pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-09-19 16:01:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

combining various AI and item check imports (#692)

Browse Source 
* aggregating AI includes

* workin on AI funcs

* fix

* misc

* ongoing lock dedupe

* item choices

* so many item choices

* dead item choices

* deleted matches

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
This commit is contained in:
HailSanta 2022-04-14 23:28:49 -04:00 committed by GitHub
parent 02a6b226a4
commit 0ef8c71bdb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
164 changed files with 921 additions and 4433 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
include/enums.h
View File

@ -1082,12 +1082,27 @@ enum ItemIDs {
ITEM_ITEMS_ICON = 0x0000016C,
};
#define ITEM_FIRST_KEY_ITEM ITEM_LUCKY_STAR
#define ITEM_LAST_KEY_ITEM ITEM_PRISON_KEY4
#define ITEM_FIRST_NORMAL_ITEM ITEM_FIRE_FLOWER
#define ITEM_LAST_NORMAL_ITEM ITEM_JELLY_SHROOM6
#define ITEM_FIRST_BADGE ITEM_SPIN_SMASH
#define ITEM_LAST_BADGE ITEM_ATTACK_FX_F5
#define ITEM_FIRST_KEY ITEM_LUCKY_STAR
#define ITEM_FIRST_VALID_KEY ITEM_KOOPA_FORTRESS_KEY
#define ITEM_LAST_KEY ITEM_PRISON_KEY4
#define ITEM_FIRST_CONSUMABLE ITEM_FIRE_FLOWER
#define ITEM_LAST_VALID_CONSUMABLE ITEM_JELLY_SHROOM1
#define ITEM_LAST_CONSUMABLE ITEM_JELLY_SHROOM6
#define ITEM_FIRST_BADGE ITEM_SPIN_SMASH
#define ITEM_LAST_BADGE ITEM_ATTACK_FX_F5
enum ItemTypeFlags {
ITEM_TYPE_FLAG_WORLD_USABLE = 0x0001,
ITEM_TYPE_FLAG_BATTLE_USABLE = 0x0002,
ITEM_TYPE_FLAG_CONSUMABLE = 0x0004,
ITEM_TYPE_FLAG_KEY = 0x0008,
ITEM_TYPE_FLAG_GEAR = 0x0020,
ITEM_TYPE_FLAG_BADGE = 0x0040,
ITEM_TYPE_FLAG_FOOD_OR_DRINK = 0x0080,
ITEM_TYPE_FLAG_USE_DRINK_ANIMATION = 0x0100,
ITEM_TYPE_FLAG_ENTITY_COLLECTIBLE = 0x0200,
ITEM_TYPE_FLAG_ENTITY_FULLSIZE = 0x1000,
};
// TODO: use NPC_ANIM-like macro for player animations
enum PlayerAnims {
@ -1160,6 +1175,7 @@ enum PlayerAnims {
ANIM_3001E = 0x0003001E,
ANIM_3001F = 0x0003001F,
ANIM_30020 = 0x00030020,
ANIM_60005 = 0x00060005,
ANIM_6000C = 0x0006000C,
ANIM_80003 = 0x00080003,
ANIM_80007 = 0x00080007,
@ -3357,26 +3373,6 @@ enum ElementImmunityFlags {
ELEMENT_IMMUNITY_FLAGS_80000000 = 0x80000000,
};
enum ItemTypeFlags {
ITEM_TYPE_FLAGS_0 = 0x0000,
ITEM_TYPE_FLAGS_1 = 0x0001,
ITEM_TYPE_FLAGS_2 = 0x0002,
ITEM_TYPE_FLAGS_4 = 0x0004,
ITEM_TYPE_FLAGS_8 = 0x0008,
ITEM_TYPE_FLAGS_10 = 0x0010,
ITEM_TYPE_FLAGS_20 = 0x0020,
ITEM_TYPE_FLAGS_40 = 0x0040,
ITEM_TYPE_FLAGS_80 = 0x0080,
ITEM_TYPE_FLAGS_100 = 0x0100,
ITEM_TYPE_FLAGS_200 = 0x0200,
ITEM_TYPE_FLAGS_400 = 0x0400,
ITEM_TYPE_FLAGS_800 = 0x0800,
ITEM_TYPE_FLAGS_1000 = 0x1000,
ITEM_TYPE_FLAGS_2000 = 0x2000,
ITEM_TYPE_FLAGS_4000 = 0x4000,
ITEM_TYPE_FLAGS_8000 = 0x8000,
};
enum FoldStateFlags {
FOLD_STATE_FLAG_ENABLED = 0x00000001,
FOLD_STATE_FLAG_G_CULL_BACK = 0x00000002,

8
src/EA0C10.c
View File

@ -329,13 +329,7 @@ ApiStatus func_80241AE0_EA23E0(Evt* script, s32 isInitialCall) {
return ApiStatus_BLOCK;
}
#include "world/common/set_script_owner_npc_anim.inc.c"
#include "world/common/UnkDistFunc.inc.c"
#include "world/common/UnkNpcAIFunc12.inc.c"
#include "world/common/set_script_owner_npc_col_height.inc.c"
#include "world/common/atomic/enemy/UnkAI_StateHandlers_A.inc.c"
#include "world/common/DeadUnkNpcAIMainFunc5.inc.c"

25
src/EB8E90.c
View File

@ -5,30 +5,7 @@
#define NAMESPACE EB8E90
#include "world/common/UnkNpcAIFunc24.inc.c"
#include "world/common/UnkFunc13.inc.c"
#include "world/common/UnkNpcAIFunc1.inc.c"
#include "world/common/UnkFunc14.inc.c"
#include "world/common/UnkNpcAIFunc25.inc.c"
#include "world/common/NpcJumpFunc2.inc.c"
#include "world/common/NpcJumpFunc.inc.c"
#include "world/common/UnkNpcAIFunc13.inc.c"
#include "world/common/UnkFunc15.inc.c"
#include "world/common/UnkNpcDurationFlagFunc.inc.c"
#include "world/common/UnkFunc16.inc.c"
// See func_80240BD4_C9EAF4 in C9DF60.c
INCLUDE_ASM(s32, "EB8E90", func_80240BD4_EB9A24);
#include "world/common/atomic/enemy/Dead_UnkAI_1.inc.c"
ApiStatus N(PostChapter6StatUpdate)(Evt* script, s32 isInitialCall) {
PlayerData* playerData = &gPlayerData;

70
src/ECAA80.c
View File

@ -6,9 +6,8 @@
#define NAMESPACE ECAA80
extern s32 D_802462F0[];
extern s32 D_80246460_EC9D00[91];
extern s32 D_802465CC;
extern s32 N(ItemChoiceList)[];
extern s32 N(FlowerGuard_ItemChoiceList)[91];
void func_80241364_ECB064(Evt* script, NpcAISettings* npcAISettings, EnemyTerritoryThing* territory);
@ -208,70 +207,19 @@ ApiStatus func_8024150C_ECB20C(Evt* script, s32 isInitialCall) {
return ApiStatus_BLOCK;
}
// following four functions can be folded into this combined include when the last two are done
// #include "world/common/atomic/ItemChoice_PartA.inc.c"
#include "world/common/GetNpcCollisionHeight.inc.c"
#include "world/common/AddPlayerHandsOffset.inc.c"
// ECAA80_ItemChoice_WaitForSelection (needs data?)
INCLUDE_ASM(s32, "ECAA80", func_8024199C_ECB69C);
// ECAA80_ItemChoice_SaveSelected (needs data?)
INCLUDE_ASM(s32, "ECAA80", func_802419F0_ECB6F0);
ApiStatus func_80241A28_ECB728(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
s32* ptr = (s32*) evt_get_variable(script, *args);
s32 i;
#include "world/common/atomic/MakeConsumableChoice.inc.c"
if (ptr != NULL) {
for (i = 0; ptr[i] != 0; i++) {
D_802462F0[i] = ptr[i];
}
D_802462F0[i] = 0;
} else {
for (i = 0; i < 91; i++) {
D_802462F0[i] = i + 128;
D_802462F0[91] = 0;
}
}
return ApiStatus_DONE2;
}
ApiStatus func_80241AC4_ECB7C4(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
s32 itemIdx = evt_get_variable(script, *args++);
s32 var1 = evt_get_variable(script, *args++);
s32 var2 = evt_get_variable(script, *args++);
s32 var3 = evt_get_variable(script, *args++);
ItemEntity* item = get_item_entity(itemIdx);
item->position.x = var1;
item->position.y = var2;
item->position.z = var3;
return ApiStatus_DONE2;
}
ApiStatus func_80241B88_ECB888(Evt* script, s32 isInitialCall) {
s32 itemId = evt_get_variable(script, *script->ptrReadPos);
ItemData* item = &gItemTable[itemId];
if (itemId == ITEM_YUMMY_MEAL) {
script->varTable[9] = 2;
} else if (item->typeFlags & 0x80) {
script->varTable[9] = 1;
} else {
script->varTable[9] = 0;
}
return ApiStatus_DONE2;
}
ApiStatus func_80241BF8_ECB8F8(Evt* script, s32 isInitialCall) {
s32 i;
for (i = 0; i <= 90; i++) {
D_80246460_EC9D00[i] = 128 + i;
}
D_802465CC = 0;
return ApiStatus_DONE2;
}
#include "world/common/atomic/ItemChoice_FlowerGuard.inc.c"

22
src/ED0310.c
View File

@ -5,24 +5,4 @@
#define NAMESPACE ED0310
#include "world/common/UnkNpcAIFunc23.inc.c"
#include "world/common/UnkNpcAIFunc35.inc.c"
#include "world/common/UnkNpcAIFunc1.inc.c"
#include "world/common/UnkFunc4.inc.c"
#include "world/common/UnkNpcAIFunc2.inc.c"
#include "world/common/SixFloatsFunc.inc.c"
#include "world/common/UnkNpcAIFunc14.inc.c"
#include "world/common/UnkNpcAIFunc3.inc.c"
#include "world/common/UnkFunc6.inc.c"
#include "world/common/UnkFunc5.inc.c"
INCLUDE_ASM(s32, "ED0310", func_8024162C_ED161C);
#include "world/common/atomic/enemy/Dead_UnkAI_9.inc.c"

30
src/EDEA00.c
View File

@ -7,27 +7,9 @@
#include "world/common/UnkFunc41.inc.c"
#include "world/common/UnkNpcAIFunc23.inc.c"
#include "world/common/atomic/enemy/Dead_UnkAI_9.inc.c"
#include "world/common/UnkNpcAIFunc35.inc.c"
#include "world/common/UnkNpcAIFunc1.inc.c"
#include "world/common/UnkFunc4.inc.c"
#include "world/common/UnkNpcAIFunc2.inc.c"
#include "world/common/SixFloatsFunc.inc.c"
#include "world/common/UnkNpcAIFunc14.inc.c"
#include "world/common/UnkNpcAIFunc3.inc.c"
#include "world/common/UnkFunc6.inc.c"
#include "world/common/UnkFunc5.inc.c"
INCLUDE_ASM(s32, "EDEA00", func_802414D0_EDFE90);
const char D_80247B44_EE6504[] = "JUGEMU MOVE";
s32 func_802416E8_EE00A8(void) {
s32 i;
@ -172,13 +154,7 @@ void func_80241B94_EE0554(Evt* script, NpcAISettings* aiSettings, EnemyTerritory
INCLUDE_ASM(s32, "EDEA00", func_80241DE4_EE07A4);
#include "world/common/set_script_owner_npc_anim.inc.c"
#include "world/common/UnkDistFunc.inc.c"
#include "world/common/UnkNpcAIFunc12.inc.c"
#include "world/common/set_script_owner_npc_col_height.inc.c"
#include "world/common/atomic/enemy/UnkAI_StateHandlers_A.inc.c"
INCLUDE_ASM(s32, "EDEA00", func_80242684_EE1044);

26
src/EE70C0.c
View File

File diff suppressed because one or more lines are too long

22
src/EEDF50.c
View File

@ -5,27 +5,7 @@
#define NAMESPACE EEDF50
#include "world/common/UnkNpcAIFunc23.inc.c"
#include "world/common/UnkNpcAIFunc35.inc.c"
#include "world/common/UnkNpcAIFunc1.inc.c"
#include "world/common/UnkFunc4.inc.c"
#include "world/common/UnkNpcAIFunc2.inc.c"
#include "world/common/SixFloatsFunc.inc.c"
#include "world/common/UnkNpcAIFunc14.inc.c"
#include "world/common/UnkNpcAIFunc3.inc.c"
#include "world/common/UnkFunc6.inc.c"
#include "world/common/UnkFunc5.inc.c"
INCLUDE_ASM(s32, "EEDF50", func_8024215C_EEF25C);
#include "world/common/atomic/enemy/Dead_UnkAI_9.inc.c"
#include "world/common/UnkNpcAIFunc13.inc.c"

30
src/EF2680.c
View File

@ -5,27 +5,7 @@
#define NAMESPACE EF2680
#include "world/common/UnkNpcAIFunc23.inc.c"
#include "world/common/UnkNpcAIFunc35.inc.c"
#include "world/common/UnkNpcAIFunc1.inc.c"
#include "world/common/UnkFunc4.inc.c"
#include "world/common/UnkNpcAIFunc2.inc.c"
#include "world/common/SixFloatsFunc.inc.c"
#include "world/common/UnkNpcAIFunc14.inc.c"
#include "world/common/UnkNpcAIFunc3.inc.c"
#include "world/common/UnkFunc6.inc.c"
#include "world/common/UnkFunc5.inc.c"
INCLUDE_ASM(s32, "EF2680", func_8024137C_EF398C);
#include "world/common/atomic/enemy/Dead_UnkAI_9.inc.c"
s32 func_80241594_EF3BA4(void) {
s32 i;
@ -170,13 +150,7 @@ void func_80241A40_EF4050(Evt* script, NpcAISettings* aiSettings, EnemyTerritory
INCLUDE_ASM(s32, "EF2680", func_80241C90_EF42A0);
#include "world/common/set_script_owner_npc_anim.inc.c"
#include "world/common/UnkDistFunc.inc.c"
#include "world/common/UnkNpcAIFunc12.inc.c"
#include "world/common/set_script_owner_npc_col_height.inc.c"
#include "world/common/atomic/enemy/UnkAI_StateHandlers_A.inc.c"
#include "world/common/DeadUnkNpcAIMainFunc5.inc.c"

6
src/world/area_arn/arn_03/arn_03.h
View File

@ -9,9 +9,9 @@
#define NAMESPACE arn_03
ApiStatus N(AddPlayerHandsOffset)(Evt* script, s32 isInitialCall);
ApiStatus N(func_80241648_BE03D8)(Evt* script, s32 isInitialCall);
ApiStatus N(func_80241680_BE0410)(Evt* script, s32 isInitialCall);
ApiStatus N(func_802415F4_BE0384)(Evt* script, s32 isInitialCall);
ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall);
ApiStatus N(BuildKeyItemChoiceList)(Evt* script, s32 isInitialCall);
ApiStatus N(ItemChoice_WaitForSelection)(Evt* script, s32 isInitialCall);
ApiStatus N(func_8024113C_BDFECC)(Evt* script, s32 isInitialCall);
extern EvtScript N(main);

93
src/world/area_arn/arn_03/events.c
View File

@ -2,7 +2,7 @@
#include "sprite/npc/boo.h"
#include "sprite/npc/world_bow.h"
static s32 N(D_80244A20)[112];
static s32 N(KeyItemChoiceList)[112];
EvtScript N(exitWalk_80241830) = EXIT_WALK_SCRIPT(60, 0, "arn_07", 1);
@ -99,29 +99,7 @@ NpcSettings N(npcSettings_80241C3C) = {
.level = 99,
};
#include "world/common/UnkNpcAIFunc24.inc.c"
#include "world/common/UnkFunc13.inc.c"
#include "world/common/UnkNpcAIFunc1.inc.c"
#include "world/common/UnkFunc14.inc.c"
#include "world/common/UnkNpcAIFunc25.inc.c"
#include "world/common/NpcJumpFunc2.inc.c"
#include "world/common/NpcJumpFunc.inc.c"
#include "world/common/UnkNpcAIFunc13.inc.c"
#include "world/common/UnkFunc15.inc.c"
#include "world/common/UnkNpcDurationFlagFunc.inc.c"
#include "world/common/UnkFunc16.inc.c"
#include "world/common/UnkNpcAIMainFunc.inc.c"
#include "world/common/atomic/enemy/UnkAI_1.inc.c"
void N(func_80240E90_BDFC20)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
Enemy* enemy = script->owner1.enemy;
@ -220,7 +198,7 @@ ApiStatus N(func_8024113C_BDFECC)(Evt* script, s32 isInitialCall) {
}
static s32** N(varStash) = NULL;
#include "world/common/StashVars.inc.c"
EvtScript N(80241C6C) = {
EVT_CALL(ShowGotItem, EVT_VAR(0), 1, 0)
@ -236,11 +214,11 @@ EvtScript N(80241C9C) = {
EVT_END
};
s32 N(D_80241CCC_BE0A5C) = {
s32 N(ItemChoice_HasSelectedItem) = {
0x00000000,
};
s32 N(D_80241CD0_BE0A60) = {
s32 N(ItemChoice_SelectedItemID) = {
0x00000000,
};
@ -262,7 +240,7 @@ EvtScript N(80241CD4) = {
EVT_CALL(SetPlayerAnimation, ANIM_10002)
EVT_CALL(RemoveItemEntity, EVT_VAR(0))
EVT_END_SWITCH
EVT_CALL(N(func_80241648_BE03D8), EVT_VAR(10))
EVT_CALL(N(ItemChoice_SaveSelected), EVT_VAR(10))
EVT_CALL(CloseChoicePopup)
EVT_UNBIND
EVT_RETURN
@ -270,9 +248,9 @@ EvtScript N(80241CD4) = {
};
EvtScript N(80241E18) = {
EVT_CALL(N(func_80241680_BE0410), EVT_VAR(0))
EVT_BIND_PADLOCK(N(80241CD4), 0x10, 0, EVT_PTR(N(D_80244A20)), 0, 1)
EVT_CALL(N(func_802415F4_BE0384), EVT_VAR(0))
EVT_CALL(N(BuildKeyItemChoiceList), EVT_VAR(0))
EVT_BIND_PADLOCK(N(80241CD4), TRIGGER_FORCE_ACTIVATE, 0, EVT_PTR(N(KeyItemChoiceList)), 0, 1)
EVT_CALL(N(ItemChoice_WaitForSelection), EVT_VAR(0))
EVT_RETURN
EVT_END
};
@ -1004,55 +982,10 @@ EvtScript N(makeEntities) = {
EVT_END
};
#include "world/common/StashVars.inc.c"
#include "world/common/GetItemName.inc.c"
#include "world/common/GetNpcCollisionHeight.inc.c"
#include "world/common/atomic/ItemChoice_PartA.inc.c"
#include "world/common/AddPlayerHandsOffset.inc.c"
ApiStatus N(func_802415F4_BE0384)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
s32* ptr;
if (isInitialCall) {
ptr = &N(D_80241CCC_BE0A5C);
*ptr = 0;
}
ptr = &N(D_80241CCC_BE0A5C);
if (*ptr != NULL) {
ptr = &N(D_80241CCC_BE0A5C);
*ptr = 0;
evt_set_variable(script, *args, N(D_80241CD0_BE0A60));
return ApiStatus_DONE2;
}
return ApiStatus_BLOCK;
}
ApiStatus N(func_80241648_BE03D8)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
N(D_80241CD0_BE0A60) = evt_get_variable(script, *args);
N(D_80241CCC_BE0A5C) = 1;
return ApiStatus_DONE2;
}
ApiStatus N(func_80241680_BE0410)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
s32* ptr = (s32*) evt_get_variable(script, *args);
s32 i;
if (ptr != NULL) {
for (i = 0; ptr[i] != 0; i++) {
N(D_80244A20)[i] = ptr[i];
}
N(D_80244A20)[i] = 0;
} else {
for (i = 0; i < 0x70; i++) {
N(D_80244A20)[i] = i + 16;
N(D_80244A20)[112] = 0;
}
}
return ApiStatus_DONE2;
}
#include "world/common/atomic/MakeKeyChoice.inc.c"

46
src/world/area_arn/arn_04/events.c
View File

@ -63,56 +63,14 @@ NpcSettings N(npcSettings_802436B0) = {
.level = 12,
};
#include "world/common/UnkNpcAIFunc24.inc.c"
#include "world/common/UnkFunc13.inc.c"
#include "world/common/UnkNpcAIFunc1.inc.c"
#include "world/common/UnkFunc14.inc.c"
#include "world/common/UnkNpcAIFunc25.inc.c"
#include "world/common/NpcJumpFunc2.inc.c"
#include "world/common/NpcJumpFunc.inc.c"
#include "world/common/UnkNpcAIFunc13.inc.c"
#include "world/common/UnkFunc15.inc.c"
#include "world/common/UnkNpcDurationFlagFunc.inc.c"
#include "world/common/UnkFunc16.inc.c"
#include "world/common/UnkNpcAIMainFunc.inc.c"
#include "world/common/UnkNpcAIFunc23.inc.c"
#include "world/common/UnkNpcAIFunc35.inc.c"
#include "world/common/UnkNpcAIFunc1_copy.inc.c"
#include "world/common/UnkFunc4.inc.c"
#include "world/common/UnkNpcAIFunc2.inc.c"
#include "world/common/atomic/enemy/UnkAI_1.inc.c"
f32 N(sixFloats)[] = {
4.5f, 3.5f, 2.6f, 2.0f,
1.5f, 20.0f,
};
#include "world/common/SixFloatsFunc.inc.c"
#include "world/common/UnkNpcAIFunc14.inc.c"
#include "world/common/UnkNpcAIFunc3.inc.c"
#include "world/common/UnkFunc6.inc.c"
#include "world/common/UnkFunc5.inc.c"
#include "world/common/UnkNpcAIMainFunc9.inc.c"
#include "world/common/atomic/enemy/UnkAI_9.inc.c"
NpcAISettings N(npcAISettings_802436F4) = {
.moveSpeed = 1.8f,

24
src/world/area_arn/arn_05/events.c
View File

@ -1015,29 +1015,7 @@ EvtScript N(makeEntities) = {
EVT_END
};
#include "world/common/UnkNpcAIFunc24.inc.c"
#include "world/common/UnkFunc13.inc.c"
#include "world/common/UnkNpcAIFunc1.inc.c"
#include "world/common/UnkFunc14.inc.c"
#include "world/common/UnkNpcAIFunc25.inc.c"
#include "world/common/NpcJumpFunc2.inc.c"
#include "world/common/NpcJumpFunc.inc.c"
#include "world/common/UnkNpcAIFunc13.inc.c"
#include "world/common/UnkFunc15.inc.c"
#include "world/common/UnkNpcDurationFlagFunc.inc.c"
#include "world/common/UnkFunc16.inc.c"
#include "world/common/UnkNpcAIMainFunc.inc.c"
#include "world/common/atomic/enemy/UnkAI_1.inc.c"
void N(func_80240E90_BE8A70)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
Enemy* enemy = script->owner1.enemy;

22
src/world/area_arn/arn_07/events.c
View File

@ -1203,27 +1203,7 @@ NpcGroupList N(npcGroupList_802478E8) = {
{},
};
#include "world/common/UnkNpcAIFunc23.inc.c"
#include "world/common/UnkNpcAIFunc35.inc.c"
#include "world/common/UnkNpcAIFunc1_copy.inc.c"
#include "world/common/UnkFunc4.inc.c"
#include "world/common/UnkNpcAIFunc2.inc.c"
#include "world/common/SixFloatsFunc.inc.c"
#include "world/common/UnkNpcAIFunc14.inc.c"
#include "world/common/UnkNpcAIFunc3.inc.c"
#include "world/common/UnkFunc6.inc.c"
#include "world/common/UnkFunc5.inc.c"
#include "world/common/UnkNpcAIMainFunc9.inc.c"
#include "world/common/atomic/enemy/UnkAI_9.inc.c"
ApiStatus PostChapter3StatUpdate(Evt* script, s32 isInitialCall) {
PlayerData* playerData = &gPlayerData;

46
src/world/area_dgb/dgb_01/BFD9A0.c
View File

@ -503,27 +503,7 @@ NpcAISettings N(npcAISettings_80244D24) = {
.unk_2C = 1,
};
#include "world/common/UnkNpcAIFunc23.inc.c"
#include "world/common/UnkNpcAIFunc35.inc.c"
#include "world/common/UnkNpcAIFunc1_copy.inc.c"
#include "world/common/UnkFunc4.inc.c"
#include "world/common/UnkNpcAIFunc2.inc.c"
#include "world/common/SixFloatsFunc.inc.c"
#include "world/common/UnkNpcAIFunc14.inc.c"
#include "world/common/UnkNpcAIFunc3.inc.c"
#include "world/common/UnkFunc6.inc.c"
#include "world/common/UnkFunc5.inc.c"
#include "world/common/UnkNpcAIMainFunc9.inc.c"
#include "world/common/atomic/enemy/UnkAI_9.inc.c"
void N(func_80241618_BFEE98)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
Enemy* enemy = script->owner1.enemy;
@ -1053,29 +1033,7 @@ EvtScript N(init_80245784) = {
const char N(dgb_00_name_hack)[] = "dgb_00";
#include "world/common/UnkNpcAIFunc24.inc.c"
#include "world/common/UnkFunc13.inc.c"
#include "world/common/UnkNpcAIFunc1.inc.c"
#include "world/common/UnkFunc14.inc.c"
#include "world/common/UnkNpcAIFunc25.inc.c"
#include "world/common/NpcJumpFunc2.inc.c"
#include "world/common/NpcJumpFunc.inc.c"
#include "world/common/UnkNpcAIFunc13.inc.c"
#include "world/common/UnkFunc15.inc.c"
#include "world/common/UnkNpcDurationFlagFunc.inc.c"
#include "world/common/UnkFunc16.inc.c"
#include "world/common/UnkNpcAIMainFunc.inc.c"
#include "world/common/atomic/enemy/UnkAI_1.inc.c"
#include "world/common/UnkFunc1.inc.c"

24
src/world/area_dgb/dgb_03/C31730.c
View File

@ -862,29 +862,7 @@ ApiStatus N(func_8024086C_C31D4C)(Evt* script, s32 isInitialCall) {
return ApiStatus_BLOCK;
}
#include "world/common/UnkNpcAIFunc24.inc.c"
#include "world/common/UnkFunc13.inc.c"
#include "world/common/UnkNpcAIFunc1.inc.c"
#include "world/common/UnkFunc14.inc.c"
#include "world/common/UnkNpcAIFunc25.inc.c"
#include "world/common/NpcJumpFunc2.inc.c"
#include "world/common/NpcJumpFunc.inc.c"
#include "world/common/UnkNpcAIFunc13.inc.c"
#include "world/common/UnkFunc15.inc.c"
#include "world/common/UnkNpcDurationFlagFunc.inc.c"
#include "world/common/UnkFunc16.inc.c"
#include "world/common/UnkNpcAIMainFunc.inc.c"
#include "world/common/atomic/enemy/UnkAI_1.inc.c"
ApiStatus N(func_802419B0_C32E90)(Evt* script, s32 isInitialCall) {
Enemy* enemy = script->owner1.enemy;

22
src/world/area_dgb/dgb_04/C36530.c
View File

@ -280,27 +280,7 @@ EvtScript N(makeEntities) = {
EVT_END
};
#include "world/common/UnkNpcAIFunc23.inc.c"
#include "world/common/UnkNpcAIFunc35.inc.c"
#include "world/common/UnkNpcAIFunc1_copy.inc.c"
#include "world/common/UnkFunc4.inc.c"
#include "world/common/UnkNpcAIFunc2.inc.c"
#include "world/common/SixFloatsFunc.inc.c"
#include "world/common/UnkNpcAIFunc14.inc.c"
#include "world/common/UnkNpcAIFunc3.inc.c"
#include "world/common/UnkFunc6.inc.c"
#include "world/common/UnkFunc5.inc.c"
#include "world/common/UnkNpcAIMainFunc9.inc.c"
#include "world/common/atomic/enemy/UnkAI_9.inc.c"
void N(func_802414F8_C37A28)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
Enemy* enemy = script->owner1.enemy;

46
src/world/area_dgb/dgb_08/C3FDB0.c
View File

@ -988,29 +988,7 @@ EvtScript N(802469E0) = {
EVT_END
};
#include "world/common/UnkNpcAIFunc24.inc.c"
#include "world/common/UnkFunc13.inc.c"
#include "world/common/UnkNpcAIFunc1.inc.c"
#include "world/common/UnkFunc14.inc.c"
#include "world/common/UnkNpcAIFunc25.inc.c"
#include "world/common/NpcJumpFunc2.inc.c"
#include "world/common/NpcJumpFunc.inc.c"
#include "world/common/UnkNpcAIFunc13.inc.c"
#include "world/common/UnkFunc15.inc.c"
#include "world/common/UnkNpcDurationFlagFunc.inc.c"
#include "world/common/UnkFunc16.inc.c"
#include "world/common/UnkNpcAIMainFunc.inc.c"
#include "world/common/atomic/enemy/UnkAI_1.inc.c"
#include "world/common/UnkNpcAIFunc6.inc.c"
@ -1109,27 +1087,7 @@ ApiStatus N(func_802414AC_C4125C)(Evt* script, s32 isInitialCall) {
return ApiStatus_BLOCK;
}
#include "world/common/UnkNpcAIFunc23.inc.c"
#include "world/common/UnkNpcAIFunc35.inc.c"
#include "world/common/UnkNpcAIFunc1_copy.inc.c"
#include "world/common/UnkFunc4.inc.c"
#include "world/common/UnkNpcAIFunc2.inc.c"
#include "world/common/SixFloatsFunc.inc.c"
#include "world/common/UnkNpcAIFunc14.inc.c"
#include "world/common/UnkNpcAIFunc3.inc.c"
#include "world/common/UnkFunc6.inc.c"
#include "world/common/UnkFunc5.inc.c"
#include "world/common/UnkNpcAIMainFunc9.inc.c"
#include "world/common/atomic/enemy/UnkAI_9.inc.c"
void N(func_80242C58_C42A08)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
Enemy* enemy = script->owner1.enemy;

22
src/world/area_dgb/dgb_09/C46BE0.c
View File

@ -1001,27 +1001,7 @@ ApiStatus N(func_802410D4_C47CB4)(Evt* script, s32 isInitialCall) {
return ApiStatus_BLOCK;
}
#include "world/common/UnkNpcAIFunc23.inc.c"
#include "world/common/UnkNpcAIFunc35.inc.c"
#include "world/common/UnkNpcAIFunc1_copy.inc.c"
#include "world/common/UnkFunc4.inc.c"
#include "world/common/UnkNpcAIFunc2.inc.c"
#include "world/common/SixFloatsFunc.inc.c"
#include "world/common/UnkNpcAIFunc14.inc.c"
#include "world/common/UnkNpcAIFunc3.inc.c"
#include "world/common/UnkFunc6.inc.c"
#include "world/common/UnkFunc5.inc.c"
#include "world/common/UnkNpcAIMainFunc9.inc.c"
#include "world/common/atomic/enemy/UnkAI_9.inc.c"
void N(func_8024291C_C494FC)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
Enemy* enemy = script->owner1.enemy;

24
src/world/area_dgb/dgb_15/C4F510.c
View File

@ -561,29 +561,7 @@ ApiStatus N(func_8024061C_C4FB2C)(Evt* script, s32 isInitialCall) {
return ApiStatus_BLOCK;
}
#include "world/common/UnkNpcAIFunc24.inc.c"
#include "world/common/UnkFunc13.inc.c"
#include "world/common/UnkNpcAIFunc1.inc.c"
#include "world/common/UnkFunc14.inc.c"
#include "world/common/UnkNpcAIFunc25.inc.c"
#include "world/common/NpcJumpFunc2.inc.c"
#include "world/common/NpcJumpFunc.inc.c"
#include "world/common/UnkNpcAIFunc13.inc.c"
#include "world/common/UnkFunc15.inc.c"
#include "world/common/UnkNpcDurationFlagFunc.inc.c"
#include "world/common/UnkFunc16.inc.c"
#include "world/common/UnkNpcAIMainFunc.inc.c"
#include "world/common/atomic/enemy/UnkAI_1.inc.c"
#include "world/common/UnkFunc1.inc.c"

24
src/world/area_dgb/dgb_18/C55F40.c
View File

@ -700,29 +700,7 @@ EvtScript N(makeEntities) = {
EVT_END
};
#include "world/common/UnkNpcAIFunc24.inc.c"
#include "world/common/UnkFunc13.inc.c"
#include "world/common/UnkNpcAIFunc1.inc.c"
#include "world/common/UnkFunc14.inc.c"
#include "world/common/UnkNpcAIFunc25.inc.c"
#include "world/common/NpcJumpFunc2.inc.c"
#include "world/common/NpcJumpFunc.inc.c"
#include "world/common/UnkNpcAIFunc13.inc.c"
#include "world/common/UnkFunc15.inc.c"
#include "world/common/UnkNpcDurationFlagFunc.inc.c"
#include "world/common/UnkFunc16.inc.c"
#include "world/common/UnkNpcAIMainFunc.inc.c"
#include "world/common/atomic/enemy/UnkAI_1.inc.c"
#include "world/common/UnkFunc1.inc.c"

24
src/world/area_dro/dro_01/95B7E0.c
View File

@ -1997,29 +1997,7 @@ EvtScript N(makeEntities) = {
EVT_END
};
#include "world/common/UnkNpcAIFunc24.inc.c"
#include "world/common/UnkFunc13.inc.c"
#include "world/common/UnkNpcAIFunc1.inc.c"
#include "world/common/UnkFunc14.inc.c"
#include "world/common/UnkNpcAIFunc25.inc.c"
#include "world/common/NpcJumpFunc2.inc.c"
#include "world/common/NpcJumpFunc.inc.c"
#include "world/common/UnkNpcAIFunc13.inc.c"
#include "world/common/UnkFunc15.inc.c"
#include "world/common/UnkNpcDurationFlagFunc.inc.c"
#include "world/common/UnkFunc16.inc.c"
#include "world/common/UnkNpcAIMainFunc.inc.c"
#include "world/common/atomic/enemy/UnkAI_1.inc.c"
#include "world/common/atomic/Quizmo.inc.c"

100
src/world/area_dro/dro_02/9694C0.c
View File

@ -70,10 +70,8 @@ static Evt* N(D_8024EFCC);
static s32 N(D_8024EFD0)[16];
static D_8024F010_Struct N(D_8024F010)[3];
static s8 N(pad_D_8024F07C)[0x4];
static s32 N(D_8024F080)[112];
static s8 N(pad_D_8024F240)[0x8]; // likely conencted to the above
static s32 N(D_8024F248)[91];
static s8 N(pad_D_8024F3B4)[0x4]; // likely conencted to the above
static s32 N(KeyItemChoiceList)[(ITEM_LAST_KEY - ITEM_FIRST_VALID_KEY) + 3];
static s32 N(ItemChoiceList)[(ITEM_LAST_VALID_CONSUMABLE - ITEM_FIRST_CONSUMABLE) + 2]; // extra entry for list terminator
static s32 N(D_8024F3B8);
// DATA
@ -901,11 +899,11 @@ NpcSettings N(npcSettings_80248754) = {
.level = 99,
};
s32 N(D_80248780_971940) = {
s32 N(ItemChoice_HasSelectedItem) = {
0x00000000,
};
s32 N(D_80248784_971944) = {
s32 N(ItemChoice_SelectedItemID) = {
0x00000000,
};
@ -927,7 +925,7 @@ EvtScript N(80248788) = {
EVT_CALL(SetPlayerAnimation, ANIM_10002)
EVT_CALL(RemoveItemEntity, EVT_VAR(0))
EVT_END_SWITCH
EVT_CALL(N(func_80243314_96C4D4), EVT_VAR(10))
EVT_CALL(N(ItemChoice_SaveSelected), EVT_VAR(10))
EVT_CALL(CloseChoicePopup)
EVT_UNBIND
EVT_RETURN
@ -935,9 +933,9 @@ EvtScript N(80248788) = {
};
EvtScript N(802488CC) = {
EVT_CALL(N(func_8024334C_96C50C), EVT_VAR(0))
EVT_BIND_PADLOCK(N(80248788), 0x10, 0, EVT_PTR(N(D_8024F080)), 0, 1)
EVT_CALL(N(func_802432C0_96C480), EVT_VAR(0))
EVT_CALL(N(BuildKeyItemChoiceList), EVT_VAR(0))
EVT_BIND_PADLOCK(N(80248788), 0x10, 0, EVT_PTR(N(KeyItemChoiceList)), 0, 1)
EVT_CALL(N(ItemChoice_WaitForSelection), EVT_VAR(0))
EVT_RETURN
EVT_END
};
@ -959,7 +957,7 @@ EvtScript N(8024891C) = {
EVT_CALL(SetPlayerAnimation, ANIM_10002)
EVT_CALL(RemoveItemEntity, EVT_VAR(0))
EVT_END_SWITCH
EVT_CALL(N(func_80243314_96C4D4), EVT_VAR(10))
EVT_CALL(N(ItemChoice_SaveSelected), EVT_VAR(10))
EVT_CALL(CloseChoicePopup)
EVT_UNBIND
EVT_RETURN
@ -967,9 +965,9 @@ EvtScript N(8024891C) = {
};
EvtScript N(80248A50) = {
EVT_CALL(N(func_802433E8_96C5A8), EVT_VAR(0))
EVT_BIND_PADLOCK(N(8024891C), 0x10, 0, EVT_PTR(N(D_8024F248)), 0, 1)
EVT_CALL(N(func_802432C0_96C480), EVT_VAR(0))
EVT_CALL(N(BuildItemChoiceList), EVT_VAR(0))
EVT_BIND_PADLOCK(N(8024891C), 0x10, 0, EVT_PTR(N(ItemChoiceList)), 0, 1)
EVT_CALL(N(ItemChoice_WaitForSelection), EVT_VAR(0))
EVT_RETURN
EVT_END
};
@ -1363,7 +1361,7 @@ EvtScript N(8024B20C) = {
EVT_CALL(EnablePartnerAI)
EVT_WAIT_FRAMES(5)
EVT_END_SWITCH
EVT_CALL(N(func_80243314_96C4D4), EVT_VAR(10))
EVT_CALL(N(ItemChoice_SaveSelected), EVT_VAR(10))
EVT_CALL(CloseChoicePopup)
EVT_UNBIND
EVT_RETURN
@ -1373,9 +1371,9 @@ EvtScript N(8024B20C) = {
EvtScript N(8024B530) = {
EVT_SET(EVT_VAR(0), EVT_VAR(11))
EVT_SET(EVT_VAR(1), EVT_VAR(2))
EVT_CALL(N(func_8024334C_96C50C), EVT_VAR(0))
EVT_BIND_PADLOCK(N(8024B20C), 0x10, 0, EVT_PTR(N(D_8024F080)), 0, 1)
EVT_CALL(N(func_802432C0_96C480), EVT_VAR(0))
EVT_CALL(N(BuildKeyItemChoiceList), EVT_VAR(0))
EVT_BIND_PADLOCK(N(8024B20C), 0x10, 0, EVT_PTR(N(KeyItemChoiceList)), 0, 1)
EVT_CALL(N(ItemChoice_WaitForSelection), EVT_VAR(0))
EVT_RETURN
EVT_END
};
@ -2547,71 +2545,11 @@ ApiStatus N(func_80243068_96C228)(Evt* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
#include "world/common/GetNpcCollisionHeight.inc.c"
#include "world/common/atomic/ItemChoice_PartA.inc.c"
#include "world/common/AddPlayerHandsOffset.inc.c"
#include "world/common/atomic/MakeKeyChoice.inc.c"
ApiStatus N(func_802432C0_96C480)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
if (isInitialCall) {
N(D_80248780_971940) = 0;
}
if (N(D_80248780_971940) != NULL) {
N(D_80248780_971940) = 0;
evt_set_variable(script, *args, N(D_80248784_971944));
return ApiStatus_DONE2;
}
return ApiStatus_BLOCK;
}
ApiStatus N(func_80243314_96C4D4)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
N(D_80248784_971944) = evt_get_variable(script, *args);
N(D_80248780_971940) = 1;
return ApiStatus_DONE2;
}
ApiStatus N(func_8024334C_96C50C)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
s32* ptr = (s32*) evt_get_variable(script, *args);
s32 i;
if (ptr != NULL) {
for (i = 0; ptr[i] != 0; i++) {
N(D_8024F080)[i] = ptr[i];
}
N(D_8024F080)[i] = 0;
} else {
for (i = 0; i < 0x70; i++) {
N(D_8024F080)[i] = i + 16;
N(D_8024F080)[112] = 0;
}
}
return ApiStatus_DONE2;
}
ApiStatus N(func_802433E8_96C5A8)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
s32* ptr = (s32*) evt_get_variable(script, *args);
s32 i;
if (ptr != NULL) {
for (i = 0; ptr[i] != 0; i++) {
N(D_8024F248)[i] = ptr[i];
}
N(D_8024F248)[i] = 0;
} else {
for (i = 0; i <= 90; i++) {
N(D_8024F248)[i] = i + 128;
N(D_8024F248)[91] = 0;
}
}
return ApiStatus_DONE2;
}
#include "world/common/atomic/MakeConsumableChoice.inc.c"
#include "world/common/atomic/ToadHouse.inc.c"

8
src/world/area_dro/dro_02/dro_02.h
View File

@ -45,10 +45,10 @@ ApiStatus N(func_802416FC_96A8BC)(Evt* script, s32 isInitialCall);
ApiStatus N(func_80241874_96AA34)(Evt* script, s32 isInitialCall);
ApiStatus N(func_8024303C_96C1FC)(Evt* script, s32 isInitialCall);
ApiStatus N(func_80243068_96C228)(Evt* script, s32 isInitialCall);
ApiStatus N(func_802432C0_96C480)(Evt* script, s32 isInitialCall);
ApiStatus N(func_80243314_96C4D4)(Evt* script, s32 isInitialCall);
ApiStatus N(func_8024334C_96C50C)(Evt* script, s32 isInitialCall);
ApiStatus N(func_802433E8_96C5A8)(Evt* script, s32 isInitialCall);
ApiStatus N(ItemChoice_WaitForSelection)(Evt* script, s32 isInitialCall);
ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall);
ApiStatus N(BuildKeyItemChoiceList)(Evt* script, s32 isInitialCall);
ApiStatus N(BuildItemChoiceList)(Evt* script, s32 isInitialCall);
ApiStatus N(ToadHouse_UpdateScreenOverlay)(Evt* script, s32 isInitialCall);
ApiStatus N(ToadHouse_CamSetFOV)(Evt* script, s32 isInitialCall);
ApiStatus N(ToadHouse_DoesPlayerNeedSleep)(Evt* script, s32 isInitialCall);

24
src/world/area_flo/flo_00/C9DF60.c
View File

@ -2080,29 +2080,7 @@ EvtScript N(makeEntities) = SCRIPT({
}
});
#include "world/common/UnkNpcAIFunc24.inc.c"
#include "world/common/UnkFunc13.inc.c"
#include "world/common/UnkNpcAIFunc1.inc.c"
#include "world/common/UnkFunc14.inc.c"
#include "world/common/UnkNpcAIFunc25.inc.c"
#include "world/common/NpcJumpFunc2.inc.c"
#include "world/common/NpcJumpFunc.inc.c"
#include "world/common/UnkNpcAIFunc13.inc.c"
#include "world/common/UnkFunc15.inc.c"
#include "world/common/UnkNpcDurationFlagFunc.inc.c"
#include "world/common/UnkFunc16.inc.c"
#include "world/common/UnkNpcAIMainFunc.inc.c"
#include "world/common/atomic/enemy/UnkAI_1.inc.c"
ApiStatus N(PostChapter6StatUpdate)(Evt* script, s32 isInitialCall) {
PlayerData* playerData = &gPlayerData;

116
src/world/area_flo/flo_08/CAFAC0.c
View File

@ -17,10 +17,8 @@ enum {
};
// BSS
static s32 N(D_802462C0_B4AA30)[91];
static s8 N(D_802462C4_pad);
static s32 N(D_80246428)[91];
static s32 N(D_8024659C);
static s32 N(ItemChoiceList)[(ITEM_LAST_VALID_CONSUMABLE - ITEM_FIRST_CONSUMABLE) + 2]; // extra entry for list terminator
static s32 N(FlowerGuard_ItemChoiceList)[(ITEM_LAST_VALID_CONSUMABLE - ITEM_FIRST_CONSUMABLE) + 2]; // extra entry for list terminator
// DATA
EntryList N(entryList) = {
@ -268,9 +266,9 @@ NpcSettings N(npcSettings_8024305C) = {
.level = 19,
};
s32 N(D_80243088_CB1DC8) = FALSE;
s32 N(ItemChoice_HasSelectedItem) = FALSE;
s32 N(D_8024308C_CB1DCC) = {
s32 N(ItemChoice_SelectedItemID) = {
0x00000000,
};
@ -291,7 +289,7 @@ EvtScript N(80243090) = {
EVT_CALL(SetPlayerAnimation, ANIM_10002)
EVT_CALL(RemoveItemEntity, EVT_VAR(0))
EVT_END_SWITCH
EVT_CALL(N(func_802419C4_CB0704), EVT_VAR(10))
EVT_CALL(N(ItemChoice_SaveSelected), EVT_VAR(10))
EVT_CALL(CloseChoicePopup)
EVT_UNBIND
EVT_RETURN
@ -299,9 +297,9 @@ EvtScript N(80243090) = {
};
EvtScript N(802431C4) = {
EVT_CALL(N(func_802419FC_CB073C), EVT_VAR(0))
EVT_BIND_PADLOCK(N(80243090), 0x10, 0, EVT_PTR(D_802462C0_B4AA30), 0, 1)
EVT_CALL(N(func_80241970_CB06B0), EVT_VAR(0))
EVT_CALL(N(BuildItemChoiceList), EVT_VAR(0))
EVT_BIND_PADLOCK(N(80243090), 0x10, 0, EVT_PTR(N(ItemChoiceList)), 0, 1)
EVT_CALL(N(ItemChoice_WaitForSelection), EVT_VAR(0))
EVT_RETURN
EVT_END
};
@ -319,8 +317,8 @@ EvtScript N(interact_80243214) = {
EVT_CALL(WaitForCam, 0, EVT_FIXED(1.0))
EVT_CALL(SpeakToPlayer, NPC_SELF, NPC_ANIM_gate_flower_Palette_02_Anim_2, NPC_ANIM_gate_flower_Palette_02_Anim_1, 0, MESSAGE_ID(0x11, 0x0042))
EVT_CALL(SetPlayerAnimation, ANIM_THINKING)
EVT_CALL(N(func_80241BCC_CB090C))
EVT_SET(EVT_VAR(0), EVT_PTR(N(D_80246428)))
EVT_CALL(N(FlowerGuard_MakeItemList))
EVT_SET(EVT_VAR(0), EVT_PTR(N(FlowerGuard_ItemChoiceList)))
EVT_SET(EVT_VAR(1), 0)
EVT_EXEC_WAIT(N(802431C4))
EVT_SWITCH(EVT_VAR(0))
@ -329,7 +327,7 @@ EvtScript N(interact_80243214) = {
EVT_CALL(SpeakToPlayer, NPC_SELF, NPC_ANIM_gate_flower_Palette_02_Anim_2, NPC_ANIM_gate_flower_Palette_02_Anim_1, 0, MESSAGE_ID(0x11, 0x0043))
EVT_CASE_DEFAULT
EVT_SET(EVT_VAR(8), EVT_VAR(0))
EVT_CALL(N(func_80241B5C_CB089C), EVT_VAR(0))
EVT_CALL(N(FlowerGuard_JudgeItemTastiness), EVT_VAR(0))
EVT_CALL(MakeItemEntity, EVT_VAR(8), -695, 20, -29, 1, 0)
EVT_SET(EVT_VAR(7), EVT_VAR(0))
EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2095, 0)
@ -391,7 +389,7 @@ EvtScript N(interact_80243214) = {
EVT_ADDF(EVT_VAR(2), EVT_FIXED(-700.0))
EVT_ADDF(EVT_VAR(3), EVT_FIXED(15.0))
EVT_ADDF(EVT_VAR(4), EVT_FIXED(-25.0))
EVT_CALL(N(func_80241A98_CB07D8), EVT_VAR(7), EVT_VAR(2), EVT_VAR(3), EVT_VAR(4))
EVT_CALL(N(FlowerGuard_SetItemEntityPosition), EVT_VAR(7), EVT_VAR(2), EVT_VAR(3), EVT_VAR(4))
EVT_WAIT_FRAMES(1)
EVT_IF_EQ(EVT_VAR(1), 0)
EVT_BREAK_LOOP
@ -410,7 +408,7 @@ EvtScript N(interact_80243214) = {
EVT_ADDF(EVT_VAR(2), EVT_FIXED(-690.0))
EVT_ADDF(EVT_VAR(3), EVT_FIXED(15.0))
EVT_ADDF(EVT_VAR(4), EVT_FIXED(-25.0))
EVT_CALL(N(func_80241A98_CB07D8), EVT_VAR(7), EVT_VAR(2), EVT_VAR(3), EVT_VAR(4))
EVT_CALL(N(FlowerGuard_SetItemEntityPosition), EVT_VAR(7), EVT_VAR(2), EVT_VAR(3), EVT_VAR(4))
EVT_WAIT_FRAMES(1)
EVT_IF_EQ(EVT_VAR(1), 0)
EVT_BREAK_LOOP
@ -1041,93 +1039,11 @@ ApiStatus N(func_8024150C_CB024C)(Evt* script, s32 isInitialCall) {
return ApiStatus_BLOCK;
}
#include "world/common/GetNpcCollisionHeight.inc.c"
#include "world/common/atomic/ItemChoice_PartA.inc.c"
#include "world/common/AddPlayerHandsOffset.inc.c"
#include "world/common/atomic/MakeConsumableChoice.inc.c"
ApiStatus N(func_80241970_CB06B0)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
if (isInitialCall) {
N(D_80243088_CB1DC8) = FALSE;
}
if (N(D_80243088_CB1DC8)) {
N(D_80243088_CB1DC8) = FALSE;
evt_set_variable(script, *args, N(D_8024308C_CB1DCC));
return ApiStatus_DONE2;
}
return ApiStatus_BLOCK;
}
ApiStatus N(func_802419C4_CB0704)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
N(D_8024308C_CB1DCC) = evt_get_variable(script, *args);
N(D_80243088_CB1DC8) = TRUE;
return ApiStatus_DONE2;
}
ApiStatus N(func_802419FC_CB073C)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
s32* ptr = (s32*)evt_get_variable(script, *args);
s32 i;
if (ptr != NULL) {
for (i = 0; ptr[i] != 0; i++) {
N(D_802462C0_B4AA30)[i] = ptr[i];
}
N(D_802462C0_B4AA30)[i] = 0;
} else {
for (i = 0; i <= 90; i++) {
N(D_802462C0_B4AA30)[i] = i + 128;
N(D_802462C0_B4AA30)[91] = 0;
}
}
return ApiStatus_DONE2;
}
ApiStatus N(func_80241A98_CB07D8)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
s32 itemIdx = evt_get_variable(script, *args++);
s32 var1 = evt_get_variable(script, *args++);
s32 var2 = evt_get_variable(script, *args++);
s32 var3 = evt_get_variable(script, *args++);
ItemEntity* item = get_item_entity(itemIdx);
item->position.x = var1;
item->position.y = var2;
item->position.z = var3;
return ApiStatus_DONE2;
}
ApiStatus N(func_80241B5C_CB089C)(Evt* script, s32 isInitialCall) {
s32 itemId = evt_get_variable(script, *script->ptrReadPos);
ItemData* item = &gItemTable[itemId];
if (itemId == ITEM_YUMMY_MEAL) {
script->varTable[9] = 2;
} else if (item->typeFlags & 0x80) {
script->varTable[9] = 1;
} else {
script->varTable[9] = 0;
}
return ApiStatus_DONE2;
}
ApiStatus N(func_80241BCC_CB090C)(Evt* script, s32 isInitialCall) {
s32 i;
for (i = 0; i <= 90; i++) {
N(D_80246428)[i] = 128 + i;
}
N(D_8024659C) = 0;
return ApiStatus_DONE2;
}
#include "world/common/atomic/ItemChoice_FlowerGuard.inc.c"
#include "common/foliage.inc.c"

13
src/world/area_flo/flo_08/flo_08.h
View File

@ -10,16 +10,15 @@ ApiStatus N(AddPlayerHandsOffset)(Evt* script, s32 isInitialCall);
ApiStatus N(TransformFoliage)(Evt* script, s32 isInitialCall);
ApiStatus N(func_80240D40_CAFA80)(Evt* script, s32 isInitialCall);
ApiStatus N(func_8024150C_CB024C)(Evt* script, s32 isInitialCall);
ApiStatus N(func_80241970_CB06B0)(Evt* script, s32 isInitialCall);
ApiStatus N(func_802419C4_CB0704)(Evt* script, s32 isInitialCall);
ApiStatus N(func_802419FC_CB073C)(Evt* script, s32 isInitialCall);
ApiStatus N(func_80241A98_CB07D8)(Evt* script, s32 isInitialCall);
ApiStatus N(func_80241B5C_CB089C)(Evt* script, s32 isInitialCall);
ApiStatus N(func_80241BCC_CB090C)(Evt* script, s32 isInitialCall);
ApiStatus N(ItemChoice_WaitForSelection)(Evt* script, s32 isInitialCall);
ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall);
ApiStatus N(BuildItemChoiceList)(Evt* script, s32 isInitialCall);
ApiStatus N(FlowerGuard_SetItemEntityPosition)(Evt* script, s32 isInitialCall);
ApiStatus N(FlowerGuard_JudgeItemTastiness)(Evt* script, s32 isInitialCall);
ApiStatus N(FlowerGuard_MakeItemList)(Evt* script, s32 isInitialCall);
ApiStatus N(UnkFunc43)(Evt* script, s32 isInitialCall);
extern NpcGroupList N(npcGroupList_80244EC4);
extern EvtScript N(80245914);
extern EvtScript N(80245F5C);
extern EvtScript N(main);
extern s32 D_802462C0_B4AA30;

22
src/world/area_flo/flo_09/CB5320.c
View File

@ -1,23 +1,3 @@
#include "flo_09.h"
#include "world/common/UnkNpcAIFunc23.inc.c"
#include "world/common/UnkNpcAIFunc35.inc.c"
#include "world/common/UnkNpcAIFunc1_copy.inc.c"
#include "world/common/UnkFunc4.inc.c"
#include "world/common/UnkNpcAIFunc2.inc.c"
#include "world/common/SixFloatsFunc.inc.c"
#include "world/common/UnkNpcAIFunc14.inc.c"
#include "world/common/UnkNpcAIFunc3.inc.c"
#include "world/common/UnkFunc6.inc.c"
#include "world/common/UnkFunc5.inc.c"
#include "world/common/UnkNpcAIMainFunc9.inc.c"
#include "world/common/atomic/enemy/UnkAI_9.inc.c"

34
src/world/area_flo/flo_13/CC3850.c
View File

@ -1221,27 +1221,7 @@ NpcGroupList N(npcGroupList_80247984) = {
#include "world/common/UnkFunc41.inc.c"
#include "world/common/UnkNpcAIFunc23.inc.c"
#include "world/common/UnkNpcAIFunc35.inc.c"
#include "world/common/UnkNpcAIFunc1_copy.inc.c"
#include "world/common/UnkFunc4.inc.c"
#include "world/common/UnkNpcAIFunc2.inc.c"
#include "world/common/SixFloatsFunc.inc.c"
#include "world/common/UnkNpcAIFunc14.inc.c"
#include "world/common/UnkNpcAIFunc3.inc.c"
#include "world/common/UnkFunc6.inc.c"
#include "world/common/UnkFunc5.inc.c"
#include "world/common/UnkNpcAIMainFunc9.inc.c"
#include "world/common/atomic/enemy/UnkAI_9.inc.c"
s32 N(func_802416BC_CC4ECC)(void) {
s32 i;
@ -1520,17 +1500,7 @@ INCLUDE_ASM(ApiStatus, "world/area_flo/flo_13/CC3850", flo_13_func_80241DB8_CC55
s32 isInitialCall);
#endif
#include "world/common/set_script_owner_npc_anim.inc.c"
#include "world/common/UnkDistFunc.inc.c"
#include "world/common/UnkNpcAIFunc12.inc.c"
#include "world/common/set_script_owner_npc_col_height.inc.c"
#include "world/common/UnkNpcAIMainFunc5.inc.c"
#include "world/common/UnkNpcAIMainFunc6.inc.c"
#include "world/common/atomic/enemy/UnkAI_6.inc.c"
#include "world/common/UnkFunc42.inc.c"

87
src/world/area_flo/flo_14/CCBE20.c
View File

@ -7,7 +7,7 @@ enum {
NPC_BZZAP,
};
BSS s32 N(D_802453B0_EF79C0)[91];
BSS s32 N(ItemChoiceList)[91];
f32 N(sixFloats)[] = {
4.5f, 3.5f, 2.6f, 2.0f,
@ -60,11 +60,11 @@ NpcSettings N(npcSettings_802445D0) = {
.level = 99,
};
s32 N(D_802445FC_CCF90C) = {
s32 N(ItemChoice_HasSelectedItem) = {
0x00000000,
};
s32 N(D_80244600_CCF910) = {
s32 N(ItemChoice_SelectedItemID) = {
0x00000000,
};
@ -80,12 +80,12 @@ EvtScript N(80244604) = {
EVT_CALL(GetPlayerPos, EVT_VAR(3), EVT_VAR(4), EVT_VAR(5))
EVT_CALL(N(AddPlayerHandsOffset), EVT_VAR(3), EVT_VAR(4), EVT_VAR(5))
EVT_CALL(MakeItemEntity, EVT_VAR(0), EVT_VAR(3), EVT_VAR(4), EVT_VAR(5), 1, 0)
EVT_CALL(SetPlayerAnimation, 393221)
EVT_CALL(SetPlayerAnimation, ANIM_60005)
EVT_WAIT_FRAMES(30)
EVT_CALL(SetPlayerAnimation, ANIM_10002)
EVT_CALL(RemoveItemEntity, EVT_VAR(0))
EVT_END_SWITCH
EVT_CALL(N(func_80242288_CCD598), EVT_VAR(10))
EVT_CALL(N(ItemChoice_SaveSelected), EVT_VAR(10))
EVT_CALL(CloseChoicePopup)
EVT_UNBIND
EVT_RETURN
@ -93,16 +93,16 @@ EvtScript N(80244604) = {
};
EvtScript N(80244738) = {
EVT_CALL(N(func_802422C0_CCD5D0), EVT_VAR(0))
EVT_BIND_PADLOCK(N(80244604), 0x10, 0, EVT_PTR(N(D_802453B0_EF79C0)), 0, 1)
EVT_CALL(N(func_80242234_CCD544), EVT_VAR(0))
EVT_CALL(N(BuildItemChoiceList), EVT_VAR(0))
EVT_BIND_PADLOCK(N(80244604), 0x10, 0, EVT_PTR(N(ItemChoiceList)), 0, 1)
EVT_CALL(N(ItemChoice_WaitForSelection), EVT_VAR(0))
EVT_RETURN
EVT_END
};
s32 N(D_80244788_CCFA98)[] = {
0x000000A1, 0x00000000,
ITEM_BUBBLE_BERRY, ITEM_NONE
};
EvtScript N(interact_80244790) = {
@ -323,71 +323,8 @@ EvtScript N(80245224) = {
EVT_END
};
#include "world/common/UnkNpcAIFunc23.inc.c"
#include "world/common/atomic/enemy/UnkAI_9.inc.c"
#include "world/common/UnkNpcAIFunc35.inc.c"
#include "world/common/atomic/ItemChoice_PartA.inc.c"
#include "world/common/UnkNpcAIFunc1_copy.inc.c"
#include "world/common/UnkFunc4.inc.c"
#include "world/common/UnkNpcAIFunc2.inc.c"
#include "world/common/SixFloatsFunc.inc.c"
#include "world/common/UnkNpcAIFunc14.inc.c"
#include "world/common/UnkNpcAIFunc3.inc.c"
#include "world/common/UnkFunc6.inc.c"
#include "world/common/UnkFunc5.inc.c"
#include "world/common/UnkNpcAIMainFunc9.inc.c"
#include "world/common/GetNpcCollisionHeight.inc.c"
#include "world/common/AddPlayerHandsOffset.inc.c"
ApiStatus N(func_80242234_CCD544)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
if (isInitialCall) {
N(D_802445FC_CCF90C) = FALSE;
}
if (N(D_802445FC_CCF90C)) {
N(D_802445FC_CCF90C) = FALSE;
evt_set_variable(script, *args, N(D_80244600_CCF910));
return ApiStatus_DONE2;
}
return ApiStatus_BLOCK;
}
ApiStatus N(func_80242288_CCD598)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
N(D_80244600_CCF910) = evt_get_variable(script, *args);
N(D_802445FC_CCF90C) = TRUE;
return ApiStatus_DONE2;
}
ApiStatus N(func_802422C0_CCD5D0)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
s32* ptr = (s32*) evt_get_variable(script, *args);
s32 i;
if (ptr != NULL) {
for (i = 0; ptr[i] != 0; i++) {
N(D_802453B0_EF79C0)[i] = ptr[i];
}
N(D_802453B0_EF79C0)[i] = 0;
} else {
for (i = 0; i <= 90; i++) {
N(D_802453B0_EF79C0)[i] = i + 128;
N(D_802453B0_EF79C0)[91] = 0;
}
}
return ApiStatus_DONE2;
}
#include "world/common/atomic/MakeConsumableChoice.inc.c"

6
src/world/area_flo/flo_14/flo_14.h
View File

@ -18,9 +18,9 @@ ApiStatus N(func_8024046C_CCB77C)(Evt* script, s32 isInitialCall);
void N(func_80240504_CCB814)(void);
void N(func_802407D4_CCBAE4)(void);
ApiStatus N(UnkNpcAIMainFunc9)(Evt* script, s32 isInitialCall);
ApiStatus N(func_80242234_CCD544)(Evt* script, s32 isInitialCall);
ApiStatus N(func_80242288_CCD598)(Evt* script, s32 isInitialCall);
ApiStatus N(func_802422C0_CCD5D0)(Evt* script, s32 isInitialCall);
ApiStatus N(ItemChoice_WaitForSelection)(Evt* script, s32 isInitialCall);
ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall);
ApiStatus N(BuildItemChoiceList)(Evt* script, s32 isInitialCall);
extern NpcGroupList N(npcGroupList_80244F00);
extern EvtScript N(80243E78);

30
src/world/area_flo/flo_16/CD2C80.c
View File

@ -353,32 +353,6 @@ EvtScript N(802451C4) = {
EVT_END
};
#include "world/common/UnkNpcAIFunc23.inc.c"
#include "world/common/atomic/enemy/UnkAI_9.inc.c"
#include "world/common/UnkNpcAIFunc35.inc.c"
#include "world/common/UnkNpcAIFunc1_copy.inc.c"
#include "world/common/UnkFunc4.inc.c"
#include "world/common/UnkNpcAIFunc2.inc.c"
#include "world/common/SixFloatsFunc.inc.c"
#include "world/common/UnkNpcAIFunc14.inc.c"
#include "world/common/UnkNpcAIFunc3.inc.c"
#include "world/common/UnkFunc6.inc.c"
#include "world/common/UnkFunc5.inc.c"
#include "world/common/UnkNpcAIMainFunc9.inc.c"
#include "world/common/UnkNpcAIFunc13.inc.c"
#include "world/common/UnkNpcAIFunc34.inc.c"
#include "world/common/UnkFunc45.inc.c"
#include "world/common/UnkNpcAIMainFunc10.inc.c"
#include "world/common/atomic/enemy/UnkAI_10.inc.c"

34
src/world/area_flo/flo_17/CD7350.c
View File

@ -625,27 +625,7 @@ EvtScript N(makeEntities) = {
EVT_END
};
#include "world/common/UnkNpcAIFunc23.inc.c"
#include "world/common/UnkNpcAIFunc35.inc.c"
#include "world/common/UnkNpcAIFunc1_copy.inc.c"
#include "world/common/UnkFunc4.inc.c"
#include "world/common/UnkNpcAIFunc2.inc.c"
#include "world/common/SixFloatsFunc.inc.c"
#include "world/common/UnkNpcAIFunc14.inc.c"
#include "world/common/UnkNpcAIFunc3.inc.c"
#include "world/common/UnkFunc6.inc.c"
#include "world/common/UnkFunc5.inc.c"
#include "world/common/UnkNpcAIMainFunc9.inc.c"
#include "world/common/atomic/enemy/UnkAI_9.inc.c"
s32 N(func_80241568_CD8848)(void) {
s32 i;
@ -924,14 +904,4 @@ INCLUDE_ASM(ApiStatus, "world/area_flo/flo_17/CD7350", flo_17_func_80241C64_CD8F
s32 isInitialCall);
#endif
#include "world/common/set_script_owner_npc_anim.inc.c"
#include "world/common/UnkDistFunc.inc.c"
#include "world/common/UnkNpcAIFunc12.inc.c"
#include "world/common/set_script_owner_npc_col_height.inc.c"
#include "world/common/UnkNpcAIMainFunc5.inc.c"
#include "world/common/UnkNpcAIMainFunc6.inc.c"
#include "world/common/atomic/enemy/UnkAI_6.inc.c"

125
src/world/area_flo/flo_23/CEE2A0.c
View File

@ -10,10 +10,9 @@ enum {
NPC_GATE_FLOWER,
};
static s32 N(D_802426E0)[91];
static s32 N(ItemChoiceList)[91];
static s8 N(D_8024284C_pad)[4];
static s32 N(D_80242850)[91];
static s32 N(D_802429BC);
static s32 N(FlowerGuard_ItemChoiceList)[91];
EntryList N(entryList) = {
{ 470.0f, 0.0f, 0.0f, 270.0f },
@ -128,11 +127,11 @@ NpcSettings N(npcSettings_802412E0) = {
.level = 99,
};
s32 N(D_8024130C_CEF56C) = {
s32 N(ItemChoice_HasSelectedItem) = {
0x00000000,
};
s32 N(D_80241310_CEF570) = {
s32 N(ItemChoice_SelectedItemID) = {
0x00000000,
};
@ -153,7 +152,7 @@ EvtScript N(80241314) = {
EVT_CALL(SetPlayerAnimation, ANIM_10002)
EVT_CALL(RemoveItemEntity, EVT_VAR(0))
EVT_END_SWITCH
EVT_CALL(N(func_802402C0_CEE520), EVT_VAR(10))
EVT_CALL(N(ItemChoice_SaveSelected), EVT_VAR(10))
EVT_CALL(CloseChoicePopup)
EVT_UNBIND
EVT_RETURN
@ -161,9 +160,9 @@ EvtScript N(80241314) = {
};
EvtScript N(80241448) = {
EVT_CALL(N(func_802402F8_CEE558), EVT_VAR(0))
EVT_BIND_PADLOCK(N(80241314), 0x10, 0, EVT_PTR(N(D_802426E0)), 0, 1)
EVT_CALL(N(func_8024026C_CEE4CC), EVT_VAR(0))
EVT_CALL(N(BuildItemChoiceList), EVT_VAR(0))
EVT_BIND_PADLOCK(N(80241314), 0x10, 0, EVT_PTR(N(ItemChoiceList)), 0, 1)
EVT_CALL(N(ItemChoice_WaitForSelection), EVT_VAR(0))
EVT_RETURN
EVT_END
};
@ -213,8 +212,8 @@ EvtScript N(interact_80241564) = {
EVT_CALL(WaitForCam, 0, EVT_FIXED(1.0))
EVT_CALL(SpeakToPlayer, NPC_SELF, NPC_ANIM_gate_flower_Palette_00_Anim_2, NPC_ANIM_gate_flower_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x0049))
EVT_CALL(SetPlayerAnimation, ANIM_THINKING)
EVT_CALL(N(func_80240C9C_CEEEFC))
EVT_SET(EVT_VAR(0), EVT_PTR(N(D_80242850)))
EVT_CALL(N(FlowerGuard_MakeItemList))
EVT_SET(EVT_VAR(0), EVT_PTR(N(FlowerGuard_ItemChoiceList)))
EVT_SET(EVT_VAR(1), 2)
EVT_EXEC_WAIT(N(80241448))
EVT_SWITCH(EVT_VAR(0))
@ -223,7 +222,7 @@ EvtScript N(interact_80241564) = {
EVT_CALL(SpeakToPlayer, NPC_SELF, NPC_ANIM_gate_flower_Palette_00_Anim_2, NPC_ANIM_gate_flower_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x004A))
EVT_CASE_DEFAULT
EVT_SET(EVT_VAR(8), EVT_VAR(0))
EVT_CALL(N(func_80240C2C_CEEE8C), EVT_VAR(0))
EVT_CALL(N(FlowerGuard_JudgeItemTastiness), EVT_VAR(0))
EVT_CALL(MakeItemEntity, EVT_VAR(8), 385, 20, -34, 1, 0)
EVT_SET(EVT_VAR(7), EVT_VAR(0))
EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2095, 0)
@ -285,7 +284,7 @@ EvtScript N(interact_80241564) = {
EVT_ADDF(EVT_VAR(2), EVT_FIXED(380.0))
EVT_ADDF(EVT_VAR(3), EVT_FIXED(15.0))
EVT_ADDF(EVT_VAR(4), EVT_FIXED(-30.0))
EVT_CALL(N(func_80240B68_CEEDC8), EVT_VAR(7), EVT_VAR(2), EVT_VAR(3), EVT_VAR(4))
EVT_CALL(N(FlowerGuard_SetItemEntityPosition), EVT_VAR(7), EVT_VAR(2), EVT_VAR(3), EVT_VAR(4))
EVT_WAIT_FRAMES(1)
EVT_IF_NE(EVT_VAR(1), 1)
EVT_BREAK_LOOP
@ -304,7 +303,7 @@ EvtScript N(interact_80241564) = {
EVT_ADDF(EVT_VAR(2), EVT_FIXED(390.0))
EVT_ADDF(EVT_VAR(3), EVT_FIXED(15.0))
EVT_ADDF(EVT_VAR(4), EVT_FIXED(-30.0))
EVT_CALL(N(func_80240B68_CEEDC8), EVT_VAR(7), EVT_VAR(2), EVT_VAR(3), EVT_VAR(4))
EVT_CALL(N(FlowerGuard_SetItemEntityPosition), EVT_VAR(7), EVT_VAR(2), EVT_VAR(3), EVT_VAR(4))
EVT_WAIT_FRAMES(1)
EVT_IF_NE(EVT_VAR(1), 1)
EVT_BREAK_LOOP
@ -465,100 +464,10 @@ EvtScript N(makeEntities) = {
EVT_END
};
#include "world/common/GetNpcCollisionHeight.inc.c"
#include "world/common/atomic/ItemChoice_PartA.inc.c"
#include "world/common/AddPlayerHandsOffset.inc.c"
#include "world/common/atomic/MakeConsumableChoice.inc.c"
ApiStatus N(func_8024026C_CEE4CC)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
#include "world/common/atomic/enemy/UnkAI_5.inc.c"
if (isInitialCall) {
N(D_8024130C_CEF56C) = FALSE;
}
if (N(D_8024130C_CEF56C)) {
N(D_8024130C_CEF56C) = FALSE;
evt_set_variable(script, *args, N(D_80241310_CEF570));
return ApiStatus_DONE2;
}
return ApiStatus_BLOCK;
}
ApiStatus N(func_802402C0_CEE520)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
N(D_80241310_CEF570) = evt_get_variable(script, *args);
N(D_8024130C_CEF56C) = TRUE;
return ApiStatus_DONE2;
}
ApiStatus N(func_802402F8_CEE558)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
s32* ptr = (s32*) evt_get_variable(script, *args);
s32 i;
if (ptr != NULL) {
for (i = 0; ptr[i] != 0; i++) {
N(D_802426E0)[i] = ptr[i];
}
N(D_802426E0)[i] = 0;
} else {
for (i = 0; i <= 90; i++) {
N(D_802426E0)[i] = i + 128;
N(D_802426E0)[91] = 0;
}
}
return ApiStatus_DONE2;
}
#include "world/common/set_script_owner_npc_anim.inc.c"
#include "world/common/UnkDistFunc.inc.c"
#include "world/common/UnkNpcAIFunc12.inc.c"
#include "world/common/set_script_owner_npc_col_height.inc.c"
#include "world/common/UnkNpcAIMainFunc5.inc.c"
ApiStatus N(func_80240B68_CEEDC8)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
s32 itemIdx = evt_get_variable(script, *args++);
s32 var1 = evt_get_variable(script, *args++);
s32 var2 = evt_get_variable(script, *args++);
s32 var3 = evt_get_variable(script, *args++);
ItemEntity* item = get_item_entity(itemIdx);
item->position.x = var1;
item->position.y = var2;
item->position.z = var3;
return ApiStatus_DONE2;
}
ApiStatus N(func_80240C2C_CEEE8C)(Evt* script, s32 isInitialCall) {
s32 itemId = evt_get_variable(script, *script->ptrReadPos);
ItemData* item = &gItemTable[itemId];
if (itemId == ITEM_YUMMY_MEAL) {
script->varTable[9] = 2;
} else if (item->typeFlags & 0x80) {
script->varTable[9] = 1;
} else {
script->varTable[9] = 0;
}
return ApiStatus_DONE2;
}
ApiStatus N(func_80240C9C_CEEEFC)(Evt* script, s32 isInitialCall) {
s32 i;
for (i = 0; i <= 90; i++) {
N(D_80242850)[i] = 128 + i;
}
N(D_802429BC) = 0;
return ApiStatus_DONE2;
}
#include "world/common/atomic/ItemChoice_FlowerGuard.inc.c"

12
src/world/area_flo/flo_23/flo_23.h
View File

@ -10,13 +10,13 @@ extern s32 D_802EA0C4;
ApiStatus N(AddPlayerHandsOffset)(Evt* script, s32 isInitialCall);
ApiStatus N(func_80240000_CEE260)(Evt* script, s32 isInitialCall);
ApiStatus N(func_8024026C_CEE4CC)(Evt* script, s32 isInitialCall);
ApiStatus N(func_802402C0_CEE520)(Evt* script, s32 isInitialCall);
ApiStatus N(func_802402F8_CEE558)(Evt* script, s32 isInitialCall);
ApiStatus N(ItemChoice_WaitForSelection)(Evt* script, s32 isInitialCall);
ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall);
ApiStatus N(BuildItemChoiceList)(Evt* script, s32 isInitialCall);
ApiStatus N(UnkNpcAIMainFunc5)(Evt* script, s32 isInitialCall);
ApiStatus N(func_80240B68_CEEDC8)(Evt* script, s32 isInitialCall);
ApiStatus N(func_80240C2C_CEEE8C)(Evt* script, s32 isInitialCall);
ApiStatus N(func_80240C9C_CEEEFC)(Evt* script, s32 isInitialCall);
ApiStatus N(FlowerGuard_SetItemEntityPosition)(Evt* script, s32 isInitialCall);
ApiStatus N(FlowerGuard_JudgeItemTastiness)(Evt* script, s32 isInitialCall);
ApiStatus N(FlowerGuard_MakeItemList)(Evt* script, s32 isInitialCall);
extern NpcGroupList N(npcGroupList_80242568);
extern EvtScript N(main);

145
src/world/area_flo/flo_25/CF2C10.c
View File

@ -10,10 +10,9 @@ enum {
NPC_BZZAP,
};
static s32 N(D_80244A20)[91];
static s32 N(ItemChoiceList)[91];
static s8 N(D_8024510C_pad)[4];
static s32 N(D_80245110)[91];
static s32 N(D_8024527C);
static s32 N(FlowerGuard_ItemChoiceList)[91];
EntryList N(entryList) = {
{ 620.0f, 0.0f, 0.0f, 270.0f },
@ -197,11 +196,11 @@ NpcSettings N(npcSettings_80242AA0) = {
.level = 19,
};
s32 N(D_80242ACC_CF569C) = {
s32 N(ItemChoice_HasSelectedItem) = {
0x00000000,
};
s32 N(D_80242AD0_CF56A0) = {
s32 N(ItemChoice_SelectedItemID) = {
0x00000000,
};
@ -222,7 +221,7 @@ EvtScript N(80242AD4) = {
EVT_CALL(SetPlayerAnimation, ANIM_10002)
EVT_CALL(RemoveItemEntity, EVT_VAR(0))
EVT_END_SWITCH
EVT_CALL(N(func_80241DAC_CF497C), EVT_VAR(10))
EVT_CALL(N(ItemChoice_SaveSelected), EVT_VAR(10))
EVT_CALL(CloseChoicePopup)
EVT_UNBIND
EVT_RETURN
@ -230,9 +229,9 @@ EvtScript N(80242AD4) = {
};
EvtScript N(80242C08) = {
EVT_CALL(N(func_80241DE4_CF49B4), EVT_VAR(0))
EVT_BIND_PADLOCK(N(80242AD4), 0x10, 0, EVT_PTR(N(D_80244A20)), 0, 1)
EVT_CALL(N(func_80241D58_CF4928), EVT_VAR(0))
EVT_CALL(N(BuildItemChoiceList), EVT_VAR(0))
EVT_BIND_PADLOCK(N(80242AD4), 0x10, 0, EVT_PTR(N(ItemChoiceList)), 0, 1)
EVT_CALL(N(ItemChoice_WaitForSelection), EVT_VAR(0))
EVT_RETURN
EVT_END
};
@ -250,8 +249,8 @@ EvtScript N(interact_80242C58) = {
EVT_CALL(WaitForCam, 0, EVT_FIXED(1.0))
EVT_CALL(SpeakToPlayer, NPC_SELF, NPC_ANIM_gate_flower_Palette_01_Anim_2, NPC_ANIM_gate_flower_Palette_01_Anim_1, 0, MESSAGE_ID(0x11, 0x003B))
EVT_CALL(SetPlayerAnimation, ANIM_THINKING)
EVT_CALL(N(func_80241FB4_CF4B84))
EVT_SET(EVT_VAR(0), EVT_PTR(N(D_80245110)))
EVT_CALL(N(FlowerGuard_MakeItemList))
EVT_SET(EVT_VAR(0), EVT_PTR(N(FlowerGuard_ItemChoiceList)))
EVT_SET(EVT_VAR(1), 0)
EVT_EXEC_WAIT(N(80242C08))
EVT_SWITCH(EVT_VAR(0))
@ -260,7 +259,7 @@ EvtScript N(interact_80242C58) = {
EVT_CALL(SpeakToPlayer, NPC_SELF, NPC_ANIM_gate_flower_Palette_01_Anim_2, NPC_ANIM_gate_flower_Palette_01_Anim_1, 0, MESSAGE_ID(0x11, 0x003C))
EVT_CASE_DEFAULT
EVT_SET(EVT_VAR(8), EVT_VAR(0))
EVT_CALL(N(func_80241F44_CF4B14), EVT_VAR(0))
EVT_CALL(N(FlowerGuard_JudgeItemTastiness), EVT_VAR(0))
EVT_CALL(MakeItemEntity, EVT_VAR(8), 505, 20, -24, 1, 0)
EVT_SET(EVT_VAR(7), EVT_VAR(0))
EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2095, 0)
@ -322,7 +321,7 @@ EvtScript N(interact_80242C58) = {
EVT_ADDF(EVT_VAR(2), EVT_FIXED(500.0))
EVT_ADDF(EVT_VAR(3), EVT_FIXED(15.0))
EVT_ADDF(EVT_VAR(4), EVT_FIXED(-20.0))
EVT_CALL(N(func_80241E80_CF4A50), EVT_VAR(7), EVT_VAR(2), EVT_VAR(3), EVT_VAR(4))
EVT_CALL(N(FlowerGuard_SetItemEntityPosition), EVT_VAR(7), EVT_VAR(2), EVT_VAR(3), EVT_VAR(4))
EVT_WAIT_FRAMES(1)
EVT_IF_NE(EVT_VAR(1), 1)
EVT_BREAK_LOOP
@ -341,7 +340,7 @@ EvtScript N(interact_80242C58) = {
EVT_ADDF(EVT_VAR(2), EVT_FIXED(510.0))
EVT_ADDF(EVT_VAR(3), EVT_FIXED(15.0))
EVT_ADDF(EVT_VAR(4), EVT_FIXED(-20.0))
EVT_CALL(N(func_80241E80_CF4A50), EVT_VAR(7), EVT_VAR(2), EVT_VAR(3), EVT_VAR(4))
EVT_CALL(N(FlowerGuard_SetItemEntityPosition), EVT_VAR(7), EVT_VAR(2), EVT_VAR(3), EVT_VAR(4))
EVT_WAIT_FRAMES(1)
EVT_IF_NE(EVT_VAR(1), 1)
EVT_BREAK_LOOP
@ -514,120 +513,12 @@ static s32 N(pad_3CD8)[] = {
0x00000000, 0x00000000,
};
#include "world/common/UnkNpcAIFunc23.inc.c"
#include "world/common/atomic/enemy/UnkAI_9.inc.c"
#include "world/common/UnkNpcAIFunc35.inc.c"
#include "world/common/atomic/enemy/UnkAI_10.inc.c"
#include "world/common/UnkNpcAIFunc1_copy.inc.c"
#include "world/common/atomic/ItemChoice_PartA.inc.c"
#include "world/common/UnkFunc4.inc.c"
#include "world/common/atomic/MakeConsumableChoice.inc.c"
#include "world/common/UnkNpcAIFunc2.inc.c"
#include "world/common/SixFloatsFunc.inc.c"
#include "world/common/UnkNpcAIFunc14.inc.c"
#include "world/common/UnkNpcAIFunc3.inc.c"
#include "world/common/UnkFunc6.inc.c"
#include "world/common/UnkFunc5.inc.c"
#include "world/common/UnkNpcAIMainFunc9.inc.c"
#include "world/common/UnkNpcAIFunc13.inc.c"
#include "world/common/UnkNpcAIFunc34.inc.c"
#include "world/common/UnkFunc45.inc.c"
#include "world/common/UnkNpcAIMainFunc10.inc.c"
#include "world/common/GetNpcCollisionHeight.inc.c"
#include "world/common/AddPlayerHandsOffset.inc.c"
ApiStatus N(func_80241D58_CF4928)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
if (isInitialCall) {
N(D_80242ACC_CF569C) = FALSE;
}
if (N(D_80242ACC_CF569C)) {
N(D_80242ACC_CF569C) = FALSE;
evt_set_variable(script, *args, N(D_80242AD0_CF56A0));
return ApiStatus_DONE2;
}
return ApiStatus_BLOCK;
}
ApiStatus N(func_80241DAC_CF497C)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
N(D_80242AD0_CF56A0) = evt_get_variable(script, *args);
N(D_80242ACC_CF569C) = TRUE;
return ApiStatus_DONE2;
}
ApiStatus N(func_80241DE4_CF49B4)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
s32* ptr = (s32*) evt_get_variable(script, *args);
s32 i;
if (ptr != NULL) {
for (i = 0; ptr[i] != 0; i++) {
N(D_80244A20)[i] = ptr[i];
}
N(D_80244A20)[i] = 0;
} else {
for (i = 0; i <= 90; i++) {
N(D_80244A20)[i] = i + 128;
N(D_80244A20)[91] = 0;
}
}
return ApiStatus_DONE2;
}
ApiStatus N(func_80241E80_CF4A50)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
s32 itemIdx = evt_get_variable(script, *args++);
s32 var1 = evt_get_variable(script, *args++);
s32 var2 = evt_get_variable(script, *args++);
s32 var3 = evt_get_variable(script, *args++);
ItemEntity* item = get_item_entity(itemIdx);
item->position.x = var1;
item->position.y = var2;
item->position.z = var3;
return ApiStatus_DONE2;
}
ApiStatus N(func_80241F44_CF4B14)(Evt* script, s32 isInitialCall) {
s32 itemId = evt_get_variable(script, *script->ptrReadPos);
ItemData* item = &gItemTable[itemId];
if (itemId == ITEM_YUMMY_MEAL) {
script->varTable[9] = 2;
} else if (item->typeFlags & 0x80) {
script->varTable[9] = 1;
} else {
script->varTable[9] = 0;
}
return ApiStatus_DONE2;
}
ApiStatus N(func_80241FB4_CF4B84)(Evt* script, s32 isInitialCall) {
s32 i;
for (i = 0; i <= 90; i++) {
N(D_80245110)[i] = 128 + i;
}
N(D_8024527C) = 0;
return ApiStatus_DONE2;
}
#include "world/common/atomic/ItemChoice_FlowerGuard.inc.c"

12
src/world/area_flo/flo_25/flo_25.h
View File

@ -12,12 +12,12 @@ ApiStatus N(UnkFunc43)(Evt* script, s32 isInitialCall);
ApiStatus N(func_80240000_CF2BD0)(Evt* script, s32 isInitialCall);
ApiStatus N(UnkNpcAIMainFunc9)(Evt* script, s32 isInitialCall);
ApiStatus N(UnkNpcAIMainFunc10)(Evt* script, s32 isInitialCall);
ApiStatus N(func_80241D58_CF4928)(Evt* script, s32 isInitialCall);
ApiStatus N(func_80241DAC_CF497C)(Evt* script, s32 isInitialCall);
ApiStatus N(func_80241DE4_CF49B4)(Evt* script, s32 isInitialCall);
ApiStatus N(func_80241E80_CF4A50)(Evt* script, s32 isInitialCall);
ApiStatus N(func_80241F44_CF4B14)(Evt* script, s32 isInitialCall);
ApiStatus N(func_80241FB4_CF4B84)(Evt* script, s32 isInitialCall);
ApiStatus N(ItemChoice_WaitForSelection)(Evt* script, s32 isInitialCall);
ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall);
ApiStatus N(BuildItemChoiceList)(Evt* script, s32 isInitialCall);
ApiStatus N(FlowerGuard_SetItemEntityPosition)(Evt* script, s32 isInitialCall);
ApiStatus N(FlowerGuard_JudgeItemTastiness)(Evt* script, s32 isInitialCall);
ApiStatus N(FlowerGuard_MakeItemList)(Evt* script, s32 isInitialCall);
extern NpcGroupList N(npcGroupList_80243C5C);
extern EvtScript N(802446BC);

31
src/world/area_hos/hos_02/A17210.c
View File

@ -1,32 +1,5 @@
#include "hos_02.h"
#include "world/common/UnkNpcAIFunc23.inc.c"
#include "world/common/atomic/enemy/UnkAI_9.inc.c"
#include "world/common/UnkNpcAIFunc35.inc.c"
#include "world/common/UnkNpcAIFunc1_copy.inc.c"
#include "world/common/UnkFunc4.inc.c"
#include "world/common/UnkNpcAIFunc2.inc.c"
#include "world/common/SixFloatsFunc.inc.c"
#include "world/common/UnkNpcAIFunc14.inc.c"
#include "world/common/UnkNpcAIFunc3.inc.c"
#include "world/common/UnkFunc6.inc.c"
#include "world/common/UnkFunc5.inc.c"
#include "world/common/UnkNpcAIMainFunc9.inc.c"
#include "world/common/UnkNpcAIFunc13.inc.c"
INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_80242618_A18838);
//#include "world/common/UnkNpcAIFunc34.inc.c"
#include "world/common/UnkFunc45.inc.c"
#include "world/common/UnkNpcAIMainFunc10.inc.c"
#include "world/common/atomic/enemy/UnkAI_10.inc.c"

22
src/world/area_hos/hos_03/A1BDB0.c
View File

@ -2,27 +2,7 @@
#define CHUCK_QUIZMO_NPC_ID 7
#include "world/common/UnkNpcAIFunc23.inc.c"
#include "world/common/UnkNpcAIFunc35.inc.c"
#include "world/common/UnkNpcAIFunc1_copy.inc.c"
#include "world/common/UnkFunc4.inc.c"
#include "world/common/UnkNpcAIFunc2.inc.c"
#include "world/common/SixFloatsFunc.inc.c"
#include "world/common/UnkNpcAIFunc14.inc.c"
#include "world/common/UnkNpcAIFunc3.inc.c"
#include "world/common/UnkFunc6.inc.c"
#include "world/common/UnkFunc5.inc.c"
#include "world/common/UnkNpcAIMainFunc9.inc.c"
#include "world/common/atomic/enemy/UnkAI_9.inc.c"
#include "world/common/atomic/ToadHouse.inc.c"

10
src/world/area_isk/isk_04/97B670.c
View File

@ -1,14 +1,6 @@
#include "isk_04.h"
#include "world/common/set_script_owner_npc_anim.inc.c"
#include "world/common/UnkDistFunc.inc.c"
#include "world/common/UnkNpcAIFunc12.inc.c"
#include "world/common/set_script_owner_npc_col_height.inc.c"
#include "world/common/UnkNpcAIMainFunc5.inc.c"
#include "world/common/atomic/enemy/UnkAI_5.inc.c"
#include "world/common/AwaitPlayerNearNpc.inc.c"

20
src/world/area_isk/isk_05/97DAD0.c
View File

@ -3,25 +3,7 @@
static char* N(exit_str_0) = "isk_04";
static char* N(exit_str_1) = "";
#include "world/common/UnkNpcAIFunc36.inc.c"
#include "world/common/UnkNpcAIFunc37.inc.c"
#include "world/common/UnkNpcAIFunc1.inc.c"
#include "world/common/UnkNpcAIFunc38.inc.c"
#include "world/common/UnkNpcAIFunc15.inc.c"
#include "world/common/UnkNpcAIFunc39.inc.c"
#include "world/common/UnkDurationCheck.inc.c"
#include "world/common/UnkNpcAIMainFunc2.inc.c"
#include "world/common/UnkNpcAIFunc40.inc.c"
#include "world/common/UnkNpcAIMainFunc3.inc.c"
#include "world/common/atomic/enemy/UnkAI_3.inc.c"
#include "world/common/UnkFunc53.inc.c"

10
src/world/area_isk/isk_08/984E30.c
View File

@ -5,14 +5,6 @@ static char* N(exit_str_1) = "isk_10";
static char* N(exit_str_2) = "isk_07";
static char* N(exit_str_3) = "isk_11";
#include "world/common/set_script_owner_npc_anim.inc.c"
#include "world/common/UnkDistFunc.inc.c"
#include "world/common/UnkNpcAIFunc12.inc.c"
#include "world/common/set_script_owner_npc_col_height.inc.c"
#include "world/common/UnkNpcAIMainFunc5.inc.c"
#include "world/common/atomic/enemy/UnkAI_5.inc.c"
#include "world/common/AwaitPlayerNearNpc.inc.c"

20
src/world/area_isk/isk_13/98F7E0.c
View File

@ -3,25 +3,7 @@
static char* N(exit_str_0) = "isk_12";
static char* N(exit_str_1) = "";
#include "world/common/UnkNpcAIFunc36.inc.c"
#include "world/common/UnkNpcAIFunc37.inc.c"
#include "world/common/UnkNpcAIFunc1.inc.c"
#include "world/common/UnkNpcAIFunc38.inc.c"
#include "world/common/UnkNpcAIFunc15.inc.c"
#include "world/common/UnkNpcAIFunc39.inc.c"
#include "world/common/UnkDurationCheck.inc.c"
#include "world/common/UnkNpcAIMainFunc2.inc.c"
#include "world/common/UnkNpcAIFunc40.inc.c"
#include "world/common/UnkNpcAIMainFunc3.inc.c"
#include "world/common/atomic/enemy/UnkAI_3.inc.c"
#include "world/common/UnkFunc53.inc.c"

20
src/world/area_isk/isk_14/992730.c
View File

@ -3,25 +3,7 @@
static char* N(exit_str_0) = "isk_10";
static char* N(exit_str_1) = "";
#include "world/common/UnkNpcAIFunc36.inc.c"
#include "world/common/UnkNpcAIFunc37.inc.c"
#include "world/common/UnkNpcAIFunc1.inc.c"
#include "world/common/UnkNpcAIFunc38.inc.c"
#include "world/common/UnkNpcAIFunc15.inc.c"
#include "world/common/UnkNpcAIFunc39.inc.c"
#include "world/common/UnkDurationCheck.inc.c"
#include "world/common/UnkNpcAIMainFunc2.inc.c"
#include "world/common/UnkNpcAIFunc40.inc.c"
#include "world/common/UnkNpcAIMainFunc3.inc.c"
#include "world/common/atomic/enemy/UnkAI_3.inc.c"
#include "world/common/UnkFunc53.inc.c"

10
src/world/area_isk/isk_18/997F70.c
View File

@ -3,14 +3,6 @@
static char* N(exit_str_0) = "isk_10";
static char* N(exit_str_1) = "isk_12";
#include "world/common/set_script_owner_npc_anim.inc.c"
#include "world/common/UnkDistFunc.inc.c"
#include "world/common/UnkNpcAIFunc12.inc.c"
#include "world/common/set_script_owner_npc_col_height.inc.c"
#include "world/common/UnkNpcAIMainFunc5.inc.c"
#include "world/common/atomic/enemy/UnkAI_5.inc.c"
#include "world/common/AwaitPlayerNearNpc.inc.c"

16
src/world/area_jan/jan_01/B28030.c
View File

@ -7,21 +7,7 @@ static char* N(exit_str_1) = "jan_02";
INCLUDE_ASM(s32, "world/area_jan/jan_01/B28030", func_8024030C_B2833C);
#include "world/common/UnkNpcAIFunc36.inc.c"
#include "world/common/UnkNpcAIFunc37.inc.c"
#include "world/common/UnkNpcAIFunc1.inc.c"
#include "world/common/UnkNpcAIFunc38.inc.c"
#include "world/common/UnkNpcAIFunc15.inc.c"
#include "world/common/UnkNpcAIFunc39.inc.c"
#include "world/common/UnkDurationCheck.inc.c"
#include "world/common/UnkNpcAIMainFunc2.inc.c"
#include "world/common/atomic/enemy/UnkAI_2.inc.c"
#include "world/common/SetCamera0Flag1000.inc.c"

24
src/world/area_jan/jan_02/B2C8A0.c
View File

@ -2,29 +2,7 @@
#define CHUCK_QUIZMO_NPC_ID 5
#include "world/common/UnkNpcAIFunc24.inc.c"
#include "world/common/UnkFunc13.inc.c"
#include "world/common/UnkNpcAIFunc1.inc.c"
#include "world/common/UnkFunc14.inc.c"
#include "world/common/UnkNpcAIFunc25.inc.c"
#include "world/common/NpcJumpFunc2.inc.c"
#include "world/common/NpcJumpFunc.inc.c"
#include "world/common/UnkNpcAIFunc13.inc.c"
#include "world/common/UnkFunc15.inc.c"
#include "world/common/UnkNpcDurationFlagFunc.inc.c"
#include "world/common/UnkFunc16.inc.c"
#include "world/common/UnkNpcAIMainFunc.inc.c"
#include "world/common/atomic/enemy/UnkAI_1.inc.c"
#include "world/common/GetNpcCollisionHeight.inc.c"

24
src/world/area_jan/jan_03/B34BD0.c
View File

@ -13,29 +13,7 @@ static char* N(exit_str_3) = "";
INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802405EC_B351BC);
#include "world/common/UnkNpcAIFunc24.inc.c"
#include "world/common/UnkFunc13.inc.c"
#include "world/common/UnkNpcAIFunc1.inc.c"
#include "world/common/UnkFunc14.inc.c"
#include "world/common/UnkNpcAIFunc25.inc.c"
#include "world/common/NpcJumpFunc2.inc.c"
#include "world/common/NpcJumpFunc.inc.c"
#include "world/common/UnkNpcAIFunc13.inc.c"
#include "world/common/UnkFunc15.inc.c"
#include "world/common/UnkNpcDurationFlagFunc.inc.c"
#include "world/common/UnkFunc16.inc.c"
#include "world/common/UnkNpcAIMainFunc.inc.c"
#include "world/common/atomic/enemy/UnkAI_1.inc.c"
static char* N(exit_str_4) = "tik_08";

16
src/world/area_jan/jan_05/B4B260.c
View File

@ -2,21 +2,7 @@
INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_802407F0_B4B260);
#include "world/common/UnkNpcAIFunc36.inc.c"
#include "world/common/UnkNpcAIFunc37.inc.c"
#include "world/common/UnkNpcAIFunc1.inc.c"
#include "world/common/UnkNpcAIFunc38.inc.c"
#include "world/common/UnkNpcAIFunc15.inc.c"
#include "world/common/UnkNpcAIFunc39.inc.c"
#include "world/common/UnkDurationCheck.inc.c"
#include "world/common/UnkNpcAIMainFunc2.inc.c"
#include "world/common/atomic/enemy/UnkAI_2.inc.c"
#include "world/common/atomic/enemy/SpearGuy.inc.c"

16
src/world/area_jan/jan_06/B52F70.c
View File

@ -1,20 +1,6 @@
#include "jan_06.h"
#include "world/common/UnkNpcAIFunc36.inc.c"
#include "world/common/UnkNpcAIFunc37.inc.c"
#include "world/common/UnkNpcAIFunc1.inc.c"
#include "world/common/UnkNpcAIFunc38.inc.c"
#include "world/common/UnkNpcAIFunc15.inc.c"
#include "world/common/UnkNpcAIFunc39.inc.c"
#include "world/common/UnkDurationCheck.inc.c"
#include "world/common/UnkNpcAIMainFunc2.inc.c"
#include "world/common/atomic/enemy/UnkAI_2.inc.c"
INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_80241554_B53D84);

16
src/world/area_jan/jan_10/B6C6A0.c
View File

@ -1,17 +1,3 @@
#include "jan_10.h"
#include "world/common/UnkNpcAIFunc36.inc.c"
#include "world/common/UnkNpcAIFunc37.inc.c"
#include "world/common/UnkNpcAIFunc1.inc.c"
#include "world/common/UnkNpcAIFunc38.inc.c"
#include "world/common/UnkNpcAIFunc15.inc.c"
#include "world/common/UnkNpcAIFunc39.inc.c"
#include "world/common/UnkDurationCheck.inc.c"
#include "world/common/UnkNpcAIMainFunc2.inc.c"
#include "world/common/atomic/enemy/UnkAI_2.inc.c"

16
src/world/area_jan/jan_14/B7A510.c
View File

@ -1,17 +1,3 @@
#include "jan_14.h"
#include "world/common/UnkNpcAIFunc36.inc.c"
#include "world/common/UnkNpcAIFunc37.inc.c"
#include "world/common/UnkNpcAIFunc1.inc.c"
#include "world/common/UnkNpcAIFunc38.inc.c"
#include "world/common/UnkNpcAIFunc15.inc.c"
#include "world/common/UnkNpcAIFunc39.inc.c"
#include "world/common/UnkDurationCheck.inc.c"
#include "world/common/UnkNpcAIMainFunc2.inc.c"
#include "world/common/atomic/enemy/UnkAI_2.inc.c"

24
src/world/area_jan/jan_22/B84180.c
View File

@ -5,29 +5,7 @@ static char* N(exit_str_1) = "jan_16";
static char* N(exit_str_2) = "kzn_01";
static char* N(exit_str_3) = "";
#include "world/common/UnkNpcAIFunc24.inc.c"
#include "world/common/UnkFunc13.inc.c"
#include "world/common/UnkNpcAIFunc1.inc.c"
#include "world/common/UnkFunc14.inc.c"
#include "world/common/UnkNpcAIFunc25.inc.c"
#include "world/common/NpcJumpFunc2.inc.c"
#include "world/common/NpcJumpFunc.inc.c"
#include "world/common/UnkNpcAIFunc13.inc.c"
#include "world/common/UnkFunc15.inc.c"
#include "world/common/UnkNpcDurationFlagFunc.inc.c"
#include "world/common/UnkFunc16.inc.c"
#include "world/common/UnkNpcAIMainFunc.inc.c"
#include "world/common/atomic/enemy/UnkAI_1.inc.c"
#include "world/common/StashVars.inc.c"

24
src/world/area_kkj/kkj_00/ABB340.c
View File

@ -1,28 +1,6 @@
#include "kkj_00.h"
#include "world/common/UnkNpcAIFunc24.inc.c"
#include "world/common/UnkFunc13.inc.c"
#include "world/common/UnkNpcAIFunc1.inc.c"
#include "world/common/UnkFunc14.inc.c"
#include "world/common/UnkNpcAIFunc25.inc.c"
#include "world/common/NpcJumpFunc2.inc.c"
#include "world/common/NpcJumpFunc.inc.c"
#include "world/common/UnkNpcAIFunc13.inc.c"
#include "world/common/UnkFunc15.inc.c"
#include "world/common/UnkNpcDurationFlagFunc.inc.c"
#include "world/common/UnkFunc16.inc.c"
#include "world/common/UnkNpcAIMainFunc.inc.c"
#include "world/common/atomic/enemy/UnkAI_1.inc.c"
static char* N(exit_str) = "end_00";

24
src/world/area_kkj/kkj_01/AC5170.c
View File

@ -5,26 +5,4 @@ static char* N(exit_str_1) = "kkj_02";
static char* N(exit_str_2) = "kkj_14";
static char* N(exit_str_3) = "";
#include "world/common/UnkNpcAIFunc24.inc.c"
#include "world/common/UnkFunc13.inc.c"
#include "world/common/UnkNpcAIFunc1.inc.c"
#include "world/common/UnkFunc14.inc.c"
#include "world/common/UnkNpcAIFunc25.inc.c"
#include "world/common/NpcJumpFunc2.inc.c"
#include "world/common/NpcJumpFunc.inc.c"
#include "world/common/UnkNpcAIFunc13.inc.c"
#include "world/common/UnkFunc15.inc.c"
#include "world/common/UnkNpcDurationFlagFunc.inc.c"
#include "world/common/UnkFunc16.inc.c"
#include "world/common/UnkNpcAIMainFunc.inc.c"
#include "world/common/atomic/enemy/UnkAI_1.inc.c"

20
src/world/area_kmr/kmr_02/8B0070.c
View File

@ -22,25 +22,7 @@ extern EffectInstance* N(Quizmo_VannaTEffect);
#include "world/common/atomic/Quizmo.inc.c"
#include "world/common/UnkNpcAIFunc43.inc.c"
#include "world/common/UnkNpcAIFunc44.inc.c"
#include "world/common/NpcJumpFunc3.inc.c"
#include "world/common/NpcJumpFunc.inc.c"
#include "world/common/UnkNpcAIFunc13_2.inc.c"
#include "world/common/UnkNpcAIFunc11.inc.c"
#include "world/common/UnkNpcAIFunc10.inc.c"
#include "world/common/UnkNpcAIFunc42.inc.c"
#include "world/common/UnkNpcAIFunc45.inc.c"
#include "world/common/UnkNpcAIMainFunc4.inc.c"
#include "world/common/atomic/enemy/UnkAI_4.inc.c"
static char* N(exit_str_4) = "nok_02";
static char* N(exit_str_5) = "kmr_03";

22
src/world/area_kmr/kmr_05/8CE070.c
View File

@ -3,24 +3,4 @@
static char* N(exit_str_0) = "kmr_03";
static char* N(exit_str_1) = "kmr_02";
#include "world/common/UnkNpcAIFunc23.inc.c"
#include "world/common/UnkNpcAIFunc35.inc.c"
#include "world/common/UnkNpcAIFunc1_copy.inc.c"
#include "world/common/UnkFunc4.inc.c"
#include "world/common/UnkNpcAIFunc2.inc.c"
#include "world/common/SixFloatsFunc.inc.c"
#include "world/common/UnkNpcAIFunc14.inc.c"
#include "world/common/UnkNpcAIFunc3.inc.c"
#include "world/common/UnkFunc6.inc.c"
#include "world/common/UnkFunc5.inc.c"
#include "world/common/UnkNpcAIMainFunc9.inc.c"
#include "world/common/atomic/enemy/UnkAI_9.inc.c"

22
src/world/area_kmr/kmr_06/8D1510.c
View File

@ -3,24 +3,4 @@
static char* N(exit_str_0) = "kmr_09";
static char* N(exit_str_1) = "kmr_07";
#include "world/common/UnkNpcAIFunc23.inc.c"
#include "world/common/UnkNpcAIFunc35.inc.c"
#include "world/common/UnkNpcAIFunc1_copy.inc.c"
#include "world/common/UnkFunc4.inc.c"
#include "world/common/UnkNpcAIFunc2.inc.c"
#include "world/common/SixFloatsFunc.inc.c"
#include "world/common/UnkNpcAIFunc14.inc.c"
#include "world/common/UnkNpcAIFunc3.inc.c"
#include "world/common/UnkFunc6.inc.c"
#include "world/common/UnkFunc5.inc.c"
#include "world/common/UnkNpcAIMainFunc9.inc.c"
#include "world/common/atomic/enemy/UnkAI_9.inc.c"

20
src/world/area_kmr/kmr_07/8D3DC0.c
View File

@ -3,25 +3,7 @@
static char* N(exit_str_0) = "kmr_06";
static char* N(exit_str_1) = "kmr_12";
#include "world/common/UnkNpcAIFunc43.inc.c"
#include "world/common/UnkNpcAIFunc44.inc.c"
#include "world/common/NpcJumpFunc3.inc.c"
#include "world/common/NpcJumpFunc.inc.c"
#include "world/common/UnkNpcAIFunc13_2.inc.c"
#include "world/common/UnkNpcAIFunc11.inc.c"
#include "world/common/UnkNpcAIFunc10.inc.c"
#include "world/common/UnkNpcAIFunc42.inc.c"
#include "world/common/UnkNpcAIFunc45.inc.c"
#include "world/common/UnkNpcAIMainFunc4.inc.c"
#include "world/common/atomic/enemy/UnkAI_4.inc.c"
// see func_802402BC_8D878C
#ifdef NON_MATCHING

22
src/world/area_kmr/kmr_09/8D5E00.c
View File

@ -3,27 +3,7 @@
static char* N(exit_str_0) = "kmr_02";
static char* N(exit_str_1) = "kmr_06";
#include "world/common/UnkNpcAIFunc23.inc.c"
#include "world/common/UnkNpcAIFunc35.inc.c"
#include "world/common/UnkNpcAIFunc1_copy.inc.c"
#include "world/common/UnkFunc4.inc.c"
#include "world/common/UnkNpcAIFunc2.inc.c"
#include "world/common/SixFloatsFunc.inc.c"
#include "world/common/UnkNpcAIFunc14.inc.c"
#include "world/common/UnkNpcAIFunc3.inc.c"
#include "world/common/UnkFunc6.inc.c"
#include "world/common/UnkFunc5.inc.c"
#include "world/common/UnkNpcAIMainFunc9.inc.c"
#include "world/common/atomic/enemy/UnkAI_9.inc.c"
ApiStatus func_802414F8_8D72F8(Evt* script, s32 isInitialCall) {
script->varTable[0] = get_enemy_safe(2);

20
src/world/area_kmr/kmr_11/8DA3A0.c
View File

@ -4,24 +4,6 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_802402A0_8DA3A0);
INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_80240344_8DA444);
#include "world/common/UnkNpcAIFunc43.inc.c"
#include "world/common/UnkNpcAIFunc44.inc.c"
#include "world/common/NpcJumpFunc3.inc.c"
#include "world/common/NpcJumpFunc.inc.c"
#include "world/common/UnkNpcAIFunc13_2.inc.c"
#include "world/common/UnkNpcAIFunc11.inc.c"
#include "world/common/UnkNpcAIFunc10.inc.c"
#include "world/common/UnkNpcAIFunc42.inc.c"
#include "world/common/UnkNpcAIFunc45.inc.c"
#include "world/common/UnkNpcAIMainFunc4.inc.c"
#include "world/common/atomic/enemy/UnkAI_4.inc.c"
INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_80240DDC_8DAEDC);

10
src/world/area_kpa/kpa_01/A470C0.c
View File

@ -1,13 +1,5 @@
#include "kpa_01.h"
#include "world/common/set_script_owner_npc_anim.inc.c"
#include "world/common/UnkDistFunc.inc.c"
#include "world/common/UnkNpcAIFunc12.inc.c"
#include "world/common/set_script_owner_npc_col_height.inc.c"
#include "world/common/UnkNpcAIMainFunc5.inc.c"
#include "world/common/atomic/enemy/UnkAI_5.inc.c"
#include "world/common/AwaitPlayerNearNpc.inc.c"

10
src/world/area_kpa/kpa_03/A48720.c
View File

@ -1,14 +1,6 @@
#include "kpa_03.h"
#include "world/common/set_script_owner_npc_anim.inc.c"
#include "world/common/UnkDistFunc.inc.c"
#include "world/common/UnkNpcAIFunc12.inc.c"
#include "world/common/set_script_owner_npc_col_height.inc.c"
#include "world/common/UnkNpcAIMainFunc5.inc.c"
#include "world/common/atomic/enemy/UnkAI_5.inc.c"
#include "world/common/AwaitPlayerNearNpc.inc.c"

18
src/world/area_kpa/kpa_09/A4F0A0.c
View File

@ -1,21 +1,5 @@
#include "kpa_09.h"
#include "world/common/UnkFunc61.inc.c"
#include "world/common/UnkNpcAIFunc48.inc.c"
#include "world/common/UnkNpcAIFunc49.inc.c"
#include "world/common/UnkSetDurationFunc.inc.c"
#include "world/common/UnkNpcAIFunc9.inc.c"
#include "world/common/UnkDurationCheckNoArgs.inc.c"
#include "world/common/UnkFunc54.inc.c"
#include "world/common/UnkFunc55.inc.c"
#include "world/common/UnkNpcAIMainFunc7.inc.c"
#include "world/common/atomic/enemy/ThrowAttackAI.inc.c"
#include "world/common/GetEncounterEnemyIsOwner.inc.c"

28
src/world/area_kpa/kpa_102/A93A50.c
View File

@ -1,34 +1,10 @@
#include "kpa_102.h"
#include "world/common/UnkFunc61.inc.c"
#include "world/common/UnkNpcAIFunc48.inc.c"
#include "world/common/UnkNpcAIFunc49.inc.c"
#include "world/common/UnkSetDurationFunc.inc.c"
#include "world/common/UnkNpcAIFunc9.inc.c"
#include "world/common/UnkDurationCheckNoArgs.inc.c"
#include "world/common/UnkFunc54.inc.c"
#include "world/common/UnkFunc55.inc.c"
#include "world/common/UnkNpcAIMainFunc7.inc.c"
#include "world/common/atomic/enemy/ThrowAttackAI.inc.c"
#include "world/common/GetEncounterEnemyIsOwner.inc.c"
#include "world/common/set_script_owner_npc_anim.inc.c"
#include "world/common/UnkDistFunc.inc.c"
#include "world/common/UnkNpcAIFunc12.inc.c"
#include "world/common/set_script_owner_npc_col_height.inc.c"
#include "world/common/UnkNpcAIMainFunc5.inc.c"
#include "world/common/atomic/enemy/UnkAI_5.inc.c"
#include "world/common/UnkNpcAIFunc47.inc.c"

10
src/world/area_kpa/kpa_11/A52BD0.c
View File

@ -1,11 +1,3 @@
#include "kpa_11.h"
#include "world/common/set_script_owner_npc_anim.inc.c"
#include "world/common/UnkDistFunc.inc.c"
#include "world/common/UnkNpcAIFunc12.inc.c"
#include "world/common/set_script_owner_npc_col_height.inc.c"
#include "world/common/UnkNpcAIMainFunc5.inc.c"
#include "world/common/atomic/enemy/UnkAI_5.inc.c"

18
src/world/area_kpa/kpa_111/A99590.c
View File

@ -7,22 +7,6 @@ static char* N(exit_str_1) = "kpa_112";
#include "world/common/UnkFunc12.inc.c"
#include "world/common/UnkFunc61.inc.c"
#include "world/common/UnkNpcAIFunc48.inc.c"
#include "world/common/UnkNpcAIFunc49.inc.c"
#include "world/common/UnkSetDurationFunc.inc.c"
#include "world/common/UnkNpcAIFunc9.inc.c"
#include "world/common/UnkDurationCheckNoArgs.inc.c"
#include "world/common/UnkFunc54.inc.c"
#include "world/common/UnkFunc55.inc.c"
#include "world/common/UnkNpcAIMainFunc7.inc.c"
#include "world/common/atomic/enemy/ThrowAttackAI.inc.c"
#include "world/common/GetEncounterEnemyIsOwner.inc.c"

10
src/world/area_kpa/kpa_113/A9CC70.c
View File

@ -4,14 +4,6 @@
#include "world/common/UnkFunc12.inc.c"
#include "world/common/set_script_owner_npc_anim.inc.c"
#include "world/common/UnkDistFunc.inc.c"
#include "world/common/UnkNpcAIFunc12.inc.c"
#include "world/common/set_script_owner_npc_col_height.inc.c"
#include "world/common/UnkNpcAIMainFunc5.inc.c"
#include "world/common/atomic/enemy/UnkAI_5.inc.c"
#include "world/common/AwaitPlayerNearNpc.inc.c"

18
src/world/area_kpa/kpa_115/A9ED40.c
View File

@ -9,22 +9,6 @@ static char* N(exit_str_3) = "";
#include "world/common/UnkFunc12.inc.c"
#include "world/common/UnkFunc61.inc.c"
#include "world/common/UnkNpcAIFunc48.inc.c"
#include "world/common/UnkNpcAIFunc49.inc.c"
#include "world/common/UnkSetDurationFunc.inc.c"
#include "world/common/UnkNpcAIFunc9.inc.c"
#include "world/common/UnkDurationCheckNoArgs.inc.c"
#include "world/common/UnkFunc54.inc.c"
#include "world/common/UnkFunc55.inc.c"
#include "world/common/UnkNpcAIMainFunc7.inc.c"
#include "world/common/atomic/enemy/ThrowAttackAI.inc.c"
#include "world/common/GetEncounterEnemyIsOwner.inc.c"

28
src/world/area_kpa/kpa_50/A609D0.c
View File

@ -3,32 +3,8 @@
static char* N(exit_str_0) = "kpa_70";
static char* N(exit_str_1) = "kpa_81";
#include "world/common/UnkFunc61.inc.c"
#include "world/common/UnkNpcAIFunc48.inc.c"
#include "world/common/UnkNpcAIFunc49.inc.c"
#include "world/common/UnkSetDurationFunc.inc.c"
#include "world/common/UnkNpcAIFunc9.inc.c"
#include "world/common/UnkDurationCheckNoArgs.inc.c"
#include "world/common/UnkFunc54.inc.c"
#include "world/common/UnkFunc55.inc.c"
#include "world/common/UnkNpcAIMainFunc7.inc.c"
#include "world/common/atomic/enemy/ThrowAttackAI.inc.c"
#include "world/common/GetEncounterEnemyIsOwner.inc.c"
#include "world/common/set_script_owner_npc_anim.inc.c"
#include "world/common/UnkDistFunc.inc.c"
#include "world/common/UnkNpcAIFunc12.inc.c"
#include "world/common/set_script_owner_npc_col_height.inc.c"
#include "world/common/UnkNpcAIMainFunc5.inc.c"
#include "world/common/atomic/enemy/UnkAI_5.inc.c"

10
src/world/area_kpa/kpa_51/A640E0.c
View File

@ -36,12 +36,4 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_80241374_A65404);
INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_80241404_A65494);
#include "world/common/set_script_owner_npc_anim.inc.c"
#include "world/common/UnkDistFunc.inc.c"
#include "world/common/UnkNpcAIFunc12.inc.c"
#include "world/common/set_script_owner_npc_col_height.inc.c"
#include "world/common/UnkNpcAIMainFunc5.inc.c"
#include "world/common/atomic/enemy/UnkAI_5.inc.c"

18
src/world/area_kpa/kpa_52/A671E0.c
View File

@ -1,21 +1,5 @@
#include "kpa_52.h"
#include "world/common/UnkFunc61.inc.c"
#include "world/common/UnkNpcAIFunc48.inc.c"
#include "world/common/UnkNpcAIFunc49.inc.c"
#include "world/common/UnkSetDurationFunc.inc.c"
#include "world/common/UnkNpcAIFunc9.inc.c"
#include "world/common/UnkDurationCheckNoArgs.inc.c"
#include "world/common/UnkFunc54.inc.c"
#include "world/common/UnkFunc55.inc.c"
#include "world/common/UnkNpcAIMainFunc7.inc.c"
#include "world/common/atomic/enemy/ThrowAttackAI.inc.c"
#include "world/common/GetEncounterEnemyIsOwner.inc.c"

10
src/world/area_kpa/kpa_61/A6E6F0.c
View File

@ -1,14 +1,6 @@
#include "kpa_61.h"
#include "world/common/set_script_owner_npc_anim.inc.c"
#include "world/common/UnkDistFunc.inc.c"
#include "world/common/UnkNpcAIFunc12.inc.c"
#include "world/common/set_script_owner_npc_col_height.inc.c"
#include "world/common/UnkNpcAIMainFunc5.inc.c"
#include "world/common/atomic/enemy/UnkAI_5.inc.c"
#include "world/common/UnkNpcAIFunc47.inc.c"

10
src/world/area_kpa/kpa_70/A74B80.c
View File

@ -1,11 +1,3 @@
#include "kpa_70.h"
#include "world/common/set_script_owner_npc_anim.inc.c"
#include "world/common/UnkDistFunc.inc.c"
#include "world/common/UnkNpcAIFunc12.inc.c"
#include "world/common/set_script_owner_npc_col_height.inc.c"
#include "world/common/UnkNpcAIMainFunc5.inc.c"
#include "world/common/atomic/enemy/UnkAI_5.inc.c"

32
src/world/area_kpa/kpa_91/A86A50.c
View File

@ -3,37 +3,9 @@
static char* N(exit_str_0) = "kpa_90";
static char* N(exit_str_1) = "";
#include "world/common/UnkNpcAIFunc24.inc.c"
#include "world/common/atomic/enemy/UnkAI_1.inc.c"
#include "world/common/UnkFunc13.inc.c"
#include "world/common/UnkNpcAIFunc1.inc.c"
#include "world/common/UnkFunc14.inc.c"
#include "world/common/UnkNpcAIFunc25.inc.c"
#include "world/common/NpcJumpFunc2.inc.c"
#include "world/common/NpcJumpFunc.inc.c"
#include "world/common/UnkNpcAIFunc13.inc.c"
#include "world/common/UnkFunc15.inc.c"
#include "world/common/UnkNpcDurationFlagFunc.inc.c"
#include "world/common/UnkFunc16.inc.c"
#include "world/common/UnkNpcAIMainFunc.inc.c"
#include "world/common/set_script_owner_npc_anim.inc.c"
#include "world/common/UnkDistFunc.inc.c"
#include "world/common/UnkNpcAIFunc12.inc.c"
#include "world/common/set_script_owner_npc_col_height.inc.c"
#include "world/common/atomic/enemy/UnkAI_StateHandlers_A.inc.c"
#include "world/common/UnkNpcAIMainFunc8.inc.c"

32
src/world/area_kpa/kpa_95/A8CB60.c
View File

@ -1,36 +1,8 @@
#include "kpa_95.h"
#include "world/common/UnkNpcAIFunc24.inc.c"
#include "world/common/atomic/enemy/UnkAI_1.inc.c"
#include "world/common/UnkFunc13.inc.c"
#include "world/common/UnkNpcAIFunc1.inc.c"
#include "world/common/UnkFunc14.inc.c"
#include "world/common/UnkNpcAIFunc25.inc.c"
#include "world/common/NpcJumpFunc2.inc.c"
#include "world/common/NpcJumpFunc.inc.c"
#include "world/common/UnkNpcAIFunc13.inc.c"
#include "world/common/UnkFunc15.inc.c"
#include "world/common/UnkNpcDurationFlagFunc.inc.c"
#include "world/common/UnkFunc16.inc.c"
#include "world/common/UnkNpcAIMainFunc.inc.c"
#include "world/common/set_script_owner_npc_anim.inc.c"
#include "world/common/UnkDistFunc.inc.c"
#include "world/common/UnkNpcAIFunc12.inc.c"
#include "world/common/set_script_owner_npc_col_height.inc.c"
#include "world/common/atomic/enemy/UnkAI_StateHandlers_A.inc.c"
#include "world/common/UnkNpcAIMainFunc8.inc.c"

31
src/world/area_kzn/kzn_02/C5AC20.c
View File

@ -1,35 +1,8 @@
#include "kzn_02.h"
#include "world/common/UnkNpcAIFunc23.inc.c"
#include "world/common/UnkNpcAIFunc35.inc.c"
#include "world/common/UnkNpcAIFunc1_copy.inc.c"
#include "world/common/UnkFunc4.inc.c"
#include "world/common/UnkNpcAIFunc2.inc.c"
#include "world/common/SixFloatsFunc.inc.c"
#include "world/common/UnkNpcAIFunc14.inc.c"
#include "world/common/UnkNpcAIFunc3.inc.c"
#include "world/common/UnkFunc6.inc.c"
#include "world/common/UnkFunc5.inc.c"
#include "world/common/UnkNpcAIMainFunc9.inc.c"
#include "world/common/UnkNpcAIFunc13.inc.c"
#include "world/common/UnkNpcAIFunc34.inc.c"
#include "world/common/UnkFunc45.inc.c"
#include "world/common/UnkNpcAIMainFunc10.inc.c"
#include "world/common/atomic/enemy/UnkAI_9.inc.c"
#include "world/common/atomic/enemy/UnkAI_10.inc.c"
#include "world/common/StashVars.inc.c"

10
src/world/area_kzn/kzn_03/C61020.c
View File

@ -1,14 +1,6 @@
#include "kzn_03.h"
#include "world/common/set_script_owner_npc_anim.inc.c"
#include "world/common/UnkDistFunc.inc.c"
#include "world/common/UnkNpcAIFunc12.inc.c"
#include "world/common/set_script_owner_npc_col_height.inc.c"
#include "world/common/UnkNpcAIMainFunc5.inc.c"
#include "world/common/atomic/enemy/UnkAI_5.inc.c"
#include "world/common/AwaitPlayerNearNpc.inc.c"

30
src/world/area_kzn/kzn_07/C6EA50.c
View File

@ -5,32 +5,6 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_80240720_C6EA50);
INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_802407F4_C6EB24);
#include "world/common/UnkNpcAIFunc23.inc.c"
#include "world/common/atomic/enemy/UnkAI_9.inc.c"
#include "world/common/UnkNpcAIFunc35.inc.c"
#include "world/common/UnkNpcAIFunc1_copy.inc.c"
#include "world/common/UnkFunc4.inc.c"
#include "world/common/UnkNpcAIFunc2.inc.c"
#include "world/common/SixFloatsFunc.inc.c"
#include "world/common/UnkNpcAIFunc14.inc.c"
#include "world/common/UnkNpcAIFunc3.inc.c"
#include "world/common/UnkFunc6.inc.c"
#include "world/common/UnkFunc5.inc.c"
#include "world/common/UnkNpcAIMainFunc9.inc.c"
#include "world/common/UnkNpcAIFunc13.inc.c"
#include "world/common/UnkNpcAIFunc34.inc.c"
#include "world/common/UnkFunc45.inc.c"
#include "world/common/UnkNpcAIMainFunc10.inc.c"
#include "world/common/atomic/enemy/UnkAI_10.inc.c"

30
src/world/area_kzn/kzn_08/C71ED0.c
View File

@ -1,34 +1,8 @@
#include "kzn_08.h"
#include "world/common/UnkNpcAIFunc23.inc.c"
#include "world/common/atomic/enemy/UnkAI_9.inc.c"
#include "world/common/UnkNpcAIFunc35.inc.c"
#include "world/common/UnkNpcAIFunc1_copy.inc.c"
#include "world/common/UnkFunc4.inc.c"
#include "world/common/UnkNpcAIFunc2.inc.c"
#include "world/common/SixFloatsFunc.inc.c"
#include "world/common/UnkNpcAIFunc14.inc.c"
#include "world/common/UnkNpcAIFunc3.inc.c"
#include "world/common/UnkFunc6.inc.c"
#include "world/common/UnkFunc5.inc.c"
#include "world/common/UnkNpcAIMainFunc9.inc.c"
#include "world/common/UnkNpcAIFunc13.inc.c"
#include "world/common/UnkNpcAIFunc34.inc.c"
#include "world/common/UnkFunc45.inc.c"
#include "world/common/UnkNpcAIMainFunc10.inc.c"
#include "world/common/atomic/enemy/UnkAI_10.inc.c"
#include "world/common/UnkNpcAIFunc6.inc.c"

10
src/world/area_kzn/kzn_09/C77D00.c
View File

@ -31,15 +31,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80241A58_C78738);
INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80242774_C79454);
#include "world/common/set_script_owner_npc_anim.inc.c"
#include "world/common/UnkDistFunc.inc.c"
#include "world/common/UnkNpcAIFunc12.inc.c"
#include "world/common/set_script_owner_npc_col_height.inc.c"
#include "world/common/UnkNpcAIMainFunc5.inc.c"
#include "world/common/atomic/enemy/UnkAI_5.inc.c"
#include "world/common/AwaitPlayerNearNpc.inc.c"

30
src/world/area_kzn/kzn_11/C80600.c
View File

@ -1,34 +1,8 @@
#include "kzn_11.h"
#include "world/common/UnkNpcAIFunc23.inc.c"
#include "world/common/atomic/enemy/UnkAI_9.inc.c"
#include "world/common/UnkNpcAIFunc35.inc.c"
#include "world/common/UnkNpcAIFunc1_copy.inc.c"
#include "world/common/UnkFunc4.inc.c"
#include "world/common/UnkNpcAIFunc2.inc.c"
#include "world/common/SixFloatsFunc.inc.c"
#include "world/common/UnkNpcAIFunc14.inc.c"
#include "world/common/UnkNpcAIFunc3.inc.c"
#include "world/common/UnkFunc6.inc.c"
#include "world/common/UnkFunc5.inc.c"
#include "world/common/UnkNpcAIMainFunc9.inc.c"
#include "world/common/UnkNpcAIFunc13.inc.c"
#include "world/common/UnkNpcAIFunc34.inc.c"
#include "world/common/UnkFunc45.inc.c"
#include "world/common/UnkNpcAIMainFunc10.inc.c"
#include "world/common/atomic/enemy/UnkAI_10.inc.c"
INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_80241F4C_C820EC);

10
src/world/area_kzn/kzn_17/C85DC0.c
View File

@ -31,15 +31,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80240D48_C867F8);
INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80241A64_C87514);
#include "world/common/set_script_owner_npc_anim.inc.c"
#include "world/common/UnkDistFunc.inc.c"
#include "world/common/UnkNpcAIFunc12.inc.c"
#include "world/common/set_script_owner_npc_col_height.inc.c"
#include "world/common/UnkNpcAIMainFunc5.inc.c"
#include "world/common/atomic/enemy/UnkAI_5.inc.c"
#include "world/common/AwaitPlayerNearNpc.inc.c"

24
src/world/area_mac/mac_00/7ED280.c
View File

@ -1,28 +1,6 @@
#include "mac_00.h"
#include "world/common/UnkNpcAIFunc24.inc.c"
#include "world/common/UnkFunc13.inc.c"
#include "world/common/UnkNpcAIFunc1.inc.c"
#include "world/common/UnkFunc14.inc.c"
#include "world/common/UnkNpcAIFunc25.inc.c"
#include "world/common/NpcJumpFunc2.inc.c"
#include "world/common/NpcJumpFunc.inc.c"
#include "world/common/UnkNpcAIFunc13.inc.c"
#include "world/common/UnkFunc15.inc.c"
#include "world/common/UnkNpcDurationFlagFunc.inc.c"
#include "world/common/UnkFunc16.inc.c"
#include "world/common/UnkNpcAIMainFunc.inc.c"
#include "world/common/atomic/enemy/UnkAI_1.inc.c"
static char* N(exit_str_0) = "mac_01";

24
src/world/area_mac/mac_01/8017D0.c
View File

@ -6,29 +6,7 @@ extern u8 D_80258407_818C87;
#include "world/common/UnkMusicFunc.inc.c"
#include "world/common/UnkNpcAIFunc24.inc.c"
#include "world/common/UnkFunc13.inc.c"
#include "world/common/UnkNpcAIFunc1.inc.c"
#include "world/common/UnkFunc14.inc.c"
#include "world/common/UnkNpcAIFunc25.inc.c"
#include "world/common/NpcJumpFunc2.inc.c"
#include "world/common/NpcJumpFunc.inc.c"
#include "world/common/UnkNpcAIFunc13.inc.c"
#include "world/common/UnkFunc15.inc.c"
#include "world/common/UnkNpcDurationFlagFunc.inc.c"
#include "world/common/UnkFunc16.inc.c"
#include "world/common/UnkNpcAIMainFunc.inc.c"
#include "world/common/atomic/enemy/UnkAI_1.inc.c"
static char* N(exit_str_0) = "flo_00";
static char* N(exit_str_1) = "kmr_22";

24
src/world/area_mac/mac_01/805DD0.c
View File

@ -2,29 +2,7 @@
#define NAMESPACE dup_mac_01
#include "world/common/UnkNpcAIFunc24.inc.c"
#include "world/common/UnkFunc13.inc.c"
#include "world/common/UnkNpcAIFunc1.inc.c"
#include "world/common/UnkFunc14.inc.c"
#include "world/common/UnkNpcAIFunc25.inc.c"
#include "world/common/NpcJumpFunc2.inc.c"
#include "world/common/NpcJumpFunc.inc.c"
#include "world/common/UnkNpcAIFunc13.inc.c"
#include "world/common/UnkFunc15.inc.c"
#include "world/common/UnkNpcDurationFlagFunc.inc.c"
#include "world/common/UnkFunc16.inc.c"
#include "world/common/UnkNpcAIMainFunc.inc.c"
#include "world/common/atomic/enemy/UnkAI_1.inc.c"
#define NAMESPACE mac_01

24
src/world/area_mac/mac_02/823BF0.c
View File

@ -2,29 +2,7 @@
#define CHUCK_QUIZMO_NPC_ID 12
#include "world/common/UnkNpcAIFunc24.inc.c"
#include "world/common/UnkFunc13.inc.c"
#include "world/common/UnkNpcAIFunc1.inc.c"
#include "world/common/UnkFunc14.inc.c"
#include "world/common/UnkNpcAIFunc25.inc.c"
#include "world/common/NpcJumpFunc2.inc.c"
#include "world/common/NpcJumpFunc.inc.c"
#include "world/common/UnkNpcAIFunc13.inc.c"
#include "world/common/UnkFunc15.inc.c"
#include "world/common/UnkNpcDurationFlagFunc.inc.c"
#include "world/common/UnkFunc16.inc.c"
#include "world/common/UnkNpcAIMainFunc.inc.c"
#include "world/common/atomic/enemy/UnkAI_1.inc.c"
extern s32 N(Quizmo_Worker);
extern s32 N(Quizmo_AnswerResult);

24
src/world/area_mac/mac_05/852170.c
View File

@ -11,29 +11,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024030C_85247C);
INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024047C_8525EC);
#include "world/common/UnkNpcAIFunc24.inc.c"
#include "world/common/UnkFunc13.inc.c"
#include "world/common/UnkNpcAIFunc1.inc.c"
#include "world/common/UnkFunc14.inc.c"
#include "world/common/UnkNpcAIFunc25.inc.c"
#include "world/common/NpcJumpFunc2.inc.c"
#include "world/common/NpcJumpFunc.inc.c"
#include "world/common/UnkNpcAIFunc13.inc.c"
#include "world/common/UnkFunc15.inc.c"
#include "world/common/UnkNpcDurationFlagFunc.inc.c"
#include "world/common/UnkFunc16.inc.c"
#include "world/common/UnkNpcAIMainFunc.inc.c"
#include "world/common/atomic/enemy/UnkAI_1.inc.c"
extern s32 N(Quizmo_Worker);
extern s32 N(Quizmo_AnswerResult);

24
src/world/area_mgm/mgm_00/E0E7A0.c
View File

@ -7,29 +7,7 @@ static char* N(exit_str_3) = "";
#include "world/common/atomic/Pipe.inc.c"
#include "world/common/UnkNpcAIFunc24.inc.c"
#include "world/common/UnkFunc13.inc.c"
#include "world/common/UnkNpcAIFunc1.inc.c"
#include "world/common/UnkFunc14.inc.c"
#include "world/common/UnkNpcAIFunc25.inc.c"
#include "world/common/NpcJumpFunc2.inc.c"
#include "world/common/NpcJumpFunc.inc.c"
#include "world/common/UnkNpcAIFunc13.inc.c"
#include "world/common/UnkFunc15.inc.c"
#include "world/common/UnkNpcDurationFlagFunc.inc.c"
#include "world/common/UnkFunc16.inc.c"
#include "world/common/UnkNpcAIMainFunc.inc.c"
#include "world/common/atomic/enemy/UnkAI_1.inc.c"
/* N(GetAvailableGamesCount) */
ApiStatus func_80241170_E0F910(Evt* script, s32 isInitialCall) {

16
src/world/area_mim/mim_02/B97C70.c
View File

@ -1,20 +1,6 @@
#include "mim_02.h"
#include "world/common/UnkNpcAIFunc36.inc.c"
#include "world/common/UnkNpcAIFunc37.inc.c"
#include "world/common/UnkNpcAIFunc1.inc.c"
#include "world/common/UnkNpcAIFunc38.inc.c"
#include "world/common/UnkNpcAIFunc15.inc.c"
#include "world/common/UnkNpcAIFunc39.inc.c"
#include "world/common/UnkDurationCheck.inc.c"
#include "world/common/UnkNpcAIMainFunc2.inc.c"
#include "world/common/atomic/enemy/UnkAI_2.inc.c"
#include "world/common/GetNpcCollisionHeight.inc.c"

16
src/world/area_mim/mim_04/B9DB60.c
View File

@ -1,20 +1,6 @@
#include "mim_04.h"
#include "world/common/UnkNpcAIFunc36.inc.c"
#include "world/common/UnkNpcAIFunc37.inc.c"
#include "world/common/UnkNpcAIFunc1.inc.c"
#include "world/common/UnkNpcAIFunc38.inc.c"
#include "world/common/UnkNpcAIFunc15.inc.c"
#include "world/common/UnkNpcAIFunc39.inc.c"
#include "world/common/UnkDurationCheck.inc.c"
#include "world/common/UnkNpcAIMainFunc2.inc.c"
#include "world/common/atomic/enemy/UnkAI_2.inc.c"
#include "world/common/StashVars.inc.c"

16
src/world/area_mim/mim_06/BA4CF0.c
View File

@ -30,18 +30,4 @@
INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_80241CC4_BA6444);
#include "world/common/UnkNpcAIFunc36.inc.c"
#include "world/common/UnkNpcAIFunc37.inc.c"
#include "world/common/UnkNpcAIFunc1.inc.c"
#include "world/common/UnkNpcAIFunc38.inc.c"
#include "world/common/UnkNpcAIFunc15.inc.c"
#include "world/common/UnkNpcAIFunc39.inc.c"
#include "world/common/UnkDurationCheck.inc.c"
#include "world/common/UnkNpcAIMainFunc2.inc.c"
#include "world/common/atomic/enemy/UnkAI_2.inc.c"

16
src/world/area_mim/mim_07/BAA3B0.c
View File

@ -1,17 +1,3 @@
#include "mim_07.h"
#include "world/common/UnkNpcAIFunc36.inc.c"
#include "world/common/UnkNpcAIFunc37.inc.c"
#include "world/common/UnkNpcAIFunc1.inc.c"
#include "world/common/UnkNpcAIFunc38.inc.c"
#include "world/common/UnkNpcAIFunc15.inc.c"
#include "world/common/UnkNpcAIFunc39.inc.c"
#include "world/common/UnkDurationCheck.inc.c"
#include "world/common/UnkNpcAIMainFunc2.inc.c"
#include "world/common/atomic/enemy/UnkAI_2.inc.c"

22
src/world/area_mim/mim_08/BAD940.c
View File

@ -7,27 +7,7 @@ static char* N(exit_str_1) = "mim_05";
INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80240068_BAD9A8);
#include "world/common/UnkNpcAIFunc23.inc.c"
#include "world/common/UnkNpcAIFunc35.inc.c"
#include "world/common/UnkNpcAIFunc1_copy.inc.c"
#include "world/common/UnkFunc4.inc.c"
#include "world/common/UnkNpcAIFunc2.inc.c"
#include "world/common/SixFloatsFunc.inc.c"
#include "world/common/UnkNpcAIFunc14.inc.c"
#include "world/common/UnkNpcAIFunc3.inc.c"
#include "world/common/UnkFunc6.inc.c"
#include "world/common/UnkFunc5.inc.c"
#include "world/common/UnkNpcAIMainFunc9.inc.c"
#include "world/common/atomic/enemy/UnkAI_9.inc.c"
#include "world/common/UnkNpcAIFunc6.inc.c"

16
src/world/area_mim/mim_09/BB2E00.c
View File

@ -7,18 +7,4 @@ static char* N(exit_str_1) = "mim_07";
INCLUDE_ASM(s32, "world/area_mim/mim_09/BB2E00", func_80240068_BB2E68);
#include "world/common/UnkNpcAIFunc36.inc.c"
#include "world/common/UnkNpcAIFunc37.inc.c"
#include "world/common/UnkNpcAIFunc1.inc.c"
#include "world/common/UnkNpcAIFunc38.inc.c"
#include "world/common/UnkNpcAIFunc15.inc.c"
#include "world/common/UnkNpcAIFunc39.inc.c"
#include "world/common/UnkDurationCheck.inc.c"
#include "world/common/UnkNpcAIMainFunc2.inc.c"
#include "world/common/atomic/enemy/UnkAI_2.inc.c"

20
src/world/area_nok/nok_01/9C53E0.c
View File

@ -5,25 +5,7 @@ static char* N(exit_str_1) = "nok_02";
#define CHUCK_QUIZMO_NPC_ID 15
#include "world/common/UnkNpcAIFunc43.inc.c"
#include "world/common/UnkNpcAIFunc44.inc.c"
#include "world/common/NpcJumpFunc3.inc.c"
#include "world/common/NpcJumpFunc.inc.c"
#include "world/common/UnkNpcAIFunc13_2.inc.c"
#include "world/common/UnkNpcAIFunc11.inc.c"
#include "world/common/UnkNpcAIFunc10.inc.c"
#include "world/common/UnkNpcAIFunc42.inc.c"
#include "world/common/UnkNpcAIFunc45.inc.c"
#include "world/common/UnkNpcAIMainFunc4.inc.c"
#include "world/common/atomic/enemy/UnkAI_4.inc.c"
#include "world/common/atomic/ToadHouse.inc.c"

24
src/world/area_nok/nok_02/9D7AA0.c
View File

@ -2,29 +2,7 @@
#define CHUCK_QUIZMO_NPC_ID 19
#include "world/common/UnkNpcAIFunc24.inc.c"
#include "world/common/UnkFunc13.inc.c"
#include "world/common/UnkNpcAIFunc1.inc.c"
#include "world/common/UnkFunc14.inc.c"
#include "world/common/UnkNpcAIFunc25.inc.c"
#include "world/common/NpcJumpFunc2.inc.c"
#include "world/common/NpcJumpFunc.inc.c"
#include "world/common/UnkNpcAIFunc13.inc.c"
#include "world/common/UnkFunc15.inc.c"
#include "world/common/UnkNpcDurationFlagFunc.inc.c"
#include "world/common/UnkFunc16.inc.c"
#include "world/common/UnkNpcAIMainFunc.inc.c"
#include "world/common/atomic/enemy/UnkAI_1.inc.c"
static char* N(exit_str_0) = "nok_02";
static char* N(exit_str_1) = "obk_09";

16
src/world/area_nok/nok_03/9EB7F0.c
View File

@ -3,18 +3,4 @@
static char* N(exit_str_0) = "nok_02";
static char* N(exit_str_1) = "nok_04";
#include "world/common/UnkNpcAIFunc36.inc.c"
#include "world/common/UnkNpcAIFunc37.inc.c"
#include "world/common/UnkNpcAIFunc1.inc.c"
#include "world/common/UnkNpcAIFunc38.inc.c"
#include "world/common/UnkNpcAIFunc15.inc.c"
#include "world/common/UnkNpcAIFunc39.inc.c"
#include "world/common/UnkDurationCheck.inc.c"
#include "world/common/UnkNpcAIMainFunc2.inc.c"
#include "world/common/atomic/enemy/UnkAI_2.inc.c"

33
src/world/area_nok/nok_11/9F4A40.c
View File

@ -3,41 +3,12 @@
static char* N(exit_str_0) = "mac_01";
static char* N(exit_str_1) = "nok_12";
#include "world/common/set_script_owner_npc_anim.inc.c"
#include "world/common/atomic/enemy/UnkAI_5.inc.c"
#include "world/common/UnkDistFunc.inc.c"
#include "world/common/UnkNpcAIFunc12.inc.c"
#include "world/common/set_script_owner_npc_col_height.inc.c"
#include "world/common/UnkNpcAIMainFunc5.inc.c"
#include "world/common/UnkNpcAIFunc23.inc.c"
#include "world/common/UnkNpcAIFunc35.inc.c"
#include "world/common/UnkNpcAIFunc1_copy.inc.c"
#include "world/common/UnkFunc4.inc.c"
#include "world/common/UnkNpcAIFunc2.inc.c"
#include "world/common/SixFloatsFunc.inc.c"
#include "world/common/UnkNpcAIFunc14.inc.c"
#include "world/common/UnkNpcAIFunc3.inc.c"
#include "world/common/UnkFunc6.inc.c"
#include "world/common/UnkFunc5.inc.c"
#include "world/common/UnkNpcAIMainFunc9.inc.c"
#include "world/common/atomic/enemy/UnkAI_9.inc.c"
#include "common/foliage.inc.c"
INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_80241F08_9F6948);
ApiStatus func_80241F30_9F6970(Evt* script, s32 isInitialCall) {

34
src/world/area_nok/nok_12/9FAD60.c
View File

@ -1,38 +1,8 @@
#include "nok_12.h"
#include "world/common/set_script_owner_npc_anim.inc.c"
#include "world/common/atomic/enemy/UnkAI_5.inc.c"
#include "world/common/UnkDistFunc.inc.c"
#include "world/common/UnkNpcAIFunc12.inc.c"
#include "world/common/set_script_owner_npc_col_height.inc.c"
#include "world/common/UnkNpcAIMainFunc5.inc.c"
#include "world/common/UnkNpcAIFunc24.inc.c"
#include "world/common/UnkFunc13.inc.c"
#include "world/common/UnkNpcAIFunc1.inc.c"
#include "world/common/UnkFunc14.inc.c"
#include "world/common/UnkNpcAIFunc25.inc.c"
#include "world/common/NpcJumpFunc2.inc.c"
#include "world/common/NpcJumpFunc.inc.c"
#include "world/common/UnkNpcAIFunc13.inc.c"
#include "world/common/UnkFunc15.inc.c"
#include "world/common/UnkNpcDurationFlagFunc.inc.c"
#include "world/common/UnkFunc16.inc.c"
#include "world/common/UnkNpcAIMainFunc.inc.c"
#include "world/common/atomic/enemy/UnkAI_1.inc.c"
#include "world/common/UnkNpcAIMainFunc8.inc.c"

Some files were not shown because too many files have changed in this diff Show More