diff --git a/include/enums.h b/include/enums.h index 6f84f565ed..05c12c4c38 100644 --- a/include/enums.h +++ b/include/enums.h @@ -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, diff --git a/src/EA0C10.c b/src/EA0C10.c index 5f6b0ea10d..516138fad5 100644 --- a/src/EA0C10.c +++ b/src/EA0C10.c @@ -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" diff --git a/src/EB8E90.c b/src/EB8E90.c index 0d7fa2eba8..92f4388f1e 100644 --- a/src/EB8E90.c +++ b/src/EB8E90.c @@ -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; diff --git a/src/ECAA80.c b/src/ECAA80.c index eb76dc8750..26828a1eeb 100644 --- a/src/ECAA80.c +++ b/src/ECAA80.c @@ -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" diff --git a/src/ED0310.c b/src/ED0310.c index 442c84a6b0..15bd90a992 100644 --- a/src/ED0310.c +++ b/src/ED0310.c @@ -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" diff --git a/src/EDEA00.c b/src/EDEA00.c index 1b1ea74c85..4f42061fe7 100644 --- a/src/EDEA00.c +++ b/src/EDEA00.c @@ -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); diff --git a/src/EE70C0.c b/src/EE70C0.c index 1964b71a6f..bed36aeb89 100644 --- a/src/EE70C0.c +++ b/src/EE70C0.c @@ -1,5 +1,6 @@ #include "dead.h" #include "common.h" +#include "dead_structs.h" // Copy of flo_14 (CCBE20.c) @@ -7,28 +8,7 @@ extern const s32 D_802453E0_EEB990[]; -INCLUDE_ASM(s32, "EE70C0", func_80240B10_EE70C0); -//#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, "EE70C0", func_80241E1C_EE83CC); +#include "world/common/atomic/enemy/Dead_UnkAI_9.inc.c" #include "world/common/GetNpcCollisionHeight.inc.c" @@ -59,5 +39,7 @@ ApiStatus func_802422EC_EE889C(Evt* script, s32 isInitialCall) { extern ApiStatus EE65B0_UpdateTexturePanSmooth; +const s32 padding[] = {0, 0, 0}; + // TODO sort out this mess const s32 D_802453E0_EEB990[] = { 0x43A00000, 0x00000000, 0x00000000, 0x43870000, 0xC32A0000, 0x00000000, 0x425C0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802401A8, &EE65B0_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80200000, 0x0019011F, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x0000007F, 0x00000000, 0x00000008, 0x00000012, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000034, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000035, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x80241760, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80240120, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, func_802D8248, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, 0x802412C0, 0x00000046, 0x00000001, 0x80241300, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000044, 0x00000001, 0x802404D8, 0x00000012, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0x8024017C, 0x00000044, 0x00000001, 0x80285C70, 0x00000013, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000000E, 0x7FFFFE00, 0x00000044, 0x00000001, 0x802413B0, 0x00000046, 0x00000001, 0x80240060, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000024, 0x00000002, 0xFE363C83, 0x00000007, 0x00000024, 0x00000002, 0xFE363C84, 0x00000005, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C84, 0x00000001, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, 0x802DB210, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0xFE363C84, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000005, 0x802DB210, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0xFE363C84, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000005, 0x802DB210, 0x0000000A, 0x00000000, 0x0000010E, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x0000041A, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24AA280, 0xF24A8A80, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24AB680, 0xF24A5280, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A9480, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0009, 0x00CB0009, 0x00000205, 0x001100C3, 0x00000043, 0x00000003, 0x802DB654, 0x0000000A, 0x00CB0009, 0x00000056, 0x00000000, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x000003E8, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, 0x802DB5E8, 0x0000000A, 0xF24A7A80, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000190, 0x00000043, 0x00000006, 0x802DBC24, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000043, 0x00000003, 0x802D78AC, 0x80241768, 0x00000009, 0x00000008, 0x00000001, 0x00000046, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802DB3C8, 0x0000000B, 0x00000030, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0xFFFFFFE2, 0x0000001E, 0x00000014, 0x0000000B, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, 0x802DB310, 0x0000000B, 0x00000000, 0x00000000, 0xFE363C80, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x0000001E, 0xFFFFFFE2, 0x00000014, 0x0000000B, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, 0x802DB310, 0x0000000B, 0x00000000, 0x00000000, 0xFE363C80, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C81, 0x000000DC, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, 0x802DF124, 0x0000000A, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, 0x802DB5E8, 0x0000000A, 0xF24A7A80, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C81, 0x00000190, 0x00000043, 0x00000006, 0x802DBC24, 0x0000000A, 0xFE363C80, 0x00000113, 0xFE363C82, 0x0000001E, 0x00000045, 0x00000002, 0x8024032C, 0xFE363C89, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF97188A6, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000049, 0x00000001, 0xFE363C89, 0x00000043, 0x00000004, 0x802DC5C0, 0x0000000A, 0x00000100, 0x00000001, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, 0x802DBC24, 0x0000000A, 0xFE363C80, 0x000001C2, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000032, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009A, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010021, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, 0x802DE6A4, 0x00080007, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009B, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000032, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009C, 0x00000018, 0x00000001, 0x00000039, 0x0000000A, 0x00000002, 0xF8406102, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009D, 0x00000024, 0x00000002, 0xF8406102, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009E, 0x00000013, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009F, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xF97188A6, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802DB4EC, 0x0000000A, 0x00000040, 0x00000028, 0x00000043, 0x00000003, 0x802DC7C8, 0x0000000A, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000005, 0x802DB210, 0x0000000A, 0x00000000, 0x0000010E, 0x00000000, 0x00000043, 0x00000003, 0x80049154, 0xFFFFFFFF, 0x80240B28, 0x00000044, 0x00000001, 0x8024032C, 0x00000012, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x0000000A, 0x00000000, 0x000001C2, 0x00000000, 0x00000043, 0x00000003, 0x80049154, 0xFFFFFFFF, 0x80240B28, 0x00000024, 0x00000002, 0xF97188A6, 0x00000000, 0x00000044, 0x00000001, 0x8024094C, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802DC7C8, 0x0000000B, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0x0000000B, 0x00CB0002, 0x00000043, 0x00000003, 0x802DD3E0, 0x0000000A, 0x00000003, 0x00000043, 0x00000003, 0x802DD3E0, 0x0000000B, 0x00000003, 0x00000043, 0x0000000A, 0x802DD520, 0x0000000A, 0x00000000, 0x00000001, 0x00000005, 0x00000005, 0x0000000D, 0x00000005, 0x00000000, 0x00000000, 0x00000043, 0x0000000A, 0x802DD520, 0x0000000B, 0x00000000, 0x00000001, 0x00000005, 0x00000005, 0x0000000D, 0x00000005, 0x00000000, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0x00000000, 0x0000010E, 0xFFFFFFFB, 0x00000012, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0x00000000, 0x000001C2, 0xFFFFFFFB, 0x00000043, 0x00000003, 0x80048F68, 0xFFFFFFFF, 0x8024079C, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x80240300, 0x00000000, 0x437A0000, 0x00000000, 0x00400D01, 0x80240CD0, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00000000, 0x00000000, 0x00000000, 0x001A00E1, 0x0000000B, 0x80240300, 0x00000000, 0x437A0000, 0x00000000, 0x00008F01, 0x80240DB4, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00000000, 0x00000000, 0x00000000, 0x001A00E1, 0x00000002, 0x80240EE0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF84060F9, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF84060F9, 0x00000000, 0x00000043, 0x00000007, 0x8011A58C, 0x802CCF00, 0xFFFFFF4C, 0x00000000, 0xFFFFFFEE, 0x00000000, 0x80000000, 0x00000043, 0x00000002, 0x8011A804, 0x802412E0, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0000000A, 0xF24A7CE7, 0x0000000D, 0xF24A7D80, 0x00000010, 0xF24A7E1A, 0x00000013, 0xF24A7EB4, 0x00000016, 0xF24A7F4D, 0x00000019, 0xF24A7EB4, 0x00000018, 0xF24A7E1A, 0x00000019, 0xF24A7D80, 0x00000018, 0xF24A7CE7, 0x0000000A, 0xF24A814D, 0x0000000A, 0x00000002, 0xF84060F9, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF84060F9, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000056, 0x00000000, 0x00000030, 0x00000001, 0x80241360, 0x00000005, 0x00000001, 0x0000000A, 0x00000032, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D8758, 0x00000000, 0x00000000, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFFFFFF56, 0x00000000, 0x00000023, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFFFFFF56, 0x00000000, 0x00000023, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x00000258, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24ADE80, 0xF24A5680, 0x00000043, 0x00000004, 0x802D914C, 0x00000000, 0xF249B280, 0xF24ADE80, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8080, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000006, 0x00000004, 0xFFFFFF4C, 0x00000000, 0xFFFFFFF1, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000006, 0x00000004, 0xFFFFFF42, 0x00000000, 0xFFFFFFDD, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000006, 0x00000043, 0x00000004, 0x802D7AC0, 0x0000000B, 0x00000187, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x00000000, 0xFFFFFFCE, 0x00000078, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, 0x802D6C60, 0x00000010, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000000C, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000001, 0x0000000E, 0x7FFFFE00, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, 0x802D9DE4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000000C, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000001, 0x0000000E, 0x7FFFFE00, 0x00000043, 0x00000005, 0x802D6C60, 0x00000010, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x666C6F5F, 0x31330000, 0x666C6F5F, 0x30300000, }; diff --git a/src/EEDF50.c b/src/EEDF50.c index 730d3f6124..fc02cbe4d4 100644 --- a/src/EEDF50.c +++ b/src/EEDF50.c @@ -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" diff --git a/src/EF2680.c b/src/EF2680.c index 794b519fa7..4b3e14d633 100644 --- a/src/EF2680.c +++ b/src/EF2680.c @@ -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" diff --git a/src/world/area_arn/arn_03/arn_03.h b/src/world/area_arn/arn_03/arn_03.h index d4b86042ab..e6a6584cb2 100644 --- a/src/world/area_arn/arn_03/arn_03.h +++ b/src/world/area_arn/arn_03/arn_03.h @@ -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); diff --git a/src/world/area_arn/arn_03/events.c b/src/world/area_arn/arn_03/events.c index ca6496ef08..d99a3a847a 100644 --- a/src/world/area_arn/arn_03/events.c +++ b/src/world/area_arn/arn_03/events.c @@ -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" diff --git a/src/world/area_arn/arn_04/events.c b/src/world/area_arn/arn_04/events.c index 0109415a7d..a4f40c42df 100644 --- a/src/world/area_arn/arn_04/events.c +++ b/src/world/area_arn/arn_04/events.c @@ -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, diff --git a/src/world/area_arn/arn_05/events.c b/src/world/area_arn/arn_05/events.c index 3d07020c5d..6a702c8c10 100644 --- a/src/world/area_arn/arn_05/events.c +++ b/src/world/area_arn/arn_05/events.c @@ -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; diff --git a/src/world/area_arn/arn_07/events.c b/src/world/area_arn/arn_07/events.c index ab1c062335..adf4813f8a 100644 --- a/src/world/area_arn/arn_07/events.c +++ b/src/world/area_arn/arn_07/events.c @@ -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; diff --git a/src/world/area_dgb/dgb_01/BFD9A0.c b/src/world/area_dgb/dgb_01/BFD9A0.c index d3872044a6..420bb59f19 100644 --- a/src/world/area_dgb/dgb_01/BFD9A0.c +++ b/src/world/area_dgb/dgb_01/BFD9A0.c @@ -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" diff --git a/src/world/area_dgb/dgb_03/C31730.c b/src/world/area_dgb/dgb_03/C31730.c index 5cab6b1e95..c562905f49 100644 --- a/src/world/area_dgb/dgb_03/C31730.c +++ b/src/world/area_dgb/dgb_03/C31730.c @@ -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; diff --git a/src/world/area_dgb/dgb_04/C36530.c b/src/world/area_dgb/dgb_04/C36530.c index 0ef3a8cb5b..0abf522878 100644 --- a/src/world/area_dgb/dgb_04/C36530.c +++ b/src/world/area_dgb/dgb_04/C36530.c @@ -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; diff --git a/src/world/area_dgb/dgb_08/C3FDB0.c b/src/world/area_dgb/dgb_08/C3FDB0.c index 7aa98ea63c..2ca2b20632 100644 --- a/src/world/area_dgb/dgb_08/C3FDB0.c +++ b/src/world/area_dgb/dgb_08/C3FDB0.c @@ -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; diff --git a/src/world/area_dgb/dgb_09/C46BE0.c b/src/world/area_dgb/dgb_09/C46BE0.c index 9cfc2d39ad..8659c40ae4 100644 --- a/src/world/area_dgb/dgb_09/C46BE0.c +++ b/src/world/area_dgb/dgb_09/C46BE0.c @@ -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; diff --git a/src/world/area_dgb/dgb_15/C4F510.c b/src/world/area_dgb/dgb_15/C4F510.c index 09fd8e854e..6fcede79b2 100644 --- a/src/world/area_dgb/dgb_15/C4F510.c +++ b/src/world/area_dgb/dgb_15/C4F510.c @@ -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" diff --git a/src/world/area_dgb/dgb_18/C55F40.c b/src/world/area_dgb/dgb_18/C55F40.c index 372bd891ce..c05fae18f6 100644 --- a/src/world/area_dgb/dgb_18/C55F40.c +++ b/src/world/area_dgb/dgb_18/C55F40.c @@ -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" diff --git a/src/world/area_dro/dro_01/95B7E0.c b/src/world/area_dro/dro_01/95B7E0.c index 637b62dd4b..f61ad210bd 100644 --- a/src/world/area_dro/dro_01/95B7E0.c +++ b/src/world/area_dro/dro_01/95B7E0.c @@ -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" diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c index 9f4a6e8ddd..2be5aeb752 100644 --- a/src/world/area_dro/dro_02/9694C0.c +++ b/src/world/area_dro/dro_02/9694C0.c @@ -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" diff --git a/src/world/area_dro/dro_02/dro_02.h b/src/world/area_dro/dro_02/dro_02.h index 33827c1945..ccc60040b0 100644 --- a/src/world/area_dro/dro_02/dro_02.h +++ b/src/world/area_dro/dro_02/dro_02.h @@ -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); diff --git a/src/world/area_flo/flo_00/C9DF60.c b/src/world/area_flo/flo_00/C9DF60.c index 5d025718ae..5c5baf0162 100644 --- a/src/world/area_flo/flo_00/C9DF60.c +++ b/src/world/area_flo/flo_00/C9DF60.c @@ -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; diff --git a/src/world/area_flo/flo_08/CAFAC0.c b/src/world/area_flo/flo_08/CAFAC0.c index 3795e36bbb..e72194b942 100644 --- a/src/world/area_flo/flo_08/CAFAC0.c +++ b/src/world/area_flo/flo_08/CAFAC0.c @@ -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" diff --git a/src/world/area_flo/flo_08/flo_08.h b/src/world/area_flo/flo_08/flo_08.h index f9f787c2a9..fdf63678e8 100644 --- a/src/world/area_flo/flo_08/flo_08.h +++ b/src/world/area_flo/flo_08/flo_08.h @@ -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; diff --git a/src/world/area_flo/flo_09/CB5320.c b/src/world/area_flo/flo_09/CB5320.c index 790ad9a189..f5c71f72cd 100644 --- a/src/world/area_flo/flo_09/CB5320.c +++ b/src/world/area_flo/flo_09/CB5320.c @@ -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" diff --git a/src/world/area_flo/flo_13/CC3850.c b/src/world/area_flo/flo_13/CC3850.c index 0a2725fdce..ec3057718c 100644 --- a/src/world/area_flo/flo_13/CC3850.c +++ b/src/world/area_flo/flo_13/CC3850.c @@ -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" diff --git a/src/world/area_flo/flo_14/CCBE20.c b/src/world/area_flo/flo_14/CCBE20.c index df794ca878..3be2fcee8f 100644 --- a/src/world/area_flo/flo_14/CCBE20.c +++ b/src/world/area_flo/flo_14/CCBE20.c @@ -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" diff --git a/src/world/area_flo/flo_14/flo_14.h b/src/world/area_flo/flo_14/flo_14.h index 84729d7efd..131443193d 100644 --- a/src/world/area_flo/flo_14/flo_14.h +++ b/src/world/area_flo/flo_14/flo_14.h @@ -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); diff --git a/src/world/area_flo/flo_16/CD2C80.c b/src/world/area_flo/flo_16/CD2C80.c index 707c29dabf..29da8bfa8b 100644 --- a/src/world/area_flo/flo_16/CD2C80.c +++ b/src/world/area_flo/flo_16/CD2C80.c @@ -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" diff --git a/src/world/area_flo/flo_17/CD7350.c b/src/world/area_flo/flo_17/CD7350.c index 9b8ef9252d..ced9cc2519 100644 --- a/src/world/area_flo/flo_17/CD7350.c +++ b/src/world/area_flo/flo_17/CD7350.c @@ -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" diff --git a/src/world/area_flo/flo_23/CEE2A0.c b/src/world/area_flo/flo_23/CEE2A0.c index 246964fbd0..cf9af549cf 100644 --- a/src/world/area_flo/flo_23/CEE2A0.c +++ b/src/world/area_flo/flo_23/CEE2A0.c @@ -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" diff --git a/src/world/area_flo/flo_23/flo_23.h b/src/world/area_flo/flo_23/flo_23.h index 1b7aa7d34c..d68b2d5c8a 100644 --- a/src/world/area_flo/flo_23/flo_23.h +++ b/src/world/area_flo/flo_23/flo_23.h @@ -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); diff --git a/src/world/area_flo/flo_25/CF2C10.c b/src/world/area_flo/flo_25/CF2C10.c index 819db45a09..71e5b072a6 100644 --- a/src/world/area_flo/flo_25/CF2C10.c +++ b/src/world/area_flo/flo_25/CF2C10.c @@ -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" diff --git a/src/world/area_flo/flo_25/flo_25.h b/src/world/area_flo/flo_25/flo_25.h index d7f10175f8..545fcdd0c5 100644 --- a/src/world/area_flo/flo_25/flo_25.h +++ b/src/world/area_flo/flo_25/flo_25.h @@ -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); diff --git a/src/world/area_hos/hos_02/A17210.c b/src/world/area_hos/hos_02/A17210.c index aca84f5df5..c6ae153590 100644 --- a/src/world/area_hos/hos_02/A17210.c +++ b/src/world/area_hos/hos_02/A17210.c @@ -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" diff --git a/src/world/area_hos/hos_03/A1BDB0.c b/src/world/area_hos/hos_03/A1BDB0.c index 20fd4c192b..147259166d 100644 --- a/src/world/area_hos/hos_03/A1BDB0.c +++ b/src/world/area_hos/hos_03/A1BDB0.c @@ -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" diff --git a/src/world/area_isk/isk_04/97B670.c b/src/world/area_isk/isk_04/97B670.c index 54b6beeac0..099cd42ac3 100644 --- a/src/world/area_isk/isk_04/97B670.c +++ b/src/world/area_isk/isk_04/97B670.c @@ -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" diff --git a/src/world/area_isk/isk_05/97DAD0.c b/src/world/area_isk/isk_05/97DAD0.c index cb5ad6ec34..cef5f0eba2 100644 --- a/src/world/area_isk/isk_05/97DAD0.c +++ b/src/world/area_isk/isk_05/97DAD0.c @@ -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" diff --git a/src/world/area_isk/isk_08/984E30.c b/src/world/area_isk/isk_08/984E30.c index d35b9f5a7a..b3adbca34b 100644 --- a/src/world/area_isk/isk_08/984E30.c +++ b/src/world/area_isk/isk_08/984E30.c @@ -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" diff --git a/src/world/area_isk/isk_13/98F7E0.c b/src/world/area_isk/isk_13/98F7E0.c index b90f5caea7..d4ece9dd89 100644 --- a/src/world/area_isk/isk_13/98F7E0.c +++ b/src/world/area_isk/isk_13/98F7E0.c @@ -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" diff --git a/src/world/area_isk/isk_14/992730.c b/src/world/area_isk/isk_14/992730.c index ffbddb8a90..f39b5e4140 100644 --- a/src/world/area_isk/isk_14/992730.c +++ b/src/world/area_isk/isk_14/992730.c @@ -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" diff --git a/src/world/area_isk/isk_18/997F70.c b/src/world/area_isk/isk_18/997F70.c index b534603b06..a9035388d0 100644 --- a/src/world/area_isk/isk_18/997F70.c +++ b/src/world/area_isk/isk_18/997F70.c @@ -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" diff --git a/src/world/area_jan/jan_01/B28030.c b/src/world/area_jan/jan_01/B28030.c index 3de5e6ded8..78ad43f08b 100644 --- a/src/world/area_jan/jan_01/B28030.c +++ b/src/world/area_jan/jan_01/B28030.c @@ -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" diff --git a/src/world/area_jan/jan_02/B2C8A0.c b/src/world/area_jan/jan_02/B2C8A0.c index d4dd79fb5f..1398026b34 100644 --- a/src/world/area_jan/jan_02/B2C8A0.c +++ b/src/world/area_jan/jan_02/B2C8A0.c @@ -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" diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c index 0667653603..7e6add9efc 100644 --- a/src/world/area_jan/jan_03/B34BD0.c +++ b/src/world/area_jan/jan_03/B34BD0.c @@ -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"; diff --git a/src/world/area_jan/jan_05/B4B260.c b/src/world/area_jan/jan_05/B4B260.c index 29eff209c5..9cf07186cd 100644 --- a/src/world/area_jan/jan_05/B4B260.c +++ b/src/world/area_jan/jan_05/B4B260.c @@ -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" diff --git a/src/world/area_jan/jan_06/B52F70.c b/src/world/area_jan/jan_06/B52F70.c index 364b8d80be..ecf96d4c27 100644 --- a/src/world/area_jan/jan_06/B52F70.c +++ b/src/world/area_jan/jan_06/B52F70.c @@ -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); diff --git a/src/world/area_jan/jan_10/B6C6A0.c b/src/world/area_jan/jan_10/B6C6A0.c index ea14588dbc..d0b9209764 100644 --- a/src/world/area_jan/jan_10/B6C6A0.c +++ b/src/world/area_jan/jan_10/B6C6A0.c @@ -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" diff --git a/src/world/area_jan/jan_14/B7A510.c b/src/world/area_jan/jan_14/B7A510.c index 5411e19510..894e6090ad 100644 --- a/src/world/area_jan/jan_14/B7A510.c +++ b/src/world/area_jan/jan_14/B7A510.c @@ -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" diff --git a/src/world/area_jan/jan_22/B84180.c b/src/world/area_jan/jan_22/B84180.c index a73f838aeb..20c06a027f 100644 --- a/src/world/area_jan/jan_22/B84180.c +++ b/src/world/area_jan/jan_22/B84180.c @@ -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" diff --git a/src/world/area_kkj/kkj_00/ABB340.c b/src/world/area_kkj/kkj_00/ABB340.c index 1a11785755..70f7098359 100644 --- a/src/world/area_kkj/kkj_00/ABB340.c +++ b/src/world/area_kkj/kkj_00/ABB340.c @@ -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"; diff --git a/src/world/area_kkj/kkj_01/AC5170.c b/src/world/area_kkj/kkj_01/AC5170.c index e89385351f..cb36b08bc2 100644 --- a/src/world/area_kkj/kkj_01/AC5170.c +++ b/src/world/area_kkj/kkj_01/AC5170.c @@ -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" diff --git a/src/world/area_kmr/kmr_02/8B0070.c b/src/world/area_kmr/kmr_02/8B0070.c index 816eaf8c4d..e3ad732740 100644 --- a/src/world/area_kmr/kmr_02/8B0070.c +++ b/src/world/area_kmr/kmr_02/8B0070.c @@ -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"; diff --git a/src/world/area_kmr/kmr_05/8CE070.c b/src/world/area_kmr/kmr_05/8CE070.c index c07e68a565..98fe4f4aff 100644 --- a/src/world/area_kmr/kmr_05/8CE070.c +++ b/src/world/area_kmr/kmr_05/8CE070.c @@ -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" diff --git a/src/world/area_kmr/kmr_06/8D1510.c b/src/world/area_kmr/kmr_06/8D1510.c index 9daa0e6393..f0f4202ccf 100644 --- a/src/world/area_kmr/kmr_06/8D1510.c +++ b/src/world/area_kmr/kmr_06/8D1510.c @@ -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" diff --git a/src/world/area_kmr/kmr_07/8D3DC0.c b/src/world/area_kmr/kmr_07/8D3DC0.c index 6dcebb68ee..06b94b909b 100644 --- a/src/world/area_kmr/kmr_07/8D3DC0.c +++ b/src/world/area_kmr/kmr_07/8D3DC0.c @@ -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 diff --git a/src/world/area_kmr/kmr_09/8D5E00.c b/src/world/area_kmr/kmr_09/8D5E00.c index 18a3d3bf91..7595a01ffe 100644 --- a/src/world/area_kmr/kmr_09/8D5E00.c +++ b/src/world/area_kmr/kmr_09/8D5E00.c @@ -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); diff --git a/src/world/area_kmr/kmr_11/8DA3A0.c b/src/world/area_kmr/kmr_11/8DA3A0.c index a6612c3e65..a0ffe13971 100644 --- a/src/world/area_kmr/kmr_11/8DA3A0.c +++ b/src/world/area_kmr/kmr_11/8DA3A0.c @@ -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); diff --git a/src/world/area_kpa/kpa_01/A470C0.c b/src/world/area_kpa/kpa_01/A470C0.c index 3827976419..4669163b9a 100644 --- a/src/world/area_kpa/kpa_01/A470C0.c +++ b/src/world/area_kpa/kpa_01/A470C0.c @@ -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" diff --git a/src/world/area_kpa/kpa_03/A48720.c b/src/world/area_kpa/kpa_03/A48720.c index 78a0d34357..4e00c158ca 100644 --- a/src/world/area_kpa/kpa_03/A48720.c +++ b/src/world/area_kpa/kpa_03/A48720.c @@ -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" diff --git a/src/world/area_kpa/kpa_09/A4F0A0.c b/src/world/area_kpa/kpa_09/A4F0A0.c index ecc891d7b5..aca836bfb3 100644 --- a/src/world/area_kpa/kpa_09/A4F0A0.c +++ b/src/world/area_kpa/kpa_09/A4F0A0.c @@ -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" diff --git a/src/world/area_kpa/kpa_102/A93A50.c b/src/world/area_kpa/kpa_102/A93A50.c index bdb74a40e4..da10684b63 100644 --- a/src/world/area_kpa/kpa_102/A93A50.c +++ b/src/world/area_kpa/kpa_102/A93A50.c @@ -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" diff --git a/src/world/area_kpa/kpa_11/A52BD0.c b/src/world/area_kpa/kpa_11/A52BD0.c index cd257def81..ae1e2070d7 100644 --- a/src/world/area_kpa/kpa_11/A52BD0.c +++ b/src/world/area_kpa/kpa_11/A52BD0.c @@ -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" diff --git a/src/world/area_kpa/kpa_111/A99590.c b/src/world/area_kpa/kpa_111/A99590.c index 11a41efadf..63d4ea08ea 100644 --- a/src/world/area_kpa/kpa_111/A99590.c +++ b/src/world/area_kpa/kpa_111/A99590.c @@ -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" diff --git a/src/world/area_kpa/kpa_113/A9CC70.c b/src/world/area_kpa/kpa_113/A9CC70.c index 0aaa24f123..4a117fb4fa 100644 --- a/src/world/area_kpa/kpa_113/A9CC70.c +++ b/src/world/area_kpa/kpa_113/A9CC70.c @@ -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" diff --git a/src/world/area_kpa/kpa_115/A9ED40.c b/src/world/area_kpa/kpa_115/A9ED40.c index 275c528cea..2818f2dc04 100644 --- a/src/world/area_kpa/kpa_115/A9ED40.c +++ b/src/world/area_kpa/kpa_115/A9ED40.c @@ -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" diff --git a/src/world/area_kpa/kpa_50/A609D0.c b/src/world/area_kpa/kpa_50/A609D0.c index 5e1c4a8372..34dcd283ff 100644 --- a/src/world/area_kpa/kpa_50/A609D0.c +++ b/src/world/area_kpa/kpa_50/A609D0.c @@ -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" diff --git a/src/world/area_kpa/kpa_51/A640E0.c b/src/world/area_kpa/kpa_51/A640E0.c index e24a4fb883..91a37b7e9e 100644 --- a/src/world/area_kpa/kpa_51/A640E0.c +++ b/src/world/area_kpa/kpa_51/A640E0.c @@ -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" diff --git a/src/world/area_kpa/kpa_52/A671E0.c b/src/world/area_kpa/kpa_52/A671E0.c index 2fe02987bc..28bfb04093 100644 --- a/src/world/area_kpa/kpa_52/A671E0.c +++ b/src/world/area_kpa/kpa_52/A671E0.c @@ -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" diff --git a/src/world/area_kpa/kpa_61/A6E6F0.c b/src/world/area_kpa/kpa_61/A6E6F0.c index b580ce5417..f148793deb 100644 --- a/src/world/area_kpa/kpa_61/A6E6F0.c +++ b/src/world/area_kpa/kpa_61/A6E6F0.c @@ -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" diff --git a/src/world/area_kpa/kpa_70/A74B80.c b/src/world/area_kpa/kpa_70/A74B80.c index 810e26a643..300a076f3c 100644 --- a/src/world/area_kpa/kpa_70/A74B80.c +++ b/src/world/area_kpa/kpa_70/A74B80.c @@ -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" diff --git a/src/world/area_kpa/kpa_91/A86A50.c b/src/world/area_kpa/kpa_91/A86A50.c index ce10bf8397..c200bd4eae 100644 --- a/src/world/area_kpa/kpa_91/A86A50.c +++ b/src/world/area_kpa/kpa_91/A86A50.c @@ -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" diff --git a/src/world/area_kpa/kpa_95/A8CB60.c b/src/world/area_kpa/kpa_95/A8CB60.c index f5600174f1..e1a98b22fd 100644 --- a/src/world/area_kpa/kpa_95/A8CB60.c +++ b/src/world/area_kpa/kpa_95/A8CB60.c @@ -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" diff --git a/src/world/area_kzn/kzn_02/C5AC20.c b/src/world/area_kzn/kzn_02/C5AC20.c index 612f2abfb1..5d5fe2936f 100644 --- a/src/world/area_kzn/kzn_02/C5AC20.c +++ b/src/world/area_kzn/kzn_02/C5AC20.c @@ -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" diff --git a/src/world/area_kzn/kzn_03/C61020.c b/src/world/area_kzn/kzn_03/C61020.c index 7d10b06b3e..e9902f41d3 100644 --- a/src/world/area_kzn/kzn_03/C61020.c +++ b/src/world/area_kzn/kzn_03/C61020.c @@ -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" diff --git a/src/world/area_kzn/kzn_07/C6EA50.c b/src/world/area_kzn/kzn_07/C6EA50.c index d95799543b..9b1182736d 100644 --- a/src/world/area_kzn/kzn_07/C6EA50.c +++ b/src/world/area_kzn/kzn_07/C6EA50.c @@ -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" diff --git a/src/world/area_kzn/kzn_08/C71ED0.c b/src/world/area_kzn/kzn_08/C71ED0.c index 69aa2994a9..3b55d1798e 100644 --- a/src/world/area_kzn/kzn_08/C71ED0.c +++ b/src/world/area_kzn/kzn_08/C71ED0.c @@ -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" diff --git a/src/world/area_kzn/kzn_09/C77D00.c b/src/world/area_kzn/kzn_09/C77D00.c index 61e075a7e3..f07685db59 100644 --- a/src/world/area_kzn/kzn_09/C77D00.c +++ b/src/world/area_kzn/kzn_09/C77D00.c @@ -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" diff --git a/src/world/area_kzn/kzn_11/C80600.c b/src/world/area_kzn/kzn_11/C80600.c index 39534ab5c7..d9bbca1b4f 100644 --- a/src/world/area_kzn/kzn_11/C80600.c +++ b/src/world/area_kzn/kzn_11/C80600.c @@ -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); diff --git a/src/world/area_kzn/kzn_17/C85DC0.c b/src/world/area_kzn/kzn_17/C85DC0.c index f800cebdf4..346c348705 100644 --- a/src/world/area_kzn/kzn_17/C85DC0.c +++ b/src/world/area_kzn/kzn_17/C85DC0.c @@ -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" diff --git a/src/world/area_mac/mac_00/7ED280.c b/src/world/area_mac/mac_00/7ED280.c index 2a711eb288..f0cea2d436 100644 --- a/src/world/area_mac/mac_00/7ED280.c +++ b/src/world/area_mac/mac_00/7ED280.c @@ -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"; diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c index 4b80dbb997..f20f90ee20 100644 --- a/src/world/area_mac/mac_01/8017D0.c +++ b/src/world/area_mac/mac_01/8017D0.c @@ -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"; diff --git a/src/world/area_mac/mac_01/805DD0.c b/src/world/area_mac/mac_01/805DD0.c index c9971f114e..c674b67d45 100644 --- a/src/world/area_mac/mac_01/805DD0.c +++ b/src/world/area_mac/mac_01/805DD0.c @@ -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 diff --git a/src/world/area_mac/mac_02/823BF0.c b/src/world/area_mac/mac_02/823BF0.c index 701163e8e2..21ce9458c3 100644 --- a/src/world/area_mac/mac_02/823BF0.c +++ b/src/world/area_mac/mac_02/823BF0.c @@ -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); diff --git a/src/world/area_mac/mac_05/852170.c b/src/world/area_mac/mac_05/852170.c index e03fc54f80..d11320366e 100644 --- a/src/world/area_mac/mac_05/852170.c +++ b/src/world/area_mac/mac_05/852170.c @@ -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); diff --git a/src/world/area_mgm/mgm_00/E0E7A0.c b/src/world/area_mgm/mgm_00/E0E7A0.c index 95ed8b534a..64076cc66f 100644 --- a/src/world/area_mgm/mgm_00/E0E7A0.c +++ b/src/world/area_mgm/mgm_00/E0E7A0.c @@ -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) { diff --git a/src/world/area_mim/mim_02/B97C70.c b/src/world/area_mim/mim_02/B97C70.c index 6fc7840a3f..a2e0456306 100644 --- a/src/world/area_mim/mim_02/B97C70.c +++ b/src/world/area_mim/mim_02/B97C70.c @@ -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" diff --git a/src/world/area_mim/mim_04/B9DB60.c b/src/world/area_mim/mim_04/B9DB60.c index 1ab88df90a..9e6bdd9e2f 100644 --- a/src/world/area_mim/mim_04/B9DB60.c +++ b/src/world/area_mim/mim_04/B9DB60.c @@ -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" diff --git a/src/world/area_mim/mim_06/BA4CF0.c b/src/world/area_mim/mim_06/BA4CF0.c index 213d7a5cc1..8a420557e0 100644 --- a/src/world/area_mim/mim_06/BA4CF0.c +++ b/src/world/area_mim/mim_06/BA4CF0.c @@ -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" diff --git a/src/world/area_mim/mim_07/BAA3B0.c b/src/world/area_mim/mim_07/BAA3B0.c index 2173e294d8..0a00ca22ec 100644 --- a/src/world/area_mim/mim_07/BAA3B0.c +++ b/src/world/area_mim/mim_07/BAA3B0.c @@ -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" diff --git a/src/world/area_mim/mim_08/BAD940.c b/src/world/area_mim/mim_08/BAD940.c index fc8df5fb53..67bba16e64 100644 --- a/src/world/area_mim/mim_08/BAD940.c +++ b/src/world/area_mim/mim_08/BAD940.c @@ -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" diff --git a/src/world/area_mim/mim_09/BB2E00.c b/src/world/area_mim/mim_09/BB2E00.c index 3148333465..09687a2b23 100644 --- a/src/world/area_mim/mim_09/BB2E00.c +++ b/src/world/area_mim/mim_09/BB2E00.c @@ -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" diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c index 23074735cb..6d891fb4af 100644 --- a/src/world/area_nok/nok_01/9C53E0.c +++ b/src/world/area_nok/nok_01/9C53E0.c @@ -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" diff --git a/src/world/area_nok/nok_02/9D7AA0.c b/src/world/area_nok/nok_02/9D7AA0.c index 100a4b0704..a50d1967ab 100644 --- a/src/world/area_nok/nok_02/9D7AA0.c +++ b/src/world/area_nok/nok_02/9D7AA0.c @@ -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"; diff --git a/src/world/area_nok/nok_03/9EB7F0.c b/src/world/area_nok/nok_03/9EB7F0.c index ec0d0d6749..5b9cee095c 100644 --- a/src/world/area_nok/nok_03/9EB7F0.c +++ b/src/world/area_nok/nok_03/9EB7F0.c @@ -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" diff --git a/src/world/area_nok/nok_11/9F4A40.c b/src/world/area_nok/nok_11/9F4A40.c index 4accda5951..580533a803 100644 --- a/src/world/area_nok/nok_11/9F4A40.c +++ b/src/world/area_nok/nok_11/9F4A40.c @@ -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) { diff --git a/src/world/area_nok/nok_12/9FAD60.c b/src/world/area_nok/nok_12/9FAD60.c index caa5cc98b1..65a99594a4 100644 --- a/src/world/area_nok/nok_12/9FAD60.c +++ b/src/world/area_nok/nok_12/9FAD60.c @@ -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" diff --git a/src/world/area_nok/nok_13/A00600.c b/src/world/area_nok/nok_13/A00600.c index 7c8ab396fd..164a12bc94 100644 --- a/src/world/area_nok/nok_13/A00600.c +++ b/src/world/area_nok/nok_13/A00600.c @@ -5,18 +5,4 @@ static char* N(exit_str_1) = "nok_01"; static char* N(exit_str_2) = "nok_14"; static char* N(exit_str_3) = ""; -#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" diff --git a/src/world/area_nok/nok_14/A02A00.c b/src/world/area_nok/nok_14/A02A00.c index 462b42eae8..2d3b02ffd0 100644 --- a/src/world/area_nok/nok_14/A02A00.c +++ b/src/world/area_nok/nok_14/A02A00.c @@ -1,36 +1,8 @@ #include "nok_14.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/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" // todo remove when below are decompiled static const f32 padding = 0.0f; diff --git a/src/world/area_nok/nok_15/A06F00.c b/src/world/area_nok/nok_15/A06F00.c index 039483dc52..4ade4eae91 100644 --- a/src/world/area_nok/nok_15/A06F00.c +++ b/src/world/area_nok/nok_15/A06F00.c @@ -7,37 +7,9 @@ static char* N(exit_str_3) = ""; #include "world/common/atomic/Pipe.inc.c" -#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" // todo remove when below are decompiled static const f32 padding = 0.0f; diff --git a/src/world/area_omo/omo_02/D9D510.c b/src/world/area_omo/omo_02/D9D510.c index 9a6a8144da..977f1c79b5 100644 --- a/src/world/area_omo/omo_02/D9D510.c +++ b/src/world/area_omo/omo_02/D9D510.c @@ -16,43 +16,9 @@ INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80240AB0_D9DF80); INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80240BA8_D9E078); -#include "world/common/UnkNpcAIFunc43.inc.c" +#include "world/common/atomic/enemy/UnkAI_4.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/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/SetNpcB5_3.inc.c" diff --git a/src/world/area_omo/omo_04/DAD400.c b/src/world/area_omo/omo_04/DAD400.c index 4a72f0865e..8bbe91f082 100644 --- a/src/world/area_omo/omo_04/DAD400.c +++ b/src/world/area_omo/omo_04/DAD400.c @@ -17,27 +17,7 @@ static char* N(exit_str_1) = ""; INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_802402F4_DAD6F4); -#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_ASM(s32, "world/area_omo/omo_04/DAD400", func_80241898_DAEC98); diff --git a/src/world/area_omo/omo_05/DB22C0.c b/src/world/area_omo/omo_05/DB22C0.c index e3b66e2705..433ea9c199 100644 --- a/src/world/area_omo/omo_05/DB22C0.c +++ b/src/world/area_omo/omo_05/DB22C0.c @@ -19,27 +19,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_802405BC_DB287C); INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80240780_DB2A40); -#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/GetNpcCollisionHeight.inc.c" diff --git a/src/world/area_omo/omo_07/DBD2B0.c b/src/world/area_omo/omo_07/DBD2B0.c index 7c53058d16..d9e190336b 100644 --- a/src/world/area_omo/omo_07/DBD2B0.c +++ b/src/world/area_omo/omo_07/DBD2B0.c @@ -13,29 +13,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80240140_DBD3F0); INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80240238_DBD4E8); -#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_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_802413FC_DBE6AC); @@ -49,27 +27,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_8024153C_DBE7EC); INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80241634_DBE8E4); -#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/SetCamera0Flag1000.inc.c" diff --git a/src/world/area_omo/omo_09/DCD6B0.c b/src/world/area_omo/omo_09/DCD6B0.c index b76edfa394..58bb4f40f7 100644 --- a/src/world/area_omo/omo_09/DCD6B0.c +++ b/src/world/area_omo/omo_09/DCD6B0.c @@ -10,29 +10,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80240B20_DCD7F0); INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80240C18_DCD8E8); -#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_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80241DDC_DCEAAC); @@ -46,23 +24,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80241F1C_DCEBEC); INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80242014_DCECE4); -#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/SetNpcB5_3.inc.c" diff --git a/src/world/area_omo/omo_17/DEF400.c b/src/world/area_omo/omo_17/DEF400.c index 82ff927861..aebed9cf99 100644 --- a/src/world/area_omo/omo_17/DEF400.c +++ b/src/world/area_omo/omo_17/DEF400.c @@ -16,45 +16,9 @@ INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80240B1C_DEF9BC); INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80240CE0_DEFB80); -#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/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/SetNpcB5_3.inc.c" diff --git a/src/world/area_pra/pra_35/D8D270.c b/src/world/area_pra/pra_35/D8D270.c index a404e2d81b..e11330c8e0 100644 --- a/src/world/area_pra/pra_35/D8D270.c +++ b/src/world/area_pra/pra_35/D8D270.c @@ -2,29 +2,7 @@ #include "world/common/atomic/Reflection.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/UnkNpcAIFunc6.inc.c" diff --git a/src/world/area_sam/sam_06/D203E0.c b/src/world/area_sam/sam_06/D203E0.c index 15615d3b9f..b2a9754a50 100644 --- a/src/world/area_sam/sam_06/D203E0.c +++ b/src/world/area_sam/sam_06/D203E0.c @@ -1,26 +1,6 @@ #include "sam_06.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" #include "world/common/StashVars.inc.c" diff --git a/src/world/area_sbk/sbk_30/93F5B0.c b/src/world/area_sbk/sbk_30/93F5B0.c index e11cdc83fb..ea03fa7f0b 100644 --- a/src/world/area_sbk/sbk_30/93F5B0.c +++ b/src/world/area_sbk/sbk_30/93F5B0.c @@ -13,25 +13,7 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80240000_93F5B0); #include "world/common/SpawnSunEffect.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" #include "world/common/StashVars.inc.c" diff --git a/src/world/area_tik/tik_07/87AC00.c b/src/world/area_tik/tik_07/87AC00.c index 19d282b134..df6d6eb4f3 100644 --- a/src/world/area_tik/tik_07/87AC00.c +++ b/src/world/area_tik/tik_07/87AC00.c @@ -19,25 +19,4 @@ ApiStatus func_80241390_87AF70(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } - -#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" diff --git a/src/world/area_tik/tik_09/882BF0.c b/src/world/area_tik/tik_09/882BF0.c index 3285552df3..0bd507e57c 100644 --- a/src/world/area_tik/tik_09/882BF0.c +++ b/src/world/area_tik/tik_09/882BF0.c @@ -1,14 +1,6 @@ #include "tik_09.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" ApiStatus func_80241204_8833C4(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; diff --git a/src/world/area_tik/tik_12/88A530.c b/src/world/area_tik/tik_12/88A530.c index e48fa77191..73e67f270d 100644 --- a/src/world/area_tik/tik_12/88A530.c +++ b/src/world/area_tik/tik_12/88A530.c @@ -1,13 +1,5 @@ #include "tik_12.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" diff --git a/src/world/area_tik/tik_20/89ACB0.c b/src/world/area_tik/tik_20/89ACB0.c index 4da5c83035..704c33354c 100644 --- a/src/world/area_tik/tik_20/89ACB0.c +++ b/src/world/area_tik/tik_20/89ACB0.c @@ -1,11 +1,3 @@ #include "tik_20.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" diff --git a/src/world/area_tik/tik_23/8A2D30.c b/src/world/area_tik/tik_23/8A2D30.c index 8c78e569f6..80c99ccaab 100644 --- a/src/world/area_tik/tik_23/8A2D30.c +++ b/src/world/area_tik/tik_23/8A2D30.c @@ -1,11 +1,3 @@ #include "tik_23.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" diff --git a/src/world/area_tik/tik_24/8A5DE0.c b/src/world/area_tik/tik_24/8A5DE0.c index 44db909c7f..f39607579a 100644 --- a/src/world/area_tik/tik_24/8A5DE0.c +++ b/src/world/area_tik/tik_24/8A5DE0.c @@ -2,12 +2,4 @@ #include "world/common/UnkPosFunc2.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" diff --git a/src/world/area_trd/trd_01/99CD80.c b/src/world/area_trd/trd_01/99CD80.c index 930c2c0c27..be79f59738 100644 --- a/src/world/area_trd/trd_01/99CD80.c +++ b/src/world/area_trd/trd_01/99CD80.c @@ -1,34 +1,8 @@ #include "trd_01.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/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" ApiStatus func_80241630_99DFC0(Evt* script, s32 isInitialCall) { Enemy* owner1 = script->owner1.enemy; diff --git a/src/world/area_trd/trd_02/9A10C0.c b/src/world/area_trd/trd_02/9A10C0.c index dc80f61b42..636fc62e9c 100644 --- a/src/world/area_trd/trd_02/9A10C0.c +++ b/src/world/area_trd/trd_02/9A10C0.c @@ -1,37 +1,7 @@ #include "trd_02.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" diff --git a/src/world/area_trd/trd_03/9A46F0.c b/src/world/area_trd/trd_03/9A46F0.c index 411351fcf5..0aa1129ffe 100644 --- a/src/world/area_trd/trd_03/9A46F0.c +++ b/src/world/area_trd/trd_03/9A46F0.c @@ -1,11 +1,3 @@ #include "trd_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" diff --git a/src/world/area_trd/trd_04/9A88A0.c b/src/world/area_trd/trd_04/9A88A0.c index e3f428380d..2daf778840 100644 --- a/src/world/area_trd/trd_04/9A88A0.c +++ b/src/world/area_trd/trd_04/9A88A0.c @@ -1,62 +1,12 @@ #include "trd_04.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" -#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" // todo remove when below are decompiled static const f32 padding = 0.0f; diff --git a/src/world/area_trd/trd_07/9B6C90.c b/src/world/area_trd/trd_07/9B6C90.c index 030459c64b..0c715af2ec 100644 --- a/src/world/area_trd/trd_07/9B6C90.c +++ b/src/world/area_trd/trd_07/9B6C90.c @@ -1,36 +1,8 @@ #include "trd_07.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/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" // todo remove when below are decompiled static const f32 padding = 0.0f; diff --git a/src/world/common/DeadUnkNpcAIMainFunc.inc.c b/src/world/common/DeadUnkNpcAIMainFunc.inc.c new file mode 100644 index 0000000000..706667e4d5 --- /dev/null +++ b/src/world/common/DeadUnkNpcAIMainFunc.inc.c @@ -0,0 +1,98 @@ +#include "common.h" +#include "npc.h" +#include "dead_structs.h" + +ApiStatus N(DeadUnkNpcAIMainFunc)(Evt* script, s32 isInitialCall) { + DeadEnemy* enemy = (DeadEnemy*)script->owner1.enemy; + Npc* npc = dead_get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); + f32 posX, posY, posZ, posW; + + territory.unk_00 = 0; + territory.shape = enemy->territory->patrol.detectShape; + territory.pointX = enemy->territory->patrol.detect.x; + territory.pointZ = enemy->territory->patrol.detect.z; + territory.sizeX = enemy->territory->patrol.detectSizeX; + territory.sizeZ = enemy->territory->patrol.detectSizeZ; + territory.unk_18 = 65.0f; + territory.unk_1C = 0; + + enemy->unk_108.x = npc->pos.x; + enemy->unk_108.y = npc->pos.y; + enemy->unk_108.z = npc->pos.z; + enemy->unk_114 = 0.0001f; + enemy->unk_118 = 0.0001f; + + if (isInitialCall || enemy->unk_B0 & 4) { + script->functionTemp[0] = 0; + npc->duration = 0; + npc->currentAnim.w = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->patrol.isFlying) { + npc->flags = (npc->flags | 0x200) & ~8; + } else { + npc->flags = (npc->flags & ~0x200) | 8; + } + + if (enemy->unk_B0 & 4) { + script->functionTemp[0] = 99; + script->functionTemp[1] = 0; + enemy->unk_B0 &= ~4; + } else if (enemy->flags & ENEMY_FLAGS_40000000) { + script->functionTemp[0] = 12; + enemy->flags &= ~ENEMY_FLAGS_40000000; + } + + posX = npc->pos.x; + posY = npc->pos.y + npc->collisionHeight; + posZ = npc->pos.z; + posW = 100.0f; + + if (npc_raycast_down_sides(npc->collisionChannel, &posX, &posY, &posZ, &posW)) { + npc->pos.y = posY; + } + } + + switch (script->functionTemp[0]) { + case 0x0: + N(UnkNpcAIFunc24)(script, npcAISettings, territoryPtr); + /* fallthrough */ + case 0x1: + N(UnkFunc13)(script, npcAISettings, territoryPtr); + break; + case 0x2: + N(UnkNpcAIFunc1)(script, npcAISettings, territoryPtr); + /* fallthrough */ + case 0x3: + N(UnkFunc14)(script, npcAISettings, territoryPtr); + break; + case 0x4: + N(UnkNpcAIFunc25)(script, npcAISettings, territoryPtr); + break; + case 0xA: + N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); + /* fallthrough */ + case 0xB: + N(NpcJumpFunc)(script, npcAISettings, territoryPtr); + break; + case 0xC: + N(UnkNpcAIFunc13)(script, npcAISettings, territoryPtr); + /* fallthrough */ + case 0xD: + N(UnkFunc15)(script, npcAISettings, territoryPtr); + break; + case 0xE: + N(UnkNpcDurationFlagFunc)(script, npcAISettings, territoryPtr); + break; + case 0xF: + N(UnkFunc16)(script, npcAISettings, territoryPtr); + break; + case 0x63: + func_8004EB8C(script); + break; + } + return 0; +} diff --git a/src/world/common/DeadUnkNpcAIMainFunc10.inc.c b/src/world/common/DeadUnkNpcAIMainFunc10.inc.c new file mode 100644 index 0000000000..9aaf6f9179 --- /dev/null +++ b/src/world/common/DeadUnkNpcAIMainFunc10.inc.c @@ -0,0 +1,69 @@ +#include "common.h" +#include "npc.h" +#include "effects.h" +#include "dead_structs.h" + +ApiStatus N(DeadUnkNpcAIMainFunc10)(Evt* script, s32 isInitialCall) { + DeadEnemy* enemy = script->owner1.enemy; + Bytecode* args = script->ptrReadPos; + Npc* npc = get_npc_unsafe(enemy->npcID); + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* aiSettings =(NpcAISettings*) evt_get_variable(script, *args); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_18 = 120.0f; + territory.unk_1C = 0; + + enemy->unk_108.x = npc->pos.x; + enemy->unk_108.y = npc->pos.y; + enemy->unk_108.z = npc->pos.z; + enemy->unk_114 = 0.0001f; + enemy->unk_118 = 0.0001f; + + if (isInitialCall) { + N(UnkFunc5)(npc, enemy, script, aiSettings); + script->functionTemp[0] = 0; + } + npc->unk_AB = -2; + + if (enemy->unk_B0 & 4) { + if (enemy->unk_B4) { + return ApiStatus_BLOCK; + } + enemy->unk_B0 &= ~4; + } + + switch (script->functionTemp[0]) { + case 0: + N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr); + case 1: + N(UnkNpcAIFunc35)(script, aiSettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc1_copy)(script, aiSettings, territoryPtr); + case 3: + N(UnkFunc4)(script, aiSettings, territoryPtr); + break; + case 10: + N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr); + case 11: + N(SixFloatsFunc)(script, aiSettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc13)(script, aiSettings, territoryPtr); + case 13: + N(UnkNpcAIFunc34)(script, aiSettings, territoryPtr); + break; + case 20: + N(UnkFunc45)(script, aiSettings, territoryPtr); + break; + } + + return ApiStatus_BLOCK; +} diff --git a/src/world/common/DeadUnkNpcAIMainFunc9.inc.c b/src/world/common/DeadUnkNpcAIMainFunc9.inc.c new file mode 100644 index 0000000000..4088aac6c6 --- /dev/null +++ b/src/world/common/DeadUnkNpcAIMainFunc9.inc.c @@ -0,0 +1,71 @@ +#include "common.h" +#include "npc.h" +#include "dead_structs.h" + +ApiStatus N(DeadUnkNpcAIMainFunc9)(Evt* script, s32 isInitialCall) { + DeadEnemy* enemy = (DeadEnemy*)script->owner1.enemy; + Bytecode* args = script->ptrReadPos; + Npc* npc = get_npc_unsafe(enemy->npcID); + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* aiSettings = (NpcAISettings*) evt_get_variable(script, *args); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_18 = 120.0f; + territory.unk_1C = 0; + + enemy->unk_108.x = npc->pos.x; + enemy->unk_108.y = npc->pos.y; + enemy->unk_108.z = npc->pos.z; + enemy->unk_114 = 0.0001f; + enemy->unk_118 = 0.0001f; + + if (isInitialCall) { + N(UnkFunc5)(npc, (Enemy*)enemy, script, aiSettings); + } + + npc->unk_AB = -2; + + if (enemy->unk_B0 & 4) { + if (enemy->unk_B4 != 0) { + return ApiStatus_BLOCK; + } + enemy->unk_B0 &= ~4; + } + switch (script->functionTemp[0]) { + case 0: + N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr); + /* fallthrough */ + case 1: + N(UnkNpcAIFunc35)(script, aiSettings, territoryPtr); + return 0; + case 2: + N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); + /* fallthrough */ + case 3: + N(UnkFunc4)(script, aiSettings, territoryPtr); + return 0; + case 10: + N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr); + /* fallthrough */ + case 11: + N(SixFloatsFunc)(script, aiSettings, territoryPtr); + return 0; + case 12: + N(UnkNpcAIFunc14)(script, aiSettings, territoryPtr); + return 0; + case 13: + N(UnkNpcAIFunc3)(script, aiSettings, territoryPtr); + return 0; + case 14: + N(UnkFunc6)(script, aiSettings, territoryPtr); + /* fallthrough */ + default: + return 0; + } +} diff --git a/src/world/common/UnkFunc11.inc.c b/src/world/common/UnkFunc11.inc.c index 93cfb78039..87350018fa 100644 --- a/src/world/common/UnkFunc11.inc.c +++ b/src/world/common/UnkFunc11.inc.c @@ -6,7 +6,7 @@ ApiStatus N(UnkFunc11)(Evt* script, s32 isInitialCall) { PlayerStatus* playerStatus = &gPlayerStatus; CollisionStatus* collisionStatus = &gCollisionStatus; - if (((collisionStatus->pushingAgainstWall != var) && (playerStatus->actionState == 20)) || + if (((collisionStatus->pushingAgainstWall != var) && (playerStatus->actionState == ACTION_STATE_14)) || playerStatus->enableCollisionOverlapsCheck || playerStatus->inputEnabledCounter) { set_action_state(0); script->varTable[0] = 0; @@ -15,7 +15,7 @@ ApiStatus N(UnkFunc11)(Evt* script, s32 isInitialCall) { if (collisionStatus->pushingAgainstWall != var) { script->varTable[0] = 0; - } else if ((playerStatus->actionState != 20) && (playerStatus->actionState != 1) && + } else if ((playerStatus->actionState != ACTION_STATE_14) && (playerStatus->actionState != 1) && (playerStatus->actionState != 2)) { script->varTable[0] = 0; } else if (playerStatus->animFlags & 1) { diff --git a/src/world/common/atomic/ItemChoice_FlowerGuard.inc.c b/src/world/common/atomic/ItemChoice_FlowerGuard.inc.c new file mode 100644 index 0000000000..d36aa666da --- /dev/null +++ b/src/world/common/atomic/ItemChoice_FlowerGuard.inc.c @@ -0,0 +1,42 @@ +#include "common.h" + +ApiStatus N(FlowerGuard_SetItemEntityPosition)(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 itemIdx = evt_get_variable(script, *args++); + s32 x = evt_get_variable(script, *args++); + s32 y = evt_get_variable(script, *args++); + s32 z = evt_get_variable(script, *args++); + ItemEntity* item = get_item_entity(itemIdx); + + item->position.x = x; + item->position.y = y; + item->position.z = z; + + return ApiStatus_DONE2; +} + +ApiStatus N(FlowerGuard_JudgeItemTastiness)(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 & ITEM_TYPE_FLAG_FOOD_OR_DRINK) { + script->varTable[9] = 1; + } else { + script->varTable[9] = 0; + } + + return ApiStatus_DONE2; +} + +ApiStatus N(FlowerGuard_MakeItemList)(Evt* script, s32 isInitialCall) { + s32 i; + + for (i = 0; i <= (ITEM_LAST_VALID_CONSUMABLE - ITEM_FIRST_CONSUMABLE); i++) { + N(FlowerGuard_ItemChoiceList)[i] = ITEM_FIRST_CONSUMABLE + i; + } + + N(FlowerGuard_ItemChoiceList)[(ITEM_LAST_VALID_CONSUMABLE - ITEM_FIRST_CONSUMABLE) + 1] = ITEM_NONE; + return ApiStatus_DONE2; +} diff --git a/src/world/common/atomic/ItemChoice_PartA.inc.c b/src/world/common/atomic/ItemChoice_PartA.inc.c new file mode 100644 index 0000000000..f73449c29c --- /dev/null +++ b/src/world/common/atomic/ItemChoice_PartA.inc.c @@ -0,0 +1,29 @@ +#include "common.h" + +#include "world/common/GetNpcCollisionHeight.inc.c" + +#include "world/common/AddPlayerHandsOffset.inc.c" + +ApiStatus N(ItemChoice_WaitForSelection)(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + + if (isInitialCall) { + N(ItemChoice_HasSelectedItem) = FALSE; + } + + if (N(ItemChoice_HasSelectedItem)) { + N(ItemChoice_HasSelectedItem) = FALSE; + evt_set_variable(script, *args, N(ItemChoice_SelectedItemID)); + return ApiStatus_DONE2; + } + + return ApiStatus_BLOCK; +} + +ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + + N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args); + N(ItemChoice_HasSelectedItem) = TRUE; + return ApiStatus_DONE2; +} diff --git a/src/world/common/atomic/MakeConsumableChoice.inc.c b/src/world/common/atomic/MakeConsumableChoice.inc.c new file mode 100644 index 0000000000..b4c402e186 --- /dev/null +++ b/src/world/common/atomic/MakeConsumableChoice.inc.c @@ -0,0 +1,20 @@ +#include "common.h" + +ApiStatus N(BuildItemChoiceList)(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32* allowedItemList = (s32*)evt_get_variable(script, *args++); + s32 i; + + if (allowedItemList != NULL) { + for (i = 0; allowedItemList[i] != ITEM_NONE; i++) { + N(ItemChoiceList)[i] = allowedItemList[i]; + } + N(ItemChoiceList)[i] = ITEM_NONE; + } else { + for (i = 0; i <= (ITEM_LAST_VALID_CONSUMABLE - ITEM_FIRST_CONSUMABLE); i++) { + N(ItemChoiceList)[i] = ITEM_FIRST_CONSUMABLE + i; + N(ItemChoiceList)[(ITEM_LAST_VALID_CONSUMABLE - ITEM_FIRST_CONSUMABLE) + 1] = ITEM_NONE; + } + } + return ApiStatus_DONE2; +} diff --git a/src/world/common/atomic/MakeKeyChoice.inc.c b/src/world/common/atomic/MakeKeyChoice.inc.c new file mode 100644 index 0000000000..da16ea461e --- /dev/null +++ b/src/world/common/atomic/MakeKeyChoice.inc.c @@ -0,0 +1,20 @@ +#include "common.h" + +ApiStatus N(BuildKeyItemChoiceList)(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32* allowedItemList = (s32*)evt_get_variable(script, *args++); + s32 i; + + if (allowedItemList != NULL) { + for (i = 0; allowedItemList[i] != ITEM_NONE; i++) { + N(KeyItemChoiceList)[i] = allowedItemList[i]; + } + N(KeyItemChoiceList)[i] = ITEM_NONE; + } else { + for (i = 0; i <= (ITEM_LAST_KEY - ITEM_FIRST_VALID_KEY); i++) { + N(KeyItemChoiceList)[i] = ITEM_FIRST_VALID_KEY + i; + N(KeyItemChoiceList)[(ITEM_LAST_KEY - ITEM_FIRST_VALID_KEY) + 1] = ITEM_NONE; // vanilla oddity -- should be after the loop! + } + } + return ApiStatus_DONE2; +} diff --git a/src/world/common/atomic/enemy/Dead_UnkAI_1.inc.c b/src/world/common/atomic/enemy/Dead_UnkAI_1.inc.c new file mode 100644 index 0000000000..e22830b60c --- /dev/null +++ b/src/world/common/atomic/enemy/Dead_UnkAI_1.inc.c @@ -0,0 +1,23 @@ +#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/DeadUnkNpcAIMainFunc.inc.c" diff --git a/src/world/common/atomic/enemy/Dead_UnkAI_9.inc.c b/src/world/common/atomic/enemy/Dead_UnkAI_9.inc.c new file mode 100644 index 0000000000..9824f0e43f --- /dev/null +++ b/src/world/common/atomic/enemy/Dead_UnkAI_9.inc.c @@ -0,0 +1,21 @@ +#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 "world/common/DeadUnkNpcAIMainFunc9.inc.c" diff --git a/src/world/common/atomic/enemy/ThrowAttackAI.inc.c b/src/world/common/atomic/enemy/ThrowAttackAI.inc.c new file mode 100644 index 0000000000..36ddc5aaa4 --- /dev/null +++ b/src/world/common/atomic/enemy/ThrowAttackAI.inc.c @@ -0,0 +1,17 @@ +#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" diff --git a/src/world/common/atomic/enemy/UnkAI_1.inc.c b/src/world/common/atomic/enemy/UnkAI_1.inc.c new file mode 100644 index 0000000000..670f7212d0 --- /dev/null +++ b/src/world/common/atomic/enemy/UnkAI_1.inc.c @@ -0,0 +1,32 @@ +// stand in one place, chase the player on sight +// if the player is lost, do not attempt to return home + +// see: goomba in arn_04, Tubbla Blubba +// included in many maps where it goes unused + +#include "world/common/UnkNpcAIFunc24.inc.c" + +#include "world/common/UnkFunc13.inc.c" + +// found in 9 files +#include "world/common/UnkNpcAIFunc1.inc.c" + +#include "world/common/UnkFunc14.inc.c" + +#include "world/common/UnkNpcAIFunc25.inc.c" + +#include "world/common/NpcJumpFunc2.inc.c" + +// shared +#include "world/common/NpcJumpFunc.inc.c" + +// found in 4 files +#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" diff --git a/src/world/common/atomic/enemy/UnkAI_10.inc.c b/src/world/common/atomic/enemy/UnkAI_10.inc.c new file mode 100644 index 0000000000..b7e8688790 --- /dev/null +++ b/src/world/common/atomic/enemy/UnkAI_10.inc.c @@ -0,0 +1,7 @@ +#include "world/common/UnkNpcAIFunc13.inc.c" + +#include "world/common/UnkNpcAIFunc34.inc.c" + +#include "world/common/UnkFunc45.inc.c" + +#include "world/common/UnkNpcAIMainFunc10.inc.c" diff --git a/src/world/common/atomic/enemy/UnkAI_2.inc.c b/src/world/common/atomic/enemy/UnkAI_2.inc.c new file mode 100644 index 0000000000..bbf404ec4e --- /dev/null +++ b/src/world/common/atomic/enemy/UnkAI_2.inc.c @@ -0,0 +1,34 @@ +#include "world/common/UnkNpcAIFunc36.inc.c" + +#include "world/common/UnkNpcAIFunc37.inc.c" + +// used in 38 files +//#include "world/common/UnkNpcAIFunc1.inc.c" +void N(UnkNpcAIFunc1)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->duration = (aiSettings->waitTime / 2) + rand_int((aiSettings->waitTime / 2) + 1); + npc->yaw = clamp_angle(npc->yaw + rand_int(180) - 90.0f); + npc->currentAnim.w = *enemy->animList; + script->functionTemp[0] = 3; +} + +#include "world/common/UnkNpcAIFunc38.inc.c" + +#include "world/common/UnkNpcAIFunc15.inc.c" + +#include "world/common/UnkNpcAIFunc39.inc.c" + +// used in 11 files +// #include "world/common/UnkDurationCheck.inc.c" +void N(UnkDurationCheck)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { + Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); + + npc->duration--; + if (npc->duration <= 0) { + script->functionTemp[0] = 0; + } +} + +#include "world/common/UnkNpcAIMainFunc2.inc.c" diff --git a/src/world/common/atomic/enemy/UnkAI_3.inc.c b/src/world/common/atomic/enemy/UnkAI_3.inc.c new file mode 100644 index 0000000000..5c21f49cc2 --- /dev/null +++ b/src/world/common/atomic/enemy/UnkAI_3.inc.c @@ -0,0 +1,5 @@ +#include "world/common/atomic/enemy/UnkAI_2.inc.c" + +#include "world/common/UnkNpcAIFunc40.inc.c" + +#include "world/common/UnkNpcAIMainFunc3.inc.c" diff --git a/src/world/common/atomic/enemy/UnkAI_4.inc.c b/src/world/common/atomic/enemy/UnkAI_4.inc.c new file mode 100644 index 0000000000..3db3f1d5d3 --- /dev/null +++ b/src/world/common/atomic/enemy/UnkAI_4.inc.c @@ -0,0 +1,20 @@ +#include "world/common/UnkNpcAIFunc43.inc.c" + +#include "world/common/UnkNpcAIFunc44.inc.c" + +#include "world/common/NpcJumpFunc3.inc.c" + +// shared +#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" diff --git a/src/world/common/atomic/enemy/UnkAI_5.inc.c b/src/world/common/atomic/enemy/UnkAI_5.inc.c new file mode 100644 index 0000000000..b7c7e567e8 --- /dev/null +++ b/src/world/common/atomic/enemy/UnkAI_5.inc.c @@ -0,0 +1,3 @@ +#include "world/common/atomic/enemy/UnkAI_StateHandlers_A.inc.c" + +#include "world/common/UnkNpcAIMainFunc5.inc.c" diff --git a/src/world/common/atomic/enemy/UnkAI_6.inc.c b/src/world/common/atomic/enemy/UnkAI_6.inc.c new file mode 100644 index 0000000000..f7a47c489a --- /dev/null +++ b/src/world/common/atomic/enemy/UnkAI_6.inc.c @@ -0,0 +1,5 @@ +// include an entire different AI +#include "world/common/atomic/enemy/UnkAI_5.inc.c" + +// unique to this file +#include "world/common/UnkNpcAIMainFunc6.inc.c" diff --git a/src/world/common/atomic/enemy/UnkAI_9.inc.c b/src/world/common/atomic/enemy/UnkAI_9.inc.c new file mode 100644 index 0000000000..23ee2ac7fb --- /dev/null +++ b/src/world/common/atomic/enemy/UnkAI_9.inc.c @@ -0,0 +1,21 @@ +#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" diff --git a/src/world/common/atomic/enemy/UnkAI_StateHandlers_A.inc.c b/src/world/common/atomic/enemy/UnkAI_StateHandlers_A.inc.c new file mode 100644 index 0000000000..2359aa6657 --- /dev/null +++ b/src/world/common/atomic/enemy/UnkAI_StateHandlers_A.inc.c @@ -0,0 +1,4 @@ +#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" diff --git a/src/world/script_api/7E0E80.c b/src/world/script_api/7E0E80.c index fd4b369c2a..97cdff1854 100644 --- a/src/world/script_api/7E0E80.c +++ b/src/world/script_api/7E0E80.c @@ -258,7 +258,7 @@ ApiStatus ShowShopPurchaseDialog(Evt* script, s32 isInitialCall) { D_80286530 = 0; D_80286534 = 0; bpCost = -1; - if (shopItem->typeFlags & ITEM_TYPE_FLAGS_40) { + if (shopItem->typeFlags & ITEM_TYPE_FLAG_BADGE) { bpCost = gMoveTable[shopItem->moveID].costBP; } script->functionTemp[1] = shop_owner_buy_dialog(0, shopItem->nameMsg, shopInventory->price, bpCost); diff --git a/ver/us/asm/data/EBA260.data.s b/ver/us/asm/data/EBA260.data.s index 50e9c957ca..1deaeaeedc 100644 --- a/ver/us/asm/data/EBA260.data.s +++ b/ver/us/asm/data/EBA260.data.s @@ -51,7 +51,7 @@ dlabel D_8024289C_EBB6EC .word 0x3FC00000, 0x0000001E, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 dlabel D_802428CC_EBB71C -.word 0x00000043, 0x00000002, func_80240BD4_EB9A24, D_8024289C_EBB6EC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, EB8E90_DeadUnkNpcAIMainFunc, D_8024289C_EBB6EC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802428EC_EBB73C .word 0x00000000, 0x002A001C, 0x00000000, 0x00000000, D_802428CC_EBB71C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 diff --git a/ver/us/asm/data/ECBC10.data.s b/ver/us/asm/data/ECBC10.data.s index de553b4c32..8ea367b171 100644 --- a/ver/us/asm/data/ECBC10.data.s +++ b/ver/us/asm/data/ECBC10.data.s @@ -71,20 +71,20 @@ dlabel D_8024306C_ECCD6C dlabel D_8024308C_ECCD8C .word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, D_8024306C_ECCD6C, 0x8007D3C0, 0x00000000, 0x8007D4EC, 0x00000000, 0x00000000, 0x00130000 -dlabel D_802430B8_ECCDB8 +dlabel ECAA80_ItemChoice_HasSelectedItem .word 0x00000000 -dlabel D_802430BC_ECCDBC +dlabel ECAA80_ItemChoice_SelectedItemID .word 0x00000000 dlabel D_802430C0_ECCDC0 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3C8C, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EDC, 0xFE363C81, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, ECAA80_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802419F0_ECB6F0, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802431F4_ECCEF4 -.word 0x00000043, 0x00000002, func_80241A28_ECB728, 0xFE363C80, 0x0000004E, 0x00000006, D_802430C0_ECCDC0, 0x00000010, 0x00000000, D_802462F0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024199C_ECB69C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, ECAA80_BuildItemChoiceList, 0xFE363C80, 0x0000004E, 0x00000006, D_802430C0_ECCDC0, 0x00000010, 0x00000000, ECAA80_ItemChoiceList, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024199C_ECB69C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243244_ECCF44 -.word 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x0000000A, 0x00000002, 0xF84060D4, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x0000015E, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24AC480, 0xF24A5C80, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00C60202, 0x00C60201, 0x00000000, 0x00110042, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010021, 0x00000043, 0x00000001, func_80241BF8_ECB8F8, 0x00000024, 0x00000002, 0xFE363C80, 0x80246460, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000046, 0x00000001, D_802431F4_ECCEF4, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001A, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010000, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00C60202, 0x00C60201, 0x00000000, 0x00110043, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000043, 0x00000002, func_80241B88_ECB888, 0xFE363C80, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C88, 0xFFFFFD49, 0x00000014, 0xFFFFFFE3, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C80, 0x00000043, 0x00000004, 0x802DD70C, 0xFFFFFFFF, 0x00002095, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00C60203, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C87, 0x00000014, 0x00000001, 0xFE363C88, 0x00000016, 0x00000001, 0x000000A0, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00C60204, 0x00C60201, 0x00000000, 0x00110046, 0x00000043, 0x00000004, 0x802DD70C, 0xFFFFFFFF, 0x0000021C, 0x00000000, 0x00000043, 0x00000005, 0x802DD82C, 0xFFFFFFFF, 0x00C60209, 0x00C60208, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00C60207, 0x00000043, 0x00000004, 0x802D7AC0, 0x00000011, 0x000001C9, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000011, 0x7FFFFE00, 0x00000043, 0x00000005, 0x802E1C00, 0x00000000, 0x00000064, 0x0000001E, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000026, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000026, 0x00000002, 0xFE363C89, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C88, 0xF24A7C80, 0x0000002E, 0x00000002, 0xFE363C89, 0xF24A7F4D, 0x00000043, 0x00000006, 0x802D60E4, 0x00000067, 0xFE363C88, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0x00000068, 0xFE363C88, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0x00000069, 0xFE363C88, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0x00000063, 0xFE363C89, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0x00000064, 0xFE363C89, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0x00000065, 0xFE363C89, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00C60205, 0x00000024, 0x00000002, 0xF84060D4, 0x00000001, 0x00000016, 0x00000001, 0x0000009F, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00C60204, 0x00C60201, 0x00000000, 0x00110045, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00C60201, 0x00000016, 0x00000001, 0x0000009E, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00C60204, 0x00C60201, 0x00000000, 0x00110045, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00C60201, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00C60204, 0x00C60201, 0x00000000, 0x00110044, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00C60206, 0x00000043, 0x00000004, 0x802DD70C, 0xFFFFFFFF, 0x00002096, 0x00000000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C88, 0x0000007D, 0x00000014, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C80, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, 0x802E1E80, 0xFFFFFFFF, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000005, 0x802E1C00, 0x00000000, 0x00000064, 0x00000007, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000026, 0x00000002, 0xFE363C82, 0xF24A7880, 0x00000026, 0x00000002, 0xFE363C83, 0xF24A79B4, 0x00000026, 0x00000002, 0xFE363C84, 0xF24A7E1A, 0x0000002E, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C83, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C84, 0xFE363C80, 0x0000002C, 0x00000002, 0xFE363C82, 0xF23F8A80, 0x0000002C, 0x00000002, 0xFE363C83, 0xF24AB680, 0x0000002C, 0x00000002, 0xFE363C84, 0xF24A1680, 0x00000043, 0x00000005, func_80241AC4_ECB7C4, 0xFE363C87, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x00000000, 0x00000064, 0x00000007, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000026, 0x00000002, 0xFE363C82, 0xF24A7C80, 0x00000026, 0x00000002, 0xFE363C83, 0xF24A79B4, 0x00000026, 0x00000002, 0xFE363C84, 0xF24A7E1A, 0x0000002E, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C83, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C84, 0xFE363C80, 0x0000002C, 0x00000002, 0xFE363C82, 0xF23FB280, 0x0000002C, 0x00000002, 0xFE363C83, 0xF24AB680, 0x0000002C, 0x00000002, 0xFE363C84, 0xF24A1680, 0x00000043, 0x00000005, func_80241AC4_ECB7C4, 0xFE363C87, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00C60201, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C87, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00C60201, 0x00000043, 0x00000005, 0x802DD82C, 0xFFFFFFFF, 0x00C60202, 0x00C60201, 0x00000000, 0x00000023, 0x00000000, 0x00000023, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, 0x802D9DE4, 0x00000000, 0xF24A9280, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000012, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000039, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00C60209, 0x00C60208, 0x00000000, 0x00110047, 0x00000012, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00C60209, 0x00C60208, 0x00000000, 0x00110048, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x0000000A, 0x00000002, 0xF84060D4, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x0000015E, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24AC480, 0xF24A5C80, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00C60202, 0x00C60201, 0x00000000, 0x00110042, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010021, 0x00000043, 0x00000001, ECAA80_FlowerGuard_MakeItemList, 0x00000024, 0x00000002, 0xFE363C80, 0x80246460, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000046, 0x00000001, D_802431F4_ECCEF4, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001A, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010000, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00C60202, 0x00C60201, 0x00000000, 0x00110043, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000043, 0x00000002, ECAA80_FlowerGuard_JudgeItemTastiness, 0xFE363C80, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C88, 0xFFFFFD49, 0x00000014, 0xFFFFFFE3, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C80, 0x00000043, 0x00000004, 0x802DD70C, 0xFFFFFFFF, 0x00002095, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00C60203, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C87, 0x00000014, 0x00000001, 0xFE363C88, 0x00000016, 0x00000001, 0x000000A0, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00C60204, 0x00C60201, 0x00000000, 0x00110046, 0x00000043, 0x00000004, 0x802DD70C, 0xFFFFFFFF, 0x0000021C, 0x00000000, 0x00000043, 0x00000005, 0x802DD82C, 0xFFFFFFFF, 0x00C60209, 0x00C60208, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00C60207, 0x00000043, 0x00000004, 0x802D7AC0, 0x00000011, 0x000001C9, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000011, 0x7FFFFE00, 0x00000043, 0x00000005, 0x802E1C00, 0x00000000, 0x00000064, 0x0000001E, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000026, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000026, 0x00000002, 0xFE363C89, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C88, 0xF24A7C80, 0x0000002E, 0x00000002, 0xFE363C89, 0xF24A7F4D, 0x00000043, 0x00000006, 0x802D60E4, 0x00000067, 0xFE363C88, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0x00000068, 0xFE363C88, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0x00000069, 0xFE363C88, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0x00000063, 0xFE363C89, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0x00000064, 0xFE363C89, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0x00000065, 0xFE363C89, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00C60205, 0x00000024, 0x00000002, 0xF84060D4, 0x00000001, 0x00000016, 0x00000001, 0x0000009F, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00C60204, 0x00C60201, 0x00000000, 0x00110045, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00C60201, 0x00000016, 0x00000001, 0x0000009E, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00C60204, 0x00C60201, 0x00000000, 0x00110045, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00C60201, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00C60204, 0x00C60201, 0x00000000, 0x00110044, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00C60206, 0x00000043, 0x00000004, 0x802DD70C, 0xFFFFFFFF, 0x00002096, 0x00000000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C88, 0x0000007D, 0x00000014, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C80, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, 0x802E1E80, 0xFFFFFFFF, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000005, 0x802E1C00, 0x00000000, 0x00000064, 0x00000007, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000026, 0x00000002, 0xFE363C82, 0xF24A7880, 0x00000026, 0x00000002, 0xFE363C83, 0xF24A79B4, 0x00000026, 0x00000002, 0xFE363C84, 0xF24A7E1A, 0x0000002E, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C83, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C84, 0xFE363C80, 0x0000002C, 0x00000002, 0xFE363C82, 0xF23F8A80, 0x0000002C, 0x00000002, 0xFE363C83, 0xF24AB680, 0x0000002C, 0x00000002, 0xFE363C84, 0xF24A1680, 0x00000043, 0x00000005, ECAA80_FlowerGuard_SetItemEntityPosition, 0xFE363C87, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x00000000, 0x00000064, 0x00000007, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000026, 0x00000002, 0xFE363C82, 0xF24A7C80, 0x00000026, 0x00000002, 0xFE363C83, 0xF24A79B4, 0x00000026, 0x00000002, 0xFE363C84, 0xF24A7E1A, 0x0000002E, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C83, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C84, 0xFE363C80, 0x0000002C, 0x00000002, 0xFE363C82, 0xF23FB280, 0x0000002C, 0x00000002, 0xFE363C83, 0xF24AB680, 0x0000002C, 0x00000002, 0xFE363C84, 0xF24A1680, 0x00000043, 0x00000005, ECAA80_FlowerGuard_SetItemEntityPosition, 0xFE363C87, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00C60201, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C87, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00C60201, 0x00000043, 0x00000005, 0x802DD82C, 0xFFFFFFFF, 0x00C60202, 0x00C60201, 0x00000000, 0x00000023, 0x00000000, 0x00000023, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, 0x802D9DE4, 0x00000000, 0xF24A9280, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000012, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000039, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00C60209, 0x00C60208, 0x00000000, 0x00110047, 0x00000012, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00C60209, 0x00C60208, 0x00000000, 0x00110048, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243B50_ECD850 .word 0x00000043, 0x00000003, 0x80049154, 0xFFFFFFFF, D_80243244_ECCF44, 0x0000000A, 0x00000002, 0xF84060D4, 0x00000001, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00C60205, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000011, 0x7FFFFE00, 0x00000043, 0x00000006, 0x802D60E4, 0x00000067, 0x00000032, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0x00000068, 0x00000032, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0x00000069, 0x00000032, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0x00000063, 0x00000078, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0x00000064, 0x00000078, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0x00000065, 0x00000078, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/ED1840.data.s b/ver/us/asm/data/ED1840.data.s index bb2454ac29..47b98eb264 100644 --- a/ver/us/asm/data/ED1840.data.s +++ b/ver/us/asm/data/ED1840.data.s @@ -99,7 +99,7 @@ dlabel D_80243674_ED3664 .word 0x3F800000, 0x0000001E, 0x00000005, 0x42A00000, 0x41F00000, 0x00000002, 0x40900000, 0x00000006, 0x00000001, 0x42B40000, 0x41F00000, 0x00000001 dlabel D_802436A4_ED3694 -.word 0x00000043, 0x00000003, 0x8004930C, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0xFFFFFD8A, 0x00000043, 0x00000003, 0x8004930C, 0x00000006, 0x00000032, 0x00000043, 0x00000003, 0x8004930C, 0x00000001, 0x000000C8, 0x00000043, 0x00000002, func_8024162C_ED161C, D_80243674_ED3664, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, 0x8004930C, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0xFFFFFD8A, 0x00000043, 0x00000003, 0x8004930C, 0x00000006, 0x00000032, 0x00000043, 0x00000003, 0x8004930C, 0x00000001, 0x000000C8, 0x00000043, 0x00000002, ED0310_DeadUnkNpcAIMainFunc9, D_80243674_ED3664, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243714_ED3704 .word 0x00000000, 0x001A0018, 0x00000000, 0x00000000, D_802436A4_ED3694, 0x8007D3C0, 0x00000000, 0x8007D4EC, 0x00000000, 0x00000000, 0x00130000 diff --git a/ver/us/asm/data/EE8970.data.s b/ver/us/asm/data/EE8970.data.s index 55b9033447..9384ddf63f 100644 --- a/ver/us/asm/data/EE8970.data.s +++ b/ver/us/asm/data/EE8970.data.s @@ -72,7 +72,7 @@ dlabel D_80244508_EEAAB8 .word 0x3F800000, 0x0000001E, 0x00000005, 0x42A00000, 0x41F00000, 0x00000002, 0x40900000, 0x00000006, 0x00000001, 0x42B40000, 0x41F00000, 0x00000001 dlabel D_80244538_EEAAE8 -.word 0x00000043, 0x00000003, 0x8004930C, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0xFFFFFD8A, 0x00000043, 0x00000003, 0x8004930C, 0x00000006, 0x00000032, 0x00000043, 0x00000003, 0x8004930C, 0x00000001, 0x000000C8, 0x00000043, 0x00000002, func_80241E1C_EE83CC, D_80244508_EEAAB8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, 0x8004930C, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0xFFFFFD8A, 0x00000043, 0x00000003, 0x8004930C, 0x00000006, 0x00000032, 0x00000043, 0x00000003, 0x8004930C, 0x00000001, 0x000000C8, 0x00000043, 0x00000002, EE70C0_DeadUnkNpcAIMainFunc9, D_80244508_EEAAB8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802445A8_EEAB58 .word 0x00000000, 0x001A0018, 0x00000000, 0x00000000, D_80244538_EEAAE8, 0x8007D3C0, 0x00000000, 0x8007D4EC, 0x00000000, 0x00000000, 0x00130000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_18/AF4BB0.data.s b/ver/us/asm/data/world/area_kkj/kkj_18/AF4BB0.data.s index 883e74719c..fa91ccd0d3 100644 --- a/ver/us/asm/data/world/area_kkj/kkj_18/AF4BB0.data.s +++ b/ver/us/asm/data/world/area_kkj/kkj_18/AF4BB0.data.s @@ -12,7 +12,7 @@ dlabel D_80241F18_AF4BB8 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kkj_18_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802405C0_AF3260, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802405F8_AF3298, 0xFE363C80, 0x0000004E, 0x00000006, D_80241F18_AF4BB8, 0x00000010, 0x00000000, tik_07_sixFloats, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024056C_AF320C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802420AC_AF4D4C -.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kkj_18_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802405C0_AF3260, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240694_AF3334, 0xFE363C80, 0x0000004E, 0x00000006, D_802420AC_AF4D4C, 0x00000010, 0x00000000, D_80244E78_A1B098, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024056C_AF320C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kkj_18_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802405C0_AF3260, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240694_AF3334, 0xFE363C80, 0x0000004E, 0x00000006, D_802420AC_AF4D4C, 0x00000010, 0x00000000, D_80244E78, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024056C_AF320C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242230_AF4ED0 .word 0xC1B80000, 0x41F00000, 0x42100000, 0x41800000, 0x42780000, 0xC1200000, 0x42800000, 0x425C0000, 0x40A00000, 0x42E00000, 0x42380000, 0x41A00000, 0x43200000, 0x42700000, 0xC1C80000 diff --git a/ver/us/asm/data/world/area_pra/pra_22/D78BF0.data.s b/ver/us/asm/data/world/area_pra/pra_22/D78BF0.data.s index d321ff8c42..d57e8744fb 100644 --- a/ver/us/asm/data/world/area_pra/pra_22/D78BF0.data.s +++ b/ver/us/asm/data/world/area_pra/pra_22/D78BF0.data.s @@ -21,7 +21,7 @@ dlabel D_80240510_D78D90 .word 0x00000043, 0x00000002, GetLoadType, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, EnterSavePoint, 0x00000044, 0x00000001, D_802404C8_D78D48, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000002A, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000046, 0x00000001, EnterSingleDoor, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, D_80240370_D78BF0, 0x00000024, 0x00000002, 0xFE363C83, D_80240378_D78BF8, 0x00000046, 0x00000001, D_802861B0_7E7030, 0x00000023, 0x00000000, 0x00000044, 0x00000001, D_802404C8_D78D48, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240608_D78E88 -.word 0x00000005, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_22_UnkFunc11, 0xFE363C89, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000064, 0xF24A7CE7, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C82, 0xFE363C86, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0xFE363C81, 0x00000064, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000001, func_802400DC_D7895C, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080002, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000008, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFE363C86, 0xFE363C87, 0x00000064, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000001C, 0x80000010, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000021, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000026, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001C, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x80000010, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000005, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_22_UnkFunc11, 0xFE363C89, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000064, 0xF24A7CE7, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C82, 0xFE363C86, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0xFE363C81, 0x00000064, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000001, pra_22_UnkFunc12, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080002, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000008, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFE363C86, 0xFE363C87, 0x00000064, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000001C, 0x80000010, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000021, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000026, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001C, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x80000010, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240AB0_D79330 .word 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000E, 0x00000002, 0xFE363C80, 0x00000151, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000032, 0x00000024, 0x00000002, 0xFE363C88, 0x00000002, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C80, 0x0000019D, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0xFFFFFFCE, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000012, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x0000001C, 0x00000046, 0x00000001, D_80240608_D78E88, 0x0000000B, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000054, 0x00000024, 0x00000002, 0xF5DE029E, 0xFE363C88, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000A, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000048, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000015, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000018, 0x00000018, 0x00000028, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000046, 0x00000001, 0x80241088, 0x00000044, 0x00000001, 0x80240330, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000054, 0x00000047, 0x00000005, D_80240AB0_D79330, 0x00000040, 0x0000001C, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000012, 0x00000000, 0x00000014, 0x00000001, 0xF5DE029E, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFCE, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFCE, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x00000032, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001C, 0x00000021, 0x00000043, 0x00000005, TranslateModel, 0x00000021, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000026, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001C, 0x00000044, 0x00000001, D_80240510_D78D90, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/nonmatchings/EB8E90/func_80240BD4_EB9A24.s b/ver/us/asm/nonmatchings/EB8E90/func_80240BD4_EB9A24.s deleted file mode 100644 index 794453e298..0000000000 --- a/ver/us/asm/nonmatchings/EB8E90/func_80240BD4_EB9A24.s +++ /dev/null @@ -1,232 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80249200_EC2050 -.word .L80240DE4_EB9C34, .L80240DF4_EB9C44, .L80240E0C_EB9C5C, .L80240E1C_EB9C6C, .L80240E34_EB9C84, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240E4C_EB9C9C, .L80240E5C_EB9CAC, .L80240E74_EB9CC4, .L80240E84_EB9CD4, .L80240E9C_EB9CEC, .L80240EB4_EB9D04, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ED4_EB9D24, .L80240ECC_EB9D1C - -.section .text - -glabel func_80240BD4_EB9A24 -/* EB9A24 80240BD4 27BDFF98 */ addiu $sp, $sp, -0x68 -/* EB9A28 80240BD8 AFB5005C */ sw $s5, 0x5c($sp) -/* EB9A2C 80240BDC 0080A82D */ daddu $s5, $a0, $zero -/* EB9A30 80240BE0 AFBF0060 */ sw $ra, 0x60($sp) -/* EB9A34 80240BE4 AFB40058 */ sw $s4, 0x58($sp) -/* EB9A38 80240BE8 AFB30054 */ sw $s3, 0x54($sp) -/* EB9A3C 80240BEC AFB20050 */ sw $s2, 0x50($sp) -/* EB9A40 80240BF0 AFB1004C */ sw $s1, 0x4c($sp) -/* EB9A44 80240BF4 AFB00048 */ sw $s0, 0x48($sp) -/* EB9A48 80240BF8 8EB10148 */ lw $s1, 0x148($s5) -/* EB9A4C 80240BFC 86240008 */ lh $a0, 8($s1) -/* EB9A50 80240C00 0C00F92F */ jal dead_get_npc_unsafe -/* EB9A54 80240C04 00A0802D */ daddu $s0, $a1, $zero -/* EB9A58 80240C08 8EA3000C */ lw $v1, 0xc($s5) -/* EB9A5C 80240C0C 02A0202D */ daddu $a0, $s5, $zero -/* EB9A60 80240C10 8C650000 */ lw $a1, ($v1) -/* EB9A64 80240C14 0C0B53A3 */ jal dead_evt_get_variable -/* EB9A68 80240C18 0040902D */ daddu $s2, $v0, $zero -/* EB9A6C 80240C1C AFA00018 */ sw $zero, 0x18($sp) -/* EB9A70 80240C20 8E2300D0 */ lw $v1, 0xd0($s1) -/* EB9A74 80240C24 8C630094 */ lw $v1, 0x94($v1) -/* EB9A78 80240C28 AFA3001C */ sw $v1, 0x1c($sp) -/* EB9A7C 80240C2C 8E2300D0 */ lw $v1, 0xd0($s1) -/* EB9A80 80240C30 8C630080 */ lw $v1, 0x80($v1) -/* EB9A84 80240C34 AFA30020 */ sw $v1, 0x20($sp) -/* EB9A88 80240C38 8E2300D0 */ lw $v1, 0xd0($s1) -/* EB9A8C 80240C3C 8C630088 */ lw $v1, 0x88($v1) -/* EB9A90 80240C40 AFA30024 */ sw $v1, 0x24($sp) -/* EB9A94 80240C44 8E2300D0 */ lw $v1, 0xd0($s1) -/* EB9A98 80240C48 8C63008C */ lw $v1, 0x8c($v1) -/* EB9A9C 80240C4C AFA30028 */ sw $v1, 0x28($sp) -/* EB9AA0 80240C50 8E2300D0 */ lw $v1, 0xd0($s1) -/* EB9AA4 80240C54 3C014282 */ lui $at, 0x4282 -/* EB9AA8 80240C58 44810000 */ mtc1 $at, $f0 -/* EB9AAC 80240C5C 8C630090 */ lw $v1, 0x90($v1) -/* EB9AB0 80240C60 E7A00030 */ swc1 $f0, 0x30($sp) -/* EB9AB4 80240C64 A7A00034 */ sh $zero, 0x34($sp) -/* EB9AB8 80240C68 AFA3002C */ sw $v1, 0x2c($sp) -/* EB9ABC 80240C6C C6400038 */ lwc1 $f0, 0x38($s2) -/* EB9AC0 80240C70 E6200108 */ swc1 $f0, 0x108($s1) -/* EB9AC4 80240C74 C640003C */ lwc1 $f0, 0x3c($s2) -/* EB9AC8 80240C78 27B40018 */ addiu $s4, $sp, 0x18 -/* EB9ACC 80240C7C E620010C */ swc1 $f0, 0x10c($s1) -/* EB9AD0 80240C80 3C0138D1 */ lui $at, 0x38d1 -/* EB9AD4 80240C84 3421B717 */ ori $at, $at, 0xb717 -/* EB9AD8 80240C88 44810000 */ mtc1 $at, $f0 -/* EB9ADC 80240C8C C6420040 */ lwc1 $f2, 0x40($s2) -/* EB9AE0 80240C90 0040982D */ daddu $s3, $v0, $zero -/* EB9AE4 80240C94 E6200114 */ swc1 $f0, 0x114($s1) -/* EB9AE8 80240C98 E6200118 */ swc1 $f0, 0x118($s1) -/* EB9AEC 80240C9C 16000005 */ bnez $s0, .L80240CB4 -/* EB9AF0 80240CA0 E6220110 */ swc1 $f2, 0x110($s1) -/* EB9AF4 80240CA4 8E2200B0 */ lw $v0, 0xb0($s1) -/* EB9AF8 80240CA8 30420004 */ andi $v0, $v0, 4 -/* EB9AFC 80240CAC 10400044 */ beqz $v0, .L80240DC0 -/* EB9B00 80240CB0 00000000 */ nop -.L80240CB4: -/* EB9B04 80240CB4 2404F7FF */ addiu $a0, $zero, -0x801 -/* EB9B08 80240CB8 AEA00070 */ sw $zero, 0x70($s5) -/* EB9B0C 80240CBC A640008E */ sh $zero, 0x8e($s2) -/* EB9B10 80240CC0 8E2200CC */ lw $v0, 0xcc($s1) -/* EB9B14 80240CC4 8E430000 */ lw $v1, ($s2) -/* EB9B18 80240CC8 8C420000 */ lw $v0, ($v0) -/* EB9B1C 80240CCC 00641824 */ and $v1, $v1, $a0 -/* EB9B20 80240CD0 AE430000 */ sw $v1, ($s2) -/* EB9B24 80240CD4 AE420028 */ sw $v0, 0x28($s2) -/* EB9B28 80240CD8 8E2200D0 */ lw $v0, 0xd0($s1) -/* EB9B2C 80240CDC 8C420098 */ lw $v0, 0x98($v0) -/* EB9B30 80240CE0 54400005 */ bnel $v0, $zero, .L80240CF8 -/* EB9B34 80240CE4 2402FDFF */ addiu $v0, $zero, -0x201 -/* EB9B38 80240CE8 34620200 */ ori $v0, $v1, 0x200 -/* EB9B3C 80240CEC 2403FFF7 */ addiu $v1, $zero, -9 -/* EB9B40 80240CF0 08090340 */ j .L80240D00 -/* EB9B44 80240CF4 00431024 */ and $v0, $v0, $v1 -.L80240CF8: -/* EB9B48 80240CF8 00621024 */ and $v0, $v1, $v0 -/* EB9B4C 80240CFC 34420008 */ ori $v0, $v0, 8 -.L80240D00: -/* EB9B50 80240D00 AE420000 */ sw $v0, ($s2) -/* EB9B54 80240D04 8E2200B0 */ lw $v0, 0xb0($s1) -/* EB9B58 80240D08 30420004 */ andi $v0, $v0, 4 -/* EB9B5C 80240D0C 10400008 */ beqz $v0, .L80240D30 -/* EB9B60 80240D10 24020063 */ addiu $v0, $zero, 0x63 -/* EB9B64 80240D14 AEA20070 */ sw $v0, 0x70($s5) -/* EB9B68 80240D18 AEA00074 */ sw $zero, 0x74($s5) -/* EB9B6C 80240D1C 8E2200B0 */ lw $v0, 0xb0($s1) -/* EB9B70 80240D20 2403FFFB */ addiu $v1, $zero, -5 -/* EB9B74 80240D24 00431024 */ and $v0, $v0, $v1 -/* EB9B78 80240D28 08090357 */ j .L80240D5C -/* EB9B7C 80240D2C AE2200B0 */ sw $v0, 0xb0($s1) -.L80240D30: -/* EB9B80 80240D30 8E220000 */ lw $v0, ($s1) -/* EB9B84 80240D34 3C034000 */ lui $v1, 0x4000 -/* EB9B88 80240D38 00431024 */ and $v0, $v0, $v1 -/* EB9B8C 80240D3C 10400007 */ beqz $v0, .L80240D5C -/* EB9B90 80240D40 3C03BFFF */ lui $v1, 0xbfff -/* EB9B94 80240D44 2402000C */ addiu $v0, $zero, 0xc -/* EB9B98 80240D48 AEA20070 */ sw $v0, 0x70($s5) -/* EB9B9C 80240D4C 8E220000 */ lw $v0, ($s1) -/* EB9BA0 80240D50 3463FFFF */ ori $v1, $v1, 0xffff -/* EB9BA4 80240D54 00431024 */ and $v0, $v0, $v1 -/* EB9BA8 80240D58 AE220000 */ sw $v0, ($s1) -.L80240D5C: -/* EB9BAC 80240D5C 27A50038 */ addiu $a1, $sp, 0x38 -/* EB9BB0 80240D60 27A6003C */ addiu $a2, $sp, 0x3c -/* EB9BB4 80240D64 C6400038 */ lwc1 $f0, 0x38($s2) -/* EB9BB8 80240D68 864200A8 */ lh $v0, 0xa8($s2) -/* EB9BBC 80240D6C 3C0142C8 */ lui $at, 0x42c8 -/* EB9BC0 80240D70 44812000 */ mtc1 $at, $f4 -/* EB9BC4 80240D74 44823000 */ mtc1 $v0, $f6 -/* EB9BC8 80240D78 00000000 */ nop -/* EB9BCC 80240D7C 468031A0 */ cvt.s.w $f6, $f6 -/* EB9BD0 80240D80 27A20044 */ addiu $v0, $sp, 0x44 -/* EB9BD4 80240D84 E7A00038 */ swc1 $f0, 0x38($sp) -/* EB9BD8 80240D88 C640003C */ lwc1 $f0, 0x3c($s2) -/* EB9BDC 80240D8C C6420040 */ lwc1 $f2, 0x40($s2) -/* EB9BE0 80240D90 46060000 */ add.s $f0, $f0, $f6 -/* EB9BE4 80240D94 E7A40044 */ swc1 $f4, 0x44($sp) -/* EB9BE8 80240D98 E7A20040 */ swc1 $f2, 0x40($sp) -/* EB9BEC 80240D9C E7A0003C */ swc1 $f0, 0x3c($sp) -/* EB9BF0 80240DA0 AFA20010 */ sw $v0, 0x10($sp) -/* EB9BF4 80240DA4 8E440080 */ lw $a0, 0x80($s2) -/* EB9BF8 80240DA8 0C03908F */ jal dead_npc_raycast_down_sides -/* EB9BFC 80240DAC 27A70040 */ addiu $a3, $sp, 0x40 -/* EB9C00 80240DB0 10400003 */ beqz $v0, .L80240DC0 -/* EB9C04 80240DB4 00000000 */ nop -/* EB9C08 80240DB8 C7A0003C */ lwc1 $f0, 0x3c($sp) -/* EB9C0C 80240DBC E640003C */ swc1 $f0, 0x3c($s2) -.L80240DC0: -/* EB9C10 80240DC0 8EA30070 */ lw $v1, 0x70($s5) -/* EB9C14 80240DC4 2C620064 */ sltiu $v0, $v1, 0x64 -/* EB9C18 80240DC8 10400042 */ beqz $v0, .L80240ED4_EB9D24 -/* EB9C1C 80240DCC 00031080 */ sll $v0, $v1, 2 -/* EB9C20 80240DD0 3C018025 */ lui $at, %hi(jtbl_80249200_EC2050) -/* EB9C24 80240DD4 00220821 */ addu $at, $at, $v0 -/* EB9C28 80240DD8 8C229200 */ lw $v0, %lo(jtbl_80249200_EC2050)($at) -/* EB9C2C 80240DDC 00400008 */ jr $v0 -/* EB9C30 80240DE0 00000000 */ nop -.L80240DE4_EB9C34: -/* EB9C34 80240DE4 02A0202D */ daddu $a0, $s5, $zero -/* EB9C38 80240DE8 0260282D */ daddu $a1, $s3, $zero -/* EB9C3C 80240DEC 0C090010 */ jal EB8E90_UnkNpcAIFunc24 -/* EB9C40 80240DF0 0280302D */ daddu $a2, $s4, $zero -.L80240DF4_EB9C44: -/* EB9C44 80240DF4 02A0202D */ daddu $a0, $s5, $zero -/* EB9C48 80240DF8 0260282D */ daddu $a1, $s3, $zero -/* EB9C4C 80240DFC 0C090066 */ jal EB8E90_UnkFunc13 -/* EB9C50 80240E00 0280302D */ daddu $a2, $s4, $zero -/* EB9C54 80240E04 080903B5 */ j .L80240ED4_EB9D24 -/* EB9C58 80240E08 00000000 */ nop -.L80240E0C_EB9C5C: -/* EB9C5C 80240E0C 02A0202D */ daddu $a0, $s5, $zero -/* EB9C60 80240E10 0260282D */ daddu $a1, $s3, $zero -/* EB9C64 80240E14 0C090110 */ jal EB8E90_UnkNpcAIFunc1 -/* EB9C68 80240E18 0280302D */ daddu $a2, $s4, $zero -.L80240E1C_EB9C6C: -/* EB9C6C 80240E1C 02A0202D */ daddu $a0, $s5, $zero -/* EB9C70 80240E20 0260282D */ daddu $a1, $s3, $zero -/* EB9C74 80240E24 0C090140 */ jal EB8E90_UnkFunc14 -/* EB9C78 80240E28 0280302D */ daddu $a2, $s4, $zero -/* EB9C7C 80240E2C 080903B5 */ j .L80240ED4_EB9D24 -/* EB9C80 80240E30 00000000 */ nop -.L80240E34_EB9C84: -/* EB9C84 80240E34 02A0202D */ daddu $a0, $s5, $zero -/* EB9C88 80240E38 0260282D */ daddu $a1, $s3, $zero -/* EB9C8C 80240E3C 0C0901AF */ jal EB8E90_UnkNpcAIFunc25 -/* EB9C90 80240E40 0280302D */ daddu $a2, $s4, $zero -/* EB9C94 80240E44 080903B5 */ j .L80240ED4_EB9D24 -/* EB9C98 80240E48 00000000 */ nop -.L80240E4C_EB9C9C: -/* EB9C9C 80240E4C 02A0202D */ daddu $a0, $s5, $zero -/* EB9CA0 80240E50 0260282D */ daddu $a1, $s3, $zero -/* EB9CA4 80240E54 0C0901DC */ jal EB8E90_NpcJumpFunc2 -/* EB9CA8 80240E58 0280302D */ daddu $a2, $s4, $zero -.L80240E5C_EB9CAC: -/* EB9CAC 80240E5C 02A0202D */ daddu $a0, $s5, $zero -/* EB9CB0 80240E60 0260282D */ daddu $a1, $s3, $zero -/* EB9CB4 80240E64 0C0901F9 */ jal EB8E90_NpcJumpFunc -/* EB9CB8 80240E68 0280302D */ daddu $a2, $s4, $zero -/* EB9CBC 80240E6C 080903B5 */ j .L80240ED4_EB9D24 -/* EB9CC0 80240E70 00000000 */ nop -.L80240E74_EB9CC4: -/* EB9CC4 80240E74 02A0202D */ daddu $a0, $s5, $zero -/* EB9CC8 80240E78 0260282D */ daddu $a1, $s3, $zero -/* EB9CCC 80240E7C 0C090217 */ jal EB8E90_UnkNpcAIFunc13 -/* EB9CD0 80240E80 0280302D */ daddu $a2, $s4, $zero -.L80240E84_EB9CD4: -/* EB9CD4 80240E84 02A0202D */ daddu $a0, $s5, $zero -/* EB9CD8 80240E88 0260282D */ daddu $a1, $s3, $zero -/* EB9CDC 80240E8C 0C090263 */ jal EB8E90_UnkFunc15 -/* EB9CE0 80240E90 0280302D */ daddu $a2, $s4, $zero -/* EB9CE4 80240E94 080903B5 */ j .L80240ED4_EB9D24 -/* EB9CE8 80240E98 00000000 */ nop -.L80240E9C_EB9CEC: -/* EB9CEC 80240E9C 02A0202D */ daddu $a0, $s5, $zero -/* EB9CF0 80240EA0 0260282D */ daddu $a1, $s3, $zero -/* EB9CF4 80240EA4 0C0902AB */ jal EB8E90_UnkNpcDurationFlagFunc -/* EB9CF8 80240EA8 0280302D */ daddu $a2, $s4, $zero -/* EB9CFC 80240EAC 080903B5 */ j .L80240ED4_EB9D24 -/* EB9D00 80240EB0 00000000 */ nop -.L80240EB4_EB9D04: -/* EB9D04 80240EB4 02A0202D */ daddu $a0, $s5, $zero -/* EB9D08 80240EB8 0260282D */ daddu $a1, $s3, $zero -/* EB9D0C 80240EBC 0C0902C5 */ jal EB8E90_UnkFunc16 -/* EB9D10 80240EC0 0280302D */ daddu $a2, $s4, $zero -/* EB9D14 80240EC4 080903B5 */ j .L80240ED4_EB9D24 -/* EB9D18 80240EC8 00000000 */ nop -.L80240ECC_EB9D1C: -/* EB9D1C 80240ECC 0C013AE3 */ jal func_8004EB8C -/* EB9D20 80240ED0 02A0202D */ daddu $a0, $s5, $zero -.L80240ED4_EB9D24: -/* EB9D24 80240ED4 8FBF0060 */ lw $ra, 0x60($sp) -/* EB9D28 80240ED8 8FB5005C */ lw $s5, 0x5c($sp) -/* EB9D2C 80240EDC 8FB40058 */ lw $s4, 0x58($sp) -/* EB9D30 80240EE0 8FB30054 */ lw $s3, 0x54($sp) -/* EB9D34 80240EE4 8FB20050 */ lw $s2, 0x50($sp) -/* EB9D38 80240EE8 8FB1004C */ lw $s1, 0x4c($sp) -/* EB9D3C 80240EEC 8FB00048 */ lw $s0, 0x48($sp) -/* EB9D40 80240EF0 0000102D */ daddu $v0, $zero, $zero -/* EB9D44 80240EF4 03E00008 */ jr $ra -/* EB9D48 80240EF8 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/ECAA80/func_8024199C_ECB69C.s b/ver/us/asm/nonmatchings/ECAA80/func_8024199C_ECB69C.s index fc531a338b..d37c78b2be 100644 --- a/ver/us/asm/nonmatchings/ECAA80/func_8024199C_ECB69C.s +++ b/ver/us/asm/nonmatchings/ECAA80/func_8024199C_ECB69C.s @@ -6,11 +6,11 @@ glabel func_8024199C_ECB69C /* ECB6A0 802419A0 AFBF0010 */ sw $ra, 0x10($sp) /* ECB6A4 802419A4 10A00003 */ beqz $a1, .L802419B4 /* ECB6A8 802419A8 8C86000C */ lw $a2, 0xc($a0) -/* ECB6AC 802419AC 3C018024 */ lui $at, %hi(D_802430B8_ECCDB8) -/* ECB6B0 802419B0 AC2030B8 */ sw $zero, %lo(D_802430B8_ECCDB8)($at) +/* ECB6AC 802419AC 3C018024 */ lui $at, %hi(ECAA80_ItemChoice_HasSelectedItem) +/* ECB6B0 802419B0 AC2030B8 */ sw $zero, %lo(ECAA80_ItemChoice_HasSelectedItem)($at) .L802419B4: -/* ECB6B4 802419B4 3C038024 */ lui $v1, %hi(D_802430B8_ECCDB8) -/* ECB6B8 802419B8 246330B8 */ addiu $v1, $v1, %lo(D_802430B8_ECCDB8) +/* ECB6B4 802419B4 3C038024 */ lui $v1, %hi(ECAA80_ItemChoice_HasSelectedItem) +/* ECB6B8 802419B8 246330B8 */ addiu $v1, $v1, %lo(ECAA80_ItemChoice_HasSelectedItem) /* ECB6BC 802419BC 8C620000 */ lw $v0, ($v1) /* ECB6C0 802419C0 54400003 */ bnel $v0, $zero, .L802419D0 /* ECB6C4 802419C4 AC600000 */ sw $zero, ($v1) @@ -18,9 +18,9 @@ glabel func_8024199C_ECB69C /* ECB6CC 802419CC 0000102D */ daddu $v0, $zero, $zero .L802419D0: /* ECB6D0 802419D0 8CC50000 */ lw $a1, ($a2) -/* ECB6D4 802419D4 3C068024 */ lui $a2, %hi(D_802430BC_ECCDBC) +/* ECB6D4 802419D4 3C068024 */ lui $a2, %hi(ECAA80_ItemChoice_SelectedItemID) /* ECB6D8 802419D8 0C0B551A */ jal dead_evt_set_variable -/* ECB6DC 802419DC 8CC630BC */ lw $a2, %lo(D_802430BC_ECCDBC)($a2) +/* ECB6DC 802419DC 8CC630BC */ lw $a2, %lo(ECAA80_ItemChoice_SelectedItemID)($a2) /* ECB6E0 802419E0 24020002 */ addiu $v0, $zero, 2 .L802419E4: /* ECB6E4 802419E4 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/ECAA80/func_802419F0_ECB6F0.s b/ver/us/asm/nonmatchings/ECAA80/func_802419F0_ECB6F0.s index d071b66261..bb45c8eeef 100644 --- a/ver/us/asm/nonmatchings/ECAA80/func_802419F0_ECB6F0.s +++ b/ver/us/asm/nonmatchings/ECAA80/func_802419F0_ECB6F0.s @@ -7,12 +7,12 @@ glabel func_802419F0_ECB6F0 /* ECB6F8 802419F8 8C82000C */ lw $v0, 0xc($a0) /* ECB6FC 802419FC 0C0B53A3 */ jal dead_evt_get_variable /* ECB700 80241A00 8C450000 */ lw $a1, ($v0) -/* ECB704 80241A04 3C018024 */ lui $at, %hi(D_802430BC_ECCDBC) -/* ECB708 80241A08 AC2230BC */ sw $v0, %lo(D_802430BC_ECCDBC)($at) +/* ECB704 80241A04 3C018024 */ lui $at, %hi(ECAA80_ItemChoice_SelectedItemID) +/* ECB708 80241A08 AC2230BC */ sw $v0, %lo(ECAA80_ItemChoice_SelectedItemID)($at) /* ECB70C 80241A0C 24020002 */ addiu $v0, $zero, 2 /* ECB710 80241A10 8FBF0010 */ lw $ra, 0x10($sp) /* ECB714 80241A14 24030001 */ addiu $v1, $zero, 1 -/* ECB718 80241A18 3C018024 */ lui $at, %hi(D_802430B8_ECCDB8) -/* ECB71C 80241A1C AC2330B8 */ sw $v1, %lo(D_802430B8_ECCDB8)($at) +/* ECB718 80241A18 3C018024 */ lui $at, %hi(ECAA80_ItemChoice_HasSelectedItem) +/* ECB71C 80241A1C AC2330B8 */ sw $v1, %lo(ECAA80_ItemChoice_HasSelectedItem)($at) /* ECB720 80241A20 03E00008 */ jr $ra /* ECB724 80241A24 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/ED0310/func_8024162C_ED161C.s b/ver/us/asm/nonmatchings/ED0310/func_8024162C_ED161C.s deleted file mode 100644 index c4706e08f3..0000000000 --- a/ver/us/asm/nonmatchings/ED0310/func_8024162C_ED161C.s +++ /dev/null @@ -1,161 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_802441E8_ED41D8 -.word .L80241764_ED1754, .L80241774_ED1764, .L8024178C_ED177C, .L8024179C_ED178C, .L8024181C_ED180C, .L8024181C_ED180C, .L8024181C_ED180C, .L8024181C_ED180C, .L8024181C_ED180C, .L8024181C_ED180C, .L802417B4_ED17A4, .L802417C4_ED17B4, .L802417DC_ED17CC, .L802417F4_ED17E4, .L8024180C_ED17FC, 0, 0, 0 - -.section .text - -glabel func_8024162C_ED161C -/* ED161C 8024162C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* ED1620 80241630 AFB50044 */ sw $s5, 0x44($sp) -/* ED1624 80241634 0080A82D */ daddu $s5, $a0, $zero -/* ED1628 80241638 AFBF0048 */ sw $ra, 0x48($sp) -/* ED162C 8024163C AFB40040 */ sw $s4, 0x40($sp) -/* ED1630 80241640 AFB3003C */ sw $s3, 0x3c($sp) -/* ED1634 80241644 AFB20038 */ sw $s2, 0x38($sp) -/* ED1638 80241648 AFB10034 */ sw $s1, 0x34($sp) -/* ED163C 8024164C AFB00030 */ sw $s0, 0x30($sp) -/* ED1640 80241650 8EB20148 */ lw $s2, 0x148($s5) -/* ED1644 80241654 86440008 */ lh $a0, 8($s2) -/* ED1648 80241658 8EB0000C */ lw $s0, 0xc($s5) -/* ED164C 8024165C 0C00F92F */ jal dead_get_npc_unsafe -/* ED1650 80241660 00A0882D */ daddu $s1, $a1, $zero -/* ED1654 80241664 02A0202D */ daddu $a0, $s5, $zero -/* ED1658 80241668 8E050000 */ lw $a1, ($s0) -/* ED165C 8024166C 0C0B53A3 */ jal dead_evt_get_variable -/* ED1660 80241670 0040A02D */ daddu $s4, $v0, $zero -/* ED1664 80241674 AFA00010 */ sw $zero, 0x10($sp) -/* ED1668 80241678 8E4300D0 */ lw $v1, 0xd0($s2) -/* ED166C 8024167C 8C630030 */ lw $v1, 0x30($v1) -/* ED1670 80241680 AFA30014 */ sw $v1, 0x14($sp) -/* ED1674 80241684 8E4300D0 */ lw $v1, 0xd0($s2) -/* ED1678 80241688 8C63001C */ lw $v1, 0x1c($v1) -/* ED167C 8024168C AFA30018 */ sw $v1, 0x18($sp) -/* ED1680 80241690 8E4300D0 */ lw $v1, 0xd0($s2) -/* ED1684 80241694 8C630024 */ lw $v1, 0x24($v1) -/* ED1688 80241698 AFA3001C */ sw $v1, 0x1c($sp) -/* ED168C 8024169C 8E4300D0 */ lw $v1, 0xd0($s2) -/* ED1690 802416A0 8C630028 */ lw $v1, 0x28($v1) -/* ED1694 802416A4 AFA30020 */ sw $v1, 0x20($sp) -/* ED1698 802416A8 8E4300D0 */ lw $v1, 0xd0($s2) -/* ED169C 802416AC 3C0142F0 */ lui $at, 0x42f0 -/* ED16A0 802416B0 44810000 */ mtc1 $at, $f0 -/* ED16A4 802416B4 8C63002C */ lw $v1, 0x2c($v1) -/* ED16A8 802416B8 E7A00028 */ swc1 $f0, 0x28($sp) -/* ED16AC 802416BC A7A0002C */ sh $zero, 0x2c($sp) -/* ED16B0 802416C0 AFA30024 */ sw $v1, 0x24($sp) -/* ED16B4 802416C4 C6800038 */ lwc1 $f0, 0x38($s4) -/* ED16B8 802416C8 E6400108 */ swc1 $f0, 0x108($s2) -/* ED16BC 802416CC C680003C */ lwc1 $f0, 0x3c($s4) -/* ED16C0 802416D0 27B30010 */ addiu $s3, $sp, 0x10 -/* ED16C4 802416D4 E640010C */ swc1 $f0, 0x10c($s2) -/* ED16C8 802416D8 3C0138D1 */ lui $at, 0x38d1 -/* ED16CC 802416DC 3421B717 */ ori $at, $at, 0xb717 -/* ED16D0 802416E0 44810000 */ mtc1 $at, $f0 -/* ED16D4 802416E4 C6820040 */ lwc1 $f2, 0x40($s4) -/* ED16D8 802416E8 0040802D */ daddu $s0, $v0, $zero -/* ED16DC 802416EC E6400114 */ swc1 $f0, 0x114($s2) -/* ED16E0 802416F0 E6400118 */ swc1 $f0, 0x118($s2) -/* ED16E4 802416F4 12200006 */ beqz $s1, .L80241710 -/* ED16E8 802416F8 E6420110 */ swc1 $f2, 0x110($s2) -/* ED16EC 802416FC 0280202D */ daddu $a0, $s4, $zero -/* ED16F0 80241700 0240282D */ daddu $a1, $s2, $zero -/* ED16F4 80241704 02A0302D */ daddu $a2, $s5, $zero -/* ED16F8 80241708 0C090542 */ jal ED0310_UnkFunc5 -/* ED16FC 8024170C 0200382D */ daddu $a3, $s0, $zero -.L80241710: -/* ED1700 80241710 2402FFFE */ addiu $v0, $zero, -2 -/* ED1704 80241714 A28200AB */ sb $v0, 0xab($s4) -/* ED1708 80241718 8E4300B0 */ lw $v1, 0xb0($s2) -/* ED170C 8024171C 30620004 */ andi $v0, $v1, 4 -/* ED1710 80241720 10400007 */ beqz $v0, .L80241740 -/* ED1714 80241724 00000000 */ nop -/* ED1718 80241728 824200B4 */ lb $v0, 0xb4($s2) -/* ED171C 8024172C 1440003C */ bnez $v0, .L80241820 -/* ED1720 80241730 0000102D */ daddu $v0, $zero, $zero -/* ED1724 80241734 2402FFFB */ addiu $v0, $zero, -5 -/* ED1728 80241738 00621024 */ and $v0, $v1, $v0 -/* ED172C 8024173C AE4200B0 */ sw $v0, 0xb0($s2) -.L80241740: -/* ED1730 80241740 8EA30070 */ lw $v1, 0x70($s5) -/* ED1734 80241744 2C62000F */ sltiu $v0, $v1, 0xf -/* ED1738 80241748 10400034 */ beqz $v0, .L8024181C_ED180C -/* ED173C 8024174C 00031080 */ sll $v0, $v1, 2 -/* ED1740 80241750 3C018024 */ lui $at, %hi(jtbl_802441E8_ED41D8) -/* ED1744 80241754 00220821 */ addu $at, $at, $v0 -/* ED1748 80241758 8C2241E8 */ lw $v0, %lo(jtbl_802441E8_ED41D8)($at) -/* ED174C 8024175C 00400008 */ jr $v0 -/* ED1750 80241760 00000000 */ nop -.L80241764_ED1754: -/* ED1754 80241764 02A0202D */ daddu $a0, $s5, $zero -/* ED1758 80241768 0200282D */ daddu $a1, $s0, $zero -/* ED175C 8024176C 0C0900C8 */ jal ED0310_UnkNpcAIFunc23 -/* ED1760 80241770 0260302D */ daddu $a2, $s3, $zero -.L80241774_ED1764: -/* ED1764 80241774 02A0202D */ daddu $a0, $s5, $zero -/* ED1768 80241778 0200282D */ daddu $a1, $s0, $zero -/* ED176C 8024177C 0C090134 */ jal ED0310_UnkNpcAIFunc35 -/* ED1770 80241780 0260302D */ daddu $a2, $s3, $zero -/* ED1774 80241784 08090608 */ j .L80241820 -/* ED1778 80241788 0000102D */ daddu $v0, $zero, $zero -.L8024178C_ED177C: -/* ED177C 8024178C 02A0202D */ daddu $a0, $s5, $zero -/* ED1780 80241790 0200282D */ daddu $a1, $s0, $zero -/* ED1784 80241794 0C0902BE */ jal ED0310_UnkNpcAIFunc1 -/* ED1788 80241798 0260302D */ daddu $a2, $s3, $zero -.L8024179C_ED178C: -/* ED178C 8024179C 02A0202D */ daddu $a0, $s5, $zero -/* ED1790 802417A0 0200282D */ daddu $a1, $s0, $zero -/* ED1794 802417A4 0C0902EE */ jal ED0310_UnkFunc4 -/* ED1798 802417A8 0260302D */ daddu $a2, $s3, $zero -/* ED179C 802417AC 08090608 */ j .L80241820 -/* ED17A0 802417B0 0000102D */ daddu $v0, $zero, $zero -.L802417B4_ED17A4: -/* ED17A4 802417B4 02A0202D */ daddu $a0, $s5, $zero -/* ED17A8 802417B8 0200282D */ daddu $a1, $s0, $zero -/* ED17AC 802417BC 0C0903BF */ jal ED0310_UnkNpcAIFunc2 -/* ED17B0 802417C0 0260302D */ daddu $a2, $s3, $zero -.L802417C4_ED17B4: -/* ED17B4 802417C4 02A0202D */ daddu $a0, $s5, $zero -/* ED17B8 802417C8 0200282D */ daddu $a1, $s0, $zero -/* ED17BC 802417CC 0C0903DD */ jal ED0310_SixFloatsFunc -/* ED17C0 802417D0 0260302D */ daddu $a2, $s3, $zero -/* ED17C4 802417D4 08090608 */ j .L80241820 -/* ED17C8 802417D8 0000102D */ daddu $v0, $zero, $zero -.L802417DC_ED17CC: -/* ED17CC 802417DC 02A0202D */ daddu $a0, $s5, $zero -/* ED17D0 802417E0 0200282D */ daddu $a1, $s0, $zero -/* ED17D4 802417E4 0C0903F8 */ jal ED0310_UnkNpcAIFunc14 -/* ED17D8 802417E8 0260302D */ daddu $a2, $s3, $zero -/* ED17DC 802417EC 08090608 */ j .L80241820 -/* ED17E0 802417F0 0000102D */ daddu $v0, $zero, $zero -.L802417F4_ED17E4: -/* ED17E4 802417F4 02A0202D */ daddu $a0, $s5, $zero -/* ED17E8 802417F8 0200282D */ daddu $a1, $s0, $zero -/* ED17EC 802417FC 0C090445 */ jal ED0310_UnkNpcAIFunc3 -/* ED17F0 80241800 0260302D */ daddu $a2, $s3, $zero -/* ED17F4 80241804 08090608 */ j .L80241820 -/* ED17F8 80241808 0000102D */ daddu $v0, $zero, $zero -.L8024180C_ED17FC: -/* ED17FC 8024180C 02A0202D */ daddu $a0, $s5, $zero -/* ED1800 80241810 0200282D */ daddu $a1, $s0, $zero -/* ED1804 80241814 0C09045E */ jal ED0310_UnkFunc6 -/* ED1808 80241818 0260302D */ daddu $a2, $s3, $zero -.L8024181C_ED180C: -/* ED180C 8024181C 0000102D */ daddu $v0, $zero, $zero -.L80241820: -/* ED1810 80241820 8FBF0048 */ lw $ra, 0x48($sp) -/* ED1814 80241824 8FB50044 */ lw $s5, 0x44($sp) -/* ED1818 80241828 8FB40040 */ lw $s4, 0x40($sp) -/* ED181C 8024182C 8FB3003C */ lw $s3, 0x3c($sp) -/* ED1820 80241830 8FB20038 */ lw $s2, 0x38($sp) -/* ED1824 80241834 8FB10034 */ lw $s1, 0x34($sp) -/* ED1828 80241838 8FB00030 */ lw $s0, 0x30($sp) -/* ED182C 8024183C 03E00008 */ jr $ra -/* ED1830 80241840 27BD0050 */ addiu $sp, $sp, 0x50 -/* ED1834 80241844 00000000 */ nop -/* ED1838 80241848 00000000 */ nop -/* ED183C 8024184C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/EDEA00/func_802414D0_EDFE90.s b/ver/us/asm/nonmatchings/EDEA00/func_802414D0_EDFE90.s deleted file mode 100644 index 49da701cd9..0000000000 --- a/ver/us/asm/nonmatchings/EDEA00/func_802414D0_EDFE90.s +++ /dev/null @@ -1,161 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80247B08_EE64C8 -.word .L80241608_EDFFC8, .L80241618_EDFFD8, .L80241630_EDFFF0, .L80241640_EE0000, .L802416C0_EE0080, .L802416C0_EE0080, .L802416C0_EE0080, .L802416C0_EE0080, .L802416C0_EE0080, .L802416C0_EE0080, .L80241658_EE0018, .L80241668_EE0028, .L80241680_EE0040, .L80241698_EE0058, .L802416B0_EE0070 - -dlabel D_80247B44_EE6504 -.word 0x4A554745, 0x4D55204D, 0x4F564500 - -.section .text - -glabel func_802414D0_EDFE90 -/* EDFE90 802414D0 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* EDFE94 802414D4 AFB50044 */ sw $s5, 0x44($sp) -/* EDFE98 802414D8 0080A82D */ daddu $s5, $a0, $zero -/* EDFE9C 802414DC AFBF0048 */ sw $ra, 0x48($sp) -/* EDFEA0 802414E0 AFB40040 */ sw $s4, 0x40($sp) -/* EDFEA4 802414E4 AFB3003C */ sw $s3, 0x3c($sp) -/* EDFEA8 802414E8 AFB20038 */ sw $s2, 0x38($sp) -/* EDFEAC 802414EC AFB10034 */ sw $s1, 0x34($sp) -/* EDFEB0 802414F0 AFB00030 */ sw $s0, 0x30($sp) -/* EDFEB4 802414F4 8EB20148 */ lw $s2, 0x148($s5) -/* EDFEB8 802414F8 86440008 */ lh $a0, 8($s2) -/* EDFEBC 802414FC 8EB0000C */ lw $s0, 0xc($s5) -/* EDFEC0 80241500 0C00F92F */ jal dead_get_npc_unsafe -/* EDFEC4 80241504 00A0882D */ daddu $s1, $a1, $zero -/* EDFEC8 80241508 02A0202D */ daddu $a0, $s5, $zero -/* EDFECC 8024150C 8E050000 */ lw $a1, ($s0) -/* EDFED0 80241510 0C0B53A3 */ jal dead_evt_get_variable -/* EDFED4 80241514 0040A02D */ daddu $s4, $v0, $zero -/* EDFED8 80241518 AFA00010 */ sw $zero, 0x10($sp) -/* EDFEDC 8024151C 8E4300D0 */ lw $v1, 0xd0($s2) -/* EDFEE0 80241520 8C630030 */ lw $v1, 0x30($v1) -/* EDFEE4 80241524 AFA30014 */ sw $v1, 0x14($sp) -/* EDFEE8 80241528 8E4300D0 */ lw $v1, 0xd0($s2) -/* EDFEEC 8024152C 8C63001C */ lw $v1, 0x1c($v1) -/* EDFEF0 80241530 AFA30018 */ sw $v1, 0x18($sp) -/* EDFEF4 80241534 8E4300D0 */ lw $v1, 0xd0($s2) -/* EDFEF8 80241538 8C630024 */ lw $v1, 0x24($v1) -/* EDFEFC 8024153C AFA3001C */ sw $v1, 0x1c($sp) -/* EDFF00 80241540 8E4300D0 */ lw $v1, 0xd0($s2) -/* EDFF04 80241544 8C630028 */ lw $v1, 0x28($v1) -/* EDFF08 80241548 AFA30020 */ sw $v1, 0x20($sp) -/* EDFF0C 8024154C 8E4300D0 */ lw $v1, 0xd0($s2) -/* EDFF10 80241550 3C0142F0 */ lui $at, 0x42f0 -/* EDFF14 80241554 44810000 */ mtc1 $at, $f0 -/* EDFF18 80241558 8C63002C */ lw $v1, 0x2c($v1) -/* EDFF1C 8024155C E7A00028 */ swc1 $f0, 0x28($sp) -/* EDFF20 80241560 A7A0002C */ sh $zero, 0x2c($sp) -/* EDFF24 80241564 AFA30024 */ sw $v1, 0x24($sp) -/* EDFF28 80241568 C6800038 */ lwc1 $f0, 0x38($s4) -/* EDFF2C 8024156C E6400108 */ swc1 $f0, 0x108($s2) -/* EDFF30 80241570 C680003C */ lwc1 $f0, 0x3c($s4) -/* EDFF34 80241574 27B30010 */ addiu $s3, $sp, 0x10 -/* EDFF38 80241578 E640010C */ swc1 $f0, 0x10c($s2) -/* EDFF3C 8024157C 3C0138D1 */ lui $at, 0x38d1 -/* EDFF40 80241580 3421B717 */ ori $at, $at, 0xb717 -/* EDFF44 80241584 44810000 */ mtc1 $at, $f0 -/* EDFF48 80241588 C6820040 */ lwc1 $f2, 0x40($s4) -/* EDFF4C 8024158C 0040802D */ daddu $s0, $v0, $zero -/* EDFF50 80241590 E6400114 */ swc1 $f0, 0x114($s2) -/* EDFF54 80241594 E6400118 */ swc1 $f0, 0x118($s2) -/* EDFF58 80241598 12200006 */ beqz $s1, .L802415B4 -/* EDFF5C 8024159C E6420110 */ swc1 $f2, 0x110($s2) -/* EDFF60 802415A0 0280202D */ daddu $a0, $s4, $zero -/* EDFF64 802415A4 0240282D */ daddu $a1, $s2, $zero -/* EDFF68 802415A8 02A0302D */ daddu $a2, $s5, $zero -/* EDFF6C 802415AC 0C0904EB */ jal EDEA00_UnkFunc5 -/* EDFF70 802415B0 0200382D */ daddu $a3, $s0, $zero -.L802415B4: -/* EDFF74 802415B4 2402FFFE */ addiu $v0, $zero, -2 -/* EDFF78 802415B8 A28200AB */ sb $v0, 0xab($s4) -/* EDFF7C 802415BC 8E4300B0 */ lw $v1, 0xb0($s2) -/* EDFF80 802415C0 30620004 */ andi $v0, $v1, 4 -/* EDFF84 802415C4 10400007 */ beqz $v0, .L802415E4 -/* EDFF88 802415C8 00000000 */ nop -/* EDFF8C 802415CC 824200B4 */ lb $v0, 0xb4($s2) -/* EDFF90 802415D0 1440003C */ bnez $v0, .L802416C4 -/* EDFF94 802415D4 0000102D */ daddu $v0, $zero, $zero -/* EDFF98 802415D8 2402FFFB */ addiu $v0, $zero, -5 -/* EDFF9C 802415DC 00621024 */ and $v0, $v1, $v0 -/* EDFFA0 802415E0 AE4200B0 */ sw $v0, 0xb0($s2) -.L802415E4: -/* EDFFA4 802415E4 8EA30070 */ lw $v1, 0x70($s5) -/* EDFFA8 802415E8 2C62000F */ sltiu $v0, $v1, 0xf -/* EDFFAC 802415EC 10400034 */ beqz $v0, .L802416C0_EE0080 -/* EDFFB0 802415F0 00031080 */ sll $v0, $v1, 2 -/* EDFFB4 802415F4 3C018024 */ lui $at, %hi(jtbl_80247B08_EE64C8) -/* EDFFB8 802415F8 00220821 */ addu $at, $at, $v0 -/* EDFFBC 802415FC 8C227B08 */ lw $v0, %lo(jtbl_80247B08_EE64C8)($at) -/* EDFFC0 80241600 00400008 */ jr $v0 -/* EDFFC4 80241604 00000000 */ nop -.L80241608_EDFFC8: -/* EDFFC8 80241608 02A0202D */ daddu $a0, $s5, $zero -/* EDFFCC 8024160C 0200282D */ daddu $a1, $s0, $zero -/* EDFFD0 80241610 0C090071 */ jal EDEA00_UnkNpcAIFunc23 -/* EDFFD4 80241614 0260302D */ daddu $a2, $s3, $zero -.L80241618_EDFFD8: -/* EDFFD8 80241618 02A0202D */ daddu $a0, $s5, $zero -/* EDFFDC 8024161C 0200282D */ daddu $a1, $s0, $zero -/* EDFFE0 80241620 0C0900DD */ jal EDEA00_UnkNpcAIFunc35 -/* EDFFE4 80241624 0260302D */ daddu $a2, $s3, $zero -/* EDFFE8 80241628 080905B1 */ j .L802416C4 -/* EDFFEC 8024162C 0000102D */ daddu $v0, $zero, $zero -.L80241630_EDFFF0: -/* EDFFF0 80241630 02A0202D */ daddu $a0, $s5, $zero -/* EDFFF4 80241634 0200282D */ daddu $a1, $s0, $zero -/* EDFFF8 80241638 0C090267 */ jal EDEA00_UnkNpcAIFunc1 -/* EDFFFC 8024163C 0260302D */ daddu $a2, $s3, $zero -.L80241640_EE0000: -/* EE0000 80241640 02A0202D */ daddu $a0, $s5, $zero -/* EE0004 80241644 0200282D */ daddu $a1, $s0, $zero -/* EE0008 80241648 0C090297 */ jal EDEA00_UnkFunc4 -/* EE000C 8024164C 0260302D */ daddu $a2, $s3, $zero -/* EE0010 80241650 080905B1 */ j .L802416C4 -/* EE0014 80241654 0000102D */ daddu $v0, $zero, $zero -.L80241658_EE0018: -/* EE0018 80241658 02A0202D */ daddu $a0, $s5, $zero -/* EE001C 8024165C 0200282D */ daddu $a1, $s0, $zero -/* EE0020 80241660 0C090368 */ jal EDEA00_UnkNpcAIFunc2 -/* EE0024 80241664 0260302D */ daddu $a2, $s3, $zero -.L80241668_EE0028: -/* EE0028 80241668 02A0202D */ daddu $a0, $s5, $zero -/* EE002C 8024166C 0200282D */ daddu $a1, $s0, $zero -/* EE0030 80241670 0C090386 */ jal EDEA00_SixFloatsFunc -/* EE0034 80241674 0260302D */ daddu $a2, $s3, $zero -/* EE0038 80241678 080905B1 */ j .L802416C4 -/* EE003C 8024167C 0000102D */ daddu $v0, $zero, $zero -.L80241680_EE0040: -/* EE0040 80241680 02A0202D */ daddu $a0, $s5, $zero -/* EE0044 80241684 0200282D */ daddu $a1, $s0, $zero -/* EE0048 80241688 0C0903A1 */ jal EDEA00_UnkNpcAIFunc14 -/* EE004C 8024168C 0260302D */ daddu $a2, $s3, $zero -/* EE0050 80241690 080905B1 */ j .L802416C4 -/* EE0054 80241694 0000102D */ daddu $v0, $zero, $zero -.L80241698_EE0058: -/* EE0058 80241698 02A0202D */ daddu $a0, $s5, $zero -/* EE005C 8024169C 0200282D */ daddu $a1, $s0, $zero -/* EE0060 802416A0 0C0903EE */ jal EDEA00_UnkNpcAIFunc3 -/* EE0064 802416A4 0260302D */ daddu $a2, $s3, $zero -/* EE0068 802416A8 080905B1 */ j .L802416C4 -/* EE006C 802416AC 0000102D */ daddu $v0, $zero, $zero -.L802416B0_EE0070: -/* EE0070 802416B0 02A0202D */ daddu $a0, $s5, $zero -/* EE0074 802416B4 0200282D */ daddu $a1, $s0, $zero -/* EE0078 802416B8 0C090407 */ jal EDEA00_UnkFunc6 -/* EE007C 802416BC 0260302D */ daddu $a2, $s3, $zero -.L802416C0_EE0080: -/* EE0080 802416C0 0000102D */ daddu $v0, $zero, $zero -.L802416C4: -/* EE0084 802416C4 8FBF0048 */ lw $ra, 0x48($sp) -/* EE0088 802416C8 8FB50044 */ lw $s5, 0x44($sp) -/* EE008C 802416CC 8FB40040 */ lw $s4, 0x40($sp) -/* EE0090 802416D0 8FB3003C */ lw $s3, 0x3c($sp) -/* EE0094 802416D4 8FB20038 */ lw $s2, 0x38($sp) -/* EE0098 802416D8 8FB10034 */ lw $s1, 0x34($sp) -/* EE009C 802416DC 8FB00030 */ lw $s0, 0x30($sp) -/* EE00A0 802416E0 03E00008 */ jr $ra -/* EE00A4 802416E4 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/EE70C0/func_80240B10_EE70C0.s b/ver/us/asm/nonmatchings/EE70C0/func_80240B10_EE70C0.s deleted file mode 100644 index 789133a6be..0000000000 --- a/ver/us/asm/nonmatchings/EE70C0/func_80240B10_EE70C0.s +++ /dev/null @@ -1,123 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80245380_EEB930 -.double 32767.0 - -.section .text - -glabel EE70C0_UnkNpcAIFunc23 -/* EE70C0 80240B10 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* EE70C4 80240B14 AFB3002C */ sw $s3, 0x2c($sp) -/* EE70C8 80240B18 0080982D */ daddu $s3, $a0, $zero -/* EE70CC 80240B1C AFBF0030 */ sw $ra, 0x30($sp) -/* EE70D0 80240B20 AFB20028 */ sw $s2, 0x28($sp) -/* EE70D4 80240B24 AFB10024 */ sw $s1, 0x24($sp) -/* EE70D8 80240B28 AFB00020 */ sw $s0, 0x20($sp) -/* EE70DC 80240B2C 8E710148 */ lw $s1, 0x148($s3) -/* EE70E0 80240B30 86240008 */ lh $a0, 8($s1) -/* EE70E4 80240B34 0C00F92F */ jal dead_get_npc_unsafe -/* EE70E8 80240B38 00A0902D */ daddu $s2, $a1, $zero -/* EE70EC 80240B3C 8E440004 */ lw $a0, 4($s2) -/* EE70F0 80240B40 0040802D */ daddu $s0, $v0, $zero -/* EE70F4 80240B44 00041FC2 */ srl $v1, $a0, 0x1f -/* EE70F8 80240B48 00832021 */ addu $a0, $a0, $v1 -/* EE70FC 80240B4C 00042043 */ sra $a0, $a0, 1 -/* EE7100 80240B50 0C00AB3B */ jal dead_rand_int -/* EE7104 80240B54 24840001 */ addiu $a0, $a0, 1 -/* EE7108 80240B58 8E430004 */ lw $v1, 4($s2) -/* EE710C 80240B5C 000327C2 */ srl $a0, $v1, 0x1f -/* EE7110 80240B60 00641821 */ addu $v1, $v1, $a0 -/* EE7114 80240B64 00031843 */ sra $v1, $v1, 1 -/* EE7118 80240B68 00621821 */ addu $v1, $v1, $v0 -/* EE711C 80240B6C A603008E */ sh $v1, 0x8e($s0) -/* EE7120 80240B70 8E2300D0 */ lw $v1, 0xd0($s1) -/* EE7124 80240B74 C6000040 */ lwc1 $f0, 0x40($s0) -/* EE7128 80240B78 C4640000 */ lwc1 $f4, ($v1) -/* EE712C 80240B7C 46802120 */ cvt.s.w $f4, $f4 -/* EE7130 80240B80 C4620008 */ lwc1 $f2, 8($v1) -/* EE7134 80240B84 468010A0 */ cvt.s.w $f2, $f2 -/* EE7138 80240B88 E7A00010 */ swc1 $f0, 0x10($sp) -/* EE713C 80240B8C 8E2200D0 */ lw $v0, 0xd0($s1) -/* EE7140 80240B90 44061000 */ mfc1 $a2, $f2 -/* EE7144 80240B94 C440000C */ lwc1 $f0, 0xc($v0) -/* EE7148 80240B98 46800020 */ cvt.s.w $f0, $f0 -/* EE714C 80240B9C E7A00014 */ swc1 $f0, 0x14($sp) -/* EE7150 80240BA0 8E2200D0 */ lw $v0, 0xd0($s1) -/* EE7154 80240BA4 44052000 */ mfc1 $a1, $f4 -/* EE7158 80240BA8 C4400010 */ lwc1 $f0, 0x10($v0) -/* EE715C 80240BAC 46800020 */ cvt.s.w $f0, $f0 -/* EE7160 80240BB0 E7A00018 */ swc1 $f0, 0x18($sp) -/* EE7164 80240BB4 8C640018 */ lw $a0, 0x18($v1) -/* EE7168 80240BB8 0C013431 */ jal dead_is_point_within_region -/* EE716C 80240BBC 8E070038 */ lw $a3, 0x38($s0) -/* EE7170 80240BC0 1040000E */ beqz $v0, .L80240BFC -/* EE7174 80240BC4 00000000 */ nop -/* EE7178 80240BC8 8E2200D0 */ lw $v0, 0xd0($s1) -/* EE717C 80240BCC C60C0038 */ lwc1 $f12, 0x38($s0) -/* EE7180 80240BD0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* EE7184 80240BD4 C4460000 */ lwc1 $f6, ($v0) -/* EE7188 80240BD8 468031A0 */ cvt.s.w $f6, $f6 -/* EE718C 80240BDC 44063000 */ mfc1 $a2, $f6 -/* EE7190 80240BE0 C4460008 */ lwc1 $f6, 8($v0) -/* EE7194 80240BE4 468031A0 */ cvt.s.w $f6, $f6 -/* EE7198 80240BE8 44073000 */ mfc1 $a3, $f6 -/* EE719C 80240BEC 0C00ABDC */ jal fio_validate_header_checksums -/* EE71A0 80240BF0 00000000 */ nop -/* EE71A4 80240BF4 0809030B */ j .L80240C2C -/* EE71A8 80240BF8 E600000C */ swc1 $f0, 0xc($s0) -.L80240BFC: -/* EE71AC 80240BFC 0C00AB3B */ jal dead_rand_int -/* EE71B0 80240C00 2404003C */ addiu $a0, $zero, 0x3c -/* EE71B4 80240C04 C60C000C */ lwc1 $f12, 0xc($s0) -/* EE71B8 80240C08 44820000 */ mtc1 $v0, $f0 -/* EE71BC 80240C0C 00000000 */ nop -/* EE71C0 80240C10 46800020 */ cvt.s.w $f0, $f0 -/* EE71C4 80240C14 46006300 */ add.s $f12, $f12, $f0 -/* EE71C8 80240C18 3C0141F0 */ lui $at, 0x41f0 -/* EE71CC 80240C1C 44810000 */ mtc1 $at, $f0 -/* EE71D0 80240C20 0C00AB85 */ jal dead_clamp_angle -/* EE71D4 80240C24 46006301 */ sub.s $f12, $f12, $f0 -/* EE71D8 80240C28 E600000C */ swc1 $f0, 0xc($s0) -.L80240C2C: -/* EE71DC 80240C2C 8E2200CC */ lw $v0, 0xcc($s1) -/* EE71E0 80240C30 8C420004 */ lw $v0, 4($v0) -/* EE71E4 80240C34 AE020028 */ sw $v0, 0x28($s0) -/* EE71E8 80240C38 AE600074 */ sw $zero, 0x74($s3) -/* EE71EC 80240C3C 8E2200D0 */ lw $v0, 0xd0($s1) -/* EE71F0 80240C40 8C420014 */ lw $v0, 0x14($v0) -/* EE71F4 80240C44 04410004 */ bgez $v0, .L80240C58 -/* EE71F8 80240C48 00000000 */ nop -/* EE71FC 80240C4C C6400000 */ lwc1 $f0, ($s2) -/* EE7200 80240C50 0809031E */ j .L80240C78 -/* EE7204 80240C54 E6000018 */ swc1 $f0, 0x18($s0) -.L80240C58: -/* EE7208 80240C58 3C018024 */ lui $at, %hi(D_80245380_EEB930) -/* EE720C 80240C5C D4225380 */ ldc1 $f2, %lo(D_80245380_EEB930)($at) -/* EE7210 80240C60 44820000 */ mtc1 $v0, $f0 -/* EE7214 80240C64 00000000 */ nop -/* EE7218 80240C68 46800021 */ cvt.d.w $f0, $f0 -/* EE721C 80240C6C 46220003 */ div.d $f0, $f0, $f2 -/* EE7220 80240C70 46200020 */ cvt.s.d $f0, $f0 -/* EE7224 80240C74 E6000018 */ swc1 $f0, 0x18($s0) -.L80240C78: -/* EE7228 80240C78 C600003C */ lwc1 $f0, 0x3c($s0) -/* EE722C 80240C7C 3C014059 */ lui $at, 0x4059 -/* EE7230 80240C80 44811800 */ mtc1 $at, $f3 -/* EE7234 80240C84 44801000 */ mtc1 $zero, $f2 -/* EE7238 80240C88 46000021 */ cvt.d.s $f0, $f0 -/* EE723C 80240C8C 46220002 */ mul.d $f0, $f0, $f2 -/* EE7240 80240C90 00000000 */ nop -/* EE7244 80240C94 24020001 */ addiu $v0, $zero, 1 -/* EE7248 80240C98 4620018D */ trunc.w.d $f6, $f0 -/* EE724C 80240C9C E626007C */ swc1 $f6, 0x7c($s1) -/* EE7250 80240CA0 AE620070 */ sw $v0, 0x70($s3) -/* EE7254 80240CA4 8FBF0030 */ lw $ra, 0x30($sp) -/* EE7258 80240CA8 8FB3002C */ lw $s3, 0x2c($sp) -/* EE725C 80240CAC 8FB20028 */ lw $s2, 0x28($sp) -/* EE7260 80240CB0 8FB10024 */ lw $s1, 0x24($sp) -/* EE7264 80240CB4 8FB00020 */ lw $s0, 0x20($sp) -/* EE7268 80240CB8 03E00008 */ jr $ra -/* EE726C 80240CBC 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/EE70C0/func_80241E1C_EE83CC.s b/ver/us/asm/nonmatchings/EE70C0/func_80241E1C_EE83CC.s deleted file mode 100644 index c58798a7f6..0000000000 --- a/ver/us/asm/nonmatchings/EE70C0/func_80241E1C_EE83CC.s +++ /dev/null @@ -1,158 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80245398_EEB948 -.word L80241F54_EE8504, L80241F64_EE8514, L80241F7C_EE852C, L80241F8C_EE853C, L8024200C_EE85BC, L8024200C_EE85BC, L8024200C_EE85BC, L8024200C_EE85BC, L8024200C_EE85BC, L8024200C_EE85BC, L80241FA4_EE8554, L80241FB4_EE8564, L80241FCC_EE857C, L80241FE4_EE8594, L80241FFC_EE85AC, 0, 0, 0 - -.section .text - -glabel func_80241E1C_EE83CC -/* EE83CC 80241E1C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* EE83D0 80241E20 AFB50044 */ sw $s5, 0x44($sp) -/* EE83D4 80241E24 0080A82D */ daddu $s5, $a0, $zero -/* EE83D8 80241E28 AFBF0048 */ sw $ra, 0x48($sp) -/* EE83DC 80241E2C AFB40040 */ sw $s4, 0x40($sp) -/* EE83E0 80241E30 AFB3003C */ sw $s3, 0x3c($sp) -/* EE83E4 80241E34 AFB20038 */ sw $s2, 0x38($sp) -/* EE83E8 80241E38 AFB10034 */ sw $s1, 0x34($sp) -/* EE83EC 80241E3C AFB00030 */ sw $s0, 0x30($sp) -/* EE83F0 80241E40 8EB20148 */ lw $s2, 0x148($s5) -/* EE83F4 80241E44 86440008 */ lh $a0, 8($s2) -/* EE83F8 80241E48 8EB0000C */ lw $s0, 0xc($s5) -/* EE83FC 80241E4C 0C00F92F */ jal dead_get_npc_unsafe -/* EE8400 80241E50 00A0882D */ daddu $s1, $a1, $zero -/* EE8404 80241E54 02A0202D */ daddu $a0, $s5, $zero -/* EE8408 80241E58 8E050000 */ lw $a1, ($s0) -/* EE840C 80241E5C 0C0B53A3 */ jal dead_evt_get_variable -/* EE8410 80241E60 0040A02D */ daddu $s4, $v0, $zero -/* EE8414 80241E64 AFA00010 */ sw $zero, 0x10($sp) -/* EE8418 80241E68 8E4300D0 */ lw $v1, 0xd0($s2) -/* EE841C 80241E6C 8C630030 */ lw $v1, 0x30($v1) -/* EE8420 80241E70 AFA30014 */ sw $v1, 0x14($sp) -/* EE8424 80241E74 8E4300D0 */ lw $v1, 0xd0($s2) -/* EE8428 80241E78 8C63001C */ lw $v1, 0x1c($v1) -/* EE842C 80241E7C AFA30018 */ sw $v1, 0x18($sp) -/* EE8430 80241E80 8E4300D0 */ lw $v1, 0xd0($s2) -/* EE8434 80241E84 8C630024 */ lw $v1, 0x24($v1) -/* EE8438 80241E88 AFA3001C */ sw $v1, 0x1c($sp) -/* EE843C 80241E8C 8E4300D0 */ lw $v1, 0xd0($s2) -/* EE8440 80241E90 8C630028 */ lw $v1, 0x28($v1) -/* EE8444 80241E94 AFA30020 */ sw $v1, 0x20($sp) -/* EE8448 80241E98 8E4300D0 */ lw $v1, 0xd0($s2) -/* EE844C 80241E9C 3C0142F0 */ lui $at, 0x42f0 -/* EE8450 80241EA0 44810000 */ mtc1 $at, $f0 -/* EE8454 80241EA4 8C63002C */ lw $v1, 0x2c($v1) -/* EE8458 80241EA8 E7A00028 */ swc1 $f0, 0x28($sp) -/* EE845C 80241EAC A7A0002C */ sh $zero, 0x2c($sp) -/* EE8460 80241EB0 AFA30024 */ sw $v1, 0x24($sp) -/* EE8464 80241EB4 C6800038 */ lwc1 $f0, 0x38($s4) -/* EE8468 80241EB8 E6400108 */ swc1 $f0, 0x108($s2) -/* EE846C 80241EBC C680003C */ lwc1 $f0, 0x3c($s4) -/* EE8470 80241EC0 27B30010 */ addiu $s3, $sp, 0x10 -/* EE8474 80241EC4 E640010C */ swc1 $f0, 0x10c($s2) -/* EE8478 80241EC8 3C0138D1 */ lui $at, 0x38d1 -/* EE847C 80241ECC 3421B717 */ ori $at, $at, 0xb717 -/* EE8480 80241ED0 44810000 */ mtc1 $at, $f0 -/* EE8484 80241ED4 C6820040 */ lwc1 $f2, 0x40($s4) -/* EE8488 80241ED8 0040802D */ daddu $s0, $v0, $zero -/* EE848C 80241EDC E6400114 */ swc1 $f0, 0x114($s2) -/* EE8490 80241EE0 E6400118 */ swc1 $f0, 0x118($s2) -/* EE8494 80241EE4 12200006 */ beqz $s1, .L80241F00 -/* EE8498 80241EE8 E6420110 */ swc1 $f2, 0x110($s2) -/* EE849C 80241EEC 0280202D */ daddu $a0, $s4, $zero -/* EE84A0 80241EF0 0240282D */ daddu $a1, $s2, $zero -/* EE84A4 80241EF4 02A0302D */ daddu $a2, $s5, $zero -/* EE84A8 80241EF8 0C09073E */ jal EE70C0_UnkFunc5 -/* EE84AC 80241EFC 0200382D */ daddu $a3, $s0, $zero -.L80241F00: -/* EE84B0 80241F00 2402FFFE */ addiu $v0, $zero, -2 -/* EE84B4 80241F04 A28200AB */ sb $v0, 0xab($s4) -/* EE84B8 80241F08 8E4300B0 */ lw $v1, 0xb0($s2) -/* EE84BC 80241F0C 30620004 */ andi $v0, $v1, 4 -/* EE84C0 80241F10 10400007 */ beqz $v0, .L80241F30 -/* EE84C4 80241F14 00000000 */ nop -/* EE84C8 80241F18 824200B4 */ lb $v0, 0xb4($s2) -/* EE84CC 80241F1C 1440003C */ bnez $v0, .L80242010 -/* EE84D0 80241F20 0000102D */ daddu $v0, $zero, $zero -/* EE84D4 80241F24 2402FFFB */ addiu $v0, $zero, -5 -/* EE84D8 80241F28 00621024 */ and $v0, $v1, $v0 -/* EE84DC 80241F2C AE4200B0 */ sw $v0, 0xb0($s2) -.L80241F30: -/* EE84E0 80241F30 8EA30070 */ lw $v1, 0x70($s5) -/* EE84E4 80241F34 2C62000F */ sltiu $v0, $v1, 0xf -/* EE84E8 80241F38 10400034 */ beqz $v0, L8024200C_EE85BC -/* EE84EC 80241F3C 00031080 */ sll $v0, $v1, 2 -/* EE84F0 80241F40 3C018024 */ lui $at, %hi(jtbl_80245398_EEB948) -/* EE84F4 80241F44 00220821 */ addu $at, $at, $v0 -/* EE84F8 80241F48 8C225398 */ lw $v0, %lo(jtbl_80245398_EEB948)($at) -/* EE84FC 80241F4C 00400008 */ jr $v0 -/* EE8500 80241F50 00000000 */ nop -dlabel L80241F54_EE8504 -/* EE8504 80241F54 02A0202D */ daddu $a0, $s5, $zero -/* EE8508 80241F58 0200282D */ daddu $a1, $s0, $zero -/* EE850C 80241F5C 0C0902C4 */ jal EE70C0_UnkNpcAIFunc23 -/* EE8510 80241F60 0260302D */ daddu $a2, $s3, $zero -dlabel L80241F64_EE8514 -/* EE8514 80241F64 02A0202D */ daddu $a0, $s5, $zero -/* EE8518 80241F68 0200282D */ daddu $a1, $s0, $zero -/* EE851C 80241F6C 0C090330 */ jal EE70C0_UnkNpcAIFunc35 -/* EE8520 80241F70 0260302D */ daddu $a2, $s3, $zero -/* EE8524 80241F74 08090804 */ j .L80242010 -/* EE8528 80241F78 0000102D */ daddu $v0, $zero, $zero -dlabel L80241F7C_EE852C -/* EE852C 80241F7C 02A0202D */ daddu $a0, $s5, $zero -/* EE8530 80241F80 0200282D */ daddu $a1, $s0, $zero -/* EE8534 80241F84 0C0904BA */ jal EE70C0_UnkNpcAIFunc1 -/* EE8538 80241F88 0260302D */ daddu $a2, $s3, $zero -dlabel L80241F8C_EE853C -/* EE853C 80241F8C 02A0202D */ daddu $a0, $s5, $zero -/* EE8540 80241F90 0200282D */ daddu $a1, $s0, $zero -/* EE8544 80241F94 0C0904EA */ jal EE70C0_UnkFunc4 -/* EE8548 80241F98 0260302D */ daddu $a2, $s3, $zero -/* EE854C 80241F9C 08090804 */ j .L80242010 -/* EE8550 80241FA0 0000102D */ daddu $v0, $zero, $zero -dlabel L80241FA4_EE8554 -/* EE8554 80241FA4 02A0202D */ daddu $a0, $s5, $zero -/* EE8558 80241FA8 0200282D */ daddu $a1, $s0, $zero -/* EE855C 80241FAC 0C0905BB */ jal EE70C0_UnkNpcAIFunc2 -/* EE8560 80241FB0 0260302D */ daddu $a2, $s3, $zero -dlabel L80241FB4_EE8564 -/* EE8564 80241FB4 02A0202D */ daddu $a0, $s5, $zero -/* EE8568 80241FB8 0200282D */ daddu $a1, $s0, $zero -/* EE856C 80241FBC 0C0905D9 */ jal EE70C0_SixFloatsFunc -/* EE8570 80241FC0 0260302D */ daddu $a2, $s3, $zero -/* EE8574 80241FC4 08090804 */ j .L80242010 -/* EE8578 80241FC8 0000102D */ daddu $v0, $zero, $zero -dlabel L80241FCC_EE857C -/* EE857C 80241FCC 02A0202D */ daddu $a0, $s5, $zero -/* EE8580 80241FD0 0200282D */ daddu $a1, $s0, $zero -/* EE8584 80241FD4 0C0905F4 */ jal EE70C0_UnkNpcAIFunc14 -/* EE8588 80241FD8 0260302D */ daddu $a2, $s3, $zero -/* EE858C 80241FDC 08090804 */ j .L80242010 -/* EE8590 80241FE0 0000102D */ daddu $v0, $zero, $zero -dlabel L80241FE4_EE8594 -/* EE8594 80241FE4 02A0202D */ daddu $a0, $s5, $zero -/* EE8598 80241FE8 0200282D */ daddu $a1, $s0, $zero -/* EE859C 80241FEC 0C090641 */ jal EE70C0_UnkNpcAIFunc3 -/* EE85A0 80241FF0 0260302D */ daddu $a2, $s3, $zero -/* EE85A4 80241FF4 08090804 */ j .L80242010 -/* EE85A8 80241FF8 0000102D */ daddu $v0, $zero, $zero -dlabel L80241FFC_EE85AC -/* EE85AC 80241FFC 02A0202D */ daddu $a0, $s5, $zero -/* EE85B0 80242000 0200282D */ daddu $a1, $s0, $zero -/* EE85B4 80242004 0C09065A */ jal EE70C0_UnkFunc6 -/* EE85B8 80242008 0260302D */ daddu $a2, $s3, $zero -dlabel L8024200C_EE85BC -/* EE85BC 8024200C 0000102D */ daddu $v0, $zero, $zero -.L80242010: -/* EE85C0 80242010 8FBF0048 */ lw $ra, 0x48($sp) -/* EE85C4 80242014 8FB50044 */ lw $s5, 0x44($sp) -/* EE85C8 80242018 8FB40040 */ lw $s4, 0x40($sp) -/* EE85CC 8024201C 8FB3003C */ lw $s3, 0x3c($sp) -/* EE85D0 80242020 8FB20038 */ lw $s2, 0x38($sp) -/* EE85D4 80242024 8FB10034 */ lw $s1, 0x34($sp) -/* EE85D8 80242028 8FB00030 */ lw $s0, 0x30($sp) -/* EE85DC 8024202C 03E00008 */ jr $ra -/* EE85E0 80242030 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/EEDF50/func_8024215C_EEF25C.s b/ver/us/asm/nonmatchings/EEDF50/func_8024215C_EEF25C.s deleted file mode 100644 index 082cfb556c..0000000000 --- a/ver/us/asm/nonmatchings/EEDF50/func_8024215C_EEF25C.s +++ /dev/null @@ -1,158 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80245468_EF2568 -.word .L80242294_EEF394, .L802422A4_EEF3A4, .L802422BC_EEF3BC, .L802422CC_EEF3CC, .L8024234C_EEF44C, .L8024234C_EEF44C, .L8024234C_EEF44C, .L8024234C_EEF44C, .L8024234C_EEF44C, .L8024234C_EEF44C, .L802422E4_EEF3E4, .L802422F4_EEF3F4, .L8024230C_EEF40C, .L80242324_EEF424, .L8024233C_EEF43C, 0 - -.section .text - -glabel func_8024215C_EEF25C -/* EEF25C 8024215C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* EEF260 80242160 AFB50044 */ sw $s5, 0x44($sp) -/* EEF264 80242164 0080A82D */ daddu $s5, $a0, $zero -/* EEF268 80242168 AFBF0048 */ sw $ra, 0x48($sp) -/* EEF26C 8024216C AFB40040 */ sw $s4, 0x40($sp) -/* EEF270 80242170 AFB3003C */ sw $s3, 0x3c($sp) -/* EEF274 80242174 AFB20038 */ sw $s2, 0x38($sp) -/* EEF278 80242178 AFB10034 */ sw $s1, 0x34($sp) -/* EEF27C 8024217C AFB00030 */ sw $s0, 0x30($sp) -/* EEF280 80242180 8EB20148 */ lw $s2, 0x148($s5) -/* EEF284 80242184 86440008 */ lh $a0, 8($s2) -/* EEF288 80242188 8EB0000C */ lw $s0, 0xc($s5) -/* EEF28C 8024218C 0C00F92F */ jal dead_get_npc_unsafe -/* EEF290 80242190 00A0882D */ daddu $s1, $a1, $zero -/* EEF294 80242194 02A0202D */ daddu $a0, $s5, $zero -/* EEF298 80242198 8E050000 */ lw $a1, ($s0) -/* EEF29C 8024219C 0C0B53A3 */ jal dead_evt_get_variable -/* EEF2A0 802421A0 0040A02D */ daddu $s4, $v0, $zero -/* EEF2A4 802421A4 AFA00010 */ sw $zero, 0x10($sp) -/* EEF2A8 802421A8 8E4300D0 */ lw $v1, 0xd0($s2) -/* EEF2AC 802421AC 8C630030 */ lw $v1, 0x30($v1) -/* EEF2B0 802421B0 AFA30014 */ sw $v1, 0x14($sp) -/* EEF2B4 802421B4 8E4300D0 */ lw $v1, 0xd0($s2) -/* EEF2B8 802421B8 8C63001C */ lw $v1, 0x1c($v1) -/* EEF2BC 802421BC AFA30018 */ sw $v1, 0x18($sp) -/* EEF2C0 802421C0 8E4300D0 */ lw $v1, 0xd0($s2) -/* EEF2C4 802421C4 8C630024 */ lw $v1, 0x24($v1) -/* EEF2C8 802421C8 AFA3001C */ sw $v1, 0x1c($sp) -/* EEF2CC 802421CC 8E4300D0 */ lw $v1, 0xd0($s2) -/* EEF2D0 802421D0 8C630028 */ lw $v1, 0x28($v1) -/* EEF2D4 802421D4 AFA30020 */ sw $v1, 0x20($sp) -/* EEF2D8 802421D8 8E4300D0 */ lw $v1, 0xd0($s2) -/* EEF2DC 802421DC 3C0142F0 */ lui $at, 0x42f0 -/* EEF2E0 802421E0 44810000 */ mtc1 $at, $f0 -/* EEF2E4 802421E4 8C63002C */ lw $v1, 0x2c($v1) -/* EEF2E8 802421E8 E7A00028 */ swc1 $f0, 0x28($sp) -/* EEF2EC 802421EC A7A0002C */ sh $zero, 0x2c($sp) -/* EEF2F0 802421F0 AFA30024 */ sw $v1, 0x24($sp) -/* EEF2F4 802421F4 C6800038 */ lwc1 $f0, 0x38($s4) -/* EEF2F8 802421F8 E6400108 */ swc1 $f0, 0x108($s2) -/* EEF2FC 802421FC C680003C */ lwc1 $f0, 0x3c($s4) -/* EEF300 80242200 27B30010 */ addiu $s3, $sp, 0x10 -/* EEF304 80242204 E640010C */ swc1 $f0, 0x10c($s2) -/* EEF308 80242208 3C0138D1 */ lui $at, 0x38d1 -/* EEF30C 8024220C 3421B717 */ ori $at, $at, 0xb717 -/* EEF310 80242210 44810000 */ mtc1 $at, $f0 -/* EEF314 80242214 C6820040 */ lwc1 $f2, 0x40($s4) -/* EEF318 80242218 0040802D */ daddu $s0, $v0, $zero -/* EEF31C 8024221C E6400114 */ swc1 $f0, 0x114($s2) -/* EEF320 80242220 E6400118 */ swc1 $f0, 0x118($s2) -/* EEF324 80242224 12200006 */ beqz $s1, .L80242240 -/* EEF328 80242228 E6420110 */ swc1 $f2, 0x110($s2) -/* EEF32C 8024222C 0280202D */ daddu $a0, $s4, $zero -/* EEF330 80242230 0240282D */ daddu $a1, $s2, $zero -/* EEF334 80242234 02A0302D */ daddu $a2, $s5, $zero -/* EEF338 80242238 0C09080E */ jal EEDF50_UnkFunc5 -/* EEF33C 8024223C 0200382D */ daddu $a3, $s0, $zero -.L80242240: -/* EEF340 80242240 2402FFFE */ addiu $v0, $zero, -2 -/* EEF344 80242244 A28200AB */ sb $v0, 0xab($s4) -/* EEF348 80242248 8E4300B0 */ lw $v1, 0xb0($s2) -/* EEF34C 8024224C 30620004 */ andi $v0, $v1, 4 -/* EEF350 80242250 10400007 */ beqz $v0, .L80242270 -/* EEF354 80242254 00000000 */ nop -/* EEF358 80242258 824200B4 */ lb $v0, 0xb4($s2) -/* EEF35C 8024225C 1440003C */ bnez $v0, .L80242350 -/* EEF360 80242260 0000102D */ daddu $v0, $zero, $zero -/* EEF364 80242264 2402FFFB */ addiu $v0, $zero, -5 -/* EEF368 80242268 00621024 */ and $v0, $v1, $v0 -/* EEF36C 8024226C AE4200B0 */ sw $v0, 0xb0($s2) -.L80242270: -/* EEF370 80242270 8EA30070 */ lw $v1, 0x70($s5) -/* EEF374 80242274 2C62000F */ sltiu $v0, $v1, 0xf -/* EEF378 80242278 10400034 */ beqz $v0, .L8024234C_EEF44C -/* EEF37C 8024227C 00031080 */ sll $v0, $v1, 2 -/* EEF380 80242280 3C018024 */ lui $at, %hi(jtbl_80245468_EF2568) -/* EEF384 80242284 00220821 */ addu $at, $at, $v0 -/* EEF388 80242288 8C225468 */ lw $v0, %lo(jtbl_80245468_EF2568)($at) -/* EEF38C 8024228C 00400008 */ jr $v0 -/* EEF390 80242290 00000000 */ nop -.L80242294_EEF394: -/* EEF394 80242294 02A0202D */ daddu $a0, $s5, $zero -/* EEF398 80242298 0200282D */ daddu $a1, $s0, $zero -/* EEF39C 8024229C 0C090394 */ jal EEDF50_UnkNpcAIFunc23 -/* EEF3A0 802422A0 0260302D */ daddu $a2, $s3, $zero -.L802422A4_EEF3A4: -/* EEF3A4 802422A4 02A0202D */ daddu $a0, $s5, $zero -/* EEF3A8 802422A8 0200282D */ daddu $a1, $s0, $zero -/* EEF3AC 802422AC 0C090400 */ jal EEDF50_UnkNpcAIFunc35 -/* EEF3B0 802422B0 0260302D */ daddu $a2, $s3, $zero -/* EEF3B4 802422B4 080908D4 */ j .L80242350 -/* EEF3B8 802422B8 0000102D */ daddu $v0, $zero, $zero -.L802422BC_EEF3BC: -/* EEF3BC 802422BC 02A0202D */ daddu $a0, $s5, $zero -/* EEF3C0 802422C0 0200282D */ daddu $a1, $s0, $zero -/* EEF3C4 802422C4 0C09058A */ jal EEDF50_UnkNpcAIFunc1 -/* EEF3C8 802422C8 0260302D */ daddu $a2, $s3, $zero -.L802422CC_EEF3CC: -/* EEF3CC 802422CC 02A0202D */ daddu $a0, $s5, $zero -/* EEF3D0 802422D0 0200282D */ daddu $a1, $s0, $zero -/* EEF3D4 802422D4 0C0905BA */ jal EEDF50_UnkFunc4 -/* EEF3D8 802422D8 0260302D */ daddu $a2, $s3, $zero -/* EEF3DC 802422DC 080908D4 */ j .L80242350 -/* EEF3E0 802422E0 0000102D */ daddu $v0, $zero, $zero -.L802422E4_EEF3E4: -/* EEF3E4 802422E4 02A0202D */ daddu $a0, $s5, $zero -/* EEF3E8 802422E8 0200282D */ daddu $a1, $s0, $zero -/* EEF3EC 802422EC 0C09068B */ jal EEDF50_UnkNpcAIFunc2 -/* EEF3F0 802422F0 0260302D */ daddu $a2, $s3, $zero -.L802422F4_EEF3F4: -/* EEF3F4 802422F4 02A0202D */ daddu $a0, $s5, $zero -/* EEF3F8 802422F8 0200282D */ daddu $a1, $s0, $zero -/* EEF3FC 802422FC 0C0906A9 */ jal EEDF50_SixFloatsFunc -/* EEF400 80242300 0260302D */ daddu $a2, $s3, $zero -/* EEF404 80242304 080908D4 */ j .L80242350 -/* EEF408 80242308 0000102D */ daddu $v0, $zero, $zero -.L8024230C_EEF40C: -/* EEF40C 8024230C 02A0202D */ daddu $a0, $s5, $zero -/* EEF410 80242310 0200282D */ daddu $a1, $s0, $zero -/* EEF414 80242314 0C0906C4 */ jal EEDF50_UnkNpcAIFunc14 -/* EEF418 80242318 0260302D */ daddu $a2, $s3, $zero -/* EEF41C 8024231C 080908D4 */ j .L80242350 -/* EEF420 80242320 0000102D */ daddu $v0, $zero, $zero -.L80242324_EEF424: -/* EEF424 80242324 02A0202D */ daddu $a0, $s5, $zero -/* EEF428 80242328 0200282D */ daddu $a1, $s0, $zero -/* EEF42C 8024232C 0C090711 */ jal EEDF50_UnkNpcAIFunc3 -/* EEF430 80242330 0260302D */ daddu $a2, $s3, $zero -/* EEF434 80242334 080908D4 */ j .L80242350 -/* EEF438 80242338 0000102D */ daddu $v0, $zero, $zero -.L8024233C_EEF43C: -/* EEF43C 8024233C 02A0202D */ daddu $a0, $s5, $zero -/* EEF440 80242340 0200282D */ daddu $a1, $s0, $zero -/* EEF444 80242344 0C09072A */ jal EEDF50_UnkFunc6 -/* EEF448 80242348 0260302D */ daddu $a2, $s3, $zero -.L8024234C_EEF44C: -/* EEF44C 8024234C 0000102D */ daddu $v0, $zero, $zero -.L80242350: -/* EEF450 80242350 8FBF0048 */ lw $ra, 0x48($sp) -/* EEF454 80242354 8FB50044 */ lw $s5, 0x44($sp) -/* EEF458 80242358 8FB40040 */ lw $s4, 0x40($sp) -/* EEF45C 8024235C 8FB3003C */ lw $s3, 0x3c($sp) -/* EEF460 80242360 8FB20038 */ lw $s2, 0x38($sp) -/* EEF464 80242364 8FB10034 */ lw $s1, 0x34($sp) -/* EEF468 80242368 8FB00030 */ lw $s0, 0x30($sp) -/* EEF46C 8024236C 03E00008 */ jr $ra -/* EEF470 80242370 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/EF2680/func_8024137C_EF398C.s b/ver/us/asm/nonmatchings/EF2680/func_8024137C_EF398C.s deleted file mode 100644 index 6ed655e690..0000000000 --- a/ver/us/asm/nonmatchings/EF2680/func_8024137C_EF398C.s +++ /dev/null @@ -1,158 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_802453C8_EF79D8 -.word .L802414B4_EF3AC4, .L802414C4_EF3AD4, .L802414DC_EF3AEC, .L802414EC_EF3AFC, .L8024156C_EF3B7C, .L8024156C_EF3B7C, .L8024156C_EF3B7C, .L8024156C_EF3B7C, .L8024156C_EF3B7C, .L8024156C_EF3B7C, .L80241504_EF3B14, .L80241514_EF3B24, .L8024152C_EF3B3C, .L80241544_EF3B54, .L8024155C_EF3B6C, 0 - -.section .text - -glabel func_8024137C_EF398C -/* EF398C 8024137C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* EF3990 80241380 AFB50044 */ sw $s5, 0x44($sp) -/* EF3994 80241384 0080A82D */ daddu $s5, $a0, $zero -/* EF3998 80241388 AFBF0048 */ sw $ra, 0x48($sp) -/* EF399C 8024138C AFB40040 */ sw $s4, 0x40($sp) -/* EF39A0 80241390 AFB3003C */ sw $s3, 0x3c($sp) -/* EF39A4 80241394 AFB20038 */ sw $s2, 0x38($sp) -/* EF39A8 80241398 AFB10034 */ sw $s1, 0x34($sp) -/* EF39AC 8024139C AFB00030 */ sw $s0, 0x30($sp) -/* EF39B0 802413A0 8EB20148 */ lw $s2, 0x148($s5) -/* EF39B4 802413A4 86440008 */ lh $a0, 8($s2) -/* EF39B8 802413A8 8EB0000C */ lw $s0, 0xc($s5) -/* EF39BC 802413AC 0C00F92F */ jal dead_get_npc_unsafe -/* EF39C0 802413B0 00A0882D */ daddu $s1, $a1, $zero -/* EF39C4 802413B4 02A0202D */ daddu $a0, $s5, $zero -/* EF39C8 802413B8 8E050000 */ lw $a1, ($s0) -/* EF39CC 802413BC 0C0B53A3 */ jal dead_evt_get_variable -/* EF39D0 802413C0 0040A02D */ daddu $s4, $v0, $zero -/* EF39D4 802413C4 AFA00010 */ sw $zero, 0x10($sp) -/* EF39D8 802413C8 8E4300D0 */ lw $v1, 0xd0($s2) -/* EF39DC 802413CC 8C630030 */ lw $v1, 0x30($v1) -/* EF39E0 802413D0 AFA30014 */ sw $v1, 0x14($sp) -/* EF39E4 802413D4 8E4300D0 */ lw $v1, 0xd0($s2) -/* EF39E8 802413D8 8C63001C */ lw $v1, 0x1c($v1) -/* EF39EC 802413DC AFA30018 */ sw $v1, 0x18($sp) -/* EF39F0 802413E0 8E4300D0 */ lw $v1, 0xd0($s2) -/* EF39F4 802413E4 8C630024 */ lw $v1, 0x24($v1) -/* EF39F8 802413E8 AFA3001C */ sw $v1, 0x1c($sp) -/* EF39FC 802413EC 8E4300D0 */ lw $v1, 0xd0($s2) -/* EF3A00 802413F0 8C630028 */ lw $v1, 0x28($v1) -/* EF3A04 802413F4 AFA30020 */ sw $v1, 0x20($sp) -/* EF3A08 802413F8 8E4300D0 */ lw $v1, 0xd0($s2) -/* EF3A0C 802413FC 3C0142F0 */ lui $at, 0x42f0 -/* EF3A10 80241400 44810000 */ mtc1 $at, $f0 -/* EF3A14 80241404 8C63002C */ lw $v1, 0x2c($v1) -/* EF3A18 80241408 E7A00028 */ swc1 $f0, 0x28($sp) -/* EF3A1C 8024140C A7A0002C */ sh $zero, 0x2c($sp) -/* EF3A20 80241410 AFA30024 */ sw $v1, 0x24($sp) -/* EF3A24 80241414 C6800038 */ lwc1 $f0, 0x38($s4) -/* EF3A28 80241418 E6400108 */ swc1 $f0, 0x108($s2) -/* EF3A2C 8024141C C680003C */ lwc1 $f0, 0x3c($s4) -/* EF3A30 80241420 27B30010 */ addiu $s3, $sp, 0x10 -/* EF3A34 80241424 E640010C */ swc1 $f0, 0x10c($s2) -/* EF3A38 80241428 3C0138D1 */ lui $at, 0x38d1 -/* EF3A3C 8024142C 3421B717 */ ori $at, $at, 0xb717 -/* EF3A40 80241430 44810000 */ mtc1 $at, $f0 -/* EF3A44 80241434 C6820040 */ lwc1 $f2, 0x40($s4) -/* EF3A48 80241438 0040802D */ daddu $s0, $v0, $zero -/* EF3A4C 8024143C E6400114 */ swc1 $f0, 0x114($s2) -/* EF3A50 80241440 E6400118 */ swc1 $f0, 0x118($s2) -/* EF3A54 80241444 12200006 */ beqz $s1, .L80241460 -/* EF3A58 80241448 E6420110 */ swc1 $f2, 0x110($s2) -/* EF3A5C 8024144C 0280202D */ daddu $a0, $s4, $zero -/* EF3A60 80241450 0240282D */ daddu $a1, $s2, $zero -/* EF3A64 80241454 02A0302D */ daddu $a2, $s5, $zero -/* EF3A68 80241458 0C090496 */ jal EF2680_UnkFunc5 -/* EF3A6C 8024145C 0200382D */ daddu $a3, $s0, $zero -.L80241460: -/* EF3A70 80241460 2402FFFE */ addiu $v0, $zero, -2 -/* EF3A74 80241464 A28200AB */ sb $v0, 0xab($s4) -/* EF3A78 80241468 8E4300B0 */ lw $v1, 0xb0($s2) -/* EF3A7C 8024146C 30620004 */ andi $v0, $v1, 4 -/* EF3A80 80241470 10400007 */ beqz $v0, .L80241490 -/* EF3A84 80241474 00000000 */ nop -/* EF3A88 80241478 824200B4 */ lb $v0, 0xb4($s2) -/* EF3A8C 8024147C 1440003C */ bnez $v0, .L80241570 -/* EF3A90 80241480 0000102D */ daddu $v0, $zero, $zero -/* EF3A94 80241484 2402FFFB */ addiu $v0, $zero, -5 -/* EF3A98 80241488 00621024 */ and $v0, $v1, $v0 -/* EF3A9C 8024148C AE4200B0 */ sw $v0, 0xb0($s2) -.L80241490: -/* EF3AA0 80241490 8EA30070 */ lw $v1, 0x70($s5) -/* EF3AA4 80241494 2C62000F */ sltiu $v0, $v1, 0xf -/* EF3AA8 80241498 10400034 */ beqz $v0, .L8024156C_EF3B7C -/* EF3AAC 8024149C 00031080 */ sll $v0, $v1, 2 -/* EF3AB0 802414A0 3C018024 */ lui $at, %hi(jtbl_802453C8_EF79D8) -/* EF3AB4 802414A4 00220821 */ addu $at, $at, $v0 -/* EF3AB8 802414A8 8C2253C8 */ lw $v0, %lo(jtbl_802453C8_EF79D8)($at) -/* EF3ABC 802414AC 00400008 */ jr $v0 -/* EF3AC0 802414B0 00000000 */ nop -.L802414B4_EF3AC4: -/* EF3AC4 802414B4 02A0202D */ daddu $a0, $s5, $zero -/* EF3AC8 802414B8 0200282D */ daddu $a1, $s0, $zero -/* EF3ACC 802414BC 0C09001C */ jal EF2680_UnkNpcAIFunc23 -/* EF3AD0 802414C0 0260302D */ daddu $a2, $s3, $zero -.L802414C4_EF3AD4: -/* EF3AD4 802414C4 02A0202D */ daddu $a0, $s5, $zero -/* EF3AD8 802414C8 0200282D */ daddu $a1, $s0, $zero -/* EF3ADC 802414CC 0C090088 */ jal EF2680_UnkNpcAIFunc35 -/* EF3AE0 802414D0 0260302D */ daddu $a2, $s3, $zero -/* EF3AE4 802414D4 0809055C */ j .L80241570 -/* EF3AE8 802414D8 0000102D */ daddu $v0, $zero, $zero -.L802414DC_EF3AEC: -/* EF3AEC 802414DC 02A0202D */ daddu $a0, $s5, $zero -/* EF3AF0 802414E0 0200282D */ daddu $a1, $s0, $zero -/* EF3AF4 802414E4 0C090212 */ jal EF2680_UnkNpcAIFunc1 -/* EF3AF8 802414E8 0260302D */ daddu $a2, $s3, $zero -.L802414EC_EF3AFC: -/* EF3AFC 802414EC 02A0202D */ daddu $a0, $s5, $zero -/* EF3B00 802414F0 0200282D */ daddu $a1, $s0, $zero -/* EF3B04 802414F4 0C090242 */ jal EF2680_UnkFunc4 -/* EF3B08 802414F8 0260302D */ daddu $a2, $s3, $zero -/* EF3B0C 802414FC 0809055C */ j .L80241570 -/* EF3B10 80241500 0000102D */ daddu $v0, $zero, $zero -.L80241504_EF3B14: -/* EF3B14 80241504 02A0202D */ daddu $a0, $s5, $zero -/* EF3B18 80241508 0200282D */ daddu $a1, $s0, $zero -/* EF3B1C 8024150C 0C090313 */ jal EF2680_UnkNpcAIFunc2 -/* EF3B20 80241510 0260302D */ daddu $a2, $s3, $zero -.L80241514_EF3B24: -/* EF3B24 80241514 02A0202D */ daddu $a0, $s5, $zero -/* EF3B28 80241518 0200282D */ daddu $a1, $s0, $zero -/* EF3B2C 8024151C 0C090331 */ jal EF2680_SixFloatsFunc -/* EF3B30 80241520 0260302D */ daddu $a2, $s3, $zero -/* EF3B34 80241524 0809055C */ j .L80241570 -/* EF3B38 80241528 0000102D */ daddu $v0, $zero, $zero -.L8024152C_EF3B3C: -/* EF3B3C 8024152C 02A0202D */ daddu $a0, $s5, $zero -/* EF3B40 80241530 0200282D */ daddu $a1, $s0, $zero -/* EF3B44 80241534 0C09034C */ jal EF2680_UnkNpcAIFunc14 -/* EF3B48 80241538 0260302D */ daddu $a2, $s3, $zero -/* EF3B4C 8024153C 0809055C */ j .L80241570 -/* EF3B50 80241540 0000102D */ daddu $v0, $zero, $zero -.L80241544_EF3B54: -/* EF3B54 80241544 02A0202D */ daddu $a0, $s5, $zero -/* EF3B58 80241548 0200282D */ daddu $a1, $s0, $zero -/* EF3B5C 8024154C 0C090399 */ jal EF2680_UnkNpcAIFunc3 -/* EF3B60 80241550 0260302D */ daddu $a2, $s3, $zero -/* EF3B64 80241554 0809055C */ j .L80241570 -/* EF3B68 80241558 0000102D */ daddu $v0, $zero, $zero -.L8024155C_EF3B6C: -/* EF3B6C 8024155C 02A0202D */ daddu $a0, $s5, $zero -/* EF3B70 80241560 0200282D */ daddu $a1, $s0, $zero -/* EF3B74 80241564 0C0903B2 */ jal EF2680_UnkFunc6 -/* EF3B78 80241568 0260302D */ daddu $a2, $s3, $zero -.L8024156C_EF3B7C: -/* EF3B7C 8024156C 0000102D */ daddu $v0, $zero, $zero -.L80241570: -/* EF3B80 80241570 8FBF0048 */ lw $ra, 0x48($sp) -/* EF3B84 80241574 8FB50044 */ lw $s5, 0x44($sp) -/* EF3B88 80241578 8FB40040 */ lw $s4, 0x40($sp) -/* EF3B8C 8024157C 8FB3003C */ lw $s3, 0x3c($sp) -/* EF3B90 80241580 8FB20038 */ lw $s2, 0x38($sp) -/* EF3B94 80241584 8FB10034 */ lw $s1, 0x34($sp) -/* EF3B98 80241588 8FB00030 */ lw $s0, 0x30($sp) -/* EF3B9C 8024158C 03E00008 */ jr $ra -/* EF3BA0 80241590 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80242618_A18838.s b/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80242618_A18838.s deleted file mode 100644 index 970a986c5d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80242618_A18838.s +++ /dev/null @@ -1,179 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80244E78_A1B098 -.double 0.06 - -.section .text - -glabel hos_02_UnkNpcAIFunc34 -/* A18838 80242618 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* A1883C 8024261C AFB3004C */ sw $s3, 0x4c($sp) -/* A18840 80242620 0080982D */ daddu $s3, $a0, $zero -/* A18844 80242624 AFBF0050 */ sw $ra, 0x50($sp) -/* A18848 80242628 AFB20048 */ sw $s2, 0x48($sp) -/* A1884C 8024262C AFB10044 */ sw $s1, 0x44($sp) -/* A18850 80242630 AFB00040 */ sw $s0, 0x40($sp) -/* A18854 80242634 8E720148 */ lw $s2, 0x148($s3) -/* A18858 80242638 00A0882D */ daddu $s1, $a1, $zero -/* A1885C 8024263C 86440008 */ lh $a0, 8($s2) -/* A18860 80242640 0C00EABB */ jal get_npc_unsafe -/* A18864 80242644 00C0802D */ daddu $s0, $a2, $zero -/* A18868 80242648 0200202D */ daddu $a0, $s0, $zero -/* A1886C 8024264C 0240282D */ daddu $a1, $s2, $zero -/* A18870 80242650 24030001 */ addiu $v1, $zero, 1 -/* A18874 80242654 AFA30010 */ sw $v1, 0x10($sp) -/* A18878 80242658 8E260024 */ lw $a2, 0x24($s1) -/* A1887C 8024265C 8E270028 */ lw $a3, 0x28($s1) -/* A18880 80242660 0C01242D */ jal func_800490B4 -/* A18884 80242664 0040802D */ daddu $s0, $v0, $zero -/* A18888 80242668 14400020 */ bnez $v0, .L802426EC -/* A1888C 8024266C 24040002 */ addiu $a0, $zero, 2 -/* A18890 80242670 0200282D */ daddu $a1, $s0, $zero -/* A18894 80242674 0000302D */ daddu $a2, $zero, $zero -/* A18898 80242678 860300A8 */ lh $v1, 0xa8($s0) -/* A1889C 8024267C 3C013F80 */ lui $at, 0x3f80 -/* A188A0 80242680 44810000 */ mtc1 $at, $f0 -/* A188A4 80242684 3C014000 */ lui $at, 0x4000 -/* A188A8 80242688 44811000 */ mtc1 $at, $f2 -/* A188AC 8024268C 3C01C1A0 */ lui $at, 0xc1a0 -/* A188B0 80242690 44812000 */ mtc1 $at, $f4 -/* A188B4 80242694 2402000F */ addiu $v0, $zero, 0xf -/* A188B8 80242698 AFA2001C */ sw $v0, 0x1c($sp) -/* A188BC 8024269C 44834000 */ mtc1 $v1, $f8 -/* A188C0 802426A0 00000000 */ nop -/* A188C4 802426A4 46804220 */ cvt.s.w $f8, $f8 -/* A188C8 802426A8 44074000 */ mfc1 $a3, $f8 -/* A188CC 802426AC 27A20028 */ addiu $v0, $sp, 0x28 -/* A188D0 802426B0 AFA20020 */ sw $v0, 0x20($sp) -/* A188D4 802426B4 E7A00010 */ swc1 $f0, 0x10($sp) -/* A188D8 802426B8 E7A20014 */ swc1 $f2, 0x14($sp) -/* A188DC 802426BC 0C01BFA4 */ jal fx_emote -/* A188E0 802426C0 E7A40018 */ swc1 $f4, 0x18($sp) -/* A188E4 802426C4 8E4200CC */ lw $v0, 0xcc($s2) -/* A188E8 802426C8 8C430000 */ lw $v1, ($v0) -/* A188EC 802426CC 2402001E */ addiu $v0, $zero, 0x1e -/* A188F0 802426D0 A602008E */ sh $v0, 0x8e($s0) -/* A188F4 802426D4 24020014 */ addiu $v0, $zero, 0x14 -/* A188F8 802426D8 AE030028 */ sw $v1, 0x28($s0) -/* A188FC 802426DC AE620070 */ sw $v0, 0x70($s3) -/* A18900 802426E0 2402001E */ addiu $v0, $zero, 0x1e -/* A18904 802426E4 08090A1F */ j .L8024287C -/* A18908 802426E8 AE420090 */ sw $v0, 0x90($s2) -.L802426EC: -/* A1890C 802426EC 8E050018 */ lw $a1, 0x18($s0) -/* A18910 802426F0 8E06000C */ lw $a2, 0xc($s0) -/* A18914 802426F4 0C00EA95 */ jal npc_move_heading -/* A18918 802426F8 0200202D */ daddu $a0, $s0, $zero -/* A1891C 802426FC 8E020000 */ lw $v0, ($s0) -/* A18920 80242700 30420008 */ andi $v0, $v0, 8 -/* A18924 80242704 14400028 */ bnez $v0, .L802427A8 -/* A18928 80242708 0000882D */ daddu $s1, $zero, $zero -/* A1892C 8024270C 27A5002C */ addiu $a1, $sp, 0x2c -/* A18930 80242710 27A60030 */ addiu $a2, $sp, 0x30 -/* A18934 80242714 860200A8 */ lh $v0, 0xa8($s0) -/* A18938 80242718 C6000038 */ lwc1 $f0, 0x38($s0) -/* A1893C 8024271C 44821000 */ mtc1 $v0, $f2 -/* A18940 80242720 00000000 */ nop -/* A18944 80242724 468010A0 */ cvt.s.w $f2, $f2 -/* A18948 80242728 E7A0002C */ swc1 $f0, 0x2c($sp) -/* A1894C 8024272C 860200A8 */ lh $v0, 0xa8($s0) -/* A18950 80242730 C604003C */ lwc1 $f4, 0x3c($s0) -/* A18954 80242734 C6060040 */ lwc1 $f6, 0x40($s0) -/* A18958 80242738 44820000 */ mtc1 $v0, $f0 -/* A1895C 8024273C 00000000 */ nop -/* A18960 80242740 46800021 */ cvt.d.w $f0, $f0 -/* A18964 80242744 46022100 */ add.s $f4, $f4, $f2 -/* A18968 80242748 3C014008 */ lui $at, 0x4008 -/* A1896C 8024274C 44811800 */ mtc1 $at, $f3 -/* A18970 80242750 44801000 */ mtc1 $zero, $f2 -/* A18974 80242754 27A20038 */ addiu $v0, $sp, 0x38 -/* A18978 80242758 46220000 */ add.d $f0, $f0, $f2 -/* A1897C 8024275C E7A60034 */ swc1 $f6, 0x34($sp) -/* A18980 80242760 E7A40030 */ swc1 $f4, 0x30($sp) -/* A18984 80242764 46200020 */ cvt.s.d $f0, $f0 -/* A18988 80242768 E7A00038 */ swc1 $f0, 0x38($sp) -/* A1898C 8024276C AFA20010 */ sw $v0, 0x10($sp) -/* A18990 80242770 8E040080 */ lw $a0, 0x80($s0) -/* A18994 80242774 0C0372DF */ jal npc_raycast_down_sides -/* A18998 80242778 27A70034 */ addiu $a3, $sp, 0x34 -/* A1899C 8024277C 1040000A */ beqz $v0, .L802427A8 -/* A189A0 80242780 00000000 */ nop -/* A189A4 80242784 860200A8 */ lh $v0, 0xa8($s0) -/* A189A8 80242788 C7A20038 */ lwc1 $f2, 0x38($sp) -/* A189AC 8024278C 44820000 */ mtc1 $v0, $f0 -/* A189B0 80242790 00000000 */ nop -/* A189B4 80242794 46800020 */ cvt.s.w $f0, $f0 -/* A189B8 80242798 4600103C */ c.lt.s $f2, $f0 -/* A189BC 8024279C 00000000 */ nop -/* A189C0 802427A0 45030001 */ bc1tl .L802427A8 -/* A189C4 802427A4 24110001 */ addiu $s1, $zero, 1 -.L802427A8: -/* A189C8 802427A8 12200008 */ beqz $s1, .L802427CC -/* A189CC 802427AC 00000000 */ nop -/* A189D0 802427B0 C7A00030 */ lwc1 $f0, 0x30($sp) -/* A189D4 802427B4 3C013FF0 */ lui $at, 0x3ff0 -/* A189D8 802427B8 44811800 */ mtc1 $at, $f3 -/* A189DC 802427BC 44801000 */ mtc1 $zero, $f2 -/* A189E0 802427C0 46000021 */ cvt.d.s $f0, $f0 -/* A189E4 802427C4 08090A15 */ j .L80242854 -/* A189E8 802427C8 46220000 */ add.d $f0, $f0, $f2 -.L802427CC: -/* A189EC 802427CC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A189F0 802427D0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A189F4 802427D4 3C014018 */ lui $at, 0x4018 -/* A189F8 802427D8 44811800 */ mtc1 $at, $f3 -/* A189FC 802427DC 44801000 */ mtc1 $zero, $f2 -/* A18A00 802427E0 C440002C */ lwc1 $f0, 0x2c($v0) -/* A18A04 802427E4 C604003C */ lwc1 $f4, 0x3c($s0) -/* A18A08 802427E8 46000021 */ cvt.d.s $f0, $f0 -/* A18A0C 802427EC 46220000 */ add.d $f0, $f0, $f2 -/* A18A10 802427F0 46002121 */ cvt.d.s $f4, $f4 -/* A18A14 802427F4 46202001 */ sub.d $f0, $f4, $f0 -/* A18A18 802427F8 462001A0 */ cvt.s.d $f6, $f0 -/* A18A1C 802427FC 44800000 */ mtc1 $zero, $f0 -/* A18A20 80242800 44800800 */ mtc1 $zero, $f1 -/* A18A24 80242804 460030A1 */ cvt.d.s $f2, $f6 -/* A18A28 80242808 4620103C */ c.lt.d $f2, $f0 -/* A18A2C 8024280C 00000000 */ nop -/* A18A30 80242810 45010009 */ bc1t .L80242838 -/* A18A34 80242814 00000000 */ nop -/* A18A38 80242818 3C014010 */ lui $at, 0x4010 -/* A18A3C 8024281C 44810800 */ mtc1 $at, $f1 -/* A18A40 80242820 44800000 */ mtc1 $zero, $f0 -/* A18A44 80242824 00000000 */ nop -/* A18A48 80242828 4622003C */ c.lt.d $f0, $f2 -/* A18A4C 8024282C 00000000 */ nop -/* A18A50 80242830 4500000A */ bc1f .L8024285C -/* A18A54 80242834 00000000 */ nop -.L80242838: -/* A18A58 80242838 3C018024 */ lui $at, %hi(D_80244E78_A1B098) -/* A18A5C 8024283C D4224E78 */ ldc1 $f2, %lo(D_80244E78_A1B098)($at) -/* A18A60 80242840 46003187 */ neg.s $f6, $f6 -/* A18A64 80242844 46003021 */ cvt.d.s $f0, $f6 -/* A18A68 80242848 46220002 */ mul.d $f0, $f0, $f2 -/* A18A6C 8024284C 00000000 */ nop -/* A18A70 80242850 46202000 */ add.d $f0, $f4, $f0 -.L80242854: -/* A18A74 80242854 46200020 */ cvt.s.d $f0, $f0 -/* A18A78 80242858 E600003C */ swc1 $f0, 0x3c($s0) -.L8024285C: -/* A18A7C 8024285C 8602008E */ lh $v0, 0x8e($s0) -/* A18A80 80242860 9603008E */ lhu $v1, 0x8e($s0) -/* A18A84 80242864 18400003 */ blez $v0, .L80242874 -/* A18A88 80242868 2462FFFF */ addiu $v0, $v1, -1 -/* A18A8C 8024286C 08090A1F */ j .L8024287C -/* A18A90 80242870 A602008E */ sh $v0, 0x8e($s0) -.L80242874: -/* A18A94 80242874 2402000C */ addiu $v0, $zero, 0xc -/* A18A98 80242878 AE620070 */ sw $v0, 0x70($s3) -.L8024287C: -/* A18A9C 8024287C 8FBF0050 */ lw $ra, 0x50($sp) -/* A18AA0 80242880 8FB3004C */ lw $s3, 0x4c($sp) -/* A18AA4 80242884 8FB20048 */ lw $s2, 0x48($sp) -/* A18AA8 80242888 8FB10044 */ lw $s1, 0x44($sp) -/* A18AAC 8024288C 8FB00040 */ lw $s0, 0x40($sp) -/* A18AB0 80242890 03E00008 */ jr $ra -/* A18AB4 80242894 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_80240694_AF3334.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_80240694_AF3334.s index 1baa5b47c8..2b1baeb659 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_80240694_AF3334.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_80240694_AF3334.s @@ -13,8 +13,8 @@ glabel func_80240694_AF3334 /* AF3354 802406B4 8C620000 */ lw $v0, ($v1) /* AF3358 802406B8 5040000A */ beql $v0, $zero, .L802406E4 /* AF335C 802406BC 00041080 */ sll $v0, $a0, 2 -/* AF3360 802406C0 3C058024 */ lui $a1, %hi(D_80244E78_A1B098) -/* AF3364 802406C4 24A54E78 */ addiu $a1, $a1, %lo(D_80244E78_A1B098) +/* AF3360 802406C0 3C058024 */ lui $a1, %hi(D_80244E78) +/* AF3364 802406C4 24A54E78 */ addiu $a1, $a1, %lo(D_80244E78) .L802406C8: /* AF3368 802406C8 24630004 */ addiu $v1, $v1, 4 /* AF336C 802406CC 24840001 */ addiu $a0, $a0, 1 @@ -24,14 +24,14 @@ glabel func_80240694_AF3334 /* AF337C 802406DC 24A50004 */ addiu $a1, $a1, 4 /* AF3380 802406E0 00041080 */ sll $v0, $a0, 2 .L802406E4: -/* AF3384 802406E4 3C018024 */ lui $at, %hi(D_80244E78_A1B098) +/* AF3384 802406E4 3C018024 */ lui $at, %hi(D_80244E78) /* AF3388 802406E8 00220821 */ addu $at, $at, $v0 -/* AF338C 802406EC AC204E78 */ sw $zero, %lo(D_80244E78_A1B098)($at) +/* AF338C 802406EC AC204E78 */ sw $zero, %lo(D_80244E78)($at) /* AF3390 802406F0 080901C8 */ j .L80240720 /* AF3394 802406F4 00000000 */ nop .L802406F8: -/* AF3398 802406F8 3C038024 */ lui $v1, %hi(D_80244E78_A1B098) -/* AF339C 802406FC 24634E78 */ addiu $v1, $v1, %lo(D_80244E78_A1B098) +/* AF3398 802406F8 3C038024 */ lui $v1, %hi(D_80244E78) +/* AF339C 802406FC 24634E78 */ addiu $v1, $v1, %lo(D_80244E78) /* AF33A0 80240700 0060282D */ daddu $a1, $v1, $zero .L80240704: /* AF33A4 80240704 24820080 */ addiu $v0, $a0, 0x80 diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_22/D788A0/func_802400DC_D7895C.s b/ver/us/asm/nonmatchings/world/area_pra/pra_22/D788A0/func_802400DC_D7895C.s index ea2e669f03..c409d4dac2 100644 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_22/D788A0/func_802400DC_D7895C.s +++ b/ver/us/asm/nonmatchings/world/area_pra/pra_22/D788A0/func_802400DC_D7895C.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_802400DC_D7895C +glabel pra_22_UnkFunc12 /* D7895C 802400DC 27BDFFC0 */ addiu $sp, $sp, -0x40 /* D78960 802400E0 AFB10034 */ sw $s1, 0x34($sp) /* D78964 802400E4 0080882D */ daddu $s1, $a0, $zero diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index d5653c95b4..3e16fd04f3 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -14135,8 +14135,8 @@ dro_02_802481D8 = 0x802481D8; // type:data rom:0x971398 dro_02_802482A8 = 0x802482A8; // type:data rom:0x971468 dro_02_802482F8 = 0x802482F8; // type:data rom:0x9714B8 dro_02_npcSettings_80248754 = 0x80248754; // type:data rom:0x971914 -dro_02_D_80248780_971940 = 0x80248780; // type:data rom:0x971940 -dro_02_D_80248784_971944 = 0x80248784; // type:data rom:0x971944 +dro_02_ItemChoice_HasSelectedItem = 0x80248780; // type:data rom:0x971940 +dro_02_ItemChoice_SelectedItemID = 0x80248784; // type:data rom:0x971944 dro_02_80248788 = 0x80248788; // type:data rom:0x971948 dro_02_802488CC = 0x802488CC; // type:data rom:0x971A8C dro_02_8024891C = 0x8024891C; // type:data rom:0x971ADC @@ -14965,7 +14965,7 @@ hos_02_UnkFunc6 = 0x80241E48; // type:func rom:0xA18068 hos_02_UnkFunc5 = 0x802421D8; // type:func rom:0xA183F8 hos_02_UnkNpcAIMainFunc9 = 0x802422FC; // type:func rom:0xA1851C hos_02_UnkNpcAIFunc13 = 0x802424E8; // type:func rom:0xA18708 -func_80242618_A18838 = 0x80242618; // type:func rom:0xA18838 +hos_02_UnkNpcAIFunc34 = 0x80242618; // type:func rom:0xA18838 hos_02_UnkFunc45 = 0x80242898; // type:func rom:0xA18AB8 hos_02_UnkNpcAIMainFunc10 = 0x802428F4; // type:func rom:0xA18B14 D_802433AC_A195CC = 0x802433AC; // type:data rom:0xA195CC @@ -17045,8 +17045,8 @@ arn_03_StashVars = 0x802412B0; // type:func rom:0xBE0040 arn_03_GetItemName = 0x80241364; // type:func rom:0xBE00F4 arn_03_GetNpcCollisionHeight = 0x802413C8; // type:func rom:0xBE0158 arn_03_AddPlayerHandsOffset = 0x80241424; // type:func rom:0xBE01B4 -arn_03_func_802415F4_BE0384 = 0x802415F4; // type:func rom:0xBE0384 -arn_03_func_80241648_BE03D8 = 0x80241648; // type:func rom:0xBE03D8 +arn_03_ItemChoice_WaitForSelection = 0x802415F4; // type:func rom:0xBE0384 +arn_03_ItemChoice_SaveSelected = 0x80241648; // type:func rom:0xBE03D8 arn_03_func_80241680_BE0410 = 0x80241680; // type:func rom:0xBE0410 arn_03_entryList = 0x80241720; // type:data rom:0xBE04B0 arn_03_config = 0x80241740; // type:data rom:0xBE04D0 @@ -17064,8 +17064,8 @@ arn_03_npcSettings_80241C3C = 0x80241C3C; // type:data rom:0xBE09CC arn_03_D_80241C68_BE09F8 = 0x80241C68; // type:data rom:0xBE09F8 arn_03_80241C6C = 0x80241C6C; // type:data rom:0xBE09FC arn_03_80241C9C = 0x80241C9C; // type:data rom:0xBE0A2C -arn_03_D_80241CCC_BE0A5C = 0x80241CCC; // type:data rom:0xBE0A5C -arn_03_D_80241CD0_BE0A60 = 0x80241CD0; // type:data rom:0xBE0A60 +arn_03_ItemChoice_HasSelectedItem = 0x80241CCC; // type:data rom:0xBE0A5C +arn_03_ItemChoice_SelectedItemID = 0x80241CD0; // type:data rom:0xBE0A60 arn_03_80241CD4 = 0x80241CD4; // type:data rom:0xBE0A64 arn_03_80241E18 = 0x80241E18; // type:data rom:0xBE0BA8 arn_03_80241E68 = 0x80241E68; // type:data rom:0xBE0BF8 @@ -19627,12 +19627,12 @@ flo_08_func_802414C8_CB0208 = 0x802414C8; // type:func rom:0xCB0208 flo_08_func_8024150C_CB024C = 0x8024150C; // type:func rom:0xCB024C flo_08_GetNpcCollisionHeight = 0x80241744; // type:func rom:0xCB0484 flo_08_AddPlayerHandsOffset = 0x802417A0; // type:func rom:0xCB04E0 -flo_08_func_80241970_CB06B0 = 0x80241970; // type:func rom:0xCB06B0 -flo_08_func_802419C4_CB0704 = 0x802419C4; // type:func rom:0xCB0704 +flo_08_ItemChoice_WaitForSelection = 0x80241970; // type:func rom:0xCB06B0 +flo_08_ItemChoice_SaveSelected = 0x802419C4; // type:func rom:0xCB0704 flo_08_func_802419FC_CB073C = 0x802419FC; // type:func rom:0xCB073C -flo_08_func_80241A98_CB07D8 = 0x80241A98; // type:func rom:0xCB07D8 -flo_08_func_80241B5C_CB089C = 0x80241B5C; // type:func rom:0xCB089C -flo_08_func_80241BCC_CB090C = 0x80241BCC; // type:func rom:0xCB090C +flo_08_FlowerGuard_SetItemEntityPosition = 0x80241A98; // type:func rom:0xCB07D8 +flo_08_FlowerGuard_JudgeItemTastiness = 0x80241B5C; // type:func rom:0xCB089C +flo_08_FlowerGuard_MakeItemList = 0x80241BCC; // type:func rom:0xCB090C flo_08_foliage_setup_shear_mtx = 0x80241C00; // type:func rom:0xCB0940 flo_08_TransformFoliage = 0x80241C70; // type:func rom:0xCB09B0 flo_08_UnkFunc43 = 0x80241E40; // type:func rom:0xCB0B80 @@ -19660,8 +19660,8 @@ flo_08_npcSettings_80242FE0 = 0x80242FE0; // type:data rom:0xCB1D20 flo_08_npcAISettings_8024300C = 0x8024300C; // type:data rom:0xCB1D4C flo_08_npcAI_8024303C = 0x8024303C; // type:data rom:0xCB1D7C flo_08_npcSettings_8024305C = 0x8024305C; // type:data rom:0xCB1D9C -flo_08_D_80243088_CB1DC8 = 0x80243088; // type:data rom:0xCB1DC8 -flo_08_D_8024308C_CB1DCC = 0x8024308C; // type:data rom:0xCB1DCC +flo_08_ItemChoice_HasSelectedItem = 0x80243088; // type:data rom:0xCB1DC8 +flo_08_ItemChoice_SelectedItemID = 0x8024308C; // type:data rom:0xCB1DCC flo_08_80243090 = 0x80243090; // type:data rom:0xCB1DD0 flo_08_802431C4 = 0x802431C4; // type:data rom:0xCB1F04 flo_08_interact_80243214 = 0x80243214; // type:data rom:0xCB1F54 @@ -20005,8 +20005,8 @@ flo_14_UnkFunc5 = 0x80241CF8; // type:func rom:0xCCD008 flo_14_UnkNpcAIMainFunc9 = 0x80241E1C; // type:func rom:0xCCD12C flo_14_GetNpcCollisionHeight = 0x80242008; // type:func rom:0xCCD318 flo_14_AddPlayerHandsOffset = 0x80242064; // type:func rom:0xCCD374 -flo_14_func_80242234_CCD544 = 0x80242234; // type:func rom:0xCCD544 -flo_14_func_80242288_CCD598 = 0x80242288; // type:func rom:0xCCD598 +flo_14_ItemChoice_WaitForSelection = 0x80242234; // type:func rom:0xCCD544 +flo_14_ItemChoice_SaveSelected = 0x80242288; // type:func rom:0xCCD598 flo_14_func_802422C0_CCD5D0 = 0x802422C0; // type:func rom:0xCCD5D0 flo_14_func_80242360_CCD670 = 0x80242360; // type:func rom:0xCCD670 flo_14_entryList = 0x80242390; // type:data rom:0xCCD6A0 @@ -20037,8 +20037,8 @@ flo_14_npcAI_80244508 = 0x80244508; // type:data rom:0xCCF818 flo_14_npcSettings_80244578 = 0x80244578; // type:data rom:0xCCF888 flo_14_npcSettings_802445A4 = 0x802445A4; // type:data rom:0xCCF8B4 flo_14_npcSettings_802445D0 = 0x802445D0; // type:data rom:0xCCF8E0 -flo_14_D_802445FC_CCF90C = 0x802445FC; // type:data rom:0xCCF90C -flo_14_D_80244600_CCF910 = 0x80244600; // type:data rom:0xCCF910 +flo_14_ItemChoice_HasSelectedItem = 0x802445FC; // type:data rom:0xCCF90C +flo_14_ItemChoice_SelectedItemID = 0x80244600; // type:data rom:0xCCF910 flo_14_80244604 = 0x80244604; // type:data rom:0xCCF914 flo_14_80244738 = 0x80244738; // type:data rom:0xCCFA48 flo_14_D_80244788_CCFA98 = 0x80244788; // type:data rom:0xCCFA98 @@ -20059,7 +20059,7 @@ D_80245348_CD0658 = 0x80245348; // type:data rom:0xCD0658 D_80245350_CD0660 = 0x80245350; // type:data rom:0xCD0660 D_80245358_CD0668 = 0x80245358; // type:data rom:0xCD0668 D_80245360_CD0670 = 0x80245360; // type:data rom:0xCD0670 -flo_14_D_802453B0_EF79C0 = 0x80240000; // type:data rom:0xCD06C0 +flo_14_ConsumableChoiceList = 0x80240000; // type:data rom:0xCD06C0 flo_15_config = 0x80240020; // type:data rom:0xCD06E0 flo_15_80240060 = 0x80240060; // type:data rom:0xCD0720 flo_15_exitWalk_80240120 = 0x80240120; // type:data rom:0xCD07E0 @@ -20407,17 +20407,17 @@ flo_22_80241F6C = 0x80241F6C; // type:data rom:0xCEE1AC flo_23_func_80240000_CEE260 = 0x80240000; // type:func rom:0xCEE260 flo_23_GetNpcCollisionHeight = 0x80240040; // type:func rom:0xCEE2A0 flo_23_AddPlayerHandsOffset = 0x8024009C; // type:func rom:0xCEE2FC -flo_23_func_8024026C_CEE4CC = 0x8024026C; // type:func rom:0xCEE4CC -flo_23_func_802402C0_CEE520 = 0x802402C0; // type:func rom:0xCEE520 +flo_23_ItemChoice_WaitForSelection = 0x8024026C; // type:func rom:0xCEE4CC +flo_23_ItemChoice_SaveSelected = 0x802402C0; // type:func rom:0xCEE520 flo_23_func_802402F8_CEE558 = 0x802402F8; // type:func rom:0xCEE558 flo_23_set_script_owner_npc_anim = 0x80240394; // type:func rom:0xCEE5F4 flo_23_UnkDistFunc = 0x80240410; // type:func rom:0xCEE670 flo_23_UnkNpcAIFunc12 = 0x80240544; // type:func rom:0xCEE7A4 flo_23_set_script_owner_npc_col_height = 0x802406A8; // type:func rom:0xCEE908 flo_23_UnkNpcAIMainFunc5 = 0x80240728; // type:func rom:0xCEE988 -flo_23_func_80240B68_CEEDC8 = 0x80240B68; // type:func rom:0xCEEDC8 -flo_23_func_80240C2C_CEEE8C = 0x80240C2C; // type:func rom:0xCEEE8C -flo_23_func_80240C9C_CEEEFC = 0x80240C9C; // type:func rom:0xCEEEFC +flo_23_FlowerGuard_SetItemEntityPosition = 0x80240B68; // type:func rom:0xCEEDC8 +flo_23_FlowerGuard_JudgeItemTastiness = 0x80240C2C; // type:func rom:0xCEEE8C +flo_23_FlowerGuard_MakeItemList = 0x80240C9C; // type:func rom:0xCEEEFC flo_23_entryList = 0x80240CD0; // type:data rom:0xCEEF30 flo_23_config = 0x80240CF0; // type:data rom:0xCEEF50 flo_23_80240D30 = 0x80240D30; // type:data rom:0xCEEF90 @@ -20427,8 +20427,8 @@ flo_23_exitWalk_802410A8 = 0x802410A8; // type:data rom:0xCEF308 flo_23_80241104 = 0x80241104; // type:data rom:0xCEF364 flo_23_main = 0x8024114C; // type:data rom:0xCEF3AC flo_23_npcSettings_802412E0 = 0x802412E0; // type:data rom:0xCEF540 -flo_23_D_8024130C_CEF56C = 0x8024130C; // type:data rom:0xCEF56C -flo_23_D_80241310_CEF570 = 0x80241310; // type:data rom:0xCEF570 +flo_23_ItemChoice_HasSelectedItem = 0x8024130C; // type:data rom:0xCEF56C +flo_23_ItemChoice_SelectedItemID = 0x80241310; // type:data rom:0xCEF570 flo_23_80241314 = 0x80241314; // type:data rom:0xCEF574 flo_23_80241448 = 0x80241448; // type:data rom:0xCEF6A8 flo_23_npcAISettings_80241498 = 0x80241498; // type:data rom:0xCEF6F8 @@ -20486,12 +20486,12 @@ flo_25_UnkFunc45 = 0x802418E8; // type:func rom:0xCF44B8 flo_25_UnkNpcAIMainFunc10 = 0x80241944; // type:func rom:0xCF4514 flo_25_GetNpcCollisionHeight = 0x80241B2C; // type:func rom:0xCF46FC flo_25_AddPlayerHandsOffset = 0x80241B88; // type:func rom:0xCF4758 -flo_25_func_80241D58_CF4928 = 0x80241D58; // type:func rom:0xCF4928 -flo_25_func_80241DAC_CF497C = 0x80241DAC; // type:func rom:0xCF497C +flo_25_ItemChoice_WaitForSelection = 0x80241D58; // type:func rom:0xCF4928 +flo_25_ItemChoice_SaveSelected = 0x80241DAC; // type:func rom:0xCF497C flo_25_func_80241DE4_CF49B4 = 0x80241DE4; // type:func rom:0xCF49B4 -flo_25_func_80241E80_CF4A50 = 0x80241E80; // type:func rom:0xCF4A50 -flo_25_func_80241F44_CF4B14 = 0x80241F44; // type:func rom:0xCF4B14 -flo_25_func_80241FB4_CF4B84 = 0x80241FB4; // type:func rom:0xCF4B84 +flo_25_FlowerGuard_SetItemEntityPosition = 0x80241E80; // type:func rom:0xCF4A50 +flo_25_FlowerGuard_JudgeItemTastiness = 0x80241F44; // type:func rom:0xCF4B14 +flo_25_FlowerGuard_MakeItemList = 0x80241FB4; // type:func rom:0xCF4B84 flo_25_foliage_setup_shear_mtx = 0x80241FF0; // type:func rom:0xCF4BC0 flo_25_TransformFoliage = 0x80242060; // type:func rom:0xCF4C30 flo_25_UnkFunc43 = 0x80242230; // type:func rom:0xCF4E00 @@ -20511,8 +20511,8 @@ flo_25_npcSettings_802429D4 = 0x802429D4; // type:data rom:0xCF55A4 flo_25_npcAISettings_80242A00 = 0x80242A00; // type:data rom:0xCF55D0 flo_25_npcAI_80242A30 = 0x80242A30; // type:data rom:0xCF5600 flo_25_npcSettings_80242AA0 = 0x80242AA0; // type:data rom:0xCF5670 -flo_25_D_80242ACC_CF569C = 0x80242ACC; // type:data rom:0xCF569C -flo_25_D_80242AD0_CF56A0 = 0x80242AD0; // type:data rom:0xCF56A0 +flo_25_ItemChoice_HasSelectedItem = 0x80242ACC; // type:data rom:0xCF569C +flo_25_ItemChoice_SelectedItemID = 0x80242AD0; // type:data rom:0xCF56A0 flo_25_80242AD4 = 0x80242AD4; // type:data rom:0xCF56A4 flo_25_80242C08 = 0x80242C08; // type:data rom:0xCF57D8 flo_25_interact_80242C58 = 0x80242C58; // type:data rom:0xCF5828 @@ -21186,7 +21186,7 @@ func_80240020_D77F40 = 0x80240020; // type:func rom:0xD77F40 func_802400AC_D77FCC = 0x802400AC; // type:func rom:0xD77FCC pra_22_SetGameStatusUnk84_1 = 0x80240000; // type:func rom:0xD78880 pra_22_UnkFunc11 = 0x80240020; // type:func rom:0xD788A0 -func_802400DC_D7895C = 0x802400DC; // type:func rom:0xD7895C +pra_22_UnkFunc12 = 0x802400DC; // type:func rom:0xD7895C func_802401D0_D78A50 = 0x802401D0; // type:func rom:0xD78A50 func_8024025C_D78ADC = 0x8024025C; // type:func rom:0xD78ADC func_80240000_D799F0 = 0x80240000; // type:func rom:0xD799F0 @@ -22505,10 +22505,10 @@ ECAA80_GetNpcCollisionHeight = 0x80241770; // type:func rom:0xECB470 ECAA80_AddPlayerHandsOffset = 0x802417CC; // type:func rom:0xECB4CC func_8024199C_ECB69C = 0x8024199C; // type:func rom:0xECB69C func_802419F0_ECB6F0 = 0x802419F0; // type:func rom:0xECB6F0 -func_80241A28_ECB728 = 0x80241A28; // type:func rom:0xECB728 -func_80241AC4_ECB7C4 = 0x80241AC4; // type:func rom:0xECB7C4 -func_80241B88_ECB888 = 0x80241B88; // type:func rom:0xECB888 -func_80241BF8_ECB8F8 = 0x80241BF8; // type:func rom:0xECB8F8 +ECAA80_BuildItemChoiceList = 0x80241A28; // type:func rom:0xECB728 +ECAA80_FlowerGuard_SetItemEntityPosition = 0x80241AC4; // type:func rom:0xECB7C4 +ECAA80_FlowerGuard_JudgeItemTastiness = 0x80241B88; // type:func rom:0xECB888 +ECAA80_FlowerGuard_MakeItemList = 0x80241BF8; // type:func rom:0xECB8F8 ECB930_foliage_setup_shear_mtx = 0x80241C30; // type:func rom:0xECB930 ECB930_TransformFoliage = 0x80241CA0; // type:func rom:0xECB9A0 ECBB70_UnkFunc43 = 0x80241E70; // type:func rom:0xECBB70 @@ -22516,8 +22516,8 @@ EC9D00_SuperBlock_CantUpgradeMessages = 0x80241FE0; // type:data rom:0xECBCE0 EC9D00_SuperBlock_PartnerIDs = 0x80241FE8; // type:data rom:0xECBCE8 EC9D00_SuperBlock_UpgradeDescMessages = 0x80241FF8; // type:data rom:0xECBCF8 EC9D00_SuperBlock_UpgradeOrbAngles = 0x80242038; // type:data rom:0xECBD38 -D_802430B8_ECCDB8 = 0x802430B8; // type:data rom:0xECCDB8 -D_802430BC_ECCDBC = 0x802430BC; // type:data rom:0xECCDBC +ECAA80_ItemChoice_HasSelectedItem = 0x802430B8; // type:data rom:0xECCDB8 +ECAA80_ItemChoice_SelectedItemID = 0x802430BC; // type:data rom:0xECCDBC ECFFF0_DeadUnkFunc1 = 0x80240000; // type:func rom:0xECFFF0 ED0030_UnkFunc43 = 0x80240040; // type:func rom:0xED0030 ED00D0_foliage_setup_shear_mtx = 0x802400E0; // type:func rom:0xED00D0 @@ -22719,7 +22719,7 @@ EF2680_set_script_owner_npc_col_height = 0x802424B0; // type:func rom:0xEF4AC0 EF2680_DeadUnkNpcAIMainFunc5 = 0x80242530; // type:func rom:0xEF4B40 func_8024299C_EF4FAC = 0x8024299C; // type:func rom:0xEF4FAC N(sixFloats) = 0x802444BC; // type:data rom:0xEF6ACC -D_802453B0_EF79C0 = 0x802453B0; // type:data rom:0xEF79C0 +flo_14_ConsumableChoiceList = 0x802453B0; // type:data rom:0xEF79C0 D_802453B8_EF79C8 = 0x802453B8; // type:data rom:0xEF79C8 D_802453C0_EF79D0 = 0x802453C0; // type:data rom:0xEF79D0 D_80245408_EF7A18 = 0x80245408; // type:data rom:0xEF7A18 @@ -23458,9 +23458,9 @@ D_80242430 = 0x80242430; // type:data D_80242450 = 0x80242450; // type:data D_802424E0 = 0x802424E0; // type:data flo_23_pad_2598 = 0x80242598; // type:data -flo_23_D_802426E0 = 0x802426E0; // type:data +flo_23_ConsumableChoiceList = 0x802426E0; // type:data flo_23_D_8024284C_pad = 0x8024284C; // type:data -flo_23_D_80242850 = 0x80242850; // type:data +flo_23_FlowerGuard_ItemChoiceList = 0x80242850; // type:data flo_09_pad_2874 = 0x80242874; // type:data dgb_03_pad_2908 = 0x80242908; // type:data D_802429A4 = 0x802429A4; // type:data @@ -23541,7 +23541,7 @@ flo_25_pad_4734 = 0x80244734; // type:data D_802447C0 = 0x802447C0; // type:data arn_03_pad_47DC = 0x802447DC; // type:data D_80244A20 = 0x80244A20; // type:data -arn_03_D_80244A20 = 0x80244A20; // type:data +arn_03_ConsumableChoiceList = 0x80244A20; // type:data D_80244C18 = 0x80244C18; // type:data D_80244D88 = 0x80244D88; // type:data dro_02_pad_4DD4 = 0x80244DD4; // type:data @@ -23549,10 +23549,10 @@ flo_03_pad_4ECC = 0x80244ECC; // type:data flo_14_pad_4F24 = 0x80244F24; // type:data flo_08_pad_4F3C = 0x80244F3C; // type:data flo_14_pad_4F64 = 0x80244F64; // type:data -flo_25_D_80244A20 = 0x80244FA0; // type:data +flo_25_ConsumableChoiceList = 0x80244FA0; // type:data arn_05_pad_4FF8 = 0x80244FF8; // type:data flo_25_D_8024510C_pad = 0x8024510C; // type:data -flo_25_D_80245110 = 0x80245110; // type:data +flo_25_FlowerGuard_ItemChoiceList = 0x80245110; // type:data D_802451F0 = 0x802451F0; // type:data D_80245210 = 0x80245210; // type:data D_80245230 = 0x80245230; // type:data @@ -23593,11 +23593,11 @@ D_80245AB4 = 0x80245AB4; // type:data flo_00_pad_5E2C = 0x80245E2C; // type:data D_802461F0 = 0x802461F0; // type:data D_80246260 = 0x80246260; // type:data -D_802462F0 = 0x802462F0; // type:data +ECAA80_ItemChoiceList = 0x802462F0; // type:data D_80246300 = 0x80246300; // type:data D_80246424 = 0x80246424; // type:data flo_08_D_802462C4_pad = 0x8024642C; // type:data -flo_08_D_80246428 = 0x80246430; // type:data +flo_08_FlowerGuard_ItemChoiceList = 0x80246430; // type:data D_80246528 = 0x80246528; // type:data D_8024652C = 0x8024652C; // type:data D_80246530 = 0x80246530; // type:data @@ -23773,7 +23773,7 @@ dro_02_D_8024EFD0 = 0x8024EFD0; // type:data D_8024F010 = 0x8024F010; // type:data dro_02_D_8024F010 = 0x8024F010; // type:data dro_02_pad_D_8024F07C = 0x8024F07C; // type:data -D_8024F080 = 0x8024F080; // type:data +dro_02_KeyItemChoiceList = 0x8024F080; // type:data dro_02_D_8024F080 = 0x8024F080; // type:data dro_02_pad_D_8024F240 = 0x8024F240; // type:data D_8024F248 = 0x8024F248; // type:data diff --git a/ver/us/undefined_syms.txt b/ver/us/undefined_syms.txt index dbd61858eb..b58736453a 100644 --- a/ver/us/undefined_syms.txt +++ b/ver/us/undefined_syms.txt @@ -486,6 +486,7 @@ D_802447C0 = 0x802447C0; D_80244A20 = 0x80244A20; D_80244C18 = 0x80244C18; D_80244D88 = 0x80244D88; +D_80244E78 = 0x80244E78; D_802451F0 = 0x802451F0; D_80245230 = 0x80245230; D_802453D8 = 0x802453D8; @@ -511,10 +512,10 @@ D_802459C0 = 0x802459C0; D_80245AB4 = 0x80245AB4; D_802461F0 = 0x802461F0; D_80246260 = 0x80246260; -D_802462F0 = 0x802462F0; +ECAA80_ItemChoiceList = 0x802462F0; D_80246300 = 0x80246300; D_80246424 = 0x80246424; -D_80246460_EC9D00 = 0x80246460; +ECAA80_FlowerGuard_ItemChoiceList = 0x80246460; D_8024652C = 0x8024652C; D_80246530 = 0x80246530; D_80246534 = 0x80246534; @@ -615,8 +616,8 @@ D_8024EFC0 = 0x8024EFC0; D_8024EFC8 = 0x8024EFC8; D_8024EFCC = 0x8024EFCC; D_8024F010 = 0x8024F010; -D_8024F080 = 0x8024F080; -D_8024F248 = 0x8024F248; +dro_02_KeyItemChoiceList = 0x8024F080; +ItemChoiceList = 0x8024F248; D_8024F2A0 = 0x8024F2A0; D_8024F2A1 = 0x8024F2A1; D_8024F2A2 = 0x8024F2A2;