diff --git a/include/common_structs.h b/include/common_structs.h index 4d9f082b94..4cd203a2f7 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -338,7 +338,7 @@ typedef struct PlayerData { /* 0x2C4 */ s32 partnerUnlockedTime[12]; /* 0x2F4 */ s32 partnerUsedTime[12]; /* 0x324 */ s32 tradeEventStartTime; - /* 0x328 */ s32 droTreeOrbitTime; + /* 0x328 */ s32 droTreeHintTime; /* 0x32C */ s16 starPiecesCollected; /* 0x32E */ u16 jumpGamePlays; /* 0x330 */ u32 jumpGameTotal; /* all-time winnings, max = 99999 */ diff --git a/include/enums.h b/include/enums.h index 8141bd4e68..63f36986d2 100644 --- a/include/enums.h +++ b/include/enums.h @@ -788,6 +788,7 @@ enum SoundIDs { SOUND_203 = 0x00000203, SOUND_204 = 0x00000204, SOUND_205 = 0x00000205, + SOUND_206 = 0x00000206, SOUND_207 = 0x00000207, SOUND_208 = 0x00000208, SOUND_209 = 0x00000209, @@ -2375,6 +2376,14 @@ enum EncounterOutcomes { OUTCOME_ENEMY_FLED = 3, }; +enum MerleeSpellType { + MERLEE_SPELL_0 = 0, + MERLEE_SPELL_1 = 1, + MERLEE_SPELL_2 = 2, + MERLEE_SPELL_3 = 3, + MERLEE_SPELL_4 = 4, // extra coins +}; + enum NpcDecorationIDs { NPC_DECORATION_NONE = 0x00000000, NPC_DECORATION_BOWSER_AURA = 0x00000001, @@ -4832,7 +4841,7 @@ enum EffectInstanceFlags { EFFECT_INSTANCE_FLAGS_2 = 0x00000002, EFFECT_INSTANCE_FLAGS_4 = 0x00000004, EFFECT_INSTANCE_FLAGS_8 = 0x00000008, - EFFECT_INSTANCE_FLAGS_10 = 0x00000010, + EFFECT_INSTANCE_FLAGS_10 = 0x00000010, // mark ready for cleanup EFFECT_INSTANCE_FLAGS_20 = 0x00000020, EFFECT_INSTANCE_FLAGS_40 = 0x00000040, EFFECT_INSTANCE_FLAGS_80 = 0x00000080, diff --git a/include/macros.h b/include/macros.h index d2ecd8ab9d..614b881317 100644 --- a/include/macros.h +++ b/include/macros.h @@ -134,6 +134,7 @@ #define ASCII_TO_U32(a, b, c, d) ((u32)((a << 24) | (b << 16) | (c << 8) | (d << 0))) #define ITEM_VIS_GROUP(itemID, visGroupID) ((visGroupID) << 16 | (itemID)) +#define VIS_GROUP_PAIR(group1, group2) ((group1) << 12 | (group2)) // loads integrator with standard parameter set used for falling diff --git a/include/npc.h b/include/npc.h index c446ad3350..aa809c9f4f 100644 --- a/include/npc.h +++ b/include/npc.h @@ -88,19 +88,19 @@ typedef struct MobileAISettings { /* 0x20 */ s32 chaseUpdateInterval; // how often to re-run chase init and re-acquire player position (frames) /* 0x24 */ f32 chaseRadius; /* 0x28 */ f32 chaseOffsetDist; // offset along npc->yaw of the test point for chase volume overlap, creates directionality to enemy 'sight' - /* 0x2C */ s32 unk_AI_2C; // unk time + /* 0x2C */ s32 unk_AI_2C; // probably a boolean for enable loitering after a wander movement } MobileAISettings; // size = 0x30 typedef struct StationaryAISettings { - /* 0x00 */ f32 unk_00; - /* 0x04 */ f32 unk_04; + /* 0x00 */ f32 unk_00; // probably equivalent to alertRadius in MobileAISettings + /* 0x04 */ f32 unk_04; // probably equivalent to alertOffsetDist in MobileAISettings /* 0x08 */ s32 playerSearchInterval; // how often to search for player (frames) /* 0x0C */ f32 chaseSpeed; /* 0x10 */ s32 chaseTurnRate; // how many degrees this NPC can turn per frame while chasing /* 0x14 */ s32 chaseUpdateInterval; // how often to re-run chase init and re-acquire player position (frames) /* 0x18 */ f32 chaseRadius; /* 0x1C */ f32 chaseOffsetDist; // offset along npc->yaw of the test point for alert volume overlap, creates directionality to enemy 'sight' - /* 0x20 */ s32 unk_20; + /* 0x20 */ s32 unk_20; // probably equivalent to unk_AI_2C in MobileAISettings } StationaryAISettings; // size = 0x24 struct FireBarData; @@ -225,6 +225,7 @@ typedef union { typedef union NpcInitialVars { /* 0x0 */ s32 value; + /* 0x0 */ s8 bytes[4]; /* 0x0 */ s32* array; } NpcInitialVars; diff --git a/include/script_api/battle.h b/include/script_api/battle.h index 40a3d7c6ab..878c43d63e 100644 --- a/include/script_api/battle.h +++ b/include/script_api/battle.h @@ -290,7 +290,6 @@ ApiStatus CamPresetUpdate_L(Evt* script, s32 isInitialCall); ApiStatus SetBattleCamPos(Evt* script, s32 isInitialCall); ApiStatus SetBattleCamParam(Evt* script, s32 isInitialCall); ApiStatus func_8026DF88(Evt* script, s32 isInitialCall); -ApiStatus InitVirtualEntityList(Evt* script, s32 isInitialCall); ApiStatus InitAnimatedModels(Evt* script, s32 isInitialCall); ApiStatus func_8024CE9C(Evt* script, s32 isInitialCall); ApiStatus func_802CABE8(Evt* script, s32 isInitialCall); diff --git a/include/script_api/common.h b/include/script_api/common.h index 22f1380db9..f51e5c7b17 100644 --- a/include/script_api/common.h +++ b/include/script_api/common.h @@ -194,6 +194,7 @@ ApiStatus EnablePartner(Evt* script, s32 isInitialCall); ApiStatus DisablePartner(Evt* script, s32 isInitialCall); ApiStatus UseEntryHeading(Evt* script, s32 isInitialCall); ApiStatus UseExitHeading(Evt* script, s32 isInitialCall); +ApiStatus InitVirtualEntityList(Evt* script, s32 isInitialCall); ApiStatus DisablePulseStone(Evt* script, s32 isInitialCall); ApiStatus GetCurrentPartner(Evt* script, s32 isInitialCall); ApiStatus Disable8bitMario(Evt* script, s32 isInitialCall); @@ -208,6 +209,11 @@ ApiStatus AwaitPlayerApproach(Evt* script, s32 isInitialCall); ApiStatus IsPlayerWithin(Evt* script, s32 isInitialCall); ApiStatus AwaitPlayerLeave(Evt* script, s32 isInitialCall); ApiStatus AddVectorPolar(Evt* script, s32 isInitialCall); +ApiStatus func_802D4BDC(Evt* script, s32 initialCall); +ApiStatus func_802D4C4C(Evt* script, s32 initialCall); +ApiStatus func_802D4CC4(Evt* script, s32 initialCall); +ApiStatus func_802D4D14(Evt* script, s32 initialCall); +ApiStatus func_802D4D88(Evt* script, s32 initialCall); ApiStatus LoadPath(Evt* script, s32 isInitialCall); ApiStatus GetNextPathPos(Evt* script, s32 isInitialCall); ApiStatus GetDist2D(Evt* script, s32 isInitialCall); @@ -256,6 +262,8 @@ ApiStatus ShowGotItem(Evt* script, s32 isInitialCall); ApiStatus ShowEmote(Evt* script, s32 isInitialCall); ApiStatus ShowSleepBubble(Evt* script, s32 isInitialCall); ApiStatus RemoveEffect(Evt* script, s32 isInitialCall); +ApiStatus func_802D7B10(Evt* script, s32 isInitialCall); +ApiStatus func_802D7B44(Evt* script, s32 isInitialCall); ApiStatus PlayEffect(Evt* script, s32 isInitialCall); ApiStatus SetSpriteShading(Evt* script, s32 isInitialCall); ApiStatus EnableSpriteShading(Evt* script, s32 isInitialCall); @@ -286,7 +294,6 @@ ApiStatus GetVirtualEntityPosition(Evt* script, s32 isInitialCall); ApiStatus VirtualEntityJumpTo(Evt* script, s32 isInitialCall); ApiStatus func_802D2884(Evt* script, s32 isInitialCall); ApiStatus func_802D2C14(Evt* script, s32 isInitialCall); -ApiStatus func_802D7B10(Evt* script, s32 isInitialCall); ApiStatus ShowConsumableChoicePopup(Evt* script, s32 isInitialCall); ApiStatus func_800458CC(Evt* script, s32 isInitialCall); ApiStatus OnPlayerFled(Evt* script, s32 isInitialCall); diff --git a/include/script_api/map.h b/include/script_api/map.h index 70c5c87065..fd26fc6eeb 100644 --- a/include/script_api/map.h +++ b/include/script_api/map.h @@ -32,5 +32,6 @@ extern EvtScript ExitDoubleDoor; extern EvtScript EnterDoubleDoor; extern EvtScript ExitSplitDoubleDoor; extern EvtScript EnterSplitDoubleDoor; +extern EvtScript EnterPostPipe; #endif diff --git a/src/16F740.c b/src/16F740.c index 9ac1c2a4ef..43044f08b5 100644 --- a/src/16F740.c +++ b/src/16F740.c @@ -2079,15 +2079,15 @@ void btl_state_update_end_battle(void) { btl_delete_player_actor(battleStatus->playerActor); - if (battleStatus->nextMerleeSpellType == 4) { - encounterStatus->merleeCoinBonus = 1; + if (battleStatus->nextMerleeSpellType == MERLEE_SPELL_4) { + encounterStatus->merleeCoinBonus = TRUE; battleStatus->nextMerleeSpellType = 0; } encounterStatus->damageTaken = battleStatus->damageTaken; if (gBattleStatus.flags2 & BS_FLAGS2_10000000) { - encounterStatus->dropWhackaBump = 1; + encounterStatus->dropWhackaBump = TRUE; } remove_all_effects(); diff --git a/src/80850_len_3060.c b/src/80850_len_3060.c index fb05f5694a..be0fe2ca07 100644 --- a/src/80850_len_3060.c +++ b/src/80850_len_3060.c @@ -116,7 +116,7 @@ void clear_player_data(void) { playerData->partnerUsedTime[i] = 0; } - playerData->droTreeOrbitTime = 0; + playerData->droTreeHintTime = 0; playerData->starPiecesCollected = 0; playerData->jumpGamePlays = 0; playerData->jumpGameTotal = 0; diff --git a/src/EA0900.c b/src/EA0900.c deleted file mode 100644 index 470e5ca35c..0000000000 --- a/src/EA0900.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "dead.h" -#include "common.h" - -#define NAMESPACE EA0900 - -#include "world/common/atomic/TexturePan.inc.c" - diff --git a/src/EA7010.c b/src/EA7010.c deleted file mode 100644 index 6d347a8e1a..0000000000 --- a/src/EA7010.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "dead.h" -#include "common.h" - -#define NAMESPACE EA7010 - -#include "world/common/atomic/TexturePan.inc.c" - diff --git a/src/EB0E60.c b/src/EB0E60.c deleted file mode 100644 index 106f9cd56e..0000000000 --- a/src/EB0E60.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "dead.h" -#include "common.h" - -#define NAMESPACE EB0E60 - -#include "world/common/atomic/TexturePan.inc.c" - diff --git a/src/EB7230.c b/src/EB7230.c deleted file mode 100644 index 18a80d3c4c..0000000000 --- a/src/EB7230.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "dead.h" -#include "common.h" - -#define NAMESPACE EB7230 - -#include "world/common/atomic/TexturePan.inc.c" - diff --git a/src/EC2200.c b/src/EC2200.c deleted file mode 100644 index 8b6f4d6f80..0000000000 --- a/src/EC2200.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "dead.h" -#include "common.h" - -#define NAMESPACE EC2200 - -#include "world/common/todo/DeadUnkFunc1.inc.c" diff --git a/src/EC2610.c b/src/EC2610.c deleted file mode 100644 index 5dbdf67f21..0000000000 --- a/src/EC2610.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "dead.h" -#include "common.h" - -#define NAMESPACE EC2610 - -#include "common/foliage.inc.c" diff --git a/src/EC9D00.c b/src/EC9D00.c deleted file mode 100644 index 43962918a8..0000000000 --- a/src/EC9D00.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "dead.h" -#include "common.h" - -// Copy of flo_08 (CAED40.c) - -#define NAMESPACE EC9D00 - -#include "world/common/entity/SuperBlock.inc.c" diff --git a/src/ECAA40.c b/src/ECAA40.c deleted file mode 100644 index bbcc093648..0000000000 --- a/src/ECAA40.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "dead.h" -#include "common.h" - -#define NAMESPACE ECAA40 - -#include "world/common/todo/DeadUnkFunc1.inc.c" diff --git a/src/ECAA80.c b/src/ECAA80.c deleted file mode 100644 index a53b9321d7..0000000000 --- a/src/ECAA80.c +++ /dev/null @@ -1,58 +0,0 @@ -#include "dead.h" -#include "common.h" -#include "effects.h" -#include "dead_structs.h" - -// Copy of flo_08 (CAFAC0.c) - -#define NAMESPACE ECAA80 - -extern s32 N(ItemChoiceList)[]; -extern s32 N(FlowerGuard_ItemChoiceList)[91]; -extern s32 ECAA80_ItemChoice_HasSelectedItem; -extern s32 ECAA80_ItemChoice_SelectedItemID; - -void ECAA80_UnkFloAI_Chase(Evt* script, MobileAISettings* aiSettings, EnemyDetectVolume* territory); - -#include "world/common/enemy/ai/UnkFloAI.inc.c" - -// 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/todo/GetNpcCollisionHeight.inc.c" - -#include "world/common/todo/AddPlayerHandsOffset.inc.c" - -// Needs data migrated -#ifdef NON_MATCHING -ApiStatus ECAA80_ItemChoice_WaitForSelection(Evt *script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - - if (isInitialCall) { - ECAA80_ItemChoice_HasSelectedItem = FALSE; - } - if (ECAA80_ItemChoice_HasSelectedItem) { - ECAA80_ItemChoice_HasSelectedItem = FALSE; - dead_evt_set_variable(script, *args++, ECAA80_ItemChoice_SelectedItemID); - return ApiStatus_DONE2; - } - return ApiStatus_BLOCK; -} -#else -INCLUDE_ASM(s32, "ECAA80", func_8024199C_ECB69C); -#endif - -// ECAA80_ItemChoice_SaveSelected (needs data?) - -ApiStatus ECAA80_ItemChoice_SaveSelected(Evt *script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - - ECAA80_ItemChoice_SelectedItemID = dead_evt_get_variable(script, *args++); - ECAA80_ItemChoice_HasSelectedItem = TRUE; - return ApiStatus_DONE2; -} - - -#include "world/common/atomic/MakeConsumableChoice.inc.c" - -#include "world/common/atomic/ItemChoice_FlowerGuard.inc.c" diff --git a/src/ECB930.c b/src/ECB930.c deleted file mode 100644 index f7eee34efa..0000000000 --- a/src/ECB930.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "dead.h" -#include "common.h" - -#define NAMESPACE ECB930 - -#include "common/foliage.inc.c" diff --git a/src/ECBB70.c b/src/ECBB70.c deleted file mode 100644 index 41ac41b2ee..0000000000 --- a/src/ECBB70.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "dead.h" -#include "common.h" - -#define NAMESPACE ECBB70 - -#include "world/common/todo/UnkFunc43.inc.c" diff --git a/src/ECFFF0.c b/src/ECFFF0.c deleted file mode 100644 index 95989d8147..0000000000 --- a/src/ECFFF0.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "dead.h" -#include "common.h" - -#define NAMESPACE ECFFF0 - -#include "world/common/todo/DeadUnkFunc1.inc.c" diff --git a/src/ED0030.c b/src/ED0030.c deleted file mode 100644 index 57fcae1641..0000000000 --- a/src/ED0030.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "dead.h" -#include "common.h" - -#define NAMESPACE ED0030 - -#include "world/common/todo/UnkFunc43.inc.c" diff --git a/src/ED00D0.c b/src/ED00D0.c deleted file mode 100644 index 3e236961b6..0000000000 --- a/src/ED00D0.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "dead.h" -#include "common.h" - -#define NAMESPACE ED00D0 - -#include "common/foliage.inc.c" diff --git a/src/ED0310.c b/src/ED0310.c deleted file mode 100644 index 47f351666e..0000000000 --- a/src/ED0310.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "dead.h" -#include "common.h" - -// Copy of flo_09 (CB5320.c) - -#define NAMESPACE ED0310 - -#include "world/common/enemy/ai/FlyingAI.inc.c" diff --git a/src/ED4260.c b/src/ED4260.c deleted file mode 100644 index d8a685e1bb..0000000000 --- a/src/ED4260.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "dead.h" -#include "common.h" - -#define NAMESPACE ED4260 - -#include "world/common/todo/DeadUnkFunc1.inc.c" diff --git a/src/ED5540.c b/src/ED5540.c deleted file mode 100644 index 1f84f75a3a..0000000000 --- a/src/ED5540.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "dead.h" -#include "common.h" - -#define NAMESPACE ED5540 - -#include "common/foliage.inc.c" diff --git a/src/EDBFE0.c b/src/EDBFE0.c deleted file mode 100644 index 594040b3e0..0000000000 --- a/src/EDBFE0.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "dead.h" -#include "common.h" - -#define NAMESPACE ED8FE0 - -void fx_sun_undeclared(s32, s32, s32, s32, s32, s32); - -ApiStatus func_80240000_EDBFE0(Evt *script, s32 isInitialCall) { - fx_sun_undeclared(0, 0, 0, 0, 0, 0); - return ApiStatus_DONE2; -} diff --git a/src/EDE9C0.c b/src/EDE9C0.c deleted file mode 100644 index a181e09a98..0000000000 --- a/src/EDE9C0.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "dead.h" -#include "common.h" - -#define NAMESPACE EDE9C0 - -void fx_sun_undeclared(s32, s32, s32, s32, s32, s32); - -ApiStatus func_80240000_EDE9C0(Evt *script, s32 isInitialCall) { - fx_sun_undeclared(0, 0, 0, 0, 0, 0); - return ApiStatus_DONE2; -} diff --git a/src/EE70C0.c b/src/EE70C0.c deleted file mode 100644 index c18ed3fb87..0000000000 --- a/src/EE70C0.c +++ /dev/null @@ -1,70 +0,0 @@ -#include "dead.h" -#include "common.h" -#include "dead_structs.h" - -// Copy of flo_14 (CCBE20.c) - -#define NAMESPACE EE70C0 - -extern const s32 D_802453E0_EEB990[]; -extern s32 D_8024462C_EEABDC; -extern s32 D_80244630_EEABE0; - -#include "world/common/enemy/ai/FlyingAI.inc.c" - -#include "world/common/todo/GetNpcCollisionHeight.inc.c" - -#include "world/common/todo/AddPlayerHandsOffset.inc.c" - -// Needs data migrated -#ifdef NON_MATCHING -ApiStatus EE70C0_ItemChoice_WaitForSelection(Evt *script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - - if (isInitialCall) { - D_8024462C_EEABDC = FALSE; - } - if (D_8024462C_EEABDC) { - D_8024462C_EEABDC = FALSE; - dead_evt_set_variable(script, *args++, D_80244630_EEABE0); - return ApiStatus_DONE2; - } - return ApiStatus_BLOCK; -} -#else -INCLUDE_ASM(s32, "EE70C0", func_80242260_EE8810); -#endif - -ApiStatus EE70C0_ItemChoice_SaveSelected(Evt *script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - - D_80244630_EEABE0 = dead_evt_get_variable(script, *args++); - D_8024462C_EEABDC = TRUE; - return ApiStatus_DONE2; -} - -ApiStatus func_802422EC_EE889C(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++) { - D_802453E0_EEB990[i] = ptr[i]; - } - D_802453E0_EEB990[i] = 0; - } else { - for (i = 0; i < 91; i++) { - D_802453E0_EEB990[i] = i + 128; - D_802453E0_EEB990[91] = 0; - } - } - return ApiStatus_DONE2; -} - -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, SetSleepBubbleTimeLeft, 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/EED100.c b/src/EED100.c deleted file mode 100644 index be87c759e6..0000000000 --- a/src/EED100.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "dead.h" -#include "common.h" - -#define NAMESPACE EED100 - -#include "world/common/todo/DeadUnkFunc1.inc.c" diff --git a/src/EED140.c b/src/EED140.c deleted file mode 100644 index 4c6b1660bd..0000000000 --- a/src/EED140.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "dead.h" -#include "common.h" - -#define NAMESPACE EED140 - -#include "world/common/todo/UnkFunc43.inc.c" diff --git a/src/EF2610.c b/src/EF2610.c deleted file mode 100644 index 3691cf5995..0000000000 --- a/src/EF2610.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "dead.h" -#include "common.h" - -#define NAMESPACE EF2610 - -#include "world/common/todo/DeadUnkFunc1.inc.c" diff --git a/src/EF7FB0.c b/src/EF7FB0.c deleted file mode 100644 index 2c440fe4a8..0000000000 --- a/src/EF7FB0.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "dead.h" -#include "common.h" - -#define NAMESPACE EF7FB0 - -#include "world/common/todo/UnkFunc42.inc.c" diff --git a/src/EF8010.c b/src/EF8010.c deleted file mode 100644 index 5530071a6d..0000000000 --- a/src/EF8010.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "dead.h" -#include "common.h" - -#define NAMESPACE EF8010 - -#include "common/foliage.inc.c" diff --git a/src/world/area_dro/dro.h b/src/world/area_dro/dro.h index 338ea41998..333daca2ef 100644 --- a/src/world/area_dro/dro.h +++ b/src/world/area_dro/dro.h @@ -2,24 +2,33 @@ #define _WORLD_AREA_DRO_DRO_H_ enum { - AB_DRO_0 = AreaByte(0), - AB_DRO_1 = AreaByte(1), - AB_DRO_2 = AreaByte(2), - AB_DRO_3 = AreaByte(3), - AB_DRO_4 = AreaByte(4), - AB_DRO_5 = AreaByte(5), - AB_DRO_6 = AreaByte(6), - AB_DRO_7 = AreaByte(7), - AB_DRO_8 = AreaByte(8), - AB_DRO_9 = AreaByte(9), - AB_DRO_A = AreaByte(10), - AB_DRO_B = AreaByte(11), - AB_DRO_C = AreaByte(12), - AB_DRO_D = AreaByte(13), - AB_DRO_E = AreaByte(14), - AB_DRO_F = AreaByte(15), + AB_DRO_0 = AreaByte(0), + AB_DRO_1 = AreaByte(1), + AB_DRO_2 = AreaByte(2), + AB_DRO_3 = AreaByte(3), + AB_DRO_SHOP_PREV1 = AreaByte(4), + AB_DRO_SHOP_PREV2 = AreaByte(5), + AB_DRO_SHOP_PREV3 = AreaByte(6), + AB_DRO_7 = AreaByte(7), + AB_DRO_8 = AreaByte(8), + AB_DRO_9 = AreaByte(9), + AB_DRO_A = AreaByte(10), + AB_DRO_B = AreaByte(11), + AB_DRO_C = AreaByte(12), + AB_DRO_D = AreaByte(13), + AB_DRO_E = AreaByte(14), + AB_DRO_F = AreaByte(15), }; -#define AF_DRO(index) AreaFlag(index) +enum { + AF_DRO_01 = AreaFlag(1), + AF_DRO_DialogueToggle_Composer = AreaFlag(2), + AF_DRO_03 = AreaFlag(3), + AF_DRO_04 = AreaFlag(4), + AF_DRO_05 = AreaFlag(5), +}; + +extern MapSettings dro_01_settings; +extern MapSettings dro_02_settings; #endif diff --git a/src/world/area_dro/dro_01/95B200.c b/src/world/area_dro/dro_01/95B200.c deleted file mode 100644 index 1fc7339874..0000000000 --- a/src/world/area_dro/dro_01/95B200.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "dro_01.h" - -#include "world/common/entity/Pipe.inc.c" - -#include "world/common/atomic/UnkFunc27.inc.c" - diff --git a/src/world/area_dro/dro_01/95B7E0.c b/src/world/area_dro/dro_01/95B7E0.c deleted file mode 100644 index 9b39357957..0000000000 --- a/src/world/area_dro/dro_01/95B7E0.c +++ /dev/null @@ -1,2277 +0,0 @@ -#include "dro_01.h" -#include "effects.h" -#include "script_api/battle.h" -#include "message_ids.h" -#include "entity.h" -#include "sprite/npc/Musician.h" -#include "sprite/npc/ChuckQuizmo.h" -#include "sprite/npc/Dryite.h" -#include "sprite/npc/Mouser.h" -#include "sprite/npc/Toadette.h" -#include "sprite/npc/WorldParakarry.h" - -#define CHUCK_QUIZMO_NPC_ID 10 - -extern s16 MessagePlural; -extern s16 MessageSingular; - -enum { - NPC_MOUSER0, - NPC_DRYITE0, - NPC_DRYITE1, - NPC_DRYITE2, - NPC_DRYITE3, - NPC_ARTIST_TOAD, - NPC_MOUSER1, - NPC_THREE_SISTERS0, - NPC_THREE_SISTERS1, - NPC_THREE_SISTERS2, - NPC_CHUCK_QUIZMO, - NPC_DRYITE4, - NPC_DRYITE5, -}; - -typedef struct Unk_Struct_1 { - s32 unk_00; - s32 unk_04; - s32 unk_08; - s32 unk_0C; - s32 unk_10; - void (*unk_14)(struct Unk_Struct_1*, s32); - s32 unk_18; - s32 unk_1C; - s32 unk_20; - f32 unk_24; - f32 unk_28; - f32 unk_2C; - f32 unk_30; - f32 unk_34; - s32 unk_38; -} Unk_Struct_1; - -typedef struct { - s32 unk_00; - s32 unk_04; - s32 unk_08; - s32 unk_0C; - s32 unk_10; - void (*unk_14)(Unk_Struct_1*, s32); -} Unk_Struct_2; - -void N(func_802430C8_95E2C8)(Unk_Struct_1* ptr, s32 arg1); - -static s32 N(Quizmo_Worker); -static s8 N(pad_D_8024DFC4)[0x4]; -static s32 N(Quizmo_ScriptArray)[4]; -static s32 N(Quizmo_AnswerResult); -static s8 N(pad_D_8024DFDC)[0x4]; -static EffectInstance* N(Quizmo_StageEffect); -static EffectInstance* N(Quizmo_AudienceEffect); -static EffectInstance* N(Quizmo_VannaTEffect); -static s8 N(pad_D_8024DFEC)[0x4]; -static s32 N(KeyItemChoiceList)[112]; -static s8 N(pad_D_8024E1B0)[0x4]; // Probably part of the above -static s32 N(LetterDelivery_SavedNpcAnim); - -EntryList N(entryList) = { - { -342.0f, 0.0f, 316.0f, 45.0f }, - { 488.0f, 1.0f, 4.0f, 270.0f }, - { 430.0f, 35.0f, -120.0f, 180.0f }, - { 0.0f, 0.0f, 0.0f, 0.0f }, - { 0.0f, 0.0f, 0.0f, 0.0f }, - { 0.0f, 0.0f, 0.0f, 0.0f }, - { 0.0f, 0.0f, 0.0f, 0.0f }, - { 0.0f, 0.0f, 0.0f, 0.0f }, - { 0.0f, 0.0f, 0.0f, 0.0f }, - { 0.0f, 0.0f, 0.0f, 0.0f }, - { -211.0f, 50.0f, -50.0f, 120.0f }, -}; - -MapSettings N(settings) = { - .main = &N(main), - .entryList = &N(entryList), - .entryCount = ENTRY_COUNT(N(entryList)), - .background = &gBackgroundImage, - .tattle = { MSG_MapTattle_dro_01 }, -}; - -EvtScript N(80243BB0) = { - EVT_CALL(GetEntryID, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(3) - EVT_CASE_OR_EQ(4) - EVT_END_CASE_GROUP - EVT_CASE_DEFAULT - EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_OUTPOST, 0, 8) - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_RETURN - EVT_END -}; - -#include "world/common/entity/PipeData.inc.c" - -EvtScript N(exitWalk_80244960) = { - EVT_SET_GROUP(EVT_GROUP_1B) - EVT_SET(GF_DRO01_HeardHintAboutSpinningRoof, 0) - EVT_CALL(UseExitHeading, 60, 0) - EVT_EXEC(ExitWalk) - EVT_CALL(GotoMap, EVT_PTR("sbk_36"), 1) - EVT_WAIT(100) - EVT_RETURN - EVT_END -}; - -EvtScript N(exitWalk_802449CC) = EVT_EXIT_WALK(60, 1, "dro_02", 0); - -EvtScript N(80244A28) = { - EVT_BIND_TRIGGER(N(exitWalk_80244960), TRIGGER_FLOOR_ABOVE, 1, 1, 0) - EVT_BIND_TRIGGER(N(exitWalk_802449CC), TRIGGER_FLOOR_ABOVE, 5, 1, 0) - EVT_RETURN - EVT_END -}; - -EvtScript N(80244A70) = { - EVT_CALL(PlaySound, 0x80000060) - EVT_CALL(UseSettingsFrom, 0, 175, 0, -201) - EVT_CALL(SetPanTarget, 0, 175, 0, -201) - EVT_CALL(SetCamSpeed, 0, EVT_FLOAT(90.0)) - EVT_CALL(PanToTarget, 0, 0, 1) - EVT_CALL(N(UnkFunc27), 2, 0, 3) - EVT_CALL(N(UnkFunc27), 1, -1, 3) - EVT_CALL(N(UnkFunc26), 3, 44, 32, 177, 0, 0, 0, 0, 0, 0) - EVT_CALL(DisablePlayerInput, TRUE) - EVT_THREAD - EVT_CALL(ShakeCam, 0, 0, 300, EVT_FLOAT(0.2)) - EVT_END_THREAD - EVT_THREAD - EVT_WAIT(60) - EVT_CALL(GetEntryID, LVar0) - EVT_IF_EQ(LVar0, 3) - EVT_CALL(GotoMap, EVT_PTR("dro_02"), 2) - EVT_ELSE - EVT_CALL(GotoMap, EVT_PTR("dro_02"), 3) - EVT_END_IF - EVT_WAIT(100) - EVT_END_THREAD - EVT_RETURN - EVT_END -}; - -EvtScript N(enterWalk_80244C14) = { - EVT_CALL(GetLoadType, LVar1) - EVT_IF_EQ(LVar1, 1) - EVT_EXEC(EnterSavePoint) - EVT_EXEC(N(80244A28)) - EVT_RETURN - EVT_END_IF - EVT_CALL(GetEntryID, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_EQ(2) - EVT_IF_EQ(GF_DRO01_WarpPipe, 0) - EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(DisablePlayerPhysics, TRUE) - EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) - EVT_CALL(SetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(SetPlayerPos, LVar0, -1000, LVar2) - EVT_WAIT(30) - EVT_CALL(PlaySound, SOUND_208E) - EVT_SET(GF_DRO01_WarpPipe, 1) - EVT_WAIT(30) - EVT_CALL(SetPlayerActionState, 0) - EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) - EVT_CALL(SetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(DisablePlayerPhysics, FALSE) - EVT_CALL(DisablePlayerInput, FALSE) - EVT_END_IF - EVT_SET(LVarA, EVT_PTR(N(80244A28))) - EVT_EXEC_WAIT(N(Pipe_EnterVertical)) - EVT_CASE_OR_EQ(3) - EVT_CASE_OR_EQ(4) - EVT_EXEC_WAIT(N(80244A70)) - EVT_END_CASE_GROUP - EVT_CASE_EQ(10) - EVT_EXEC(0x80285C50) - EVT_EXEC(N(80244A28)) - EVT_CASE_DEFAULT - EVT_SET(LVar0, EVT_PTR(N(80244A28))) - EVT_EXEC(EnterWalk) - EVT_END_SWITCH - EVT_WAIT(1) - EVT_RETURN - EVT_END -}; - -EvtScript N(main) = { - EVT_SET(GB_WorldLocation, 9) - EVT_CALL(SetSpriteShading, -1) - EVT_CALL(SetCamPerspective, 0, 3, 25, 16, 4096) - EVT_CALL(SetCamBGColor, 0, 0, 0, 0) - EVT_CALL(SetCamEnabled, 0, 1) - EVT_CALL(SetCamLeadPlayer, 0, 0) - EVT_SET(GF_MAP_DryDryOutpost, 1) - EVT_IF_LT(GB_StoryProgress, -68) - EVT_SET(GB_StoryProgress, -68) - EVT_END_IF - EVT_SWITCH(GB_StoryProgress) - EVT_CASE_RANGE(-53, 6) - EVT_CALL(MakeNpcs, 0, EVT_PTR(N(npcGroupList_8024B47C))) - EVT_CASE_DEFAULT - EVT_CALL(MakeNpcs, 0, EVT_PTR(N(npcGroupList_8024B464))) - EVT_END_SWITCH - EVT_CALL(InitVirtualEntityList) - EVT_EXEC_WAIT(N(makeEntities)) - EVT_CALL(MakeShop, EVT_PTR(N(shopItemPositions_8024BA68)), EVT_PTR(N(shopInventory_8024B4FC)), EVT_PTR(N(shopPriceList_8024B550)), 0) - EVT_CALL(MakeShopOwner, EVT_PTR(N(shopOwnerNPC_8024BA80))) - EVT_EXEC_WAIT(N(8024C218)) - EVT_EXEC(N(8024C2EC)) - EVT_EXEC(N(80243BB0)) - EVT_EXEC(N(enterWalk_80244C14)) - EVT_WAIT(1) - EVT_EXEC(N(8024DD78)) - EVT_RETURN - EVT_END -}; - -s32 N(pad_5004)[] = { - 0x00000000, 0x00000000, 0x00000000, -}; - -MobileAISettings N(npcAISettings_80245010) = { - .moveSpeed = 1.5f, - .moveTime = 60, - .waitTime = 30, - .playerSearchInterval = -1, - .unk_AI_2C = 1, -}; - -EvtScript N(npcAI_80245040) = { - EVT_CALL(BasicAI_Main, EVT_PTR(N(npcAISettings_80245010))) - EVT_RETURN - EVT_END -}; - -NpcSettings N(npcSettings_80245060) = { - .height = 26, - .radius = 23, - .ai = &N(npcAI_80245040), - .level = 99, - .actionFlags = 16, -}; - -MobileAISettings N(npcAISettings_8024508C) = { - .moveSpeed = 1.5f, - .moveTime = 30, - .waitTime = 30, - .playerSearchInterval = -1, - .unk_AI_2C = 1, -}; - -EvtScript N(npcAI_802450BC) = { - EVT_CALL(N(PatrolNoAttackAI_Main), EVT_PTR(N(npcAISettings_8024508C))) - EVT_RETURN - EVT_END -}; - -NpcSettings N(npcSettings_802450DC) = { - .height = 26, - .radius = 23, - .ai = &N(npcAI_802450BC), - .level = 99, - .actionFlags = 16, -}; - -NpcSettings N(npcSettings_80245108) = { - .height = 26, - .radius = 23, - .level = 99, -}; - -NpcSettings N(npcSettings_80245134) = { - .height = 22, - .radius = 25, - .level = 99, -}; - -NpcSettings N(npcSettings_80245160) = { - .height = 30, - .radius = 24, - .level = 99, -}; - -NpcSettings N(npcSettings_8024518C) = { - .height = 23, - .radius = 19, - .level = 99, -}; - -#include "world/common/atomic/QuizmoData.inc.c" - -s32 N(D_802477E0_9629E0) = { - 0x00000000, -}; - -s32 N(D_802477E4_9629E4) = { - 0x00000000, -}; - -EvtScript N(802477E8) = { - EVT_SET(LVar9, LVar1) - EVT_CALL(ShowKeyChoicePopup) - EVT_SET(LVarA, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_EQ(0) - EVT_CASE_EQ(-1) - EVT_CASE_DEFAULT - EVT_CALL(RemoveKeyItemAt, LVar1) - EVT_CALL(GetPlayerPos, LVar3, LVar4, LVar5) - EVT_CALL(N(AddPlayerHandsOffset), LVar3, LVar4, LVar5) - EVT_BITWISE_OR_CONST(LVar0, 0x50000) - EVT_CALL(MakeItemEntity, LVar0, LVar3, LVar4, LVar5, 1, 0) - EVT_CALL(SetPlayerAnimation, 393221) - EVT_WAIT(30) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) - EVT_CALL(RemoveItemEntity, LVar0) - EVT_END_SWITCH - EVT_CALL(N(func_80242784_95D984), LVarA) - EVT_CALL(CloseChoicePopup) - EVT_UNBIND - EVT_RETURN - EVT_END -}; - -EvtScript N(8024792C) = { - EVT_CALL(N(BuildKeyItemChoiceList), LVar0) - EVT_BIND_PADLOCK(N(802477E8), 0x10, 0, EVT_PTR(N(KeyItemChoiceList)), 0, 1) - EVT_CALL(N(func_80242730_95D930), LVar0) - EVT_RETURN - EVT_END -}; - -EvtScript N(8024797C) = { - EVT_LOOP(0) - EVT_CALL(GetNpcPos, NPC_PARTNER, LVar3, LVar4, LVar5) - EVT_CALL(N(LetterDelivery_CalcLetterPos), LVar3, LVar4, LVar5) - EVT_CALL(SetItemPos, LVar0, LVar3, LVar4, LVar5) - EVT_WAIT(1) - EVT_END_LOOP - EVT_RETURN - EVT_END -}; - -EvtScript N(802479FC) = { - EVT_SET(LVar9, LVar1) - EVT_CALL(ShowKeyChoicePopup) - EVT_SET(LVarA, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_EQ(0) - EVT_CASE_EQ(-1) - EVT_CASE_DEFAULT - EVT_CALL(RemoveKeyItemAt, LVar1) - EVT_CALL(DisablePartnerAI, 0) - EVT_CALL(GetNpcPos, NPC_PARTNER, LVar3, LVar4, LVar5) - EVT_CALL(N(LetterDelivery_CalcLetterPos), LVar3, LVar4, LVar5) - EVT_BITWISE_OR_CONST(LVar0, 0x50000) - EVT_CALL(MakeItemEntity, LVar0, LVar3, LVar4, LVar5, 1, 0) - EVT_EXEC_GET_TID(N(8024797C), LVarA) - EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_WorldParakarry_Walk) - EVT_CALL(GetAngleBetweenNPCs, LVar9, -4, LVarB) - EVT_CALL(GetNpcPos, NPC_PARTNER, LVar3, LVar4, LVar5) - EVT_CALL(GetNpcPos, LVar9, LVar6, LVar7, LVar8) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, ((NPC_FLAG_100)), TRUE) - EVT_IF_LE(LVarB, 180) - EVT_ADD(LVar6, 20) - EVT_ELSE - EVT_ADD(LVar6, -20) - EVT_END_IF - EVT_ADD(LVar7, 10) - EVT_CALL(SetNpcJumpscale, NPC_PARTNER, EVT_FLOAT(0.0)) - EVT_CALL(NpcJump1, NPC_PARTNER, LVar6, LVar7, LVar8, 20) - EVT_KILL_THREAD(LVarA) - EVT_CALL(RemoveItemEntity, LVar0) - EVT_WAIT(20) - EVT_CALL(GetNpcYaw, -4, LVarA) - EVT_ADD(LVarA, 180) - EVT_CALL(InterpNpcYaw, NPC_PARTNER, LVarA, 0) - EVT_WAIT(5) - EVT_CALL(NpcJump1, NPC_PARTNER, LVar3, LVar4, LVar5, 20) - EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_WorldParakarry_Idle) - EVT_CALL(NpcFaceNpc, NPC_PARTNER, LVar9, 0) - EVT_WAIT(5) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, ((NPC_FLAG_100)), FALSE) - EVT_CALL(EnablePartnerAI) - EVT_WAIT(5) - EVT_END_SWITCH - EVT_CALL(N(func_80242784_95D984), LVarA) - EVT_CALL(CloseChoicePopup) - EVT_UNBIND - EVT_RETURN - EVT_END -}; - -EvtScript N(80247D20) = { - EVT_SET(LVar0, LVarB) - EVT_SET(LVar1, LVar2) - EVT_CALL(N(BuildKeyItemChoiceList), LVar0) - EVT_BIND_PADLOCK(N(802479FC), 0x10, 0, EVT_PTR(N(KeyItemChoiceList)), 0, 1) - EVT_CALL(N(func_80242730_95D930), LVar0) - EVT_RETURN - EVT_END -}; - -EvtScript N(80247D90) = { - EVT_SET(LVarC, 0) - EVT_IF_LT(GB_StoryProgress, -70) - EVT_RETURN - EVT_END_IF - EVT_CALL(N(LetterDelivery_SaveNpcAnim)) - EVT_CALL(GetCurrentPartnerID, LVar0) - EVT_CALL(FindKeyItem, LVar5, LVar1) - EVT_IF_EQ(LVar0, 4) - EVT_IF_NE(LVar1, -1) - EVT_CALL(DisablePartnerAI, 0) - EVT_CALL(PlayerFaceNpc, LVar2, 0) - EVT_WAIT(1) - EVT_CALL(GetNpcPos, LVar2, LVarD, LVar0, LVarE) - EVT_CALL(GetNpcPos, NPC_PARTNER, LVarD, LVarE, LVarF) - EVT_CALL(SetNpcJumpscale, NPC_PARTNER, EVT_FLOAT(0.0)) - EVT_ADD(LVar0, 10) - EVT_CALL(NpcJump1, NPC_PARTNER, LVarD, LVar0, LVarF, 10) - EVT_CALL(SpeakToNpc, -4, 262150, 262145, 0, LVar2, LVar7) - EVT_CALL(EnablePartnerAI) - EVT_EXEC_WAIT(N(80247D20)) - EVT_SWITCH(LVar0) - EVT_CASE_EQ(-1) - EVT_CALL(DisablePartnerAI, 0) - EVT_WAIT(1) - EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldParakarry_Talk, ANIM_WorldParakarry_Idle, 5, LVar8) - EVT_CALL(EnablePartnerAI) - EVT_SET(LVarC, 1) - EVT_CASE_DEFAULT - EVT_CALL(DisablePartnerAI, 0) - EVT_WAIT(1) - EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldParakarry_Talk, ANIM_WorldParakarry_Idle, 5, LVar9) - EVT_IF_NE(LVarA, 0) - EVT_CALL(SpeakToPlayer, LVar2, LVar3, LVar4, 0, LVarA) - EVT_END_IF - EVT_CALL(EnablePartnerAI) - EVT_IF_NE(LVar6, 0) - EVT_SET(LVar0, LVar6) - EVT_SET(LVar1, 1) - EVT_EXEC_WAIT(N(EVS_Quizmo_GiveItem_0)) - EVT_CALL(AddKeyItem, LVar6) - EVT_END_IF - EVT_SET(LVarC, 2) - EVT_END_SWITCH - EVT_END_IF - EVT_END_IF - EVT_CALL(N(LetterDelivery_RestoreNpcAnim)) - EVT_RETURN - EVT_END -}; - -s32 N(D_80248088_963288)[] = { - ITEM_LETTER19, ITEM_NONE -}; - -EvtScript N(80248090) = { - EVT_CALL(N(LetterDelivery_Init), 6, ANIM_Mouser_Purple_Talk, ANIM_Mouser_Purple_Idle, 76, 69, - MSG_CH2_0089, MSG_CH2_008A, MSG_CH2_008B, MSG_CH2_008C, EVT_PTR(N(D_80248088_963288))) - EVT_EXEC_WAIT(N(80247D90)) - EVT_RETURN - EVT_END -}; - -EvtScript N(interact_802480E0) = { - EVT_IF_GE(GB_StoryProgress, -53) - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Mouser_Blue_Talk, ANIM_Mouser_Blue_Idle, 0, MSG_CH2_0062) - EVT_RETURN - EVT_END_IF - EVT_SWITCH(AreaByte(0)) - EVT_CASE_EQ(0) - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Mouser_Blue_Talk, ANIM_Mouser_Blue_Idle, 0, MSG_CH2_005F) - EVT_ADD(AreaByte(0), 1) - EVT_CASE_EQ(1) - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Mouser_Blue_Talk, ANIM_Mouser_Blue_Idle, 0, MSG_CH2_0060) - EVT_ADD(AreaByte(0), 1) - EVT_CASE_EQ(2) - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Mouser_Blue_Talk, ANIM_Mouser_Blue_Idle, 0, MSG_CH2_0061) - EVT_SUB(AreaByte(0), 1) - EVT_END_SWITCH - EVT_RETURN - EVT_END -}; - -EvtScript N(init_802481F8) = { - EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(interact_802480E0))) - EVT_RETURN - EVT_END -}; - -EvtScript N(interact_8024821C) = { - EVT_SWITCH(GB_StoryProgress) - EVT_CASE_LT(-53) - EVT_IF_GE(GB_StoryProgress, -64) - EVT_IF_EQ(AreaByte(1), 2) - EVT_SET(AreaByte(1), 0) - EVT_END_IF - EVT_END_IF - EVT_SWITCH(AreaByte(1)) - EVT_CASE_EQ(0) - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Dryite_Yellow_Talk, ANIM_Dryite_Yellow_Idle, 0, MSG_CH2_0063) - EVT_ADD(AreaByte(1), 1) - EVT_CASE_EQ(1) - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Dryite_Yellow_Talk, ANIM_Dryite_Yellow_Idle, 0, MSG_CH2_0064) - EVT_ADD(AreaByte(1), 1) - EVT_CASE_EQ(2) - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Dryite_Yellow_Talk, ANIM_Dryite_Yellow_Idle, 0, MSG_CH2_0065) - EVT_SET(AreaByte(1), 0) - EVT_END_SWITCH - EVT_CASE_LT(39) - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Dryite_Yellow_Talk, ANIM_Dryite_Yellow_Idle, 0, MSG_CH2_0066) - EVT_CASE_DEFAULT - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Dryite_Yellow_Talk, ANIM_Dryite_Yellow_Idle, 0, MSG_CH2_0067) - EVT_END_SWITCH - EVT_RETURN - EVT_END -}; - -EvtScript N(init_802483A8) = { - EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(interact_8024821C))) - EVT_RETURN - EVT_END -}; - -EvtScript N(interact_802483CC) = { - EVT_SWITCH(AreaByte(2)) - EVT_CASE_EQ(0) - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Dryite_Blue_Talk, ANIM_Dryite_Blue_Idle, 0, MSG_CH2_0068) - EVT_ADD(AreaByte(2), 1) - EVT_CASE_EQ(1) - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Dryite_Blue_Talk, ANIM_Dryite_Blue_Idle, 0, MSG_CH2_0069) - EVT_ADD(AreaByte(2), 1) - EVT_CASE_EQ(2) - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Dryite_Blue_Talk, ANIM_Dryite_Blue_Idle, 0, MSG_CH2_006A) - EVT_ADD(AreaByte(2), 1) - EVT_CASE_EQ(3) - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Dryite_Blue_Talk, ANIM_Dryite_Blue_Idle, 0, MSG_CH2_006B) - EVT_SET(AreaByte(2), 0) - EVT_END_SWITCH - EVT_RETURN - EVT_END -}; - -EvtScript N(init_802484E0) = { - EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(interact_802483CC))) - EVT_RETURN - EVT_END -}; - -EvtScript N(80248504) = { - EVT_LOOP(0) - EVT_CALL(N(GetFloorCollider), LVar0) - EVT_IF_EQ(LVar0, 8) - EVT_BREAK_LOOP - EVT_END_IF - EVT_WAIT(1) - EVT_END_LOOP - EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(func_802CF56C, 1) - EVT_THREAD - EVT_WAIT(20) - EVT_CALL(func_802CF56C, 0) - EVT_CALL(NpcFacePlayer, NPC_PARTNER, 0) - EVT_END_THREAD - EVT_CALL(PlayerFaceNpc, 3, 0) - EVT_CALL(SpeakToPlayer, 3, ANIM_Dryite_Green_Talk, ANIM_Dryite_Green_Idle, 0, MSG_CH2_0078) - EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) - EVT_CALL(GetNpcPos, 3, LVar3, LVar4, LVar5) - EVT_CALL(UseSettingsFrom, 0, LVar0, LVar1, LVar2) - EVT_ADDF(LVar0, LVar3) - EVT_ADDF(LVar1, LVar4) - EVT_ADDF(LVar2, LVar5) - EVT_DIVF(LVar0, EVT_FLOAT(2.0)) - EVT_DIVF(LVar1, EVT_FLOAT(2.0)) - EVT_DIVF(LVar2, EVT_FLOAT(2.0)) - EVT_CALL(SetPanTarget, 0, LVar0, LVar1, LVar2) - EVT_CALL(SetCamDistance, 0, EVT_FLOAT(-300.0)) - EVT_CALL(SetCamSpeed, 0, EVT_FLOAT(5.0)) - EVT_CALL(PanToTarget, 0, 0, 1) - EVT_CALL(WaitForCam, 0, EVT_FLOAT(1.0)) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) - EVT_CALL(SpeakToPlayer, 3, ANIM_Dryite_Green_Talk, ANIM_Dryite_Green_Idle, 0, MSG_CH2_0079) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007) - EVT_WAIT(30) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) - EVT_CALL(SpeakToPlayer, 3, ANIM_Dryite_Green_Talk, ANIM_Dryite_Green_Idle, 0, MSG_CH2_007A) - EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) - EVT_CALL(UseSettingsFrom, 0, LVar0, LVar1, LVar2) - EVT_CALL(SetCamSpeed, 0, EVT_FLOAT(4.0)) - EVT_CALL(PanToTarget, 0, 0, 1) - EVT_CALL(WaitForCam, 0, EVT_FLOAT(1.0)) - EVT_CALL(PanToTarget, 0, 0, 0) - EVT_CALL(N(func_80243084_95E284)) - EVT_SET(GF_DRO01_HeardHintAboutSpinningRoof, 1) - EVT_CALL(DisablePlayerInput, FALSE) - EVT_RETURN - EVT_END -}; - -Unk_Struct_2 N(D_8024884C_963A4C) = { - 0x0000007D, 0x00000000, 0xFFFFFFD6, 0x0000004B, 0x0000004B, N(func_802430C8_95E2C8), -}; - -EvtScript N(interact_80248864) = { - EVT_IF_EQ(GF_MAC01_Merlon_HeardAboutDream, 1) - EVT_IF_EQ(GF_DRO01_HeardHintAboutSpinningRoof, 1) - EVT_CALL(N(func_802431B4_95E3B4)) - EVT_IF_EQ(LVar0, 1) - EVT_CALL(SpeakToPlayer, 3, ANIM_Dryite_Green_Talk, ANIM_Dryite_Green_Idle, 0, MSG_CH2_007B) - EVT_RETURN - EVT_END_IF - EVT_END_IF - EVT_END_IF - EVT_SWITCH(GB_StoryProgress) - EVT_CASE_LT(-53) - EVT_IF_EQ(AreaFlag(1), 0) - EVT_CALL(SpeakToPlayer, 3, ANIM_Dryite_Green_Talk, ANIM_Dryite_Green_Idle, 0, MSG_CH2_006C) - EVT_CALL(SpeakToPlayer, 4, ANIM_Dryite_Green_Talk, ANIM_Dryite_Green_Idle, 0, MSG_CH2_006D) - EVT_CALL(SpeakToPlayer, 3, ANIM_Dryite_Green_Talk, ANIM_Dryite_Green_Idle, 0, MSG_CH2_006E) - EVT_SET(AreaFlag(1), 1) - EVT_ELSE - EVT_CALL(SpeakToPlayer, 3, ANIM_Dryite_Green_Talk, ANIM_Dryite_Green_Idle, 0, MSG_CH2_006F) - EVT_CALL(SpeakToPlayer, 4, ANIM_Dryite_Green_Talk, ANIM_Dryite_Green_Idle, 0, MSG_CH2_0070) - EVT_CALL(SpeakToPlayer, 3, ANIM_Dryite_Green_Talk, ANIM_Dryite_Green_Idle, 0, MSG_CH2_0071) - EVT_SET(AreaFlag(1), 0) - EVT_END_IF - EVT_CASE_LT(39) - EVT_CALL(SpeakToPlayer, 3, ANIM_Dryite_Green_Talk, ANIM_Dryite_Green_Idle, 0, MSG_CH2_0072) - EVT_CALL(SpeakToPlayer, 4, ANIM_Dryite_Green_Talk, ANIM_Dryite_Green_Idle, 0, MSG_CH2_0073) - EVT_CALL(SpeakToPlayer, 3, ANIM_Dryite_Green_Talk, ANIM_Dryite_Green_Idle, 0, MSG_CH2_0074) - EVT_CASE_DEFAULT - EVT_CALL(SpeakToPlayer, 3, ANIM_Dryite_Green_Talk, ANIM_Dryite_Green_Idle, 0, MSG_CH2_0075) - EVT_CALL(SpeakToPlayer, 4, ANIM_Dryite_Green_Talk, ANIM_Dryite_Green_Idle, 0, MSG_CH2_0076) - EVT_CALL(SpeakToPlayer, 3, ANIM_Dryite_Green_Talk, ANIM_Dryite_Green_Idle, 0, MSG_CH2_0077) - EVT_END_SWITCH - EVT_RETURN - EVT_END -}; - -EvtScript N(init_80248AE4) = { - EVT_CALL(GetEntryID, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(3) - EVT_CASE_OR_EQ(4) - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Dryite_Green_Talk) - EVT_RETURN - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(interact_80248864))) - EVT_IF_EQ(GF_MAC01_Merlon_HeardAboutDream, 1) - EVT_THREAD - EVT_CALL(N(func_80242858_95DA58), EVT_PTR(N(D_8024884C_963A4C))) - EVT_END_THREAD - EVT_END_IF - EVT_RETURN - EVT_END -}; - -EvtScript N(interact_80248BA0) = { - EVT_CHILD_THREAD - EVT_LOOP(0) - EVT_CALL(NpcFaceNpc, 3, 4, 1) - EVT_END_LOOP - EVT_END_CHILD_THREAD - EVT_CALL(N(func_802431FC_95E3FC)) - EVT_CALL(SetNpcFlagBits, NPC_SELF, ((NPC_FLAG_100)), TRUE) - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Dryite_Green_Run) - EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(3.5)) - EVT_CALL(NpcMoveTo, NPC_SELF, LVar0, LVar1, 0) - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Dryite_Green_Idle) - EVT_CALL(SetNpcFlagBits, NPC_SELF, ((NPC_FLAG_100)), FALSE) - EVT_WAIT(5) - EVT_CALL(GetNpcYaw, -1, LVar0) - EVT_ADD(LVar0, 180) - EVT_CALL(InterpNpcYaw, NPC_SELF, LVar0, 0) - EVT_RETURN - EVT_END -}; - -EvtScript N(init_80248CC8) = { - EVT_CALL(GetEntryID, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(3) - EVT_CASE_OR_EQ(4) - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Dryite_Green_Talk) - EVT_RETURN - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(interact_80248BA0))) - EVT_RETURN - EVT_END -}; - -s32 N(D_80248D4C_963F4C)[] = { - 0x00000067, 0x00000000, -}; - -EvtScript N(interact_80248D54) = { - EVT_IF_EQ(GF_DRO01_Gift_Melody, 1) - EVT_CALL(FindKeyItem, ITEM_MELODY, LVar0) - EVT_IF_NE(LVar0, -1) - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Musician_Composer_Talk, ANIM_Musician_Composer_Idle, 0, MSG_CH2_0084) - EVT_RETURN - EVT_ELSE - EVT_IF_EQ(GF_DRO01_Gift_ToldComposerAboutMelody, 0) - EVT_IF_LT(GB_StoryProgress, 88) - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Musician_Composer_Talk, ANIM_Musician_Composer_Idle, 0, MSG_CH2_0085) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_NodYes) - EVT_WAIT(30) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Musician_Composer_Talk, ANIM_Musician_Composer_Idle, 0, MSG_CH2_0086) - EVT_SET(GF_DRO01_Gift_ToldComposerAboutMelody, 1) - EVT_RETURN - EVT_END_IF - EVT_END_IF - EVT_END_IF - EVT_END_IF - EVT_SWITCH(GB_StoryProgress) - EVT_CASE_LT(-53) - EVT_IF_EQ(AreaFlag(2), 0) - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Musician_Composer_Talk, ANIM_Musician_Composer_Idle, 0, MSG_CH2_007C) - EVT_SET(AreaFlag(2), 1) - EVT_ELSE - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Musician_Composer_Talk, ANIM_Musician_Composer_Idle, 0, MSG_CH2_007D) - EVT_SET(AreaFlag(2), 0) - EVT_END_IF - EVT_CASE_LT(39) - EVT_IF_EQ(AreaFlag(2), 0) - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Musician_Composer_Talk, ANIM_Musician_Composer_Idle, 0, MSG_CH2_007E) - EVT_SET(AreaFlag(2), 1) - EVT_ELSE - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Musician_Composer_Talk, ANIM_Musician_Composer_Idle, 0, MSG_CH2_007F) - EVT_SET(AreaFlag(2), 0) - EVT_END_IF - EVT_CASE_DEFAULT - EVT_IF_EQ(AreaFlag(2), 0) - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Musician_Composer_Talk, ANIM_Musician_Composer_Idle, 0, MSG_CH2_0080) - EVT_SET(AreaFlag(2), 1) - EVT_ELSE - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Musician_Composer_Talk, ANIM_Musician_Composer_Idle, 0, MSG_CH2_0081) - EVT_SET(AreaFlag(2), 0) - EVT_END_IF - EVT_END_SWITCH - EVT_SET(LVar0, EVT_PTR(N(D_80248D4C_963F4C))) - EVT_SET(LVar1, 5) - EVT_EXEC_WAIT(N(8024792C)) - EVT_SWITCH(LVar0) - EVT_CASE_EQ(0) - EVT_CASE_EQ(-1) - EVT_CASE_DEFAULT - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Musician_Composer_Talk, ANIM_Musician_Composer_Idle, 0, MSG_CH2_0082) - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Musician_Composer_Write) - EVT_WAIT(60) - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Musician_Composer_Idle) - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Musician_Composer_Talk, ANIM_Musician_Composer_Idle, 0, MSG_CH2_0083) - EVT_SET(LVar0, 104) - EVT_SET(LVar1, 1) - EVT_EXEC_WAIT(N(EVS_Quizmo_GiveItem_0)) - EVT_CALL(AddKeyItem, ITEM_MELODY) - EVT_SET(GF_DRO01_Gift_Melody, 1) - EVT_RETURN - EVT_END_SWITCH - EVT_RETURN - EVT_END -}; - -EvtScript N(init_80249168) = { - EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(interact_80248D54))) - EVT_RETURN - EVT_END -}; - -EvtScript N(idle_8024918C) = { - EVT_SWITCH(GB_StoryProgress) - EVT_CASE_LT(-67) - EVT_CALL(N(func_80243350_95E550), 16, 190, -134, -131) - EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_SELF, ((NPC_FLAG_100)), TRUE) - EVT_CALL(SetNpcPos, NPC_SELF, 0, 0, -180) - EVT_EXEC_WAIT(N(8024C41C)) - EVT_WAIT(10) - EVT_CALL(GetPlayerPos, LVarA, LVarB, LVarC) - EVT_CALL(UseSettingsFrom, 0, LVarA, LVarB, LVarC) - EVT_CALL(SetPanTarget, 0, 32, 0, -67) - EVT_CALL(SetCamDistance, 0, -210) - EVT_CALL(SetCamPitch, 0, 20, -12) - EVT_CALL(SetCamSpeed, 0, EVT_FLOAT(90.0)) - EVT_CALL(PanToTarget, 0, 0, 1) - EVT_WAIT(20) - EVT_CALL(UseSettingsFrom, 0, LVarA, LVarB, LVarC) - EVT_CALL(SetCamDistance, 0, -350) - EVT_CALL(SetCamSpeed, 0, EVT_FLOAT(0.8)) - EVT_CALL(PanToTarget, 0, 0, 1) - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Mouser_Purple_Run) - EVT_CALL(NpcMoveTo, NPC_SELF, -23, -105, 20) - EVT_WAIT(10) - EVT_CALL(InterpNpcYaw, NPC_SELF, 65, 0) - EVT_WAIT(10) - EVT_EXEC_WAIT(N(8024C4C8)) - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Mouser_Purple_Run) - EVT_CALL(NpcMoveTo, NPC_SELF, 37, -27, 20) - EVT_CALL(UseSettingsFrom, 0, LVarA, LVarB, LVarC) - EVT_CALL(SetPanTarget, 0, 142, 0, -67) - EVT_CALL(PanToTarget, 0, 0, 1) - EVT_CALL(NpcMoveTo, NPC_SELF, 62, -6, 20) - EVT_CALL(NpcMoveTo, NPC_SELF, 103, 11, 20) - EVT_CALL(NpcMoveTo, NPC_SELF, 150, 18, 20) - EVT_CALL(EnableNpcBlur, -1, 1) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, 372, 0) - EVT_CALL(NpcMoveTo, NPC_SELF, 554, -12, 20) - EVT_CALL(SetNpcPos, NPC_SELF, 0, -1000, 0) - EVT_WAIT(30) - EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) - EVT_CALL(UseSettingsFrom, 0, LVar0, LVar1, LVar2) - EVT_CALL(SetPanTarget, 0, LVar0, LVar1, LVar2) - EVT_CALL(SetCamSpeed, 0, EVT_FLOAT(2.0)) - EVT_CALL(PanToTarget, 0, 0, 1) - EVT_CALL(WaitForCam, 0, EVT_FLOAT(1.0)) - EVT_CALL(PanToTarget, 0, 0, 0) - EVT_CALL(DisablePlayerInput, FALSE) - EVT_SET(GB_StoryProgress, -67) - EVT_CASE_LT(-66) - EVT_CASE_LT(-65) - EVT_CALL(EnableNpcBlur, -1, 1) - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Mouser_Purple_Run) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, 372, 0) - EVT_CALL(SetNpcPos, NPC_SELF, 470, 0, 18) - EVT_CALL(NpcMoveTo, NPC_SELF, 287, 9, 20) - EVT_CALL(NpcMoveTo, NPC_SELF, 102, -14, 20) - EVT_CALL(NpcMoveTo, NPC_SELF, -32, -96, 20) - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Mouser_Purple_Idle) - EVT_EXEC_WAIT(N(8024C41C)) - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Mouser_Purple_Run) - EVT_CALL(NpcMoveTo, NPC_SELF, 20, -375, 30) - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Mouser_Purple_Idle) - EVT_EXEC_WAIT(N(8024C4C8)) - EVT_CALL(EnableNpcBlur, -1, 0) - EVT_SET(GB_StoryProgress, -65) - EVT_CASE_DEFAULT - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Mouser_Purple_Idle) - EVT_CALL(SetNpcPos, NPC_SELF, 20, 0, -375) - EVT_END_SWITCH - EVT_RETURN - EVT_END -}; - -EvtScript N(interact_80249750) = { - EVT_IF_EQ(AreaByte(4), 4) - EVT_IF_EQ(AreaByte(5), 1) - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Mouser_Purple_Talk, ANIM_Mouser_Purple_Idle, 0, MSG_CH2_0088) - EVT_EXEC_WAIT(N(80248090)) - EVT_IF_NE(LVarC, 0) - EVT_RETURN - EVT_END_IF - EVT_RETURN - EVT_END_IF - EVT_END_IF - EVT_EXEC_WAIT(0x80284054) - EVT_EXEC_WAIT(N(80248090)) - EVT_IF_NE(LVarC, 0) - EVT_RETURN - EVT_END_IF - EVT_RETURN - EVT_END -}; - -EvtScript N(init_8024981C) = { - EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(idle_8024918C))) - EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(interact_80249750))) - EVT_RETURN - EVT_END -}; - -EvtScript N(interact_80249854) = { - EVT_CALL(SpeakToPlayer, 7, ANIM_Toadette_Pink_Talk, ANIM_Toadette_Pink_Idle, 0, MSG_CH2_008E) - EVT_CALL(SpeakToPlayer, 8, ANIM_Toadette_Pink_Talk, ANIM_Toadette_Pink_Idle, 0, MSG_CH2_008F) - EVT_CALL(SpeakToPlayer, 9, ANIM_Toadette_Pink_Talk, ANIM_Toadette_Pink_Idle, 0, MSG_CH2_0090) - EVT_RETURN - EVT_END -}; - -EvtScript N(init_802498C4) = { - EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(interact_80249854))) - EVT_RETURN - EVT_END -}; - -EvtScript N(interact_802498E8) = { - EVT_CALL(FindKeyItem, ITEM_FIRST_DEGREE_CARD, LVar1) - EVT_CALL(FindKeyItem, ITEM_SECOND_DEGREE_CARD, LVar2) - EVT_CALL(FindKeyItem, ITEM_THIRD_DEGREE_CARD, LVar3) - EVT_CALL(FindKeyItem, ITEM_FOURTH_DEGREE_CARD, LVar4) - EVT_CALL(FindKeyItem, ITEM_DIPLOMA, LVar5) - EVT_IF_NE(LVar1, -1) - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Dryite_Brown_Talk, ANIM_Dryite_Brown_Idle, 0, MSG_CH2_009A) - EVT_RETURN - EVT_END_IF - EVT_IF_NE(LVar2, -1) - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Dryite_Brown_Talk, ANIM_Dryite_Brown_Idle, 0, MSG_CH2_009B) - EVT_RETURN - EVT_END_IF - EVT_IF_NE(LVar3, -1) - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Dryite_Brown_Talk, ANIM_Dryite_Brown_Idle, 0, MSG_CH2_009C) - EVT_RETURN - EVT_END_IF - EVT_IF_NE(LVar4, -1) - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Dryite_Brown_Talk, ANIM_Dryite_Brown_Idle, 0, MSG_CH2_009D) - EVT_RETURN - EVT_END_IF - EVT_IF_NE(LVar5, -1) - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Dryite_Brown_Talk, ANIM_Dryite_Brown_Idle, 0, MSG_CH2_009E) - EVT_RETURN - EVT_END_IF - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Dryite_Brown_Talk, ANIM_Dryite_Brown_Idle, 0, MSG_CH2_0099) - EVT_RETURN - EVT_END -}; - -EvtScript N(init_80249ABC) = { - EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(interact_802498E8))) - EVT_RETURN - EVT_END -}; - -EvtScript N(interact_80249AE0) = { - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Dryite_Brown_Talk, ANIM_Dryite_Brown_Idle, 0, MSG_CH2_009F) - EVT_RETURN - EVT_END -}; - -EvtScript N(init_80249B10) = { - EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(interact_80249AE0))) - EVT_RETURN - EVT_END -}; - -StaticNpc N(npcGroup_80249B34)[] = { - { - .id = NPC_MOUSER0, - .settings = &N(npcSettings_80245134), - .pos = { -332.0f, 0.0f, 188.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, - .init = &N(init_802481F8), - .yaw = 90, - .drops = { - .dropFlags = NPC_DROP_FLAGS_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, - .animations = { - ANIM_Mouser_Blue_Idle, - ANIM_Mouser_Blue_Run, - ANIM_Mouser_Blue_Run, - ANIM_Mouser_Blue_Run, - ANIM_Mouser_Blue_Idle, - ANIM_Mouser_Blue_Idle, - ANIM_Mouser_Blue_Idle, - ANIM_Mouser_Blue_Idle, - ANIM_Mouser_Blue_Idle, - ANIM_Mouser_Blue_Idle, - ANIM_Mouser_Blue_Idle, - ANIM_Mouser_Blue_Idle, - ANIM_Mouser_Blue_Idle, - ANIM_Mouser_Blue_Idle, - ANIM_Mouser_Blue_Idle, - ANIM_Mouser_Blue_Idle, - }, - .tattle = MSG_NpcTattle_DRO_Greeter, - }, - { - .id = NPC_DRYITE0, - .settings = &N(npcSettings_80245060), - .pos = { -235.0f, 0.0f, 160.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, - .init = &N(init_802483A8), - .yaw = 90, - .drops = { - .dropFlags = NPC_DROP_FLAGS_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, - .territory = { .temp = { -235, 0, 160, 30, 0, -32767, 0, 0, 0, 0, 0, 0, 0, 1 }}, - .animations = { - ANIM_Dryite_Yellow_Idle, - ANIM_Dryite_Yellow_Walk, - ANIM_Dryite_Yellow_Run, - ANIM_Dryite_Yellow_Run, - ANIM_Dryite_Yellow_Idle, - ANIM_Dryite_Yellow_Idle, - ANIM_Dryite_Yellow_Still, - ANIM_Dryite_Yellow_Still, - ANIM_Dryite_Yellow_Idle, - ANIM_Dryite_Yellow_Idle, - ANIM_Dryite_Yellow_Idle, - ANIM_Dryite_Yellow_Idle, - ANIM_Dryite_Yellow_Idle, - ANIM_Dryite_Yellow_Idle, - ANIM_Dryite_Yellow_Idle, - ANIM_Dryite_Yellow_Idle, - }, - .tattle = MSG_NpcTattle_DRO_DryiteA, - }, - { - .id = NPC_DRYITE1, - .settings = &N(npcSettings_80245108), - .pos = { -380.0f, 0.0f, -15.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, - .init = &N(init_802484E0), - .yaw = 61, - .drops = { - .dropFlags = NPC_DROP_FLAGS_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, - .animations = { - ANIM_Dryite_Blue_Idle, - ANIM_Dryite_Blue_Walk, - ANIM_Dryite_Blue_Run, - ANIM_Dryite_Blue_Run, - ANIM_Dryite_Blue_Idle, - ANIM_Dryite_Blue_Idle, - ANIM_Dryite_Blue_Still, - ANIM_Dryite_Blue_Still, - ANIM_Dryite_Blue_Idle, - ANIM_Dryite_Blue_Idle, - ANIM_Dryite_Blue_Idle, - ANIM_Dryite_Blue_Idle, - ANIM_Dryite_Blue_Idle, - ANIM_Dryite_Blue_Idle, - ANIM_Dryite_Blue_Idle, - ANIM_Dryite_Blue_Idle, - }, - .tattle = MSG_NpcTattle_DRO_DryiteD, - }, - { - .id = NPC_DRYITE2, - .settings = &N(npcSettings_80245108), - .pos = { 195.0f, 0.0f, -75.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, - .init = &N(init_80248AE4), - .yaw = 74, - .drops = { - .dropFlags = NPC_DROP_FLAGS_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, - .animations = { - ANIM_Dryite_Green_Idle, - ANIM_Dryite_Green_Walk, - ANIM_Dryite_Green_Run, - ANIM_Dryite_Green_Run, - ANIM_Dryite_Green_Idle, - ANIM_Dryite_Green_Idle, - ANIM_Dryite_Green_Still, - ANIM_Dryite_Green_Still, - ANIM_Dryite_Green_Idle, - ANIM_Dryite_Green_Idle, - ANIM_Dryite_Green_Idle, - ANIM_Dryite_Green_Idle, - ANIM_Dryite_Green_Idle, - ANIM_Dryite_Green_Idle, - ANIM_Dryite_Green_Idle, - ANIM_Dryite_Green_Idle, - }, - .tattle = MSG_NpcTattle_DRO_DryiteB, - }, - { - .id = NPC_DRYITE3, - .settings = &N(npcSettings_80245108), - .pos = { 225.0f, 0.0f, -83.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, - .init = &N(init_80248CC8), - .yaw = 257, - .drops = { - .dropFlags = NPC_DROP_FLAGS_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, - .animations = { - ANIM_Dryite_Green_Idle, - ANIM_Dryite_Green_Walk, - ANIM_Dryite_Green_Run, - ANIM_Dryite_Green_Run, - ANIM_Dryite_Green_Idle, - ANIM_Dryite_Green_Idle, - ANIM_Dryite_Green_Still, - ANIM_Dryite_Green_Still, - ANIM_Dryite_Green_Idle, - ANIM_Dryite_Green_Idle, - ANIM_Dryite_Green_Idle, - ANIM_Dryite_Green_Idle, - ANIM_Dryite_Green_Idle, - ANIM_Dryite_Green_Idle, - ANIM_Dryite_Green_Idle, - ANIM_Dryite_Green_Idle, - }, - .tattle = MSG_NpcTattle_DRO_DryiteC, - }, - { - .id = NPC_ARTIST_TOAD, - .settings = &N(npcSettings_80245108), - .pos = { 285.0f, 0.0f, -274.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, - .init = &N(init_80249168), - .yaw = 271, - .drops = { - .dropFlags = NPC_DROP_FLAGS_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, - .animations = { - ANIM_Musician_Composer_Idle, - ANIM_Musician_Composer_Still, - ANIM_Musician_Composer_Still, - ANIM_Musician_Composer_Still, - ANIM_Musician_Composer_Still, - ANIM_Musician_Composer_Still, - ANIM_Musician_Composer_Still, - ANIM_Musician_Composer_Still, - ANIM_Musician_Composer_Still, - ANIM_Musician_Composer_Still, - ANIM_Musician_Composer_Still, - ANIM_Musician_Composer_Still, - ANIM_Musician_Composer_Still, - ANIM_Musician_Composer_Still, - ANIM_Musician_Composer_Still, - ANIM_Musician_Composer_Still, - }, - .tattle = MSG_NpcTattle_Composer, - }, - { - .id = NPC_MOUSER1, - .settings = &N(npcSettings_80245134), - .pos = { 31.0f, 0.0f, -374.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, - .init = &N(init_8024981C), - .yaw = 180, - .drops = { - .dropFlags = NPC_DROP_FLAGS_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, - .animations = { - ANIM_Mouser_Purple_Idle, - ANIM_Mouser_Purple_Run, - ANIM_Mouser_Purple_Run, - ANIM_Mouser_Purple_Idle, - ANIM_Mouser_Purple_Idle, - ANIM_Mouser_Purple_Idle, - ANIM_Mouser_Purple_Idle, - ANIM_Mouser_Purple_Idle, - ANIM_Mouser_Purple_Idle, - ANIM_Mouser_Purple_Idle, - ANIM_Mouser_Purple_Idle, - ANIM_Mouser_Purple_Idle, - ANIM_Mouser_Purple_Idle, - ANIM_Mouser_Purple_Idle, - ANIM_Mouser_Purple_Idle, - ANIM_Mouser_Purple_Idle, - }, - .tattle = MSG_NpcTattle_DRO_ShopOwner, - }, - { - .id = NPC_CHUCK_QUIZMO, - .settings = &N(Quizmo_NpcSettings), - .pos = { -400.0f, 0.0f, 100.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, - .initVarCount = 1, - .initVar = { .value = 0x00030200 }, - .yaw = 263, - .drops = { - .dropFlags = NPC_DROP_FLAGS_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, - .animations = { - ANIM_ChuckQuizmo_Idle, - ANIM_ChuckQuizmo_Walk, - ANIM_ChuckQuizmo_Run, - ANIM_ChuckQuizmo_Run, - ANIM_ChuckQuizmo_Idle, - ANIM_ChuckQuizmo_Idle, - ANIM_ChuckQuizmo_Still, - ANIM_ChuckQuizmo_Still, - ANIM_ChuckQuizmo_Run, - ANIM_ChuckQuizmo_Run, - ANIM_ChuckQuizmo_Run, - ANIM_ChuckQuizmo_Run, - ANIM_ChuckQuizmo_Run, - ANIM_ChuckQuizmo_Run, - ANIM_ChuckQuizmo_Run, - ANIM_ChuckQuizmo_Run, - }, - .tattle = MSG_NpcTattle_ChuckQuizmo, - }, - { - .id = NPC_DRYITE4, - .settings = &N(npcSettings_80245060), - .pos = { -120.0f, 0.0f, 134.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, - .init = &N(init_80249ABC), - .yaw = 257, - .drops = { - .dropFlags = NPC_DROP_FLAGS_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, - .territory = { .temp = { -120, 0, 134, 40, 0, -32767, 0, 0, 0, 0, 0, 0, 0, 1 }}, - .animations = { - ANIM_Dryite_Brown_Idle, - ANIM_Dryite_Brown_Walk, - ANIM_Dryite_Brown_Run, - ANIM_Dryite_Brown_Run, - ANIM_Dryite_Brown_Idle, - ANIM_Dryite_Brown_Idle, - ANIM_Dryite_Brown_Still, - ANIM_Dryite_Brown_Still, - ANIM_Dryite_Brown_Idle, - ANIM_Dryite_Brown_Idle, - ANIM_Dryite_Brown_Idle, - ANIM_Dryite_Brown_Idle, - ANIM_Dryite_Brown_Idle, - ANIM_Dryite_Brown_Idle, - ANIM_Dryite_Brown_Idle, - ANIM_Dryite_Brown_Idle, - }, - .tattle = MSG_NpcTattle_DRO_DojoGraduate, - }, - { - .id = NPC_DRYITE5, - .settings = &N(npcSettings_802450DC), - .pos = { 40.0f, 0.0f, 105.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, - .init = &N(init_80249B10), - .yaw = 270, - .drops = { - .dropFlags = NPC_DROP_FLAGS_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, - .territory = { .temp = { 2, 40, 0, 105, -30, 0, 125, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -32767, 0, 0, 0, 0, 0, 0, 1 }}, - .animations = { - ANIM_Dryite_Brown_Idle, - ANIM_Dryite_Brown_Walk, - ANIM_Dryite_Brown_Run, - ANIM_Dryite_Brown_Run, - ANIM_Dryite_Brown_Idle, - ANIM_Dryite_Brown_Idle, - ANIM_Dryite_Brown_Still, - ANIM_Dryite_Brown_Still, - ANIM_Dryite_Brown_Idle, - ANIM_Dryite_Brown_Idle, - ANIM_Dryite_Brown_Idle, - ANIM_Dryite_Brown_Idle, - ANIM_Dryite_Brown_Idle, - ANIM_Dryite_Brown_Idle, - ANIM_Dryite_Brown_Idle, - ANIM_Dryite_Brown_Idle, - }, - .tattle = MSG_NpcTattle_DRO_WorriedDryite, - }, -}; - -StaticNpc N(npcGroup_8024AE94)[] = { - { - .id = NPC_THREE_SISTERS0, - .settings = &N(npcSettings_80245160), - .pos = { -141.0f, 0.0f, -18.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, - .init = &N(init_802498C4), - .yaw = 62, - .drops = { - .dropFlags = NPC_DROP_FLAGS_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, - .animations = { - ANIM_Toadette_Pink_Idle, - ANIM_Toadette_Pink_Walk, - ANIM_Toadette_Pink_Run, - ANIM_Toadette_Pink_Run, - ANIM_Toadette_Pink_Idle, - ANIM_Toadette_Pink_Idle, - ANIM_Toadette_Pink_Disappointed, - ANIM_Toadette_Pink_Disappointed, - ANIM_Toadette_Pink_Run, - ANIM_Toadette_Pink_Run, - ANIM_Toadette_Pink_Run, - ANIM_Toadette_Pink_Run, - ANIM_Toadette_Pink_Run, - ANIM_Toadette_Pink_Run, - ANIM_Toadette_Pink_Run, - ANIM_Toadette_Pink_Run, - }, - .tattle = MSG_NpcTattle_TravelingMaidA, - }, - { - .id = NPC_THREE_SISTERS1, - .settings = &N(npcSettings_80245160), - .pos = { -124.0f, 0.0f, -61.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, - .init = &N(init_802498C4), - .yaw = 63, - .drops = { - .dropFlags = NPC_DROP_FLAGS_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, - .animations = { - ANIM_Toadette_Pink_Idle, - ANIM_Toadette_Pink_Walk, - ANIM_Toadette_Pink_Run, - ANIM_Toadette_Pink_Run, - ANIM_Toadette_Pink_Idle, - ANIM_Toadette_Pink_Idle, - ANIM_Toadette_Pink_Disappointed, - ANIM_Toadette_Pink_Disappointed, - ANIM_Toadette_Pink_Run, - ANIM_Toadette_Pink_Run, - ANIM_Toadette_Pink_Run, - ANIM_Toadette_Pink_Run, - ANIM_Toadette_Pink_Run, - ANIM_Toadette_Pink_Run, - ANIM_Toadette_Pink_Run, - ANIM_Toadette_Pink_Run, - }, - .tattle = MSG_NpcTattle_TravelingMaidB, - }, - { - .id = NPC_THREE_SISTERS2, - .settings = &N(npcSettings_80245160), - .pos = { -80.0f, 0.0f, -35.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, - .init = &N(init_802498C4), - .yaw = 244, - .drops = { - .dropFlags = NPC_DROP_FLAGS_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, - .animations = { - ANIM_Toadette_Pink_Idle, - ANIM_Toadette_Pink_Walk, - ANIM_Toadette_Pink_Run, - ANIM_Toadette_Pink_Run, - ANIM_Toadette_Pink_Idle, - ANIM_Toadette_Pink_Idle, - ANIM_Toadette_Pink_Disappointed, - ANIM_Toadette_Pink_Disappointed, - ANIM_Toadette_Pink_Run, - ANIM_Toadette_Pink_Run, - ANIM_Toadette_Pink_Run, - ANIM_Toadette_Pink_Run, - ANIM_Toadette_Pink_Run, - ANIM_Toadette_Pink_Run, - ANIM_Toadette_Pink_Run, - ANIM_Toadette_Pink_Run, - }, - .tattle = MSG_NpcTattle_TravelingMaidC, - }, -}; - -NpcGroupList N(npcGroupList_8024B464) = { - NPC_GROUP(N(npcGroup_80249B34)), - {}, -}; - -NpcGroupList N(npcGroupList_8024B47C) = { - NPC_GROUP(N(npcGroup_80249B34)), - NPC_GROUP(N(npcGroup_8024AE94)), - {}, -}; - -s32 N(intTable_8024B4A0)[] = { - MSG_Shop_0049, MSG_Shop_004A, MSG_Shop_004B, MSG_Shop_004C, - MSG_Shop_004D, MSG_Shop_004E, MSG_Shop_004F, MSG_Shop_0050, - MSG_Shop_0051, MSG_Shop_0052, MSG_Shop_0053, MSG_Shop_0054, - MSG_Shop_0055, MSG_Shop_0056, MSG_Shop_0057, MSG_Shop_0058, - MSG_Shop_0059, MSG_Shop_005A, MSG_Shop_005B, MSG_Shop_005C, - MSG_Shop_005D, MSG_Shop_005E, MSG_Shop_005F, -}; - -N(shopInventory) N(shopInventory_8024B4FC)[] = { - { ITEM_THUNDER_BOLT, 5, MSG_ItemShopDesc_ThunderBolt }, - { ITEM_DUSTY_HAMMER, 2, MSG_ItemShopDesc_DustyHammer }, - { ITEM_HONEY_SYRUP, 5, MSG_ItemShopDesc_HoneySyrup }, - { ITEM_DRIED_SHROOM, 2, MSG_ItemShopDesc_DriedShroom }, - { ITEM_DRIED_PASTA, 3, MSG_ItemShopDesc_DriedPasta }, - { ITEM_MUSHROOM, 3, MSG_ItemShopDesc_Mushroom }, - {}, -}; - -N(shopPrice) N(shopPriceList_8024B550)[] = { - { ITEM_SNOWMAN_DOLL, 12, 0x00000000 }, - { ITEM_MELON, 10, 0x00000000 }, - { ITEM_ICED_POTATO, 10, 0x00000000 }, - { ITEM_TASTY_TONIC, 5, 0x00000000 }, - { ITEM_SUPER_SODA, 6, 0x00000000 }, - { ITEM_SPECIAL_SHAKE, 15, 0x00000000 }, - { ITEM_DRIED_PASTA, 2, 0x00000000 }, - {}, -}; - -#define NAMESPACE dro_01_dup -s32** N(varStash) = NULL; -#define NAMESPACE dro_01 - -EvtScript N(8024B5B4) = { - EVT_CALL(ShowGotItem, LVar0, 1, 0) - EVT_RETURN - EVT_RETURN - EVT_END -}; - -EvtScript N(8024B5E4) = { - EVT_CALL(ShowGotItem, LVar0, 1, 16) - EVT_RETURN - EVT_RETURN - EVT_END -}; - -EvtScript N(8024B614) = { - EVT_CALL(NpcJump0, 6, -31, 0, -283, 10) - EVT_CALL(NpcJump0, 6, -30, 0, -283, 8) - EVT_RETURN - EVT_END -}; - -EvtScript N(8024B664) = { - EVT_CALL(NpcJump0, 6, 20, 0, -259, 10) - EVT_CALL(NpcJump0, 6, 20, 0, -259, 4) - EVT_RETURN - EVT_END -}; - -EvtScript N(8024B6B4) = { - EVT_CALL(N(func_80243578_95E778)) - EVT_CALL(func_802D2C14, 1) - EVT_EXEC_WAIT(N(8024B614)) - EVT_IF_LT(GB_StoryProgress, -64) - EVT_CALL(SpeakToPlayer, 6, ANIM_Mouser_Purple_Talk, ANIM_Mouser_Purple_Idle, 0, MSG_CH2_0087) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) - EVT_WAIT(10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007) - EVT_WAIT(30) - EVT_END_IF - EVT_CALL(SpeakToPlayer, 6, ANIM_Mouser_Purple_Talk, ANIM_Mouser_Purple_Idle, 0, MSG_CH2_0088) - EVT_SET(GB_StoryProgress, -64) - EVT_CALL(func_802D2C14, 0) - EVT_EXEC_WAIT(N(8024B664)) - EVT_END_IF // @bug - EVT_RETURN - EVT_END -}; - -EvtScript N(8024B7B0) = { - EVT_IF_EQ(GF_DRO01_Gift_RedJar, 0) - EVT_CALL(N(func_80243578_95E778)) - EVT_CALL(func_802D2C14, 1) - EVT_EXEC_WAIT(N(8024B614)) - EVT_CALL(SpeakToPlayer, 6, ANIM_Mouser_Purple_Talk, ANIM_Mouser_Purple_Idle, 0, MSG_CH2_008D) - EVT_SET(LVar0, 119) - EVT_SET(LVar1, 1) - EVT_EXEC_WAIT(N(8024B5B4)) - EVT_CALL(AddKeyItem, ITEM_KOOT_RED_JAR) - EVT_SET(GF_DRO01_Gift_RedJar, 1) - EVT_WAIT(20) - EVT_CALL(func_802D2C14, 0) - EVT_EXEC_WAIT(N(8024B664)) - EVT_END_IF - EVT_RETURN - EVT_END -}; - -EvtScript N(8024B894) = { - EVT_SWITCH(LVar0) - EVT_CASE_EQ(3) - EVT_CASE_EQ(4) - EVT_CASE_EQ(1) - EVT_SET(LVar2, AreaByte(4)) - EVT_SET(LVar3, AreaByte(5)) - EVT_SET(LVar4, AreaByte(6)) - EVT_SET(AreaByte(5), LVar2) - EVT_SET(AreaByte(6), LVar3) - EVT_SWITCH(LVar1) - EVT_CASE_EQ(141) - EVT_SET(AreaByte(4), 1) - EVT_IF_EQ(LVar2, 2) - EVT_IF_EQ(LVar3, 3) - EVT_IF_EQ(LVar4, 2) - EVT_EXEC_WAIT(N(8024B7B0)) - EVT_SET(AreaByte(4), 0) - EVT_END_IF - EVT_END_IF - EVT_END_IF - EVT_CASE_EQ(134) - EVT_SET(AreaByte(4), 2) - EVT_IF_EQ(LVar2, 1) - EVT_IF_LT(GB_StoryProgress, -63) - EVT_EXEC_WAIT(N(8024B6B4)) - EVT_SET(AreaByte(4), 0) - EVT_END_IF - EVT_END_IF - EVT_CASE_EQ(167) - EVT_SET(AreaByte(4), 3) - EVT_CASE_DEFAULT - EVT_SET(AreaByte(4), 0) - EVT_END_SWITCH - EVT_CASE_EQ(2) - EVT_END_SWITCH - EVT_RETURN - EVT_END -}; - -s32 N(shopItemPositions_8024BA68)[] = { - 0x004C0021, 0x004B0022, 0x00490023, 0x004A0024, 0x00480025, 0x00470026, -}; - -ShopOwner N(shopOwnerNPC_8024BA80) = { - 0x00000006, 0x00940101, 0x00940105, N(8024B894), 0x00000000, 0x00000000, N(intTable_8024B4A0), -}; - -s32 N(pad_BA9C) = { - 0x00000000, -}; - -EvtScript N(openDoor_8024BAA0) = { - EVT_CALL(RotateModel, 103, LVar0, 0, 1, 0) - EVT_RETURN - EVT_END -}; - -EvtScript N(moveWalls_8024BAD0) = { - EVT_SET(LVar1, LVar0) - EVT_DIVF(LVar1, 50) - EVT_CALL(TranslateModel, 98, 0, LVar1, 0) - EVT_CALL(TranslateModel, 97, 0, LVar1, 0) - EVT_CALL(RotateModel, 98, LVar0, 1, 0, 0) - EVT_CALL(RotateModel, 97, LVar0, 1, 0, 0) - EVT_CALL(RotateModel, 100, LVar0, -1, 0, 0) - EVT_CALL(RotateModel, 101, LVar0, -1, 0, 0) - EVT_RETURN - EVT_END -}; - -EvtScript N(dropDoor_8024BBB8) = { - EVT_SET(LVar1, LVar0) - EVT_DIVF(LVar1, 50) - EVT_CALL(TranslateModel, 103, 0, LVar1, 0) - EVT_CALL(RotateModel, 103, LVar0, 1, 0, 0) - EVT_RETURN - EVT_END -}; - -EvtScript N(openDoor_8024BC24) = { - EVT_CALL(RotateModel, 83, LVar0, 0, 1, 0) - EVT_RETURN - EVT_END -}; - -EvtScript N(moveWalls_8024BC54) = { - EVT_SET(LVar1, LVar0) - EVT_DIVF(LVar1, 50) - EVT_CALL(TranslateModel, 47, 0, LVar1, 0) - EVT_CALL(TranslateModel, 48, 0, LVar1, 0) - EVT_CALL(RotateModel, 47, LVar0, 1, 0, 0) - EVT_CALL(RotateModel, 48, LVar0, 1, 0, 0) - EVT_CALL(RotateModel, 41, LVar0, -1, 0, 0) - EVT_CALL(RotateModel, 42, LVar0, -1, 0, 0) - EVT_CALL(RotateModel, 43, LVar0, -1, 0, 0) - EVT_CALL(RotateModel, 44, LVar0, -1, 0, 0) - EVT_CALL(RotateModel, 45, LVar0, -1, 0, 0) - EVT_RETURN - EVT_END -}; - -EvtScript N(openDoor_8024BD9C) = { - EVT_CALL(RotateModel, 157, LVar0, 0, 1, 0) - EVT_RETURN - EVT_END -}; - -EvtScript N(dropDoor_8024BDCC) = { - EVT_SET(LVar1, LVar0) - EVT_DIV(LVar1, 45) - EVT_CALL(TranslateModel, 157, 0, LVar1, 0) - EVT_CALL(RotateModel, 157, LVar0, 1, 0, 0) - EVT_RETURN - EVT_END -}; - -EvtScript N(moveWalls_8024BE38) = { - EVT_IF_EQ(LVar0, 90) - EVT_CALL(EnableModel, 142, 0) - EVT_ELSE - EVT_CALL(EnableModel, 142, 1) - EVT_END_IF - EVT_SET(LVar1, LVar0) - EVT_DIV(LVar1, 45) - EVT_SET(LVar2, LVar0) - EVT_SUB(LVar2, -90) - EVT_DIV(LVar2, -90) - EVT_CALL(TranslateModel, 140, 0, LVar1, 0) - EVT_CALL(RotateModel, 140, LVar0, 1, 0, 0) - EVT_CALL(RotateModel, 138, LVar0, -1, 0, 0) - EVT_CALL(RotateModel, 137, LVar0, -1, 0, 0) - EVT_CALL(RotateModel, 136, LVar0, -1, 0, 0) - EVT_CALL(RotateModel, 135, LVar0, -1, 0, 0) - EVT_CALL(RotateModel, 143, LVar0, 1, 0, 0) - EVT_CALL(RotateModel, 142, LVar0, 1, 0, 0) - EVT_RETURN - EVT_END -}; - -EvtScript N(toggleVis_8024BFDC) = { - EVT_SWITCH(LVar0) - EVT_CASE_EQ(0) - EVT_CALL(SetGroupEnabled, 127, 1) - EVT_CASE_EQ(3) - EVT_CALL(SetGroupEnabled, 127, 0) - EVT_END_SWITCH - EVT_RETURN - EVT_END -}; - -EvtScript N(toggleVis_8024C040) = { - EVT_SWITCH(LVar0) - EVT_CASE_EQ(0) - EVT_SWITCH(GB_StoryProgress) - EVT_CASE_LT(-66) - EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_017B, 160, 40) - EVT_SET(LVar0, -1) - EVT_RETURN - EVT_CASE_LT(-65) - EVT_SET(LVar0, -1) - EVT_RETURN - EVT_END_SWITCH - EVT_CALL(SetGroupEnabled, 82, 1) - EVT_CASE_EQ(2) - EVT_THREAD - EVT_WAIT(45) - EVT_CALL(SetNpcPos, 6, 33, 0, -375) - EVT_CALL(SetNpcYaw, 6, 180) - EVT_END_THREAD - EVT_CASE_EQ(3) - EVT_CALL(SetGroupEnabled, 82, 0) - EVT_SET(AreaByte(4), 0) - EVT_SET(AreaByte(5), 0) - EVT_END_SWITCH - EVT_RETURN - EVT_END -}; - -EvtScript N(toggleVis_8024C190) = { - EVT_SWITCH(LVar0) - EVT_CASE_EQ(0) - EVT_CALL(SetGroupEnabled, 156, 1) - EVT_CASE_EQ(2) - EVT_CASE_EQ(3) - EVT_CALL(SetGroupEnabled, 156, 0) - EVT_END_SWITCH - EVT_RETURN - EVT_END -}; - -s32 N(npcList_8024C200)[] = { - 0x00000002, 0xFFFFFFFF, -}; - -s32 N(npcList_8024C208)[] = { - 0x00000006, 0xFFFFFFFF, -}; - -s32 N(npcList_8024C210)[] = { - 0x00000005, 0xFFFFFFFF, -}; - -EvtScript N(8024C218) = { - EVT_CALL(MakeDoorAdvanced, 5, EVT_PTR(N(openDoor_8024BAA0)), EVT_PTR(N(moveWalls_8024BAD0)), EVT_PTR(N(dropDoor_8024BBB8)), EVT_PTR(N(toggleVis_8024BFDC)), 15, 16, 128, EVT_PTR(N(npcList_8024C200))) - EVT_CALL(MakeDoorAdvanced, 5, EVT_PTR(N(openDoor_8024BC24)), EVT_PTR(N(moveWalls_8024BC54)), 0, EVT_PTR(N(toggleVis_8024C040)), 23, 24, 91, EVT_PTR(N(npcList_8024C208))) - EVT_CALL(MakeDoorAdvanced, 5, EVT_PTR(N(openDoor_8024BD9C)), EVT_PTR(N(moveWalls_8024BE38)), EVT_PTR(N(dropDoor_8024BDCC)), EVT_PTR(N(toggleVis_8024C190)), 29, 30, 159, EVT_PTR(N(npcList_8024C210))) - EVT_SET(LVar0, 3) - EVT_EXEC(N(toggleVis_8024BFDC)) - EVT_EXEC(N(toggleVis_8024C040)) - EVT_EXEC(N(toggleVis_8024C190)) - EVT_RETURN - EVT_END -}; - -EvtScript N(8024C2EC) = { - EVT_LABEL(9) - EVT_CALL(MakeLerp, 10, -10, 30, 10) - EVT_LABEL(10) - EVT_CALL(UpdateLerp) - EVT_CALL(RotateModel, 34, LVar0, 1, 0, 0) - EVT_WAIT(1) - EVT_IF_EQ(LVar1, 1) - EVT_GOTO(10) - EVT_END_IF - EVT_CALL(MakeLerp, -10, 10, 30, 10) - EVT_LABEL(11) - EVT_CALL(UpdateLerp) - EVT_CALL(RotateModel, 34, LVar0, 1, 0, 0) - EVT_WAIT(1) - EVT_IF_EQ(LVar1, 1) - EVT_GOTO(11) - EVT_END_IF - EVT_GOTO(9) - EVT_RETURN - EVT_END -}; - -EvtScript N(8024C41C) = { - EVT_CALL(SetGroupEnabled, 82, 1) - EVT_CALL(PlaySoundAtCollider, 23, 449, 0) - EVT_CALL(MakeLerp, 0, 100, 15, 4) - EVT_LABEL(10) - EVT_CALL(UpdateLerp) - EVT_EXEC(N(openDoor_8024BC24)) - EVT_WAIT(1) - EVT_IF_EQ(LVar1, 1) - EVT_GOTO(10) - EVT_END_IF - EVT_RETURN - EVT_END -}; - -EvtScript N(8024C4C8) = { - EVT_CALL(MakeLerp, 100, 0, 15, 4) - EVT_LABEL(10) - EVT_CALL(UpdateLerp) - EVT_EXEC(N(openDoor_8024BC24)) - EVT_WAIT(1) - EVT_IF_EQ(LVar1, 1) - EVT_GOTO(10) - EVT_END_IF - EVT_CALL(PlaySoundAtCollider, 23, 450, 0) - EVT_CALL(SetGroupEnabled, 82, 0) - EVT_RETURN - EVT_END -}; - -s32 N(pad_C574)[] = { - 0x00000000, 0x00000000, 0x00000000, -}; - -EvtScript N(8024C580) = { - EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(DisablePlayerPhysics, TRUE) - EVT_CALL(DisablePartnerAI, 0) - EVT_CALL(HidePlayerShadow, TRUE) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_StandStill) - EVT_CALL(GetCurrentPartnerID, LVar0) - EVT_IF_NE(LVar0, 0) - EVT_CALL(EnableNpcShadow, NPC_PARTNER, FALSE) - EVT_CALL(SetNpcPos, NPC_PARTNER, 0, -1000, 0) - EVT_END_IF - EVT_CALL(GetEntryID, LVar0) - EVT_CALL(N(dup_Pipe_GetEntryPos)) - EVT_SUB(LVar2, 40) - EVT_CALL(SetPlayerPos, LVar1, LVar2, LVar3) - EVT_CALL(InterpPlayerYaw, LVar4, 0) - EVT_CALL(PlaySound, 355) - EVT_CALL(func_802D286C, 256) - EVT_CALL(func_802D2520, ANIM_Mario_StandStill, 5, 2, 1, 1, 0) - EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) - EVT_LOOP(40) - EVT_ADD(LVar1, 1) - EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) - EVT_WAIT(1) - EVT_END_LOOP - EVT_WAIT(3) - EVT_CALL(GetCurrentPartnerID, LVar0) - EVT_IF_NE(LVar0, 0) - EVT_THREAD - EVT_CALL(DisablePartnerAI, 0) - EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) - EVT_SUB(LVar2, 3) - EVT_CALL(SetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, ((NPC_FLAG_2)), FALSE) - EVT_CALL(EnablePartnerAI) - EVT_CALL(EnableNpcShadow, NPC_PARTNER, TRUE) - EVT_END_THREAD - EVT_END_IF - EVT_WAIT(2) - EVT_CALL(func_802D2520, ANIM_Mario_StandStill, 0, 0, 0, 0, 0) - EVT_WAIT(1) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) - EVT_CALL(DisablePlayerPhysics, FALSE) - EVT_CALL(DisablePlayerInput, FALSE) - EVT_CALL(HidePlayerShadow, FALSE) - EVT_LABEL(0) - EVT_CALL(N(dup_Pipe_GetCurrentFloor)) - EVT_WAIT(1) - EVT_IF_NE(LVar0, -1) - EVT_GOTO(0) - EVT_END_IF - EVT_EXEC(LVarA) - EVT_RETURN - EVT_END -}; - -EvtScript N(8024C8D4) = { - EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(DisablePlayerPhysics, TRUE) - EVT_CALL(HidePlayerShadow, TRUE) - EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, LVarB, 0x7FFFFE00) - EVT_CALL(GetEntryID, LVar0) - EVT_CALL(N(dup_Pipe_GetEntryPos)) - EVT_SET(LVar5, LVar1) - EVT_SET(LVar6, LVar2) - EVT_SET(LVar7, LVar3) - EVT_ADD(LVar2, 2) - EVT_CALL(SetPlayerPos, LVar1, LVar2, LVar3) - EVT_CALL(InterpPlayerYaw, LVar4, 0) - EVT_IF_EQ(LVar4, 90) - EVT_ADD(LVar5, 40) - EVT_ELSE - EVT_SUB(LVar5, 40) - EVT_END_IF - EVT_CALL(UseSettingsFrom, 0, LVar5, LVar6, LVar7) - EVT_CALL(SetPanTarget, 0, LVar5, LVar6, LVar7) - EVT_CALL(SetCamSpeed, 0, EVT_FLOAT(90.0)) - EVT_CALL(PanToTarget, 0, 0, 1) - EVT_CALL(GetCurrentPartnerID, LVar0) - EVT_IF_NE(LVar0, 0) - EVT_CALL(DisablePartnerAI, 0) - EVT_CALL(EnableNpcShadow, NPC_PARTNER, FALSE) - EVT_CALL(SetNpcPos, NPC_PARTNER, 0, -1000, 0) - EVT_CALL(InterpNpcYaw, NPC_PARTNER, LVar0, 0) - EVT_END_IF - EVT_WAIT(1) - EVT_CALL(PlaySound, 355) - EVT_THREAD - EVT_WAIT(25) - EVT_CALL(HidePlayerShadow, FALSE) - EVT_END_THREAD - EVT_CALL(func_802D286C, 2304) - EVT_CALL(func_802D2520, ANIM_Mario_10002, 5, 3, 1, 1, 0) - EVT_LOOP(40) - EVT_CALL(N(dup_Pipe_GetPointAheadOfPlayer), EVT_FLOAT(1.0)) - EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) - EVT_WAIT(1) - EVT_END_LOOP - EVT_CALL(GetCurrentPartnerID, LVar0) - EVT_IF_NE(LVar0, 0) - EVT_THREAD - EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) - EVT_SUB(LVar2, 3) - EVT_CALL(SetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(EnableNpcShadow, NPC_PARTNER, TRUE) - EVT_CALL(EnablePartnerAI) - EVT_END_THREAD - EVT_END_IF - EVT_WAIT(5) - EVT_CALL(func_802D2520, ANIM_Mario_10002, 0, 0, 0, 0, 0) - EVT_CALL(ModifyColliderFlags, 1, LVarB, 0x7FFFFE00) - EVT_CALL(DisablePlayerInput, FALSE) - EVT_CALL(DisablePlayerPhysics, FALSE) - EVT_CALL(PanToTarget, 0, 0, 0) - EVT_EXEC(LVarA) - EVT_RETURN - EVT_END -}; - -EvtScript N(8024CCC4) = { - EVT_CALL(N(dup_Pipe_AwaitDownInput)) - EVT_IF_EQ(LVar0, 0) - EVT_RETURN - EVT_END_IF - EVT_CALL(GetCurrentPartner, LVar0) - EVT_IF_NE(LVar0, 0) - EVT_CALL(GetCurrentPartnerID, LVar1) - EVT_IF_NE(LVar1, 6) - EVT_RETURN - EVT_ELSE - EVT_CALL(InterruptUsePartner) - EVT_CALL(DisablePlayerInput, TRUE) - EVT_END_IF - EVT_ELSE - EVT_CALL(DisablePlayerInput, TRUE) - EVT_END_IF - EVT_EXEC_WAIT(N(8024CDA0)) - EVT_RETURN - EVT_END -}; - -EvtScript N(8024CDA0) = { - EVT_CALL(N(dup_Pipe_SetAnimFlag)) - EVT_SET_GROUP(EVT_GROUP_1B) - EVT_CALL(DisablePlayerPhysics, TRUE) - EVT_CALL(HidePlayerShadow, TRUE) - EVT_SET(LVar0, LVarA) - EVT_CALL(N(dup_Pipe_GetEntryPos)) - EVT_CALL(PlayerMoveTo, LVar1, LVar3, 3) - EVT_SET(LVar0, LVarA) - EVT_CALL(N(dup_Pipe_GetEntryPos)) - EVT_CALL(SetPlayerPos, LVar1, LVar2, LVar3) - EVT_CALL(SetPlayerFlagBits, 2097152, 1) - EVT_CALL(N(dup_Pipe_GetCameraYaw)) - EVT_CALL(InterpPlayerYaw, LVar0, 0) - EVT_WAIT(2) - EVT_CALL(SetPlayerFlagBits, 2097152, 0) - EVT_CALL(PlaySound, 355) - EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) - EVT_THREAD - EVT_WAIT(4) - EVT_LOOP(40) - EVT_SUB(LVar1, 1) - EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) - EVT_WAIT(1) - EVT_END_LOOP - EVT_END_THREAD - EVT_CALL(func_802D286C, 2048) - EVT_CALL(func_802D2520, ANIM_Mario_10002, 5, 2, 1, 1, 0) - EVT_WAIT(25) - EVT_EXEC_WAIT(LVarC) - EVT_RETURN - EVT_END -}; - -EvtScript N(8024CF7C) = { - EVT_CALL(IsPlayerOnValidFloor, LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_RETURN - EVT_END_IF - EVT_CALL(GetPlayerActionState, LVar0) - EVT_IF_EQ(LVar0, 26) - EVT_RETURN - EVT_END_IF - EVT_CALL(GetCurrentPartner, LVar0) - EVT_IF_NE(LVar0, 0) - EVT_CALL(GetCurrentPartnerID, LVar1) - EVT_IF_NE(LVar1, 6) - EVT_RETURN - EVT_ELSE - EVT_CALL(InterruptUsePartner) - EVT_CALL(DisablePlayerInput, TRUE) - EVT_END_IF - EVT_ELSE - EVT_CALL(DisablePlayerInput, TRUE) - EVT_END_IF - EVT_SET_GROUP(EVT_GROUP_1B) - EVT_CALL(N(dup_Pipe_SetAnimFlag)) - EVT_CALL(DisablePlayerPhysics, TRUE) - EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, LVarB, 0x7FFFFE00) - EVT_SET(LVar0, LVarA) - EVT_CALL(N(dup_Pipe_GetEntryPos)) - EVT_SET(LVar5, LVar1) - EVT_SET(LVar6, LVar2) - EVT_ADD(LVar6, 2) - EVT_SET(LVar7, LVar3) - EVT_SET(LVar8, LVar4) - EVT_ADD(LVar8, 180) - EVT_IF_GE(LVar4, 360) - EVT_SUB(LVar4, 360) - EVT_END_IF - EVT_CALL(InterpPlayerYaw, LVar8, 1) - EVT_WAIT(1) - EVT_CALL(PlaySound, 355) - EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) - EVT_CALL(SetPlayerPos, LVar0, LVar6, LVar7) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_StandStill) - EVT_CALL(func_802D286C, 2048) - EVT_CALL(func_802D2520, ANIM_Mario_StandStill, 5, 3, 1, 1, 0) - EVT_THREAD - EVT_WAIT(8) - EVT_CALL(HidePlayerShadow, TRUE) - EVT_END_THREAD - EVT_THREAD - EVT_WAIT(3) - EVT_LOOP(40) - EVT_CALL(N(dup_Pipe_GetPointAheadOfPlayer), EVT_FLOAT(1.0)) - EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) - EVT_WAIT(1) - EVT_END_LOOP - EVT_END_THREAD - EVT_WAIT(25) - EVT_EXEC_WAIT(LVarC) - EVT_RETURN - EVT_END -}; - -extern const char N(dro_01_name_hack)[]; - -EvtScript N(8024D2B0) = { - EVT_SET(GF_DRO01_HeardHintAboutSpinningRoof, 0) - EVT_CALL(GotoMap, EVT_PTR(N(dro_01_name_hack)), 4) - EVT_WAIT(100) - EVT_RETURN - EVT_END -}; - -EvtScript N(makeEntities) = { - EVT_CALL(MakeEntity, EVT_PTR(Entity_SavePoint), -211, 60, -50, 30, MAKE_ENTITY_END) - EVT_IF_EQ(GF_DRO01_WarpPipe, 0) - EVT_IF_EQ(GF_TIK01_WarpPipes, 1) - EVT_CALL(GetEntryID, LVar0) - EVT_IF_NE(LVar0, 2) - EVT_SET(GF_DRO01_WarpPipe, 1) - EVT_END_IF - EVT_END_IF - EVT_END_IF - EVT_CALL(MakeEntity, &Entity_BlueWarpPipe, 430, 0, -120, 0, 2, EVT_PTR(N(8024D2B0)), 1939, MAKE_ENTITY_END) - EVT_RETURN - EVT_END -}; - -#include "world/common/enemy/ai/PatrolNoAttackAI.inc.c" - -#include "world/common/atomic/Quizmo.inc.c" - -#include "world/common/todo/GetNpcCollisionHeight.inc.c" - -#include "world/common/todo/AddPlayerHandsOffset.inc.c" - -ApiStatus N(func_80242730_95D930)(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32* ptr; - - if (isInitialCall) { - ptr = &N(D_802477E0_9629E0); - *ptr = 0; - } - - ptr = &N(D_802477E0_9629E0); - if (*ptr != NULL) { - ptr = &N(D_802477E0_9629E0); - *ptr = 0; - evt_set_variable(script, *args++, N(D_802477E4_9629E4)); - return ApiStatus_DONE2; - } - - return ApiStatus_BLOCK; -} - -ApiStatus N(func_80242784_95D984)(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - - N(D_802477E4_9629E4) = evt_get_variable(script, *args++); - N(D_802477E0_9629E0) = 1; - return ApiStatus_DONE2; -} - -#include "world/common/atomic/MakeKeyChoice.inc.c" - -ApiStatus N(func_80242858_95DA58)(Evt* script, s32 isInitialCall) { - PlayerStatus* playerStatus = &gPlayerStatus; - Unk_Struct_2* temp_s1 = (Unk_Struct_2*) evt_get_variable(script, *script->ptrReadPos); - Unk_Struct_1* ptr; - s32 atan_res1, atan_res2; - s32 clamp; - s32 res; - - if (isInitialCall) { - script->functionTempPtr[1] = heap_malloc(0x3C); - ptr = script->functionTempPtr[1]; - ptr->unk_00 = temp_s1->unk_00; - ptr->unk_04 = temp_s1->unk_04; - ptr->unk_08 = temp_s1->unk_08; - ptr->unk_0C = temp_s1->unk_0C; - ptr->unk_10 = temp_s1->unk_10; - ptr->unk_14 = temp_s1->unk_14; - ptr->unk_18 = 0; - ptr->unk_1C = 0; - ptr->unk_20 = 0; - ptr->unk_24 = 0; - ptr->unk_28 = 0; - ptr->unk_2C = 0; - ptr->unk_30 = 0; - ptr->unk_34 = 0; - ptr->unk_38 = 0; - } - - ptr = script->functionTempPtr[1]; - switch (ptr->unk_20) { - case 0: - res = get_xz_dist_to_player(ptr->unk_00, ptr->unk_08); - if (res < ptr->unk_0C) { - ptr->unk_24 = playerStatus->position.x; - ptr->unk_28 = playerStatus->position.z; - ptr->unk_20++; - } - break; - - case 1: - res = get_xz_dist_to_player(ptr->unk_00, ptr->unk_08); - if (res < ptr->unk_0C) { - atan_res1 = atan2(ptr->unk_00, ptr->unk_08, ptr->unk_24, ptr->unk_28); - atan_res2 = atan2(ptr->unk_00, ptr->unk_08, playerStatus->position.x, playerStatus->position.z); - clamp = get_clamped_angle_diff(atan_res1, atan_res2); - ptr->unk_34 = signF(clamp); - ptr->unk_20++; - break; - } - ptr->unk_20 = 0; - break; - - case 2: - res = get_xz_dist_to_player(ptr->unk_00, ptr->unk_08); - if (res < ptr->unk_0C) { - atan_res1 = atan2(ptr->unk_00, ptr->unk_08, ptr->unk_2C, ptr->unk_30); - atan_res2 = atan2(ptr->unk_00, ptr->unk_08, playerStatus->position.x, playerStatus->position.z); - clamp = get_clamped_angle_diff(atan_res1, atan_res2); - if (ptr->unk_34 == signF(clamp)) { - atan_res1 = atan2(ptr->unk_00, ptr->unk_08, ptr->unk_24, ptr->unk_28); - atan_res2 = atan2(ptr->unk_00, ptr->unk_08, playerStatus->position.x, playerStatus->position.z); - clamp = get_clamped_angle_diff(atan_res1, atan_res2); - if (fabsf(clamp) > 90.0f) { - if (ptr->unk_14 != NULL) { - ptr->unk_14(ptr, 0); - } - ptr->unk_18 = ptr->unk_18 + fabsf(clamp); - ptr->unk_20++; - } - break; - } - } - ptr->unk_20 = 0; - break; - - case 3: - res = get_xz_dist_to_player(ptr->unk_00, ptr->unk_08); - if (res < ptr->unk_10) { - atan_res1 = atan2(ptr->unk_00, ptr->unk_08, ptr->unk_2C, ptr->unk_30); - atan_res2 = atan2(ptr->unk_00, ptr->unk_08, playerStatus->position.x, playerStatus->position.z); - clamp = get_clamped_angle_diff(atan_res1, atan_res2); - if (ptr->unk_34 != signF(clamp)) { - if (ptr->unk_14 != NULL) { - ptr->unk_14(ptr, 3); - } - ptr->unk_20++; - } else { - ptr->unk_18 = ptr->unk_18 + fabsf(clamp); - ptr->unk_1C = ptr->unk_18 / 360; - if (ptr->unk_1C != ptr->unk_38) { - if (ptr->unk_14 != NULL) { - ptr->unk_14(ptr, 1); - } - ptr->unk_38 = ptr->unk_1C; - } - } - if (ptr->unk_14 != NULL) { - ptr->unk_14(ptr, 2); - } - } else { - if (ptr->unk_14 != NULL) { - ptr->unk_14(ptr, 4); - } - ptr->unk_20++; - } - break; - - case 4: - ptr->unk_18 = 0.0f; - ptr->unk_1C = 0; - ptr->unk_38 = 0; - ptr->unk_20 = 0; - break; - } - - ptr->unk_2C = playerStatus->position.x; - ptr->unk_30 = playerStatus->position.z; - - return ApiStatus_BLOCK; -} - -#include "world/common/todo/LetterDelivery.inc.c" - -ApiStatus N(func_80243084_95E284)(Evt* script, s32 isInitialCall) { - PlayerData* playerData = &gPlayerData; - - playerData->droTreeOrbitTime = playerData->frameCounter; - return ApiStatus_DONE2; -} - -#include "world/common/todo/GetFloorCollider.inc.c" - -void N(func_802430C8_95E2C8)(Unk_Struct_1* ptr, s32 arg1) { - PlayerStatus* playerStatus = &gPlayerStatus; - - switch (arg1) { - case 2: - if (ptr->unk_1C >= 6) { - if (fabsf(get_clamped_angle_diff(atan2(125.0f, -42.0f, 152.0f, -61.0f), atan2(125.0f, -42.0f, playerStatus->position.x, - playerStatus->position.z))) < 30.0f) { - start_script(&N(80248504), EVT_PRIORITY_1, 0); - ptr->unk_20 = 4; - } - } - break; - - case 0: - case 1: - case 3: - case 4: - break; - } -} - -ApiStatus N(func_802431B4_95E3B4)(Evt* script, s32 isInitialCall) { - PlayerData* playerData = &gPlayerData; - s32 val = (playerData->frameCounter - playerData->droTreeOrbitTime) / 3600; - - if (val < 30) { - script->varTable[0] = 1; - } else { - script->varTable[0] = 0; - } - - return ApiStatus_DONE2; -} - -ApiStatus N(func_802431FC_95E3FC)(Evt* script, s32 isInitialCall) { - PlayerStatus* playerStatus = &gPlayerStatus; - Npc* npc = get_npc_safe(script->owner2.npcID); - s32 rand; - f32 temp_f22; - f32 temp_f24; - - temp_f24 = atan2(183.0f, -75.0f, playerStatus->position.x, playerStatus->position.z); - temp_f22 = atan2(183.0f, -75.0f, npc->pos.x, npc->pos.z); - temp_f24 = get_clamped_angle_diff(temp_f22, temp_f24); - rand = rand_int(10) + 30; - if (temp_f24 < 0.0f) { - temp_f22 += rand; - } else { - temp_f22 -= rand; - } - rand = rand_int(20) + 30; - script->varTable[0] = (sin_deg(temp_f22) * rand) + 183.0f; - script->varTable[1] = -75.0f - (cos_deg(temp_f22) * rand); - - return ApiStatus_DONE2; -} - -ApiStatus N(func_80243350_95E550)(Evt* script, s32 isInitialCall) { - PlayerStatus* playerStatus = &gPlayerStatus; - Bytecode* args = script->ptrReadPos; - f32 var1 = evt_get_variable(script, *args++); - f32 var2 = evt_get_variable(script, *args++); - f32 var3 = evt_get_variable(script, *args++); - f32 var4 = evt_get_variable(script, *args++); - f32 temp_f0 = (var4 - var2) / (var3 - var1); - - if (playerStatus->position.z < ((temp_f0 * playerStatus->position.x) + (var2 - (temp_f0 * var1)))) { - script->varTable[0] = 0; - return ApiStatus_DONE2; - } - - script->varTable[0] = 1; - return ApiStatus_BLOCK; -} - -const s32 N(pad_XXX)[] = { 0 }; - -const char N(dro_01_name_hack)[] = "tik_01"; diff --git a/src/world/area_dro/dro_01/95E660.c b/src/world/area_dro/dro_01/95E660.c deleted file mode 100644 index 7f50ea0477..0000000000 --- a/src/world/area_dro/dro_01/95E660.c +++ /dev/null @@ -1,14 +0,0 @@ -#include "dro_01.h" - -#define NAMESPACE dro_01_dup -#include "world/common/todo/StashVars.inc.c" -#define NAMESPACE dro_01 - -#define NAMESPACE dro_01_dup -#include "world/common/todo/GetItemName.inc.c" -#define NAMESPACE dro_01 - -ApiStatus N(func_80243578_95E778)(Evt* script, s32 isInitialCall) { - hide_coin_counter_immediately(); - return ApiStatus_DONE2; -} diff --git a/src/world/area_dro/dro_01/95E7A0.c b/src/world/area_dro/dro_01/95E7A0.c deleted file mode 100644 index 5633e64284..0000000000 --- a/src/world/area_dro/dro_01/95E7A0.c +++ /dev/null @@ -1,45 +0,0 @@ -#include "dro_01.h" - -#define NAMESPACE dro_01_dup -#include "world/common/entity/Pipe.inc.c" -#define NAMESPACE dro_01 - -#include "common/foliage.inc.c" - -FoliageModelList N(tree1_Leaves) = { - .count = 1, - .models = { 13 } -}; - -FoliageModelList N(tree1_Trunk) = { - .count = 1, - .models = { 14 } -}; - -FoliageDropList N(tree1_Drops) = { - .count = 1, - .drops = { - { - .itemID = ITEM_COIN, - .pos = { 120, 92, -18 }, - .spawnMode = 0xF, - .pickupFlag = GF_DRO01_Tree1_Coin, - }, - } -}; - -ShakeTreeConfig N(tree1) = { - .leaves = &N(tree1_Leaves), - .trunk = &N(tree1_Trunk), - .drops = &N(tree1_Drops), -}; - -Vec4f N(triggerCoord_8024DD68) = { 120.0f, 0.0f, -43.0f, 0.0f }; - -EvtScript N(8024DD78) = { - EVT_SET(LVar0, EVT_PTR(N(tree1))) - EVT_BIND_TRIGGER(N(shakeTree), TRIGGER_WALL_HAMMER, 11, 1, 0) - EVT_BIND_TRIGGER(N(shakeTree), TRIGGER_POINT_BOMB, EVT_PTR(N(triggerCoord_8024DD68)), 1, 0) - EVT_RETURN - EVT_END -}; diff --git a/src/world/area_dro/dro_01/dro_01.h b/src/world/area_dro/dro_01/dro_01.h index 1a2fdbda95..1935c8b868 100644 --- a/src/world/area_dro/dro_01/dro_01.h +++ b/src/world/area_dro/dro_01/dro_01.h @@ -1,90 +1,68 @@ +#ifndef _DRO_01_H_ +#define _DRO_01_H_ + /// @file dro_01.h /// @brief Dry Dry Outpost - Outpost 1 #include "common.h" -#include "../dro.h" #include "message_ids.h" #include "map.h" +#include "../dro.h" +#include "mapfs/dro_01_shape.h" +#include "mapfs/dro_01_hit.h" + +#include "sprite/npc/ChuckQuizmo.h" +#include "sprite/npc/WorldParakarry.h" +#include "sprite/npc/Mouser.h" +#include "sprite/npc/Dryite.h" +#include "sprite/npc/Musician.h" +#include "sprite/npc/Toadette.h" + +enum { + NPC_Mouser_01 = 0, + NPC_Dryite_01 = 1, + NPC_Dryite_02 = 2, + NPC_Dryite_03 = 3, + NPC_Dryite_04 = 4, + NPC_ArtistToad = 5, + NPC_Mouser_ShopOwner = 6, + NPC_ThreeSisters_01 = 7, + NPC_ThreeSisters_02 = 8, + NPC_ThreeSisters_03 = 9, + NPC_ChuckQuizmo = 10, + NPC_Dryite_05 = 11, + NPC_Dryite_06 = 12, +}; + #define NAMESPACE dro_01 -typedef struct { - u32 itemID; - u32 buyPrice; - u32 descriptionID; -} N(shopInventory); +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(DefaultNPCs); +extern NpcGroupList N(Chapter3NPCs); -typedef struct { - u32 itemID; - u32 sellPrice; - u32 unk_08; -} N(shopPrice); +extern EvtScript N(EVS_SetupBuildings); +extern EvtScript N(EVS_SwingSign_Shop); +extern EvtScript N(EVS_OpenShopDoor); +extern EvtScript N(EVS_CloseShopDoor); -ApiStatus N(Quizmo_GetCamVfov)(Evt* script, s32 isInitialCall); -ApiStatus N(Quizmo_ShouldQuizmoLeave)(Evt* script, s32 isInitialCall); -ApiStatus N(Quizmo_NPC_Aux_Impl)(Evt* script, s32 isInitialCall); -ApiStatus N(Quizmo_ShowEntities)(Evt* script, s32 isInitialCall); -ApiStatus N(Quizmo_HideEntities)(Evt* script, s32 isInitialCall); -ApiStatus N(Quizmo_SetCamVfov)(Evt* script, s32 isInitialCall); -ApiStatus N(LetterDelivery_Init)(Evt* script, s32 isInitialCall); -ApiStatus N(TransformFoliage)(Evt* script, s32 isInitialCall); -ApiStatus N(AddPlayerHandsOffset)(Evt* script, s32 isInitialCall); -ApiStatus N(Quizmo_HideWorld)(Evt* script, s32 isInitialCall); -ApiStatus N(Quizmo_AddViewRelativeOffset)(Evt* script, s32 isInitialCall); -ApiStatus N(Quizmo_UpdatePartnerPosition)(Evt* script, s32 isInitialCall); -ApiStatus N(Quizmo_SpinPartner)(Evt* script, s32 isInitialCall); -ApiStatus N(Quizmo_SpinPlayer)(Evt* script, s32 isInitialCall); -ApiStatus N(LetterDelivery_CalcLetterPos)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkFunc27)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkFunc26)(Evt* script, s32 isInitialCall); -ApiStatus N(PatrolNoAttackAI_Main)(Evt* script, s32 isInitialCall); -ApiStatus N(Quizmo_ShouldAppear)(Evt* script, s32 isInitialCall); -ApiStatus N(Quizmo_RenderInit)(Evt* script, s32 isInitialCall); -ApiStatus N(Quizmo_FadeInWorld)(Evt* script, s32 isInitialCall); -ApiStatus N(Quizmo_UpdateRecords)(Evt* script, s32 isInitialCall); -ApiStatus N(Quizmo_CreateStage)(Evt* script, s32 isInitialCall); -ApiStatus N(Quizmo_DestroyEffects)(Evt* script, s32 isInitialCall); -ApiStatus N(Quizmo_SetStageLightsDelay)(Evt* script, s32 isInitialCall); -ApiStatus N(Quizmo_UnkStageEffectMode)(Evt* script, s32 isInitialCall); -ApiStatus N(Quizmo_SetVannaAnim_Idle)(Evt* script, s32 isInitialCall); -ApiStatus N(Quizmo_SetVannaAnim_Clap)(Evt* script, s32 isInitialCall); -ApiStatus N(Quizmo_SetVannaAnim_Wave)(Evt* script, s32 isInitialCall); -ApiStatus N(Quizmo_CreateWorker)(Evt* script, s32 isInitialCall); -ApiStatus N(func_80242730_95D930)(Evt* script, s32 isInitialCall); -ApiStatus N(func_80242784_95D984)(Evt* script, s32 isInitialCall); -ApiStatus N(BuildKeyItemChoiceList)(Evt* script, s32 isInitialCall); -ApiStatus N(func_80242858_95DA58)(Evt* script, s32 isInitialCall); -ApiStatus N(LetterDelivery_SaveNpcAnim)(Evt* script, s32 isInitialCall); -ApiStatus N(LetterDelivery_RestoreNpcAnim)(Evt* script, s32 isInitialCall); -ApiStatus N(func_80243084_95E284)(Evt* script, s32 isInitialCall); -ApiStatus N(GetFloorCollider)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802431B4_95E3B4)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802431FC_95E3FC)(Evt* script, s32 isInitialCall); -ApiStatus N(func_80243350_95E550)(Evt* script, s32 isInitialCall); -ApiStatus N(func_80243578_95E778)(Evt* script, s32 isInitialCall); -ApiStatus N(dup_Pipe_AwaitDownInput)(Evt* script, s32 isInitialCall); -ApiStatus N(dup_Pipe_GetCameraYaw)(Evt* script, s32 isInitialCall); -ApiStatus N(dup_Pipe_GetCurrentFloor)(Evt* script, s32 isInitialCall); -ApiStatus N(dup_Pipe_GetEntryPos)(Evt* script, s32 isInitialCall); -ApiStatus N(dup_Pipe_SetAnimFlag)(Evt* script, s32 isInitialCall); -ApiStatus N(dup_Pipe_GetPointAheadOfPlayer)(Evt* script, s32 isInitialCall); +extern ShopItemData N(Shop_Inventory)[]; +extern ShopSellPriceData N(Shop_PriceList)[]; +extern ShopItemLocation N(Shop_ItemPositions)[]; +extern ShopOwner N(Shop_Owner); + +extern EvtScript ItemShopInteract; -extern s32** N(varStash); -extern N(shopInventory) N(shopInventory_8024B4FC)[]; -extern N(shopPrice) N(shopPriceList_8024B550)[]; -extern NpcGroupList N(npcGroupList_8024B464); -extern NpcGroupList N(npcGroupList_8024B47C); extern EvtScript N(80244450); -extern EvtScript N(8024C218); -extern EvtScript N(8024C2EC); -extern EvtScript N(8024C41C); -extern EvtScript N(8024C4C8); + extern EvtScript N(8024CDA0); -extern EvtScript N(8024DD78); +extern EvtScript N(EVS_SetupFoliage); extern EvtScript N(main); extern EvtScript N(makeEntities); -extern EvtScript N(shopItemPositions_8024BA68); -extern ShopOwner N(shopOwnerNPC_8024BA80); extern EvtScript N(unk_80248088); extern EvtScript N(unk_8024884C); + +#endif diff --git a/src/world/area_dro/dro_01/dro_01_0_header.c b/src/world/area_dro/dro_01/dro_01_0_header.c new file mode 100644 index 0000000000..bf0041f172 --- /dev/null +++ b/src/world/area_dro/dro_01/dro_01_0_header.c @@ -0,0 +1,23 @@ +#include "dro_01.h" + +EntryList N(Entrances) = { + [dro_01_ENTRY_0] { -342.0, 0.0, 316.0, 45.0 }, + [dro_01_ENTRY_1] { 488.0, 1.0, 4.0, 270.0 }, + [dro_01_ENTRY_2] { 430.0, 35.0, -120.0, 180.0 }, + [dro_01_ENTRY_3] { 0.0, 0.0, 0.0, 0.0 }, + [dro_01_ENTRY_4] { 0.0, 0.0, 0.0, 0.0 }, + [dro_01_ENTRY_5] { 0.0, 0.0, 0.0, 0.0 }, + [dro_01_ENTRY_6] { 0.0, 0.0, 0.0, 0.0 }, + [dro_01_ENTRY_7] { 0.0, 0.0, 0.0, 0.0 }, + [dro_01_ENTRY_8] { 0.0, 0.0, 0.0, 0.0 }, + [dro_01_ENTRY_9] { 0.0, 0.0, 0.0, 0.0 }, + [dro_01_ENTRY_A] { -211.0, 50.0, -50.0, 120.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_dro_01 }, +}; diff --git a/src/world/area_dro/dro_01/dro_01_1_music.c b/src/world/area_dro/dro_01/dro_01_1_music.c new file mode 100644 index 0000000000..92450da062 --- /dev/null +++ b/src/world/area_dro/dro_01/dro_01_1_music.c @@ -0,0 +1,15 @@ +#include "dro_01.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(dro_01_ENTRY_3) + EVT_CASE_OR_EQ(dro_01_ENTRY_4) + EVT_END_CASE_GROUP + EVT_CASE_DEFAULT + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_OUTPOST, 0, 8) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_dro/dro_01/dro_01_2_main.c b/src/world/area_dro/dro_01/dro_01_2_main.c new file mode 100644 index 0000000000..bdacee9716 --- /dev/null +++ b/src/world/area_dro/dro_01/dro_01_2_main.c @@ -0,0 +1,125 @@ +#include "dro_01.h" + +#include "world/common/entity/Pipe.inc.c" +#include "world/common/entity/Pipe.data.inc.c" + +#include "world/common/atomic/UnkFunc27.inc.c" + +EvtScript N(EVS_ExitWalk_sbk_36_1) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_SET(GF_DRO01_HeardHintAboutSpinningRoof, 0) + EVT_CALL(UseExitHeading, 60, 0) + EVT_EXEC(ExitWalk) + EVT_CALL(GotoMap, EVT_PTR("sbk_36"), 1) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitWalk_dro_02_0) = EVT_EXIT_WALK(60, dro_01_ENTRY_1, "dro_02", dro_02_ENTRY_0); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(N(EVS_ExitWalk_sbk_36_1), TRIGGER_FLOOR_ABOVE, 1, 1, 0) + EVT_BIND_TRIGGER(N(EVS_ExitWalk_dro_02_0), TRIGGER_FLOOR_ABOVE, 5, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Scene_RuinsRising) = { + EVT_CALL(PlaySound, SOUND_80000060) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 175, 0, -201) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 175, 0, -201) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(N(UnkFunc27), 2, 0, 3) + EVT_CALL(N(UnkFunc27), 1, -1, 3) + EVT_CALL(N(UnkFunc26), 3, 44, 32, 177, 0, 0, 0, 0, 0, 0) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 300, EVT_FLOAT(0.2)) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(60) + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, dro_01_ENTRY_3) + EVT_CALL(GotoMap, EVT_PTR("dro_02"), dro_02_ENTRY_2) + EVT_ELSE + EVT_CALL(GotoMap, EVT_PTR("dro_02"), dro_02_ENTRY_3) + EVT_END_IF + EVT_WAIT(100) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetLoadType, LVar1) + EVT_IF_EQ(LVar1, LOAD_FROM_FILE_SELECT) + EVT_EXEC(EnterSavePoint) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_RETURN + EVT_END_IF + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(dro_01_ENTRY_2) + EVT_IF_EQ(GF_DRO01_WarpPipe, FALSE) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) + EVT_CALL(SetPlayerPos, LVar0, NPC_DISPOSE_POS_Y, LVar2) + EVT_WAIT(30) + EVT_CALL(PlaySound, SOUND_208E) + EVT_SET(GF_DRO01_WarpPipe, TRUE) + EVT_WAIT(30) + EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_END_IF + EVT_SET(LVarA, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC_WAIT(N(EVS_Pipe_EnterVertical)) + EVT_CASE_OR_EQ(dro_01_ENTRY_3) + EVT_CASE_OR_EQ(dro_01_ENTRY_4) + EVT_EXEC_WAIT(N(EVS_Scene_RuinsRising)) + EVT_END_CASE_GROUP + EVT_CASE_EQ(dro_01_ENTRY_A) + EVT_EXEC(EnterPostPipe) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_DEFAULT + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_END_SWITCH + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_OUTPOST) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_SET(GF_MAP_DryDryOutpost, TRUE) + EVT_IF_LT(GB_StoryProgress, STORY_CH2_ARRIVED_AT_DRY_DRY_OUTPOST) + EVT_SET(GB_StoryProgress, STORY_CH2_ARRIVED_AT_DRY_DRY_OUTPOST) + EVT_END_IF + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_RANGE(STORY_CH2_STAR_SPRIT_DEPARTED, STORY_CH4_BEGAN_PEACH_MISSION) + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(Chapter3NPCs))) + EVT_CASE_DEFAULT + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_END_SWITCH + EVT_CALL(InitVirtualEntityList) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_CALL(MakeShop, EVT_PTR(N(Shop_ItemPositions)), EVT_PTR(N(Shop_Inventory)), EVT_PTR(N(Shop_PriceList)), 0) + EVT_CALL(MakeShopOwner, EVT_PTR(N(Shop_Owner))) + EVT_EXEC_WAIT(N(EVS_SetupBuildings)) + EVT_EXEC(N(EVS_SwingSign_Shop)) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_EXEC(N(EVS_SetupFoliage)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_dro/dro_01/dro_01_3_npc.c b/src/world/area_dro/dro_01/dro_01_3_npc.c new file mode 100644 index 0000000000..423e8aceae --- /dev/null +++ b/src/world/area_dro/dro_01/dro_01_3_npc.c @@ -0,0 +1,438 @@ +#include "dro_01.h" +#include "sprite/npc/Musician.h" +#include "sprite/npc/ChuckQuizmo.h" + +#include "world/common/npc/Dryite_Wander.inc.c" +#include "world/common/npc/Dryite_Patrol.inc.c" +#include "world/common/npc/Dryite_Stationary.inc.c" + +#include "world/common/npc/Mouser.inc.c" +#include "world/common/npc/ThreeSisters.inc.c" + +// toad kid? +NpcSettings N(NpcSettings_Unused1) = { + .height = 23, + .radius = 19, + .level = 99, +}; + +#define CHUCK_QUIZMO_NPC_ID NPC_ChuckQuizmo +#include "world/common/complete/Quizmo.inc.c" + +MAP_STATIC_PAD(1,pre_key_item); // or post-quizmo? +#include "world/common/complete/KeyItemChoice.inc.c" + +#include "world/common/util/MonitorPlayerOrbiting.inc.c" + +#include "world/common/complete/LetterDelivery.inc.c" + +s32 N(LetterList)[] = { + ITEM_LETTER19, + ITEM_NONE +}; + +EvtScript N(EVS_ShopOwner_LetterDelivery) = { + EVT_CALL(N(LetterDelivery_Init), + NPC_Mouser_ShopOwner, ANIM_Mouser_Purple_Talk, ANIM_Mouser_Purple_Idle, + ITEM_LETTER19, ITEM_LETTER12, + MSG_CH2_0089, MSG_CH2_008A, MSG_CH2_008B, MSG_CH2_008C, + EVT_PTR(N(LetterList))) + EVT_EXEC_WAIT(N(EVS_DoLetterDelivery)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Mouser_01) = { + EVT_IF_GE(GB_StoryProgress, STORY_CH2_STAR_SPRIT_DEPARTED) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Mouser_Blue_Talk, ANIM_Mouser_Blue_Idle, 0, MSG_CH2_0062) + EVT_RETURN + EVT_END_IF + EVT_SWITCH(AB_DRO_0) + EVT_CASE_EQ(0) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Mouser_Blue_Talk, ANIM_Mouser_Blue_Idle, 0, MSG_CH2_005F) + EVT_ADD(AB_DRO_0, 1) + EVT_CASE_EQ(1) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Mouser_Blue_Talk, ANIM_Mouser_Blue_Idle, 0, MSG_CH2_0060) + EVT_ADD(AB_DRO_0, 1) + EVT_CASE_EQ(2) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Mouser_Blue_Talk, ANIM_Mouser_Blue_Idle, 0, MSG_CH2_0061) + EVT_SUB(AB_DRO_0, 1) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Mouser_01) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Mouser_01))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Dryite_01) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_STAR_SPRIT_DEPARTED) + EVT_IF_GE(GB_StoryProgress, STORY_CH2_BOUGHT_SECRET_ITEMS) + EVT_IF_EQ(AB_DRO_1, 2) + EVT_SET(AB_DRO_1, 0) + EVT_END_IF + EVT_END_IF + EVT_SWITCH(AB_DRO_1) + EVT_CASE_EQ(0) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Dryite_Yellow_Talk, ANIM_Dryite_Yellow_Idle, 0, MSG_CH2_0063) + EVT_ADD(AB_DRO_1, 1) + EVT_CASE_EQ(1) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Dryite_Yellow_Talk, ANIM_Dryite_Yellow_Idle, 0, MSG_CH2_0064) + EVT_ADD(AB_DRO_1, 1) + EVT_CASE_EQ(2) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Dryite_Yellow_Talk, ANIM_Dryite_Yellow_Idle, 0, MSG_CH2_0065) + EVT_SET(AB_DRO_1, 0) + EVT_END_SWITCH + EVT_CASE_LT(STORY_CH5_STAR_SPRIT_DEPARTED) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Dryite_Yellow_Talk, ANIM_Dryite_Yellow_Idle, 0, MSG_CH2_0066) + EVT_CASE_DEFAULT + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Dryite_Yellow_Talk, ANIM_Dryite_Yellow_Idle, 0, MSG_CH2_0067) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Dryite_01) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Dryite_01))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Dryite_02) = { + //@bug this dialogue was probably supposed to cycle 0 --> 1 --> 2 --> 3 --> 0 ... + EVT_SWITCH(AB_DRO_2) + EVT_CASE_EQ(0) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Dryite_Blue_Talk, ANIM_Dryite_Blue_Idle, 0, MSG_CH2_0068) + EVT_ADD(AB_DRO_2, 1) + EVT_CASE_EQ(1) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Dryite_Blue_Talk, ANIM_Dryite_Blue_Idle, 0, MSG_CH2_0069) + EVT_ADD(AB_DRO_2, 1) + EVT_CASE_EQ(2) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Dryite_Blue_Talk, ANIM_Dryite_Blue_Idle, 0, MSG_CH2_006A) + EVT_ADD(AB_DRO_2, 1) + EVT_CASE_EQ(3) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Dryite_Blue_Talk, ANIM_Dryite_Blue_Idle, 0, MSG_CH2_006B) + EVT_SET(AB_DRO_2, 0) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Dryite_02) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Dryite_02))) + EVT_RETURN + EVT_END +}; + +#include "npc_hint_dryite.c" +#include "npc_hint_dryite_companion.c" +#include "npc_composer.c" +#include "npc_shop_owner.c" + +EvtScript N(EVS_NpcInteract_ThreeSisters) = { + EVT_CALL(SpeakToPlayer, NPC_ThreeSisters_01, ANIM_Toadette_Pink_Talk, ANIM_Toadette_Pink_Idle, 0, MSG_CH2_008E) + EVT_CALL(SpeakToPlayer, NPC_ThreeSisters_02, ANIM_Toadette_Pink_Talk, ANIM_Toadette_Pink_Idle, 0, MSG_CH2_008F) + EVT_CALL(SpeakToPlayer, NPC_ThreeSisters_03, ANIM_Toadette_Pink_Talk, ANIM_Toadette_Pink_Idle, 0, MSG_CH2_0090) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_ThreeSisters) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_ThreeSisters))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_DojoGrad) = { + EVT_CALL(FindKeyItem, ITEM_FIRST_DEGREE_CARD, LVar1) + EVT_CALL(FindKeyItem, ITEM_SECOND_DEGREE_CARD, LVar2) + EVT_CALL(FindKeyItem, ITEM_THIRD_DEGREE_CARD, LVar3) + EVT_CALL(FindKeyItem, ITEM_FOURTH_DEGREE_CARD, LVar4) + EVT_CALL(FindKeyItem, ITEM_DIPLOMA, LVar5) + EVT_IF_NE(LVar1, -1) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Dryite_Brown_Talk, ANIM_Dryite_Brown_Idle, 0, MSG_CH2_009A) + EVT_RETURN + EVT_END_IF + EVT_IF_NE(LVar2, -1) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Dryite_Brown_Talk, ANIM_Dryite_Brown_Idle, 0, MSG_CH2_009B) + EVT_RETURN + EVT_END_IF + EVT_IF_NE(LVar3, -1) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Dryite_Brown_Talk, ANIM_Dryite_Brown_Idle, 0, MSG_CH2_009C) + EVT_RETURN + EVT_END_IF + EVT_IF_NE(LVar4, -1) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Dryite_Brown_Talk, ANIM_Dryite_Brown_Idle, 0, MSG_CH2_009D) + EVT_RETURN + EVT_END_IF + EVT_IF_NE(LVar5, -1) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Dryite_Brown_Talk, ANIM_Dryite_Brown_Idle, 0, MSG_CH2_009E) + EVT_RETURN + EVT_END_IF + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Dryite_Brown_Talk, ANIM_Dryite_Brown_Idle, 0, MSG_CH2_0099) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_DojoGrad) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_DojoGrad))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Dryite_06) = { + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Dryite_Brown_Talk, ANIM_Dryite_Brown_Idle, 0, MSG_CH2_009F) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Dryite_06) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Dryite_06))) + EVT_RETURN + EVT_END +}; + +StaticNpc N(PassiveNPCs)[] = { + { + .id = NPC_Mouser_01, + .settings = &N(NpcSettings_Mouser), + .pos = { -332.0f, 0.0f, 188.0f }, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .init = &N(EVS_NpcInit_Mouser_01), + .yaw = 90, + .drops = MOUSER_DROPS, + .animations = MOUSER_BLUE_ANIMS, + .tattle = MSG_NpcTattle_DRO_Greeter, + }, + { + .id = NPC_Dryite_01, + .settings = &N(NpcSettings_Dryite_Wander), + .pos = { -235.0f, 0.0f, 160.0f }, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .init = &N(EVS_NpcInit_Dryite_01), + .yaw = 90, + .drops = DRYITE_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -235, 0, 160 }, + .wanderSize = { 30 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 0 }, + } + }, + .animations = DRYITE_YELLOW_ANIMS, + .tattle = MSG_NpcTattle_DRO_DryiteA, + }, + { + .id = NPC_Dryite_02, + .settings = &N(NpcSettings_Dryite), + .pos = { -380.0f, 0.0f, -15.0f }, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .init = &N(EVS_NpcInit_Dryite_02), + .yaw = 61, + .drops = DRYITE_DROPS, + .animations = DRYITE_BLUE_ANIMS, + .tattle = MSG_NpcTattle_DRO_DryiteD, + }, + { + .id = NPC_Dryite_03, + .settings = &N(NpcSettings_Dryite), + .pos = { 195.0f, 0.0f, -75.0f }, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .init = &N(EVS_NpcInit_HintDryite), + .yaw = 74, + .drops = DRYITE_DROPS, + .animations = DRYITE_GREEN_ANIMS, + .tattle = MSG_NpcTattle_DRO_DryiteB, + }, + { + .id = NPC_Dryite_04, + .settings = &N(NpcSettings_Dryite), + .pos = { 225.0f, 0.0f, -83.0f }, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .init = &N(EVS_NpcInit_Dryite_04), + .yaw = 257, + .drops = DRYITE_DROPS, + .animations = DRYITE_GREEN_ANIMS, + .tattle = MSG_NpcTattle_DRO_DryiteC, + }, + { + .id = NPC_ArtistToad, + .settings = &N(NpcSettings_Dryite), + .pos = { 285.0f, 0.0f, -274.0f }, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .init = &N(EVS_NpcInit_Composer), + .yaw = 271, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + ANIM_Musician_Composer_Idle, + ANIM_Musician_Composer_Still, + ANIM_Musician_Composer_Still, + ANIM_Musician_Composer_Still, + ANIM_Musician_Composer_Still, + ANIM_Musician_Composer_Still, + ANIM_Musician_Composer_Still, + ANIM_Musician_Composer_Still, + ANIM_Musician_Composer_Still, + ANIM_Musician_Composer_Still, + ANIM_Musician_Composer_Still, + ANIM_Musician_Composer_Still, + ANIM_Musician_Composer_Still, + ANIM_Musician_Composer_Still, + ANIM_Musician_Composer_Still, + ANIM_Musician_Composer_Still, + }, + .tattle = MSG_NpcTattle_Composer, + }, + { + .id = NPC_Mouser_ShopOwner, + .settings = &N(NpcSettings_Mouser), + .pos = { 31.0f, 0.0f, -374.0f }, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .init = &N(EVS_NpcInit_ShopOwner), + .yaw = 180, + .drops = MOUSER_DROPS, + .animations = MOUSER_PURPLE_ANIMS, + .tattle = MSG_NpcTattle_DRO_ShopOwner, + }, + { + .id = NPC_ChuckQuizmo, + .settings = &N(Quizmo_NpcSettings), + .pos = { -400.0f, 0.0f, 100.0f }, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, + .initVarCount = 1, + .initVar = { .bytes = { 0, QUIZ_AREA_DRO, QUIZ_COUNT_DRO, QUIZ_MAP_DRO_01 }}, + .yaw = 263, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_ChuckQuizmo_Idle, + .walk = ANIM_ChuckQuizmo_Walk, + .run = ANIM_ChuckQuizmo_Run, + .chase = ANIM_ChuckQuizmo_Run, + .anim_4 = ANIM_ChuckQuizmo_Idle, + .anim_5 = ANIM_ChuckQuizmo_Idle, + .death = ANIM_ChuckQuizmo_Still, + .hit = ANIM_ChuckQuizmo_Still, + .anim_8 = ANIM_ChuckQuizmo_Run, + .anim_9 = ANIM_ChuckQuizmo_Run, + .anim_A = ANIM_ChuckQuizmo_Run, + .anim_B = ANIM_ChuckQuizmo_Run, + .anim_C = ANIM_ChuckQuizmo_Run, + .anim_D = ANIM_ChuckQuizmo_Run, + .anim_E = ANIM_ChuckQuizmo_Run, + .anim_F = ANIM_ChuckQuizmo_Run, + }, + .tattle = MSG_NpcTattle_ChuckQuizmo, + }, + { + .id = NPC_Dryite_05, + .settings = &N(NpcSettings_Dryite_Wander), + .pos = { -120.0f, 0.0f, 134.0f }, + .yaw = 257, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .init = &N(EVS_NpcInit_DojoGrad), + .drops = DRYITE_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -120, 0, 134 }, + .wanderSize = { 40 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 0 }, + } + }, + .animations = DRYITE_BROWN_ANIMS, + .tattle = MSG_NpcTattle_DRO_DojoGraduate, + }, + { + .id = NPC_Dryite_06, + .settings = &N(NpcSettings_Dryite_Patrol), + .pos = { 40.0f, 0.0f, 105.0f }, + .yaw = 270, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .init = &N(EVS_NpcInit_Dryite_06), + .drops = DRYITE_DROPS, + .territory = { + .patrol = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .numPoints = 2, + .points = { + { 40, 0, 105 }, + { -30, 0, 125 }, + }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 0 }, + } + }, + .animations = DRYITE_BROWN_ANIMS, + .tattle = MSG_NpcTattle_DRO_WorriedDryite, + }, +}; + +StaticNpc N(ThreeSisterNPCs)[] = { + { + .id = NPC_ThreeSisters_01, + .settings = &N(NpcSettings_ThreeSisters), + .pos = { -141.0f, 0.0f, -18.0f }, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .init = &N(EVS_NpcInit_ThreeSisters), + .yaw = 62, + .drops = THREE_SISTER_DROPS, + .animations = THREE_SISTER_ANIMS, + .tattle = MSG_NpcTattle_TravelingMaidA, + }, + { + .id = NPC_ThreeSisters_02, + .settings = &N(NpcSettings_ThreeSisters), + .pos = { -124.0f, 0.0f, -61.0f }, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .init = &N(EVS_NpcInit_ThreeSisters), + .yaw = 63, + .drops = THREE_SISTER_DROPS, + .animations = THREE_SISTER_ANIMS, + .tattle = MSG_NpcTattle_TravelingMaidB, + }, + { + .id = NPC_ThreeSisters_03, + .settings = &N(NpcSettings_ThreeSisters), + .pos = { -80.0f, 0.0f, -35.0f }, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .init = &N(EVS_NpcInit_ThreeSisters), + .yaw = 244, + .drops = THREE_SISTER_DROPS, + .animations = THREE_SISTER_ANIMS, + .tattle = MSG_NpcTattle_TravelingMaidC, + }, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(PassiveNPCs)), + {}, +}; + +NpcGroupList N(Chapter3NPCs) = { + NPC_GROUP(N(PassiveNPCs)), + NPC_GROUP(N(ThreeSisterNPCs)), + {}, +}; diff --git a/src/world/area_dro/dro_01/dro_01_4_shop.c b/src/world/area_dro/dro_01/dro_01_4_shop.c new file mode 100644 index 0000000000..e687cf6ef9 --- /dev/null +++ b/src/world/area_dro/dro_01/dro_01_4_shop.c @@ -0,0 +1,157 @@ +#include "dro_01.h" +#define NAMESPACE dro_01_Shop + +s32 N(ShopMessages)[] = { + MSG_Shop_0049, MSG_Shop_004A, MSG_Shop_004B, MSG_Shop_004C, + MSG_Shop_004D, MSG_Shop_004E, MSG_Shop_004F, MSG_Shop_0050, + MSG_Shop_0051, MSG_Shop_0052, MSG_Shop_0053, MSG_Shop_0054, + MSG_Shop_0055, MSG_Shop_0056, MSG_Shop_0057, MSG_Shop_0058, + MSG_Shop_0059, MSG_Shop_005A, MSG_Shop_005B, MSG_Shop_005C, + MSG_Shop_005D, MSG_Shop_005E, MSG_Shop_005F, +}; + +ShopItemData N(Inventory)[] = { + { .itemID = ITEM_THUNDER_BOLT, .price = 5, .descMsg = MSG_ItemShopDesc_ThunderBolt }, + { .itemID = ITEM_DUSTY_HAMMER, .price = 2, .descMsg = MSG_ItemShopDesc_DustyHammer }, + { .itemID = ITEM_HONEY_SYRUP, .price = 5, .descMsg = MSG_ItemShopDesc_HoneySyrup }, + { .itemID = ITEM_DRIED_SHROOM, .price = 2, .descMsg = MSG_ItemShopDesc_DriedShroom }, + { .itemID = ITEM_DRIED_PASTA, .price = 3, .descMsg = MSG_ItemShopDesc_DriedPasta }, + { .itemID = ITEM_MUSHROOM, .price = 3, .descMsg = MSG_ItemShopDesc_Mushroom }, + {}, +}; + +ShopSellPriceData N(PriceList)[] = { + { .itemID = ITEM_SNOWMAN_DOLL, .sellPrice = 12 }, + { .itemID = ITEM_MELON, .sellPrice = 10 }, + { .itemID = ITEM_ICED_POTATO, .sellPrice = 10 }, + { .itemID = ITEM_TASTY_TONIC, .sellPrice = 5 }, + { .itemID = ITEM_SUPER_SODA, .sellPrice = 6 }, + { .itemID = ITEM_SPECIAL_SHAKE, .sellPrice = 15 }, + { .itemID = ITEM_DRIED_PASTA, .sellPrice = 2 }, + {}, +}; + +#include "world/common/complete/GiveReward.inc.c" + +API_CALLABLE(N(HideCoinCounter)) { + hide_coin_counter_immediately(); + return ApiStatus_DONE2; +} + +EvtScript N(EVS_JumpToPlayer) = { + EVT_CALL(NpcJump0, NPC_Mouser_ShopOwner, -31, 0, -283, 10) + EVT_CALL(NpcJump0, NPC_Mouser_ShopOwner, -30, 0, -283, 8) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_JumpAway) = { + EVT_CALL(NpcJump0, NPC_Mouser_ShopOwner, 20, 0, -259, 10) + EVT_CALL(NpcJump0, NPC_Mouser_ShopOwner, 20, 0, -259, 4) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SecretPurcahseOrder_Moustafa) = { + EVT_CALL(N(HideCoinCounter)) + EVT_CALL(func_802D2C14, 1) + EVT_EXEC_WAIT(N(EVS_JumpToPlayer)) + EVT_IF_LT(GB_StoryProgress, STORY_CH2_BOUGHT_SECRET_ITEMS) + EVT_CALL(SpeakToPlayer, NPC_Mouser_ShopOwner, ANIM_Mouser_Purple_Talk, ANIM_Mouser_Purple_Idle, 0, MSG_CH2_0087) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007) + EVT_WAIT(30) + EVT_END_IF + EVT_CALL(SpeakToPlayer, NPC_Mouser_ShopOwner, ANIM_Mouser_Purple_Talk, ANIM_Mouser_Purple_Idle, 0, MSG_CH2_0088) + EVT_SET(GB_StoryProgress, STORY_CH2_BOUGHT_SECRET_ITEMS) + EVT_CALL(func_802D2C14, 0) + EVT_EXEC_WAIT(N(EVS_JumpAway)) + EVT_END_IF // @bug unmatched endif in script + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SecretPurcahseOrder_RedJar) = { + EVT_IF_EQ(GF_DRO01_Gift_RedJar, FALSE) + EVT_CALL(N(HideCoinCounter)) + EVT_CALL(func_802D2C14, 1) + EVT_EXEC_WAIT(N(EVS_JumpToPlayer)) + EVT_CALL(SpeakToPlayer, NPC_Mouser_ShopOwner, ANIM_Mouser_Purple_Talk, ANIM_Mouser_Purple_Idle, 0, MSG_CH2_008D) + EVT_GIVE_KEY_REWARD(ITEM_KOOT_RED_JAR) + EVT_SET(GF_DRO01_Gift_RedJar, TRUE) + EVT_WAIT(20) + EVT_CALL(func_802D2C14, 0) + EVT_EXEC_WAIT(N(EVS_JumpAway)) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +enum { + SEQ_NONE = 0, + SEQ_DRIED_SHOOM = 1, + SEQ_DUSTY_HAMMER = 2, + SEQ_DRIED_PASTA = 3, +}; + +EvtScript N(EVS_OnBuy) = { + EVT_SWITCH(LVar0) + EVT_CASE_EQ(3) + EVT_CASE_EQ(4) + EVT_CASE_EQ(1) + EVT_SET(LVar2, AB_DRO_SHOP_PREV1) + EVT_SET(LVar3, AB_DRO_SHOP_PREV2) + EVT_SET(LVar4, AB_DRO_SHOP_PREV3) + EVT_SET(AB_DRO_SHOP_PREV2, LVar2) + EVT_SET(AB_DRO_SHOP_PREV3, LVar3) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(ITEM_DRIED_SHROOM) + // Dusty Hammer, Dried Pasta, Dusty Hammer, Dried Shroom -> Red jar + EVT_SET(AB_DRO_SHOP_PREV1, SEQ_DRIED_SHOOM) + EVT_IF_EQ(LVar2, SEQ_DUSTY_HAMMER) + EVT_IF_EQ(LVar3, SEQ_DRIED_PASTA) + EVT_IF_EQ(LVar4, SEQ_DUSTY_HAMMER) + EVT_EXEC_WAIT(N(EVS_SecretPurcahseOrder_RedJar)) + EVT_SET(AB_DRO_SHOP_PREV1, SEQ_NONE) + EVT_END_IF + EVT_END_IF + EVT_END_IF + EVT_CASE_EQ(ITEM_DUSTY_HAMMER) + // Dried Shroom, Dusty Hammer -> Moustafa information + EVT_SET(AB_DRO_SHOP_PREV1, SEQ_DUSTY_HAMMER) + EVT_IF_EQ(LVar2, SEQ_DRIED_SHOOM) + EVT_IF_LT(GB_StoryProgress, STORY_CH2_GOT_PULSE_STONE) + EVT_EXEC_WAIT(N(EVS_SecretPurcahseOrder_Moustafa)) + EVT_SET(AB_DRO_SHOP_PREV1, SEQ_NONE) + EVT_END_IF + EVT_END_IF + EVT_CASE_EQ(ITEM_DRIED_PASTA) + EVT_SET(AB_DRO_SHOP_PREV1, SEQ_DRIED_PASTA) + EVT_CASE_DEFAULT + EVT_SET(AB_DRO_SHOP_PREV1, SEQ_NONE) + EVT_END_SWITCH + EVT_CASE_EQ(2) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +ShopItemLocation N(ItemPositions)[] = { + { .posModelID = MODEL_o741, .triggerColliderID = COLLIDER_mono1 }, + { .posModelID = MODEL_o740, .triggerColliderID = COLLIDER_mono2 }, + { .posModelID = MODEL_o738, .triggerColliderID = COLLIDER_mono3 }, + { .posModelID = MODEL_o739, .triggerColliderID = COLLIDER_mono4 }, + { .posModelID = MODEL_o737, .triggerColliderID = COLLIDER_mono5 }, + { .posModelID = MODEL_o736, .triggerColliderID = COLLIDER_mono6 }, +}; + +ShopOwner N(Owner) = { + .npcID = NPC_Mouser_ShopOwner, + .idleAnim = ANIM_Mouser_Purple_Idle, + .talkAnim = ANIM_Mouser_Purple_Talk, + .onBuyEvt = &N(EVS_OnBuy), + .shopMsgIDs = N(ShopMessages), +}; + +#define NAMESPACE dro_01 diff --git a/src/world/area_dro/dro_01/dro_01_5_building.c b/src/world/area_dro/dro_01/dro_01_5_building.c new file mode 100644 index 0000000000..d22a919a58 --- /dev/null +++ b/src/world/area_dro/dro_01/dro_01_5_building.c @@ -0,0 +1,247 @@ +#include "dro_01.h" + +EvtScript N(EVS_SetDoorRot_LeftHouse) = { + EVT_CALL(RotateModel, MODEL_doa1, LVar0, 0, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MoveWalls_LeftHouse) = { + EVT_SET(LVar1, LVar0) + EVT_DIVF(LVar1, 50) + EVT_CALL(TranslateModel, MODEL_1_m_kabe, 0, LVar1, 0) + EVT_CALL(TranslateModel, MODEL_mado1, 0, LVar1, 0) + EVT_CALL(RotateModel, MODEL_1_m_kabe, LVar0, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_mado1, LVar0, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_1_m_moyou, LVar0, -1, 0, 0) + EVT_CALL(RotateModel, MODEL_1_m_waku, LVar0, -1, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_DropDoor_LeftHouse) = { + EVT_SET(LVar1, LVar0) + EVT_DIVF(LVar1, 50) + EVT_CALL(TranslateModel, MODEL_doa1, 0, LVar1, 0) + EVT_CALL(RotateModel, MODEL_doa1, LVar0, 1, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetDoorRot_Shop) = { + EVT_CALL(RotateModel, MODEL_m_m_doa, LVar0, 0, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MoveWalls_Shop) = { + EVT_SET(LVar1, LVar0) + EVT_DIVF(LVar1, 50) + EVT_CALL(TranslateModel, MODEL_m_m_kabe, 0, LVar1, 0) + EVT_CALL(TranslateModel, MODEL_m_m_mado, 0, LVar1, 0) + EVT_CALL(RotateModel, MODEL_m_m_kabe, LVar0, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_m_m_mado, LVar0, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_m_m_hari, LVar0, -1, 0, 0) + EVT_CALL(RotateModel, MODEL_m_m_moyou, LVar0, -1, 0, 0) + EVT_CALL(RotateModel, MODEL_m_m_waku, LVar0, -1, 0, 0) + EVT_CALL(RotateModel, MODEL_m_m_mado2, LVar0, -1, 0, 0) + EVT_CALL(RotateModel, MODEL_m_m_kabe2, LVar0, -1, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetDoorRot_RightHouse) = { + EVT_CALL(RotateModel, MODEL_doa2, LVar0, 0, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_DropDoor_RightHouse) = { + EVT_SET(LVar1, LVar0) + EVT_DIV(LVar1, 45) + EVT_CALL(TranslateModel, MODEL_doa2, 0, LVar1, 0) + EVT_CALL(RotateModel, MODEL_doa2, LVar0, 1, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MoveWalls_RightHouse) = { + EVT_IF_EQ(LVar0, 90) + EVT_CALL(EnableModel, MODEL_nuno, FALSE) + EVT_ELSE + EVT_CALL(EnableModel, MODEL_nuno, TRUE) + EVT_END_IF + EVT_SET(LVar1, LVar0) + EVT_DIV(LVar1, 45) + EVT_SET(LVar2, LVar0) + EVT_SUB(LVar2, -90) + EVT_DIV(LVar2, -90) + EVT_CALL(TranslateModel, MODEL_si_ksbe, 0, LVar1, 0) + EVT_CALL(RotateModel, MODEL_si_ksbe, LVar0, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_ue_waku, LVar0, -1, 0, 0) + EVT_CALL(RotateModel, MODEL_mado2, LVar0, -1, 0, 0) + EVT_CALL(RotateModel, MODEL_ue_kabe, LVar0, -1, 0, 0) + EVT_CALL(RotateModel, MODEL_ue_moyou, LVar0, -1, 0, 0) + EVT_CALL(RotateModel, MODEL_bou1, LVar0, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_nuno, LVar0, 1, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ToggleVis_LeftHouse) = { + EVT_SWITCH(LVar0) + EVT_CASE_EQ(0) + EVT_CALL(SetGroupEnabled, MODEL_ie_naka, TRUE) + EVT_CASE_EQ(3) + EVT_CALL(SetGroupEnabled, MODEL_ie_naka, FALSE) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ToggleVis_Shop) = { + EVT_SWITCH(LVar0) + EVT_CASE_EQ(0) + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_SPOKE_WITH_SHEEK) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_017B, 160, 40) + EVT_SET(LVar0, -1) + EVT_RETURN + EVT_CASE_LT(STORY_CH2_SHADY_MOUSE_ENTERED_SHOP) + EVT_SET(LVar0, -1) + EVT_RETURN + EVT_END_SWITCH + EVT_CALL(SetGroupEnabled, MODEL_mise_naka, 1) + EVT_CASE_EQ(2) + EVT_THREAD + EVT_WAIT(45) + EVT_CALL(SetNpcPos, NPC_Mouser_ShopOwner, 33, 0, -375) + EVT_CALL(SetNpcYaw, NPC_Mouser_ShopOwner, 180) + EVT_END_THREAD + EVT_CASE_EQ(3) + EVT_CALL(SetGroupEnabled, MODEL_mise_naka, 0) + EVT_SET(AB_DRO_SHOP_PREV1, 0) + EVT_SET(AB_DRO_SHOP_PREV2, 0) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ToggleVis_RightHouse) = { + EVT_SWITCH(LVar0) + EVT_CASE_EQ(0) + EVT_CALL(SetGroupEnabled, MODEL_ie2_naka, 1) + EVT_CASE_EQ(2) + EVT_CASE_EQ(3) + EVT_CALL(SetGroupEnabled, MODEL_ie2_naka, 0) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +s32 N(InteriorNPCs_LeftHouse)[] = { + NPC_Dryite_02, + -1 +}; + +s32 N(InteriorNPCs_Shop)[] = { + NPC_Mouser_ShopOwner, + -1 +}; + +s32 N(InteriorNPCs_RightHouse)[] = { + NPC_ArtistToad, + -1 +}; + +EvtScript N(EVS_SetupBuildings) = { + EVT_CALL(MakeDoorAdvanced, + VIS_GROUP_PAIR(0, 5), + EVT_PTR(N(EVS_SetDoorRot_LeftHouse)), + EVT_PTR(N(EVS_MoveWalls_LeftHouse)), + EVT_PTR(N(EVS_DropDoor_LeftHouse)), + EVT_PTR(N(EVS_ToggleVis_LeftHouse)), + COLLIDER_ei1_1, + COLLIDER_ei1_2, + MODEL_k_i1, + EVT_PTR(N(InteriorNPCs_LeftHouse))) + EVT_CALL(MakeDoorAdvanced, + VIS_GROUP_PAIR(0, 5), + EVT_PTR(N(EVS_SetDoorRot_Shop)), + EVT_PTR(N(EVS_MoveWalls_Shop)), + NULL, + EVT_PTR(N(EVS_ToggleVis_Shop)), + COLLIDER_em_1, + COLLIDER_em_2, + MODEL_k_m1, + EVT_PTR(N(InteriorNPCs_Shop))) + EVT_CALL(MakeDoorAdvanced, + VIS_GROUP_PAIR(0, 5), + EVT_PTR(N(EVS_SetDoorRot_RightHouse)), + EVT_PTR(N(EVS_MoveWalls_RightHouse)), + EVT_PTR(N(EVS_DropDoor_RightHouse)), + EVT_PTR(N(EVS_ToggleVis_RightHouse)), + COLLIDER_ei2_1, + COLLIDER_ei_2, + MODEL_k_i2, + EVT_PTR(N(InteriorNPCs_RightHouse))) + EVT_SET(LVar0, 3) + EVT_EXEC(N(EVS_ToggleVis_LeftHouse)) + EVT_EXEC(N(EVS_ToggleVis_Shop)) + EVT_EXEC(N(EVS_ToggleVis_RightHouse)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SwingSign_Shop) = { + EVT_LABEL(9) + EVT_CALL(MakeLerp, 10, -10, 30, EASING_COS_IN_OUT) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o499, LVar0, 1, 0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(MakeLerp, -10, 10, 30, EASING_COS_IN_OUT) + EVT_LABEL(11) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o499, LVar0, 1, 0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(11) + EVT_END_IF + EVT_GOTO(9) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OpenShopDoor) = { + EVT_CALL(SetGroupEnabled, MODEL_mise_naka, 1) + EVT_CALL(PlaySoundAtCollider, COLLIDER_em_1, SOUND_BASIC_DOOR_OPEN, 0) + EVT_CALL(MakeLerp, 0, 100, 15, EASING_QUADRATIC_OUT) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_EXEC(N(EVS_SetDoorRot_Shop)) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_CloseShopDoor) = { + EVT_CALL(MakeLerp, 100, 0, 15, EASING_QUADRATIC_OUT) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_EXEC(N(EVS_SetDoorRot_Shop)) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(PlaySoundAtCollider, COLLIDER_em_1, SOUND_BASIC_DOOR_CLOSE, 0) + EVT_CALL(SetGroupEnabled, MODEL_mise_naka, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_dro/dro_01/dro_01_6_entity.c b/src/world/area_dro/dro_01/dro_01_6_entity.c new file mode 100644 index 0000000000..630b06a91f --- /dev/null +++ b/src/world/area_dro/dro_01/dro_01_6_entity.c @@ -0,0 +1,32 @@ +#include "dro_01.h" +#include "entity.h" + +#define NAMESPACE dro_01_Entity +#include "world/common/entity/Pipe.inc.c" +#include "world/common/entity/Pipe.data.inc.c" +#define NAMESPACE dro_01 + +EvtScript N(EVS_WarpPipeExit) = { + EVT_SET(GF_DRO01_HeardHintAboutSpinningRoof, FALSE) + EVT_CALL(GotoMap, EVT_PTR("tik_01"), tik_01_ENTRY_4) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_SavePoint), -211, 60, -50, 30, MAKE_ENTITY_END) + EVT_IF_EQ(GF_DRO01_WarpPipe, FALSE) + EVT_IF_EQ(GF_TIK01_WarpPipes, TRUE) + EVT_CALL(GetEntryID, LVar0) + EVT_IF_NE(LVar0, dro_01_ENTRY_2) + EVT_SET(GF_DRO01_WarpPipe, TRUE) + EVT_END_IF + EVT_END_IF + EVT_END_IF + EVT_CALL(MakeEntity, EVT_PTR(Entity_BlueWarpPipe), 430, 0, -120, 0, + dro_01_ENTRY_2, EVT_PTR(N(EVS_WarpPipeExit)), + EVT_INDEX_OF_GAME_FLAG(GF_DRO01_WarpPipe), MAKE_ENTITY_END) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_dro/dro_01/dro_01_7_foliage.c b/src/world/area_dro/dro_01/dro_01_7_foliage.c new file mode 100644 index 0000000000..b3c124317e --- /dev/null +++ b/src/world/area_dro/dro_01/dro_01_7_foliage.c @@ -0,0 +1,48 @@ +#include "dro_01.h" + +#include "common/foliage.inc.c" + +FoliageModelList N(Tree1_LeafModels) = { + .count = 1, + .models = { + MODEL_o799, + } +}; + +FoliageModelList N(Tree1_TrunkModels) = { + .count = 1, + .models = { + MODEL_o800, + } +}; + +FoliageDropList N(Tree1_Drops) = { + .count = 1, + .drops = { + { + .itemID = ITEM_COIN, + .pos = { 120, 92, -18 }, + .spawnMode = ITEM_SPAWN_MODE_FALL_SPAWN_ONCE, + .pickupFlag = GF_DRO01_Tree1_Coin, + }, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree1) = { + .leaves = &N(Tree1_LeafModels), + .trunk = &N(Tree1_TrunkModels), + .drops = &N(Tree1_Drops), +}; + +BombTrigger N(BombPos_Tree1) = { + .pos = { 120.0f, 0.0f, -43.0f }, + .radius = 0.0f +}; + +EvtScript N(EVS_SetupFoliage) = { + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_yasi, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_dro/dro_01/npc_composer.c b/src/world/area_dro/dro_01/npc_composer.c new file mode 100644 index 0000000000..3ddf455635 --- /dev/null +++ b/src/world/area_dro/dro_01/npc_composer.c @@ -0,0 +1,78 @@ +#include "dro_01.h" + +s32 N(LyricsList)[] = { + ITEM_LYRICS, + ITEM_NONE, +}; + +EvtScript N(EVS_NpcInteract_Composer) = { + EVT_IF_EQ(GF_DRO01_Gift_Melody, TRUE) + EVT_CALL(FindKeyItem, ITEM_MELODY, LVar0) + EVT_IF_NE(LVar0, -1) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Musician_Composer_Talk, ANIM_Musician_Composer_Idle, 0, MSG_CH2_0084) + EVT_RETURN + EVT_ELSE + EVT_IF_EQ(GF_DRO01_Gift_ToldComposerAboutMelody, FALSE) + EVT_IF_LT(GB_StoryProgress, STORY_CH7_BEGAN_PEACH_MISSION) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Musician_Composer_Talk, ANIM_Musician_Composer_Idle, 0, MSG_CH2_0085) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_NodYes) + EVT_WAIT(30) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Musician_Composer_Talk, ANIM_Musician_Composer_Idle, 0, MSG_CH2_0086) + EVT_SET(GF_DRO01_Gift_ToldComposerAboutMelody, TRUE) + EVT_RETURN + EVT_END_IF + EVT_END_IF + EVT_END_IF + EVT_END_IF + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_STAR_SPRIT_DEPARTED) + EVT_IF_EQ(AF_DRO_DialogueToggle_Composer, FALSE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Musician_Composer_Talk, ANIM_Musician_Composer_Idle, 0, MSG_CH2_007C) + EVT_SET(AF_DRO_DialogueToggle_Composer, TRUE) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Musician_Composer_Talk, ANIM_Musician_Composer_Idle, 0, MSG_CH2_007D) + EVT_SET(AF_DRO_DialogueToggle_Composer, FALSE) + EVT_END_IF + EVT_CASE_LT(STORY_CH5_STAR_SPRIT_DEPARTED) + EVT_IF_EQ(AF_DRO_DialogueToggle_Composer, FALSE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Musician_Composer_Talk, ANIM_Musician_Composer_Idle, 0, MSG_CH2_007E) + EVT_SET(AF_DRO_DialogueToggle_Composer, TRUE) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Musician_Composer_Talk, ANIM_Musician_Composer_Idle, 0, MSG_CH2_007F) + EVT_SET(AF_DRO_DialogueToggle_Composer, FALSE) + EVT_END_IF + EVT_CASE_DEFAULT + EVT_IF_EQ(AF_DRO_DialogueToggle_Composer, FALSE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Musician_Composer_Talk, ANIM_Musician_Composer_Idle, 0, MSG_CH2_0080) + EVT_SET(AF_DRO_DialogueToggle_Composer, TRUE) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Musician_Composer_Talk, ANIM_Musician_Composer_Idle, 0, MSG_CH2_0081) + EVT_SET(AF_DRO_DialogueToggle_Composer, FALSE) + EVT_END_IF + EVT_END_SWITCH + EVT_SET(LVar0, EVT_PTR(N(LyricsList))) + EVT_SET(LVar1, 5) + EVT_EXEC_WAIT(N(EVS_ChooseKeyItem)) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(0) + EVT_CASE_EQ(-1) + EVT_CASE_DEFAULT + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Musician_Composer_Talk, ANIM_Musician_Composer_Idle, 0, MSG_CH2_0082) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Musician_Composer_Write) + EVT_WAIT(60) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Musician_Composer_Idle) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Musician_Composer_Talk, ANIM_Musician_Composer_Idle, 0, MSG_CH2_0083) + EVT_GIVE_KEY_REWARD(ITEM_MELODY) + EVT_SET(GF_DRO01_Gift_Melody, TRUE) + EVT_RETURN + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Composer) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Composer))) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_dro/dro_01/npc_hint_dryite.c b/src/world/area_dro/dro_01/npc_hint_dryite.c new file mode 100644 index 0000000000..4e4425d8fe --- /dev/null +++ b/src/world/area_dro/dro_01/npc_hint_dryite.c @@ -0,0 +1,168 @@ +#include "dro_01.h" +#include "world/common/util/MonitorPlayerOrbiting.h" + +API_CALLABLE(N(SaveSpinningRoofHintTime)) { + PlayerData* playerData = &gPlayerData; + + playerData->droTreeHintTime = playerData->frameCounter; + return ApiStatus_DONE2; +} + +API_CALLABLE(N(GetFloorCollider)) { + Bytecode* args = script->ptrReadPos; + s32 outVar = *args++; + + evt_set_variable(script, outVar, gCollisionStatus.currentFloor); + return ApiStatus_DONE2; +} + +EvtScript N(EVS_Scene_TreeOrbitReaction) = { + EVT_LOOP(0) + EVT_CALL(N(GetFloorCollider), LVar0) + EVT_IF_EQ(LVar0, COLLIDER_ground) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(func_802CF56C, 1) + EVT_THREAD + EVT_WAIT(20) + EVT_CALL(func_802CF56C, 0) + EVT_CALL(NpcFacePlayer, NPC_PARTNER, 0) + EVT_END_THREAD + EVT_CALL(PlayerFaceNpc, NPC_Dryite_03, FALSE) + EVT_CALL(SpeakToPlayer, NPC_Dryite_03, ANIM_Dryite_Green_Talk, ANIM_Dryite_Green_Idle, 0, MSG_CH2_0078) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_Dryite_03, LVar3, LVar4, LVar5) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_ADDF(LVar0, LVar3) + EVT_ADDF(LVar1, LVar4) + EVT_ADDF(LVar2, LVar5) + EVT_DIVF(LVar0, EVT_FLOAT(2.0)) + EVT_DIVF(LVar1, EVT_FLOAT(2.0)) + EVT_DIVF(LVar2, EVT_FLOAT(2.0)) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(-300.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(5.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SpeakToPlayer, NPC_Dryite_03, ANIM_Dryite_Green_Talk, ANIM_Dryite_Green_Idle, 0, MSG_CH2_0079) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007) + EVT_WAIT(30) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SpeakToPlayer, NPC_Dryite_03, ANIM_Dryite_Green_Talk, ANIM_Dryite_Green_Idle, 0, MSG_CH2_007A) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(N(SaveSpinningRoofHintTime)) + EVT_SET(GF_DRO01_HeardHintAboutSpinningRoof, TRUE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +void N(red_tree_orbit_listener)(PlayerOrbitState* orbit, s32 event) { + PlayerStatus* playerStatus = &gPlayerStatus; + + switch (event) { + case PLAYER_ORBIT_CONTINUE_ORBIT: + if (orbit->numRotations >= 6) { + // wait to be near NPC with at least 6 full rotations complete + f32 angle1 = atan2(125.0f, -42.0f, 152.0f, -61.0f); + f32 angle2 = atan2(125.0f, -42.0f, playerStatus->position.x, playerStatus->position.z); + f32 deltaAngle = get_clamped_angle_diff(angle1, angle2); + if (fabsf(deltaAngle) < 30.0f) { + start_script(&N(EVS_Scene_TreeOrbitReaction), EVT_PRIORITY_1, 0); + orbit->state = ORBIT_STATE_BREAK_ORBIT; + } + } + break; + + case PLAYER_ORBIT_BEGIN: + case PLAYER_ORBIT_COMPLETE_ROTATION: + case PLAYER_ORBIT_CHANGE_DIRECTION: + case PLAYER_ORBIT_LEFT_REGION: + break; + } +} + +API_CALLABLE(N(HasBeenHalfHourSinceTreeOrbit)) { + PlayerData* playerData = &gPlayerData; + s32 minutes = (playerData->frameCounter - playerData->droTreeHintTime) / 3600; + + if (minutes < 30) { + script->varTable[0] = TRUE; + } else { + script->varTable[0] = FALSE; + } + + return ApiStatus_DONE2; +} + +PlayerOrbitTarget N(RunAroundTarget) = { + .pos = { 125, 0, -42 }, + .startRadius = 75, + .orbitRadius = 75, + .eventListener = N(red_tree_orbit_listener), +}; + +EvtScript N(EVS_NpcInteract_HintDryite) = { + EVT_IF_EQ(GF_MAC01_Merlon_HeardAboutDream, TRUE) + EVT_IF_EQ(GF_DRO01_HeardHintAboutSpinningRoof, TRUE) + // in case the player forgets, remind them after a half hour + EVT_CALL(N(HasBeenHalfHourSinceTreeOrbit)) + EVT_IF_EQ(LVar0, TRUE) + EVT_CALL(SpeakToPlayer, NPC_Dryite_03, ANIM_Dryite_Green_Talk, ANIM_Dryite_Green_Idle, 0, MSG_CH2_007B) + EVT_RETURN + EVT_END_IF + EVT_END_IF + EVT_END_IF + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_STAR_SPRIT_DEPARTED) + EVT_IF_EQ(AF_DRO_01, FALSE) + EVT_CALL(SpeakToPlayer, NPC_Dryite_03, ANIM_Dryite_Green_Talk, ANIM_Dryite_Green_Idle, 0, MSG_CH2_006C) + EVT_CALL(SpeakToPlayer, NPC_Dryite_04, ANIM_Dryite_Green_Talk, ANIM_Dryite_Green_Idle, 0, MSG_CH2_006D) + EVT_CALL(SpeakToPlayer, NPC_Dryite_03, ANIM_Dryite_Green_Talk, ANIM_Dryite_Green_Idle, 0, MSG_CH2_006E) + EVT_SET(AF_DRO_01, TRUE) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_Dryite_03, ANIM_Dryite_Green_Talk, ANIM_Dryite_Green_Idle, 0, MSG_CH2_006F) + EVT_CALL(SpeakToPlayer, NPC_Dryite_04, ANIM_Dryite_Green_Talk, ANIM_Dryite_Green_Idle, 0, MSG_CH2_0070) + EVT_CALL(SpeakToPlayer, NPC_Dryite_03, ANIM_Dryite_Green_Talk, ANIM_Dryite_Green_Idle, 0, MSG_CH2_0071) + EVT_SET(AF_DRO_01, FALSE) + EVT_END_IF + EVT_CASE_LT(STORY_CH5_STAR_SPRIT_DEPARTED) + EVT_CALL(SpeakToPlayer, NPC_Dryite_03, ANIM_Dryite_Green_Talk, ANIM_Dryite_Green_Idle, 0, MSG_CH2_0072) + EVT_CALL(SpeakToPlayer, NPC_Dryite_04, ANIM_Dryite_Green_Talk, ANIM_Dryite_Green_Idle, 0, MSG_CH2_0073) + EVT_CALL(SpeakToPlayer, NPC_Dryite_03, ANIM_Dryite_Green_Talk, ANIM_Dryite_Green_Idle, 0, MSG_CH2_0074) + EVT_CASE_DEFAULT + EVT_CALL(SpeakToPlayer, NPC_Dryite_03, ANIM_Dryite_Green_Talk, ANIM_Dryite_Green_Idle, 0, MSG_CH2_0075) + EVT_CALL(SpeakToPlayer, NPC_Dryite_04, ANIM_Dryite_Green_Talk, ANIM_Dryite_Green_Idle, 0, MSG_CH2_0076) + EVT_CALL(SpeakToPlayer, NPC_Dryite_03, ANIM_Dryite_Green_Talk, ANIM_Dryite_Green_Idle, 0, MSG_CH2_0077) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_HintDryite) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(dro_01_ENTRY_3) + EVT_CASE_OR_EQ(dro_01_ENTRY_4) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Dryite_Green_Talk) + EVT_RETURN + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_HintDryite))) + EVT_IF_EQ(GF_MAC01_Merlon_HeardAboutDream, TRUE) + EVT_THREAD + EVT_CALL(N(MonitorPlayerOrbiting), EVT_PTR(N(RunAroundTarget))) + EVT_END_THREAD + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_dro/dro_01/npc_hint_dryite_companion.c b/src/world/area_dro/dro_01/npc_hint_dryite_companion.c new file mode 100644 index 0000000000..4b89c0a598 --- /dev/null +++ b/src/world/area_dro/dro_01/npc_hint_dryite_companion.c @@ -0,0 +1,60 @@ +#include "dro_01.h" + +API_CALLABLE(N(GetRunToPos)) { + PlayerStatus* playerStatus = &gPlayerStatus; + Npc* npc = get_npc_safe(script->owner2.npcID); + s32 rand; + f32 temp_f22; + f32 temp_f24; + + temp_f24 = atan2(183.0f, -75.0f, playerStatus->position.x, playerStatus->position.z); + temp_f22 = atan2(183.0f, -75.0f, npc->pos.x, npc->pos.z); + temp_f24 = get_clamped_angle_diff(temp_f22, temp_f24); + rand = rand_int(10) + 30; + if (temp_f24 < 0.0f) { + temp_f22 += rand; + } else { + temp_f22 -= rand; + } + rand = rand_int(20) + 30; + script->varTable[0] = 183.0f + (sin_deg(temp_f22) * rand); + script->varTable[1] = -75.0f - (cos_deg(temp_f22) * rand); + + return ApiStatus_DONE2; +} + +// run away from, the player, orbiting around the hint-giving dryite +EvtScript N(EVS_NpcInteract_Dryite_04) = { + EVT_CHILD_THREAD + EVT_LOOP(0) + EVT_CALL(NpcFaceNpc, NPC_Dryite_03, NPC_Dryite_04, 1) + EVT_END_LOOP + EVT_END_CHILD_THREAD + EVT_CALL(N(GetRunToPos)) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Dryite_Green_Run) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(3.5)) + EVT_CALL(NpcMoveTo, NPC_SELF, LVar0, LVar1, 0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Dryite_Green_Idle) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, FALSE) + EVT_WAIT(5) + EVT_CALL(GetNpcYaw, NPC_SELF, LVar0) + EVT_ADD(LVar0, 180) + EVT_CALL(InterpNpcYaw, NPC_SELF, LVar0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Dryite_04) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(dro_01_ENTRY_3) + EVT_CASE_OR_EQ(dro_01_ENTRY_4) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Dryite_Green_Talk) + EVT_RETURN + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Dryite_04))) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_dro/dro_01/npc_shop_owner.c b/src/world/area_dro/dro_01/npc_shop_owner.c new file mode 100644 index 0000000000..f12d774d28 --- /dev/null +++ b/src/world/area_dro/dro_01/npc_shop_owner.c @@ -0,0 +1,120 @@ +#include "dro_01.h" + +API_CALLABLE(N(AwaitPlayerApproachShop)) { + PlayerStatus* playerStatus = &gPlayerStatus; + Bytecode* args = script->ptrReadPos; + f32 var1 = evt_get_variable(script, *args++); + f32 var2 = evt_get_variable(script, *args++); + f32 var3 = evt_get_variable(script, *args++); + f32 var4 = evt_get_variable(script, *args++); + f32 temp_f0 = (var4 - var2) / (var3 - var1); + + if (playerStatus->position.z < ((temp_f0 * playerStatus->position.x) + (var2 - (temp_f0 * var1)))) { + script->varTable[0] = 0; + return ApiStatus_DONE2; + } + + script->varTable[0] = 1; + return ApiStatus_BLOCK; +} + +EvtScript N(EVS_NpcIdle_ShopOwner) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_SHADY_MOUSE_LEFT_SHOP) + EVT_CALL(N(AwaitPlayerApproachShop), 16, 190, -134, -131) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcPos, NPC_SELF, 0, 0, -180) + EVT_EXEC_WAIT(N(EVS_OpenShopDoor)) + EVT_WAIT(10) + EVT_CALL(GetPlayerPos, LVarA, LVarB, LVarC) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVarA, LVarB, LVarC) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 32, 0, -67) + EVT_CALL(SetCamDistance, CAM_DEFAULT, -210) + EVT_CALL(SetCamPitch, CAM_DEFAULT, 20, -12) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(20) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVarA, LVarB, LVarC) + EVT_CALL(SetCamDistance, CAM_DEFAULT, -350) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.8)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Mouser_Purple_Run) + EVT_CALL(NpcMoveTo, NPC_SELF, -23, -105, 20) + EVT_WAIT(10) + EVT_CALL(InterpNpcYaw, NPC_SELF, 65, 0) + EVT_WAIT(10) + EVT_EXEC_WAIT(N(EVS_CloseShopDoor)) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Mouser_Purple_Run) + EVT_CALL(NpcMoveTo, NPC_SELF, 37, -27, 20) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVarA, LVarB, LVarC) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 142, 0, -67) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(NpcMoveTo, NPC_SELF, 62, -6, 20) + EVT_CALL(NpcMoveTo, NPC_SELF, 103, 11, 20) + EVT_CALL(NpcMoveTo, NPC_SELF, 150, 18, 20) + EVT_CALL(EnableNpcBlur, NPC_SELF, TRUE) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_174, 0) + EVT_CALL(NpcMoveTo, NPC_SELF, 554, -12, 20) + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_WAIT(30) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_SET(GB_StoryProgress, STORY_CH2_SHADY_MOUSE_LEFT_SHOP) + EVT_CASE_LT(STORY_CH2_SPOKE_WITH_SHEEK) + EVT_CASE_LT(STORY_CH2_SHADY_MOUSE_ENTERED_SHOP) + EVT_CALL(EnableNpcBlur, NPC_SELF, TRUE) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Mouser_Purple_Run) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_174, 0) + EVT_CALL(SetNpcPos, NPC_SELF, 470, 0, 18) + EVT_CALL(NpcMoveTo, NPC_SELF, 287, 9, 20) + EVT_CALL(NpcMoveTo, NPC_SELF, 102, -14, 20) + EVT_CALL(NpcMoveTo, NPC_SELF, -32, -96, 20) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Mouser_Purple_Idle) + EVT_EXEC_WAIT(N(EVS_OpenShopDoor)) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Mouser_Purple_Run) + EVT_CALL(NpcMoveTo, NPC_SELF, 20, -375, 30) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Mouser_Purple_Idle) + EVT_EXEC_WAIT(N(EVS_CloseShopDoor)) + EVT_CALL(EnableNpcBlur, NPC_SELF, FALSE) + EVT_SET(GB_StoryProgress, STORY_CH2_SHADY_MOUSE_ENTERED_SHOP) + EVT_CASE_DEFAULT + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Mouser_Purple_Idle) + EVT_CALL(SetNpcPos, NPC_SELF, 20, 0, -375) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_ShopOwner) = { + EVT_IF_EQ(AB_DRO_SHOP_PREV1, 4) + EVT_IF_EQ(AB_DRO_SHOP_PREV2, 1) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Mouser_Purple_Talk, ANIM_Mouser_Purple_Idle, 0, MSG_CH2_0088) + EVT_EXEC_WAIT(N(EVS_ShopOwner_LetterDelivery)) + EVT_IF_NE(LVarC, 0) + EVT_RETURN + EVT_END_IF + EVT_RETURN + EVT_END_IF + EVT_END_IF + EVT_EXEC_WAIT(ItemShopInteract) + EVT_EXEC_WAIT(N(EVS_ShopOwner_LetterDelivery)) + EVT_IF_NE(LVarC, 0) + EVT_RETURN + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_ShopOwner) = { + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_ShopOwner))) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_ShopOwner))) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_dro/dro_02/9691C0.c b/src/world/area_dro/dro_02/9691C0.c deleted file mode 100644 index 2c2a08b1cc..0000000000 --- a/src/world/area_dro/dro_02/9691C0.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "dro_02.h" - -#include "world/common/atomic/UnkFunc27.inc.c" - diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c deleted file mode 100644 index 31431ef0d6..0000000000 --- a/src/world/area_dro/dro_02/9694C0.c +++ /dev/null @@ -1,2924 +0,0 @@ -#include "dro_02.h" -#include "effects.h" -#include "script_api/battle.h" -#include "message_ids.h" -#include "entity.h" -#include "sprite/npc/Archeologist.h" -#include "sprite/npc/ChuckQuizmo.h" -#include "sprite/npc/DisguisedMoustafa.h" -#include "sprite/npc/Dryite.h" -#include "sprite/npc/Mouser.h" -#include "sprite/npc/Moustafa.h" -#include "sprite/npc/Toad.h" -#include "sprite/npc/WorldMerlee.h" -#include "sprite/npc/WorldParakarry.h" -#include "sprite.h" - -#define CHUCK_QUIZMO_NPC_ID 10 - -extern s16 MessagePlural; -extern s16 MessageSingular; - -enum { - NPC_ARCHEOLOGIST, - NPC_DRYITE0, - NPC_DISGUISED_MOUSTAFA, - NPC_TOAD, - NPC_WORLD_MERLEE, - NPC_MOUSTAFA, - NPC_DRYITE1, - NPC_MOUSER0, - NPC_MOUSER1, - NPC_MOUSER2, - NPC_CHUCK_QUIZMO, - NPC_DRYITE2, -}; - -// BSS - -typedef struct D_8024F010_Struct { - /* 0x00 */ s32 unk_00; - /* 0x04 */ f32 unk_04; - /* 0x08 */ f32 unk_08; - /* 0x0C */ f32 unk_0C; - /* 0x10 */ f32 unk_10; - /* 0x14 */ f32 unk_14; - /* 0x18 */ s32 unk_18; - /* 0x1C */ s32 unk_1C; - /* 0x20 */ s32 unk_20; -} D_8024F010_Struct; // size = 0x24 - -static f32 N(D_8024EF80); -static f32 N(D_8024EF84); -static s32 N(D_8024EF88); -static s8 N(pad_D_8024EF8C)[0x4]; -static EffectInstance* N(D_8024EF90)[4]; -static s32 N(Quizmo_Worker); -static s32 N(pad_D_8024EFA4); -static s32 N(Quizmo_ScriptArray)[4]; -static s32 N(Quizmo_AnswerResult); -static s8 N(pad_D_8024EFBC)[0x4]; -static EffectInstance* N(Quizmo_StageEffect); -static EffectInstance* N(Quizmo_AudienceEffect); -static EffectInstance* N(Quizmo_VannaTEffect); -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(KeyItemChoiceList)[ITEM_NUM_KEYS + 2]; -static s32 N(ItemChoiceList)[ITEM_NUM_CONSUMABLES + 1]; // extra entry for list terminator -static s32 N(LetterDelivery_SavedNpcAnim); - -// DATA - -EntryList N(entryList) = { - { -473.0f, 0.0f, 12.0f, 90.0f }, - { 415.0f, 35.0f, -15.0f, 180.0f }, - { 0.0f, 0.0f, 0.0f, 0.0f }, - { 0.0f, 0.0f, 0.0f, 0.0f }, -}; - -MapSettings N(settings) = { - .main = &N(main), - .entryList = &N(entryList), - .entryCount = ENTRY_COUNT(N(entryList)), - .background = &gBackgroundImage, - .tattle = { MSG_MapTattle_dro_02 }, -}; - -EvtScript N(80243AF0) = { - EVT_CMD(EVT_OP_CALL, EVT_PTR(GetEntryID), LVar0), - EVT_CMD(EVT_OP_SWITCH, LVar0), - EVT_CMD(EVT_OP_CASE_OR_EQ, 2), - EVT_CMD(EVT_OP_CASE_OR_EQ, 3), - EVT_CMD(EVT_OP_END_CASE_GROUP), - EVT_CMD(EVT_OP_CASE_DEFAULT), - EVT_CMD(EVT_OP_CALL, EVT_PTR(SetMusicTrack), 0, 21, 0, 8), - EVT_CMD(EVT_OP_END_CASE_GROUP), - EVT_CMD(EVT_OP_END_SWITCH), - EVT_CMD(EVT_OP_RETURN), - EVT_CMD(EVT_OP_END) -}; - -EvtScript N(80243B70) = { - EVT_CALL(SetMusicTrack, 0, SONG_TAKING_REST, 0, 8) - EVT_RETURN - EVT_END -}; - -EvtScript N(80243B9C) = { - EVT_CALL(SetMusicTrack, 0, SONG_MOUSTAFA_THEME, 0, 8) - EVT_RETURN - EVT_END -}; - -static s32 N(pad_3BC8)[] = { - 0x00000000, 0x00000000, -}; - -EvtScript N(makeEntities) = { - EVT_CALL(MakeItemEntity, ITEM_LETTER08, -135, 160, -245, 17, GF_DRO02_Item_Letter08) - EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenPanel), 180, 173, -200, 0, 32, MAKE_ENTITY_END) - EVT_CALL(AssignPanelFlag, GF_DRO02_HiddenPanel) - EVT_RETURN - EVT_END -}; - -static s32 N(pad_3C3C) = { - 0x00000000, -}; - -EvtScript N(exitWalk_80243C40) = EVT_EXIT_WALK(60, 0, "dro_01", 1); - -EvtScript N(80243C9C) = { - EVT_BIND_TRIGGER(N(exitWalk_80243C40), TRIGGER_FLOOR_ABOVE, 4, 1, 0) - EVT_RETURN - EVT_END -}; - -EvtScript N(80243CC8) = { - EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_017C, 160, 40) - EVT_CALL(DisablePlayerInput, FALSE) - EVT_RETURN - EVT_END -}; - -EvtScript N(80243D10) = { - EVT_CALL(PlaySound, 0x80000060) - EVT_CALL(UseSettingsFrom, 0, 190, 0, -37) - EVT_CALL(SetPanTarget, 0, 190, 0, -37) - EVT_CALL(SetCamDistance, 0, EVT_FLOAT(200.0)) - EVT_CALL(SetCamPitch, 0, EVT_FLOAT(13.0), EVT_FLOAT(-10.0)) - EVT_CALL(SetCamSpeed, 0, EVT_FLOAT(90.0)) - EVT_CALL(PanToTarget, 0, 0, 1) - EVT_CALL(N(UnkFunc27), 2, 0, 3) - EVT_CALL(N(UnkFunc27), 1, -1, 3) - EVT_CALL(N(UnkFunc26), 3, 44, 32, 177, 0, 0, 0, 0, 0, 0) - EVT_CALL(DisablePlayerInput, TRUE) - EVT_THREAD - EVT_CALL(ShakeCam, 0, 0, 300, EVT_FLOAT(0.2)) - EVT_END_THREAD - EVT_THREAD - EVT_WAIT(60) - EVT_CALL(GetEntryID, LVar0) - EVT_IF_EQ(LVar0, 2) - EVT_CALL(GotoMap, EVT_PTR("sbk_02"), 6) - EVT_ELSE - EVT_CALL(GotoMap, EVT_PTR("sbk_02"), 7) - EVT_END_IF - EVT_WAIT(100) - EVT_END_THREAD - EVT_RETURN - EVT_END -}; - -EvtScript N(main) = { - EVT_SET(GB_WorldLocation, 9) - EVT_CALL(SetSpriteShading, -1) - EVT_CALL(SetCamPerspective, 0, 3, 25, 16, 4096) - EVT_CALL(SetCamBGColor, 0, 0, 0, 0) - EVT_CALL(SetCamEnabled, 0, 1) - EVT_CALL(SetCamLeadPlayer, 0, 0) - EVT_CALL(MakeNpcs, 0, EVT_PTR(N(npcGroupList_8024EEF4))) - EVT_CALL(InitVirtualEntityList) - EVT_EXEC_WAIT(N(makeEntities)) - EVT_EXEC_WAIT(N(80244C78)) - EVT_EXEC(N(80243AF0)) - EVT_CALL(GetEntryID, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(2) - EVT_CASE_OR_EQ(3) - EVT_EXEC_WAIT(N(80243D10)) - EVT_END_CASE_GROUP - EVT_CASE_DEFAULT - EVT_SET(LVar0, EVT_PTR(N(80243C9C))) - EVT_EXEC(EnterWalk) - EVT_END_SWITCH - EVT_WAIT(1) - EVT_THREAD - EVT_CALL(SetTexPanner, 162, TEX_PANNER_1) - EVT_SET(LVar0, 0) - EVT_LABEL(123) - EVT_ADD(LVar0, 420) - EVT_IF_GT(LVar0, 65536) - EVT_ADD(LVar0, -65536) - EVT_END_IF - EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, 0, LVar0) - EVT_WAIT(1) - EVT_GOTO(123) - EVT_END_THREAD - EVT_SET(MapFlag(0), 0) - EVT_BIND_TRIGGER(N(80243CC8), TRIGGER_WALL_PRESS_A, 56, 1, 0) - EVT_THREAD - EVT_LOOP(0) - EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) - EVT_IF_LT(LVar2, -200) - EVT_CALL(EnableGroup, 163, 1) - EVT_ELSE - EVT_CALL(EnableGroup, 163, 0) - EVT_END_IF - EVT_WAIT(1) - EVT_END_LOOP - EVT_END_THREAD - EVT_CALL(SetCamSpeed, 0, EVT_FLOAT(1.333984375)) - EVT_RETURN - EVT_END -}; - -static s32 N(pad_41B4)[] = { - 0x00000000, 0x00000000, 0x00000000, -}; - -EvtScript N(802441C0) = { - EVT_LABEL(9) - EVT_CALL(MakeLerp, 10, -10, 30, 10) - EVT_LABEL(10) - EVT_CALL(UpdateLerp) - EVT_CALL(RotateModel, 48, LVar0, 1, 0, 0) - EVT_WAIT(1) - EVT_IF_EQ(LVar1, 1) - EVT_GOTO(10) - EVT_END_IF - EVT_CALL(MakeLerp, -10, 10, 30, 10) - EVT_LABEL(11) - EVT_CALL(UpdateLerp) - EVT_CALL(RotateModel, 48, LVar0, 1, 0, 0) - EVT_WAIT(1) - EVT_IF_EQ(LVar1, 1) - EVT_GOTO(11) - EVT_END_IF - EVT_GOTO(9) - EVT_RETURN - EVT_END -}; - -EvtScript N(802442F0) = { - EVT_DIV(LVar0, 2) - EVT_ADD(LVar0, 18) - EVT_CALL(RotateModel, 21, LVar0, 0, 1, 0) - EVT_RETURN - EVT_END -}; - -EvtScript N(openDoor_80244340) = { - EVT_CALL(RotateModel, 108, LVar0, 0, -1, 0) - EVT_CALL(RotateModel, 110, LVar0, 0, 1, 0) - EVT_RETURN - EVT_END -}; - -EvtScript N(moveWalls_80244390) = { - EVT_SET(LVar1, LVar0) - EVT_DIVF(LVar1, 50) - EVT_CALL(TranslateModel, 104, 0, LVar1, 0) - EVT_CALL(TranslateModel, 105, 0, LVar1, 0) - EVT_CALL(TranslateModel, 106, 0, LVar1, 0) - EVT_CALL(RotateModel, 104, LVar0, 1, 0, 0) - EVT_CALL(RotateModel, 105, LVar0, 1, 0, 0) - EVT_CALL(RotateModel, 106, LVar0, 1, 0, 0) - EVT_RETURN - EVT_END -}; - -EvtScript N(dropDoor_80244474) = { - EVT_SET(LVar1, LVar0) - EVT_DIVF(LVar1, 50) - EVT_CALL(TranslateModel, 108, 0, LVar1, 0) - EVT_CALL(TranslateModel, 110, 0, LVar1, 0) - EVT_CALL(RotateModel, 108, LVar0, 1, 0, 0) - EVT_CALL(RotateModel, 110, LVar0, 1, 0, 0) - EVT_RETURN - EVT_END -}; - -EvtScript N(openDoor_8024451C) = { - EVT_CALL(RotateModel, 62, LVar0, 0, 1, 0) - EVT_RETURN - EVT_END -}; - -EvtScript N(moveWalls_8024454C) = { - EVT_SET(LVar1, LVar0) - EVT_DIVF(LVar1, 50) - EVT_CALL(RotateGroup, 61, LVar0, 0, 0, -1) - EVT_RETURN - EVT_END -}; - -EvtScript N(8024459C) = { - EVT_SWITCH(LVar0) - EVT_CASE_EQ(0) - EVT_CALL(SetCamSpeed, 0, EVT_FLOAT(3.0)) - EVT_CASE_EQ(3) - EVT_CALL(SetCamSpeed, 0, EVT_FLOAT(1.333984375)) - EVT_END_SWITCH - EVT_RETURN - EVT_END -}; - -EvtScript N(toggleVis_80244600) = { - EVT_SWITCH(LVar0) - EVT_CASE_EQ(0) - EVT_CALL(SetGroupEnabled, 87, 1) - EVT_CALL(SetCamSpeed, 0, EVT_FLOAT(3.0)) - EVT_CASE_EQ(3) - EVT_CALL(SetGroupEnabled, 87, 0) - EVT_CALL(SetCamSpeed, 0, EVT_FLOAT(1.333984375)) - EVT_END_SWITCH - EVT_RETURN - EVT_END -}; - -EvtScript N(toggleVis_8024468C) = { - EVT_SWITCH(LVar0) - EVT_CASE_EQ(0) - EVT_CALL(SetGroupEnabled, 132, 1) - EVT_CALL(SetCamType, 0, 0, 0) - EVT_CALL(SetCamDistance, 0, 260) - EVT_CALL(SetCamPitch, 0, 22, -13) - EVT_CALL(SetCamPosA, 0, 0, 290) - EVT_CALL(SetCamPosB, 0, 0, -290) - EVT_CALL(SetCamPosC, 0, 0, 0) - EVT_CALL(SetPanTarget, 0, -395, 140, -150) - EVT_CALL(SetCamSpeed, 0, EVT_FLOAT(4.0)) - EVT_CALL(PanToTarget, 0, 0, 1) - EVT_CASE_EQ(2) - EVT_CALL(SetPanTarget, 0, -365, 140, -145) - EVT_CALL(SetCamPitch, 0, 20, -7) - EVT_CALL(SetCamDistance, 0, 400) - EVT_CALL(SetCamSpeed, 0, EVT_FLOAT(4.0)) - EVT_CALL(WaitForCam, 0, EVT_FLOAT(1.0)) - EVT_CASE_EQ(3) - EVT_CALL(SetGroupEnabled, 132, 0) - EVT_CALL(PanToTarget, 0, 0, 0) - EVT_CALL(SetCamSpeed, 0, EVT_FLOAT(1.333984375)) - EVT_END_SWITCH - EVT_RETURN - EVT_END -}; - -EvtScript N(8024486C) = { - EVT_SET_GROUP(EVT_GROUP_00) - EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(func_802D2C14, 1) - EVT_CALL(PlayerMoveTo, 230, 10, 20) - EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 8, 0x7FFFFE00) - EVT_CALL(PlaySoundAtCollider, 8, 449, 0) - EVT_CALL(MakeLerp, 18, 80, 10, 0) - EVT_LOOP(0) - EVT_CALL(UpdateLerp) - EVT_CALL(RotateModel, 21, LVar0, 0, 1, 0) - EVT_WAIT(1) - EVT_IF_EQ(LVar1, 0) - EVT_BREAK_LOOP - EVT_END_IF - EVT_END_LOOP - EVT_CALL(PlayerMoveTo, 230, -70, 15) - EVT_CALL(MakeLerp, 80, 18, 10, 0) - EVT_LOOP(0) - EVT_CALL(UpdateLerp) - EVT_CALL(RotateModel, 21, LVar0, 0, 1, 0) - EVT_WAIT(1) - EVT_IF_EQ(LVar1, 0) - EVT_BREAK_LOOP - EVT_END_IF - EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, 8, 450, 0) - EVT_CALL(ModifyColliderFlags, 1, 8, 0x7FFFFE00) - EVT_CALL(func_802D2C14, 0) - EVT_CALL(DisablePlayerInput, FALSE) - EVT_RETURN - EVT_END -}; - -EvtScript N(80244A68) = { - EVT_SET_GROUP(EVT_GROUP_00) - EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(func_802D2C14, 1) - EVT_CALL(PlayerMoveTo, 230, -70, 20) - EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 10, 0x7FFFFE00) - EVT_CALL(PlaySoundAtCollider, 10, 449, 0) - EVT_CALL(MakeLerp, 18, 80, 10, 0) - EVT_LOOP(0) - EVT_CALL(UpdateLerp) - EVT_CALL(RotateModel, 21, LVar0, 0, 1, 0) - EVT_WAIT(1) - EVT_IF_EQ(LVar1, 0) - EVT_BREAK_LOOP - EVT_END_IF - EVT_END_LOOP - EVT_CALL(PlayerMoveTo, 230, 10, 15) - EVT_CALL(MakeLerp, 80, 18, 10, 0) - EVT_LOOP(0) - EVT_CALL(UpdateLerp) - EVT_CALL(RotateModel, 21, LVar0, 0, 1, 0) - EVT_WAIT(1) - EVT_IF_EQ(LVar1, 0) - EVT_BREAK_LOOP - EVT_END_IF - EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, 10, 450, 0) - EVT_CALL(ModifyColliderFlags, 1, 10, 0x7FFFFE00) - EVT_CALL(func_802D2C14, 0) - EVT_CALL(DisablePlayerInput, FALSE) - EVT_RETURN - EVT_END -}; - -s32 N(npcList_80244C64)[] = { - 0x00000002, 0x00000005, 0xFFFFFFFF, -}; - -s32 N(npcList_80244C70)[] = { - 0x00000003, 0xFFFFFFFF, -}; - -EvtScript N(80244C78) = { - EVT_EXEC(N(802441C0)) - EVT_CALL(ParentColliderToModel, 8, 21) - EVT_IF_GE(GB_StoryProgress, -64) - EVT_CALL(RotateModel, 21, 18, 0, 1, 0) - EVT_CALL(UpdateColliderTransform, 8) - EVT_END_IF - EVT_CALL(MakeDoorAdvanced, 4, EVT_PTR(N(openDoor_80244340)), EVT_PTR(N(moveWalls_80244390)), EVT_PTR(N(dropDoor_80244474)), EVT_PTR(N(toggleVis_8024468C)), 15, 16, 133, EVT_PTR(N(npcList_80244C64))) - EVT_IF_GE(GB_StoryProgress, -64) - EVT_BIND_TRIGGER(N(8024486C), TRIGGER_WALL_PRESS_A, 8, 1, 0) - EVT_BIND_TRIGGER(N(80244A68), TRIGGER_WALL_PRESS_A, 10, 1, 0) - EVT_END_IF - EVT_CALL(MakeDoorAdvanced, 4101, EVT_PTR(N(openDoor_8024451C)), EVT_PTR(N(moveWalls_8024454C)), 0, EVT_PTR(N(toggleVis_80244600)), 12, 13, 94, EVT_PTR(N(npcList_80244C70))) - EVT_SET(LVar0, 3) - EVT_EXEC(N(toggleVis_8024468C)) - EVT_EXEC(N(8024459C)) - EVT_EXEC(N(toggleVis_80244600)) - EVT_RETURN - EVT_END -}; - -static s32 N(pad_4DD4)[] = { - 0x00000000, 0x00000000, 0x00000000, -}; - -#include "world/common/atomic/QuizmoData.inc.c" - -MobileAISettings N(npcAISettings_80247408) = { - .moveSpeed = 1.5f, - .moveTime = 60, - .waitTime = 30, - .playerSearchInterval = -1, - .unk_AI_2C = 1, -}; - -EvtScript N(npcAI_80247438) = { - EVT_CALL(BasicAI_Main, EVT_PTR(N(npcAISettings_80247408))) - EVT_RETURN - EVT_END -}; - -NpcSettings N(npcSettings_80247458) = { - .height = 35, - .radius = 24, - .ai = &N(npcAI_80247438), - .level = 99, - .actionFlags = 0x10, -}; - -NpcSettings N(npcSettings_80247484) = { - .height = 42, - .radius = 24, - .ai = &N(npcAI_80247438), - .level = 99, -}; - -MobileAISettings N(npcAISettings_802474B0) = { - .moveSpeed = 1.5f, - .moveTime = 60, - .waitTime = 30, - .playerSearchInterval = -1, - .unk_AI_2C = 1, -}; - -EvtScript N(npcAI_802474E0) = { - EVT_CALL(BasicAI_Main, EVT_PTR(N(npcAISettings_802474B0))) - EVT_RETURN - EVT_END -}; - -NpcSettings N(npcSettings_80247500) = { - .height = 26, - .radius = 23, - .ai = &N(npcAI_802474E0), - .level = 99, - .actionFlags = 16, -}; - -NpcSettings N(npcSettings_8024752C) = { - .height = 26, - .radius = 23, - .level = 99, -}; - -NpcSettings N(npcSettings_80247558) = { - .height = 22, - .radius = 25, - .level = 99, -}; - -NpcSettings N(npcSettings_80247584) = { - .height = 30, - .radius = 24, - .level = 99, -}; - -NpcSettings N(npcSettings_802475B0) = { - .height = 23, - .radius = 19, - .level = 99, -}; - -s8 N(D_802475DC_97079C)[] = { - 0x14, 0x0A, 0x05, 0x00, -}; - -s8 N(D_802475E0_9707A0)[] = { - 0x32, 0x14, 0x05, 0x00, -}; - -s32 N(pad_XX111)[] = { 0 }; - -// 32x32 Ci4 -s32 N(image1)[] = { - 0x66000000, 0x00000000, 0x00000000, 0x00000000, 0x60000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000333, 0x33333333, 0x33333333, 0x33333333, - 0x00000333, 0x33333333, 0x33333333, 0x33333333, 0x00000334, 0x44442024, 0x44444444, 0x20244444, - 0x00000334, 0x41120202, 0x11444112, 0x02021144, 0x00000334, 0x11202120, 0x21141120, 0x21202114, - 0x00000334, 0x12021112, 0x02141202, 0x11120214, 0x00000334, 0x20211511, 0x20242021, 0x15112024, - 0x00000332, 0x02115551, 0x12020211, 0x55511202, 0x00000330, 0x21155555, 0x11202115, 0x55551120, - 0x00000332, 0x02115551, 0x12020211, 0x55511202, 0x00000334, 0x20211511, 0x20212021, 0x15112021, - 0x00000334, 0x12021112, 0x02111202, 0x11120211, 0x00000334, 0x11202120, 0x21131120, 0x21202113, - 0x00000334, 0x41120202, 0x11333112, 0x02021133, 0x00000334, 0x44442021, 0x13333311, 0x20211333, - 0x00000334, 0x44442021, 0x13333311, 0x20211333, 0x00000334, 0x44442021, 0x13333311, 0x20211333, - 0x00000334, 0x41120202, 0x11333112, 0x02021133, 0x00000334, 0x11202120, 0x21131120, 0x21202113, - 0x00000334, 0x12021112, 0x02111202, 0x11120211, 0x00000334, 0x20211511, 0x20212021, 0x12112021, - 0x00000332, 0x02115551, 0x12020211, 0x22211202, 0x00000330, 0x21155555, 0x11202112, 0x22221120, - 0x00000332, 0x02115551, 0x12020211, 0x22211202, 0x00000334, 0x20211511, 0x20212021, 0x12112021, - 0x00000334, 0x12021112, 0x02111202, 0x11120211, 0x00000334, 0x11202120, 0x21131120, 0x21202113, - 0x00000334, 0x41120202, 0x11333112, 0x02021133, 0x00000334, 0x44442021, 0x13333311, 0x20211333, -}; - -// Above palette -s32 N(image1_pal)[] = { - 0xEF7BB18D, 0xCCABCD4F, 0x998DC30F, 0xEF7BEDF2, 0x0D2F0000, 0x00000000, 0x00000000, 0x00000000, -}; - - -Vtx N(D_80247808_9709C8)[] = { - { .v = {{ -24, 2, 0 }, 0, { 0, 60 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - { .v = {{ -22, 0, 0 }, 0, { 85, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - { .v = {{ 22, 0, 0 }, 0, { 1963, 0 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - { .v = {{ 24, 2, 0 }, 0, { 2048, 60 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - { .v = {{ 24, 66, 0 }, 0, { 2048, 1988 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - { .v = {{ 22, 68, 0 }, 0, { 1963, 2048 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - { .v = {{ -22, 68, 0 }, 0, { 85, 2048 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, - { .v = {{ -24, 66, 0 }, 0, { 0, 1988 }, { 0xFF, 0xFF, 0xFF, 0xFF }}}, -}; - -Vtx N(D_80247888_970A48)[] = { - { .v = {{ -30, 68, -2 }, 0, { 0, -160 }, { 0x00, 0x00, 0x00, 0x00 }}}, - { .v = {{ 30, 68, -2 }, 0, { 1920, -160 }, { 0x00, 0x00, 0x00, 0x00 }}}, - { .v = {{ -30, 0, -2 }, 0, { 0, 2016 }, { 0x00, 0x00, 0x00, 0x00 }}}, - { .v = {{ 30, 0, -2 }, 0, { 1920, 2016 }, { 0x00, 0x00, 0x00, 0x00 }}}, -}; - -Gfx N(D_802478C8_970A88)[] = { - gsDPPipeSync(), - gsDPSetCycleType(G_CYC_1CYCLE), - gsSPClearGeometryMode(G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), - gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH), - gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), - gsDPSetTextureLOD(G_TL_TILE), - gsDPSetTextureLUT(G_TT_RGBA16), - gsDPSetTexturePersp(G_TP_PERSP), - gsDPSetTextureFilter(G_TF_BILERP), - gsDPSetColorDither(G_CD_DISABLE), - gsDPSetTextureDetail(G_TD_CLAMP), - gsDPSetTextureConvert(G_TC_FILT), - gsDPSetCombineKey(G_CK_NONE), - gsDPSetAlphaCompare(G_AC_NONE), - gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA), - gsDPLoadTLUT_pal16(0, N(image1_pal)), - gsDPLoadTextureTile_4b(N(image1), G_IM_FMT_CI, 32, 0, 0, 0, 31, 31, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD), - gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2), - gsSPEndDisplayList(), -}; - -Gfx N(D_802479B8_970B78)[] = { - gsDPPipeSync(), - gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA), - gsSPClearGeometryMode(G_CULL_BOTH), - gsSPSetGeometryMode(G_CULL_BACK), - gsSPVertex(N(D_80247808_9709C8), 8, 0), - gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), - gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0), - gsSP2Triangles(0, 5, 6, 0, 0, 6, 7, 0), - gsDPPipeSync(), - gsDPSetCombineLERP(0, 0, 0, 1, 0, 0, 0, TEXEL0, 0, 0, 0, 1, 0, 0, 0, TEXEL0), - gsSPClearGeometryMode(G_CULL_BOTH), - gsSPSetGeometryMode(G_CULL_FRONT), - gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), - gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0), - gsSP2Triangles(0, 5, 6, 0, 0, 6, 7, 0), - gsSPEndDisplayList(), -}; - -Gfx N(D_80247A38_970BF8)[] = { - gsDPPipeSync(), - gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA), - gsSPClearGeometryMode(G_CULL_BOTH), - gsSPSetGeometryMode(G_CULL_FRONT), - gsSPVertex(N(D_80247888_970A48), 4, 0), - gsSP2Triangles(0, 2, 1, 0, 1, 2, 3, 0), - gsSPSetGeometryMode(G_CULL_BACK), - gsDPPipeSync(), - gsSPEndDisplayList(), -}; - -EvtScript N(init_80247A80) = { - EVT_RETURN - EVT_END -}; - -EvtScript N(npcAI_80247A90) = { - EVT_RETURN - EVT_END -}; - -EvtScript N(80247AA0) = { - EVT_USE_ARRAY(EVT_PTR(N(D_8024EFD0))) - EVT_SET(ArrayVar(9), 0) - EVT_CALL(GetNpcPos, 4, ArrayVar(4), ArrayVar(5), ArrayVar(6)) - EVT_ADD(ArrayVar(4), 60) - EVT_ADD(ArrayVar(6), 0) - EVT_CALL(PlaySoundAtNpc, 4, 0x201, 0) - EVT_THREAD - EVT_CALL(MakeLerp, 720, 0, 60, 0) - EVT_LOOP(0) - EVT_CALL(UpdateLerp) - EVT_CALL(SetNpcRotation, 4, 0, LVar0, 0) - EVT_IF_GT(LVar0, 360) - EVT_ADD(LVar0, -360) - EVT_END_IF - EVT_SWITCH(LVar0) - EVT_CASE_RANGE(90, 270) - EVT_SET(LVar2, 12189697) - EVT_CASE_DEFAULT - EVT_SET(LVar2, 12189698) - EVT_END_SWITCH - EVT_CALL(SetNpcAnimation, 4, LVar2) - EVT_WAIT(1) - EVT_IF_EQ(LVar1, 0) - EVT_BREAK_LOOP - EVT_END_IF - EVT_END_LOOP - EVT_CALL(SetNpcRotation, 4, 0, 0, 0) - EVT_CALL(SetNpcAnimation, 4, ANIM_WorldMerlee_Gather) - EVT_WAIT(200) - EVT_CALL(SetNpcAnimation, 4, ANIM_WorldMerlee_Bow) - EVT_WAIT(40) - EVT_CALL(SetNpcAnimation, 4, ANIM_WorldMerlee_Gather) - EVT_WAIT(75) - EVT_CALL(SetNpcAnimation, 4, ANIM_WorldMerlee_Release) - EVT_END_THREAD - EVT_WAIT(60) - EVT_CALL(PlaySoundAtNpc, 4, 0x202, 0) - EVT_SET(LVar0, ArrayVar(5)) - EVT_ADD(LVar0, 25) - EVT_CALL(PlayEffect, 0x4F, 0, ArrayVar(4), LVar0, ArrayVar(6), 1, -1, 0, 0, 0, 0, 0, 0, 0) - EVT_SET(ArrayVar(8), LVarF) - EVT_THREAD - EVT_WAIT(30) - EVT_CALL(func_802D7B10, ArrayVar(8)) - EVT_END_THREAD - EVT_CALL(N(func_802414C0_96A680)) - EVT_CALL(DisablePlayerPhysics, TRUE) - EVT_CALL(InterpPlayerYaw, 0, 0) - EVT_CALL(N(func_802416FC_96A8BC)) - EVT_THREAD - EVT_LOOP(0) - EVT_IF_EQ(ArrayVar(9), 2) - EVT_BREAK_LOOP - EVT_END_IF - EVT_WAIT(1) - EVT_END_LOOP - EVT_CALL(PlaySound, -1342177251) - EVT_WAIT(10) - EVT_CALL(PlaySound, -1342177251) - EVT_WAIT(9) - EVT_CALL(PlaySound, -1342177251) - EVT_WAIT(4) - EVT_CALL(PlaySound, -1342177251) - EVT_WAIT(4) - EVT_CALL(PlaySound, -1342177251) - EVT_WAIT(3) - EVT_CALL(PlaySound, -1342177251) - EVT_WAIT(2) - EVT_CALL(PlaySound, -1342177251) - EVT_WAIT(2) - EVT_CALL(PlaySound, -1342177251) - EVT_WAIT(2) - EVT_CALL(PlaySound, -1342177251) - EVT_WAIT(3) - EVT_CALL(PlaySound, -1342177251) - EVT_WAIT(2) - EVT_CALL(PlaySound, -1342177251) - EVT_WAIT(6) - EVT_CALL(PlaySound, -1342177251) - EVT_WAIT(3) - EVT_CALL(PlaySound, -1342177251) - EVT_WAIT(3) - EVT_CALL(PlaySound, -1342177251) - EVT_WAIT(3) - EVT_CALL(PlaySound, -1342177251) - EVT_WAIT(3) - EVT_CALL(PlaySound, -1342177251) - EVT_END_THREAD - EVT_THREAD - EVT_LOOP(0) - EVT_IF_GE(ArrayVar(9), 3) - EVT_BREAK_LOOP - EVT_END_IF - EVT_WAIT(1) - EVT_END_LOOP - EVT_WAIT(9) - EVT_CALL(N(func_8024303C_96C1FC)) - EVT_WAIT(2) - EVT_CALL(N(func_80243068_96C228)) - EVT_LOOP(0) - EVT_IF_GE(ArrayVar(9), 10) - EVT_BREAK_LOOP - EVT_END_IF - EVT_WAIT(1) - EVT_END_LOOP - EVT_WAIT(3) - EVT_CALL(PlaySound, 0x204) - EVT_LOOP(0) - EVT_IF_GE(ArrayVar(9), 11) - EVT_BREAK_LOOP - EVT_END_IF - EVT_WAIT(1) - EVT_END_LOOP - EVT_WAIT(15) - EVT_CALL(PlaySound, 0x205) - EVT_END_THREAD - EVT_LOOP(0) - EVT_IF_EQ(ArrayVar(9), 13) - EVT_BREAK_LOOP - EVT_END_IF - EVT_WAIT(1) - EVT_END_LOOP - EVT_CALL(SetPlayerPos, ArrayVar(4), ArrayVar(5), ArrayVar(6)) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_GotItem) - EVT_WAIT(1) - EVT_CALL(SetPlayerPos, ArrayVar(4), ArrayVar(5), ArrayVar(6)) - EVT_WAIT(1) - EVT_CALL(DisablePlayerPhysics, FALSE) - EVT_CALL(N(func_80241874_96AA34)) - EVT_THREAD - EVT_CALL(N(func_802415CC_96A78C)) - EVT_END_THREAD - EVT_RETURN - EVT_END -}; - -EvtScript N(802481D8) = { - EVT_CALL(GetNpcPos, 4, LVar0, LVar1, LVar2) - EVT_CALL(UseSettingsFrom, 0, LVar0, LVar1, LVar2) - EVT_CALL(SetCamDistance, 0, 200) - EVT_CALL(SetPanTarget, 0, LVar0, LVar1, LVar2) - EVT_CALL(SetCamSpeed, 0, EVT_FLOAT(8.0)) - EVT_CALL(SetCamPitch, 0, 20, -15) - EVT_CALL(PanToTarget, 0, 0, 1) - EVT_CALL(WaitForCam, 0, EVT_FLOAT(1.0)) - EVT_RETURN - EVT_END -}; - -EvtScript N(802482A8) = { - EVT_CALL(PanToTarget, 0, 0, 0) - EVT_CALL(SetCamSpeed, 0, EVT_FLOAT(3.0)) - EVT_CALL(WaitForCam, 0, EVT_FLOAT(1.0)) - EVT_RETURN - EVT_END -}; - -EvtScript N(802482F8) = { - EVT_CALL(func_802D2C14, 1) - EVT_EXEC_WAIT(N(802481D8)) - EVT_SET(LVar0, 0) - EVT_IF_EQ(GB_KootFavor_Current, 8) - EVT_ADD(LVar0, 1) - EVT_END_IF - EVT_IF_EQ(GF_HOS06_MerluvleeRequestedCrystalBall, 1) - EVT_ADD(LVar0, 1) - EVT_END_IF - EVT_IF_EQ(GF_DRO01_Gift_CrystalBall, 0) - EVT_ADD(LVar0, 1) - EVT_END_IF - EVT_IF_EQ(LVar0, 3) - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldMerlee_Talk, ANIM_WorldMerlee_Idle, 0, MSG_CH2_00DC) - EVT_SET(LVar0, 39) - EVT_SET(LVar1, 1) - EVT_EXEC_WAIT(N(EVS_Quizmo_GiveItem_0)) - EVT_CALL(AddKeyItem, ITEM_CRYSTAL_BALL) - EVT_SET(GF_DRO01_Gift_CrystalBall, 1) - EVT_WAIT(20) - EVT_CALL(func_802D2C14, 0) - EVT_EXEC_WAIT(N(802482A8)) - EVT_RETURN - EVT_END_IF - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldMerlee_Talk, ANIM_WorldMerlee_Idle, 0, MSG_CH2_00D6) - EVT_CALL(ShowChoice, MSG_Choice_0011) - EVT_IF_NE(LVar0, 0) - EVT_CALL(ContinueSpeech, -1, ANIM_WorldMerlee_Talk, ANIM_WorldMerlee_Idle, 0, MSG_CH2_00D7) - EVT_CALL(func_802D2C14, 0) - EVT_EXEC_WAIT(N(802482A8)) - EVT_RETURN - EVT_END_IF - EVT_CALL(ContinueSpeech, -1, ANIM_WorldMerlee_Talk, ANIM_WorldMerlee_Idle, 0, MSG_CH2_00D8) - EVT_CALL(ShowCoinCounter, 1) - EVT_CALL(ShowChoice, MSG_Choice_0018) - EVT_CALL(ShowCoinCounter, 0) - EVT_IF_EQ(LVar0, 3) - EVT_CALL(ContinueSpeech, -1, ANIM_WorldMerlee_Talk, ANIM_WorldMerlee_Idle, 0, MSG_CH2_00D7) - EVT_CALL(func_802D2C14, 0) - EVT_EXEC_WAIT(N(802482A8)) - EVT_RETURN - EVT_END_IF - EVT_CALL(N(func_80241394_96A554), LVar0, LVar1) - EVT_IF_NE(LVar1, 0) - EVT_CALL(ContinueSpeech, -1, ANIM_WorldMerlee_Talk, ANIM_WorldMerlee_Idle, 0, MSG_CH2_00D9) - EVT_CALL(func_802D2C14, 0) - EVT_EXEC_WAIT(N(802482A8)) - EVT_RETURN - EVT_END_IF - EVT_CALL(ContinueSpeech, -1, ANIM_WorldMerlee_Talk, ANIM_WorldMerlee_Idle, 0, MSG_CH2_00DA) - EVT_CALL(SetMusicTrack, 0, SONG_MERLEE_SPELL, 0, 8) - EVT_CALL(DisablePartnerAI, 0) - EVT_CALL(SetNpcAnimation, NPC_PARTNER, 0x106) - EVT_EXEC_GET_TID(N(80247AA0), LVar9) - EVT_LOOP(0) - EVT_IS_THREAD_RUNNING(LVar9, LVar1) - EVT_IF_EQ(LVar1, 0) - EVT_BREAK_LOOP - EVT_END_IF - EVT_WAIT(1) - EVT_END_LOOP - EVT_WAIT(60) - EVT_CALL(SetNpcAnimation, 4, ANIM_WorldMerlee_Idle) - EVT_CALL(PlayerMoveTo, -100, -370, 8) - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldMerlee_Talk, ANIM_WorldMerlee_Idle, 0, MSG_CH2_00DB) - EVT_EXEC(N(80243AF0)) - EVT_CALL(EnablePartnerAI) - EVT_CALL(func_802D2C14, 0) - EVT_EXEC_WAIT(N(802482A8)) - EVT_RETURN - EVT_END -}; - -NpcSettings N(npcSettings_80248754) = { - .height = 32, - .radius = 32, - .otherAI = &N(init_80247A80), - .onInteract = &N(802482F8), - .ai = &N(npcAI_80247A90), - .level = 99, -}; - -s32 N(ItemChoice_HasSelectedItem) = { - 0x00000000, -}; - -s32 N(ItemChoice_SelectedItemID) = { - 0x00000000, -}; - -EvtScript N(80248788) = { - EVT_SET(LVar9, LVar1) - EVT_CALL(ShowKeyChoicePopup) - EVT_SET(LVarA, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_EQ(0) - EVT_CASE_EQ(-1) - EVT_CASE_DEFAULT - EVT_CALL(RemoveKeyItemAt, LVar1) - EVT_CALL(GetPlayerPos, LVar3, LVar4, LVar5) - EVT_CALL(N(AddPlayerHandsOffset), LVar3, LVar4, LVar5) - EVT_BITWISE_OR_CONST(LVar0, 0x50000) - EVT_CALL(MakeItemEntity, LVar0, LVar3, LVar4, LVar5, 1, 0) - EVT_CALL(SetPlayerAnimation, 393221) - EVT_WAIT(30) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) - EVT_CALL(RemoveItemEntity, LVar0) - EVT_END_SWITCH - EVT_CALL(N(ItemChoice_SaveSelected), LVarA) - EVT_CALL(CloseChoicePopup) - EVT_UNBIND - EVT_RETURN - EVT_END -}; - -EvtScript N(802488CC) = { - EVT_CALL(N(BuildKeyItemChoiceList), LVar0) - EVT_BIND_PADLOCK(N(80248788), 0x10, 0, EVT_PTR(N(KeyItemChoiceList)), 0, 1) - EVT_CALL(N(ItemChoice_WaitForSelection), LVar0) - EVT_RETURN - EVT_END -}; - -EvtScript N(8024891C) = { - EVT_SET(LVar9, LVar1) - EVT_CALL(ShowConsumableChoicePopup) - EVT_SET(LVarA, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_EQ(0) - EVT_CASE_EQ(-1) - EVT_CASE_DEFAULT - EVT_CALL(RemoveItemAt, LVar1) - EVT_CALL(GetPlayerPos, LVar3, LVar4, LVar5) - EVT_CALL(N(AddPlayerHandsOffset), LVar3, LVar4, LVar5) - EVT_CALL(MakeItemEntity, LVar0, LVar3, LVar4, LVar5, 1, 0) - EVT_CALL(SetPlayerAnimation, 393221) - EVT_WAIT(30) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) - EVT_CALL(RemoveItemEntity, LVar0) - EVT_END_SWITCH - EVT_CALL(N(ItemChoice_SaveSelected), LVarA) - EVT_CALL(CloseChoicePopup) - EVT_UNBIND - EVT_RETURN - EVT_END -}; - -EvtScript N(80248A50) = { - EVT_CALL(N(BuildItemChoiceList), LVar0) - EVT_BIND_PADLOCK(N(8024891C), 0x10, 0, EVT_PTR(N(ItemChoiceList)), 0, 1) - EVT_CALL(N(ItemChoice_WaitForSelection), LVar0) - EVT_RETURN - EVT_END -}; - -extern Gfx N(D_8024A3B8_973578)[]; -extern Vtx vtx_971F98[]; - -StaticAnimatorNode N(D_80248AA0_971C60) = { - .displayList = N(D_8024A3B8_973578), - .vertexStartOffset = 0x02EE, - .vtxList = vtx_971F98, -}; - -StaticAnimatorNode N(D_80248ACC_971C8C) = { - .displayList = N(D_8024A3B8_973578), - .sibling = &N(D_80248AA0_971C60), - .vertexStartOffset = 0x02BC, - .vtxList = vtx_971F98, -}; - -StaticAnimatorNode N(D_80248AF8_971CB8) = { - .displayList = N(D_8024A3B8_973578), - .sibling = &N(D_80248ACC_971C8C), - .vertexStartOffset = 0x028A, - .vtxList = vtx_971F98, -}; - -StaticAnimatorNode N(D_80248B24_971CE4) = { - .displayList = N(D_8024A3B8_973578), - .sibling = &N(D_80248AF8_971CB8), - .vertexStartOffset = 0x0258, - .vtxList = vtx_971F98, -}; - -StaticAnimatorNode N(D_80248B50_971D10) = { - .displayList = N(D_8024A3B8_973578), - .sibling = &N(D_80248B24_971CE4), - .vertexStartOffset = 0x0226, - .vtxList = vtx_971F98, -}; - -StaticAnimatorNode N(D_80248B7C_971D3C) = { - .displayList = N(D_8024A3B8_973578), - .sibling = &N(D_80248B50_971D10), - .vertexStartOffset = 0x01F4, - .vtxList = vtx_971F98, -}; - -StaticAnimatorNode N(D_80248BA8_971D68) = { - .displayList = N(D_8024A3B8_973578), - .sibling = &N(D_80248B7C_971D3C), - .vertexStartOffset = 0x01C2, - .vtxList = vtx_971F98, -}; - -StaticAnimatorNode N(D_80248BD4_971D94) = { - .displayList = N(D_8024A3B8_973578), - .sibling = &N(D_80248BA8_971D68), - .vertexStartOffset = 0x0190, - .vtxList = vtx_971F98, -}; - -StaticAnimatorNode N(D_80248C00_971DC0) = { - .displayList = N(D_8024A3B8_973578), - .sibling = &N(D_80248BD4_971D94), - .vertexStartOffset = 0x015E, - .vtxList = vtx_971F98, -}; - -StaticAnimatorNode N(D_80248C2C_971DEC) = { - .displayList = N(D_8024A3B8_973578), - .sibling = &N(D_80248C00_971DC0), - .vertexStartOffset = 0x012C, - .vtxList = vtx_971F98, -}; - -StaticAnimatorNode N(D_80248C58_971E18) = { - .displayList = N(D_8024A3B8_973578), - .sibling = &N(D_80248C2C_971DEC), - .vertexStartOffset = 0x00FA, - .vtxList = vtx_971F98, -}; - -StaticAnimatorNode N(D_80248C84_971E44) = { - .displayList = N(D_8024A3B8_973578), - .sibling = &N(D_80248C58_971E18), - .vertexStartOffset = 0x00C8, - .vtxList = vtx_971F98, -}; - -StaticAnimatorNode N(D_80248CB0_971E70) = { - .displayList = N(D_8024A3B8_973578), - .sibling = &N(D_80248C84_971E44), - .vertexStartOffset = 0x0096, - .vtxList = vtx_971F98, -}; - -StaticAnimatorNode N(D_80248CDC_971E9C) = { - .displayList = N(D_8024A3B8_973578), - .sibling = &N(D_80248CB0_971E70), - .vertexStartOffset = 0x0064, - .vtxList = vtx_971F98, -}; - -StaticAnimatorNode N(D_80248D08_971EC8) = { - .displayList = N(D_8024A3B8_973578), - .sibling = &N(D_80248CDC_971E9C), - .vertexStartOffset = 0x0032, - .vtxList = vtx_971F98, -}; - -StaticAnimatorNode N(D_80248D34_971EF4) = { - .displayList = N(D_8024A3B8_973578), - .sibling = &N(D_80248D08_971EC8), - .vertexStartOffset = 0, - .vtxList = vtx_971F98, -}; - -StaticAnimatorNode N(D_80248D60_971F20) = { - .child = &N(D_80248D34_971EF4), - .vertexStartOffset = -1, -}; - -StaticAnimatorNode* N(D_80248D8C_971F4C)[] = { - &N(D_80248D60_971F20), &N(D_80248D34_971EF4), &N(D_80248D08_971EC8), &N(D_80248CDC_971E9C), - &N(D_80248CB0_971E70), &N(D_80248C84_971E44), &N(D_80248C58_971E18), &N(D_80248C2C_971DEC), - &N(D_80248C00_971DC0), &N(D_80248BD4_971D94), &N(D_80248BA8_971D68), &N(D_80248B7C_971D3C), - &N(D_80248B50_971D10), &N(D_80248B24_971CE4), &N(D_80248AF8_971CB8), &N(D_80248ACC_971C8C), - &N(D_80248AA0_971C60), 0x00000000, 0x00000000, -}; - -#include "world/area_dro/dro_02/vtx/971F98.vtx.inc.c" - -#include "world/area_dro/dro_02/vtx/9722B8.vtx.inc.c" - -extern s32 N(image2)[]; - -Gfx N(D_8024A3B8_973578)[] = { - gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), - gsDPPipeSync(), - gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), - gsDPLoadTextureBlock(N(image2), G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 32, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_CLAMP, 4, 5, G_TX_NOLOD, G_TX_NOLOD), - gsSPSetGeometryMode(G_LIGHTING), - gsSPVertex(vtx_9722B8, 32, 0), - gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), - gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0), - gsSP2Triangles(4, 6, 7, 0, 4, 7, 5, 0), - gsSP2Triangles(6, 8, 9, 0, 6, 9, 7, 0), - gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0), - gsSP2Triangles(10, 12, 13, 0, 10, 13, 11, 0), - gsSP2Triangles(12, 14, 15, 0, 12, 15, 13, 0), - gsSP2Triangles(14, 16, 17, 0, 14, 17, 15, 0), - gsSP2Triangles(16, 18, 19, 0, 16, 19, 17, 0), - gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0), - gsSP2Triangles(3, 2, 24, 0, 3, 24, 25, 0), - gsSP2Triangles(2, 5, 26, 0, 2, 26, 24, 0), - gsSP2Triangles(5, 7, 27, 0, 5, 27, 26, 0), - gsSP2Triangles(7, 9, 28, 0, 7, 28, 27, 0), - gsSP2Triangles(9, 11, 29, 0, 9, 29, 28, 0), - gsSP2Triangles(11, 13, 30, 0, 11, 30, 29, 0), - gsSP2Triangles(13, 15, 31, 0, 13, 31, 30, 0), - gsSP2Triangles(15, 17, 20, 0, 15, 20, 31, 0), - gsSP2Triangles(17, 19, 21, 0, 17, 21, 20, 0), - gsSP2Triangles(19, 18, 22, 0, 19, 22, 21, 0), - gsSPVertex(vtx_9722B8, 18, 0), - gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), - gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0), - gsSP2Triangles(4, 6, 7, 0, 4, 7, 5, 0), - gsSP2Triangles(6, 8, 9, 0, 6, 9, 7, 0), - gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0), - gsSP2Triangles(10, 12, 13, 0, 10, 13, 11, 0), - gsSP2Triangles(12, 14, 15, 0, 12, 15, 13, 0), - gsSP2Triangles(14, 16, 17, 0, 14, 17, 15, 0), - gsDPPipeSync(), - gsDPSetCombineLERP(PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), - gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF), - gsSPEndDisplayList(), -}; - -// 16x32 RGA16 texture -s32 N(image2)[] = { - 0x9D1D9D1D, 0x9D1D9D1D, 0x9D1D9D1D, 0x9D1D9D1D, 0x9D1D9D1D, 0x9D1D9D1D, 0x9D1D9D1D, 0x9D1D9D1D, - 0x9D1DBDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, - 0x9D1DBDE5, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, - 0x9D1DBDE5, 0xD6ABDEF7, 0xD6ABDEF7, 0xD6ABDEF7, 0xD6ABDEF7, 0xD6ABDEF7, 0xD6ABDEF7, 0xD6ABDEF7, - 0x9D1DBDE5, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, - 0x9D1DBDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, - 0x33E93C6B, 0x3C6B3C6B, 0x3C6B3C6B, 0x3C6B3C6B, 0x3C6B3C6B, 0x3C6B3C6B, 0x3C6B3C6B, 0x3C6B3C6B, - 0x3C6B44F1, 0x44F144F1, 0x44F15D73, 0x5D7344F1, 0x44F15D73, 0x5D7344F1, 0x44F144F1, 0x44F144F1, - 0x33E93C6B, 0x44F144F1, 0x44F144F1, 0x5D735D73, 0x5D735D73, 0x44F144F1, 0x44F144F1, 0x3C6B33E9, - 0x9D1D33E9, 0x3C6B44F1, 0x44F144F1, 0x44F15D73, 0x5D7344F1, 0x44F144F1, 0x44F13C6B, 0x33E99D1D, - 0xBDE59D1D, 0x33E93C6B, 0x44F144F1, 0x44F144F1, 0x44F144F1, 0x44F144F1, 0x3C6B33E9, 0x9D1D9D1D, - 0xBDE5BDE5, 0x9D1D33E9, 0x3C6B44F1, 0x44F144F1, 0x44F144F1, 0x44F13C6B, 0x33E99D1D, 0x9D1D9B01, - 0xBDE5BDE5, 0xBDE59D1D, 0x33E93C6B, 0x44F144F1, 0x44F144F1, 0x3C6B33E9, 0x9D1DBDE5, 0x9B01C405, - 0xD6ABBDE5, 0xBDE5BDE5, 0x9D1D33E9, 0x3C6B44F1, 0x44F13C6B, 0x23659D1D, 0xBDE59D1D, 0x9B01C405, - 0xD6ABD6AB, 0xBDE5BDE5, 0xBDE59D1D, 0x33E93C6B, 0x3C6B2365, 0x9D1DBDE5, 0x9D1D9B01, 0xC405D48B, - 0xBDE5D6AB, 0xD6ABBDE5, 0xBDE5BDE5, 0x9D1D33E9, 0x23659D1D, 0x9D1D9D1D, 0x9D1D9B01, 0xC405D48B, - 0xBDE5D6AB, 0xD6ABBDE5, 0xBDE5BDE5, 0x9D1D9B01, 0x9B019B01, 0x9B019B01, 0x9B01C405, 0xD48BD48B, - 0xD6ABD6AB, 0xBDE5BDE5, 0xBDE59D1D, 0x33E99B01, 0xC405C405, 0xC405C405, 0xC405D48B, 0xD48BD48B, - 0xD6ABBDE5, 0xBDE5BDE5, 0x9D1D33E9, 0x3C6B33E9, 0x9B01C405, 0xC405C405, 0xD48BD48B, 0x9B01D48B, - 0xBDE5BDE5, 0xBDE59D1D, 0x33E93C6B, 0x44F13C6B, 0x33E99B01, 0x9B01C405, 0xC405D48B, 0x9B01D48B, - 0xBDE5BDE5, 0x9D1D33E9, 0x3C6B44F1, 0x44F144F1, 0x3C6B33E9, 0x23659B01, 0xC405D48B, 0x9B01D48B, - 0xBDE59D1D, 0x33E93C6B, 0x44F144F1, 0x44F144F1, 0x44F13C6B, 0x33E99B01, 0xC405D48B, 0xD48BD48B, - 0x9D1D33E9, 0x3C6B44F1, 0x44F15D73, 0x44F144F1, 0x3C6B33E9, 0x23659B01, 0xC405D48B, 0xD48BD48B, - 0x33E93C6B, 0x44F144F1, 0x5D735D73, 0x44F144F1, 0x3C6B33E9, 0x9B01C405, 0xC405C405, 0xC405C405, - 0x33E93C6B, 0x44F144F1, 0x5D735D73, 0x44F144F1, 0x3C6B33E9, 0x9B01C405, 0xC405C405, 0x9B019B01, - 0x9D1D33E9, 0x3C6B44F1, 0x44F15D73, 0x44F13C6B, 0x33E99B01, 0xC405C405, 0xC4059B01, 0x23659D1D, - 0xBDE59D1D, 0x33E93C6B, 0x44F144F1, 0x44F13C6B, 0x33E99B01, 0xC4059B01, 0x9B012365, 0x9D1DBDE5, - 0xBDE5BDE5, 0x9D1D33E9, 0x3C6B44F1, 0x44F13C6B, 0x33E99B01, 0x9B0133E9, 0x23659D1D, 0xBDE5BDE5, - 0xBDE5BDE5, 0xBDE59D1D, 0x33E93C6B, 0x44F144F1, 0x3C6B33E9, 0x33E92365, 0x9D1DBDE5, 0xBDE5BDE5, - 0xD6ABBDE5, 0xBDE5BDE5, 0x9D1D33E9, 0x3C6B44F1, 0x3C6B3C6B, 0x33E99D1D, 0xBDE5BDE5, 0xBDE5D6AB, - 0xD6ABD6AB, 0xBDE5BDE5, 0xBDE59D1D, 0x33E93C6B, 0x3C6B33E9, 0x9D1DBDE5, 0xBDE5BDE5, 0xD6ABD6AB, - 0xBDE5D6AB, 0xD6ABBDE5, 0xBDE5BDE5, 0x9D1D33E9, 0x33E99D1D, 0xBDE5BDE5, 0xBDE5D6AB, 0xD6AB05EF, - 0x00130005, 0x00010000, 0x00000000, 0x00080001, 0x00000000, 0x00000011, 0x000100B6, 0x00B600B6, - 0x00050002, 0x00000000, 0x00000008, 0x00020000, 0x00000000, 0x00110002, 0x00B600B6, 0x00B60005, - 0x00030000, 0x00000000, 0x00080003, 0x00000000, 0x00000011, 0x000300B6, 0x00B600B6, 0x00050004, - 0x00000000, 0x00000008, 0x00040000, 0x00000000, 0x00110004, 0x00B600B6, 0x00B60005, 0x00050000, - 0x00000000, 0x00080005, 0x00000000, 0x00000011, 0x000500B6, 0x00B600B6, 0x00050006, 0x00000000, - 0x00000008, 0x00060000, 0x00000000, 0x00110006, 0x00B600B6, 0x00B60005, 0x00070000, 0x00000000, - 0x00080007, 0x00000000, 0x00000011, 0x000700B6, 0x00B600B6, 0x00050008, 0x00000000, 0x00000008, - 0x00080000, 0x00000000, 0x00110008, 0x00B600B6, 0x00B60005, 0x00090000, 0x00000000, 0x00080009, - 0x00000000, 0x00000011, 0x000900B6, 0x00B600B6, 0x0005000A, 0x00000000, 0x00000008, 0x000A0000, - 0x00000000, 0x0011000A, 0x00B600B6, 0x00B60005, 0x000B0000, 0x00000000, 0x0008000B, 0x00000000, - 0x00000011, 0x000B00B6, 0x00B600B6, 0x0005000C, 0x00000000, 0x00000008, 0x000C0000, 0x00000000, - 0x0011000C, 0x00B600B6, 0x00B60005, 0x000D0000, 0x00000000, 0x0008000D, 0x00000000, 0x00000011, - 0x000D00B6, 0x00B600B6, 0x0005000E, 0x00000000, 0x00000008, 0x000E0000, 0x00000000, 0x0011000E, - 0x00B600B6, 0x00B60005, 0x000F0000, 0x00000000, 0x0008000F, 0x00000000, 0x00000011, 0x000F00B6, - 0x00B600B6, 0x00050010, 0x00000000, 0x00000008, 0x00100000, 0x00000000, 0x00110010, 0x00B600B6, - 0x00B60005, 0x00110000, 0x00000000, 0x00080011, 0x00000000, 0x00000011, 0x001100B6, 0x00B600B6, - 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, - 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, - 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, - 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, - 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, - 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, - 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, - 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00030000, -}; - -EvtScript N(8024AC14) = { - EVT_CALL(EnableModel, LVar4, 0) - EVT_CALL(EnableModel, LVar5, 1) - EVT_CALL(RotateModel, LVar6, 0, 0, 0, 1) - EVT_CALL(RotateModel, LVar7, 0, 0, 0, 1) - EVT_RETURN - EVT_END -}; - -EvtScript N(8024AC8C) = { - EVT_SET(LVar9, LVar7) - EVT_SET(LVar8, LVar6) - EVT_SET(LVar7, LVar5) - EVT_SET(LVar6, LVar4) - EVT_WAIT(70) - EVT_CALL(EnableModel, LVar6, 0) - EVT_THREAD - EVT_WAIT(5) - EVT_CALL(EnableModel, LVar6, 1) - EVT_END_THREAD - EVT_CALL(MakeLerp, 0, 180, 20, 2) - EVT_LABEL(1) - EVT_CALL(UpdateLerp) - EVT_CALL(RotateModel, LVar8, LVar0, 0, 0, -1) - EVT_CALL(RotateModel, LVar9, LVar0, 0, 0, -1) - EVT_IF_EQ(LVar1, 1) - EVT_WAIT(1) - EVT_GOTO(1) - EVT_END_IF - EVT_CALL(EnableModel, LVar7, 0) - EVT_RETURN - EVT_END -}; - -EvtScript N(interact_8024ADE4) = { - EVT_CALL(N(ToadHouse_InitScreenOverlay), 0, 0, 0) - EVT_EXEC_WAIT(N(8024D434)) - EVT_IF_EQ(LVar0, 0) - EVT_RETURN - EVT_END_IF - EVT_SET(LVar9, LVar1) - EVT_SET(LVarA, LVar2) - EVT_SET(LVarB, LVar3) - EVT_CALL(N(ToadHouse_DoesPlayerNeedSleep)) - EVT_IF_EQ(LVar1, 0) - EVT_SET(LVar8, LVar0) - EVT_END_IF - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, LVar8) - EVT_CALL(ShowChoice, MSG_Choice_0006) - EVT_WAIT(3) - EVT_IF_EQ(LVar0, 1) - EVT_CALL(ContinueSpeech, -1, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, LVar9) - EVT_RETURN - EVT_END_IF - EVT_CALL(ContinueSpeech, -1, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, LVarA) - EVT_CALL(SetPlayerJumpscale, 1) - EVT_CALL(DisablePlayerPhysics, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) - EVT_CALL(N(ToadHouse_DisableStatusMenu)) - EVT_IF_NE(LVar4, 0) - EVT_EXEC(N(8024AC8C)) - EVT_END_IF - EVT_CALL(N(ToadHouse_PutPartnerAway), LVarA) - EVT_WAIT(20) - EVT_EXEC_WAIT(N(8024D494)) - EVT_THREAD - EVT_CALL(MakeLerp, 0, 255, 60, 0) - EVT_LABEL(0) - EVT_CALL(UpdateLerp) - EVT_CALL(N(ToadHouse_UpdateScreenOverlay), 3, LVar0) - EVT_WAIT(1) - EVT_IF_EQ(LVar1, 1) - EVT_GOTO(0) - EVT_END_IF - EVT_CALL(FullyRestoreHPandFP) - EVT_CALL(FullyRestoreSP) - EVT_IF_NE(LVar4, 0) - EVT_EXEC(N(8024AC14)) - EVT_END_IF - EVT_CALL(N(ToadHouse_GetPartnerBackOut), LVarA) - EVT_WAIT(45) - EVT_CALL(MakeLerp, 255, 0, 30, 0) - EVT_LABEL(1) - EVT_CALL(UpdateLerp) - EVT_CALL(N(ToadHouse_UpdateScreenOverlay), 0, LVar0) - EVT_WAIT(1) - EVT_IF_EQ(LVar1, 1) - EVT_GOTO(1) - EVT_END_IF - EVT_END_THREAD - EVT_WAIT(105) - EVT_EXEC_WAIT(N(8024D700)) - EVT_CALL(DisablePlayerPhysics, FALSE) - EVT_CALL(SetNpcFlagBits, NPC_SELF, ((NPC_FLAG_100)), FALSE) - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, LVarB) - EVT_CALL(N(ToadHouse_ShowStatusMenu)) - EVT_RETURN - EVT_END -}; - -EvtScript N(8024B18C) = { - EVT_LOOP(0) - EVT_CALL(GetNpcPos, NPC_PARTNER, LVar3, LVar4, LVar5) - EVT_CALL(N(LetterDelivery_CalcLetterPos), LVar3, LVar4, LVar5) - EVT_CALL(SetItemPos, LVar0, LVar3, LVar4, LVar5) - EVT_WAIT(1) - EVT_END_LOOP - EVT_RETURN - EVT_END -}; - -EvtScript N(8024B20C) = { - EVT_SET(LVar9, LVar1) - EVT_CALL(ShowKeyChoicePopup) - EVT_SET(LVarA, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_EQ(0) - EVT_CASE_EQ(-1) - EVT_CASE_DEFAULT - EVT_CALL(RemoveKeyItemAt, LVar1) - EVT_CALL(DisablePartnerAI, 0) - EVT_CALL(GetNpcPos, NPC_PARTNER, LVar3, LVar4, LVar5) - EVT_CALL(N(LetterDelivery_CalcLetterPos), LVar3, LVar4, LVar5) - EVT_BITWISE_OR_CONST(LVar0, 0x50000) - EVT_CALL(MakeItemEntity, LVar0, LVar3, LVar4, LVar5, 1, 0) - EVT_EXEC_GET_TID(N(8024B18C), LVarA) - EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_WorldParakarry_Walk) - EVT_CALL(GetAngleBetweenNPCs, LVar9, -4, LVarB) - EVT_CALL(GetNpcPos, NPC_PARTNER, LVar3, LVar4, LVar5) - EVT_CALL(GetNpcPos, LVar9, LVar6, LVar7, LVar8) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, ((NPC_FLAG_100)), TRUE) - EVT_IF_LE(LVarB, 180) - EVT_ADD(LVar6, 20) - EVT_ELSE - EVT_ADD(LVar6, -20) - EVT_END_IF - EVT_ADD(LVar7, 10) - EVT_CALL(SetNpcJumpscale, NPC_PARTNER, EVT_FLOAT(0.0)) - EVT_CALL(NpcJump1, NPC_PARTNER, LVar6, LVar7, LVar8, 20) - EVT_KILL_THREAD(LVarA) - EVT_CALL(RemoveItemEntity, LVar0) - EVT_WAIT(20) - EVT_CALL(GetNpcYaw, -4, LVarA) - EVT_ADD(LVarA, 180) - EVT_CALL(InterpNpcYaw, NPC_PARTNER, LVarA, 0) - EVT_WAIT(5) - EVT_CALL(NpcJump1, NPC_PARTNER, LVar3, LVar4, LVar5, 20) - EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_WorldParakarry_Idle) - EVT_CALL(NpcFaceNpc, NPC_PARTNER, LVar9, 0) - EVT_WAIT(5) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, ((NPC_FLAG_100)), FALSE) - EVT_CALL(EnablePartnerAI) - EVT_WAIT(5) - EVT_END_SWITCH - EVT_CALL(N(ItemChoice_SaveSelected), LVarA) - EVT_CALL(CloseChoicePopup) - EVT_UNBIND - EVT_RETURN - EVT_END -}; - -EvtScript N(8024B530) = { - EVT_SET(LVar0, LVarB) - EVT_SET(LVar1, LVar2) - EVT_CALL(N(BuildKeyItemChoiceList), LVar0) - EVT_BIND_PADLOCK(N(8024B20C), 0x10, 0, EVT_PTR(N(KeyItemChoiceList)), 0, 1) - EVT_CALL(N(ItemChoice_WaitForSelection), LVar0) - EVT_RETURN - EVT_END -}; - -EvtScript N(8024B5A0) = { - EVT_SET(LVarC, 0) - EVT_IF_LT(GB_StoryProgress, -70) - EVT_RETURN - EVT_END_IF - EVT_CALL(N(LetterDelivery_SaveNpcAnim)) - EVT_CALL(GetCurrentPartnerID, LVar0) - EVT_CALL(FindKeyItem, LVar5, LVar1) - EVT_IF_EQ(LVar0, 4) - EVT_IF_NE(LVar1, -1) - EVT_CALL(DisablePartnerAI, 0) - EVT_CALL(PlayerFaceNpc, LVar2, 0) - EVT_WAIT(1) - EVT_CALL(GetNpcPos, LVar2, LVarD, LVar0, LVarE) - EVT_CALL(GetNpcPos, NPC_PARTNER, LVarD, LVarE, LVarF) - EVT_CALL(SetNpcJumpscale, NPC_PARTNER, EVT_FLOAT(0.0)) - EVT_ADD(LVar0, 10) - EVT_CALL(NpcJump1, NPC_PARTNER, LVarD, LVar0, LVarF, 10) - EVT_CALL(SpeakToNpc, -4, 262150, 262145, 0, LVar2, LVar7) - EVT_CALL(EnablePartnerAI) - EVT_EXEC_WAIT(N(8024B530)) - EVT_SWITCH(LVar0) - EVT_CASE_EQ(-1) - EVT_CALL(DisablePartnerAI, 0) - EVT_WAIT(1) - EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldParakarry_Talk, ANIM_WorldParakarry_Idle, 5, LVar8) - EVT_CALL(EnablePartnerAI) - EVT_SET(LVarC, 1) - EVT_CASE_DEFAULT - EVT_CALL(DisablePartnerAI, 0) - EVT_WAIT(1) - EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldParakarry_Talk, ANIM_WorldParakarry_Idle, 5, LVar9) - EVT_IF_NE(LVarA, 0) - EVT_CALL(SpeakToPlayer, LVar2, LVar3, LVar4, 0, LVarA) - EVT_END_IF - EVT_CALL(EnablePartnerAI) - EVT_IF_NE(LVar6, 0) - EVT_SET(LVar0, LVar6) - EVT_SET(LVar1, 1) - EVT_EXEC_WAIT(N(EVS_Quizmo_GiveItem_0)) - EVT_CALL(AddKeyItem, LVar6) - EVT_END_IF - EVT_SET(LVarC, 2) - EVT_END_SWITCH - EVT_END_IF - EVT_END_IF - EVT_CALL(N(LetterDelivery_RestoreNpcAnim)) - EVT_RETURN - EVT_END -}; - -s32 N(D_8024B898_974A58)[] = { - 0x0000004A, 0x00000000, -}; - -EvtScript N(8024B8A0) = { - EVT_CALL(N(LetterDelivery_Init), 1, 9634308, 9634305, 74, 75, 852117, 852118, 852119, 852120, EVT_PTR(N(D_8024B898_974A58))) - EVT_EXEC_WAIT(N(8024B5A0)) - EVT_RETURN - EVT_END -}; - -EvtScript N(interact_8024B8F0) = { - EVT_SWITCH(GB_StoryProgress) - EVT_CASE_LT(-53) - EVT_IF_EQ(GF_SBK30_Kolorado_SharedRumorAboutMoustafa, 1) - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Archeologist_Talk, ANIM_Archeologist_Idle, 0, MSG_CH2_00B2) - EVT_ELSE - EVT_SWITCH(AreaByte(3)) - EVT_CASE_EQ(0) - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Archeologist_Talk, ANIM_Archeologist_Idle, 0, MSG_CH2_00AF) - EVT_SET(AreaByte(3), 1) - EVT_CASE_EQ(1) - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Archeologist_Talk, ANIM_Archeologist_Idle, 0, MSG_CH2_00B0) - EVT_SET(AreaByte(3), 2) - EVT_CASE_EQ(2) - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Archeologist_Talk, ANIM_Archeologist_Idle, 0, MSG_CH2_00B1) - EVT_SET(AreaByte(3), 1) - EVT_END_SWITCH - EVT_END_IF - EVT_CASE_DEFAULT - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Archeologist_Talk, ANIM_Archeologist_Idle, 0, MSG_CH2_00B3) - EVT_END_SWITCH - EVT_RETURN - EVT_END -}; - -EvtScript N(init_8024BA50) = { - EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(interact_8024B8F0))) - EVT_IF_GE(GB_StoryProgress, -52) - EVT_CALL(RemoveNpc, NPC_SELF) - EVT_END_IF - EVT_RETURN - EVT_END -}; - -EvtScript N(interact_8024BA9C) = { - EVT_SWITCH(GB_StoryProgress) - EVT_CASE_LT(-53) - EVT_IF_EQ(GF_DRO02_Sheek_AskedAboutDesert, 0) - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Dryite_Blue_Talk, ANIM_Dryite_Blue_Idle, 0, MSG_CH2_0091) - EVT_ELSE - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Dryite_Blue_Talk, ANIM_Dryite_Blue_Idle, 0, MSG_CH2_0092) - EVT_END_IF - EVT_CASE_LT(39) - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Dryite_Blue_Talk, ANIM_Dryite_Blue_Idle, 0, MSG_CH2_0093) - EVT_CASE_DEFAULT - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Dryite_Blue_Talk, ANIM_Dryite_Blue_Idle, 0, MSG_CH2_0094) - EVT_END_SWITCH - EVT_EXEC_WAIT(N(8024B8A0)) - EVT_IF_NE(LVarC, 0) - EVT_RETURN - EVT_END_IF - EVT_RETURN - EVT_END -}; - -EvtScript N(init_8024BBAC) = { - EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(interact_8024BA9C))) - EVT_RETURN - EVT_END -}; - -EvtScript N(interact_8024BBD0) = { - EVT_SWITCH(GB_StoryProgress) - EVT_CASE_LT(-53) - EVT_IF_EQ(AreaFlag(3), 0) - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Dryite_Green_Talk, ANIM_Dryite_Green_Idle, 0, MSG_CH2_00A1) - EVT_SET(AreaFlag(3), 1) - EVT_ELSE - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Dryite_Green_Talk, ANIM_Dryite_Green_Idle, 0, MSG_CH2_00A2) - EVT_SET(AreaFlag(3), 0) - EVT_END_IF - EVT_CASE_LT(39) - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Dryite_Green_Talk, ANIM_Dryite_Green_Idle, 0, MSG_CH2_00A3) - EVT_CASE_DEFAULT - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Dryite_Green_Talk, ANIM_Dryite_Green_Idle, 0, MSG_CH2_00A4) - EVT_END_SWITCH - EVT_RETURN - EVT_END -}; - -EvtScript N(init_8024BCD4) = { - EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(interact_8024BBD0))) - EVT_RETURN - EVT_END -}; - -EvtScript N(interact_8024BCF8) = { - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Dryite_Green_Talk, ANIM_Dryite_Green_Idle, 0, MSG_CH2_00A0) - EVT_RETURN - EVT_END -}; - -EvtScript N(init_8024BD28) = { - EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(interact_8024BCF8))) - EVT_RETURN - EVT_END -}; - -EvtScript N(interact_8024BD4C) = { - EVT_SWITCH(GB_StoryProgress) - EVT_CASE_LT(-53) - EVT_IF_EQ(AreaFlag(4), 0) - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Mouser_Blue_Talk, ANIM_Mouser_Blue_Idle, 0, MSG_CH2_00A5) - EVT_SET(AreaFlag(4), 1) - EVT_ELSE - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Mouser_Blue_Talk, ANIM_Mouser_Blue_Idle, 0, MSG_CH2_00A6) - EVT_SET(AreaFlag(4), 0) - EVT_END_IF - EVT_CASE_LT(39) - EVT_IF_EQ(AreaFlag(4), 0) - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Mouser_Blue_Talk, ANIM_Mouser_Blue_Idle, 0, MSG_CH2_00A7) - EVT_SET(AreaFlag(4), 1) - EVT_ELSE - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Mouser_Blue_Talk, ANIM_Mouser_Blue_Idle, 0, MSG_CH2_00A8) - EVT_SET(AreaFlag(4), 0) - EVT_END_IF - EVT_CASE_DEFAULT - EVT_IF_EQ(AreaFlag(4), 0) - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Mouser_Blue_Talk, ANIM_Mouser_Blue_Idle, 0, MSG_CH2_00A9) - EVT_SET(AreaFlag(4), 1) - EVT_ELSE - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Mouser_Blue_Talk, ANIM_Mouser_Blue_Idle, 0, MSG_CH2_00AA) - EVT_SET(AreaFlag(4), 0) - EVT_END_IF - EVT_END_SWITCH - EVT_RETURN - EVT_END -}; - -EvtScript N(init_8024BF10) = { - EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(interact_8024BD4C))) - EVT_RETURN - EVT_END -}; - -EvtScript N(interact_8024BF34) = { - EVT_SWITCH(GB_StoryProgress) - EVT_CASE_LT(-53) - EVT_IF_EQ(AreaFlag(5), 0) - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Mouser_Blue_Talk, ANIM_Mouser_Blue_Idle, 0, MSG_CH2_00AB) - EVT_SET(AreaFlag(5), 1) - EVT_ELSE - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Mouser_Blue_Talk, ANIM_Mouser_Blue_Idle, 0, MSG_CH2_00AC) - EVT_SET(AreaFlag(5), 0) - EVT_END_IF - EVT_CASE_LT(39) - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Mouser_Blue_Talk, ANIM_Mouser_Blue_Idle, 0, MSG_CH2_00AD) - EVT_CASE_DEFAULT - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Mouser_Blue_Talk, ANIM_Mouser_Blue_Idle, 0, MSG_CH2_00AE) - EVT_END_SWITCH - EVT_RETURN - EVT_END -}; - -EvtScript N(init_8024C038) = { - EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(interact_8024BF34))) - EVT_RETURN - EVT_END -}; - -EvtScript N(8024C05C) = { - EVT_LOOP(0) - EVT_CALL(PlayerFaceNpc, 5, 0) - EVT_CALL(NpcFaceNpc, NPC_PARTNER, 5, 0) - EVT_WAIT(1) - EVT_END_LOOP - EVT_RETURN - EVT_END -}; - -EvtScript N(8024C0B8) = { - EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) - EVT_CALL(UseSettingsFrom, 0, LVar0, LVar1, LVar2) - EVT_CALL(SetCamDistance, 0, 275) - EVT_CALL(GetNpcPos, 2, LVar3, LVar4, LVar5) - EVT_ADD(LVar0, LVar3) - EVT_ADD(LVar1, LVar4) - EVT_ADD(LVar2, LVar5) - EVT_DIV(LVar0, 2) - EVT_DIV(LVar1, 2) - EVT_DIV(LVar2, 2) - EVT_ADD(LVar1, 15) - EVT_CALL(SetPanTarget, 0, LVar0, LVar1, LVar2) - EVT_CALL(SetCamSpeed, 0, EVT_FLOAT(8.0)) - EVT_CALL(PanToTarget, 0, 0, 1) - EVT_CALL(WaitForCam, 0, EVT_FLOAT(1.0)) - EVT_RETURN - EVT_END -}; - -EvtScript N(8024C1F8) = { - EVT_CALL(PanToTarget, 0, 0, 0) - EVT_CALL(SetCamSpeed, 0, EVT_FLOAT(3.0)) - EVT_CALL(WaitForCam, 0, EVT_FLOAT(1.0)) - EVT_RETURN - EVT_END -}; - -EvtScript N(8024C248) = { - EVT_CALL(SetNpcYaw, 5, 270) - EVT_CALL(SetNpcFlagBits, 2, ((NPC_FLAG_100)), TRUE) - EVT_CALL(SetNpcFlagBits, 5, ((NPC_FLAG_100)), TRUE) - EVT_CALL(SetNpcAnimation, 2, ANIM_DisguisedMoustafa_GrabCloak) - EVT_WAIT(30) - EVT_CALL(SetNpcAnimation, 2, ANIM_DisguisedMoustafa_ThrownCloak) - EVT_CALL(SetNpcAnimation, 5, ANIM_Moustafa_Toss) - EVT_CALL(SetNpcPos, 5, -335, 163, -260) - EVT_EXEC(N(80243B9C)) - EVT_CALL(MakeLerp, 0, 80, 30, 5) - EVT_LABEL(10) - EVT_CALL(UpdateLerp) - EVT_SET(LVar2, -335) - EVT_SET(LVar3, 163) - EVT_SUB(LVar2, LVar0) - EVT_ADD(LVar3, LVar0) - EVT_CALL(SetNpcPos, 2, LVar2, LVar3, -260) - EVT_WAIT(1) - EVT_IF_EQ(LVar1, 1) - EVT_GOTO(10) - EVT_END_IF - EVT_CALL(SetNpcFlagBits, 2, ((NPC_FLAG_100)), FALSE) - EVT_CALL(SetNpcPos, 2, 0, -1000, -250) - EVT_CALL(SetNpcAnimation, 5, ANIM_Moustafa_Idle) - EVT_CALL(SetNpcFlagBits, 2, ((NPC_FLAG_100)), FALSE) - EVT_CALL(SetNpcFlagBits, 5, ((NPC_FLAG_100)), FALSE) - EVT_WAIT(30) - EVT_RETURN - EVT_END -}; - -EvtScript N(idle_8024C450) = { - EVT_SWITCH(GB_StoryProgress) - EVT_CASE_LT(-64) - EVT_CASE_LT(-63) - EVT_CALL(SetNpcPos, NPC_SELF, -335, 163, -260) - EVT_CASE_GE(-63) - EVT_CALL(SetNpcPos, NPC_SELF, 0, -1000, -250) - EVT_CALL(SetNpcPos, 5, -335, 163, -260) - EVT_END_SWITCH - EVT_RETURN - EVT_END -}; - -EvtScript N(interact_8024C4EC) = { - EVT_IF_EQ(GF_DRO02_Moustafa_UnusedDialogOverride, 1) - EVT_CALL(SpeakToPlayer, 5, ANIM_Moustafa_Shout, ANIM_Moustafa_Idle, 0, MSG_CH2_00CF) - EVT_RETURN - EVT_END_IF - EVT_SWITCH(GB_StoryProgress) - EVT_CASE_LT(-64) - EVT_SET(LVarB, 0) - EVT_CALL(SpeakToPlayer, 2, ANIM_DisguisedMoustafa_Talk, ANIM_DisguisedMoustafa_Idle, 0, MSG_CH2_00B4) - EVT_LABEL(0) - EVT_CALL(ShowChoice, MSG_Choice_0019) - EVT_IF_EQ(LVar0, 1) - EVT_CALL(ContinueSpeech, 2, ANIM_DisguisedMoustafa_Talk, ANIM_DisguisedMoustafa_Idle, 0, MSG_CH2_00B6) - EVT_EXEC(N(8024C1F8)) - EVT_RETURN - EVT_ELSE - EVT_CALL(EndSpeech, 2, ANIM_DisguisedMoustafa_Talk, ANIM_DisguisedMoustafa_Idle, 0) - EVT_END_IF - EVT_LABEL(1) - EVT_SET(LVar0, 0) - EVT_SET(LVar1, 2) - EVT_EXEC_WAIT(N(80248A50)) - EVT_SWITCH(LVar0) - EVT_CASE_EQ(0) - EVT_CALL(SpeakToPlayer, 2, ANIM_DisguisedMoustafa_Talk, ANIM_DisguisedMoustafa_Idle, 0, MSG_CH2_00B8) - EVT_EXEC(N(8024C1F8)) - EVT_RETURN - EVT_CASE_EQ(-1) - EVT_CALL(SpeakToPlayer, 2, ANIM_DisguisedMoustafa_Talk, ANIM_DisguisedMoustafa_Idle, 0, MSG_CH2_00B7) - EVT_EXEC(N(8024C1F8)) - EVT_RETURN - EVT_END_SWITCH - EVT_SET(LVarA, LVar0) - EVT_IF_EQ(GB_DRO02_SheekLemonGiftCount, 0) - EVT_IF_EQ(LVarA, 156) - EVT_SET(GB_DRO02_SheekLemonGiftCount, 1) - EVT_SET(GB_DRO02_SheekGiftCount, 10) - EVT_CALL(SpeakToPlayer, 2, ANIM_DisguisedMoustafa_Talk, ANIM_DisguisedMoustafa_Idle, 0, MSG_CH2_00BB) - EVT_CALL(ShowChoice, MSG_Choice_001C) - EVT_ELSE - EVT_ADD(GB_DRO02_SheekGiftCount, 1) - EVT_IF_LE(GB_DRO02_SheekGiftCount, 2) - EVT_CALL(SpeakToPlayer, 2, ANIM_DisguisedMoustafa_Talk, ANIM_DisguisedMoustafa_Idle, 0, MSG_CH2_00B5) - EVT_GOTO(0) - EVT_END_IF - EVT_IF_EQ(GB_DRO02_SheekGiftCount, 3) - EVT_CALL(SpeakToPlayer, 2, ANIM_DisguisedMoustafa_Talk, ANIM_DisguisedMoustafa_Idle, 0, MSG_CH2_00B9) - EVT_CALL(ShowChoice, MSG_Choice_001B) - EVT_ELSE - EVT_CALL(SpeakToPlayer, 2, ANIM_DisguisedMoustafa_Talk, ANIM_DisguisedMoustafa_Idle, 0, MSG_CH2_00BA) - EVT_CALL(ShowChoice, MSG_Choice_001B) - EVT_SET(GB_DRO02_SheekGiftCount, 10) - EVT_END_IF - EVT_END_IF - EVT_ELSE - EVT_CALL(SpeakToPlayer, 2, ANIM_DisguisedMoustafa_Talk, ANIM_DisguisedMoustafa_Idle, 0, MSG_CH2_00BA) - EVT_CALL(ShowChoice, MSG_Choice_001C) - EVT_END_IF - EVT_SWITCH(LVar0) - EVT_CASE_EQ(0) - EVT_CALL(ContinueSpeech, 2, ANIM_DisguisedMoustafa_Talk, ANIM_DisguisedMoustafa_Idle, 0, MSG_CH2_00BC) - EVT_CASE_EQ(1) - EVT_EXEC_WAIT(N(8024C0B8)) - EVT_CALL(ContinueSpeech, 2, ANIM_DisguisedMoustafa_Talk, ANIM_DisguisedMoustafa_Idle, 0, MSG_CH2_00BD) - EVT_SET(GF_DRO02_Sheek_AskedAboutDesert, 1) - EVT_CASE_EQ(2) - EVT_EXEC_WAIT(N(8024C0B8)) - EVT_CALL(ContinueSpeech, 2, ANIM_DisguisedMoustafa_Talk, ANIM_DisguisedMoustafa_Idle, 0, MSG_CH2_00BE) - EVT_SET(GF_DRO02_Sheek_AskedAboutRuins, 1) - EVT_CASE_EQ(3) - EVT_EXEC_WAIT(N(8024C0B8)) - EVT_CALL(ContinueSpeech, 2, ANIM_DisguisedMoustafa_Talk, ANIM_DisguisedMoustafa_Idle, 0, MSG_CH2_00BF) - EVT_CASE_EQ(4) - EVT_EXEC_WAIT(N(8024C0B8)) - EVT_CALL(ContinueSpeech, 2, ANIM_DisguisedMoustafa_Talk, ANIM_DisguisedMoustafa_Idle, 0, MSG_CH2_00C1) - EVT_SET(GF_DRO02_Sheek_AskedAboutMoustafa, 1) - EVT_SET(LVarB, 1) - EVT_END_SWITCH - EVT_SET(GF_DRO02_Sheek_SpokeTo, 1) - EVT_CALL(ContinueSpeech, 2, ANIM_DisguisedMoustafa_Talk, ANIM_DisguisedMoustafa_Idle, 0, MSG_CH2_00C0) - EVT_CALL(ShowChoice, MSG_Choice_001A) - EVT_IF_EQ(LVar0, 0) - EVT_CALL(EndSpeech, 2, ANIM_DisguisedMoustafa_Talk, ANIM_DisguisedMoustafa_Idle, 0) - EVT_GOTO(1) - EVT_ELSE - EVT_CALL(ContinueSpeech, 2, ANIM_DisguisedMoustafa_Talk, ANIM_DisguisedMoustafa_Idle, 0, MSG_CH2_00B6) - EVT_END_IF - EVT_IF_EQ(LVarB, 1) - EVT_IF_EQ(MapFlag(0), 0) - EVT_SET(MapFlag(0), 1) - EVT_THREAD - EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) - EVT_CALL(AwaitPlayerLeave, LVar0, LVar2, 50) - EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(SpeakToPlayer, 2, ANIM_DisguisedMoustafa_Talk, ANIM_DisguisedMoustafa_Idle, 0, MSG_CH2_00C2) - EVT_CALL(DisablePlayerInput, FALSE) - EVT_SET(MapFlag(0), 0) - EVT_END_THREAD - EVT_END_IF - EVT_END_IF - EVT_EXEC(N(8024C1F8)) - EVT_CASE_LT(-63) - EVT_THREAD - EVT_WAIT(10) - EVT_CALL(func_802D2C14, 1) - EVT_END_THREAD - EVT_CALL(SetNpcFlagBits, 2, ((NPC_FLAG_100)), TRUE) - EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) - EVT_CALL(PlayerMoveTo, -391, -260, 0) - EVT_CALL(InterpPlayerYaw, 90, 3) - EVT_CALL(SetNpcFlagBits, 2, ((NPC_FLAG_100)), FALSE) - EVT_EXEC_GET_TID(N(8024C05C), LVarA) - EVT_CALL(SetNpcFlagBits, 5, ((NPC_FLAG_100)), TRUE) - EVT_CALL(FadeOutMusic, 0, 500) - EVT_IF_EQ(GF_DRO02_Sheek_AskedAboutMoustafa, 1) - EVT_CALL(SpeakToPlayer, 2, ANIM_DisguisedMoustafa_Talk, ANIM_DisguisedMoustafa_Idle, 0, MSG_CH2_00C3) - EVT_EXEC_WAIT(N(8024C248)) - EVT_CALL(func_802D2C14, 0) - EVT_CALL(SetNpcJumpscale, 5, EVT_FLOAT(1.0)) - EVT_CALL(NpcJump0, 5, -425, 140, -206, 20) - EVT_CALL(SpeakToPlayer, 5, ANIM_Moustafa_Shout, ANIM_Moustafa_Idle, 0, MSG_CH2_00C4) - EVT_ELSE - EVT_CALL(SpeakToPlayer, 2, ANIM_DisguisedMoustafa_Talk, ANIM_DisguisedMoustafa_Idle, 0, MSG_CH2_00C5) - EVT_EXEC_WAIT(N(8024C248)) - EVT_CALL(func_802D2C14, 0) - EVT_CALL(SetNpcJumpscale, 5, EVT_FLOAT(1.0)) - EVT_CALL(NpcJump0, 5, -425, 140, -206, 20) - EVT_CALL(SpeakToPlayer, 5, ANIM_Moustafa_Shout, ANIM_Moustafa_Idle, 0, MSG_CH2_00C6) - EVT_END_IF - EVT_CALL(SetNpcJumpscale, 5, EVT_FLOAT(1.0)) - EVT_CALL(NpcJump0, 5, -337, 140, -200, 20) - EVT_CALL(SpeakToPlayer, 5, ANIM_Moustafa_Shout, ANIM_Moustafa_Idle, 0, MSG_CH2_00C7) - EVT_CALL(SpeakToPlayer, 5, ANIM_Moustafa_Shout, ANIM_Moustafa_Idle, 0, MSG_CH2_00C8) - EVT_CALL(SetNpcJumpscale, 5, EVT_FLOAT(1.0)) - EVT_CALL(NpcJump0, 5, -335, 163, -260, 20) - EVT_CALL(SpeakToPlayer, 5, ANIM_Moustafa_Shout, ANIM_Moustafa_Idle, 0, MSG_CH2_00C9) - EVT_SET(LVar0, 18) - EVT_SET(LVar1, 1) - EVT_EXEC_WAIT(N(EVS_Quizmo_GiveItem_0)) - EVT_CALL(AddKeyItem, ITEM_PULSE_STONE) - EVT_SET(GB_StoryProgress, -63) - EVT_CALL(SpeakToPlayer, 5, ANIM_Moustafa_Shout, ANIM_Moustafa_Idle, 0, MSG_CH2_00CA) - EVT_KILL_THREAD(LVarA) - EVT_EXEC(N(80243AF0)) - EVT_CASE_GE(-63) - EVT_SWITCH(GB_StoryProgress) - EVT_CASE_LT(-62) - EVT_CALL(SpeakToPlayer, 5, ANIM_Moustafa_Shout, ANIM_Moustafa_Idle, 0, MSG_CH2_00CB) - EVT_CASE_GE(-62) - EVT_IF_GE(GB_StoryProgress, -56) - EVT_IF_EQ(GF_DRO02_Moustafa_HeardAboutDryDryRuins, 0) - EVT_CALL(SpeakToPlayer, 5, ANIM_Moustafa_Shout, ANIM_Moustafa_Idle, 0, MSG_CH2_00CD) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) - EVT_WAIT(15) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007) - EVT_WAIT(30) - EVT_CALL(SpeakToPlayer, 5, ANIM_Moustafa_Shout, ANIM_Moustafa_Idle, 0, MSG_CH2_00CE) - EVT_SET(GF_DRO02_Moustafa_HeardAboutDryDryRuins, 1) - EVT_ELSE - EVT_CALL(SpeakToPlayer, 5, ANIM_Moustafa_Shout, ANIM_Moustafa_Idle, 0, MSG_CH2_00D0) - EVT_END_IF - EVT_ELSE - EVT_CALL(SpeakToPlayer, 5, ANIM_Moustafa_Shout, ANIM_Moustafa_Idle, 0, MSG_CH2_00CC) - EVT_END_IF - EVT_END_SWITCH - EVT_END_SWITCH - EVT_RETURN - EVT_END -}; - -EvtScript N(init_8024D04C) = { - EVT_CALL(GetEntryID, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(2) - EVT_CASE_OR_EQ(3) - EVT_CALL(SetNpcPos, NPC_SELF, 200, 0, -15) - EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 0) - EVT_CALL(SetNpcFlagBits, NPC_SELF, ((NPC_FLAG_200000)), TRUE) - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_DisguisedMoustafa_GrabCloak) - EVT_END_CASE_GROUP - EVT_CASE_DEFAULT - EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(idle_8024C450))) - EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(interact_8024C4EC))) - EVT_END_SWITCH - EVT_RETURN - EVT_END -}; - -EvtScript N(init_8024D130) = { - EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(interact_8024C4EC))) - EVT_RETURN - EVT_END -}; - -EvtScript N(idle_8024D154) = { - EVT_CALL(InterpNpcYaw, 2, 270, 0) - EVT_LABEL(10) - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Mouser_Purple_Gossip) - EVT_CALL(SetNpcAnimation, 2, ANIM_DisguisedMoustafa_Idle) - EVT_LOOP(50) - EVT_CALL(IsPlayerWithin, 200, 50, 100, LVar0) - EVT_IF_EQ(LVar0, 1) - EVT_GOTO(20) - EVT_END_IF - EVT_WAIT(1) - EVT_END_LOOP - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Mouser_Purple_Idle) - EVT_CALL(SetNpcAnimation, 2, ANIM_DisguisedMoustafa_TalkAlt) - EVT_LOOP(50) - EVT_CALL(IsPlayerWithin, 200, 50, 100, LVar0) - EVT_IF_EQ(LVar0, 1) - EVT_GOTO(20) - EVT_END_IF - EVT_WAIT(1) - EVT_END_LOOP - EVT_GOTO(10) - EVT_LABEL(20) - EVT_CALL(SetNpcAnimation, 2, ANIM_DisguisedMoustafa_Idle) - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Mouser_Purple_Run) - EVT_CALL(SetNpcFlagBits, NPC_SELF, ((NPC_FLAG_100)), TRUE) - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Mouser_Purple_Run) - EVT_CALL(NpcMoveTo, NPC_SELF, 150, 18, 20) - EVT_CALL(EnableNpcBlur, -1, 1) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, 0x174, 0) - EVT_CALL(NpcMoveTo, NPC_SELF, -83, 11, 20) - EVT_CALL(NpcMoveTo, NPC_SELF, -239, 5, 20) - EVT_CALL(NpcMoveTo, NPC_SELF, -371, 5, 20) - EVT_CALL(NpcMoveTo, NPC_SELF, -487, 5, 20) - EVT_CALL(SetNpcPos, NPC_SELF, 0, -1000, 0) - EVT_SET(GB_StoryProgress, -66) - EVT_RETURN - EVT_END -}; - -EvtScript N(init_8024D3E8) = { - EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(idle_8024D154))) - EVT_IF_GE(GB_StoryProgress, -66) - EVT_CALL(RemoveNpc, NPC_SELF) - EVT_END_IF - EVT_RETURN - EVT_END -}; - -EvtScript N(8024D434) = { - EVT_SET(LVar0, 852177) - EVT_SET(LVar8, 852178) - EVT_SET(LVar1, 852179) - EVT_SET(LVar2, 852180) - EVT_SET(LVar3, 852181) - EVT_RETURN - EVT_END -}; - -EvtScript N(8024D494) = { - EVT_EXEC(N(80243B70)) - EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) - EVT_CALL(PlayerMoveTo, -179, -198, 0) - EVT_THREAD - EVT_WAIT(15) - EVT_CALL(N(ToadHouse_CamSetFOV), 0, 40) - EVT_CALL(SetCamType, 0, 4, 0) - EVT_CALL(SetCamPitch, 0, 95, -61) - EVT_CALL(SetCamDistance, 0, 108) - EVT_CALL(SetCamPosA, 0, 202, 62) - EVT_CALL(SetCamPosB, 0, -89, -141) - EVT_CALL(SetCamPosC, 0, 0, 0) - EVT_CALL(SetCamSpeed, 0, EVT_FLOAT(90.0)) - EVT_CALL(PanToTarget, 0, 0, 1) - EVT_END_THREAD - EVT_CALL(PlayerMoveTo, -187, -267, 0) - EVT_CALL(InterpPlayerYaw, 230, 1) - EVT_CALL(HidePlayerShadow, TRUE) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) - EVT_CALL(func_802D286C, 2048) - EVT_CALL(func_802D2520, ANIM_Mario_10002, 5, 7, 1, 1, 0) - EVT_THREAD - EVT_WAIT(60) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_8001D) - EVT_END_THREAD - EVT_WAIT(20) - EVT_THREAD - EVT_WAIT(81) - EVT_CALL(N(ToadHouse_CamSetFOV), 0, 25) - EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) - EVT_CALL(UseSettingsFrom, 0, LVar0, LVar1, LVar2) - EVT_WAIT(1) - EVT_CALL(PanToTarget, 0, 0, 0) - EVT_END_THREAD - EVT_RETURN - EVT_END -}; - -EvtScript N(8024D700) = { - EVT_CALL(HidePlayerShadow, FALSE) - EVT_CALL(func_802D2520, ANIM_Mario_10002, 0, 0, 0, 0, 0) - EVT_CALL(SetPlayerPos, -187, 0, -240) - EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) - EVT_CALL(PlayerMoveTo, -168, -195, 0) - EVT_EXEC(N(80243AF0)) - EVT_RETURN - EVT_END -}; - -EvtScript N(init_8024D790) = { - EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(interact_8024ADE4))) - EVT_RETURN - EVT_END -}; - -StaticNpc N(npcGroup_8024D7B4)[] = { - { - .id = NPC_ARCHEOLOGIST, - .settings = &N(npcSettings_80247484), - .pos = { -320.0f, 0.0f, -14.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, - .init = &N(init_8024BA50), - .yaw = 90, - .drops = { - .dropFlags = NPC_DROP_FLAGS_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, - .territory = { .temp = { -303, 0, 22, 146, 38, -32767, 1, 0, 0, 0, 0, 0, 0, 1 }}, - .animations = { - ANIM_Archeologist_Idle, - ANIM_Archeologist_Walk, - ANIM_Archeologist_Run, - ANIM_Archeologist_Run, - ANIM_Archeologist_Idle, - ANIM_Archeologist_Idle, - ANIM_Archeologist_Idle, - ANIM_Archeologist_Idle, - ANIM_Archeologist_Idle, - ANIM_Archeologist_Idle, - ANIM_Archeologist_Idle, - ANIM_Archeologist_Idle, - ANIM_Archeologist_Idle, - ANIM_Archeologist_Idle, - ANIM_Archeologist_Idle, - ANIM_Archeologist_Idle, - }, - .tattle = MSG_NpcTattle_Archeologist, - }, - { - .id = NPC_DRYITE0, - .settings = &N(npcSettings_80247500), - .pos = { -20.0f, 0.0f, 40.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, - .init = &N(init_8024BBAC), - .yaw = 270, - .drops = { - .dropFlags = NPC_DROP_FLAGS_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, - .territory = { .temp = { -20, 0, 40, 60, 0, -32767, 0, 0, 0, 0, 0, 0, 0, 1 }}, - .animations = { - ANIM_Dryite_Blue_Idle, - ANIM_Dryite_Blue_Walk, - ANIM_Dryite_Blue_Run, - ANIM_Dryite_Blue_Run, - ANIM_Dryite_Blue_Idle, - ANIM_Dryite_Blue_Idle, - ANIM_Dryite_Blue_Still, - ANIM_Dryite_Blue_Still, - ANIM_Dryite_Blue_Idle, - ANIM_Dryite_Blue_Idle, - ANIM_Dryite_Blue_Idle, - ANIM_Dryite_Blue_Idle, - ANIM_Dryite_Blue_Idle, - ANIM_Dryite_Blue_Idle, - ANIM_Dryite_Blue_Idle, - ANIM_Dryite_Blue_Idle, - }, - .tattle = MSG_NpcTattle_DRO_DryiteE, - }, - { - .id = NPC_DISGUISED_MOUSTAFA, - .settings = &N(npcSettings_80247558), - .pos = { 245.0f, 0.0f, -35.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, - .init = &N(init_8024D04C), - .yaw = 90, - .drops = { - .dropFlags = NPC_DROP_FLAGS_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, - .animations = { - ANIM_DisguisedMoustafa_Idle, - ANIM_DisguisedMoustafa_Idle, - ANIM_DisguisedMoustafa_Idle, - ANIM_DisguisedMoustafa_Idle, - ANIM_DisguisedMoustafa_Idle, - ANIM_DisguisedMoustafa_Idle, - ANIM_DisguisedMoustafa_Idle, - ANIM_DisguisedMoustafa_Idle, - ANIM_DisguisedMoustafa_Idle, - ANIM_DisguisedMoustafa_Idle, - ANIM_DisguisedMoustafa_Idle, - ANIM_DisguisedMoustafa_Idle, - ANIM_DisguisedMoustafa_Idle, - ANIM_DisguisedMoustafa_Idle, - ANIM_DisguisedMoustafa_Idle, - ANIM_DisguisedMoustafa_Idle, - }, - .tattle = MSG_NpcTattle_Sheek, - }, - { - .id = NPC_TOAD, - .settings = &N(npcSettings_80247584), - .pos = { -143.0f, 0.0f, -170.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, - .init = &N(init_8024D790), - .yaw = 180, - .drops = { - .dropFlags = NPC_DROP_FLAGS_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, - .animations = { - ANIM_Toad_Red_Idle, - ANIM_Toad_Red_Walk, - ANIM_Toad_Red_Run, - ANIM_Toad_Red_Run, - ANIM_Toad_Red_Idle, - ANIM_Toad_Red_Idle, - ANIM_Toad_Red_Disappointed, - ANIM_Toad_Red_Disappointed, - ANIM_Toad_Red_Run, - ANIM_Toad_Red_Run, - ANIM_Toad_Red_Run, - ANIM_Toad_Red_Run, - ANIM_Toad_Red_Run, - ANIM_Toad_Red_Run, - ANIM_Toad_Red_Run, - ANIM_Toad_Red_Run, - }, - .tattle = MSG_NpcTattle_DRO_ToadHouseToad, - }, - { - .id = NPC_WORLD_MERLEE, - .settings = &N(npcSettings_80248754), - .pos = { -130.0f, 0.0f, -400.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, - .init = &N(init_80247A80), - .yaw = 180, - .drops = { - .dropFlags = NPC_DROP_FLAGS_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, - .animations = { - ANIM_WorldMerlee_Idle, - ANIM_WorldMerlee_Walk, - ANIM_WorldMerlee_Run, - ANIM_WorldMerlee_Run, - ANIM_WorldMerlee_Idle, - ANIM_WorldMerlee_Idle, - ANIM_WorldMerlee_Idle, - ANIM_WorldMerlee_Idle, - ANIM_WorldMerlee_Idle, - ANIM_WorldMerlee_Idle, - ANIM_WorldMerlee_Idle, - ANIM_WorldMerlee_Idle, - ANIM_WorldMerlee_Idle, - ANIM_WorldMerlee_Idle, - ANIM_WorldMerlee_Idle, - ANIM_WorldMerlee_Idle, - }, - .tattle = MSG_NpcTattle_Merlee, - }, - { - .id = NPC_MOUSTAFA, - .settings = &N(npcSettings_80247558), - .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, - .init = &N(init_8024D130), - .yaw = 0, - .drops = { - .dropFlags = NPC_DROP_FLAGS_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, - .animations = { - ANIM_Moustafa_Idle, - ANIM_Moustafa_Idle, - ANIM_Moustafa_Run, - ANIM_Moustafa_Run, - ANIM_Moustafa_Idle, - ANIM_Moustafa_Idle, - ANIM_Moustafa_Idle, - ANIM_Moustafa_Idle, - ANIM_Moustafa_Idle, - ANIM_Moustafa_Idle, - ANIM_Moustafa_Idle, - ANIM_Moustafa_Idle, - ANIM_Moustafa_Idle, - ANIM_Moustafa_Idle, - ANIM_Moustafa_Idle, - ANIM_Moustafa_Idle, - }, - .tattle = MSG_NpcTattle_Moustafa, - }, - { - .id = NPC_DRYITE1, - .settings = &N(npcSettings_8024752C), - .pos = { 25.0f, 0.0f, -38.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, - .init = &N(init_8024BCD4), - .yaw = 270, - .drops = { - .dropFlags = NPC_DROP_FLAGS_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, - .animations = { - ANIM_Dryite_Green_Idle, - ANIM_Dryite_Green_Walk, - ANIM_Dryite_Green_Run, - ANIM_Dryite_Green_Run, - ANIM_Dryite_Green_Idle, - ANIM_Dryite_Green_Idle, - ANIM_Dryite_Green_Still, - ANIM_Dryite_Green_Still, - ANIM_Dryite_Green_Idle, - ANIM_Dryite_Green_Idle, - ANIM_Dryite_Green_Idle, - ANIM_Dryite_Green_Idle, - ANIM_Dryite_Green_Idle, - ANIM_Dryite_Green_Idle, - ANIM_Dryite_Green_Idle, - ANIM_Dryite_Green_Idle, - }, - .tattle = MSG_NpcTattle_DRO_DryiteF, - }, - { - .id = NPC_DRYITE2, - .settings = &N(npcSettings_8024752C), - .pos = { -375.0f, 0.0f, -10.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, - .init = &N(init_8024BD28), - .yaw = 270, - .drops = { - .dropFlags = NPC_DROP_FLAGS_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, - .animations = { - ANIM_Dryite_Green_Idle, - ANIM_Dryite_Green_Walk, - ANIM_Dryite_Green_Run, - ANIM_Dryite_Green_Run, - ANIM_Dryite_Green_Idle, - ANIM_Dryite_Green_Idle, - ANIM_Dryite_Green_Still, - ANIM_Dryite_Green_Still, - ANIM_Dryite_Green_Idle, - ANIM_Dryite_Green_Idle, - ANIM_Dryite_Green_Idle, - ANIM_Dryite_Green_Idle, - ANIM_Dryite_Green_Idle, - ANIM_Dryite_Green_Idle, - ANIM_Dryite_Green_Idle, - ANIM_Dryite_Green_Idle, - }, - .tattle = MSG_NpcTattle_DRO_VisitedShootingStarSummit, - }, - { - .id = NPC_MOUSER0, - .settings = &N(npcSettings_80247558), - .pos = { -50.0f, 0.0f, -470.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, - .init = &N(init_8024BF10), - .yaw = 180, - .drops = { - .dropFlags = NPC_DROP_FLAGS_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, - .animations = { - ANIM_Mouser_Blue_Idle, - ANIM_Mouser_Blue_Run, - ANIM_Mouser_Blue_Run, - ANIM_Mouser_Blue_Run, - ANIM_Mouser_Blue_Idle, - ANIM_Mouser_Blue_Idle, - ANIM_Mouser_Blue_Idle, - ANIM_Mouser_Blue_Idle, - ANIM_Mouser_Blue_Idle, - ANIM_Mouser_Blue_Idle, - ANIM_Mouser_Blue_Idle, - ANIM_Mouser_Blue_Idle, - ANIM_Mouser_Blue_Idle, - ANIM_Mouser_Blue_Idle, - ANIM_Mouser_Blue_Idle, - ANIM_Mouser_Blue_Idle, - }, - .tattle = MSG_NpcTattle_DRO_CrushingOnMerlee, - }, - { - .id = NPC_MOUSER1, - .settings = &N(npcSettings_80247558), - .pos = { -270.0f, 0.0f, 91.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, - .init = &N(init_8024C038), - .yaw = 270, - .drops = { - .dropFlags = NPC_DROP_FLAGS_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, - .animations = { - ANIM_Mouser_Blue_Idle, - ANIM_Mouser_Blue_Run, - ANIM_Mouser_Blue_Run, - ANIM_Mouser_Blue_Run, - ANIM_Mouser_Blue_Idle, - ANIM_Mouser_Blue_Idle, - ANIM_Mouser_Blue_Idle, - ANIM_Mouser_Blue_Idle, - ANIM_Mouser_Blue_Idle, - ANIM_Mouser_Blue_Idle, - ANIM_Mouser_Blue_Idle, - ANIM_Mouser_Blue_Idle, - ANIM_Mouser_Blue_Idle, - ANIM_Mouser_Blue_Idle, - ANIM_Mouser_Blue_Idle, - ANIM_Mouser_Blue_Idle, - }, - .tattle = MSG_NpcTattle_DRO_TellsTales, - }, - { - .id = NPC_MOUSER2, - .settings = &N(npcSettings_80247558), - .pos = { 210.0f, 0.0f, -35.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, - .init = &N(init_8024D3E8), - .yaw = 90, - .drops = { - .dropFlags = NPC_DROP_FLAGS_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, - .animations = { - ANIM_Mouser_Purple_Idle, - ANIM_Mouser_Purple_Run, - ANIM_Mouser_Purple_Run, - ANIM_Mouser_Purple_Idle, - ANIM_Mouser_Purple_Idle, - ANIM_Mouser_Purple_Idle, - ANIM_Mouser_Purple_Idle, - ANIM_Mouser_Purple_Idle, - ANIM_Mouser_Purple_Idle, - ANIM_Mouser_Purple_Idle, - ANIM_Mouser_Purple_Idle, - ANIM_Mouser_Purple_Idle, - ANIM_Mouser_Purple_Idle, - ANIM_Mouser_Purple_Idle, - ANIM_Mouser_Purple_Idle, - ANIM_Mouser_Purple_Idle, - }, - }, - { - .id = NPC_CHUCK_QUIZMO, - .settings = &N(Quizmo_NpcSettings), - .pos = { -335.0f, 0.0f, 90.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, - .initVarCount = 1, - .initVar = { .value = 0x00030201 }, - .yaw = 270, - .drops = { - .dropFlags = NPC_DROP_FLAGS_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, - .animations = { - ANIM_ChuckQuizmo_Idle, - ANIM_ChuckQuizmo_Walk, - ANIM_ChuckQuizmo_Run, - ANIM_ChuckQuizmo_Run, - ANIM_ChuckQuizmo_Idle, - ANIM_ChuckQuizmo_Idle, - ANIM_ChuckQuizmo_Still, - ANIM_ChuckQuizmo_Still, - ANIM_ChuckQuizmo_Run, - ANIM_ChuckQuizmo_Run, - ANIM_ChuckQuizmo_Run, - ANIM_ChuckQuizmo_Run, - ANIM_ChuckQuizmo_Run, - ANIM_ChuckQuizmo_Run, - ANIM_ChuckQuizmo_Run, - ANIM_ChuckQuizmo_Run, - }, - .tattle = MSG_NpcTattle_ChuckQuizmo, - }, -}; - -NpcGroupList N(npcGroupList_8024EEF4) = { - NPC_GROUP(N(npcGroup_8024D7B4)), - {}, -}; - -#include "world/common/atomic/Quizmo.inc.c" - -ApiStatus N(func_80241394_96A554)(Evt* script, s32 isInitialCall) { - PlayerData* playerData = &gPlayerData; - Bytecode* args = script->ptrReadPos; - s32 var1 = evt_get_variable(script, *args++); - s32 var2 = *args; - u8 coins1 = N(D_802475E0_9707A0)[var1]; - u8 coins2 = N(D_802475DC_97079C)[var1]; - - if (playerData->coins < coins1) { - evt_set_variable(script, var2, 1); - } else { - playerData->coins = playerData->coins - coins1; - if (playerData->merleeCastsLeft < coins2) { - playerData->merleeCastsLeft = coins2; - } - playerData->merleeTurnCount = rand_int(2) + 1; - switch (rand_int(3)) { - case 0: - playerData->merleeSpellType = 1; - break; - case 1: - playerData->merleeSpellType = 2; - break; - case 2: - playerData->merleeSpellType = 3; - break; - case 3: - playerData->merleeSpellType = 4; - break; - } - evt_set_variable(script, var2, 0); - } - - return ApiStatus_DONE2; -} - -ApiStatus N(func_802414C0_96A680)(Evt* script, s32 isInitialCall) { - s32 i; - - if (isInitialCall) { - mdl_set_all_fog_mode(1); - *gBgRenderTypePtr = BACKGROUND_RENDER_TYPE_1; - set_background_color_blend(0, 0, 0, 0); - - for (i = 0; i < 64; i++) { - Npc* npc = get_npc_by_index(i); - if (npc != 0 && npc->flags != 0 && npc->npcID != NPC_PARTNER && npc->npcID != NPC_WORLD_MERLEE) { - npc->flags |= NPC_FLAG_NO_DROPS; - } - } - script->functionTemp[0] = 0; - } - - script->functionTemp[0] += 8; - if (script->functionTemp[0] >= 0x100) { - script->functionTemp[0] = 255; - } - set_background_color_blend(0, 0, 0, script->functionTemp[0]); - - return (script->functionTemp[0] == 255) * ApiStatus_DONE2; -} - -ApiStatus N(func_802415CC_96A78C)(Evt* script, s32 isInitialCall) { - s32 i; - - if (isInitialCall) { - set_background_color_blend(0, 0, 0, 0xFF); - script->functionTemp[0] = 255; - script->functionTemp[1] = 0; - } - script->functionTemp[0] -= 8; - if (script->functionTemp[0] < 0) { - script->functionTemp[0] = 0; - } - set_background_color_blend(0, 0, 0, script->functionTemp[0]); - - if (script->functionTemp[0] == 0 && script->functionTemp[1] == 0) { - script->functionTemp[1] = 1; - } else if (script->functionTemp[1] == 1) { - mdl_set_all_fog_mode(0); - *gBgRenderTypePtr = BACKGROUND_RENDER_TYPE_0; - for (i = 0; i < 64; i++) { - Npc* npc = get_npc_by_index(i); - - if (npc != NULL && npc->flags != 0 && npc->npcID != NPC_PARTNER && npc->npcID != NPC_WORLD_MERLEE) { - npc->flags &= ~NPC_FLAG_NO_DROPS; - } - } - return ApiStatus_DONE2; - } - return ApiStatus_BLOCK; -} - -ApiStatus N(func_802416FC_96A8BC)(Evt* script, s32 isInitialCall) { - s32 ret; - - N(D_8024EFCC) = script; - - ret = func_8013A704(1); - fold_update(ret, 5, 0xF, 1, 1, 0, 0x800); - evt_set_variable(script, ArrayVar(0), ret); - ret = func_8013A704(1); - fold_update(ret, 5, 0x10, 1, 1, 0, 0x800); - evt_set_variable(script, ArrayVar(1), ret); - ret = func_8013A704(1); - fold_update(ret, 5, 0x11, 1, 1, 0, 0x800); - evt_set_variable(script, ArrayVar(2), ret); - ret = func_8013A704(1); - fold_update(ret, 5, 0x12, 1, 1, 0, 0x800); - evt_set_variable(script, ArrayVar(3), ret); - - evt_set_variable(script, ArrayVar(7), create_generic_entity_world(N(func_8024240C_96B5CC), N(func_80242EAC_96C06C))); - return ApiStatus_DONE2; -} - -ApiStatus N(func_80241874_96AA34)(Evt* script, s32 isInitialCall) { - func_8013A854(evt_get_variable(script, ArrayVar(0))); - func_8013A854(evt_get_variable(script, ArrayVar(1))); - func_8013A854(evt_get_variable(script, ArrayVar(2))); - func_8013A854(evt_get_variable(script, ArrayVar(3))); - free_generic_entity(evt_get_variable(script, ArrayVar(7))); - return ApiStatus_DONE2; -} - -u32 N(func_8024190C_96AACC)(D_8024F010_Struct* arg0, Matrix4f matrix) { - Matrix4f sp18; - Matrix4f sp58; - FoldImageRecPart foldImage; - SpriteRasterInfo rasterInfo; - s32 ret; - - if (arg0->unk_00 == 0) { - return 1; - } - - gSPDisplayList(gMasterGfxPos++, N(D_802478C8_970A88)); - - if (arg0->unk_00 == 1 || arg0->unk_00 == 4 || arg0->unk_00 == 5) { - guTranslateF(sp58, arg0->unk_04, arg0->unk_08, arg0->unk_0C); - guMtxCatF(sp58, matrix, sp18); - guRotateF(sp58, arg0->unk_10, 0.0f, 1.0f, 0.0f); - guMtxCatF(sp58, sp18, sp18); - guRotateF(sp58, arg0->unk_14, 1.0f, 0.0f, 0.0f); - guMtxCatF(sp58, sp18, sp18); - guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, VIRTUAL_TO_PHYSICAL(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - - if (arg0->unk_00 == 1 || arg0->unk_00 == 4) { - gSPDisplayList(gMasterGfxPos++, N(D_802479B8_970B78)); - } - - if (arg0->unk_00 == 1 || arg0->unk_00 == 5) { - spr_get_player_raster_info(&rasterInfo, arg0->unk_18, arg0->unk_1C); - gDPSetTextureLUT(gMasterGfxPos++, G_TT_RGBA16); - gDPLoadTLUT_pal16(gMasterGfxPos++, 0, rasterInfo.defaultPal); - gDPLoadTextureTile_4b(gMasterGfxPos++, rasterInfo.raster, G_IM_FMT_CI, rasterInfo.width, rasterInfo.height, - 0, 0, rasterInfo.width - 1, rasterInfo.height - 1, 0, - G_TX_CLAMP, G_TX_CLAMP, 8, 8, G_TX_NOLOD, G_TX_NOLOD); - guTranslateF(sp18, arg0->unk_20 + 30 - rasterInfo.width / 2, 0.0f, 0.0f); - guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, VIRTUAL_TO_PHYSICAL(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, N(D_80247A38_970BF8)); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - } - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - return 1; - } - - if (arg0->unk_00 == 2) { - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, 256 * 4, 256 * 4, 287 * 4, 287 * 4); - guTranslateF(sp58, N(D_8024F010)[0].unk_04, N(D_8024F010)[0].unk_08, N(D_8024F010)[0].unk_0C); - guMtxCatF(sp58, matrix, sp18); - guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, VIRTUAL_TO_PHYSICAL(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - ret = fold_appendGfx_component(evt_get_variable(N(D_8024EFCC), ArrayVar(0)), &foldImage, FOLD_STATE_FLAG_10 | FOLD_STATE_FLAG_20, sp18); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - return ret; - } - - if (arg0->unk_00 == 3) { - gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, 256 * 4, 256 * 4, 287 * 4, 287 * 4); - guTranslateF(sp58, N(D_8024F010)[0].unk_04, N(D_8024F010)[0].unk_08, N(D_8024F010)[0].unk_0C); - guMtxCatF(sp58, matrix, sp18); - guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, VIRTUAL_TO_PHYSICAL(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - fold_appendGfx_component(evt_get_variable(N(D_8024EFCC), ArrayVar(1)), &foldImage, FOLD_STATE_FLAG_10 | FOLD_STATE_FLAG_20, sp18); - fold_appendGfx_component(evt_get_variable(N(D_8024EFCC), ArrayVar(2)), &foldImage, FOLD_STATE_FLAG_10 | FOLD_STATE_FLAG_20, sp18); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - guTranslateF(sp58, N(D_8024F010)[0].unk_04, N(D_8024F010)[0].unk_08, N(D_8024F010)[0].unk_0C); - guMtxCatF(sp58, matrix, sp18); - guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, VIRTUAL_TO_PHYSICAL(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - spr_get_player_raster_info(&rasterInfo, arg0->unk_18, arg0->unk_1C); - foldImage.raster = rasterInfo.raster; - foldImage.palette = rasterInfo.defaultPal; - foldImage.width = rasterInfo.width; - foldImage.height = rasterInfo.height; - foldImage.xOffset = -(rasterInfo.width / 2); - foldImage.yOffset = rasterInfo.height / 2; - foldImage.opacity = 255; - ret = fold_appendGfx_component(evt_get_variable(N(D_8024EFCC), ArrayVar(3)), &foldImage, FOLD_STATE_FLAG_10, sp18); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); - return ret; - } - - return 1; -} - -void N(func_80242214_96B3D4)(s32 arg0, f32* arg1, f32* arg2, f32* arg3, f32* arg4) { - D_8024F010_Struct* F010_ptr; - Matrix4f sp20; - Matrix4f sp60; - Matrix4f spA0; - - guPositionF(spA0, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, SPRITE_WORLD_SCALE_F, - evt_get_variable(N(D_8024EFCC), ArrayVar(4)), evt_get_variable(N(D_8024EFCC), ArrayVar(5)), - evt_get_variable(N(D_8024EFCC), ArrayVar(6))); - - F010_ptr = &N(D_8024F010)[arg0]; - guTranslateF(sp60, F010_ptr->unk_04, F010_ptr->unk_08, F010_ptr->unk_0C); - guMtxCatF(sp60, spA0, sp20); - guRotateF(sp60, F010_ptr->unk_10, 0.0f, 1.0f, 0.0f); - guMtxCatF(sp60, sp20, sp20); - guTranslateF(sp60, 0.0f, 0.0f, 1.0f); - guMtxCatF(sp60, sp20, sp20); - *arg1 = sp20[3][0]; - *arg2 = sp20[3][1]; - *arg3 = sp20[3][2]; - *arg4 = clamp_angle(F010_ptr->unk_10); -} - -void dro_02_func_8024240C_96B5CC(Evt* script, s32 isInitialCall) { - f32 sp18; - f32 sp1C; - f32 sp20; - f32 sp24; - f32 sp28; - f32 sp2C; - f32 sp30; - f32 sp34; - f32 sp38; - f32 sp3C; - f32 sp40; - f32 sp44; - f32 sp48; - f32 sp4C; - f32 sp50; - f32 sp54; - f32 sp58; - f32 sp5C; - f32 sp60; - f32 sp64; - f32 sp68; - f32 sp6C; - f32 sp70; - f32 sp74; - EffectInstance* effect; - EnergyInOutFXData* data; - s32 i, j; - - switch (evt_get_variable(N(D_8024EFCC), ArrayVar(9))) { - case 0: - N(D_8024EF88) = 0; - evt_set_variable(N(D_8024EFCC), ArrayVar(9), 1); - N(D_8024F010)[0].unk_00 = 1; - N(D_8024F010)[0].unk_04 = -200.0f; - N(D_8024F010)[0].unk_08 = 0.0f; - N(D_8024F010)[0].unk_0C = 0.0f; - N(D_8024F010)[0].unk_14 = 0.0f; - N(D_8024F010)[0].unk_1C = 12; - N(D_8024F010)[0].unk_20 = 2; - - N(D_8024F010)[1].unk_1C = 48; - N(D_8024F010)[2].unk_18 = 8; - N(D_8024F010)[2].unk_1C = 5; - N(D_8024F010)[0].unk_10 = 0.0f; - N(D_8024F010)[0].unk_18 = 1; - N(D_8024F010)[1].unk_00 = 1; - N(D_8024F010)[1].unk_08 = 0.0f; - N(D_8024F010)[1].unk_14 = 0.0f; - N(D_8024F010)[1].unk_10 = 0.0f; - N(D_8024F010)[1].unk_18 = 1; - N(D_8024F010)[1].unk_20 = 0; - N(D_8024F010)[2].unk_00 = 1; - N(D_8024F010)[2].unk_04 = 0.0f; - N(D_8024F010)[2].unk_14 = 0.0f; - N(D_8024F010)[2].unk_10 = 0.0f; - N(D_8024F010)[2].unk_20 = 4; - N(D_8024F010)[1].unk_04 = 200.0f; - N(D_8024F010)[1].unk_0C = 1.0f; - N(D_8024F010)[2].unk_08 = 200.0f; - N(D_8024F010)[2].unk_0C = 2.0f; - break; - case 1: - N(D_8024EF88)++; - N(D_8024F010)[0].unk_04 += 10.0f; - N(D_8024F010)[1].unk_04 += -10.0f; - N(D_8024F010)[2].unk_08 += -10.0f; - if (N(D_8024EF88) == 18) { - gPlayerStatus.position.y = -1000.0f; - } - if (N(D_8024EF88) == 20) { - evt_set_variable(N(D_8024EFCC), ArrayVar(9), 2); - N(D_8024EF88) = 0; - } - break; - case 2: - N(D_8024F010)[0].unk_00 = 2; - N(D_8024F010)[1].unk_00 = 0; - N(D_8024F010)[2].unk_00 = 0; - N(D_8024F010)[0].unk_04 = 0.0f; - N(D_8024F010)[0].unk_08 = 0.0f; - N(D_8024F010)[0].unk_0C = 0; - break; - case 3: - N(D_8024F010)[0].unk_00 = 1; - N(D_8024F010)[1].unk_00 = 1; - N(D_8024F010)[2].unk_00 = 1; - N(D_8024EF88)++; - N(D_8024F010)[0].unk_04 -= 10.0f; - N(D_8024F010)[1].unk_04 += 10.0f; - if (N(D_8024EF88) == 10) { - N(D_8024EF88) = 0; - evt_set_variable(N(D_8024EFCC), ArrayVar(9), 4); - } - break; - case 4: - N(D_8024F010)[0].unk_08 = 0.0f; - N(D_8024F010)[0].unk_0C = 0; - N(D_8024F010)[1].unk_08 = 0.0f; - N(D_8024F010)[2].unk_04 = 0; - N(D_8024F010)[2].unk_08 = 0.0f; - N(D_8024F010)[0].unk_04 = -100.0f; - N(D_8024F010)[1].unk_04 = 100.0f; - N(D_8024F010)[1].unk_0C = 1.0f; - N(D_8024F010)[2].unk_0C = 2.0f; - N(D_8024EF88)++; - if (N(D_8024EF88) == 20) { - N(D_8024EF88) = 0; - evt_set_variable(N(D_8024EFCC), ArrayVar(9), 5); - sfx_play_sound_with_params(SOUND_203, 0, 0x18, 0); - } - break; - case 5: - N(D_8024F010)[1].unk_10 = 0.0f; - N(D_8024F010)[2].unk_10 = 0.0f; - N(D_8024F010)[0].unk_10 += 18.0f; - N(D_8024EF88)++; - if (N(D_8024EF88) == 8) { - N(func_80242214_96B3D4)(0, &sp18, &sp1C, &sp20, &sp24); - fx_sparkles(0, sp18, sp1C + 20.0f, sp20, 30.0f); - } - if (N(D_8024EF88) == 10) { - N(D_8024EF88) = 0; - evt_set_variable(N(D_8024EFCC), ArrayVar(9), 6); - sfx_play_sound_with_params(SOUND_203, 0, 0x40, 0); - } - break; - case 6: - N(D_8024F010)[1].unk_10 = 0.0f; - N(D_8024F010)[0].unk_10 += 18.0f; - N(D_8024F010)[2].unk_10 += 18.0f; - N(D_8024EF88)++; - if (N(D_8024EF88) == 8) { - N(func_80242214_96B3D4)(2, &sp28, &sp2C, &sp30, &sp34); - fx_sparkles(0, sp28, sp2C + 20.0f, sp30, 30.0f); - } - if (N(D_8024EF88) == 10) { - N(D_8024EF88) = 0; - evt_set_variable(N(D_8024EFCC), ArrayVar(9), 7); - sfx_play_sound_with_params(SOUND_203, 0, 0x68, 0); - } - break; - case 7: - N(D_8024F010)[0].unk_10 = 0.0f; - N(D_8024EF88)++; - N(D_8024F010)[1].unk_10 += 18.0f; - N(D_8024F010)[2].unk_10 += 18.0f; - if (N(D_8024EF88) == 8) { - N(func_80242214_96B3D4)(1, &sp38, &sp3C, &sp40, &sp44); - fx_sparkles(0, sp38, sp3C + 20.0f, sp40, 30.0f); - } - if (N(D_8024EF88) == 10) { - N(D_8024EF88) = 0; - evt_set_variable(N(D_8024EFCC), ArrayVar(9), 8); - } - break; - case 8: - N(D_8024F010)[0].unk_10 = 0.0f; - N(D_8024F010)[2].unk_10 = 0.0f; - N(D_8024F010)[1].unk_10 += 18.0f; - N(D_8024EF88)++; - if (N(D_8024EF88) == 10) { - N(D_8024EF88) = 0; - evt_set_variable(N(D_8024EFCC), ArrayVar(9), 9); - } - break; - case 9: - N(D_8024F010)[0].unk_08 = 0.0f; - N(D_8024F010)[0].unk_10 = 0.0f; - N(D_8024F010)[1].unk_08 = 0.0f; - N(D_8024F010)[1].unk_10 = 0.0f; - N(D_8024F010)[2].unk_04 = 0; - N(D_8024F010)[2].unk_08 = 0.0f; - N(D_8024F010)[2].unk_10 = 0.0f; - N(D_8024EF88)++; - N(D_8024F010)[0].unk_04 += 10.0f; - N(D_8024F010)[1].unk_04 -= 10.0f; - if (N(D_8024EF88) == 10) { - N(D_8024EF88) = 0; - evt_set_variable(N(D_8024EFCC), ArrayVar(9), 10); - return; - } - break; - case 10: - N(D_8024F010)[0].unk_00 = 3; - N(D_8024F010)[0].unk_18 = 8; - N(D_8024F010)[1].unk_00 = 0; - N(D_8024F010)[2].unk_00 = 0; - N(D_8024F010)[0].unk_1C = 0x11; - return; - case 11: - N(D_8024F010)[0].unk_00 = 4; - N(D_8024F010)[1].unk_00 = 5; - N(D_8024F010)[1].unk_18 = 8; - N(D_8024F010)[0].unk_04 = 0.0f; - N(D_8024F010)[0].unk_0C = 0; - N(D_8024F010)[1].unk_04 = 0.0f; - N(D_8024F010)[1].unk_0C = 0; - N(D_8024F010)[1].unk_1C = 10; - N(D_8024F010)[1].unk_20 = 0; - N(D_8024EF88) = 0; - N(D_8024F010)[0].unk_08 = 68.0f; - N(D_8024F010)[0].unk_10 = 180.0f; - N(D_8024F010)[1].unk_08 = 68.0f; - N(D_8024F010)[1].unk_10 = 180.0f; - evt_set_variable(N(D_8024EFCC), ArrayVar(9), 12); - N(D_8024EF80) = 0.0f; - N(D_8024EF84) = 1.0f; - - N(func_80242214_96B3D4)(1, &sp48, &sp4C, &sp50, &sp54); - - for (j = 0; j < ARRAY_COUNT(N(D_8024EF90)); j++) { - s32 i; - - N(D_8024EF90)[j] = fx_energy_in_out(2, sp48, sp4C + 20.0f, sp50, 8.0f, -1); - N(D_8024EF90)[j]->data.energyInOut->unk_28 = 215; - N(D_8024EF90)[j]->data.energyInOut->unk_2C = 55; - N(D_8024EF90)[j]->data.energyInOut->unk_30 = 255; - - for (i = 1; i < N(D_8024EF90)[j]->numParts; i++) { - N(D_8024EF90)[j]->data.energyInOut[i].unk_38 *= 0.1; - } - } - break; - case 12: - N(func_80242214_96B3D4)(1, &sp58, &sp5C, &sp60, &sp64); - - for (j = 0; j < ARRAY_COUNT(N(D_8024EF90)); j++) { - s32 i; - - N(D_8024EF90)[j]->data.energyInOut->pos.x = sp58; - N(D_8024EF90)[j]->data.energyInOut->pos.y = sp5C + 20.0f; - N(D_8024EF90)[j]->data.energyInOut->pos.z = sp60; - N(D_8024EF90)[j]->data.energyInOut->scale -= 0.1; - - if (N(D_8024EF90)[j]->data.energyInOut->scale < 0.1) { - N(D_8024EF90)[j]->data.energyInOut->scale = 0.1f; - } - - for (i = 1; i < N(D_8024EF90)[j]->numParts; i++, data++) { - N(D_8024EF90)[j]->data.energyInOut[i].unk_38 += 0.01; - } - } - - N(D_8024F010)[0].unk_08 += N(D_8024EF80); - N(D_8024F010)[1].unk_08 += N(D_8024EF84); - N(D_8024EF80) += 0.4; - N(D_8024EF84) -= 0.05; - N(D_8024EF88) += 1; - - if (N(D_8024F010)[1].unk_08 < -5.0f) { - N(D_8024F010)[1].unk_08 = -5.0f; - N(D_8024EF88) = 0; - evt_set_variable(dro_02_D_8024EFCC, ArrayVar(9), 13); - N(D_8024F010)[0].unk_00 = 0; - N(D_8024F010)[1].unk_00 = 0; - N(func_80242214_96B3D4)(1, &sp68, &sp6C, &sp70, &sp74); - fx_sparkles(0, sp68, sp6C + 20.0f, sp70, 30.0f); - sfx_play_sound(0x206); - - for (j = 0; j < ARRAY_COUNT(N(D_8024EF90)); j++) { - N(D_8024EF90)[j]->flags |= 0x10; - } - } - break; - case 13: - break; - } -} - -void N(func_80242EAC_96C06C)(Evt* script, s32 isInitialCall) { - Matrix4f sp20; - u32 temp_s1; - - guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, SPRITE_WORLD_SCALE_F, - evt_get_variable(N(D_8024EFCC), ArrayVar(4)), evt_get_variable(N(D_8024EFCC), ArrayVar(5)), - evt_get_variable(N(D_8024EFCC), ArrayVar(6))); - - temp_s1 = N(func_8024190C_96AACC)(&N(D_8024F010)[0], sp20); - N(func_8024190C_96AACC)(&N(D_8024F010)[1], sp20); - N(func_8024190C_96AACC)(&N(D_8024F010)[2], sp20); - if ((N(D_8024F010)[0].unk_00 == 2) && ((temp_s1 - 1) < 2)) { - evt_set_variable(N(D_8024EFCC), ArrayVar(9), 3); - } - if ((N(D_8024F010)[0].unk_00 == 3) && ((temp_s1 - 1) < 2)) { - evt_set_variable(N(D_8024EFCC), ArrayVar(9), 0xB); - } -} - -ApiStatus N(func_8024303C_96C1FC)(Evt* script, s32 isInitialCall) { - sfx_play_sound_with_params(SOUND_202A, 0, 24, 0); - return ApiStatus_DONE2; -} - -ApiStatus N(func_80243068_96C228)(Evt* script, s32 isInitialCall) { - sfx_play_sound_with_params(SOUND_202B, 0, 104, 0); - return ApiStatus_DONE2; -} - -#include "world/common/atomic/ItemChoice_PartA.inc.c" - -#include "world/common/atomic/MakeKeyChoice.inc.c" - -#include "world/common/atomic/MakeConsumableChoice.inc.c" - -#include "world/common/atomic/ToadHouse.inc.c" - -#include "world/common/todo/LetterDelivery.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 ce06718969..b12385434b 100644 --- a/src/world/area_dro/dro_02/dro_02.h +++ b/src/world/area_dro/dro_02/dro_02.h @@ -1,68 +1,60 @@ +#ifndef _DRO_02_H_ +#define _DRO_02_H_ + /// @file dro_02.h /// @brief Dry Dry Outpost - Outpost 2 #include "common.h" -#include "../dro.h" #include "message_ids.h" #include "map.h" +#include "../dro.h" +#include "mapfs/dro_02_shape.h" +#include "mapfs/dro_02_hit.h" + +#include "sprite/npc/ChuckQuizmo.h" +#include "sprite/npc/WorldMerlee.h" +#include "sprite/npc/Toad.h" +#include "sprite/npc/WorldParakarry.h" +#include "sprite/npc/Archeologist.h" +#include "sprite/npc/Dryite.h" +#include "sprite/npc/Mouser.h" +#include "sprite/npc/DisguisedMoustafa.h" +#include "sprite/npc/Moustafa.h" + +enum { + NPC_Archeologist = 0, + NPC_Dryite_01 = 1, + NPC_DisguisedMoustafa = 2, + NPC_Toad = 3, + NPC_Merlee = 4, + NPC_Moustafa = 5, + NPC_Dryite_02 = 6, + NPC_Mouser_01 = 7, + NPC_Mouser_02 = 8, + NPC_Mouser_03 = 9, + NPC_ChuckQuizmo = 10, + NPC_Dryite_03 = 11, +}; + +enum { + MF_Unk_00 = MapFlag(0), +}; + #define NAMESPACE dro_02 -ApiStatus N(ToadHouse_DisableStatusMenu)(Evt* script, s32 isInitialCall); -ApiStatus N(ToadHouse_ShowStatusMenu)(Evt* script, s32 isInitialCall); -ApiStatus N(ToadHouse_GetPartnerBackOut)(Evt* script, s32 isInitialCall); -ApiStatus N(Quizmo_GetCamVfov)(Evt* script, s32 isInitialCall); -ApiStatus N(Quizmo_ShouldQuizmoLeave)(Evt* script, s32 isInitialCall); -ApiStatus N(Quizmo_NPC_Aux_Impl)(Evt* script, s32 isInitialCall); -ApiStatus N(ToadHouse_PutPartnerAway)(Evt* script, s32 isInitialCall); -ApiStatus N(Quizmo_ShowEntities)(Evt* script, s32 isInitialCall); -ApiStatus N(Quizmo_HideEntities)(Evt* script, s32 isInitialCall); -ApiStatus N(Quizmo_SetCamVfov)(Evt* script, s32 isInitialCall); -ApiStatus N(LetterDelivery_Init)(Evt* script, s32 isInitialCall); -ApiStatus N(AddPlayerHandsOffset)(Evt* script, s32 isInitialCall); -ApiStatus N(Quizmo_HideWorld)(Evt* script, s32 isInitialCall); -ApiStatus N(Quizmo_AddViewRelativeOffset)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkFunc26)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkFunc27)(Evt* script, s32 isInitialCall); -ApiStatus N(Quizmo_FadeInWorld)(Evt* script, s32 isInitialCall); -ApiStatus N(Quizmo_UpdatePartnerPosition)(Evt* script, s32 isInitialCall); -ApiStatus N(Quizmo_SpinPartner)(Evt* script, s32 isInitialCall); -ApiStatus N(Quizmo_SpinPlayer)(Evt* script, s32 isInitialCall); -ApiStatus N(LetterDelivery_CalcLetterPos)(Evt* script, s32 isInitialCall); -ApiStatus N(Quizmo_ShouldAppear)(Evt* script, s32 isInitialCall); -ApiStatus N(Quizmo_RenderInit)(Evt* script, s32 isInitialCall); -ApiStatus N(Quizmo_UpdateRecords)(Evt* script, s32 isInitialCall); -ApiStatus N(Quizmo_CreateStage)(Evt* script, s32 isInitialCall); -ApiStatus N(Quizmo_DestroyEffects)(Evt* script, s32 isInitialCall); -ApiStatus N(Quizmo_SetStageLightsDelay)(Evt* script, s32 isInitialCall); -ApiStatus N(Quizmo_UnkStageEffectMode)(Evt* script, s32 isInitialCall); -ApiStatus N(Quizmo_SetVannaAnim_Idle)(Evt* script, s32 isInitialCall); -ApiStatus N(Quizmo_SetVannaAnim_Clap)(Evt* script, s32 isInitialCall); -ApiStatus N(Quizmo_SetVannaAnim_Wave)(Evt* script, s32 isInitialCall); -ApiStatus N(Quizmo_CreateWorker)(Evt* script, s32 isInitialCall); -ApiStatus N(func_80241394_96A554)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802414C0_96A680)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802415CC_96A78C)(Evt* script, s32 isInitialCall); -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(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); -ApiStatus N(ToadHouse_InitScreenOverlay)(Evt* script, s32 isInitialCall); -ApiStatus N(LetterDelivery_SaveNpcAnim)(Evt* script, s32 isInitialCall); -ApiStatus N(LetterDelivery_RestoreNpcAnim)(Evt* script, s32 isInitialCall); -void N(func_8024240C_96B5CC)(Evt *script, s32 isInitialCall); -void N(func_80242EAC_96C06C)(Evt *script, s32 isInitialCall); +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(DefaultNPCs); -extern NpcGroupList N(npcGroupList_8024EEF4); -extern EvtScript N(80244C78); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_PlayRestMusic); +extern EvtScript N(EVS_PlayMoustafaMusic); + +extern EvtScript N(EVS_SetupBuildings); +extern EvtScript N(EVS_SetToadHouseDialogue); extern EvtScript N(8024D434); -extern EvtScript N(8024D494); -extern EvtScript N(8024D700); -extern EvtScript N(main); +extern EvtScript N(EVS_ToadHouse_GetInBed); +extern EvtScript N(EVS_ToadHouse_ReturnFromRest); + +#endif diff --git a/src/world/area_dro/dro_02/dro_02_0_header.c b/src/world/area_dro/dro_02/dro_02_0_header.c new file mode 100644 index 0000000000..9917b41c61 --- /dev/null +++ b/src/world/area_dro/dro_02/dro_02_0_header.c @@ -0,0 +1,16 @@ +#include "dro_02.h" + +EntryList N(Entrances) = { + [dro_02_ENTRY_0] { -473.0, 0.0, 12.0, 90.0 }, + [dro_02_ENTRY_1] { 415.0, 35.0, -15.0, 180.0 }, + [dro_02_ENTRY_2] { 0.0, 0.0, 0.0, 0.0 }, + [dro_02_ENTRY_3] { 0.0, 0.0, 0.0, 0.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_dro_02 }, +}; diff --git a/src/world/area_dro/dro_02/dro_02_1_music.c b/src/world/area_dro/dro_02/dro_02_1_music.c new file mode 100644 index 0000000000..9b2b2f6296 --- /dev/null +++ b/src/world/area_dro/dro_02/dro_02_1_music.c @@ -0,0 +1,27 @@ +#include "dro_02.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(dro_02_ENTRY_2) + EVT_CASE_OR_EQ(dro_02_ENTRY_3) + EVT_END_CASE_GROUP + EVT_CASE_DEFAULT + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_OUTPOST, 0, 8) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PlayRestMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_TAKING_REST, 0, 8) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PlayMoustafaMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_MOUSTAFA_THEME, 0, 8) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_dro/dro_02/dro_02_2_entity.c b/src/world/area_dro/dro_02/dro_02_2_entity.c new file mode 100644 index 0000000000..c61dc0792e --- /dev/null +++ b/src/world/area_dro/dro_02/dro_02_2_entity.c @@ -0,0 +1,10 @@ +#include "dro_02.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeItemEntity, ITEM_LETTER08, -135, 160, -245, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_DRO02_Item_Letter08) + EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenPanel), 180, 173, -200, 0, MODEL_1_yane, MAKE_ENTITY_END) + EVT_CALL(AssignPanelFlag, GF_DRO02_HiddenPanel) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_dro/dro_02/dro_02_3_main.c b/src/world/area_dro/dro_02/dro_02_3_main.c new file mode 100644 index 0000000000..053d122f05 --- /dev/null +++ b/src/world/area_dro/dro_02/dro_02_3_main.c @@ -0,0 +1,98 @@ +#include "dro_02.h" + +#include "world/common/atomic/UnkFunc27.inc.c" + +EvtScript N(EVS_ExitWalk_dro_01_1) = EVT_EXIT_WALK(60, dro_02_ENTRY_0, "dro_01", dro_01_ENTRY_1); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_dro_01_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OnReadPoster) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_017C, 160, 40) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(PlaySound, SOUND_80000060) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 190, 0, -37) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 190, 0, -37) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(200.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(13.0), EVT_FLOAT(-10.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(N(UnkFunc27), 2, 0, 3) + EVT_CALL(N(UnkFunc27), 1, -1, 3) + EVT_CALL(N(UnkFunc26), 3, 44, 32, 177, 0, 0, 0, 0, 0, 0) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 300, EVT_FLOAT(0.2)) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(60) + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, dro_02_ENTRY_2) + EVT_CALL(GotoMap, EVT_PTR("sbk_02"), sbk_02_ENTRY_6) + EVT_ELSE + EVT_CALL(GotoMap, EVT_PTR("sbk_02"), sbk_02_ENTRY_7) + EVT_END_IF + EVT_WAIT(100) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_OUTPOST) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_CALL(InitVirtualEntityList) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC_WAIT(N(EVS_SetupBuildings)) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(dro_02_ENTRY_2) + EVT_CASE_OR_EQ(dro_02_ENTRY_3) + EVT_EXEC_WAIT(N(EVS_EnterMap)) + EVT_END_CASE_GROUP + EVT_CASE_DEFAULT + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_END_SWITCH + EVT_WAIT(1) + EVT_THREAD + EVT_CALL(SetTexPanner, MODEL_kemuri, 1) + EVT_SET(LVar0, 0) + EVT_LABEL(123) + EVT_ADD(LVar0, 420) + EVT_IF_GT(LVar0, 0x10000) + EVT_ADD(LVar0, -0x10000) + EVT_END_IF + EVT_CALL(SetTexPanOffset, 1, 0, 0, LVar0) + EVT_WAIT(1) + EVT_GOTO(123) + EVT_END_THREAD + EVT_SET(MF_Unk_00, FALSE) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnReadPoster)), TRIGGER_WALL_PRESS_A, COLLIDER_poster, 1, 0) + EVT_THREAD + EVT_LOOP(0) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_IF_LT(LVar2, -200) + EVT_CALL(EnableGroup, MODEL_mazinai, TRUE) + EVT_ELSE + EVT_CALL(EnableGroup, MODEL_mazinai, FALSE) + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.3339844)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_dro/dro_02/dro_02_4_building.c b/src/world/area_dro/dro_02/dro_02_4_building.c new file mode 100644 index 0000000000..f0407cec34 --- /dev/null +++ b/src/world/area_dro/dro_02/dro_02_4_building.c @@ -0,0 +1,247 @@ +#include "dro_02.h" + +EvtScript N(EVS_SwingToadHouseSign) = { + EVT_LABEL(9) + EVT_CALL(MakeLerp, 10, -10, 30, EASING_COS_IN_OUT) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o852, LVar0, 1, 0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(MakeLerp, -10, 10, 30, EASING_COS_IN_OUT) + EVT_LABEL(11) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o852, LVar0, 1, 0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(11) + EVT_END_IF + EVT_GOTO(9) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UnusedDoorSetup) = { + EVT_DIV(LVar0, 2) + EVT_ADD(LVar0, 18) + EVT_CALL(RotateModel, MODEL_1_doa, LVar0, 0, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OpenDoor_Hideout) = { + EVT_CALL(RotateModel, MODEL_o769, LVar0, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_o770, LVar0, 0, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MoveWalls_Hideout) = { + EVT_SET(LVar1, LVar0) + EVT_DIVF(LVar1, 50) + EVT_CALL(TranslateModel, MODEL_6_kabe, 0, LVar1, 0) + EVT_CALL(TranslateModel, MODEL_6_waku, 0, LVar1, 0) + EVT_CALL(TranslateModel, MODEL_6_moyou, 0, LVar1, 0) + EVT_CALL(RotateModel, MODEL_6_kabe, LVar0, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_6_waku, LVar0, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_6_moyou, LVar0, 1, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_DropDoor_Hideout) = { + EVT_SET(LVar1, LVar0) + EVT_DIVF(LVar1, 50) + EVT_CALL(TranslateModel, MODEL_o769, 0, LVar1, 0) + EVT_CALL(TranslateModel, MODEL_o770, 0, LVar1, 0) + EVT_CALL(RotateModel, MODEL_o769, LVar0, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o770, LVar0, 1, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OpenDoor_ToadHouse) = { + EVT_CALL(RotateModel, MODEL_4_doa, LVar0, 0, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MoveWalls_ToadHouse) = { + EVT_SET(LVar1, LVar0) + EVT_DIVF(LVar1, 50) + EVT_CALL(RotateGroup, MODEL_mobe, LVar0, 0, 0, -1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupCamSpeed) = { + EVT_SWITCH(LVar0) + EVT_CASE_EQ(0) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_CASE_EQ(3) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.3339844)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ToggleVis_ToadHouse) = { + EVT_SWITCH(LVar0) + EVT_CASE_EQ(0) + EVT_CALL(SetGroupEnabled, MODEL_ie4_naka, 1) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_CASE_EQ(3) + EVT_CALL(SetGroupEnabled, MODEL_ie4_naka, 0) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.3339844)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ToggleVis_Hideout) = { + EVT_SWITCH(LVar0) + EVT_CASE_EQ(0) + EVT_CALL(SetGroupEnabled, MODEL_ie5_naka, 1) + EVT_CALL(SetCamType, CAM_DEFAULT, 0, FALSE) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 260) + EVT_CALL(SetCamPitch, CAM_DEFAULT, 22, -13) + EVT_CALL(SetCamPosA, CAM_DEFAULT, 0, 290) + EVT_CALL(SetCamPosB, CAM_DEFAULT, 0, -290) + EVT_CALL(SetCamPosC, CAM_DEFAULT, 0, 0) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -395, 140, -150) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CASE_EQ(2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -365, 140, -145) + EVT_CALL(SetCamPitch, CAM_DEFAULT, 20, -7) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 400) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CASE_EQ(3) + EVT_CALL(SetGroupEnabled, MODEL_ie5_naka, 0) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.3339844)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OpenSecretDoor_FromOutside) = { + EVT_SET_GROUP(EVT_GROUP_00) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(func_802D2C14, 1) + EVT_CALL(PlayerMoveTo, 230, 10, 20) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o1287, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o1287, SOUND_BASIC_DOOR_OPEN, 0) + EVT_CALL(MakeLerp, 18, 80, 10, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_1_doa, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(PlayerMoveTo, 230, -70, 15) + EVT_CALL(MakeLerp, 80, 18, 10, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_1_doa, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(PlaySoundAtCollider, COLLIDER_o1287, SOUND_BASIC_DOOR_CLOSE, 0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o1287, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(func_802D2C14, 0) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OpenSecretDoor_FromInside) = { + EVT_SET_GROUP(EVT_GROUP_00) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(func_802D2C14, 1) + EVT_CALL(PlayerMoveTo, 230, -70, 20) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o1289, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o1289, SOUND_BASIC_DOOR_OPEN, 0) + EVT_CALL(MakeLerp, 18, 80, 10, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_1_doa, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(PlayerMoveTo, 230, 10, 15) + EVT_CALL(MakeLerp, 80, 18, 10, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_1_doa, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(PlaySoundAtCollider, COLLIDER_o1289, SOUND_BASIC_DOOR_CLOSE, 0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o1289, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(func_802D2C14, 0) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +s32 N(InsideNPCs_Hideout)[] = { + NPC_DisguisedMoustafa, + NPC_Moustafa, + -1 +}; + +s32 N(InsideNPCs_ToadHouse)[] = { + NPC_Toad, + -1 +}; + +EvtScript N(EVS_SetupBuildings) = { + EVT_EXEC(N(EVS_SwingToadHouseSign)) + EVT_CALL(ParentColliderToModel, COLLIDER_o1287, MODEL_1_doa) + EVT_IF_GE(GB_StoryProgress, STORY_CH2_BOUGHT_SECRET_ITEMS) + EVT_CALL(RotateModel, MODEL_1_doa, 18, 0, 1, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_o1287) + EVT_END_IF + EVT_CALL(MakeDoorAdvanced, + VIS_GROUP_PAIR(0, 4), + EVT_PTR(N(EVS_OpenDoor_Hideout)), + EVT_PTR(N(EVS_MoveWalls_Hideout)), + EVT_PTR(N(EVS_DropDoor_Hideout)), + EVT_PTR(N(EVS_ToggleVis_Hideout)), + COLLIDER_o1252, + COLLIDER_o1253, + MODEL_k_i5, + EVT_PTR(N(InsideNPCs_Hideout))) + EVT_IF_GE(GB_StoryProgress, STORY_CH2_BOUGHT_SECRET_ITEMS) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OpenSecretDoor_FromOutside)), TRIGGER_WALL_PRESS_A, COLLIDER_o1287, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OpenSecretDoor_FromInside)), TRIGGER_WALL_PRESS_A, COLLIDER_o1289, 1, 0) + EVT_END_IF + EVT_CALL(MakeDoorAdvanced, + VIS_GROUP_PAIR(1, 5), + EVT_PTR(N(EVS_OpenDoor_ToadHouse)), + EVT_PTR(N(EVS_MoveWalls_ToadHouse)), + NULL, + EVT_PTR(N(EVS_ToggleVis_ToadHouse)), + COLLIDER_o1204, + COLLIDER_o1261, + MODEL_k_i4, + EVT_PTR(N(InsideNPCs_ToadHouse))) + EVT_SET(LVar0, 3) + EVT_EXEC(N(EVS_ToggleVis_Hideout)) + EVT_EXEC(N(EVS_SetupCamSpeed)) + EVT_EXEC(N(EVS_ToggleVis_ToadHouse)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_dro/dro_02/dro_02_5_npc.c b/src/world/area_dro/dro_02/dro_02_5_npc.c new file mode 100644 index 0000000000..8c39bdfcc7 --- /dev/null +++ b/src/world/area_dro/dro_02/dro_02_5_npc.c @@ -0,0 +1,631 @@ +#include "dro_02.h" +#include "effects.h" +#include "script_api/battle.h" +#include "entity.h" +#include "sprite.h" + +#define CHUCK_QUIZMO_NPC_ID NPC_ChuckQuizmo + +static f32 N(D_8024EF80); +static f32 N(D_8024EF84); +static s32 N(RitualStateTime); +static s8 N(pad_D_8024EF8C)[0x4]; +static EffectInstance* N(D_8024EF90)[4]; + +#include "world/common/complete/Quizmo.inc.c" + +MobileAISettings N(AISettings_Archeologist) = { + .moveSpeed = 1.5f, + .moveTime = 60, + .waitTime = 30, + .playerSearchInterval = -1, + .unk_AI_2C = 1, +}; + +EvtScript N(EVS_NpcAI_Archeologist) = { + EVT_CALL(BasicAI_Main, EVT_PTR(N(AISettings_Archeologist))) + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_Archeologist_Wander) = { + .height = 35, + .radius = 24, + .ai = &N(EVS_NpcAI_Archeologist), + .level = 99, + .actionFlags = ENEMY_AI_FLAGS_10, +}; + +NpcSettings N(NpcSettings_Archeologist) = { + .height = 42, + .radius = 24, + .ai = &N(EVS_NpcAI_Archeologist), + .level = 99, +}; + +#include "world/common/npc/Dryite_Wander.inc.c" +#include "world/common/npc/Dryite_Stationary.inc.c" +#include "world/common/npc/Mouser.inc.c" + +NpcSettings N(NpcSettings_ToadHouseKeeper) = { + .height = 30, + .radius = 24, + .level = 99, +}; + +// toad kid? +NpcSettings N(NpcSettings_Unused1) = { + .height = 23, + .radius = 19, + .level = 99, +}; + +#include "npc_merlee.c" + +#include "world/common/complete/KeyItemChoice.inc.c" +MAP_STATIC_PAD(1,key_item); +#include "world/common/complete/NormalItemChoice.inc.c" + +extern IMG_BIN N(toad_house_blanket_img)[]; +#include "dro_02_toad_house_blanket_skeleton.c" +#include "world/area_dro/dro_02/toad_house_blanket.vtx.inc.c" +#include "world/area_dro/dro_02/toad_house_blanket.gfx.inc.c" +#include "world/area_dro/dro_02/toad_house_blanket.png.inc.c" +#include "dro_02_toad_house_blanket_anim.c" + +#include "world/common/atomic/ToadHouse.inc.c" +#include "world/common/atomic/ToadHouse.data.inc.c" + +#include "world/common/complete/LetterDelivery.inc.c" + +s32 N(LetterList)[] = { + ITEM_LETTER17, + ITEM_NONE +}; + +EvtScript N(EVS_MrE_LetterPrompt) = { + EVT_CALL(N(LetterDelivery_Init), + NPC_Dryite_01, ANIM_Dryite_Blue_Talk, ANIM_Dryite_Blue_Idle, + ITEM_LETTER17, ITEM_LETTER18, + MSG_CH2_0095, MSG_CH2_0096, MSG_CH2_0097, MSG_CH2_0098, + EVT_PTR(N(LetterList))) + EVT_EXEC_WAIT(N(EVS_DoLetterDelivery)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Archeologist) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_STAR_SPRIT_DEPARTED) + EVT_IF_EQ(GF_SBK30_Kolorado_SharedRumorAboutMoustafa, TRUE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Archeologist_Talk, ANIM_Archeologist_Idle, 0, MSG_CH2_00B2) + EVT_ELSE + EVT_SWITCH(AB_DRO_3) + EVT_CASE_EQ(0) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Archeologist_Talk, ANIM_Archeologist_Idle, 0, MSG_CH2_00AF) + EVT_SET(AB_DRO_3, 1) + EVT_CASE_EQ(1) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Archeologist_Talk, ANIM_Archeologist_Idle, 0, MSG_CH2_00B0) + EVT_SET(AB_DRO_3, 2) + EVT_CASE_EQ(2) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Archeologist_Talk, ANIM_Archeologist_Idle, 0, MSG_CH2_00B1) + EVT_SET(AB_DRO_3, 1) + EVT_END_SWITCH + EVT_END_IF + EVT_CASE_DEFAULT + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Archeologist_Talk, ANIM_Archeologist_Idle, 0, MSG_CH2_00B3) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Archeologist) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Archeologist))) + EVT_IF_GE(GB_StoryProgress, STORY_UNUSED_FFFFFFCC) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_MrE) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_STAR_SPRIT_DEPARTED) + EVT_IF_EQ(GF_DRO02_Sheek_AskedAboutDesert, FALSE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Dryite_Blue_Talk, ANIM_Dryite_Blue_Idle, 0, MSG_CH2_0091) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Dryite_Blue_Talk, ANIM_Dryite_Blue_Idle, 0, MSG_CH2_0092) + EVT_END_IF + EVT_CASE_LT(STORY_CH5_STAR_SPRIT_DEPARTED) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Dryite_Blue_Talk, ANIM_Dryite_Blue_Idle, 0, MSG_CH2_0093) + EVT_CASE_DEFAULT + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Dryite_Blue_Talk, ANIM_Dryite_Blue_Idle, 0, MSG_CH2_0094) + EVT_END_SWITCH + EVT_EXEC_WAIT(N(EVS_MrE_LetterPrompt)) + EVT_IF_NE(LVarC, 0) + EVT_RETURN + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_MrE) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_MrE))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Dryite_02) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_STAR_SPRIT_DEPARTED) + EVT_IF_EQ(AF_DRO_03, FALSE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Dryite_Green_Talk, ANIM_Dryite_Green_Idle, 0, MSG_CH2_00A1) + EVT_SET(AF_DRO_03, TRUE) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Dryite_Green_Talk, ANIM_Dryite_Green_Idle, 0, MSG_CH2_00A2) + EVT_SET(AF_DRO_03, FALSE) + EVT_END_IF + EVT_CASE_LT(STORY_CH5_STAR_SPRIT_DEPARTED) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Dryite_Green_Talk, ANIM_Dryite_Green_Idle, 0, MSG_CH2_00A3) + EVT_CASE_DEFAULT + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Dryite_Green_Talk, ANIM_Dryite_Green_Idle, 0, MSG_CH2_00A4) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Dryite_02) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Dryite_02))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Dryite_03) = { + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Dryite_Green_Talk, ANIM_Dryite_Green_Idle, 0, MSG_CH2_00A0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Dryite_03) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Dryite_03))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Mouser_01) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_STAR_SPRIT_DEPARTED) + EVT_IF_EQ(AF_DRO_04, FALSE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Mouser_Blue_Talk, ANIM_Mouser_Blue_Idle, 0, MSG_CH2_00A5) + EVT_SET(AF_DRO_04, TRUE) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Mouser_Blue_Talk, ANIM_Mouser_Blue_Idle, 0, MSG_CH2_00A6) + EVT_SET(AF_DRO_04, FALSE) + EVT_END_IF + EVT_CASE_LT(STORY_CH5_STAR_SPRIT_DEPARTED) + EVT_IF_EQ(AF_DRO_04, FALSE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Mouser_Blue_Talk, ANIM_Mouser_Blue_Idle, 0, MSG_CH2_00A7) + EVT_SET(AF_DRO_04, TRUE) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Mouser_Blue_Talk, ANIM_Mouser_Blue_Idle, 0, MSG_CH2_00A8) + EVT_SET(AF_DRO_04, FALSE) + EVT_END_IF + EVT_CASE_DEFAULT + EVT_IF_EQ(AF_DRO_04, FALSE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Mouser_Blue_Talk, ANIM_Mouser_Blue_Idle, 0, MSG_CH2_00A9) + EVT_SET(AF_DRO_04, TRUE) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Mouser_Blue_Talk, ANIM_Mouser_Blue_Idle, 0, MSG_CH2_00AA) + EVT_SET(AF_DRO_04, FALSE) + EVT_END_IF + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Mouser_01) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Mouser_01))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Mouser_02) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_STAR_SPRIT_DEPARTED) + EVT_IF_EQ(AF_DRO_05, FALSE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Mouser_Blue_Talk, ANIM_Mouser_Blue_Idle, 0, MSG_CH2_00AB) + EVT_SET(AF_DRO_05, TRUE) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Mouser_Blue_Talk, ANIM_Mouser_Blue_Idle, 0, MSG_CH2_00AC) + EVT_SET(AF_DRO_05, FALSE) + EVT_END_IF + EVT_CASE_LT(STORY_CH5_STAR_SPRIT_DEPARTED) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Mouser_Blue_Talk, ANIM_Mouser_Blue_Idle, 0, MSG_CH2_00AD) + EVT_CASE_DEFAULT + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Mouser_Blue_Talk, ANIM_Mouser_Blue_Idle, 0, MSG_CH2_00AE) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Mouser_02) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Mouser_02))) + EVT_RETURN + EVT_END +}; + +#include "npc_moustafa.c" + +EvtScript N(EVS_NpcIdle_Mouser_03) = { + EVT_CALL(InterpNpcYaw, NPC_DisguisedMoustafa, 270, 0) + EVT_LABEL(10) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Mouser_Purple_Gossip) + EVT_CALL(SetNpcAnimation, NPC_DisguisedMoustafa, ANIM_DisguisedMoustafa_Idle) + EVT_LOOP(50) + EVT_CALL(IsPlayerWithin, 200, 50, 100, LVar0) + EVT_IF_EQ(LVar0, 1) + EVT_GOTO(20) + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Mouser_Purple_Idle) + EVT_CALL(SetNpcAnimation, NPC_DisguisedMoustafa, ANIM_DisguisedMoustafa_TalkAlt) + EVT_LOOP(50) + EVT_CALL(IsPlayerWithin, 200, 50, 100, LVar0) + EVT_IF_EQ(LVar0, 1) + EVT_GOTO(20) + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_GOTO(10) + EVT_LABEL(20) + EVT_CALL(SetNpcAnimation, NPC_DisguisedMoustafa, ANIM_DisguisedMoustafa_Idle) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Mouser_Purple_Run) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Mouser_Purple_Run) + EVT_CALL(NpcMoveTo, NPC_SELF, 150, 18, 20) + EVT_CALL(EnableNpcBlur, NPC_SELF, TRUE) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_174, 0) + EVT_CALL(NpcMoveTo, NPC_SELF, -83, 11, 20) + EVT_CALL(NpcMoveTo, NPC_SELF, -239, 5, 20) + EVT_CALL(NpcMoveTo, NPC_SELF, -371, 5, 20) + EVT_CALL(NpcMoveTo, NPC_SELF, -487, 5, 20) + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_SET(GB_StoryProgress, STORY_CH2_SPOKE_WITH_SHEEK) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Mouser_03) = { + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Mouser_03))) + EVT_IF_GE(GB_StoryProgress, STORY_CH2_SPOKE_WITH_SHEEK) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetToadHouseDialogue) = { + EVT_SET(LVar0, MSG_CH2_00D1) + EVT_SET(LVar8, MSG_CH2_00D2) + EVT_SET(LVar1, MSG_CH2_00D3) + EVT_SET(LVar2, MSG_CH2_00D4) + EVT_SET(LVar3, MSG_CH2_00D5) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ToadHouse_GetInBed) = { + EVT_EXEC(N(EVS_PlayRestMusic)) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) + EVT_CALL(PlayerMoveTo, -179, -198, 0) + EVT_THREAD + EVT_WAIT(15) + EVT_CALL(N(ToadHouse_CamSetFOV), 0, 40) + EVT_CALL(SetCamType, CAM_DEFAULT, 4, FALSE) + EVT_CALL(SetCamPitch, CAM_DEFAULT, 95, -61) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 108) + EVT_CALL(SetCamPosA, CAM_DEFAULT, 202, 62) + EVT_CALL(SetCamPosB, CAM_DEFAULT, -89, -141) + EVT_CALL(SetCamPosC, CAM_DEFAULT, 0, 0) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_END_THREAD + EVT_CALL(PlayerMoveTo, -187, -267, 0) + EVT_CALL(InterpPlayerYaw, 230, 1) + EVT_CALL(HidePlayerShadow, TRUE) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(func_802D286C, 0x00000800) + EVT_CALL(func_802D2520, ANIM_Mario_10002, 5, 7, 1, 1, 0) + EVT_THREAD + EVT_WAIT(60) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_8001D) + EVT_END_THREAD + EVT_WAIT(20) + EVT_THREAD + EVT_WAIT(81) + EVT_CALL(N(ToadHouse_CamSetFOV), 0, 25) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ToadHouse_ReturnFromRest) = { + EVT_CALL(HidePlayerShadow, FALSE) + EVT_CALL(func_802D2520, ANIM_Mario_10002, 0, 0, 0, 0, 0) + EVT_CALL(SetPlayerPos, -187, 0, -240) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) + EVT_CALL(PlayerMoveTo, -168, -195, 0) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_ToadHouseKeeper) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_ToadHouseKeeper))) + EVT_RETURN + EVT_END +}; + +StaticNpc N(PassiveNPCs)[] = { + { + .id = NPC_Archeologist, + .settings = &N(NpcSettings_Archeologist), + .pos = { -320.0f, 0.0f, -14.0f }, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .init = &N(EVS_NpcInit_Archeologist), + .yaw = 90, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .territory = { .temp = { -303, 0, 22, 146, 38, -32767, 1, 0, 0, 0, 0, 0, 0, 1 }}, + .animations = { + ANIM_Archeologist_Idle, + ANIM_Archeologist_Walk, + ANIM_Archeologist_Run, + ANIM_Archeologist_Run, + ANIM_Archeologist_Idle, + ANIM_Archeologist_Idle, + ANIM_Archeologist_Idle, + ANIM_Archeologist_Idle, + ANIM_Archeologist_Idle, + ANIM_Archeologist_Idle, + ANIM_Archeologist_Idle, + ANIM_Archeologist_Idle, + ANIM_Archeologist_Idle, + ANIM_Archeologist_Idle, + ANIM_Archeologist_Idle, + ANIM_Archeologist_Idle, + }, + .tattle = MSG_NpcTattle_Archeologist, + }, + { + .id = NPC_Dryite_01, + .settings = &N(NpcSettings_Dryite_Wander), + .pos = { -20.0f, 0.0f, 40.0f }, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .init = &N(EVS_NpcInit_MrE), + .yaw = 270, + .drops = DRYITE_DROPS, + .territory = { .temp = { -20, 0, 40, 60, 0, -32767, 0, 0, 0, 0, 0, 0, 0, 1 }}, + .animations = DRYITE_BLUE_ANIMS, + .tattle = MSG_NpcTattle_DRO_DryiteE, + }, + { + .id = NPC_DisguisedMoustafa, + .settings = &N(NpcSettings_Mouser), + .pos = { 245.0f, 0.0f, -35.0f }, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .init = &N(EVS_NpcInit_DisguisedMoustafa), + .yaw = 90, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + ANIM_DisguisedMoustafa_Idle, + ANIM_DisguisedMoustafa_Idle, + ANIM_DisguisedMoustafa_Idle, + ANIM_DisguisedMoustafa_Idle, + ANIM_DisguisedMoustafa_Idle, + ANIM_DisguisedMoustafa_Idle, + ANIM_DisguisedMoustafa_Idle, + ANIM_DisguisedMoustafa_Idle, + ANIM_DisguisedMoustafa_Idle, + ANIM_DisguisedMoustafa_Idle, + ANIM_DisguisedMoustafa_Idle, + ANIM_DisguisedMoustafa_Idle, + ANIM_DisguisedMoustafa_Idle, + ANIM_DisguisedMoustafa_Idle, + ANIM_DisguisedMoustafa_Idle, + ANIM_DisguisedMoustafa_Idle, + }, + .tattle = MSG_NpcTattle_Sheek, + }, + { + .id = NPC_Toad, + .settings = &N(NpcSettings_ToadHouseKeeper), + .pos = { -143.0f, 0.0f, -170.0f }, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .init = &N(EVS_NpcInit_ToadHouseKeeper), + .yaw = 180, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + ANIM_Toad_Red_Idle, + ANIM_Toad_Red_Walk, + ANIM_Toad_Red_Run, + ANIM_Toad_Red_Run, + ANIM_Toad_Red_Idle, + ANIM_Toad_Red_Idle, + ANIM_Toad_Red_Disappointed, + ANIM_Toad_Red_Disappointed, + ANIM_Toad_Red_Run, + ANIM_Toad_Red_Run, + ANIM_Toad_Red_Run, + ANIM_Toad_Red_Run, + ANIM_Toad_Red_Run, + ANIM_Toad_Red_Run, + ANIM_Toad_Red_Run, + ANIM_Toad_Red_Run, + }, + .tattle = MSG_NpcTattle_DRO_ToadHouseToad, + }, + { + .id = NPC_Merlee, + .settings = &N(NpcSettings_Merlee), + .pos = { -130.0f, 0.0f, -400.0f }, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .init = &N(EVS_NpcAuxAI_Merlee), + .yaw = 180, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + ANIM_WorldMerlee_Idle, + ANIM_WorldMerlee_Walk, + ANIM_WorldMerlee_Run, + ANIM_WorldMerlee_Run, + ANIM_WorldMerlee_Idle, + ANIM_WorldMerlee_Idle, + ANIM_WorldMerlee_Idle, + ANIM_WorldMerlee_Idle, + ANIM_WorldMerlee_Idle, + ANIM_WorldMerlee_Idle, + ANIM_WorldMerlee_Idle, + ANIM_WorldMerlee_Idle, + ANIM_WorldMerlee_Idle, + ANIM_WorldMerlee_Idle, + ANIM_WorldMerlee_Idle, + ANIM_WorldMerlee_Idle, + }, + .tattle = MSG_NpcTattle_Merlee, + }, + { + .id = NPC_Moustafa, + .settings = &N(NpcSettings_Mouser), + .pos = { NPC_DISPOSE_LOCATION }, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .init = &N(EVS_NpcInit_Moustafa), + .yaw = 0, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + ANIM_Moustafa_Idle, + ANIM_Moustafa_Idle, + ANIM_Moustafa_Run, + ANIM_Moustafa_Run, + ANIM_Moustafa_Idle, + ANIM_Moustafa_Idle, + ANIM_Moustafa_Idle, + ANIM_Moustafa_Idle, + ANIM_Moustafa_Idle, + ANIM_Moustafa_Idle, + ANIM_Moustafa_Idle, + ANIM_Moustafa_Idle, + ANIM_Moustafa_Idle, + ANIM_Moustafa_Idle, + ANIM_Moustafa_Idle, + ANIM_Moustafa_Idle, + }, + .tattle = MSG_NpcTattle_Moustafa, + }, + { + .id = NPC_Dryite_02, + .settings = &N(NpcSettings_Dryite), + .pos = { 25.0f, 0.0f, -38.0f }, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .init = &N(EVS_NpcInit_Dryite_02), + .yaw = 270, + .drops = DRYITE_DROPS, + .animations = DRYITE_GREEN_ANIMS, + .tattle = MSG_NpcTattle_DRO_DryiteF, + }, + { + .id = NPC_Dryite_03, + .settings = &N(NpcSettings_Dryite), + .pos = { -375.0f, 0.0f, -10.0f }, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .init = &N(EVS_NpcInit_Dryite_03), + .yaw = 270, + .drops = DRYITE_DROPS, + .animations = DRYITE_GREEN_ANIMS, + .tattle = MSG_NpcTattle_DRO_VisitedShootingStarSummit, + }, + { + .id = NPC_Mouser_01, + .settings = &N(NpcSettings_Mouser), + .pos = { -50.0f, 0.0f, -470.0f }, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .init = &N(EVS_NpcInit_Mouser_01), + .yaw = 180, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = MOUSER_BLUE_ANIMS, + .tattle = MSG_NpcTattle_DRO_CrushingOnMerlee, + }, + { + .id = NPC_Mouser_02, + .settings = &N(NpcSettings_Mouser), + .pos = { -270.0f, 0.0f, 91.0f }, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .init = &N(EVS_NpcInit_Mouser_02), + .yaw = 270, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = MOUSER_BLUE_ANIMS, + .tattle = MSG_NpcTattle_DRO_TellsTales, + }, + { + .id = NPC_Mouser_03, + .settings = &N(NpcSettings_Mouser), + .pos = { 210.0f, 0.0f, -35.0f }, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .init = &N(EVS_NpcInit_Mouser_03), + .yaw = 90, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = MOUSER_PURPLE_ANIMS, + }, + { + .id = NPC_ChuckQuizmo, + .settings = &N(Quizmo_NpcSettings), + .pos = { -335.0f, 0.0f, 90.0f }, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .initVarCount = 1, + .initVar = { .bytes = { 0, QUIZ_AREA_DRO, QUIZ_COUNT_DRO, QUIZ_MAP_DRO_02 } }, + .yaw = 270, + .drops = QUIZMO_DROPS, + .animations = QUIZMO_ANIMS, + .tattle = MSG_NpcTattle_ChuckQuizmo, + }, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(PassiveNPCs)), + {}, +}; diff --git a/src/world/area_dro/dro_02/dro_02_toad_house_blanket_anim.c b/src/world/area_dro/dro_02/dro_02_toad_house_blanket_anim.c new file mode 100644 index 0000000000..1f872c497e --- /dev/null +++ b/src/world/area_dro/dro_02/dro_02_toad_house_blanket_anim.c @@ -0,0 +1,118 @@ +#include "animation_script.h" + +AnimScript script = { + AS_OP_19, + AS_SET_ROTATION, 1, AS_F(0.0), AS_F(0.0), AS_F(0.0), + AS_SET_POS, 1, 0, 0, 0, + AS_SET_SCALE, 1, AS_F(1.0), AS_F(1.0), AS_F(1.0), + AS_SET_ROTATION, 2, AS_F(0.0), AS_F(0.0), AS_F(0.0), + AS_SET_POS, 2, 0, 0, 0, + AS_SET_SCALE, 2, AS_F(1.0), AS_F(1.0), AS_F(1.0), + AS_SET_ROTATION, 3, AS_F(0.0), AS_F(0.0), AS_F(0.0), + AS_SET_POS, 3, 0, 0, 0, + AS_SET_SCALE, 3, AS_F(1.0), AS_F(1.0), AS_F(1.0), + AS_SET_ROTATION, 4, AS_F(0.0), AS_F(0.0), AS_F(0.0), + AS_SET_POS, 4, 0, 0, 0, + AS_SET_SCALE, 4, AS_F(1.0), AS_F(1.0), AS_F(1.0), + AS_SET_ROTATION, 5, AS_F(0.0), AS_F(0.0), AS_F(0.0), + AS_SET_POS, 5, 0, 0, 0, + AS_SET_SCALE, 5, AS_F(1.0), AS_F(1.0), AS_F(1.0), + AS_SET_ROTATION, 6, AS_F(0.0), AS_F(0.0), AS_F(0.0), + AS_SET_POS, 6, 0, 0, 0, + AS_SET_SCALE, 6, AS_F(1.0), AS_F(1.0), AS_F(1.0), + AS_SET_ROTATION, 7, AS_F(0.0), AS_F(0.0), AS_F(0.0), + AS_SET_POS, 7, 0, 0, 0, + AS_SET_SCALE, 7, AS_F(1.0), AS_F(1.0), AS_F(1.0), + AS_SET_ROTATION, 8, AS_F(0.0), AS_F(0.0), AS_F(0.0), + AS_SET_POS, 8, 0, 0, 0, + AS_SET_SCALE, 8, AS_F(1.0), AS_F(1.0), AS_F(1.0), + AS_SET_ROTATION, 9, AS_F(0.0), AS_F(0.0), AS_F(0.0), + AS_SET_POS, 9, 0, 0, 0, + AS_SET_SCALE, 9, AS_F(1.0), AS_F(1.0), AS_F(1.0), + AS_SET_ROTATION, 10, AS_F(0.0), AS_F(0.0), AS_F(0.0), + AS_SET_POS, 10, 0, 0, 0, + AS_SET_SCALE, 10, AS_F(1.0), AS_F(1.0), AS_F(1.0), + AS_SET_ROTATION, 11, AS_F(0.0), AS_F(0.0), AS_F(0.0), + AS_SET_POS, 11, 0, 0, 0, + AS_SET_SCALE, 11, AS_F(1.0), AS_F(1.0), AS_F(1.0), + AS_SET_ROTATION, 12, AS_F(0.0), AS_F(0.0), AS_F(0.0), + AS_SET_POS, 12, 0, 0, 0, + AS_SET_SCALE, 12, AS_F(1.0), AS_F(1.0), AS_F(1.0), + AS_SET_ROTATION, 13, AS_F(0.0), AS_F(0.0), AS_F(0.0), + AS_SET_POS, 13, 0, 0, 0, + AS_SET_SCALE, 13, AS_F(1.0), AS_F(1.0), AS_F(1.0), + AS_SET_ROTATION, 14, AS_F(0.0), AS_F(0.0), AS_F(0.0), + AS_SET_POS, 14, 0, 0, 0, + AS_SET_SCALE, 14, AS_F(1.0), AS_F(1.0), AS_F(1.0), + AS_SET_ROTATION, 15, AS_F(0.0), AS_F(0.0), AS_F(0.0), + AS_SET_POS, 15, 0, 0, 0, + AS_SET_SCALE, 15, AS_F(1.0), AS_F(1.0), AS_F(1.0), + AS_SET_ROTATION, 16, AS_F(0.0), AS_F(0.0), AS_F(0.0), + AS_SET_POS, 16, 0, 0, 0, + AS_SET_SCALE, 16, AS_F(1.0), AS_F(1.0), AS_F(1.0), + AS_SET_ROTATION, 17, AS_F(0.0), AS_F(0.0), AS_F(0.0), + AS_SET_POS, 17, 0, 0, 0, + AS_SET_SCALE, 17, AS_F(1.0), AS_F(1.0), AS_F(1.0), + AS_WAIT, 1, + AS_WAIT, 1, + AS_WAIT, 1, + AS_WAIT, 1, + AS_WAIT, 1, + AS_WAIT, 1, + AS_WAIT, 1, + AS_WAIT, 1, + AS_WAIT, 1, + AS_WAIT, 1, + AS_WAIT, 1, + AS_WAIT, 1, + AS_WAIT, 1, + AS_WAIT, 1, + AS_WAIT, 1, + AS_WAIT, 1, + AS_WAIT, 1, + AS_WAIT, 1, + AS_WAIT, 1, + AS_WAIT, 1, + AS_WAIT, 1, + AS_WAIT, 1, + AS_WAIT, 1, + AS_WAIT, 1, + AS_WAIT, 1, + AS_WAIT, 1, + AS_WAIT, 1, + AS_WAIT, 1, + AS_WAIT, 1, + AS_WAIT, 1, + AS_WAIT, 1, + AS_WAIT, 1, + AS_WAIT, 1, + AS_WAIT, 1, + AS_WAIT, 1, + AS_WAIT, 1, + AS_WAIT, 1, + AS_WAIT, 1, + AS_WAIT, 1, + AS_WAIT, 1, + AS_WAIT, 1, + AS_WAIT, 1, + AS_WAIT, 1, + AS_WAIT, 1, + AS_WAIT, 1, + AS_WAIT, 1, + AS_WAIT, 1, + AS_WAIT, 1, + AS_WAIT, 1, + AS_WAIT, 1, + AS_WAIT, 1, + AS_WAIT, 1, + AS_WAIT, 1, + AS_WAIT, 1, + AS_WAIT, 1, + AS_WAIT, 1, + AS_WAIT, 1, + AS_WAIT, 1, + AS_WAIT, 1, + AS_WAIT, 1, + AS_END_LOOP, + AS_END, +}; diff --git a/src/world/area_dro/dro_02/dro_02_toad_house_blanket_skeleton.c b/src/world/area_dro/dro_02/dro_02_toad_house_blanket_skeleton.c new file mode 100644 index 0000000000..710f15369b --- /dev/null +++ b/src/world/area_dro/dro_02/dro_02_toad_house_blanket_skeleton.c @@ -0,0 +1,128 @@ +#include "animation_script.h" + +extern Gfx N(toad_house_blanket_gfx)[]; +extern Vtx N(toad_house_blanket_vtx)[]; + +StaticAnimatorNode N(D_80248AA0_971C60) = { + .displayList = N(toad_house_blanket_gfx), + .vertexStartOffset = 0x02EE, + .vtxList = N(toad_house_blanket_vtx), +}; + +StaticAnimatorNode N(D_80248ACC_971C8C) = { + .displayList = N(toad_house_blanket_gfx), + .sibling = &N(D_80248AA0_971C60), + .vertexStartOffset = 0x02BC, + .vtxList = N(toad_house_blanket_vtx), +}; + +StaticAnimatorNode N(D_80248AF8_971CB8) = { + .displayList = N(toad_house_blanket_gfx), + .sibling = &N(D_80248ACC_971C8C), + .vertexStartOffset = 0x028A, + .vtxList = N(toad_house_blanket_vtx), +}; + +StaticAnimatorNode N(D_80248B24_971CE4) = { + .displayList = N(toad_house_blanket_gfx), + .sibling = &N(D_80248AF8_971CB8), + .vertexStartOffset = 0x0258, + .vtxList = N(toad_house_blanket_vtx), +}; + +StaticAnimatorNode N(D_80248B50_971D10) = { + .displayList = N(toad_house_blanket_gfx), + .sibling = &N(D_80248B24_971CE4), + .vertexStartOffset = 0x0226, + .vtxList = N(toad_house_blanket_vtx), +}; + +StaticAnimatorNode N(D_80248B7C_971D3C) = { + .displayList = N(toad_house_blanket_gfx), + .sibling = &N(D_80248B50_971D10), + .vertexStartOffset = 0x01F4, + .vtxList = N(toad_house_blanket_vtx), +}; + +StaticAnimatorNode N(D_80248BA8_971D68) = { + .displayList = N(toad_house_blanket_gfx), + .sibling = &N(D_80248B7C_971D3C), + .vertexStartOffset = 0x01C2, + .vtxList = N(toad_house_blanket_vtx), +}; + +StaticAnimatorNode N(D_80248BD4_971D94) = { + .displayList = N(toad_house_blanket_gfx), + .sibling = &N(D_80248BA8_971D68), + .vertexStartOffset = 0x0190, + .vtxList = N(toad_house_blanket_vtx), +}; + +StaticAnimatorNode N(D_80248C00_971DC0) = { + .displayList = N(toad_house_blanket_gfx), + .sibling = &N(D_80248BD4_971D94), + .vertexStartOffset = 0x015E, + .vtxList = N(toad_house_blanket_vtx), +}; + +StaticAnimatorNode N(D_80248C2C_971DEC) = { + .displayList = N(toad_house_blanket_gfx), + .sibling = &N(D_80248C00_971DC0), + .vertexStartOffset = 0x012C, + .vtxList = N(toad_house_blanket_vtx), +}; + +StaticAnimatorNode N(D_80248C58_971E18) = { + .displayList = N(toad_house_blanket_gfx), + .sibling = &N(D_80248C2C_971DEC), + .vertexStartOffset = 0x00FA, + .vtxList = N(toad_house_blanket_vtx), +}; + +StaticAnimatorNode N(D_80248C84_971E44) = { + .displayList = N(toad_house_blanket_gfx), + .sibling = &N(D_80248C58_971E18), + .vertexStartOffset = 0x00C8, + .vtxList = N(toad_house_blanket_vtx), +}; + +StaticAnimatorNode N(D_80248CB0_971E70) = { + .displayList = N(toad_house_blanket_gfx), + .sibling = &N(D_80248C84_971E44), + .vertexStartOffset = 0x0096, + .vtxList = N(toad_house_blanket_vtx), +}; + +StaticAnimatorNode N(D_80248CDC_971E9C) = { + .displayList = N(toad_house_blanket_gfx), + .sibling = &N(D_80248CB0_971E70), + .vertexStartOffset = 0x0064, + .vtxList = N(toad_house_blanket_vtx), +}; + +StaticAnimatorNode N(D_80248D08_971EC8) = { + .displayList = N(toad_house_blanket_gfx), + .sibling = &N(D_80248CDC_971E9C), + .vertexStartOffset = 0x0032, + .vtxList = N(toad_house_blanket_vtx), +}; + +StaticAnimatorNode N(D_80248D34_971EF4) = { + .displayList = N(toad_house_blanket_gfx), + .sibling = &N(D_80248D08_971EC8), + .vertexStartOffset = 0, + .vtxList = N(toad_house_blanket_vtx), +}; + +StaticAnimatorNode N(D_80248D60_971F20) = { + .child = &N(D_80248D34_971EF4), + .vertexStartOffset = -1, +}; + +StaticAnimatorNode* N(D_80248D8C_971F4C)[] = { + &N(D_80248D60_971F20), &N(D_80248D34_971EF4), &N(D_80248D08_971EC8), &N(D_80248CDC_971E9C), + &N(D_80248CB0_971E70), &N(D_80248C84_971E44), &N(D_80248C58_971E18), &N(D_80248C2C_971DEC), + &N(D_80248C00_971DC0), &N(D_80248BD4_971D94), &N(D_80248BA8_971D68), &N(D_80248B7C_971D3C), + &N(D_80248B50_971D10), &N(D_80248B24_971CE4), &N(D_80248AF8_971CB8), &N(D_80248ACC_971C8C), + &N(D_80248AA0_971C60), 0x00000000, 0x00000000, +}; diff --git a/src/world/area_dro/dro_02/npc_merlee.c b/src/world/area_dro/dro_02/npc_merlee.c new file mode 100644 index 0000000000..55fd42e4e3 --- /dev/null +++ b/src/world/area_dro/dro_02/npc_merlee.c @@ -0,0 +1,842 @@ +#include "dro_02.h" + +// cards used during Merlee's ritual +typedef struct RitualCard { + /* 0x00 */ s32 unk_00; + /* 0x04 */ Vec3f pos; + /* 0x10 */ f32 yaw; + /* 0x14 */ f32 pitch; + /* 0x18 */ s32 spriteID; + /* 0x1C */ s32 rasterIndex; + /* 0x20 */ s32 xoffset; +} RitualCard; // size = 0x24 + +static Evt* N(CreatorScript); + +// this buffer is used as an array in scripts managaing the ritual scene +// values are enumerated below +static s32 N(RitualBuffer)[16]; + +enum { + RITUAL_VAR_FOLDER_1 = ArrayVar(0), + RITUAL_VAR_FOLDER_2 = ArrayVar(1), + RITUAL_VAR_FOLDER_3 = ArrayVar(2), + RITUAL_VAR_FOLDER_4 = ArrayVar(3), + RITUAL_VAR_POS_X = ArrayVar(4), + RITUAL_VAR_POS_Y = ArrayVar(5), + RITUAL_VAR_POS_Z = ArrayVar(6), + RITUAL_VAR_WORKER = ArrayVar(7), + RITUAL_VAR_ORB_EFFECT = ArrayVar(8), + RITUAL_VAR_STATE = ArrayVar(9), +}; + +enum { + RITUAL_STATE_INIT = 0, + RITUAL_STATE_APPEAR = 1, + RITUAL_STATE_2 = 2, + RITUAL_STATE_3 = 3, + RITUAL_STATE_4 = 4, + RITUAL_STATE_FLIP_LEFT = 5, + RITUAL_STATE_FLIP_MIDDLE = 6, + RITUAL_STATE_FLIP_RIGHT = 7, + RITUAL_STATE_8 = 8, + RITUAL_STATE_9 = 9, + RITUAL_STATE_A = 10, + RITUAL_STATE_B = 11, + RITUAL_STATE_C = 12, + RITUAL_STATE_D = 13, +}; + +static RitualCard N(RitualCards)[3]; +MAP_STATIC_PAD(1,merlee) + +s8 N(MerleeSpellCasts)[] = { + 20, 10, 5, 0, +}; + +s8 N(MerleeCoinCosts)[] = { + 50, 20, 5, 0, +}; + +s32 N(pad_XX111)[] = { 0 }; + +#include "world/area_dro/dro_02/card.png.inc.c" +#include "world/area_dro/dro_02/card.pal.inc.c" +#include "world/area_dro/dro_02/card_1.vtx.inc.c" +#include "world/area_dro/dro_02/card_2.vtx.inc.c" +#include "world/area_dro/dro_02/card_setup.gfx.inc.c" +#include "world/area_dro/dro_02/card_1.gfx.inc.c" +#include "world/area_dro/dro_02/card_2.gfx.inc.c" + +void N(card_worker_update)(void); +void N(card_worker_render)(void); + +API_CALLABLE(N(TryEnchantPlayer)) { + PlayerData* playerData = &gPlayerData; + Bytecode* args = script->ptrReadPos; + s32 tier = evt_get_variable(script, *args++); + s32 outPrevented = *args++; + u8 coins = N(MerleeCoinCosts)[tier]; + u8 casts = N(MerleeSpellCasts)[tier]; + + if (playerData->coins < coins) { + evt_set_variable(script, outPrevented, TRUE); + } else { + playerData->coins = playerData->coins - coins; + if (playerData->merleeCastsLeft < casts) { + playerData->merleeCastsLeft = casts; + } + playerData->merleeTurnCount = rand_int(2) + 1; + switch (rand_int(3)) { + case 0: + playerData->merleeSpellType = MERLEE_SPELL_1; + break; + case 1: + playerData->merleeSpellType = MERLEE_SPELL_2; + break; + case 2: + playerData->merleeSpellType = MERLEE_SPELL_3; + break; + case 3: + playerData->merleeSpellType = MERLEE_SPELL_4; + break; + } + evt_set_variable(script, outPrevented, FALSE); + } + + return ApiStatus_DONE2; +} + +API_CALLABLE(N(DarkenWorld)) { + s32 i; + + if (isInitialCall) { + mdl_set_all_fog_mode(1); + *gBgRenderTypePtr = BACKGROUND_RENDER_TYPE_1; + set_background_color_blend(0, 0, 0, 0); + + for (i = 0; i < MAX_NPCS; i++) { + Npc* npc = get_npc_by_index(i); + if (npc != 0 && npc->flags != 0 && npc->npcID != NPC_PARTNER && npc->npcID != NPC_Merlee) { + npc->flags |= NPC_FLAG_NO_DROPS; + } + } + script->functionTemp[0] = 0; + } + + script->functionTemp[0] += 8; + if (script->functionTemp[0] > 255) { + script->functionTemp[0] = 255; + } + set_background_color_blend(0, 0, 0, script->functionTemp[0]); + + return (script->functionTemp[0] == 255) * ApiStatus_DONE2; +} + +API_CALLABLE(N(UndarkenWorld)) { + s32 i; + + if (isInitialCall) { + set_background_color_blend(0, 0, 0, 255); + script->functionTemp[0] = 255; + script->functionTemp[1] = 0; + } + script->functionTemp[0] -= 8; + if (script->functionTemp[0] < 0) { + script->functionTemp[0] = 0; + } + set_background_color_blend(0, 0, 0, script->functionTemp[0]); + + if (script->functionTemp[0] == 0 && script->functionTemp[1] == 0) { + script->functionTemp[1] = 1; + } else if (script->functionTemp[1] == 1) { + mdl_set_all_fog_mode(0); + *gBgRenderTypePtr = BACKGROUND_RENDER_TYPE_0; + for (i = 0; i < MAX_NPCS; i++) { + Npc* npc = get_npc_by_index(i); + + if (npc != NULL && npc->flags != 0 && npc->npcID != NPC_PARTNER && npc->npcID != NPC_Merlee) { + npc->flags &= ~NPC_FLAG_NO_DROPS; + } + } + return ApiStatus_DONE2; + } + return ApiStatus_BLOCK; +} + +API_CALLABLE(N(CreateRitualCards)) { + s32 ret; + + N(CreatorScript) = script; + + ret = func_8013A704(1); + fold_update(ret, FOLD_TYPE_5, 0xF, 1, 1, 0, 0x800); + evt_set_variable(script, RITUAL_VAR_FOLDER_1, ret); + ret = func_8013A704(1); + fold_update(ret, FOLD_TYPE_5, 0x10, 1, 1, 0, 0x800); + evt_set_variable(script, RITUAL_VAR_FOLDER_2, ret); + ret = func_8013A704(1); + fold_update(ret, FOLD_TYPE_5, 0x11, 1, 1, 0, 0x800); + evt_set_variable(script, RITUAL_VAR_FOLDER_3, ret); + ret = func_8013A704(1); + fold_update(ret, FOLD_TYPE_5, 0x12, 1, 1, 0, 0x800); + evt_set_variable(script, RITUAL_VAR_FOLDER_4, ret); + + evt_set_variable(script, RITUAL_VAR_WORKER, create_generic_entity_world( + N(card_worker_update), + N(card_worker_render))); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(DestroyRitualCards)) { + func_8013A854(evt_get_variable(script, RITUAL_VAR_FOLDER_1)); + func_8013A854(evt_get_variable(script, RITUAL_VAR_FOLDER_2)); + func_8013A854(evt_get_variable(script, RITUAL_VAR_FOLDER_3)); + func_8013A854(evt_get_variable(script, RITUAL_VAR_FOLDER_4)); + free_generic_entity(evt_get_variable(script, RITUAL_VAR_WORKER)); + return ApiStatus_DONE2; +} + +u32 N(appendGfx_ritual_card)(RitualCard* card, Matrix4f mtxParent) { + Matrix4f mtxTransform; + Matrix4f mtxTemp; + FoldImageRecPart foldImage; + SpriteRasterInfo rasterInfo; + s32 ret; + + if (card->unk_00 == 0) { + return 1; + } + + gSPDisplayList(gMasterGfxPos++, N(card_setup_gfx)); + + if (card->unk_00 == 1 || card->unk_00 == 4 || card->unk_00 == 5) { + guTranslateF(mtxTemp, card->pos.x, card->pos.y, card->pos.z); + guMtxCatF(mtxTemp, mtxParent, mtxTransform); + guRotateF(mtxTemp, card->yaw, 0.0f, 1.0f, 0.0f); + guMtxCatF(mtxTemp, mtxTransform, mtxTransform); + guRotateF(mtxTemp, card->pitch, 1.0f, 0.0f, 0.0f); + guMtxCatF(mtxTemp, mtxTransform, mtxTransform); + guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); + gSPMatrix(gMasterGfxPos++, VIRTUAL_TO_PHYSICAL(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + + if (card->unk_00 == 1 || card->unk_00 == 4) { + gSPDisplayList(gMasterGfxPos++, N(card_1_gfx)); + } + + if (card->unk_00 == 1 || card->unk_00 == 5) { + spr_get_player_raster_info(&rasterInfo, card->spriteID, card->rasterIndex); + gDPSetTextureLUT(gMasterGfxPos++, G_TT_RGBA16); + gDPLoadTLUT_pal16(gMasterGfxPos++, 0, rasterInfo.defaultPal); + gDPLoadTextureTile_4b(gMasterGfxPos++, rasterInfo.raster, G_IM_FMT_CI, rasterInfo.width, rasterInfo.height, + 0, 0, rasterInfo.width - 1, rasterInfo.height - 1, 0, + G_TX_CLAMP, G_TX_CLAMP, 8, 8, G_TX_NOLOD, G_TX_NOLOD); + guTranslateF(mtxTransform, card->xoffset + 30 - rasterInfo.width / 2, 0.0f, 0.0f); + guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); + gSPMatrix(gMasterGfxPos++, VIRTUAL_TO_PHYSICAL(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMasterGfxPos++, N(card_2_gfx)); + gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + } + gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + return 1; + } + + if (card->unk_00 == 2) { + gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, 256 * 4, 256 * 4, 287 * 4, 287 * 4); + guTranslateF(mtxTemp, N(RitualCards)[0].pos.x, N(RitualCards)[0].pos.y, N(RitualCards)[0].pos.z); + guMtxCatF(mtxTemp, mtxParent, mtxTransform); + guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); + gSPMatrix(gMasterGfxPos++, VIRTUAL_TO_PHYSICAL(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + ret = fold_appendGfx_component(evt_get_variable(N(CreatorScript), RITUAL_VAR_FOLDER_1), &foldImage, FOLD_STATE_FLAG_10 | FOLD_STATE_FLAG_20, mtxTransform); + gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + return ret; + } + + if (card->unk_00 == 3) { + gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, 256 * 4, 256 * 4, 287 * 4, 287 * 4); + guTranslateF(mtxTemp, N(RitualCards)[0].pos.x, N(RitualCards)[0].pos.y, N(RitualCards)[0].pos.z); + guMtxCatF(mtxTemp, mtxParent, mtxTransform); + guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); + gSPMatrix(gMasterGfxPos++, VIRTUAL_TO_PHYSICAL(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + fold_appendGfx_component(evt_get_variable(N(CreatorScript), RITUAL_VAR_FOLDER_2), &foldImage, FOLD_STATE_FLAG_10 | FOLD_STATE_FLAG_20, mtxTransform); + fold_appendGfx_component(evt_get_variable(N(CreatorScript), RITUAL_VAR_FOLDER_3), &foldImage, FOLD_STATE_FLAG_10 | FOLD_STATE_FLAG_20, mtxTransform); + gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + guTranslateF(mtxTemp, N(RitualCards)[0].pos.x, N(RitualCards)[0].pos.y, N(RitualCards)[0].pos.z); + guMtxCatF(mtxTemp, mtxParent, mtxTransform); + guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); + gSPMatrix(gMasterGfxPos++, VIRTUAL_TO_PHYSICAL(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + spr_get_player_raster_info(&rasterInfo, card->spriteID, card->rasterIndex); + foldImage.raster = rasterInfo.raster; + foldImage.palette = rasterInfo.defaultPal; + foldImage.width = rasterInfo.width; + foldImage.height = rasterInfo.height; + foldImage.xOffset = -(rasterInfo.width / 2); + foldImage.yOffset = rasterInfo.height / 2; + foldImage.opacity = 255; + ret = fold_appendGfx_component(evt_get_variable(N(CreatorScript), RITUAL_VAR_FOLDER_4), &foldImage, FOLD_STATE_FLAG_10, mtxTransform); + gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + return ret; + } + + return 1; +} + +void N(GetCardOrientation)(s32 index, f32* outX, f32* outY, f32* outZ, f32* outAngle) { + RitualCard* card; + Matrix4f mtxTranform; + Matrix4f mtxTemp; + Matrix4f mtxParent; + + guPositionF(mtxParent, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, SPRITE_WORLD_SCALE_F, + evt_get_variable(N(CreatorScript), RITUAL_VAR_POS_X), + evt_get_variable(N(CreatorScript), RITUAL_VAR_POS_Y), + evt_get_variable(N(CreatorScript), RITUAL_VAR_POS_Z)); + + card = &N(RitualCards)[index]; + guTranslateF(mtxTemp, card->pos.x, card->pos.y, card->pos.z); + guMtxCatF(mtxTemp, mtxParent, mtxTranform); + guRotateF(mtxTemp, card->yaw, 0.0f, 1.0f, 0.0f); + guMtxCatF(mtxTemp, mtxTranform, mtxTranform); + guTranslateF(mtxTemp, 0.0f, 0.0f, 1.0f); + guMtxCatF(mtxTemp, mtxTranform, mtxTranform); + *outX = mtxTranform[3][0]; + *outY = mtxTranform[3][1]; + *outZ = mtxTranform[3][2]; + *outAngle = clamp_angle(card->yaw); +} + +void N(card_worker_update)(void) { + f32 posX5, posY5, posZ5, yaw5; + f32 posX6, posY6, posZ6, yaw6; + f32 posX7, posY7, posZ7, yaw7; + f32 sp48, sp4C, sp50, sp54; + f32 sp58, sp5C, sp60, sp64; + f32 sp68, sp6C, sp70, sp74; + EffectInstance* effect; + EnergyInOutFXData* data; + s32 i, j; + + switch (evt_get_variable(N(CreatorScript), RITUAL_VAR_STATE)) { + case RITUAL_STATE_INIT: + N(RitualStateTime) = 0; + evt_set_variable(N(CreatorScript), RITUAL_VAR_STATE, RITUAL_STATE_APPEAR); + N(RitualCards)[0].unk_00 = 1; + N(RitualCards)[0].pos.x = -200.0f; + N(RitualCards)[0].pos.y = 0.0f; + N(RitualCards)[0].pos.z = 0.0f; + N(RitualCards)[0].pitch = 0.0f; + N(RitualCards)[0].yaw = 0.0f; + N(RitualCards)[0].spriteID = 1; + N(RitualCards)[0].rasterIndex = 12; + N(RitualCards)[0].xoffset = 2; + + N(RitualCards)[1].unk_00 = 1; + N(RitualCards)[1].pos.x = 200.0f; + N(RitualCards)[1].pos.y = 0.0f; + N(RitualCards)[1].pos.z = 1.0f; + N(RitualCards)[1].pitch = 0.0f; + N(RitualCards)[1].yaw = 0.0f; + N(RitualCards)[1].spriteID = 1; + N(RitualCards)[1].rasterIndex = 48; + N(RitualCards)[1].xoffset = 0; + + + N(RitualCards)[2].spriteID = 8; + N(RitualCards)[2].rasterIndex = 5; + N(RitualCards)[2].unk_00 = 1; + N(RitualCards)[2].pos.x = 0.0f; + N(RitualCards)[2].pos.y = 200.0f; + N(RitualCards)[2].pos.z = 2.0f; + N(RitualCards)[2].pitch = 0.0f; + N(RitualCards)[2].yaw = 0.0f; + N(RitualCards)[2].xoffset = 4; + break; + case RITUAL_STATE_APPEAR: + N(RitualStateTime)++; + N(RitualCards)[0].pos.x += 10.0f; + N(RitualCards)[1].pos.x += -10.0f; + N(RitualCards)[2].pos.y += -10.0f; + if (N(RitualStateTime) == 18) { + gPlayerStatus.position.y = NPC_DISPOSE_POS_Y; + } + if (N(RitualStateTime) == 20) { + evt_set_variable(N(CreatorScript), RITUAL_VAR_STATE, RITUAL_STATE_2); + N(RitualStateTime) = 0; + } + break; + case RITUAL_STATE_2: + N(RitualCards)[0].unk_00 = 2; + N(RitualCards)[1].unk_00 = 0; + N(RitualCards)[2].unk_00 = 0; + N(RitualCards)[0].pos.x = 0.0f; + N(RitualCards)[0].pos.y = 0.0f; + N(RitualCards)[0].pos.z = 0; + break; + case RITUAL_STATE_3: + N(RitualCards)[0].unk_00 = 1; + N(RitualCards)[1].unk_00 = 1; + N(RitualCards)[2].unk_00 = 1; + N(RitualStateTime)++; + N(RitualCards)[0].pos.x -= 10.0f; + N(RitualCards)[1].pos.x += 10.0f; + if (N(RitualStateTime) == 10) { + N(RitualStateTime) = 0; + evt_set_variable(N(CreatorScript), RITUAL_VAR_STATE, RITUAL_STATE_4); + } + break; + case RITUAL_STATE_4: + N(RitualCards)[0].pos.x = -100.0f; + N(RitualCards)[0].pos.y = 0.0f; + N(RitualCards)[0].pos.z = 0; + N(RitualCards)[1].pos.x = 100.0f; + N(RitualCards)[1].pos.y = 0.0f; + N(RitualCards)[1].pos.z = 1.0f; + N(RitualCards)[2].pos.x = 0; + N(RitualCards)[2].pos.y = 0.0f; + N(RitualCards)[2].pos.z = 2.0f; + N(RitualStateTime)++; + if (N(RitualStateTime) == 20) { + N(RitualStateTime) = 0; + evt_set_variable(N(CreatorScript), RITUAL_VAR_STATE, RITUAL_STATE_FLIP_LEFT); + sfx_play_sound_with_params(SOUND_203, 0, 24, 0); + } + break; + case RITUAL_STATE_FLIP_LEFT: + N(RitualCards)[0].yaw += 18.0f; + N(RitualCards)[1].yaw = 0.0f; + N(RitualCards)[2].yaw = 0.0f; + N(RitualStateTime)++; + if (N(RitualStateTime) == 8) { + N(GetCardOrientation)(0, &posX5, &posY5, &posZ5, &yaw5); + fx_sparkles(0, posX5, posY5 + 20.0f, posZ5, 30.0f); + } + if (N(RitualStateTime) == 10) { + N(RitualStateTime) = 0; + evt_set_variable(N(CreatorScript), RITUAL_VAR_STATE, RITUAL_STATE_FLIP_MIDDLE); + sfx_play_sound_with_params(SOUND_203, 0, 64, 0); + } + break; + case RITUAL_STATE_FLIP_MIDDLE: + N(RitualCards)[0].yaw += 18.0f; + N(RitualCards)[1].yaw = 0.0f; + N(RitualCards)[2].yaw += 18.0f; + N(RitualStateTime)++; + if (N(RitualStateTime) == 8) { + N(GetCardOrientation)(2, &posX6, &posY6, &posZ6, &yaw6); + fx_sparkles(0, posX6, posY6 + 20.0f, posZ6, 30.0f); + } + if (N(RitualStateTime) == 10) { + N(RitualStateTime) = 0; + evt_set_variable(N(CreatorScript), RITUAL_VAR_STATE, RITUAL_STATE_FLIP_RIGHT); + sfx_play_sound_with_params(SOUND_203, 0, 104, 0); + } + break; + case RITUAL_STATE_FLIP_RIGHT: + N(RitualCards)[0].yaw = 0.0f; + N(RitualCards)[1].yaw += 18.0f; + N(RitualCards)[2].yaw += 18.0f; + N(RitualStateTime)++; + if (N(RitualStateTime) == 8) { + N(GetCardOrientation)(1, &posX7, &posY7, &posZ7, &yaw7); + fx_sparkles(0, posX7, posY7 + 20.0f, posZ7, 30.0f); + } + if (N(RitualStateTime) == 10) { + N(RitualStateTime) = 0; + evt_set_variable(N(CreatorScript), RITUAL_VAR_STATE, RITUAL_STATE_8); + } + break; + case RITUAL_STATE_8: + N(RitualCards)[0].yaw = 0.0f; + N(RitualCards)[1].yaw += 18.0f; + N(RitualCards)[2].yaw = 0.0f; + N(RitualStateTime)++; + if (N(RitualStateTime) == 10) { + N(RitualStateTime) = 0; + evt_set_variable(N(CreatorScript), RITUAL_VAR_STATE, RITUAL_STATE_9); + } + break; + case RITUAL_STATE_9: + N(RitualCards)[0].pos.x += 10.0f; + N(RitualCards)[0].pos.y = 0.0f; + N(RitualCards)[0].yaw = 0.0f; + N(RitualCards)[1].pos.x -= 10.0f; + N(RitualCards)[1].pos.y = 0.0f; + N(RitualCards)[1].yaw = 0.0f; + N(RitualCards)[2].pos.x = 0; + N(RitualCards)[2].pos.y = 0.0f; + N(RitualCards)[2].yaw = 0.0f; + N(RitualStateTime)++; + if (N(RitualStateTime) == 10) { + N(RitualStateTime) = 0; + evt_set_variable(N(CreatorScript), RITUAL_VAR_STATE, RITUAL_STATE_A); + return; + } + break; + case RITUAL_STATE_A: + N(RitualCards)[0].unk_00 = 3; + N(RitualCards)[0].spriteID = 8; + N(RitualCards)[1].unk_00 = 0; + N(RitualCards)[2].unk_00 = 0; + N(RitualCards)[0].rasterIndex = 0x11; + return; + case RITUAL_STATE_B: + N(RitualCards)[0].unk_00 = 4; + N(RitualCards)[1].unk_00 = 5; + N(RitualCards)[1].spriteID = 8; + N(RitualCards)[0].pos.x = 0.0f; + N(RitualCards)[0].pos.z = 0; + N(RitualCards)[1].pos.x = 0.0f; + N(RitualCards)[1].pos.z = 0; + N(RitualCards)[1].rasterIndex = 10; + N(RitualCards)[1].xoffset = 0; + N(RitualStateTime) = 0; + N(RitualCards)[0].pos.y = 68.0f; + N(RitualCards)[0].yaw = 180.0f; + N(RitualCards)[1].pos.y = 68.0f; + N(RitualCards)[1].yaw = 180.0f; + evt_set_variable(N(CreatorScript), RITUAL_VAR_STATE, RITUAL_STATE_C); + N(D_8024EF80) = 0.0f; + N(D_8024EF84) = 1.0f; + + N(GetCardOrientation)(1, &sp48, &sp4C, &sp50, &sp54); + + for (j = 0; j < ARRAY_COUNT(N(D_8024EF90)); j++) { + s32 i; + + N(D_8024EF90)[j] = fx_energy_in_out(2, sp48, sp4C + 20.0f, sp50, 8.0f, -1); + N(D_8024EF90)[j]->data.energyInOut->unk_28 = 215; + N(D_8024EF90)[j]->data.energyInOut->unk_2C = 55; + N(D_8024EF90)[j]->data.energyInOut->unk_30 = 255; + + for (i = 1; i < N(D_8024EF90)[j]->numParts; i++) { + N(D_8024EF90)[j]->data.energyInOut[i].unk_38 *= 0.1; + } + } + break; + case RITUAL_STATE_C: + N(GetCardOrientation)(1, &sp58, &sp5C, &sp60, &sp64); + + for (j = 0; j < ARRAY_COUNT(N(D_8024EF90)); j++) { + s32 i; + + N(D_8024EF90)[j]->data.energyInOut->pos.x = sp58; + N(D_8024EF90)[j]->data.energyInOut->pos.y = sp5C + 20.0f; + N(D_8024EF90)[j]->data.energyInOut->pos.z = sp60; + N(D_8024EF90)[j]->data.energyInOut->scale -= 0.1; + + if (N(D_8024EF90)[j]->data.energyInOut->scale < 0.1) { + N(D_8024EF90)[j]->data.energyInOut->scale = 0.1f; + } + + for (i = 1; i < N(D_8024EF90)[j]->numParts; i++, data++) { + N(D_8024EF90)[j]->data.energyInOut[i].unk_38 += 0.01; + } + } + + N(RitualCards)[0].pos.y += N(D_8024EF80); + N(RitualCards)[1].pos.y += N(D_8024EF84); + N(D_8024EF80) += 0.4; + N(D_8024EF84) -= 0.05; + N(RitualStateTime)++; + + if (N(RitualCards)[1].pos.y < -5.0f) { + N(RitualCards)[1].pos.y = -5.0f; + N(RitualStateTime) = 0; + evt_set_variable(N(CreatorScript), RITUAL_VAR_STATE, RITUAL_STATE_D); + N(RitualCards)[0].unk_00 = 0; + N(RitualCards)[1].unk_00 = 0; + N(GetCardOrientation)(1, &sp68, &sp6C, &sp70, &sp74); + fx_sparkles(0, sp68, sp6C + 20.0f, sp70, 30.0f); + sfx_play_sound(SOUND_206); + + for (j = 0; j < ARRAY_COUNT(N(D_8024EF90)); j++) { + N(D_8024EF90)[j]->flags |= EFFECT_INSTANCE_FLAGS_10; + } + } + break; + case 13: + break; + } +} + +void N(card_worker_render)(void) { + Matrix4f mtx; + u32 temp_s1; + + guPositionF(mtx, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, SPRITE_WORLD_SCALE_F, + evt_get_variable(N(CreatorScript), RITUAL_VAR_POS_X), + evt_get_variable(N(CreatorScript), RITUAL_VAR_POS_Y), + evt_get_variable(N(CreatorScript), RITUAL_VAR_POS_Z)); + + temp_s1 = N(appendGfx_ritual_card)(&N(RitualCards)[0], mtx); + N(appendGfx_ritual_card)(&N(RitualCards)[1], mtx); + N(appendGfx_ritual_card)(&N(RitualCards)[2], mtx); + if ((N(RitualCards)[0].unk_00 == 2) && ((temp_s1 - 1) < 2)) { + evt_set_variable(N(CreatorScript), RITUAL_VAR_STATE, RITUAL_STATE_3); + } + if ((N(RitualCards)[0].unk_00 == 3) && ((temp_s1 - 1) < 2)) { + evt_set_variable(N(CreatorScript), RITUAL_VAR_STATE, RITUAL_STATE_B); + } +} + +API_CALLABLE(N(func_8024303C_96C1FC)) { + sfx_play_sound_with_params(SOUND_202A, 0, 24, 0); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(func_80243068_96C228)) { + sfx_play_sound_with_params(SOUND_202B, 0, 104, 0); + return ApiStatus_DONE2; +} + +EvtScript N(EVS_NpcAuxAI_Merlee) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcAI_Merlee) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PerformRitual) = { + EVT_USE_ARRAY(EVT_PTR(N(RitualBuffer))) + EVT_SET(RITUAL_VAR_STATE, RITUAL_STATE_INIT) + EVT_CALL(GetNpcPos, NPC_Merlee, RITUAL_VAR_POS_X, RITUAL_VAR_POS_Y, RITUAL_VAR_POS_Z) + EVT_ADD(RITUAL_VAR_POS_X, 60) + EVT_ADD(RITUAL_VAR_POS_Z, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Merlee, SOUND_201, 0) + EVT_THREAD + EVT_CALL(MakeLerp, 720, 0, 60, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcRotation, NPC_Merlee, 0, LVar0, 0) + EVT_IF_GT(LVar0, 360) + EVT_ADD(LVar0, -360) + EVT_END_IF + EVT_SWITCH(LVar0) + EVT_CASE_RANGE(90, 270) + EVT_SET(LVar2, ANIM_WorldMerlee_SpinBack) + EVT_CASE_DEFAULT + EVT_SET(LVar2, ANIM_WorldMerlee_SpinFront) + EVT_END_SWITCH + EVT_CALL(SetNpcAnimation, NPC_Merlee, LVar2) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(SetNpcRotation, NPC_Merlee, 0, 0, 0) + EVT_CALL(SetNpcAnimation, NPC_Merlee, ANIM_WorldMerlee_Gather) + EVT_WAIT(200) + EVT_CALL(SetNpcAnimation, NPC_Merlee, ANIM_WorldMerlee_Bow) + EVT_WAIT(40) + EVT_CALL(SetNpcAnimation, NPC_Merlee, ANIM_WorldMerlee_Gather) + EVT_WAIT(75) + EVT_CALL(SetNpcAnimation, NPC_Merlee, ANIM_WorldMerlee_Release) + EVT_END_THREAD + EVT_WAIT(60) + EVT_CALL(PlaySoundAtNpc, NPC_Merlee, SOUND_202, 0) + EVT_SET(LVar0, RITUAL_VAR_POS_Y) + EVT_ADD(LVar0, 25) + EVT_PLAY_EFFECT(EFFECT_RADIATING_ENERGY_ORB, 0, RITUAL_VAR_POS_X, LVar0, RITUAL_VAR_POS_Z, 1, -1) + EVT_SET(RITUAL_VAR_ORB_EFFECT, LVarF) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(func_802D7B10, RITUAL_VAR_ORB_EFFECT) + EVT_END_THREAD + EVT_CALL(N(DarkenWorld)) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(InterpPlayerYaw, 0, 0) + EVT_CALL(N(CreateRitualCards)) + EVT_THREAD + EVT_LOOP(0) + EVT_IF_EQ(RITUAL_VAR_STATE, RITUAL_STATE_2) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(PlaySound, SOUND_B000001D) + EVT_WAIT(10) + EVT_CALL(PlaySound, SOUND_B000001D) + EVT_WAIT(9) + EVT_CALL(PlaySound, SOUND_B000001D) + EVT_WAIT(4) + EVT_CALL(PlaySound, SOUND_B000001D) + EVT_WAIT(4) + EVT_CALL(PlaySound, SOUND_B000001D) + EVT_WAIT(3) + EVT_CALL(PlaySound, SOUND_B000001D) + EVT_WAIT(2) + EVT_CALL(PlaySound, SOUND_B000001D) + EVT_WAIT(2) + EVT_CALL(PlaySound, SOUND_B000001D) + EVT_WAIT(2) + EVT_CALL(PlaySound, SOUND_B000001D) + EVT_WAIT(3) + EVT_CALL(PlaySound, SOUND_B000001D) + EVT_WAIT(2) + EVT_CALL(PlaySound, SOUND_B000001D) + EVT_WAIT(6) + EVT_CALL(PlaySound, SOUND_B000001D) + EVT_WAIT(3) + EVT_CALL(PlaySound, SOUND_B000001D) + EVT_WAIT(3) + EVT_CALL(PlaySound, SOUND_B000001D) + EVT_WAIT(3) + EVT_CALL(PlaySound, SOUND_B000001D) + EVT_WAIT(3) + EVT_CALL(PlaySound, SOUND_B000001D) + EVT_END_THREAD + EVT_THREAD + EVT_LOOP(0) + EVT_IF_GE(RITUAL_VAR_STATE, RITUAL_STATE_3) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_WAIT(9) + EVT_CALL(N(func_8024303C_96C1FC)) + EVT_WAIT(2) + EVT_CALL(N(func_80243068_96C228)) + EVT_LOOP(0) + EVT_IF_GE(RITUAL_VAR_STATE, RITUAL_STATE_A) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_WAIT(3) + EVT_CALL(PlaySound, SOUND_204) + EVT_LOOP(0) + EVT_IF_GE(RITUAL_VAR_STATE, RITUAL_STATE_B) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_WAIT(15) + EVT_CALL(PlaySound, SOUND_205) + EVT_END_THREAD + EVT_LOOP(0) + EVT_IF_EQ(RITUAL_VAR_STATE, RITUAL_STATE_D) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(SetPlayerPos, RITUAL_VAR_POS_X, RITUAL_VAR_POS_Y, RITUAL_VAR_POS_Z) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_GotItem) + EVT_WAIT(1) + EVT_CALL(SetPlayerPos, RITUAL_VAR_POS_X, RITUAL_VAR_POS_Y, RITUAL_VAR_POS_Z) + EVT_WAIT(1) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(N(DestroyRitualCards)) + EVT_THREAD + EVT_CALL(N(UndarkenWorld)) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_BeginMerleeCamera) = { + EVT_CALL(GetNpcPos, NPC_Merlee, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, 0, LVar0, LVar1, LVar2) + EVT_CALL(SetCamDistance, 0, 200) + EVT_CALL(SetPanTarget, 0, LVar0, LVar1, LVar2) + EVT_CALL(SetCamSpeed, 0, EVT_FLOAT(8.0)) + EVT_CALL(SetCamPitch, 0, 20, -15) + EVT_CALL(PanToTarget, 0, 0, 1) + EVT_CALL(WaitForCam, 0, EVT_FLOAT(1.0)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EndMerleeCamera) = { + EVT_CALL(PanToTarget, 0, 0, 0) + EVT_CALL(SetCamSpeed, 0, EVT_FLOAT(3.0)) + EVT_CALL(WaitForCam, 0, EVT_FLOAT(1.0)) + EVT_RETURN + EVT_END +}; + + +EvtScript N(EVS_NpcInteract_Merlee) = { + EVT_CALL(func_802D2C14, 1) + EVT_EXEC_WAIT(N(EVS_BeginMerleeCamera)) + EVT_SET(LVar0, 0) + EVT_IF_EQ(GB_KootFavor_Current, 8) + EVT_ADD(LVar0, 1) + EVT_END_IF + EVT_IF_EQ(GF_HOS06_MerluvleeRequestedCrystalBall, 1) + EVT_ADD(LVar0, 1) + EVT_END_IF + EVT_IF_EQ(GF_DRO01_Gift_CrystalBall, 0) + EVT_ADD(LVar0, 1) + EVT_END_IF + EVT_IF_EQ(LVar0, 3) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldMerlee_Talk, ANIM_WorldMerlee_Idle, 0, MSG_CH2_00DC) + EVT_SET(LVar0, 39) + EVT_SET(LVar1, 1) + EVT_EXEC_WAIT(N(GiveKeyReward)) + EVT_CALL(AddKeyItem, ITEM_CRYSTAL_BALL) + EVT_SET(GF_DRO01_Gift_CrystalBall, 1) + EVT_WAIT(20) + EVT_CALL(func_802D2C14, 0) + EVT_EXEC_WAIT(N(EVS_EndMerleeCamera)) + EVT_RETURN + EVT_END_IF + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldMerlee_Talk, ANIM_WorldMerlee_Idle, 0, MSG_CH2_00D6) + EVT_CALL(ShowChoice, MSG_Choice_0011) + EVT_IF_NE(LVar0, 0) + EVT_CALL(ContinueSpeech, -1, ANIM_WorldMerlee_Talk, ANIM_WorldMerlee_Idle, 0, MSG_CH2_00D7) + EVT_CALL(func_802D2C14, 0) + EVT_EXEC_WAIT(N(EVS_EndMerleeCamera)) + EVT_RETURN + EVT_END_IF + EVT_CALL(ContinueSpeech, -1, ANIM_WorldMerlee_Talk, ANIM_WorldMerlee_Idle, 0, MSG_CH2_00D8) + EVT_CALL(ShowCoinCounter, 1) + EVT_CALL(ShowChoice, MSG_Choice_0018) + EVT_CALL(ShowCoinCounter, 0) + EVT_IF_EQ(LVar0, 3) + EVT_CALL(ContinueSpeech, -1, ANIM_WorldMerlee_Talk, ANIM_WorldMerlee_Idle, 0, MSG_CH2_00D7) + EVT_CALL(func_802D2C14, 0) + EVT_EXEC_WAIT(N(EVS_EndMerleeCamera)) + EVT_RETURN + EVT_END_IF + EVT_CALL(N(TryEnchantPlayer), LVar0, LVar1) + EVT_IF_NE(LVar1, 0) + EVT_CALL(ContinueSpeech, -1, ANIM_WorldMerlee_Talk, ANIM_WorldMerlee_Idle, 0, MSG_CH2_00D9) + EVT_CALL(func_802D2C14, 0) + EVT_EXEC_WAIT(N(EVS_EndMerleeCamera)) + EVT_RETURN + EVT_END_IF + EVT_CALL(ContinueSpeech, -1, ANIM_WorldMerlee_Talk, ANIM_WorldMerlee_Idle, 0, MSG_CH2_00DA) + EVT_CALL(SetMusicTrack, 0, SONG_MERLEE_SPELL, 0, 8) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_EXEC_GET_TID(N(EVS_PerformRitual), LVar9) + EVT_LOOP(0) + EVT_IS_THREAD_RUNNING(LVar9, LVar1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_WAIT(60) + EVT_CALL(SetNpcAnimation, 4, ANIM_WorldMerlee_Idle) + EVT_CALL(PlayerMoveTo, -100, -370, 8) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldMerlee_Talk, ANIM_WorldMerlee_Idle, 0, MSG_CH2_00DB) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_CALL(EnablePartnerAI) + EVT_CALL(func_802D2C14, 0) + EVT_EXEC_WAIT(N(EVS_EndMerleeCamera)) + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_Merlee) = { + .height = 32, + .radius = 32, + .otherAI = &N(EVS_NpcAuxAI_Merlee), + .onInteract = &N(EVS_NpcInteract_Merlee), + .ai = &N(EVS_NpcAI_Merlee), + .level = 99, +}; diff --git a/src/world/area_dro/dro_02/npc_moustafa.c b/src/world/area_dro/dro_02/npc_moustafa.c new file mode 100644 index 0000000000..297fad2e51 --- /dev/null +++ b/src/world/area_dro/dro_02/npc_moustafa.c @@ -0,0 +1,273 @@ +#include "dro_02.h" + +EvtScript N(EVS_PartyWatchingMousatafa) = { + EVT_LOOP(0) + EVT_CALL(PlayerFaceNpc, NPC_Moustafa, FALSE) + EVT_CALL(NpcFaceNpc, NPC_PARTNER, NPC_Moustafa, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Moustafa_SetCamBetween) = { + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 275) + EVT_CALL(GetNpcPos, NPC_DisguisedMoustafa, LVar3, LVar4, LVar5) + EVT_ADD(LVar0, LVar3) + EVT_ADD(LVar1, LVar4) + EVT_ADD(LVar2, LVar5) + EVT_DIV(LVar0, 2) + EVT_DIV(LVar1, 2) + EVT_DIV(LVar2, 2) + EVT_ADD(LVar1, 15) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(8.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Moustafa_ResetCam) = { + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Moustafa_Unveiling) = { + EVT_CALL(SetNpcYaw, NPC_Moustafa, 270) + EVT_CALL(SetNpcFlagBits, NPC_DisguisedMoustafa, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Moustafa, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcAnimation, NPC_DisguisedMoustafa, ANIM_DisguisedMoustafa_GrabCloak) + EVT_WAIT(30) + EVT_CALL(SetNpcAnimation, NPC_DisguisedMoustafa, ANIM_DisguisedMoustafa_ThrownCloak) + EVT_CALL(SetNpcAnimation, NPC_Moustafa, ANIM_Moustafa_Toss) + EVT_CALL(SetNpcPos, NPC_Moustafa, -335, 163, -260) + EVT_EXEC(N(EVS_PlayMoustafaMusic)) + EVT_CALL(MakeLerp, 0, 80, 30, EASING_CUBIC_OUT) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_SET(LVar2, -335) + EVT_SET(LVar3, 163) + EVT_SUB(LVar2, LVar0) + EVT_ADD(LVar3, LVar0) + EVT_CALL(SetNpcPos, NPC_DisguisedMoustafa, LVar2, LVar3, -260) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(SetNpcFlagBits, NPC_DisguisedMoustafa, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcPos, NPC_DisguisedMoustafa, 0, NPC_DISPOSE_POS_Y, -250) + EVT_CALL(SetNpcAnimation, NPC_Moustafa, ANIM_Moustafa_Idle) + EVT_CALL(SetNpcFlagBits, NPC_DisguisedMoustafa, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Moustafa, NPC_FLAG_100, FALSE) + EVT_WAIT(30) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_DisguisedMoustafa) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_BOUGHT_SECRET_ITEMS) + EVT_CASE_LT(STORY_CH2_GOT_PULSE_STONE) + EVT_CALL(SetNpcPos, NPC_SELF, -335, 163, -260) + EVT_CASE_GE(STORY_CH2_GOT_PULSE_STONE) + EVT_CALL(SetNpcPos, NPC_SELF, 0, NPC_DISPOSE_POS_Y, -250) + EVT_CALL(SetNpcPos, NPC_Moustafa, -335, 163, -260) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Moustafa) = { + EVT_IF_EQ(GF_DRO02_Moustafa_UnusedDialogOverride, TRUE) + EVT_CALL(SpeakToPlayer, NPC_Moustafa, ANIM_Moustafa_Shout, ANIM_Moustafa_Idle, 0, MSG_CH2_00CF) + EVT_RETURN + EVT_END_IF + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_BOUGHT_SECRET_ITEMS) + EVT_SET(LVarB, 0) + EVT_CALL(SpeakToPlayer, NPC_DisguisedMoustafa, ANIM_DisguisedMoustafa_Talk, ANIM_DisguisedMoustafa_Idle, 0, MSG_CH2_00B4) + EVT_LABEL(0) + EVT_CALL(ShowChoice, MSG_Choice_0019) + EVT_IF_EQ(LVar0, 1) + EVT_CALL(ContinueSpeech, NPC_DisguisedMoustafa, ANIM_DisguisedMoustafa_Talk, ANIM_DisguisedMoustafa_Idle, 0, MSG_CH2_00B6) + EVT_EXEC(N(EVS_Moustafa_ResetCam)) + EVT_RETURN + EVT_ELSE + EVT_CALL(EndSpeech, NPC_DisguisedMoustafa, ANIM_DisguisedMoustafa_Talk, ANIM_DisguisedMoustafa_Idle, 0) + EVT_END_IF + EVT_LABEL(1) + EVT_CHOOSE_ANY_CONSUMABLE() + EVT_SWITCH(LVar0) + EVT_CASE_EQ(0) + EVT_CALL(SpeakToPlayer, NPC_DisguisedMoustafa, ANIM_DisguisedMoustafa_Talk, ANIM_DisguisedMoustafa_Idle, 0, MSG_CH2_00B8) + EVT_EXEC(N(EVS_Moustafa_ResetCam)) + EVT_RETURN + EVT_CASE_EQ(-1) + EVT_CALL(SpeakToPlayer, NPC_DisguisedMoustafa, ANIM_DisguisedMoustafa_Talk, ANIM_DisguisedMoustafa_Idle, 0, MSG_CH2_00B7) + EVT_EXEC(N(EVS_Moustafa_ResetCam)) + EVT_RETURN + EVT_END_SWITCH + EVT_SET(LVarA, LVar0) + EVT_IF_EQ(GB_DRO02_SheekLemonGiftCount, 0) + EVT_IF_EQ(LVarA, ITEM_LEMON) + EVT_SET(GB_DRO02_SheekLemonGiftCount, 1) + EVT_SET(GB_DRO02_SheekGiftCount, 10) + EVT_CALL(SpeakToPlayer, NPC_DisguisedMoustafa, ANIM_DisguisedMoustafa_Talk, ANIM_DisguisedMoustafa_Idle, 0, MSG_CH2_00BB) + EVT_CALL(ShowChoice, MSG_Choice_001C) + EVT_ELSE + EVT_ADD(GB_DRO02_SheekGiftCount, 1) + EVT_IF_LE(GB_DRO02_SheekGiftCount, 2) + EVT_CALL(SpeakToPlayer, NPC_DisguisedMoustafa, ANIM_DisguisedMoustafa_Talk, ANIM_DisguisedMoustafa_Idle, 0, MSG_CH2_00B5) + EVT_GOTO(0) + EVT_END_IF + EVT_IF_EQ(GB_DRO02_SheekGiftCount, 3) + EVT_CALL(SpeakToPlayer, NPC_DisguisedMoustafa, ANIM_DisguisedMoustafa_Talk, ANIM_DisguisedMoustafa_Idle, 0, MSG_CH2_00B9) + EVT_CALL(ShowChoice, MSG_Choice_001B) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_DisguisedMoustafa, ANIM_DisguisedMoustafa_Talk, ANIM_DisguisedMoustafa_Idle, 0, MSG_CH2_00BA) + EVT_CALL(ShowChoice, MSG_Choice_001B) + EVT_SET(GB_DRO02_SheekGiftCount, 10) + EVT_END_IF + EVT_END_IF + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_DisguisedMoustafa, ANIM_DisguisedMoustafa_Talk, ANIM_DisguisedMoustafa_Idle, 0, MSG_CH2_00BA) + EVT_CALL(ShowChoice, MSG_Choice_001C) + EVT_END_IF + EVT_SWITCH(LVar0) + EVT_CASE_EQ(0) + EVT_CALL(ContinueSpeech, NPC_DisguisedMoustafa, ANIM_DisguisedMoustafa_Talk, ANIM_DisguisedMoustafa_Idle, 0, MSG_CH2_00BC) + EVT_CASE_EQ(1) + EVT_EXEC_WAIT(N(EVS_Moustafa_SetCamBetween)) + EVT_CALL(ContinueSpeech, NPC_DisguisedMoustafa, ANIM_DisguisedMoustafa_Talk, ANIM_DisguisedMoustafa_Idle, 0, MSG_CH2_00BD) + EVT_SET(GF_DRO02_Sheek_AskedAboutDesert, TRUE) + EVT_CASE_EQ(2) + EVT_EXEC_WAIT(N(EVS_Moustafa_SetCamBetween)) + EVT_CALL(ContinueSpeech, NPC_DisguisedMoustafa, ANIM_DisguisedMoustafa_Talk, ANIM_DisguisedMoustafa_Idle, 0, MSG_CH2_00BE) + EVT_SET(GF_DRO02_Sheek_AskedAboutRuins, TRUE) + EVT_CASE_EQ(3) + EVT_EXEC_WAIT(N(EVS_Moustafa_SetCamBetween)) + EVT_CALL(ContinueSpeech, NPC_DisguisedMoustafa, ANIM_DisguisedMoustafa_Talk, ANIM_DisguisedMoustafa_Idle, 0, MSG_CH2_00BF) + EVT_CASE_EQ(4) + EVT_EXEC_WAIT(N(EVS_Moustafa_SetCamBetween)) + EVT_CALL(ContinueSpeech, NPC_DisguisedMoustafa, ANIM_DisguisedMoustafa_Talk, ANIM_DisguisedMoustafa_Idle, 0, MSG_CH2_00C1) + EVT_SET(GF_DRO02_Sheek_AskedAboutMoustafa, TRUE) + EVT_SET(LVarB, 1) + EVT_END_SWITCH + EVT_SET(GF_DRO02_Sheek_SpokeTo, TRUE) + EVT_CALL(ContinueSpeech, NPC_DisguisedMoustafa, ANIM_DisguisedMoustafa_Talk, ANIM_DisguisedMoustafa_Idle, 0, MSG_CH2_00C0) + EVT_CALL(ShowChoice, MSG_Choice_001A) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(EndSpeech, NPC_DisguisedMoustafa, ANIM_DisguisedMoustafa_Talk, ANIM_DisguisedMoustafa_Idle, 0) + EVT_GOTO(1) + EVT_ELSE + EVT_CALL(ContinueSpeech, NPC_DisguisedMoustafa, ANIM_DisguisedMoustafa_Talk, ANIM_DisguisedMoustafa_Idle, 0, MSG_CH2_00B6) + EVT_END_IF + EVT_IF_EQ(LVarB, 1) + EVT_IF_EQ(MF_Unk_00, FALSE) + EVT_SET(MF_Unk_00, TRUE) + EVT_THREAD + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_CALL(AwaitPlayerLeave, LVar0, LVar2, 50) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(SpeakToPlayer, NPC_DisguisedMoustafa, ANIM_DisguisedMoustafa_Talk, ANIM_DisguisedMoustafa_Idle, 0, MSG_CH2_00C2) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_SET(MF_Unk_00, FALSE) + EVT_END_THREAD + EVT_END_IF + EVT_END_IF + EVT_EXEC(N(EVS_Moustafa_ResetCam)) + EVT_CASE_LT(STORY_CH2_GOT_PULSE_STONE) + EVT_THREAD + EVT_WAIT(10) + EVT_CALL(func_802D2C14, 1) + EVT_END_THREAD + EVT_CALL(SetNpcFlagBits, NPC_DisguisedMoustafa, NPC_FLAG_100, TRUE) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) + EVT_CALL(PlayerMoveTo, -391, -260, 0) + EVT_CALL(InterpPlayerYaw, 90, 3) + EVT_CALL(SetNpcFlagBits, NPC_DisguisedMoustafa, NPC_FLAG_100, FALSE) + EVT_EXEC_GET_TID(N(EVS_PartyWatchingMousatafa), LVarA) + EVT_CALL(SetNpcFlagBits, NPC_Moustafa, NPC_FLAG_100, TRUE) + EVT_CALL(FadeOutMusic, 0, 500) + EVT_IF_EQ(GF_DRO02_Sheek_AskedAboutMoustafa, TRUE) + EVT_CALL(SpeakToPlayer, NPC_DisguisedMoustafa, ANIM_DisguisedMoustafa_Talk, ANIM_DisguisedMoustafa_Idle, 0, MSG_CH2_00C3) + EVT_EXEC_WAIT(N(EVS_Moustafa_Unveiling)) + EVT_CALL(func_802D2C14, 0) + EVT_CALL(SetNpcJumpscale, NPC_Moustafa, EVT_FLOAT(1.0)) + EVT_CALL(NpcJump0, NPC_Moustafa, -425, 140, -206, 20) + EVT_CALL(SpeakToPlayer, NPC_Moustafa, ANIM_Moustafa_Shout, ANIM_Moustafa_Idle, 0, MSG_CH2_00C4) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_DisguisedMoustafa, ANIM_DisguisedMoustafa_Talk, ANIM_DisguisedMoustafa_Idle, 0, MSG_CH2_00C5) + EVT_EXEC_WAIT(N(EVS_Moustafa_Unveiling)) + EVT_CALL(func_802D2C14, 0) + EVT_CALL(SetNpcJumpscale, NPC_Moustafa, EVT_FLOAT(1.0)) + EVT_CALL(NpcJump0, NPC_Moustafa, -425, 140, -206, 20) + EVT_CALL(SpeakToPlayer, NPC_Moustafa, ANIM_Moustafa_Shout, ANIM_Moustafa_Idle, 0, MSG_CH2_00C6) + EVT_END_IF + EVT_CALL(SetNpcJumpscale, NPC_Moustafa, EVT_FLOAT(1.0)) + EVT_CALL(NpcJump0, NPC_Moustafa, -337, 140, -200, 20) + EVT_CALL(SpeakToPlayer, NPC_Moustafa, ANIM_Moustafa_Shout, ANIM_Moustafa_Idle, 0, MSG_CH2_00C7) + EVT_CALL(SpeakToPlayer, NPC_Moustafa, ANIM_Moustafa_Shout, ANIM_Moustafa_Idle, 0, MSG_CH2_00C8) + EVT_CALL(SetNpcJumpscale, NPC_Moustafa, EVT_FLOAT(1.0)) + EVT_CALL(NpcJump0, NPC_Moustafa, -335, 163, -260, 20) + EVT_CALL(SpeakToPlayer, NPC_Moustafa, ANIM_Moustafa_Shout, ANIM_Moustafa_Idle, 0, MSG_CH2_00C9) + EVT_GIVE_KEY_REWARD(ITEM_PULSE_STONE) + EVT_SET(GB_StoryProgress, STORY_CH2_GOT_PULSE_STONE) + EVT_CALL(SpeakToPlayer, NPC_Moustafa, ANIM_Moustafa_Shout, ANIM_Moustafa_Idle, 0, MSG_CH2_00CA) + EVT_KILL_THREAD(LVarA) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_CASE_GE(STORY_CH2_GOT_PULSE_STONE) + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_UNCOVERED_DRY_DRY_RUINS) + EVT_CALL(SpeakToPlayer, NPC_Moustafa, ANIM_Moustafa_Shout, ANIM_Moustafa_Idle, 0, MSG_CH2_00CB) + EVT_CASE_GE(STORY_CH2_UNCOVERED_DRY_DRY_RUINS) + EVT_IF_GE(GB_StoryProgress, STORY_CH2_DEFEATED_TUTANKOOPA) + EVT_IF_EQ(GF_DRO02_Moustafa_HeardAboutDryDryRuins, FALSE) + EVT_CALL(SpeakToPlayer, NPC_Moustafa, ANIM_Moustafa_Shout, ANIM_Moustafa_Idle, 0, MSG_CH2_00CD) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_WAIT(15) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007) + EVT_WAIT(30) + EVT_CALL(SpeakToPlayer, NPC_Moustafa, ANIM_Moustafa_Shout, ANIM_Moustafa_Idle, 0, MSG_CH2_00CE) + EVT_SET(GF_DRO02_Moustafa_HeardAboutDryDryRuins, TRUE) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_Moustafa, ANIM_Moustafa_Shout, ANIM_Moustafa_Idle, 0, MSG_CH2_00D0) + EVT_END_IF + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_Moustafa, ANIM_Moustafa_Shout, ANIM_Moustafa_Idle, 0, MSG_CH2_00CC) + EVT_END_IF + EVT_END_SWITCH + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_DisguisedMoustafa) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(dro_02_ENTRY_2) + EVT_CASE_OR_EQ(dro_02_ENTRY_3) + EVT_CALL(SetNpcPos, NPC_SELF, 200, 0, -15) + EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 0) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_200000, TRUE) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_DisguisedMoustafa_GrabCloak) + EVT_END_CASE_GROUP + EVT_CASE_DEFAULT + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_DisguisedMoustafa))) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Moustafa))) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Moustafa) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Moustafa))) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_iwa/iwa.h b/src/world/area_iwa/iwa.h index 1adc1e410c..d9dba14324 100644 --- a/src/world/area_iwa/iwa.h +++ b/src/world/area_iwa/iwa.h @@ -25,4 +25,12 @@ enum { AF_IWA_SpokeWIthDryite = AreaFlag(2), }; +extern MapSettings iwa_00_settings; +extern MapSettings iwa_01_settings; +extern MapSettings iwa_02_settings; +extern MapSettings iwa_03_settings; +extern MapSettings iwa_04_settings; +extern MapSettings iwa_10_settings; +extern MapSettings iwa_11_settings; + #endif diff --git a/src/world/area_iwa/iwa_10/iwa_10_5_parakarry.c b/src/world/area_iwa/iwa_10/iwa_10_5_parakarry.c index c7eb77abe1..0c5085d25a 100644 --- a/src/world/area_iwa/iwa_10/iwa_10_5_parakarry.c +++ b/src/world/area_iwa/iwa_10/iwa_10_5_parakarry.c @@ -16,7 +16,6 @@ NpcSettings N(NpcSettings_Parakarry) = { #include "world/common/util/ChangeNpcToPartner.inc.c" #include "world/common/complete/KeyItemChoice.inc.c" -MAP_STATIC_PAD(4,unk); EvtScript N(EVS_Scene_MeetParakarry) = { EVT_LABEL(0) diff --git a/src/world/area_kmr/kmr.h b/src/world/area_kmr/kmr.h index f6a299ec17..c28cf6b219 100644 --- a/src/world/area_kmr/kmr.h +++ b/src/world/area_kmr/kmr.h @@ -2,25 +2,30 @@ #define _WORLD_AREA_KMR_KMR_H_ enum { - AB_KMR_0 = AreaByte(0), - AB_KMR_1 = AreaByte(1), - AB_KMR_2 = AreaByte(2), - AB_KMR_3 = AreaByte(3), - AB_KMR_4 = AreaByte(4), - AB_KMR_5 = AreaByte(5), - AB_KMR_6 = AreaByte(6), - AB_KMR_7 = AreaByte(7), - AB_KMR_8 = AreaByte(8), - AB_KMR_9 = AreaByte(9), - AB_KMR_A = AreaByte(10), - AB_KMR_B = AreaByte(11), - AB_KMR_C = AreaByte(12), - AB_KMR_D = AreaByte(13), - AB_KMR_E = AreaByte(14), - AB_KMR_F = AreaByte(15), + AB_KMR_0 = AreaByte(0), + AB_KMR_1 = AreaByte(1), + AB_KMR_2 = AreaByte(2), + AB_KMR_3 = AreaByte(3), + AB_KMR_4 = AreaByte(4), + AB_KMR_5 = AreaByte(5), + AB_KMR_6 = AreaByte(6), + AB_KMR_7 = AreaByte(7), + AB_KMR_8 = AreaByte(8), + AB_KMR_9 = AreaByte(9), + AB_KMR_A = AreaByte(10), + AB_KMR_B = AreaByte(11), + AB_KMR_C = AreaByte(12), + AB_KMR_D = AreaByte(13), + AB_KMR_E = AreaByte(14), + AB_KMR_F = AreaByte(15), }; -#define AF_KMR(index) AreaFlag(index) +enum { + AF_KMR_06 = AreaFlag(6), + AF_KMR_07 = AreaFlag(7), + AF_KMR_08 = AreaFlag(8), + AF_KMR_09 = AreaFlag(9), +}; extern MapSettings kmr_00_settings; extern MapSettings kmr_02_settings; diff --git a/src/world/area_kmr/kmr_00/8ABF90.c b/src/world/area_kmr/kmr_00/8ABF90.c deleted file mode 100644 index d4477bb401..0000000000 --- a/src/world/area_kmr/kmr_00/8ABF90.c +++ /dev/null @@ -1,232 +0,0 @@ -#include "kmr_00.h" -#include "effects.h" - -static char* N(exit_str_0) = "kmr_02"; -static char* N(exit_str_1) = "kmr_02\0"; - -extern s16 D_80242D60_8AECF0[8]; - -void set_model_env_color_parameters(u8 primR, u8 primG, u8 primB, u8 envR, u8 envG, u8 envB); -void get_model_env_color_parameters(u8* primR, u8* primG, u8* primB, u8* envR, u8* envG, u8* envB); - -ApiStatus func_80240000_8ABF90(Evt* script, s32 isInitialCall) { - Bytecode* args; - static u8 oldPrimR, oldPrimG, oldPrimB; - static u8 oldEnvR, oldEnvG, oldEnvB; - static s32 newPrimR, newPrimG, newPrimB; - static s32 newEnvR, newEnvG, newEnvB; - static s32 duration, time; - - args = script->ptrReadPos; - if (isInitialCall) { - get_model_env_color_parameters(&oldPrimR, &oldPrimG, &oldPrimB, &oldEnvR, &oldEnvG, &oldEnvB); - newPrimR = evt_get_variable(script, *args++); - newPrimG = evt_get_variable(script, *args++); - newPrimB = evt_get_variable(script, *args++); - newEnvR = evt_get_variable(script, *args++); - newEnvG = evt_get_variable(script, *args++); - newEnvB = evt_get_variable(script, *args++); - duration = evt_get_variable(script, *args++); - time = 0; - } - - if (duration > 0) { - time++; - set_model_env_color_parameters( - (oldPrimR + ((newPrimR - oldPrimR) * time) / duration), - (oldPrimG + ((newPrimG - oldPrimG) * time) / duration), - (oldPrimB + ((newPrimB - oldPrimB) * time) / duration), - (oldEnvR + ( (newEnvR - oldEnvR) * time) / duration), - (oldEnvG + ( (newEnvG - oldEnvG) * time) / duration), - (oldEnvB + ( (newEnvB - oldEnvB) * time) / duration)); - if (time >= duration) { - return ApiStatus_DONE2; - } - } else { - set_model_env_color_parameters(newPrimR, newPrimG, newPrimB, newEnvR, newEnvG, newEnvB); - return ApiStatus_DONE2; - } - return ApiStatus_BLOCK; -} - -ApiStatus func_80240388_8AC318(Evt* script, s32 isInitialCall) { - mdl_set_all_fog_mode(3); - *gBgRenderTypePtr = BACKGROUND_RENDER_TYPE_3; - return ApiStatus_DONE2; -} - -ApiStatus func_802403B8_8AC348(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32 var0 = 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++); - s32 var4 = evt_get_variable(script, *args++); - - fx_sparkles(var0, var1, var2, var3, var4); - return ApiStatus_DONE2; -} - -ApiStatus func_802404A0_8AC430(Evt* script, s32 isInitialCall) { - fx_energy_orb_wave(4, 0.0f, 0.0f, 0.0f, 0.3f, 30); - return ApiStatus_DONE2; -} - -ApiStatus func_802404E8_8AC478(Evt* script, s32 isInitialCall) { - s32 pitch = evt_get_variable(script, script->varTable[0]); - gCameras[CAM_DEFAULT].controlSettings.boomPitch = pitch * 0.001f; - return ApiStatus_DONE2; -} - -ApiStatus func_80240530_8AC4C0(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32 npcID = evt_get_variable(script, *args++); - Npc* npc = get_npc_unsafe(npcID); - - fx_sparkles(FX_SPARKLES_3, npc->pos.x, npc->pos.y + 10.0f, npc->pos.z, 10.0f); - return ApiStatus_DONE2; -} - -ApiStatus func_80240584_8AC514(Evt* script, s32 isInitialCall) { - snd_ambient_8005553C(0, 2000); - return ApiStatus_DONE2; -} - -ApiStatus func_802405A8_8AC538(Evt* script, s32 isInitialCall) { - snd_ambient_80055590(0, 2000); - return ApiStatus_DONE2; -} - -ApiStatus func_802405CC_8AC55C(Evt* script, s32 isInitialCall) { - snd_ambient_slow_fade_out(0, 1000); - return ApiStatus_DONE2; -} - -ApiStatus func_802405F0_8AC580(Evt* script, s32 isInitialCall) { - enum { - FUNC_STATE_0 = 0, - FUNC_STATE_1 = 1, - FUNC_STATE_2 = 2, - FUNC_STATE_3 = 3 - }; - - Bytecode* args = script->ptrReadPos; - ApiStatus retVal = ApiStatus_BLOCK; - Npc* npc; - - if (isInitialCall) { - script->functionTemp[1] = evt_get_variable(script, *args++); - script->functionTemp[2] = evt_get_variable(script, *args++); - script->varTable[15] = evt_get_variable(script, *args++); - script->functionTemp[0] = FUNC_STATE_0; - script->functionTemp[3] = 0; - } - - npc = get_npc_unsafe(script->functionTemp[1]); - switch (script->functionTemp[0]) { - case FUNC_STATE_0: - npc->pos.x = 0.0f; - npc->pos.y = -1000.0f; - npc->pos.z = -50.0f; - npc->moveToPos.x = script->functionTemp[3] * 3; - npc->moveToPos.y = 3.0f; - if (script->functionTemp[3] >= script->varTable[15]) { - npc->pos.y = 100.0f; - add_vec2D_polar(&npc->pos.x, &npc->pos.z, 70.0f, npc->moveToPos.x + (script->functionTemp[2] * 51) + 153.0f); - npc->pos.y += (-npc->pos.z + -50.0f + 70.0f) * 0.15f; - sfx_play_sound_at_position(SOUND_B000001E, 0, npc->pos.x, npc->pos.y, npc->pos.z); - fx_sparkles(FX_SPARKLES_0, npc->pos.x, npc->pos.y + 20.0f, npc->pos.z, 20.0f); - script->functionTemp[0] = FUNC_STATE_1; - } - break; - case FUNC_STATE_1: - npc->pos.x = 0.0f; - npc->pos.z = -50.0f; - npc->pos.y = 100.0f; - add_vec2D_polar(&npc->pos.x, &npc->pos.z, 70.0f, npc->moveToPos.x + (script->functionTemp[2] * 51) + 153.0f); - npc->pos.y += (-npc->pos.z + -50.0f + 70.0f) * 0.15f; - if ((script->functionTemp[3] + script->functionTemp[2]) == - (((script->functionTemp[3] + script->functionTemp[2]) / 13) * 13)) { - fx_sparkles(FX_SPARKLES_3, npc->pos.x, npc->pos.y + 10.0f, npc->pos.z, 10.0f); - } - if (script->functionTemp[3] > 256) { - script->functionTemp[0] = FUNC_STATE_2; - script->varTable[14] = 0; - } - break; - case FUNC_STATE_2: - npc->pos.x = 0.0f; - npc->pos.z = -50.0f; - npc->pos.y = 100.0f - (script->varTable[14] * 0.3f); - add_vec2D_polar(&npc->pos.x, &npc->pos.z, 70.0f, npc->moveToPos.x + (script->functionTemp[2] * 51) + 153.0f); - npc->pos.y += (-npc->pos.z + -50.0f + 70.0f) * 0.15f; - if ((script->functionTemp[3] + script->functionTemp[2]) == - (((script->functionTemp[3] + script->functionTemp[2]) / 13) * 13)) { - fx_sparkles(FX_SPARKLES_3, npc->pos.x, npc->pos.y + 10.0f, npc->pos.z, 10.0f); - } - if (script->varTable[14]++ > 180) { - script->functionTemp[0] = FUNC_STATE_3; - script->varTable[14] = 0; - } - break; - case FUNC_STATE_3: - npc->moveToPos.y -= 0.03f; - npc->pos.x = 0.0f; - npc->pos.z = -50.0f; - npc->pos.y = 45.999996f; - add_vec2D_polar(&npc->pos.x, &npc->pos.z, 70.0f, npc->moveToPos.x + (script->functionTemp[2] * 51) + 153.0f); - npc->pos.y += (-npc->pos.z + -50.0f + 70.0f) * 0.15f; - if ((script->functionTemp[3] + script->functionTemp[2]) == - (((script->functionTemp[3] + script->functionTemp[2]) / 13) * 13)) { - fx_sparkles(FX_SPARKLES_3, npc->pos.x, npc->pos.y + 10.0f, npc->pos.z, 10.0f); - } - if (npc->moveToPos.y < 0.0f) { - retVal = ApiStatus_DONE2; - } - break; - } - script->functionTemp[3]++; - npc->moveToPos.x += npc->moveToPos.y; - return retVal; -} - -ApiStatus func_80240BD8_8ACB68(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - Npc* npc; - - if (isInitialCall) { - script->functionTemp[1] = evt_get_variable(script, *args); - npc = get_npc_unsafe(script->functionTemp[1]); - sfx_play_sound_at_position(SOUND_B000001E, 0, npc->pos.x, npc->pos.y, npc->pos.z); - fx_sparkles(FX_SPARKLES_0, npc->pos.x, npc->pos.y + 20.0f, npc->pos.z, 10.0f); - script->functionTemp[0] = 3; - } - - npc = get_npc_unsafe(script->functionTemp[1]); - script->functionTemp[0]--; - if (script->functionTemp[0] == -1) { - npc->pos.y = -1000.0f; - return ApiStatus_DONE2; - } - - return ApiStatus_BLOCK; -} - -ApiStatus func_80240CB0_8ACC40(Evt* script, s32 isInitialCall) { - s32 retVal; - if (isInitialCall) { - script->functionTemp[1] = 0; - script->functionTempPtr[2] = get_npc_safe(script->owner2.npcID); - script->functionTemp[3] = D_80242D60_8AECF0[script->owner2.npcID - 1]; - } - if (script->functionTemp[3] == 0) { - Npc* npc = script->functionTempPtr[2]; - npc->verticalRenderOffset = sin_deg(script->functionTempF[1]) * 1.5f; - script->functionTempF[1] = clamp_angle(script->functionTempF[1] + 18.0f); - retVal = ApiStatus_BLOCK; - } else { - script->functionTemp[3]--; - retVal = ApiStatus_BLOCK; - } - return retVal; -} diff --git a/src/world/area_kmr/kmr_00/kmr_00.h b/src/world/area_kmr/kmr_00/kmr_00.h index 7318f7b929..33653af906 100644 --- a/src/world/area_kmr/kmr_00/kmr_00.h +++ b/src/world/area_kmr/kmr_00/kmr_00.h @@ -2,9 +2,41 @@ /// @brief Goomba Region - Forest Clearing #include "common.h" -#include "../kmr.h" #include "message_ids.h" #include "map.h" + #include "../kmr.h" +#include "mapfs/kmr_00_shape.h" +#include "mapfs/kmr_00_hit.h" + +#include "sprite/npc/WorldKalmar.h" +#include "sprite/npc/WorldMamar.h" +#include "sprite/npc/WorldEldstar.h" +#include "sprite/npc/WorldSkolar.h" +#include "sprite/npc/WorldMuskular.h" +#include "sprite/npc/WorldMisstar.h" +#include "sprite/npc/WorldKlevar.h" +#include "sprite/npc/Goombaria.h" + +enum { + NPC_Goombaria = 0, + NPC_Eldstar = 1, + NPC_Mamar = 2, + NPC_Skolar = 3, + NPC_Muskular = 4, + NPC_Misstar = 5, + NPC_Klevar = 6, + NPC_Kalmar = 7, +}; + +enum { + MV_Unk_01 = MapVar(1), +}; #define NAMESPACE kmr_00 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_MakeEntities); +extern EvtScript N(EVS_Scene_MarioRevived); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_kmr/kmr_00/kmr_00_0_header.c b/src/world/area_kmr/kmr_00/kmr_00_0_header.c new file mode 100644 index 0000000000..32ea15e7a0 --- /dev/null +++ b/src/world/area_kmr/kmr_00/kmr_00_0_header.c @@ -0,0 +1,13 @@ +#include "kmr_00.h" + +EntryList N(Entrances) = { + [kmr_00_ENTRY_0] { 485.0, 0.0, 0.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_kmr_00 }, +}; diff --git a/src/world/area_kmr/kmr_00/kmr_00_1_music.c b/src/world/area_kmr/kmr_00/kmr_00_1_music.c new file mode 100644 index 0000000000..fade165a1a --- /dev/null +++ b/src/world/area_kmr/kmr_00/kmr_00_1_music.c @@ -0,0 +1,10 @@ +#include "kmr_00.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_IF_GE(GB_StoryProgress, STORY_CH0_WAKE_UP) + EVT_CALL(SetMusicTrack, 0, SONG_GOOMBA_VILLAGE, 0, 8) + EVT_CALL(PlayAmbientSounds, AMBIENT_BIRDS) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kmr/kmr_00/kmr_00_2_main.c b/src/world/area_kmr/kmr_00/kmr_00_2_main.c new file mode 100644 index 0000000000..6e0211c948 --- /dev/null +++ b/src/world/area_kmr/kmr_00/kmr_00_2_main.c @@ -0,0 +1,36 @@ +#include "kmr_00.h" + +EvtScript N(EVS_ExitWalk_kmr_02_1) = EVT_EXIT_WALK(60, kmr_00_ENTRY_0, "kmr_02", kmr_02_ENTRY_1); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kmr_02_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deili1, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_GOOMBA_VILLAGE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_SET(GF_MAP_GoombaVillage, TRUE) + EVT_IF_LT(GB_StoryProgress, STORY_CH0_MET_INNKEEPER) + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_CALL(ClearDefeatedEnemies) + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_EXEC(N(EVS_Scene_MarioRevived)) + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_EQ(STORY_INTRO) + EVT_CALL(EnableModel, MODEL_ji_3, FALSE) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_GE(STORY_CH0_WAKE_UP) + EVT_CALL(EnableModel, MODEL_ji_1, FALSE) + EVT_CALL(EnableModel, MODEL_ji_2, FALSE) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_END_SWITCH + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kmr/kmr_00/kmr_00_3_revival.c b/src/world/area_kmr/kmr_00/kmr_00_3_revival.c new file mode 100644 index 0000000000..3e0c1843b5 --- /dev/null +++ b/src/world/area_kmr/kmr_00/kmr_00_3_revival.c @@ -0,0 +1,615 @@ +#include "kmr_00.h" +#include "effects.h" + +void set_model_env_color_parameters(u8 primR, u8 primG, u8 primB, u8 envR, u8 envG, u8 envB); +void get_model_env_color_parameters(u8* primR, u8* primG, u8* primB, u8* envR, u8* envG, u8* envB); + +API_CALLABLE(N(func_80240000_8ABF90)) { + Bytecode* args; + static u8 oldPrimR, oldPrimG, oldPrimB; + static u8 oldEnvR, oldEnvG, oldEnvB; + static s32 newPrimR, newPrimG, newPrimB; + static s32 newEnvR, newEnvG, newEnvB; + static s32 duration, time; + + args = script->ptrReadPos; + if (isInitialCall) { + get_model_env_color_parameters(&oldPrimR, &oldPrimG, &oldPrimB, &oldEnvR, &oldEnvG, &oldEnvB); + newPrimR = evt_get_variable(script, *args++); + newPrimG = evt_get_variable(script, *args++); + newPrimB = evt_get_variable(script, *args++); + newEnvR = evt_get_variable(script, *args++); + newEnvG = evt_get_variable(script, *args++); + newEnvB = evt_get_variable(script, *args++); + duration = evt_get_variable(script, *args++); + time = 0; + } + + if (duration > 0) { + time++; + set_model_env_color_parameters( + (oldPrimR + ((newPrimR - oldPrimR) * time) / duration), + (oldPrimG + ((newPrimG - oldPrimG) * time) / duration), + (oldPrimB + ((newPrimB - oldPrimB) * time) / duration), + (oldEnvR + ( (newEnvR - oldEnvR) * time) / duration), + (oldEnvG + ( (newEnvG - oldEnvG) * time) / duration), + (oldEnvB + ( (newEnvB - oldEnvB) * time) / duration)); + if (time >= duration) { + return ApiStatus_DONE2; + } + } else { + set_model_env_color_parameters(newPrimR, newPrimG, newPrimB, newEnvR, newEnvG, newEnvB); + return ApiStatus_DONE2; + } + return ApiStatus_BLOCK; +} + +API_CALLABLE(N(func_80240388_8AC318)) { + mdl_set_all_fog_mode(3); + *gBgRenderTypePtr = BACKGROUND_RENDER_TYPE_3; + return ApiStatus_DONE2; +} + +API_CALLABLE(N(func_802403B8_8AC348)) { + Bytecode* args = script->ptrReadPos; + s32 var0 = 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++); + s32 var4 = evt_get_variable(script, *args++); + + fx_sparkles(var0, var1, var2, var3, var4); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(func_802404A0_8AC430)) { + fx_energy_orb_wave(4, 0.0f, 0.0f, 0.0f, 0.3f, 30); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(func_802404E8_8AC478)) { + s32 pitch = evt_get_variable(script, script->varTable[0]); + gCameras[CAM_DEFAULT].controlSettings.boomPitch = pitch * 0.001f; + return ApiStatus_DONE2; +} + +API_CALLABLE(N(func_80240530_8AC4C0)) { + Bytecode* args = script->ptrReadPos; + s32 npcID = evt_get_variable(script, *args++); + Npc* npc = get_npc_unsafe(npcID); + + fx_sparkles(FX_SPARKLES_3, npc->pos.x, npc->pos.y + 10.0f, npc->pos.z, 10.0f); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(func_80240584_8AC514)) { + snd_ambient_8005553C(0, 2000); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(func_802405A8_8AC538)) { + snd_ambient_80055590(0, 2000); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(func_802405CC_8AC55C)) { + snd_ambient_slow_fade_out(0, 1000); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(func_802405F0_8AC580)) { + enum { + FUNC_STATE_0 = 0, + FUNC_STATE_1 = 1, + FUNC_STATE_2 = 2, + FUNC_STATE_3 = 3 + }; + + Bytecode* args = script->ptrReadPos; + ApiStatus retVal = ApiStatus_BLOCK; + Npc* npc; + + if (isInitialCall) { + script->functionTemp[1] = evt_get_variable(script, *args++); + script->functionTemp[2] = evt_get_variable(script, *args++); + script->varTable[15] = evt_get_variable(script, *args++); + script->functionTemp[0] = FUNC_STATE_0; + script->functionTemp[3] = 0; + } + + npc = get_npc_unsafe(script->functionTemp[1]); + switch (script->functionTemp[0]) { + case FUNC_STATE_0: + npc->pos.x = 0.0f; + npc->pos.y = NPC_DISPOSE_POS_Y; + npc->pos.z = -50.0f; + npc->moveToPos.x = script->functionTemp[3] * 3; + npc->moveToPos.y = 3.0f; + if (script->functionTemp[3] >= script->varTable[15]) { + npc->pos.y = 100.0f; + add_vec2D_polar(&npc->pos.x, &npc->pos.z, 70.0f, npc->moveToPos.x + (script->functionTemp[2] * 51) + 153.0f); + npc->pos.y += (-npc->pos.z + -50.0f + 70.0f) * 0.15f; + sfx_play_sound_at_position(SOUND_B000001E, 0, npc->pos.x, npc->pos.y, npc->pos.z); + fx_sparkles(FX_SPARKLES_0, npc->pos.x, npc->pos.y + 20.0f, npc->pos.z, 20.0f); + script->functionTemp[0] = FUNC_STATE_1; + } + break; + case FUNC_STATE_1: + npc->pos.x = 0.0f; + npc->pos.z = -50.0f; + npc->pos.y = 100.0f; + add_vec2D_polar(&npc->pos.x, &npc->pos.z, 70.0f, npc->moveToPos.x + (script->functionTemp[2] * 51) + 153.0f); + npc->pos.y += (-npc->pos.z + -50.0f + 70.0f) * 0.15f; + if ((script->functionTemp[3] + script->functionTemp[2]) == + (((script->functionTemp[3] + script->functionTemp[2]) / 13) * 13)) { + fx_sparkles(FX_SPARKLES_3, npc->pos.x, npc->pos.y + 10.0f, npc->pos.z, 10.0f); + } + if (script->functionTemp[3] > 256) { + script->functionTemp[0] = FUNC_STATE_2; + script->varTable[14] = 0; + } + break; + case FUNC_STATE_2: + npc->pos.x = 0.0f; + npc->pos.z = -50.0f; + npc->pos.y = 100.0f - (script->varTable[14] * 0.3f); + add_vec2D_polar(&npc->pos.x, &npc->pos.z, 70.0f, npc->moveToPos.x + (script->functionTemp[2] * 51) + 153.0f); + npc->pos.y += (-npc->pos.z + -50.0f + 70.0f) * 0.15f; + if ((script->functionTemp[3] + script->functionTemp[2]) == + (((script->functionTemp[3] + script->functionTemp[2]) / 13) * 13)) { + fx_sparkles(FX_SPARKLES_3, npc->pos.x, npc->pos.y + 10.0f, npc->pos.z, 10.0f); + } + if (script->varTable[14]++ > 180) { + script->functionTemp[0] = FUNC_STATE_3; + script->varTable[14] = 0; + } + break; + case FUNC_STATE_3: + npc->moveToPos.y -= 0.03f; + npc->pos.x = 0.0f; + npc->pos.z = -50.0f; + npc->pos.y = 45.999996f; + add_vec2D_polar(&npc->pos.x, &npc->pos.z, 70.0f, npc->moveToPos.x + (script->functionTemp[2] * 51) + 153.0f); + npc->pos.y += (-npc->pos.z + -50.0f + 70.0f) * 0.15f; + if ((script->functionTemp[3] + script->functionTemp[2]) == + (((script->functionTemp[3] + script->functionTemp[2]) / 13) * 13)) { + fx_sparkles(FX_SPARKLES_3, npc->pos.x, npc->pos.y + 10.0f, npc->pos.z, 10.0f); + } + if (npc->moveToPos.y < 0.0f) { + retVal = ApiStatus_DONE2; + } + break; + } + script->functionTemp[3]++; + npc->moveToPos.x += npc->moveToPos.y; + return retVal; +} + +API_CALLABLE(N(func_80240BD8_8ACB68)) { + Bytecode* args = script->ptrReadPos; + Npc* npc; + + if (isInitialCall) { + script->functionTemp[1] = evt_get_variable(script, *args); + npc = get_npc_unsafe(script->functionTemp[1]); + sfx_play_sound_at_position(SOUND_B000001E, 0, npc->pos.x, npc->pos.y, npc->pos.z); + fx_sparkles(FX_SPARKLES_0, npc->pos.x, npc->pos.y + 20.0f, npc->pos.z, 10.0f); + script->functionTemp[0] = 3; + } + + npc = get_npc_unsafe(script->functionTemp[1]); + script->functionTemp[0]--; + if (script->functionTemp[0] == -1) { + npc->pos.y = NPC_DISPOSE_POS_Y; + return ApiStatus_DONE2; + } + + return ApiStatus_BLOCK; +} + +EvtScript N(EVS_Scene_MarioRevived) = { + EVT_IF_GE(GB_StoryProgress, STORY_CH0_WAKE_UP) + EVT_CALL(EnableModel, MODEL_reef_1, FALSE) + EVT_CALL(EnableModel, MODEL_reef_2, FALSE) + EVT_CALL(EnableModel, MODEL_reef_3, FALSE) + EVT_CALL(EnableModel, MODEL_reef_4, FALSE) + EVT_CALL(EnableModel, MODEL_moku1, FALSE) + EVT_CALL(EnableModel, MODEL_moku2, FALSE) + EVT_CALL(EnableModel, MODEL_ha1, FALSE) + EVT_CALL(EnableModel, MODEL_ha2, FALSE) + EVT_CALL(EnableModel, MODEL_ha2_1, FALSE) + EVT_CALL(EnableModel, MODEL_ha2_2, FALSE) + EVT_CALL(EnableModel, MODEL_ha2_3, FALSE) + EVT_RETURN + EVT_END_IF + EVT_SETF(MV_Unk_01, EVT_FLOAT(0.0)) + EVT_CALL(N(func_80240388_8AC318)) + EVT_CALL(N(func_80240000_8ABF90), 255, 255, 255, 60, 60, 60, 0) + EVT_CALL(FadeOutMusic, 0, 500) + EVT_CALL(SetPlayerFlagBits, PS_FLAGS_200000, TRUE) + EVT_CALL(InterpPlayerYaw, 90, 0) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(PlayAmbientSounds, AMBIENT_BIRDS) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 0, 0, 0) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(6.0), EVT_FLOAT(-7.5)) + EVT_CALL(SetCamDistance, CAM_DEFAULT, -540) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 0, 15, 0) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(1) + EVT_CALL(func_802D4D14, 180) + EVT_CALL(SetPlayerPos, 0, 2, 0) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_DeadStill) + EVT_WAIT(60) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.7)) + EVT_CALL(SetCamDistance, CAM_DEFAULT, -350) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_THREAD + EVT_WAIT(2) + EVT_SETF(LVar0, 0) + EVT_SETF(LVar1, 0) + EVT_LOOP(90) + EVT_CALL(TranslateModel, MODEL_reef_3, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_reef_4, LVar1, 0, 0) + EVT_ADDF(LVar0, EVT_FLOAT(-0.66)) + EVT_ADDF(LVar1, EVT_FLOAT(0.66)) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(20) + EVT_SETF(LVar0, 0) + EVT_SETF(LVar1, 0) + EVT_LOOP(120) + EVT_CALL(TranslateModel, MODEL_reef_1, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_reef_2, LVar1, 0, 0) + EVT_CALL(TranslateModel, MODEL_moku2, LVar1, 0, 0) + EVT_CALL(TranslateModel, MODEL_ha2_1, LVar1, 0, 0) + EVT_CALL(TranslateModel, MODEL_ha2_2, LVar1, 0, 0) + EVT_CALL(TranslateModel, MODEL_ha2_3, LVar1, 0, 0) + EVT_ADDF(LVar0, EVT_FLOAT(-0.75)) + EVT_ADDF(LVar1, EVT_FLOAT(0.75)) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(10) + EVT_SETF(LVar0, 0) + EVT_SETF(LVar1, 0) + EVT_LOOP(120) + EVT_CALL(TranslateModel, MODEL_moku1, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_ha1, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_ha2, LVar0, 0, 0) + EVT_CALL(RotateModel, MODEL_moku1, LVar1, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_ha1, LVar1, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_ha2, LVar1, 0, 1, 0) + EVT_ADDF(LVar0, EVT_FLOAT(-0.2)) + EVT_ADDF(LVar1, EVT_FLOAT(-0.4)) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_WAIT(140) + EVT_CALL(N(func_80240584_8AC514)) + EVT_WAIT(30) + EVT_CALL(SetMusicTrack, 0, SONG_STAR_SPIRIT_THEME, 0, 8) + EVT_THREAD + EVT_CALL(N(func_80240000_8ABF90), 50, 50, 50, 0, 0, 0, 50) + EVT_END_THREAD + EVT_WAIT(90) + EVT_CALL(func_802D4D88) + EVT_THREAD + EVT_CALL(N(func_802405F0_8AC580), 1, 0, 180) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(N(func_802405F0_8AC580), 2, 1, 30) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(N(func_802405F0_8AC580), 3, 2, 90) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(N(func_802405F0_8AC580), 4, 3, 150) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(N(func_802405F0_8AC580), 5, 4, 0) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(N(func_802405F0_8AC580), 6, 5, 60) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(N(func_802405F0_8AC580), 7, 6, 120) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(330) + EVT_CALL(MakeLerp, 6000, 12000, 120, EASING_LINEAR) + EVT_LABEL(25) + EVT_CALL(UpdateLerp) + EVT_CALL(N(func_802404E8_8AC478)) + EVT_WAIT(1) + EVT_IF_NE(LVar1, 0) + EVT_GOTO(25) + EVT_END_IF + EVT_END_THREAD + EVT_WAIT(550) + EVT_CALL(GetNpcPos, NPC_Kalmar, LVar6, LVar7, LVar8) + EVT_CALL(GetNpcPos, NPC_Mamar, LVar9, LVarA, LVarB) + EVT_WAIT(15) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_CALL(SetCamDistance, CAM_DEFAULT, -200) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Kalmar, ANIM_WorldKalmar_LeanLeft) + EVT_CALL(NpcFlyTo, NPC_Kalmar, 20, 10, -5, 25, -10, EASING_QUADRATIC_OUT) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Kalmar, ANIM_WorldKalmar_LeanLeftAlt) + EVT_WAIT(35) + EVT_CALL(SetNpcAnimation, NPC_Kalmar, ANIM_WorldKalmar_LeanRight) + EVT_END_THREAD + EVT_THREAD + EVT_LOOP(3) + EVT_CALL(N(func_80240530_8AC4C0), NPC_Kalmar) + EVT_WAIT(6) + EVT_END_LOOP + EVT_END_THREAD + EVT_WAIT(10) + EVT_THREAD + EVT_CALL(N(func_80240530_8AC4C0), NPC_Mamar) + EVT_CALL(SetNpcAnimation, NPC_Mamar, ANIM_WorldMamar_LeanLeft) + EVT_CALL(NpcFlyTo, NPC_Mamar, -20, 10, -5, 25, -10, EASING_QUADRATIC_OUT) + EVT_WAIT(5) + EVT_CALL(SetNpcAnimation, NPC_Mamar, ANIM_WorldMamar_LeanLeftAlt) + EVT_WAIT(30) + EVT_CALL(SetNpcAnimation, NPC_Mamar, ANIM_WorldMamar_LeanRight) + EVT_END_THREAD + EVT_THREAD + EVT_LOOP(3) + EVT_CALL(N(func_80240530_8AC4C0), NPC_Mamar) + EVT_WAIT(6) + EVT_END_LOOP + EVT_END_THREAD + EVT_WAIT(35) + EVT_CALL(SpeakToPlayer, NPC_Mamar, ANIM_WorldMamar_TalkHappy, ANIM_WorldMamar_Idle, 5, MSG_CH0_0000) + EVT_WAIT(15) + EVT_CALL(SpeakToPlayer, NPC_Kalmar, ANIM_WorldMamar_TalkHappy, ANIM_WorldMamar_Idle, 5, MSG_CH0_0001) + EVT_WAIT(3) + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Kalmar, ANIM_WorldKalmar_LeanLeftAlt) + EVT_WAIT(30) + EVT_CALL(SetNpcAnimation, NPC_Kalmar, ANIM_WorldKalmar_LeanRight) + EVT_WAIT(10) + EVT_CALL(NpcFlyTo, NPC_Kalmar, LVar6, LVar7, LVar8, 15, -10, EASING_CUBIC_OUT) + EVT_CALL(SetNpcAnimation, NPC_Kalmar, ANIM_WorldKalmar_Idle) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(40) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_CALL(SetCamDistance, CAM_DEFAULT, -350) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_LOOP(3) + EVT_CALL(N(func_80240530_8AC4C0), NPC_Kalmar) + EVT_WAIT(4) + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Mamar, ANIM_WorldMamar_LeanLeftAlt) + EVT_WAIT(30) + EVT_CALL(SetNpcAnimation, NPC_Mamar, ANIM_WorldMamar_LeanRight) + EVT_WAIT(10) + EVT_CALL(NpcFlyTo, NPC_Mamar, LVar9, LVarA, LVarB, 15, -10, EASING_CUBIC_OUT) + EVT_CALL(SetNpcAnimation, NPC_Mamar, ANIM_WorldMamar_Idle) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(40) + EVT_LOOP(3) + EVT_CALL(N(func_80240530_8AC4C0), NPC_Mamar) + EVT_WAIT(4) + EVT_END_LOOP + EVT_END_THREAD + EVT_WAIT(90) + EVT_CALL(SpeakToPlayer, NPC_Eldstar, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Wave, 5, MSG_CH0_0002) + EVT_WAIT(15) + EVT_THREAD + EVT_CALL(SetNpcFlagBits, NPC_Eldstar, NPC_FLAG_400000, FALSE) + EVT_CALL(SetNpcAnimation, NPC_Eldstar, ANIM_WorldEldstar_Leap) + EVT_CALL(SetNpcJumpscale, NPC_Eldstar, EVT_FLOAT(3.2)) + EVT_CALL(GetNpcPos, NPC_Eldstar, LVar6, LVar7, LVar8) + EVT_CALL(NpcJump0, NPC_Eldstar, LVar6, LVar7, LVar8, 5) + EVT_CALL(SetNpcAnimation, NPC_Eldstar, ANIM_WorldEldstar_Idle) + EVT_CALL(PlaySoundAtPlayer, SOUND_B000001F, 0) + EVT_CALL(N(func_802403B8_8AC348), 0, 0, 0, 3, 10) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(20) + EVT_CALL(SetNpcAnimation, NPC_Mamar, ANIM_WorldMamar_Leap) + EVT_CALL(SetNpcFlagBits, NPC_Mamar, NPC_FLAG_400000, FALSE) + EVT_CALL(SetNpcJumpscale, NPC_Mamar, EVT_FLOAT(3.2)) + EVT_CALL(GetNpcPos, NPC_Mamar, LVar6, LVar7, LVar8) + EVT_CALL(NpcJump0, NPC_Mamar, LVar6, LVar7, LVar8, 5) + EVT_CALL(SetNpcAnimation, NPC_Mamar, ANIM_WorldMamar_Idle) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(21) + EVT_CALL(SetNpcAnimation, NPC_Skolar, ANIM_WorldSkolar_Leap) + EVT_CALL(SetNpcFlagBits, NPC_Skolar, NPC_FLAG_400000, FALSE) + EVT_CALL(SetNpcJumpscale, NPC_Skolar, EVT_FLOAT(3.2)) + EVT_CALL(GetNpcPos, NPC_Skolar, LVar6, LVar7, LVar8) + EVT_CALL(NpcJump0, NPC_Skolar, LVar6, LVar7, LVar8, 5) + EVT_CALL(SetNpcAnimation, NPC_Skolar, ANIM_WorldSkolar_Idle) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(22) + EVT_CALL(SetNpcAnimation, NPC_Muskular, ANIM_WorldMuskular_Leap) + EVT_CALL(SetNpcFlagBits, NPC_Muskular, NPC_FLAG_400000, FALSE) + EVT_CALL(SetNpcJumpscale, NPC_Muskular, EVT_FLOAT(3.2)) + EVT_CALL(GetNpcPos, NPC_Muskular, LVar6, LVar7, LVar8) + EVT_CALL(NpcJump0, NPC_Muskular, LVar6, LVar7, LVar8, 5) + EVT_CALL(SetNpcAnimation, NPC_Muskular, ANIM_WorldMuskular_Idle) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(20) + EVT_CALL(SetNpcAnimation, NPC_Misstar, ANIM_WorldMisstar_Leap) + EVT_CALL(SetNpcFlagBits, NPC_Misstar, NPC_FLAG_400000, FALSE) + EVT_CALL(SetNpcJumpscale, NPC_Misstar, EVT_FLOAT(3.2)) + EVT_CALL(GetNpcPos, NPC_Misstar, LVar6, LVar7, LVar8) + EVT_CALL(NpcJump0, NPC_Misstar, LVar6, LVar7, LVar8, 5) + EVT_CALL(SetNpcAnimation, NPC_Misstar, ANIM_WorldMisstar_Idle) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(21) + EVT_CALL(SetNpcAnimation, NPC_Klevar, ANIM_WorldKlevar_Leap) + EVT_CALL(SetNpcFlagBits, NPC_Klevar, NPC_FLAG_400000, FALSE) + EVT_CALL(SetNpcJumpscale, NPC_Klevar, EVT_FLOAT(3.2)) + EVT_CALL(GetNpcPos, NPC_Klevar, LVar6, LVar7, LVar8) + EVT_CALL(NpcJump0, NPC_Klevar, LVar6, LVar7, LVar8, 5) + EVT_CALL(SetNpcAnimation, NPC_Klevar, ANIM_WorldKlevar_Idle) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(22) + EVT_CALL(SetNpcAnimation, NPC_Kalmar, ANIM_WorldKalmar_Leap) + EVT_CALL(SetNpcFlagBits, NPC_Kalmar, NPC_FLAG_400000, FALSE) + EVT_CALL(SetNpcJumpscale, NPC_Kalmar, EVT_FLOAT(3.2)) + EVT_CALL(GetNpcPos, NPC_Kalmar, LVar6, LVar7, LVar8) + EVT_CALL(NpcJump0, NPC_Kalmar, LVar6, LVar7, LVar8, 5) + EVT_CALL(SetNpcAnimation, NPC_Kalmar, ANIM_WorldKalmar_Idle) + EVT_END_THREAD + EVT_WAIT(30) + EVT_THREAD + EVT_WAIT(45) + EVT_CALL(PlaySoundAtPlayer, SOUND_188, 0) + EVT_CALL(N(func_802404A0_8AC430)) + EVT_END_THREAD + EVT_CALL(PlaySoundAtPlayer, SOUND_B000001F, 0) + EVT_CALL(N(func_802403B8_8AC348), 0, 10, 10, 3, 10) + EVT_WAIT(6) + EVT_CALL(PlaySoundAtPlayer, SOUND_B000001F, 0) + EVT_CALL(N(func_802403B8_8AC348), 0, 0, 10, 3, 15) + EVT_WAIT(6) + EVT_CALL(PlaySoundAtPlayer, SOUND_B000001F, 0) + EVT_CALL(N(func_802403B8_8AC348), 0, -10, 10, 3, 20) + EVT_WAIT(6) + EVT_CALL(PlaySoundAtPlayer, SOUND_B000001F, 0) + EVT_CALL(N(func_802403B8_8AC348), 0, 10, 10, 3, 25) + EVT_WAIT(6) + EVT_LOOP(3) + EVT_CALL(PlaySoundAtPlayer, SOUND_B000001F, 0) + EVT_CALL(N(func_802403B8_8AC348), 0, 0, 10, 3, 30) + EVT_WAIT(6) + EVT_CALL(PlaySoundAtPlayer, SOUND_B000001F, 0) + EVT_CALL(N(func_802403B8_8AC348), 0, -10, 10, 3, 30) + EVT_WAIT(6) + EVT_CALL(PlaySoundAtPlayer, SOUND_B000001F, 0) + EVT_CALL(N(func_802403B8_8AC348), 0, 10, 10, 3, 30) + EVT_WAIT(6) + EVT_END_LOOP + EVT_WAIT(40) + EVT_CALL(SpeakToPlayer, NPC_Eldstar, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Wave, 5, MSG_CH0_0003) + EVT_THREAD + EVT_WAIT(15) + EVT_CALL(N(func_80240BD8_8ACB68), 5) + EVT_WAIT(2) + EVT_CALL(N(func_80240BD8_8ACB68), 2) + EVT_WAIT(2) + EVT_CALL(N(func_80240BD8_8ACB68), 6) + EVT_WAIT(2) + EVT_CALL(N(func_80240BD8_8ACB68), 3) + EVT_WAIT(2) + EVT_CALL(N(func_80240BD8_8ACB68), 7) + EVT_WAIT(2) + EVT_CALL(N(func_80240BD8_8ACB68), 4) + EVT_WAIT(2) + EVT_CALL(N(func_80240BD8_8ACB68), 1) + EVT_END_THREAD + EVT_CALL(FadeOutMusic, 0, 0x00001388) + EVT_THREAD + EVT_WAIT(90) + EVT_CALL(N(func_802405A8_8AC538)) + EVT_END_THREAD + EVT_WAIT(60) + EVT_CALL(N(func_80240000_8ABF90), 255, 255, 255, 0, 0, 0, 50) + EVT_CALL(SetNpcSpeed, NPC_Goombaria, EVT_FLOAT(3.0)) + EVT_CALL(SetNpcFlagBits, NPC_Goombaria, NPC_FLAG_100 | NPC_FLAG_GRAVITY, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Goombaria, NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_40, FALSE) + EVT_CALL(EnableNpcShadow, NPC_Goombaria, TRUE) + EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_Walk) + EVT_CALL(SetNpcPos, NPC_Goombaria, 300, 0, 0) + EVT_CALL(NpcMoveTo, NPC_Goombaria, 110, 0, 0) + EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_Stand) + EVT_CALL(InterpNpcYaw, NPC_Goombaria, 90, 1) + EVT_WAIT(10) + EVT_CALL(InterpNpcYaw, NPC_Goombaria, 270, 1) + EVT_WAIT(15) + EVT_CALL(InterpNpcYaw, NPC_Goombaria, 90, 1) + EVT_WAIT(18) + EVT_CALL(InterpNpcYaw, NPC_Goombaria, 270, 1) + EVT_WAIT(10) + EVT_WAIT(6) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 200) + EVT_CALL(SetCamPitch, CAM_DEFAULT, 15, -12) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(GetNpcPos, NPC_Goombaria, LVar3, LVar4, LVar5) + EVT_ADD(LVar3, -20) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar3, LVar4, LVar5) + EVT_WAIT(25) + EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_LeanOver) + EVT_CALL(PlaySoundAtNpc, NPC_Goombaria, SOUND_263, 0) + EVT_CALL(ShowEmote, NPC_Goombaria, EMOTE_QUESTION, 0, 20, TRUE, 0, 0, 0, 0) + EVT_WAIT(25) + EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_Stand) + EVT_CALL(SpeakToPlayer, NPC_Goombaria, ANIM_Goombaria_Talk, ANIM_Goombaria_Stand, 5, MSG_CH0_0004) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, 1) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 0, 0, 0) + EVT_CALL(SetNpcSpeed, NPC_Goombaria, EVT_FLOAT(3.0)) + EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_Run) + EVT_CALL(NpcMoveTo, NPC_Goombaria, 30, -10, 0) + EVT_WAIT(2) + EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_Inspect) + EVT_WAIT(15) + EVT_CALL(SpeakToPlayer, NPC_Goombaria, ANIM_Goombaria_Inspect, ANIM_Goombaria_Inspect, 5, MSG_CH0_0005) + EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_Talk) + EVT_CALL(NpcJump0, NPC_Goombaria, 30, 0, -10, 4) + EVT_WAIT(5) + EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_LeanOver) + EVT_CALL(NpcJump0, NPC_Goombaria, 30, 0, -10, 4) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Goombaria, ANIM_Goombaria_Talk, ANIM_Goombaria_Stand, 5, MSG_CH0_0006) + EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_Run) + EVT_CALL(SetNpcSpeed, NPC_Goombaria, EVT_FLOAT(6.0)) + EVT_CALL(NpcMoveTo, NPC_Goombaria, -30, -5, 0) + EVT_CALL(NpcFacePlayer, NPC_Goombaria, 5) + EVT_CALL(SetNpcJumpscale, NPC_Goombaria, EVT_FLOAT(4.0)) + EVT_CALL(NpcJump0, NPC_Goombaria, -29, 0, 5, 4) + EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_Run) + EVT_CALL(SetNpcSpeed, NPC_Goombaria, EVT_FLOAT(6.0)) + EVT_CALL(NpcMoveTo, NPC_Goombaria, 34, 5, 0) + EVT_CALL(NpcFacePlayer, NPC_Goombaria, 5) + EVT_CALL(SetNpcJumpscale, NPC_Goombaria, EVT_FLOAT(4.0)) + EVT_CALL(NpcJump0, NPC_Goombaria, 33, 0, 5, 4) + EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_Run) + EVT_CALL(SetNpcSpeed, NPC_Goombaria, EVT_FLOAT(6.0)) + EVT_CALL(NpcMoveTo, NPC_Goombaria, -30, 5, 0) + EVT_CALL(NpcFacePlayer, NPC_Goombaria, 5) + EVT_CALL(SetNpcJumpscale, NPC_Goombaria, EVT_FLOAT(4.0)) + EVT_CALL(NpcJump0, NPC_Goombaria, -29, 0, 5, 4) + EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_Run) + EVT_CALL(SetNpcSpeed, NPC_Goombaria, EVT_FLOAT(6.0)) + EVT_CALL(NpcMoveTo, NPC_Goombaria, 34, 5, 0) + EVT_CALL(NpcFacePlayer, NPC_Goombaria, 5) + EVT_CALL(SetNpcJumpscale, NPC_Goombaria, EVT_FLOAT(4.0)) + EVT_CALL(NpcJump0, NPC_Goombaria, 33, 0, 5, 4) + EVT_WAIT(20) + EVT_CALL(SpeakToPlayer, NPC_Goombaria, ANIM_Goombaria_Talk, ANIM_Goombaria_Stand, 5, MSG_CH0_0007) + EVT_WAIT(20) + EVT_THREAD + EVT_CALL(SetNpcSpeed, NPC_Goombaria, EVT_FLOAT(4.0)) + EVT_CALL(NpcMoveTo, NPC_Goombaria, 450, 0, 0) + EVT_END_THREAD + EVT_WAIT(15) + EVT_CALL(SpeakToPlayer, NPC_Goombaria, ANIM_Goombaria_Talk, ANIM_Goombaria_Stand, 5, MSG_CH0_0008) + EVT_WAIT(30) + EVT_SET(GB_StoryProgress, STORY_CH0_WAKE_UP) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(N(func_802405CC_8AC55C)) + EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_02"), kmr_02_ENTRY_5, TRANSITION_10) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kmr/kmr_00/kmr_00_4_npc.c b/src/world/area_kmr/kmr_00/kmr_00_4_npc.c new file mode 100644 index 0000000000..7345c95ca9 --- /dev/null +++ b/src/world/area_kmr/kmr_00/kmr_00_4_npc.c @@ -0,0 +1,386 @@ +#include "kmr_00.h" + +NpcSettings N(NpcSettings_StarSpirit) = { + .height = 26, + .radius = 24, + .level = 99, +}; + +NpcSettings N(NpcSettings_Unused1) = { + .height = 20, + .radius = 20, + .level = 99, +}; + +NpcSettings N(NpcSettings_Unused2) = { + .height = 22, + .radius = 24, + .level = 99, +}; + +NpcSettings N(NpcSettings_Goombaria) = { + .height = 24, + .radius = 24, + .level = 99, +}; + +// initial delay to start bobbing, ensuring star spirits motions are desync'd from one another +s16 N(StarSpiritBobDelays)[] = { + [NPC_Eldstar - 1] 1, + [NPC_Mamar - 1] 3, + [NPC_Skolar - 1] 5, + [NPC_Muskular - 1] 7, + [NPC_Misstar - 1] 7, + [NPC_Klevar - 1] 5, + [NPC_Kalmar - 1] 3, +}; + +API_CALLABLE(N(UpdateStarSpiritBobbing)) { + s32 retVal; + if (isInitialCall) { + script->functionTemp[1] = 0; + script->functionTempPtr[2] = get_npc_safe(script->owner2.npcID); + script->functionTemp[3] = N(StarSpiritBobDelays)[script->owner2.npcID - 1]; + } + if (script->functionTemp[3] == 0) { + Npc* npc = script->functionTempPtr[2]; + npc->verticalRenderOffset = sin_deg(script->functionTempF[1]) * 1.5f; + script->functionTempF[1] = clamp_angle(script->functionTempF[1] + 18.0f); + retVal = ApiStatus_BLOCK; + } else { + script->functionTemp[3]--; + retVal = ApiStatus_BLOCK; + } + return retVal; +} + +EvtScript N(EVS_NpcAux_StarSpirit) = { + EVT_THREAD + EVT_CALL(N(UpdateStarSpiritBobbing)) + EVT_END_THREAD + EVT_CALL(RandInt, 100, LVar0) + EVT_ADD(LVar0, 1) + EVT_WAIT(LVar0) + EVT_MALLOC_ARRAY(1, LVarA) + EVT_USE_ARRAY(LVarA) + EVT_THREAD + EVT_USE_ARRAY(LVarA) + EVT_LABEL(0) + EVT_CALL(RandInt, 90, LVar0) + EVT_ADD(LVar0, 30) + EVT_SETF(ArrayVar(0), EVT_FLOAT(10.0)) + EVT_WAIT(LVar0) + EVT_CALL(RandInt, 100, LVar1) + EVT_IF_LT(LVar1, 80) + EVT_SET(LVar1, 1) + EVT_ELSE + EVT_SET(LVar1, 2) + EVT_END_IF + EVT_LOOP(LVar1) + EVT_SETF(ArrayVar(0), EVT_FLOAT(40.0)) + EVT_WAIT(1) + EVT_SETF(ArrayVar(0), EVT_FLOAT(50.0)) + EVT_WAIT(1) + EVT_SETF(ArrayVar(0), EVT_FLOAT(80.0)) + EVT_WAIT(1) + EVT_SETF(ArrayVar(0), EVT_FLOAT(70.0)) + EVT_WAIT(1) + EVT_SETF(ArrayVar(0), EVT_FLOAT(60.0)) + EVT_WAIT(1) + EVT_SETF(ArrayVar(0), EVT_FLOAT(50.0)) + EVT_WAIT(1) + EVT_END_LOOP + EVT_GOTO(0) + EVT_END_THREAD + EVT_SETF(LVar0, EVT_FLOAT(100.0)) + EVT_LABEL(1) + EVT_LOOP(50) + EVT_ADDF(LVar0, EVT_FLOAT(0.8)) + EVT_CALL(func_802CFD30, -1, 13, 0, ArrayVar(0), MV_Unk_01, LVar0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_LOOP(50) + EVT_ADDF(LVar0, EVT_FLOAT(-0.8)) + EVT_CALL(func_802CFD30, -1, 13, 0, ArrayVar(0), MV_Unk_01, LVar0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_GOTO(1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_StarSpirit) = { + EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) + EVT_CALL(BindNpcAux, NPC_SELF, EVT_PTR(N(EVS_NpcAux_StarSpirit))) + EVT_IF_GE(GB_StoryProgress, STORY_CH0_WAKE_UP) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Goombaria) = { + EVT_IF_GE(GB_StoryProgress, STORY_CH0_WAKE_UP) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_Goombaria) = { + .id = NPC_Goombaria, + .settings = &N(NpcSettings_Goombaria), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, + .init = &N(EVS_NpcInit_Goombaria), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_Goombaria_Idle, + .walk = ANIM_Goombaria_Walk, + .run = ANIM_Goombaria_Run, + .chase = ANIM_Goombaria_Run, + .anim_4 = ANIM_Goombaria_Idle, + .anim_5 = ANIM_Goombaria_Idle, + .death = ANIM_Goombaria_Still, + .hit = ANIM_Goombaria_Still, + .anim_8 = ANIM_Goombaria_Run, + .anim_9 = ANIM_Goombaria_Run, + .anim_A = ANIM_Goombaria_Run, + .anim_B = ANIM_Goombaria_Run, + .anim_C = ANIM_Goombaria_Run, + .anim_D = ANIM_Goombaria_Run, + .anim_E = ANIM_Goombaria_Run, + .anim_F = ANIM_Goombaria_Run, + }, +}; + +StaticNpc N(NpcData_Eldstar)[] = { + { + .id = NPC_Eldstar, + .settings = &N(NpcSettings_StarSpirit), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, + .init = &N(EVS_NpcInit_StarSpirit), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_WorldEldstar_Idle, + .walk = ANIM_WorldEldstar_Idle, + .run = ANIM_WorldEldstar_Idle, + .chase = ANIM_WorldEldstar_Idle, + .anim_4 = ANIM_WorldEldstar_Idle, + .anim_5 = ANIM_WorldEldstar_Idle, + .death = ANIM_WorldEldstar_Idle, + .hit = ANIM_WorldEldstar_Idle, + .anim_8 = ANIM_WorldEldstar_Still, + .anim_9 = ANIM_WorldEldstar_Idle, + .anim_A = ANIM_WorldEldstar_Idle, + .anim_B = ANIM_WorldEldstar_Idle, + .anim_C = ANIM_WorldEldstar_Idle, + .anim_D = ANIM_WorldEldstar_Idle, + .anim_E = ANIM_WorldEldstar_Idle, + .anim_F = ANIM_WorldEldstar_Idle, + }, + }, + { + .id = NPC_Mamar, + .settings = &N(NpcSettings_StarSpirit), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, + .init = &N(EVS_NpcInit_StarSpirit), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_WorldMamar_Idle, + .walk = ANIM_WorldMamar_Idle, + .run = ANIM_WorldMamar_Idle, + .chase = ANIM_WorldMamar_Idle, + .anim_4 = ANIM_WorldMamar_Idle, + .anim_5 = ANIM_WorldMamar_Idle, + .death = ANIM_WorldMamar_Idle, + .hit = ANIM_WorldMamar_Idle, + .anim_8 = ANIM_WorldMamar_Still, + .anim_9 = ANIM_WorldMamar_Idle, + .anim_A = ANIM_WorldMamar_Idle, + .anim_B = ANIM_WorldMamar_Idle, + .anim_C = ANIM_WorldMamar_Idle, + .anim_D = ANIM_WorldMamar_Idle, + .anim_E = ANIM_WorldMamar_Idle, + .anim_F = ANIM_WorldMamar_Idle, + }, + }, + { + .id = NPC_Skolar, + .settings = &N(NpcSettings_StarSpirit), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, + .init = &N(EVS_NpcInit_StarSpirit), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_WorldSkolar_Idle, + .walk = ANIM_WorldSkolar_Idle, + .run = ANIM_WorldSkolar_Idle, + .chase = ANIM_WorldSkolar_Idle, + .anim_4 = ANIM_WorldSkolar_Idle, + .anim_5 = ANIM_WorldSkolar_Idle, + .death = ANIM_WorldSkolar_Idle, + .hit = ANIM_WorldSkolar_Idle, + .anim_8 = ANIM_WorldSkolar_Still, + .anim_9 = ANIM_WorldSkolar_Idle, + .anim_A = ANIM_WorldSkolar_Idle, + .anim_B = ANIM_WorldSkolar_Idle, + .anim_C = ANIM_WorldSkolar_Idle, + .anim_D = ANIM_WorldSkolar_Idle, + .anim_E = ANIM_WorldSkolar_Idle, + .anim_F = ANIM_WorldSkolar_Idle, + }, + }, + { + .id = NPC_Muskular, + .settings = &N(NpcSettings_StarSpirit), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, + .init = &N(EVS_NpcInit_StarSpirit), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_WorldMuskular_Idle, + .walk = ANIM_WorldMuskular_Idle, + .run = ANIM_WorldMuskular_Idle, + .chase = ANIM_WorldMuskular_Idle, + .anim_4 = ANIM_WorldMuskular_Idle, + .anim_5 = ANIM_WorldMuskular_Idle, + .death = ANIM_WorldMuskular_Idle, + .hit = ANIM_WorldMuskular_Idle, + .anim_8 = ANIM_WorldMuskular_Still, + .anim_9 = ANIM_WorldMuskular_Idle, + .anim_A = ANIM_WorldMuskular_Idle, + .anim_B = ANIM_WorldMuskular_Idle, + .anim_C = ANIM_WorldMuskular_Idle, + .anim_D = ANIM_WorldMuskular_Idle, + .anim_E = ANIM_WorldMuskular_Idle, + .anim_F = ANIM_WorldMuskular_Idle, + }, + }, + { + .id = NPC_Misstar, + .settings = &N(NpcSettings_StarSpirit), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, + .init = &N(EVS_NpcInit_StarSpirit), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_WorldMisstar_Idle, + .walk = ANIM_WorldMisstar_Idle, + .run = ANIM_WorldMisstar_Idle, + .chase = ANIM_WorldMisstar_Idle, + .anim_4 = ANIM_WorldMisstar_Idle, + .anim_5 = ANIM_WorldMisstar_Idle, + .death = ANIM_WorldMisstar_Idle, + .hit = ANIM_WorldMisstar_Idle, + .anim_8 = ANIM_WorldMisstar_Still, + .anim_9 = ANIM_WorldMisstar_Idle, + .anim_A = ANIM_WorldMisstar_Idle, + .anim_B = ANIM_WorldMisstar_Idle, + .anim_C = ANIM_WorldMisstar_Idle, + .anim_D = ANIM_WorldMisstar_Idle, + .anim_E = ANIM_WorldMisstar_Idle, + .anim_F = ANIM_WorldMisstar_Idle, + }, + }, + { + .id = NPC_Klevar, + .settings = &N(NpcSettings_StarSpirit), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, + .init = &N(EVS_NpcInit_StarSpirit), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_WorldKlevar_Idle, + .walk = ANIM_WorldKlevar_Idle, + .run = ANIM_WorldKlevar_Idle, + .chase = ANIM_WorldKlevar_Idle, + .anim_4 = ANIM_WorldKlevar_Idle, + .anim_5 = ANIM_WorldKlevar_Idle, + .death = ANIM_WorldKlevar_Idle, + .hit = ANIM_WorldKlevar_Idle, + .anim_8 = ANIM_WorldKlevar_Still, + .anim_9 = ANIM_WorldKlevar_Idle, + .anim_A = ANIM_WorldKlevar_Idle, + .anim_B = ANIM_WorldKlevar_Idle, + .anim_C = ANIM_WorldKlevar_Idle, + .anim_D = ANIM_WorldKlevar_Idle, + .anim_E = ANIM_WorldKlevar_Idle, + .anim_F = ANIM_WorldKlevar_Idle, + }, + }, + { + .id = NPC_Kalmar, + .settings = &N(NpcSettings_StarSpirit), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, + .init = &N(EVS_NpcInit_StarSpirit), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_WorldKalmar_Idle, + .walk = ANIM_WorldKalmar_Idle, + .run = ANIM_WorldKalmar_Idle, + .chase = ANIM_WorldKalmar_Idle, + .anim_4 = ANIM_WorldKalmar_Idle, + .anim_5 = ANIM_WorldKalmar_Idle, + .death = ANIM_WorldKalmar_Idle, + .hit = ANIM_WorldKalmar_Idle, + .anim_8 = ANIM_WorldKalmar_Still, + .anim_9 = ANIM_WorldKalmar_Idle, + .anim_A = ANIM_WorldKalmar_Idle, + .anim_B = ANIM_WorldKalmar_Idle, + .anim_C = ANIM_WorldKalmar_Idle, + .anim_D = ANIM_WorldKalmar_Idle, + .anim_E = ANIM_WorldKalmar_Idle, + .anim_F = ANIM_WorldKalmar_Idle, + }, + }, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Goombaria)), + NPC_GROUP(N(NpcData_Eldstar)), + {} +}; diff --git a/src/world/area_kmr/kmr_00/kmr_00_5_entity.c b/src/world/area_kmr/kmr_00/kmr_00_5_entity.c new file mode 100644 index 0000000000..46e67db29b --- /dev/null +++ b/src/world/area_kmr/kmr_00/kmr_00_5_entity.c @@ -0,0 +1,9 @@ +#include "kmr_00.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenPanel), 0, 0, 0, 0, MODEL_ji_3, MAKE_ENTITY_END) + EVT_CALL(AssignPanelFlag, GF_KMR00_HiddenPanel) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kmr/kmr_03/8C7F90.c b/src/world/area_kmr/kmr_03/8C7F90.c deleted file mode 100644 index 96f2696296..0000000000 --- a/src/world/area_kmr/kmr_03/8C7F90.c +++ /dev/null @@ -1,27 +0,0 @@ -#include "kmr_03.h" -#include "message_ids.h" -#include "../../partners.h" - -#include "world/common/util/ChangeNpcToPartner.inc.c" - -#include "world/common/todo/CheckPartnerFlags1000.inc.c" - -EntryList N(entryList) = { - { -340.0f, 0.0f, 348.0f, 48.0f }, - { 480.0f, 0.0f, 0.0f, 270.0f }, - { -310.0f, 20.0f, -80.0f, 135.0f }, -}; - -MapSettings N(settings) = { - .main = &N(main), - .entryList = &N(entryList), - .entryCount = ENTRY_COUNT(N(entryList)), - .background = &gBackgroundImage, - .tattle = { MSG_MapTattle_kmr_03 }, -}; - -EvtScript N(802406C0) = { - EVT_CALL(SetMusicTrack, 0, SONG_PLEASANT_PATH, 0, 8) - EVT_RETURN - EVT_END -}; diff --git a/src/world/area_kmr/kmr_03/8C8140.c b/src/world/area_kmr/kmr_03/8C8140.c deleted file mode 100644 index 2523b79645..0000000000 --- a/src/world/area_kmr/kmr_03/8C8140.c +++ /dev/null @@ -1,302 +0,0 @@ -#include "kmr_03.h" -#include "sprite/npc/Goompa.h" -#include "entity.h" - -enum { - NPC_GOOMPA, -}; - -ApiStatus N(func_802401B0_8C8140)(Evt* script, s32 isInitialCall) { - Npc* npc = get_npc_unsafe(0); - - script->varTable[1] = get_xz_dist_to_player(npc->pos.x, npc->pos.z) / npc->moveSpeed * 0.8f; - return ApiStatus_DONE2; -} - -#include "world/common/todo/UnkPositionFunc.inc.c" - -EvtScript N(exitWalk_802406F0) = EVT_EXIT_WALK(60, 0, "kmr_04", 0); - -EvtScript N(exitWalk_8024074C) = EVT_EXIT_WALK(60, 1, "kmr_05", 0); - -EvtScript N(802407A8) = { - EVT_BIND_TRIGGER(N(exitWalk_802406F0), TRIGGER_FLOOR_ABOVE, 3, 1, 0) - EVT_BIND_TRIGGER(N(exitWalk_8024074C), TRIGGER_FLOOR_ABOVE, 5, 1, 0) - EVT_RETURN - EVT_END -}; - -EvtScript N(main) = { - EVT_SET(GB_WorldLocation, 30) - EVT_CALL(SetSpriteShading, -1) - EVT_CALL(SetCamPerspective, 0, 3, 25, 16, 4096) - EVT_CALL(SetCamBGColor, 0, 0, 0, 0) - EVT_CALL(SetCamEnabled, 0, 1) - EVT_CALL(SetCamLeadPlayer, 0, 0) - EVT_SET(AreaFlag(8), 0) - EVT_CALL(MakeNpcs, 0, EVT_PTR(N(npcGroupList_80241450))) - EVT_CALL(ClearDefeatedEnemies) - EVT_EXEC_WAIT(N(makeEntities)) - EVT_EXEC_WAIT(N(802422B8)) - EVT_EXEC(N(802406C0)) - EVT_CALL(GetEntryID, LVar0) - EVT_IF_NE(LVar0, 2) - EVT_SET(LVar0, EVT_PTR(N(802407A8))) - EVT_EXEC(EnterWalk) - EVT_ELSE - EVT_EXEC(N(802407A8)) - EVT_EXEC(N(80242340)) - EVT_END_IF - EVT_WAIT(1) - EVT_RETURN - EVT_END -}; - -static s32 N(pad_948)[] = { - 0x00000000, 0x00000000, -}; - -NpcSettings N(npcSettings_80240950) = { - .height = 22, - .radius = 24, - .level = 99, - .actionFlags = 16, -}; - -EvtScript N(8024097C) = { - EVT_LABEL(1) - EVT_IF_EQ(AreaFlag(8), 1) - EVT_LABEL(100) - EVT_CALL(AwaitPlayerLeave, 294, 123, 170) - EVT_CALL(EnableNpcAI, 0, 0) - EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(SetNpcSpeed, 0, EVT_FLOAT(4.0)) - EVT_CALL(SetNpcAnimation, 0, ANIM_Goompa_Run) - EVT_CALL(N(func_802401B0_8C8140)) - EVT_CALL(GetAngleToPlayer, 0, LVar2) - EVT_LOOP(LVar1) - EVT_CALL(GetNpcPos, 0, LVar7, LVar8, LVar9) - EVT_CALL(AddVectorPolar, LVar7, LVar9, EVT_FLOAT(4.0), LVar2) - EVT_CALL(SetNpcPos, 0, LVar7, LVar8, LVar9) - EVT_WAIT(1) - EVT_END_LOOP - EVT_CALL(PlayerFaceNpc, 0, 3) - EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) - EVT_CALL(PlayerMoveTo, 243, 243, 0) - EVT_CALL(SetNpcVar, 0, 0, 1) - EVT_CALL(EnableNpcAI, 0, 1) - EVT_CALL(DisablePlayerInput, FALSE) - EVT_GOTO(100) - EVT_END_IF - EVT_WAIT(1) - EVT_GOTO(1) - EVT_RETURN - EVT_END -}; - -EvtScript N(npcAI_80240B50) = { - EVT_LABEL(1) - EVT_SWITCH(GB_StoryProgress) - EVT_CASE_EQ(-122) - EVT_LABEL(89) - EVT_CALL(N(UnkPositionFunc), -118, 86, -70, -15) - EVT_WAIT(1) - EVT_IF_EQ(LVar0, 0) - EVT_GOTO(89) - EVT_END_IF - EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(SetNpcAux, 0, 0) - EVT_CALL(PlaySoundAtNpc, 0, SOUND_262, 0) - EVT_CALL(ShowEmote, 0, EMOTE_EXCLAMATION, 45, 15, 1, 0, 0, 0, 0) - EVT_WAIT(15) - EVT_CALL(NpcFacePlayer, NPC_SELF, 5) - EVT_WAIT(10) - EVT_CALL(SpeakToPlayer, 0, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_00A6) - EVT_CALL(UseSettingsFrom, 0, -220, 20, -72) - EVT_CALL(SetPanTarget, 0, -20, 0, 68) - EVT_CALL(SetCamPitch, 0, EVT_FLOAT(15.0), EVT_FLOAT(-8.5)) - EVT_CALL(SetCamDistance, 0, 275) - EVT_CALL(SetCamSpeed, 0, EVT_FLOAT(1.5)) - EVT_CALL(PanToTarget, 0, 0, 1) - EVT_THREAD - EVT_WAIT(20) - EVT_CALL(SetPlayerSpeed, EVT_FLOAT(2.0)) - EVT_CALL(PlayerMoveTo, -38, 68, 0) - EVT_END_THREAD - EVT_CALL(GetNpcPos, 0, LVar7, LVar8, LVar9) - EVT_CALL(SetNpcSpeed, 0, EVT_FLOAT(4.0)) - EVT_CALL(SetNpcAnimation, 0, ANIM_Goompa_Run) - EVT_CALL(NpcMoveTo, 0, 0, 70, 0) - EVT_CALL(SetNpcAnimation, 0, ANIM_Goompa_Idle) - EVT_CALL(InterpNpcYaw, 0, 276, 20) - EVT_WAIT(30) - EVT_CALL(SpeakToPlayer, 0, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_00A7) - EVT_WAIT(5) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007) - EVT_WAIT(30) - EVT_CALL(SpeakToPlayer, 0, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_00A8) - EVT_CALL(N(ChangeNpcToPartner), 0, 5) - EVT_SET(GB_StoryProgress, -121) - EVT_CALL(UseSettingsFrom, 0, -220, 20, -72) - EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) - EVT_CALL(SetPanTarget, 0, LVar0, LVar1, LVar2) - EVT_CALL(SetCamSpeed, 0, EVT_FLOAT(3.0)) - EVT_CALL(PanToTarget, 0, 0, 1) - EVT_CALL(WaitForCam, 0, EVT_FLOAT(1.0)) - EVT_CALL(PanToTarget, 0, 0, 0) - EVT_CALL(EnablePartnerAI) - EVT_CALL(DisablePlayerInput, FALSE) - EVT_WAIT(1) - EVT_END_SWITCH - EVT_RETURN - EVT_END -}; - -EvtScript N(hit_80240F64) = { - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Goompa_Injured) - EVT_WAIT(10) - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Goompa_Idle) - EVT_ADD(MapVar(0), 1) - EVT_IF_LT(MapVar(0), 3) - EVT_CALL(GetOwnerEncounterTrigger, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_EQ(2) - EVT_CALL(SetNpcVar, 0, 0, 1) - EVT_IF_EQ(AreaFlag(6), 1) - EVT_ELSE - EVT_SET(AreaFlag(6), 1) - EVT_SET(AreaFlag(7), 0) - EVT_END_IF - EVT_CASE_EQ(4) - EVT_CALL(SetNpcVar, 0, 0, 1) - EVT_IF_EQ(AreaFlag(7), 1) - EVT_ELSE - EVT_SET(AreaFlag(6), 0) - EVT_SET(AreaFlag(7), 1) - EVT_END_IF - EVT_END_SWITCH - EVT_WAIT(10) - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Goompa_Run) - EVT_ELSE - EVT_WAIT(10) - EVT_CALL(GetNpcPos, 0, LVar0, LVar1, LVar2) - EVT_CALL(SetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, ((NPC_FLAG_GRAVITY)), TRUE) - EVT_CALL(SetNpcPos, 0, 0, -1000, 0) - EVT_CALL(SetNpcFlagBits, 0, ((NPC_FLAG_100)), FALSE) - EVT_CALL(EnablePartnerAI) - EVT_CALL(SetNpcAux, NPC_SELF, EVT_PTR(N(8024097C))) - EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(npcAI_80240B50))) - EVT_END_IF - EVT_RETURN - EVT_END -}; - -EvtScript N(init_802411A8) = { - EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(npcAI_80240B50))) - EVT_CALL(BindNpcAux, -1, EVT_PTR(N(8024097C))) - EVT_CALL(BindNpcHit, -1, EVT_PTR(N(hit_80240F64))) - EVT_SWITCH(GB_StoryProgress) - EVT_CASE_GE(-121) - EVT_CALL(SetNpcFlagBits, NPC_SELF, ((NPC_FLAG_GRAVITY)), FALSE) - EVT_CALL(SetNpcFlagBits, NPC_SELF, ((NPC_FLAG_ENABLE_HIT_SCRIPT)), TRUE) - EVT_CALL(SetNpcPos, NPC_SELF, 0, -1000, 0) - EVT_END_SWITCH - EVT_RETURN - EVT_END -}; - -StaticNpc N(npcGroup_80241260) = { - .id = NPC_GOOMPA, - .settings = &N(npcSettings_80240950), - .pos = { -50.0f, 0.0f, 80.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_400000, - .init = &N(init_802411A8), - .yaw = 45, - .drops = { - .dropFlags = NPC_DROP_FLAGS_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, - .animations = { - ANIM_Goompa_Idle, - ANIM_Goompa_Walk, - ANIM_Goompa_Run, - ANIM_Goompa_Run, - ANIM_Goompa_Idle, - ANIM_Goompa_Idle, - ANIM_Goompa_Still, - ANIM_Goompa_Still, - ANIM_Goompa_Run, - ANIM_Goompa_Run, - ANIM_Goompa_Run, - ANIM_Goompa_Run, - ANIM_Goompa_Run, - ANIM_Goompa_Run, - ANIM_Goompa_Run, - ANIM_Goompa_Run, - }, - .tattle = MSG_NpcTattle_Goompa, -}; - -NpcGroupList N(npcGroupList_80241450) = { - NPC_GROUP(N(npcGroup_80241260), 0x0002, BTL_DEFAULT_STAGE), - {}, -}; - -static s32 N(pad_1468)[] = { - 0x00000000, 0x00000000, -}; - -EvtScript N(80241470) = { - EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 9, 0x7FFFFE00) - EVT_SET(GB_StoryProgress, -117) - EVT_RETURN - EVT_END -}; - -EvtScript N(802414A8) = { - EVT_SET(GF_KMR03_Hammer1Block, 1) - EVT_RETURN - EVT_END -}; - -EvtScript N(802414C8) = { - EVT_LABEL(0) - EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) - EVT_CALL(SetCamTarget, 0, LVar0, LVar1, LVar2) - EVT_WAIT(1) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -EvtScript N(makeEntities) = { - EVT_IF_LT(GB_StoryProgress, -117) - EVT_CALL(MakeEntity, EVT_PTR(Entity_Hammer1Block), 45, 0, 70, 15, MAKE_ENTITY_END) - EVT_CALL(AssignScript, EVT_PTR(N(80241470))) - EVT_ELSE - EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 9, 0x7FFFFE00) - EVT_END_IF - EVT_IF_EQ(GF_KMR03_Hammer1Block, 0) - EVT_CALL(MakeEntity, EVT_PTR(Entity_Hammer2Block), 230, 0, 310, 15, MAKE_ENTITY_END) - EVT_CALL(AssignScript, EVT_PTR(N(802414A8))) - EVT_END_IF - EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenYellowBlock), 230, 60, 310, 15, 151, MAKE_ENTITY_END) - EVT_CALL(AssignBlockFlag, GF_KMR03_HiddenItem_RepelGel) - EVT_CALL(MakeEntity, EVT_PTR(Entity_BrickBlock), 230, 50, -160, 15, MAKE_ENTITY_END) - EVT_CALL(MakeEntity, EVT_PTR(Entity_BrickBlock), 165, 0, 380, 20, MAKE_ENTITY_END) - EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), -170, 0, 370, 43, 343, MAKE_ENTITY_END) - EVT_CALL(AssignBlockFlag, GF_KMR03_ItemBlock_Coin) - EVT_CALL(MakeEntity, EVT_PTR(Entity_SimpleSpring), 345, 75, -250, 0, 100, MAKE_ENTITY_END) - EVT_CALL(MakeItemEntity, ITEM_COIN, 345, 205, -250, 17, GF_KMR03_Item_CoinA) - EVT_CALL(MakeItemEntity, ITEM_COIN, 345, 230, -250, 17, GF_KMR03_Item_CoinB) - EVT_CALL(MakeItemEntity, ITEM_COIN, 345, 255, -250, 17, GF_KMR03_Item_CoinC) - EVT_CALL(MakeItemEntity, ITEM_COIN, 345, 280, -250, 17, GF_KMR03_Item_CoinD) - EVT_CALL(MakeItemEntity, ITEM_FIRE_FLOWER, 229, 250, -156, 17, GF_KMR02_Item_FireFlower) - EVT_CALL(MakeEntity, &Entity_HiddenPanel, 300, 0, 150, 0, 18, MAKE_ENTITY_END) - EVT_CALL(AssignPanelFlag, GF_KMR03_HiddenPanel) - EVT_CALL(MakeEntity, EVT_PTR(Entity_HeartBlock), 130, 60, 0, 0, MAKE_ENTITY_END) - EVT_RETURN - EVT_END -}; diff --git a/src/world/area_kmr/kmr_03/8C82B0.c b/src/world/area_kmr/kmr_03/8C82B0.c deleted file mode 100644 index db2ff7f477..0000000000 --- a/src/world/area_kmr/kmr_03/8C82B0.c +++ /dev/null @@ -1,17 +0,0 @@ -#include "kmr_03.h" - -#include "world/common/todo/UnsetCamera0MoveFlag1.inc.c" - -#include "world/common/todo/SetCamera0MoveFlag1.inc.c" - -ApiStatus func_80240358_8C82E8(Evt* script, s32 isInitialCall) { - PlayerStatus* playerStatus = &gPlayerStatus; - - f32 xDelta = playerStatus->currentSpeed * 5.0f * sin_deg(playerStatus->targetYaw); - f32 zDelta = playerStatus->currentSpeed * 5.0f * -cos_deg(playerStatus->targetYaw); - - script->varTable[0] = playerStatus->position.x + xDelta; - script->varTable[1] = playerStatus->position.z + zDelta; - - return ApiStatus_DONE2; -} diff --git a/src/world/area_kmr/kmr_03/8C83A0.c b/src/world/area_kmr/kmr_03/8C83A0.c deleted file mode 100644 index e4bfd7ad8a..0000000000 --- a/src/world/area_kmr/kmr_03/8C83A0.c +++ /dev/null @@ -1,77 +0,0 @@ -#include "kmr_03.h" - -#include "common/foliage.inc.c" - -FoliageModelList N(treeModelList_Bush1_Bush) = { - .count = 1, - .models = { 64 }, -}; - -FoliageVectorList N(treeEffectVectors_Bush1) = { - .count = 1, - .vectors = { - { 143, 16, 462 }, - }, -}; - -SearchBushConfig N(bush1) = { - .bush = &N(treeModelList_Bush1_Bush), - .vectors = &N(treeEffectVectors_Bush1), -}; - -FoliageModelList N(treeModelList_Tree1_Leaves) = { - .count = 1, - .models = { 62 }, -}; - -FoliageModelList N(treeModelList_Tree1_Trunk) = { - .count = 1, - .models = { 61 }, -}; - -FoliageVectorList N(treeEffectVectors_Tree1) = { - .count = 2, - .vectors = { - { -80, 130, 18 }, - { 28, 130, 39 }, - }, -}; - -EvtScript N(tree1_Callback) = { - EVT_IF_EQ(GF_KMR03_Tree1_Mushroom, 1) - EVT_RETURN - EVT_END_IF - EVT_IF_EQ(MapFlag(10), 1) - EVT_RETURN - EVT_END_IF - EVT_WAIT(10) - EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) - EVT_IF_LT(LVar0, -30) - EVT_CALL(MakeItemEntity, ITEM_MUSHROOM, -23, 100, 35, 13, GF_KMR03_Tree1_Mushroom) - EVT_ELSE - EVT_CALL(MakeItemEntity, ITEM_MUSHROOM, -85, 100, 16, 13, GF_KMR03_Tree1_Mushroom) - EVT_END_IF - EVT_SET(MapFlag(10), 1) - EVT_RETURN - EVT_END -}; - -ShakeTreeConfig N(tree1) = { - .leaves = &N(treeModelList_Tree1_Leaves), - .trunk = &N(treeModelList_Tree1_Trunk), - .vectors = &N(treeEffectVectors_Tree1), - .callback = &N(tree1_Callback), -}; - -Vec4f N(tree1Point) = { -42.0f, 0.0f, -13.0f, 0.0f }; - -EvtScript N(802422B8) = { - EVT_SET(LVar0, EVT_PTR(N(bush1))) - EVT_BIND_TRIGGER(N(searchBush), TRIGGER_WALL_PRESS_A, 53, 1, 0) - EVT_SET(LVar0, EVT_PTR(N(tree1))) - EVT_BIND_TRIGGER(N(shakeTree), TRIGGER_WALL_HAMMER, 52, 1, 0) - EVT_BIND_TRIGGER(N(shakeTree), TRIGGER_POINT_BOMB, EVT_PTR(N(tree1Point)), 1, 0) - EVT_RETURN - EVT_END -}; - diff --git a/src/world/area_kmr/kmr_03/8C85E0.c b/src/world/area_kmr/kmr_03/8C85E0.c deleted file mode 100644 index 02c3b07c71..0000000000 --- a/src/world/area_kmr/kmr_03/8C85E0.c +++ /dev/null @@ -1,88 +0,0 @@ -#include "kmr_03.h" - -EvtScript N(80242340) = { - EVT_CALL(UseSettingsFrom, 0, -270, 20, -80) - EVT_CALL(SetPanTarget, 0, -270, 20, -80) - EVT_CALL(SetCamDistance, 0, EVT_FLOAT(700.0)) - EVT_CALL(SetCamSpeed, 0, EVT_FLOAT(90.0)) - EVT_CALL(PanToTarget, 0, 0, 1) - EVT_IF_GE(GB_StoryProgress, -119) - EVT_CALL(SetPlayerPos, 0, -1000, 0) - EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(SetPlayerPos, -224, 20, -80) - EVT_CALL(SetNpcPos, NPC_PARTNER, -224, 20, -80) - EVT_WAIT(20) - EVT_CALL(SetCamSpeed, 0, EVT_FLOAT(3.0)) - EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) - EVT_CALL(UseSettingsFrom, 0, LVar0, LVar1, LVar2) - EVT_CALL(SetPanTarget, 0, LVar0, LVar1, LVar2) - EVT_CALL(PanToTarget, 0, 0, 1) - EVT_CALL(WaitForCam, 0, EVT_FLOAT(1.0)) - EVT_CALL(PanToTarget, 0, 0, 0) - EVT_CALL(DisablePlayerInput, FALSE) - EVT_RETURN - EVT_END_IF - EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(DisablePlayerPhysics, TRUE) - EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) - EVT_CALL(SetPlayerPos, LVar0, -1000, LVar2) - EVT_WAIT(30) - EVT_CALL(SetCamDistance, 0, 220) - EVT_CALL(SetCamSpeed, 0, EVT_FLOAT(1.0)) - EVT_CALL(PanToTarget, 0, 0, 1) - EVT_CALL(WaitForCam, 0, EVT_FLOAT(1.0)) - EVT_THREAD - EVT_WAIT(18) - EVT_CALL(PlaySoundAtPlayer, 373, 0) - EVT_WAIT(30) - EVT_CALL(PlaySoundAtPlayer, 374, 0) - EVT_WAIT(28) - EVT_CALL(PlaySoundAtPlayer, 373, 0) - EVT_END_THREAD - EVT_CALL(HidePlayerShadow, TRUE) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) - EVT_CALL(SetPlayerPos, -224, 120, -80) - EVT_CALL(InterpPlayerYaw, 90, 0) - EVT_LABEL(0) - EVT_WAIT(1) - EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) - EVT_ADD(LVar1, -2) - EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) - EVT_IF_GT(LVar1, 86) - EVT_GOTO(0) - EVT_END_IF - EVT_CALL(SetPlayerPos, -310, 20, -80) - EVT_THREAD - EVT_WAIT(20) - EVT_CALL(SetPanTarget, 0, -310, 20, -80) - EVT_CALL(SetCamSpeed, 0, EVT_FLOAT(0.2)) - EVT_CALL(PanToTarget, 0, 0, 1) - EVT_END_THREAD - EVT_CALL(func_802D286C, 10240) - EVT_CALL(func_802D2520, ANIM_Mario_10002, 5, 5, 1, 1, 0) - EVT_WAIT(100) - EVT_CALL(WaitForCam, 0, EVT_FLOAT(1.0)) - EVT_CALL(func_802D2520, ANIM_Mario_10002, 0, 0, 0, 0, 0) - EVT_CALL(HidePlayerShadow, FALSE) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_BeforeJump) - EVT_WAIT(10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_AnimMidairStill) - EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) - EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) - EVT_CALL(PlayerJump, LVar0, LVar1, LVar2, 10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) - EVT_THREAD - EVT_CALL(SetCamSpeed, 0, EVT_FLOAT(3.0)) - EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) - EVT_CALL(UseSettingsFrom, 0, LVar0, LVar1, LVar2) - EVT_CALL(SetPanTarget, 0, LVar0, LVar1, LVar2) - EVT_CALL(PanToTarget, 0, 0, 1) - EVT_CALL(WaitForCam, 0, EVT_FLOAT(1.0)) - EVT_CALL(PanToTarget, 0, 0, 0) - EVT_END_THREAD - EVT_WAIT(30) - EVT_CALL(DisablePlayerPhysics, FALSE) - EVT_CALL(DisablePlayerInput, FALSE) - EVT_RETURN - EVT_END -}; diff --git a/src/world/area_kmr/kmr_03/kmr_03.h b/src/world/area_kmr/kmr_03/kmr_03.h index 9b9f214dc0..772e42b4cb 100644 --- a/src/world/area_kmr/kmr_03/kmr_03.h +++ b/src/world/area_kmr/kmr_03/kmr_03.h @@ -2,20 +2,32 @@ /// @brief Goomba Region - Bottom of the Cliff #include "common.h" -#include "../kmr.h" #include "message_ids.h" #include "map.h" + #include "../kmr.h" +#include "mapfs/kmr_03_shape.h" +#include "mapfs/kmr_03_hit.h" + +#include "sprite/npc/Goompa.h" + +enum { + NPC_Goompa = 0, +}; + +enum { + MV_Unk_00 = MapVar(0), +}; + +enum { + MF_Unk_0A = MapFlag(10), +}; #define NAMESPACE kmr_03 -ApiStatus N(UnkPositionFunc)(Evt* script, s32 isInitialCall); -ApiStatus N(ChangeNpcToPartner)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802401B0_8C8140)(Evt* script, s32 isInitialCall); - -extern NpcGroupList N(npcGroupList_80241450); -extern EvtScript N(802422B8); -extern EvtScript N(80242340); -extern EvtScript N(802406C0); -extern EvtScript N(main); -extern EvtScript N(makeEntities); +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupFoliage); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_MakeEntities); +extern EvtScript N(EVS_Scene_FallingDown); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_kmr/kmr_03/kmr_03_0_header.c b/src/world/area_kmr/kmr_03/kmr_03_0_header.c new file mode 100644 index 0000000000..859aaa6223 --- /dev/null +++ b/src/world/area_kmr/kmr_03/kmr_03_0_header.c @@ -0,0 +1,15 @@ +#include "kmr_03.h" + +EntryList N(Entrances) = { + [kmr_03_ENTRY_0] { -340.0, 0.0, 348.0, 48.0 }, + [kmr_03_ENTRY_1] { 480.0, 0.0, 0.0, 270.0 }, + [kmr_03_ENTRY_2] { -310.0, 20.0, -80.0, 135.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_kmr_03 }, +}; diff --git a/src/world/area_kmr/kmr_03/kmr_03_1_music.c b/src/world/area_kmr/kmr_03/kmr_03_1_music.c new file mode 100644 index 0000000000..605b440140 --- /dev/null +++ b/src/world/area_kmr/kmr_03/kmr_03_1_music.c @@ -0,0 +1,7 @@ +#include "kmr_03.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_PLEASANT_PATH, 0, 8) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kmr/kmr_03/kmr_03_2_main.c b/src/world/area_kmr/kmr_03/kmr_03_2_main.c new file mode 100644 index 0000000000..973b3232b5 --- /dev/null +++ b/src/world/area_kmr/kmr_03/kmr_03_2_main.c @@ -0,0 +1,34 @@ +#include "kmr_03.h" + +EvtScript N(EVS_ExitWalk_kmr_04_0) = EVT_EXIT_WALK(60, kmr_03_ENTRY_0, "kmr_04", kmr_04_ENTRY_0); +EvtScript N(EVS_ExitWalk_kmr_05_0) = EVT_EXIT_WALK(60, kmr_03_ENTRY_1, "kmr_05", kmr_05_ENTRY_0); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kmr_04_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deili1, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kmr_05_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deili2, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_GOOMBA_VILLAGE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_SET(AF_KMR_08, FALSE) + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_CALL(ClearDefeatedEnemies) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC_WAIT(N(EVS_SetupFoliage)) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_CALL(GetEntryID, LVar0) + EVT_IF_NE(LVar0, kmr_03_ENTRY_2) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_ELSE + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_EXEC(N(EVS_Scene_FallingDown)) + EVT_END_IF + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kmr/kmr_03/kmr_03_3_npc.c b/src/world/area_kmr/kmr_03/kmr_03_3_npc.c new file mode 100644 index 0000000000..cd48080cd3 --- /dev/null +++ b/src/world/area_kmr/kmr_03/kmr_03_3_npc.c @@ -0,0 +1,202 @@ +#include "kmr_03.h" + +#include "world/common/util/ChangeNpcToPartner.inc.c" + +#include "world/common/todo/CheckPartnerFlags1000.inc.c" + +API_CALLABLE(N(func_802401B0_8C8140)) { + Npc* npc = get_npc_unsafe(0); + + script->varTable[1] = get_xz_dist_to_player(npc->pos.x, npc->pos.z) / npc->moveSpeed * 0.8f; + return ApiStatus_DONE2; +} + +#include "world/common/todo/UnkPositionFunc.inc.c" + +NpcSettings N(NpcSettings_Goompa) = { + .height = 22, + .radius = 24, + .level = 99, + .actionFlags = AI_ACTION_LOOK_AROUND_DURING_LOITER, +}; + +EvtScript N(EVS_NpcAux_Goompa) = { + EVT_LABEL(1) + EVT_IF_EQ(AF_KMR_08, TRUE) + EVT_LABEL(100) + EVT_CALL(AwaitPlayerLeave, 294, 123, 170) + EVT_CALL(EnableNpcAI, NPC_Goompa, FALSE) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(SetNpcSpeed, NPC_Goompa, EVT_FLOAT(4.0)) + EVT_CALL(SetNpcAnimation, NPC_Goompa, ANIM_Goompa_Run) + EVT_CALL(N(func_802401B0_8C8140)) + EVT_CALL(GetAngleToPlayer, NPC_Goompa, LVar2) + EVT_LOOP(LVar1) + EVT_CALL(GetNpcPos, NPC_Goompa, LVar7, LVar8, LVar9) + EVT_CALL(AddVectorPolar, LVar7, LVar9, EVT_FLOAT(4.0), LVar2) + EVT_CALL(SetNpcPos, NPC_Goompa, LVar7, LVar8, LVar9) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(PlayerFaceNpc, NPC_Goompa, 3) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) + EVT_CALL(PlayerMoveTo, 243, 243, 0) + EVT_CALL(SetNpcVar, NPC_Goompa, 0, 1) + EVT_CALL(EnableNpcAI, NPC_Goompa, TRUE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_GOTO(100) + EVT_END_IF + EVT_WAIT(1) + EVT_GOTO(1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcAI_Goompa) = { + EVT_LABEL(1) + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_EQ(STORY_CH0_FELL_OFF_CLIFF) + EVT_LABEL(89) + EVT_CALL(N(UnkPositionFunc), -118, 86, -70, -15) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 0) + EVT_GOTO(89) + EVT_END_IF + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(SetNpcAux, NPC_Goompa, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Goompa, SOUND_262, 0) + EVT_CALL(ShowEmote, NPC_Goompa, EMOTE_EXCLAMATION, 45, 15, TRUE, 0, 0, 0, 0) + EVT_WAIT(15) + EVT_CALL(NpcFacePlayer, NPC_SELF, 5) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Goompa, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_00A6) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -220, 20, -72) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -20, 0, 68) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(15.0), EVT_FLOAT(-8.5)) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 275) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.5)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_THREAD + EVT_WAIT(20) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(2.0)) + EVT_CALL(PlayerMoveTo, -38, 68, 0) + EVT_END_THREAD + EVT_CALL(GetNpcPos, NPC_Goompa, LVar7, LVar8, LVar9) + EVT_CALL(SetNpcSpeed, NPC_Goompa, EVT_FLOAT(4.0)) + EVT_CALL(SetNpcAnimation, NPC_Goompa, ANIM_Goompa_Run) + EVT_CALL(NpcMoveTo, NPC_Goompa, 0, 70, 0) + EVT_CALL(SetNpcAnimation, NPC_Goompa, ANIM_Goompa_Idle) + EVT_CALL(InterpNpcYaw, NPC_Goompa, 276, 20) + EVT_WAIT(30) + EVT_CALL(SpeakToPlayer, NPC_Goompa, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_00A7) + EVT_WAIT(5) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007) + EVT_WAIT(30) + EVT_CALL(SpeakToPlayer, NPC_Goompa, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_00A8) + EVT_CALL(N(ChangeNpcToPartner), 0, 5) + EVT_SET(GB_StoryProgress, STORY_CH0_GOOMPA_JOINED_PARTY) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -220, 20, -72) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(EnablePartnerAI) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_WAIT(1) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcHit_Goompa) = { + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Goompa_Injured) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Goompa_Idle) + EVT_ADD(MV_Unk_00, 1) + EVT_IF_LT(MV_Unk_00, 3) + EVT_CALL(GetOwnerEncounterTrigger, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(ENCOUNTER_TRIGGER_JUMP) + EVT_CALL(SetNpcVar, NPC_Goompa, 0, 1) + EVT_IF_EQ(AF_KMR_06, TRUE) + EVT_ELSE + EVT_SET(AF_KMR_06, TRUE) + EVT_SET(AF_KMR_07, FALSE) + EVT_END_IF + EVT_CASE_EQ(ENCOUNTER_TRIGGER_HAMMER) + EVT_CALL(SetNpcVar, NPC_Goompa, 0, 1) + EVT_IF_EQ(AF_KMR_07, TRUE) + EVT_ELSE + EVT_SET(AF_KMR_06, FALSE) + EVT_SET(AF_KMR_07, TRUE) + EVT_END_IF + EVT_END_SWITCH + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Goompa_Run) + EVT_ELSE + EVT_WAIT(10) + EVT_CALL(GetNpcPos, NPC_Goompa, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, TRUE) + EVT_CALL(SetNpcPos, NPC_Goompa, NPC_DISPOSE_LOCATION) + EVT_CALL(SetNpcFlagBits, NPC_Goompa, NPC_FLAG_100, FALSE) + EVT_CALL(EnablePartnerAI) + EVT_CALL(SetNpcAux, NPC_SELF, EVT_PTR(N(EVS_NpcAux_Goompa))) + EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_Goompa))) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Goompa) = { + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcAI_Goompa))) + EVT_CALL(BindNpcAux, NPC_SELF, EVT_PTR(N(EVS_NpcAux_Goompa))) + EVT_CALL(BindNpcHit, NPC_SELF, EVT_PTR(N(EVS_NpcHit_Goompa))) + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_GE(STORY_CH0_GOOMPA_JOINED_PARTY) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_ENABLE_HIT_SCRIPT, TRUE) + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_Goompa) = { + .id = NPC_Goompa, + .settings = &N(NpcSettings_Goompa), + .pos = { -50.0f, 0.0f, 80.0f }, + .yaw = 45, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_400000, + .init = &N(EVS_NpcInit_Goompa), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_Goompa_Idle, + .walk = ANIM_Goompa_Walk, + .run = ANIM_Goompa_Run, + .chase = ANIM_Goompa_Run, + .anim_4 = ANIM_Goompa_Idle, + .anim_5 = ANIM_Goompa_Idle, + .death = ANIM_Goompa_Still, + .hit = ANIM_Goompa_Still, + .anim_8 = ANIM_Goompa_Run, + .anim_9 = ANIM_Goompa_Run, + .anim_A = ANIM_Goompa_Run, + .anim_B = ANIM_Goompa_Run, + .anim_C = ANIM_Goompa_Run, + .anim_D = ANIM_Goompa_Run, + .anim_E = ANIM_Goompa_Run, + .anim_F = ANIM_Goompa_Run, + }, + .tattle = MSG_NpcTattle_Goompa, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Goompa), BTL_KMR_PART_1_FORMATION_02), + {} +}; diff --git a/src/world/area_kmr/kmr_03/kmr_03_4_entity.c b/src/world/area_kmr/kmr_03/kmr_03_4_entity.c new file mode 100644 index 0000000000..6bb96197b2 --- /dev/null +++ b/src/world/area_kmr/kmr_03/kmr_03_4_entity.c @@ -0,0 +1,71 @@ +#include "kmr_03.h" +#include "entity.h" + +EvtScript N(EVS_OnSmashBlock1) = { + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tt1, COLLIDER_FLAGS_UPPER_MASK) + EVT_SET(GB_StoryProgress, STORY_CH0_LEFT_THE_PLAYGROUND) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OnSmashBlock2) = { + EVT_SET(GF_KMR03_Hammer1Block, TRUE) + EVT_RETURN + EVT_END +}; + +#include "world/common/todo/UnsetCamera0MoveFlag1.inc.c" + +#include "world/common/todo/SetCamera0MoveFlag1.inc.c" + +API_CALLABLE(func_80240358_8C82E8) { + PlayerStatus* playerStatus = &gPlayerStatus; + + f32 xDelta = playerStatus->currentSpeed * 5.0f * sin_deg(playerStatus->targetYaw); + f32 zDelta = playerStatus->currentSpeed * 5.0f * -cos_deg(playerStatus->targetYaw); + + script->varTable[0] = playerStatus->position.x + xDelta; + script->varTable[1] = playerStatus->position.z + zDelta; + + return ApiStatus_DONE2; +} + +EvtScript N(EVS_TetherCameraToPlayer) = { + EVT_LABEL(0) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(SetCamTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_IF_LT(GB_StoryProgress, STORY_CH0_LEFT_THE_PLAYGROUND) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Hammer1Block), 45, 0, 70, 15, MAKE_ENTITY_END) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_OnSmashBlock1))) + EVT_ELSE + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tt1, COLLIDER_FLAGS_UPPER_MASK) + EVT_END_IF + EVT_IF_EQ(GF_KMR03_Hammer1Block, FALSE) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Hammer2Block), 230, 0, 310, 15, MAKE_ENTITY_END) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_OnSmashBlock2))) + EVT_END_IF + EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenYellowBlock), 230, 60, 310, 15, ITEM_REPEL_GEL, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_KMR03_HiddenItem_RepelGel) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BrickBlock), 230, 50, -160, 15, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BrickBlock), 165, 0, 380, 20, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), -170, 0, 370, 43, ITEM_COIN, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_KMR03_ItemBlock_Coin) + EVT_CALL(MakeEntity, EVT_PTR(Entity_SimpleSpring), 345, 75, -250, 0, 100, MAKE_ENTITY_END) + EVT_CALL(MakeItemEntity, ITEM_COIN, 345, 205, -250, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_KMR03_Item_CoinA) + EVT_CALL(MakeItemEntity, ITEM_COIN, 345, 230, -250, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_KMR03_Item_CoinB) + EVT_CALL(MakeItemEntity, ITEM_COIN, 345, 255, -250, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_KMR03_Item_CoinC) + EVT_CALL(MakeItemEntity, ITEM_COIN, 345, 280, -250, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_KMR03_Item_CoinD) + EVT_CALL(MakeItemEntity, ITEM_FIRE_FLOWER, 229, 250, -156, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_KMR02_Item_FireFlower) + EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenPanel), 300, 0, 150, 0, MODEL_jimen_1, MAKE_ENTITY_END) + EVT_CALL(AssignPanelFlag, GF_KMR03_HiddenPanel) + EVT_CALL(MakeEntity, EVT_PTR(Entity_HeartBlock), 130, 60, 0, 0, MAKE_ENTITY_END) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kmr/kmr_03/kmr_03_5_foliage.c b/src/world/area_kmr/kmr_03/kmr_03_5_foliage.c new file mode 100644 index 0000000000..e0477887a3 --- /dev/null +++ b/src/world/area_kmr/kmr_03/kmr_03_5_foliage.c @@ -0,0 +1,85 @@ +#include "kmr_03.h" + +#include "common/foliage.inc.c" + +FoliageModelList N(Bush1_BushModels) = { + .count = 1, + .models = { + MODEL_km, + } +}; + +FoliageVectorList N(Bush1_Effects) = { + .count = 1, + .vectors = { + { 143.0f, 16.0f, 462.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush1) = { + .bush = &N(Bush1_BushModels), + .vectors = &N(Bush1_Effects), +}; + +FoliageModelList N(Tree1_LeafModels) = { + .count = 1, + .models = { + MODEL_ue, + } +}; + +FoliageModelList N(Tree1_TrunkModels) = { + .count = 1, + .models = { + MODEL_sita, + } +}; + +FoliageVectorList N(Tree1_Effects) = { + .count = 2, + .vectors = { + { -80.0f, 130.0f, 18.0f }, + { 28.0f, 130.0f, 39.0f }, + } +}; + +EvtScript N(Tree1_CallbackScript) = { + EVT_IF_EQ(GF_KMR03_Tree1_Mushroom, TRUE) + EVT_RETURN + EVT_END_IF + EVT_IF_EQ(MF_Unk_0A, TRUE) + EVT_RETURN + EVT_END_IF + EVT_WAIT(10) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_IF_LT(LVar0, -30) + EVT_CALL(MakeItemEntity, ITEM_MUSHROOM, -23, 100, 35, ITEM_SPAWN_MODE_FALL_NEVER_VANISH, GF_KMR03_Tree1_Mushroom) + EVT_ELSE + EVT_CALL(MakeItemEntity, ITEM_MUSHROOM, -85, 100, 16, ITEM_SPAWN_MODE_FALL_NEVER_VANISH, GF_KMR03_Tree1_Mushroom) + EVT_END_IF + EVT_SET(MF_Unk_0A, TRUE) + EVT_RETURN + EVT_END +}; + +ShakeTreeConfig N(ShakeTree_Tree1) = { + .leaves = &N(Tree1_LeafModels), + .trunk = &N(Tree1_TrunkModels), + .vectors = &N(Tree1_Effects), + .callback = &N(Tree1_CallbackScript), +}; + +BombTrigger N(BombPos_Tree1) = { + .pos = { -42.0f, 0.0f, -13.0f }, + .radius = 0.0f +}; + +EvtScript N(EVS_SetupFoliage) = { + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush1))) + EVT_BIND_TRIGGER(EVT_PTR(N(searchBush)), TRIGGER_WALL_PRESS_A, COLLIDER_km, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_ki, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kmr/kmr_03/kmr_03_6_fall_down.c b/src/world/area_kmr/kmr_03/kmr_03_6_fall_down.c new file mode 100644 index 0000000000..0678378c1b --- /dev/null +++ b/src/world/area_kmr/kmr_03/kmr_03_6_fall_down.c @@ -0,0 +1,88 @@ +#include "kmr_03.h" + +EvtScript N(EVS_Scene_FallingDown) = { + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -270, 20, -80) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -270, 20, -80) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(700.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_IF_GE(GB_StoryProgress, STORY_CH0_FOUND_HAMMER) + EVT_CALL(SetPlayerPos, NPC_DISPOSE_LOCATION) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(SetPlayerPos, -224, 20, -80) + EVT_CALL(SetNpcPos, NPC_PARTNER, -224, 20, -80) + EVT_WAIT(20) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END_IF + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(SetPlayerPos, LVar0, NPC_DISPOSE_POS_Y, LVar2) + EVT_WAIT(30) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 220) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_THREAD + EVT_WAIT(18) + EVT_CALL(PlaySoundAtPlayer, SOUND_175, 0) + EVT_WAIT(30) + EVT_CALL(PlaySoundAtPlayer, SOUND_176, 0) + EVT_WAIT(28) + EVT_CALL(PlaySoundAtPlayer, SOUND_175, 0) + EVT_END_THREAD + EVT_CALL(HidePlayerShadow, TRUE) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerPos, -224, 120, -80) + EVT_CALL(InterpPlayerYaw, 90, 0) + EVT_LABEL(0) + EVT_WAIT(1) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar1, -2) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar1, 86) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(SetPlayerPos, -310, 20, -80) + EVT_THREAD + EVT_WAIT(20) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -310, 20, -80) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.2)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_END_THREAD + EVT_CALL(func_802D286C, 0x00002800) + EVT_CALL(func_802D2520, ANIM_Mario_10002, 5, 5, 1, 1, 0) + EVT_WAIT(100) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(func_802D2520, ANIM_Mario_10002, 0, 0, 0, 0, 0) + EVT_CALL(HidePlayerShadow, FALSE) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_BeforeJump) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_AnimMidairStill) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) + EVT_CALL(PlayerJump, LVar0, LVar1, LVar2, 10) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_THREAD + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_END_THREAD + EVT_WAIT(30) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kmr/kmr_04/8CA900.c b/src/world/area_kmr/kmr_04/8CA900.c deleted file mode 100644 index 3bed8ad476..0000000000 --- a/src/world/area_kmr/kmr_04/8CA900.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "kmr_04.h" - -static char* N(exit_str_0) = "kmr_03"; -static char* N(exit_str_1) = ""; - -#include "world/common/todo/CheckPartnerFlags1000.inc.c" - -ApiStatus N(func_8024002C_8CA92C)(Evt* script, s32 isInitialCall) { - script->varTable[0] = get_player_data()->curHP; - - return ApiStatus_DONE2; -} diff --git a/src/world/area_kmr/kmr_04/8CA960.c b/src/world/area_kmr/kmr_04/8CA960.c deleted file mode 100644 index 0bf17beaff..0000000000 --- a/src/world/area_kmr/kmr_04/8CA960.c +++ /dev/null @@ -1,25 +0,0 @@ -#include "kmr_04.h" - -#include "common/foliage.inc.c" - -#define NAMESPACE dup_kmr_04 -#include "world/common/todo/CheckPartnerFlags1000.inc.c" -#define NAMESPACE kmr_04 - -#include "world/common/todo/StashVars.inc.c" - -#include "world/common/todo/GetItemName.inc.c" - -INCLUDE_ASM(s32, "world/area_kmr/kmr_04/8CA960", func_802403E0_8CACE0); - -ApiStatus N(func_80240434_8CAD34)(Evt* script, s32 isInitialCall) { - gPlayerData.hammerLevel = 0; - - return ApiStatus_DONE2; -} - -ApiStatus N(func_80240444_8CAD44)(Evt* script, s32 isInitialCall) { - exec_entity_commandlist(get_entity_by_index(script->varTable[0])); - - return ApiStatus_DONE2; -} diff --git a/src/world/area_kmr/kmr_04/kmr_04.h b/src/world/area_kmr/kmr_04/kmr_04.h index f669988a91..6dd87dd31a 100644 --- a/src/world/area_kmr/kmr_04/kmr_04.h +++ b/src/world/area_kmr/kmr_04/kmr_04.h @@ -2,9 +2,37 @@ /// @brief Goomba Region - Jr. Troopa's Playground #include "common.h" -#include "../kmr.h" #include "message_ids.h" #include "map.h" + #include "../kmr.h" +#include "mapfs/kmr_04_shape.h" +#include "mapfs/kmr_04_hit.h" + +#include "sprite/npc/Goompa.h" +#include "sprite/npc/JrTroopa.h" + +enum { + NPC_JrTroopa = 0, + NPC_Goompa = 1, +}; + +enum { + MF_Unk_0A = MapFlag(10), + MF_Unk_0B = MapFlag(11), + MF_Unk_0C = MapFlag(12), + MF_Unk_0D = MapFlag(13), + MF_Unk_0E = MapFlag(14), + MF_Unk_0F = MapFlag(15), + MF_Unk_12 = MapFlag(18), +}; #define NAMESPACE kmr_04 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetNormalMusic); +extern EvtScript N(EVS_SetJrTroopaMusic); +extern EvtScript N(EVS_PushPopMusic); +extern EvtScript N(EVS_SetupFoliage); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_kmr/kmr_04/kmr_04_0_header.c b/src/world/area_kmr/kmr_04/kmr_04_0_header.c new file mode 100644 index 0000000000..4d967399ac --- /dev/null +++ b/src/world/area_kmr/kmr_04/kmr_04_0_header.c @@ -0,0 +1,23 @@ +#include "kmr_04.h" + +EntryList N(Entrances) = { + [kmr_04_ENTRY_0] { 485.0, 0.0, 9.0, 270.0 }, + [kmr_04_ENTRY_1] { 198.0, 100.0, -25.0, 270.0 }, + [kmr_04_ENTRY_2] { 0.0, 0.0, 0.0, 0.0 }, + [kmr_04_ENTRY_3] { 0.0, 0.0, 0.0, 0.0 }, + [kmr_04_ENTRY_4] { 0.0, 0.0, 0.0, 0.0 }, + [kmr_04_ENTRY_5] { 0.0, 0.0, 0.0, 0.0 }, + [kmr_04_ENTRY_6] { 0.0, 0.0, 0.0, 0.0 }, + [kmr_04_ENTRY_7] { 0.0, 0.0, 0.0, 0.0 }, + [kmr_04_ENTRY_8] { 0.0, 0.0, 0.0, 0.0 }, + [kmr_04_ENTRY_9] { 0.0, 0.0, 0.0, 0.0 }, + [kmr_04_ENTRY_A] { 43.0, 0.0, -376.0, 90.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_kmr_04 }, +}; diff --git a/src/world/area_kmr/kmr_04/kmr_04_1_music.c b/src/world/area_kmr/kmr_04/kmr_04_1_music.c new file mode 100644 index 0000000000..369ea8ae11 --- /dev/null +++ b/src/world/area_kmr/kmr_04/kmr_04_1_music.c @@ -0,0 +1,21 @@ +#include "kmr_04.h" + +EvtScript N(EVS_SetNormalMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_PLEASANT_PATH, 0, 8) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetJrTroopaMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_JR_TROOPA_THEME, 0, 8) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PushPopMusic) = { + EVT_CALL(PushSong, 66, 0) + EVT_WAIT(130) + EVT_CALL(PopSong) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kmr/kmr_04/kmr_04_2_main.c b/src/world/area_kmr/kmr_04/kmr_04_2_main.c new file mode 100644 index 0000000000..c63949f796 --- /dev/null +++ b/src/world/area_kmr/kmr_04/kmr_04_2_main.c @@ -0,0 +1,45 @@ +#include "kmr_04.h" + +EvtScript N(EVS_ExitWalk_kmr_03_0) = EVT_EXIT_WALK(60, kmr_04_ENTRY_0, "kmr_03", kmr_03_ENTRY_0); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kmr_03_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deili1, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetLoadType, LVar1) + EVT_IF_EQ(LVar1, 1) + EVT_EXEC(EnterSavePoint) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_RETURN + EVT_END_IF + EVT_CALL(GetEntryID, LVar0) + EVT_IF_NE(LVar0, kmr_04_ENTRY_A) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_ELSE + EVT_EXEC(EnterPostPipe) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_GOOMBA_VILLAGE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_SET(AF_KMR_09, FALSE) + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_CALL(ClearDefeatedEnemies) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC_WAIT(N(EVS_SetupFoliage)) + EVT_EXEC(N(EVS_SetNormalMusic)) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilit1, COLLIDER_FLAGS_UPPER_MASK) + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kmr/kmr_04/kmr_04_3_npc.c b/src/world/area_kmr/kmr_04/kmr_04_3_npc.c new file mode 100644 index 0000000000..b188c6ecc9 --- /dev/null +++ b/src/world/area_kmr/kmr_04/kmr_04_3_npc.c @@ -0,0 +1,307 @@ +#include "kmr_04.h" +#include "effects.h" + +NpcSettings N(NpcSettings_JrTroopa) = { + .height = 32, + .radius = 24, + .level = 99, +}; + +EvtScript N(EVS_NpcAuxAI_Goompa) = { + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_40, TRUE) + EVT_CALL(SetNpcPos, NPC_SELF, 0, -1000, 0) + EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcAux_Goompa) = { + EVT_RETURN + EVT_END +}; + +#include "world/common/todo/CheckPartnerFlags1000.inc.c" + +API_CALLABLE(N(GetPlayerHP)) { + script->varTable[0] = get_player_data()->curHP; + + return ApiStatus_DONE2; +} + +EvtScript N(EVS_NpcAI_Goompa) = { + EVT_LABEL(1) + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_EQ(STORY_CH0_GOOMPA_JOINED_PARTY) + EVT_LOOP(0) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_IF_LE(LVar0, 370) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(func_802CF56C, 0) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 30) + EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(2.0)) + EVT_CALL(NpcMoveTo, LVar0, LVar1, LVar2, 0) + EVT_WAIT(5) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_00A9) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Goompa_Idle) + EVT_CALL(EnablePartnerAI) + EVT_WAIT(10) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_SET(GB_StoryProgress, STORY_CH0_LOOKING_FOR_HAMMER) + EVT_CASE_EQ(STORY_CH0_FOUND_HAMMER) + EVT_IF_EQ(AB_KMR_0, 0) + EVT_LABEL(10) + EVT_WAIT(1) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_IF_LT(LVar0, 360) + EVT_GOTO(10) + EVT_END_IF + EVT_IF_GT(LVar0, 400) + EVT_GOTO(10) + EVT_END_IF + EVT_IF_LT(LVar2, -36) + EVT_GOTO(10) + EVT_END_IF + EVT_IF_GT(LVar2, 85) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(N(CheckPartnerFlags1000)) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_40, TRUE) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Goompa_Walk) + EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(3.0)) + EVT_CALL(NpcMoveTo, NPC_PARTNER, 420, 6, 0) + EVT_THREAD + EVT_WAIT(3) + EVT_CALL(PlayerFaceNpc, NPC_PARTNER, 3) + EVT_END_THREAD + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_00AC) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Goompa_Idle) + EVT_WAIT(10) + EVT_THREAD + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) + EVT_CALL(PlayerMoveTo, 395, 0, 0) + EVT_CALL(InterpPlayerYaw, 90, 0) + EVT_END_THREAD + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_ENABLE_HIT_SCRIPT, TRUE) + EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(6.0)) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Goompa_Run) + EVT_CALL(NpcMoveTo, NPC_PARTNER, 582, 6, 0) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Goompa_Idle) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_ENABLE_HIT_SCRIPT, FALSE) + EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_61, 0) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_00AD) + EVT_WAIT(10) + EVT_THREAD + EVT_SET(LVar0, 0) + EVT_CALL(func_802CDE68, -4, 10) + EVT_LOOP(60) + EVT_ADD(LVar0, 53) + EVT_CALL(SetNpcRotation, NPC_PARTNER, 0, 0, LVar0) + EVT_CALL(PlayerFaceNpc, NPC_PARTNER, FALSE) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(func_802CDE68, -4, 0) + EVT_CALL(SetNpcRotation, NPC_PARTNER, 0, 0, 0) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 15, EVT_FLOAT(1.0)) + EVT_END_THREAD + EVT_PLAY_EFFECT(EFFECT_DAMAGE_STARS, 1, 495, 15, 9, 460, 15, 9, 6) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Goompa_Injured) + EVT_CALL(NpcMoveTo, NPC_PARTNER, 250, 6, 60) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Goompa_Injured) + EVT_CALL(SetNpcRotation, NPC_PARTNER, 0, 0, 0) + EVT_THREAD + EVT_LOOP(20) + EVT_CALL(SetNpcPos, NPC_PARTNER, 250, 0, 6) + EVT_WAIT(3) + EVT_CALL(SetNpcPos, NPC_PARTNER, 250, 0, 0) + EVT_WAIT(3) + EVT_END_LOOP + EVT_END_THREAD + EVT_SET(AB_KMR_0, 1) + EVT_END_IF + EVT_END_SWITCH + EVT_WAIT(1) + EVT_GOTO(1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Goompa) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcDefeat_Goompa) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_JrTroopa) = { + EVT_CALL(func_800445D4, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(100) + EVT_LABEL(0) + EVT_SWITCH(AB_KMR_0) + EVT_CASE_EQ(1) + EVT_EXEC(N(EVS_SetJrTroopaMusic)) + EVT_THREAD + EVT_WAIT(20) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 430, LVar1, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(275.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.5), EVT_FLOAT(-7.5)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_END_THREAD + EVT_CALL(SetNpcPos, NPC_JrTroopa, 630, 0, 0) + EVT_CALL(EnableNpcShadow, NPC_SELF, TRUE) + EVT_WAIT(1) + EVT_CALL(PlayerFaceNpc, NPC_JrTroopa, 3) + EVT_CALL(SetNpcSpeed, NPC_JrTroopa, EVT_FLOAT(3.0)) + EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_JrTroopa_Run) + EVT_CALL(NpcMoveTo, NPC_JrTroopa, 465, 0, 0) + EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_JrTroopa_PointIdle) + EVT_CALL(PlayerFaceNpc, NPC_JrTroopa, 3) + EVT_CALL(SpeakToPlayer, NPC_JrTroopa, ANIM_JrTroopa_PointTalk, ANIM_JrTroopa_PointIdle, 0, MSG_CH0_00AE) + EVT_WAIT(10) + EVT_THREAD + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 430, LVar1, LVar2) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_END_THREAD + EVT_CALL(StartBossBattle, SONG_JR_TROOPA_BATTLE) + EVT_END_SWITCH + EVT_WAIT(1) + EVT_GOTO(0) + EVT_CASE_OR_EQ(101) + EVT_CASE_OR_EQ(102) + EVT_CASE_OR_EQ(3) + EVT_CASE_OR_EQ(103) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcDefeat_JrTroopa) = { + EVT_CALL(GetBattleOutcome, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(OUTCOME_PLAYER_WON) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 400, LVar1, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(275.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(15.0), EVT_FLOAT(-7.5)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(PlayerFaceNpc, NPC_SELF, FALSE) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_JrTroopa_Hurt) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_JrTroopa_Hurt, ANIM_JrTroopa_Hurt, 0, MSG_CH0_00B5) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(6.0)) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_JrTroopa_Run) + EVT_CALL(NpcMoveTo, NPC_SELF, 564, 10, 0) + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_WAIT(60) + EVT_CALL(SetNpcPos, NPC_SELF, 564, 0, 10) + EVT_CALL(NpcMoveTo, NPC_SELF, 435, 10, 0) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_JrTroopa_PointTalk, ANIM_JrTroopa_PointIdle, 0, MSG_CH0_00B6) + EVT_CALL(NpcMoveTo, NPC_SELF, 564, 10, 0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_JrTroopa_Idle) + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_THREAD + EVT_CALL(ResetCam, CAM_DEFAULT, 4) + EVT_END_THREAD + EVT_EXEC(N(EVS_SetNormalMusic)) + EVT_SET(AB_KMR_0, 0) + EVT_SET(GB_StoryProgress, STORY_CH0_DEFEATED_JR_TROOPA) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_Goompa) = { + .defaultAnim = ANIM_Goompa_Idle, + .height = 24, + .radius = 24, + .otherAI = &N(EVS_NpcAuxAI_Goompa), + .onInteract = &N(EVS_NpcInteract_Goompa), + .ai = &N(EVS_NpcAI_Goompa), + .aux = &N(EVS_NpcAux_Goompa), + .onDefeat = &N(EVS_NpcDefeat_Goompa), + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100, +}; + +EvtScript N(EVS_NpcInit_JrTroopa) = { + EVT_CALL(SetNpcPos, NPC_SELF, 0, -1000, 0) + EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_JrTroopa))) + EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_JrTroopa))) + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_JrTroopa) = { + .id = NPC_JrTroopa, + .settings = &N(NpcSettings_JrTroopa), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_40000 | NPC_FLAG_200000 | NPC_FLAG_NO_DROPS, + .init = &N(EVS_NpcInit_JrTroopa), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_JrTroopa_Idle, + .walk = ANIM_JrTroopa_Walk, + .run = ANIM_JrTroopa_Walk, + .chase = ANIM_JrTroopa_Walk, + .anim_4 = ANIM_JrTroopa_Idle, + .anim_5 = ANIM_JrTroopa_Idle, + .death = ANIM_JrTroopa_Idle, + .hit = ANIM_JrTroopa_Idle, + .anim_8 = ANIM_JrTroopa_Idle, + .anim_9 = ANIM_JrTroopa_Idle, + .anim_A = ANIM_JrTroopa_Idle, + .anim_B = ANIM_JrTroopa_Idle, + .anim_C = ANIM_JrTroopa_Idle, + .anim_D = ANIM_JrTroopa_Idle, + .anim_E = ANIM_JrTroopa_Idle, + .anim_F = ANIM_JrTroopa_Idle, + }, +}; + +StaticNpc N(NpcData_Goompa) = { + .id = NPC_Goompa, + .settings = &N(NpcSettings_Goompa), + .pos = { -58.0f, 0.0f, 130.0f }, + .yaw = 0, + .flags = NPC_FLAG_100 | NPC_FLAG_200000, + .animations = { + }, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_JrTroopa), BTL_KMR_PART_3_FORMATION_02), + NPC_GROUP(N(NpcData_Goompa)), + {} +}; diff --git a/src/world/area_kmr/kmr_04/kmr_04_4_entity.c b/src/world/area_kmr/kmr_04/kmr_04_4_entity.c new file mode 100644 index 0000000000..36479af7a4 --- /dev/null +++ b/src/world/area_kmr/kmr_04/kmr_04_4_entity.c @@ -0,0 +1,24 @@ +#include "kmr_04.h" +#include "entity.h" + +EvtScript N(EVS_OnSmashBlock) = { + EVT_SET(GF_KMR04_Hammer1Block, TRUE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_IF_EQ(GF_KMR04_Hammer1Block, FALSE) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Hammer1Block), -80, 0, 400, 0, MAKE_ENTITY_END) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_OnSmashBlock))) + EVT_END_IF + EVT_CALL(MakeEntity, EVT_PTR(Entity_BrickBlock), -230, 60, -140, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BrickBlock), -440, 60, 20, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BrickBlock), 60, 0, 370, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BrickBlock), 85, 0, 395, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_MulticoinBlock), 100, 0, -70, 0, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_KMR04_MultiCoinBrick) + EVT_CALL(MakeEntity, EVT_PTR(Entity_SavePoint), 0, 60, 0, 0, MAKE_ENTITY_END) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kmr/kmr_04/kmr_04_5_foliage.c b/src/world/area_kmr/kmr_04/kmr_04_5_foliage.c new file mode 100644 index 0000000000..d4e0f2d85d --- /dev/null +++ b/src/world/area_kmr/kmr_04/kmr_04_5_foliage.c @@ -0,0 +1,562 @@ +#include "kmr_04.h" + +#include "world/area_kmr/kmr_04/hammer_block_message.png.h" +#include "world/area_kmr/kmr_04/hammer_block_message.png.inc.c" +#include "world/area_kmr/kmr_04/hammer_block_message.pal.inc.c" + +#include "common/foliage.inc.c" + +#define NAMESPACE dup_kmr_04 +#include "world/common/todo/CheckPartnerFlags1000.inc.c" +#define NAMESPACE kmr_04 + +#include "world/common/complete/GiveReward.inc.c" + +static MessageImageData MessageImage; + +API_CALLABLE(N(SetMessageImage_HammerBlock)) { + MessageImage.raster = N(hammer_block_message_img); + MessageImage.palette = N(hammer_block_message_pal); + MessageImage.width = N(hammer_block_message_img_width); + MessageImage.height = N(hammer_block_message_img_height); + MessageImage.format = G_IM_FMT_CI; + MessageImage.bitDepth = G_IM_SIZ_4b; + set_message_images(&MessageImage); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(GiveWoodenHammer)) { + gPlayerData.hammerLevel = 0; + + return ApiStatus_DONE2; +} + +API_CALLABLE(N(func_80240444_8CAD44)) { + exec_entity_commandlist(get_entity_by_index(script->varTable[0])); + + return ApiStatus_DONE2; +} + +EvtScript N(EVS_GotHammer) = { + EVT_CALL(SetPlayerAnimation, ANIM_Mario_6000C) + EVT_CALL(GetPlayerPos, LVar5, LVar6, LVar7) + EVT_ADD(LVar6, 40) + EVT_CALL(MakeItemEntity, ITEM_HAMMER, LVar5, LVar6, LVar7, ITEM_SPAWN_MODE_DECORATION, 0) + EVT_SET(LVarC, LVar0) + EVT_ADD(LVar6, 16) + EVT_PLAY_EFFECT(EFFECT_GOT_ITEM_OUTLINE, 0, LVar5, LVar6, LVar7, EVT_FLOAT(1.0), LVar8) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 9, LVar5, LVar6, LVar7, EVT_FLOAT(1.0), 100) + EVT_EXEC(N(EVS_PushPopMusic)) + EVT_THREAD + EVT_WAIT(4) + EVT_CALL(GetPlayerPos, LVar3, LVar4, LVar5) + EVT_ADD(LVar4, 50) + EVT_ADD(LVar5, 2) + EVT_ADD(LVar3, 8) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 3, LVar3, LVar4, LVar5, 20) + EVT_ADD(LVar3, -16) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 3, LVar3, LVar4, LVar5, 20) + EVT_END_THREAD + EVT_LOOP(0) + EVT_WAIT(1) + EVT_IF_EQ(MF_Unk_12, TRUE) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(func_802D7B44, LVar8) + EVT_CALL(RemoveItemEntity, LVarC) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OnSearch_HammerBush) = { + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(8.0), 0, EVT_FLOAT(300.0), EVT_FLOAT(19.0), EVT_FLOAT(-9.0)) + EVT_SET(MF_Unk_12, FALSE) + EVT_EXEC(N(EVS_GotHammer)) + EVT_CALL(N(GiveWoodenHammer)) + EVT_WAIT(30) + EVT_CALL(N(SetMessageImage_HammerBlock)) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_Inspect_FoundHammer, 160, 40) + EVT_SET(MF_Unk_12, TRUE) + EVT_CALL(DisablePartnerAI, 0) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_00AA) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Goompa_Idle) + EVT_SET(GB_StoryProgress, STORY_CH0_FOUND_HAMMER) + EVT_CALL(ClearPartnerMoveHistory, NPC_PARTNER) + EVT_CALL(EnablePartnerAI) + EVT_THREAD + EVT_CALL(ResetCam, CAM_DEFAULT, 3) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(Bush7_CallbackScript) = { + EVT_IF_GE(GB_StoryProgress, STORY_CH0_FOUND_HAMMER) + EVT_RETURN + EVT_END_IF + EVT_CALL(DisablePlayerInput, TRUE) + EVT_EXEC_WAIT(N(EVS_OnSearch_HammerBush)) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(Bush8_CallbackScript) = { + EVT_IF_GE(GB_StoryProgress, STORY_CH0_FOUND_HAMMER) + EVT_RETURN + EVT_END_IF + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(MakeLerp, 0, 85, 20, EASING_COS_IN_OUT) + EVT_LABEL(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o213, LVar0, 1, 0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(0) + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_OnSearch_HammerBush)) + EVT_CALL(MakeLerp, 85, 0, 20, EASING_COS_IN_OUT) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o213, LVar0, 1, 0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +FoliageModelList N(Bush1_BushModels) = { + .count = 1, + .models = { + MODEL_o181, + } +}; + +FoliageDropList N(Bush1_Drops) = { + .count = 1, + .drops = { + { + .itemID = ITEM_COIN, + .pos = { 248, 17, 97 }, + .spawnMode = ITEM_SPAWN_MODE_TOSS_SPAWN_ONCE, + .pickupFlag = GF_KMR04_Bush1_Coin, + .spawnFlag = MF_Unk_0A, + }, + } +}; + +FoliageVectorList N(Bush1_Effects) = { + .count = 1, + .vectors = { + { 248.0f, 17.0f, 97.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush1) = { + .bush = &N(Bush1_BushModels), + .drops = &N(Bush1_Drops), + .vectors = &N(Bush1_Effects), +}; + +FoliageModelList N(Bush2_BushModels) = { + .count = 1, + .models = { + MODEL_o212, + } +}; + +FoliageDropList N(Bush2_Drops) = { + .count = 1, + .drops = { + { + .itemID = ITEM_COIN, + .pos = { 99, 17, 237 }, + .spawnMode = ITEM_SPAWN_MODE_TOSS, + .pickupFlag = GF_KMR04_Bush2_Coin, + .spawnFlag = MF_Unk_0B, + }, + } +}; + +FoliageVectorList N(Bush2_Effects) = { + .count = 1, + .vectors = { + { 100.0f, 19.0f, 246.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush2) = { + .bush = &N(Bush2_BushModels), + .drops = &N(Bush2_Drops), + .vectors = &N(Bush2_Effects), +}; + +FoliageModelList N(Bush3_BushModels) = { + .count = 1, + .models = { + MODEL_o235, + } +}; + +FoliageDropList N(Bush3_Drops) = { + .count = 2, + .drops = { + { + .itemID = ITEM_COIN, + .pos = { 50, 18, -200 }, + .spawnMode = ITEM_SPAWN_MODE_TOSS_SPAWN_ONCE, + .pickupFlag = GF_KMR04_Bush3_CoinA, + .spawnFlag = MF_Unk_0C, + }, + { + .itemID = ITEM_COIN, + .pos = { 50, 18, -200 }, + .spawnMode = ITEM_SPAWN_MODE_TOSS_SPAWN_ONCE, + .pickupFlag = GF_KMR04_Bush3_CoinB, + .spawnFlag = MF_Unk_0D, + }, + } +}; + +FoliageVectorList N(Bush3_Effects) = { + .count = 1, + .vectors = { + { 50.0f, 18.0f, -200.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush3) = { + .bush = &N(Bush3_BushModels), + .drops = &N(Bush3_Drops), + .vectors = &N(Bush3_Effects), +}; + +FoliageModelList N(Bush4_BushModels) = { + .count = 1, + .models = { + MODEL_o182, + } +}; + +FoliageDropList N(Bush4_Drops) = { + .count = 1, + .drops = { + { + .itemID = ITEM_COIN, + .pos = { -49, 20, 146 }, + .spawnMode = ITEM_SPAWN_MODE_TOSS_SPAWN_ONCE, + .pickupFlag = GF_KMR04_Bush4_Coin, + .spawnFlag = MF_Unk_0E, + }, + } +}; + +FoliageVectorList N(Bush4_Effects) = { + .count = 1, + .vectors = { + { -49.0f, 20.0f, 146.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush4) = { + .bush = &N(Bush4_BushModels), + .drops = &N(Bush4_Drops), + .vectors = &N(Bush4_Effects), +}; + +FoliageModelList N(Bush5_BushModels) = { + .count = 1, + .models = { + MODEL_o205, + } +}; + +FoliageDropList N(Bush5_Drops) = { + .count = 1, + .drops = { + { + .itemID = ITEM_COIN, + .pos = { -148, 16, -150 }, + .spawnMode = ITEM_SPAWN_MODE_TOSS_SPAWN_ONCE, + .pickupFlag = GF_KMR04_Bush5_Coin, + .spawnFlag = MF_Unk_0F, + }, + } +}; + +FoliageVectorList N(Bush5_Effects) = { + .count = 1, + .vectors = { + { -148.0f, 16.0f, -150.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush5) = { + .bush = &N(Bush5_BushModels), + .drops = &N(Bush5_Drops), + .vectors = &N(Bush5_Effects), +}; + +FoliageModelList N(Bush8_BushModels) = { + .count = 1, + .models = { + MODEL_o213, + } +}; + +FoliageVectorList N(Bush8_Effects) = { + .count = 1, + .vectors = { + { -224.0f, 20.0f, 96.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush7) = { + .bush = &N(Bush8_BushModels), + .vectors = &N(Bush8_Effects), + .callback = &N(Bush7_CallbackScript), +}; + +SearchBushConfig N(SearchBush_Bush8) = { + .bush = &N(Bush8_BushModels), + .vectors = &N(Bush8_Effects), + .callback = &N(Bush8_CallbackScript), +}; + +FoliageModelList N(Bush6_BushModels) = { + .count = 1, + .models = { + MODEL_o213, + } +}; + +FoliageVectorList N(Bush6_Effects) = { + .count = 1, + .vectors = { + { -224.0f, 20.0f, 96.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush6) = { + .bush = &N(Bush6_BushModels), + .vectors = &N(Bush6_Effects), +}; + +FoliageModelList N(Bush9_BushModels) = { + .count = 1, + .models = { + MODEL_o239, + } +}; + +FoliageVectorList N(Bush9_Effects) = { + .count = 1, + .vectors = { + { -174.0f, 19.0f, 296.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush9) = { + .bush = &N(Bush9_BushModels), + .vectors = &N(Bush9_Effects), +}; + +FoliageModelList N(Tree1_LeafModels) = { + .count = 1, + .models = { + MODEL_o237, + } +}; + +FoliageModelList N(Tree1_TrunkModels) = { + .count = 1, + .models = { + MODEL_o236, + } +}; + +FoliageDropList N(Tree1_Drops) = { + .count = 1, + .drops = { + { + .itemID = ITEM_COIN, + .pos = { -302, 128, 2 }, + .spawnMode = ITEM_SPAWN_MODE_FALL_SPAWN_ONCE, + .pickupFlag = GF_KMR04_Tree1_Coin, + }, + } +}; + +FoliageVectorList N(Tree1_Effects) = { + .count = 2, + .vectors = { + { -391.0f, 150.0f, 20.0f }, + { -267.0f, 150.0f, 22.0f }, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree1) = { + .leaves = &N(Tree1_LeafModels), + .trunk = &N(Tree1_TrunkModels), + .drops = &N(Tree1_Drops), + .vectors = &N(Tree1_Effects), +}; + +BombTrigger N(BombPos_Tree1) = { + .pos = { -352.0f, 0.0f, 10.0f }, + .radius = 0.0f +}; + +FoliageModelList N(Tree2_LeafModels) = { + .count = 1, + .models = { + MODEL_o194, + } +}; + +FoliageModelList N(Tree2_TrunkModels) = { + .count = 1, + .models = { + MODEL_o193, + } +}; + +FoliageDropList N(Tree2_Drops) = { + .count = 1, + .drops = { + { + .itemID = ITEM_COIN, + .pos = { -96, 132, -255 }, + .spawnMode = ITEM_SPAWN_MODE_TOSS_SPAWN_ONCE, + .pickupFlag = GF_KMR04_Tree2_Coin, + }, + } +}; + +FoliageVectorList N(Tree2_Effects) = { + .count = 2, + .vectors = { + { -156.0f, 150.0f, -255.0f }, + { -32.0f, 150.0f, -272.0f }, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree2) = { + .leaves = &N(Tree2_LeafModels), + .trunk = &N(Tree2_TrunkModels), + .drops = &N(Tree2_Drops), + .vectors = &N(Tree2_Effects), +}; + +BombTrigger N(BombPos_Tree2) = { + .pos = { -92.0f, 0.0f, -295.0f }, + .radius = 0.0f +}; + +EvtScript N(Tree3_CallbackScript) = { + EVT_IF_EQ(GF_KMR04_Tree3_Dolly, TRUE) + EVT_RETURN + EVT_END_IF + EVT_IF_EQ(AF_KMR_09, TRUE) + EVT_RETURN + EVT_END_IF + EVT_WAIT(15) + EVT_CALL(MakeItemEntity, ITEM_DOLLY, 250, 132, -100, ITEM_SPAWN_MODE_FALL_NEVER_VANISH, GF_KMR04_Tree3_Dolly) + EVT_SET(AF_KMR_09, TRUE) + EVT_THREAD + EVT_LABEL(10) + EVT_IF_EQ(GF_KMR04_Tree3_Dolly, FALSE) + EVT_WAIT(1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(GetCurrentPartnerID, LVar0) + EVT_IF_EQ(LVar0, PARTNER_GOOMPA) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_WAIT(5) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_00AB) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Goompa_Idle) + EVT_CALL(EnablePartnerAI) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_END_IF + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +FoliageModelList N(Tree3_LeafModels) = { + .count = 1, + .models = { + MODEL_o192, + } +}; + +FoliageModelList N(Tree3_TrunkModels) = { + .count = 1, + .models = { + MODEL_o191, + } +}; + +FoliageVectorList N(Tree3_Effects) = { + .count = 2, + .vectors = { + { 190.0f, 150.0f, -124.0f }, + { 295.0f, 150.0f, -124.0f }, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree3) = { + .leaves = &N(Tree3_LeafModels), + .trunk = &N(Tree3_TrunkModels), + .vectors = &N(Tree3_Effects), + .callback = &N(Tree3_CallbackScript), +}; + +BombTrigger N(BombPos_Tree3) = { + .pos = { 248.0f, 0.0f, -122.0f }, + .radius = 0.0f +}; + +EvtScript N(EVS_SetupFoliage) = { + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush1))) + EVT_BIND_TRIGGER(EVT_PTR(N(searchBush)), TRIGGER_WALL_PRESS_A, COLLIDER_o402, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush2))) + EVT_BIND_TRIGGER(EVT_PTR(N(searchBush)), TRIGGER_WALL_PRESS_A, COLLIDER_o415, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush3))) + EVT_BIND_TRIGGER(EVT_PTR(N(searchBush)), TRIGGER_WALL_PRESS_A, COLLIDER_o409, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush4))) + EVT_BIND_TRIGGER(EVT_PTR(N(searchBush)), TRIGGER_WALL_PRESS_A, COLLIDER_o412, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush5))) + EVT_BIND_TRIGGER(EVT_PTR(N(searchBush)), TRIGGER_WALL_PRESS_A, COLLIDER_o399, 1, 0) + EVT_IF_GE(GB_StoryProgress, STORY_CH0_FOUND_HAMMER) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush6))) + EVT_BIND_TRIGGER(EVT_PTR(N(searchBush)), TRIGGER_WALL_PRESS_A, COLLIDER_o410, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush6))) + EVT_BIND_TRIGGER(EVT_PTR(N(searchBush)), TRIGGER_WALL_PRESS_A, COLLIDER_o410_1, 1, 0) + EVT_ELSE + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush7))) + EVT_BIND_TRIGGER(EVT_PTR(N(searchBush)), TRIGGER_WALL_PRESS_A, COLLIDER_o410, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush8))) + EVT_BIND_TRIGGER(EVT_PTR(N(searchBush)), TRIGGER_WALL_PRESS_A, COLLIDER_o410_1, 1, 0) + EVT_END_IF + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush9))) + EVT_BIND_TRIGGER(EVT_PTR(N(searchBush)), TRIGGER_WALL_PRESS_A, COLLIDER_o413, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o407, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree2))) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o271, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree2)), 1, 0) + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree3))) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o341, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree3)), 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kmr/kmr_05/8CE070.c b/src/world/area_kmr/kmr_05/8CE070.c deleted file mode 100644 index 470b4e19e1..0000000000 --- a/src/world/area_kmr/kmr_05/8CE070.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "kmr_05.h" - -static char* N(exit_str_0) = "kmr_03"; -static char* N(exit_str_1) = "kmr_02"; - -#include "world/common/enemy/ai/FlyingAI.inc.c" diff --git a/src/world/area_kmr/kmr_05/8CF570.c b/src/world/area_kmr/kmr_05/8CF570.c deleted file mode 100644 index 59f33fa621..0000000000 --- a/src/world/area_kmr/kmr_05/8CF570.c +++ /dev/null @@ -1,13 +0,0 @@ -#include "kmr_05.h" - -#include "common/foliage.inc.c" - -ApiStatus func_8024173C_8CF7AC(Evt* script, s32 isInitialCall) { - if (get_enemy_safe(6) == NULL) { - script->varTable[0] = FALSE; - } else { - script->varTable[0] = TRUE; - } - - return ApiStatus_DONE2; -} diff --git a/src/world/area_kmr/kmr_05/kmr_05.h b/src/world/area_kmr/kmr_05/kmr_05.h index dff65f0ff4..5ee1d36dd6 100644 --- a/src/world/area_kmr/kmr_05/kmr_05.h +++ b/src/world/area_kmr/kmr_05/kmr_05.h @@ -2,9 +2,36 @@ /// @brief Goomba Region - Behind the Village #include "common.h" -#include "../kmr.h" #include "message_ids.h" #include "map.h" + #include "../kmr.h" +#include "mapfs/kmr_05_shape.h" +#include "mapfs/kmr_05_hit.h" + +#include "sprite/npc/Goompa.h" +#include "sprite/npc/Goomba.h" +#include "sprite/npc/SpikedGoomba.h" +#include "sprite/npc/Paragoomba.h" + +enum { + NPC_Goomba_01 = 0, + NPC_Goomba_02 = 2, + NPC_SpikedGoomba = 3, + NPC_Paragoomba = 4, + NPC_06 = 6, +}; + +enum { + MF_Unk_0A = MapFlag(10), +}; #define NAMESPACE kmr_05 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_MakeEntities); +extern EvtScript N(EVS_SetupFoliage); +extern EvtScript N(EVS_GoompaRemark); +extern NpcGroupList N(NpcsBefore); +extern NpcGroupList N(NpcsAfter); diff --git a/src/world/area_kmr/kmr_05/kmr_05_0_header.c b/src/world/area_kmr/kmr_05/kmr_05_0_header.c new file mode 100644 index 0000000000..82cfa15b48 --- /dev/null +++ b/src/world/area_kmr/kmr_05/kmr_05_0_header.c @@ -0,0 +1,14 @@ +#include "kmr_05.h" + +EntryList N(Entrances) = { + [kmr_05_ENTRY_0] { -110.0, 0.0, -19.0, 90.0 }, + [kmr_05_ENTRY_1] { 1397.0, 200.0, -145.0, 220.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_kmr_05 }, +}; diff --git a/src/world/area_kmr/kmr_05/kmr_05_1_music.c b/src/world/area_kmr/kmr_05/kmr_05_1_music.c new file mode 100644 index 0000000000..33ae3b3d98 --- /dev/null +++ b/src/world/area_kmr/kmr_05/kmr_05_1_music.c @@ -0,0 +1,7 @@ +#include "kmr_05.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_PLEASANT_PATH, 0, 8) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kmr/kmr_05/kmr_05_2_main.c b/src/world/area_kmr/kmr_05/kmr_05_2_main.c new file mode 100644 index 0000000000..686545bf92 --- /dev/null +++ b/src/world/area_kmr/kmr_05/kmr_05_2_main.c @@ -0,0 +1,39 @@ +#include "kmr_05.h" + +EvtScript N(EVS_ExitWalk_kmr_03_1) = EVT_EXIT_WALK(60, kmr_05_ENTRY_0, "kmr_03", kmr_03_ENTRY_1); +EvtScript N(EVS_ExitWalk_kmr_02_2) = EVT_EXIT_WALK(60, kmr_05_ENTRY_1, "kmr_02", kmr_02_ENTRY_2); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kmr_03_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deili1, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kmr_02_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deili2, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_GOOMBA_VILLAGE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_IF_EQ(GF_KMR02_ReturnedWithGoompa, FALSE) + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(NpcsBefore))) + EVT_ELSE + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(NpcsAfter))) + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_EXEC_WAIT(N(EVS_SetupFoliage)) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilit1, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilit2, COLLIDER_FLAGS_UPPER_MASK) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_WAIT(1) + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, kmr_05_ENTRY_0) + EVT_IF_EQ(GF_KMR05_EnemyWarning, FALSE) + EVT_EXEC(N(EVS_GoompaRemark)) + EVT_SET(GF_KMR05_EnemyWarning, TRUE) + EVT_END_IF + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kmr/kmr_05/kmr_05_3_npc.c b/src/world/area_kmr/kmr_05/kmr_05_3_npc.c new file mode 100644 index 0000000000..64f9c9567f --- /dev/null +++ b/src/world/area_kmr/kmr_05/kmr_05_3_npc.c @@ -0,0 +1,188 @@ +#include "kmr_05.h" + +#include "world/common/enemy/complete/Goomba_Wander.inc.c" + +#include "world/common/enemy/complete/Paragoomba_Wander.inc.c" + +#include "world/common/enemy/complete/SpikedGoomba_Wander.inc.c" + +EvtScript N(EVS_GoompaRemark) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_WAIT(10) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) + EVT_CALL(PlayerMoveTo, -60, -19, 0) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_00B7) + EVT_CALL(EnablePartnerAI) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcAux_SpikedGoomba) = { + EVT_LABEL(0) + EVT_CALL(TranslateModel, MODEL_usokinoko, -1, 0, 0) + EVT_WAIT(1) + EVT_CALL(TranslateModel, MODEL_usokinoko, 1, 0, 0) + EVT_WAIT(20) + EVT_CALL(TranslateModel, MODEL_usokinoko, 1, 0, 0) + EVT_WAIT(1) + EVT_CALL(TranslateModel, MODEL_usokinoko, -1, 0, 0) + EVT_WAIT(8) + EVT_CALL(TranslateModel, MODEL_usokinoko, -1, 0, 0) + EVT_WAIT(1) + EVT_CALL(TranslateModel, MODEL_usokinoko, 1, 0, 0) + EVT_WAIT(30) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_SpikedGoomba) = { + EVT_CALL(func_800445D4, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(100) + EVT_LABEL(10) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_IF_LT(LVar1, 100) + EVT_GOTO(10) + EVT_END_IF + EVT_IF_LT(LVar0, 560) + EVT_GOTO(10) + EVT_END_IF + EVT_IF_GT(LVar0, 700) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(SetNpcAux, NPC_SELF, 0) + EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, -30, 12, TRUE, 0, 0, 0, 0) + EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.0)) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(5.0)) + EVT_CALL(NpcJump0, NPC_SELF, 685, 100, -35, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_40000000, 1) + EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_SpikedGoomba_Wander))) + EVT_CASE_OR_EQ(102) + EVT_CASE_OR_EQ(3) + EVT_CASE_OR_EQ(103) + EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_SpikedGoomba_Wander))) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_Goomba_01) = { + .id = NPC_Goomba_01, + .settings = &N(NpcSettings_Goomba_Wander), + .pos = { 305.0f, 50.0f, -13.0f }, + .yaw = 90, + .flags = NPC_FLAG_LOCK_ANIMS, + .drops = GOOMBA_DROPS, + .territory = { + .wander = { + .isFlying = FALSE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 305, 50, -13 }, + .wanderSize = { 30, 20 }, + .detectShape = SHAPE_RECT, + .detectPos = { 330, 50, 20 }, + .detectSize = { 120, 130 }, + } + }, + .animations = GOOMBA_ANIMS, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_Goomba_02) = { + .id = NPC_Goomba_02, + .settings = &N(NpcSettings_Goomba_Wander), + .pos = { 700.0f, 210.0f, -165.0f }, + .yaw = 90, + .flags = NPC_FLAG_LOCK_ANIMS, + .drops = GOOMBA_DROPS, + .territory = { + .wander = { + .isFlying = FALSE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 700, 210, -165 }, + .wanderSize = { 30, 20 }, + .detectShape = SHAPE_RECT, + .detectPos = { 700, 210, -165 }, + .detectSize = { 120, 130 }, + } + }, + .animations = GOOMBA_ANIMS, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +EvtScript N(EVS_NpcInit_SpikedGoomba) = { + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_SpikedGoomba))) + EVT_CALL(BindNpcAux, NPC_SELF, EVT_PTR(N(EVS_NpcAux_SpikedGoomba))) + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_SpikedGoomba) = { + .id = NPC_SpikedGoomba, + .settings = &N(NpcSettings_SpikedGoomba_Wander), + .pos = { 712.0f, 100.0f, -95.0f }, + .yaw = 270, + .flags = NPC_FLAG_LOCK_ANIMS, + .init = &N(EVS_NpcInit_SpikedGoomba), + .drops = SPIKED_GOOMBA_DROPS, + .territory = { + .wander = { + .isFlying = FALSE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 630, 100, 25 }, + .wanderSize = { 40, 20 }, + .detectShape = SHAPE_RECT, + .detectPos = { 660, 100, 30 }, + .detectSize = { 165, 150 }, + } + }, + .animations = SPIKED_GOOMBA_ANIMS, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_Paragoomba) = { + .id = NPC_Paragoomba, + .settings = &N(NpcSettings_Paragoomba_Wander), + .pos = { 960.0f, 210.0f, -20.0f }, + .yaw = 270, + .flags = NPC_FLAG_LOCK_ANIMS, + .drops = PARAGOOMBA_DROPS, + .territory = { + .wander = { + .isFlying = FALSE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 960, 210, -20 }, + .wanderSize = { 50, 25 }, + .detectShape = SHAPE_RECT, + .detectPos = { 995, 210, -57 }, + .detectSize = { 210, 100 }, + } + }, + .animations = PARAGOOMBA_ANIMS, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +NpcGroupList N(NpcsBefore) = { + NPC_GROUP(N(NpcData_Goomba_01), BTL_KMR_PART_1_FORMATION_00, BTL_KMR_PART_1_STAGE_03), + NPC_GROUP(N(NpcData_Goomba_02), BTL_KMR_PART_1_FORMATION_00, BTL_KMR_PART_1_STAGE_03), + NPC_GROUP(N(NpcData_SpikedGoomba), BTL_KMR_PART_3_FORMATION_00, BTL_KMR_PART_3_STAGE_03), + NPC_GROUP(N(NpcData_Paragoomba), BTL_KMR_PART_3_FORMATION_01, BTL_KMR_PART_3_STAGE_03), + {} +}; + +NpcGroupList N(NpcsAfter) = { + NPC_GROUP(N(NpcData_Goomba_01), BTL_KMR_PART_1_FORMATION_00, BTL_KMR_PART_1_STAGE_03), + NPC_GROUP(N(NpcData_Goomba_02), BTL_KMR_PART_1_FORMATION_00, BTL_KMR_PART_1_STAGE_03), + NPC_GROUP(N(NpcData_SpikedGoomba), BTL_KMR_PART_1_FORMATION_0A, BTL_KMR_PART_1_STAGE_03), + NPC_GROUP(N(NpcData_Paragoomba), BTL_KMR_PART_1_FORMATION_08, BTL_KMR_PART_1_STAGE_03), + {} +}; diff --git a/src/world/area_kmr/kmr_05/kmr_05_4_entity.c b/src/world/area_kmr/kmr_05/kmr_05_4_entity.c new file mode 100644 index 0000000000..4cac84abf7 --- /dev/null +++ b/src/world/area_kmr/kmr_05/kmr_05_4_entity.c @@ -0,0 +1,7 @@ +#include "kmr_05.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeItemEntity, ITEM_STAR_PIECE, 133, 140, -155, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_KMR05_Item_StarPiece) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kmr/kmr_05/kmr_05_5_foliage.c b/src/world/area_kmr/kmr_05/kmr_05_5_foliage.c new file mode 100644 index 0000000000..adc41810f4 --- /dev/null +++ b/src/world/area_kmr/kmr_05/kmr_05_5_foliage.c @@ -0,0 +1,88 @@ +#include "kmr_05.h" + +#include "common/foliage.inc.c" + +API_CALLABLE(N(func_8024173C_8CF7AC)) { + if (get_enemy_safe(NPC_06) == NULL) { + script->varTable[0] = FALSE; + } else { + script->varTable[0] = TRUE; + } + + return ApiStatus_DONE2; +} + +EvtScript N(EVS_80243234) = { + EVT_WAIT(15) + EVT_CALL(N(func_8024173C_8CF7AC)) + EVT_IF_EQ(LVar0, 1) + EVT_CALL(SetNpcVar, NPC_06, 4, 1) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +FoliageModelList N(Tree1_LeafModels) = { + .count = 3, + .models = { + MODEL_ha2_1, + MODEL_ha2_2, + MODEL_ha2_3, + } +}; + +FoliageModelList N(Tree1_TrunkModels) = { + .count = 3, + .models = { + MODEL_o1065, + MODEL_miki2_1, + MODEL_miki2_2, + } +}; + +FoliageVectorList N(Tree1_Effects) = { + .count = 2, + .vectors = { + { 439.0f, 314.0f, -181.0f }, + { 524.0f, 314.0f, -210.0f }, + } +}; + +EvtScript N(Tree1_CallbackScript) = { + EVT_IF_EQ(GF_KMR05_Tree1_Coin, TRUE) + EVT_RETURN + EVT_END_IF + EVT_IF_EQ(MF_Unk_0A, TRUE) + EVT_RETURN + EVT_END_IF + EVT_WAIT(10) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_IF_LT(LVar0, 490) + EVT_CALL(MakeItemEntity, ITEM_COIN, 540, 290, -180, ITEM_SPAWN_MODE_FALL, GF_KMR05_Tree1_Coin) + EVT_ELSE + EVT_CALL(MakeItemEntity, ITEM_COIN, 436, 300, -180, ITEM_SPAWN_MODE_FALL, GF_KMR05_Tree1_Coin) + EVT_END_IF + EVT_SET(MF_Unk_0A, TRUE) + EVT_RETURN + EVT_END +}; + +ShakeTreeConfig N(ShakeTree_Tree1) = { + .leaves = &N(Tree1_LeafModels), + .trunk = &N(Tree1_TrunkModels), + .vectors = &N(Tree1_Effects), + .callback = &N(Tree1_CallbackScript), +}; + +BombTrigger N(BombPos_Tree1) = { + .pos = { 488.0f, 245.0f, -196.0f }, + .radius = 0.0f +}; + +EvtScript N(EVS_SetupFoliage) = { + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o1238, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kmr/kmr_06/8D1510.c b/src/world/area_kmr/kmr_06/8D1510.c deleted file mode 100644 index 98c64ed89a..0000000000 --- a/src/world/area_kmr/kmr_06/8D1510.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "kmr_06.h" - -static char* N(exit_str_0) = "kmr_09"; -static char* N(exit_str_1) = "kmr_07"; - -#include "world/common/enemy/ai/FlyingAI.inc.c" diff --git a/src/world/area_kmr/kmr_06/8D2A10.c b/src/world/area_kmr/kmr_06/8D2A10.c deleted file mode 100644 index 3a91827743..0000000000 --- a/src/world/area_kmr/kmr_06/8D2A10.c +++ /dev/null @@ -1,34 +0,0 @@ -#include "kmr_06.h" - -INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D2A10", func_80241500_8D2A10); - -INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D2A10", func_802417A8_8D2CB8); - -INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D2A10", func_802417E0_8D2CF0); - -INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D2A10", func_80241950_8D2E60); - -INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D2A10", func_802419EC_8D2EFC); - -INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D2A10", func_80241A68_8D2F78); - -INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D2A10", func_80241C78_8D3188); - -ApiStatus func_80241CC8_8D31D8(Evt* script, s32 isInitialCall) { - // todo use correct types - s32* mapVar10 = evt_get_variable(script, MapVar(10)); - s32 mapVar11 = evt_get_variable(script, MapVar(11)); - s32 mapVar12 = evt_get_variable(script, MapVar(12)); - - free_generic_entity(mapVar10[1]); - - heap_free(mapVar10); - heap_free(mapVar11); - heap_free(mapVar12); - - evt_set_variable(script, MapVar(10), NULL); - evt_set_variable(script, MapVar(11), NULL); - evt_set_variable(script, MapVar(12), NULL); - - return ApiStatus_DONE2; -} diff --git a/src/world/area_kmr/kmr_06/kmr_06.h b/src/world/area_kmr/kmr_06/kmr_06.h index f4056e73a1..9cd1c3db53 100644 --- a/src/world/area_kmr/kmr_06/kmr_06.h +++ b/src/world/area_kmr/kmr_06/kmr_06.h @@ -2,9 +2,35 @@ /// @brief Goomba Region - Goomba Road 2 #include "common.h" -#include "../kmr.h" #include "message_ids.h" #include "map.h" + #include "../kmr.h" +#include "mapfs/kmr_06_shape.h" +#include "mapfs/kmr_06_hit.h" + +#include "sprite/npc/SpikedGoomba.h" +#include "sprite/npc/Paragoomba.h" + +enum { + NPC_SpikedGoomba = 0, + NPC_Paragoomba = 1, +}; + +enum { + MF_Unk_0A = MapFlag(10), +}; + +enum { + MV_StickerData = MapVar(10), + MV_StickerImage = MapVar(11), + MV_StickerPalette = MapVar(12), +}; #define NAMESPACE kmr_06 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_MakeEntities); +extern EvtScript N(EVS_SetupStickerSign); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_kmr/kmr_06/kmr_06_0_header.c b/src/world/area_kmr/kmr_06/kmr_06_0_header.c new file mode 100644 index 0000000000..6d29b61880 --- /dev/null +++ b/src/world/area_kmr/kmr_06/kmr_06_0_header.c @@ -0,0 +1,14 @@ +#include "kmr_06.h" + +EntryList N(Entrances) = { + [kmr_06_ENTRY_0] { -110.0, 0.0, 33.0, 90.0 }, + [kmr_06_ENTRY_1] { 850.0, 0.0, 35.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_kmr_06 }, +}; diff --git a/src/world/area_kmr/kmr_06/kmr_06_1_music.c b/src/world/area_kmr/kmr_06/kmr_06_1_music.c new file mode 100644 index 0000000000..f4ad8eb77c --- /dev/null +++ b/src/world/area_kmr/kmr_06/kmr_06_1_music.c @@ -0,0 +1,7 @@ +#include "kmr_06.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_PLEASANT_PATH, 0, 8) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kmr/kmr_06/kmr_06_2_main.c b/src/world/area_kmr/kmr_06/kmr_06_2_main.c new file mode 100644 index 0000000000..3ab26cd138 --- /dev/null +++ b/src/world/area_kmr/kmr_06/kmr_06_2_main.c @@ -0,0 +1,28 @@ +#include "kmr_06.h" + +EvtScript N(EVS_ExitWalk_kmr_09_1) = EVT_EXIT_WALK(60, kmr_06_ENTRY_0, "kmr_09", kmr_09_ENTRY_1); +EvtScript N(EVS_ExitWalk_kmr_07_0) = EVT_EXIT_WALK(60, kmr_06_ENTRY_1, "kmr_07", kmr_07_ENTRY_0); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kmr_09_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deili1, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kmr_07_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deili2, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_GOOMBA_ROAD) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilit1, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilit2, COLLIDER_FLAGS_UPPER_MASK) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_WAIT(1) + EVT_EXEC_WAIT(N(EVS_SetupStickerSign)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kmr/kmr_06/kmr_06_3_npc.c b/src/world/area_kmr/kmr_06/kmr_06_3_npc.c new file mode 100644 index 0000000000..be3df60a24 --- /dev/null +++ b/src/world/area_kmr/kmr_06/kmr_06_3_npc.c @@ -0,0 +1,172 @@ +#include "kmr_06.h" + +#include "world/common/enemy/ai/FlyingAI.inc.c" + +MobileAISettings N(D_80242040_8D3550) = { + .moveSpeed = 1.5f, + .moveTime = 30, + .waitTime = 30, + .alertRadius = 130.0f, + .playerSearchInterval = 1, + .chaseSpeed = 2.5f, + .chaseTurnRate = 180, + .chaseUpdateInterval = 3, + .chaseRadius = 150.0f, + .unk_AI_2C = 1, +}; + +EvtScript N(EVS_NpcAI_SpikedGoomba) = { + EVT_CALL(BasicAI_Main, EVT_PTR(N(D_80242040_8D3550))) + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_SpikedGoomba) = { + .height = 23, + .radius = 23, + .level = 6, + .ai = &N(EVS_NpcAI_SpikedGoomba), + .onHit = &EnemyNpcHit, + .onDefeat = &EnemyNpcDefeat, +}; + +f32 N(FlyingAI_JumpVels)[] = { + 4.5, 3.5, 2.6, 2.0, 1.5, 20.0, +}; + +MobileAISettings N(AISettings_Paragoomba) = { + .moveSpeed = 1.6f, + .moveTime = 60, + .waitTime = 30, + .alertRadius = 80.0f, + .playerSearchInterval = 5, + .chaseSpeed = 2.2f, + .chaseTurnRate = 60, + .chaseUpdateInterval = 15, + .chaseRadius = 100.0f, + .unk_AI_2C = 1, +}; + +EvtScript N(EVS_NpcAI_Paragoomba) = { + EVT_CALL(SetSelfVar, 0, 0) + EVT_CALL(SetSelfVar, 5, -500) + EVT_CALL(SetSelfVar, 6, 21) + EVT_CALL(SetSelfVar, 1, 580) + EVT_CALL(N(FlyingAI_Main), EVT_PTR(N(AISettings_Paragoomba))) + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_Paragoomba) = { + .height = 20, + .radius = 21, + .level = 6, + .ai = &N(EVS_NpcAI_Paragoomba), + .onHit = &EnemyNpcHit, + .onDefeat = &EnemyNpcDefeat, + .actionFlags = AI_ACTION_02, +}; + +StaticNpc N(NpcData_SpikedGoomba) = { + .id = NPC_SpikedGoomba, + .settings = &N(NpcSettings_SpikedGoomba), + .pos = { 160.0f, 0.0f, 30.0f }, + .yaw = 270, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_MUSHROOM, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 160, 0, 30 }, + .wanderSize = { 30, 20 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 160, 0, 30 }, + .detectSize = { 300 }, + } + }, + .animations = { + .idle = ANIM_SpikedGoomba_Idle, + .walk = ANIM_SpikedGoomba_Walk, + .run = ANIM_SpikedGoomba_Run, + .chase = ANIM_SpikedGoomba_Run, + .anim_4 = ANIM_SpikedGoomba_Idle, + .anim_5 = ANIM_SpikedGoomba_Idle, + .death = ANIM_SpikedGoomba_HurtStill, + .hit = ANIM_SpikedGoomba_HurtStill, + .anim_8 = ANIM_SpikedGoomba_Run, + .anim_9 = ANIM_SpikedGoomba_Run, + .anim_A = ANIM_SpikedGoomba_Run, + .anim_B = ANIM_SpikedGoomba_Run, + .anim_C = ANIM_SpikedGoomba_Run, + .anim_D = ANIM_SpikedGoomba_Run, + .anim_E = ANIM_SpikedGoomba_Run, + .anim_F = ANIM_SpikedGoomba_Run, + }, +}; + +StaticNpc N(NpcData_Paragoomba) = { + .id = NPC_Paragoomba, + .settings = &N(NpcSettings_Paragoomba), + .pos = { 525.0f, 60.0f, 15.0f }, + .yaw = 270, + .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_MUSHROOM, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 525, 60, 15 }, + .wanderSize = { 30 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 525, 60, 15 }, + .detectSize = { 300 }, + } + }, + .animations = { + .idle = ANIM_Paragoomba_Idle, + .walk = ANIM_Paragoomba_Walk, + .run = ANIM_Paragoomba_Run, + .chase = ANIM_Paragoomba_Run, + .anim_4 = ANIM_Paragoomba_Idle, + .anim_5 = ANIM_Paragoomba_Idle, + .death = ANIM_Paragoomba_Hurt, + .hit = ANIM_Paragoomba_Hurt, + .anim_8 = ANIM_Paragoomba_Run, + .anim_9 = ANIM_Paragoomba_Run, + .anim_A = ANIM_Paragoomba_Run, + .anim_B = ANIM_Paragoomba_Run, + .anim_C = ANIM_Paragoomba_Run, + .anim_D = ANIM_Paragoomba_Run, + .anim_E = ANIM_Paragoomba_Run, + .anim_F = ANIM_Paragoomba_Run, + }, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_SpikedGoomba), BTL_KMR_PART_1_FORMATION_0B, BTL_KMR_PART_1_STAGE_02), + NPC_GROUP(N(NpcData_Paragoomba), BTL_KMR_PART_1_FORMATION_09, BTL_KMR_PART_1_STAGE_02), + {} +}; diff --git a/src/world/area_kmr/kmr_06/kmr_06_4_entity.c b/src/world/area_kmr/kmr_06/kmr_06_4_entity.c new file mode 100644 index 0000000000..b22cc60d4a --- /dev/null +++ b/src/world/area_kmr/kmr_06/kmr_06_4_entity.c @@ -0,0 +1,10 @@ +#include "kmr_06.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_HeartBlock), 800, 60, 0, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_RedBlock), 220, 60, 10, 0, ITEM_CLOSE_CALL, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_KMR06_BadgeBlock_CloseCall) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kmr/kmr_06/kmr_06_5_sticker_sign.c b/src/world/area_kmr/kmr_06/kmr_06_5_sticker_sign.c new file mode 100644 index 0000000000..46e582a925 --- /dev/null +++ b/src/world/area_kmr/kmr_06/kmr_06_5_sticker_sign.c @@ -0,0 +1,261 @@ +#include "kmr_06.h" +#include "ld_addrs.h" + +extern s32 gItemIconRasterOffsets[]; +extern s32 gItemIconPaletteOffsets[]; + +typedef struct StickerData { + /* 0x00 */ s32 folderID; + /* 0x04 */ s32 workerID; + /* 0x08 */ Vec3f pos; + /* 0x14 */ f32 pitch; + /* 0x18 */ f32 yaw; + /* 0x1C */ Vec3f scale; + /* 0x28 */ Vec3f goalPos; + /* 0x34 */ f32 moveAngle; + /* 0x38 */ f32 moveSpeed; + /* 0x3C */ f32 fallSpeed; + /* 0x40 */ f32 gravity; + /* 0x44 */ s32 duration; +} StickerData; + +void N(appendGfx_sticker)(void* renderData) { + FoldImageRecPart foldImage; + Matrix4f mtxTransform; + Matrix4f mtxTemp; + + StickerData* sticker = (StickerData*) evt_get_variable(NULL, MV_StickerData); + IMG_PTR img = (IMG_PTR) evt_get_variable(NULL, MV_StickerImage); + PAL_PTR pal = (PAL_PTR) evt_get_variable(NULL, MV_StickerPalette); + u32 foldFlags = FOLD_STATE_FLAG_400; + + gDPPipeSync(gMasterGfxPos++); + guTranslateF(mtxTransform, sticker->pos.x, sticker->pos.y, sticker->pos.z); + guRotateF(mtxTemp, sticker->yaw, 0.0f, 1.0f, 0.0f); + guMtxCatF(mtxTemp, mtxTransform, mtxTransform); + guRotateF(mtxTemp, sticker->pitch, 1.0f, 0.0f, 0.0f); + guMtxCatF(mtxTemp, mtxTransform, mtxTransform); + guScaleF(mtxTemp, sticker->scale.x, sticker->scale.y, sticker->scale.z); + guMtxCatF(mtxTemp, mtxTransform, mtxTransform); + guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); + gSPMatrix(gMasterGfxPos++, VIRTUAL_TO_PHYSICAL(&gDisplayContext->matrixStack[gMatrixListPos++]), + G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + + foldImage.raster = img; + foldImage.palette = pal; + foldImage.width = 32; + foldImage.height = 32; + foldImage.xOffset = -16; + foldImage.yOffset = 16; + foldImage.opacity = 255; + + if (sticker->yaw != 0.0 || sticker->pitch != 0.0) { + foldFlags |= FOLD_STATE_FLAG_2000; + } + fold_update(0, 0, 0, 0, 0, 0, 0); + fold_appendGfx_component(0, &foldImage, foldFlags, mtxTransform); + + gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); +} + +void N(worker_render_sticker)(void) { + RenderTask renderTask; + RenderTask* renderTaskPtr = &renderTask; + + renderTaskPtr->renderMode = RENDER_MODE_ALPHATEST; + renderTaskPtr->appendGfxArg = 0; + renderTaskPtr->appendGfx = &N(appendGfx_sticker); + renderTaskPtr->distance = 0; + queue_render_task(renderTaskPtr); +} + +API_CALLABLE(N(CreateSticker)) { + Bytecode* args = script->ptrReadPos; + s32 itemID = evt_get_variable(script, *args++); + + StickerData* sticker = (StickerData*) heap_malloc(sizeof(*sticker)); + IMG_PTR iconImg = heap_malloc(0x200); + PAL_PTR iconPal = heap_malloc(0x20); + + s32 iconBase = (s32) icon_present_ROM_START; + s32 iconImgEnd = iconBase + 0x200; + s32 iconPalEnd = iconBase + 0x20; + + sticker->pos.x = 0.0f; + sticker->pos.y = 0.0f; + sticker->pos.z = 0.0f; + sticker->pitch = 0.0f; + sticker->yaw = 0.0f; + sticker->goalPos.x = 0.0f; + sticker->goalPos.y = 0.0f; + sticker->goalPos.z = 0.0f; + sticker->moveAngle = 0.0f; + sticker->moveSpeed = 0.0f; + sticker->fallSpeed = 0.0f; + sticker->gravity = 0.0f; + sticker->scale.x = 1.0f; + sticker->scale.y = 1.0f; + sticker->scale.z = 1.0f; + + sticker->duration = 0; + dma_copy( + (u8*) (iconBase + gItemIconRasterOffsets[itemID]), + (u8*) (iconImgEnd + gItemIconRasterOffsets[itemID]), + iconImg); + dma_copy( + (u8*) (iconBase + gItemIconPaletteOffsets[itemID]), + (u8*) (iconPalEnd + gItemIconPaletteOffsets[itemID]), + iconPal); + + sticker->folderID = func_8013A704(1); + sticker->workerID = create_generic_entity_world(NULL, N(worker_render_sticker)); + evt_set_variable(script, MapVar(10), (s32) sticker); + evt_set_variable(script, MapVar(11), (s32) iconImg); + evt_set_variable(script, MapVar(12), (s32) iconPal); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(SetStickerPos)) { + Bytecode* args = script->ptrReadPos; + f32 x = evt_get_float_variable(script, *args++); + f32 y = evt_get_float_variable(script, *args++); + f32 z = evt_get_float_variable(script, *args++); + StickerData* sticker = (StickerData*) evt_get_variable(script, MV_StickerData); + + sticker->pos.x = x; + sticker->pos.y = y; + sticker->pos.z = z; + return ApiStatus_DONE2; +} + +API_CALLABLE(N(SetStickerRotation)) { + Bytecode* args = script->ptrReadPos; + f32 pitch = evt_get_float_variable(script, *args++); + f32 yaw = evt_get_float_variable(script, *args++); + StickerData* sticker = (StickerData*) evt_get_variable(script, MV_StickerData); + + sticker->pitch = pitch; + sticker->yaw = yaw; + return ApiStatus_DONE2; +} + +API_CALLABLE(N(JumpStickerTo)) { + Bytecode* args = script->ptrReadPos; + StickerData* data = (StickerData*) evt_get_variable(script, MV_StickerData); + f32 x, y, z, dist; + + if (isInitialCall) { + script->functionTemp[0] = 0; + } + + if (script->functionTemp[0] == 0) { + x = evt_get_float_variable(script, *args++); + y = evt_get_float_variable(script, *args++) + 12.0f; + z = evt_get_float_variable(script, *args++); + data->goalPos.x = x; + data->goalPos.y = y; + data->goalPos.z = z; + data->duration = evt_get_variable(script, *args++); + dist = dist2D(data->pos.x, data->pos.z, data->goalPos.x, data->goalPos.z); + data->moveAngle = atan2(data->pos.x, data->pos.z, data->goalPos.x, data->goalPos.z); + + y = data->goalPos.y - data->pos.y; + if (data->duration == 0) { + // oversight here: + // moveSpeed is initialized to zero and never changed except in prior calls to JumpStickerTo + // this will cause a divide by zero if duration = 0 is used for the first call + data->duration = dist / data->moveSpeed; + } else { + data->moveSpeed = dist / data->duration; + } + + data->fallSpeed = (data->gravity * data->duration * 0.5f) + y / data->duration; + script->functionTemp[0] = 1; + } + + data->pos.x = data->pos.x + data->moveSpeed * sin_deg(data->moveAngle); + data->pos.z = data->pos.z - data->moveSpeed * cos_deg(data->moveAngle); + data->pos.y = data->pos.y + data->fallSpeed; + data->fallSpeed -= data->gravity; + + data->duration--; + if (data->duration < 0) { + data->fallSpeed = 0.0f; + data->pos.x = data->goalPos.x; + data->pos.y = data->goalPos.y; + data->pos.z = data->goalPos.z; + return ApiStatus_DONE1; + } else { + return ApiStatus_BLOCK; + } +} + +API_CALLABLE(N(SetStickerGravity)) { + Bytecode* args = script->ptrReadPos; + f32 gravity = evt_get_float_variable(script, *args++); + StickerData* data = (StickerData*) evt_get_variable(script, MV_StickerData); + + data->gravity = gravity; + return ApiStatus_DONE2; +} + +API_CALLABLE(N(DeleteSticker)) { + StickerData* data = (StickerData*) evt_get_variable(script, MV_StickerData); + IMG_PTR img = (IMG_PTR) evt_get_variable(script, MV_StickerImage); + PAL_PTR pal = (PAL_PTR) evt_get_variable(script, MV_StickerPalette); + + free_generic_entity(data->workerID); + + heap_free(data); + heap_free(img); + heap_free(pal); + + evt_set_variable(script, MV_StickerData, NULL); + evt_set_variable(script, MV_StickerImage, NULL); + evt_set_variable(script, MV_StickerPalette, NULL); + + return ApiStatus_DONE2; +} + +EvtScript N(EVS_OnInspect_StickerSign) = { + EVT_SET_GROUP(EVT_GROUP_00) + EVT_SUSPEND_GROUP(EVT_GROUP_01) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_Sign_EatMushroomsTip, 160, 40) + EVT_IF_EQ(GF_KMR06_Item_Mushroom, FALSE) + EVT_IF_EQ(MF_Unk_0A, FALSE) + EVT_SET(MF_Unk_0A, TRUE) + EVT_THREAD + EVT_WAIT(2) + EVT_SETF(LVar0, EVT_FLOAT(0.0)) + EVT_LOOP(18) + EVT_ADDF(LVar0, EVT_FLOAT(10.0)) + EVT_CALL(N(SetStickerRotation), 0, LVar0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(N(SetStickerRotation), 0, 0) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(N(SetStickerGravity), EVT_FLOAT(0.6)) + EVT_CALL(N(JumpStickerTo), 362, 0, 40, 23) + EVT_CALL(N(DeleteSticker)) + EVT_CALL(MakeItemEntity, ITEM_MUSHROOM, 362, 0, 40, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_KMR06_Item_Mushroom) + EVT_END_THREAD + EVT_WAIT(10) + EVT_END_IF + EVT_END_IF + EVT_RESUME_GROUP(EVT_GROUP_01) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupStickerSign) = { + EVT_IF_EQ(GF_KMR06_Item_Mushroom, FALSE) + EVT_CALL(N(CreateSticker), ITEM_MUSHROOM) + EVT_CALL(N(SetStickerPos), 362, 40, -17) + EVT_END_IF + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnInspect_StickerSign)), TRIGGER_WALL_PRESS_A, COLLIDER_o852, 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kzn/kzn_06/kzn_06_3_extra.c b/src/world/area_kzn/kzn_06/kzn_06_3_extra.c index aca5dc927e..be4a62ec3f 100644 --- a/src/world/area_kzn/kzn_06/kzn_06_3_extra.c +++ b/src/world/area_kzn/kzn_06/kzn_06_3_extra.c @@ -1,8 +1,6 @@ #include "kzn_06.h" #include "model.h" -MAP_RODATA_PAD(1, C6E318); - #include "world/common/atomic/LavaGlowLighting.inc.c" API_CALLABLE(N(AdjustFog)) { diff --git a/src/world/area_nok/nok_02/9D7020.c b/src/world/area_nok/nok_02/9D7020.c index bf00eb41fc..8ed4d950a0 100644 --- a/src/world/area_nok/nok_02/9D7020.c +++ b/src/world/area_nok/nok_02/9D7020.c @@ -7,17 +7,10 @@ static char* N(exit_str_3) = ""; #include "world/common/entity/Pipe.inc.c" +#define NAMESPACE dup_nok_02 #include "world/common/todo/StashVars.inc.c" - -#define NAMESPACE dup_nok_02 #include "world/common/todo/GetItemName.inc.c" -#define NAMESPACE nok_02 - -#define NAMESPACE dup_nok_02 #include "world/common/todo/GetNpcCollisionHeight.inc.c" -#define NAMESPACE nok_02 - -#define NAMESPACE dup_nok_02 #include "world/common/todo/AddPlayerHandsOffset.inc.c" #define NAMESPACE nok_02 diff --git a/src/world/area_nok/nok_13/A01420.c b/src/world/area_nok/nok_13/A01420.c index 8278412a87..f1a26b1940 100644 --- a/src/world/area_nok/nok_13/A01420.c +++ b/src/world/area_nok/nok_13/A01420.c @@ -1,6 +1,6 @@ #include "nok_13.h" -INCLUDE_ASM(s32, "world/area_nok/nok_13/A01420", func_80240E20_A01420); +#include "world/common/util/MonitorPlayerOrbiting.inc.c" ApiStatus func_80241360_A01960(Evt* script) { Bytecode* args = script->ptrReadPos; @@ -10,4 +10,26 @@ ApiStatus func_80241360_A01960(Evt* script) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "world/area_nok/nok_13/A01420", func_802413CC_A019CC); +extern EvtScript D_80242134_A02734; + +void N(musical_hill_orbit_listener)(PlayerOrbitState* orbit, s32 event) { + Evt* script; + + switch (event) { + case PLAYER_ORBIT_BEGIN: + script = start_script(&D_80242134_A02734, EVT_PRIORITY_1, 0); + script->varTable[0] = 0x84; + break; + case PLAYER_ORBIT_COMPLETE_ROTATION: + make_item_entity_nodelay(ITEM_HEART, orbit->pos.x, orbit->pos.y, orbit->pos.z, + ITEM_SPAWN_MODE_TOSS_SPAWN_ALWAYS, 0); + break; + case PLAYER_ORBIT_CHANGE_DIRECTION: + case PLAYER_ORBIT_LEFT_REGION: + script = start_script(&D_80242134_A02734, EVT_PRIORITY_1, 0); + script->varTable[0] = 0x11; + break; + } + + return; +} diff --git a/src/world/area_sbk/sbk_30/sbk_30_2_main.c b/src/world/area_sbk/sbk_30/sbk_30_2_main.c index 56e788772c..1b85a86bd9 100644 --- a/src/world/area_sbk/sbk_30/sbk_30_2_main.c +++ b/src/world/area_sbk/sbk_30/sbk_30_2_main.c @@ -96,5 +96,3 @@ EvtScript N(EVS_Main) = { EVT_RETURN EVT_END }; - -MAP_RODATA_PAD(1,main); diff --git a/src/world/area_sbk/sbk_30/sbk_30_3_npc.c b/src/world/area_sbk/sbk_30/sbk_30_3_npc.c index 9d73561123..4a212943f7 100644 --- a/src/world/area_sbk/sbk_30/sbk_30_3_npc.c +++ b/src/world/area_sbk/sbk_30/sbk_30_3_npc.c @@ -23,7 +23,7 @@ NpcSettings N(NpcSettings_Archeologist_01) = { #include "world/common/complete/GiveReward.inc.c" #include "world/common/complete/KeyItemChoice.inc.c" -MAP_STATIC_PAD(2,main); +MAP_STATIC_PAD(1,key_item); #include "world/common/complete/NormalItemChoice.inc.c" #include "world/common/atomic/LetterChoice.inc.c" @@ -88,14 +88,14 @@ EvtScript N(EVS_NpcInteract_Kolorado) = { EVT_SET(GF_SBK_KeptArtifactFromKolorado, TRUE) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_CH2_0040) EVT_END_IF - EVT_CHOOSE_KEY_ITEM(N(ArtifactList)) + EVT_CHOOSE_KEY_ITEM_FROM(N(ArtifactList)) EVT_SWITCH(LVar0) EVT_CASE_GE(1) EVT_EXEC_WAIT(N(EVS_ArtifactPrompt)) EVT_GOTO(50) EVT_CASE_DEFAULT EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_CH2_0041) - EVT_CHOOSE_KEY_ITEM(N(ArtifactList)) + EVT_CHOOSE_KEY_ITEM_FROM(N(ArtifactList)) EVT_SWITCH(LVar0) EVT_CASE_GE(1) EVT_EXEC_WAIT(N(EVS_ArtifactPrompt)) diff --git a/src/world/area_trd/trd_06/trd_06_1_main.c b/src/world/area_trd/trd_06/trd_06_1_main.c index f131c2ad67..282c42fa28 100644 --- a/src/world/area_trd/trd_06/trd_06_1_main.c +++ b/src/world/area_trd/trd_06/trd_06_1_main.c @@ -15,8 +15,6 @@ extern EvtScript N(EVS_Scene_ImprisonedKoopaBros); EvtScript N(EVS_ExitDoors_trd_04_5) = EVT_EXIT_DOUBLE_DOOR(trd_06_ENTRY_1, "trd_04", trd_04_ENTRY_5, COLLIDER_ttw, MODEL_o93, MODEL_o94); -MAP_RODATA_PAD(1,pad); //TODO remove - EvtScript N(EVS_EnterMap) = { EVT_CALL(GetEntryID, LVar0) EVT_SWITCH(LVar0) diff --git a/src/world/area_trd/trd_06/trd_06_4_npc_koopa_bros.c b/src/world/area_trd/trd_06/trd_06_4_npc_koopa_bros.c index 008fd38972..5775eb5e91 100644 --- a/src/world/area_trd/trd_06/trd_06_4_npc_koopa_bros.c +++ b/src/world/area_trd/trd_06/trd_06_4_npc_koopa_bros.c @@ -219,3 +219,6 @@ NpcGroupList N(NpcGroup_KoopaBros) = { NPC_GROUP(N(NpcData_KoopaBros)), {} }; + +#define PARTY_IMAGE "party_pinki" +#include "world/common/todo/LoadPartyImage.inc.c" diff --git a/src/world/area_trd/trd_06/trd_06_6_party_image.c b/src/world/area_trd/trd_06/trd_06_6_party_image.c deleted file mode 100644 index 7a67b436af..0000000000 --- a/src/world/area_trd/trd_06/trd_06_6_party_image.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "trd_06.h" - -#define PARTY_IMAGE "party_pinki" -#include "world/common/todo/LoadPartyImage.inc.c" diff --git a/src/world/common/atomic/LetterChoice.inc.c b/src/world/common/atomic/LetterChoice.inc.c index 4402e03b5c..a041b12b61 100644 --- a/src/world/common/atomic/LetterChoice.inc.c +++ b/src/world/common/atomic/LetterChoice.inc.c @@ -1,13 +1,13 @@ #include "common.h" -//TODO remove +//TODO this should be static, but causes wierd padding issues in sbk_30 extern s32 N(LetterDelivery_SavedNpcAnim); #include "world/common/complete/GiveReward.inc.c" #include "world/common/complete/KeyItemChoice.inc.c" -ApiStatus N(LetterDelivery_Init)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(LetterDelivery_Init)) { Bytecode* args = script->ptrReadPos; script->varTable[2] = evt_get_variable(script, *args++); @@ -23,7 +23,7 @@ ApiStatus N(LetterDelivery_Init)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(LetterDelivery_CalcLetterPos)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(LetterDelivery_CalcLetterPos)) { Bytecode* args = script->ptrReadPos; s32 varX = *args++; f32 x = evt_get_variable(script, varX); @@ -44,7 +44,7 @@ ApiStatus N(LetterDelivery_CalcLetterPos)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(LetterDelivery_SaveNpcAnim)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(LetterDelivery_SaveNpcAnim)) { Npc* npc = get_npc_unsafe(script->varTable[2]); N(LetterDelivery_SavedNpcAnim) = npc->currentAnim; @@ -52,7 +52,7 @@ ApiStatus N(LetterDelivery_SaveNpcAnim)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(LetterDelivery_RestoreNpcAnim)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(LetterDelivery_RestoreNpcAnim)) { Npc* npc = get_npc_unsafe(script->varTable[2]); npc->currentAnim = N(LetterDelivery_SavedNpcAnim); diff --git a/src/world/common/atomic/Quizmo.inc.c b/src/world/common/atomic/Quizmo.inc.c index 7b1645a91b..d8a106fa80 100644 --- a/src/world/common/atomic/Quizmo.inc.c +++ b/src/world/common/atomic/Quizmo.inc.c @@ -4,33 +4,33 @@ // TODO, can we remove this once all data disasm'ed? extern QuizRequirement N(Quizmo_Requirements)[]; extern u8 N(Quizmo_Answers)[64]; -extern s32** N(Quizmo_varStash); +extern s32** N(varStash); void N(Quizmo_NPC_OnRender)(Npc* npc); -ApiStatus N(Quizmo_StashVars)(Evt* script, s32 isInitialCall) { +ApiStatus N(StashVars)(Evt* script, s32 isInitialCall) { //static s32** varTable = NULL; s32 i; - if (N(Quizmo_varStash) == NULL) { - N(Quizmo_varStash) = heap_malloc(sizeof(script->varTable)); + if (N(varStash) == NULL) { + N(varStash) = heap_malloc(sizeof(script->varTable)); for (i = 0; i < ARRAY_COUNT(script->varTable); i++) { - N(Quizmo_varStash)[i] = script->varTablePtr[i]; + N(varStash)[i] = script->varTablePtr[i]; } } else { for (i = 0; i < ARRAY_COUNT(script->varTable); i++) { - script->varTablePtr[i] = N(Quizmo_varStash)[i]; + script->varTablePtr[i] = N(varStash)[i]; } - heap_free(N(Quizmo_varStash)); - N(Quizmo_varStash) = NULL; + heap_free(N(varStash)); + N(varStash) = NULL; } return ApiStatus_DONE2; } -ApiStatus N(Quizmo_GetItemName)(Evt* script, s32 isInitialCall) { +ApiStatus N(GetItemName)(Evt* script, s32 isInitialCall) { Bytecode args = *script->ptrReadPos; s32 itemID = evt_get_variable(script, args); diff --git a/src/world/common/atomic/QuizmoData.inc.c b/src/world/common/atomic/QuizmoData.inc.c index c98598be98..70eba3d7e3 100644 --- a/src/world/common/atomic/QuizmoData.inc.c +++ b/src/world/common/atomic/QuizmoData.inc.c @@ -5,7 +5,7 @@ # error CHUCK_QUIZMO_NPC_ID must be defined for QuizmoData.inc.c #endif -s32** N(Quizmo_varStash) = NULL; +s32** N(varStash) = NULL; EvtScript N(EVS_Quizmo_GiveItem_0) = { EVT_CALL(ShowGotItem, LVar0, 1, 0) diff --git a/src/world/common/atomic/ToadHouse.data.inc.c b/src/world/common/atomic/ToadHouse.data.inc.c new file mode 100644 index 0000000000..2d111569ef --- /dev/null +++ b/src/world/common/atomic/ToadHouse.data.inc.c @@ -0,0 +1,101 @@ +#include "common.h" + +EvtScript N(8024AC14) = { + EVT_CALL(EnableModel, LVar4, FALSE) + EVT_CALL(EnableModel, LVar5, TRUE) + EVT_CALL(RotateModel, LVar6, 0, 0, 0, 1) + EVT_CALL(RotateModel, LVar7, 0, 0, 0, 1) + EVT_RETURN + EVT_END +}; + +EvtScript N(8024AC8C) = { + EVT_SET(LVar9, LVar7) + EVT_SET(LVar8, LVar6) + EVT_SET(LVar7, LVar5) + EVT_SET(LVar6, LVar4) + EVT_WAIT(70) + EVT_CALL(EnableModel, LVar6, FALSE) + EVT_THREAD + EVT_WAIT(5) + EVT_CALL(EnableModel, LVar6, TRUE) + EVT_END_THREAD + EVT_CALL(MakeLerp, 0, 180, 20, EASING_CUBIC_IN) + EVT_LABEL(1) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, LVar8, LVar0, 0, 0, -1) + EVT_CALL(RotateModel, LVar9, LVar0, 0, 0, -1) + EVT_IF_EQ(LVar1, 1) + EVT_WAIT(1) + EVT_GOTO(1) + EVT_END_IF + EVT_CALL(EnableModel, LVar7, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_ToadHouseKeeper) = { + EVT_CALL(N(ToadHouse_InitScreenOverlay), 0, 0, 0) + EVT_EXEC_WAIT(N(EVS_SetToadHouseDialogue)) + EVT_IF_EQ(LVar0, 0) + EVT_RETURN + EVT_END_IF + EVT_SET(LVar9, LVar1) + EVT_SET(LVarA, LVar2) + EVT_SET(LVarB, LVar3) + EVT_CALL(N(ToadHouse_DoesPlayerNeedSleep)) + EVT_IF_EQ(LVar1, 0) + EVT_SET(LVar8, LVar0) + EVT_END_IF + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, LVar8) + EVT_CALL(ShowChoice, MSG_Choice_0006) + EVT_WAIT(3) + EVT_IF_EQ(LVar0, 1) + EVT_CALL(ContinueSpeech, NPC_SELF, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, LVar9) + EVT_RETURN + EVT_END_IF + EVT_CALL(ContinueSpeech, NPC_SELF, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, LVarA) + EVT_CALL(SetPlayerJumpscale, 1) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(N(ToadHouse_DisableStatusMenu)) + EVT_IF_NE(LVar4, 0) + EVT_EXEC(N(8024AC8C)) + EVT_END_IF + EVT_CALL(N(ToadHouse_PutPartnerAway), LVarA) + EVT_WAIT(20) + EVT_EXEC_WAIT(N(EVS_ToadHouse_GetInBed)) + EVT_THREAD + EVT_CALL(MakeLerp, 0, 255, 60, EASING_LINEAR) + EVT_LABEL(0) + EVT_CALL(UpdateLerp) + EVT_CALL(N(ToadHouse_UpdateScreenOverlay), 3, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(FullyRestoreHPandFP) + EVT_CALL(FullyRestoreSP) + EVT_IF_NE(LVar4, 0) + EVT_EXEC(N(8024AC14)) + EVT_END_IF + EVT_CALL(N(ToadHouse_GetPartnerBackOut), LVarA) + EVT_WAIT(45) + EVT_CALL(MakeLerp, 255, 0, 30, EASING_LINEAR) + EVT_LABEL(1) + EVT_CALL(UpdateLerp) + EVT_CALL(N(ToadHouse_UpdateScreenOverlay), 0, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(1) + EVT_END_IF + EVT_END_THREAD + EVT_WAIT(105) + EVT_EXEC_WAIT(N(EVS_ToadHouse_ReturnFromRest)) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, FALSE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, LVarB) + EVT_CALL(N(ToadHouse_ShowStatusMenu)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/common/atomic/ToadHouse.inc.c b/src/world/common/atomic/ToadHouse.inc.c index ee31e7bdd9..c710f6ed45 100644 --- a/src/world/common/atomic/ToadHouse.inc.c +++ b/src/world/common/atomic/ToadHouse.inc.c @@ -2,18 +2,18 @@ #include "npc.h" #include "../../partners.h" -ApiStatus N(ToadHouse_DisableStatusMenu)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(ToadHouse_DisableStatusMenu)) { func_800E9894(); return ApiStatus_DONE2; } -ApiStatus N(ToadHouse_ShowStatusMenu)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(ToadHouse_ShowStatusMenu)) { func_800E98C4(); sync_status_menu(); return ApiStatus_DONE2; } -ApiStatus N(ToadHouse_UpdateScreenOverlay)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(ToadHouse_UpdateScreenOverlay)) { Bytecode* args = script->ptrReadPos; s32 type = evt_get_variable(script, *args++); s32 zoom = evt_get_variable(script, *args++); @@ -23,7 +23,7 @@ ApiStatus N(ToadHouse_UpdateScreenOverlay)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(ToadHouse_CamSetFOV)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(ToadHouse_CamSetFOV)) { Bytecode* args = script->ptrReadPos; s32 camIdx = evt_get_variable(script, *args++); @@ -31,7 +31,7 @@ ApiStatus N(ToadHouse_CamSetFOV)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(ToadHouse_AwaitScriptComplete)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(ToadHouse_AwaitScriptComplete)) { Bytecode* args = script->ptrReadPos; s32 waitingScriptID = evt_get_variable(script, *args++); @@ -42,7 +42,7 @@ ApiStatus N(ToadHouse_AwaitScriptComplete)(Evt* script, s32 isInitialCall) { } } -ApiStatus N(ToadHouse_PartnerSuspendAbilityScript)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(ToadHouse_PartnerSuspendAbilityScript)) { if (gPlayerData.currentPartner == PARTNER_NONE) { return ApiStatus_DONE2; } @@ -50,12 +50,12 @@ ApiStatus N(ToadHouse_PartnerSuspendAbilityScript)(Evt* script, s32 isInitialCal return ApiStatus_DONE2; } -ApiStatus N(ToadHouse_PartnerResumeAbilityScript)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(ToadHouse_PartnerResumeAbilityScript)) { partner_resume_ability_script(); return ApiStatus_DONE2; } -ApiStatus N(ToadHouse_DoesPlayerNeedSleep)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(ToadHouse_DoesPlayerNeedSleep)) { PlayerData* playerData = &gPlayerData; script->varTable[1] = FALSE; @@ -73,7 +73,7 @@ ApiStatus N(ToadHouse_DoesPlayerNeedSleep)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(ToadHouse_InitScreenOverlay)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(ToadHouse_InitScreenOverlay)) { Bytecode* args = script->ptrReadPos; s32 r = evt_get_variable(script, *args++); s32 g = evt_get_variable(script, *args++); @@ -83,7 +83,7 @@ ApiStatus N(ToadHouse_InitScreenOverlay)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(ToadHouse_PutPartnerAway)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(ToadHouse_PutPartnerAway)) { Bytecode* args = script->ptrReadPos; Bytecode saveToVar = *args++; @@ -92,7 +92,7 @@ ApiStatus N(ToadHouse_PutPartnerAway)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(ToadHouse_GetPartnerBackOut)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(ToadHouse_GetPartnerBackOut)) { Bytecode* args = script->ptrReadPos; Bytecode readFromVar = *args++; @@ -101,6 +101,6 @@ ApiStatus N(ToadHouse_GetPartnerBackOut)(Evt* script, s32 isInitialCall) { } // do nothing (unused) -ApiStatus N(ToadHouse_Stub)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(ToadHouse_Stub)) { return ApiStatus_DONE2; } diff --git a/src/world/common/complete/KeyItemChoice.inc.c b/src/world/common/complete/KeyItemChoice.inc.c index 3aff8196be..bf68a7f113 100644 --- a/src/world/common/complete/KeyItemChoice.inc.c +++ b/src/world/common/complete/KeyItemChoice.inc.c @@ -3,7 +3,7 @@ #include "common.h" -static s32 N(KeyItemChoiceList)[ITEM_NUM_KEYS]; +static s32 N(KeyItemChoiceList)[ITEM_NUM_KEYS + 1]; #ifndef _CHOICE_SUPPORT_ #define _CHOICE_SUPPORT_ @@ -80,7 +80,7 @@ EvtScript N(EVS_ChooseKeyItem) = { EVT_SET(LVar1, 0) \ EVT_EXEC_WAIT(N(EVS_ChooseKeyItem)) -#define EVT_CHOOSE_KEY_ITEM(itemList) \ +#define EVT_CHOOSE_KEY_ITEM_FROM(itemList) \ EVT_SET(LVar0, EVT_PTR(itemList)) \ EVT_SET(LVar1, 0) \ EVT_EXEC_WAIT(N(EVS_ChooseKeyItem)) diff --git a/src/world/common/complete/LetterDelivery.inc.c b/src/world/common/complete/LetterDelivery.inc.c new file mode 100644 index 0000000000..8e86d09cf9 --- /dev/null +++ b/src/world/common/complete/LetterDelivery.inc.c @@ -0,0 +1,182 @@ +#include "common.h" +#include "sprite/npc/WorldParakarry.h" + +static s32 N(LetterDelivery_SavedNpcAnim); + +#include "world/common/complete/GiveReward.inc.c" + +#include "world/common/complete/KeyItemChoice.inc.c" + +API_CALLABLE(N(LetterDelivery_Init)) { + Bytecode* args = script->ptrReadPos; + + script->varTable[2] = evt_get_variable(script, *args++); + script->varTable[3] = evt_get_variable(script, *args++); + script->varTable[4] = evt_get_variable(script, *args++); + script->varTable[5] = evt_get_variable(script, *args++); + script->varTable[6] = evt_get_variable(script, *args++); + script->varTable[7] = evt_get_variable(script, *args++); + script->varTable[8] = evt_get_variable(script, *args++); + script->varTable[9] = evt_get_variable(script, *args++); + script->varTable[10] = evt_get_variable(script, *args++); + script->varTable[11] = evt_get_variable(script, *args++); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(LetterDelivery_CalcLetterPos)) { + Bytecode* args = script->ptrReadPos; + s32 varX = *args++; + f32 x = evt_get_variable(script, varX); + s32 varY = *args++; + f32 y = evt_get_variable(script, varY); + s32 varZ = *args++; + f32 z = evt_get_variable(script, varZ); + Npc* partner = get_npc_unsafe(NPC_PARTNER); + f32 currentCamYaw = clamp_angle(gCameras[gCurrentCameraID].currentYaw + 180.0f); + + add_vec2D_polar(&x, &z, 15.0f, partner->yaw); + add_vec2D_polar(&x, &z, 10.0f, currentCamYaw); + + evt_set_variable(script, varX, x); + evt_set_variable(script, varY, y); + evt_set_variable(script, varZ, z); + + return ApiStatus_DONE2; +} + +API_CALLABLE(N(LetterDelivery_SaveNpcAnim)) { + Npc* npc = get_npc_unsafe(script->varTable[2]); + + N(LetterDelivery_SavedNpcAnim) = npc->currentAnim; + npc->currentAnim = script->varTable[4]; + return ApiStatus_DONE2; +} + +API_CALLABLE(N(LetterDelivery_RestoreNpcAnim)) { + Npc* npc = get_npc_unsafe(script->varTable[2]); + + npc->currentAnim = N(LetterDelivery_SavedNpcAnim); + return ApiStatus_DONE2; +} + +EvtScript N(D_80245450_C7C130) = { + EVT_LOOP(0) + EVT_CALL(GetNpcPos, NPC_PARTNER, LVar3, LVar4, LVar5) + EVT_CALL(N(LetterDelivery_CalcLetterPos), LVar3, LVar4, LVar5) + EVT_CALL(SetItemPos, LVar0, LVar3, LVar4, LVar5) + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(D_802454D0_C7C1B0) = { + EVT_SET(LVar9, LVar1) + EVT_CALL(ShowKeyChoicePopup) + EVT_SET(LVarA, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(0) + EVT_CASE_EQ(-1) + EVT_CASE_DEFAULT + EVT_CALL(RemoveKeyItemAt, LVar1) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(GetNpcPos, NPC_PARTNER, LVar3, LVar4, LVar5) + EVT_CALL(N(LetterDelivery_CalcLetterPos), LVar3, LVar4, LVar5) + EVT_BITWISE_OR_CONST(LVar0, 0x00050000) + EVT_CALL(MakeItemEntity, LVar0, LVar3, LVar4, LVar5, ITEM_SPAWN_MODE_DECORATION, 0) + EVT_EXEC_GET_TID(N(D_80245450_C7C130), LVarA) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_WorldParakarry_Walk) + EVT_CALL(GetAngleBetweenNPCs, LVar9, NPC_PARTNER, LVarB) + EVT_CALL(GetNpcPos, NPC_PARTNER, LVar3, LVar4, LVar5) + EVT_CALL(GetNpcPos, LVar9, LVar6, LVar7, LVar8) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_100, TRUE) + EVT_IF_LE(LVarB, 180) + EVT_ADD(LVar6, 20) + EVT_ELSE + EVT_ADD(LVar6, -20) + EVT_END_IF + EVT_ADD(LVar7, 10) + EVT_CALL(SetNpcJumpscale, NPC_PARTNER, EVT_FLOAT(0.0)) + EVT_CALL(NpcJump1, NPC_PARTNER, LVar6, LVar7, LVar8, 20) + EVT_KILL_THREAD(LVarA) + EVT_CALL(RemoveItemEntity, LVar0) + EVT_WAIT(20) + EVT_CALL(GetNpcYaw, NPC_PARTNER, LVarA) + EVT_ADD(LVarA, 180) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, LVarA, 0) + EVT_WAIT(5) + EVT_CALL(NpcJump1, NPC_PARTNER, LVar3, LVar4, LVar5, 20) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_WorldParakarry_Idle) + EVT_CALL(NpcFaceNpc, NPC_PARTNER, LVar9, 0) + EVT_WAIT(5) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_100, FALSE) + EVT_CALL(EnablePartnerAI) + EVT_WAIT(5) + EVT_END_SWITCH + EVT_CALL(N(ItemChoice_SaveSelected), LVarA) + EVT_CALL(CloseChoicePopup) + EVT_UNBIND + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ShowLetterChoice) = { + EVT_SET(LVar0, LVarB) + EVT_SET(LVar1, LVar2) + EVT_CALL(N(BuildKeyItemChoiceList), LVar0) + EVT_BIND_PADLOCK(N(D_802454D0_C7C1B0), TRIGGER_FORCE_ACTIVATE, 0, EVT_PTR(N(KeyItemChoiceList)), 0, 1) + EVT_CALL(N(ItemChoice_WaitForSelection), LVar0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_DoLetterDelivery) = { + EVT_SET(LVarC, 0) + EVT_IF_LT(GB_StoryProgress, STORY_CH2_PARAKARRY_JOINED_PARTY) + EVT_RETURN + EVT_END_IF + EVT_CALL(N(LetterDelivery_SaveNpcAnim)) + EVT_CALL(GetCurrentPartnerID, LVar0) + EVT_CALL(FindKeyItem, LVar5, LVar1) + EVT_IF_EQ(LVar0, PARTNER_PARAKARRY) + EVT_IF_NE(LVar1, -1) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(PlayerFaceNpc, LVar2, FALSE) + EVT_WAIT(1) + EVT_CALL(GetNpcPos, LVar2, LVarD, LVar0, LVarE) + EVT_CALL(GetNpcPos, NPC_PARTNER, LVarD, LVarE, LVarF) + EVT_CALL(SetNpcJumpscale, NPC_PARTNER, EVT_FLOAT(0.0)) + EVT_ADD(LVar0, 10) + EVT_CALL(NpcJump1, NPC_PARTNER, LVarD, LVar0, LVarF, 10) + EVT_CALL(SpeakToNpc, NPC_PARTNER, ANIM_WorldParakarry_Talk, ANIM_WorldParakarry_Idle, 0, LVar2, LVar7) + EVT_CALL(EnablePartnerAI) + EVT_EXEC_WAIT(N(EVS_ShowLetterChoice)) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(-1) + EVT_CALL(DisablePartnerAI, 0) + EVT_WAIT(1) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldParakarry_Talk, ANIM_WorldParakarry_Idle, 5, LVar8) + EVT_CALL(EnablePartnerAI) + EVT_SET(LVarC, 1) + EVT_CASE_DEFAULT + EVT_CALL(DisablePartnerAI, 0) + EVT_WAIT(1) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldParakarry_Talk, ANIM_WorldParakarry_Idle, 5, LVar9) + EVT_IF_NE(LVarA, 0) + EVT_CALL(SpeakToPlayer, LVar2, LVar3, LVar4, 0, LVarA) + EVT_END_IF + EVT_CALL(EnablePartnerAI) + EVT_IF_NE(LVar6, 0) + EVT_SET(LVar0, LVar6) + EVT_SET(LVar1, ITEM_TYPE_KEY) + EVT_EXEC_WAIT(N(GiveKeyReward)) + EVT_CALL(AddKeyItem, LVar6) + EVT_END_IF + EVT_SET(LVarC, 2) + EVT_END_SWITCH + EVT_END_IF + EVT_END_IF + EVT_CALL(N(LetterDelivery_RestoreNpcAnim)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/common/complete/NormalItemChoice.inc.c b/src/world/common/complete/NormalItemChoice.inc.c index db841b3834..2ab7068c8e 100644 --- a/src/world/common/complete/NormalItemChoice.inc.c +++ b/src/world/common/complete/NormalItemChoice.inc.c @@ -3,7 +3,7 @@ #include "common.h" -static s32 N(ItemChoice_List)[ITEM_NUM_CONSUMABLES]; +static s32 N(ItemChoice_List)[ITEM_NUM_CONSUMABLES + 1]; #ifndef _CHOICE_SUPPORT_ #define _CHOICE_SUPPORT_ @@ -96,7 +96,7 @@ EvtScript N(EVS_ChooseItem) = { EVT_SET(LVar1, 2) \ EVT_EXEC_WAIT(N(EVS_ChooseItem)) -#define EVT_CHOOSE_CONSUMABLE(itemList) \ +#define EVT_CHOOSE_CONSUMABLE_FROM(itemList) \ EVT_SET(LVar0, EVT_PTR(itemList)) \ EVT_SET(LVar1, 2) \ EVT_EXEC_WAIT(N(EVS_ChooseItem)) diff --git a/src/world/common/complete/Quizmo.inc.c b/src/world/common/complete/Quizmo.inc.c new file mode 100644 index 0000000000..eb2ea88c0a --- /dev/null +++ b/src/world/common/complete/Quizmo.inc.c @@ -0,0 +1,1188 @@ +#include "common.h" +#include "message_ids.h" +#include "effects.h" +#include "sprite/npc/ChuckQuizmo.h" + +#ifndef CHUCK_QUIZMO_NPC_ID +# error CHUCK_QUIZMO_NPC_ID must be defined for Quizmo.inc.c +#endif + +#define QUIZMO_DROPS \ +{ \ + .dropFlags = NPC_DROP_FLAGS_80, \ + .heartDrops = NO_DROPS, \ + .flowerDrops = NO_DROPS, \ +} + +#define QUIZMO_ANIMS \ +{ \ + ANIM_ChuckQuizmo_Idle, \ + ANIM_ChuckQuizmo_Walk, \ + ANIM_ChuckQuizmo_Run, \ + ANIM_ChuckQuizmo_Run, \ + ANIM_ChuckQuizmo_Idle, \ + ANIM_ChuckQuizmo_Idle, \ + ANIM_ChuckQuizmo_Still, \ + ANIM_ChuckQuizmo_Still, \ + ANIM_ChuckQuizmo_Run, \ + ANIM_ChuckQuizmo_Run, \ + ANIM_ChuckQuizmo_Run, \ + ANIM_ChuckQuizmo_Run, \ + ANIM_ChuckQuizmo_Run, \ + ANIM_ChuckQuizmo_Run, \ + ANIM_ChuckQuizmo_Run, \ + ANIM_ChuckQuizmo_Run, \ +} + +extern s16 MessagePlural; +extern s16 MessageSingular; + +static s32 N(Quizmo_Worker); +static s32 N(pad_D_8024EFA4); +static s32 N(Quizmo_ScriptArray)[4]; +static s32 N(Quizmo_AnswerResult); +MAP_STATIC_PAD(1,quizmo_unk) +static EffectInstance* N(Quizmo_StageEffect); +static EffectInstance* N(Quizmo_AudienceEffect); +static EffectInstance* N(Quizmo_VannaTEffect); + +#include "world/common/complete/GiveReward.inc.c" + +// values for Quizmo npc init vars +enum { + QUIZ_AREA_MAC = 0, + QUIZ_AREA_KMR = 1, + QUIZ_AREA_NOK = 2, + QUIZ_AREA_DRO = 3, + QUIZ_AREA_JAN = 4, + QUIZ_AREA_SAM = 5, + QUIZ_AREA_HOS = 6, +}; + +enum { + QUIZ_MAP_DRO_01 = 0, + QUIZ_MAP_DRO_02 = 1, + QUIZ_COUNT_DRO = 2, +}; + +u8 N(Quizmo_Answers)[64] = { + 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x02, 0x00, + 0x02, 0x01, 0x00, 0x02, 0x01, 0x01, 0x00, 0x02, + 0x00, 0x02, 0x01, 0x00, 0x00, 0x02, 0x01, 0x00, + 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, + 0x00, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, + 0x02, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x01, + 0x01, 0x00, 0x01, 0x02, 0x01, 0x00, 0x02, 0x02, + 0x01, 0x02, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01, +}; + +QuizRequirement N(Quizmo_Requirements)[] = { + { STORY_CH0_KAMMY_RETURNED_TO_BOWSER, 0 }, + { STORY_CH1_BEGAN_PEACH_MISSION, 10 }, + { STORY_CH2_BEGAN_PEACH_MISSION, 20 }, + { STORY_CH3_BEGAN_PEACH_MISSION, 30 }, + { STORY_CH4_BEGAN_PEACH_MISSION, 37 }, + { STORY_CH5_STAR_SPRIT_DEPARTED, 44 }, + { STORY_CH6_BEGAN_PEACH_MISSION, 52 }, + { STORY_CH7_BEGAN_PEACH_MISSION, 60 }, + { STORY_EPILOGUE, 64 }, + { 0, 64 }, // end of list +}; + +API_CALLABLE(N(Quizmo_HideEntities)) { + gEntityHideMode = 1; + return ApiStatus_DONE2; +} + +API_CALLABLE(N(Quizmo_ShowEntities)) { + gEntityHideMode = 0; + return ApiStatus_DONE2; +} + +API_CALLABLE(N(Quizmo_ShouldAppear)) { + Enemy* enemy = script->owner1.enemy; + u16 hasLocation = evt_get_variable(script, GF_Quizmo_HasLocation); + u16 changedLocation = evt_get_variable(script, GF_Quizmo_ChangedLocation); + u16 locTown = evt_get_variable(script, GB_ChuckQuizmo_Town); + u16 locMap = evt_get_variable(script, GB_ChuckQuizmo_Map); + s32 var; + s32 i; + + s32 test2; + u16 curTown1 = (enemy->varTable[0] & 0xFF0000) >> 16; + u16 curTown2 = (enemy->varTable[0] & 0xFF0000) >> 16; + u16 numMaps = (enemy->varTable[0] & 0xFF00) >> 8; + u16 curMap = (enemy->varTable[0] & 0xFF) >> 0; + s32 progress; + s32 numAnswered; + + if (curTown1 != locTown) { + changedLocation = FALSE; + hasLocation = FALSE; + } + + if (!hasLocation) { + if (rand_int(100) < 30) { + locMap = rand_int(numMaps - 1); + locTown = curTown1; + evt_set_variable(script, GB_ChuckQuizmo_Town, locTown); + evt_set_variable(script, GB_ChuckQuizmo_Map, locMap); + hasLocation = TRUE; + } + } + + evt_set_variable(script, GF_Quizmo_HasLocation, hasLocation); + evt_set_variable(script, GF_Quizmo_ChangedLocation, changedLocation); + numAnswered = evt_get_variable(NULL, GB_CompletedQuizzes); + progress = evt_get_variable(NULL, GB_StoryProgress); + + // vanilla bug? never checks the final requirement in the list + for (i = 0; i < 8; i++) { + if (progress < N(Quizmo_Requirements)[i].requiredStoryProgress) { + break; + } + } + + //TODO clean this up + progress = numAnswered < N(Quizmo_Requirements)[i].numQuestionsUnlocked; + test2 = var = progress; + + if ((((curTown2 == locTown) && (curMap == locMap) && (changedLocation == 0) && test2)) || + (gGameStatusPtr->debugQuizmo && var)) { + script->varTable[0] = TRUE; + } else { + kill_enemy(enemy); + script->varTable[0] = FALSE; + } + + return ApiStatus_DONE2; +} + +void N(Quizmo_NPC_OnRender)(Npc* npc); + +API_CALLABLE(N(Quizmo_RenderInit)) { + Npc* npc = get_npc_unsafe(script->owner2.npcID); + + npc->onRender = N(Quizmo_NPC_OnRender); + npc->blur.quizmo = heap_malloc(sizeof(*npc->blur.quizmo)); + npc->blur.quizmo->flags = 0; + + return ApiStatus_DONE1; +} + +API_CALLABLE(N(Quizmo_NPC_Aux_Impl)) { + // does nothing, probably a default/template function for NPCs + get_npc_unsafe(script->owner2.npcID); + return ApiStatus_BLOCK; +} + +void N(Quizmo_NPC_OnRender)(Npc* npc) { + Camera* camera = &gCameras[gCurrentCamID]; + + if (npc->blur.quizmo->flags & 1) { + clamp_angle(-camera->currentYaw); + } +} + +API_CALLABLE(N(Quizmo_HideWorld)) { + if (isInitialCall) { + s32 i; + + mdl_set_all_fog_mode(1); + *gBgRenderTypePtr = BACKGROUND_RENDER_TYPE_1; + set_background_color_blend(0, 0, 0, 0); + + for (i = 0; i < MAX_NPCS; i++) { + Npc* npc = get_npc_by_index(i); + + if (npc != NULL && npc->flags != 0 && npc->npcID != NPC_PARTNER && npc->npcID != CHUCK_QUIZMO_NPC_ID) { + npc->flags |= NPC_FLAG_NO_DROPS; // odd + } + } + + for (i = 0; i < MAX_ITEM_ENTITIES; i++) { + ItemEntity* itemEntity = get_item_entity(i); + + if (itemEntity != NULL && itemEntity->flags & ITEM_ENTITY_FLAGS_10) { + itemEntity->flags |= ITEM_ENTITY_FLAGS_8000000; + } + } + + script->functionTemp[0] = 0; + } + + script->functionTemp[0] += 8; + if (script->functionTemp[0] > 255) { + script->functionTemp[0] = 255; + } + + set_background_color_blend(0, 0, 0, script->functionTemp[0]); + + if (script->functionTemp[0] == 255) { + return ApiStatus_DONE2; + } else { + return ApiStatus_BLOCK; + } +} + +API_CALLABLE(N(Quizmo_FadeInWorld)) { + s32 i; + + if (isInitialCall) { + set_background_color_blend(0, 0, 0, 255); + script->functionTemp[0] = 255; + script->functionTemp[1] = 0; + } + + script->functionTemp[0] -= 8; + if (script->functionTemp[0] < 0) { + script->functionTemp[0] = 0; + } + + set_background_color_blend(0, 0, 0, script->functionTemp[0]); + if (script->functionTemp[0] == 0 && script->functionTemp[1] == 0) { + script->functionTemp[1] = 1; + } else if (script->functionTemp[1] == 1) { + mdl_set_all_fog_mode(0); + *gBgRenderTypePtr = BACKGROUND_RENDER_TYPE_0; + + for (i = 0; i < MAX_NPCS; i++) { + Npc* npc = get_npc_by_index(i); + if (npc != NULL && npc->flags != 0) { + if (npc->npcID != NPC_PARTNER && npc->npcID != CHUCK_QUIZMO_NPC_ID) { + npc->flags &= ~NPC_FLAG_NO_DROPS; + } + } + } + + for (i = 0; i < MAX_ITEM_ENTITIES; i++) { + ItemEntity* entity = get_item_entity(i); + if (entity != NULL && entity->flags & ITEM_ENTITY_FLAGS_10) { + entity->flags &= ~ITEM_ENTITY_FLAGS_8000000; + } + } + + return ApiStatus_DONE2; + } + + return ApiStatus_BLOCK; +} + +API_CALLABLE(N(Quizmo_UpdateRecords)) { + u16 quizzesAnswered = gPlayerData.quizzesAnswered; + + if (quizzesAnswered < 999) { + gPlayerData.quizzesAnswered++; + } + + if (script->varTable[0] == N(Quizmo_Answers)[evt_get_variable(NULL, GB_CompletedQuizzes)]) { + script->varTable[0] = 1; + gPlayerData.quizzesCorrect++; + } else { + script->varTable[0] = 0; + } + + return ApiStatus_DONE2; +} + +API_CALLABLE(N(Quizmo_CreateStage)) { + QuizmoStageFXData* stageData; + + if (isInitialCall) { + N(Quizmo_StageEffect) = fx_quizmo_stage(0, + evt_get_variable(script, ArrayVar(1)), + evt_get_variable(script, ArrayVar(2)), + evt_get_variable(script, ArrayVar(3))); + N(Quizmo_AudienceEffect) = fx_quizmo_audience(0, + evt_get_variable(script, ArrayVar(1)), + evt_get_variable(script, ArrayVar(2)), + evt_get_variable(script, ArrayVar(3))); + N(Quizmo_VannaTEffect) = fx_quizmo_assistant(0, + evt_get_variable(script, ArrayVar(1)), + evt_get_variable(script, ArrayVar(2)), + evt_get_variable(script, ArrayVar(3)), + 1.0f, 0); + + stageData = N(Quizmo_StageEffect)->data.quizmoStage; + stageData->microphoneRaiseAmt = 0; + stageData->leftWallRaiseAmt = 0; + stageData->rightWallRaiseAmt = 0; + stageData->podiumRaiseAmt = 0; + stageData->rearWallRaiseAmt = 0; + } + + stageData = N(Quizmo_StageEffect)->data.quizmoStage; + + stageData->leftWallRaiseAmt += 10; + stageData->podiumRaiseAmt += 10; + stageData->rightWallRaiseAmt += 10; + stageData->microphoneRaiseAmt += 10; + stageData->rearWallRaiseAmt += 10; + if (stageData->microphoneRaiseAmt >= 255) { + stageData->microphoneRaiseAmt = 255; + return ApiStatus_DONE2; + } + + return ApiStatus_BLOCK; +} + +API_CALLABLE(N(Quizmo_DestroyEffects)) { + QuizmoStageFXData* stageData; + + if (isInitialCall) { + N(Quizmo_AudienceEffect)->flags |= EFFECT_INSTANCE_FLAGS_10; + N(Quizmo_VannaTEffect)->flags |= EFFECT_INSTANCE_FLAGS_10; + } + + stageData = N(Quizmo_StageEffect)->data.quizmoStage; + stageData->microphoneRaiseAmt -= 10; + stageData->leftWallRaiseAmt -= 10; + stageData->rightWallRaiseAmt -= 10; + stageData->podiumRaiseAmt -= 10; + stageData->rearWallRaiseAmt -= 10; + + if (stageData->microphoneRaiseAmt <= 0) { + stageData->microphoneRaiseAmt = 0; + remove_effect(N(Quizmo_StageEffect)); + free_generic_entity(N(Quizmo_Worker)); + return ApiStatus_DONE2; + } + + return ApiStatus_BLOCK; +} + +API_CALLABLE(N(Quizmo_SetStageLightsDelay)) { + N(Quizmo_StageEffect)->data.quizmoStage->lightScrollDelay = evt_get_variable(script, *script->ptrReadPos); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(Quizmo_UnkStageEffectMode)) { + s32 var = evt_get_variable(script, *script->ptrReadPos); + QuizmoStageFXData* stageData = N(Quizmo_StageEffect)->data.quizmoStage; + + switch (var) { + case 0: + stageData->unkEffectMode = 0xC0; + break; + case 1: + stageData->unkEffectMode = 0x80; + break; + case 2: + stageData->unkEffectMode = 0x40; + break; + default: + stageData->unkEffectMode = 0; + break; + } + + return ApiStatus_DONE2; +} + +API_CALLABLE(N(Quizmo_SetVannaAnim_Idle)) { + N(Quizmo_VannaTEffect)->data.quizmoAssistant->anim = 0; + return ApiStatus_DONE2; +} + +API_CALLABLE(N(Quizmo_SetVannaAnim_Clap)) { + N(Quizmo_VannaTEffect)->data.quizmoAssistant->anim = 1; + return ApiStatus_DONE2; +} + +API_CALLABLE(N(Quizmo_SetVannaAnim_Wave)) { + N(Quizmo_VannaTEffect)->data.quizmoAssistant->anim = 2; + return ApiStatus_DONE2; +} + +API_CALLABLE(N(Quizmo_ShouldQuizmoLeave)) { + evt_set_variable(script, LVar0, gGameStatusPtr->debugQuizmo); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(Quizmo_SetCamVfov)) { + Bytecode* args = script->ptrReadPos; + s32 cameraID = evt_get_variable(script, *args++); + + gCameras[cameraID].vfov = evt_get_float_variable(script, *args++); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(Quizmo_GetCamVfov)) { + Bytecode* args = script->ptrReadPos; + s32 cameraID = evt_get_variable(script, *args++); + + evt_set_variable(script, *args++, EVT_FLOAT_TO_FIXED(gCameras[cameraID].vfov)); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(Quizmo_AddViewRelativeOffset)) { + Bytecode* args = script->ptrReadPos; + s32 x = evt_get_variable(script, *args++); + s32 y = evt_get_variable(script, *args++); + s32 z = evt_get_variable(script, *args++); + Bytecode ourVarX = *args++; + Bytecode outVarZ = *args++; + + s32 cameraYaw = gCameras[gCurrentCameraID].currentYaw; + s32 outX = evt_get_variable(script, ArrayVar(1)) - (z * cos_deg(cameraYaw)); + s32 outZ = evt_get_variable(script, ArrayVar(3)) - (z * sin_deg(cameraYaw)); + + outX -= x; + outZ -= y; + + evt_set_variable(script, ourVarX, outX); + evt_set_variable(script, outVarZ, outZ); + + return ApiStatus_DONE2; +} + +API_CALLABLE(N(Quizmo_SpinPlayer)) { + PlayerStatus* playerStatus = &gPlayerStatus; + + if (isInitialCall) { + script->functionTemp[0] = 60; + } + + playerStatus->targetYaw += 30.0f; + if (playerStatus->targetYaw >= 360.0f) { + playerStatus->targetYaw -= 360.0f; + } + + script->functionTemp[0]--; + + if (script->functionTemp[0] < 0) { + return ApiStatus_DONE2; + } else { + return ApiStatus_BLOCK; + } +} + +API_CALLABLE(N(Quizmo_SpinPartner)) { + Npc* partner = get_npc_unsafe(NPC_PARTNER); + + if (isInitialCall) { + script->functionTemp[0] = 60; + } + + partner->yaw += 30.0f; + if (partner->yaw >= 360.0f) { + partner->yaw -= 360.0f; + } + + script->functionTemp[0]--; + + if (script->functionTemp[0] < 0) { + return ApiStatus_DONE2; + } else { + return ApiStatus_BLOCK; + } +} + +API_CALLABLE(N(Quizmo_UpdatePartnerPosition)) { + Npc* npc = get_npc_unsafe(NPC_PARTNER); + f32* x = (f32*) &script->functionTemp[1]; + f32* y = (f32*) &script->functionTemp[2]; + f32* z = (f32*) &script->functionTemp[3]; + + if (isInitialCall) { + *x = evt_get_float_variable(script, LVar0) / 60.0f; + *y = evt_get_float_variable(script, LVar5) / 60.0f; + *z = evt_get_float_variable(script, LVar1) / 60.0f; + script->functionTemp[0] = 60; + } + + npc->pos.x += *x; + npc->pos.y += *y; + npc->pos.z += *z; + script->functionTemp[0]--; + + if (script->functionTemp[0] == 0) { + return ApiStatus_DONE2; + } else { + return ApiStatus_BLOCK; + } +} + +void N(Quizmo_CreateReactionEffect)(void) { + s32 result = evt_get_variable(NULL, N(Quizmo_AnswerResult)); + + if (result == 1) { + fx_quizmo_answer(0, 0, 0, 0); + } else if (result == 2) { + fx_quizmo_answer(1, 0, 0, 0); + } +} + +API_CALLABLE(N(Quizmo_CreateWorker)) { + N(Quizmo_Worker) = create_generic_entity_frontUI(NULL, N(Quizmo_CreateReactionEffect)); + return ApiStatus_DONE2; +} + +EvtScript N(EVS_Quizmo_Exit) = { + EVT_CALL(N(Quizmo_ShouldQuizmoLeave)) + EVT_IF_LE(LVar0, 1) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_ADD(LVar1, 300) + EVT_CALL(SetNpcJumpscale, NPC_SELF, 1) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_ChuckQuizmo_Vanish) + EVT_WAIT(40) + EVT_CALL(SetNpcPos, NPC_SELF, 0, -1000, 0) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Quizmo_SetQuizCamera) = { + EVT_CALL(N(Quizmo_GetCamVfov), 0, ArrayVar(0)) + EVT_CALL(N(Quizmo_SetCamVfov), 0, 25) //TODO + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, 0, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, 0, LVar0, LVar1, LVar2) + EVT_CALL(GetCamType, 0, LVar1, LVar2) + EVT_CALL(SetCamType, 0, LVar1, 0) + EVT_CALL(GetCamDistance, 0, LVar0) + EVT_IF_GT(LVar0, 0) + EVT_SETF(LVar0, 370) + EVT_ELSE + EVT_SETF(LVar0, -370) + EVT_END_IF + EVT_CALL(SetCamDistance, 0, LVar0) + EVT_CALL(GetCamPitch, 0, LVar0, LVar1) + EVT_SETF(LVar0, EVT_FLOAT(13.0)) + EVT_SETF(LVar1, EVT_FLOAT(-10.0)) + EVT_CALL(SetCamPitch, 0, LVar0, LVar1) + EVT_CALL(PanToTarget, 0, 0, 1) + EVT_CALL(SetCamLeadPlayer, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Quizmo_OtherCamScript) = { + EVT_CALL(GetNpcPos, CHUCK_QUIZMO_NPC_ID, LVar0, LVar1, LVar2) + EVT_ADD(LVar1, 30) + EVT_CALL(SetPanTarget, 0, LVar0, LVar1, LVar2) + EVT_CALL(GetCamDistance, 0, LVar0) + EVT_IF_GT(LVar0, 0) + EVT_SETF(LVar0, 17) + EVT_ELSE + EVT_SETF(LVar0, -17) + EVT_END_IF + EVT_CALL(SetCamDistance, 0, LVar0) + EVT_CALL(SetCamSpeed, 0, EVT_FLOAT(90.0)) + EVT_CALL(WaitForCam, 0, EVT_FLOAT(1.0)) + EVT_CALL(SetCamSpeed, 0, 1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Quizmo_ResetCamera) = { + EVT_CALL(N(Quizmo_SetCamVfov), 0, ArrayVar(0)) + EVT_CALL(PanToTarget, 0, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Quizmo_MovePlayerToPodium) = { + EVT_WAIT(20) + EVT_CALL(N(Quizmo_AddViewRelativeOffset), ArrayVar(1), ArrayVar(3), 83, LVar0, LVar1) + EVT_THREAD + EVT_SETF(LVar2, 0) + EVT_LOOP(60) + EVT_SETF(LVar3, LVar0) + EVT_SETF(LVar4, LVar1) + EVT_MULF(LVar3, LVar2) + EVT_MULF(LVar4, LVar2) + EVT_DIVF(LVar3, 60) + EVT_DIVF(LVar4, 60) + EVT_ADDF(LVar3, ArrayVar(1)) + EVT_ADDF(LVar4, ArrayVar(3)) + EVT_CALL(SetPlayerPos, LVar3, ArrayVar(2), LVar4) + EVT_ADDF(LVar2, 1) + EVT_WAIT(1) + EVT_END_LOOP + EVT_SETF(LVar3, LVar0) + EVT_SETF(LVar4, LVar1) + EVT_ADDF(LVar3, ArrayVar(1)) + EVT_ADDF(LVar4, ArrayVar(3)) + EVT_CALL(SetPlayerPos, LVar3, ArrayVar(2), LVar4) + EVT_END_THREAD + EVT_CALL(N(Quizmo_SpinPlayer)) + EVT_CALL(func_802D2884, ArrayVar(1), ArrayVar(3), 0) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Quizmo_MovePartnerToPodium) = { + EVT_CALL(GetNpcPos, NPC_PARTNER, LVarA, LVarB, LVarC) + EVT_CALL(N(Quizmo_AddViewRelativeOffset), LVarA, LVarC, 108, LVar0, LVar1) + EVT_SETF(LVar5, ArrayVar(2)) + EVT_SUBF(LVar5, LVarB) + EVT_THREAD + EVT_CALL(N(Quizmo_UpdatePartnerPosition)) + EVT_SETF(LVar3, LVar0) + EVT_SETF(LVar4, LVar1) + EVT_SETF(LVar6, LVar5) + EVT_ADDF(LVar3, LVarA) + EVT_ADDF(LVar4, LVarC) + EVT_ADDF(LVar6, LVarB) + EVT_CALL(SetNpcPos, NPC_PARTNER, LVar3, LVar6, LVar4) + EVT_END_THREAD + EVT_CALL(N(Quizmo_SpinPartner)) + EVT_CALL(NpcFacePlayer, NPC_PARTNER, 0) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Quizmo_MoveQuizmoToMicrophone) = { + EVT_CALL(GetNpcPos, CHUCK_QUIZMO_NPC_ID, LVarA, LVarB, LVarC) + EVT_CALL(N(Quizmo_AddViewRelativeOffset), LVarA, LVarC, -70, LVar0, LVar1) + EVT_THREAD + EVT_SETF(LVar2, 0) + EVT_LOOP(60) + EVT_SETF(LVar3, LVar0) + EVT_SETF(LVar4, LVar1) + EVT_MULF(LVar3, LVar2) + EVT_MULF(LVar4, LVar2) + EVT_DIVF(LVar3, 60) + EVT_DIVF(LVar4, 60) + EVT_ADDF(LVar3, LVarA) + EVT_ADDF(LVar4, LVarC) + EVT_CALL(SetNpcPos, CHUCK_QUIZMO_NPC_ID, LVar3, ArrayVar(2), LVar4) + EVT_ADDF(LVar2, 1) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_WAIT(60) + EVT_CALL(NpcFacePlayer, CHUCK_QUIZMO_NPC_ID, 0) + EVT_CALL(SetNpcAnimation, CHUCK_QUIZMO_NPC_ID, ANIM_ChuckQuizmo_Idle) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Quizmo_SetCharacterPositons) = { + EVT_EXEC(N(EVS_Quizmo_MovePlayerToPodium)) + EVT_EXEC(N(EVS_Quizmo_MovePartnerToPodium)) + EVT_EXEC_WAIT(N(EVS_Quizmo_MoveQuizmoToMicrophone)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Quizmo_PlayerThinking) = { + EVT_LOOP(0) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_Question) + EVT_WAIT(20) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Quizmo_PlayerHitBuzzer) = { + EVT_CALL(SetPlayerAnimation, ANIM_Mario_Throw) + EVT_WAIT(15) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Quizmo_PlayerReaction_RightAnswer) = { + EVT_LOOP(0) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_WAIT(1) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_BeforeJump) + EVT_WAIT(2) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_AnimMidairStill) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar1, 3) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_ADD(LVar1, 2) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_ADD(LVar1, 1) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_ADD(LVar1, 1) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_ADD(LVar1, 0) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_ADD(LVar1, 0) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_ADD(LVar1, 0) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_ADD(LVar1, 0) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_AnimMidair) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar1, 0) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_ADD(LVar1, 0) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_ADD(LVar1, 0) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_ADD(LVar1, -1) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_ADD(LVar1, -1) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_ADD(LVar1, -2) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_ADD(LVar1, -3) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10009) + EVT_WAIT(2) + EVT_WAIT(1) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_BeforeJump) + EVT_WAIT(2) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_AnimMidairStill) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar1, 3) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_ADD(LVar1, 2) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_ADD(LVar1, 1) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_ADD(LVar1, 1) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_ADD(LVar1, 0) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_ADD(LVar1, 0) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_ADD(LVar1, 0) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_ADD(LVar1, 0) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_AnimMidair) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar1, 0) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_ADD(LVar1, 0) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_ADD(LVar1, 0) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_ADD(LVar1, -1) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_ADD(LVar1, -1) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_ADD(LVar1, -2) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_ADD(LVar1, -3) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10009) + EVT_WAIT(2) + EVT_WAIT(1) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_BeforeJump) + EVT_WAIT(2) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_AnimMidairStill) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar1, 3) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_ADD(LVar1, 2) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_ADD(LVar1, 1) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_ADD(LVar1, 1) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_ADD(LVar1, 0) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_ADD(LVar1, 0) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_ADD(LVar1, 0) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_ADD(LVar1, 0) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_AnimMidair) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar1, 0) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_ADD(LVar1, 0) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_ADD(LVar1, 0) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_ADD(LVar1, -1) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_ADD(LVar1, -1) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_ADD(LVar1, -2) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_ADD(LVar1, -3) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10009) + EVT_WAIT(2) + EVT_END_LOOP + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerPos, LVar0, ArrayVar(2), LVar2) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Quizmo_PlayerReaction_WrongAnswer) = { + EVT_CALL(SetPlayerAnimation, ANIM_Mario_ShockStill) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Quizmo_ReturnPlayerToOriginalPos) = { + EVT_THREAD + EVT_CALL(N(Quizmo_AddViewRelativeOffset), ArrayVar(1), ArrayVar(3), 25, LVar0, LVar1) + EVT_SETF(LVar2, ArrayVar(1)) + EVT_ADDF(LVar2, LVar0) + EVT_SETF(LVar3, ArrayVar(3)) + EVT_ADDF(LVar3, LVar1) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_JUMP) + EVT_CALL(NpcMoveTo, NPC_PARTNER, LVar2, LVar3, 40) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_END_THREAD + EVT_CALL(PlayerMoveTo, ArrayVar(1), ArrayVar(3), 40) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Quizmo_RightAnswer) = { + EVT_EXEC_GET_TID(N(EVS_Quizmo_PlayerReaction_RightAnswer), LVar1) + EVT_WAIT(60) + EVT_KILL_THREAD(LVar1) + EVT_LOOP(5) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar1, -1) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(2) + EVT_END_LOOP + EVT_WAIT(20) + EVT_EXEC_WAIT(N(EVS_Quizmo_ReturnPlayerToOriginalPos)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Quizmo_WrongAnswer) = { + EVT_EXEC_GET_TID(N(EVS_Quizmo_PlayerReaction_WrongAnswer), LVar1) + EVT_WAIT(60) + EVT_LOOP(5) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar1, -1) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(2) + EVT_END_LOOP + EVT_WAIT(20) + EVT_KILL_THREAD(LVar1) + EVT_EXEC_WAIT(N(EVS_Quizmo_ReturnPlayerToOriginalPos)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Quizmo_QuizMain) = { + EVT_IF_GT(GB_CompletedQuizzes, 63) + EVT_SET(LVar0, 0) + EVT_RETURN + EVT_END_IF + EVT_CALL(GetPlayerPos, ArrayVar(1), ArrayVar(2), ArrayVar(3)) + EVT_CALL(NpcFacePlayer, NPC_SELF, 16) + EVT_IF_EQ(GB_CompletedQuizzes, 63) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ChuckQuizmo_Talk, ANIM_ChuckQuizmo_Idle, 0, MSG_MGM_000A) + EVT_ELSE + EVT_IF_EQ(GF_Met_ChuckQuizmo, 1) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ChuckQuizmo_Talk, ANIM_ChuckQuizmo_Idle, 0, MSG_MGM_0009) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ChuckQuizmo_Talk, ANIM_ChuckQuizmo_Idle, 0, MSG_MGM_0008) + EVT_SET(GF_Met_ChuckQuizmo, 1) + EVT_END_IF + EVT_END_IF + EVT_CALL(ShowChoice, MSG_Choice_000D) + EVT_IF_EQ(LVar0, 1) + EVT_CALL(ContinueSpeech, -1, ANIM_ChuckQuizmo_Talk, ANIM_ChuckQuizmo_Idle, 0, MSG_MGM_000C) + EVT_EXEC_WAIT(N(EVS_Quizmo_Exit)) + EVT_SET(LVar0, 0) + EVT_RETURN + EVT_END_IF + EVT_SET(GF_Quizmo_TakingQuiz, 1) + EVT_CALL(N(Quizmo_HideEntities)) + EVT_CALL(N(Quizmo_HideWorld)) + EVT_EXEC(N(EVS_Quizmo_SetQuizCamera)) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(SetNpcFlagBits, CHUCK_QUIZMO_NPC_ID, NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_40 | NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, CHUCK_QUIZMO_NPC_ID, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_EXEC_GET_TID(N(EVS_Quizmo_SetCharacterPositons), LVar1) + EVT_CALL(ContinueSpeech, -1, ANIM_ChuckQuizmo_Talk, ANIM_ChuckQuizmo_Idle, 0, MSG_MGM_000B) + EVT_CALL(PlaySound, 137) + EVT_LOOP(0) + EVT_IS_THREAD_RUNNING(LVar1, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(N(Quizmo_CreateStage)) + EVT_LOOP(5) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar1, 1) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(2) + EVT_END_LOOP + EVT_SET(LVar0, MSG_QuizQuestion_01) + EVT_ADD(LVar0, GB_CompletedQuizzes) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ChuckQuizmo_OpenHat, ANIM_ChuckQuizmo_CloseHat, 0, LVar0) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_Question) + EVT_SET(LVar0, MSG_QuizChoice_01) + EVT_ADD(LVar0, GB_CompletedQuizzes) + EVT_CALL(PlaySound, 142) + EVT_CALL(ShowChoice, LVar0) + EVT_KILL_THREAD(LVar1) + EVT_CALL(StopSound, 142) + EVT_EXEC(N(EVS_Quizmo_PlayerHitBuzzer)) + EVT_WAIT(15) + EVT_CALL(PlaySound, 141) + EVT_CALL(N(Quizmo_UnkStageEffectMode), LVar0) + EVT_SET(ArrayVar(4), 0) + EVT_CALL(N(Quizmo_CreateWorker)) + EVT_WAIT(40) + EVT_CALL(N(Quizmo_UpdateRecords)) + EVT_THREAD + EVT_WAIT(110) + EVT_CALL(CloseChoice) + EVT_SET(ArrayVar(4), 0) + EVT_END_THREAD + EVT_IF_EQ(LVar0, 1) + EVT_CALL(SetNpcAnimation, CHUCK_QUIZMO_NPC_ID, ANIM_ChuckQuizmo_OpenCorrect) + EVT_SET(ArrayVar(4), 1) + EVT_THREAD + EVT_CALL(N(Quizmo_SetStageLightsDelay), 1) + EVT_WAIT(6) + EVT_WAIT(6) + EVT_WAIT(6) + EVT_CALL(N(Quizmo_SetStageLightsDelay), 2) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(PlaySound, SOUND_21C) + EVT_WAIT(6) + EVT_CALL(PlaySound, SOUND_21C) + EVT_WAIT(6) + EVT_CALL(PlaySound, SOUND_21C) + EVT_WAIT(6) + EVT_CALL(PlaySound, SOUND_21C) + EVT_END_THREAD + EVT_CALL(PlaySound, SOUND_8A) + EVT_CALL(N(Quizmo_SetVannaAnim_Clap)) + EVT_THREAD + EVT_WAIT(15) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar1, 50) + EVT_CALL(N(Quizmo_AddViewRelativeOffset), 0, 0, 83, LVar0, LVar2) + EVT_CALL(PlayEffect, 0x7, 2, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_CALL(PlayEffect, 0x44, 4, LVar0, LVar1, LVar2, 1, 60, 0, 0, 0, 0, 0, 0, 0) + EVT_WAIT(15) + EVT_ADD(LVar1, -3) + EVT_CALL(N(Quizmo_AddViewRelativeOffset), 0, 0, 58, LVar0, LVar2) + EVT_CALL(PlayEffect, 0x7, 2, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_CALL(PlayEffect, 0x44, 4, LVar0, LVar1, LVar2, 1, 60, 0, 0, 0, 0, 0, 0, 0) + EVT_WAIT(15) + EVT_ADD(LVar1, 30) + EVT_CALL(N(Quizmo_AddViewRelativeOffset), 0, 0, 93, LVar0, LVar2) + EVT_CALL(PlayEffect, 0x7, 2, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_CALL(PlayEffect, 0x44, 4, LVar0, LVar1, LVar2, 1, 60, 0, 0, 0, 0, 0, 0, 0) + EVT_WAIT(15) + EVT_END_THREAD + EVT_WAIT(20) + EVT_EXEC_GET_TID(N(EVS_Quizmo_RightAnswer), LVar1) + EVT_ADD(GB_CompletedQuizzes, 1) + EVT_IF_GT(GB_CompletedQuizzes, 63) + EVT_CALL(ContinueSpeech, -1, -1, -1, 0, MSG_MGM_0010) + EVT_CALL(SetNpcAnimation, CHUCK_QUIZMO_NPC_ID, ANIM_ChuckQuizmo_CloseHat) + EVT_LOOP(0) + EVT_IS_THREAD_RUNNING(LVar1, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(SetNpcAnimation, CHUCK_QUIZMO_NPC_ID, ANIM_ChuckQuizmo_OpenHat) + EVT_SET(LVar0, ITEM_STAR_PIECE) + EVT_SET(LVar1, 3) + EVT_EXEC_WAIT(N(GiveKeyReward)) + EVT_CALL(AddStarPieces, 1) + EVT_CALL(N(Quizmo_SetStageLightsDelay), 15) + EVT_CALL(N(Quizmo_SetVannaAnim_Idle)) + EVT_CALL(SetMessageValue, GB_CompletedQuizzes, 0) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ChuckQuizmo_Talk, ANIM_ChuckQuizmo_Idle, 0, MSG_MGM_0011) + EVT_ELSE + EVT_CALL(ContinueSpeech, -1, -1, -1, 0, MSG_MGM_000E) + EVT_CALL(SetNpcAnimation, CHUCK_QUIZMO_NPC_ID, ANIM_ChuckQuizmo_CloseHat) + EVT_LOOP(0) + EVT_IS_THREAD_RUNNING(LVar1, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(SetNpcAnimation, CHUCK_QUIZMO_NPC_ID, ANIM_ChuckQuizmo_OpenHat) + EVT_SET(LVar0, ITEM_STAR_PIECE) + EVT_SET(LVar1, 1) + EVT_EXEC_WAIT(N(GiveKeyReward)) + EVT_CALL(AddStarPieces, 1) + EVT_CALL(N(Quizmo_SetStageLightsDelay), 15) + EVT_CALL(N(Quizmo_SetVannaAnim_Idle)) + EVT_CALL(SetMessageValue, GB_CompletedQuizzes, 0) + EVT_IF_EQ(GB_CompletedQuizzes, 1) + EVT_CALL(SetMessageMsg, EVT_PTR(MessageSingular), 1) + EVT_ELSE + EVT_CALL(SetMessageMsg, EVT_PTR(MessagePlural), 1) + EVT_END_IF + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ChuckQuizmo_Talk, ANIM_ChuckQuizmo_Idle, 0, MSG_MGM_000F) + EVT_END_IF + EVT_SET(LVar0, 1) + EVT_ELSE + EVT_CALL(SetNpcAnimation, CHUCK_QUIZMO_NPC_ID, ANIM_ChuckQuizmo_OpenWrong) + EVT_SET(ArrayVar(4), 2) + EVT_CALL(PlaySound, SOUND_MENU_ERROR) + EVT_CALL(PlaySound, SOUND_8B) + EVT_EXEC_GET_TID(N(EVS_Quizmo_WrongAnswer), LVar1) + EVT_CALL(GetPlayerPos, LVar2, LVar3, LVar4) + EVT_CALL(PlayEffect, 0x2B, 0, LVar2, LVar3, LVar4, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_CALL(ContinueSpeech, -1, -1, -1, 0, MSG_MGM_000D) + EVT_CALL(SetNpcAnimation, CHUCK_QUIZMO_NPC_ID, ANIM_ChuckQuizmo_CloseWrong) + EVT_LOOP(0) + EVT_IS_THREAD_RUNNING(LVar1, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_SET(LVar0, 0) + EVT_END_IF + EVT_CALL(N(Quizmo_UnkStageEffectMode), -1) + EVT_CALL(EnablePartnerAI) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(PlaySound, SOUND_8F) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(45) + EVT_CALL(StopSound, SOUND_89) + EVT_END_THREAD + EVT_CALL(N(Quizmo_SetVannaAnim_Wave)) + EVT_CALL(N(Quizmo_DestroyEffects)) + EVT_EXEC_WAIT(N(EVS_Quizmo_Exit)) + EVT_EXEC(N(EVS_Quizmo_ResetCamera)) + EVT_CALL(N(Quizmo_FadeInWorld)) + EVT_CALL(N(Quizmo_ShowEntities)) + EVT_SET(GF_Quizmo_TakingQuiz, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Quizmo_NPC_OtherAI) = { + EVT_CALL(N(Quizmo_ShouldAppear)) + EVT_IF_EQ(LVar0, 0) + EVT_RETURN + EVT_END_IF + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_1000000, FALSE) + EVT_CALL(SetNpcSprite, -1, ANIM_ChuckQuizmo_Idle) + EVT_CALL(N(Quizmo_RenderInit)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Quizmo_NPC_Interact) = { + EVT_USE_ARRAY(EVT_PTR(N(Quizmo_ScriptArray))) + EVT_SET(GF_Quizmo_ChangedLocation, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(SetPlayerFlagBits, PS_FLAGS_400000, 1) + EVT_EXEC_WAIT(N(EVS_Quizmo_QuizMain)) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(SetPlayerFlagBits, PS_FLAGS_400000, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Quizmo_NPC_Aux) = { + EVT_CALL(N(Quizmo_NPC_Aux_Impl)) + EVT_RETURN + EVT_END +}; + +MobileAISettings N(Quizmo_MobileAISettings) = { + .moveSpeed = 0.7f, + .moveTime = 30, + .waitTime = 20, + .playerSearchInterval = -1, + .unk_AI_2C = 1, +}; + +EvtScript N(EVS_Quizmo_Npc_AI) = { + EVT_CALL(BasicAI_Main, EVT_PTR(N(Quizmo_MobileAISettings))) + EVT_RETURN + EVT_END +}; + +// primary quizmo NpcSettings +NpcSettings N(Quizmo_NpcSettings) = { + .defaultAnim = ANIM_ChuckQuizmo_Idle, + .height = 35, + .radius = 28, + .otherAI = &N(EVS_Quizmo_NPC_OtherAI), + .onInteract = &N(EVS_Quizmo_NPC_Interact), + .aux = &N(EVS_Quizmo_NPC_Aux), + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, + .level = 99, +}; + +// alternate (unused?) variant of quizmo with AI and NPC_FLAG_100 unset +NpcSettings N(Quizmo_AltNpcSettings) = { + .defaultAnim = ANIM_ChuckQuizmo_Idle, + .height = 35, + .radius = 28, + .otherAI = &N(EVS_Quizmo_NPC_OtherAI), + .onInteract = &N(EVS_Quizmo_NPC_Interact), + .ai = &N(EVS_Quizmo_Npc_AI), + .aux = &N(EVS_Quizmo_NPC_Aux), + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, + .level = 99, + .actionFlags = 16, +}; diff --git a/src/world/common/enemy/complete/Goomba.h b/src/world/common/enemy/complete/Goomba.h new file mode 100644 index 0000000000..667832a2da --- /dev/null +++ b/src/world/common/enemy/complete/Goomba.h @@ -0,0 +1,33 @@ +#include "common.h" +#include "sprite/npc/Goomba.h" + +#define GOOMBA_DROPS \ +{ \ + .dropFlags = NPC_DROP_FLAGS_80, \ + .itemDropChance = 5, \ + .itemDrops = { \ + { ITEM_MUSHROOM, 10, 0 }, \ + }, \ + .heartDrops = GENEROUS_WHEN_LOW_HEART_DROPS(2), \ + .flowerDrops = GENEROUS_WHEN_LOW_FLOWER_DROPS(2), \ +} + +#define GOOMBA_ANIMS \ +{ \ + .idle = ANIM_Goomba_Idle, \ + .walk = ANIM_Goomba_Walk, \ + .run = ANIM_Goomba_Run, \ + .chase = ANIM_Goomba_Run, \ + .anim_4 = ANIM_Goomba_Idle, \ + .anim_5 = ANIM_Goomba_Idle, \ + .death = ANIM_Goomba_Hurt, \ + .hit = ANIM_Goomba_Hurt, \ + .anim_8 = ANIM_Goomba_Run, \ + .anim_9 = ANIM_Goomba_Run, \ + .anim_A = ANIM_Goomba_Run, \ + .anim_B = ANIM_Goomba_Run, \ + .anim_C = ANIM_Goomba_Run, \ + .anim_D = ANIM_Goomba_Run, \ + .anim_E = ANIM_Goomba_Run, \ + .anim_F = ANIM_Goomba_Run, \ +} diff --git a/src/world/common/enemy/complete/Goomba_Wander.inc.c b/src/world/common/enemy/complete/Goomba_Wander.inc.c new file mode 100644 index 0000000000..282b1fc437 --- /dev/null +++ b/src/world/common/enemy/complete/Goomba_Wander.inc.c @@ -0,0 +1,29 @@ +#include "Goomba.h" + +MobileAISettings N(AISettings_Goomba_Wander) = { + .moveSpeed = 1.5f, + .moveTime = 30, + .waitTime = 30, + .alertRadius = 130.0f, + .playerSearchInterval = 1, + .chaseSpeed = 2.5f, + .chaseTurnRate = 180, + .chaseUpdateInterval = 3, + .chaseRadius = 150.0f, + .unk_AI_2C = 1, +}; + +EvtScript N(EVS_NpcAI_Goomba_Wander) = { + EVT_CALL(BasicAI_Main, EVT_PTR(N(AISettings_Goomba_Wander))) + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_Goomba_Wander) = { + .height = 20, + .radius = 23, + .level = 5, + .ai = &N(EVS_NpcAI_Goomba_Wander), + .onHit = &EnemyNpcHit, + .onDefeat = &EnemyNpcDefeat, +}; diff --git a/src/world/common/enemy/complete/Paragoomba.h b/src/world/common/enemy/complete/Paragoomba.h new file mode 100644 index 0000000000..5380b295de --- /dev/null +++ b/src/world/common/enemy/complete/Paragoomba.h @@ -0,0 +1,35 @@ +#include "common.h" +#include "sprite/npc/Paragoomba.h" + +#define PARAGOOMBA_DROPS \ +{ \ + .dropFlags = NPC_DROP_FLAGS_80, \ + .itemDropChance = 5, \ + .itemDrops = { \ + { ITEM_MUSHROOM, 10, 0 }, \ + }, \ + .heartDrops = STANDARD_HEART_DROPS(2), \ + .flowerDrops = STANDARD_FLOWER_DROPS(2), \ + .minCoinBonus = 0, \ + .maxCoinBonus = 1, \ +} + +#define PARAGOOMBA_ANIMS \ +{ \ + .idle = ANIM_Paragoomba_Idle, \ + .walk = ANIM_Paragoomba_Walk, \ + .run = ANIM_Paragoomba_Run, \ + .chase = ANIM_Paragoomba_Run, \ + .anim_4 = ANIM_Paragoomba_Idle, \ + .anim_5 = ANIM_Paragoomba_Idle, \ + .death = ANIM_Paragoomba_Hurt, \ + .hit = ANIM_Paragoomba_Hurt, \ + .anim_8 = ANIM_Paragoomba_Run, \ + .anim_9 = ANIM_Paragoomba_Run, \ + .anim_A = ANIM_Paragoomba_Run, \ + .anim_B = ANIM_Paragoomba_Run, \ + .anim_C = ANIM_Paragoomba_Run, \ + .anim_D = ANIM_Paragoomba_Run, \ + .anim_E = ANIM_Paragoomba_Run, \ + .anim_F = ANIM_Paragoomba_Run, \ +} diff --git a/src/world/common/enemy/complete/Paragoomba_Wander.inc.c b/src/world/common/enemy/complete/Paragoomba_Wander.inc.c new file mode 100644 index 0000000000..0cbe89f52e --- /dev/null +++ b/src/world/common/enemy/complete/Paragoomba_Wander.inc.c @@ -0,0 +1,40 @@ +#include "Paragoomba.h" + +#include "world/common/enemy/ai/FlyingAI.inc.c" + +f32 N(FlyingAI_JumpVels)[] = { + 4.5, 3.5, 2.6, 2.0, 1.5, 20.0, +}; + +MobileAISettings N(AISettings_Paragoomba_Wander) = { + .moveSpeed = 1.6f, + .moveTime = 60, + .waitTime = 30, + .alertRadius = 80.0f, + .playerSearchInterval = 5, + .chaseSpeed = 2.2f, + .chaseTurnRate = 60, + .chaseUpdateInterval = 15, + .chaseRadius = 100.0f, + .unk_AI_2C = 1, +}; + +EvtScript N(EVS_NpcAI_Paragoomba_Wander) = { + EVT_CALL(SetSelfVar, 0, 0) + EVT_CALL(SetSelfVar, 5, -500) + EVT_CALL(SetSelfVar, 6, 21) + EVT_CALL(SetSelfVar, 1, 580) + EVT_CALL(N(FlyingAI_Main), EVT_PTR(N(AISettings_Paragoomba_Wander))) + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_Paragoomba_Wander) = { + .height = 20, + .radius = 21, + .level = 6, + .ai = &N(EVS_NpcAI_Paragoomba_Wander), + .onHit = &EnemyNpcHit, + .onDefeat = &EnemyNpcDefeat, + .actionFlags = AI_ACTION_02, +}; diff --git a/src/world/common/enemy/complete/SpikedGoomba.h b/src/world/common/enemy/complete/SpikedGoomba.h new file mode 100644 index 0000000000..6c362028e2 --- /dev/null +++ b/src/world/common/enemy/complete/SpikedGoomba.h @@ -0,0 +1,35 @@ +#include "common.h" +#include "sprite/npc/SpikedGoomba.h" + +#define SPIKED_GOOMBA_DROPS \ +{ \ + .dropFlags = NPC_DROP_FLAGS_80, \ + .itemDropChance = 5, \ + .itemDrops = { \ + { ITEM_MUSHROOM, 10, 0 }, \ + }, \ + .heartDrops = STANDARD_HEART_DROPS(2), \ + .flowerDrops = STANDARD_FLOWER_DROPS(2), \ + .minCoinBonus = 0, \ + .maxCoinBonus = 1, \ +} + +#define SPIKED_GOOMBA_ANIMS \ +{ \ + .idle = ANIM_SpikedGoomba_Idle, \ + .walk = ANIM_SpikedGoomba_Walk, \ + .run = ANIM_SpikedGoomba_Run, \ + .chase = ANIM_SpikedGoomba_Run, \ + .anim_4 = ANIM_SpikedGoomba_Idle, \ + .anim_5 = ANIM_SpikedGoomba_Idle, \ + .death = ANIM_SpikedGoomba_HurtStill, \ + .hit = ANIM_SpikedGoomba_HurtStill, \ + .anim_8 = ANIM_SpikedGoomba_Run, \ + .anim_9 = ANIM_SpikedGoomba_Run, \ + .anim_A = ANIM_SpikedGoomba_Run, \ + .anim_B = ANIM_SpikedGoomba_Run, \ + .anim_C = ANIM_SpikedGoomba_Run, \ + .anim_D = ANIM_SpikedGoomba_Run, \ + .anim_E = ANIM_SpikedGoomba_Run, \ + .anim_F = ANIM_SpikedGoomba_Run, \ +} diff --git a/src/world/common/enemy/complete/SpikedGoomba_Wander.inc.c b/src/world/common/enemy/complete/SpikedGoomba_Wander.inc.c new file mode 100644 index 0000000000..5c91223373 --- /dev/null +++ b/src/world/common/enemy/complete/SpikedGoomba_Wander.inc.c @@ -0,0 +1,29 @@ +#include "SpikedGoomba.h" + +MobileAISettings N(AISettings_SpikedGoomba_Wander) = { + .moveSpeed = 1.5f, + .moveTime = 30, + .waitTime = 30, + .alertRadius = 130.0f, + .playerSearchInterval = 1, + .chaseSpeed = 2.5f, + .chaseTurnRate = 180, + .chaseUpdateInterval = 3, + .chaseRadius = 150.0f, + .unk_AI_2C = 1, +}; + +EvtScript N(EVS_NpcAI_SpikedGoomba_Wander) = { + EVT_CALL(BasicAI_Main, EVT_PTR(N(AISettings_SpikedGoomba_Wander))) + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_SpikedGoomba_Wander) = { + .height = 23, + .radius = 23, + .level = 6, + .ai = &N(EVS_NpcAI_SpikedGoomba_Wander), + .onHit = &EnemyNpcHit, + .onDefeat = &EnemyNpcDefeat, +}; diff --git a/src/world/common/entity/Pipe.inc.h b/src/world/common/entity/Pipe.inc.h index 652cdf1f1d..01c9172c3d 100644 --- a/src/world/common/entity/Pipe.inc.h +++ b/src/world/common/entity/Pipe.inc.h @@ -1,3 +1,6 @@ +#ifndef _ENTITY_PIPE_H_ +#define _ENTITY_PIPE_H_ + #include "common.h" ApiStatus N(Pipe_GetCameraYaw)(Evt* script, s32 isInitialCall); @@ -12,3 +15,5 @@ extern EvtScript N(Pipe_EnterHorizontal); extern EvtScript N(Pipe_ExitVertical); extern EvtScript N(Pipe_ScriptD); extern EvtScript N(Pipe_ExitHorizontal); + +#endif diff --git a/src/world/common/npc/Dryite.h b/src/world/common/npc/Dryite.h new file mode 100644 index 0000000000..86d953662d --- /dev/null +++ b/src/world/common/npc/Dryite.h @@ -0,0 +1,89 @@ +#include "common.h" +#include "sprite/npc/Dryite.h" + +#define DRYITE_DROPS \ +{ \ + .dropFlags = NPC_DROP_FLAGS_80, \ + .heartDrops = NO_DROPS, \ + .flowerDrops = NO_DROPS, \ +} + +#define DRYITE_GREEN_ANIMS \ +{ \ + ANIM_Dryite_Green_Idle, \ + ANIM_Dryite_Green_Walk, \ + ANIM_Dryite_Green_Run, \ + ANIM_Dryite_Green_Run, \ + ANIM_Dryite_Green_Idle, \ + ANIM_Dryite_Green_Idle, \ + ANIM_Dryite_Green_Still, \ + ANIM_Dryite_Green_Still, \ + ANIM_Dryite_Green_Idle, \ + ANIM_Dryite_Green_Idle, \ + ANIM_Dryite_Green_Idle, \ + ANIM_Dryite_Green_Idle, \ + ANIM_Dryite_Green_Idle, \ + ANIM_Dryite_Green_Idle, \ + ANIM_Dryite_Green_Idle, \ + ANIM_Dryite_Green_Idle, \ +} + +#define DRYITE_BROWN_ANIMS \ +{ \ + ANIM_Dryite_Brown_Idle, \ + ANIM_Dryite_Brown_Walk, \ + ANIM_Dryite_Brown_Run, \ + ANIM_Dryite_Brown_Run, \ + ANIM_Dryite_Brown_Idle, \ + ANIM_Dryite_Brown_Idle, \ + ANIM_Dryite_Brown_Still, \ + ANIM_Dryite_Brown_Still, \ + ANIM_Dryite_Brown_Idle, \ + ANIM_Dryite_Brown_Idle, \ + ANIM_Dryite_Brown_Idle, \ + ANIM_Dryite_Brown_Idle, \ + ANIM_Dryite_Brown_Idle, \ + ANIM_Dryite_Brown_Idle, \ + ANIM_Dryite_Brown_Idle, \ + ANIM_Dryite_Brown_Idle, \ +} + +#define DRYITE_BLUE_ANIMS \ +{ \ + ANIM_Dryite_Blue_Idle, \ + ANIM_Dryite_Blue_Walk, \ + ANIM_Dryite_Blue_Run, \ + ANIM_Dryite_Blue_Run, \ + ANIM_Dryite_Blue_Idle, \ + ANIM_Dryite_Blue_Idle, \ + ANIM_Dryite_Blue_Still, \ + ANIM_Dryite_Blue_Still, \ + ANIM_Dryite_Blue_Idle, \ + ANIM_Dryite_Blue_Idle, \ + ANIM_Dryite_Blue_Idle, \ + ANIM_Dryite_Blue_Idle, \ + ANIM_Dryite_Blue_Idle, \ + ANIM_Dryite_Blue_Idle, \ + ANIM_Dryite_Blue_Idle, \ + ANIM_Dryite_Blue_Idle, \ +} + +#define DRYITE_YELLOW_ANIMS \ +{ \ + ANIM_Dryite_Yellow_Idle, \ + ANIM_Dryite_Yellow_Walk, \ + ANIM_Dryite_Yellow_Run, \ + ANIM_Dryite_Yellow_Run, \ + ANIM_Dryite_Yellow_Idle, \ + ANIM_Dryite_Yellow_Idle, \ + ANIM_Dryite_Yellow_Still, \ + ANIM_Dryite_Yellow_Still, \ + ANIM_Dryite_Yellow_Idle, \ + ANIM_Dryite_Yellow_Idle, \ + ANIM_Dryite_Yellow_Idle, \ + ANIM_Dryite_Yellow_Idle, \ + ANIM_Dryite_Yellow_Idle, \ + ANIM_Dryite_Yellow_Idle, \ + ANIM_Dryite_Yellow_Idle, \ + ANIM_Dryite_Yellow_Idle, \ +} diff --git a/src/world/common/npc/Dryite_Patrol.inc.c b/src/world/common/npc/Dryite_Patrol.inc.c new file mode 100644 index 0000000000..e727ed2d49 --- /dev/null +++ b/src/world/common/npc/Dryite_Patrol.inc.c @@ -0,0 +1,25 @@ +#include "Dryite.h" + +#include "world/common/enemy/ai/PatrolNoAttackAI.inc.c" + +MobileAISettings N(AISettings_Dryite_Patrol) = { + .moveSpeed = 1.5f, + .moveTime = 30, + .waitTime = 30, + .playerSearchInterval = -1, + .unk_AI_2C = 1, +}; + +EvtScript N(EVS_NpcAI_Dryite_Patrol) = { + EVT_CALL(N(PatrolNoAttackAI_Main), EVT_PTR(N(AISettings_Dryite_Patrol))) + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_Dryite_Patrol) = { + .height = 26, + .radius = 23, + .ai = &N(EVS_NpcAI_Dryite_Patrol), + .level = 99, + .actionFlags = 16, +}; diff --git a/src/world/common/npc/Dryite_Stationary.inc.c b/src/world/common/npc/Dryite_Stationary.inc.c new file mode 100644 index 0000000000..d6657923cb --- /dev/null +++ b/src/world/common/npc/Dryite_Stationary.inc.c @@ -0,0 +1,7 @@ +#include "Dryite.h" + +NpcSettings N(NpcSettings_Dryite) = { + .height = 26, + .radius = 23, + .level = 99, +}; diff --git a/src/world/common/npc/Dryite_Wander.inc.c b/src/world/common/npc/Dryite_Wander.inc.c new file mode 100644 index 0000000000..4fe0bc170c --- /dev/null +++ b/src/world/common/npc/Dryite_Wander.inc.c @@ -0,0 +1,23 @@ +#include "Dryite.h" + +MobileAISettings N(AISettings_Dryite_Wander) = { + .moveSpeed = 1.5f, + .moveTime = 60, + .waitTime = 30, + .playerSearchInterval = -1, + .unk_AI_2C = 1, +}; + +EvtScript N(EVS_NpcAI_Dryite_Wander) = { + EVT_CALL(BasicAI_Main, EVT_PTR(N(AISettings_Dryite_Wander))) + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_Dryite_Wander) = { + .height = 26, + .radius = 23, + .ai = &N(EVS_NpcAI_Dryite_Wander), + .level = 99, + .actionFlags = 16, +}; diff --git a/src/world/common/npc/Mouser.h b/src/world/common/npc/Mouser.h new file mode 100644 index 0000000000..9310f1924f --- /dev/null +++ b/src/world/common/npc/Mouser.h @@ -0,0 +1,49 @@ +#include "common.h" +#include "sprite/npc/Toadette.h" + +#define MOUSER_DROPS \ +{ \ + .dropFlags = NPC_DROP_FLAGS_80, \ + .heartDrops = NO_DROPS, \ + .flowerDrops = NO_DROPS, \ +} + +#define MOUSER_BLUE_ANIMS \ +{ \ + ANIM_Mouser_Blue_Idle, \ + ANIM_Mouser_Blue_Run, \ + ANIM_Mouser_Blue_Run, \ + ANIM_Mouser_Blue_Run, \ + ANIM_Mouser_Blue_Idle, \ + ANIM_Mouser_Blue_Idle, \ + ANIM_Mouser_Blue_Idle, \ + ANIM_Mouser_Blue_Idle, \ + ANIM_Mouser_Blue_Idle, \ + ANIM_Mouser_Blue_Idle, \ + ANIM_Mouser_Blue_Idle, \ + ANIM_Mouser_Blue_Idle, \ + ANIM_Mouser_Blue_Idle, \ + ANIM_Mouser_Blue_Idle, \ + ANIM_Mouser_Blue_Idle, \ + ANIM_Mouser_Blue_Idle, \ +} + +#define MOUSER_PURPLE_ANIMS \ +{ \ + ANIM_Mouser_Purple_Idle, \ + ANIM_Mouser_Purple_Run, \ + ANIM_Mouser_Purple_Run, \ + ANIM_Mouser_Purple_Idle, \ + ANIM_Mouser_Purple_Idle, \ + ANIM_Mouser_Purple_Idle, \ + ANIM_Mouser_Purple_Idle, \ + ANIM_Mouser_Purple_Idle, \ + ANIM_Mouser_Purple_Idle, \ + ANIM_Mouser_Purple_Idle, \ + ANIM_Mouser_Purple_Idle, \ + ANIM_Mouser_Purple_Idle, \ + ANIM_Mouser_Purple_Idle, \ + ANIM_Mouser_Purple_Idle, \ + ANIM_Mouser_Purple_Idle, \ + ANIM_Mouser_Purple_Idle, \ +} diff --git a/src/world/common/npc/Mouser.inc.c b/src/world/common/npc/Mouser.inc.c new file mode 100644 index 0000000000..303c990ca0 --- /dev/null +++ b/src/world/common/npc/Mouser.inc.c @@ -0,0 +1,7 @@ +#include "Mouser.h" + +NpcSettings N(NpcSettings_Mouser) = { + .height = 22, + .radius = 25, + .level = 99, +}; diff --git a/src/world/common/npc/ThreeSisters.h b/src/world/common/npc/ThreeSisters.h new file mode 100644 index 0000000000..d1c2c8c9b1 --- /dev/null +++ b/src/world/common/npc/ThreeSisters.h @@ -0,0 +1,29 @@ +#include "common.h" +#include "sprite/npc/Toadette.h" + +#define THREE_SISTER_DROPS \ +{ \ + .dropFlags = NPC_DROP_FLAGS_80, \ + .heartDrops = NO_DROPS, \ + .flowerDrops = NO_DROPS, \ +} + +#define THREE_SISTER_ANIMS \ +{ \ + ANIM_Toadette_Pink_Idle, \ + ANIM_Toadette_Pink_Walk, \ + ANIM_Toadette_Pink_Run, \ + ANIM_Toadette_Pink_Run, \ + ANIM_Toadette_Pink_Idle, \ + ANIM_Toadette_Pink_Idle, \ + ANIM_Toadette_Pink_Disappointed, \ + ANIM_Toadette_Pink_Disappointed, \ + ANIM_Toadette_Pink_Run, \ + ANIM_Toadette_Pink_Run, \ + ANIM_Toadette_Pink_Run, \ + ANIM_Toadette_Pink_Run, \ + ANIM_Toadette_Pink_Run, \ + ANIM_Toadette_Pink_Run, \ + ANIM_Toadette_Pink_Run, \ + ANIM_Toadette_Pink_Run, \ +} diff --git a/src/world/common/npc/ThreeSisters.inc.c b/src/world/common/npc/ThreeSisters.inc.c new file mode 100644 index 0000000000..eb7c91a486 --- /dev/null +++ b/src/world/common/npc/ThreeSisters.inc.c @@ -0,0 +1,7 @@ +#include "ThreeSisters.h" + +NpcSettings N(NpcSettings_ThreeSisters) = { + .height = 30, + .radius = 24, + .level = 99, +}; diff --git a/src/world/common/util/MonitorPlayerOrbiting.h b/src/world/common/util/MonitorPlayerOrbiting.h new file mode 100644 index 0000000000..629dbfc48b --- /dev/null +++ b/src/world/common/util/MonitorPlayerOrbiting.h @@ -0,0 +1,48 @@ +#ifndef _PLAYER_ORBITING_H_ +#define _PLAYER_ORBITING_H_ + +#include "common.h" + +typedef struct PlayerOrbitState { + Vec3i pos; + s32 startRadius; + s32 orbitRadius; + void (*eventListener)(struct PlayerOrbitState*, s32); + s32 totalOrbitAngle; + s32 numRotations; + s32 state; + f32 firstPlayerX; + f32 firstPlayerZ; + f32 lastPlayerX; + f32 lastPlayerZ; + f32 direction; + s32 lastNumRotations; +} PlayerOrbitState; + +// these should be defined in map data and supplied to MonitorPlayerOrbiting when it is called +typedef struct { + Vec3i pos; + s32 startRadius; // orbiting begins when the player enters this radius + s32 orbitRadius; // orbiting continues while the player is within this radius + void (*eventListener)(PlayerOrbitState*, s32); +} PlayerOrbitTarget; + +// events which are dispatched to the event handler +enum { + PLAYER_ORBIT_BEGIN = 0, + PLAYER_ORBIT_COMPLETE_ROTATION = 1, + PLAYER_ORBIT_CONTINUE_ORBIT = 2, + PLAYER_ORBIT_CHANGE_DIRECTION = 3, + PLAYER_ORBIT_LEFT_REGION = 4, +}; + +// states of this function +enum { + ORBIT_STATE_FIRST_FRAME = 0, + ORBIT_STATE_SECOND_FRAME = 1, + ORBIT_STATE_STARTING_ORBIT = 2, + ORBIT_STATE_MAINTAIN_ORBIT = 3, + ORBIT_STATE_BREAK_ORBIT = 4, +}; + +#endif diff --git a/src/world/common/util/MonitorPlayerOrbiting.inc.c b/src/world/common/util/MonitorPlayerOrbiting.inc.c new file mode 100644 index 0000000000..2933c22f23 --- /dev/null +++ b/src/world/common/util/MonitorPlayerOrbiting.inc.c @@ -0,0 +1,123 @@ +#include "MonitorPlayerOrbiting.h" + +API_CALLABLE(N(MonitorPlayerOrbiting)) { + PlayerStatus* playerStatus = &gPlayerStatus; + PlayerOrbitTarget* target = (PlayerOrbitTarget*) evt_get_variable(script, *script->ptrReadPos); + PlayerOrbitState* orbit; + s32 prevAngle, curAngle; + s32 deltaAngle; + s32 dist; + + if (isInitialCall) { + orbit = script->functionTempPtr[1] = heap_malloc(sizeof(*orbit)); + orbit->pos.x = target->pos.x; + orbit->pos.y = target->pos.y; + orbit->pos.z = target->pos.z; + orbit->startRadius = target->startRadius; + orbit->orbitRadius = target->orbitRadius; + orbit->eventListener = target->eventListener; + orbit->totalOrbitAngle = 0; + orbit->numRotations = 0; + orbit->state = 0; + orbit->firstPlayerX = 0; + orbit->firstPlayerZ = 0; + orbit->lastPlayerX = 0; + orbit->lastPlayerZ = 0; + orbit->direction = 0; + orbit->lastNumRotations = 0; + } + + orbit = script->functionTempPtr[1]; + switch (orbit->state) { + case ORBIT_STATE_FIRST_FRAME: + // wait for player to come within range + dist = get_xz_dist_to_player(orbit->pos.x, orbit->pos.z); + if (dist < orbit->startRadius) { + orbit->firstPlayerX = playerStatus->position.x; + orbit->firstPlayerZ = playerStatus->position.z; + orbit->state++; + } + break; + + case ORBIT_STATE_SECOND_FRAME: + // determine direction the player is orbiting + dist = get_xz_dist_to_player(orbit->pos.x, orbit->pos.z); + if (dist < orbit->startRadius) { + prevAngle = atan2(orbit->pos.x, orbit->pos.z, orbit->firstPlayerX, orbit->firstPlayerZ); + curAngle = atan2(orbit->pos.x, orbit->pos.z, playerStatus->position.x, playerStatus->position.z); + deltaAngle = get_clamped_angle_diff(prevAngle, curAngle); + orbit->direction = signF(deltaAngle); + orbit->state++; + break; + } + orbit->state = ORBIT_STATE_FIRST_FRAME; + break; + + case ORBIT_STATE_STARTING_ORBIT: + dist = get_xz_dist_to_player(orbit->pos.x, orbit->pos.z); + if (dist < orbit->startRadius) { + prevAngle = atan2(orbit->pos.x, orbit->pos.z, orbit->lastPlayerX, orbit->lastPlayerZ); + curAngle = atan2(orbit->pos.x, orbit->pos.z, playerStatus->position.x, playerStatus->position.z); + deltaAngle = get_clamped_angle_diff(prevAngle, curAngle); + if (orbit->direction == signF(deltaAngle)) { + prevAngle = atan2(orbit->pos.x, orbit->pos.z, orbit->firstPlayerX, orbit->firstPlayerZ); + curAngle = atan2(orbit->pos.x, orbit->pos.z, playerStatus->position.x, playerStatus->position.z); + deltaAngle = get_clamped_angle_diff(prevAngle, curAngle); + if (fabsf(deltaAngle) > 90.0f) { + if (orbit->eventListener != NULL) { + orbit->eventListener(orbit, PLAYER_ORBIT_BEGIN); + } + orbit->totalOrbitAngle += fabsf(deltaAngle); + orbit->state++; + } + break; + } + } + orbit->state = ORBIT_STATE_FIRST_FRAME; + break; + + case ORBIT_STATE_MAINTAIN_ORBIT: + dist = get_xz_dist_to_player(orbit->pos.x, orbit->pos.z); + if (dist < orbit->orbitRadius) { + prevAngle = atan2(orbit->pos.x, orbit->pos.z, orbit->lastPlayerX, orbit->lastPlayerZ); + curAngle = atan2(orbit->pos.x, orbit->pos.z, playerStatus->position.x, playerStatus->position.z); + deltaAngle = get_clamped_angle_diff(prevAngle, curAngle); + if (orbit->direction != signF(deltaAngle)) { + if (orbit->eventListener != NULL) { + orbit->eventListener(orbit, PLAYER_ORBIT_CHANGE_DIRECTION); + } + orbit->state++; + } else { + orbit->totalOrbitAngle = orbit->totalOrbitAngle + fabsf(deltaAngle); + orbit->numRotations = orbit->totalOrbitAngle / 360; + if (orbit->numRotations != orbit->lastNumRotations) { + if (orbit->eventListener != NULL) { + orbit->eventListener(orbit, PLAYER_ORBIT_COMPLETE_ROTATION); + } + orbit->lastNumRotations = orbit->numRotations; + } + } + if (orbit->eventListener != NULL) { + orbit->eventListener(orbit, PLAYER_ORBIT_CONTINUE_ORBIT); + } + } else { + if (orbit->eventListener != NULL) { + orbit->eventListener(orbit, PLAYER_ORBIT_LEFT_REGION); + } + orbit->state++; + } + break; + + case ORBIT_STATE_BREAK_ORBIT: + orbit->totalOrbitAngle = 0.0f; + orbit->numRotations = 0; + orbit->lastNumRotations = 0; + orbit->state = ORBIT_STATE_FIRST_FRAME; + break; + } + + orbit->lastPlayerX = playerStatus->position.x; + orbit->lastPlayerZ = playerStatus->position.z; + + return ApiStatus_BLOCK; +} diff --git a/src/world/dead/dead_03/EB0E60.c b/src/world/dead/dead_03/EB0E60.c new file mode 100644 index 0000000000..4758533f79 --- /dev/null +++ b/src/world/dead/dead_03/EB0E60.c @@ -0,0 +1,4 @@ +#include "dead_03.h" + +#include "world/common/atomic/TexturePan.inc.c" + diff --git a/src/EB1170.c b/src/world/dead/dead_03/EB1170.c similarity index 81% rename from src/EB1170.c rename to src/world/dead/dead_03/EB1170.c index 2784dfd022..0e6ee75b08 100644 --- a/src/EB1170.c +++ b/src/world/dead/dead_03/EB1170.c @@ -1,15 +1,10 @@ -#include "dead.h" -#include "common.h" - -// Has some relation to flo_12 (CC0E70.c) but it's rearranged and some stuff is different, so hard to tell - -#define NAMESPACE EB1170 +#include "dead_03.h" extern s32 func_80059AC8(s32, s32); extern s32 D_802417E4_EB2644; extern s32 D_802417E8_EB2648; -extern s32 EB1170_D_802442D0[]; -extern s32 EB1170_LetterDelivery_SavedNpcAnim; +extern s32 dead_03_D_802442D0[]; +extern s32 dead_03_LetterDelivery_SavedNpcAnim; extern s32 D_800B8DEC; #include "world/common/todo/StashVars.inc.c" @@ -54,13 +49,13 @@ ApiStatus func_802406E0_EB1540(Evt* script, s32 isInitialCall) { if (ptr != NULL) { for (i = 0; ptr[i] != 0; i++) { - EB1170_D_802442D0[i] = ptr[i]; + dead_03_D_802442D0[i] = ptr[i]; } - EB1170_D_802442D0[i] = 0; + dead_03_D_802442D0[i] = 0; } else { for (i = 0; i < 112; i++) { - EB1170_D_802442D0[i] = i + 16; - EB1170_D_802442D0[112] = 0; + dead_03_D_802442D0[i] = i + 16; + dead_03_D_802442D0[112] = 0; } } return ApiStatus_DONE2; diff --git a/src/world/dead/dead_03/dead_03.h b/src/world/dead/dead_03/dead_03.h new file mode 100644 index 0000000000..1c89d241b0 --- /dev/null +++ b/src/world/dead/dead_03/dead_03.h @@ -0,0 +1,9 @@ +// Unknown map +// Has some relation to flo_12 but it's rearranged and some stuff is different, +// so hard to tell + +#include "dead.h" +#include "common.h" +#include "dead_structs.h" + +#define NAMESPACE dead_03 diff --git a/src/EB5130.c b/src/world/dead/dead_04/EB5130.c similarity index 80% rename from src/EB5130.c rename to src/world/dead/dead_04/EB5130.c index 21c8017dee..a5af0a5eac 100644 --- a/src/EB5130.c +++ b/src/world/dead/dead_04/EB5130.c @@ -1,7 +1,4 @@ -#include "dead.h" -#include "common.h" - -#define NAMESPACE EB5130 +#include "dead_04.h" #include "world/common/atomic/TexturePan.inc.c" diff --git a/src/EB5470.c b/src/world/dead/dead_04/EB5470.c similarity index 83% rename from src/EB5470.c rename to src/world/dead/dead_04/EB5470.c index 75469557c2..914bd5533d 100644 --- a/src/EB5470.c +++ b/src/world/dead/dead_04/EB5470.c @@ -1,7 +1,4 @@ -#include "dead.h" -#include "common.h" - -#define NAMESPACE EB5470 +#include "dead_04.h" ApiStatus func_80240340_EB5470(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; diff --git a/src/world/dead/dead_04/dead_04.h b/src/world/dead/dead_04/dead_04.h new file mode 100644 index 0000000000..ada477d88b --- /dev/null +++ b/src/world/dead/dead_04/dead_04.h @@ -0,0 +1,7 @@ +// Unknown map + +#include "dead.h" +#include "common.h" +#include "dead_structs.h" + +#define NAMESPACE dead_04 diff --git a/src/world/dead/dead_11/EF2610.c b/src/world/dead/dead_11/EF2610.c new file mode 100644 index 0000000000..0b33a3c54a --- /dev/null +++ b/src/world/dead/dead_11/EF2610.c @@ -0,0 +1,3 @@ +#include "dead_11.h" + +#include "world/common/todo/DeadUnkFunc1.inc.c" diff --git a/src/EF2650.c b/src/world/dead/dead_11/EF2650.c similarity index 76% rename from src/EF2650.c rename to src/world/dead/dead_11/EF2650.c index 0a26c50b1a..8b32eff961 100644 --- a/src/EF2650.c +++ b/src/world/dead/dead_11/EF2650.c @@ -1,7 +1,4 @@ -#include "dead.h" -#include "common.h" - -#define NAMESPACE EF2650 +#include "dead_11.h" ApiStatus func_80240040_EF2650(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; diff --git a/src/EF2680.c b/src/world/dead/dead_11/EF2680.c similarity index 60% rename from src/EF2680.c rename to src/world/dead/dead_11/EF2680.c index cea42098b9..ac55ab4524 100644 --- a/src/EF2680.c +++ b/src/world/dead/dead_11/EF2680.c @@ -1,9 +1,4 @@ -#include "dead.h" -#include "common.h" - -// Copy of flo_13 or _17 (CC3850 or CD7350) - -#define NAMESPACE EF2680 +#include "dead_11.h" #define AI_LAKITU_FIRST_SPINY_ID 50 #define AI_LAKITU_LAST_SPINY_ID 53 diff --git a/src/world/dead/dead_11/dead_11.h b/src/world/dead/dead_11/dead_11.h new file mode 100644 index 0000000000..5546023a14 --- /dev/null +++ b/src/world/dead/dead_11/dead_11.h @@ -0,0 +1,8 @@ +// Unknown map +// Possibly either flo_13 or flo_17 + +#include "dead.h" +#include "common.h" +#include "dead_structs.h" + +#define NAMESPACE dead_11 diff --git a/src/EB8E50.c b/src/world/dead/flo_00/EB8E50.c similarity index 74% rename from src/EB8E50.c rename to src/world/dead/flo_00/EB8E50.c index 0774682ffe..d19ce9db17 100644 --- a/src/EB8E50.c +++ b/src/world/dead/flo_00/EB8E50.c @@ -1,10 +1,4 @@ -#include "dead.h" -#include "common.h" - -// Should be related to flo_00 -// The function is in (C9DF20.c) the loading zones in (C9DF60.c) - -#define NAMESPACE EB8E50 +#include "flo_00.h" const char ascii_EC2000[] = "mac_01"; const char ascii_EC2008[] = "flo_14"; diff --git a/src/EB8E90.c b/src/world/dead/flo_00/EB8E90.c similarity index 78% rename from src/EB8E90.c rename to src/world/dead/flo_00/EB8E90.c index 3100524721..4dd5d2a62f 100644 --- a/src/EB8E90.c +++ b/src/world/dead/flo_00/EB8E90.c @@ -1,9 +1,4 @@ -#include "dead.h" -#include "common.h" - -// Copy of flo_00 (C9DF60) - -#define NAMESPACE EB8E90 +#include "flo_00.h" #include "world/common/enemy/ai/PatrolNoAttackAI.inc.c" diff --git a/src/EB9D90.c b/src/world/dead/flo_00/EB9D90.c similarity index 95% rename from src/EB9D90.c rename to src/world/dead/flo_00/EB9D90.c index 23eb577c1b..0b749ca710 100644 --- a/src/EB9D90.c +++ b/src/world/dead/flo_00/EB9D90.c @@ -1,9 +1,4 @@ -#include "dead.h" -#include "common.h" - -// Copy of flo_00 (C9EE30.c) - -#define NAMESPACE EB9D90 +#include "flo_00.h" static char* N(exit_str_0) = "flo_07"; static char* N(exit_str_1) = "\0\0\0\0"; diff --git a/src/world/dead/flo_00/flo_00.h b/src/world/dead/flo_00/flo_00.h new file mode 100644 index 0000000000..81098357e9 --- /dev/null +++ b/src/world/dead/flo_00/flo_00.h @@ -0,0 +1,7 @@ +// Older version of flo_00 + +#include "dead.h" +#include "common.h" +#include "dead_structs.h" + +#define NAMESPACE dead_flo_00 diff --git a/src/world/dead/flo_03/EC2200.c b/src/world/dead/flo_03/EC2200.c new file mode 100644 index 0000000000..5cde12d23c --- /dev/null +++ b/src/world/dead/flo_03/EC2200.c @@ -0,0 +1,3 @@ +#include "flo_03.h" + +#include "world/common/todo/DeadUnkFunc1.inc.c" diff --git a/src/EC2240.c b/src/world/dead/flo_03/EC2240.c similarity index 96% rename from src/EC2240.c rename to src/world/dead/flo_03/EC2240.c index 44d654114b..ca7269dafb 100644 --- a/src/EC2240.c +++ b/src/world/dead/flo_03/EC2240.c @@ -1,9 +1,4 @@ -#include "dead.h" -#include "common.h" - -// Copy of flo_03 (CA72E0) - -#define NAMESPACE EC2240 +#include "flo_03.h" const char* ascii_EC7170 = "flo_09"; const char* ascii_EC7178 = "flo_22"; diff --git a/src/world/dead/flo_03/EC2610.c b/src/world/dead/flo_03/EC2610.c new file mode 100644 index 0000000000..70774857c0 --- /dev/null +++ b/src/world/dead/flo_03/EC2610.c @@ -0,0 +1,3 @@ +#include "flo_03.h" + +#include "common/foliage.inc.c" diff --git a/src/world/dead/flo_03/flo_03.h b/src/world/dead/flo_03/flo_03.h new file mode 100644 index 0000000000..bbafecef07 --- /dev/null +++ b/src/world/dead/flo_03/flo_03.h @@ -0,0 +1,7 @@ +// Older version of flo_03 + +#include "dead.h" +#include "common.h" +#include "dead_structs.h" + +#define NAMESPACE dead_flo_03 diff --git a/src/EC71B0.c b/src/world/dead/flo_07/EC71B0.c similarity index 85% rename from src/EC71B0.c rename to src/world/dead/flo_07/EC71B0.c index abdae80b74..91bdb11d9a 100644 --- a/src/EC71B0.c +++ b/src/world/dead/flo_07/EC71B0.c @@ -1,9 +1,4 @@ -#include "dead.h" -#include "common.h" - -// Copy of flo_07 (CAC1F0.c) - -#define NAMESPACE EC71B0 +#include "flo_07.h" #include "world/common/atomic/TexturePan.inc.c" diff --git a/src/EC7590.c b/src/world/dead/flo_07/EC7590.c similarity index 66% rename from src/EC7590.c rename to src/world/dead/flo_07/EC7590.c index 9ff6f0ae47..c5961e5eeb 100644 --- a/src/EC7590.c +++ b/src/world/dead/flo_07/EC7590.c @@ -1,7 +1,4 @@ -#include "dead.h" -#include "common.h" - -#define NAMESPACE EC7590 +#include "flo_07.h" #include "common/foliage.inc.c" diff --git a/src/world/dead/flo_07/flo_07.h b/src/world/dead/flo_07/flo_07.h new file mode 100644 index 0000000000..5ade598258 --- /dev/null +++ b/src/world/dead/flo_07/flo_07.h @@ -0,0 +1,7 @@ +// Older version of flo_07 + +#include "dead.h" +#include "common.h" +#include "dead_structs.h" + +#define NAMESPACE dead_flo_07 diff --git a/src/world/dead/flo_08/EC9D00.c b/src/world/dead/flo_08/EC9D00.c new file mode 100644 index 0000000000..6940defdc0 --- /dev/null +++ b/src/world/dead/flo_08/EC9D00.c @@ -0,0 +1,3 @@ +#include "flo_08.h" + +#include "world/common/entity/SuperBlock.inc.c" diff --git a/src/world/dead/flo_08/ECAA40.c b/src/world/dead/flo_08/ECAA40.c new file mode 100644 index 0000000000..a59716e0e1 --- /dev/null +++ b/src/world/dead/flo_08/ECAA40.c @@ -0,0 +1,3 @@ +#include "flo_08.h" + +#include "world/common/todo/DeadUnkFunc1.inc.c" diff --git a/src/world/dead/flo_08/ECAA80.c b/src/world/dead/flo_08/ECAA80.c new file mode 100644 index 0000000000..4c3951f0e9 --- /dev/null +++ b/src/world/dead/flo_08/ECAA80.c @@ -0,0 +1,52 @@ +#include "flo_08.h" +#include "effects.h" + +extern s32 N(ItemChoiceList)[]; +extern s32 N(FlowerGuard_ItemChoiceList)[91]; +extern s32 dead_flo_08_ItemChoice_HasSelectedItem; +extern s32 dead_flo_08_ItemChoice_SelectedItemID; + +void dead_flo_08_UnkFloAI_Chase(Evt* script, MobileAISettings* aiSettings, EnemyDetectVolume* territory); + +#include "world/common/enemy/ai/UnkFloAI.inc.c" + +// 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/todo/GetNpcCollisionHeight.inc.c" + +#include "world/common/todo/AddPlayerHandsOffset.inc.c" + +// Needs data migrated +#ifdef NON_MATCHING +ApiStatus dead_flo_08_ItemChoice_WaitForSelection(Evt *script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + + if (isInitialCall) { + dead_flo_08_ItemChoice_HasSelectedItem = FALSE; + } + if (dead_flo_08_ItemChoice_HasSelectedItem) { + dead_flo_08_ItemChoice_HasSelectedItem = FALSE; + dead_evt_set_variable(script, *args++, dead_flo_08_ItemChoice_SelectedItemID); + return ApiStatus_DONE2; + } + return ApiStatus_BLOCK; +} +#else +INCLUDE_ASM(s32, "ECAA80", func_8024199C_ECB69C); +#endif + +// dead_flo_08_ItemChoice_SaveSelected (needs data?) + +ApiStatus dead_flo_08_ItemChoice_SaveSelected(Evt *script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + + dead_flo_08_ItemChoice_SelectedItemID = dead_evt_get_variable(script, *args++); + dead_flo_08_ItemChoice_HasSelectedItem = TRUE; + return ApiStatus_DONE2; +} + + +#include "world/common/atomic/MakeConsumableChoice.inc.c" + +#include "world/common/atomic/ItemChoice_FlowerGuard.inc.c" diff --git a/src/world/dead/flo_08/ECB930.c b/src/world/dead/flo_08/ECB930.c new file mode 100644 index 0000000000..99784800ef --- /dev/null +++ b/src/world/dead/flo_08/ECB930.c @@ -0,0 +1,3 @@ +#include "flo_08.h" + +#include "common/foliage.inc.c" diff --git a/src/world/dead/flo_08/ECBB70.c b/src/world/dead/flo_08/ECBB70.c new file mode 100644 index 0000000000..578e9049a2 --- /dev/null +++ b/src/world/dead/flo_08/ECBB70.c @@ -0,0 +1,3 @@ +#include "flo_08.h" + +#include "world/common/todo/UnkFunc43.inc.c" diff --git a/src/world/dead/flo_08/flo_08.h b/src/world/dead/flo_08/flo_08.h new file mode 100644 index 0000000000..5d6a91bf8c --- /dev/null +++ b/src/world/dead/flo_08/flo_08.h @@ -0,0 +1,7 @@ +// Older version of flo_08 + +#include "dead.h" +#include "common.h" +#include "dead_structs.h" + +#define NAMESPACE dead_flo_08 diff --git a/src/world/dead/flo_09/ECFFF0.c b/src/world/dead/flo_09/ECFFF0.c new file mode 100644 index 0000000000..e0bf9d41f9 --- /dev/null +++ b/src/world/dead/flo_09/ECFFF0.c @@ -0,0 +1,3 @@ +#include "flo_09.h" + +#include "world/common/todo/DeadUnkFunc1.inc.c" diff --git a/src/world/dead/flo_09/ED0030.c b/src/world/dead/flo_09/ED0030.c new file mode 100644 index 0000000000..9a8d3bbad3 --- /dev/null +++ b/src/world/dead/flo_09/ED0030.c @@ -0,0 +1,3 @@ +#include "flo_09.h" + +#include "world/common/todo/UnkFunc43.inc.c" diff --git a/src/world/dead/flo_09/ED00D0.c b/src/world/dead/flo_09/ED00D0.c new file mode 100644 index 0000000000..962abd8c56 --- /dev/null +++ b/src/world/dead/flo_09/ED00D0.c @@ -0,0 +1,3 @@ +#include "flo_09.h" + +#include "common/foliage.inc.c" diff --git a/src/world/dead/flo_09/ED0310.c b/src/world/dead/flo_09/ED0310.c new file mode 100644 index 0000000000..5a12f0ff1c --- /dev/null +++ b/src/world/dead/flo_09/ED0310.c @@ -0,0 +1,3 @@ +#include "flo_09.h" + +#include "world/common/enemy/ai/FlyingAI.inc.c" diff --git a/src/world/dead/flo_09/flo_09.h b/src/world/dead/flo_09/flo_09.h new file mode 100644 index 0000000000..98a677cb06 --- /dev/null +++ b/src/world/dead/flo_09/flo_09.h @@ -0,0 +1,7 @@ +// Older version of flo_09 + +#include "dead.h" +#include "common.h" +#include "dead_structs.h" + +#define NAMESPACE dead_flo_09 diff --git a/src/ED4220.c b/src/world/dead/flo_10/ED4220.c similarity index 72% rename from src/ED4220.c rename to src/world/dead/flo_10/ED4220.c index 4d49abceb9..2e288e616e 100644 --- a/src/ED4220.c +++ b/src/world/dead/flo_10/ED4220.c @@ -1,11 +1,6 @@ -#include "dead.h" -#include "common.h" +#include "flo_10.h" #include "message_ids.h" -// Copy of flo_10 (CBP200.c) - -#define NAMESPACE ED4220 - s32 N(get_tattle)(void) { if (evt_get_variable(NULL, GB_StoryProgress) < STORY_CH6_FILLED_SPRING_WITH_WATER) { return MSG_MapTattle_flo_10_before; diff --git a/src/world/dead/flo_10/ED4260.c b/src/world/dead/flo_10/ED4260.c new file mode 100644 index 0000000000..e5f9bc2fce --- /dev/null +++ b/src/world/dead/flo_10/ED4260.c @@ -0,0 +1,3 @@ +#include "flo_10.h" + +#include "world/common/todo/DeadUnkFunc1.inc.c" diff --git a/src/ED42A0.c b/src/world/dead/flo_10/ED42A0.c similarity index 69% rename from src/ED42A0.c rename to src/world/dead/flo_10/ED42A0.c index fab07f3c1a..444790c968 100644 --- a/src/ED42A0.c +++ b/src/world/dead/flo_10/ED42A0.c @@ -1,7 +1,4 @@ -#include "dead.h" -#include "common.h" - -#define NAMESPACE ED42A0 +#include "flo_10.h" #include "world/common/todo/StashVars.inc.c" diff --git a/src/ED46D0.c b/src/world/dead/flo_10/ED46D0.c similarity index 98% rename from src/ED46D0.c rename to src/world/dead/flo_10/ED46D0.c index 3934a80a10..21b7e9694f 100644 --- a/src/ED46D0.c +++ b/src/world/dead/flo_10/ED46D0.c @@ -1,12 +1,8 @@ -#include "dead.h" -#include "common.h" +#include "flo_10.h" + #include "nu/nusys.h" #include "model.h" -// Copy of flo_10 (CB96B0.c) - -#define NAMESPACE ED46D0 - // rodata extern char D_80244BB8_ED8DD8[]; extern char D_80244BEC_ED8E0C[]; diff --git a/src/world/dead/flo_10/ED5540.c b/src/world/dead/flo_10/ED5540.c new file mode 100644 index 0000000000..1badd584b9 --- /dev/null +++ b/src/world/dead/flo_10/ED5540.c @@ -0,0 +1,3 @@ +#include "flo_10.h" + +#include "common/foliage.inc.c" diff --git a/src/world/dead/flo_10/flo_10.h b/src/world/dead/flo_10/flo_10.h new file mode 100644 index 0000000000..f6326128c6 --- /dev/null +++ b/src/world/dead/flo_10/flo_10.h @@ -0,0 +1,7 @@ +// Older version of flo_10 + +#include "dead.h" +#include "common.h" +#include "dead_structs.h" + +#define NAMESPACE dead_flo_10 diff --git a/src/ED8E20.c b/src/world/dead/flo_11/ED8E20.c similarity index 76% rename from src/ED8E20.c rename to src/world/dead/flo_11/ED8E20.c index 353f11b689..83f2f33e90 100644 --- a/src/ED8E20.c +++ b/src/world/dead/flo_11/ED8E20.c @@ -1,9 +1,4 @@ -#include "dead.h" -#include "common.h" - -// Copy of flo_11 (CBDCD0.c) - -#define NAMESPACE ED8E20 +#include "flo_11.h" #include "world/common/entity/Pipe.inc.c" diff --git a/src/world/dead/flo_11/flo_11.h b/src/world/dead/flo_11/flo_11.h new file mode 100644 index 0000000000..2561b01afe --- /dev/null +++ b/src/world/dead/flo_11/flo_11.h @@ -0,0 +1,7 @@ +// Older version of flo_11 + +#include "dead.h" +#include "common.h" +#include "dead_structs.h" + +#define NAMESPACE dead_flo_11 diff --git a/src/world/dead/flo_12/EDBFE0.c b/src/world/dead/flo_12/EDBFE0.c new file mode 100644 index 0000000000..c21ec117e9 --- /dev/null +++ b/src/world/dead/flo_12/EDBFE0.c @@ -0,0 +1,8 @@ +#include "flo_12.h" + +void fx_sun_undeclared(s32, s32, s32, s32, s32, s32); + +ApiStatus N(func_80240000_EDBFE0)(Evt *script, s32 isInitialCall) { + fx_sun_undeclared(0, 0, 0, 0, 0, 0); + return ApiStatus_DONE2; +} diff --git a/src/EDC020.c b/src/world/dead/flo_12/EDC020.c similarity index 82% rename from src/EDC020.c rename to src/world/dead/flo_12/EDC020.c index 044323d02a..943388933d 100644 --- a/src/EDC020.c +++ b/src/world/dead/flo_12/EDC020.c @@ -1,11 +1,6 @@ -#include "dead.h" -#include "common.h" +#include "flo_12.h" -// Copy of flo_12 (CC0E70.c) - -#define NAMESPACE EDC020 - -extern s32 EDC020_D_802429E0[]; +extern s32 N(D_802429E0)[]; #include "common/foliage.inc.c" @@ -56,13 +51,13 @@ ApiStatus func_8024064C_EDC62C(Evt* script, s32 isInitialCall) { if (ptr != NULL) { for (i = 0; ptr[i] != 0; i++) { - EDC020_D_802429E0[i] = ptr[i]; + N(D_802429E0)[i] = ptr[i]; } - EDC020_D_802429E0[i] = 0; + N(D_802429E0)[i] = 0; } else { for (i = 0; i < 112; i++) { - EDC020_D_802429E0[i] = i + 16; - EDC020_D_802429E0[112] = 0; + N(D_802429E0)[i] = i + 16; + N(D_802429E0)[112] = 0; } } return ApiStatus_DONE2; diff --git a/src/world/dead/flo_12/flo_12.h b/src/world/dead/flo_12/flo_12.h new file mode 100644 index 0000000000..227b395325 --- /dev/null +++ b/src/world/dead/flo_12/flo_12.h @@ -0,0 +1,7 @@ +// Older version of flo_12 + +#include "dead.h" +#include "common.h" +#include "dead_structs.h" + +#define NAMESPACE dead_flo_12 diff --git a/src/world/dead/flo_13/EDE9C0.c b/src/world/dead/flo_13/EDE9C0.c new file mode 100644 index 0000000000..b10106aaad --- /dev/null +++ b/src/world/dead/flo_13/EDE9C0.c @@ -0,0 +1,8 @@ +#include "flo_13.h" + +void fx_sun_undeclared(s32, s32, s32, s32, s32, s32); + +ApiStatus N(func_80240000_EDE9C0)(Evt *script, s32 isInitialCall) { + fx_sun_undeclared(0, 0, 0, 0, 0, 0); + return ApiStatus_DONE2; +} diff --git a/src/EDEA00.c b/src/world/dead/flo_13/EDEA00.c similarity index 95% rename from src/EDEA00.c rename to src/world/dead/flo_13/EDEA00.c index a04190caee..9d49fd4ff7 100644 --- a/src/EDEA00.c +++ b/src/world/dead/flo_13/EDEA00.c @@ -1,9 +1,4 @@ -#include "dead.h" -#include "common.h" - -// Copy of flo_13 (CC3850.c) - -#define NAMESPACE EDEA00 +#include "flo_13.h" #include "world/common/util/ChangeNpcToPartner.inc.c" diff --git a/src/EE2040.c b/src/world/dead/flo_13/EE2040.c similarity index 57% rename from src/EE2040.c rename to src/world/dead/flo_13/EE2040.c index 8159475569..7ebb32d196 100644 --- a/src/EE2040.c +++ b/src/world/dead/flo_13/EE2040.c @@ -1,7 +1,4 @@ -#include "dead.h" -#include "common.h" - -#define NAMESPACE EE2040 +#include "flo_13.h" #define PARTY_IMAGE "party_pokopi" diff --git a/src/world/dead/flo_13/flo_13.h b/src/world/dead/flo_13/flo_13.h new file mode 100644 index 0000000000..e98a5e1db5 --- /dev/null +++ b/src/world/dead/flo_13/flo_13.h @@ -0,0 +1,7 @@ +// Older version of flo_13 + +#include "dead.h" +#include "common.h" +#include "dead_structs.h" + +#define NAMESPACE dead_flo_13 diff --git a/src/EE65B0.c b/src/world/dead/flo_14/EE65B0.c similarity index 96% rename from src/EE65B0.c rename to src/world/dead/flo_14/EE65B0.c index 3cae93ab50..97db97ab30 100644 --- a/src/EE65B0.c +++ b/src/world/dead/flo_14/EE65B0.c @@ -1,9 +1,4 @@ -#include "dead.h" -#include "common.h" - -// Copy of flo_14 (CCB310.c) - -#define NAMESPACE EE65B0 +#include "flo_14.h" extern f32 D_80243B44_EEA0F4; diff --git a/src/world/dead/flo_14/EE70C0.c b/src/world/dead/flo_14/EE70C0.c new file mode 100644 index 0000000000..3c9bad8e1a --- /dev/null +++ b/src/world/dead/flo_14/EE70C0.c @@ -0,0 +1,64 @@ +#include "flo_14.h" + +extern const s32 D_802453E0_EEB990[]; +extern s32 D_8024462C_EEABDC; +extern s32 D_80244630_EEABE0; + +#include "world/common/enemy/ai/FlyingAI.inc.c" + +#include "world/common/todo/GetNpcCollisionHeight.inc.c" + +#include "world/common/todo/AddPlayerHandsOffset.inc.c" + +// Needs data migrated +#ifdef NON_MATCHING +ApiStatus N(ItemChoice_WaitForSelection)(Evt *script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + + if (isInitialCall) { + D_8024462C_EEABDC = FALSE; + } + if (D_8024462C_EEABDC) { + D_8024462C_EEABDC = FALSE; + dead_evt_set_variable(script, *args++, D_80244630_EEABE0); + return ApiStatus_DONE2; + } + return ApiStatus_BLOCK; +} +#else +INCLUDE_ASM(s32, "EE70C0", func_80242260_EE8810); +#endif + +ApiStatus N(ItemChoice_SaveSelected)(Evt *script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + + D_80244630_EEABE0 = dead_evt_get_variable(script, *args++); + D_8024462C_EEABDC = TRUE; + return ApiStatus_DONE2; +} + +ApiStatus func_802422EC_EE889C(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++) { + D_802453E0_EEB990[i] = ptr[i]; + } + D_802453E0_EEB990[i] = 0; + } else { + for (i = 0; i < 91; i++) { + D_802453E0_EEB990[i] = i + 128; + D_802453E0_EEB990[91] = 0; + } + } + return ApiStatus_DONE2; +} + +extern ApiStatus dead_flo_14_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, &dead_flo_14_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, SetSleepBubbleTimeLeft, 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/EE8940.c b/src/world/dead/flo_14/EE8940.c similarity index 52% rename from src/EE8940.c rename to src/world/dead/flo_14/EE8940.c index b75a78dac8..f3e01cd02f 100644 --- a/src/EE8940.c +++ b/src/world/dead/flo_14/EE8940.c @@ -1,9 +1,6 @@ -#include "dead.h" -#include "common.h" +#include "flo_14.h" -#define NAMESPACE EE8940 - -ApiStatus func_80242390_EE8940(Evt* script, s32 isInitialCall) { +ApiStatus N(func_80242390_EE8940)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; evt_set_variable(script, *args++, gCollisionStatus.floorBelow); diff --git a/src/world/dead/flo_14/flo_14.h b/src/world/dead/flo_14/flo_14.h new file mode 100644 index 0000000000..c5dfb55dba --- /dev/null +++ b/src/world/dead/flo_14/flo_14.h @@ -0,0 +1,7 @@ +// Older version of flo_14 + +#include "dead.h" +#include "common.h" +#include "dead_structs.h" + +#define NAMESPACE dead_flo_14 diff --git a/src/world/dead/flo_16/EED100.c b/src/world/dead/flo_16/EED100.c new file mode 100644 index 0000000000..3dea71029c --- /dev/null +++ b/src/world/dead/flo_16/EED100.c @@ -0,0 +1,3 @@ +#include "flo_16.h" + +#include "world/common/todo/DeadUnkFunc1.inc.c" diff --git a/src/world/dead/flo_16/EED140.c b/src/world/dead/flo_16/EED140.c new file mode 100644 index 0000000000..f489fe7825 --- /dev/null +++ b/src/world/dead/flo_16/EED140.c @@ -0,0 +1,3 @@ +#include "flo_16.h" + +#include "world/common/todo/UnkFunc43.inc.c" diff --git a/src/EED1E0.c b/src/world/dead/flo_16/EED1E0.c similarity index 50% rename from src/EED1E0.c rename to src/world/dead/flo_16/EED1E0.c index 6c17670abb..b8cb2c5891 100644 --- a/src/EED1E0.c +++ b/src/world/dead/flo_16/EED1E0.c @@ -1,9 +1,4 @@ -#include "dead.h" -#include "common.h" - -// Copy of flo_16 (CD1F10.c) - -#define NAMESPACE EED1E0 +#include "flo_16.h" #include "world/common/entity/SuperBlock.inc.c" diff --git a/src/EEDF50.c b/src/world/dead/flo_16/EEDF50.c similarity index 53% rename from src/EEDF50.c rename to src/world/dead/flo_16/EEDF50.c index d8b2111165..3561de43c6 100644 --- a/src/EEDF50.c +++ b/src/world/dead/flo_16/EEDF50.c @@ -1,9 +1,4 @@ -#include "dead.h" -#include "common.h" - -// Copy of flo_16 (CD2C80.c) - -#define NAMESPACE EEDF50 +#include "flo_16.h" #include "world/common/enemy/ai/FlyingAI.inc.c" diff --git a/src/EEFAA0.c b/src/world/dead/flo_16/EEFAA0.c similarity index 80% rename from src/EEFAA0.c rename to src/world/dead/flo_16/EEFAA0.c index e269fc046f..201e003692 100644 --- a/src/EEFAA0.c +++ b/src/world/dead/flo_16/EEFAA0.c @@ -1,9 +1,4 @@ -#include "dead.h" -#include "common.h" - -// Copy of flo_16 (CD4770.c) - -#define NAMESPACE EEFAA0 +#include "flo_16.h" // Copy from flo_16/UnkFunc44 ApiStatus func_802429A0_EEFAA0(Evt* script, s32 isInitialCall) { diff --git a/src/world/dead/flo_16/flo_16.h b/src/world/dead/flo_16/flo_16.h new file mode 100644 index 0000000000..0000bd7f1f --- /dev/null +++ b/src/world/dead/flo_16/flo_16.h @@ -0,0 +1,7 @@ +// Older version of flo_16 + +#include "dead.h" +#include "common.h" +#include "dead_structs.h" + +#define NAMESPACE dead_flo_16 diff --git a/src/EF7A80.c b/src/world/dead/flo_18/EF7A80.c similarity index 88% rename from src/EF7A80.c rename to src/world/dead/flo_18/EF7A80.c index af6b61997e..d62965d779 100644 --- a/src/EF7A80.c +++ b/src/world/dead/flo_18/EF7A80.c @@ -1,9 +1,4 @@ -#include "dead.h" -#include "common.h" - -// Copy of flo_18 (CDC6A0.c) - -#define NAMESPACE EF7A80 +#include "flo_18.h" #include "world/common/atomic/TexturePan.inc.c" diff --git a/src/world/dead/flo_18/EF7FB0.c b/src/world/dead/flo_18/EF7FB0.c new file mode 100644 index 0000000000..d6c7de4a5c --- /dev/null +++ b/src/world/dead/flo_18/EF7FB0.c @@ -0,0 +1,3 @@ +#include "flo_18.h" + +#include "world/common/todo/UnkFunc42.inc.c" diff --git a/src/world/dead/flo_18/EF8010.c b/src/world/dead/flo_18/EF8010.c new file mode 100644 index 0000000000..b95f383d8d --- /dev/null +++ b/src/world/dead/flo_18/EF8010.c @@ -0,0 +1,3 @@ +#include "flo_18.h" + +#include "common/foliage.inc.c" diff --git a/src/world/dead/flo_18/flo_18.h b/src/world/dead/flo_18/flo_18.h new file mode 100644 index 0000000000..b3377914bb --- /dev/null +++ b/src/world/dead/flo_18/flo_18.h @@ -0,0 +1,7 @@ +// Older version of flo_18 + +#include "dead.h" +#include "common.h" +#include "dead_structs.h" + +#define NAMESPACE dead_flo_18 diff --git a/src/world/dead/kzn_17/EA0900.c b/src/world/dead/kzn_17/EA0900.c new file mode 100644 index 0000000000..301a3f8386 --- /dev/null +++ b/src/world/dead/kzn_17/EA0900.c @@ -0,0 +1,3 @@ +#include "kzn_17.h" + +#include "world/common/atomic/TexturePan.inc.c" diff --git a/src/EA0C10.c b/src/world/dead/kzn_17/EA0C10.c similarity index 87% rename from src/EA0C10.c rename to src/world/dead/kzn_17/EA0C10.c index 176db675cc..ab2c81ff21 100644 --- a/src/EA0C10.c +++ b/src/world/dead/kzn_17/EA0C10.c @@ -1,14 +1,8 @@ -#include "dead.h" -#include "common.h" -#include "dead_structs.h" - -// Copy of kzn_17 (C85DC0.c) - -#define NAMESPACE EA0C10 +#include "kzn_17.h" const char ascii_EA6D70[] = "kzn_11"; const char ascii_EA6D78[] = "kzn_18"; -extern s32 EA0C10_D_802466D0[]; +extern s32 N(D_802466D0)[]; void func_8004D8E0(DeadEnemy*); @@ -76,13 +70,13 @@ ApiStatus func_80242A4C_EA334C(Evt* script, s32 isInitialCall) { if (ptr != NULL) { for (i = 0; ptr[i] != 0; i++) { - EA0C10_D_802466D0[i] = ptr[i]; + N(D_802466D0)[i] = ptr[i]; } - EA0C10_D_802466D0[i] = 0; + N(D_802466D0)[i] = 0; } else { for (i = 0; i < 112; i++) { - EA0C10_D_802466D0[i] = i + 16; - EA0C10_D_802466D0[112] = 0; + N(D_802466D0)[i] = i + 16; + N(D_802466D0)[112] = 0; } } return ApiStatus_DONE2; diff --git a/src/EA36E0.c b/src/world/dead/kzn_17/EA36E0.c similarity index 88% rename from src/EA36E0.c rename to src/world/dead/kzn_17/EA36E0.c index 9c267a42af..548fa8f9d0 100644 --- a/src/EA36E0.c +++ b/src/world/dead/kzn_17/EA36E0.c @@ -1,9 +1,4 @@ -#include "dead.h" -#include "common.h" - -#define NAMESPACE EA36E0 - -// Copy of kzn_17 (C887B0.c) +#include "kzn_17.h" #define UNK_FUNC_50_LVar1 -583.0 #define UNK_FUNC_50_LVar2 165.0 diff --git a/src/world/dead/kzn_17/kzn_17.h b/src/world/dead/kzn_17/kzn_17.h new file mode 100644 index 0000000000..bf0c1b1c1f --- /dev/null +++ b/src/world/dead/kzn_17/kzn_17.h @@ -0,0 +1,7 @@ +// Older version of kzn_17 + +#include "dead.h" +#include "common.h" +#include "dead_structs.h" + +#define NAMESPACE dead_kzn_17 diff --git a/src/EA6FD0.c b/src/world/dead/kzn_18/EA6FD0.c similarity index 50% rename from src/EA6FD0.c rename to src/world/dead/kzn_18/EA6FD0.c index 44c4c06678..1188eaa0aa 100644 --- a/src/EA6FD0.c +++ b/src/world/dead/kzn_18/EA6FD0.c @@ -1,14 +1,12 @@ -#include "dead.h" -#include "common.h" - -#define NAMESPACE EA6FD0 +#include "kzn_18.h" +#include "message_ids.h" s32 func_80240000_EA6FD0(void) { s32 temp = evt_get_variable(NULL, GB_StoryProgress); if (temp <= 0x26) { - return 0x19010F; + return MSG_MapTattle_kzn_18_before; } else { - return 0x190110; + return MSG_MapTattle_kzn_18_after; } } diff --git a/src/world/dead/kzn_18/EA7010.c b/src/world/dead/kzn_18/EA7010.c new file mode 100644 index 0000000000..4032ded79c --- /dev/null +++ b/src/world/dead/kzn_18/EA7010.c @@ -0,0 +1,3 @@ +#include "kzn_18.h" + +#include "world/common/atomic/TexturePan.inc.c" diff --git a/src/EA7320.c b/src/world/dead/kzn_18/EA7320.c similarity index 83% rename from src/EA7320.c rename to src/world/dead/kzn_18/EA7320.c index fb9cef2c99..ac12ba9fc5 100644 --- a/src/EA7320.c +++ b/src/world/dead/kzn_18/EA7320.c @@ -1,7 +1,4 @@ -#include "dead.h" -#include "common.h" - -#define NAMESPACE EA7320 +#include "kzn_18.h" #include "world/common/todo/SetCamera0Flag1000.inc.c" diff --git a/src/world/dead/kzn_18/kzn_18.h b/src/world/dead/kzn_18/kzn_18.h new file mode 100644 index 0000000000..8ae60f6ffc --- /dev/null +++ b/src/world/dead/kzn_18/kzn_18.h @@ -0,0 +1,7 @@ +// Older version of kzn_18 + +#include "dead.h" +#include "common.h" +#include "dead_structs.h" + +#define NAMESPACE dead_kzn_18 diff --git a/src/EA8AE0.c b/src/world/dead/kzn_19/EA8AE0.c similarity index 90% rename from src/EA8AE0.c rename to src/world/dead/kzn_19/EA8AE0.c index 67f5dcb752..ccf0a43361 100644 --- a/src/EA8AE0.c +++ b/src/world/dead/kzn_19/EA8AE0.c @@ -1,13 +1,6 @@ -#include "dead.h" -#include "common.h" -#include "effects.h" -#include "battle/battle.h" +#include "kzn_19.h" -// Copy of kzn_19 (kzn_19_3.npc.c) - -#define NAMESPACE EA8AE0 - -extern s32 EA8AE0_D_80248388[]; +extern s32 N(D_80248388)[]; extern s32 D_80248380; extern s32 D_80243DD8_EAC8B8; extern s32 D_80243DDC_EAC8BC; @@ -116,13 +109,13 @@ ApiStatus func_80241838_EAA318(Evt* script, s32 isInitialCall) { if (ptr != NULL) { for (i = 0; ptr[i] != 0; i++) { - EA8AE0_D_80248388[i] = ptr[i]; + N(D_80248388)[i] = ptr[i]; } - EA8AE0_D_80248388[i] = 0; + N(D_80248388)[i] = 0; } else { for (i = 0; i < 112; i++) { - EA8AE0_D_80248388[i] = i + 16; - EA8AE0_D_80248388[112] = 0; + N(D_80248388)[i] = i + 16; + N(D_80248388)[112] = 0; } } return ApiStatus_DONE2; diff --git a/src/world/dead/kzn_19/kzn_19.h b/src/world/dead/kzn_19/kzn_19.h new file mode 100644 index 0000000000..e931b60d3a --- /dev/null +++ b/src/world/dead/kzn_19/kzn_19.h @@ -0,0 +1,7 @@ +// Older version of kzn_19 + +#include "dead.h" +#include "common.h" +#include "dead_structs.h" + +#define NAMESPACE dead_kzn_19 diff --git a/src/world/dead/kzn_23/EB7230.c b/src/world/dead/kzn_23/EB7230.c new file mode 100644 index 0000000000..722476db2c --- /dev/null +++ b/src/world/dead/kzn_23/EB7230.c @@ -0,0 +1,3 @@ +#include "kzn_23.h" + +#include "world/common/atomic/TexturePan.inc.c" diff --git a/src/EB7540.c b/src/world/dead/kzn_23/EB7540.c similarity index 92% rename from src/EB7540.c rename to src/world/dead/kzn_23/EB7540.c index 96df4c04f6..ed5442e905 100644 --- a/src/EB7540.c +++ b/src/world/dead/kzn_23/EB7540.c @@ -1,11 +1,6 @@ -#include "dead.h" -#include "common.h" +#include "kzn_23.h" #include "effects.h" -// Copy of kzn_23 (kzn_23_2_extra.c) - -#define NAMESPACE EB7540 - API_CALLABLE(N(SetChestPosition)) { Bytecode* args = script->ptrReadPos; s32 entityIndex = evt_get_variable(script, *args++); @@ -35,7 +30,7 @@ API_CALLABLE(N(SetPyroclastPos)) { f32 x = evt_get_float_variable(script, *args++); f32 y = evt_get_float_variable(script, *args++); f32 z = evt_get_float_variable(script, *args++); - EffectInstance* effect = script->varTablePtr[0xE]; + EffectInstance* effect = script->varTablePtr[14]; effect->data.unk_65->pos.x = x; effect->data.unk_65->pos.y = y; diff --git a/src/world/dead/kzn_23/kzn_23.h b/src/world/dead/kzn_23/kzn_23.h new file mode 100644 index 0000000000..7e3293a69f --- /dev/null +++ b/src/world/dead/kzn_23/kzn_23.h @@ -0,0 +1,7 @@ +// Older version of kzn_23 + +#include "dead.h" +#include "common.h" +#include "dead_structs.h" + +#define NAMESPACE dead_kzn_23 diff --git a/src/world/partners.c b/src/world/partners.c index 2ec4e7585b..3fbbbc0097 100644 --- a/src/world/partners.c +++ b/src/world/partners.c @@ -169,7 +169,7 @@ extern HudScript HES_StatusSPIncrement6; extern HudScript HES_StatusSPIncrement7; extern s32 D_802C0000; -extern EvtScript D_802C05CC_32579C; +extern EvtScript EVS_World_UseItem; s32 partner_is_idle(Npc* partner); s32 world_partner_can_player_pause_default(Npc* partner); @@ -211,7 +211,7 @@ s32 D_800F8000[] = { 8, 0, 0, 0 }; UseItemStruct UseItemDmaArgs = { _3251D0_ROM_START, _3251D0_ROM_END, - &D_802C05CC_32579C, + &EVS_World_UseItem, 0 }; s32 D_800F8020 = 0; diff --git a/src/world/script_api/7E0E80.c b/src/world/script_api/7E0E80.c index 063ed44324..476da1ed9e 100644 --- a/src/world/script_api/7E0E80.c +++ b/src/world/script_api/7E0E80.c @@ -66,7 +66,7 @@ EvtScript BadgeShopInteract = { EVT_END }; -EvtScript D_80284054_7E4ED4 = { +EvtScript ItemShopInteract = { EVT_CALL(ShowShopOwnerDialog) EVT_RETURN EVT_END diff --git a/src/world/script_api/7E2AA0.c b/src/world/script_api/7E2AA0.c index 6fec9046a5..a6ea6fa3d7 100644 --- a/src/world/script_api/7E2AA0.c +++ b/src/world/script_api/7E2AA0.c @@ -50,6 +50,18 @@ ApiStatus func_80281C84(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } +/* ARGS: + s16 group1; + s16 group2; + EvtScript* openDoor; + EvtScript* moveWalls; + EvtScript* dropDoor; + EvtScript* toggleVis; + s32 doorInColliderID; + s32 doorOutColliderID; + s32 interiorModelGroup; + s32* interiorNPCs; +*/ ApiStatus MakeDoorAdvanced(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; AdvancedDoor* door = heap_malloc(sizeof(*door)); diff --git a/src/world/world.c b/src/world/world.c index b04a0fe80c..0e1b7283b1 100644 --- a/src/world/world.c +++ b/src/world/world.c @@ -321,12 +321,12 @@ MapConfig kgr_maps[] = { /// Goomba Region #include "area_kmr/kmr.h" MapConfig kmr_maps[] = { - { MAP_UNSPLIT(kmr_00, 0x80240D80), .bgName = "kmr_bg", .unk_1C = { .bytes = { .flags = 1 } } }, + { MAP(kmr_00), .bgName = "kmr_bg", .unk_1C = { .bytes = { .flags = 1 } } }, { MAP_UNSPLIT(kmr_02, 0x80243AF0), .bgName = "kmr_bg" }, - { MAP_UNSPLIT(kmr_03, 0x80240680), .bgName = "kmr_bg" }, - { MAP_UNSPLIT(kmr_04, 0x80240520), .bgName = "kmr_bg" }, - { MAP_UNSPLIT(kmr_05, 0x802417A0), .bgName = "kmr_bg" }, - { MAP_UNSPLIT(kmr_06, 0x80241DC0), .bgName = "kmr_bg" }, + { MAP(kmr_03), .bgName = "kmr_bg" }, + { MAP(kmr_04), .bgName = "kmr_bg" }, + { MAP(kmr_05), .bgName = "kmr_bg" }, + { MAP(kmr_06), .bgName = "kmr_bg" }, { MAP_UNSPLIT(kmr_07, 0x80240B70), .bgName = "kmr_bg" }, { MAP_UNSPLIT(kmr_09, 0x80241550), .bgName = "kmr_bg" }, { MAP_UNSPLIT(kmr_10, 0x80240640), .bgName = "kmr_bg" }, @@ -341,20 +341,22 @@ MapConfig kmr_maps[] = { }; /// Mt. Rugged +#include "area_iwa/iwa.h" MapConfig iwa_maps[] = { - { MAP_UNSPLIT(iwa_00, 0x80240310), .bgName = "iwa_bg" }, - { MAP_UNSPLIT(iwa_01, 0x80243320), .bgName = "iwa_bg" }, - { MAP_UNSPLIT(iwa_02, 0x80241140), .bgName = "iwa_bg" }, - { MAP_UNSPLIT(iwa_03, 0x80241360), .bgName = "iwa_bg" }, - { MAP_UNSPLIT(iwa_04, 0x80241100), .bgName = "iwa_bg" }, - { MAP_UNSPLIT(iwa_10, 0x80241810), .bgName = "iwa_bg" }, - { MAP_UNSPLIT(iwa_11, 0x80240330), .bgName = "iwa_bg" }, + { MAP(iwa_00), .bgName = "iwa_bg" }, + { MAP(iwa_01), .bgName = "iwa_bg" }, + { MAP(iwa_02), .bgName = "iwa_bg" }, + { MAP(iwa_03), .bgName = "iwa_bg" }, + { MAP(iwa_04), .bgName = "iwa_bg" }, + { MAP(iwa_10), .bgName = "iwa_bg" }, + { MAP(iwa_11), .bgName = "iwa_bg" }, }; /// Dry Dry Outpost +#include "area_dro/dro.h" MapConfig dro_maps[] = { - { MAP_UNSPLIT(dro_01, 0x80243B70), .bgName = "sbk_bg" }, - { MAP_UNSPLIT(dro_02, 0x80243AB0), .bgName = "sbk_bg" }, + { MAP(dro_01), .bgName = "sbk_bg" }, + { MAP(dro_02), .bgName = "sbk_bg" }, }; /// Dry Dry Desert diff --git a/src/3251D0.c b/src/world_use_item.c similarity index 64% rename from src/3251D0.c rename to src/world_use_item.c index c16bdc1179..afb1a7eaad 100644 --- a/src/3251D0.c +++ b/src/world_use_item.c @@ -2,41 +2,40 @@ #include "effects.h" #include "script_api/battle.h" -ApiStatus func_802C0000(Evt* script, s32 isInitialCall) { +ApiStatus WorldItem_ShowUseSparkles(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 a = evt_get_variable(script, *args++); - s32 b = evt_get_variable(script, *args++); - s32 c = 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++); - fx_sparkles(FX_SPARKLES_0, a, b, c, 60.0f); + fx_sparkles(FX_SPARKLES_0, x, y, z, 60.0f); return ApiStatus_DONE2; } -ApiStatus func_802C00AC(Evt* script, s32 isInitialCall) { +ApiStatus WorldItem_ShowHPGain(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 a = evt_get_variable(script, *args++); - s32 b = evt_get_variable(script, *args++); - s32 c = evt_get_variable(script, *args++); - s32 d = 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++); + s32 amt = evt_get_variable(script, *args++); - fx_recover(0, a, b, c, d); + fx_recover(0, x, y, z, amt); return ApiStatus_DONE2; } -ApiStatus func_802C016C(Evt* script, s32 isInitialCall) { +ApiStatus WorldItem_ShowFPGain(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 a = evt_get_variable(script, *args++); - s32 b = evt_get_variable(script, *args++); - s32 c = evt_get_variable(script, *args++); - s32 d = 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++); + s32 amt = evt_get_variable(script, *args++); - fx_recover(1, a, b, c, d); + fx_recover(1, x, y, z, amt); return ApiStatus_DONE2; } -ApiStatus func_802C022C(Evt* script, s32 isInitialCall) { +ApiStatus WorldItem_RestoreHP(Evt* script, s32 isInitialCall) { PlayerData* playerData = &gPlayerData; - s32 newHP = playerData->curHP + evt_get_variable(script, *script->ptrReadPos); if (newHP > playerData->curMaxHP) { @@ -51,9 +50,8 @@ ApiStatus func_802C022C(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_802C0288(Evt* script, s32 isInitialCall) { +ApiStatus WorldItem_RestoreFP(Evt* script, s32 isInitialCall) { PlayerData* playerData = &gPlayerData; - s32 newFP = playerData->curFP + evt_get_variable(script, *script->ptrReadPos); if (newFP > playerData->curMaxFP) { @@ -68,28 +66,28 @@ ApiStatus func_802C0288(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_802C02E4(Evt* script, s32 isInitialCall) { +ApiStatus WorldItem_PauseTime(Evt* script, s32 isInitialCall) { set_time_freeze_mode(TIME_FREEZE_FULL); gOverrideFlags |= GLOBAL_OVERRIDES_CANT_PICK_UP_ITEMS; return ApiStatus_DONE2; } -ApiStatus func_802C031C(Evt* script, s32 isInitialCall) { +ApiStatus WorldItem_UnpauseTime(Evt* script, s32 isInitialCall) { set_time_freeze_mode(TIME_FREEZE_NORMAL); gOverrideFlags &= ~GLOBAL_OVERRIDES_CANT_PICK_UP_ITEMS; return ApiStatus_DONE2; } -ApiStatus func_802C0358(Evt* script, s32 isInitialCall) { +ApiStatus WorldItem_GetItemProperties(Evt* script, s32 isInitialCall) { s32 itemIdx = evt_get_variable(script, *script->ptrReadPos); s32 var15; script->varTable[11] = (&gItemTable[itemIdx])->potencyA; script->varTable[12] = (&gItemTable[itemIdx])->potencyB; - script->varTable[13] = 0; + script->varTable[13] = FALSE; - if ((&gItemTable[itemIdx])->typeFlags & 0x100) { - script->varTable[13] = 1; + if ((&gItemTable[itemIdx])->typeFlags & ITEM_TYPE_FLAG_USE_DRINK_ANIMATION) { + script->varTable[13] = TRUE; } var15 = 0; @@ -101,12 +99,12 @@ ApiStatus func_802C0358(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_802C03E8(Evt* script, s32 isInitialCall) { +ApiStatus WorldItem_ConsumeItem(Evt* script, s32 isInitialCall) { remove_consumable(); return ApiStatus_DONE2; } -EvtScript D_802C0410 = { +EvtScript EVS_WorldItem_ShowUsedItem = { EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(SetPlayerAnimation, ANIM_Mario_GotItem) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) @@ -116,13 +114,13 @@ EvtScript D_802C0410 = { EVT_WAIT(15) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) - EVT_CALL(func_802C0000, LVar0, LVar1, LVar2) + EVT_CALL(WorldItem_ShowUseSparkles, LVar0, LVar1, LVar2) EVT_CALL(RemoveItemEntity, LVarA) EVT_RETURN EVT_END }; -EvtScript D_802C04F4 = { +EvtScript EVS_WorldItem_PlayEatingSounds = { EVT_THREAD EVT_LOOP(4) EVT_CALL(PlaySound, SOUND_2095) @@ -135,7 +133,7 @@ EvtScript D_802C04F4 = { EVT_END }; -EvtScript D_802C0560 = { +EvtScript EVS_WorldItem_PlayDrinkingSounds = { EVT_THREAD EVT_LOOP(4) EVT_CALL(PlaySound, SOUND_2095) @@ -148,7 +146,7 @@ EvtScript D_802C0560 = { EVT_END }; -EvtScript D_802C05CC_32579C = { +EvtScript EVS_World_UseItem = { EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(GetCurrentPartner, LVar0) @@ -156,13 +154,13 @@ EvtScript D_802C05CC_32579C = { EVT_CALL(InterruptUsePartner) EVT_WAIT(20) EVT_END_IF - EVT_CALL(func_802C02E4) - EVT_CALL(func_802C0358, LVarA) - EVT_EXEC_WAIT(D_802C0410) + EVT_CALL(WorldItem_PauseTime) + EVT_CALL(WorldItem_GetItemProperties, LVarA) + EVT_EXEC_WAIT(EVS_WorldItem_ShowUsedItem) EVT_IF_EQ(LVarD, 0) - EVT_EXEC_WAIT(D_802C04F4) + EVT_EXEC_WAIT(EVS_WorldItem_PlayEatingSounds) EVT_ELSE - EVT_EXEC_WAIT(D_802C0560) + EVT_EXEC_WAIT(EVS_WorldItem_PlayDrinkingSounds) EVT_END_IF EVT_IF_EQ(LVarF, 1) EVT_CALL(SetPlayerAnimation, ANIM_Mario_StickOutTongue) @@ -171,22 +169,22 @@ EvtScript D_802C05CC_32579C = { EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 0) EVT_ADD(LVar1, 35) - EVT_CALL(func_802C00AC, LVar0, LVar1, LVar2, LVarB) + EVT_CALL(WorldItem_ShowHPGain, LVar0, LVar1, LVar2, LVarB) EVT_END_IF EVT_IF_GT(LVarC, 0) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 20) EVT_ADD(LVar1, 25) - EVT_CALL(func_802C016C, LVar0, LVar1, LVar2, LVarC) + EVT_CALL(WorldItem_ShowFPGain, LVar0, LVar1, LVar2, LVarC) EVT_END_IF EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 25) EVT_CALL(ShowStartRecoveryShimmer, LVar0, LVar1, LVar2, LVarB) EVT_IF_NE(LVarB, 0) - EVT_CALL(func_802C022C, LVarB) + EVT_CALL(WorldItem_RestoreHP, LVarB) EVT_END_IF EVT_IF_NE(LVarC, 0) - EVT_CALL(func_802C0288, LVarC) + EVT_CALL(WorldItem_RestoreFP, LVarC) EVT_END_IF EVT_IF_EQ(LVarF, 0) EVT_WAIT(10) @@ -199,9 +197,9 @@ EvtScript D_802C05CC_32579C = { EVT_CALL(ShowRecoveryShimmer, LVar0, LVar1, LVar2, LVarB) EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) EVT_WAIT(20) - EVT_CALL(func_802C03E8) + EVT_CALL(WorldItem_ConsumeItem) EVT_CALL(DisablePlayerInput, FALSE) - EVT_CALL(func_802C031C) + EVT_CALL(WorldItem_UnpauseTime) EVT_RETURN EVT_END }; diff --git a/tools/splat/.gitrepo b/tools/splat/.gitrepo index fa3514eb14..768218b06e 100644 --- a/tools/splat/.gitrepo +++ b/tools/splat/.gitrepo @@ -6,7 +6,7 @@ [subrepo] remote = https://github.com/ethteck/splat.git branch = master - commit = 6c228fc53a8f1da47775c9807401710d06495e71 - parent = 198ed0efc54dc06e8a86325bd52b29b7a37f39aa + commit = ebadd64f07f744382786a5000b1667d4a21c48e6 + parent = 25780dbbc1b130021483bde6228d196f9998ab30 method = merge cmdver = 0.4.5 diff --git a/tools/splat/CHANGELOG.md b/tools/splat/CHANGELOG.md index 1cc645d68c..d6ba90a1b1 100644 --- a/tools/splat/CHANGELOG.md +++ b/tools/splat/CHANGELOG.md @@ -1,5 +1,19 @@ # splat Release Notes +### 0.12.4 +* Fixed a bug involving the order of attributes in symbol_addrs preventing proper range searching during calls to `get_symbol` + +### 0.12.3: Initial Gamecube Support +Initial support for Gamecube disk images has been set up! Disassembly is not currently supported, and a more comprehensive explanation of Gamecube support will come once that is finished. + +* The Symbol class is now hashable +* Added the ability for segments to specify a file path (`path`) to receive that file's contents as their split input +* The `generated_s_preamble` option now will be applied to data files created by spimdisasm +* Rewrote symbol range check code to be more efficient +* Fixed bug that allowed empty top-level segments of type `code`. +* Fixed progress bars to properly update their descriptions +* Fixed bug pertaining to symbols getting assigned to segments they shouldn't if their segment is given in symbol_addrs (`segment:`) + ### 0.12.2 * Fixed bug where `given_dir` was possibly not a `Path` diff --git a/tools/splat/create_config.py b/tools/splat/create_config.py index 3e2993b055..afbee0b1cd 100755 --- a/tools/splat/create_config.py +++ b/tools/splat/create_config.py @@ -5,16 +5,35 @@ import argparse from pathlib import Path from util.n64 import rominfo, find_code_length +from util.gc import gcinfo -parser = argparse.ArgumentParser(description="Create a splat config from an N64 ROM.") -parser.add_argument("rom", help="Path to a .z64/.n64 ROM") +from segtypes.gc.rarc import GcSegRarc + +parser = argparse.ArgumentParser( + description="Create a splat config from an N64 ROM or a GameCube disc image." +) +parser.add_argument("file", help="Path to a .z64/.n64 ROM or .iso/.gcm GameCube image") -def main(rom_path: Path): - if not rom_path.exists(): - sys.exit(f"ROM file {rom_path} does not exist ({rom_path.absolute()})") - if rom_path.is_dir(): - sys.exit(f"Path {rom_path} is a directory ({rom_path.absolute()})") +def main(file_path: Path): + if not file_path.exists(): + sys.exit(f"File {file_path} does not exist ({file_path.absolute()})") + if file_path.is_dir(): + sys.exit(f"Path {file_path} is a directory ({file_path.absolute()})") + + # Check for N64 ROM + if file_path.suffix.lower() == ".n64" or file_path.suffix.lower() == ".z64": + create_n64_config(file_path) + return + + file_bytes = file_path.read_bytes() + + # Check for GC disc image + if int.from_bytes(file_bytes[0x1C:0x20], byteorder="big") == 0xC2339F3D: + create_gc_config(file_path, file_bytes) + + +def create_n64_config(rom_path: Path): rom_bytes = rominfo.read_rom(rom_path) rom = rominfo.get_info(rom_path, rom_bytes) @@ -30,7 +49,7 @@ options: compiler: {rom.compiler} find_file_boundaries: True header_encoding: {rom.header_encoding} - # platform: n64 + platform: n64 # undefined_funcs_auto: True # undefined_funcs_auto_path: undefined_funcs_auto.txt # undefined_syms_auto: True @@ -75,6 +94,63 @@ segments: f.write(segments) +def create_gc_config(iso_path: Path, iso_bytes: bytes): + gc = gcinfo.get_info(iso_path, iso_bytes) + basename = gc.system_code + gc.game_code + gc.region_code + gc.publisher_code + + header = f"""\ +name: \"{gc.name.title()} ({gc.get_region_name()})\" +system_code: {gc.system_code} +game_code: {gc.game_code} +region_code: {gc.region_code} +publisher_code: {gc.publisher_code} +sha1: {gc.sha1} +options: + filesystem_path: filesystem + basename: {basename} + target_path: {iso_path.with_suffix(".iso")} + base_path: . + compiler: {gc.compiler} + platform: gc + # undefined_funcs_auto: True + # undefined_funcs_auto_path: undefined_funcs_auto.txt + # undefined_syms_auto: True + # undefined_syms_auto_path: undefined_syms_auto.txt + # symbol_addrs_path: symbol_addrs.txt + # asm_path: asm + # src_path: src + # build_path: build + # extensions_path: tools/splat_ext + # section_order: [".text", ".data", ".rodata", ".bss"] + # auto_all_sections: [".data", ".rodata", ".bss"] +""" + + segments = f"""\ +segments: + - name: filesystem + type: fst + path: filesystem/sys/fst.bin + - name: bootinfo + type: bootinfo + path: filesystem/sys/boot.bin + - name: bi2 + type: bi2 + path: filesystem/sys/bi2.bin + - name: apploader + type: apploader + path: filesystem/sys/apploader.img + - name: main + type: dol + path: filesystem/sys/main.dol +""" + + out_file = f"{basename}.yaml" + with open(out_file, "w", newline="\n") as f: + print(f"Writing config to {out_file}") + f.write(header) + f.write(segments) + + if __name__ == "__main__": args = parser.parse_args() - main(Path(args.rom)) + main(Path(args.file)) diff --git a/tools/splat/platforms/gc.py b/tools/splat/platforms/gc.py new file mode 100644 index 0000000000..af08a283c7 --- /dev/null +++ b/tools/splat/platforms/gc.py @@ -0,0 +1,5 @@ +from util.gc import gcfst + + +def init(target_bytes: bytes): + gcfst.split_iso(target_bytes) diff --git a/tools/splat/segtypes/gc/apploader.py b/tools/splat/segtypes/gc/apploader.py new file mode 100644 index 0000000000..08d1ad96a3 --- /dev/null +++ b/tools/splat/segtypes/gc/apploader.py @@ -0,0 +1,8 @@ +import struct + +from segtypes.gc.segment import GCSegment +from pathlib import Path + + +class GcSegApploader(GCSegment): + pass diff --git a/tools/splat/segtypes/gc/bi2.py b/tools/splat/segtypes/gc/bi2.py new file mode 100644 index 0000000000..b7cc1ab755 --- /dev/null +++ b/tools/splat/segtypes/gc/bi2.py @@ -0,0 +1,66 @@ +import struct + +from segtypes.gc.segment import GCSegment +from pathlib import Path +from util import options + + +class GcSegBi2(GCSegment): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + def split(self, bi2_bytes): + lines = [] + + # Gathering variables + debug_monitor_size = struct.unpack_from(">I", bi2_bytes, 0x00)[0] + simulated_memory_size = struct.unpack_from(">I", bi2_bytes, 0x04)[0] + + argument_offset = struct.unpack_from(">I", bi2_bytes, 0x08)[0] + + debug_flag = struct.unpack_from(">I", bi2_bytes, 0x0C)[0] + + track_offset = struct.unpack_from(">I", bi2_bytes, 0x10)[0] + track_size = struct.unpack_from(">I", bi2_bytes, 0x14)[0] + + country_code_bi2 = struct.unpack_from(">I", bi2_bytes, 0x18)[0] + + unk_int = struct.unpack_from(">I", bi2_bytes, 0x1C)[0] + unk_int_2 = struct.unpack_from(">I", bi2_bytes, 0x20)[0] + + # Outputting .s file + lines.append(f"# GameCube disc image bi2 data, located at 0x440 in the disc.\n") + lines.append(f"# Generated by splat.\n\n") + + lines.append(f".section .data\n\n") + + lines.append(f"debug_monitor_size: .long 0x{debug_monitor_size:08X}\n") + lines.append(f"simulated_memory_size: .long 0x{simulated_memory_size:08X}\n\n") + + lines.append(f"argument_offset: .long 0x{argument_offset:08X}\n\n") + + lines.append(f"debug_flag: .long 0x{debug_flag:08X}\n\n") + + lines.append(f"track_offset: .long 0x{track_offset:08X}\n") + lines.append(f"track_size: .long 0x{track_size:08X}\n\n") + + lines.append(f"country_code_bi2: .long 0x{country_code_bi2:08X}\n\n") + + lines.append(f"ukn_int_bi2: .long 0x{unk_int:08X}\n") + lines.append(f"ukn_int_bi2_2: .long 0x{unk_int_2:08X}\n\n") + + lines.append(f".fill 0x00001FDC\n\n") + + out_path = self.out_path() + out_path.parent.mkdir(parents=True, exist_ok=True) + + with open(out_path, "w", encoding="utf-8") as f: + f.writelines(lines) + + return + + def should_split(self) -> bool: + return True + + def out_path(self) -> Path: + return options.opts.asm_path / "sys" / "bi2.s" diff --git a/tools/splat/segtypes/gc/bootinfo.py b/tools/splat/segtypes/gc/bootinfo.py new file mode 100644 index 0000000000..77b665c8f4 --- /dev/null +++ b/tools/splat/segtypes/gc/bootinfo.py @@ -0,0 +1,116 @@ +import struct + +from segtypes.gc.segment import GCSegment +from pathlib import Path +from util import options + + +class GcSegBootinfo(GCSegment): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + def split(self, iso_bytes): + lines = [] + + gc_dvd_magic = struct.unpack_from(">I", iso_bytes, 0x1C)[0] + assert gc_dvd_magic == 0xC2339F3D + + # Gathering variables + system_code = chr(iso_bytes[0x00]) + game_code = iso_bytes[0x01:0x03].decode("utf-8") + region_code = chr(iso_bytes[0x03]) + publisher_code = iso_bytes[0x04:0x06].decode("utf-8") + + disc_id = iso_bytes[0x06] + game_version = iso_bytes[0x07] + audio_streaming = iso_bytes[0x08] + stream_buffer_size = iso_bytes[0x09] + + name = iso_bytes[0x20:0x400].decode("utf-8").strip("\x00") + name_padding_len = 0x3E0 - len(name) + + # The following is from YAGCD, don't know what they were for: + # https://web.archive.org/web/20220528011846/http://hitmen.c02.at/files/yagcd/yagcd/chap13.html#sec13.1 + apploader_size = struct.unpack_from(">I", iso_bytes, 0x400)[0] + debug_monitor_address = struct.unpack_from(">I", iso_bytes, 0x404)[0] + + # These on the other hand are easy to understand + dol_offset = struct.unpack_from(">I", iso_bytes, 0x420)[0] + fst_offset = struct.unpack_from(">I", iso_bytes, 0x424)[0] + fst_size = struct.unpack_from(">I", iso_bytes, 0x428)[0] + fst_max_size = struct.unpack_from(">I", iso_bytes, 0x42C)[0] + + user_position = struct.unpack_from(">I", iso_bytes, 0x430)[0] + user_length = struct.unpack_from(">I", iso_bytes, 0x434)[0] + unk_int = struct.unpack_from(">I", iso_bytes, 0x438)[0] + + # Outputting .s file + lines.append(f"# GameCube disc image boot data, located at 0x00 in the disc.\n") + lines.append(f"# Generated by splat.\n\n") + + lines.append(f".section .data\n\n") + + # Game ID stuff + lines.append(f'system_code: .ascii "{system_code}"\n') + lines.append(f'game_code: .ascii "{game_code}"\n') + lines.append(f'region_code: .ascii "{region_code}"\n') + lines.append(f'publisher_code: .ascii "{publisher_code}"\n\n') + + lines.append(f"disc_id: .byte {disc_id:X}\n") + lines.append(f"game_version: .byte {game_version:X}\n") + lines.append(f"audio_streaming: .byte {audio_streaming:X}\n") + lines.append(f"stream_buffer_size: .byte {stream_buffer_size:X}\n\n") + + # padding + lines.append(f".fill 0x12\n\n") + + # GC magic number + lines.append(f"gc_magic: .long 0xC2339F3D\n\n") + + # Long game name + lines.append(f'game_name: .ascii "{name}"\n') + lines.append(f".org 0x400\n\n") + + lines.append(f"apploader_size: .long 0x{apploader_size:08X}\n\n") + + # Unknown stuff gleaned from YAGCD + lines.append(f"debug_monitor_address: .long 0x{debug_monitor_address:08X}\n\n") + + # More padding + lines.append(f".fill 0x18\n\n") + + # DOL and FST data + lines.append(f"dol_offset: .long 0x{dol_offset:08X}\n") + lines.append(f"fst_offset: .long 0x{fst_offset:08X}\n\n") + + lines.append( + f"# The FST is only allocated once per game boot, even in games with multiple disks. fst_max_size is used to ensure that\n" + ) + lines.append( + f"# there is enough space allocated for the FST in the event that a game spans multiple disks, and one disk has a larger FST than another.\n" + ) + lines.append(f"fst_size: .long 0x{fst_size:08X}\n") + lines.append(f"fst_max_size: .long 0x{fst_max_size:08X}\n\n") + + # Honestly not sure what this data is for + lines.append(f"# Not even YAGCD knows what these are for.\n") + lines.append(f"user_position: .long 0x{user_position:08X}\n") + lines.append(f"user_length: .long 0x{user_length:08X}\n") + lines.append(f"unk_int: .long 0x{unk_int:08X}\n\n") + + # Final padding + lines.append(f".word 0\n") + out_path = self.out_path() + + out_path.parent.mkdir(parents=True, exist_ok=True) + + with open(out_path, "w", encoding="utf-8") as f: + f.writelines(lines) + + return + + def should_split(self) -> bool: + return True + + def out_path(self) -> Path: + return options.opts.asm_path / "sys" / "boot.s" diff --git a/tools/splat/segtypes/gc/dol.py b/tools/splat/segtypes/gc/dol.py new file mode 100644 index 0000000000..4fc075283e --- /dev/null +++ b/tools/splat/segtypes/gc/dol.py @@ -0,0 +1,8 @@ +import struct + +from segtypes.gc.segment import GCSegment +from pathlib import Path + + +class GcSegDol(GCSegment): + pass diff --git a/tools/splat/segtypes/gc/dolheader.py b/tools/splat/segtypes/gc/dolheader.py new file mode 100644 index 0000000000..d08a341569 --- /dev/null +++ b/tools/splat/segtypes/gc/dolheader.py @@ -0,0 +1,67 @@ +from segtypes.common.header import CommonSegHeader +from util import options + + +class DolSegHeader(CommonSegHeader): + def parse_header(self, dol_bytes): + header_lines = [] + header_lines.append(".section .data\n") + + # Text file offsets + for i in range(0x00, 0x1C, 4): + header_lines.append( + self.get_line("word", dol_bytes[i : i + 4], f"Text {i / 4} Offset") + ) + # Data file offsets + for i in range(0x1C, 0x48, 4): + header_lines.append( + self.get_line("word", dol_bytes[i : i + 4], f"Data {i / 4} Offset") + ) + + # Text RAM addresses + for i in range(0x48, 0x64, 4): + header_lines.append( + self.get_line( + "word", + dol_bytes[i : i + 4], + f"Text {(i - 0x48) / 4} Address", + ) + ) + # Data RAM addresses + for i in range(0x64, 0x90, 4): + header_lines.append( + self.get_line( + "word", + dol_bytes[i : i + 4], + f"Data {(i - 0x64) / 4} Address", + ) + ) + + # Text file sizes + for i in range(0x90, 0xAC, 4): + header_lines.append( + self.get_line( + "word", + dol_bytes[i : i + 4], + f"Text {(i - 0x90) / 4} Size", + ) + ) + # Data file sizes + for i in range(0xAC, 0xD8, 4): + header_lines.append( + self.get_line( + "word", + dol_bytes[i : i + 4], + f"Data {(i - 0xAC) / 4} Size", + ) + ) + + # BSS RAM address + header_lines.append(self.get_line("word", dol_bytes[0xD8:0xDC], "BSS Address")) + # BSS size + header_lines.append(self.get_line("word", dol_bytes[0xDC:0xE0], "BSS Size")) + + # Entry point + header_lines.append(self.get_line("word", dol_bytes[0xE0:0xE4], "Entry Point")) + + return header_lines diff --git a/tools/splat/segtypes/gc/fst.py b/tools/splat/segtypes/gc/fst.py new file mode 100644 index 0000000000..d0e7beef1f --- /dev/null +++ b/tools/splat/segtypes/gc/fst.py @@ -0,0 +1,8 @@ +import struct + +from segtypes.gc.segment import GCSegment +from pathlib import Path + + +class GcSegFst(GCSegment): + pass diff --git a/tools/splat/segtypes/gc/rarc.py b/tools/splat/segtypes/gc/rarc.py new file mode 100644 index 0000000000..63c535f98d --- /dev/null +++ b/tools/splat/segtypes/gc/rarc.py @@ -0,0 +1,322 @@ +import struct + +from segtypes.gc.segment import GCSegment +from pathlib import Path +from util import options +from util.n64.Yay0decompress import decompress_yay0 +from util.gc.gcutil import read_string_from_bytes + +from typing import List +from enum import IntEnum + + +# Represents the RARC archive format used by first-party Nintendo games. +class GcSegRarc(GCSegment): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + def split(self, file_bytes): + archive = GCRARCArchive(self.file_path, file_bytes) + archive.build_hierarchy(file_bytes) + + archive.emit(file_bytes) + + def should_split(self) -> bool: + return True + + +class GCRARCArchive: + def __init__(self, file_path: Path, file_bytes): + self.file_path = file_path + self.compression = "none" + file_bytes = self.try_decompress_archive(file_bytes) + + self.magic = struct.unpack_from(">I", file_bytes, 0x0000)[0] + self.file_size = struct.unpack_from(">I", file_bytes, 0x0004)[0] + self.data_header_offset = struct.unpack_from(">I", file_bytes, 0x0008)[0] + self.file_data_offset = struct.unpack_from(">I", file_bytes, 0x000C)[0] + 0x0020 + self.total_file_data_size = struct.unpack_from(">I", file_bytes, 0x0010)[0] + + self.mram_preload_size = struct.unpack_from(">I", file_bytes, 0x0014)[0] + self.aram_preload_size = struct.unpack_from(">I", file_bytes, 0x0018)[0] + + self.data_header = GCRARCDataHeader(self.data_header_offset, file_bytes) + self.nodes: List[GCRARCNode] = [] + + def try_decompress_archive(self, file_bytes): + compression_scheme = struct.unpack_from(">I", file_bytes, 0x0000)[0] + + # Yaz0 + if compression_scheme == 0x59617A30: + self.compression = "yaz0" + return file_bytes + # Yay0 + elif compression_scheme == 0x59617930: + self.compression = "yay0" + return decompress_yay0(file_bytes) + # Not compressed! + else: + return file_bytes + + def build_hierarchy(self, file_bytes): + string_table_offset = self.data_header.string_table_offset + string_table_size = self.data_header.string_table_size + + string_table_bytes = file_bytes[ + string_table_offset : string_table_offset + string_table_size + ] + + # Load the file entries into their corresponding nodes. + for i in range(self.data_header.node_count): + offset = self.data_header.node_offset + i * 0x10 + + new_node = GCRARCNode(offset, file_bytes, string_table_bytes) + new_node.get_entries( + self.data_header.file_entry_offset, file_bytes, string_table_bytes + ) + + self.nodes.append(new_node) + + # Now, organize the nodes into a hierarchy. + for n in self.nodes: + for e in n.entries: + # We're only looking for directory nodes, so ignore files. + if e.flags & int(GCRARCFlags.IS_FILE) != 0x00: + continue + + if e.name == "." or e.name == "..": + continue + + # This is the node that the current entry corresponds to. + dir_node = self.nodes[e.data_offset] + + # Set up hierarchy relationship. + dir_node.parent = n + n.children.append(dir_node) + + def emit(self, file_bytes): + rel_path = self.file_path.relative_to(options.opts.filesystem_path / "files") + arc_root_path = options.opts.asset_path / rel_path.with_suffix("") + + self.nodes[0].emit_to_filesystem_recursive( + arc_root_path, self.file_data_offset, file_bytes + ) + self.emit_config(arc_root_path) + + def emit_config(self, config_path: Path): + lines = [] + + lines.append(f'name: "{self.file_path.name}"\n') + + if self.compression != "none": + lines.append(f"compression: {self.compression}\n") + + lines.append(f"next_file_id: 0x{self.data_header.next_free_file_id:04X}\n") + lines.append( + f"sync_file_ids_to_indices: {self.data_header.sync_file_ids_to_indices}\n" + ) + + root_node = self.nodes[0] + + lines.append("root_dir:\n") + lines.append(f' res_type: "{root_node.resource_type}"\n') + lines.append(f' name: "{root_node.name}"\n') + + if len(root_node.entries) != 0: + lines.append(" entries:\n") + for e in root_node.entries: + entry_config = e.emit_config(2) + if entry_config != None: + lines.extend(entry_config) + + if len(root_node.children) != 0: + lines.append(" subdirs:\n") + for n in root_node.children: + node_config = n.emit_config(2) + if node_config != None: + lines.extend(node_config) + + with open(config_path / "arcinfo.yaml", "w", newline="\n") as f: + f.writelines(lines) + + +class GCRARCDataHeader: + def __init__(self, offset, file_bytes): + self.node_count = struct.unpack_from(">I", file_bytes, offset + 0x0000)[0] + self.node_offset = ( + struct.unpack_from(">I", file_bytes, offset + 0x0004)[0] + 0x0020 + ) + + self.file_entry_count = struct.unpack_from(">I", file_bytes, offset + 0x0008)[0] + self.file_entry_offset = ( + struct.unpack_from(">I", file_bytes, offset + 0x000C)[0] + 0x0020 + ) + + self.string_table_size = struct.unpack_from(">I", file_bytes, offset + 0x0010)[ + 0 + ] + self.string_table_offset = ( + struct.unpack_from(">I", file_bytes, offset + 0x0014)[0] + 0x0020 + ) + + self.next_free_file_id = struct.unpack_from(">H", file_bytes, offset + 0x0018)[ + 0 + ] + self.sync_file_ids_to_indices = bool(file_bytes[offset + 0x001A]) + + +class GCRARCNode: + def __init__(self, offset, file_bytes, string_table_bytes): + self.resource_type = file_bytes[offset + 0x0000 : offset + 0x0004].decode( + "utf-8" + ) + self.name_offset = struct.unpack_from(">I", file_bytes, offset + 0x0004)[0] + self.name_hash = struct.unpack_from(">H", file_bytes, offset + 0x0008)[0] + self.file_entry_count = struct.unpack_from(">H", file_bytes, offset + 0x000A)[0] + self.first_file_entry_index = struct.unpack_from( + ">I", file_bytes, offset + 0x000C + )[0] + + self.name = read_string_from_bytes(self.name_offset, string_table_bytes) + self.entries = [] + + self.parent = None + self.children = [] + + def get_entries(self, file_entry_offset, file_bytes, string_table_bytes): + for i in range(self.file_entry_count): + entry_offset = file_entry_offset + (self.first_file_entry_index + i) * 0x14 + + new_entry = GCRARCFileEntry(entry_offset, file_bytes, string_table_bytes) + new_entry.parent_node = self + + self.entries.append(new_entry) + + def emit_to_filesystem_recursive( + self, root_path: Path, file_data_offset, file_bytes + ): + dir_path = root_path / self.get_full_directory_path() + dir_path.mkdir(parents=True, exist_ok=True) + + for n in self.children: + n.emit_to_filesystem_recursive(root_path, file_data_offset, file_bytes) + + for e in self.entries: + e.emit_to_filesystem(root_path, file_data_offset, file_bytes) + + def emit_config(self, level): + lines = [] + + lines.append(" " * level + f'- res_type: "{self.resource_type}"\n') + lines.append(" " * level + f' name: "{self.name}"\n') + + if len(self.entries) != 0: + lines.append(" " * level + " entries:\n") + for e in self.entries: + entry_config = e.emit_config(level + 1) + if entry_config != None: + lines.extend(entry_config) + + if len(self.children) != 0: + lines.append(" " * level + " subdirs:\n") + for n in self.children: + node_config = n.emit_config(level + 1) + if node_config != None: + lines.extend(node_config) + + return lines + + def print_recursive(self, level): + print((" " * level) + self.name) + + for n in self.children: + n.print_recursive(level + 1) + + def get_full_directory_path(self): + path_components = [] + + node = self + while True: + path_components.insert(0, node.name) + node = node.parent + + if node == None: + break + + return Path(*path_components) + + +class GCRARCFileEntry: + def __init__(self, offset, file_bytes, string_table_bytes): + self.file_id = struct.unpack_from(">H", file_bytes, offset + 0x0000)[0] + self.name_hash = struct.unpack_from(">H", file_bytes, offset + 0x0002)[0] + self.flags = file_bytes[offset + 0x0004] + self.name_offset = ( + struct.unpack_from(">I", file_bytes, offset + 0x0004)[0] & 0x00FFFFFF + ) + self.data_offset = struct.unpack_from(">I", file_bytes, offset + 0x0008)[0] + self.data_size = struct.unpack_from(">I", file_bytes, offset + 0x000C)[0] + + self.name = read_string_from_bytes(self.name_offset, string_table_bytes) + self.parent_node = None + + def emit_to_filesystem(self, dir_path: Path, file_data_offset, file_bytes): + if self.flags & int(GCRARCFlags.IS_DIR) != 0x00: + return + + file_path = dir_path / self.get_full_file_path() + + file_data = file_bytes[ + file_data_offset + + self.data_offset : file_data_offset + + self.data_offset + + self.data_size + ] + with open(file_path, "wb") as f: + f.write(file_data) + + def emit_config(self, level): + if self.flags & int(GCRARCFlags.IS_DIR) != 0x00: + return + + lines = [] + + lines.append(" " * level + f' - name: "{self.name}"\n') + lines.append(" " * level + f" file_id: 0x{self.file_id:04X}\n") + + if self.flags & int(GCRARCFlags.IS_COMPRESSED) != 0x00: + if self.flags & int(GCRARCFlags.IS_YAZ0_COMPRESSED) != 0x00: + lines.append(" " * level + f" compression: yaz0\n") + else: + lines.append(" " * level + f" compression: yay0\n") + + if self.flags & int(GCRARCFlags.PRELOAD_TO_MRAM) == 0x00: + if self.flags & int(GCRARCFlags.PRELOAD_TO_ARAM) != 0x00: + lines.append(" " * level + f" preload_type: aram\n") + else: + lines.append(" " * level + f" preload_type: dvd\n") + + return lines + + def get_full_file_path(self): + path_components = [self.name] + + node = self.parent_node + while True: + path_components.insert(0, node.name) + node = node.parent + + if node == None: + break + + return Path("/".join(path_components)) + + +class GCRARCFlags(IntEnum): + IS_FILE = 0x01 + IS_DIR = 0x02 + IS_COMPRESSED = 0x04 + PRELOAD_TO_MRAM = 0x10 + PRELOAD_TO_ARAM = 0x20 + LOAD_FROM_DVD = 0x40 + IS_YAZ0_COMPRESSED = 0x80 diff --git a/tools/splat/segtypes/gc/relheader.py b/tools/splat/segtypes/gc/relheader.py new file mode 100644 index 0000000000..69acb4b3dd --- /dev/null +++ b/tools/splat/segtypes/gc/relheader.py @@ -0,0 +1,113 @@ +from segtypes.common.header import CommonSegHeader +from util import options + + +class RelSegHeader(CommonSegHeader): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + if isinstance(self.yaml, dict): + self.version: int = self.yaml.get("version", 0) + + def parse_header(self, rel_bytes): + header_lines = [] + header_lines.append(".section .data\n") + + # Module ID + header_lines.append(self.get_line("word", rel_bytes[0x00:0x04], "Module ID")) + + # Next module (filled at runtime) + header_lines.append(self.get_line("word", rel_bytes[0x04:0x08], "Next Module")) + # Last module (filled at runtime) + header_lines.append(self.get_line("word", rel_bytes[0x08:0x0C], "Last Module")) + + # Section count + header_lines.append( + self.get_line("word", rel_bytes[0x0C:0x10], "Section Count") + ) + # Section table offset + header_lines.append( + self.get_line("word", rel_bytes[0x10:0x14], "Section Table Offset") + ) + + # Module name offset (might be null) + header_lines.append( + self.get_line("word", rel_bytes[0x14:0x18], "Module Name Offset") + ) + # Module name length + header_lines.append( + self.get_line("word", rel_bytes[0x18:0x1C], "Module Name Length") + ) + + # REL format version + header_lines.append( + self.get_line("word", rel_bytes[0x1C:0x20], "REL Format Version") + ) + + # BSS size + header_lines.append(self.get_line("word", rel_bytes[0x20:0x24], "BSS Size")) + + # Relocation table offset + header_lines.append( + self.get_line("word", rel_bytes[0x24:0x28], "Relocation Table Offset") + ) + # Import table offset + header_lines.append( + self.get_line("word", rel_bytes[0x28:0x2C], "Import Table Offset") + ) + # Import table size + header_lines.append( + self.get_line("word", rel_bytes[0x2C:0x30], "Import Table Size") + ) + + # Prolog section index + header_lines.append( + self.get_line("byte", rel_bytes[0x30:0x31], "Prolog Section Index") + ) + # Epilog section index + header_lines.append( + self.get_line("byte", rel_bytes[0x31:0x32], "Epilog Section Index") + ) + # Unresolved section index + header_lines.append( + self.get_line("byte", rel_bytes[0x32:0x33], "Unresolved Section Index") + ) + # BSS section index (filled at runtime) + header_lines.append( + self.get_line("byte", rel_bytes[0x33:0x34], "BSS Section Index") + ) + + # Prolog function offset + header_lines.append( + self.get_line("word", rel_bytes[0x34:0x38], "Prolog Function Offset") + ) + # Epilog function offset + header_lines.append( + self.get_line("word", rel_bytes[0x38:0x3C], "Epilog Function Offset") + ) + # Unresolved function offset + header_lines.append( + self.get_line("word", rel_bytes[0x3C:0x40], "Unresolved Function Offset") + ) + + # Version 1 is only 0x40 bytes long + if self.version <= 1: + return header_lines + + # Alignment constraint + header_lines.append( + self.get_line("word", rel_bytes[0x40:0x44], "Alignment Constraint") + ) + # BSS alignment constraint + header_lines.append( + self.get_line("word", rel_bytes[0x44:0x48], "BSS Alignment Constraint") + ) + + # Version 2 is only 0x48 bytes long + if self.version <= 2: + return header_lines + + # Fix size + header_lines.append(self.get_line("word", rel_bytes[0x48:0x4C], "Fix Size")) + + return header_lines diff --git a/tools/splat/segtypes/gc/segment.py b/tools/splat/segtypes/gc/segment.py new file mode 100644 index 0000000000..8e4d9bca25 --- /dev/null +++ b/tools/splat/segtypes/gc/segment.py @@ -0,0 +1,5 @@ +from segtypes.segment import Segment + + +class GCSegment(Segment): + pass diff --git a/tools/splat/segtypes/linker_entry.py b/tools/splat/segtypes/linker_entry.py index e7f36d35f5..2280c26bca 100644 --- a/tools/splat/segtypes/linker_entry.py +++ b/tools/splat/segtypes/linker_entry.py @@ -108,7 +108,8 @@ class LinkerEntry: class LinkerWriter: def __init__(self): self.linker_discard_section: bool = options.opts.ld_discard_section - self.entries: List[LinkerEntry] = [] # Used to store all the linker entries - build tools may want this information + # Used to store all the linker entries - build tools may want this information + self.entries: List[LinkerEntry] = [] self.buffer: List[str] = [] self.symbols: List[str] = [] diff --git a/tools/splat/segtypes/segment.py b/tools/splat/segtypes/segment.py index f43a837195..e3093e1441 100644 --- a/tools/splat/segtypes/segment.py +++ b/tools/splat/segtypes/segment.py @@ -1,7 +1,7 @@ import importlib import importlib.util -from typing import Any, Dict, TYPE_CHECKING, Type, Union, Optional, List +from typing import Any, Dict, TYPE_CHECKING, Set, Type, Union, Optional, List from pathlib import Path from util import log @@ -504,7 +504,7 @@ class Segment: if not ret and search_ranges: # Search ranges first, starting with rom if rom is not None: - cands: set[Interval] = most_parent.symbol_ranges_rom[rom] + cands: Set[Interval] = most_parent.symbol_ranges_rom[rom] if cands: ret = cands.pop().data # and then vram if we can't find a rom match diff --git a/tools/splat/split.py b/tools/splat/split.py index e31654dec0..bbda664551 100755 --- a/tools/splat/split.py +++ b/tools/splat/split.py @@ -14,10 +14,10 @@ from colorama import Fore, Style from intervaltree import Interval, IntervalTree from segtypes.linker_entry import LinkerWriter, to_cname -from segtypes.segment import Segment +from segtypes.segment import RomAddr, Segment from util import compiler, log, options, palettes, symbols -VERSION = "0.12.2" +VERSION = "0.12.4" # This value should be keep in sync with the version listed on requirements.txt SPIMDISASM_MIN = (1, 5, 6) @@ -67,7 +67,11 @@ def initialize_segments(config_segments: Union[dict, list]) -> List[Segment]: segment_class = Segment.get_class_for_type(seg_type) this_start = Segment.parse_segment_start(seg_yaml) - next_start = Segment.parse_segment_start(config_segments[i + 1]) + + if i == len(config_segments) - 1 and Segment.parse_segment_file_path: + next_start: RomAddr = 0 + else: + next_start = Segment.parse_segment_start(config_segments[i + 1]) segment: Segment = Segment.from_yaml( segment_class, seg_yaml, this_start, next_start @@ -393,7 +397,9 @@ def main(config_path, modes, verbose, use_cache=True): segment_bytes = segment_input_file.read() segment.split(segment_bytes) - if options.opts.is_mode_active("ld"): + if ( + options.opts.is_mode_active("ld") and options.opts.platform != "gc" + ): # TODO move this to platform initialization when it gets implemented global linker_writer linker_writer = LinkerWriter() linker_bar = tqdm.tqdm( diff --git a/tools/splat/util/gc/gcfst.py b/tools/splat/util/gc/gcfst.py new file mode 100644 index 0000000000..e3bfcabe91 --- /dev/null +++ b/tools/splat/util/gc/gcfst.py @@ -0,0 +1,173 @@ +import struct + +from segtypes.gc.segment import GCSegment +from pathlib import Path +from util import options +from util.gc.gcutil import read_string_from_bytes +from typing import List, Optional + + +# Represents the info for either a directory or a file within a GameCube disc image's file system. +class GCFSTEntry: + def __init__(self, flags: bool, name_offset, offset, length): + self.flags = flags + self.name_offset = name_offset + self.offset = offset + self.length = length + + self.name = "" + self.parent: Optional[GCFSTEntry] = None + self.children: List[GCFSTEntry] = [] + + def populate_children_recursive( + self, root_dir: "GCFSTEntry", current_node_offset, fst_bytes, string_table_bytes + ): + self.parent = root_dir + self.name = read_string_from_bytes(self.name_offset, string_table_bytes) + + # This node is a file, so we don't do anything but return that we read 1 node. + if self.flags == False: + return 1 + + nodes_read = 1 + next_child_offset = current_node_offset + 0x0C + + # Directory nodes contain the index of the next node that is NOT its child, meaning the index of their next sibling node. + # We can figure out when we're done reading child nodes by comparing the offset of the next node to read to the + # offset of the next sibling node. We stop reading when the next node offset is >= the offset of the next sibling node. + while next_child_offset < self.length * 0x0C: + new_entry = GCFSTEntry( + bool(fst_bytes[next_child_offset + 0x0000]), + struct.unpack_from( + ">I", fst_bytes[next_child_offset : next_child_offset + 0x0004] + )[0] + & 0x00FFFFFF, + struct.unpack_from(">I", fst_bytes, next_child_offset + 0x0004)[0], + struct.unpack_from(">I", fst_bytes, next_child_offset + 0x0008)[0], + ) + + self.children.append(new_entry) + nodes_read += new_entry.populate_children_recursive( + self, next_child_offset, fst_bytes, string_table_bytes + ) + + next_child_offset = current_node_offset + nodes_read * 0x0C + + return nodes_read + + # Builds this entry's full path within the filesystem from its parents' names. + def get_full_name(self): + path_components = [] + + entry = self + while entry.parent != None: + path_components.insert(0, entry.name) + entry = entry.parent + + return Path(*path_components) + + # Emits this entry to the filesystem. + def emit(self, filesystem_dir: Path, iso_bytes): + full_path = filesystem_dir / self.get_full_name() + + # If this is a directory, we just need to make the directory on disk. + if self.flags == True: + full_path.mkdir(parents=True, exist_ok=True) + return + + file_bytes = iso_bytes[self.offset : self.offset + self.length] + with open(full_path, "wb") as f: + f.write(file_bytes) + + def emit_recursive(self, filesystem_dir: Path, iso_bytes): + # Don't emit if this is the root directory. + if self.parent != None: + self.emit(filesystem_dir, iso_bytes) + + for e in self.children: + e.emit_recursive(filesystem_dir, iso_bytes) + + +# Splits the ISO into its component parts - header info, apploader, DOL, FST metadata, and the individual files in the filesystem. +def split_iso(iso_bytes): + split_sys_info(iso_bytes) + split_content(iso_bytes) + + +# Splits the header info, apploader, DOL, and FST metadata from the ISO. +def split_sys_info(iso_bytes): + sys_path = options.opts.filesystem_path / "sys" + sys_path.mkdir(parents=True, exist_ok=True) + + # Split boot.info. Always at 0x0000 and 0x0440 bytes long. + with open(sys_path / "boot.bin", "wb") as f: + f.write(iso_bytes[0x0000:0x0440]) + + # Split bi2.info. Always at 0x0440 and 0x2000 bytes long. + with open(sys_path / "bi2.bin", "wb") as f: + f.write(iso_bytes[0x0440:0x2440]) + + # Split apploader.img. Always at 0x2440 and size is listed at 0x0400. + apploader_size = struct.unpack_from(">I", iso_bytes, 0x0400)[0] + with open(sys_path / "apploader.img", "wb") as f: + f.write(iso_bytes[0x2440 : 0x2440 + apploader_size]) + + # Split main.dol. Offset specified explicitly at 0x0420, but size must be calculated. + dol_offset = struct.unpack_from(">I", iso_bytes, 0x0420)[0] + fst_offset = struct.unpack_from(">I", iso_bytes, 0x0424)[0] + + dol_size = fst_offset - dol_offset + with open(sys_path / "main.dol", "wb") as f: + f.write(iso_bytes[dol_offset : dol_offset + dol_size]) + + # Split fst.bin. Offset specified at 0x0424 and size specified at 0x402C. + fst_size = struct.unpack_from(">I", iso_bytes, 0x0428)[0] + with open(sys_path / "fst.bin", "wb") as f: + f.write(iso_bytes[fst_offset : fst_offset + fst_size]) + + +# Splits the ISO's filesystem into individual files. +def split_content(iso_bytes): + fst_path = options.opts.filesystem_path / "sys" / "fst.bin" + assert fst_path.is_file() + + fst_bytes = fst_path.read_bytes() + fst_root_entry = populate_filesystem(fst_bytes) + + files_path = options.opts.filesystem_path / "files" + files_path.mkdir(parents=True, exist_ok=True) + fst_root_entry.emit_recursive(files_path, iso_bytes) + + +# Loads the FST data needed to split the filesystem. +def populate_filesystem(fst_bytes): + root_dir = GCFSTEntry( + bool(fst_bytes[0x0000]), + struct.unpack_from(">I", fst_bytes, 0x0000)[0] & 0x00FFFFFF, + struct.unpack_from(">I", fst_bytes, 0x0004)[0], + struct.unpack_from(">I", fst_bytes, 0x0008)[0], + ) + + string_table_bytes = fst_bytes[root_dir.length * 0x0C : len(fst_bytes)] + + # Parsing the filesystem is a bit tricky. The root directory's length property is the total number of nodes in the FST. + # So, we initialize nodes_read to 1, since the root is included in the number of nodes. + # We will rely on each directory and file on the root directory to tell us how many nodes were read while parsing them. + # We can stop reading the FST when our total number of nodes read is >= the number of nodes in the FST. + nodes_read = 1 + while nodes_read < root_dir.length: + current_offset = nodes_read * 0x0C + + new_entry = GCFSTEntry( + bool(fst_bytes[current_offset + 0x0000]), + struct.unpack_from(">I", fst_bytes, current_offset)[0] & 0x00FFFFFF, + struct.unpack_from(">I", fst_bytes, current_offset + 0x0004)[0], + struct.unpack_from(">I", fst_bytes, current_offset + 0x0008)[0], + ) + + root_dir.children.append(new_entry) + nodes_read += new_entry.populate_children_recursive( + root_dir, current_offset, fst_bytes, string_table_bytes + ) + + return root_dir diff --git a/tools/splat/util/gc/gcinfo.py b/tools/splat/util/gc/gcinfo.py new file mode 100644 index 0000000000..002c6434f4 --- /dev/null +++ b/tools/splat/util/gc/gcinfo.py @@ -0,0 +1,93 @@ +#! /usr/bin/env python3 + +from dataclasses import dataclass + +import sys +import os +import argparse +import itertools +import struct + +from pathlib import Path + +import hashlib +import zlib + +parser = argparse.ArgumentParser( + description="Gives information on GameCube disc images" +) +parser.add_argument("iso", help="path to a GameCube disc image") + +system_codes = { + "D": "GameCube Demo", + "G": "GameCube", + "P": "GameCube Promotional", + "R": "Early Wii", + "S": "Later Wii", +} + +region_codes = {"E": "NTSC-U", "J": "NTSC-J", "P": "PAL"} + +publisher_codes = {"01": "Nintendo", "08": "Capcom", "8P": "Sega", "E9": "Natsume"} + + +def get_info(iso_path: Path, iso_bytes: bytes = None): + if iso_bytes is None: + iso_bytes = iso_path.read_bytes() + + return get_info_bytes(iso_bytes) + + +def get_info_bytes(iso_bytes: bytes): + system_code = chr(iso_bytes[0x00]) + game_code = iso_bytes[0x01:0x03].decode("utf-8") + region_code = chr(iso_bytes[0x03]) + publisher_code = iso_bytes[0x04:0x06].decode("utf-8") + + name = str(iso_bytes[0x20:0x400], "utf-8").strip("\x00") + root = "filesystem" + + compiler = "mwcc" + sha1 = hashlib.sha1(iso_bytes).hexdigest() + + return GCIso( + name, + root, + system_code, + game_code, + region_code, + publisher_code, + compiler, + sha1, + ) + + +class GCIso: + def __init__( + self, + name: str, + root: str, + system_code, + game_code, + region_code, + publisher_code, + compiler, + sha1, + ): + self.name = name + self.root = root + self.system_code = system_code + self.game_code = game_code + self.region_code = region_code + self.publisher_code = publisher_code + self.compiler = compiler + self.sha1 = sha1 + + def get_system_name(self): + return system_codes[self.system_code] + + def get_publisher_name(self): + return publisher_codes[self.publisher_code] + + def get_region_name(self): + return region_codes[self.region_code] diff --git a/tools/splat/util/gc/gcutil.py b/tools/splat/util/gc/gcutil.py new file mode 100644 index 0000000000..ba78bc2f05 --- /dev/null +++ b/tools/splat/util/gc/gcutil.py @@ -0,0 +1,11 @@ +def read_string_from_bytes(name_offset, string_table_bytes): + bytes = bytearray() + + for offset in range(len(string_table_bytes) - name_offset): + cur_byte = string_table_bytes[name_offset + offset] + if cur_byte == 0x00: + break + + bytes.append(cur_byte) + + return bytes.decode("shift-jis") diff --git a/tools/splat/util/options.py b/tools/splat/util/options.py index 71b602f272..6e1add1d98 100644 --- a/tools/splat/util/options.py +++ b/tools/splat/util/options.py @@ -160,6 +160,12 @@ class SplatOpts: # Use named hardware register symbols by default. Those will need to be added to a linker script manually by the user hardware_regs: bool + ################################################################################ + # Gamecube-specific options + ################################################################################ + # Path where the iso's filesystem will be extracted to + filesystem_path: Path + ################################################################################ # Compiler-specific options ################################################################################ @@ -255,7 +261,7 @@ def parse_yaml( else: raise ValueError(f"Expected str or list, got {type(paths)}") - platform = parse_opt_within(yaml, "platform", str, ["n64", "psx"], "n64") + platform = parse_opt_within(yaml, "platform", str, ["n64", "psx", "gc"]) comp = compiler.for_name(parse_opt(yaml, "compiler", str, "IDO")) base_path = Path(config_paths[0]).parent / parse_opt(yaml, "base_path", str) @@ -373,6 +379,7 @@ def parse_yaml( libultra_symbols=parse_opt(yaml, "libultra_symbols", bool, False), hardware_regs=parse_opt(yaml, "hardware_regs", bool, False), use_legacy_include_asm=parse_opt(yaml, "use_legacy_include_asm", bool, True), + filesystem_path=parse_optional_path(yaml, "filesystem_path", base_path), ) diff --git a/tools/splat/util/symbols.py b/tools/splat/util/symbols.py index 035e47320e..2f49333389 100644 --- a/tools/splat/util/symbols.py +++ b/tools/splat/util/symbols.py @@ -140,9 +140,8 @@ def initialize(all_segments: "List[Segment]"): ) log.error("") else: - # Add segment to symbol, symbol to segment + # Add segment to symbol sym.segment = seg - seg.add_symbol(sym) continue except: log.parsing_error_preamble(path, line_num, line) @@ -185,6 +184,9 @@ def initialize(all_segments: "List[Segment]"): ignore_sym = False continue + if sym.segment: + sym.segment.add_symbol(sym) + sym.user_declared = True add_symbol(sym) diff --git a/ver/us/asm/data/world/area_hos/hos_03/A1F3C0.data.s b/ver/us/asm/data/world/area_hos/hos_03/A1F3C0.data.s index dafc406db8..d63cedb3e4 100644 --- a/ver/us/asm/data/world/area_hos/hos_03/A1F3C0.data.s +++ b/ver/us/asm/data/world/area_hos/hos_03/A1F3C0.data.s @@ -140,5 +140,5 @@ dlabel D_80247AA4_A22BA4 dlabel D_80247B1C_A22C1C .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C87, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C84, 0x00000008, 0x00000001, 0x00000046, 0x00000043, 0x00000003, EnableModel, 0xFE363C86, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, EnableModel, 0xFE363C86, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000B4, 0x00000014, 0x00000002, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0xFE363C88, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0xFE363C89, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, hos_03_ToadHouse_InitScreenOverlay, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, 0x8024AAA0, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C83, 0x00000043, 0x00000001, hos_03_ToadHouse_DoesPlayerNeedSleep, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B30002, 0x00B30001, 0x00000000, 0xFE363C88, 0x00000043, 0x00000002, ShowChoice, 0x001E0006, 0x00000008, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00B30002, 0x00B30001, 0x00000000, 0xFE363C89, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00B30002, 0x00B30001, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000001, hos_03_ToadHouse_DisableStatusMenu, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80247B1C_A22C1C, 0x00000013, 0x00000000, 0x00000043, 0x00000002, hos_03_ToadHouse_PutPartnerAway, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, 0x8024A7E8, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x0000003C, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, hos_03_ToadHouse_UpdateScreenOverlay, 0x00000003, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, FullyRestoreSP, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80247AA4_A22BA4, 0x00000013, 0x00000000, 0x00000043, 0x00000002, hos_03_ToadHouse_GetPartnerBackOut, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, hos_03_ToadHouse_UpdateScreenOverlay, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000069, 0x00000046, 0x00000001, 0x8024AA1C, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B30002, 0x00B30001, 0x00000000, 0xFE363C8B, 0x00000043, 0x00000001, hos_03_ToadHouse_ShowStatusMenu, 0x00000002, 0x00000000, 0x00000001, 0x00000000 -dlabel hos_03_Quizmo_varStash +dlabel hos_03_varStash .word 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_02/B2F410.data.s b/ver/us/asm/data/world/area_jan/jan_02/B2F410.data.s index 3b00dfaaa6..a88ecc6af9 100644 --- a/ver/us/asm/data/world/area_jan/jan_02/B2F410.data.s +++ b/ver/us/asm/data/world/area_jan/jan_02/B2F410.data.s @@ -23,7 +23,7 @@ dlabel D_8024304C_B2F4BC dlabel D_80243050_B2F4C0 .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, jan_02_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_80241540_B2D9B0, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241578_B2D9E8, 0xFE363C80, 0x0000004E, 0x00000006, D_80243050_B2F4C0, 0x00000010, 0x00000000, D_80248760_jan_02, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802414EC_B2D95C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 -dlabel jan_02_Quizmo_varStash +dlabel jan_02_varStash .word 0x00000000 dlabel D_802431E8_B2F658 diff --git a/ver/us/asm/data/world/area_jan/jan_03/B39530.data.s b/ver/us/asm/data/world/area_jan/jan_03/B39530.data.s index 23830415bc..fd5fdba2f9 100644 --- a/ver/us/asm/data/world/area_jan/jan_03/B39530.data.s +++ b/ver/us/asm/data/world/area_jan/jan_03/B39530.data.s @@ -140,7 +140,7 @@ dlabel D_802475E0_B3C1B0 dlabel D_80247714_B3C2E4 .word 0x00000043, 0x00000002, func_80241B00_B366D0, 0xFE363C80, 0x0000004E, 0x00000006, D_802475E0_B3C1B0, 0x00000010, 0x00000000, D_8024FD68, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802419D8_B365A8, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 -dlabel jan_03_Quizmo_varStash +dlabel jan_03_varStash .word 0x00000000 dlabel D_80247768_B3C338 diff --git a/ver/us/asm/data/world/area_kmr/kmr_00/8ACD00.data.s b/ver/us/asm/data/world/area_kmr/kmr_00/8ACD00.data.s deleted file mode 100644 index 55b2e29513..0000000000 --- a/ver/us/asm/data/world/area_kmr/kmr_00/8ACD00.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240D70_8ACD00 -.word 0x43F28000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240EA8, D_80240D70_8ACD00, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190039, 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFF81, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000010, 0x00000000, 0x00000008, 0x00000043, 0x00000002, PlayAmbientSounds, 0x0000000C, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_00/8ACDB0.data.s b/ver/us/asm/data/world/area_kmr/kmr_00/8ACDB0.data.s deleted file mode 100644 index 722729c3a6..0000000000 --- a/ver/us/asm/data/world/area_kmr/kmr_00/8ACDB0.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240E20_8ACDB0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802440D0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240E7C_8ACE0C -.word 0x00000047, 0x00000005, D_80240E20_8ACDB0, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000001E, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF840632E, 0x00000001, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFF82, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80244054, 0x00000043, 0x00000001, ClearDefeatedEnemies, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80244080, 0x00000044, 0x00000001, 0x80240DC0, 0x00000044, 0x00000001, 0x80241050, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000016, 0x00000001, 0xFFFFFF80, 0x00000043, 0x00000003, EnableModel, 0x00000002, 0x00000000, 0x00000044, 0x00000001, D_80240E7C_8ACE0C, 0x0000001B, 0x00000001, 0xFFFFFF81, 0x00000043, 0x00000003, EnableModel, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80240E7C_8ACE0C, 0x00000044, 0x00000001, EnterWalk, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_00/8ACFE0.data.s b/ver/us/asm/data/world/area_kmr/kmr_00/8ACFE0.data.s deleted file mode 100644 index 24194884b8..0000000000 --- a/ver/us/asm/data/world/area_kmr/kmr_00/8ACFE0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241050_8ACFE0 -.word 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFF81, 0x00000043, 0x00000003, EnableModel, 0x00000038, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000003A, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000034, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000036, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000003C, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000040, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000003D, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000003E, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000041, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000042, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000043, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFD050F81, 0xF24A7A80, 0x00000043, 0x00000001, func_80240388_8AC318, 0x00000043, 0x00000008, func_80240000_8ABF90, 0x000000FF, 0x000000FF, 0x000000FF, 0x0000003C, 0x0000003C, 0x0000003C, 0x00000000, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000001F4, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, PlayAmbientSounds, 0x0000000C, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A9280, 0xF24A5C80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFFFFFDE4, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x0000000F, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_802D4D14, 0x000000B4, 0x00000043, 0x00000004, SetPlayerPos, 0x00000000, 0x00000002, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001000F, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7D4D, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFFFFFEA2, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000026, 0x00000002, 0xFE363C80, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000005A, 0x00000043, 0x00000005, TranslateModel, 0x00000034, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000036, 0xFE363C81, 0x00000000, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A77DD, 0x0000002C, 0x00000002, 0xFE363C81, 0xF24A7D24, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000026, 0x00000002, 0xFE363C80, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000078, 0x00000043, 0x00000005, TranslateModel, 0x00000038, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000003A, 0xFE363C81, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000040, 0xFE363C81, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000041, 0xFE363C81, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000042, 0xFE363C81, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000043, 0xFE363C81, 0x00000000, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A7780, 0x0000002C, 0x00000002, 0xFE363C81, 0xF24A7D80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000026, 0x00000002, 0xFE363C80, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000078, 0x00000043, 0x00000005, TranslateModel, 0x0000003C, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000003D, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000003E, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000003C, 0xFE363C81, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000003D, 0xFE363C81, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000003E, 0xFE363C81, 0x00000000, 0x00000001, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A79B4, 0x0000002C, 0x00000002, 0xFE363C81, 0xF24A78E7, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000008C, 0x00000043, 0x00000001, func_80240584_8AC514, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000078, 0x00000000, 0x00000008, 0x00000056, 0x00000000, 0x00000043, 0x00000008, func_80240000_8ABF90, 0x00000032, 0x00000032, 0x00000032, 0x00000000, 0x00000000, 0x00000000, 0x00000032, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000005A, 0x00000043, 0x00000001, func_802D4D88, 0x00000056, 0x00000000, 0x00000043, 0x00000004, func_802405F0_8AC580, 0x00000001, 0x00000000, 0x000000B4, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, func_802405F0_8AC580, 0x00000002, 0x00000001, 0x0000001E, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, func_802405F0_8AC580, 0x00000003, 0x00000002, 0x0000005A, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, func_802405F0_8AC580, 0x00000004, 0x00000003, 0x00000096, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, func_802405F0_8AC580, 0x00000005, 0x00000004, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, func_802405F0_8AC580, 0x00000006, 0x00000005, 0x0000003C, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, func_802405F0_8AC580, 0x00000007, 0x00000006, 0x00000078, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000014A, 0x00000043, 0x00000005, MakeLerp, 0x00001770, 0x00002EE0, 0x00000078, 0x00000000, 0x00000003, 0x00000001, 0x00000019, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000001, func_802404E8_8AC478, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000004, 0x00000001, 0x00000019, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000226, 0x00000043, 0x00000005, GetNpcPos, 0x00000007, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFFFFFF38, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00180004, 0x00000043, 0x00000008, NpcFlyTo, 0x00000007, 0x00000014, 0x0000000A, 0xFFFFFFFB, 0x00000019, 0xFFFFFFF6, 0x00000004, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00180006, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00180005, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240530_8AC4C0, 0x00000007, 0x00000008, 0x00000001, 0x00000006, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80240530_8AC4C0, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00130004, 0x00000043, 0x00000008, NpcFlyTo, 0x00000002, 0xFFFFFFEC, 0x0000000A, 0xFFFFFFFB, 0x00000019, 0xFFFFFFF6, 0x00000004, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00130006, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00130005, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240530_8AC4C0, 0x00000002, 0x00000008, 0x00000001, 0x00000006, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00130002, 0x00130001, 0x00000005, 0x000B0000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000007, 0x00130002, 0x00130001, 0x00000005, 0x000B0001, 0x00000008, 0x00000001, 0x00000003, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00180006, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00180005, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000008, NpcFlyTo, 0x00000007, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x0000000F, 0xFFFFFFF6, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00180001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFFFFFEA2, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000005, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240530_8AC4C0, 0x00000007, 0x00000008, 0x00000001, 0x00000004, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00130006, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00130005, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000008, NpcFlyTo, 0x00000002, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x0000000F, 0xFFFFFFF6, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00130001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000005, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240530_8AC4C0, 0x00000002, 0x00000008, 0x00000001, 0x00000004, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000005A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00120002, 0x00120002, 0x00000005, 0x000B0002, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00400000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00120003, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A874D, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00120001, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0xB000001F, 0x00000000, 0x00000043, 0x00000006, func_802403B8_8AC348, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x0000000A, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00130003, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00400000, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000002, 0xF24A874D, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000006, NpcJump0, 0x00000002, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00130001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000015, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00140003, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00400000, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000003, 0xF24A874D, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00140001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000016, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00150003, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000004, 0x00400000, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000004, 0xF24A874D, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00150001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00160003, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000005, 0x00400000, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000005, 0xF24A874D, 0x00000043, 0x00000005, GetNpcPos, 0x00000005, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000006, NpcJump0, 0x00000005, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00160001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000015, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00170004, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000006, 0x00400000, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000006, 0xF24A874D, 0x00000043, 0x00000005, GetNpcPos, 0x00000006, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000006, NpcJump0, 0x00000006, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00170001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000016, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00180003, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000007, 0x00400000, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000007, 0xF24A874D, 0x00000043, 0x00000005, GetNpcPos, 0x00000007, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000006, NpcJump0, 0x00000007, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00180001, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000188, 0x00000000, 0x00000043, 0x00000001, func_802404A0_8AC430, 0x00000057, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0xB000001F, 0x00000000, 0x00000043, 0x00000006, func_802403B8_8AC348, 0x00000000, 0x0000000A, 0x0000000A, 0x00000003, 0x0000000A, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0xB000001F, 0x00000000, 0x00000043, 0x00000006, func_802403B8_8AC348, 0x00000000, 0x00000000, 0x0000000A, 0x00000003, 0x0000000F, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0xB000001F, 0x00000000, 0x00000043, 0x00000006, func_802403B8_8AC348, 0x00000000, 0xFFFFFFF6, 0x0000000A, 0x00000003, 0x00000014, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0xB000001F, 0x00000000, 0x00000043, 0x00000006, func_802403B8_8AC348, 0x00000000, 0x0000000A, 0x0000000A, 0x00000003, 0x00000019, 0x00000008, 0x00000001, 0x00000006, 0x00000005, 0x00000001, 0x00000003, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0xB000001F, 0x00000000, 0x00000043, 0x00000006, func_802403B8_8AC348, 0x00000000, 0x00000000, 0x0000000A, 0x00000003, 0x0000001E, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0xB000001F, 0x00000000, 0x00000043, 0x00000006, func_802403B8_8AC348, 0x00000000, 0xFFFFFFF6, 0x0000000A, 0x00000003, 0x0000001E, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0xB000001F, 0x00000000, 0x00000043, 0x00000006, func_802403B8_8AC348, 0x00000000, 0x0000000A, 0x0000000A, 0x00000003, 0x0000001E, 0x00000008, 0x00000001, 0x00000006, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00120002, 0x00120002, 0x00000005, 0x000B0003, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, func_80240BD8_8ACB68, 0x00000005, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80240BD8_8ACB68, 0x00000002, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80240BD8_8ACB68, 0x00000006, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80240BD8_8ACB68, 0x00000003, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80240BD8_8ACB68, 0x00000007, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80240BD8_8ACB68, 0x00000004, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80240BD8_8ACB68, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x00001388, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000005A, 0x00000043, 0x00000001, func_802405A8_8AC538, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000008, func_80240000_8ABF90, 0x000000FF, 0x000000FF, 0x000000FF, 0x00000000, 0x00000000, 0x00000000, 0x00000032, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000300, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000048, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x009E0005, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x0000012C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x0000006E, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x009E0004, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000005A, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x00000001, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000005A, 0x00000001, 0x00000008, 0x00000001, 0x00000012, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000000C8, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x0000000F, 0xFFFFFFF4, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFEC, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x009E000F, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x00000263, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000002, 0x00000000, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x009E0004, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x009E000B, 0x009E0004, 0x00000005, 0x000B0004, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0x00000001, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x009E0007, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x0000001E, 0xFFFFFFF6, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x009E0010, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x009E0010, 0x009E0010, 0x00000005, 0x000B0005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x009E000B, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x0000001E, 0x00000000, 0xFFFFFFF6, 0x00000004, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x009E000F, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x0000001E, 0x00000000, 0xFFFFFFF6, 0x00000004, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x009E000B, 0x009E0004, 0x00000005, 0x000B0006, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x009E0007, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A9280, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFFE2, 0xFFFFFFFB, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000000, 0x00000005, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFFE3, 0x00000000, 0x00000005, 0x00000004, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x009E0007, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A9280, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x00000022, 0x00000005, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000000, 0x00000005, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x00000021, 0x00000000, 0x00000005, 0x00000004, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x009E0007, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A9280, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFFE2, 0x00000005, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000000, 0x00000005, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFFE3, 0x00000000, 0x00000005, 0x00000004, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x009E0007, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A9280, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x00000022, 0x00000005, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000000, 0x00000005, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x00000021, 0x00000000, 0x00000005, 0x00000004, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x009E000B, 0x009E0004, 0x00000005, 0x000B0007, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x000001C2, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x009E000B, 0x009E0004, 0x00000005, 0x000B0008, 0x00000008, 0x00000001, 0x0000001E, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFF81, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000001, func_802405CC_8AC55C, 0x00000043, 0x00000004, GotoMapSpecial, 0x802440D8, 0x00000005, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_00/8AEC40.data.s b/ver/us/asm/data/world/area_kmr/kmr_00/8AEC40.data.s deleted file mode 100644 index 0411bbb2ab..0000000000 --- a/ver/us/asm/data/world/area_kmr/kmr_00/8AEC40.data.s +++ /dev/null @@ -1,27 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242CB0_8AEC40 -.word 0x00000000, 0x001A0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00140014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00160018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80242D34_8AECC4 -.word 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80242D60_8AECF0 -.short 0x0001, 0x0003, 0x0005, 0x0007, 0x0007, 0x0005, 0x0003, 0x0000 - -dlabel D_80242D70_8AED00 -.word 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240CB0_8ACC40, 0x00000057, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x00000064, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0xFE363C80, 0x0000003E, 0x00000002, 0x00000001, 0xFE363C8A, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000056, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x0000005A, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000026, 0x00000002, 0xF4ACD480, 0xF24AA280, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, RandInt, 0x00000064, 0xFE363C81, 0x0000000C, 0x00000002, 0xFE363C81, 0x00000050, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0xFE363C81, 0x00000026, 0x00000002, 0xF4ACD480, 0xF24B1A80, 0x00000008, 0x00000001, 0x00000001, 0x00000026, 0x00000002, 0xF4ACD480, 0xF24B4280, 0x00000008, 0x00000001, 0x00000001, 0x00000026, 0x00000002, 0xF4ACD480, 0xF24BBA80, 0x00000008, 0x00000001, 0x00000001, 0x00000026, 0x00000002, 0xF4ACD480, 0xF24B9280, 0x00000008, 0x00000001, 0x00000001, 0x00000026, 0x00000002, 0xF4ACD480, 0xF24B6A80, 0x00000008, 0x00000001, 0x00000001, 0x00000026, 0x00000002, 0xF4ACD480, 0xF24B4280, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000003, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000032, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A7DB4, 0x00000043, 0x00000007, func_802CFD30, 0xFFFFFFFF, 0x0000000D, 0x00000000, 0xF4ACD480, 0xFD050F81, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000032, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A774D, 0x00000043, 0x00000007, func_802CFD30, 0xFFFFFFFF, 0x0000000D, 0x00000000, 0xF4ACD480, 0xFD050F81, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000004, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024303C_8AEFCC -.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, BindNpcAux, 0xFFFFFFFF, D_80242D70_8AED00, 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFF81, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024309C_8AF02C -.word 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFF81, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802430D4_8AF064 -.word 0x00000000, D_80242D34_8AECC4, 0x00000000, 0xC47A0000, 0x00000000, 0x00000F01, D_8024309C_8AF02C, 0x00000000, 0x00000000, 0x00000000, 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, 0x009E0001, 0x009E0005, 0x009E0007, 0x009E0007, 0x009E0001, 0x009E0001, 0x009E0000, 0x009E0000, 0x009E0007, 0x009E0007, 0x009E0007, 0x009E0007, 0x009E0007, 0x009E0007, 0x009E0007, 0x009E0007, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802432C4_8AF254 -.word 0x00000001, D_80242CB0_8AEC40, 0x00000000, 0xC47A0000, 0x00000000, 0x00000F01, D_8024303C_8AEFCC, 0x00000000, 0x00000000, 0x00000000, 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, 0x00120001, 0x00120001, 0x00120001, 0x00120001, 0x00120001, 0x00120001, 0x00120001, 0x00120001, 0x00120000, 0x00120001, 0x00120001, 0x00120001, 0x00120001, 0x00120001, 0x00120001, 0x00120001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, D_80242CB0_8AEC40, 0x00000000, 0xC47A0000, 0x00000000, 0x00000F01, D_8024303C_8AEFCC, 0x00000000, 0x00000000, 0x00000000, 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, 0x00130001, 0x00130001, 0x00130001, 0x00130001, 0x00130001, 0x00130001, 0x00130001, 0x00130001, 0x00130000, 0x00130001, 0x00130001, 0x00130001, 0x00130001, 0x00130001, 0x00130001, 0x00130001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000003, D_80242CB0_8AEC40, 0x00000000, 0xC47A0000, 0x00000000, 0x00000F01, D_8024303C_8AEFCC, 0x00000000, 0x00000000, 0x00000000, 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, 0x00140001, 0x00140001, 0x00140001, 0x00140001, 0x00140001, 0x00140001, 0x00140001, 0x00140001, 0x00140000, 0x00140001, 0x00140001, 0x00140001, 0x00140001, 0x00140001, 0x00140001, 0x00140001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000004, D_80242CB0_8AEC40, 0x00000000, 0xC47A0000, 0x00000000, 0x00000F01, D_8024303C_8AEFCC, 0x00000000, 0x00000000, 0x00000000, 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, 0x00150001, 0x00150001, 0x00150001, 0x00150001, 0x00150001, 0x00150001, 0x00150001, 0x00150001, 0x00150000, 0x00150001, 0x00150001, 0x00150001, 0x00150001, 0x00150001, 0x00150001, 0x00150001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000005, D_80242CB0_8AEC40, 0x00000000, 0xC47A0000, 0x00000000, 0x00000F01, D_8024303C_8AEFCC, 0x00000000, 0x00000000, 0x00000000, 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, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160000, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, D_80242CB0_8AEC40, 0x00000000, 0xC47A0000, 0x00000000, 0x00000F01, D_8024303C_8AEFCC, 0x00000000, 0x00000000, 0x00000000, 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, 0x00170001, 0x00170001, 0x00170001, 0x00170001, 0x00170001, 0x00170001, 0x00170001, 0x00170001, 0x00170000, 0x00170001, 0x00170001, 0x00170001, 0x00170001, 0x00170001, 0x00170001, 0x00170001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000007, D_80242CB0_8AEC40, 0x00000000, 0xC47A0000, 0x00000000, 0x00000F01, D_8024303C_8AEFCC, 0x00000000, 0x00000000, 0x00000000, 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, 0x00180001, 0x00180001, 0x00180001, 0x00180001, 0x00180001, 0x00180001, 0x00180001, 0x00180001, 0x00180000, 0x00180001, 0x00180001, 0x00180001, 0x00180001, 0x00180001, 0x00180001, 0x00180001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_802430D4_8AF064, 0x00000000, 0x00000007, D_802432C4_8AF254, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_00/8B0010.data.s b/ver/us/asm/data/world/area_kmr/kmr_00/8B0010.data.s deleted file mode 100644 index 2969fcd53a..0000000000 --- a/ver/us/asm/data/world/area_kmr/kmr_00/8B0010.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80244080_8B0010 -.word 0x00000043, 0x00000008, MakeEntity, Entity_HiddenPanel, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8405BD6, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_02/8B5640.data.s b/ver/us/asm/data/world/area_kmr/kmr_02/8B5640.data.s index f0d7ae2709..a65ae8cc36 100644 --- a/ver/us/asm/data/world/area_kmr/kmr_02/8B5640.data.s +++ b/ver/us/asm/data/world/area_kmr/kmr_02/8B5640.data.s @@ -2,7 +2,7 @@ .section .data -dlabel kmr_02_Quizmo_varStash +dlabel kmr_02_varStash .word 0x00000000 dlabel D_802455D4_8B5644 diff --git a/ver/us/asm/data/world/area_kmr/kmr_04/8CAD70.data.s b/ver/us/asm/data/world/area_kmr/kmr_04/8CAD70.data.s deleted file mode 100644 index 46eda79201..0000000000 --- a/ver/us/asm/data/world/area_kmr/kmr_04/8CAD70.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240470_8CAD70 -.word 0x43F28000, 0x00000000, 0x41100000, 0x43870000, 0x43460000, 0x42C80000, 0xC1C80000, 0x43870000, 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, 0x422C0000, 0x00000000, 0xC3BC0000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240744, D_80240470_8CAD70, 0x0000000B, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x0019003C, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000011, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000047, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PushSong, 0x00000042, 0x00000000, 0x00000008, 0x00000001, 0x00000082, 0x00000043, 0x00000001, PopSong, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_04/8CAF00.data.s b/ver/us/asm/data/world/area_kmr/kmr_04/8CAF00.data.s deleted file mode 100644 index 3f61b533ae..0000000000 --- a/ver/us/asm/data/world/area_kmr/kmr_04/8CAF00.data.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240600_8CAF00 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80243760, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024065C_8CAF5C -.word 0x00000047, 0x00000005, D_80240600_8CAF00, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240688_8CAF88 -.word 0x00000043, 0x00000002, GetLoadType, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, EnterSavePoint, 0x00000044, 0x00000001, D_8024065C_8CAF5C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, D_8024065C_8CAF5C, 0x00000044, 0x00000001, EnterWalk, 0x00000012, 0x00000000, 0x00000044, 0x00000001, 0x80285C50, 0x00000044, 0x00000001, D_8024065C_8CAF5C, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000001E, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF9718889, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80241A5C, 0x00000043, 0x00000001, ClearDefeatedEnemies, 0x00000046, 0x00000001, 0x80241AA0, 0x00000046, 0x00000001, 0x8024349C, 0x00000044, 0x00000001, 0x80240560, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000044, 0x00000001, D_80240688_8CAF88, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_04/8CB160.data.s b/ver/us/asm/data/world/area_kmr/kmr_04/8CB160.data.s deleted file mode 100644 index e513056e93..0000000000 --- a/ver/us/asm/data/world/area_kmr/kmr_04/8CB160.data.s +++ /dev/null @@ -1,42 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240860_8CB160 -.word 0x00000000, 0x00200018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_8024088C_8CB18C -.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000048, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802408FC_8CB1FC -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024090C_8CB20C -.word 0x00000003, 0x00000001, 0x00000001, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000016, 0x00000001, 0xFFFFFF87, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C80, 0x00000172, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, func_802CF56C, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8280, 0x00000043, 0x00000005, NpcMoveTo, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x000B00A9, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFF88, 0x00000016, 0x00000001, 0xFFFFFF89, 0x0000000A, 0x00000002, 0xF70F2E80, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000168, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000190, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C82, 0xFFFFFFDC, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C82, 0x00000055, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000001, kmr_04_CheckPartnerFlags1000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0002, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x000001A4, 0x00000006, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFFFFFFFC, 0x00000003, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x000B00AC, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0001, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0x0000018B, 0x00000000, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000008, 0x00000001, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A9280, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0003, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x00000246, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000008, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFC, 0x00000061, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x000B00AD, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, func_802CDE68, 0xFFFFFFFC, 0x0000000A, 0x00000005, 0x00000001, 0x0000003C, 0x00000027, 0x00000002, 0xFE363C80, 0x00000035, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFC, 0x00000000, 0x00000000, 0xFE363C80, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFFFFFFFC, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, func_802CDE68, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFC, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000F, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000018, 0x00000001, 0x000001EF, 0x0000000F, 0x00000009, 0x000001CC, 0x0000000F, 0x00000009, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0007, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x000000FA, 0x00000006, 0x0000003C, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0007, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFC, 0x00000000, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x000000FA, 0x00000000, 0x00000006, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x000000FA, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E80, 0x00000001, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240FC4_8CB8C4 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240FD4_8CB8D4 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240FE4_8CB8E4 -.word 0x00000043, 0x00000002, func_800445D4, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000064, 0x00000003, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF70F2E80, 0x00000016, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x8024058C, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000001AE, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24EC680, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AC080, 0xF24A5C80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000276, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000003, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00210009, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x000001D1, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00210006, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x0021001A, 0x00210006, 0x00000000, 0x000B00AE, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000001AE, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, StartBossBattle, 0x00000004, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000065, 0x0000001D, 0x00000001, 0x00000066, 0x0000001D, 0x00000001, 0x00000003, 0x0000001D, 0x00000001, 0x00000067, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241334_8CBC34 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000190, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24EC680, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5C80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00210011, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00210011, 0x00210011, 0x00000000, 0x000B00B5, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A9280, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00210009, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x00000234, 0x0000000A, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000234, 0x00000000, 0x0000000A, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x000001B3, 0x0000000A, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x0021001A, 0x00210006, 0x00000000, 0x000B00B6, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x00000234, 0x0000000A, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00210003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0x00000004, 0x00000057, 0x00000000, 0x00000044, 0x00000001, 0x80240560, 0x00000024, 0x00000002, 0xF70F2E80, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFF8A, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802415E8_8CBEE8 -.word 0x009D0001, 0x00180018, D_8024088C_8CB18C, D_80240FC4_8CB8C4, D_8024090C_8CB20C, 0x00000000, D_802408FC_8CB1FC, D_80240FD4_8CB8D4, 0x00000105, 0x00000000, 0x00000000 - -dlabel D_80241614_8CBF14 -.word 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80240FE4_8CB8E4, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_80241334_8CBC34, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024167C_8CBF7C -.word 0x00000000, D_80240860_8CB160, 0x00000000, 0xC47A0000, 0x00000000, 0x00A40D00, D_80241614_8CBF14, 0x00000000, 0x00000000, 0x00000000, 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, 0x00210003, 0x00210007, 0x00210007, 0x00210007, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_8024186C_8CC16C -.word 0x00000001, D_802415E8_8CBEE8, 0xC2680000, 0x00000000, 0x43020000, 0x00200100, 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, 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, 0x00000001, D_8024167C_8CBF7C, 0x02020000, 0x00000001, D_8024186C_8CC16C, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80241A80_8CC380 -.word 0x00000024, 0x00000002, 0xF8405BC7, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405BC7, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Hammer1Block, 0xFFFFFFB0, 0x00000000, 0x00000190, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80241A80_8CC380, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0xFFFFFF1A, 0x0000003C, 0xFFFFFF74, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0xFFFFFE48, 0x0000003C, 0x00000014, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x0000003C, 0x00000000, 0x00000172, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x00000055, 0x00000000, 0x0000018B, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_MulticoinBlock, 0x00000064, 0x00000000, 0xFFFFFFBA, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405BC6, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x00000000, 0x0000003C, 0x00000000, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_04/8CC4F0.data.s b/ver/us/asm/data/world/area_kmr/kmr_04/8CC4F0.data.s deleted file mode 100644 index a14efe16d0..0000000000 --- a/ver/us/asm/data/world/area_kmr/kmr_04/8CC4F0.data.s +++ /dev/null @@ -1,174 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241BF0_8CC4F0 -.word 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, 0x00000066, 0x66666666, 0x66666600, 0x00000000, 0x00000000, 0x00003388, 0x99888888, 0x89999999, 0x99999988, 0x88888888, 0x88830000, 0x0005A999, 0x99999999, 0x99999999, 0x99888888, 0x88787777, 0x77773000, 0x005AAAAA, 0xAAA99999, 0x99999999, 0x99999877, 0x77777777, 0x77788300, 0x05ADFFFE, 0xEEDDDDDD, 0xDBAAAAAA, 0xAAAA9977, 0x77888888, 0x88888800, 0x07AFFEEE, 0xEEEEEEEE, 0xEEEEEEEE, 0xFFFF9978, 0x88888888, 0x88888800, 0x07AFEDCC, 0xDDDDDDDD, 0xEEEEEEEE, 0xEEEFD978, 0x88888888, 0x88888800, 0x07AFDCCC, 0xCCCCCCCC, 0xCCCCCCDD, 0xDDEFF978, 0x88888888, 0x88888800, 0x07AFDCCC, 0xCCCCCCCC, 0xCCCCCCCC, 0xCCDFE978, 0x88888888, 0x88888800, 0x07AEDCCC, 0xCCCCCCCC, 0xCCCCCCCC, 0xCCCED978, 0x88888888, 0x88888800, 0x07AEDCCC, 0xCCCCCCCC, 0xCCCCCCCC, 0xCCCED978, 0x88888888, 0x88888800, 0x07AEDCCC, 0xCCCCCCCC, 0xCCCCCCCC, 0xCCCED978, 0x88888888, 0x88888800, 0x07AEDCCC, 0xCCCCCCCC, 0xCCCCCCCC, 0xCCDED978, 0x88888888, 0x88888800, 0x07AEDCCC, 0xCBBCCCCC, 0xCCCCCCCC, 0xCCDED978, 0x88888888, 0x87888800, 0x07AEDCCC, 0xCA79BCCC, 0xCBAABCCC, 0xCCDED978, 0x88877888, 0x65888800, 0x07AEDCCC, 0xCA56ACCC, 0xCB958BCC, 0xCCDED978, 0x88854888, 0x65888800, 0x07AEDCCC, 0xCA57ACCC, 0xCB948BCC, 0xCCDED978, 0x88854888, 0x65888800, 0x07AEDCCC, 0xCA57ACCC, 0xCB948BCC, 0xCCDED978, 0x88854888, 0x55888800, 0x07AEDCCC, 0xCA57ACCC, 0xCB948BCC, 0xCCDED978, 0x88854888, 0x55888800, 0x07AEDCCC, 0xCA57ACCC, 0xCB948BCC, 0xCCDED978, 0x88854888, 0x66888800, 0x07AEDCCC, 0xCBA9ACCC, 0xCC958BCC, 0xCCDED978, 0x88856888, 0x88888800, 0x07AEDCCC, 0xCCCCCCCC, 0xCCCAABCC, 0xCCDED978, 0x88888888, 0x88888800, 0x07AEDCCC, 0xCCCCCCCC, 0xCCCCCCCC, 0xCCDED978, 0x88888888, 0x88888800, 0x07AEDCCC, 0xCCCCCCCC, 0xCCCCCCCC, 0xCCDED978, 0x88888888, 0x88888800, 0x07AEDCCC, 0xCCCCCCCC, 0xCCCCCCCC, 0xCCDED978, 0x88888888, 0x88888800, 0x07AEDCCC, 0xCCCCCCCC, 0xCCCCCCCC, 0xCCDEA978, 0x88888888, 0x88888800, 0x07AEDCCC, 0xCCCCCCCC, 0xCCCCCCCC, 0xCCDEA978, 0x88888888, 0x88888800, 0x07AEDCCC, 0xCCCCCCCC, 0xCCCCCCCC, 0xCCDEA978, 0x88888888, 0x88888800, 0x07AEDCCC, 0xCCCCCCCC, 0xCCCCCCCC, 0xCCDEA978, 0x88888888, 0x88888800, 0x07AEDCCC, 0xCCCCCCCC, 0xCCCCCCCC, 0xCCDEA978, 0x88888888, 0x88888800, 0x07BEDCCC, 0xCCCCCCCC, 0xCCCCCCCC, 0xCCDEA978, 0x88888888, 0x88888300, 0x008EBCCC, 0xCCCCCCCC, 0xCCCCCCCC, 0xCCDEA978, 0x88888888, 0x88883000, 0x0008BCCC, 0xCCBCCCCC, 0xCCCCCCCC, 0xCCDEA978, 0x88888888, 0x88730000, 0x000089AA, 0xAAAAACCC, 0xBBBCCCCC, 0xCCDEA978, 0x88888777, 0x55000000, 0x00000088, 0x88999AAA, 0xAAAAAACB, 0xBBBEB978, 0x88777322, 0x00000000, 0x00000000, 0x00000888, 0x999999AA, 0xAAAAA877, 0x75510000, 0x00000000, 0x00000000, 0x00000000, 0x00000288, 0x88999752, 0x10000000, 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 - -dlabel D_80242070_8CC970 -.word 0x00000841, 0x08431083, 0x184128C3, 0x31434985, 0x5A078307, 0xA3CBB44B, 0xB44BBC8D, 0xC4CFC511 - -dlabel D_80242090_8CC990 -.word 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, kmr_04_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, kmr_04_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802423F0_8CCCF0 -.word 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, PlaySound, 0x00000165, 0x00000043, 0x00000002, PlaySound, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, kmr_04_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000166, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, kmr_04_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, kmr_04_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C84, 0x00000165, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, kmr_04_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000030, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000005, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000033, 0x00000003, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8B, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8B, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000030, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000005, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x0000000F, PlayEffect, 0x00000014, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000046, 0x00000001, 0xFE363C85, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel kmr_04_varStash -.word 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242A58_8CD358 -.word 0x00000043, 0x00000002, SetPlayerAnimation, 0x0006000C, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000027, 0x00000002, 0xFE363C86, 0x00000028, 0x00000043, 0x00000007, MakeItemEntity, 0x00000004, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C86, 0x00000010, 0x00000043, 0x0000000F, PlayEffect, 0x0000001B, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xF24A7E80, 0xFE363C88, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000033, 0x00000009, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xF24A7E80, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0x802405B8, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C84, 0x00000032, 0x00000027, 0x00000002, 0xFE363C85, 0x00000002, 0x00000027, 0x00000002, 0xFE363C83, 0x00000008, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000003, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFF0, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000003, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFAA2B592, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, func_802D7B44, 0xFE363C88, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C8C, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242CE4_8CD5E4 -.word 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A9A80, 0x00000000, 0xF24F2A80, 0xF24AC680, 0xF24A5680, 0x00000024, 0x00000002, 0xFAA2B592, 0x00000000, 0x00000044, 0x00000001, D_80242A58_8CD358, 0x00000043, 0x00000001, kmr_04_func_80240434_8CAD34, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, func_802403E0_8CACE0, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0164, 0x000000A0, 0x00000028, 0x00000024, 0x00000002, 0xFAA2B592, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x000B00AA, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0001, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFF89, 0x00000043, 0x00000002, ClearPartnerMoveHistory, 0xFFFFFFFC, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0x00000003, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242E20_8CD720 -.word 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFF89, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000046, 0x00000001, D_80242CE4_8CD5E4, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242E7C_8CD77C -.word 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFF89, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000055, 0x00000014, 0x0000000A, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000030, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80242CE4_8CD5E4, 0x00000043, 0x00000005, MakeLerp, 0x00000055, 0x00000000, 0x00000014, 0x0000000A, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000030, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242FE0_8CD8E0 -.word 0x00000001, 0x00000034 - -dlabel D_80242FE8_8CD8E8 -.word 0x00000001, 0x00000157, 0x000000F8, 0x00000011, 0x00000061, 0x00000007, 0xF8405BBE, 0xFAA2B58A - -dlabel D_80243008_8CD908 -.word 0x00000001, 0x000000F8, 0x00000011, 0x00000061 - -dlabel D_80243018_8CD918 -.word D_80242FE0_8CD8E0, D_80242FE8_8CD8E8, D_80243008_8CD908, 0x00000000 - -dlabel D_80243028_8CD928 -.word 0x00000001, 0x00000036 - -dlabel D_80243030_8CD930 -.word 0x00000001, 0x00000157, 0x00000063, 0x00000011, 0x000000ED, 0x00000006, 0xF8405BBF, 0xFAA2B58B - -dlabel D_80243050_8CD950 -.word 0x00000001, 0x00000064, 0x00000013, 0x000000F6 - -dlabel D_80243060_8CD960 -.word D_80243028_8CD928, D_80243030_8CD930, D_80243050_8CD950, 0x00000000 - -dlabel D_80243070_8CD970 -.word 0x00000001, 0x00000032 - -dlabel D_80243078_8CD978 -.word 0x00000002, 0x00000157, 0x00000032, 0x00000012, 0xFFFFFF38, 0x00000007, 0xF8405BC0, 0xFAA2B58C, 0x00000157, 0x00000032, 0x00000012, 0xFFFFFF38, 0x00000007, 0xF8405BC1, 0xFAA2B58D - -dlabel D_802430B4_8CD9B4 -.word 0x00000001, 0x00000032, 0x00000012, 0xFFFFFF38 - -dlabel D_802430C4_8CD9C4 -.word D_80243070_8CD970, D_80243078_8CD978, D_802430B4_8CD9B4, 0x00000000 - -dlabel D_802430D4_8CD9D4 -.word 0x00000001, 0x00000035 - -dlabel D_802430DC_8CD9DC -.word 0x00000001, 0x00000157, 0xFFFFFFCF, 0x00000014, 0x00000092, 0x00000007, 0xF8405BC2, 0xFAA2B58E - -dlabel D_802430FC_8CD9FC -.word 0x00000001, 0xFFFFFFCF, 0x00000014, 0x00000092 - -dlabel D_8024310C_8CDA0C -.word D_802430D4_8CD9D4, D_802430DC_8CD9DC, D_802430FC_8CD9FC, 0x00000000 - -dlabel D_8024311C_8CDA1C -.word 0x00000001, 0x00000033 - -dlabel D_80243124_8CDA24 -.word 0x00000001, 0x00000157, 0xFFFFFF6C, 0x00000010, 0xFFFFFF6A, 0x00000007, 0xF8405BC3, 0xFAA2B58F - -dlabel D_80243144_8CDA44 -.word 0x00000001, 0xFFFFFF6C, 0x00000010, 0xFFFFFF6A - -dlabel D_80243154_8CDA54 -.word D_8024311C_8CDA1C, D_80243124_8CDA24, D_80243144_8CDA44, 0x00000000 - -dlabel D_80243164_8CDA64 -.word 0x00000001, 0x00000030 - -dlabel D_8024316C_8CDA6C -.word 0x00000001, 0xFFFFFF20, 0x00000014, 0x00000060 - -dlabel D_8024317C_8CDA7C -.word D_80243164_8CDA64, 0x00000000, D_8024316C_8CDA6C, D_80242E20_8CD720 - -dlabel D_8024318C_8CDA8C -.word D_80243164_8CDA64, 0x00000000, D_8024316C_8CDA6C, D_80242E7C_8CD77C - -dlabel D_8024319C_8CDA9C -.word 0x00000001, 0x00000030 - -dlabel D_802431A4_8CDAA4 -.word 0x00000001, 0xFFFFFF20, 0x00000014, 0x00000060 - -dlabel D_802431B4_8CDAB4 -.word D_8024319C_8CDA9C, 0x00000000, D_802431A4_8CDAA4, 0x00000000 - -dlabel D_802431C4_8CDAC4 -.word 0x00000001, 0x00000037 - -dlabel D_802431CC_8CDACC -.word 0x00000001, 0xFFFFFF52, 0x00000013, 0x00000128 - -dlabel D_802431DC_8CDADC -.word D_802431C4_8CDAC4, 0x00000000, D_802431CC_8CDACC, 0x00000000 - -dlabel D_802431EC_8CDAEC -.word 0x00000001, 0x00000014 - -dlabel D_802431F4_8CDAF4 -.word 0x00000001, 0x00000013 - -dlabel D_802431FC_8CDAFC -.word 0x00000001, 0x00000157, 0xFFFFFED2, 0x00000080, 0x00000002, 0x0000000F, 0xF8405BBC, 0x00000000 - -dlabel D_8024321C_8CDB1C -.word 0x00000002, 0xFFFFFE79, 0x00000096, 0x00000014, 0xFFFFFEF5, 0x00000096, 0x00000016 - -dlabel D_80243238_8CDB38 -.word D_802431EC_8CDAEC, D_802431F4_8CDAF4, D_802431FC_8CDAFC, D_8024321C_8CDB1C, 0x00000000 - -dlabel D_8024324C_8CDB4C -.word 0xC3B00000, 0x00000000, 0x41200000, 0x00000000 - -dlabel D_8024325C_8CDB5C -.word 0x00000001, 0x00000017 - -dlabel D_80243264_8CDB64 -.word 0x00000001, 0x00000016 - -dlabel D_8024326C_8CDB6C -.word 0x00000001, 0x00000157, 0xFFFFFFA0, 0x00000084, 0xFFFFFF01, 0x00000007, 0xF8405BBD, 0x00000000 - -dlabel D_8024328C_8CDB8C -.word 0x00000002, 0xFFFFFF64, 0x00000096, 0xFFFFFF01, 0xFFFFFFE0, 0x00000096, 0xFFFFFEF0 - -dlabel D_802432A8_8CDBA8 -.word D_8024325C_8CDB5C, D_80243264_8CDB64, D_8024326C_8CDB6C, D_8024328C_8CDB8C, 0x00000000 - -dlabel D_802432BC_8CDBBC -.word 0xC2B80000, 0x00000000, 0xC3938000, 0x00000000 - -dlabel D_802432CC_8CDBCC -.word 0x0000000A, 0x00000002, 0xF8405B9E, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF9718889, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000007, MakeItemEntity, 0x00000056, 0x000000FA, 0x00000084, 0xFFFFFF9C, 0x0000000D, 0xF8405B9E, 0x00000024, 0x00000002, 0xF9718889, 0x00000001, 0x00000056, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xF8405B9E, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000005, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x000B00AB, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024344C_8CDD4C -.word 0x00000001, 0x0000001A - -dlabel D_80243454_8CDD54 -.word 0x00000001, 0x00000019 - -dlabel D_8024345C_8CDD5C -.word 0x00000002, 0x000000BE, 0x00000096, 0xFFFFFF84, 0x00000127, 0x00000096, 0xFFFFFF84 - -dlabel D_80243478_8CDD78 -.word D_8024344C_8CDD4C, D_80243454_8CDD54, 0x00000000, D_8024345C_8CDD5C, D_802432CC_8CDBCC - -dlabel D_8024348C_8CDD8C -.word 0x43780000, 0x00000000, 0xC2F40000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80243018_8CD918, 0x00000047, 0x00000005, D_80242090_8CC990, 0x00000100, 0x0000002D, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80243060_8CD960, 0x00000047, 0x00000005, D_80242090_8CC990, 0x00000100, 0x00000035, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802430C4_8CD9C4, 0x00000047, 0x00000005, D_80242090_8CC990, 0x00000100, 0x0000002F, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024310C_8CDA0C, 0x00000047, 0x00000005, D_80242090_8CC990, 0x00000100, 0x00000033, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80243154_8CDA54, 0x00000047, 0x00000005, D_80242090_8CC990, 0x00000100, 0x0000002C, 0x00000001, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFF89, 0x00000024, 0x00000002, 0xFE363C80, D_802431B4_8CDAB4, 0x00000047, 0x00000005, D_80242090_8CC990, 0x00000100, 0x00000030, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802431B4_8CDAB4, 0x00000047, 0x00000005, D_80242090_8CC990, 0x00000100, 0x00000031, 0x00000001, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024317C_8CDA7C, 0x00000047, 0x00000005, D_80242090_8CC990, 0x00000100, 0x00000030, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024318C_8CDA8C, 0x00000047, 0x00000005, D_80242090_8CC990, 0x00000100, 0x00000031, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802431DC_8CDADC, 0x00000047, 0x00000005, D_80242090_8CC990, 0x00000100, 0x00000034, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80243238_8CDB38, 0x00000047, 0x00000005, D_802423F0_8CCCF0, 0x00001000, 0x00000009, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802423F0_8CCCF0, 0x00100000, D_8024324C_8CDB4C, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802432A8_8CDBA8, 0x00000047, 0x00000005, D_802423F0_8CCCF0, 0x00001000, 0x00000016, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802423F0_8CCCF0, 0x00100000, D_802432BC_8CDBBC, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80243478_8CDD78, 0x00000047, 0x00000005, D_802423F0_8CCCF0, 0x00001000, 0x00000020, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802423F0_8CCCF0, 0x00100000, D_8024348C_8CDD8C, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_05/8CF7F0.data.s b/ver/us/asm/data/world/area_kmr/kmr_05/8CF7F0.data.s deleted file mode 100644 index c0e416c7d2..0000000000 --- a/ver/us/asm/data/world/area_kmr/kmr_05/8CF7F0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241780_8CF7F0 -.word 0xC2DC0000, 0x00000000, 0xC1980000, 0x42B40000, 0x44AEA000, 0x43480000, 0xC3110000, 0x435C0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241910, D_80241780_8CF7F0, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x0019003D, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000011, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_05/8CF880.data.s b/ver/us/asm/data/world/area_kmr/kmr_05/8CF880.data.s deleted file mode 100644 index f6697bc3a6..0000000000 --- a/ver/us/asm/data/world/area_kmr/kmr_05/8CF880.data.s +++ /dev/null @@ -1,72 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241810_8CF880 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80243430, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024186C_8CF8DC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80243438, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802418C8_8CF938 -.word 0x00000047, 0x00000005, D_80241810_8CF880, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024186C_8CF8DC, 0x00080000, 0x00000002, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000001E, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x0000000A, 0x00000002, 0xF8405BAB, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, D_8024280C_8D087C, 0x00000012, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, D_80242848_8D08B8, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80242890, 0x00000044, 0x00000001, 0x802417E0, 0x00000046, 0x00000001, 0x802433D8, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000003, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_802418C8_8CF938, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xF8405BC8, 0x00000000, 0x00000044, 0x00000001, D_80241C8C_8CFCFC, 0x00000024, 0x00000002, 0xF8405BC8, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241AB0_8CFB20 -.word 0x3FC00000, 0x0000001E, 0x0000001E, 0x43020000, 0x00000000, 0x00000001, 0x40200000, 0x000000B4, 0x00000003, 0x43160000, 0x00000000, 0x00000001 - -dlabel D_80241AE0_8CFB50 -.word 0x00000043, 0x00000002, BasicAI_Main, D_80241AB0_8CFB20, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241B00_8CFB70 -.word 0x00000000, 0x00140017, 0x00000000, 0x00000000, D_80241AE0_8CFB50, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00050000 - -dlabel kmr_05_FlyingAI_JumpVels -.float 4.5, 3.5, 2.6, 2.0, 1.5, 20.0 - -dlabel D_80241B44_8CFBB4 -.word 0x3FCCCCCD, 0x0000003C, 0x0000001E, 0x42A00000, 0x00000000, 0x00000005, 0x400CCCCD, 0x0000003C, 0x0000000F, 0x42C80000, 0x00000000, 0x00000001 - -dlabel D_80241B74_8CFBE4 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0xFFFFFE0C, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x00000015, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000244, 0x00000043, 0x00000002, kmr_05_FlyingAI_Main, D_80241B44_8CFBB4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241BE4_8CFC54 -.word 0x00000000, 0x00140015, 0x00000000, 0x00000000, D_80241B74_8CFBE4, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060002 - -dlabel D_80241C10_8CFC80 -.word 0x3FC00000, 0x0000001E, 0x0000001E, 0x43020000, 0x00000000, 0x00000001, 0x40200000, 0x000000B4, 0x00000003, 0x43160000, 0x00000000, 0x00000001 - -dlabel D_80241C40_8CFCB0 -.word 0x00000043, 0x00000002, BasicAI_Main, D_80241C10_8CFC80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241C60_8CFCD0 -.word 0x00000000, 0x00170017, 0x00000000, 0x00000000, D_80241C40_8CFCB0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 - -dlabel D_80241C8C_8CFCFC -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFFC4, 0xFFFFFFED, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x000B00B7, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241D2C_8CFD9C -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000006B, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x0000006B, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, TranslateModel, 0x0000006B, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x0000006B, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000005, TranslateModel, 0x0000006B, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x0000006B, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241E44_8CFEB4 -.word 0x00000043, 0x00000002, func_800445D4, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000064, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x0000000C, 0x00000002, 0xFE363C81, 0x00000064, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000230, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C80, 0x000002BC, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcAux, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0xFFFFFFFF, 0x00000000, 0xFFFFFFE2, 0x0000000C, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8E80, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0x000002AD, 0x00000064, 0xFFFFFFDD, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x40000000, 0x00000001, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80241C40_8CFCB0, 0x0000001D, 0x00000001, 0x00000066, 0x0000001D, 0x00000001, 0x00000003, 0x0000001D, 0x00000001, 0x00000067, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80241C40_8CFCB0, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242014_8D0084 -.word 0x00000000, D_80241B00_8CFB70, 0x43988000, 0x42480000, 0xC1500000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x8005008A, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x66650002, 0x4CCC2666, 0x59980002, 0x3FFF3FFF, 0x4CCC0002, 0x3FFF6665, 0x3FFF0002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000131, 0x00000032, 0xFFFFFFF3, 0x0000001E, 0x00000014, 0xFFFF8001, 0x00000001, 0x0000014A, 0x00000032, 0x00000014, 0x00000078, 0x00000082, 0x00000001, 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, 0x00260001, 0x00260002, 0x00260003, 0x00260003, 0x00260001, 0x00260001, 0x00260005, 0x00260005, 0x00260003, 0x00260003, 0x00260003, 0x00260003, 0x00260003, 0x00260003, 0x00260003, 0x00260003, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80242204_8D0274 -.word 0x00000002, D_80241B00_8CFB70, 0x442F0000, 0x43520000, 0xC3250000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x8005008A, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x66650002, 0x4CCC2666, 0x59980002, 0x3FFF3FFF, 0x4CCC0002, 0x3FFF6665, 0x3FFF0002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000002BC, 0x000000D2, 0xFFFFFF5B, 0x0000001E, 0x00000014, 0xFFFF8001, 0x00000001, 0x000002BC, 0x000000D2, 0xFFFFFF5B, 0x00000078, 0x00000082, 0x00000001, 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, 0x00260001, 0x00260002, 0x00260003, 0x00260003, 0x00260001, 0x00260001, 0x00260005, 0x00260005, 0x00260003, 0x00260003, 0x00260003, 0x00260003, 0x00260003, 0x00260003, 0x00260003, 0x00260003, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802423F4_8D0464 -.word 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80241E44_8CFEB4, 0x00000043, 0x00000003, BindNpcAux, 0xFFFFFFFF, D_80241D2C_8CFD9C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024242C_8D049C -.word 0x00000003, D_80241C60_8CFCD0, 0x44320000, 0x42C80000, 0xC2BE0000, 0x00000400, D_802423F4_8D0464, 0x00000000, 0x00000000, 0x0000010E, 0x8005008A, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000276, 0x00000064, 0x00000019, 0x00000028, 0x00000014, 0xFFFF8001, 0x00000001, 0x00000294, 0x00000064, 0x0000001E, 0x000000A5, 0x00000096, 0x00000001, 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, 0x00270001, 0x00270002, 0x00270003, 0x00270003, 0x00270001, 0x00270001, 0x00270005, 0x00270005, 0x00270003, 0x00270003, 0x00270003, 0x00270003, 0x00270003, 0x00270003, 0x00270003, 0x00270003, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_8024261C_8D068C -.word 0x00000004, D_80241BE4_8CFC54, 0x44700000, 0x43520000, 0xC1A00000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008A, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x000003C0, 0x000000D2, 0xFFFFFFEC, 0x00000032, 0x00000019, 0xFFFF8001, 0x00000001, 0x000003E3, 0x000000D2, 0xFFFFFFC7, 0x000000D2, 0x00000064, 0x00000001, 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, 0x00280001, 0x00280003, 0x00280004, 0x00280004, 0x00280001, 0x00280001, 0x00280006, 0x00280006, 0x00280004, 0x00280004, 0x00280004, 0x00280004, 0x00280004, 0x00280004, 0x00280004, 0x00280004, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_8024280C_8D087C -.word 0x00000001, D_80242014_8D0084, 0x00000004, 0x00000001, D_80242204_8D0274, 0x00000004, 0x00000001, D_8024242C_8D049C, 0x02000004, 0x00000001, D_8024261C_8D068C, 0x02010004, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80242848_8D08B8 -.word 0x00000001, D_80242014_8D0084, 0x00000004, 0x00000001, D_80242204_8D0274, 0x00000004, 0x00000001, D_8024242C_8D049C, 0x000A0004, 0x00000001, D_8024261C_8D068C, 0x00080004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_05/8D0900.data.s b/ver/us/asm/data/world/area_kmr/kmr_05/8D0900.data.s deleted file mode 100644 index 44d5441753..0000000000 --- a/ver/us/asm/data/world/area_kmr/kmr_05/8D0900.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242890_8D0900 -.word 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0x00000085, 0x0000008C, 0xFFFFFF65, 0x00000011, 0xF8405BCA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_05/8D0940.data.s b/ver/us/asm/data/world/area_kmr/kmr_05/8D0940.data.s deleted file mode 100644 index 33ca2a00b3..0000000000 --- a/ver/us/asm/data/world/area_kmr/kmr_05/8D0940.data.s +++ /dev/null @@ -1,27 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802428D0_8D0940 -.word 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, kmr_05_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, kmr_05_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242C30_8D0CA0 -.word 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, PlaySound, 0x00000165, 0x00000043, 0x00000002, PlaySound, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, kmr_05_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000166, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, kmr_05_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, kmr_05_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C84, 0x00000165, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, kmr_05_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000030, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000005, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000033, 0x00000003, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8B, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8B, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000030, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000005, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x0000000F, PlayEffect, 0x00000014, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000046, 0x00000001, 0xFE363C85, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000001, func_8024173C_8CF7AC, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetNpcVar, 0x00000006, 0x00000004, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024328C_8D12FC -.word 0x00000003, 0x00000053, 0x00000054, 0x00000055 - -dlabel D_8024329C_8D130C -.word 0x00000003, 0x00000050, 0x00000051, 0x00000052 - -dlabel D_802432AC_8D131C -.word 0x00000002, 0x000001B7, 0x0000013A, 0xFFFFFF4B, 0x0000020C, 0x0000013A, 0xFFFFFF2E - -dlabel D_802432C8_8D1338 -.word 0x0000000A, 0x00000002, 0xF8405BC9, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B58A, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0x000001EA, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x0000021C, 0x00000122, 0xFFFFFF4C, 0x0000000E, 0xF8405BC9, 0x00000012, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x000001B4, 0x0000012C, 0xFFFFFF4C, 0x0000000E, 0xF8405BC9, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B58A, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802433B4_8D1424 -.word D_8024328C_8D12FC, D_8024329C_8D130C, 0x00000000, D_802432AC_8D131C, D_802432C8_8D1338 - -dlabel D_802433C8_8D1438 -.word 0x43F40000, 0x43750000, 0xC3440000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802433B4_8D1424, 0x00000047, 0x00000005, D_80242C30_8D0CA0, 0x00001000, 0x00000048, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80242C30_8D0CA0, 0x00100000, D_802433C8_8D1438, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_06/8D32B0.data.s b/ver/us/asm/data/world/area_kmr/kmr_06/8D32B0.data.s deleted file mode 100644 index b39eb17b9e..0000000000 --- a/ver/us/asm/data/world/area_kmr/kmr_06/8D32B0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241DA0_8D32B0 -.word 0xC2DC0000, 0x00000000, 0x42040000, 0x42B40000, 0x44548000, 0x00000000, 0x420C0000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241F30, D_80241DA0_8D32B0, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x0019003E, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000011, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_06/8D3340.data.s b/ver/us/asm/data/world/area_kmr/kmr_06/8D3340.data.s deleted file mode 100644 index fec71ceeee..0000000000 --- a/ver/us/asm/data/world/area_kmr/kmr_06/8D3340.data.s +++ /dev/null @@ -1,42 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241E30_8D3340 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242840, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241E8C_8D339C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242848, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241EE8_8D33F8 -.word 0x00000047, 0x00000005, D_80241E30_8D3340, 0x00080000, 0x00000003, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241E8C_8D339C, 0x00080000, 0x00000006, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000001F, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, D_80242580_8D3A90, 0x00000046, 0x00000001, 0x802425B0, 0x00000044, 0x00000001, 0x80241E00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000004, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000007, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80241EE8_8D33F8, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000046, 0x00000001, 0x802427C8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242040_8D3550 -.word 0x3FC00000, 0x0000001E, 0x0000001E, 0x43020000, 0x00000000, 0x00000001, 0x40200000, 0x000000B4, 0x00000003, 0x43160000, 0x00000000, 0x00000001 - -dlabel D_80242070_8D3580 -.word 0x00000043, 0x00000002, BasicAI_Main, D_80242040_8D3550, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242090_8D35A0 -.word 0x00000000, 0x00170017, 0x00000000, 0x00000000, D_80242070_8D3580, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 - -dlabel kmr_06_FlyingAI_JumpVels -.float 4.5, 3.5, 2.6, 2.0, 1.5, 20.0 - -dlabel D_802420D4_8D35E4 -.word 0x3FCCCCCD, 0x0000003C, 0x0000001E, 0x42A00000, 0x00000000, 0x00000005, 0x400CCCCD, 0x0000003C, 0x0000000F, 0x42C80000, 0x00000000, 0x00000001 - -dlabel D_80242104_8D3614 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0xFFFFFE0C, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x00000015, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000244, 0x00000043, 0x00000002, kmr_06_FlyingAI_Main, D_802420D4_8D35E4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242174_8D3684 -.word 0x00000000, 0x00140015, 0x00000000, 0x00000000, D_80242104_8D3614, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060002 - -dlabel D_802421A0_8D36B0 -.word 0x00000000, D_80242090_8D35A0, 0x43200000, 0x00000000, 0x41F00000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008A, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x000000A0, 0x00000000, 0x0000001E, 0x0000001E, 0x00000014, 0xFFFF8001, 0x00000001, 0x000000A0, 0x00000000, 0x0000001E, 0x0000012C, 0x00000000, 0x00000000, 0x00000001, 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, 0x00270001, 0x00270002, 0x00270003, 0x00270003, 0x00270001, 0x00270001, 0x00270005, 0x00270005, 0x00270003, 0x00270003, 0x00270003, 0x00270003, 0x00270003, 0x00270003, 0x00270003, 0x00270003, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80242390_8D38A0 -.word 0x00000001, D_80242174_8D3684, 0x44034000, 0x42700000, 0x41700000, 0x00000D00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008A, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x0000020D, 0x0000003C, 0x0000000F, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x0000020D, 0x0000003C, 0x0000000F, 0x0000012C, 0x00000000, 0x00000000, 0x00000001, 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, 0x00280001, 0x00280003, 0x00280004, 0x00280004, 0x00280001, 0x00280001, 0x00280006, 0x00280006, 0x00280004, 0x00280004, 0x00280004, 0x00280004, 0x00280004, 0x00280004, 0x00280004, 0x00280004, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80242580_8D3A90 -.word 0x00000001, D_802421A0_8D36B0, 0x000B0003, 0x00000001, D_80242390_8D38A0, 0x00090003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_06/8D3AC0.data.s b/ver/us/asm/data/world/area_kmr/kmr_06/8D3AC0.data.s deleted file mode 100644 index 478d81ab1d..0000000000 --- a/ver/us/asm/data/world/area_kmr/kmr_06/8D3AC0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802425B0_8D3AC0 -.word 0x00000043, 0x00000007, MakeEntity, Entity_HeartBlock, 0x00000320, 0x0000003C, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_RedBlock, 0x000000DC, 0x0000003C, 0x0000000A, 0x00000000, 0x00000112, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405BD0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_06/8D3B30.data.s b/ver/us/asm/data/world/area_kmr/kmr_06/8D3B30.data.s deleted file mode 100644 index 93c5b3d8fc..0000000000 --- a/ver/us/asm/data/world/area_kmr/kmr_06/8D3B30.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242620_8D3B30 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000004F, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0166, 0x000000A0, 0x00000028, 0x0000000A, 0x00000002, 0xF8405BCF, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B58A, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B58A, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7A80, 0x00000005, 0x00000001, 0x00000012, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24AA280, 0x00000043, 0x00000003, func_802419EC_8D2EFC, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, func_802419EC_8D2EFC, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80241C78_8D3188, 0xF24A7CE7, 0x00000043, 0x00000005, func_80241A68_8D2F78, 0x0000016A, 0x00000000, 0x00000028, 0x00000017, 0x00000043, 0x00000001, func_80241CC8_8D31D8, 0x00000043, 0x00000007, MakeItemEntity, 0x0000008A, 0x0000016A, 0x00000000, 0x00000028, 0x00000011, 0xF8405BCF, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000050, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405BCF, 0x00000000, 0x00000043, 0x00000002, func_802417E0_8D2CF0, 0x0000008A, 0x00000043, 0x00000004, func_80241950_8D2E60, 0x0000016A, 0x00000028, 0xFFFFFFEF, 0x00000013, 0x00000000, 0x00000047, 0x00000005, D_80242620_8D3B30, 0x00000100, 0x00000013, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/mac_00/7F0A20.data.s b/ver/us/asm/data/world/area_mac/mac_00/7F0A20.data.s index f24646fb64..57da0d2cb4 100644 --- a/ver/us/asm/data/world/area_mac/mac_00/7F0A20.data.s +++ b/ver/us/asm/data/world/area_mac/mac_00/7F0A20.data.s @@ -11,7 +11,7 @@ dlabel D_80245D68_7F0A78 dlabel D_80245D94_7F0AA4 .word 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 -dlabel mac_00_Quizmo_varStash +dlabel mac_00_varStash .word 0x00000000 dlabel D_80245DC4_7F0AD4 diff --git a/ver/us/asm/data/world/area_mac/mac_01/8091F0.data.s b/ver/us/asm/data/world/area_mac/mac_01/8091F0.data.s index 3753180cf9..e091341a20 100644 --- a/ver/us/asm/data/world/area_mac/mac_01/8091F0.data.s +++ b/ver/us/asm/data/world/area_mac/mac_01/8091F0.data.s @@ -44,7 +44,7 @@ dlabel D_80248BD8_809458 dlabel D_80248C04_809484 .word 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 -dlabel mac_01_Quizmo_varStash +dlabel mac_01_varStash .word 0x00000000 dlabel D_80248C34_8094B4 diff --git a/ver/us/asm/data/world/area_mac/mac_02/828F10.data.s b/ver/us/asm/data/world/area_mac/mac_02/828F10.data.s index 5af76b7eea..bef31bbc52 100644 --- a/ver/us/asm/data/world/area_mac/mac_02/828F10.data.s +++ b/ver/us/asm/data/world/area_mac/mac_02/828F10.data.s @@ -41,7 +41,7 @@ dlabel D_80246114_8293D4 dlabel D_80246124_8293E4 .word 0x00000000, 0x002A001A, D_80246114_8293D4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 -dlabel mac_02_Quizmo_varStash +dlabel mac_02_varStash .word 0x00000000 dlabel D_80246154_829414 @@ -165,7 +165,7 @@ dlabel D_80249550_82C810 .word 0x0000000A, 0x00000002, 0xF9718881, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x0004001D, 0x00000024, 0x00000002, 0xF9718881, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x0004001E, 0x00000024, 0x00000002, 0xF9718881, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80249548_82C808, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000046, 0x00000001, D_802488C4_82BB84, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x0004001F, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040020, 0x00000024, 0x00000002, 0xF8405C9A, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80249684_82C944 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x0000000A, 0x00000002, 0xF8405C98, 0x00000000, 0x00000024, 0x00000002, 0xF8405C98, 0x00000001, 0x00000024, 0x00000002, 0xF9718881, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040000, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF9718881, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040001, 0x00000024, 0x00000002, 0xF9718881, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040002, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80243040_826300, 0xFE363C80, 0x0000000E, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040003, 0x00000004, 0x00000001, 0x00000009, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E0010, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040004, 0x00000004, 0x00000001, 0x00000009, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040005, 0x00000003, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000043, 0x00000001, func_802430D0_826390, 0x00000024, 0x00000002, 0xFE363C80, 0x8024E8A8, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000046, 0x00000001, D_80248A48_82BD08, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040006, 0x00000043, 0x00000002, ShowChoice, 0x001E0009, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040004, 0x00000004, 0x00000001, 0x00000009, 0x00000013, 0x00000000, 0x00000043, 0x00000001, CloseMessage, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000043, 0x00000003, AddItem, 0xFE363C80, 0xFE363C81, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C83, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405C9A, 0x00000000, 0x00000004, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80243040_826300, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000002, 0x00000004, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040007, 0x00000043, 0x00000002, ShowChoice, 0x001E0010, 0x00000043, 0x00000001, CloseMessage, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000003, RemoveItem, 0xFE363C88, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000043, 0x00000001, func_802430D0_826390, 0x00000024, 0x00000002, 0xFE363C80, 0x8024E8A8, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000046, 0x00000001, D_80248A48_82BD08, 0x00000043, 0x00000003, AddItem, 0xFE363C88, 0xFE363C81, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040008, 0x00000043, 0x00000002, ShowChoice, 0x001E0008, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, CloseMessage, 0x00000004, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040004, 0x00000004, 0x00000001, 0x00000009, 0x00000013, 0x00000000, 0x00000043, 0x00000001, CloseMessage, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C80, 0x00000043, 0x00000003, AddItem, 0xFE363C80, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040009, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C83, 0x00000001, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C88, 0x00000043, 0x00000002, mac_02_Quizmo_GetItemName, 0xFE363C80, 0x00000043, 0x00000003, SetMessageMsg, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C89, 0x00000043, 0x00000002, mac_02_Quizmo_GetItemName, 0xFE363C81, 0x00000043, 0x00000003, SetMessageMsg, 0xFE363C81, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x0004000B, 0x00000043, 0x00000002, ShowChoice, 0x001E0010, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x0004000C, 0x00000004, 0x00000001, 0x00000009, 0x00000013, 0x00000000, 0x00000043, 0x00000005, func_80242DBC_82607C, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000003, RemoveItem, 0xFE363C88, 0xFE363C80, 0x00000043, 0x00000003, RemoveItem, 0xFE363C89, 0xFE363C80, 0x00000004, 0x00000001, 0x00000006, 0x00000003, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C88, 0x00000043, 0x00000002, mac_02_Quizmo_GetItemName, 0xFE363C80, 0x00000043, 0x00000003, SetMessageMsg, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x0004000A, 0x00000043, 0x00000002, ShowChoice, 0x001E0010, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x0004000C, 0x00000004, 0x00000001, 0x00000009, 0x00000013, 0x00000000, 0x00000043, 0x00000005, func_80242C44_825F04, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xF8405C9A, 0x00000043, 0x00000003, RemoveItem, 0xFE363C88, 0xFE363C80, 0x00000003, 0x00000001, 0x00000006, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x0004000D, 0x00000046, 0x00000001, D_802490F8_82C3B8, 0x00000014, 0x00000001, 0xFE363C87, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040012, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x0004000F, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040010, 0x00000016, 0x00000001, 0x00000004, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040013, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040011, 0x00000023, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040014, 0x00000043, 0x00000002, func_80242F60_826220, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000046, 0x00000001, D_80246154_829414, 0x00000043, 0x00000003, AddItem, 0xFE363C86, 0xFE363C80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040015, 0x00000003, 0x00000001, 0x00000009, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x0000000A, 0x00000002, 0xF8405C98, 0x00000000, 0x00000024, 0x00000002, 0xF8405C98, 0x00000001, 0x00000024, 0x00000002, 0xF9718881, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040000, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF9718881, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040001, 0x00000024, 0x00000002, 0xF9718881, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040002, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80243040_826300, 0xFE363C80, 0x0000000E, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040003, 0x00000004, 0x00000001, 0x00000009, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E0010, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040004, 0x00000004, 0x00000001, 0x00000009, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040005, 0x00000003, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000043, 0x00000001, func_802430D0_826390, 0x00000024, 0x00000002, 0xFE363C80, 0x8024E8A8, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000046, 0x00000001, D_80248A48_82BD08, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040006, 0x00000043, 0x00000002, ShowChoice, 0x001E0009, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040004, 0x00000004, 0x00000001, 0x00000009, 0x00000013, 0x00000000, 0x00000043, 0x00000001, CloseMessage, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000043, 0x00000003, AddItem, 0xFE363C80, 0xFE363C81, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C83, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405C9A, 0x00000000, 0x00000004, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80243040_826300, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000002, 0x00000004, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040007, 0x00000043, 0x00000002, ShowChoice, 0x001E0010, 0x00000043, 0x00000001, CloseMessage, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000003, RemoveItem, 0xFE363C88, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000043, 0x00000001, func_802430D0_826390, 0x00000024, 0x00000002, 0xFE363C80, 0x8024E8A8, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000046, 0x00000001, D_80248A48_82BD08, 0x00000043, 0x00000003, AddItem, 0xFE363C88, 0xFE363C81, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040008, 0x00000043, 0x00000002, ShowChoice, 0x001E0008, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, CloseMessage, 0x00000004, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040004, 0x00000004, 0x00000001, 0x00000009, 0x00000013, 0x00000000, 0x00000043, 0x00000001, CloseMessage, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C80, 0x00000043, 0x00000003, AddItem, 0xFE363C80, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040009, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C83, 0x00000001, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C88, 0x00000043, 0x00000002, mac_02_GetItemName, 0xFE363C80, 0x00000043, 0x00000003, SetMessageMsg, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C89, 0x00000043, 0x00000002, mac_02_GetItemName, 0xFE363C81, 0x00000043, 0x00000003, SetMessageMsg, 0xFE363C81, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x0004000B, 0x00000043, 0x00000002, ShowChoice, 0x001E0010, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x0004000C, 0x00000004, 0x00000001, 0x00000009, 0x00000013, 0x00000000, 0x00000043, 0x00000005, func_80242DBC_82607C, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000003, RemoveItem, 0xFE363C88, 0xFE363C80, 0x00000043, 0x00000003, RemoveItem, 0xFE363C89, 0xFE363C80, 0x00000004, 0x00000001, 0x00000006, 0x00000003, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C88, 0x00000043, 0x00000002, mac_02_GetItemName, 0xFE363C80, 0x00000043, 0x00000003, SetMessageMsg, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x0004000A, 0x00000043, 0x00000002, ShowChoice, 0x001E0010, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x0004000C, 0x00000004, 0x00000001, 0x00000009, 0x00000013, 0x00000000, 0x00000043, 0x00000005, func_80242C44_825F04, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xF8405C9A, 0x00000043, 0x00000003, RemoveItem, 0xFE363C88, 0xFE363C80, 0x00000003, 0x00000001, 0x00000006, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x0004000D, 0x00000046, 0x00000001, D_802490F8_82C3B8, 0x00000014, 0x00000001, 0xFE363C87, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040012, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x0004000F, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040010, 0x00000016, 0x00000001, 0x00000004, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040013, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040011, 0x00000023, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040014, 0x00000043, 0x00000002, func_80242F60_826220, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000046, 0x00000001, D_80246154_829414, 0x00000043, 0x00000003, AddItem, 0xFE363C86, 0xFE363C80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040015, 0x00000003, 0x00000001, 0x00000009, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024A034_82D2F4 .word 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFF3, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFFD, 0x00000046, 0x00000001, D_8024926C_82C52C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, FindKeyItem, 0x00000029, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000046, 0x00000001, D_80249684_82C944, 0x00000012, 0x00000000, 0x00000046, 0x00000001, D_80249550_82C810, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/mac_03/837CB0.data.s b/ver/us/asm/data/world/area_mac/mac_03/837CB0.data.s index b4d5d7753a..b92f7c8a57 100644 --- a/ver/us/asm/data/world/area_mac/mac_03/837CB0.data.s +++ b/ver/us/asm/data/world/area_mac/mac_03/837CB0.data.s @@ -29,7 +29,7 @@ dlabel D_802465EC_837DEC dlabel D_80246618_837E18 .word 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 -dlabel mac_03_Quizmo_varStash +dlabel mac_03_varStash .word 0x00000000 dlabel D_80246648_837E48 diff --git a/ver/us/asm/data/world/area_mac/mac_04/8469B0.data.s b/ver/us/asm/data/world/area_mac/mac_04/8469B0.data.s index c65c459fd1..b174784d11 100644 --- a/ver/us/asm/data/world/area_mac/mac_04/8469B0.data.s +++ b/ver/us/asm/data/world/area_mac/mac_04/8469B0.data.s @@ -26,7 +26,7 @@ dlabel D_80243F38_846B08 dlabel D_80243FBC_846B8C .word 0x00000000, 0x00140014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 -dlabel mac_04_Quizmo_varStash +dlabel mac_04_varStash .word 0x00000000 dlabel D_80243FEC_846BBC diff --git a/ver/us/asm/data/world/area_mac/mac_05/857070.data.s b/ver/us/asm/data/world/area_mac/mac_05/857070.data.s index 664732fb25..927da37663 100644 --- a/ver/us/asm/data/world/area_mac/mac_05/857070.data.s +++ b/ver/us/asm/data/world/area_mac/mac_05/857070.data.s @@ -20,7 +20,7 @@ dlabel D_80244FB4_857124 dlabel D_8024502C_85719C .word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00170013, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00300020, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 -dlabel mac_05_Quizmo_varStash +dlabel mac_05_varStash .word 0x00000000 dlabel D_802450B4_857224 diff --git a/ver/us/asm/data/world/area_nok/nok_01/9C89E0.data.s b/ver/us/asm/data/world/area_nok/nok_01/9C89E0.data.s index e32b403afa..c46bc73b80 100644 --- a/ver/us/asm/data/world/area_nok/nok_01/9C89E0.data.s +++ b/ver/us/asm/data/world/area_nok/nok_01/9C89E0.data.s @@ -104,7 +104,7 @@ dlabel D_80245A44_9CAE24 dlabel D_80245B9C_9CAF7C .word 0x00000043, 0x00000004, nok_01_ToadHouse_InitScreenOverlay, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_80249810_9CEBF0, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C83, 0x00000043, 0x00000001, nok_01_ToadHouse_DoesPlayerNeedSleep, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C88, 0x00000043, 0x00000002, ShowChoice, 0x001E0006, 0x00000008, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C89, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000001, nok_01_ToadHouse_DisableStatusMenu, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80245A44_9CAE24, 0x00000013, 0x00000000, 0x00000043, 0x00000002, nok_01_ToadHouse_PutPartnerAway, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_802498E8_9CECC8, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x0000003C, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, nok_01_ToadHouse_UpdateScreenOverlay, 0x00000003, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, FullyRestoreSP, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802459CC_9CADAC, 0x00000013, 0x00000000, 0x00000043, 0x00000002, nok_01_ToadHouse_GetPartnerBackOut, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, nok_01_ToadHouse_UpdateScreenOverlay, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000069, 0x00000046, 0x00000001, D_80249B68_9CEF48, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8B, 0x00000043, 0x00000001, nok_01_ToadHouse_ShowStatusMenu, 0x00000002, 0x00000000, 0x00000001, 0x00000000 -dlabel nok_01_Quizmo_varStash +dlabel nok_01_varStash .word 0x00000000 dlabel D_80245F48_9CB328 diff --git a/ver/us/asm/data/world/area_nok/nok_02/9DB6C0.data.s b/ver/us/asm/data/world/area_nok/nok_02/9DB6C0.data.s index b79c70bd25..a1c2c8141c 100644 --- a/ver/us/asm/data/world/area_nok/nok_02/9DB6C0.data.s +++ b/ver/us/asm/data/world/area_nok/nok_02/9DB6C0.data.s @@ -8,7 +8,7 @@ dlabel D_802446A0_9DB6C0 dlabel D_80244EC0_9DBEE0 .word 0x00000043, 0x00000001, nok_02_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, nok_02_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, nok_02_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, nok_02_Pipe_GetCameraYaw, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, nok_02_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, nok_02_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, nok_02_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 -dlabel nok_02_varStash +dlabel dup_nok_02_varStash .word 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80245434_9DC454 diff --git a/ver/us/asm/data/world/area_nok/nok_02/9DDE90.data.s b/ver/us/asm/data/world/area_nok/nok_02/9DDE90.data.s index d6748a2cc8..75af3acd29 100644 --- a/ver/us/asm/data/world/area_nok/nok_02/9DDE90.data.s +++ b/ver/us/asm/data/world/area_nok/nok_02/9DDE90.data.s @@ -38,7 +38,7 @@ dlabel D_80247070_9DE090 dlabel D_8024709C_9DE0BC .word 0x00000000, 0x00170014, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 -dlabel nok_02_Quizmo_varStash +dlabel nok_02_varStash .word 0x00000000 dlabel D_802470CC_9DE0EC diff --git a/ver/us/asm/data/world/area_nok/nok_13/A026C0.data.s b/ver/us/asm/data/world/area_nok/nok_13/A026C0.data.s index 498e67b12b..3fbae4c091 100644 --- a/ver/us/asm/data/world/area_nok/nok_13/A026C0.data.s +++ b/ver/us/asm/data/world/area_nok/nok_13/A026C0.data.s @@ -9,4 +9,4 @@ dlabel D_80242134_A02734 .word 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242160_A02760 -.word 0xFFFFFE94, 0x000000BE, 0xFFFFFF79, 0x00000032, 0x00000064, func_802413CC_A019CC, 0x00000044, 0x00000001, D_802420C0_A026C0, 0x00000043, 0x00000002, func_80240E20_A01420, D_80242160_A02760, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0xFFFFFE94, 0x000000BE, 0xFFFFFF79, 0x00000032, 0x00000064, nok_13_musical_hill_orbit_listener, 0x00000044, 0x00000001, D_802420C0_A026C0, 0x00000043, 0x00000002, nok_13_MonitorPlayerOrbiting, D_80242160_A02760, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sam/sam_01/CF9BC0.data.s b/ver/us/asm/data/world/area_sam/sam_01/CF9BC0.data.s index 4d5a5291dd..09c2017fec 100644 --- a/ver/us/asm/data/world/area_sam/sam_01/CF9BC0.data.s +++ b/ver/us/asm/data/world/area_sam/sam_01/CF9BC0.data.s @@ -95,7 +95,7 @@ dlabel D_802432D8_CFAE48 dlabel D_8024346C_CFAFDC .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, sam_01_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_80240590_CF8100, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240664_CF81D4, 0xFE363C80, 0x0000004E, 0x00000006, D_8024346C_CFAFDC, 0x00000010, 0x00000000, D_8024DD88, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024053C_CF80AC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 -dlabel sam_01_Quizmo_varStash +dlabel sam_01_varStash .word 0x00000000 dlabel D_802435F4_CFB164 diff --git a/ver/us/asm/data/world/area_sam/sam_02/D09AD0.data.s b/ver/us/asm/data/world/area_sam/sam_02/D09AD0.data.s index 03c5fee08f..ed5850e75a 100644 --- a/ver/us/asm/data/world/area_sam/sam_02/D09AD0.data.s +++ b/ver/us/asm/data/world/area_sam/sam_02/D09AD0.data.s @@ -89,7 +89,7 @@ dlabel D_80246B08_D0C238 dlabel D_80246B34_D0C264 .word 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 -dlabel sam_02_Quizmo_varStash +dlabel sam_02_varStash .word 0x00000000 dlabel D_80246B64_D0C294 diff --git a/ver/us/asm/data/world/area_sam/sam_11/D3D900.data.s b/ver/us/asm/data/world/area_sam/sam_11/D3D900.data.s index 2f8f7139f2..3b84ae6184 100644 --- a/ver/us/asm/data/world/area_sam/sam_11/D3D900.data.s +++ b/ver/us/asm/data/world/area_sam/sam_11/D3D900.data.s @@ -116,7 +116,7 @@ dlabel D_80244F20_D3F4F0 dlabel D_80244F4C_D3F51C .word 0x00000000, 0x00230018, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 -dlabel sam_11_Quizmo_varStash +dlabel sam_11_varStash .word 0x00000000 dlabel D_80244F7C_D3F54C diff --git a/ver/us/asm/data/dead/EB1920.data.s b/ver/us/asm/data/world/dead/dead_03/EB1920.data.s similarity index 86% rename from ver/us/asm/data/dead/EB1920.data.s rename to ver/us/asm/data/world/dead/dead_03/EB1920.data.s index 29f01f53fc..85ef77c79f 100644 --- a/ver/us/asm/data/dead/EB1920.data.s +++ b/ver/us/asm/data/world/dead/dead_03/EB1920.data.s @@ -9,7 +9,7 @@ dlabel D_80240B20_EB1980 .word 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000024, 0x00000043, 0x00000002, 0x802E37A0, 0x8000006B, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000025, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000029, 0x00000000, 0x00000008, 0x00000043, 0x00000002, 0x802E376C, 0x00000007, 0x00000012, 0x00000000, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x0000002A, 0x00000000, 0x00000008, 0x00000043, 0x00000002, 0x802E376C, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240BD0_EB1A30 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, EB0E60_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EB0E60_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, dead_03_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, dead_03_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240C6C_EB1ACC .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, D_802442C0_EB5120, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -50,7 +50,7 @@ dlabel D_802416D0_EB2530 dlabel D_802416FC_EB255C .word 0x00000000, 0x001A0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00140014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00160018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 -dlabel EB1170_varStash +dlabel dead_03_varStash .word 0x00000000 dlabel D_80241784_EB25E4 @@ -63,25 +63,25 @@ dlabel D_802417E8_EB2648 .word 0x00000000 dlabel D_802417EC_EB264C -.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EB1170_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 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_802406A8_EB1508, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802406E0_EB1540, 0xFE363C80, 0x0000004E, 0x00000006, D_802417EC_EB264C, 0x00000010, 0x00000000, EB1170_D_802442D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240654_EB14B4, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dead_03_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 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_802406A8_EB1508, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802406E0_EB1540, 0xFE363C80, 0x0000004E, 0x00000006, D_802417EC_EB264C, 0x00000010, 0x00000000, dead_03_D_802442D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240654_EB14B4, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241980_EB27E0 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EB1170_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802E4720, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dead_03_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802E4720, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241A00_EB2860 -.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EB1170_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80241980_EB27E0, 0xFE363C8A, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, 0x802E1D58, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802DC654, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, 0x802DBF70, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, 0x802DC3E0, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802406A8_EB1508, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dead_03_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80241980_EB27E0, 0xFE363C8A, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, 0x802E1D58, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802DC654, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, 0x802DBF70, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, 0x802DC3E0, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802406A8_EB1508, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241D24_EB2B84 -.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_802406E0_EB1540, 0xFE363C80, 0x0000004E, 0x00000006, D_80241A00_EB2860, 0x00000010, 0x00000000, EB1170_D_802442D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240654_EB14B4, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_802406E0_EB1540, 0xFE363C80, 0x0000004E, 0x00000006, D_80241A00_EB2860, 0x00000010, 0x00000000, dead_03_D_802442D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240654_EB14B4, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241D94_EB2BF4 -.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EB1170_LetterDelivery_SaveNpcAnim, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x00000043, 0x00000003, 0x802E4064, 0xFE363C85, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000003, 0x802DF124, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, 0x802DC654, 0xFE363C82, 0xFE363C8D, 0xFE363C80, 0xFE363C8E, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C80, 0xFE363C8F, 0x0000000A, 0x00000043, 0x00000007, 0x802DD864, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0xFE363C82, 0xFE363C87, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000046, 0x00000001, D_80241D24_EB2B84, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C88, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C89, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80241784_EB25E4, 0x00000043, 0x00000002, 0x802E3F18, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EB1170_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, dead_03_LetterDelivery_SaveNpcAnim, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x00000043, 0x00000003, 0x802E4064, 0xFE363C85, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000003, 0x802DF124, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, 0x802DC654, 0xFE363C82, 0xFE363C8D, 0xFE363C80, 0xFE363C8E, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C80, 0xFE363C8F, 0x0000000A, 0x00000043, 0x00000007, 0x802DD864, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0xFE363C82, 0xFE363C87, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000046, 0x00000001, D_80241D24_EB2B84, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C88, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C89, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80241784_EB25E4, 0x00000043, 0x00000002, 0x802E3F18, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, dead_03_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024208C_EB2EEC .word 0x00000054, 0x00000000 dlabel D_80242094_EB2EF4 -.word 0x00000043, 0x0000000B, EB1170_LetterDelivery_Init, 0x00000000, 0x00B60008, 0x00B60001, 0x00000054, 0x00000000, 0x001000E4, 0x001000E5, 0x001000E6, 0x001000E7, D_8024208C_EB2EEC, 0x00000046, 0x00000001, D_80241D94_EB2BF4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x0000000B, dead_03_LetterDelivery_Init, 0x00000000, 0x00B60008, 0x00B60001, 0x00000054, 0x00000000, 0x001000E4, 0x001000E5, 0x001000E6, 0x001000E7, D_8024208C_EB2EEC, 0x00000046, 0x00000001, D_80241D94_EB2BF4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802420E4_EB2F44 .word 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80241784_EB25E4, 0x00000043, 0x00000002, 0x802E4940, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/dead/EB54C0.data.s b/ver/us/asm/data/world/dead/dead_04/EB54C0.data.s similarity index 98% rename from ver/us/asm/data/dead/EB54C0.data.s rename to ver/us/asm/data/world/dead/dead_04/EB54C0.data.s index fc55c40fdc..47a1277e43 100644 --- a/ver/us/asm/data/dead/EB54C0.data.s +++ b/ver/us/asm/data/world/dead/dead_04/EB54C0.data.s @@ -9,7 +9,7 @@ dlabel D_802403E0_EB5510 .word 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000024, 0x00000043, 0x00000002, 0x802E37A0, 0x8000006B, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x0000002A, 0x00000000, 0x00000008, 0x00000043, 0x00000002, 0x802E376C, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 dlabel D_80240450_EB5580 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, EB5130_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EB5130_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, dead_04_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, dead_04_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802404EC_EB561C .word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802D6480, 0xFE363C80, 0x00000003, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000258, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80240450_EB5580, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/dead/EF58E0.data.s b/ver/us/asm/data/world/dead/dead_11/EF58E0.data.s similarity index 98% rename from ver/us/asm/data/dead/EF58E0.data.s rename to ver/us/asm/data/world/dead/dead_11/EF58E0.data.s index 556bcdc9a2..ca2986d553 100644 --- a/ver/us/asm/data/dead/EF58E0.data.s +++ b/ver/us/asm/data/world/dead/dead_11/EF58E0.data.s @@ -24,7 +24,7 @@ dlabel D_8024374C_EF5D5C .word 0x0000000F, 0xC4048000, 0x00000000, 0xC2DC0000, 0x00000011, 0xC4070000, 0x00000000, 0xC2480000, 0x00000010, 0xC4048000, 0x00000000, 0x42A00000, 0x00000014, 0xC3870000, 0x00000000, 0xC2F00000, 0x00000013, 0xC3870000, 0x00000000, 0xC2F00000, 0x00000012, 0xC3870000, 0x00000000, 0x420C0000, 0x00000017, 0xC3020000, 0x00000000, 0xC2480000, 0x00000016, 0xC3020000, 0x00000000, 0xC2480000, 0x00000015, 0xC30C0000, 0x00000000, 0x42960000, 0x0000001B, 0x42F00000, 0x00000000, 0xC2480000, 0x0000001A, 0x42F00000, 0x00000000, 0xC2480000, 0x00000018, 0x43020000, 0x00000000, 0x42700000, 0x00000019, 0x42F00000, 0x00000000, 0x42F00000, 0x0000001F, 0x438C0000, 0x00000000, 0xC2DC0000, 0x0000001E, 0x438C0000, 0x00000000, 0xC2DC0000, 0x0000001D, 0x43870000, 0x00000000, 0xC2480000, 0x0000001C, 0x438C0000, 0x00000000, 0x42480000, 0x00000021, 0x44034000, 0x00000000, 0xC28C0000, 0x00000020, 0x44034000, 0x00000000, 0x42480000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000 dlabel D_8024388C_EF5E9C -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleTimeLeft, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_802452D8_EF78E8, 0x00000046, 0x00000001, D_80245330_EF7940, 0x00000044, 0x00000001, D_80244334_EF6944, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000000F, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000010, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000014, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000017, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000019, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000001B, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000001C, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000001F, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000020, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFD20, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF77, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFDF6, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF8A, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802433A0_EF59B0, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFD28, 0x00000024, 0x00000002, 0xFE363C81, 0x0000004C, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFE10, 0x00000024, 0x00000002, 0xFE363C83, 0x00000089, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802433A0_EF59B0, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFF60, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF8B, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFA4, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFCA, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802433A0_EF59B0, 0x00000024, 0x00000002, 0xFE363C80, 0x0000004C, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF84, 0x00000024, 0x00000002, 0xFE363C82, 0x00000096, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFC9, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802433A0_EF59B0, 0x00000024, 0x00000002, 0xFE363C80, 0x000000C0, 0x00000024, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C82, 0x00000135, 0x00000024, 0x00000002, 0xFE363C83, 0x00000085, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802433A0_EF59B0, 0x00000024, 0x00000002, 0xFE363C80, 0x000001E8, 0x00000024, 0x00000002, 0xFE363C81, 0x0000002E, 0x00000024, 0x00000002, 0xFE363C82, 0x000002DD, 0x00000024, 0x00000002, 0xFE363C83, 0x00000089, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802433A0_EF59B0, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000009, 0x00000002, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802D7384, D_8024374C_EF5D5C, 0x00000057, 0x00000000, 0x00000043, 0x00000003, 0x802D6688, 0x0000001E, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000020, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000021, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000024, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000025, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000028, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002A, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002C, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002D, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000030, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000031, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000034, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000036, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000038, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000039, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000003C, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000003D, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000040, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001F, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000022, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000023, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000026, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000027, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002B, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002E, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002F, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000032, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000033, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000037, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000003A, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000003B, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000003E, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000003F, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x0000008C, 0x0000000D, 0x00000002, 0xFE363C80, 0x00010000, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFF0000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x0000000C, 0x00000002, 0xFE363C81, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00010000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x00000002, 0x00000000, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80243704_EF5D14, 0x00000044, 0x00000001, 0x80285C70, 0x00000046, 0x00000001, D_80243330_EF5940, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, EF2610_DeadUnkFunc1, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleTimeLeft, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_802452D8_EF78E8, 0x00000046, 0x00000001, D_80245330_EF7940, 0x00000044, 0x00000001, D_80244334_EF6944, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000000F, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000010, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000014, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000017, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000019, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000001B, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000001C, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000001F, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000020, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFD20, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF77, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFDF6, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF8A, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802433A0_EF59B0, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFD28, 0x00000024, 0x00000002, 0xFE363C81, 0x0000004C, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFE10, 0x00000024, 0x00000002, 0xFE363C83, 0x00000089, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802433A0_EF59B0, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFF60, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF8B, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFA4, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFCA, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802433A0_EF59B0, 0x00000024, 0x00000002, 0xFE363C80, 0x0000004C, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF84, 0x00000024, 0x00000002, 0xFE363C82, 0x00000096, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFC9, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802433A0_EF59B0, 0x00000024, 0x00000002, 0xFE363C80, 0x000000C0, 0x00000024, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C82, 0x00000135, 0x00000024, 0x00000002, 0xFE363C83, 0x00000085, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802433A0_EF59B0, 0x00000024, 0x00000002, 0xFE363C80, 0x000001E8, 0x00000024, 0x00000002, 0xFE363C81, 0x0000002E, 0x00000024, 0x00000002, 0xFE363C82, 0x000002DD, 0x00000024, 0x00000002, 0xFE363C83, 0x00000089, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802433A0_EF59B0, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000009, 0x00000002, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802D7384, D_8024374C_EF5D5C, 0x00000057, 0x00000000, 0x00000043, 0x00000003, 0x802D6688, 0x0000001E, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000020, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000021, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000024, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000025, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000028, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002A, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002C, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002D, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000030, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000031, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000034, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000036, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000038, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000039, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000003C, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000003D, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000040, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001F, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000022, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000023, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000026, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000027, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002B, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002E, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002F, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000032, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000033, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000037, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000003A, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000003B, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000003E, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000003F, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x0000008C, 0x0000000D, 0x00000002, 0xFE363C80, 0x00010000, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFF0000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x0000000C, 0x00000002, 0xFE363C81, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00010000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x00000002, 0x00000000, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80243704_EF5D14, 0x00000044, 0x00000001, 0x80285C70, 0x00000046, 0x00000001, D_80243330_EF5940, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, dead_11_DeadUnkFunc1, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 dlabel D_80244080_EF6690 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240040_EF2650, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0xFE363C84, 0x00000043, 0x00000002, D_802DF3F0, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000017, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802D6400, 0xFE363C85, 0x00000043, 0x00000006, 0x802E382C, 0x000001DB, 0x00400000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C87, 0x0000005A, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C88, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0xFE363C89, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C87, 0xFE363C88, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000032, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C87, 0x00000000, 0x00000028, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C87, 0xFE363C88, 0x0000000E, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802D6400, 0xFE363C85, 0x00000043, 0x00000006, 0x802E382C, 0x000001DC, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000057, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000001, 0xFE363C89, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000032, 0x0000000F, 0x00000002, 0xFE363C87, 0x0000005A, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFE363C87, 0x0000005A, 0x00000013, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C85, 0xFE363C87, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C86, 0xFE363C87, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -32,14 +32,14 @@ dlabel D_80244080_EF6690 dlabel D_80244334_EF6944 .word 0x00000024, 0x00000002, 0xFE363C84, 0x00000023, 0x00000024, 0x00000002, 0xFE363C85, 0x0000000E, 0x00000024, 0x00000002, 0xFE363C86, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C87, 0xFD050F8A, 0x00000024, 0x00000002, 0xFE363C88, 0xFD050F8B, 0x00000024, 0x00000002, 0xFE363C89, 0x00000026, 0x00000044, 0x00000001, D_80244080_EF6690, 0x00000024, 0x00000002, 0xFE363C84, 0x00000024, 0x00000024, 0x00000002, 0xFE363C85, 0x00000013, 0x00000024, 0x00000002, 0xFE363C86, 0x00000014, 0x00000024, 0x00000002, 0xFE363C87, 0xFD050F8C, 0x00000024, 0x00000002, 0xFE363C88, 0xFD050F8D, 0x00000024, 0x00000002, 0xFE363C89, 0x00000027, 0x00000044, 0x00000001, D_80244080_EF6690, 0x00000024, 0x00000002, 0xFE363C84, 0x00000025, 0x00000024, 0x00000002, 0xFE363C85, 0x00000018, 0x00000024, 0x00000002, 0xFE363C86, 0x00000019, 0x00000024, 0x00000002, 0xFE363C87, 0xFD050F8E, 0x00000024, 0x00000002, 0xFE363C88, 0xFD050F8F, 0x00000024, 0x00000002, 0xFE363C89, 0x00000028, 0x00000044, 0x00000001, D_80244080_EF6690, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 -dlabel EF2680_FlyingAI_JumpVels +dlabel dead_11_FlyingAI_JumpVels .float 4.5, 3.5, 2.6, 2.0, 1.5, 20.0 dlabel D_802444D4_EF6AE4 .word 0x3FC00000, 0x0000003C, 0x0000001E, 0x42700000, 0x42480000, 0x00000003, 0x40600000, 0x0000003C, 0x0000000A, 0x42A00000, 0x428C0000, 0x00000001 dlabel D_80244504_EF6B14 -.word 0x00000043, 0x00000003, 0x8004930C, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0xFFFFFD76, 0x00000043, 0x00000003, 0x8004930C, 0x00000006, 0x0000001E, 0x00000043, 0x00000003, 0x8004930C, 0x00000001, 0x00000190, 0x00000043, 0x00000002, EF2680_LakituAI_Main, D_802444D4_EF6AE4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, 0x8004930C, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0xFFFFFD76, 0x00000043, 0x00000003, 0x8004930C, 0x00000006, 0x0000001E, 0x00000043, 0x00000003, 0x8004930C, 0x00000001, 0x00000190, 0x00000043, 0x00000002, dead_11_LakituAI_Main, D_802444D4_EF6AE4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244574_EF6B84 .word 0x00000000, 0x001C0018, 0x00000000, 0x00000000, D_80244504_EF6B14, 0x8007D3C0, 0x00000000, 0x8007D4EC, 0x00000000, 0x00000000, 0x00140000 @@ -48,7 +48,7 @@ dlabel D_802445A0_EF6BB0 .word 0x3FC00000, 0x0000001E, 0x00000032, 0x42700000, 0x41F00000, 0x00000003, 0x40C00000, 0x00000000, 0x00000000, 0x42C80000, 0x41F00000, 0x00000003 dlabel D_802445D0_EF6BE0 -.word 0x00000043, 0x00000003, 0x8004930C, 0x00000002, 0x00000003, 0x00000043, 0x00000003, 0x8004930C, 0x00000003, 0x00000012, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0x00000003, 0x00000043, 0x00000003, 0x8004930C, 0x00000007, 0x00000004, 0x00000043, 0x00000002, EF2680_SpinyAI_Main, D_802445A0_EF6BB0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, 0x8004930C, 0x00000002, 0x00000003, 0x00000043, 0x00000003, 0x8004930C, 0x00000003, 0x00000012, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0x00000003, 0x00000043, 0x00000003, 0x8004930C, 0x00000007, 0x00000004, 0x00000043, 0x00000002, dead_11_SpinyAI_Main, D_802445A0_EF6BB0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244640_EF6C50 .word 0x00000043, 0x00000005, 0x802DB310, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, 0x8004861C, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x8004930C, 0x0000000A, 0x00000064, 0x00000043, 0x00000001, 0x800486CC, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, 0x800499B0, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, 0x80049738, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, 0x800483E0, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/dead/EBA260.data.s b/ver/us/asm/data/world/dead/flo_00/EBA260.data.s similarity index 89% rename from ver/us/asm/data/dead/EBA260.data.s rename to ver/us/asm/data/world/dead/flo_00/EBA260.data.s index 2395f30de8..daaf7da6eb 100644 --- a/ver/us/asm/data/dead/EBA260.data.s +++ b/ver/us/asm/data/world/dead/flo_00/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, EB8E90_PatrolNoAttackAI_Main, D_8024289C_EBB6EC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, dead_flo_00_PatrolNoAttackAI_Main, 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 @@ -111,7 +111,7 @@ dlabel D_802441B8_EBD008 .word 0x00000005, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802442AC_EBD0FC -.word 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000002, 0x802DCACC, 0x00000002, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFCE, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C84, 0x0000001A, 0x00000043, 0x00000005, 0x802DB210, 0x00000006, 0xFE363C83, 0xFE363C84, 0xFE363C82, 0x00000043, 0x00000003, 0x802DF124, 0x00000006, 0x00000000, 0x00000043, 0x00000004, 0x802DC3E0, 0xFFFFFFFC, 0x00000006, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFE7, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0xF251E680, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0x00000012, 0xFFFFFFF8, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, 0x802DFB28, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000006, 0x802DD810, 0x00000006, 0x00170003, 0x00170001, 0x00000200, 0x001100D8, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0x00000012, 0xFFFFFFF7, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, 0x802E1C00, 0x00000000, 0x00000168, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, 0x802DB310, 0x00000006, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, 0x80048DA0, 0x00000006, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0x00000006, 0x00170004, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, 0x802DE6A4, 0x0001001F, 0x00000043, 0x00000003, 0x802E0324, 0x00000139, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000027, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C83, 0x0000001E, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000011, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000011, 0x00000001, 0xFE363C80, 0xFE363C83, 0xFE363C82, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, 0x802E0324, 0x00000188, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000052, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000003, 0x802DB654, 0x00000006, 0x00170001, 0x00000043, 0x00000003, 0x80048DA0, 0x00000006, 0x00000001, 0x00000043, 0x00000001, EB8E90_PostChapter6StatUpdate, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D0196, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, 0x802DC654, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0xF24E6280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, 0x802DD810, 0x00000006, 0x00170003, 0x00170001, 0x00000200, 0x001100D9, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFE7, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, 0x802DD810, 0x00000006, 0x00170003, 0x00170001, 0x00000200, 0x001100DA, 0x00000043, 0x00000004, 0x802DC5C0, 0x00000006, 0x00040000, 0x00000001, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000019, 0x00000043, 0x00000005, 0x802DC654, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000011, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000708, 0x00000043, 0x00000005, 0x802E1C00, 0xFE363C82, 0xFE363C83, 0x00000064, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, 0x802DB310, 0x00000006, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0x00000006, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C85, 0x000000B4, 0x00000043, 0x00000005, 0x802E1C00, 0xFE363C83, 0xFE363C85, 0x00000064, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, 0x802DB210, 0x00000006, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x00000006, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, 0x802DD70C, 0x00000006, 0x00002045, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, 0x802DE6A4, 0x0001002A, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000003B, 0x00000046, 0x00000001, D_80243398_EBC1E8, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000002, 0x802DCACC, 0x00000002, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFCE, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C84, 0x0000001A, 0x00000043, 0x00000005, 0x802DB210, 0x00000006, 0xFE363C83, 0xFE363C84, 0xFE363C82, 0x00000043, 0x00000003, 0x802DF124, 0x00000006, 0x00000000, 0x00000043, 0x00000004, 0x802DC3E0, 0xFFFFFFFC, 0x00000006, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFE7, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0xF251E680, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0x00000012, 0xFFFFFFF8, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, 0x802DFB28, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000006, 0x802DD810, 0x00000006, 0x00170003, 0x00170001, 0x00000200, 0x001100D8, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0x00000012, 0xFFFFFFF7, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, 0x802E1C00, 0x00000000, 0x00000168, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, 0x802DB310, 0x00000006, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, 0x80048DA0, 0x00000006, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0x00000006, 0x00170004, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, 0x802DE6A4, 0x0001001F, 0x00000043, 0x00000003, 0x802E0324, 0x00000139, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000027, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C83, 0x0000001E, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000011, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000011, 0x00000001, 0xFE363C80, 0xFE363C83, 0xFE363C82, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, 0x802E0324, 0x00000188, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000052, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000003, 0x802DB654, 0x00000006, 0x00170001, 0x00000043, 0x00000003, 0x80048DA0, 0x00000006, 0x00000001, 0x00000043, 0x00000001, dead_flo_00_PostChapter6StatUpdate, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D0196, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, 0x802DC654, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0xF24E6280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, 0x802DD810, 0x00000006, 0x00170003, 0x00170001, 0x00000200, 0x001100D9, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFE7, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, 0x802DD810, 0x00000006, 0x00170003, 0x00170001, 0x00000200, 0x001100DA, 0x00000043, 0x00000004, 0x802DC5C0, 0x00000006, 0x00040000, 0x00000001, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000019, 0x00000043, 0x00000005, 0x802DC654, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000011, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000708, 0x00000043, 0x00000005, 0x802E1C00, 0xFE363C82, 0xFE363C83, 0x00000064, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, 0x802DB310, 0x00000006, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0x00000006, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C85, 0x000000B4, 0x00000043, 0x00000005, 0x802E1C00, 0xFE363C83, 0xFE363C85, 0x00000064, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, 0x802DB210, 0x00000006, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x00000006, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, 0x802DD70C, 0x00000006, 0x00002045, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, 0x802DE6A4, 0x0001002A, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000003B, 0x00000046, 0x00000001, D_80243398_EBC1E8, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244C24_EBDA74 .word 0x00000043, 0x00000002, 0x802D796C, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000003, 0x80048C5C, 0xFFFFFFFF, D_802441B8_EBD008, 0x00000044, 0x00000001, D_802442AC_EBD0FC, 0x00000012, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -180,22 +180,22 @@ dlabel D_802477A0_EC05F0 .word 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C81, 0xF24A6E80, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000051, 0xF24A7976, 0xFE363C80, 0xF24A8069, 0x00000043, 0x00000006, 0x802D60E4, 0x00000051, 0xFE363C81, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802D7634, 0x0000002E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024781C_EC066C -.word 0x0000000A, 0x00000002, 0xF97188AC, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000001, 0x802E01B8, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000024, 0x00000002, 0xF97188AC, 0x00000001, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000002F, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000030, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C89, 0xF2498E80, 0x00000024, 0x00000002, 0xFE363C8A, 0xF24AD280, 0x00000024, 0x00000002, 0xFE363C8B, 0xF24C6E80, 0x00000024, 0x00000002, 0xFE363C8C, 0xF2499E80, 0x00000024, 0x00000002, 0xFE363C8D, 0xF24ADA80, 0x00000024, 0x00000002, 0xFE363C8E, 0xF24CBE80, 0x00000043, 0x00000004, 0x802DE754, 0xFE363C89, 0xFE363C8B, 0x00000008, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, 0x802DBC24, 0xFFFFFFFC, 0xFE363C8C, 0xFE363C8D, 0xFE363C8E, 0x00000005, 0x00000043, 0x00000002, 0x802E37A0, 0x0000019C, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x0000007B, 0x00000001, 0x00000008, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010004, 0x00000043, 0x00000003, func_80240F40_EB9D90, 0xFE363C83, 0xFE363C84, 0x00000014, 0x00000001, 0xFE363C84, 0x00000018, 0x00000001, 0x0000005A, 0x00000024, 0x00000002, 0xF9718890, 0x00000000, 0x00000043, 0x00000003, 0x802DEF5C, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0x0000005A, 0x00000000, 0x0000001B, 0x00000001, 0x0000010E, 0x00000024, 0x00000002, 0xF9718890, 0x00000001, 0x00000043, 0x00000003, 0x802DEF5C, 0x0000010E, 0x00000000, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0x0000010E, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000051, 0xF24A7976, 0xF24A8280, 0xF24A8069, 0x00000043, 0x00000002, 0x802D7634, 0x0000002E, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000043, 0x00000008, EB9D90_CosInterpMinMax, 0xFE363C8F, 0xFE363C80, 0x00000000, 0x000002BC, 0x00000320, 0x00000000, 0x00000000, 0x00000044, 0x00000001, D_802477A0_EC05F0, 0x00000026, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C82, 0xF24A6E80, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000001, func_80240FB0_EB9E00, 0x00000043, 0x00000001, func_802410E4_EB9F34, 0x0000000A, 0x00000002, 0xFE363C8F, 0x0000015E, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xFD050F8A, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802D78AC, 0x802493A8, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF97188AC, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000001, 0x802E01B8, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000024, 0x00000002, 0xF97188AC, 0x00000001, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000002F, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000030, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C89, 0xF2498E80, 0x00000024, 0x00000002, 0xFE363C8A, 0xF24AD280, 0x00000024, 0x00000002, 0xFE363C8B, 0xF24C6E80, 0x00000024, 0x00000002, 0xFE363C8C, 0xF2499E80, 0x00000024, 0x00000002, 0xFE363C8D, 0xF24ADA80, 0x00000024, 0x00000002, 0xFE363C8E, 0xF24CBE80, 0x00000043, 0x00000004, 0x802DE754, 0xFE363C89, 0xFE363C8B, 0x00000008, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, 0x802DBC24, 0xFFFFFFFC, 0xFE363C8C, 0xFE363C8D, 0xFE363C8E, 0x00000005, 0x00000043, 0x00000002, 0x802E37A0, 0x0000019C, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x0000007B, 0x00000001, 0x00000008, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010004, 0x00000043, 0x00000003, func_80240F40_EB9D90, 0xFE363C83, 0xFE363C84, 0x00000014, 0x00000001, 0xFE363C84, 0x00000018, 0x00000001, 0x0000005A, 0x00000024, 0x00000002, 0xF9718890, 0x00000000, 0x00000043, 0x00000003, 0x802DEF5C, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0x0000005A, 0x00000000, 0x0000001B, 0x00000001, 0x0000010E, 0x00000024, 0x00000002, 0xF9718890, 0x00000001, 0x00000043, 0x00000003, 0x802DEF5C, 0x0000010E, 0x00000000, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0x0000010E, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000051, 0xF24A7976, 0xF24A8280, 0xF24A8069, 0x00000043, 0x00000002, 0x802D7634, 0x0000002E, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000043, 0x00000008, dead_flo_00_CosInterpMinMax, 0xFE363C8F, 0xFE363C80, 0x00000000, 0x000002BC, 0x00000320, 0x00000000, 0x00000000, 0x00000044, 0x00000001, D_802477A0_EC05F0, 0x00000026, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C82, 0xF24A6E80, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000001, func_80240FB0_EB9E00, 0x00000043, 0x00000001, func_802410E4_EB9F34, 0x0000000A, 0x00000002, 0xFE363C8F, 0x0000015E, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xFD050F8A, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802D78AC, 0x802493A8, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80247BFC_EC0A4C -.word 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DE6F8, 0x0000000A, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000002F, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000030, 0x7FFFFE00, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0xF2498E80, 0x00000024, 0x00000002, 0xFE363C8A, 0xF24AD280, 0x00000024, 0x00000002, 0xFE363C8B, 0xF24C6E80, 0x00000024, 0x00000002, 0xFE363C8C, 0xF2499E80, 0x00000024, 0x00000002, 0xFE363C8D, 0xF24AD680, 0x00000024, 0x00000002, 0xFE363C8E, 0xF24CBE80, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010004, 0x00000014, 0x00000001, 0xF9718890, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802DEF5C, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0x0000005A, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, 0x802DEF5C, 0x0000010E, 0x00000000, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0x0000010E, 0x00000000, 0x00000023, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000051, 0xF24A7976, 0xF24A8280, 0xF24A8069, 0x00000043, 0x00000002, 0x802D7634, 0x0000002E, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000005, 0x00000001, 0x00000078, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000043, 0x00000008, EB9D90_CosInterpMinMax, 0xFE363C8F, 0xFE363C80, 0x00000046, 0x00000000, 0x00000078, 0x00000000, 0x00000000, 0x00000044, 0x00000001, D_802477A0_EC05F0, 0x00000026, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C82, 0xF24A6E80, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000001, func_80240FB0_EB9E00, 0x00000043, 0x00000001, func_802410E4_EB9F34, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000002, 0x802DC8D0, 0xFFFFFFFC, 0x00000043, 0x00000002, 0x802DE674, 0x00000001, 0x00000043, 0x00000005, 0x802DEF08, 0x0000000A, 0x00000000, 0x0000006E, 0x00000014, 0x00000043, 0x00000002, 0x802DE6F8, 0x0000000A, 0x00000043, 0x00000003, 0x802DEF5C, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, AddCoin, 0x00000001, 0x0000002F, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000001, 0x00000030, 0x7FFFFE00, 0x00000024, 0x00000002, 0xF97188AC, 0x00000000, 0x00000043, 0x00000002, 0x802E3908, 0x0000019D, 0x00000046, 0x00000001, D_80241500_EBA350, 0x00000043, 0x00000003, 0x802D9DE4, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DE6F8, 0x0000000A, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000002F, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000030, 0x7FFFFE00, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0xF2498E80, 0x00000024, 0x00000002, 0xFE363C8A, 0xF24AD280, 0x00000024, 0x00000002, 0xFE363C8B, 0xF24C6E80, 0x00000024, 0x00000002, 0xFE363C8C, 0xF2499E80, 0x00000024, 0x00000002, 0xFE363C8D, 0xF24AD680, 0x00000024, 0x00000002, 0xFE363C8E, 0xF24CBE80, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010004, 0x00000014, 0x00000001, 0xF9718890, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802DEF5C, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0x0000005A, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, 0x802DEF5C, 0x0000010E, 0x00000000, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0x0000010E, 0x00000000, 0x00000023, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000051, 0xF24A7976, 0xF24A8280, 0xF24A8069, 0x00000043, 0x00000002, 0x802D7634, 0x0000002E, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000005, 0x00000001, 0x00000078, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000043, 0x00000008, dead_flo_00_CosInterpMinMax, 0xFE363C8F, 0xFE363C80, 0x00000046, 0x00000000, 0x00000078, 0x00000000, 0x00000000, 0x00000044, 0x00000001, D_802477A0_EC05F0, 0x00000026, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C82, 0xF24A6E80, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000001, func_80240FB0_EB9E00, 0x00000043, 0x00000001, func_802410E4_EB9F34, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000002, 0x802DC8D0, 0xFFFFFFFC, 0x00000043, 0x00000002, 0x802DE674, 0x00000001, 0x00000043, 0x00000005, 0x802DEF08, 0x0000000A, 0x00000000, 0x0000006E, 0x00000014, 0x00000043, 0x00000002, 0x802DE6F8, 0x0000000A, 0x00000043, 0x00000003, 0x802DEF5C, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, AddCoin, 0x00000001, 0x0000002F, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000001, 0x00000030, 0x7FFFFE00, 0x00000024, 0x00000002, 0xF97188AC, 0x00000000, 0x00000043, 0x00000002, 0x802E3908, 0x0000019D, 0x00000046, 0x00000001, D_80241500_EBA350, 0x00000043, 0x00000003, 0x802D9DE4, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80247FDC_EC0E2C -.word 0x00000043, 0x00000004, 0x802D7AC0, 0x0000002F, 0x0000019B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000005, 0x00000001, 0x00000064, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000043, 0x00000008, EB9D90_CosInterpMinMax, 0xFE363C8F, 0xFE363C80, 0x00000000, 0xF24A7E80, 0x00000064, 0x00000000, 0x00000000, 0x00000044, 0x00000001, D_802475B8_EC0408, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000005, 0x00000001, 0x000004B0, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000043, 0x00000008, EB9D90_CosInterpMinMax, 0xFE363C8F, 0xFE363C80, 0xFFFFFD44, 0x00000000, 0x000004B0, 0x00000000, 0x00000000, 0x00000026, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C82, 0xF24A7E80, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000044, 0x00000001, D_80246880_EBF6D0, 0x00000026, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C82, 0xF24A7E80, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000044, 0x00000001, D_802474B8_EC0308, 0x00000014, 0x00000001, 0xFE363C8F, 0x00000016, 0x00000001, 0x000000C8, 0x00000043, 0x00000002, 0x802DE6A4, 0x0001002A, 0x00000016, 0x00000001, 0x000000FA, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFC4, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000041, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24AAC80, 0xF24A5E80, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x00000320, 0x00000043, 0x00000004, 0x802D914C, 0x00000000, 0xFFFFFF38, 0x00000000, 0x00000043, 0x00000004, 0x802D91E8, 0x00000000, 0x00000000, 0xFFFFFED4, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x0000001C, 0x00000000, 0x00000023, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C8F, 0x00000226, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xFD050F8A, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000007, 0x802E3444, 0x00000000, 0x00000032, 0x00000000, 0x00000BB8, 0x00000000, 0x0000007F, 0x00000043, 0x00000003, 0x802E3330, 0x00000001, 0x00000BB8, 0x00000043, 0x00000003, 0x802D78AC, 0x802493A8, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000004, 0x802D7AC0, 0x0000002F, 0x0000019B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000005, 0x00000001, 0x00000064, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000043, 0x00000008, dead_flo_00_CosInterpMinMax, 0xFE363C8F, 0xFE363C80, 0x00000000, 0xF24A7E80, 0x00000064, 0x00000000, 0x00000000, 0x00000044, 0x00000001, D_802475B8_EC0408, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000005, 0x00000001, 0x000004B0, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000043, 0x00000008, dead_flo_00_CosInterpMinMax, 0xFE363C8F, 0xFE363C80, 0xFFFFFD44, 0x00000000, 0x000004B0, 0x00000000, 0x00000000, 0x00000026, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C82, 0xF24A7E80, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000044, 0x00000001, D_80246880_EBF6D0, 0x00000026, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C82, 0xF24A7E80, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000044, 0x00000001, D_802474B8_EC0308, 0x00000014, 0x00000001, 0xFE363C8F, 0x00000016, 0x00000001, 0x000000C8, 0x00000043, 0x00000002, 0x802DE6A4, 0x0001002A, 0x00000016, 0x00000001, 0x000000FA, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFC4, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000041, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24AAC80, 0xF24A5E80, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x00000320, 0x00000043, 0x00000004, 0x802D914C, 0x00000000, 0xFFFFFF38, 0x00000000, 0x00000043, 0x00000004, 0x802D91E8, 0x00000000, 0x00000000, 0xFFFFFED4, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x0000001C, 0x00000000, 0x00000023, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C8F, 0x00000226, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xFD050F8A, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000007, 0x802E3444, 0x00000000, 0x00000032, 0x00000000, 0x00000BB8, 0x00000000, 0x0000007F, 0x00000043, 0x00000003, 0x802E3330, 0x00000001, 0x00000BB8, 0x00000043, 0x00000003, 0x802D78AC, 0x802493A8, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024837C_EC11CC -.word 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000003, 0x802DEF5C, 0x000000C8, 0x00000000, 0x00000043, 0x00000004, 0x802DE510, 0xFFFFFFC4, 0x00000000, 0x0000001E, 0x00000043, 0x00000003, 0x802DC228, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFC, 0xFFFFFFEC, 0x00000000, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFC4, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000041, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24AAC80, 0xF24A5E80, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x00000320, 0x00000043, 0x00000004, 0x802D914C, 0x00000000, 0xFFFFFF38, 0x00000000, 0x00000043, 0x00000004, 0x802D91E8, 0x00000000, 0x00000000, 0xFFFFFED4, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000014, 0x00000043, 0x00000008, EB9D90_CosInterpMinMax, 0xFE363C8F, 0xFE363C80, 0xF24A7A80, 0xF24A7E80, 0x00000064, 0x00000000, 0x00000000, 0x00000044, 0x00000001, D_80247724_EC0574, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000001, 0x0000002E, 0x7FFFFE00, 0x00000043, 0x00000005, 0x802DDEEC, 0x0011000A, 0x00000000, 0x00000032, 0xFFFFFF38, 0x00000043, 0x00000003, 0x802D9DE4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000003, 0x802DEF5C, 0x000000C8, 0x00000000, 0x00000043, 0x00000004, 0x802DE510, 0xFFFFFFC4, 0x00000000, 0x0000001E, 0x00000043, 0x00000003, 0x802DC228, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFC, 0xFFFFFFEC, 0x00000000, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFC4, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000041, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24AAC80, 0xF24A5E80, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x00000320, 0x00000043, 0x00000004, 0x802D914C, 0x00000000, 0xFFFFFF38, 0x00000000, 0x00000043, 0x00000004, 0x802D91E8, 0x00000000, 0x00000000, 0xFFFFFED4, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000014, 0x00000043, 0x00000008, dead_flo_00_CosInterpMinMax, 0xFE363C8F, 0xFE363C80, 0xF24A7A80, 0xF24A7E80, 0x00000064, 0x00000000, 0x00000000, 0x00000044, 0x00000001, D_80247724_EC0574, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000001, 0x0000002E, 0x7FFFFE00, 0x00000043, 0x00000005, 0x802DDEEC, 0x0011000A, 0x00000000, 0x00000032, 0xFFFFFF38, 0x00000043, 0x00000003, 0x802D9DE4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802485C8_EC1418 .word 0x00000059, 0x00000058, 0x0000005A, 0x00000000 dlabel D_802485D8_EC1428 -.word 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000004, 0x802DFED0, 0xFFFFFFAB, 0x00000055, 0x00000000, 0x00000043, 0x00000002, 0x802DCACC, 0x00000002, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x0000000A, 0x00000002, 0xF84060DB, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802E2E80, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C82, 0x0000001A, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000043, 0x00000002, 0x802E2E80, 0x00000000, 0x00000043, 0x00000004, 0x802E20AC, 0xFFFFFFAB, 0x00000055, 0x0000001C, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x00000059, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060006, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000007, 0x802E4310, 0x00000059, 0xFFFFFFAD, 0x00000000, 0x00000057, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010000, 0x00000008, 0x00000001, 0x00000014, 0x0000001C, 0x00000000, 0x00000014, 0x00000001, 0xF9718891, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DDEEC, 0x00110008, 0x00000000, 0x0000000A, 0xFFFFFF38, 0x00000024, 0x00000002, 0xF9718891, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, 0x802DDEEC, 0x00110009, 0x00000000, 0x0000000A, 0xFFFFFF38, 0x00000023, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000002, 0x802DE404, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000059, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF84060DB, 0x00000001, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF84060DC, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802E2E80, 0x00000001, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C82, 0x0000001A, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000043, 0x00000002, 0x802E2E80, 0x00000000, 0x00000043, 0x00000004, 0x802E20AC, 0xFFFFFFAB, 0x00000055, 0x0000001C, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x00000058, 0x00000043, 0x00000002, 0x802E461C, 0xFD050F8B, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060006, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000007, 0x802E4310, 0x00000058, 0xFFFFFFAD, 0x00000000, 0x00000057, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010000, 0x00000008, 0x00000001, 0x00000014, 0x0000001C, 0x00000000, 0x00000014, 0x00000001, 0xF9718891, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DDEEC, 0x00110008, 0x00000000, 0x0000000A, 0xFFFFFF38, 0x00000024, 0x00000002, 0xF9718891, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, 0x802DDEEC, 0x00110009, 0x00000000, 0x0000000A, 0xFFFFFF38, 0x00000023, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000002, 0x802DE404, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000058, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF84060DC, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802E2E80, 0x00000001, 0x00000003, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C82, 0x0000001A, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000043, 0x00000002, 0x802E2E80, 0x00000000, 0x00000043, 0x00000004, 0x802E20AC, 0xFFFFFFAB, 0x00000055, 0x0000001C, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x0000005A, 0x00000043, 0x00000002, 0x802E461C, 0xFD050F8B, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060006, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000001, EB9D90_SyncStatusMenu, 0x00000043, 0x00000007, 0x802E4310, 0x0000005A, 0xFFFFFFAD, 0x00000000, 0x00000057, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802E461C, 0xFD050F8B, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000002F, 0x7FFFFE00, 0x00000043, 0x00000004, 0x802DE754, 0xFFFFFFC4, 0x0000001E, 0x00000014, 0x00000043, 0x00000004, AddCoin, 0x00000001, 0x0000002F, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000001, 0x00000030, 0x7FFFFE00, 0x00000043, 0x00000003, 0x802DEF5C, 0x000000C8, 0x00000000, 0x00000043, 0x00000002, 0x802DCACC, 0x00000002, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000007, 0x802E3444, 0x00000001, 0x0000007B, 0x00000000, 0x00000BB8, 0x00000000, 0x0000007F, 0x00000043, 0x00000003, 0x802E3330, 0x00000000, 0x00000BB8, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFFFFFFAB, 0x00000000, 0x0000004B, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFFFFFFAB, 0x00000000, 0x0000004B, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24ABE80, 0xF24A6280, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x000000FA, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000046, 0x00000001, D_80247FDC_EC0E2C, 0x00000023, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x0000005A, 0x00000004, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000004, 0x802DFED0, 0xFFFFFFAB, 0x00000055, 0x00000000, 0x00000043, 0x00000002, 0x802DCACC, 0x00000002, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x0000000A, 0x00000002, 0xF84060DB, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802E2E80, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C82, 0x0000001A, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000043, 0x00000002, 0x802E2E80, 0x00000000, 0x00000043, 0x00000004, 0x802E20AC, 0xFFFFFFAB, 0x00000055, 0x0000001C, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x00000059, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060006, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000007, 0x802E4310, 0x00000059, 0xFFFFFFAD, 0x00000000, 0x00000057, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010000, 0x00000008, 0x00000001, 0x00000014, 0x0000001C, 0x00000000, 0x00000014, 0x00000001, 0xF9718891, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DDEEC, 0x00110008, 0x00000000, 0x0000000A, 0xFFFFFF38, 0x00000024, 0x00000002, 0xF9718891, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, 0x802DDEEC, 0x00110009, 0x00000000, 0x0000000A, 0xFFFFFF38, 0x00000023, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000002, 0x802DE404, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000059, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF84060DB, 0x00000001, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF84060DC, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802E2E80, 0x00000001, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C82, 0x0000001A, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000043, 0x00000002, 0x802E2E80, 0x00000000, 0x00000043, 0x00000004, 0x802E20AC, 0xFFFFFFAB, 0x00000055, 0x0000001C, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x00000058, 0x00000043, 0x00000002, 0x802E461C, 0xFD050F8B, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060006, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000007, 0x802E4310, 0x00000058, 0xFFFFFFAD, 0x00000000, 0x00000057, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010000, 0x00000008, 0x00000001, 0x00000014, 0x0000001C, 0x00000000, 0x00000014, 0x00000001, 0xF9718891, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DDEEC, 0x00110008, 0x00000000, 0x0000000A, 0xFFFFFF38, 0x00000024, 0x00000002, 0xF9718891, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, 0x802DDEEC, 0x00110009, 0x00000000, 0x0000000A, 0xFFFFFF38, 0x00000023, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000002, 0x802DE404, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000058, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF84060DC, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802E2E80, 0x00000001, 0x00000003, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C82, 0x0000001A, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000043, 0x00000002, 0x802E2E80, 0x00000000, 0x00000043, 0x00000004, 0x802E20AC, 0xFFFFFFAB, 0x00000055, 0x0000001C, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x0000005A, 0x00000043, 0x00000002, 0x802E461C, 0xFD050F8B, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060006, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000001, dead_flo_00_SyncStatusMenu, 0x00000043, 0x00000007, 0x802E4310, 0x0000005A, 0xFFFFFFAD, 0x00000000, 0x00000057, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802E461C, 0xFD050F8B, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000002F, 0x7FFFFE00, 0x00000043, 0x00000004, 0x802DE754, 0xFFFFFFC4, 0x0000001E, 0x00000014, 0x00000043, 0x00000004, AddCoin, 0x00000001, 0x0000002F, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000001, 0x00000030, 0x7FFFFE00, 0x00000043, 0x00000003, 0x802DEF5C, 0x000000C8, 0x00000000, 0x00000043, 0x00000002, 0x802DCACC, 0x00000002, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000007, 0x802E3444, 0x00000001, 0x0000007B, 0x00000000, 0x00000BB8, 0x00000000, 0x0000007F, 0x00000043, 0x00000003, 0x802E3330, 0x00000000, 0x00000BB8, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFFFFFFAB, 0x00000000, 0x0000004B, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFFFFFFAB, 0x00000000, 0x0000004B, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24ABE80, 0xF24A6280, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x000000FA, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000046, 0x00000001, D_80247FDC_EC0E2C, 0x00000023, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x0000005A, 0x00000004, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80248D6C_EC1BBC .word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802E1FB4, 0xFFFFFFAB, 0x00000055, 0x00000014, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, 0x802DFABC, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802E0158, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802413CC_EBA21C, 0x00000046, 0x00000001, D_802485D8_EC1428, 0x00000043, 0x00000001, func_802413EC_EBA23C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/dead/EC2850.data.s b/ver/us/asm/data/world/dead/flo_03/EC2850.data.s similarity index 89% rename from ver/us/asm/data/dead/EC2850.data.s rename to ver/us/asm/data/world/dead/flo_03/EC2850.data.s index 99273912d4..dcd3c37a58 100644 --- a/ver/us/asm/data/dead/EC2850.data.s +++ b/ver/us/asm/data/world/dead/flo_03/EC2850.data.s @@ -27,7 +27,7 @@ dlabel D_80240C04_EC2E04 .word 0x00000047, 0x00000005, D_80240B4C_EC2D4C, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240BA8_EC2DA8, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240C4C_EC2E4C -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleTimeLeft, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF971889B, 0x00000000, 0x00000024, 0x00000002, 0xF971889C, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000000, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_80244464_EC6664, 0x00000046, 0x00000001, D_80244F20_EC7120, 0x00000046, 0x00000001, D_80241F14_EC4114, 0x00000044, 0x00000001, D_80244E94_EC7094, 0x00000044, 0x00000001, D_80244F10_EC7110, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000009, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFF6F, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFEB1, 0x00000024, 0x00000002, 0xFE363C82, 0x000000B6, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF4C, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802408A0_EC2AA0, 0x00000024, 0x00000002, 0xFE363C80, 0x000000C8, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF56, 0x00000024, 0x00000002, 0xFE363C82, 0x00000136, 0x00000024, 0x00000002, 0xFE363C83, 0x00000096, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802408A0_EC2AA0, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000044, 0x00000001, D_8024101C_EC321C, 0x00000012, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80240C04_EC2E04, 0x00000044, 0x00000001, 0x80285C70, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802406C0_EC28C0, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, EC2200_DeadUnkFunc1, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleTimeLeft, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF971889B, 0x00000000, 0x00000024, 0x00000002, 0xF971889C, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000000, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_80244464_EC6664, 0x00000046, 0x00000001, D_80244F20_EC7120, 0x00000046, 0x00000001, D_80241F14_EC4114, 0x00000044, 0x00000001, D_80244E94_EC7094, 0x00000044, 0x00000001, D_80244F10_EC7110, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000009, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFF6F, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFEB1, 0x00000024, 0x00000002, 0xFE363C82, 0x000000B6, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF4C, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802408A0_EC2AA0, 0x00000024, 0x00000002, 0xFE363C80, 0x000000C8, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF56, 0x00000024, 0x00000002, 0xFE363C82, 0x00000136, 0x00000024, 0x00000002, 0xFE363C83, 0x00000096, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802408A0_EC2AA0, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000044, 0x00000001, D_8024101C_EC321C, 0x00000012, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80240C04_EC2E04, 0x00000044, 0x00000001, 0x80285C70, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802406C0_EC28C0, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, dead_flo_03_DeadUnkFunc1, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 dlabel D_80240ED0_EC30D0 .word 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 @@ -35,7 +35,7 @@ dlabel D_80240ED0_EC30D0 dlabel D_80240EFC_EC30FC .word 0x00000000, 0x00380028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 -dlabel EC2240_varStash +dlabel dead_flo_03_varStash .word 0x00000000 dlabel D_80240F2C_EC312C @@ -126,10 +126,10 @@ dlabel D_80244274_EC6474 .word 0x00000005, D_80240ED0_EC30D0, 0x428E0000, 0x00000000, 0x43480000, 0x00000F01, D_80243784_EC5984, 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, 0x002F0101, 0x002F0102, 0x002F0103, 0x002F0103, 0x002F0101, 0x002F0101, 0x002F0105, 0x002F0105, 0x002F0100, 0x002F0100, 0x002F0100, 0x002F0100, 0x002F0100, 0x002F0100, 0x002F0100, 0x002F0100, 0x00000000, 0x00000000, 0x00000000, 0x00000000 dlabel D_80244464_EC6664 -.word 0x00000001, D_802438C4_EC5AC4, 0x00000000, 0x00000001, D_80243AB4_EC5CB4, 0x1A0F0002, 0x00000001, D_80243CA4_EC5EA4, 0x1B020002, 0x00000001, D_80243E94_EC6094, 0x1B010002, 0x00000001, D_80244084_EC6284, 0x1B030002, 0x00000001, D_80244274_EC6474, 0x1B040002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, EC2610_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, EC2610_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802E2F8C, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, 0x802E2F30, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000001, D_802438C4_EC5AC4, 0x00000000, 0x00000001, D_80243AB4_EC5CB4, 0x1A0F0002, 0x00000001, D_80243CA4_EC5EA4, 0x1B020002, 0x00000001, D_80243E94_EC6094, 0x1B010002, 0x00000001, D_80244084_EC6284, 0x1B030002, 0x00000001, D_80244274_EC6474, 0x1B040002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dead_flo_03_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dead_flo_03_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802E2F8C, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, 0x802E2F30, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244820_EC6A20 -.word 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, 0x802E37A0, 0x00000165, 0x00000043, 0x00000002, 0x802E37A0, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, EC2610_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C83, 0x00000166, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, EC2610_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, EC2610_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C84, 0x00000165, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, EC2610_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000030, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000005, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000033, 0x00000003, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802E2F8C, 0xFE363C8B, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000003, 0x802E2F30, 0xFE363C8B, 0x00000001, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000030, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000005, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000014, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000046, 0x00000001, 0xFE363C85, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, 0x802E37A0, 0x00000165, 0x00000043, 0x00000002, 0x802E37A0, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dead_flo_03_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C83, 0x00000166, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dead_flo_03_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, dead_flo_03_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C84, 0x00000165, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, dead_flo_03_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000030, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000005, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000033, 0x00000003, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802E2F8C, 0xFE363C8B, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000003, 0x802E2F30, 0xFE363C8B, 0x00000001, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000030, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000005, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000014, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000046, 0x00000001, 0xFE363C85, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244E24_EC7024 .word 0x00000001, 0x00000017 diff --git a/ver/us/asm/data/dead/EC78F0.data.s b/ver/us/asm/data/world/dead/flo_07/EC78F0.data.s similarity index 78% rename from ver/us/asm/data/dead/EC78F0.data.s rename to ver/us/asm/data/world/dead/flo_07/EC78F0.data.s index 66535f832c..076595e3f9 100644 --- a/ver/us/asm/data/dead/EC78F0.data.s +++ b/ver/us/asm/data/world/dead/flo_07/EC78F0.data.s @@ -15,7 +15,7 @@ dlabel D_80240890_EC7A40 .word 0x00000043, 0x00000003, 0x802E3330, 0x00000000, 0x000000FA, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, 0x802E3628, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 dlabel D_802408D0_EC7A80 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, EC71B0_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EC71B0_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, dead_flo_07_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, dead_flo_07_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024096C_EC7B1C .word 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, 0x802E1D00, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -27,15 +27,15 @@ dlabel D_80240C74_EC7E24 .word 0x00000047, 0x00000005, D_80240C18_EC7DC8, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240CA0_EC7E50 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleTimeLeft, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF9718886, 0x00000000, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_80242B0C_EC9CBC, 0x00000046, 0x00000001, D_802428C4_EC9A74, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000006, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0x00000129, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C82, 0x0000017F, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFBF, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8024096C_EC7B1C, 0x00000024, 0x00000002, 0xFE363C80, 0x00000125, 0x00000024, 0x00000002, 0xFE363C81, 0x00000047, 0x00000024, 0x00000002, 0xFE363C82, 0x0000017A, 0x00000024, 0x00000002, 0xFE363C83, 0x00000071, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8024096C_EC7B1C, 0x00000024, 0x00000002, 0xFE363C80, 0x00000015, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFEA6, 0x00000024, 0x00000002, 0xFE363C82, 0x00000093, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF0E, 0x00000024, 0x00000002, 0xFE363C84, 0x00000014, 0x00000044, 0x00000001, D_8024096C_EC7B1C, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFEA2, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF42, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFAF, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF96, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8024096C_EC7B1C, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFE84, 0x00000024, 0x00000002, 0xFE363C81, 0x00000055, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C83, 0x00000096, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8024096C_EC7B1C, 0x00000043, 0x00000003, 0x802D6688, 0x00000033, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000031, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000032, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF9C, 0x00000024, 0x00000002, 0xFE363C82, 0x00000064, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802408D0_EC7A80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFB50, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802408D0_EC7A80, 0x00000057, 0x00000000, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000044, 0x00000001, D_80241C14_EC8DC4, 0x00000012, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80240C74_EC7E24, 0x00000044, 0x00000001, 0x80285C70, 0x00000044, 0x00000001, D_802424F4_EC96A4, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802407A0_EC7950, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, EC71B0_SpawnSunEffect, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240344_EC74F4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleTimeLeft, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF9718886, 0x00000000, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_80242B0C_EC9CBC, 0x00000046, 0x00000001, D_802428C4_EC9A74, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000006, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0x00000129, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C82, 0x0000017F, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFBF, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8024096C_EC7B1C, 0x00000024, 0x00000002, 0xFE363C80, 0x00000125, 0x00000024, 0x00000002, 0xFE363C81, 0x00000047, 0x00000024, 0x00000002, 0xFE363C82, 0x0000017A, 0x00000024, 0x00000002, 0xFE363C83, 0x00000071, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8024096C_EC7B1C, 0x00000024, 0x00000002, 0xFE363C80, 0x00000015, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFEA6, 0x00000024, 0x00000002, 0xFE363C82, 0x00000093, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF0E, 0x00000024, 0x00000002, 0xFE363C84, 0x00000014, 0x00000044, 0x00000001, D_8024096C_EC7B1C, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFEA2, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF42, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFAF, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF96, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8024096C_EC7B1C, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFE84, 0x00000024, 0x00000002, 0xFE363C81, 0x00000055, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C83, 0x00000096, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8024096C_EC7B1C, 0x00000043, 0x00000003, 0x802D6688, 0x00000033, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000031, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000032, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF9C, 0x00000024, 0x00000002, 0xFE363C82, 0x00000064, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802408D0_EC7A80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFB50, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802408D0_EC7A80, 0x00000057, 0x00000000, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000044, 0x00000001, D_80241C14_EC8DC4, 0x00000012, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80240C74_EC7E24, 0x00000044, 0x00000001, 0x80285C70, 0x00000044, 0x00000001, D_802424F4_EC96A4, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802407A0_EC7950, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, dead_flo_07_SpawnSunEffect, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240344_EC74F4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 dlabel D_80241220_EC83D0 -.word 0x00000000, 0x00380028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, EC7590_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, EC7590_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802E2F8C, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, 0x802E2F30, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000000, 0x00380028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dead_flo_07_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dead_flo_07_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802E2F8C, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, 0x802E2F30, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802415AC_EC875C -.word 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, 0x802E37A0, 0x00000165, 0x00000043, 0x00000002, 0x802E37A0, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, EC7590_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C83, 0x00000166, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, EC7590_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, EC7590_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C84, 0x00000165, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, EC7590_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000030, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000005, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000033, 0x00000003, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802E2F8C, 0xFE363C8B, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000003, 0x802E2F30, 0xFE363C8B, 0x00000001, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000030, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000005, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000014, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000046, 0x00000001, 0xFE363C85, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, 0x802E37A0, 0x00000165, 0x00000043, 0x00000002, 0x802E37A0, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dead_flo_07_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C83, 0x00000166, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dead_flo_07_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, dead_flo_07_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C84, 0x00000165, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, dead_flo_07_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000030, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000005, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000033, 0x00000003, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802E2F8C, 0xFE363C8B, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000003, 0x802E2F30, 0xFE363C8B, 0x00000001, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000030, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000005, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000014, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000046, 0x00000001, 0xFE363C85, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000 -dlabel EC7590_varStash +dlabel dead_flo_07_varStash .word 0x00000000 dlabel D_80241BB4_EC8D64 diff --git a/ver/us/asm/data/dead/ECBC10.data.s b/ver/us/asm/data/world/dead/flo_08/ECBC10.data.s similarity index 62% rename from ver/us/asm/data/dead/ECBC10.data.s rename to ver/us/asm/data/world/dead/flo_08/ECBC10.data.s index 184330a394..5c84724326 100644 --- a/ver/us/asm/data/dead/ECBC10.data.s +++ b/ver/us/asm/data/world/dead/flo_08/ECBC10.data.s @@ -8,23 +8,23 @@ dlabel D_80241F10_ECBC10 dlabel D_80241F70_ECBC70 .word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000030, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000031, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 -dlabel EC9D00_SuperBlock_CantUpgradeMessages +dlabel dead_flo_08_SuperBlock_CantUpgradeMessages .word 0x001D00F0, 0x001D00F1 -dlabel EC9D00_SuperBlock_PartnerIDs +dlabel dead_flo_08_SuperBlock_PartnerIDs .word 0x00010002, 0x00030004, 0x00090006, 0x00070008 -dlabel EC9D00_SuperBlock_UpgradeDescMessages +dlabel dead_flo_08_SuperBlock_UpgradeDescMessages .word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF -dlabel EC9D00_SuperBlock_UpgradeOrbAngles +dlabel dead_flo_08_SuperBlock_UpgradeOrbAngles .word 0x430C0000, 0x43340000, 0x435C0000 dlabel D_80242044_ECBD44 -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, 0x802E37A0, 0x0000212D, 0x00000043, 0x00000002, EC9D00_SuperBlock_GatherEnergyFX, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802E37A0, 0x0000212E, 0x00000043, 0x00000003, EC9D00_SuperBlock_WhiteScreenFlash, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, 0x802E37A0, 0x0000208E, 0x00000043, 0x00000003, EC9D00_SuperBlock_WhiteScreenFlash, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, EC9D00_SuperBlock_HideBlockContent, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, EC9D00_SuperBlock_RadiateFaintEnergyFX, 0x00000043, 0x00000001, EC9D00_SuperBlock_PartnerSparkles2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, EC9D00_SuperBlock_PartnerSparkles4, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, EC9D00_SuperBlock_PartnerSparkles2, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, EC9D00_SuperBlock_AnimateEnergyOrbs, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, 0x802E37A0, 0x0000212D, 0x00000043, 0x00000002, dead_flo_08_SuperBlock_GatherEnergyFX, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802E37A0, 0x0000212E, 0x00000043, 0x00000003, dead_flo_08_SuperBlock_WhiteScreenFlash, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, 0x802E37A0, 0x0000208E, 0x00000043, 0x00000003, dead_flo_08_SuperBlock_WhiteScreenFlash, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, dead_flo_08_SuperBlock_HideBlockContent, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, dead_flo_08_SuperBlock_RadiateFaintEnergyFX, 0x00000043, 0x00000001, dead_flo_08_SuperBlock_PartnerSparkles2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, dead_flo_08_SuperBlock_PartnerSparkles4, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, dead_flo_08_SuperBlock_PartnerSparkles2, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, dead_flo_08_SuperBlock_AnimateEnergyOrbs, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802421A8_ECBEA8 -.word 0x0000000A, 0x00000002, 0xF84060FA, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x80048290, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EC9D00_SuperBlock_WaitForPlayerToLand, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000001, 0x00200000, 0x00000043, 0x00000001, EC9D00_SuperBlock_SetOverride40, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, EC9D00_SuperBlock_StartGlowEffect, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, 0x802E4064, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, EC9D00_SuperBlock_CountEligiblePartners, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, EC9D00_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, EC9D00_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EC9D00_SuperBlock_ShowSelectPartnerMenu, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, EC9D00_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, EC9D00_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, EC9D00_SuperBlock_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, 0x802DCACC, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, 0x802DE138, 0x001E000D, 0x00000043, 0x00000001, 0x802DE040, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, EC9D00_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, EC9D00_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80242044_ECBD44, 0x00000043, 0x00000003, EC9D00_SuperBlock_GetPartnerRank, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF84060FA, 0x00000001, 0x00000043, 0x00000002, EC9D00_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000001, EC9D00_SuperBlock_LoadCurrentPartnerName, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, EC9D00_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF84060FA, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x80048290, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, dead_flo_08_SuperBlock_WaitForPlayerToLand, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000001, 0x00200000, 0x00000043, 0x00000001, dead_flo_08_SuperBlock_SetOverride40, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, dead_flo_08_SuperBlock_StartGlowEffect, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, 0x802E4064, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, dead_flo_08_SuperBlock_CountEligiblePartners, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, dead_flo_08_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, dead_flo_08_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, dead_flo_08_SuperBlock_ShowSelectPartnerMenu, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, dead_flo_08_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, dead_flo_08_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, dead_flo_08_SuperBlock_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, 0x802DCACC, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, 0x802DE138, 0x001E000D, 0x00000043, 0x00000001, 0x802DE040, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, dead_flo_08_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, dead_flo_08_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80242044_ECBD44, 0x00000043, 0x00000003, dead_flo_08_SuperBlock_GetPartnerRank, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF84060FA, 0x00000001, 0x00000043, 0x00000002, dead_flo_08_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000001, dead_flo_08_SuperBlock_LoadCurrentPartnerName, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, dead_flo_08_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242628_ECC328 .word 0x00000043, 0x00000007, 0x8011A58C, 0x802F8DC0, 0xFFFFFCF4, 0x00000078, 0xFFFFFF92, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, 0x8011A8C0, 0xF84060FA, 0x00000043, 0x00000002, 0x8011A804, D_802421A8_ECBEA8, 0x00000043, 0x00000007, 0x802E4310, 0x0000015C, 0x000001FE, 0x00000000, 0xFFFFFFA6, 0x00000011, 0xF84060E5, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -45,13 +45,13 @@ dlabel D_80242A5C_ECC75C .word 0x00000009, 0xC4070000, 0x00000000, 0x42480000, 0x0000000A, 0x42700000, 0x00000000, 0x42480000, 0x0000000F, 0x42700000, 0x00000000, 0x42480000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000 dlabel D_80242A9C_ECC79C -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleTimeLeft, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_80244EF4_ECEBF4, 0x00000046, 0x00000001, D_80242628_ECC328, 0x00000044, 0x00000001, D_80245F8C_ECFC8C, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000013, 0x00000002, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802D7384, D_80242A5C_ECC75C, 0x00000057, 0x00000000, 0x00000043, 0x00000003, 0x802D6688, 0x00000016, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000017, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000019, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001B, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001D, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001F, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000029, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000018, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001A, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001C, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001E, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000020, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x0000008C, 0x0000000D, 0x00000002, 0xFE363C80, 0x00010000, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFF0000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x0000000C, 0x00000002, 0xFE363C81, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00010000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x00000002, 0x00000000, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000015, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0x0000008C, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF77, 0x00000024, 0x00000002, 0xFE363C82, 0x00000154, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFC4, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802426B0_ECC3B0, 0x00000024, 0x00000002, 0xFE363C80, 0x000001C2, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF77, 0x00000024, 0x00000002, 0xFE363C82, 0x0000024E, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFC4, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802426B0_ECC3B0, 0x00000044, 0x00000001, D_80245944_ECF644, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80242A14_ECC714, 0x00000044, 0x00000001, 0x80285C70, 0x00000046, 0x00000001, D_80241F70_ECBC70, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, ECAA40_DeadUnkFunc1, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleTimeLeft, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_80244EF4_ECEBF4, 0x00000046, 0x00000001, D_80242628_ECC328, 0x00000044, 0x00000001, D_80245F8C_ECFC8C, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000013, 0x00000002, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802D7384, D_80242A5C_ECC75C, 0x00000057, 0x00000000, 0x00000043, 0x00000003, 0x802D6688, 0x00000016, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000017, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000019, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001B, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001D, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001F, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000029, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000018, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001A, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001C, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001E, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000020, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x0000008C, 0x0000000D, 0x00000002, 0xFE363C80, 0x00010000, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFF0000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x0000000C, 0x00000002, 0xFE363C81, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00010000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x00000002, 0x00000000, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000015, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0x0000008C, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF77, 0x00000024, 0x00000002, 0xFE363C82, 0x00000154, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFC4, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802426B0_ECC3B0, 0x00000024, 0x00000002, 0xFE363C80, 0x000001C2, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF77, 0x00000024, 0x00000002, 0xFE363C82, 0x0000024E, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFC4, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802426B0_ECC3B0, 0x00000044, 0x00000001, D_80245944_ECF644, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80242A14_ECC714, 0x00000044, 0x00000001, 0x80285C70, 0x00000046, 0x00000001, D_80241F70_ECBC70, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, dead_flo_08_DeadUnkFunc1, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 dlabel D_80242EE0_ECCBE0 .word 0x3FC00000, 0x0000001E, 0x0000001E, 0x42C80000, 0x41F00000, 0x00000003, 0x4019999A, 0x0000000F, 0x00000001, 0x430C0000, 0x41F00000, 0x00000001 dlabel D_80242F10_ECCC10 -.word 0x00000043, 0x00000002, ECAA80_UnkFloAI_Main, D_80242EE0_ECCBE0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, dead_flo_08_UnkFloAI_Main, D_80242EE0_ECCBE0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242F30_ECCC30 .word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000028, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000011, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -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 ECAA80_ItemChoice_HasSelectedItem +dlabel dead_flo_08_ItemChoice_HasSelectedItem .word 0x00000000 -dlabel ECAA80_ItemChoice_SelectedItemID +dlabel dead_flo_08_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, ECAA80_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.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, dead_flo_08_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, dead_flo_08_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802431F4_ECCEF4 -.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 +.word 0x00000043, 0x00000002, dead_flo_08_BuildItemChoiceList, 0xFE363C80, 0x0000004E, 0x00000006, D_802430C0_ECCDC0, 0x00000010, 0x00000000, dead_flo_08_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, 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 +.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, dead_flo_08_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, dead_flo_08_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, dead_flo_08_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, dead_flo_08_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 @@ -120,10 +120,10 @@ dlabel D_80244D04_ECEA04 .word 0x00000008, D_80242FE4_ECCCE4, 0x43700000, 0x00000000, 0xC2B40000, 0x00002C00, D_80244BF8_ECE8F8, 0x00000000, 0x00000000, 0x0000010E, 0x801400A4, 0x00180000, 0x00A30019, 0x000000A2, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0006, 0x33322666, 0x33320006, 0x33323FFF, 0x33320006, 0x33326665, 0x33320006, 0x33327FFF, 0x26660006, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000005, 0x00080000, 0x000000F0, 0x00000000, 0xFFFFFFA6, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x000000F0, 0x00000000, 0xFFFFFFA6, 0x000000C8, 0x00000000, 0x00000000, 0x00000001, 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, 0x00480101, 0x00480102, 0x00480103, 0x00480103, 0x00480101, 0x00480101, 0x00480108, 0x00480108, 0x00480106, 0x00480107, 0x00480101, 0x00480101, 0x00480101, 0x00480101, 0x00480101, 0x00480101, 0x00000002, 0x00000000, 0x00000000, 0x00000000 dlabel D_80244EF4_ECEBF4 -.word 0x00000001, D_80243C78_ECD978, 0x00000000, 0x00000001, D_80243E68_ECDB68, 0x1A140001, 0x00000001, D_80244058_ECDD58, 0x1A0F0001, 0x00000001, D_80244248_ECDF48, 0x1A0F0002, 0x00000001, D_80244438_ECE138, 0x1A0F0002, 0x00000001, D_80244628_ECE328, 0x1A0F0002, 0x00000001, D_80244818_ECE518, 0x1A0F0002, 0x00000001, D_80244A08_ECE708, 0x1A120002, 0x00000001, D_80244D04_ECEA04, 0x1A1C0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, ECB930_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, ECB930_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802E2F8C, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, 0x802E2F30, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000001, D_80243C78_ECD978, 0x00000000, 0x00000001, D_80243E68_ECDB68, 0x1A140001, 0x00000001, D_80244058_ECDD58, 0x1A0F0001, 0x00000001, D_80244248_ECDF48, 0x1A0F0002, 0x00000001, D_80244438_ECE138, 0x1A0F0002, 0x00000001, D_80244628_ECE328, 0x1A0F0002, 0x00000001, D_80244818_ECE518, 0x1A0F0002, 0x00000001, D_80244A08_ECE708, 0x1A120002, 0x00000001, D_80244D04_ECEA04, 0x1A1C0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dead_flo_08_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dead_flo_08_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802E2F8C, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, 0x802E2F30, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802452D0_ECEFD0 -.word 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, 0x802E37A0, 0x00000165, 0x00000043, 0x00000002, 0x802E37A0, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, ECB930_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C83, 0x00000166, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, ECB930_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, ECB930_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C84, 0x00000165, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, ECB930_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000030, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000005, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000033, 0x00000003, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802E2F8C, 0xFE363C8B, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000003, 0x802E2F30, 0xFE363C8B, 0x00000001, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000030, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000005, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000014, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000046, 0x00000001, 0xFE363C85, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, 0x802E37A0, 0x00000165, 0x00000043, 0x00000002, 0x802E37A0, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dead_flo_08_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C83, 0x00000166, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dead_flo_08_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, dead_flo_08_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C84, 0x00000165, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, dead_flo_08_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000030, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000005, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000033, 0x00000003, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802E2F8C, 0xFE363C8B, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000003, 0x802E2F30, 0xFE363C8B, 0x00000001, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000030, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000005, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000014, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000046, 0x00000001, 0xFE363C85, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802458D4_ECF5D4 .word 0x00000001, 0x0000002E @@ -144,7 +144,7 @@ dlabel D_80245944_ECF644 .word 0x00000024, 0x00000002, 0xF971889D, 0x00000000, 0x00000024, 0x00000002, 0xF971889E, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80245920_ECF620, 0x00000047, 0x00000005, D_802452D0_ECEFD0, 0x00001000, 0x00000016, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802452D0_ECEFD0, 0x00100000, D_80245934_ECF634, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, 0x802E1D00, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80245C6C_ECF96C -.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C86, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, ECBB70_UnkFunc43, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C86, 0x00000001, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C82, 0x00000008, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000011, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000E, 0x00000000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, 0x802E382C, 0x000000F8, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000057, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x00000000, 0x000000B4, 0x00000014, 0x00000002, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C88, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C89, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C87, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C86, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, dead_flo_08_UnkFunc43, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C86, 0x00000001, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C82, 0x00000008, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000011, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000E, 0x00000000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, 0x802E382C, 0x000000F8, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000057, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x00000000, 0x000000B4, 0x00000014, 0x00000002, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C88, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C89, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C87, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80245F8C_ECFC8C .word 0x00000043, 0x00000002, 0x802D6400, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C83, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C84, 0x0000003D, 0x00000024, 0x00000002, 0xFE363C85, 0x0000003E, 0x00000024, 0x00000002, 0xFE363C86, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, D_80245C6C_ECF96C, 0x00000043, 0x00000002, 0x802D6400, 0x00000036, 0x00000024, 0x00000002, 0xFE363C83, 0x00000036, 0x00000024, 0x00000002, 0xFE363C84, 0x00000037, 0x00000024, 0x00000002, 0xFE363C85, 0x00000038, 0x00000024, 0x00000002, 0xFE363C86, 0x00000039, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, D_80245C6C_ECF96C, 0x00000043, 0x00000002, 0x802D6400, 0x00000030, 0x00000024, 0x00000002, 0xFE363C83, 0x00000030, 0x00000024, 0x00000002, 0xFE363C84, 0x00000031, 0x00000024, 0x00000002, 0xFE363C85, 0x00000032, 0x00000024, 0x00000002, 0xFE363C86, 0x00000033, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, D_80245C6C_ECF96C, 0x00000043, 0x00000002, 0x802D6400, 0x00000043, 0x00000024, 0x00000002, 0xFE363C83, 0x00000043, 0x00000024, 0x00000002, 0xFE363C84, 0x00000042, 0x00000024, 0x00000002, 0xFE363C85, 0x00000044, 0x00000024, 0x00000002, 0xFE363C86, 0x00000045, 0x00000024, 0x00000002, 0xFE363C8A, 0x000000AE, 0x00000044, 0x00000001, D_80245C6C_ECF96C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/dead/ED1840.data.s b/ver/us/asm/data/world/dead/flo_09/ED1840.data.s similarity index 71% rename from ver/us/asm/data/dead/ED1840.data.s rename to ver/us/asm/data/world/dead/flo_09/ED1840.data.s index 4aa9bfaa21..b34a4ae2c4 100644 --- a/ver/us/asm/data/dead/ED1840.data.s +++ b/ver/us/asm/data/world/dead/flo_09/ED1840.data.s @@ -21,16 +21,16 @@ dlabel D_80241C84_ED1C74 .word 0x00000047, 0x00000005, D_80241BCC_ED1BBC, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241C28_ED1C18, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241CCC_ED1CBC -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleTimeLeft, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_8024417C_ED416C, 0x00000044, 0x00000001, D_8024260C_ED25FC, 0x00000044, 0x00000001, D_802434D8_ED34C8, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000009, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFE01, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFFC, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFEC1, 0x00000024, 0x00000002, 0xFE363C83, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80241920_ED1910, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFED2, 0x00000024, 0x00000002, 0xFE363C81, 0x0000004D, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFE0, 0x00000024, 0x00000002, 0xFE363C83, 0x00000074, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80241920_ED1910, 0x00000024, 0x00000002, 0xFE363C80, 0x00000033, 0x00000024, 0x00000002, 0xFE363C81, 0x00000012, 0x00000024, 0x00000002, 0xFE363C82, 0x0000008D, 0x00000024, 0x00000002, 0xFE363C83, 0x0000007F, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80241920_ED1910, 0x00000024, 0x00000002, 0xFE363C80, 0x000000EA, 0x00000024, 0x00000002, 0xFE363C81, 0x00000026, 0x00000024, 0x00000002, 0xFE363C82, 0x000001F6, 0x00000024, 0x00000002, 0xFE363C83, 0x00000062, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80241920_ED1910, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFDF3, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF5D, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFB0, 0x00000024, 0x00000002, 0xFE363C84, 0x0000003C, 0x00000044, 0x00000001, D_80241920_ED1910, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFEA6, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF6C, 0x00000024, 0x00000002, 0xFE363C82, 0x00000205, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFA5, 0x00000024, 0x00000002, 0xFE363C84, 0x0000003C, 0x00000044, 0x00000001, D_80241920_ED1910, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80241C84_ED1C74, 0x00000044, 0x00000001, 0x80285C70, 0x00000046, 0x00000001, D_802418B0_ED18A0, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, ECFFF0_DeadUnkFunc1, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, 0x802E1D00, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleTimeLeft, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_8024417C_ED416C, 0x00000044, 0x00000001, D_8024260C_ED25FC, 0x00000044, 0x00000001, D_802434D8_ED34C8, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000009, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFE01, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFFC, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFEC1, 0x00000024, 0x00000002, 0xFE363C83, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80241920_ED1910, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFED2, 0x00000024, 0x00000002, 0xFE363C81, 0x0000004D, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFE0, 0x00000024, 0x00000002, 0xFE363C83, 0x00000074, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80241920_ED1910, 0x00000024, 0x00000002, 0xFE363C80, 0x00000033, 0x00000024, 0x00000002, 0xFE363C81, 0x00000012, 0x00000024, 0x00000002, 0xFE363C82, 0x0000008D, 0x00000024, 0x00000002, 0xFE363C83, 0x0000007F, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80241920_ED1910, 0x00000024, 0x00000002, 0xFE363C80, 0x000000EA, 0x00000024, 0x00000002, 0xFE363C81, 0x00000026, 0x00000024, 0x00000002, 0xFE363C82, 0x000001F6, 0x00000024, 0x00000002, 0xFE363C83, 0x00000062, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80241920_ED1910, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFDF3, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF5D, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFB0, 0x00000024, 0x00000002, 0xFE363C84, 0x0000003C, 0x00000044, 0x00000001, D_80241920_ED1910, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFEA6, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF6C, 0x00000024, 0x00000002, 0xFE363C82, 0x00000205, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFA5, 0x00000024, 0x00000002, 0xFE363C84, 0x0000003C, 0x00000044, 0x00000001, D_80241920_ED1910, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80241C84_ED1C74, 0x00000044, 0x00000001, 0x80285C70, 0x00000046, 0x00000001, D_802418B0_ED18A0, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, dead_flo_09_DeadUnkFunc1, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, 0x802E1D00, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802422EC_ED22DC -.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C86, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, ED0030_UnkFunc43, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C86, 0x00000001, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C82, 0x00000008, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000011, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000E, 0x00000000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, 0x802E382C, 0x000000F8, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000057, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x00000000, 0x000000B4, 0x00000014, 0x00000002, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C88, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C89, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C87, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C86, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, dead_flo_09_UnkFunc43, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C86, 0x00000001, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C82, 0x00000008, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000011, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000E, 0x00000000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, 0x802E382C, 0x000000F8, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000057, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x00000000, 0x000000B4, 0x00000014, 0x00000002, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C88, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C89, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C87, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024260C_ED25FC -.word 0x00000043, 0x00000002, 0x802D6400, 0x00000045, 0x00000024, 0x00000002, 0xFE363C83, 0x00000045, 0x00000024, 0x00000002, 0xFE363C84, 0x00000046, 0x00000024, 0x00000002, 0xFE363C85, 0x00000047, 0x00000024, 0x00000002, 0xFE363C86, 0x00000048, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, D_802422EC_ED22DC, 0x00000043, 0x00000002, 0x802D6400, 0x0000004B, 0x00000024, 0x00000002, 0xFE363C83, 0x0000004B, 0x00000024, 0x00000002, 0xFE363C84, 0x0000004C, 0x00000024, 0x00000002, 0xFE363C85, 0x0000004D, 0x00000024, 0x00000002, 0xFE363C86, 0x0000004E, 0x00000024, 0x00000002, 0xFE363C8A, 0x000000AE, 0x00000044, 0x00000001, D_802422EC_ED22DC, 0x00000043, 0x00000002, 0x802D6400, 0x00000053, 0x00000024, 0x00000002, 0xFE363C83, 0x00000053, 0x00000024, 0x00000002, 0xFE363C84, 0x00000054, 0x00000024, 0x00000002, 0xFE363C85, 0x00000055, 0x00000024, 0x00000002, 0xFE363C86, 0x00000056, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, D_802422EC_ED22DC, 0x00000043, 0x00000002, 0x802D6400, 0x00000059, 0x00000024, 0x00000002, 0xFE363C83, 0x00000059, 0x00000024, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000024, 0x00000002, 0xFE363C85, 0x0000005B, 0x00000024, 0x00000002, 0xFE363C86, 0x0000005C, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, D_802422EC_ED22DC, 0x00000043, 0x00000002, 0x802D6400, 0x00000061, 0x00000024, 0x00000002, 0xFE363C83, 0x00000061, 0x00000024, 0x00000002, 0xFE363C84, 0x00000062, 0x00000024, 0x00000002, 0xFE363C85, 0x00000063, 0x00000024, 0x00000002, 0xFE363C86, 0x00000064, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, D_802422EC_ED22DC, 0x00000043, 0x00000002, 0x802D6400, 0x00000067, 0x00000024, 0x00000002, 0xFE363C83, 0x00000067, 0x00000024, 0x00000002, 0xFE363C84, 0x00000068, 0x00000024, 0x00000002, 0xFE363C85, 0x00000069, 0x00000024, 0x00000002, 0xFE363C86, 0x0000006A, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, D_802422EC_ED22DC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, ED00D0_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, ED00D0_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802E2F8C, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, 0x802E2F30, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, 0x802D6400, 0x00000045, 0x00000024, 0x00000002, 0xFE363C83, 0x00000045, 0x00000024, 0x00000002, 0xFE363C84, 0x00000046, 0x00000024, 0x00000002, 0xFE363C85, 0x00000047, 0x00000024, 0x00000002, 0xFE363C86, 0x00000048, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, D_802422EC_ED22DC, 0x00000043, 0x00000002, 0x802D6400, 0x0000004B, 0x00000024, 0x00000002, 0xFE363C83, 0x0000004B, 0x00000024, 0x00000002, 0xFE363C84, 0x0000004C, 0x00000024, 0x00000002, 0xFE363C85, 0x0000004D, 0x00000024, 0x00000002, 0xFE363C86, 0x0000004E, 0x00000024, 0x00000002, 0xFE363C8A, 0x000000AE, 0x00000044, 0x00000001, D_802422EC_ED22DC, 0x00000043, 0x00000002, 0x802D6400, 0x00000053, 0x00000024, 0x00000002, 0xFE363C83, 0x00000053, 0x00000024, 0x00000002, 0xFE363C84, 0x00000054, 0x00000024, 0x00000002, 0xFE363C85, 0x00000055, 0x00000024, 0x00000002, 0xFE363C86, 0x00000056, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, D_802422EC_ED22DC, 0x00000043, 0x00000002, 0x802D6400, 0x00000059, 0x00000024, 0x00000002, 0xFE363C83, 0x00000059, 0x00000024, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000024, 0x00000002, 0xFE363C85, 0x0000005B, 0x00000024, 0x00000002, 0xFE363C86, 0x0000005C, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, D_802422EC_ED22DC, 0x00000043, 0x00000002, 0x802D6400, 0x00000061, 0x00000024, 0x00000002, 0xFE363C83, 0x00000061, 0x00000024, 0x00000002, 0xFE363C84, 0x00000062, 0x00000024, 0x00000002, 0xFE363C85, 0x00000063, 0x00000024, 0x00000002, 0xFE363C86, 0x00000064, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, D_802422EC_ED22DC, 0x00000043, 0x00000002, 0x802D6400, 0x00000067, 0x00000024, 0x00000002, 0xFE363C83, 0x00000067, 0x00000024, 0x00000002, 0xFE363C84, 0x00000068, 0x00000024, 0x00000002, 0xFE363C85, 0x00000069, 0x00000024, 0x00000002, 0xFE363C86, 0x0000006A, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, D_802422EC_ED22DC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dead_flo_09_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dead_flo_09_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802E2F8C, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, 0x802E2F30, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242C10_ED2C00 -.word 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, 0x802E37A0, 0x00000165, 0x00000043, 0x00000002, 0x802E37A0, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, ED00D0_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C83, 0x00000166, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, ED00D0_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, ED00D0_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C84, 0x00000165, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, ED00D0_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000030, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000005, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000033, 0x00000003, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802E2F8C, 0xFE363C8B, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000003, 0x802E2F30, 0xFE363C8B, 0x00000001, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000030, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000005, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000014, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000046, 0x00000001, 0xFE363C85, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, 0x802E37A0, 0x00000165, 0x00000043, 0x00000002, 0x802E37A0, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dead_flo_09_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C83, 0x00000166, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dead_flo_09_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, dead_flo_09_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C84, 0x00000165, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, dead_flo_09_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000030, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000005, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000033, 0x00000003, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802E2F8C, 0xFE363C8B, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000003, 0x802E2F30, 0xFE363C8B, 0x00000001, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000030, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000005, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000014, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000046, 0x00000001, 0xFE363C85, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243214_ED3204 .word 0x00000043, 0x00000005, 0x802DC654, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000002, 0x802D6400, 0xFE363C89, 0x00000027, 0x00000002, 0xFE363C82, 0x00000023, 0x00000043, 0x00000005, 0x802DB210, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -92,14 +92,14 @@ dlabel D_80243610_ED3600 dlabel D_80243630_ED3620 .word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, D_80243610_ED3600, 0x8007D3C0, 0x00000000, 0x8007D4EC, 0x00000000, 0x00000000, 0x00130000 -dlabel ED0310_FlyingAI_JumpVels +dlabel dead_flo_09_FlyingAI_JumpVels .float 4.5, 3.5, 2.6, 2.0, 1.5, 20.0 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, ED0310_FlyingAI_Main, 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, dead_flo_09_FlyingAI_Main, 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/dead/ED5780.data.s b/ver/us/asm/data/world/dead/flo_10/ED5780.data.s similarity index 85% rename from ver/us/asm/data/dead/ED5780.data.s rename to ver/us/asm/data/world/dead/flo_10/ED5780.data.s index 3a6d2a07dd..bbfd756ba6 100644 --- a/ver/us/asm/data/dead/ED5780.data.s +++ b/ver/us/asm/data/world/dead/flo_10/ED5780.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80241560_ED5780 -.word 0xC3B40000, 0x00000000, 0x00000000, 0x42B40000, 0xC3B40000, 0x00000000, 0x00000000, 0x42B40000, 0xC2C80000, 0xC1200000, 0xC32C0000, 0x43070000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80241AA4_ED5CC4, D_80241560_ED5780, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, ED4220_get_tattle +.word 0xC3B40000, 0x00000000, 0x00000000, 0x42B40000, 0xC3B40000, 0x00000000, 0x00000000, 0x42B40000, 0xC2C80000, 0xC1200000, 0xC32C0000, 0x43070000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80241AA4_ED5CC4, D_80241560_ED5780, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, dead_flo_10_get_tattle dlabel D_802415D0_ED57F0 .word 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, 0x00000030, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000031, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000031, 0x00000043, 0x00000002, 0x802E37A0, 0x80000022, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -27,16 +27,16 @@ dlabel D_80241A78_ED5C98 .word 0x00000047, 0x00000005, D_80241A1C_ED5C3C, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241AA4_ED5CC4 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleTimeLeft, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_80244144_ED8364, 0x00000046, 0x00000001, D_80241720_ED5940, 0x00000044, 0x00000001, D_80244B40_ED8D60, 0x00000044, 0x00000001, D_802436E8_ED7908, 0x00000044, 0x00000001, D_80242BD8_ED6DF8, 0x00000044, 0x00000001, D_80244164_ED8384, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000000B, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000000C, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFEF7, 0x00000024, 0x00000002, 0xFE363C81, 0x000000F7, 0x00000024, 0x00000002, 0xFE363C82, 0x000000C7, 0x00000024, 0x00000002, 0xFE363C83, 0x00000139, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80241770_ED5990, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFED4, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFEED, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFF74, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF47, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80241770_ED5990, 0x00000024, 0x00000002, 0xFE363C80, 0x00000107, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF08, 0x00000024, 0x00000002, 0xFE363C82, 0x0000016A, 0x00000024, 0x00000002, 0xFE363C83, 0x00000092, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80241770_ED5990, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000044, 0x00000001, D_8024333C_ED755C, 0x00000016, 0x00000001, 0x00000002, 0x00000044, 0x00000001, D_802428DC_ED6AFC, 0x00000044, 0x00000001, D_80241A78_ED5C98, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80241A78_ED5C98, 0x00000044, 0x00000001, 0x80285C70, 0x00000023, 0x00000000, 0x00000046, 0x00000001, D_802415D0_ED57F0, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, ED4260_DeadUnkFunc1, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleTimeLeft, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_80244144_ED8364, 0x00000046, 0x00000001, D_80241720_ED5940, 0x00000044, 0x00000001, D_80244B40_ED8D60, 0x00000044, 0x00000001, D_802436E8_ED7908, 0x00000044, 0x00000001, D_80242BD8_ED6DF8, 0x00000044, 0x00000001, D_80244164_ED8384, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000000B, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000000C, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFEF7, 0x00000024, 0x00000002, 0xFE363C81, 0x000000F7, 0x00000024, 0x00000002, 0xFE363C82, 0x000000C7, 0x00000024, 0x00000002, 0xFE363C83, 0x00000139, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80241770_ED5990, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFED4, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFEED, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFF74, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF47, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80241770_ED5990, 0x00000024, 0x00000002, 0xFE363C80, 0x00000107, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF08, 0x00000024, 0x00000002, 0xFE363C82, 0x0000016A, 0x00000024, 0x00000002, 0xFE363C83, 0x00000092, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80241770_ED5990, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000044, 0x00000001, D_8024333C_ED755C, 0x00000016, 0x00000001, 0x00000002, 0x00000044, 0x00000001, D_802428DC_ED6AFC, 0x00000044, 0x00000001, D_80241A78_ED5C98, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80241A78_ED5C98, 0x00000044, 0x00000001, 0x80285C70, 0x00000023, 0x00000000, 0x00000046, 0x00000001, D_802415D0_ED57F0, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, dead_flo_10_DeadUnkFunc1, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 -dlabel ED42A0_varStash +dlabel dead_flo_10_varStash .word 0x00000000 dlabel D_80241DA4_ED5FC4 .word 0x00000043, 0x00000004, 0x802E49F4, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802E49F4, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241E04_ED6024 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, ED42A0_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, ED42A0_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, dead_flo_10_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, dead_flo_10_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241EA0_ED60C0 .word 0x00000043, 0x00000005, 0x802E1C00, 0xFFFFFFCE, 0x000000AA, 0x00000181, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, 0x802D6C60, 0x00000038, 0x00000000, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -114,10 +114,10 @@ dlabel D_80244160_ED8380 .word 0x00000000 dlabel D_80244164_ED8384 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, ED5540_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, ED5540_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802E2F8C, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, 0x802E2F30, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dead_flo_10_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dead_flo_10_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802E2F8C, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, 0x802E2F30, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802444E0_ED8700 -.word 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, 0x802E37A0, 0x00000165, 0x00000043, 0x00000002, 0x802E37A0, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, ED5540_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C83, 0x00000166, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, ED5540_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, ED5540_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C84, 0x00000165, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, ED5540_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000030, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000005, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000033, 0x00000003, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802E2F8C, 0xFE363C8B, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000003, 0x802E2F30, 0xFE363C8B, 0x00000001, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000030, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000005, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000014, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000046, 0x00000001, 0xFE363C85, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, 0x802E37A0, 0x00000165, 0x00000043, 0x00000002, 0x802E37A0, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dead_flo_10_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C83, 0x00000166, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dead_flo_10_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, dead_flo_10_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C84, 0x00000165, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, dead_flo_10_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000030, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000005, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000033, 0x00000003, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802E2F8C, 0xFE363C8B, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000003, 0x802E2F30, 0xFE363C8B, 0x00000001, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000030, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000005, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000014, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000046, 0x00000001, 0xFE363C85, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244AE4_ED8D04 .word 0x00000003, 0x00000021, 0x00000022, 0x00000023 diff --git a/ver/us/asm/data/dead/ED9170.data.s b/ver/us/asm/data/world/dead/flo_11/ED9170.data.s similarity index 73% rename from ver/us/asm/data/dead/ED9170.data.s rename to ver/us/asm/data/world/dead/flo_11/ED9170.data.s index 5c7064e232..856bc9393f 100644 --- a/ver/us/asm/data/dead/ED9170.data.s +++ b/ver/us/asm/data/world/dead/flo_11/ED9170.data.s @@ -9,13 +9,13 @@ dlabel D_80240410_ED9230 .word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000030, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000031, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, 0x802E1D00, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024072C_ED954C -.word 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000002, 0x802DE3C0, 0x00000001, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010000, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, 0x802DC7C8, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x00000043, 0x00000001, ED8E20_Pipe_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, 0x802DEF5C, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, 0x802E37A0, 0x00000163, 0x00000043, 0x00000002, D_802DFEB8, 0x00000100, 0x00000043, 0x00000007, 0x802DFB40, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802DC7C8, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, 0x802DFB40, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000002, 0x802DE404, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000002, 0x802DE3C0, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, ED8E20_Pipe_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000002, 0x802DE3C0, 0x00000001, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x00000043, 0x00000001, ED8E20_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, 0x802DEF5C, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000003, 0x802DC7C8, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, 0x802E37A0, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, 0x802DE3C0, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, D_802DFEB8, 0x00000900, 0x00000043, 0x00000007, 0x802DFB40, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, ED8E20_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802DC7C8, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, 0x802DFB40, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000002, 0x802DE404, 0x00000000, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000002, 0x802DE3C0, 0x00000001, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010000, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, 0x802DC7C8, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x00000043, 0x00000001, dead_flo_11_Pipe_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, 0x802DEF5C, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, 0x802E37A0, 0x00000163, 0x00000043, 0x00000002, D_802DFEB8, 0x00000100, 0x00000043, 0x00000007, 0x802DFB40, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802DC7C8, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, 0x802DFB40, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000002, 0x802DE404, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000002, 0x802DE3C0, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, dead_flo_11_Pipe_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000002, 0x802DE3C0, 0x00000001, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x00000043, 0x00000001, dead_flo_11_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, 0x802DEF5C, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000003, 0x802DC7C8, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, 0x802E37A0, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, 0x802DE3C0, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, D_802DFEB8, 0x00000900, 0x00000043, 0x00000007, 0x802DFB40, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, dead_flo_11_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802DC7C8, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, 0x802DFB40, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000002, 0x802DE404, 0x00000000, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240E70_ED9C90 -.word 0x00000043, 0x00000001, ED8E20_Pipe_AwaitDownInput, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802E0158, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, 0x802E01B8, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80240F4C_ED9D6C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, dead_flo_11_Pipe_AwaitDownInput, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802E0158, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, 0x802E01B8, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80240F4C_ED9D6C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240F4C_ED9D6C -.word 0x00000043, 0x00000001, ED8E20_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000002, 0x802DE3C0, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, ED8E20_Pipe_GetEntryPos, 0x00000043, 0x00000004, 0x802DE754, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, ED8E20_Pipe_GetEntryPos, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, 0x802DF380, 0x00200000, 0x00000001, 0x00000043, 0x00000001, ED8E20_Pipe_GetCameraYaw, 0x00000043, 0x00000003, 0x802DEF5C, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, 0x802DF380, 0x00200000, 0x00000000, 0x00000043, 0x00000002, 0x802E37A0, 0x00000163, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, D_802DFEB8, 0x00000800, 0x00000043, 0x00000007, 0x802DFB40, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DFABC, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, D_802DF3F0, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802E0158, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, 0x802E01B8, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, ED8E20_Pipe_SetAnimFlag, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, ED8E20_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802DEF5C, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, 0x802E37A0, 0x00000163, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010000, 0x00000043, 0x00000002, D_802DFEB8, 0x00000800, 0x00000043, 0x00000007, 0x802DFB40, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, 0x802DE3C0, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, ED8E20_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, dead_flo_11_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000002, 0x802DE3C0, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, dead_flo_11_Pipe_GetEntryPos, 0x00000043, 0x00000004, 0x802DE754, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, dead_flo_11_Pipe_GetEntryPos, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, 0x802DF380, 0x00200000, 0x00000001, 0x00000043, 0x00000001, dead_flo_11_Pipe_GetCameraYaw, 0x00000043, 0x00000003, 0x802DEF5C, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, 0x802DF380, 0x00200000, 0x00000000, 0x00000043, 0x00000002, 0x802E37A0, 0x00000163, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, D_802DFEB8, 0x00000800, 0x00000043, 0x00000007, 0x802DFB40, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DFABC, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, D_802DF3F0, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802E0158, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, 0x802E01B8, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, dead_flo_11_Pipe_SetAnimFlag, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, dead_flo_11_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802DEF5C, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, 0x802E37A0, 0x00000163, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010000, 0x00000043, 0x00000002, D_802DFEB8, 0x00000800, 0x00000043, 0x00000007, 0x802DFB40, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, 0x802DE3C0, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, dead_flo_11_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024145C_EDA27C .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x802431A8, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/dead/EDC6D0.data.s b/ver/us/asm/data/world/dead/flo_12/EDC6D0.data.s similarity index 72% rename from ver/us/asm/data/dead/EDC6D0.data.s rename to ver/us/asm/data/world/dead/flo_12/EDC6D0.data.s index e0922e951c..41fca310d2 100644 --- a/ver/us/asm/data/dead/EDC6D0.data.s +++ b/ver/us/asm/data/world/dead/flo_12/EDC6D0.data.s @@ -24,15 +24,15 @@ dlabel D_80240B78_EDCB58 .word 0x00000047, 0x00000005, D_80240B1C_EDCAFC, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240BA4_EDCB84 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleTimeLeft, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF9718896, 0x00000000, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_802429B8_EDE998, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000000B, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFBF, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF2E, 0x00000024, 0x00000002, 0xFE363C82, 0x0000005A, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF92, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80240870_EDC850, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C81, 0x00000082, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFB0, 0x00000024, 0x00000002, 0xFE363C83, 0x000000AA, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80240870_EDC850, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFEF2, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFB0, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFF1F, 0x00000024, 0x00000002, 0xFE363C83, 0x0000007D, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80240870_EDC850, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000044, 0x00000001, D_802419F4_EDD9D4, 0x00000012, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80240B78_EDCB58, 0x00000044, 0x00000001, 0x80285C70, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80240750_EDC730, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, func_80240000_EDBFE0, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleTimeLeft, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF9718896, 0x00000000, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_802429B8_EDE998, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000000B, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFBF, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF2E, 0x00000024, 0x00000002, 0xFE363C82, 0x0000005A, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF92, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80240870_EDC850, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C81, 0x00000082, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFB0, 0x00000024, 0x00000002, 0xFE363C83, 0x000000AA, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80240870_EDC850, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFEF2, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFB0, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFF1F, 0x00000024, 0x00000002, 0xFE363C83, 0x0000007D, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80240870_EDC850, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000044, 0x00000001, D_802419F4_EDD9D4, 0x00000012, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80240B78_EDCB58, 0x00000044, 0x00000001, 0x80285C70, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80240750_EDC730, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, dead_flo_12_func_80240000_EDBFE0, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 dlabel D_80240E30_EDCE10 .word 0x00000000, 0x00380028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 dlabel D_80240E5C_EDCE3C -.word 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, EDC020_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, EDC020_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802E2F8C, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, 0x802E2F30, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, 0x802E37A0, 0x00000165, 0x00000043, 0x00000002, 0x802E37A0, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, EDC020_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C83, 0x00000166, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, EDC020_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, EDC020_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C84, 0x00000165, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, EDC020_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000030, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000005, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000033, 0x00000003, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802E2F8C, 0xFE363C8B, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000003, 0x802E2F30, 0xFE363C8B, 0x00000001, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000030, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000005, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000014, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000046, 0x00000001, 0xFE363C85, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dead_flo_12_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dead_flo_12_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802E2F8C, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, 0x802E2F30, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, 0x802E37A0, 0x00000165, 0x00000043, 0x00000002, 0x802E37A0, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dead_flo_12_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C83, 0x00000166, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dead_flo_12_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, dead_flo_12_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C84, 0x00000165, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, dead_flo_12_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000030, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000005, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000033, 0x00000003, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802E2F8C, 0xFE363C8B, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000003, 0x802E2F30, 0xFE363C8B, 0x00000001, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000030, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000005, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000014, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000046, 0x00000001, 0xFE363C85, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000 -dlabel EDC020_varStash +dlabel dead_flo_12_varStash .word 0x00000000 dlabel D_802417F0_EDD7D0 @@ -45,10 +45,10 @@ dlabel D_80241854_EDD834 .word 0x00000000 dlabel D_80241858_EDD838 -.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EDC020_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 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_80240614_EDC5F4, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dead_flo_12_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 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_80240614_EDC5F4, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024199C_EDD97C -.word 0x00000043, 0x00000002, func_8024064C_EDC62C, 0xFE363C80, 0x0000004E, 0x00000006, D_80241858_EDD838, 0x00000010, 0x00000000, EDC020_D_802429E0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802405C0_EDC5A0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, func_8024064C_EDC62C, 0xFE363C80, 0x0000004E, 0x00000006, D_80241858_EDD838, 0x00000010, 0x00000000, dead_flo_12_D_802429E0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802405C0_EDC5A0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802419EC_EDD9CC .word 0x0000001E, 0x00000000 diff --git a/ver/us/asm/data/dead/EE20E0.data.s b/ver/us/asm/data/world/dead/flo_13/EE20E0.data.s similarity index 95% rename from ver/us/asm/data/dead/EE20E0.data.s rename to ver/us/asm/data/world/dead/flo_13/EE20E0.data.s index 9b2fd5d612..cfc46ba833 100644 --- a/ver/us/asm/data/dead/EE20E0.data.s +++ b/ver/us/asm/data/world/dead/flo_13/EE20E0.data.s @@ -36,19 +36,19 @@ dlabel D_80243E54_EE2814 .word 0x00000047, 0x00000005, D_80243DF8_EE27B8, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80243D9C_EE275C, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243E9C_EE285C -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleTimeLeft, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_80247A4C_EE640C, 0x00000046, 0x00000001, D_80243A28_EE23E8, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000000D, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0x00000112, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF77, 0x00000024, 0x00000002, 0xFE363C82, 0x00000247, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFC0, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80243AF0_EE24B0, 0x00000024, 0x00000002, 0xFE363C80, 0x000001B1, 0x00000024, 0x00000002, 0xFE363C81, 0x0000006C, 0x00000024, 0x00000002, 0xFE363C82, 0x00000244, 0x00000024, 0x00000002, 0xFE363C83, 0x000000A9, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80243AF0_EE24B0, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFE34, 0x00000024, 0x00000002, 0xFE363C81, 0x0000005A, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFF83, 0x00000024, 0x00000002, 0xFE363C83, 0x00000082, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80243AF0_EE24B0, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFE5C, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF7E, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFEFC, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFA6, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80243AF0_EE24B0, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFF24, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF77, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFCE, 0x00000024, 0x00000002, 0xFE363C84, 0x000000A0, 0x00000044, 0x00000001, D_80243AF0_EE24B0, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80243E54_EE2814, 0x00000044, 0x00000001, 0x80285C70, 0x00000046, 0x00000001, D_80243960_EE2320, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, func_80240000_EDE9C0, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleTimeLeft, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_80247A4C_EE640C, 0x00000046, 0x00000001, D_80243A28_EE23E8, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000000D, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0x00000112, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF77, 0x00000024, 0x00000002, 0xFE363C82, 0x00000247, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFC0, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80243AF0_EE24B0, 0x00000024, 0x00000002, 0xFE363C80, 0x000001B1, 0x00000024, 0x00000002, 0xFE363C81, 0x0000006C, 0x00000024, 0x00000002, 0xFE363C82, 0x00000244, 0x00000024, 0x00000002, 0xFE363C83, 0x000000A9, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80243AF0_EE24B0, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFE34, 0x00000024, 0x00000002, 0xFE363C81, 0x0000005A, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFF83, 0x00000024, 0x00000002, 0xFE363C83, 0x00000082, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80243AF0_EE24B0, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFE5C, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF7E, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFEFC, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFA6, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80243AF0_EE24B0, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFF24, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF77, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFCE, 0x00000024, 0x00000002, 0xFE363C84, 0x000000A0, 0x00000044, 0x00000001, D_80243AF0_EE24B0, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80243E54_EE2814, 0x00000044, 0x00000001, 0x80285C70, 0x00000046, 0x00000001, D_80243960_EE2320, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, dead_flo_13_func_80240000_EDE9C0, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802441B0_EE2B70 .word 0x00000000, 0x00200018, 0x00000000, 0x00000000, 0x00000000, 0x8007D3C0, 0x00000000, 0x8007D4EC, 0x00000000, 0x00000000, 0x00140000 -dlabel EDEA00_FlyingAI_JumpVels +dlabel dead_flo_13_FlyingAI_JumpVels .float 4.5, 3.5, 2.6, 2.0, 1.5, 20.0 dlabel D_802441F4_EE2BB4 .word 0x3FC00000, 0x0000003C, 0x0000001E, 0x42700000, 0x42480000, 0x00000003, 0x40600000, 0x0000003C, 0x0000000A, 0x42A00000, 0x428C0000, 0x00000001 dlabel D_80244224_EE2BE4 -.word 0x0000005A, 0x00000001, D_80247B44_EE6504, 0x00000043, 0x00000003, 0x8004930C, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0xFFFFFD76, 0x00000043, 0x00000003, 0x8004930C, 0x00000006, 0x0000001E, 0x00000043, 0x00000003, 0x8004930C, 0x00000001, 0x00000190, 0x00000043, 0x00000002, EDEA00_LakituAI_Main, D_802441F4_EE2BB4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000005A, 0x00000001, D_80247B44_EE6504, 0x00000043, 0x00000003, 0x8004930C, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0xFFFFFD76, 0x00000043, 0x00000003, 0x8004930C, 0x00000006, 0x0000001E, 0x00000043, 0x00000003, 0x8004930C, 0x00000001, 0x00000190, 0x00000043, 0x00000002, dead_flo_13_LakituAI_Main, D_802441F4_EE2BB4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802442A0_EE2C60 .word 0x00000000, 0x001C0018, 0x00000000, 0x00000000, D_80244224_EE2BE4, 0x8007D3C0, 0x00000000, 0x8007D4EC, 0x00000000, 0x00000000, 0x00140000 @@ -57,7 +57,7 @@ dlabel D_802442CC_EE2C8C .word 0x3FC00000, 0x0000001E, 0x00000032, 0x42700000, 0x41F00000, 0x00000003, 0x40C00000, 0x00000000, 0x00000000, 0x42C80000, 0x41F00000, 0x00000003 dlabel D_802442FC_EE2CBC -.word 0x00000043, 0x00000003, 0x8004930C, 0x00000002, 0x00000003, 0x00000043, 0x00000003, 0x8004930C, 0x00000003, 0x00000012, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0x00000003, 0x00000043, 0x00000003, 0x8004930C, 0x00000007, 0x00000004, 0x0000005A, 0x00000001, 0x80247BB8, 0x00000043, 0x00000002, EDEA00_SpinyAI_Main, D_802442CC_EE2C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, 0x8004930C, 0x00000002, 0x00000003, 0x00000043, 0x00000003, 0x8004930C, 0x00000003, 0x00000012, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0x00000003, 0x00000043, 0x00000003, 0x8004930C, 0x00000007, 0x00000004, 0x0000005A, 0x00000001, 0x80247BB8, 0x00000043, 0x00000002, dead_flo_13_SpinyAI_Main, D_802442CC_EE2C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244378_EE2D38 .word 0x00000043, 0x00000005, 0x802DB310, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, 0x8004861C, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x8004930C, 0x0000000A, 0x00000064, 0x00000043, 0x00000001, 0x800486CC, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, 0x800499B0, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, 0x80049738, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, 0x800483E0, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -75,10 +75,10 @@ dlabel D_802444E8_EE2EA8 .word 0x41200000, 0x00000000, 0x42340000, 0xC2B40000, 0x41A00000, 0x42340000, 0xC33E0000, 0x42700000, 0x42340000, 0xC3910000, 0x430C0000, 0x42340000, 0xC3C30000, 0x43960000, 0x42340000 dlabel D_80244524_EE2EE4 -.word 0x00000043, 0x00000005, 0x802DC654, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000001, EDEA00_UnkFunc42, 0x00000043, 0x00000004, 0x802DC064, 0x00000000, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000043, 0x00000004, 0x802E1D58, 0xFFFFFFFC, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000003, 0x802DF124, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000005, 0x802DC654, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000001, dead_flo_13_UnkFunc42, 0x00000043, 0x00000004, 0x802DC064, 0x00000000, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000043, 0x00000004, 0x802E1D58, 0xFFFFFFFC, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000003, 0x802DF124, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244628_EE2FE8 -.word 0x00000043, 0x00000005, 0x802DC654, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0x00000001, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000001, EDEA00_UnkFunc42, 0x00000043, 0x00000004, 0x802DC064, 0x00000001, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000043, 0x00000004, 0x802E1D58, 0xFFFFFFFC, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000033, 0x00000043, 0x00000004, 0x802E1D58, 0x00000000, 0x00000001, 0xFE363C8B, 0x00000043, 0x00000004, 0x802DC064, 0x00000000, 0xFE363C8B, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802DF124, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000005, 0x802DC654, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0x00000001, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000001, dead_flo_13_UnkFunc42, 0x00000043, 0x00000004, 0x802DC064, 0x00000001, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000043, 0x00000004, 0x802E1D58, 0xFFFFFFFC, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000033, 0x00000043, 0x00000004, 0x802E1D58, 0x00000000, 0x00000001, 0xFE363C8B, 0x00000043, 0x00000004, 0x802DC064, 0x00000000, 0xFE363C8B, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802DF124, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244774_EE3134 .word 0x00000024, 0x00000002, 0xFD050F8A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000002, 0x00000043, 0x00000005, 0x802DC654, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, 0x802DB210, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802DC654, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, 0x802DB210, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000002, 0x00000043, 0x00000005, 0x802DC654, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000005, 0x802DB210, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802DC654, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000005, 0x802DB210, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFD050F8A, 0x00000001, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -93,7 +93,7 @@ dlabel D_802450DC_EE3A9C .word 0x00000043, 0x00000005, 0x802DC654, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, 0x802E20AC, 0xFE363C80, 0xFE363C82, 0x00000078, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000005, 0x802DC654, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x000000FA, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24A9080, 0xF24A5C80, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, 0x802DC3E0, 0x00000001, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802DD810, 0x00000001, 0x00CC0004, 0x00CC0001, 0x00000000, 0x001100B4, 0x00000043, 0x00000004, 0x802DC3E0, 0xFFFFFFFC, 0x00000001, 0x00000001, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x00000258, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24AA280, 0xF24A5A80, 0x00000043, 0x00000004, 0x802D914C, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, 0x802D91E8, 0x00000000, 0x00000082, 0xFFFFFF38, 0x00000043, 0x00000004, 0x802D9284, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80243470_EE1E30, 0x00000037, 0x00000057, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0x00000001, 0x00000100, 0x00000001, 0x00000045, 0x00000002, D_80244628_EE2FE8, 0xFE363C89, 0x00000043, 0x00000005, func_802E2A80, 0x00000037, D_802444E8_EE2EA8, 0x00000005, 0x00000000, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, func_802E2B74, 0x00000043, 0x00000005, 0x802DB210, 0x00000001, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000049, 0x00000001, 0xFE363C89, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x00000043, 0x00000002, 0x802DCB18, 0x00000008, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000008, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000027, 0x00000002, 0xFE363C82, 0x00000014, 0x00000027, 0x00000002, 0xFE363C83, 0x00000014, 0x00000043, 0x00000006, 0x802DBC24, 0xFFFFFFFC, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFC, 0x00080009, 0x00080001, 0x00000005, 0x001100B5, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000001, 0x802DCEE8, 0x00000043, 0x00000003, 0x802D9DE4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024550C_EE3ECC -.word 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x0008000A, 0x00080004, 0x00000000, 0x001100A2, 0x00000043, 0x00000005, 0x802DB210, 0x00000001, 0xFFFFFEDE, 0x00000078, 0x0000002D, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00080001, 0x00000043, 0x00000002, 0x802DE6A4, 0x0001002A, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, 0x802DEF5C, 0x0000010E, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0x00000001, 0x00CC0004, 0x00CC0001, 0x00000005, 0x001100A3, 0x00000043, 0x00000003, 0x802DB654, 0x00000001, 0x00CC0007, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x000001F4, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24A9080, 0xF24A6280, 0x00000043, 0x00000004, 0x802D914C, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, 0x802D91E8, 0x00000000, 0x00000082, 0xFFFFFF38, 0x00000043, 0x00000004, 0x802D9284, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x00000190, 0x00000043, 0x00000004, 0x802D91E8, 0x00000000, 0x00000082, 0x0000003C, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80243470_EE1E30, 0x00000050, 0x00000057, 0x00000000, 0x00000045, 0x00000002, D_80244628_EE2FE8, 0xFE363C89, 0x00000043, 0x00000005, func_802E2A80, 0x00000050, D_802444AC_EE2E6C, 0x00000005, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802E2B74, 0x00000043, 0x00000005, 0x802DB210, 0x00000001, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000049, 0x00000001, 0xFE363C89, 0x00000043, 0x00000003, 0x802DB654, 0x00000001, 0x00CC0009, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, 0x802DC654, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x000000FA, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24A9080, 0xF24A5C80, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x00080009, 0x00080001, 0x00000000, 0x001100A4, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000028, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x0000012C, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, 0x802DD810, 0x00000001, 0x00CC0008, 0x00CC0008, 0x00000000, 0x001100A5, 0x00000043, 0x00000005, 0x802DC654, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x000000FA, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x0008000B, 0x00080003, 0x00000000, 0x001100A6, 0x00000043, 0x00000003, 0x802DB654, 0x00000000, 0x00080001, 0x00000043, 0x00000005, 0x802DD82C, 0x00000000, 0x00080009, 0x00080001, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000028, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x0000015E, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24AA280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, 0x802DD810, 0x00000001, 0x00CC000A, 0x00CC0009, 0x00000000, 0x001100A7, 0x00000043, 0x00000002, 0x802DE138, 0x001E0020, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000046, 0x00000001, D_80244950_EE3310, 0x00000008, 0x00000001, 0x0000000A, 0x00000004, 0x00000001, 0x0000000A, 0x00000012, 0x00000000, 0x00000043, 0x00000006, 0x802DD848, 0x00000001, 0x00CC0004, 0x00CC0001, 0x00000000, 0x001100A9, 0x00000043, 0x00000003, 0x802DB654, 0x00000001, 0x00CC0001, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010029, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, 0x802DC654, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x000000FA, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x0008000B, 0x00080003, 0x00000000, 0x001100AA, 0x00000043, 0x00000003, 0x802DB654, 0x00000000, 0x00080001, 0x00000043, 0x00000005, 0x802DD82C, 0x00000000, 0x00080009, 0x00080001, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000028, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x0000015E, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x0008000B, 0x00080003, 0x00000000, 0x001100AB, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, 0x802DE138, 0x001E0021, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000006, 0x802DD848, 0x00000000, 0x00080009, 0x00080001, 0x00000000, 0x001100AC, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, 0x802DD848, 0x00000000, 0x00080009, 0x00080001, 0x00000000, 0x001100AD, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000006, 0x802DD848, 0x00000000, 0x00080009, 0x00080001, 0x00000000, 0x001100AE, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000006, 0x802DD848, 0x00000000, 0x00080009, 0x00080001, 0x00000000, 0x001100AF, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, 0x802DC064, 0x00000001, 0x0000005A, 0x00000001, 0x00000043, 0x00000003, 0x802DB654, 0x00000001, 0x00CC0009, 0x00000043, 0x00000006, 0x802DD810, 0x00000001, 0x00CC000A, 0x00CC0009, 0x00000005, 0x001100B0, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x00080009, 0x00080001, 0x00000000, 0x001100B1, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000006, 0x802DD810, 0x00000001, 0x00CC000A, 0x00CC0009, 0x00000005, 0x001100B2, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x00080009, 0x00080001, 0x00000000, 0x001100B3, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000003, 0x802D9DE4, 0x00000000, 0xF24BE280, 0x00000057, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000003, 0x802DB57C, 0x00000000, 0xF24A8880, 0x00000043, 0x00000005, 0x802DB78C, 0x00000000, 0xFE363C80, 0x0000003C, 0x00000000, 0x00000043, 0x00000003, EDEA00_ChangeNpcToPartner, 0x00000000, 0x00000008, 0x00000043, 0x00000001, EE2040_LoadPartyImage, 0x00000044, 0x00000001, D_8024397C_EE233C, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D0190, 0x000000A0, 0x00000028, 0x00000044, 0x00000001, D_802439A8_EE2368, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000033, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000046, 0x00000001, D_802450DC_EE3A9C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x0008000A, 0x00080004, 0x00000000, 0x001100A2, 0x00000043, 0x00000005, 0x802DB210, 0x00000001, 0xFFFFFEDE, 0x00000078, 0x0000002D, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00080001, 0x00000043, 0x00000002, 0x802DE6A4, 0x0001002A, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, 0x802DEF5C, 0x0000010E, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0x00000001, 0x00CC0004, 0x00CC0001, 0x00000005, 0x001100A3, 0x00000043, 0x00000003, 0x802DB654, 0x00000001, 0x00CC0007, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x000001F4, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24A9080, 0xF24A6280, 0x00000043, 0x00000004, 0x802D914C, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, 0x802D91E8, 0x00000000, 0x00000082, 0xFFFFFF38, 0x00000043, 0x00000004, 0x802D9284, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x00000190, 0x00000043, 0x00000004, 0x802D91E8, 0x00000000, 0x00000082, 0x0000003C, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80243470_EE1E30, 0x00000050, 0x00000057, 0x00000000, 0x00000045, 0x00000002, D_80244628_EE2FE8, 0xFE363C89, 0x00000043, 0x00000005, func_802E2A80, 0x00000050, D_802444AC_EE2E6C, 0x00000005, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802E2B74, 0x00000043, 0x00000005, 0x802DB210, 0x00000001, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000049, 0x00000001, 0xFE363C89, 0x00000043, 0x00000003, 0x802DB654, 0x00000001, 0x00CC0009, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, 0x802DC654, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x000000FA, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24A9080, 0xF24A5C80, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x00080009, 0x00080001, 0x00000000, 0x001100A4, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000028, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x0000012C, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, 0x802DD810, 0x00000001, 0x00CC0008, 0x00CC0008, 0x00000000, 0x001100A5, 0x00000043, 0x00000005, 0x802DC654, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x000000FA, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x0008000B, 0x00080003, 0x00000000, 0x001100A6, 0x00000043, 0x00000003, 0x802DB654, 0x00000000, 0x00080001, 0x00000043, 0x00000005, 0x802DD82C, 0x00000000, 0x00080009, 0x00080001, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000028, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x0000015E, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24AA280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, 0x802DD810, 0x00000001, 0x00CC000A, 0x00CC0009, 0x00000000, 0x001100A7, 0x00000043, 0x00000002, 0x802DE138, 0x001E0020, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000046, 0x00000001, D_80244950_EE3310, 0x00000008, 0x00000001, 0x0000000A, 0x00000004, 0x00000001, 0x0000000A, 0x00000012, 0x00000000, 0x00000043, 0x00000006, 0x802DD848, 0x00000001, 0x00CC0004, 0x00CC0001, 0x00000000, 0x001100A9, 0x00000043, 0x00000003, 0x802DB654, 0x00000001, 0x00CC0001, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010029, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, 0x802DC654, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x000000FA, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x0008000B, 0x00080003, 0x00000000, 0x001100AA, 0x00000043, 0x00000003, 0x802DB654, 0x00000000, 0x00080001, 0x00000043, 0x00000005, 0x802DD82C, 0x00000000, 0x00080009, 0x00080001, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000028, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x0000015E, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x0008000B, 0x00080003, 0x00000000, 0x001100AB, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, 0x802DE138, 0x001E0021, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000006, 0x802DD848, 0x00000000, 0x00080009, 0x00080001, 0x00000000, 0x001100AC, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, 0x802DD848, 0x00000000, 0x00080009, 0x00080001, 0x00000000, 0x001100AD, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000006, 0x802DD848, 0x00000000, 0x00080009, 0x00080001, 0x00000000, 0x001100AE, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000006, 0x802DD848, 0x00000000, 0x00080009, 0x00080001, 0x00000000, 0x001100AF, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, 0x802DC064, 0x00000001, 0x0000005A, 0x00000001, 0x00000043, 0x00000003, 0x802DB654, 0x00000001, 0x00CC0009, 0x00000043, 0x00000006, 0x802DD810, 0x00000001, 0x00CC000A, 0x00CC0009, 0x00000005, 0x001100B0, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x00080009, 0x00080001, 0x00000000, 0x001100B1, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000006, 0x802DD810, 0x00000001, 0x00CC000A, 0x00CC0009, 0x00000005, 0x001100B2, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x00080009, 0x00080001, 0x00000000, 0x001100B3, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000003, 0x802D9DE4, 0x00000000, 0xF24BE280, 0x00000057, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000003, 0x802DB57C, 0x00000000, 0xF24A8880, 0x00000043, 0x00000005, 0x802DB78C, 0x00000000, 0xFE363C80, 0x0000003C, 0x00000000, 0x00000043, 0x00000003, dead_flo_13_ChangeNpcToPartner, 0x00000000, 0x00000008, 0x00000043, 0x00000001, dead_flo_13_LoadPartyImage, 0x00000044, 0x00000001, D_8024397C_EE233C, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D0190, 0x000000A0, 0x00000028, 0x00000044, 0x00000001, D_802439A8_EE2368, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000033, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000046, 0x00000001, D_802450DC_EE3A9C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80246100_EE4AC0 .word 0x00000043, 0x00000002, 0x8004861C, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00080004, 0x00000043, 0x00000004, 0x802D8FA8, 0x00000000, 0x00000006, 0x00000001, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFF, 0xFE363C83, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C83, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24ABE80, 0xF24A5C80, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000044, 0x00000001, D_8024550C_EE3ECC, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/dead/EE8970.data.s b/ver/us/asm/data/world/dead/flo_14/EE8970.data.s similarity index 87% rename from ver/us/asm/data/dead/EE8970.data.s rename to ver/us/asm/data/world/dead/flo_14/EE8970.data.s index ba59604ff5..1ecc4aeef2 100644 --- a/ver/us/asm/data/dead/EE8970.data.s +++ b/ver/us/asm/data/world/dead/flo_14/EE8970.data.s @@ -9,7 +9,7 @@ dlabel D_80242420_EE89D0 .word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000030, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000031, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242490_EE8A40 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, EE65B0_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EE65B0_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, dead_flo_14_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, dead_flo_14_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024252C_EE8ADC .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, D_80245340_EEB8F0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -30,7 +30,7 @@ dlabel D_80242C30_EE91E0 .word 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, 0x802E1D00, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242EDC_EE948C -.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C86, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, EE65B0_UnkFunc43, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C86, 0x00000001, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C82, 0x00000008, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000011, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000E, 0x00000000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, 0x802E382C, 0x000000F8, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000057, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x00000000, 0x000000B4, 0x00000014, 0x00000002, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C88, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C89, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C87, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C86, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, dead_flo_14_UnkFunc43, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C86, 0x00000001, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C82, 0x00000008, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000011, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000E, 0x00000000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, 0x802E382C, 0x000000F8, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000057, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x00000000, 0x000000B4, 0x00000014, 0x00000002, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C88, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C89, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C87, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802431FC_EE97AC .word 0x00000000 @@ -65,14 +65,14 @@ dlabel D_80243B4C_EEA0FC dlabel D_80243EA8_EEA458 .word 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000001F, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000020, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000021, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000022, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000023, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFD26, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF7E, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFE2A, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFBA, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80242C30_EE91E0, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFD26, 0x00000024, 0x00000002, 0xFE363C81, 0x00000046, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFE2A, 0x00000024, 0x00000002, 0xFE363C83, 0x0000008C, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80242C30_EE91E0, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFEE8, 0x00000024, 0x00000002, 0xFE363C81, 0x00000082, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFF92, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFBA, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80242C30_EE91E0, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFEE8, 0x00000024, 0x00000002, 0xFE363C81, 0x00000046, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFF6, 0x00000024, 0x00000002, 0xFE363C83, 0x0000008C, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80242C30_EE91E0, 0x00000043, 0x00000002, 0x802D6400, 0x00000060, 0x00000024, 0x00000002, 0xFE363C83, 0x00000060, 0x00000024, 0x00000002, 0xFE363C84, 0x00000061, 0x00000024, 0x00000002, 0xFE363C85, 0x00000062, 0x00000024, 0x00000002, 0xFE363C86, 0x00000063, 0x00000024, 0x00000002, 0xFE363C8A, 0x000000AE, 0x00000044, 0x00000001, D_80242EDC_EE948C, 0x00000043, 0x00000002, 0x802D6400, 0x00000052, 0x00000024, 0x00000002, 0xFE363C83, 0x00000052, 0x00000024, 0x00000002, 0xFE363C84, 0x00000053, 0x00000024, 0x00000002, 0xFE363C85, 0x00000054, 0x00000024, 0x00000002, 0xFE363C86, 0x00000055, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, D_80242EDC_EE948C, 0x00000043, 0x00000002, 0x802D6400, 0x0000004C, 0x00000024, 0x00000002, 0xFE363C83, 0x0000004C, 0x00000024, 0x00000002, 0xFE363C84, 0x0000004D, 0x00000024, 0x00000002, 0xFE363C85, 0x0000004E, 0x00000024, 0x00000002, 0xFE363C86, 0x0000004F, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, D_80242EDC_EE948C, 0x00000043, 0x00000002, 0x802D6400, 0x0000005A, 0x00000024, 0x00000002, 0xFE363C83, 0x0000005A, 0x00000024, 0x00000002, 0xFE363C84, 0x0000005B, 0x00000024, 0x00000002, 0xFE363C85, 0x0000005C, 0x00000024, 0x00000002, 0xFE363C86, 0x0000005D, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, D_80242EDC_EE948C, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000000F, 0x7FFFFE00, 0x00000043, 0x00000003, 0x802D63A8, 0x0000007C, 0x00002711, 0x00000043, 0x00000003, 0x802D63A8, 0x0000007C, 0x00002712, 0x00000043, 0x00000003, 0x802D63A8, 0x0000007C, 0x00002713, 0x00000043, 0x00000003, 0x802D63A8, 0x0000007C, 0x00002714, 0x00000043, 0x00000003, 0x802D63A8, 0x0000007C, 0x00002715, 0x00000043, 0x00000003, 0x802D6708, 0x0000007B, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x0000007C, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00002711, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00002712, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00002713, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00002714, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00002715, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00002711, 0x00000044, 0x00000001, D_80243B4C_EEA0FC, 0x00000024, 0x00000002, 0xFE363C80, 0x00002712, 0x00000044, 0x00000001, D_80243B4C_EEA0FC, 0x00000024, 0x00000002, 0xFE363C80, 0x00002713, 0x00000044, 0x00000001, D_80243B4C_EEA0FC, 0x00000024, 0x00000002, 0xFE363C80, 0x00002714, 0x00000044, 0x00000001, D_80243B4C_EEA0FC, 0x00000024, 0x00000002, 0xFE363C80, 0x00002715, 0x00000044, 0x00000001, D_80243B4C_EEA0FC, 0x00000043, 0x00000004, 0x802D711C, 0x00000000, 0x0000007B, 0x00000001, 0x00000043, 0x00000004, 0x802D6920, 0x00000001, func_80240504_EE6AB4, 0x00000000, 0x00000043, 0x00000004, 0x802D657C, 0x0000007B, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000004, 0x802D657C, 0x00002711, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000004, 0x802D657C, 0x00002712, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000004, 0x802D657C, 0x00002713, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000004, 0x802D657C, 0x00002714, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000004, 0x802D657C, 0x00002715, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000004, 0x802D711C, 0x00000001, 0x00000039, 0x00000001, 0x00000043, 0x00000004, 0x802D6920, 0x00000002, func_802407D4_EE6D84, 0x00000000, 0x00000043, 0x00000004, 0x802D657C, 0x00000039, 0x00000002, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 -dlabel EE70C0_FlyingAI_JumpVels +dlabel dead_flo_14_FlyingAI_JumpVels .float 4.5, 3.5, 2.6, 2.0, 1.5, 20.0 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, EE70C0_FlyingAI_Main, 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, dead_flo_14_FlyingAI_Main, 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 @@ -87,7 +87,7 @@ dlabel D_80244630_EEABE0 .word 0x00000000 dlabel D_80244634_EEABE4 -.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, EE70C0_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, EE70C0_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.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, dead_flo_14_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, dead_flo_14_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244768_EEAD18 .word 0x00000043, 0x00000002, func_802422EC_EE889C, 0xFE363C80, 0x0000004E, 0x00000006, D_80244634_EEABE4, 0x00000010, 0x00000000, D_802453E0_EEB990, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242260_EE8810, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -114,7 +114,7 @@ dlabel D_80244F60_EEB510 .word 0x00000043, 0x00000007, 0x802E4310, 0x0000015C, 0x000002A3, 0x0000003C, 0xFFFFFF9C, 0x00000011, 0xF84060EB, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 dlabel D_80244FA0_EEB550 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80242390_EE8940, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0xFE363C84, 0x00000043, 0x00000002, D_802DF3F0, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000017, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802D6400, 0xFE363C85, 0x00000043, 0x00000006, 0x802E382C, 0x000001DB, 0x00400000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C87, 0x0000005A, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C88, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0xFE363C89, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C87, 0xFE363C88, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000032, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C87, 0x00000000, 0x00000028, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C87, 0xFE363C88, 0x0000000E, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802D6400, 0xFE363C85, 0x00000043, 0x00000006, 0x802E382C, 0x000001DC, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000057, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000001, 0xFE363C89, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000032, 0x0000000F, 0x00000002, 0xFE363C87, 0x0000005A, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFE363C87, 0x0000005A, 0x00000013, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C85, 0xFE363C87, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C86, 0xFE363C87, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, dead_flo_14_func_80242390_EE8940, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0xFE363C84, 0x00000043, 0x00000002, D_802DF3F0, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000017, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802D6400, 0xFE363C85, 0x00000043, 0x00000006, 0x802E382C, 0x000001DB, 0x00400000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C87, 0x0000005A, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C88, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0xFE363C89, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C87, 0xFE363C88, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000032, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C87, 0x00000000, 0x00000028, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C87, 0xFE363C88, 0x0000000E, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802D6400, 0xFE363C85, 0x00000043, 0x00000006, 0x802E382C, 0x000001DC, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000057, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000001, 0xFE363C89, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000032, 0x0000000F, 0x00000002, 0xFE363C87, 0x0000005A, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFE363C87, 0x0000005A, 0x00000013, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C85, 0xFE363C87, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C86, 0xFE363C87, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80245254_EEB804 .word 0x00000024, 0x00000002, 0xFE363C84, 0x00000015, 0x00000024, 0x00000002, 0xFE363C85, 0x00000015, 0x00000024, 0x00000002, 0xFE363C86, 0x00000014, 0x00000024, 0x00000002, 0xFE363C87, 0xFD050F8A, 0x00000024, 0x00000002, 0xFE363C88, 0xFD050F8B, 0x00000024, 0x00000002, 0xFE363C89, 0x00000016, 0x00000044, 0x00000001, D_80244FA0_EEB550, 0x00000024, 0x00000002, 0xFE363C84, 0x00000011, 0x00000024, 0x00000002, 0xFE363C85, 0x0000001A, 0x00000024, 0x00000002, 0xFE363C86, 0x00000019, 0x00000024, 0x00000002, 0xFE363C87, 0xFD050F8C, 0x00000024, 0x00000002, 0xFE363C88, 0xFD050F8D, 0x00000024, 0x00000002, 0xFE363C89, 0x00000012, 0x00000044, 0x00000001, D_80244FA0_EEB550, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/dead/EEFAD0.data.s b/ver/us/asm/data/world/dead/flo_16/EEFAD0.data.s similarity index 77% rename from ver/us/asm/data/dead/EEFAD0.data.s rename to ver/us/asm/data/world/dead/flo_16/EEFAD0.data.s index 6c19fa76c6..5a0790bb4d 100644 --- a/ver/us/asm/data/dead/EEFAD0.data.s +++ b/ver/us/asm/data/world/dead/flo_16/EEFAD0.data.s @@ -21,34 +21,34 @@ dlabel D_80242BA0_EEFCA0 .word 0x0000000A, 0xC39B0000, 0x00000000, 0x00000000, 0x0000000B, 0x43988000, 0x42C80000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000 dlabel D_80242BD0_EEFCD0 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleTimeLeft, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_80244534_EF1634, 0x00000046, 0x00000001, D_80243FA4_EF10A4, 0x00000044, 0x00000001, D_802434CC_EF05CC, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000009, 0x00000002, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802D7384, D_80242BA0_EEFCA0, 0x00000057, 0x00000000, 0x00000043, 0x00000003, 0x802D6688, 0x00000010, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000011, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000012, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000014, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000016, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000018, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000013, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000015, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000017, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000019, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x0000008C, 0x0000000D, 0x00000002, 0xFE363C80, 0x00010000, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFF0000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x0000000C, 0x00000002, 0xFE363C81, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00010000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x00000002, 0x00000000, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000044, 0x00000001, D_80245224_EF2324, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80242B58_EEFC58, 0x00000044, 0x00000001, 0x80285C70, 0x00000046, 0x00000001, D_80242A30_EEFB30, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, EED100_DeadUnkFunc1, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleTimeLeft, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_80244534_EF1634, 0x00000046, 0x00000001, D_80243FA4_EF10A4, 0x00000044, 0x00000001, D_802434CC_EF05CC, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000009, 0x00000002, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802D7384, D_80242BA0_EEFCA0, 0x00000057, 0x00000000, 0x00000043, 0x00000003, 0x802D6688, 0x00000010, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000011, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000012, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000014, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000016, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000018, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000013, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000015, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000017, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000019, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x0000008C, 0x0000000D, 0x00000002, 0xFE363C80, 0x00010000, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFF0000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x0000000C, 0x00000002, 0xFE363C81, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00010000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x00000002, 0x00000000, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000044, 0x00000001, D_80245224_EF2324, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80242B58_EEFC58, 0x00000044, 0x00000001, 0x80285C70, 0x00000046, 0x00000001, D_80242A30_EEFB30, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, dead_flo_16_DeadUnkFunc1, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242F00_EF0000 .word 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, 0x802E1D00, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802431AC_EF02AC -.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C86, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, EED140_UnkFunc43, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C86, 0x00000001, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C82, 0x00000008, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000011, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000E, 0x00000000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, 0x802E382C, 0x000000F8, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000057, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x00000000, 0x000000B4, 0x00000014, 0x00000002, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C88, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C89, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C87, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C86, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, dead_flo_16_UnkFunc43, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C86, 0x00000001, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C82, 0x00000008, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000011, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000E, 0x00000000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, 0x802E382C, 0x000000F8, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000057, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x00000000, 0x000000B4, 0x00000014, 0x00000002, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C88, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C89, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C87, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802434CC_EF05CC .word 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000014, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFD1C, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF74, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFEFC, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFC9, 0x00000024, 0x00000002, 0xFE363C84, 0x00000064, 0x00000044, 0x00000001, D_80242F00_EF0000, 0x00000024, 0x00000002, 0xFE363C80, 0x000000FA, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF74, 0x00000024, 0x00000002, 0xFE363C82, 0x000002D5, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFC9, 0x00000024, 0x00000002, 0xFE363C84, 0x000000B4, 0x00000044, 0x00000001, D_80242F00_EF0000, 0x00000043, 0x00000002, 0x802D6400, 0x00000041, 0x00000024, 0x00000002, 0xFE363C83, 0x00000041, 0x00000024, 0x00000002, 0xFE363C84, 0x00000042, 0x00000024, 0x00000002, 0xFE363C85, 0x00000043, 0x00000024, 0x00000002, 0xFE363C86, 0x00000044, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, D_802431AC_EF02AC, 0x00000043, 0x00000002, 0x802D6400, 0x00000047, 0x00000024, 0x00000002, 0xFE363C83, 0x00000047, 0x00000024, 0x00000002, 0xFE363C84, 0x00000048, 0x00000024, 0x00000002, 0xFE363C85, 0x00000049, 0x00000024, 0x00000002, 0xFE363C86, 0x0000004A, 0x00000024, 0x00000002, 0xFE363C8A, 0x000000AE, 0x00000044, 0x00000001, D_802431AC_EF02AC, 0x00000043, 0x00000002, 0x802D6400, 0x0000004F, 0x00000024, 0x00000002, 0xFE363C83, 0x0000004F, 0x00000024, 0x00000002, 0xFE363C84, 0x00000050, 0x00000024, 0x00000002, 0xFE363C85, 0x00000051, 0x00000024, 0x00000002, 0xFE363C86, 0x00000052, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, D_802431AC_EF02AC, 0x00000043, 0x00000002, 0x802D6400, 0x00000055, 0x00000024, 0x00000002, 0xFE363C83, 0x00000055, 0x00000024, 0x00000002, 0xFE363C84, 0x00000056, 0x00000024, 0x00000002, 0xFE363C85, 0x00000057, 0x00000024, 0x00000002, 0xFE363C86, 0x00000058, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, D_802431AC_EF02AC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 -dlabel EED1E0_SuperBlock_CantUpgradeMessages +dlabel dead_flo_16_SuperBlock_CantUpgradeMessages .word 0x001D00F0, 0x001D00F1 -dlabel EED1E0_SuperBlock_PartnerIDs +dlabel dead_flo_16_SuperBlock_PartnerIDs .word 0x00010002, 0x00030004, 0x00090006, 0x00070008 -dlabel EED1E0_SuperBlock_UpgradeDescMessages +dlabel dead_flo_16_SuperBlock_UpgradeDescMessages .word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF -dlabel EED1E0_SuperBlock_UpgradeOrbAngles +dlabel dead_flo_16_SuperBlock_UpgradeOrbAngles .word 0x430C0000, 0x43340000, 0x435C0000 dlabel D_802437C4_EF08C4 -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, 0x802E37A0, 0x0000212D, 0x00000043, 0x00000002, EED1E0_SuperBlock_GatherEnergyFX, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802E37A0, 0x0000212E, 0x00000043, 0x00000003, EED1E0_SuperBlock_WhiteScreenFlash, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, 0x802E37A0, 0x0000208E, 0x00000043, 0x00000003, EED1E0_SuperBlock_WhiteScreenFlash, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, EED1E0_SuperBlock_HideBlockContent, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, EED1E0_SuperBlock_RadiateFaintEnergyFX, 0x00000043, 0x00000001, EED1E0_SuperBlock_PartnerSparkles2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, EED1E0_SuperBlock_PartnerSparkles4, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, EED1E0_SuperBlock_PartnerSparkles2, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, EED1E0_SuperBlock_AnimateEnergyOrbs, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, 0x802E37A0, 0x0000212D, 0x00000043, 0x00000002, dead_flo_16_SuperBlock_GatherEnergyFX, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802E37A0, 0x0000212E, 0x00000043, 0x00000003, dead_flo_16_SuperBlock_WhiteScreenFlash, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, 0x802E37A0, 0x0000208E, 0x00000043, 0x00000003, dead_flo_16_SuperBlock_WhiteScreenFlash, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, dead_flo_16_SuperBlock_HideBlockContent, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, dead_flo_16_SuperBlock_RadiateFaintEnergyFX, 0x00000043, 0x00000001, dead_flo_16_SuperBlock_PartnerSparkles2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, dead_flo_16_SuperBlock_PartnerSparkles4, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, dead_flo_16_SuperBlock_PartnerSparkles2, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, dead_flo_16_SuperBlock_AnimateEnergyOrbs, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243928_EF0A28 -.word 0x0000000A, 0x00000002, 0xF84060FB, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x80048290, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EED1E0_SuperBlock_WaitForPlayerToLand, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000001, 0x00200000, 0x00000043, 0x00000001, EED1E0_SuperBlock_SetOverride40, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, EED1E0_SuperBlock_StartGlowEffect, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, 0x802E4064, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, EED1E0_SuperBlock_CountEligiblePartners, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, EED1E0_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, EED1E0_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EED1E0_SuperBlock_ShowSelectPartnerMenu, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, EED1E0_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, EED1E0_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, EED1E0_SuperBlock_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, 0x802DCACC, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, 0x802DE138, 0x001E000D, 0x00000043, 0x00000001, 0x802DE040, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, EED1E0_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, EED1E0_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802437C4_EF08C4, 0x00000043, 0x00000003, EED1E0_SuperBlock_GetPartnerRank, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF84060FB, 0x00000001, 0x00000043, 0x00000002, EED1E0_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000001, EED1E0_SuperBlock_LoadCurrentPartnerName, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, EED1E0_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF84060FB, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x80048290, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, dead_flo_16_SuperBlock_WaitForPlayerToLand, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000001, 0x00200000, 0x00000043, 0x00000001, dead_flo_16_SuperBlock_SetOverride40, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, dead_flo_16_SuperBlock_StartGlowEffect, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, 0x802E4064, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, dead_flo_16_SuperBlock_CountEligiblePartners, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, dead_flo_16_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, dead_flo_16_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, dead_flo_16_SuperBlock_ShowSelectPartnerMenu, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, dead_flo_16_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, dead_flo_16_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, dead_flo_16_SuperBlock_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, 0x802DCACC, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, 0x802DE138, 0x001E000D, 0x00000043, 0x00000001, 0x802DE040, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, dead_flo_16_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, dead_flo_16_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802437C4_EF08C4, 0x00000043, 0x00000003, dead_flo_16_SuperBlock_GetPartnerRank, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF84060FB, 0x00000001, 0x00000043, 0x00000002, dead_flo_16_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000001, dead_flo_16_SuperBlock_LoadCurrentPartnerName, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, dead_flo_16_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243DA8_EF0EA8 .word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D83DC, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -57,19 +57,19 @@ dlabel D_80243E10_EF0F10 .word 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000002, 0x802DE6F8, 0x00000006, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000045, 0x00000002, D_80243DA8_EF0EA8, 0xFE363C8A, 0x00000043, 0x00000002, 0x802DE674, 0xF24A7D4D, 0x00000043, 0x00000005, 0x802DEF08, 0x000001C2, 0x000000B4, 0xFFFFFF88, 0x0000001E, 0x00000043, 0x00000002, 0x802DE6F8, 0x00000000, 0x00000043, 0x00000002, 0x802DE404, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243EE0_EF0FE0 -.word 0x0000000A, 0x00000002, 0xF97188A7, 0x00000000, 0x00000043, 0x00000001, EED1E0_UnkFunc44, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C80, 0x00000021, 0x00000002, 0x0000026C, 0x00000294, 0x00000043, 0x00000007, 0x802E4310, 0x0000015C, 0x00000280, 0x00000091, 0xFFFFFF9C, 0x0000000D, 0xF84060EC, 0x00000024, 0x00000002, 0xF97188A7, 0x00000001, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF97188A7, 0x00000000, 0x00000043, 0x00000001, dead_flo_16_UnkFunc44, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C80, 0x00000021, 0x00000002, 0x0000026C, 0x00000294, 0x00000043, 0x00000007, 0x802E4310, 0x0000015C, 0x00000280, 0x00000091, 0xFFFFFF9C, 0x0000000D, 0xF84060EC, 0x00000024, 0x00000002, 0xF97188A7, 0x00000001, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243FA4_EF10A4 .word 0x00000024, 0x00000002, 0xF97188A7, 0x00000000, 0x00000047, 0x00000005, D_80243EE0_EF0FE0, 0x00000080, 0x00000014, 0x00000001, 0x00000000, 0x00000043, 0x00000007, 0x8011A58C, 0x802F8DC0, 0x0000015E, 0x000000F0, 0xFFFFFF9C, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, 0x8011A8C0, 0xF84060FB, 0x00000043, 0x00000002, 0x8011A804, D_80243928_EF0A28, 0x00000043, 0x00000007, 0x8011A58C, 0x802F8EE0, 0x000001D8, 0x00000064, 0xFFFFFF9C, 0x00000000, 0x80000000, 0x00000043, 0x00000002, 0x8011A804, D_80243E10_EF0F10, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 -dlabel EEDF50_FlyingAI_JumpVels +dlabel dead_flo_16_FlyingAI_JumpVels .float 4.5, 3.5, 2.6, 2.0, 1.5, 20.0 dlabel D_80244088_EF1188 .word 0x3F800000, 0x0000002D, 0x0000003C, 0x42C80000, 0x00000000, 0x00000003, 0x40666666, 0x0000000A, 0x00000001, 0x42F00000, 0x00000000, 0x00000001 dlabel D_802440B8_EF11B8 -.word 0x00000043, 0x00000003, 0x8004930C, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0x00000000, 0x00000043, 0x00000003, 0x8004930C, 0x00000006, 0x00000000, 0x00000043, 0x00000003, 0x8004930C, 0x00000001, 0x00000258, 0x00000043, 0x00000002, EEDF50_FlyingNoAttackAI_Main, D_80244088_EF1188, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, 0x8004930C, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0x00000000, 0x00000043, 0x00000003, 0x8004930C, 0x00000006, 0x00000000, 0x00000043, 0x00000003, 0x8004930C, 0x00000001, 0x00000258, 0x00000043, 0x00000002, dead_flo_16_FlyingNoAttackAI_Main, D_80244088_EF1188, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244128_EF1228 .word 0x00000000, 0x0018001C, 0x00000000, 0x00000000, D_802440B8_EF11B8, 0x8007D3C0, 0x00000000, 0x8007D4EC, 0x00000000, 0x00000000, 0x00130000 diff --git a/ver/us/asm/data/dead/EF8250.data.s b/ver/us/asm/data/world/dead/flo_18/EF8250.data.s similarity index 81% rename from ver/us/asm/data/dead/EF8250.data.s rename to ver/us/asm/data/world/dead/flo_18/EF8250.data.s index d8a8787bfb..ed0a2e02b1 100644 --- a/ver/us/asm/data/dead/EF8250.data.s +++ b/ver/us/asm/data/world/dead/flo_18/EF8250.data.s @@ -9,7 +9,7 @@ dlabel D_80240830_EF82B0 .word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000033, 0x00000000, 0x00000008, 0x00000043, 0x00000004, 0x802D7AC0, 0x00000014, 0x80000025, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000031, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 dlabel D_802408C0_EF8340 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, EF7A80_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EF7A80_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, dead_flo_18_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, dead_flo_18_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024095C_EF83DC .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, D_80247070_EFEAF0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -21,19 +21,19 @@ dlabel D_802409E4_EF8464 .word 0x0000000B, 0xC3480000, 0x00000000, 0x42F00000, 0x0000000C, 0x00000000, 0x00000000, 0x42F00000, 0x0000000D, 0x432A0000, 0x00000000, 0x42F00000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000 dlabel D_80240A24_EF84A4 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleTimeLeft, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_802466CC_EFE14C, 0x00000044, 0x00000001, D_80247054_EFEAD4, 0x00000044, 0x00000001, D_802436E0_EFB160, 0x00000044, 0x00000001, D_80245704_EFD184, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000008, 0x00000002, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802D7384, D_802409E4_EF8464, 0x00000057, 0x00000000, 0x00000043, 0x00000003, 0x802D6688, 0x00000009, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000000B, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000000C, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000000D, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000000E, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000000F, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000007, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000008, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000000A, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000010, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000011, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF74, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802408C0_EF8340, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802408C0_EF8340, 0x00000057, 0x00000000, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_802409B8_EF8438, 0x00000044, 0x00000001, 0x80285C70, 0x00000012, 0x00000000, 0x00000044, 0x00000001, D_80244088_EFBB08, 0x00000044, 0x00000001, D_802409B8_EF8438, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80240830_EF82B0, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, EF7A80_DeadUnkFunc1, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetSleepBubbleTimeLeft, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_802466CC_EFE14C, 0x00000044, 0x00000001, D_80247054_EFEAD4, 0x00000044, 0x00000001, D_802436E0_EFB160, 0x00000044, 0x00000001, D_80245704_EFD184, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000008, 0x00000002, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802D7384, D_802409E4_EF8464, 0x00000057, 0x00000000, 0x00000043, 0x00000003, 0x802D6688, 0x00000009, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000000B, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000000C, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000000D, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000000E, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000000F, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000007, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000008, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000000A, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000010, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000011, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF74, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802408C0_EF8340, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802408C0_EF8340, 0x00000057, 0x00000000, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_802409B8_EF8438, 0x00000044, 0x00000001, 0x80285C70, 0x00000012, 0x00000000, 0x00000044, 0x00000001, D_80244088_EFBB08, 0x00000044, 0x00000001, D_802409B8_EF8438, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80240830_EF82B0, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, dead_flo_18_DeadUnkFunc1, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 dlabel D_80240E90_EF8910 .word 0x0000004D, 0x00000001, 0x0000000B, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000005E, 0x00000000, 0xF24A3A80, 0xF24C1280, 0xF24A6A1A, 0xF24BBE1A, 0xF24C1280, 0xF24A6A1A, 0xF24A7C80, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000001, func_80240340_EF7DC0, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000005E, 0x00000000, 0xF24BBE1A, 0xF24C1280, 0xF24A6A1A, 0xF24A3A80, 0xF24C1280, 0xF24A6A1A, 0xF24A7C80, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000001, func_80240340_EF7DC0, 0x00000008, 0x00000001, 0x00000004, 0x0000000F, 0x00000002, 0xF5DE027D, 0x00000003, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000006, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000005E, 0x00000000, 0xF24A3A80, 0xF24C1280, 0xF24A6A1A, 0xF24BBE1A, 0xF24C1280, 0xF24A6A1A, 0xF24A7C80, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000001, func_80240340_EF7DC0, 0x00000008, 0x00000001, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000005E, 0x00000000, 0xF24BBE1A, 0xF24C1280, 0xF24A6A1A, 0xF24A3A80, 0xF24C1280, 0xF24A6A1A, 0xF24A7C80, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000001, func_80240340_EF7DC0, 0x00000008, 0x00000001, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000002, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241094_EF8B14 -.word 0x00000043, 0x00000003, 0x802D6708, 0xFE363C8F, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8E, 0x0000009F, 0x00000005, 0x00000001, 0xFE363C8E, 0x0000002C, 0x00000002, 0xFE363C83, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C84, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C85, 0xF24A7A8B, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C83, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C82, 0xFE363C85, 0x0000002E, 0x00000002, 0xFE363C86, 0xF24A7E8B, 0x0000002C, 0x00000002, 0xFE363C87, 0xF24A7A8B, 0x00000026, 0x00000002, 0xFE363C88, 0xFE363C86, 0x00000043, 0x00000008, EF7A80_CosInterpMinMax, 0xFE363C8E, 0xFE363C8A, 0xF24A7A80, 0xF24A7B50, 0x0000000F, 0x00000000, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C88, 0xFE363C8A, 0x00000026, 0x00000002, 0xFE363C89, 0xFE363C87, 0x00000043, 0x00000008, EF7A80_CosInterpMinMax, 0xFE363C8E, 0xFE363C8A, 0xF24A7A80, 0xF24A7B50, 0x00000014, 0x00000000, 0x0000005A, 0x0000002C, 0x00000002, 0xFE363C89, 0xFE363C8A, 0x00000026, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C8A, 0xF24AA280, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C8F, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0xFE363C8F, 0xFE363C88, 0xFE363C89, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C8F, 0xFE363C8A, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C8F, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, 0x802D6708, 0xFE363C8F, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8E, 0x0000009F, 0x00000005, 0x00000001, 0xFE363C8E, 0x0000002C, 0x00000002, 0xFE363C83, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C84, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C85, 0xF24A7A8B, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C83, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C82, 0xFE363C85, 0x0000002E, 0x00000002, 0xFE363C86, 0xF24A7E8B, 0x0000002C, 0x00000002, 0xFE363C87, 0xF24A7A8B, 0x00000026, 0x00000002, 0xFE363C88, 0xFE363C86, 0x00000043, 0x00000008, dead_flo_18_CosInterpMinMax, 0xFE363C8E, 0xFE363C8A, 0xF24A7A80, 0xF24A7B50, 0x0000000F, 0x00000000, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C88, 0xFE363C8A, 0x00000026, 0x00000002, 0xFE363C89, 0xFE363C87, 0x00000043, 0x00000008, dead_flo_18_CosInterpMinMax, 0xFE363C8E, 0xFE363C8A, 0xF24A7A80, 0xF24A7B50, 0x00000014, 0x00000000, 0x0000005A, 0x0000002C, 0x00000002, 0xFE363C89, 0xFE363C8A, 0x00000026, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C8A, 0xF24AA280, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C8F, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0xFE363C8F, 0xFE363C88, 0xFE363C89, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C8F, 0xFE363C8A, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C8F, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241284_EF8D04 .word 0x00000024, 0x00000002, 0xFE363C8E, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE027D, 0x00000003, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24C8A80, 0x00000026, 0x00000002, 0xFE363C81, 0xF24BE280, 0x00000026, 0x00000002, 0xFE363C82, 0xF24A0280, 0x00000043, 0x00000003, 0x802E1D00, 0x00000064, 0xFE363C83, 0x0000002C, 0x00000002, 0xFE363C83, 0xFFFFFFCE, 0x0000002F, 0x00000002, 0xFE363C83, 0xF24D9A80, 0x00000026, 0x00000002, 0xFE363C84, 0xF24A7E80, 0x00000026, 0x00000002, 0xFE363C85, 0x00000000, 0x00000026, 0x00000002, 0xFE363C86, 0xF24A7BB0, 0x00000026, 0x00000002, 0xFE363C87, 0xF24A7BB0, 0x00000024, 0x00000002, 0xFE363C8F, 0xFE363C8E, 0x00000027, 0x00000002, 0xFE363C8F, 0x00002710, 0x00000044, 0x00000001, D_80241094_EF8B14, 0x00000027, 0x00000002, 0xFE363C8E, 0x00000001, 0x0000000F, 0x00000002, 0xFE363C8E, 0x00000010, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802413F0_EF8E70 -.word 0x0000000A, 0x00000002, 0xFAA2B582, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B582, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000005, 0x00000001, 0x0000000C, 0x00000043, 0x00000003, 0x802E1D00, 0x00000050, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C80, 0x00000028, 0x00000043, 0x00000003, 0x802E1D00, 0x00000032, 0xFE363C81, 0x00000043, 0x00000003, 0x802E1D00, 0x00000032, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000019, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x0000000A, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000043, 0x00000008, EF7A80_CosInterpMinMax, 0xFE363C8F, 0xFE363C8E, 0xF24A7E80, 0xF24A7EE0, 0x00000002, 0x00000000, 0x00000000, 0x00000043, 0x00000008, EF7A80_CosInterpMinMax, 0xFE363C8F, 0xFE363C8D, 0xF24A7EE0, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8E, 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C8D, 0x00000026, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x0000000A, 0x00000002, 0xF5DE027C, 0x00000000, 0x00000043, 0x00000005, 0x802D6208, 0x0000001F, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000020, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE027D, 0x00000000, 0x00000043, 0x00000005, 0x802D6208, 0x00000013, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000014, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xF5DE027C, 0x00000001, 0x00000043, 0x00000005, 0x802D6208, 0x00000015, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xF5DE027C, 0x00000002, 0x0000000E, 0x00000002, 0xF5DE027D, 0x00000001, 0x00000043, 0x00000005, 0x802D6208, 0x00000016, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000017, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000018, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000019, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x0000001A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D6208, 0x0000001B, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000E, 0x00000002, 0xF5DE027C, 0x00000002, 0x0000000E, 0x00000002, 0xF5DE027D, 0x00000002, 0x00000043, 0x00000005, 0x802D6208, 0x0000001D, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000029, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000021, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D6208, 0x00000024, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000025, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000026, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000027, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000028, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000022, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000002D, 0x00000002, 0xFE363C80, 0xF24A7EB0, 0x0000002E, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x0000000A, 0x00000002, 0xF5DE027C, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0x0000001F, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000020, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE027D, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0x00000013, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000014, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xF5DE027C, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000015, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xF5DE027C, 0x00000002, 0x0000000E, 0x00000002, 0xF5DE027D, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000016, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000017, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000018, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000019, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x0000001A, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0x0000001B, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x0000000E, 0x00000002, 0xF5DE027C, 0x00000002, 0x0000000E, 0x00000002, 0xF5DE027D, 0x00000002, 0x00000043, 0x00000006, 0x802D60E4, 0x0000001D, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000029, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000021, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0x00000024, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000025, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000026, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000027, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000028, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000022, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0x00000001, 0x00000026, 0x00000002, 0xFE363C81, 0x00000001, 0x00000026, 0x00000002, 0xFE363C82, 0x00000001, 0x0000000A, 0x00000002, 0xF5DE027C, 0x00000000, 0x00000043, 0x00000005, 0x802D6208, 0x0000001F, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000020, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE027D, 0x00000000, 0x00000043, 0x00000005, 0x802D6208, 0x00000013, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000014, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xF5DE027C, 0x00000001, 0x00000043, 0x00000005, 0x802D6208, 0x00000015, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xF5DE027C, 0x00000002, 0x0000000E, 0x00000002, 0xF5DE027D, 0x00000001, 0x00000043, 0x00000005, 0x802D6208, 0x00000016, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000017, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000018, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000019, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x0000001A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D6208, 0x0000001B, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000E, 0x00000002, 0xF5DE027C, 0x00000002, 0x0000000E, 0x00000002, 0xF5DE027D, 0x00000002, 0x00000043, 0x00000005, 0x802D6208, 0x0000001D, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000029, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000021, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D6208, 0x00000024, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000025, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000026, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000027, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000028, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000022, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFAA2B582, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000000A, 0x00000002, 0xFAA2B582, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B582, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000005, 0x00000001, 0x0000000C, 0x00000043, 0x00000003, 0x802E1D00, 0x00000050, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C80, 0x00000028, 0x00000043, 0x00000003, 0x802E1D00, 0x00000032, 0xFE363C81, 0x00000043, 0x00000003, 0x802E1D00, 0x00000032, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000019, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x0000000A, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000043, 0x00000008, dead_flo_18_CosInterpMinMax, 0xFE363C8F, 0xFE363C8E, 0xF24A7E80, 0xF24A7EE0, 0x00000002, 0x00000000, 0x00000000, 0x00000043, 0x00000008, dead_flo_18_CosInterpMinMax, 0xFE363C8F, 0xFE363C8D, 0xF24A7EE0, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8E, 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C8D, 0x00000026, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x0000000A, 0x00000002, 0xF5DE027C, 0x00000000, 0x00000043, 0x00000005, 0x802D6208, 0x0000001F, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000020, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE027D, 0x00000000, 0x00000043, 0x00000005, 0x802D6208, 0x00000013, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000014, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xF5DE027C, 0x00000001, 0x00000043, 0x00000005, 0x802D6208, 0x00000015, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xF5DE027C, 0x00000002, 0x0000000E, 0x00000002, 0xF5DE027D, 0x00000001, 0x00000043, 0x00000005, 0x802D6208, 0x00000016, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000017, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000018, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000019, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x0000001A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D6208, 0x0000001B, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000E, 0x00000002, 0xF5DE027C, 0x00000002, 0x0000000E, 0x00000002, 0xF5DE027D, 0x00000002, 0x00000043, 0x00000005, 0x802D6208, 0x0000001D, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000029, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000021, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D6208, 0x00000024, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000025, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000026, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000027, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000028, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000022, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000002D, 0x00000002, 0xFE363C80, 0xF24A7EB0, 0x0000002E, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x0000000A, 0x00000002, 0xF5DE027C, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0x0000001F, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000020, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE027D, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0x00000013, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000014, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xF5DE027C, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000015, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xF5DE027C, 0x00000002, 0x0000000E, 0x00000002, 0xF5DE027D, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000016, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000017, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000018, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000019, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x0000001A, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0x0000001B, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x0000000E, 0x00000002, 0xF5DE027C, 0x00000002, 0x0000000E, 0x00000002, 0xF5DE027D, 0x00000002, 0x00000043, 0x00000006, 0x802D60E4, 0x0000001D, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000029, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000021, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0x00000024, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000025, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000026, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000027, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000028, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000022, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0x00000001, 0x00000026, 0x00000002, 0xFE363C81, 0x00000001, 0x00000026, 0x00000002, 0xFE363C82, 0x00000001, 0x0000000A, 0x00000002, 0xF5DE027C, 0x00000000, 0x00000043, 0x00000005, 0x802D6208, 0x0000001F, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000020, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE027D, 0x00000000, 0x00000043, 0x00000005, 0x802D6208, 0x00000013, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000014, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xF5DE027C, 0x00000001, 0x00000043, 0x00000005, 0x802D6208, 0x00000015, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xF5DE027C, 0x00000002, 0x0000000E, 0x00000002, 0xF5DE027D, 0x00000001, 0x00000043, 0x00000005, 0x802D6208, 0x00000016, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000017, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000018, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000019, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x0000001A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D6208, 0x0000001B, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000E, 0x00000002, 0xF5DE027C, 0x00000002, 0x0000000E, 0x00000002, 0xF5DE027D, 0x00000002, 0x00000043, 0x00000005, 0x802D6208, 0x0000001D, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000029, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000021, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D6208, 0x00000024, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000025, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000026, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000027, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000028, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000022, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFAA2B582, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241ED4_EF9954 .word 0x00000026, 0x00000002, 0xFE363C80, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0x00000000, 0x00000026, 0x00000002, 0xFE363C82, 0x00000000, 0x00000026, 0x00000002, 0xFE363C83, 0xF24A7680, 0x00000026, 0x00000002, 0xFE363C84, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C85, 0xF24A8680, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, 0x802D7AC0, 0x00000013, 0x000001E6, 0x00000000, 0x00000057, 0x00000000, 0x00000005, 0x00000001, 0x0000012C, 0x0000002C, 0x00000002, 0xFE363C84, 0xF24A7880, 0x0000002C, 0x00000002, 0xFE363C85, 0xF24A7AE0, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C83, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C82, 0xFE363C85, 0x0000000C, 0x00000002, 0xFE363C81, 0xFFFFFFF6, 0x00000026, 0x00000002, 0xFE363C81, 0xF24A5280, 0x00000026, 0x00000002, 0xFE363C83, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C84, 0xF24A7A80, 0x0000000F, 0x00000002, 0xFE363C82, 0x00000050, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D5FE0, 0x0000001F, 0xFFFFFFB2, 0x00000013, 0x00000002, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000020, 0xFFFFFFB2, 0x00000013, 0x00000002, 0x00000043, 0x00000005, 0x802D5FE0, 0x0000001F, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000020, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0x0000001F, 0xFE363C82, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000020, 0xFE363C82, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000005, 0x802D5FE0, 0x0000001F, 0x0000004E, 0xFFFFFFED, 0xFFFFFFFE, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000020, 0x0000004E, 0xFFFFFFED, 0xFFFFFFFE, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000013, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -183,7 +183,7 @@ dlabel D_80245D1C_EFD79C .word 0x00000000, D_80243F40_EFB9C0, 0x00000000, 0x41700000, 0x42700000, 0x00440D05, D_80245BC0_EFD640, 0x00000000, 0x00000000, 0x0000005A, 0x8019008C, 0x00020000, 0x00A30002, 0x00000082, 0x00020000, 0x00920002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0003, 0x33322666, 0x33320003, 0x33323FFF, 0x33320003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 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, 0x00490001, 0x00490002, 0x00490003, 0x00490003, 0x00490001, 0x00490001, 0x00490004, 0x00490004, 0x00490003, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00000000, 0x00000000, 0x00000000, 0x001A00E4, 0x00000001, D_80243F40_EFB9C0, 0x42820000, 0x41700000, 0x42700000, 0x00440D05, D_80245C34_EFD6B4, 0x00000000, 0x00000000, 0x0000010E, 0x8019008C, 0x00020000, 0x00A30002, 0x00000082, 0x00020000, 0x00920002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0003, 0x33322666, 0x33320003, 0x33323FFF, 0x33320003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 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, 0x00490001, 0x00490002, 0x00490003, 0x00490003, 0x00490001, 0x00490001, 0x00490004, 0x00490004, 0x00490003, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00000000, 0x00000000, 0x00000000, 0x001A00E4, 0x00000002, D_80243F40_EFB9C0, 0x43070000, 0x41700000, 0x420C0000, 0x00440D05, D_80245CA8_EFD728, 0x00000000, 0x00000000, 0x0000010E, 0x8019008C, 0x00020000, 0x00A30002, 0x00000082, 0x00020000, 0x00920002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0003, 0x33322666, 0x33320003, 0x33323FFF, 0x33320003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 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, 0x00490001, 0x00490002, 0x00490003, 0x00490003, 0x00490001, 0x00490001, 0x00490004, 0x00490004, 0x00490003, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00000000, 0x00000000, 0x00000000, 0x001A00E4, 0x00000003, D_80243F6C_EFB9EC, 0xC2700000, 0x00000000, 0x42480000, 0x00440D05, D_80245AD8_EFD558, 0x00000000, 0x00000000, 0x0000005A, 0x8019008C, 0x00020000, 0x00A30002, 0x00000082, 0x00020000, 0x00920002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0003, 0x33322666, 0x33320003, 0x33323FFF, 0x33320003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 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, 0x00560201, 0x00560201, 0x00560201, 0x00560201, 0x00560201, 0x00560201, 0x00560204, 0x00560204, 0x00560201, 0x00560201, 0x00560201, 0x00560201, 0x00560201, 0x00560201, 0x00560201, 0x00560201, 0x00000000, 0x00000000, 0x00000000, 0x001A00E4, 0x00000004, D_80243F6C_EFB9EC, 0x00000000, 0xC47A0000, 0x00000000, 0x00440D05, D_80245B60_EFD5E0, 0x00000000, 0x00000000, 0x0000010E, 0x8019008C, 0x00020000, 0x00A30002, 0x00000082, 0x00020000, 0x00920002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0003, 0x33322666, 0x33320003, 0x33323FFF, 0x33320003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 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, 0x00570201, 0x00570201, 0x00570201, 0x00570201, 0x00570201, 0x00570201, 0x00570204, 0x00570204, 0x00570201, 0x00570201, 0x00570201, 0x00570201, 0x00570201, 0x00570201, 0x00570201, 0x00570201, 0x00000000, 0x00000000, 0x00000000, 0x001A00E4 dlabel D_802466CC_EFE14C -.word 0x00000005, D_80245D1C_EFD79C, 0x1A0B0007, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, EF8010_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, EF8010_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802E2F8C, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, 0x802E2F30, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, 0x802E37A0, 0x00000165, 0x00000043, 0x00000002, 0x802E37A0, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, EF8010_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C83, 0x00000166, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, EF8010_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, EF8010_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C84, 0x00000165, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, EF8010_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000030, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000005, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000033, 0x00000003, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802E2F8C, 0xFE363C8B, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000003, 0x802E2F30, 0xFE363C8B, 0x00000001, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000030, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000005, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000014, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000046, 0x00000001, 0xFE363C85, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000005, D_80245D1C_EFD79C, 0x1A0B0007, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dead_flo_18_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dead_flo_18_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802E2F8C, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, 0x802E2F30, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, 0x802E37A0, 0x00000165, 0x00000043, 0x00000002, 0x802E37A0, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dead_flo_18_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C83, 0x00000166, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dead_flo_18_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, dead_flo_18_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C84, 0x00000165, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, dead_flo_18_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000030, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000005, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000033, 0x00000003, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802E2F8C, 0xFE363C8B, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000003, 0x802E2F30, 0xFE363C8B, 0x00000001, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000030, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000005, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000014, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000046, 0x00000001, 0xFE363C85, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80247054_EFEAD4 .word 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/dead/EA3A80.data.s b/ver/us/asm/data/world/dead/kzn_17/EA3A80.data.s similarity index 67% rename from ver/us/asm/data/dead/EA3A80.data.s rename to ver/us/asm/data/world/dead/kzn_17/EA3A80.data.s index dd6eeda160..3c79c20a32 100644 --- a/ver/us/asm/data/dead/EA3A80.data.s +++ b/ver/us/asm/data/world/dead/kzn_17/EA3A80.data.s @@ -6,7 +6,7 @@ dlabel D_80243180_EA3A80 .word 0xC4278000, 0x00000000, 0x43200000, 0x42B40000, 0x441B0000, 0x00000000, 0x41F00000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802435B4_EA3EB4, D_80243180_EA3A80, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0019010E dlabel D_802431E0_EA3AE0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, EA0900_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EA0900_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, dead_kzn_17_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, dead_kzn_17_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024327C_EA3B7C .word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802D6480, 0xFE363C80, 0x00000003, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000258, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802431E0_EA3AE0, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -60,13 +60,13 @@ dlabel D_80243B68_EA4468 .word 0x00000000, 0x0000001E, 0x0000001E, 0x43160000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 dlabel D_80243B98_EA4498 -.word 0x00000043, 0x00000003, 0x8004930C, 0x00000007, 0x00000001, 0x00000043, 0x00000003, 0x8004930C, 0x00000008, 0x0000000A, 0x00000043, 0x00000003, 0x8004930C, 0x00000009, 0x00000009, 0x00000043, 0x00000003, 0x8004930C, 0x0000000A, 0x0000000C, 0x00000043, 0x00000003, 0x8004930C, 0x0000000B, 0x00000007, 0x00000043, 0x00000003, 0x8004930C, 0x0000000C, 0x0000001E, 0x00000043, 0x00000003, 0x8004930C, 0x0000000D, 0x0000000F, 0x00000043, 0x00000003, 0x8004930C, 0x0000000E, 0x00000012, 0x00000043, 0x00000003, 0x8004930C, 0x0000000F, 0x0000000F, 0x00000043, 0x00000002, EA0C10_PiranhaPlantAI_Main, D_80243B68_EA4468, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, 0x8004930C, 0x00000007, 0x00000001, 0x00000043, 0x00000003, 0x8004930C, 0x00000008, 0x0000000A, 0x00000043, 0x00000003, 0x8004930C, 0x00000009, 0x00000009, 0x00000043, 0x00000003, 0x8004930C, 0x0000000A, 0x0000000C, 0x00000043, 0x00000003, 0x8004930C, 0x0000000B, 0x00000007, 0x00000043, 0x00000003, 0x8004930C, 0x0000000C, 0x0000001E, 0x00000043, 0x00000003, 0x8004930C, 0x0000000D, 0x0000000F, 0x00000043, 0x00000003, 0x8004930C, 0x0000000E, 0x00000012, 0x00000043, 0x00000003, 0x8004930C, 0x0000000F, 0x0000000F, 0x00000043, 0x00000002, dead_kzn_17_PiranhaPlantAI_Main, D_80243B68_EA4468, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243C6C_EA456C .word 0x00000000, 0x00320024, 0x00000000, 0x00000000, D_80243B98_EA4498, 0x8007D3C0, 0x00000000, 0x8007D4EC, 0x00000000, 0x00000000, 0x00110000 dlabel D_80243C98_EA4598 -.word 0x00000043, 0x00000003, 0x802DC7C8, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, 0x8004930C, 0x00000000, 0x0000000E, 0x00000043, 0x00000003, 0x8004930C, 0x00000001, 0x0000001C, 0x00000043, 0x00000003, 0x8004930C, 0x00000004, 0x00000003, 0x00000043, 0x00000003, 0x8004930C, 0x0000000F, 0x000020DE, 0x00000043, 0x00000001, EA0C10_MeleeHitbox_Main, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x800486A0, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, 0x800497E4, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800990BC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, 0x802DC7C8, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, 0x8004930C, 0x00000000, 0x0000000E, 0x00000043, 0x00000003, 0x8004930C, 0x00000001, 0x0000001C, 0x00000043, 0x00000003, 0x8004930C, 0x00000004, 0x00000003, 0x00000043, 0x00000003, 0x8004930C, 0x0000000F, 0x000020DE, 0x00000043, 0x00000001, dead_kzn_17_MeleeHitbox_Main, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x800486A0, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, 0x800497E4, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800990BC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243DA4_EA46A4 .word 0x00000000, 0x0014001C, 0x00000000, 0x00000000, D_80243C98_EA4598, 0x00000000, 0x00000000, D_80243AAC_EA43AC, 0x00000000, 0x00000000, 0x00110000 @@ -75,27 +75,27 @@ dlabel D_80243DD0_EA46D0 .word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40900000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 dlabel D_80243E00_EA4700 -.word 0x00000043, 0x00000003, 0x8004930C, 0x00000002, 0x00000005, 0x00000043, 0x00000003, 0x8004930C, 0x00000003, 0x00000002, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0x00000005, 0x00000043, 0x00000003, 0x8004930C, 0x00000007, 0x00000002, 0x00000043, 0x00000002, EA0C10_TackleAI_Main, D_80243DD0_EA46D0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, 0x8004930C, 0x00000002, 0x00000005, 0x00000043, 0x00000003, 0x8004930C, 0x00000003, 0x00000002, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0x00000005, 0x00000043, 0x00000003, 0x8004930C, 0x00000007, 0x00000002, 0x00000043, 0x00000002, dead_kzn_17_TackleAI_Main, D_80243DD0_EA46D0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243E70_EA4770 .word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40E00000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 dlabel D_80243EA0_EA47A0 -.word 0x00000043, 0x00000003, 0x8004930C, 0x00000002, 0x00000004, 0x00000043, 0x00000003, 0x8004930C, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0x00000004, 0x00000043, 0x00000003, 0x8004930C, 0x00000007, 0x00000003, 0x00000043, 0x00000002, EA0C10_TackleAI_Main, D_80243E70_EA4770, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, 0x8004930C, 0x00000002, 0x00000004, 0x00000043, 0x00000003, 0x8004930C, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0x00000004, 0x00000043, 0x00000003, 0x8004930C, 0x00000007, 0x00000003, 0x00000043, 0x00000002, dead_kzn_17_TackleAI_Main, D_80243E70_EA4770, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243F10_EA4810 .word 0x3F800000, 0x00000014, 0x00000005, 0x42F00000, 0x00000000, 0x00000003, 0x40C00000, 0x00000000, 0x00000000, 0x43160000, 0x00000000, 0x00000001 dlabel D_80243F40_EA4840 -.word 0x00000043, 0x00000003, 0x8004930C, 0x00000002, 0x00000003, 0x00000043, 0x00000003, 0x8004930C, 0x00000003, 0x00000008, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0x00000006, 0x00000043, 0x00000003, 0x8004930C, 0x00000007, 0x00000006, 0x00000043, 0x00000002, EA0C10_TackleAI_Main, D_80243F10_EA4810, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, 0x8004930C, 0x00000002, 0x00000003, 0x00000043, 0x00000003, 0x8004930C, 0x00000003, 0x00000008, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0x00000006, 0x00000043, 0x00000003, 0x8004930C, 0x00000007, 0x00000006, 0x00000043, 0x00000002, dead_kzn_17_TackleAI_Main, D_80243F10_EA4810, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243FB0_EA48B0 -.word 0x00000043, 0x00000001, EA0C10_func_80240814_97BE44, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, EA0C10_AwaitPlayerNearNpc, 0x00000043, 0x00000002, 0x80049630, 0x00000001, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, EA0C10_func_802408B4_97BEE4, 0x00000043, 0x00000002, 0x80049630, 0x00000000, 0x00000043, 0x00000003, 0x8004930C, 0x00000002, 0x00000005, 0x00000043, 0x00000003, 0x8004930C, 0x00000003, 0x00000002, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0x00000005, 0x00000043, 0x00000003, 0x8004930C, 0x00000007, 0x00000002, 0x00000043, 0x00000002, EA0C10_TackleAI_Main, D_80243DD0_EA46D0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80243E00_EA4700, 0x8007D3C0, 0x00000000, 0x8007D4EC, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80243FB0_EA48B0, 0x8007D3C0, 0x00000000, 0x8007D4EC, 0x00000000, 0x00000000, 0x000A0000 +.word 0x00000043, 0x00000001, dead_kzn_17_func_80240814_97BE44, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, dead_kzn_17_AwaitPlayerNearNpc, 0x00000043, 0x00000002, 0x80049630, 0x00000001, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, dead_kzn_17_func_802408B4_97BEE4, 0x00000043, 0x00000002, 0x80049630, 0x00000000, 0x00000043, 0x00000003, 0x8004930C, 0x00000002, 0x00000005, 0x00000043, 0x00000003, 0x8004930C, 0x00000003, 0x00000002, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0x00000005, 0x00000043, 0x00000003, 0x8004930C, 0x00000007, 0x00000002, 0x00000043, 0x00000002, dead_kzn_17_TackleAI_Main, D_80243DD0_EA46D0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80243E00_EA4700, 0x8007D3C0, 0x00000000, 0x8007D4EC, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80243FB0_EA48B0, 0x8007D3C0, 0x00000000, 0x8007D4EC, 0x00000000, 0x00000000, 0x000A0000 dlabel D_802440FC_EA49FC .word 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80243EA0_EA47A0, 0x8007D3C0, 0x00000000, 0x8007D4EC, 0x00000000, 0x00000000, 0x00110000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, D_80243F40_EA4840, 0x8007D3C0, 0x00000000, 0x8007D4EC, 0x00000000, 0x00000000, 0x00190000 -dlabel EA0C10_varStash +dlabel dead_kzn_17_varStash .word 0x00000000 dlabel D_80244158_EA4A58 @@ -108,28 +108,28 @@ dlabel D_802441BC_EA4ABC .word 0x00000000 dlabel D_802441C0_EA4AC0 -.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EA0C10_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 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_80242A14_EA3314, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80242A4C_EA334C, 0xFE363C80, 0x0000004E, 0x00000006, D_802441C0_EA4AC0, 0x00000010, 0x00000000, EA0C10_D_802466D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802429C0_EA32C0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dead_kzn_17_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 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_80242A14_EA3314, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80242A4C_EA334C, 0xFE363C80, 0x0000004E, 0x00000006, D_802441C0_EA4AC0, 0x00000010, 0x00000000, dead_kzn_17_D_802466D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802429C0_EA32C0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244354_EA4C54 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EA0C10_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802E4720, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dead_kzn_17_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802E4720, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802443D4_EA4CD4 -.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EA0C10_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80244354_EA4C54, 0xFE363C8A, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, 0x802E1D58, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802DC654, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, 0x802DBF70, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, 0x802DC3E0, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80242A14_EA3314, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dead_kzn_17_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80244354_EA4C54, 0xFE363C8A, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, 0x802E1D58, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802DC654, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, 0x802DBF70, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, 0x802DC3E0, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80242A14_EA3314, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802446F8_EA4FF8 -.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80242A4C_EA334C, 0xFE363C80, 0x0000004E, 0x00000006, D_802443D4_EA4CD4, 0x00000010, 0x00000000, EA0C10_D_802466D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802429C0_EA32C0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80242A4C_EA334C, 0xFE363C80, 0x0000004E, 0x00000006, D_802443D4_EA4CD4, 0x00000010, 0x00000000, dead_kzn_17_D_802466D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802429C0_EA32C0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244768_EA5068 -.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EA0C10_LetterDelivery_SaveNpcAnim, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x00000043, 0x00000003, 0x802E4064, 0xFE363C85, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000003, 0x802DF124, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, 0x802DC654, 0xFE363C82, 0xFE363C8D, 0xFE363C80, 0xFE363C8E, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C80, 0xFE363C8F, 0x0000000A, 0x00000043, 0x00000007, 0x802DD864, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0xFE363C82, 0xFE363C87, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000046, 0x00000001, D_802446F8_EA4FF8, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C88, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C89, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80244158_EA4A58, 0x00000043, 0x00000002, 0x802E3F18, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EA0C10_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, dead_kzn_17_LetterDelivery_SaveNpcAnim, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x00000043, 0x00000003, 0x802E4064, 0xFE363C85, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000003, 0x802DF124, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, 0x802DC654, 0xFE363C82, 0xFE363C8D, 0xFE363C80, 0xFE363C8E, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C80, 0xFE363C8F, 0x0000000A, 0x00000043, 0x00000007, 0x802DD864, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0xFE363C82, 0xFE363C87, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000046, 0x00000001, D_802446F8_EA4FF8, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C88, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C89, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80244158_EA4A58, 0x00000043, 0x00000002, 0x802E3F18, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, dead_kzn_17_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244A60_EA5360 .word 0x00000054, 0x00000000 dlabel D_80244A68_EA5368 -.word 0x00000043, 0x0000000B, EA0C10_LetterDelivery_Init, 0x00000000, 0x00B60008, 0x00B60001, 0x00000054, 0x00000000, 0x001000E4, 0x001000E5, 0x001000E6, 0x001000E7, D_80244A60_EA5360, 0x00000046, 0x00000001, D_80244768_EA5068, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x0000000B, dead_kzn_17_LetterDelivery_Init, 0x00000000, 0x00B60008, 0x00B60001, 0x00000054, 0x00000000, 0x001000E4, 0x001000E5, 0x001000E6, 0x001000E7, D_80244A60_EA5360, 0x00000046, 0x00000001, D_80244768_EA5068, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244AB8_EA53B8 -.word 0x00000043, 0x0000000B, EA0C10_LetterDelivery_Init, 0x00000000, 0x00B60008, 0x00B60001, 0x00000054, 0x00000000, 0x001000E8, 0x001000E9, 0x001000EA, 0x001000EB, D_80244A60_EA5360, 0x00000046, 0x00000001, D_80244768_EA5068, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x0000000B, dead_kzn_17_LetterDelivery_Init, 0x00000000, 0x00B60008, 0x00B60001, 0x00000054, 0x00000000, 0x001000E8, 0x001000E9, 0x001000EA, 0x001000EB, D_80244A60_EA5360, 0x00000046, 0x00000001, D_80244768_EA5068, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244B08_EA5408 .word 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80244158_EA4A58, 0x00000043, 0x00000002, 0x802E4940, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -168,13 +168,13 @@ dlabel D_802458F0_EA61F0 .word 0x00000001, D_80245130_EA5A30, 0x00000000, 0x00000002, D_80245320_EA5C20, 0x18140001, 0x00000001, D_80245700_EA6000, 0x180D0001, 0x00000000, 0x00000000, 0x00000000 dlabel D_80245920_EA6220 -.word 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, 0x802E0158, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, 0x802E01B8, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, 0x802E0158, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000009, 0x00000004, 0x00000001, 0x00000002, 0x00000012, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, D_802DF3F0, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DF348, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000003, 0x802DEF5C, 0x0000005A, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, EA36E0_UnkFunc48, 0x00000014, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802DEF5C, 0x0000010E, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, EA36E0_UnkFunc48, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x0001000F, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, EA36E0_SpinyTrompHit, 0x00000043, 0x00000007, 0x802DFB40, 0x0001000F, 0x00000004, 0xF24A8680, 0xF24A8680, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000007, 0x802DFB40, 0x0001000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010030, 0x00000043, 0x00000002, EA36E0_UnkFunc48, 0x00000000, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, 0x802E0158, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, 0x802E01B8, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, 0x802E0158, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000009, 0x00000004, 0x00000001, 0x00000002, 0x00000012, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, D_802DF3F0, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DF348, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000003, 0x802DEF5C, 0x0000005A, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, dead_kzn_17_UnkFunc48, 0x00000014, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802DEF5C, 0x0000010E, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, dead_kzn_17_UnkFunc48, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x0001000F, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, dead_kzn_17_SpinyTrompHit, 0x00000043, 0x00000007, 0x802DFB40, 0x0001000F, 0x00000004, 0xF24A8680, 0xF24A8680, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000007, 0x802DFB40, 0x0001000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010030, 0x00000043, 0x00000002, dead_kzn_17_UnkFunc48, 0x00000000, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80245BC0_EA64C0 -.word 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x000001F4, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24AA280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF9718886, 0x00000000, 0x0000000C, 0x00000002, 0xFD050F80, 0x00000226, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0xFD050F80, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00000037, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C81, 0x00000043, 0x00000001, EA36E0_UnkFunc46, 0x00000028, 0x00000002, 0xFE363C82, 0x00000037, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x000001F4, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24AA280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF9718886, 0x00000000, 0x0000000C, 0x00000002, 0xFD050F80, 0x00000226, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0xFD050F80, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00000037, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C81, 0x00000043, 0x00000001, dead_kzn_17_UnkFunc46, 0x00000028, 0x00000002, 0xFE363C82, 0x00000037, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80245D88_EA6688 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802D8758, 0x00000000, 0x00000000, 0x0000001E, 0xF24A7E80, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80245DC8_EA66C8 -.word 0x0000004D, 0x00000001, 0x000000EF, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000020, 0x00000043, 0x00000003, 0x802D6788, 0x0000001B, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00000020, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000006, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x0000001E, 0x00000000, 0x00000024, 0x00000002, 0xF9718885, 0x00000000, 0x00000024, 0x00000002, 0xF9718886, 0x00000000, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000024, 0x00000002, 0xF9718882, 0x00000000, 0x00000024, 0x00000002, 0xF9718887, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFDB9, 0x00000024, 0x00000002, 0xFE363C82, 0x000000A5, 0x00000043, 0x00000005, 0x802D6C60, 0x0000001B, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000005, 0x802D5FE0, 0x0000001C, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF84060AA, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000045, 0x00000002, D_80245BC0_EA64C0, 0xFE363C8A, 0x00000044, 0x00000001, D_80244BA8_EA54A8, 0x00000045, 0x00000002, D_80245D88_EA6688, 0xFD050F8A, 0x00000043, 0x00000002, 0x802E37A0, 0x8000001B, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0xFFFFFDB9, 0x000002EE, 0x0000010E, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000001, EA36E0_UnkFunc46, 0x00000043, 0x00000004, EA36E0_UnkFunc51, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000027, 0x00000002, 0xFD050F80, 0x00000014, 0x00000043, 0x00000005, 0x802D6C60, 0x0000001B, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000005, 0x802D5FE0, 0x0000001C, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000006, 0x802D6D84, 0x0000001B, 0xFE363C83, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x0000001C, 0xFE363C83, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000001, EA36E0_UnkFunc49, 0x00000043, 0x00000005, 0x802D5FE0, 0x0000001C, 0xFE363C85, 0xFE363C86, 0x0000001E, 0x00000043, 0x00000001, EA36E0_UnkFunc50, 0x0000000A, 0x00000002, 0xF9718887, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C83, 0x00000014, 0x0000000C, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000024, 0x00000002, 0xF9718887, 0x00000001, 0x00000003, 0x00000001, 0x0000000C, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xF9718887, 0x00000000, 0x00000004, 0x00000001, 0x0000000C, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF9718885, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C80, 0x000001AE, 0x00000044, 0x00000001, D_80244BFC_EA54FC, 0x00000024, 0x00000002, 0xF9718885, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF9718886, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000276, 0x00000049, 0x00000001, 0xFD050F8A, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000006, 0x7FFFFE00, 0x00000043, 0x00000004, 0x802D7AC0, 0x00000006, 0x000001E4, 0x00000000, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000042, 0x00000002, 0x00000020, 0x00000020, 0x00000001, 0x0000000A, 0x0000002D, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00000020, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x0000001E, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000005, 0x802D8758, 0x00000000, 0x00000000, 0x00000014, 0xF24A8680, 0x00000043, 0x00000005, 0x802D8758, 0x00000000, 0x00000000, 0x0000000A, 0xF24A814D, 0x00000043, 0x00000005, 0x802D8758, 0x00000000, 0x00000000, 0x00000005, 0xF24A7C80, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xF9718886, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, EA36E0_SpinyTromp_CheckDist, 0x0000000C, 0x00000002, 0xFE363C84, 0x00000050, 0x0000000A, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000001, EA36E0_GetActingPartner, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000009, 0x00000024, 0x00000002, 0xF9718883, 0x00000001, 0x00000044, 0x00000001, D_80245920_EA6220, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000020, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000002, 0x802E3908, 0x8000001B, 0x00000043, 0x00000003, 0x802D6788, 0x0000001B, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x0000001C, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, 0x802D9DE4, 0x00000000, 0xF24BE280, 0x00000024, 0x00000002, 0xF9718887, 0x00000000, 0x00000024, 0x00000002, 0xF9718882, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x000000EF, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000020, 0x00000043, 0x00000003, 0x802D6788, 0x0000001B, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00000020, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000006, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x0000001E, 0x00000000, 0x00000024, 0x00000002, 0xF9718885, 0x00000000, 0x00000024, 0x00000002, 0xF9718886, 0x00000000, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000024, 0x00000002, 0xF9718882, 0x00000000, 0x00000024, 0x00000002, 0xF9718887, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFDB9, 0x00000024, 0x00000002, 0xFE363C82, 0x000000A5, 0x00000043, 0x00000005, 0x802D6C60, 0x0000001B, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000005, 0x802D5FE0, 0x0000001C, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF84060AA, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000045, 0x00000002, D_80245BC0_EA64C0, 0xFE363C8A, 0x00000044, 0x00000001, D_80244BA8_EA54A8, 0x00000045, 0x00000002, D_80245D88_EA6688, 0xFD050F8A, 0x00000043, 0x00000002, 0x802E37A0, 0x8000001B, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0xFFFFFDB9, 0x000002EE, 0x0000010E, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000001, dead_kzn_17_UnkFunc46, 0x00000043, 0x00000004, dead_kzn_17_UnkFunc51, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000027, 0x00000002, 0xFD050F80, 0x00000014, 0x00000043, 0x00000005, 0x802D6C60, 0x0000001B, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000005, 0x802D5FE0, 0x0000001C, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000006, 0x802D6D84, 0x0000001B, 0xFE363C83, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x0000001C, 0xFE363C83, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000001, dead_kzn_17_UnkFunc49, 0x00000043, 0x00000005, 0x802D5FE0, 0x0000001C, 0xFE363C85, 0xFE363C86, 0x0000001E, 0x00000043, 0x00000001, dead_kzn_17_UnkFunc50, 0x0000000A, 0x00000002, 0xF9718887, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C83, 0x00000014, 0x0000000C, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000024, 0x00000002, 0xF9718887, 0x00000001, 0x00000003, 0x00000001, 0x0000000C, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xF9718887, 0x00000000, 0x00000004, 0x00000001, 0x0000000C, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF9718885, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C80, 0x000001AE, 0x00000044, 0x00000001, D_80244BFC_EA54FC, 0x00000024, 0x00000002, 0xF9718885, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF9718886, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000276, 0x00000049, 0x00000001, 0xFD050F8A, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000006, 0x7FFFFE00, 0x00000043, 0x00000004, 0x802D7AC0, 0x00000006, 0x000001E4, 0x00000000, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000042, 0x00000002, 0x00000020, 0x00000020, 0x00000001, 0x0000000A, 0x0000002D, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00000020, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x0000001E, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000005, 0x802D8758, 0x00000000, 0x00000000, 0x00000014, 0xF24A8680, 0x00000043, 0x00000005, 0x802D8758, 0x00000000, 0x00000000, 0x0000000A, 0xF24A814D, 0x00000043, 0x00000005, 0x802D8758, 0x00000000, 0x00000000, 0x00000005, 0xF24A7C80, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xF9718886, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, dead_kzn_17_SpinyTromp_CheckDist, 0x0000000C, 0x00000002, 0xFE363C84, 0x00000050, 0x0000000A, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000001, dead_kzn_17_GetActingPartner, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000009, 0x00000024, 0x00000002, 0xF9718883, 0x00000001, 0x00000044, 0x00000001, D_80245920_EA6220, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000020, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000002, 0x802E3908, 0x8000001B, 0x00000043, 0x00000003, 0x802D6788, 0x0000001B, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x0000001C, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, 0x802D9DE4, 0x00000000, 0xF24BE280, 0x00000024, 0x00000002, 0xF9718887, 0x00000000, 0x00000024, 0x00000002, 0xF9718882, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/dead/EA7390.data.s b/ver/us/asm/data/world/dead/kzn_18/EA7390.data.s similarity index 90% rename from ver/us/asm/data/dead/EA7390.data.s rename to ver/us/asm/data/world/dead/kzn_18/EA7390.data.s index 9af69a55d1..71125e7b42 100644 --- a/ver/us/asm/data/dead/EA7390.data.s +++ b/ver/us/asm/data/world/dead/kzn_18/EA7390.data.s @@ -6,7 +6,7 @@ dlabel D_802403C0_EA7390 .word 0xC3CA8000, 0x437A0000, 0xC3A50000, 0x42B40000, 0x43D98000, 0x437A0000, 0xC3AF0000, 0x43870000, 0x43F50000, 0x41C80000, 0xC0A00000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240BCC_EA7B9C, D_802403C0_EA7390, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80240000_EA6FD0 dlabel D_80240430_EA7400 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, EA7010_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EA7010_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, dead_kzn_18_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, dead_kzn_18_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802404CC_EA749C .word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802D6480, 0xFE363C80, 0x00000003, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000258, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80240430_EA7400, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -51,7 +51,7 @@ dlabel D_80241360_EA8330 .word 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000022, 0x00000043, 0x00000003, 0x80048C5C, 0xFFFFFFFF, D_80240E44_EA7E14, 0x00000012, 0x00000000, 0x00000043, 0x00000002, 0x800483E0, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802413B4_EA8384 -.word 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C81, 0x00000064, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000064, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000001, EA7320_SetCamera0Flag1000, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0x0000011D, 0x00000019, 0x00000023, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x00000190, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8480, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFF, 0x0000011D, 0x00000019, 0x00000023, 0x00000043, 0x00000004, 0x802DD70C, 0xFFFFFFFF, 0x00000321, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00360017, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00360001, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00360004, 0x00360001, 0x00000000, 0x001000FF, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, 0x802DD70C, 0xFFFFFFFF, 0x00000322, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00360018, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000001, EA7320_UnsetCamera0Flag1000, 0x00000043, 0x00000003, 0x802D9DE4, 0x00000000, 0xF24A8680, 0x00000024, 0x00000002, 0xF840609E, 0x00000001, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C81, 0x00000064, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000064, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000001, dead_kzn_18_SetCamera0Flag1000, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0x0000011D, 0x00000019, 0x00000023, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x00000190, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8480, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFF, 0x0000011D, 0x00000019, 0x00000023, 0x00000043, 0x00000004, 0x802DD70C, 0xFFFFFFFF, 0x00000321, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00360017, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00360001, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00360004, 0x00360001, 0x00000000, 0x001000FF, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, 0x802DD70C, 0xFFFFFFFF, 0x00000322, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00360018, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000001, dead_kzn_18_UnsetCamera0Flag1000, 0x00000043, 0x00000003, 0x802D9DE4, 0x00000000, 0xF24A8680, 0x00000024, 0x00000002, 0xF840609E, 0x00000001, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241618_EA85E8 .word 0x0000000A, 0x00000002, 0xF840609E, 0x00000000, 0x00000043, 0x00000003, 0x80048C5C, 0xFFFFFFFF, D_802413B4_EA8384, 0x00000012, 0x00000000, 0x00000043, 0x00000002, 0x800483E0, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/dead/EAA810.data.s b/ver/us/asm/data/world/dead/kzn_19/EAA810.data.s similarity index 89% rename from ver/us/asm/data/dead/EAA810.data.s rename to ver/us/asm/data/world/dead/kzn_19/EAA810.data.s index fd485dbf81..16cdf78c49 100644 --- a/ver/us/asm/data/dead/EAA810.data.s +++ b/ver/us/asm/data/world/dead/kzn_19/EAA810.data.s @@ -9,7 +9,7 @@ dlabel D_80241DB0_EAA890 .word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000016, 0x00000001, 0x00000023, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, 0x802E3330, 0x00000000, 0x000001F4, 0x00000043, 0x00000002, 0x802E376C, 0x00000004, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000001B, 0x00000001, 0x00000024, 0x00000043, 0x00000002, 0x802E37A0, 0x8000006B, 0x00000023, 0x00000000, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000029, 0x00000000, 0x00000008, 0x00000043, 0x00000002, 0x802E376C, 0x00000004, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 dlabel D_80241E90_EAA970 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, EA8AE0_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EA8AE0_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, dead_kzn_19_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, dead_kzn_19_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241F2C_EAAA0C .word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802D6480, 0xFE363C80, 0x00000003, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000258, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80241E90_EAA970, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -18,7 +18,7 @@ dlabel D_80242048_EAAB28 .word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802D6480, 0xFE363C80, 0x00000004, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000024, 0x00000002, 0xFE363C81, 0x000001F4, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80241E90_EAA970, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242164_EAAC44 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000016, 0x00000001, 0x00000022, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F8A, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000023, 0x00000016, 0x00000001, 0x00000023, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x0000001C, 0x00000000, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0x000000B9, 0x0000006E, 0xFFFFFFE2, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A7C43, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0x000000B9, 0x00000037, 0xFFFFFFE2, 0x00000043, 0x00000003, 0x802D9578, 0x00000000, 0xFE363C81, 0x00000028, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0xFE363C81, 0x0000000B, 0x00000002, 0x00002710, 0x00002710, 0x00000043, 0x00000004, 0x802D94E8, 0x00000000, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xFE363C82, 0x00002710, 0x00000013, 0x00000000, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x0000000B, EA8AE0_StarSpiritEffectFunc2, 0x00000004, 0x000000B4, 0x00000130, 0x0000000F, 0xFFFFFFCA, 0x000000B9, 0x0000006E, 0xFFFFFFE2, 0x00000037, 0x00000019, 0x00000056, 0x00000000, 0x00000043, 0x00000001, EA8AE0_StarSpiritEffectFunc3, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, 0x802E37A0, 0x80000067, 0x00000043, 0x00000001, EA8AE0_StarSpiritEffectFunc1, 0x00000043, 0x00000002, 0x802E3908, 0x80000067, 0x00000043, 0x00000006, 0x802E382C, 0x000000B2, 0x00000000, 0x000000B9, 0x0000006E, 0xFFFFFFE2, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, 0x802DE6A4, 0x0001002A, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x000000B4, 0x00000008, 0x00000001, 0x00000073, 0x00000043, 0x00000006, 0x802E382C, 0x00000137, 0x00000000, 0x000000B9, 0x0000006E, 0xFFFFFFE2, 0x00000057, 0x00000000, 0x00000043, 0x00000002, EA8AE0_StarSpiritEffectFunc4, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000057, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0xFE363C81, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0x000000B9, 0x00000019, 0xFFFFFFE2, 0x00000043, 0x00000002, EA8AE0_StarSpiritEffectFunc4, 0x00000002, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, EA8AE0_StarSpiritEffectFunc5, 0x00000004, 0x000000B9, 0x00000037, 0xFFFFFFE2, 0x00000019, 0x00000056, 0x00000000, 0x00000043, 0x00000001, EA8AE0_StarSpiritEffectFunc6, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, EA8AE0_StarSpiritEffectFunc4, 0x00000003, 0x00000043, 0x00000003, 0x802E0324, 0x00000138, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000004, 0x802D78CC, 0x80248354, 0x00000004, 0x0000000E, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000016, 0x00000001, 0x00000022, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F8A, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000023, 0x00000016, 0x00000001, 0x00000023, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x0000001C, 0x00000000, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0x000000B9, 0x0000006E, 0xFFFFFFE2, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A7C43, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0x000000B9, 0x00000037, 0xFFFFFFE2, 0x00000043, 0x00000003, 0x802D9578, 0x00000000, 0xFE363C81, 0x00000028, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0xFE363C81, 0x0000000B, 0x00000002, 0x00002710, 0x00002710, 0x00000043, 0x00000004, 0x802D94E8, 0x00000000, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xFE363C82, 0x00002710, 0x00000013, 0x00000000, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x0000000B, dead_kzn_19_StarSpiritEffectFunc2, 0x00000004, 0x000000B4, 0x00000130, 0x0000000F, 0xFFFFFFCA, 0x000000B9, 0x0000006E, 0xFFFFFFE2, 0x00000037, 0x00000019, 0x00000056, 0x00000000, 0x00000043, 0x00000001, dead_kzn_19_StarSpiritEffectFunc3, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, 0x802E37A0, 0x80000067, 0x00000043, 0x00000001, dead_kzn_19_StarSpiritEffectFunc1, 0x00000043, 0x00000002, 0x802E3908, 0x80000067, 0x00000043, 0x00000006, 0x802E382C, 0x000000B2, 0x00000000, 0x000000B9, 0x0000006E, 0xFFFFFFE2, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, 0x802DE6A4, 0x0001002A, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x000000B4, 0x00000008, 0x00000001, 0x00000073, 0x00000043, 0x00000006, 0x802E382C, 0x00000137, 0x00000000, 0x000000B9, 0x0000006E, 0xFFFFFFE2, 0x00000057, 0x00000000, 0x00000043, 0x00000002, dead_kzn_19_StarSpiritEffectFunc4, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000057, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0xFE363C81, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0x000000B9, 0x00000019, 0xFFFFFFE2, 0x00000043, 0x00000002, dead_kzn_19_StarSpiritEffectFunc4, 0x00000002, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, dead_kzn_19_StarSpiritEffectFunc5, 0x00000004, 0x000000B9, 0x00000037, 0xFFFFFFE2, 0x00000019, 0x00000056, 0x00000000, 0x00000043, 0x00000001, dead_kzn_19_StarSpiritEffectFunc6, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, dead_kzn_19_StarSpiritEffectFunc4, 0x00000003, 0x00000043, 0x00000003, 0x802E0324, 0x00000138, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000004, 0x802D78CC, 0x80248354, 0x00000004, 0x0000000E, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024263C_EAB11C .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x8024835C, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -143,7 +143,7 @@ dlabel D_80243AD8_EAC5B8 dlabel D_80243BB8_EAC698 .word 0x009C8540, 0x009C8F90, 0x80234000, 0x009C7810, 0x009C8540, 0x80234000, 0x009D6E00, 0x009D92C0, 0x80234000, 0x009D92C0, 0x009D9D00, 0x80234000, 0x009C8F90, 0x009C9EE0, 0x80234000, 0x009C9EE0, 0x009CABE0, 0x80234000, 0x009CABE0, 0x009CB690, 0x80234000, 0x009CB690, 0x009CC130, 0x80234000, 0x009CC130, 0x009CCF00, 0x80234000, 0x009CCF00, 0x009CDC30, 0x80234000, 0x009CDC30, 0x009D0C80, 0x80234000, 0x009D0C80, 0x009D3570, 0x80234000, 0x009D3570, 0x009D58B0, 0x80234000, 0x009D58B0, 0x009D6380, 0x80234000, 0x009D6380, 0x009D6E00, 0x80234000, 0x009D9D00, 0x009DC700, 0x80234000, 0x009DC700, 0x009DF4A0, 0x80234000, 0x009DF4A0, 0x009DF9E0, 0x80234000, 0x009DF9E0, 0x009E0EA0, 0x80234000, 0x009E0EA0, 0x009E1B70, 0x80234000, 0x009E1B70, 0x009E2710, 0x80234000, 0x009E2710, 0x009E3390, 0x80234000, 0x009E3390, 0x009E3F30, 0x80234000, 0x009E3F30, 0x009E4810, 0x80234000, 0x009E4810, 0x009E5110, 0x80234000, 0x009E5110, 0x009E7420, 0x80234000, 0x009E7420, 0x009E8E30, 0x80234000, 0x009E8E30, 0x009E9560, 0x80234000, 0x009E9560, 0x009EAEA0, 0x80234000, 0x009EAEA0, 0x009EB590, 0x80234000, 0x009EB590, 0x009EB790, 0x80234000, 0x009EB790, 0x009EBFF0, 0x80234000, 0x009EBFF0, 0x009EE030, 0x80234000, 0x009EE030, 0x009F0820, 0x80234000, 0x009F0820, 0x009F1160, 0x80234000, 0x009F1160, 0x009F2260, 0x80234000, 0x009F2260, 0x009F2D30, 0x80234000 -dlabel EA8AE0_varStash +dlabel dead_kzn_19_varStash .word 0x00000000 dlabel D_80243D78_EAC858 @@ -156,25 +156,25 @@ dlabel D_80243DDC_EAC8BC .word 0x00000000 dlabel D_80243DE0_EAC8C0 -.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EA8AE0_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 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_80241800_EAA2E0, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241838_EAA318, 0xFE363C80, 0x0000004E, 0x00000006, D_80243DE0_EAC8C0, 0x00000010, 0x00000000, EA8AE0_D_80248388, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802417AC_EAA28C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dead_kzn_19_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 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_80241800_EAA2E0, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241838_EAA318, 0xFE363C80, 0x0000004E, 0x00000006, D_80243DE0_EAC8C0, 0x00000010, 0x00000000, dead_kzn_19_D_80248388, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802417AC_EAA28C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243F74_EACA54 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EA8AE0_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802E4720, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dead_kzn_19_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802E4720, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243FF4_EACAD4 -.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EA8AE0_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80243F74_EACA54, 0xFE363C8A, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, 0x802E1D58, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802DC654, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, 0x802DBF70, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, 0x802DC3E0, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80241800_EAA2E0, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dead_kzn_19_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80243F74_EACA54, 0xFE363C8A, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, 0x802E1D58, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802DC654, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, 0x802DBF70, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, 0x802DC3E0, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80241800_EAA2E0, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244318_EACDF8 -.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80241838_EAA318, 0xFE363C80, 0x0000004E, 0x00000006, D_80243FF4_EACAD4, 0x00000010, 0x00000000, EA8AE0_D_80248388, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802417AC_EAA28C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80241838_EAA318, 0xFE363C80, 0x0000004E, 0x00000006, D_80243FF4_EACAD4, 0x00000010, 0x00000000, dead_kzn_19_D_80248388, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802417AC_EAA28C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244388_EACE68 -.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EA8AE0_LetterDelivery_SaveNpcAnim, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x00000043, 0x00000003, 0x802E4064, 0xFE363C85, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000003, 0x802DF124, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, 0x802DC654, 0xFE363C82, 0xFE363C8D, 0xFE363C80, 0xFE363C8E, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C80, 0xFE363C8F, 0x0000000A, 0x00000043, 0x00000007, 0x802DD864, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0xFE363C82, 0xFE363C87, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000046, 0x00000001, D_80244318_EACDF8, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C88, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C89, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80243D78_EAC858, 0x00000043, 0x00000002, 0x802E3F18, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EA8AE0_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, dead_kzn_19_LetterDelivery_SaveNpcAnim, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x00000043, 0x00000003, 0x802E4064, 0xFE363C85, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000003, 0x802DF124, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, 0x802DC654, 0xFE363C82, 0xFE363C8D, 0xFE363C80, 0xFE363C8E, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C80, 0xFE363C8F, 0x0000000A, 0x00000043, 0x00000007, 0x802DD864, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0xFE363C82, 0xFE363C87, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000046, 0x00000001, D_80244318_EACDF8, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C88, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C89, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80243D78_EAC858, 0x00000043, 0x00000002, 0x802E3F18, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, dead_kzn_19_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244680_EAD160 .word 0x00000054, 0x00000000 dlabel D_80244688_EAD168 -.word 0x00000043, 0x0000000B, EA8AE0_LetterDelivery_Init, 0x00000000, 0x00B60008, 0x00B60001, 0x00000054, 0x00000000, 0x001000E4, 0x001000E5, 0x001000E6, 0x001000E7, D_80244680_EAD160, 0x00000046, 0x00000001, D_80244388_EACE68, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x0000000B, dead_kzn_19_LetterDelivery_Init, 0x00000000, 0x00B60008, 0x00B60001, 0x00000054, 0x00000000, 0x001000E4, 0x001000E5, 0x001000E6, 0x001000E7, D_80244680_EAD160, 0x00000046, 0x00000001, D_80244388_EACE68, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802446D8_EAD1B8 .word 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80243D78_EAC858, 0x00000043, 0x00000002, 0x802E4940, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/dead/EB7850.data.s b/ver/us/asm/data/world/dead/kzn_23/EB7850.data.s similarity index 81% rename from ver/us/asm/data/dead/EB7850.data.s rename to ver/us/asm/data/world/dead/kzn_23/EB7850.data.s index eba42784eb..3e466015e2 100644 --- a/ver/us/asm/data/dead/EB7850.data.s +++ b/ver/us/asm/data/world/dead/kzn_23/EB7850.data.s @@ -9,7 +9,7 @@ dlabel D_80240670_EB78A0 .word 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x0000002A, 0x00000000, 0x00000008, 0x00000043, 0x00000002, 0x802E376C, 0x00000009, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 dlabel D_802406B0_EB78E0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, EB7230_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EB7230_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, dead_kzn_23_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, dead_kzn_23_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024074C_EB797C .word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802D6480, 0xFE363C80, 0x00000003, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000258, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802406B0_EB78E0, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -63,10 +63,10 @@ dlabel D_80241028_EB8258 .word 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000030, 0x00000001, D_80241018_EB8248, 0x00000005, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000006, 0x00000000, 0x0000000A, 0x00000002, 0xF9718891, 0x00000000, 0x00000043, 0x00000006, 0x802E382C, 0x000001AD, 0x00000000, 0xFE363C81, 0x00000AF0, 0x00000000, 0x00000024, 0x00000002, 0xF9718891, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, 0x802E382C, 0x000001AE, 0x00000000, 0xFE363C81, 0x00000AF0, 0x00000000, 0x00000024, 0x00000002, 0xF9718891, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802410F4_EB8324 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0x00000003, 0xFE363C80, 0x00000044, 0x00000001, D_80241028_EB8258, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000065, 0x00000002, 0x00000032, 0x00000A5A, 0xFFFFFFEC, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000005, func_802E2A80, 0x0000000F, D_80240F40_EB8170, 0x00000004, 0x00000004, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000065, 0x00000002, 0xFFFFFFEC, 0x00000A5A, 0xFFFFFFEC, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000005, func_802E2A80, 0x0000000A, D_80240F70_EB81A0, 0x00000003, 0x00000004, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000065, 0x00000002, 0x0000000A, 0x00000A5A, 0xFFFFFFEC, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000005, func_802E2A80, 0x0000000F, D_80240F94_EB81C4, 0x00000005, 0x00000004, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000065, 0x00000002, 0xFFFFFFCE, 0x00000A5A, 0xFFFFFFEC, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000005, func_802E2A80, 0x00000014, D_80240FD0_EB8200, 0x00000006, 0x00000004, 0x00000023, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0x00000001, 0xFE363C84, 0x0000000A, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802E2B74, 0x00000029, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000043, 0x00000004, EB7540_SetPyroclastPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, 0x802E5160, 0xFE363C8E, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000005, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0x00000003, 0xFE363C80, 0x00000044, 0x00000001, D_80241028_EB8258, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000065, 0x00000002, 0x00000032, 0x00000A5A, 0xFFFFFFEC, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000005, func_802E2A80, 0x0000000F, D_80240F40_EB8170, 0x00000004, 0x00000004, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000065, 0x00000002, 0xFFFFFFEC, 0x00000A5A, 0xFFFFFFEC, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000005, func_802E2A80, 0x0000000A, D_80240F70_EB81A0, 0x00000003, 0x00000004, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000065, 0x00000002, 0x0000000A, 0x00000A5A, 0xFFFFFFEC, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000005, func_802E2A80, 0x0000000F, D_80240F94_EB81C4, 0x00000005, 0x00000004, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000065, 0x00000002, 0xFFFFFFCE, 0x00000A5A, 0xFFFFFFEC, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000005, func_802E2A80, 0x00000014, D_80240FD0_EB8200, 0x00000006, 0x00000004, 0x00000023, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0x00000001, 0xFE363C84, 0x0000000A, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802E2B74, 0x00000029, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000043, 0x00000004, dead_kzn_23_SetPyroclastPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, 0x802E5160, 0xFE363C8E, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241418_EB8648 -.word 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000002, 0x802DE6F8, 0x0000000A, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000001, EB7540_AllowCameraInterpY, 0x00000044, 0x00000001, D_80240E98_EB80C8, 0x00000043, 0x00000003, 0x8004930C, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, 0x802DE6A4, 0x00080000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x00000000, 0x00000C12, 0x000000A0, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000028, 0x00000002, 0xFE363C80, 0x00000064, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFF, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x00000000, 0x0000000A, 0xFE363C80, 0xFFFFFFFB, 0x00000043, 0x00000004, 0x802DE510, 0xFFFFFFF6, 0xFE363C80, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFC, 0xFFFFFFF6, 0xFE363C80, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000B18, 0x00000043, 0x00000003, 0x8004930C, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x80049370, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_802410F4_EB8324, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000007, 0x8011A58C, 0x802F92E0, 0x00000000, 0x00000A5A, 0x00000000, 0x00000094, 0x80000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000056, 0x00000000, 0x00000043, 0x00000001, EB7540_AnimateChestSize, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C8A, 0x00000043, 0x00000005, EB7540_GetChestPosition, 0xFE363C89, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, 0x802E1C00, 0xFE363C83, 0x00000BB8, 0x0000000A, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, EB7540_SetChestPosition, 0xFE363C89, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, 0x802D78AC, 0x80241C18, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000002, 0x802DE6F8, 0x0000000A, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000001, dead_kzn_23_AllowCameraInterpY, 0x00000044, 0x00000001, D_80240E98_EB80C8, 0x00000043, 0x00000003, 0x8004930C, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, 0x802DE6A4, 0x00080000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x00000000, 0x00000C12, 0x000000A0, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000028, 0x00000002, 0xFE363C80, 0x00000064, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFF, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x00000000, 0x0000000A, 0xFE363C80, 0xFFFFFFFB, 0x00000043, 0x00000004, 0x802DE510, 0xFFFFFFF6, 0xFE363C80, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFC, 0xFFFFFFF6, 0xFE363C80, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000B18, 0x00000043, 0x00000003, 0x8004930C, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x80049370, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_802410F4_EB8324, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000007, 0x8011A58C, 0x802F92E0, 0x00000000, 0x00000A5A, 0x00000000, 0x00000094, 0x80000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000056, 0x00000000, 0x00000043, 0x00000001, dead_kzn_23_AnimateChestSize, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C8A, 0x00000043, 0x00000005, dead_kzn_23_GetChestPosition, 0xFE363C89, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, 0x802E1C00, 0xFE363C83, 0x00000BB8, 0x0000000A, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, dead_kzn_23_SetChestPosition, 0xFE363C89, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, 0x802D78AC, 0x80241C18, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802417AC_EB89DC .word 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFF, 0x00000000, 0xFFFFFF9C, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00160008, 0x00000043, 0x00000003, 0x80048C5C, 0xFFFFFFFF, D_80241418_EB8648, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/nonmatchings/ECAA80/func_8024199C_ECB69C.s b/ver/us/asm/nonmatchings/ECAA80/func_8024199C_ECB69C.s index d37c78b2be..aed061ebe1 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(ECAA80_ItemChoice_HasSelectedItem) -/* ECB6B0 802419B0 AC2030B8 */ sw $zero, %lo(ECAA80_ItemChoice_HasSelectedItem)($at) +/* ECB6AC 802419AC 3C018024 */ lui $at, %hi(dead_flo_08_ItemChoice_HasSelectedItem) +/* ECB6B0 802419B0 AC2030B8 */ sw $zero, %lo(dead_flo_08_ItemChoice_HasSelectedItem)($at) .L802419B4: -/* ECB6B4 802419B4 3C038024 */ lui $v1, %hi(ECAA80_ItemChoice_HasSelectedItem) -/* ECB6B8 802419B8 246330B8 */ addiu $v1, $v1, %lo(ECAA80_ItemChoice_HasSelectedItem) +/* ECB6B4 802419B4 3C038024 */ lui $v1, %hi(dead_flo_08_ItemChoice_HasSelectedItem) +/* ECB6B8 802419B8 246330B8 */ addiu $v1, $v1, %lo(dead_flo_08_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(ECAA80_ItemChoice_SelectedItemID) +/* ECB6D4 802419D4 3C068024 */ lui $a2, %hi(dead_flo_08_ItemChoice_SelectedItemID) /* ECB6D8 802419D8 0C0B551A */ jal dead_evt_set_variable -/* ECB6DC 802419DC 8CC630BC */ lw $a2, %lo(ECAA80_ItemChoice_SelectedItemID)($a2) +/* ECB6DC 802419DC 8CC630BC */ lw $a2, %lo(dead_flo_08_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/ED46D0/ED46D0_UnkModelFunc000.s b/ver/us/asm/nonmatchings/ED46D0/ED46D0_UnkModelFunc000.s index 68610f67b7..67516b0ada 100644 --- a/ver/us/asm/nonmatchings/ED46D0/ED46D0_UnkModelFunc000.s +++ b/ver/us/asm/nonmatchings/ED46D0/ED46D0_UnkModelFunc000.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel ED46D0_UnkModelFunc000 +glabel dead_flo_10_UnkModelFunc000 /* ED46D0 802404B0 27BDFFB0 */ addiu $sp, $sp, -0x50 /* ED46D4 802404B4 AFB60040 */ sw $s6, 0x40($sp) /* ED46D8 802404B8 0080B02D */ daddu $s6, $a0, $zero diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_802403E0_8CACE0.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_802403E0_8CACE0.s deleted file mode 100644 index 7d624894e2..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_802403E0_8CACE0.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403E0_8CACE0 -/* 8CACE0 802403E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8CACE4 802403E4 3C048024 */ lui $a0, %hi(dro_01_dup_Pipe_GetCameraYaw) -/* 8CACE8 802403E8 24843770 */ addiu $a0, $a0, %lo(dro_01_dup_Pipe_GetCameraYaw) -/* 8CACEC 802403EC 3C028024 */ lui $v0, %hi(D_80241BF0_8CC4F0) -/* 8CACF0 802403F0 24421BF0 */ addiu $v0, $v0, %lo(D_80241BF0_8CC4F0) -/* 8CACF4 802403F4 AFBF0010 */ sw $ra, 0x10($sp) -/* 8CACF8 802403F8 AC820000 */ sw $v0, ($a0) -/* 8CACFC 802403FC 3C028024 */ lui $v0, %hi(D_80242070_8CC970) -/* 8CAD00 80240400 24422070 */ addiu $v0, $v0, %lo(D_80242070_8CC970) -/* 8CAD04 80240404 AC820004 */ sw $v0, 4($a0) -/* 8CAD08 80240408 24020030 */ addiu $v0, $zero, 0x30 -/* 8CAD0C 8024040C A4820008 */ sh $v0, 8($a0) -/* 8CAD10 80240410 A482000A */ sh $v0, 0xa($a0) -/* 8CAD14 80240414 24020002 */ addiu $v0, $zero, 2 -/* 8CAD18 80240418 AC82000C */ sw $v0, 0xc($a0) -/* 8CAD1C 8024041C 0C0496CB */ jal set_message_images -/* 8CAD20 80240420 AC800010 */ sw $zero, 0x10($a0) -/* 8CAD24 80240424 8FBF0010 */ lw $ra, 0x10($sp) -/* 8CAD28 80240428 24020002 */ addiu $v0, $zero, 2 -/* 8CAD2C 8024042C 03E00008 */ jr $ra -/* 8CAD30 80240430 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241500_8D2A10.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241500_8D2A10.s deleted file mode 100644 index ae380467ac..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241500_8D2A10.s +++ /dev/null @@ -1,176 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241500_8D2A10 -/* 8D2A10 80241500 27BDFF10 */ addiu $sp, $sp, -0xf0 -/* 8D2A14 80241504 0000202D */ daddu $a0, $zero, $zero -/* 8D2A18 80241508 3C05FD05 */ lui $a1, 0xfd05 -/* 8D2A1C 8024150C AFBF00D8 */ sw $ra, 0xd8($sp) -/* 8D2A20 80241510 AFB700D4 */ sw $s7, 0xd4($sp) -/* 8D2A24 80241514 AFB600D0 */ sw $s6, 0xd0($sp) -/* 8D2A28 80241518 AFB500CC */ sw $s5, 0xcc($sp) -/* 8D2A2C 8024151C AFB400C8 */ sw $s4, 0xc8($sp) -/* 8D2A30 80241520 AFB300C4 */ sw $s3, 0xc4($sp) -/* 8D2A34 80241524 AFB200C0 */ sw $s2, 0xc0($sp) -/* 8D2A38 80241528 AFB100BC */ sw $s1, 0xbc($sp) -/* 8D2A3C 8024152C AFB000B8 */ sw $s0, 0xb8($sp) -/* 8D2A40 80241530 F7B600E8 */ sdc1 $f22, 0xe8($sp) -/* 8D2A44 80241534 F7B400E0 */ sdc1 $f20, 0xe0($sp) -/* 8D2A48 80241538 0C0B1EAF */ jal evt_get_variable -/* 8D2A4C 8024153C 34A50F8A */ ori $a1, $a1, 0xf8a -/* 8D2A50 80241540 0000202D */ daddu $a0, $zero, $zero -/* 8D2A54 80241544 3C05FD05 */ lui $a1, 0xfd05 -/* 8D2A58 80241548 34A50F8B */ ori $a1, $a1, 0xf8b -/* 8D2A5C 8024154C 0C0B1EAF */ jal evt_get_variable -/* 8D2A60 80241550 0040B02D */ daddu $s6, $v0, $zero -/* 8D2A64 80241554 0000202D */ daddu $a0, $zero, $zero -/* 8D2A68 80241558 3C05FD05 */ lui $a1, 0xfd05 -/* 8D2A6C 8024155C 34A50F8C */ ori $a1, $a1, 0xf8c -/* 8D2A70 80241560 0C0B1EAF */ jal evt_get_variable -/* 8D2A74 80241564 0040A82D */ daddu $s5, $v0, $zero -/* 8D2A78 80241568 24170400 */ addiu $s7, $zero, 0x400 -/* 8D2A7C 8024156C 27B10038 */ addiu $s1, $sp, 0x38 -/* 8D2A80 80241570 0220202D */ daddu $a0, $s1, $zero -/* 8D2A84 80241574 3C130001 */ lui $s3, 1 -/* 8D2A88 80241578 3C12800A */ lui $s2, %hi(gMasterGfxPos) -/* 8D2A8C 8024157C 2652A66C */ addiu $s2, $s2, %lo(gMasterGfxPos) -/* 8D2A90 80241580 36731630 */ ori $s3, $s3, 0x1630 -/* 8D2A94 80241584 3C03E700 */ lui $v1, 0xe700 -/* 8D2A98 80241588 0040A02D */ daddu $s4, $v0, $zero -/* 8D2A9C 8024158C 8E480000 */ lw $t0, ($s2) -/* 8D2AA0 80241590 4480A000 */ mtc1 $zero, $f20 -/* 8D2AA4 80241594 0100282D */ daddu $a1, $t0, $zero -/* 8D2AA8 80241598 ACA30000 */ sw $v1, ($a1) -/* 8D2AAC 8024159C ACA00004 */ sw $zero, 4($a1) -/* 8D2AB0 802415A0 8EC50008 */ lw $a1, 8($s6) -/* 8D2AB4 802415A4 8EC6000C */ lw $a2, 0xc($s6) -/* 8D2AB8 802415A8 8EC70010 */ lw $a3, 0x10($s6) -/* 8D2ABC 802415AC 25080008 */ addiu $t0, $t0, 8 -/* 8D2AC0 802415B0 0C019E40 */ jal guTranslateF -/* 8D2AC4 802415B4 AE480000 */ sw $t0, ($s2) -/* 8D2AC8 802415B8 27B00078 */ addiu $s0, $sp, 0x78 -/* 8D2ACC 802415BC E7B40010 */ swc1 $f20, 0x10($sp) -/* 8D2AD0 802415C0 8EC50018 */ lw $a1, 0x18($s6) -/* 8D2AD4 802415C4 3C013F80 */ lui $at, 0x3f80 -/* 8D2AD8 802415C8 4481B000 */ mtc1 $at, $f22 -/* 8D2ADC 802415CC 4406A000 */ mfc1 $a2, $f20 -/* 8D2AE0 802415D0 4407B000 */ mfc1 $a3, $f22 -/* 8D2AE4 802415D4 0C019EC8 */ jal guRotateF -/* 8D2AE8 802415D8 0200202D */ daddu $a0, $s0, $zero -/* 8D2AEC 802415DC 0200202D */ daddu $a0, $s0, $zero -/* 8D2AF0 802415E0 0220282D */ daddu $a1, $s1, $zero -/* 8D2AF4 802415E4 0C019D80 */ jal guMtxCatF -/* 8D2AF8 802415E8 0220302D */ daddu $a2, $s1, $zero -/* 8D2AFC 802415EC E7B40010 */ swc1 $f20, 0x10($sp) -/* 8D2B00 802415F0 8EC50014 */ lw $a1, 0x14($s6) -/* 8D2B04 802415F4 4406B000 */ mfc1 $a2, $f22 -/* 8D2B08 802415F8 4407A000 */ mfc1 $a3, $f20 -/* 8D2B0C 802415FC 0C019EC8 */ jal guRotateF -/* 8D2B10 80241600 0200202D */ daddu $a0, $s0, $zero -/* 8D2B14 80241604 0200202D */ daddu $a0, $s0, $zero -/* 8D2B18 80241608 0220282D */ daddu $a1, $s1, $zero -/* 8D2B1C 8024160C 0C019D80 */ jal guMtxCatF -/* 8D2B20 80241610 0220302D */ daddu $a2, $s1, $zero -/* 8D2B24 80241614 8EC5001C */ lw $a1, 0x1c($s6) -/* 8D2B28 80241618 8EC60020 */ lw $a2, 0x20($s6) -/* 8D2B2C 8024161C 8EC70024 */ lw $a3, 0x24($s6) -/* 8D2B30 80241620 0C019DF0 */ jal guScaleF -/* 8D2B34 80241624 0200202D */ daddu $a0, $s0, $zero -/* 8D2B38 80241628 0200202D */ daddu $a0, $s0, $zero -/* 8D2B3C 8024162C 0220282D */ daddu $a1, $s1, $zero -/* 8D2B40 80241630 0C019D80 */ jal guMtxCatF -/* 8D2B44 80241634 0220302D */ daddu $a2, $s1, $zero -/* 8D2B48 80241638 0220202D */ daddu $a0, $s1, $zero -/* 8D2B4C 8024163C 3C108007 */ lui $s0, %hi(gMatrixListPos) -/* 8D2B50 80241640 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) -/* 8D2B54 80241644 3C11800A */ lui $s1, %hi(gDisplayContext) -/* 8D2B58 80241648 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) -/* 8D2B5C 8024164C 96050000 */ lhu $a1, ($s0) -/* 8D2B60 80241650 8E220000 */ lw $v0, ($s1) -/* 8D2B64 80241654 00052980 */ sll $a1, $a1, 6 -/* 8D2B68 80241658 00B32821 */ addu $a1, $a1, $s3 -/* 8D2B6C 8024165C 0C019D40 */ jal guMtxF2L -/* 8D2B70 80241660 00452821 */ addu $a1, $v0, $a1 -/* 8D2B74 80241664 3C04DA38 */ lui $a0, 0xda38 -/* 8D2B78 80241668 34840002 */ ori $a0, $a0, 2 -/* 8D2B7C 8024166C 8E430000 */ lw $v1, ($s2) -/* 8D2B80 80241670 96020000 */ lhu $v0, ($s0) -/* 8D2B84 80241674 0060282D */ daddu $a1, $v1, $zero -/* 8D2B88 80241678 24630008 */ addiu $v1, $v1, 8 -/* 8D2B8C 8024167C AE430000 */ sw $v1, ($s2) -/* 8D2B90 80241680 24430001 */ addiu $v1, $v0, 1 -/* 8D2B94 80241684 3042FFFF */ andi $v0, $v0, 0xffff -/* 8D2B98 80241688 00021180 */ sll $v0, $v0, 6 -/* 8D2B9C 8024168C ACA40000 */ sw $a0, ($a1) -/* 8D2BA0 80241690 A6030000 */ sh $v1, ($s0) -/* 8D2BA4 80241694 8E230000 */ lw $v1, ($s1) -/* 8D2BA8 80241698 00531021 */ addu $v0, $v0, $s3 -/* 8D2BAC 8024169C 00621821 */ addu $v1, $v1, $v0 -/* 8D2BB0 802416A0 3C028000 */ lui $v0, 0x8000 -/* 8D2BB4 802416A4 00621821 */ addu $v1, $v1, $v0 -/* 8D2BB8 802416A8 24020020 */ addiu $v0, $zero, 0x20 -/* 8D2BBC 802416AC ACA30004 */ sw $v1, 4($a1) -/* 8D2BC0 802416B0 A7A20028 */ sh $v0, 0x28($sp) -/* 8D2BC4 802416B4 A7A2002A */ sh $v0, 0x2a($sp) -/* 8D2BC8 802416B8 2402FFF0 */ addiu $v0, $zero, -0x10 -/* 8D2BCC 802416BC A7A2002C */ sh $v0, 0x2c($sp) -/* 8D2BD0 802416C0 24020010 */ addiu $v0, $zero, 0x10 -/* 8D2BD4 802416C4 A7A2002E */ sh $v0, 0x2e($sp) -/* 8D2BD8 802416C8 240200FF */ addiu $v0, $zero, 0xff -/* 8D2BDC 802416CC AFB50020 */ sw $s5, 0x20($sp) -/* 8D2BE0 802416D0 AFB40024 */ sw $s4, 0x24($sp) -/* 8D2BE4 802416D4 A3A20030 */ sb $v0, 0x30($sp) -/* 8D2BE8 802416D8 C6C00018 */ lwc1 $f0, 0x18($s6) -/* 8D2BEC 802416DC 44801000 */ mtc1 $zero, $f2 -/* 8D2BF0 802416E0 44801800 */ mtc1 $zero, $f3 -/* 8D2BF4 802416E4 46000021 */ cvt.d.s $f0, $f0 -/* 8D2BF8 802416E8 46220032 */ c.eq.d $f0, $f2 -/* 8D2BFC 802416EC 00000000 */ nop -/* 8D2C00 802416F0 45020008 */ bc1fl .L80241714 -/* 8D2C04 802416F4 24172400 */ addiu $s7, $zero, 0x2400 -/* 8D2C08 802416F8 C6C00014 */ lwc1 $f0, 0x14($s6) -/* 8D2C0C 802416FC 46000021 */ cvt.d.s $f0, $f0 -/* 8D2C10 80241700 46220032 */ c.eq.d $f0, $f2 -/* 8D2C14 80241704 00000000 */ nop -/* 8D2C18 80241708 45010003 */ bc1t .L80241718 -/* 8D2C1C 8024170C 0000202D */ daddu $a0, $zero, $zero -/* 8D2C20 80241710 24172400 */ addiu $s7, $zero, 0x2400 -.L80241714: -/* 8D2C24 80241714 0000202D */ daddu $a0, $zero, $zero -.L80241718: -/* 8D2C28 80241718 0080282D */ daddu $a1, $a0, $zero -/* 8D2C2C 8024171C 0080302D */ daddu $a2, $a0, $zero -/* 8D2C30 80241720 0080382D */ daddu $a3, $a0, $zero -/* 8D2C34 80241724 AFA00010 */ sw $zero, 0x10($sp) -/* 8D2C38 80241728 AFA00014 */ sw $zero, 0x14($sp) -/* 8D2C3C 8024172C 0C04EAA7 */ jal fold_update -/* 8D2C40 80241730 AFA00018 */ sw $zero, 0x18($sp) -/* 8D2C44 80241734 0000202D */ daddu $a0, $zero, $zero -/* 8D2C48 80241738 27A50020 */ addiu $a1, $sp, 0x20 -/* 8D2C4C 8024173C 02E0302D */ daddu $a2, $s7, $zero -/* 8D2C50 80241740 0C04EBDC */ jal fold_appendGfx_component -/* 8D2C54 80241744 27A70038 */ addiu $a3, $sp, 0x38 -/* 8D2C58 80241748 3C05D838 */ lui $a1, 0xd838 -/* 8D2C5C 8024174C 3C03800A */ lui $v1, %hi(gMasterGfxPos) -/* 8D2C60 80241750 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) -/* 8D2C64 80241754 8C620000 */ lw $v0, ($v1) -/* 8D2C68 80241758 34A50002 */ ori $a1, $a1, 2 -/* 8D2C6C 8024175C 0040202D */ daddu $a0, $v0, $zero -/* 8D2C70 80241760 24420008 */ addiu $v0, $v0, 8 -/* 8D2C74 80241764 AC620000 */ sw $v0, ($v1) -/* 8D2C78 80241768 24020040 */ addiu $v0, $zero, 0x40 -/* 8D2C7C 8024176C AC850000 */ sw $a1, ($a0) -/* 8D2C80 80241770 AC820004 */ sw $v0, 4($a0) -/* 8D2C84 80241774 8FBF00D8 */ lw $ra, 0xd8($sp) -/* 8D2C88 80241778 8FB700D4 */ lw $s7, 0xd4($sp) -/* 8D2C8C 8024177C 8FB600D0 */ lw $s6, 0xd0($sp) -/* 8D2C90 80241780 8FB500CC */ lw $s5, 0xcc($sp) -/* 8D2C94 80241784 8FB400C8 */ lw $s4, 0xc8($sp) -/* 8D2C98 80241788 8FB300C4 */ lw $s3, 0xc4($sp) -/* 8D2C9C 8024178C 8FB200C0 */ lw $s2, 0xc0($sp) -/* 8D2CA0 80241790 8FB100BC */ lw $s1, 0xbc($sp) -/* 8D2CA4 80241794 8FB000B8 */ lw $s0, 0xb8($sp) -/* 8D2CA8 80241798 D7B600E8 */ ldc1 $f22, 0xe8($sp) -/* 8D2CAC 8024179C D7B400E0 */ ldc1 $f20, 0xe0($sp) -/* 8D2CB0 802417A0 03E00008 */ jr $ra -/* 8D2CB4 802417A4 27BD00F0 */ addiu $sp, $sp, 0xf0 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_802417A8_8D2CB8.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_802417A8_8D2CB8.s deleted file mode 100644 index 2ff074afab..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_802417A8_8D2CB8.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802417A8_8D2CB8 -/* 8D2CB8 802417A8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8D2CBC 802417AC 2402000D */ addiu $v0, $zero, 0xd -/* 8D2CC0 802417B0 AFA20010 */ sw $v0, 0x10($sp) -/* 8D2CC4 802417B4 3C028024 */ lui $v0, %hi(func_80241500_8D2A10) -/* 8D2CC8 802417B8 24421500 */ addiu $v0, $v0, %lo(func_80241500_8D2A10) -/* 8D2CCC 802417BC 27A40010 */ addiu $a0, $sp, 0x10 -/* 8D2CD0 802417C0 AFBF0020 */ sw $ra, 0x20($sp) -/* 8D2CD4 802417C4 AFA00018 */ sw $zero, 0x18($sp) -/* 8D2CD8 802417C8 AFA2001C */ sw $v0, 0x1c($sp) -/* 8D2CDC 802417CC 0C047644 */ jal queue_render_task -/* 8D2CE0 802417D0 AFA00014 */ sw $zero, 0x14($sp) -/* 8D2CE4 802417D4 8FBF0020 */ lw $ra, 0x20($sp) -/* 8D2CE8 802417D8 03E00008 */ jr $ra -/* 8D2CEC 802417DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_802417E0_8D2CF0.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_802417E0_8D2CF0.s deleted file mode 100644 index 131e1048ee..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_802417E0_8D2CF0.s +++ /dev/null @@ -1,96 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802417E0_8D2CF0 -/* 8D2CF0 802417E0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 8D2CF4 802417E4 AFB3001C */ sw $s3, 0x1c($sp) -/* 8D2CF8 802417E8 0080982D */ daddu $s3, $a0, $zero -/* 8D2CFC 802417EC AFBF0028 */ sw $ra, 0x28($sp) -/* 8D2D00 802417F0 AFB50024 */ sw $s5, 0x24($sp) -/* 8D2D04 802417F4 AFB40020 */ sw $s4, 0x20($sp) -/* 8D2D08 802417F8 AFB20018 */ sw $s2, 0x18($sp) -/* 8D2D0C 802417FC AFB10014 */ sw $s1, 0x14($sp) -/* 8D2D10 80241800 AFB00010 */ sw $s0, 0x10($sp) -/* 8D2D14 80241804 8E62000C */ lw $v0, 0xc($s3) -/* 8D2D18 80241808 0C0B1EAF */ jal evt_get_variable -/* 8D2D1C 8024180C 8C450000 */ lw $a1, ($v0) -/* 8D2D20 80241810 24040048 */ addiu $a0, $zero, 0x48 -/* 8D2D24 80241814 0C00AB39 */ jal heap_malloc -/* 8D2D28 80241818 0040902D */ daddu $s2, $v0, $zero -/* 8D2D2C 8024181C 24040200 */ addiu $a0, $zero, 0x200 -/* 8D2D30 80241820 0C00AB39 */ jal heap_malloc -/* 8D2D34 80241824 0040802D */ daddu $s0, $v0, $zero -/* 8D2D38 80241828 24040020 */ addiu $a0, $zero, 0x20 -/* 8D2D3C 8024182C 0C00AB39 */ jal heap_malloc -/* 8D2D40 80241830 0040A82D */ daddu $s5, $v0, $zero -/* 8D2D44 80241834 02A0302D */ daddu $a2, $s5, $zero -/* 8D2D48 80241838 00129080 */ sll $s2, $s2, 2 -/* 8D2D4C 8024183C 3C11001D */ lui $s1, 0x1d -/* 8D2D50 80241840 2631C310 */ addiu $s1, $s1, -0x3cf0 -/* 8D2D54 80241844 3C013F80 */ lui $at, 0x3f80 -/* 8D2D58 80241848 44810000 */ mtc1 $at, $f0 -/* 8D2D5C 8024184C 26250200 */ addiu $a1, $s1, 0x200 -/* 8D2D60 80241850 AE000008 */ sw $zero, 8($s0) -/* 8D2D64 80241854 AE00000C */ sw $zero, 0xc($s0) -/* 8D2D68 80241858 AE000010 */ sw $zero, 0x10($s0) -/* 8D2D6C 8024185C AE000014 */ sw $zero, 0x14($s0) -/* 8D2D70 80241860 AE000018 */ sw $zero, 0x18($s0) -/* 8D2D74 80241864 AE000028 */ sw $zero, 0x28($s0) -/* 8D2D78 80241868 AE00002C */ sw $zero, 0x2c($s0) -/* 8D2D7C 8024186C AE000030 */ sw $zero, 0x30($s0) -/* 8D2D80 80241870 AE000034 */ sw $zero, 0x34($s0) -/* 8D2D84 80241874 AE000038 */ sw $zero, 0x38($s0) -/* 8D2D88 80241878 AE00003C */ sw $zero, 0x3c($s0) -/* 8D2D8C 8024187C AE000040 */ sw $zero, 0x40($s0) -/* 8D2D90 80241880 AE000044 */ sw $zero, 0x44($s0) -/* 8D2D94 80241884 E600001C */ swc1 $f0, 0x1c($s0) -/* 8D2D98 80241888 E6000020 */ swc1 $f0, 0x20($s0) -/* 8D2D9C 8024188C E6000024 */ swc1 $f0, 0x24($s0) -/* 8D2DA0 80241890 3C038009 */ lui $v1, %hi(gItemIconRasterOffsets) -/* 8D2DA4 80241894 00721821 */ addu $v1, $v1, $s2 -/* 8D2DA8 80241898 8C63E3D8 */ lw $v1, %lo(gItemIconRasterOffsets)($v1) -/* 8D2DAC 8024189C 0040A02D */ daddu $s4, $v0, $zero -/* 8D2DB0 802418A0 00712021 */ addu $a0, $v1, $s1 -/* 8D2DB4 802418A4 0C00A5CF */ jal dma_copy -/* 8D2DB8 802418A8 00652821 */ addu $a1, $v1, $a1 -/* 8D2DBC 802418AC 3C058009 */ lui $a1, %hi(gItemIconPaletteOffsets) -/* 8D2DC0 802418B0 00B22821 */ addu $a1, $a1, $s2 -/* 8D2DC4 802418B4 8CA5E94C */ lw $a1, %lo(gItemIconPaletteOffsets)($a1) -/* 8D2DC8 802418B8 0280302D */ daddu $a2, $s4, $zero -/* 8D2DCC 802418BC 00B12021 */ addu $a0, $a1, $s1 -/* 8D2DD0 802418C0 26310020 */ addiu $s1, $s1, 0x20 -/* 8D2DD4 802418C4 0C00A5CF */ jal dma_copy -/* 8D2DD8 802418C8 00B12821 */ addu $a1, $a1, $s1 -/* 8D2DDC 802418CC 0C04E9C1 */ jal func_8013A704 -/* 8D2DE0 802418D0 24040001 */ addiu $a0, $zero, 1 -/* 8D2DE4 802418D4 0000202D */ daddu $a0, $zero, $zero -/* 8D2DE8 802418D8 3C058024 */ lui $a1, %hi(func_802417A8_8D2CB8) -/* 8D2DEC 802418DC 24A517A8 */ addiu $a1, $a1, %lo(func_802417A8_8D2CB8) -/* 8D2DF0 802418E0 0C048C56 */ jal create_generic_entity_world -/* 8D2DF4 802418E4 AE020000 */ sw $v0, ($s0) -/* 8D2DF8 802418E8 0260202D */ daddu $a0, $s3, $zero -/* 8D2DFC 802418EC 3C05FD05 */ lui $a1, 0xfd05 -/* 8D2E00 802418F0 34A50F8A */ ori $a1, $a1, 0xf8a -/* 8D2E04 802418F4 0200302D */ daddu $a2, $s0, $zero -/* 8D2E08 802418F8 0C0B2026 */ jal evt_set_variable -/* 8D2E0C 802418FC ACC20004 */ sw $v0, 4($a2) -/* 8D2E10 80241900 0260202D */ daddu $a0, $s3, $zero -/* 8D2E14 80241904 3C05FD05 */ lui $a1, 0xfd05 -/* 8D2E18 80241908 34A50F8B */ ori $a1, $a1, 0xf8b -/* 8D2E1C 8024190C 0C0B2026 */ jal evt_set_variable -/* 8D2E20 80241910 02A0302D */ daddu $a2, $s5, $zero -/* 8D2E24 80241914 0260202D */ daddu $a0, $s3, $zero -/* 8D2E28 80241918 3C05FD05 */ lui $a1, 0xfd05 -/* 8D2E2C 8024191C 34A50F8C */ ori $a1, $a1, 0xf8c -/* 8D2E30 80241920 0C0B2026 */ jal evt_set_variable -/* 8D2E34 80241924 0280302D */ daddu $a2, $s4, $zero -/* 8D2E38 80241928 8FBF0028 */ lw $ra, 0x28($sp) -/* 8D2E3C 8024192C 8FB50024 */ lw $s5, 0x24($sp) -/* 8D2E40 80241930 8FB40020 */ lw $s4, 0x20($sp) -/* 8D2E44 80241934 8FB3001C */ lw $s3, 0x1c($sp) -/* 8D2E48 80241938 8FB20018 */ lw $s2, 0x18($sp) -/* 8D2E4C 8024193C 8FB10014 */ lw $s1, 0x14($sp) -/* 8D2E50 80241940 8FB00010 */ lw $s0, 0x10($sp) -/* 8D2E54 80241944 24020002 */ addiu $v0, $zero, 2 -/* 8D2E58 80241948 03E00008 */ jr $ra -/* 8D2E5C 8024194C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241950_8D2E60.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241950_8D2E60.s deleted file mode 100644 index b557b9bdfb..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241950_8D2E60.s +++ /dev/null @@ -1,43 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241950_8D2E60 -/* 8D2E60 80241950 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 8D2E64 80241954 AFB10014 */ sw $s1, 0x14($sp) -/* 8D2E68 80241958 0080882D */ daddu $s1, $a0, $zero -/* 8D2E6C 8024195C AFBF0018 */ sw $ra, 0x18($sp) -/* 8D2E70 80241960 AFB00010 */ sw $s0, 0x10($sp) -/* 8D2E74 80241964 F7B80030 */ sdc1 $f24, 0x30($sp) -/* 8D2E78 80241968 F7B60028 */ sdc1 $f22, 0x28($sp) -/* 8D2E7C 8024196C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 8D2E80 80241970 8E30000C */ lw $s0, 0xc($s1) -/* 8D2E84 80241974 8E050000 */ lw $a1, ($s0) -/* 8D2E88 80241978 0C0B210B */ jal evt_get_float_variable -/* 8D2E8C 8024197C 26100004 */ addiu $s0, $s0, 4 -/* 8D2E90 80241980 8E050000 */ lw $a1, ($s0) -/* 8D2E94 80241984 26100004 */ addiu $s0, $s0, 4 -/* 8D2E98 80241988 0220202D */ daddu $a0, $s1, $zero -/* 8D2E9C 8024198C 0C0B210B */ jal evt_get_float_variable -/* 8D2EA0 80241990 46000606 */ mov.s $f24, $f0 -/* 8D2EA4 80241994 0220202D */ daddu $a0, $s1, $zero -/* 8D2EA8 80241998 8E050000 */ lw $a1, ($s0) -/* 8D2EAC 8024199C 0C0B210B */ jal evt_get_float_variable -/* 8D2EB0 802419A0 46000586 */ mov.s $f22, $f0 -/* 8D2EB4 802419A4 0220202D */ daddu $a0, $s1, $zero -/* 8D2EB8 802419A8 3C05FD05 */ lui $a1, 0xfd05 -/* 8D2EBC 802419AC 34A50F8A */ ori $a1, $a1, 0xf8a -/* 8D2EC0 802419B0 0C0B1EAF */ jal evt_get_variable -/* 8D2EC4 802419B4 46000506 */ mov.s $f20, $f0 -/* 8D2EC8 802419B8 0040182D */ daddu $v1, $v0, $zero -/* 8D2ECC 802419BC E4780008 */ swc1 $f24, 8($v1) -/* 8D2ED0 802419C0 E476000C */ swc1 $f22, 0xc($v1) -/* 8D2ED4 802419C4 E4740010 */ swc1 $f20, 0x10($v1) -/* 8D2ED8 802419C8 8FBF0018 */ lw $ra, 0x18($sp) -/* 8D2EDC 802419CC 8FB10014 */ lw $s1, 0x14($sp) -/* 8D2EE0 802419D0 8FB00010 */ lw $s0, 0x10($sp) -/* 8D2EE4 802419D4 D7B80030 */ ldc1 $f24, 0x30($sp) -/* 8D2EE8 802419D8 D7B60028 */ ldc1 $f22, 0x28($sp) -/* 8D2EEC 802419DC D7B40020 */ ldc1 $f20, 0x20($sp) -/* 8D2EF0 802419E0 24020002 */ addiu $v0, $zero, 2 -/* 8D2EF4 802419E4 03E00008 */ jr $ra -/* 8D2EF8 802419E8 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_802419EC_8D2EFC.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_802419EC_8D2EFC.s deleted file mode 100644 index 32e88f624b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_802419EC_8D2EFC.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802419EC_8D2EFC -/* 8D2EFC 802419EC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 8D2F00 802419F0 AFB10014 */ sw $s1, 0x14($sp) -/* 8D2F04 802419F4 0080882D */ daddu $s1, $a0, $zero -/* 8D2F08 802419F8 AFBF0018 */ sw $ra, 0x18($sp) -/* 8D2F0C 802419FC AFB00010 */ sw $s0, 0x10($sp) -/* 8D2F10 80241A00 F7B60028 */ sdc1 $f22, 0x28($sp) -/* 8D2F14 80241A04 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 8D2F18 80241A08 8E30000C */ lw $s0, 0xc($s1) -/* 8D2F1C 80241A0C 8E050000 */ lw $a1, ($s0) -/* 8D2F20 80241A10 0C0B210B */ jal evt_get_float_variable -/* 8D2F24 80241A14 26100004 */ addiu $s0, $s0, 4 -/* 8D2F28 80241A18 0220202D */ daddu $a0, $s1, $zero -/* 8D2F2C 80241A1C 8E050000 */ lw $a1, ($s0) -/* 8D2F30 80241A20 0C0B210B */ jal evt_get_float_variable -/* 8D2F34 80241A24 46000586 */ mov.s $f22, $f0 -/* 8D2F38 80241A28 0220202D */ daddu $a0, $s1, $zero -/* 8D2F3C 80241A2C 3C05FD05 */ lui $a1, 0xfd05 -/* 8D2F40 80241A30 34A50F8A */ ori $a1, $a1, 0xf8a -/* 8D2F44 80241A34 0C0B1EAF */ jal evt_get_variable -/* 8D2F48 80241A38 46000506 */ mov.s $f20, $f0 -/* 8D2F4C 80241A3C 0040182D */ daddu $v1, $v0, $zero -/* 8D2F50 80241A40 E4760014 */ swc1 $f22, 0x14($v1) -/* 8D2F54 80241A44 E4740018 */ swc1 $f20, 0x18($v1) -/* 8D2F58 80241A48 8FBF0018 */ lw $ra, 0x18($sp) -/* 8D2F5C 80241A4C 8FB10014 */ lw $s1, 0x14($sp) -/* 8D2F60 80241A50 8FB00010 */ lw $s0, 0x10($sp) -/* 8D2F64 80241A54 D7B60028 */ ldc1 $f22, 0x28($sp) -/* 8D2F68 80241A58 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 8D2F6C 80241A5C 24020002 */ addiu $v0, $zero, 2 -/* 8D2F70 80241A60 03E00008 */ jr $ra -/* 8D2F74 80241A64 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241A68_8D2F78.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241A68_8D2F78.s deleted file mode 100644 index d0482ce56a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241A68_8D2F78.s +++ /dev/null @@ -1,142 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A68_8D2F78 -/* 8D2F78 80241A68 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 8D2F7C 80241A6C AFB3001C */ sw $s3, 0x1c($sp) -/* 8D2F80 80241A70 0080982D */ daddu $s3, $a0, $zero -/* 8D2F84 80241A74 AFB00010 */ sw $s0, 0x10($sp) -/* 8D2F88 80241A78 00A0802D */ daddu $s0, $a1, $zero -/* 8D2F8C 80241A7C 3C05FD05 */ lui $a1, 0xfd05 -/* 8D2F90 80241A80 AFBF0020 */ sw $ra, 0x20($sp) -/* 8D2F94 80241A84 AFB20018 */ sw $s2, 0x18($sp) -/* 8D2F98 80241A88 AFB10014 */ sw $s1, 0x14($sp) -/* 8D2F9C 80241A8C F7B60030 */ sdc1 $f22, 0x30($sp) -/* 8D2FA0 80241A90 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 8D2FA4 80241A94 8E72000C */ lw $s2, 0xc($s3) -/* 8D2FA8 80241A98 0C0B1EAF */ jal evt_get_variable -/* 8D2FAC 80241A9C 34A50F8A */ ori $a1, $a1, 0xf8a -/* 8D2FB0 80241AA0 12000002 */ beqz $s0, .L80241AAC -/* 8D2FB4 80241AA4 0040882D */ daddu $s1, $v0, $zero -/* 8D2FB8 80241AA8 AE600070 */ sw $zero, 0x70($s3) -.L80241AAC: -/* 8D2FBC 80241AAC 8E620070 */ lw $v0, 0x70($s3) -/* 8D2FC0 80241AB0 14400042 */ bnez $v0, .L80241BBC -/* 8D2FC4 80241AB4 00000000 */ nop -/* 8D2FC8 80241AB8 8E450000 */ lw $a1, ($s2) -/* 8D2FCC 80241ABC 26520004 */ addiu $s2, $s2, 4 -/* 8D2FD0 80241AC0 0C0B210B */ jal evt_get_float_variable -/* 8D2FD4 80241AC4 0260202D */ daddu $a0, $s3, $zero -/* 8D2FD8 80241AC8 8E450000 */ lw $a1, ($s2) -/* 8D2FDC 80241ACC 26520004 */ addiu $s2, $s2, 4 -/* 8D2FE0 80241AD0 0260202D */ daddu $a0, $s3, $zero -/* 8D2FE4 80241AD4 0C0B210B */ jal evt_get_float_variable -/* 8D2FE8 80241AD8 46000506 */ mov.s $f20, $f0 -/* 8D2FEC 80241ADC 8E450000 */ lw $a1, ($s2) -/* 8D2FF0 80241AE0 26520004 */ addiu $s2, $s2, 4 -/* 8D2FF4 80241AE4 3C014140 */ lui $at, 0x4140 -/* 8D2FF8 80241AE8 44811000 */ mtc1 $at, $f2 -/* 8D2FFC 80241AEC 0260202D */ daddu $a0, $s3, $zero -/* 8D3000 80241AF0 0C0B210B */ jal evt_get_float_variable -/* 8D3004 80241AF4 46020580 */ add.s $f22, $f0, $f2 -/* 8D3008 80241AF8 E6340028 */ swc1 $f20, 0x28($s1) -/* 8D300C 80241AFC E6200030 */ swc1 $f0, 0x30($s1) -/* 8D3010 80241B00 E636002C */ swc1 $f22, 0x2c($s1) -/* 8D3014 80241B04 8E450000 */ lw $a1, ($s2) -/* 8D3018 80241B08 0C0B1EAF */ jal evt_get_variable -/* 8D301C 80241B0C 0260202D */ daddu $a0, $s3, $zero -/* 8D3020 80241B10 C62C0008 */ lwc1 $f12, 8($s1) -/* 8D3024 80241B14 C62E0010 */ lwc1 $f14, 0x10($s1) -/* 8D3028 80241B18 8E260028 */ lw $a2, 0x28($s1) -/* 8D302C 80241B1C 8E270030 */ lw $a3, 0x30($s1) -/* 8D3030 80241B20 0C00A7B5 */ jal dist2D -/* 8D3034 80241B24 AE220044 */ sw $v0, 0x44($s1) -/* 8D3038 80241B28 C62C0008 */ lwc1 $f12, 8($s1) -/* 8D303C 80241B2C C62E0010 */ lwc1 $f14, 0x10($s1) -/* 8D3040 80241B30 8E260028 */ lw $a2, 0x28($s1) -/* 8D3044 80241B34 8E270030 */ lw $a3, 0x30($s1) -/* 8D3048 80241B38 0C00A720 */ jal atan2 -/* 8D304C 80241B3C 46000506 */ mov.s $f20, $f0 -/* 8D3050 80241B40 C622002C */ lwc1 $f2, 0x2c($s1) -/* 8D3054 80241B44 E6200034 */ swc1 $f0, 0x34($s1) -/* 8D3058 80241B48 C620000C */ lwc1 $f0, 0xc($s1) -/* 8D305C 80241B4C 8E220044 */ lw $v0, 0x44($s1) -/* 8D3060 80241B50 14400006 */ bnez $v0, .L80241B6C -/* 8D3064 80241B54 46001581 */ sub.s $f22, $f2, $f0 -/* 8D3068 80241B58 C6200038 */ lwc1 $f0, 0x38($s1) -/* 8D306C 80241B5C 4600A003 */ div.s $f0, $f20, $f0 -/* 8D3070 80241B60 4600020D */ trunc.w.s $f8, $f0 -/* 8D3074 80241B64 080906E0 */ j .L80241B80 -/* 8D3078 80241B68 E6280044 */ swc1 $f8, 0x44($s1) -.L80241B6C: -/* 8D307C 80241B6C 44820000 */ mtc1 $v0, $f0 -/* 8D3080 80241B70 00000000 */ nop -/* 8D3084 80241B74 46800020 */ cvt.s.w $f0, $f0 -/* 8D3088 80241B78 4600A003 */ div.s $f0, $f20, $f0 -/* 8D308C 80241B7C E6200038 */ swc1 $f0, 0x38($s1) -.L80241B80: -/* 8D3090 80241B80 C6200040 */ lwc1 $f0, 0x40($s1) -/* 8D3094 80241B84 C6220044 */ lwc1 $f2, 0x44($s1) -/* 8D3098 80241B88 468010A0 */ cvt.s.w $f2, $f2 -/* 8D309C 80241B8C 46020002 */ mul.s $f0, $f0, $f2 -/* 8D30A0 80241B90 00000000 */ nop -/* 8D30A4 80241B94 3C013F00 */ lui $at, 0x3f00 -/* 8D30A8 80241B98 44812000 */ mtc1 $at, $f4 -/* 8D30AC 80241B9C 00000000 */ nop -/* 8D30B0 80241BA0 46040002 */ mul.s $f0, $f0, $f4 -/* 8D30B4 80241BA4 00000000 */ nop -/* 8D30B8 80241BA8 4602B083 */ div.s $f2, $f22, $f2 -/* 8D30BC 80241BAC 46020000 */ add.s $f0, $f0, $f2 -/* 8D30C0 80241BB0 24020001 */ addiu $v0, $zero, 1 -/* 8D30C4 80241BB4 E620003C */ swc1 $f0, 0x3c($s1) -/* 8D30C8 80241BB8 AE620070 */ sw $v0, 0x70($s3) -.L80241BBC: -/* 8D30CC 80241BBC 0C00A8BB */ jal sin_deg -/* 8D30D0 80241BC0 C62C0034 */ lwc1 $f12, 0x34($s1) -/* 8D30D4 80241BC4 C6220038 */ lwc1 $f2, 0x38($s1) -/* 8D30D8 80241BC8 46001082 */ mul.s $f2, $f2, $f0 -/* 8D30DC 80241BCC 00000000 */ nop -/* 8D30E0 80241BD0 C6200008 */ lwc1 $f0, 8($s1) -/* 8D30E4 80241BD4 46020000 */ add.s $f0, $f0, $f2 -/* 8D30E8 80241BD8 C62C0034 */ lwc1 $f12, 0x34($s1) -/* 8D30EC 80241BDC 0C00A8D4 */ jal cos_deg -/* 8D30F0 80241BE0 E6200008 */ swc1 $f0, 8($s1) -/* 8D30F4 80241BE4 C6260038 */ lwc1 $f6, 0x38($s1) -/* 8D30F8 80241BE8 46003182 */ mul.s $f6, $f6, $f0 -/* 8D30FC 80241BEC 00000000 */ nop -/* 8D3100 80241BF0 C620003C */ lwc1 $f0, 0x3c($s1) -/* 8D3104 80241BF4 C624000C */ lwc1 $f4, 0xc($s1) -/* 8D3108 80241BF8 46000086 */ mov.s $f2, $f0 -/* 8D310C 80241BFC 46002100 */ add.s $f4, $f4, $f0 -/* 8D3110 80241C00 C6200040 */ lwc1 $f0, 0x40($s1) -/* 8D3114 80241C04 8E220044 */ lw $v0, 0x44($s1) -/* 8D3118 80241C08 46001081 */ sub.s $f2, $f2, $f0 -/* 8D311C 80241C0C C6200010 */ lwc1 $f0, 0x10($s1) -/* 8D3120 80241C10 2442FFFF */ addiu $v0, $v0, -1 -/* 8D3124 80241C14 AE220044 */ sw $v0, 0x44($s1) -/* 8D3128 80241C18 46060001 */ sub.s $f0, $f0, $f6 -/* 8D312C 80241C1C E624000C */ swc1 $f4, 0xc($s1) -/* 8D3130 80241C20 E622003C */ swc1 $f2, 0x3c($s1) -/* 8D3134 80241C24 04400003 */ bltz $v0, .L80241C34 -/* 8D3138 80241C28 E6200010 */ swc1 $f0, 0x10($s1) -/* 8D313C 80241C2C 08090715 */ j .L80241C54 -/* 8D3140 80241C30 0000102D */ daddu $v0, $zero, $zero -.L80241C34: -/* 8D3144 80241C34 C6200028 */ lwc1 $f0, 0x28($s1) -/* 8D3148 80241C38 C622002C */ lwc1 $f2, 0x2c($s1) -/* 8D314C 80241C3C C6240030 */ lwc1 $f4, 0x30($s1) -/* 8D3150 80241C40 24020001 */ addiu $v0, $zero, 1 -/* 8D3154 80241C44 AE20003C */ sw $zero, 0x3c($s1) -/* 8D3158 80241C48 E6200008 */ swc1 $f0, 8($s1) -/* 8D315C 80241C4C E622000C */ swc1 $f2, 0xc($s1) -/* 8D3160 80241C50 E6240010 */ swc1 $f4, 0x10($s1) -.L80241C54: -/* 8D3164 80241C54 8FBF0020 */ lw $ra, 0x20($sp) -/* 8D3168 80241C58 8FB3001C */ lw $s3, 0x1c($sp) -/* 8D316C 80241C5C 8FB20018 */ lw $s2, 0x18($sp) -/* 8D3170 80241C60 8FB10014 */ lw $s1, 0x14($sp) -/* 8D3174 80241C64 8FB00010 */ lw $s0, 0x10($sp) -/* 8D3178 80241C68 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 8D317C 80241C6C D7B40028 */ ldc1 $f20, 0x28($sp) -/* 8D3180 80241C70 03E00008 */ jr $ra -/* 8D3184 80241C74 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241C78_8D3188.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241C78_8D3188.s deleted file mode 100644 index fa66ba3dd2..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241C78_8D3188.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241C78_8D3188 -/* 8D3188 80241C78 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8D318C 80241C7C AFB00010 */ sw $s0, 0x10($sp) -/* 8D3190 80241C80 0080802D */ daddu $s0, $a0, $zero -/* 8D3194 80241C84 AFBF0014 */ sw $ra, 0x14($sp) -/* 8D3198 80241C88 F7B40018 */ sdc1 $f20, 0x18($sp) -/* 8D319C 80241C8C 8E02000C */ lw $v0, 0xc($s0) -/* 8D31A0 80241C90 0C0B210B */ jal evt_get_float_variable -/* 8D31A4 80241C94 8C450000 */ lw $a1, ($v0) -/* 8D31A8 80241C98 0200202D */ daddu $a0, $s0, $zero -/* 8D31AC 80241C9C 3C05FD05 */ lui $a1, 0xfd05 -/* 8D31B0 80241CA0 34A50F8A */ ori $a1, $a1, 0xf8a -/* 8D31B4 80241CA4 0C0B1EAF */ jal evt_get_variable -/* 8D31B8 80241CA8 46000506 */ mov.s $f20, $f0 -/* 8D31BC 80241CAC E4540040 */ swc1 $f20, 0x40($v0) -/* 8D31C0 80241CB0 8FBF0014 */ lw $ra, 0x14($sp) -/* 8D31C4 80241CB4 8FB00010 */ lw $s0, 0x10($sp) -/* 8D31C8 80241CB8 D7B40018 */ ldc1 $f20, 0x18($sp) -/* 8D31CC 80241CBC 24020002 */ addiu $v0, $zero, 2 -/* 8D31D0 80241CC0 03E00008 */ jr $ra -/* 8D31D4 80241CC4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_13/A01420/func_80240E20_A01420.s b/ver/us/asm/nonmatchings/world/area_nok/nok_13/A01420/func_80240E20_A01420.s deleted file mode 100644 index 3e3a38a6f1..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_13/A01420/func_80240E20_A01420.s +++ /dev/null @@ -1,362 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80242220_A02820 -.word .L80240EEC_A014EC, .L80240F3C_A0153C, .L80240FF8_A015F8, .L8024118C_A0178C, .L8024131C_A0191C, 0, 0, 0 - -.section .text - -glabel func_80240E20_A01420 -/* A01420 80240E20 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* A01424 80240E24 AFB20018 */ sw $s2, 0x18($sp) -/* A01428 80240E28 0080902D */ daddu $s2, $a0, $zero -/* A0142C 80240E2C AFBF0020 */ sw $ra, 0x20($sp) -/* A01430 80240E30 AFB3001C */ sw $s3, 0x1c($sp) -/* A01434 80240E34 AFB10014 */ sw $s1, 0x14($sp) -/* A01438 80240E38 AFB00010 */ sw $s0, 0x10($sp) -/* A0143C 80240E3C F7B40028 */ sdc1 $f20, 0x28($sp) -/* A01440 80240E40 8E42000C */ lw $v0, 0xc($s2) -/* A01444 80240E44 00A0802D */ daddu $s0, $a1, $zero -/* A01448 80240E48 0C0B1EAF */ jal evt_get_variable -/* A0144C 80240E4C 8C450000 */ lw $a1, ($v0) -/* A01450 80240E50 3C138011 */ lui $s3, %hi(gPlayerStatus) -/* A01454 80240E54 2673EFC8 */ addiu $s3, $s3, %lo(gPlayerStatus) -/* A01458 80240E58 1200001A */ beqz $s0, .L80240EC4 -/* A0145C 80240E5C 0040882D */ daddu $s1, $v0, $zero -/* A01460 80240E60 0C00AB39 */ jal heap_malloc -/* A01464 80240E64 2404003C */ addiu $a0, $zero, 0x3c -/* A01468 80240E68 AE420074 */ sw $v0, 0x74($s2) -/* A0146C 80240E6C 8E230000 */ lw $v1, ($s1) -/* A01470 80240E70 0040802D */ daddu $s0, $v0, $zero -/* A01474 80240E74 AE030000 */ sw $v1, ($s0) -/* A01478 80240E78 8E220004 */ lw $v0, 4($s1) -/* A0147C 80240E7C AE020004 */ sw $v0, 4($s0) -/* A01480 80240E80 8E220008 */ lw $v0, 8($s1) -/* A01484 80240E84 AE020008 */ sw $v0, 8($s0) -/* A01488 80240E88 8E22000C */ lw $v0, 0xc($s1) -/* A0148C 80240E8C AE02000C */ sw $v0, 0xc($s0) -/* A01490 80240E90 8E220010 */ lw $v0, 0x10($s1) -/* A01494 80240E94 AE020010 */ sw $v0, 0x10($s0) -/* A01498 80240E98 8E220014 */ lw $v0, 0x14($s1) -/* A0149C 80240E9C AE000018 */ sw $zero, 0x18($s0) -/* A014A0 80240EA0 AE00001C */ sw $zero, 0x1c($s0) -/* A014A4 80240EA4 AE000020 */ sw $zero, 0x20($s0) -/* A014A8 80240EA8 AE000024 */ sw $zero, 0x24($s0) -/* A014AC 80240EAC AE000028 */ sw $zero, 0x28($s0) -/* A014B0 80240EB0 AE00002C */ sw $zero, 0x2c($s0) -/* A014B4 80240EB4 AE000030 */ sw $zero, 0x30($s0) -/* A014B8 80240EB8 AE000034 */ sw $zero, 0x34($s0) -/* A014BC 80240EBC AE000038 */ sw $zero, 0x38($s0) -/* A014C0 80240EC0 AE020014 */ sw $v0, 0x14($s0) -.L80240EC4: -/* A014C4 80240EC4 8E500074 */ lw $s0, 0x74($s2) -/* A014C8 80240EC8 8E030020 */ lw $v1, 0x20($s0) -/* A014CC 80240ECC 2C620005 */ sltiu $v0, $v1, 5 -/* A014D0 80240ED0 10400116 */ beqz $v0, .L8024132C -/* A014D4 80240ED4 00031080 */ sll $v0, $v1, 2 -/* A014D8 80240ED8 3C018024 */ lui $at, %hi(jtbl_80242220_A02820) -/* A014DC 80240EDC 00220821 */ addu $at, $at, $v0 -/* A014E0 80240EE0 8C222220 */ lw $v0, %lo(jtbl_80242220_A02820)($at) -/* A014E4 80240EE4 00400008 */ jr $v0 -/* A014E8 80240EE8 00000000 */ nop -.L80240EEC_A014EC: -/* A014EC 80240EEC C60C0000 */ lwc1 $f12, ($s0) -/* A014F0 80240EF0 46806320 */ cvt.s.w $f12, $f12 -/* A014F4 80240EF4 C60E0008 */ lwc1 $f14, 8($s0) -/* A014F8 80240EF8 0C038022 */ jal get_xz_dist_to_player -/* A014FC 80240EFC 468073A0 */ cvt.s.w $f14, $f14 -/* A01500 80240F00 8E02000C */ lw $v0, 0xc($s0) -/* A01504 80240F04 4600010D */ trunc.w.s $f4, $f0 -/* A01508 80240F08 44032000 */ mfc1 $v1, $f4 -/* A0150C 80240F0C 00000000 */ nop -/* A01510 80240F10 0062102A */ slt $v0, $v1, $v0 -/* A01514 80240F14 10400105 */ beqz $v0, .L8024132C -/* A01518 80240F18 00000000 */ nop -/* A0151C 80240F1C C6600028 */ lwc1 $f0, 0x28($s3) -/* A01520 80240F20 8E020020 */ lw $v0, 0x20($s0) -/* A01524 80240F24 E6000024 */ swc1 $f0, 0x24($s0) -/* A01528 80240F28 C6600030 */ lwc1 $f0, 0x30($s3) -/* A0152C 80240F2C 24420001 */ addiu $v0, $v0, 1 -/* A01530 80240F30 AE020020 */ sw $v0, 0x20($s0) -/* A01534 80240F34 080904CB */ j .L8024132C -/* A01538 80240F38 E6000028 */ swc1 $f0, 0x28($s0) -.L80240F3C_A0153C: -/* A0153C 80240F3C C60C0000 */ lwc1 $f12, ($s0) -/* A01540 80240F40 46806320 */ cvt.s.w $f12, $f12 -/* A01544 80240F44 C60E0008 */ lwc1 $f14, 8($s0) -/* A01548 80240F48 0C038022 */ jal get_xz_dist_to_player -/* A0154C 80240F4C 468073A0 */ cvt.s.w $f14, $f14 -/* A01550 80240F50 8E02000C */ lw $v0, 0xc($s0) -/* A01554 80240F54 4600010D */ trunc.w.s $f4, $f0 -/* A01558 80240F58 44032000 */ mfc1 $v1, $f4 -/* A0155C 80240F5C 00000000 */ nop -/* A01560 80240F60 0062102A */ slt $v0, $v1, $v0 -/* A01564 80240F64 504000F1 */ beql $v0, $zero, .L8024132C -/* A01568 80240F68 AE000020 */ sw $zero, 0x20($s0) -/* A0156C 80240F6C C60C0000 */ lwc1 $f12, ($s0) -/* A01570 80240F70 46806320 */ cvt.s.w $f12, $f12 -/* A01574 80240F74 8E060024 */ lw $a2, 0x24($s0) -/* A01578 80240F78 8E070028 */ lw $a3, 0x28($s0) -/* A0157C 80240F7C C60E0008 */ lwc1 $f14, 8($s0) -/* A01580 80240F80 0C00A720 */ jal atan2 -/* A01584 80240F84 468073A0 */ cvt.s.w $f14, $f14 -/* A01588 80240F88 4600010D */ trunc.w.s $f4, $f0 -/* A0158C 80240F8C 44112000 */ mfc1 $s1, $f4 -/* A01590 80240F90 C60C0000 */ lwc1 $f12, ($s0) -/* A01594 80240F94 46806320 */ cvt.s.w $f12, $f12 -/* A01598 80240F98 8E660028 */ lw $a2, 0x28($s3) -/* A0159C 80240F9C 8E670030 */ lw $a3, 0x30($s3) -/* A015A0 80240FA0 C60E0008 */ lwc1 $f14, 8($s0) -/* A015A4 80240FA4 0C00A720 */ jal atan2 -/* A015A8 80240FA8 468073A0 */ cvt.s.w $f14, $f14 -/* A015AC 80240FAC 4600010D */ trunc.w.s $f4, $f0 -/* A015B0 80240FB0 44022000 */ mfc1 $v0, $f4 -/* A015B4 80240FB4 44916000 */ mtc1 $s1, $f12 -/* A015B8 80240FB8 00000000 */ nop -/* A015BC 80240FBC 46806320 */ cvt.s.w $f12, $f12 -/* A015C0 80240FC0 44827000 */ mtc1 $v0, $f14 -/* A015C4 80240FC4 00000000 */ nop -/* A015C8 80240FC8 0C00A70A */ jal get_clamped_angle_diff -/* A015CC 80240FCC 468073A0 */ cvt.s.w $f14, $f14 -/* A015D0 80240FD0 4600010D */ trunc.w.s $f4, $f0 -/* A015D4 80240FD4 44022000 */ mfc1 $v0, $f4 -/* A015D8 80240FD8 00000000 */ nop -/* A015DC 80240FDC 44826000 */ mtc1 $v0, $f12 -/* A015E0 80240FE0 00000000 */ nop -/* A015E4 80240FE4 0C00A69F */ jal signF -/* A015E8 80240FE8 46806320 */ cvt.s.w $f12, $f12 -/* A015EC 80240FEC 8E020020 */ lw $v0, 0x20($s0) -/* A015F0 80240FF0 080904C4 */ j .L80241310 -/* A015F4 80240FF4 E6000034 */ swc1 $f0, 0x34($s0) -.L80240FF8_A015F8: -/* A015F8 80240FF8 C60C0000 */ lwc1 $f12, ($s0) -/* A015FC 80240FFC 46806320 */ cvt.s.w $f12, $f12 -/* A01600 80241000 C60E0008 */ lwc1 $f14, 8($s0) -/* A01604 80241004 0C038022 */ jal get_xz_dist_to_player -/* A01608 80241008 468073A0 */ cvt.s.w $f14, $f14 -/* A0160C 8024100C 8E02000C */ lw $v0, 0xc($s0) -/* A01610 80241010 4600010D */ trunc.w.s $f4, $f0 -/* A01614 80241014 44032000 */ mfc1 $v1, $f4 -/* A01618 80241018 00000000 */ nop -/* A0161C 8024101C 0062102A */ slt $v0, $v1, $v0 -/* A01620 80241020 504000C2 */ beql $v0, $zero, .L8024132C -/* A01624 80241024 AE000020 */ sw $zero, 0x20($s0) -/* A01628 80241028 C60C0000 */ lwc1 $f12, ($s0) -/* A0162C 8024102C 46806320 */ cvt.s.w $f12, $f12 -/* A01630 80241030 8E06002C */ lw $a2, 0x2c($s0) -/* A01634 80241034 8E070030 */ lw $a3, 0x30($s0) -/* A01638 80241038 C60E0008 */ lwc1 $f14, 8($s0) -/* A0163C 8024103C 0C00A720 */ jal atan2 -/* A01640 80241040 468073A0 */ cvt.s.w $f14, $f14 -/* A01644 80241044 4600010D */ trunc.w.s $f4, $f0 -/* A01648 80241048 44112000 */ mfc1 $s1, $f4 -/* A0164C 8024104C C60C0000 */ lwc1 $f12, ($s0) -/* A01650 80241050 46806320 */ cvt.s.w $f12, $f12 -/* A01654 80241054 8E660028 */ lw $a2, 0x28($s3) -/* A01658 80241058 8E670030 */ lw $a3, 0x30($s3) -/* A0165C 8024105C C60E0008 */ lwc1 $f14, 8($s0) -/* A01660 80241060 0C00A720 */ jal atan2 -/* A01664 80241064 468073A0 */ cvt.s.w $f14, $f14 -/* A01668 80241068 4600010D */ trunc.w.s $f4, $f0 -/* A0166C 8024106C 44022000 */ mfc1 $v0, $f4 -/* A01670 80241070 44916000 */ mtc1 $s1, $f12 -/* A01674 80241074 00000000 */ nop -/* A01678 80241078 46806320 */ cvt.s.w $f12, $f12 -/* A0167C 8024107C 44827000 */ mtc1 $v0, $f14 -/* A01680 80241080 00000000 */ nop -/* A01684 80241084 0C00A70A */ jal get_clamped_angle_diff -/* A01688 80241088 468073A0 */ cvt.s.w $f14, $f14 -/* A0168C 8024108C 4600010D */ trunc.w.s $f4, $f0 -/* A01690 80241090 44022000 */ mfc1 $v0, $f4 -/* A01694 80241094 00000000 */ nop -/* A01698 80241098 44826000 */ mtc1 $v0, $f12 -/* A0169C 8024109C 00000000 */ nop -/* A016A0 802410A0 0C00A69F */ jal signF -/* A016A4 802410A4 46806320 */ cvt.s.w $f12, $f12 -/* A016A8 802410A8 C6020034 */ lwc1 $f2, 0x34($s0) -/* A016AC 802410AC 46001032 */ c.eq.s $f2, $f0 -/* A016B0 802410B0 00000000 */ nop -/* A016B4 802410B4 4502009D */ bc1fl .L8024132C -/* A016B8 802410B8 AE000020 */ sw $zero, 0x20($s0) -/* A016BC 802410BC C60C0000 */ lwc1 $f12, ($s0) -/* A016C0 802410C0 46806320 */ cvt.s.w $f12, $f12 -/* A016C4 802410C4 8E060024 */ lw $a2, 0x24($s0) -/* A016C8 802410C8 8E070028 */ lw $a3, 0x28($s0) -/* A016CC 802410CC C60E0008 */ lwc1 $f14, 8($s0) -/* A016D0 802410D0 0C00A720 */ jal atan2 -/* A016D4 802410D4 468073A0 */ cvt.s.w $f14, $f14 -/* A016D8 802410D8 4600010D */ trunc.w.s $f4, $f0 -/* A016DC 802410DC 44112000 */ mfc1 $s1, $f4 -/* A016E0 802410E0 C60C0000 */ lwc1 $f12, ($s0) -/* A016E4 802410E4 46806320 */ cvt.s.w $f12, $f12 -/* A016E8 802410E8 8E660028 */ lw $a2, 0x28($s3) -/* A016EC 802410EC 8E670030 */ lw $a3, 0x30($s3) -/* A016F0 802410F0 C60E0008 */ lwc1 $f14, 8($s0) -/* A016F4 802410F4 0C00A720 */ jal atan2 -/* A016F8 802410F8 468073A0 */ cvt.s.w $f14, $f14 -/* A016FC 802410FC 4600010D */ trunc.w.s $f4, $f0 -/* A01700 80241100 44022000 */ mfc1 $v0, $f4 -/* A01704 80241104 44916000 */ mtc1 $s1, $f12 -/* A01708 80241108 00000000 */ nop -/* A0170C 8024110C 46806320 */ cvt.s.w $f12, $f12 -/* A01710 80241110 44827000 */ mtc1 $v0, $f14 -/* A01714 80241114 00000000 */ nop -/* A01718 80241118 0C00A70A */ jal get_clamped_angle_diff -/* A0171C 8024111C 468073A0 */ cvt.s.w $f14, $f14 -/* A01720 80241120 4600010D */ trunc.w.s $f4, $f0 -/* A01724 80241124 44022000 */ mfc1 $v0, $f4 -/* A01728 80241128 00000000 */ nop -/* A0172C 8024112C 44820000 */ mtc1 $v0, $f0 -/* A01730 80241130 00000000 */ nop -/* A01734 80241134 46800020 */ cvt.s.w $f0, $f0 -/* A01738 80241138 3C0142B4 */ lui $at, 0x42b4 -/* A0173C 8024113C 44811000 */ mtc1 $at, $f2 -/* A01740 80241140 46000505 */ abs.s $f20, $f0 -/* A01744 80241144 4614103C */ c.lt.s $f2, $f20 -/* A01748 80241148 00000000 */ nop -/* A0174C 8024114C 45000077 */ bc1f .L8024132C -/* A01750 80241150 00000000 */ nop -/* A01754 80241154 8E020014 */ lw $v0, 0x14($s0) -/* A01758 80241158 10400003 */ beqz $v0, .L80241168 -/* A0175C 8024115C 0200202D */ daddu $a0, $s0, $zero -/* A01760 80241160 0040F809 */ jalr $v0 -/* A01764 80241164 0000282D */ daddu $a1, $zero, $zero -.L80241168: -/* A01768 80241168 C6000018 */ lwc1 $f0, 0x18($s0) -/* A0176C 8024116C 46800020 */ cvt.s.w $f0, $f0 -/* A01770 80241170 8E020020 */ lw $v0, 0x20($s0) -/* A01774 80241174 46140000 */ add.s $f0, $f0, $f20 -/* A01778 80241178 24420001 */ addiu $v0, $v0, 1 -/* A0177C 8024117C AE020020 */ sw $v0, 0x20($s0) -/* A01780 80241180 4600010D */ trunc.w.s $f4, $f0 -/* A01784 80241184 080904CB */ j .L8024132C -/* A01788 80241188 E6040018 */ swc1 $f4, 0x18($s0) -.L8024118C_A0178C: -/* A0178C 8024118C C60C0000 */ lwc1 $f12, ($s0) -/* A01790 80241190 46806320 */ cvt.s.w $f12, $f12 -/* A01794 80241194 C60E0008 */ lwc1 $f14, 8($s0) -/* A01798 80241198 0C038022 */ jal get_xz_dist_to_player -/* A0179C 8024119C 468073A0 */ cvt.s.w $f14, $f14 -/* A017A0 802411A0 8E020010 */ lw $v0, 0x10($s0) -/* A017A4 802411A4 4600010D */ trunc.w.s $f4, $f0 -/* A017A8 802411A8 44032000 */ mfc1 $v1, $f4 -/* A017AC 802411AC 00000000 */ nop -/* A017B0 802411B0 0062102A */ slt $v0, $v1, $v0 -/* A017B4 802411B4 10400050 */ beqz $v0, .L802412F8 -/* A017B8 802411B8 00000000 */ nop -/* A017BC 802411BC C60C0000 */ lwc1 $f12, ($s0) -/* A017C0 802411C0 46806320 */ cvt.s.w $f12, $f12 -/* A017C4 802411C4 8E06002C */ lw $a2, 0x2c($s0) -/* A017C8 802411C8 8E070030 */ lw $a3, 0x30($s0) -/* A017CC 802411CC C60E0008 */ lwc1 $f14, 8($s0) -/* A017D0 802411D0 0C00A720 */ jal atan2 -/* A017D4 802411D4 468073A0 */ cvt.s.w $f14, $f14 -/* A017D8 802411D8 4600010D */ trunc.w.s $f4, $f0 -/* A017DC 802411DC 44112000 */ mfc1 $s1, $f4 -/* A017E0 802411E0 C60C0000 */ lwc1 $f12, ($s0) -/* A017E4 802411E4 46806320 */ cvt.s.w $f12, $f12 -/* A017E8 802411E8 8E660028 */ lw $a2, 0x28($s3) -/* A017EC 802411EC 8E670030 */ lw $a3, 0x30($s3) -/* A017F0 802411F0 C60E0008 */ lwc1 $f14, 8($s0) -/* A017F4 802411F4 0C00A720 */ jal atan2 -/* A017F8 802411F8 468073A0 */ cvt.s.w $f14, $f14 -/* A017FC 802411FC 4600010D */ trunc.w.s $f4, $f0 -/* A01800 80241200 44022000 */ mfc1 $v0, $f4 -/* A01804 80241204 44916000 */ mtc1 $s1, $f12 -/* A01808 80241208 00000000 */ nop -/* A0180C 8024120C 46806320 */ cvt.s.w $f12, $f12 -/* A01810 80241210 44827000 */ mtc1 $v0, $f14 -/* A01814 80241214 00000000 */ nop -/* A01818 80241218 0C00A70A */ jal get_clamped_angle_diff -/* A0181C 8024121C 468073A0 */ cvt.s.w $f14, $f14 -/* A01820 80241220 4600010D */ trunc.w.s $f4, $f0 -/* A01824 80241224 44022000 */ mfc1 $v0, $f4 -/* A01828 80241228 00000000 */ nop -/* A0182C 8024122C 4482A000 */ mtc1 $v0, $f20 -/* A01830 80241230 00000000 */ nop -/* A01834 80241234 4680A520 */ cvt.s.w $f20, $f20 -/* A01838 80241238 0C00A69F */ jal signF -/* A0183C 8024123C 4600A306 */ mov.s $f12, $f20 -/* A01840 80241240 C6020034 */ lwc1 $f2, 0x34($s0) -/* A01844 80241244 46001032 */ c.eq.s $f2, $f0 -/* A01848 80241248 00000000 */ nop -/* A0184C 8024124C 4503000A */ bc1tl .L80241278 -/* A01850 80241250 4600A005 */ abs.s $f0, $f20 -/* A01854 80241254 8E020014 */ lw $v0, 0x14($s0) -/* A01858 80241258 10400003 */ beqz $v0, .L80241268 -/* A0185C 8024125C 0200202D */ daddu $a0, $s0, $zero -/* A01860 80241260 0040F809 */ jalr $v0 -/* A01864 80241264 24050003 */ addiu $a1, $zero, 3 -.L80241268: -/* A01868 80241268 8E020020 */ lw $v0, 0x20($s0) -/* A0186C 8024126C 24420001 */ addiu $v0, $v0, 1 -/* A01870 80241270 080904B7 */ j .L802412DC -/* A01874 80241274 AE020020 */ sw $v0, 0x20($s0) -.L80241278: -/* A01878 80241278 C6020018 */ lwc1 $f2, 0x18($s0) -/* A0187C 8024127C 468010A0 */ cvt.s.w $f2, $f2 -/* A01880 80241280 46001080 */ add.s $f2, $f2, $f0 -/* A01884 80241284 3C02B60B */ lui $v0, 0xb60b -/* A01888 80241288 344260B7 */ ori $v0, $v0, 0x60b7 -/* A0188C 8024128C 4600110D */ trunc.w.s $f4, $f2 -/* A01890 80241290 44032000 */ mfc1 $v1, $f4 -/* A01894 80241294 00000000 */ nop -/* A01898 80241298 00620018 */ mult $v1, $v0 -/* A0189C 8024129C 8E040038 */ lw $a0, 0x38($s0) -/* A018A0 802412A0 AE030018 */ sw $v1, 0x18($s0) -/* A018A4 802412A4 00004010 */ mfhi $t0 -/* A018A8 802412A8 01031021 */ addu $v0, $t0, $v1 -/* A018AC 802412AC 00021203 */ sra $v0, $v0, 8 -/* A018B0 802412B0 00031FC3 */ sra $v1, $v1, 0x1f -/* A018B4 802412B4 00431023 */ subu $v0, $v0, $v1 -/* A018B8 802412B8 10440008 */ beq $v0, $a0, .L802412DC -/* A018BC 802412BC AE02001C */ sw $v0, 0x1c($s0) -/* A018C0 802412C0 8E020014 */ lw $v0, 0x14($s0) -/* A018C4 802412C4 10400003 */ beqz $v0, .L802412D4 -/* A018C8 802412C8 0200202D */ daddu $a0, $s0, $zero -/* A018CC 802412CC 0040F809 */ jalr $v0 -/* A018D0 802412D0 24050001 */ addiu $a1, $zero, 1 -.L802412D4: -/* A018D4 802412D4 8E02001C */ lw $v0, 0x1c($s0) -/* A018D8 802412D8 AE020038 */ sw $v0, 0x38($s0) -.L802412DC: -/* A018DC 802412DC 8E020014 */ lw $v0, 0x14($s0) -/* A018E0 802412E0 10400012 */ beqz $v0, .L8024132C -/* A018E4 802412E4 0200202D */ daddu $a0, $s0, $zero -/* A018E8 802412E8 0040F809 */ jalr $v0 -/* A018EC 802412EC 24050002 */ addiu $a1, $zero, 2 -/* A018F0 802412F0 080904CB */ j .L8024132C -/* A018F4 802412F4 00000000 */ nop -.L802412F8: -/* A018F8 802412F8 8E020014 */ lw $v0, 0x14($s0) -/* A018FC 802412FC 10400003 */ beqz $v0, .L8024130C -/* A01900 80241300 0200202D */ daddu $a0, $s0, $zero -/* A01904 80241304 0040F809 */ jalr $v0 -/* A01908 80241308 24050004 */ addiu $a1, $zero, 4 -.L8024130C: -/* A0190C 8024130C 8E020020 */ lw $v0, 0x20($s0) -.L80241310: -/* A01910 80241310 24420001 */ addiu $v0, $v0, 1 -/* A01914 80241314 080904CB */ j .L8024132C -/* A01918 80241318 AE020020 */ sw $v0, 0x20($s0) -.L8024131C_A0191C: -/* A0191C 8024131C AE000018 */ sw $zero, 0x18($s0) -/* A01920 80241320 AE00001C */ sw $zero, 0x1c($s0) -/* A01924 80241324 AE000038 */ sw $zero, 0x38($s0) -/* A01928 80241328 AE000020 */ sw $zero, 0x20($s0) -.L8024132C: -/* A0192C 8024132C C6600028 */ lwc1 $f0, 0x28($s3) -/* A01930 80241330 E600002C */ swc1 $f0, 0x2c($s0) -/* A01934 80241334 C6600030 */ lwc1 $f0, 0x30($s3) -/* A01938 80241338 E6000030 */ swc1 $f0, 0x30($s0) -/* A0193C 8024133C 8FBF0020 */ lw $ra, 0x20($sp) -/* A01940 80241340 8FB3001C */ lw $s3, 0x1c($sp) -/* A01944 80241344 8FB20018 */ lw $s2, 0x18($sp) -/* A01948 80241348 8FB10014 */ lw $s1, 0x14($sp) -/* A0194C 8024134C 8FB00010 */ lw $s0, 0x10($sp) -/* A01950 80241350 D7B40028 */ ldc1 $f20, 0x28($sp) -/* A01954 80241354 0000102D */ daddu $v0, $zero, $zero -/* A01958 80241358 03E00008 */ jr $ra -/* A0195C 8024135C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_13/A01420/func_802413CC_A019CC.s b/ver/us/asm/nonmatchings/world/area_nok/nok_13/A01420/func_802413CC_A019CC.s deleted file mode 100644 index aa7f1ceded..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_13/A01420/func_802413CC_A019CC.s +++ /dev/null @@ -1,59 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413CC_A019CC -/* A019CC 802413CC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A019D0 802413D0 AFBF0018 */ sw $ra, 0x18($sp) -/* A019D4 802413D4 24020001 */ addiu $v0, $zero, 1 -/* A019D8 802413D8 10A20014 */ beq $a1, $v0, .L8024142C -/* A019DC 802413DC 0080182D */ daddu $v1, $a0, $zero -/* A019E0 802413E0 28A20002 */ slti $v0, $a1, 2 -/* A019E4 802413E4 50400005 */ beql $v0, $zero, .L802413FC -/* A019E8 802413E8 28A20005 */ slti $v0, $a1, 5 -/* A019EC 802413EC 10A00009 */ beqz $a1, .L80241414 -/* A019F0 802413F0 24050001 */ addiu $a1, $zero, 1 -/* A019F4 802413F4 08090521 */ j .L80241484 -/* A019F8 802413F8 00000000 */ nop -.L802413FC: -/* A019FC 802413FC 10400021 */ beqz $v0, .L80241484 -/* A01A00 80241400 28A20003 */ slti $v0, $a1, 3 -/* A01A04 80241404 1440001F */ bnez $v0, .L80241484 -/* A01A08 80241408 24050001 */ addiu $a1, $zero, 1 -/* A01A0C 8024140C 0809051B */ j .L8024146C -/* A01A10 80241410 00000000 */ nop -.L80241414: -/* A01A14 80241414 3C048024 */ lui $a0, %hi(D_80242134_A02734) -/* A01A18 80241418 24842134 */ addiu $a0, $a0, %lo(D_80242134_A02734) -/* A01A1C 8024141C 0C0B0CF8 */ jal start_script -/* A01A20 80241420 0000302D */ daddu $a2, $zero, $zero -/* A01A24 80241424 08090520 */ j .L80241480 -/* A01A28 80241428 24030084 */ addiu $v1, $zero, 0x84 -.L8024142C: -/* A01A2C 8024142C 24040156 */ addiu $a0, $zero, 0x156 -/* A01A30 80241430 C4600000 */ lwc1 $f0, ($v1) -/* A01A34 80241434 46800020 */ cvt.s.w $f0, $f0 -/* A01A38 80241438 44050000 */ mfc1 $a1, $f0 -/* A01A3C 8024143C C4600004 */ lwc1 $f0, 4($v1) -/* A01A40 80241440 46800020 */ cvt.s.w $f0, $f0 -/* A01A44 80241444 44060000 */ mfc1 $a2, $f0 -/* A01A48 80241448 C4600008 */ lwc1 $f0, 8($v1) -/* A01A4C 8024144C 46800020 */ cvt.s.w $f0, $f0 -/* A01A50 80241450 44070000 */ mfc1 $a3, $f0 -/* A01A54 80241454 24020003 */ addiu $v0, $zero, 3 -/* A01A58 80241458 AFA20010 */ sw $v0, 0x10($sp) -/* A01A5C 8024145C 0C04C6A5 */ jal make_item_entity_nodelay -/* A01A60 80241460 AFA00014 */ sw $zero, 0x14($sp) -/* A01A64 80241464 08090521 */ j .L80241484 -/* A01A68 80241468 00000000 */ nop -.L8024146C: -/* A01A6C 8024146C 3C048024 */ lui $a0, %hi(D_80242134_A02734) -/* A01A70 80241470 24842134 */ addiu $a0, $a0, %lo(D_80242134_A02734) -/* A01A74 80241474 0C0B0CF8 */ jal start_script -/* A01A78 80241478 0000302D */ daddu $a2, $zero, $zero -/* A01A7C 8024147C 24030011 */ addiu $v1, $zero, 0x11 -.L80241480: -/* A01A80 80241480 AC430084 */ sw $v1, 0x84($v0) -.L80241484: -/* A01A84 80241484 8FBF0018 */ lw $ra, 0x18($sp) -/* A01A88 80241488 03E00008 */ jr $ra -/* A01A8C 8024148C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml index 88d35ff59f..01aecbfd70 100644 --- a/ver/us/splat.yaml +++ b/ver/us/splat.yaml @@ -2533,7 +2533,7 @@ segments: start: 0x3251D0 vram: 0x802C0000 subsegments: - - [0x3251D0, c, 3251D0] + - [0x3251D0, c, world_use_item] - [0x3255E0] ############### @@ -8130,13 +8130,13 @@ segments: start: 0x8ABF90 vram: 0x80240000 subsegments: - - [0x8ABF90, c] - - [0x8ACD00, data] - - [0x8ACDB0, data] - - [0x8ACFE0, data] - - [0x8AEC40, data] - - [0x8B0010, data] - - [0x8B0060] + - [0x8ABF90, c, kmr_00_0_header] + - [0x8ABF90, c, kmr_00_1_music] + - [0x8ABF90, c, kmr_00_2_main] + - [0x8ABF90, c, kmr_00_3_revival] + - [0x8ACC40, c, kmr_00_4_npc] + - [0x8ACC40, c, kmr_00_5_entity] + - [0x8ACD00] - name: kmr_02 dir: world/area_kmr/kmr_02 type: code @@ -8163,51 +8163,64 @@ segments: start: 0x8C7F90 vram: 0x80240000 subsegments: - - [0x8C7F90, c] - - [0x8C8140, c] - - [0x8C82B0, c] - - [0x8C83A0, c] - - [0x8C85E0, c] - - [0x8C85E0] + - [0x8C7F90, c, kmr_03_0_header] + - [0x8C7F90, c, kmr_03_1_music] + - [0x8C7F90, c, kmr_03_2_main] + - [0x8C7F90, c, kmr_03_3_npc] + - [0x8C82B0, c, kmr_03_4_entity] + - [0x8C83A0, c, kmr_03_5_foliage] + - [0x8C85E0, c, kmr_03_6_fall_down] + - [0x8C8680] - name: kmr_04 dir: world/area_kmr/kmr_04 type: code start: 0x8CA900 vram: 0x80240000 subsegments: - - [0x8CA900, c] - - [0x8CA960, c] - - [0x8CAD70, data] - - [0x8CAF00, data] - - [0x8CB160, data] - - [0x8CC4F0, data] - - [0x8CE060] + - [0x8CA900, c, kmr_04_0_header] + - [0x8CA900, c, kmr_04_1_music] + - [0x8CA900, c, kmr_04_2_main] + - [0x8CA900, c, kmr_04_3_npc] + - [0x8CA960, c, kmr_04_4_entity] + - [0x8CA960, c, kmr_04_5_foliage] + - [0x8CAD70, .data, kmr_04_0_header] + - [0x8CAE60, .data, kmr_04_1_music] + - [0x8CAF00, .data, kmr_04_2_main] + - [0x8CB160, .data, kmr_04_3_npc] + - [0x8CC380, .data, kmr_04_4_entity] + - start: 0x8CC4F0 + type: .data + name: kmr_04_5_foliage + subsegments: + - [0x8CC4F0, ci4, hammer_block_message, 48, 48] + - [0x8CC970, palette, hammer_block_message] + - [0x8CC990] - name: kmr_05 dir: world/area_kmr/kmr_05 type: code start: 0x8CE070 vram: 0x80240000 subsegments: - - [0x8CE070, c] - - [0x8CF570, c] - - [0x8CF7F0, data] - - [0x8CF880, data] - - [0x8D0900, data] - - [0x8D0940, data] - - [0x8D14A0] + - [0x8CE070, c, kmr_05_0_header] + - [0x8CE070, c, kmr_05_1_music] + - [0x8CE070, c, kmr_05_2_main] + - [0x8CE070, c, kmr_05_3_npc] + - [0x8CF570, c, kmr_05_4_entity] + - [0x8CF570, c, kmr_05_5_foliage] + - [0x8CF7F0] - name: kmr_06 dir: world/area_kmr/kmr_06 type: code start: 0x8D1510 vram: 0x80240000 subsegments: - - [0x8D1510, c] - - [0x8D2A10, c] - - [0x8D32B0, data] - - [0x8D3340, data] - - [0x8D3AC0, data] - - [0x8D3B30, data] - - [0x8D3D50] + - [0x8D1510, c, kmr_06_0_header] + - [0x8D1510, c, kmr_06_1_music] + - [0x8D1510, c, kmr_06_2_main] + - [0x8D1510, c, kmr_06_3_npc] + - [0x8D2A10, c, kmr_06_4_entity] + - [0x8D2A10, c, kmr_06_5_sticker_sign] + - [0x8D32B0] - name: kmr_07 dir: world/area_kmr/kmr_07 type: code @@ -8650,6 +8663,7 @@ segments: type: code start: 0x93F5B0 vram: 0x80240000 + subalign: 16 subsegments: - [0x93F5B0, c, sbk_30_0_header] - [0x93F5B0, c, sbk_30_1_music] @@ -8925,10 +8939,14 @@ segments: start: 0x95B200 vram: 0x80240000 subsegments: - - [0x95B200, c, 95B200] - - [0x95B7E0, c, 95B7E0] - - [0x95E660, c, 95E660] - - [0x95E7A0, c, 95E7A0] + - [0x95B200, c, dro_01_0_header] + - [0x95B200, c, dro_01_1_music] + - [0x95B200, c, dro_01_2_main] + - [0x95B7E0, c, dro_01_3_npc] + - [0x95E660, c, dro_01_4_shop] + - [0x95E660, c, dro_01_5_building] + - [0x95E7A0, c, dro_01_6_entity] + - [0x95EA80, c, dro_01_7_foliage] - [0x95ECC0] - name: dro_02 dir: world/area_dro/dro_02 @@ -8936,16 +8954,34 @@ segments: start: 0x9691C0 vram: 0x80240000 subsegments: - - [0x9691C0, c, 9691C0] - - [0x9694C0, c, 9694C0] - - start: 0x96CC30 + - [0x9691C0, c, dro_02_0_header] + - [0x9691C0, c, dro_02_1_music] + - [0x9691C0, c, dro_02_2_entity] + - [0x9691C0, c, dro_02_3_main] + - [0x9694C0, c, dro_02_4_building] + - [0x9694C0, c, dro_02_5_npc] + - [0x96CC30, .data, dro_02_0_header] + - [0x96CCB0, .data, dro_02_1_music] + - [0x96CD90, .data, dro_02_2_entity] + - [0x96CE00, .data, dro_02_3_main] + - [0x96D380, .data, dro_02_4_building] + - start: 0x96DFA0 type: .data - name: 9694C0 + name: dro_02_5_npc subsegments: - - [0x96CC30] - - [0x971F98, vtx, vtx/971F98] - - [0x9722B8, vtx, vtx/9722B8] - - [0x973578] + - [0x96DFA0] + - [0x9707A8, ci4, card, 32, 32] + - [0x9709A8, palette, card] + - [0x9709C8, vtx, card_1] + - [0x970A48, vtx, card_2] + - [0x970A88, gfx, card_setup] + - [0x970B78, gfx, card_1] + - [0x970BF8, gfx, card_2] + - [0x970C40] + - [0x971F98, vtx, toad_house_blanket] + - [0x973578, gfx, toad_house_blanket] + - [0x9736E0, rgba16, toad_house_blanket, 16, 32] + - [0x973AE0] - [0x9780D0] - name: isk_01 dir: world/area_isk/isk_01 @@ -9228,6 +9264,7 @@ segments: type: code start: 0x9B1790 vram: 0x80240000 + subalign: 16 subsegments: - [0x9B1790, c, trd_06_0_header] - [0x9B1790, c, trd_06_1_main] @@ -9235,7 +9272,6 @@ segments: - [0x9B2280, c, trd_06_3_npc_prisoners] - [0x9B2280, c, trd_06_4_npc_koopa_bros] - [0x9B2280, c, trd_06_5_entity] - - [0x9B2410, c, trd_06_6_party_image] - [0x9B24B0] - name: trd_07 dir: world/area_trd/trd_07 @@ -11861,6 +11897,7 @@ segments: type: code start: 0xC6C920 vram: 0x80240000 + subalign: 16 subsegments: - [0xC6C920, c, kzn_06_1_main] - [0xC6CC30, c, kzn_06_2_entity] @@ -14416,89 +14453,111 @@ segments: ################# ### Dead maps ### ################# - - type: code + - name: dead_kzn_17 + dir: world/dead/kzn_17 + type: code start: 0xEA0900 vram: 0x80240000 subsegments: - [0xEA0900, c] - - [0xEA0C10, c, EA0C10] - - [0xEA36E0, c, EA36E0] - - [0xEA3A80, data, dead/EA3A80] + - [0xEA0C10, c] + - [0xEA36E0, c] + - [0xEA3A80, data] - [0xEA6D70] - - type: code + - name: dead_kzn_18 + dir: world/dead/kzn_18 + type: code start: 0xEA6FD0 vram: 0x80240000 subsegments: - [0xEA6FD0, c] - [0xEA7010, c] - [0xEA7320, c] - - [0xEA7390, data, dead/EA7390] - - type: code + - [0xEA7390, data] + - name: dead_kzn_19 + dir: world/dead/kzn_19 + type: code start: 0xEA8AE0 vram: 0x80240000 subsegments: - [0xEA8AE0, c] - - [0xEAA810, data, dead/EAA810] + - [0xEAA810, data] - [0xEB0E20] - - type: code + - name: dead_03 + dir: world/dead/dead_03 + type: code start: 0xEB0E60 vram: 0x80240000 subsegments: - [0xEB0E60, c] - [0xEB1170, c] - - [0xEB1920, data, dead/EB1920] - - type: code + - [0xEB1920, data] + - name: dead_04 + dir: world/dead/dead_04 + type: code start: 0xEB5130 vram: 0x80240000 subsegments: - [0xEB5130, c] - [0xEB5470, c] - - [0xEB54C0, data, dead/EB54C0] - - type: code + - [0xEB54C0, data] + - name: dead_kzn_23 + dir: world/dead/kzn_23 + type: code start: 0xEB7230 vram: 0x80240000 subsegments: - [0xEB7230, c] - - [0xEB7540, c, EB7540] - - [0xEB7850, data, dead/EB7850] + - [0xEB7540, c] + - [0xEB7850, data] - [0xEB8E40] - - type: code + - name: dead_flo_00 + dir: world/dead/flo_00 + type: code start: 0xEB8E50 vram: 0x80240000 subsegments: - - [0xEB8E50, c, EB8E50] - - [0xEB8E90, c, EB8E90] + - [0xEB8E50, c] + - [0xEB8E90, c] - [0xEB9D90, c] - - [0xEBA260, data, dead/EBA260] + - [0xEBA260, data] - [0xEC2000] - - type: code + - name: dead_flo_03 + dir: world/dead/flo_03 + type: code start: 0xEC2200 vram: 0x80240000 subsegments: - - [0xEC2200, c, EC2200] - - [0xEC2240, c, EC2240] + - [0xEC2200, c] + - [0xEC2240, c] - [0xEC2610, c] - - [0xEC2850, data, dead/EC2850] + - [0xEC2850, data] - [0xEC7170] - - type: code + - name: dead_flo_07 + dir: world/dead/flo_07 + type: code start: 0xEC71B0 vram: 0x80240000 subsegments: - [0xEC71B0, c] - [0xEC7590, c] - - [0xEC78F0, data, dead/EC78F0] - - type: code + - [0xEC78F0, data] + - name: dead_flo_08 + dir: world/dead/flo_08 + type: code start: 0xEC9D00 vram: 0x80240000 subsegments: - [0xEC9D00, c] - [0xECAA40, c] - - [0xECAA80, c, ECAA80] + - [0xECAA80, c] - [0xECB930, c] - [0xECBB70, c] - - [0xECBC10, data, dead/ECBC10] + - [0xECBC10, data] - [0xECFE60] - - type: code + - name: dead_flo_09 + dir: world/dead/flo_09 + type: code start: 0xECFFF0 vram: 0x80240000 subsegments: @@ -14506,9 +14565,11 @@ segments: - [0xED0030, c] - [0xED00D0, c] - [0xED0310, c] - - [0xED1840, data, dead/ED1840] + - [0xED1840, data] - [0xED41C0] - - type: code + - name: dead_flo_10 + dir: world/dead/flo_10 + type: code start: 0xED4220 vram: 0x80240000 subsegments: @@ -14517,40 +14578,50 @@ segments: - [0xED42A0, c] - [0xED46D0, c] - [0xED5540, c] - - [0xED5780, data, dead/ED5780] - - type: code + - [0xED5780, data] + - name: dead_flo_11 + dir: world/dead/flo_11 + type: code start: 0xED8E20 vram: 0x80240000 subsegments: - - [0xED8E20, c, ED8E20] - - [0xED9170, data, dead/ED9170] + - [0xED8E20, c] + - [0xED9170, data] - [0xEDBF90] - - type: code + - name: dead_flo_12 + dir: world/dead/flo_12 + type: code start: 0xEDBFE0 vram: 0x80240000 subsegments: - [0xEDBFE0, c] - [0xEDC020, c] - - [0xEDC6D0, data, dead/EDC6D0] - - type: code + - [0xEDC6D0, data] + - name: dead_flo_13 + dir: world/dead/flo_13 + type: code start: 0xEDE9C0 vram: 0x80240000 subsegments: - [0xEDE9C0, c] - - [0xEDEA00, c, EDEA00] - - [0xEE2040, c, EE2040] - - [0xEE20E0, data, dead/EE20E0] + - [0xEDEA00, c] + - [0xEE2040, c] + - [0xEE20E0, data] - [0xEE64B0] - - type: code + - name: dead_flo_14 + dir: world/dead/flo_14 + type: code start: 0xEE65B0 vram: 0x80240000 subsegments: - [0xEE65B0, c] - [0xEE70C0, c] - [0xEE8940, c] - - [0xEE8970, data, dead/EE8970] + - [0xEE8970, data] - [0xEEB900] - - type: code + - name: dead_flo_16 + dir: world/dead/flo_16 + type: code start: 0xEED100 vram: 0x80240000 subsegments: @@ -14559,25 +14630,29 @@ segments: - [0xEED1E0, c] - [0xEEDF50, c] - [0xEEFAA0, c] - - [0xEEFAD0, data, dead/EEFAD0] + - [0xEEFAD0, data] - [0xEF2550] - - type: code + - name: dead_11 + dir: world/dead/dead_11 + type: code start: 0xEF2610 vram: 0x80240000 subsegments: - [0xEF2610, c] - [0xEF2650, c] - - [0xEF2680, c, EF2680] - - [0xEF58E0, data, dead/EF58E0] + - [0xEF2680, c] + - [0xEF58E0, data] - [0xEF79C0] - - type: code + - name: dead_flo_18 + dir: world/dead/flo_18 + type: code start: 0xEF7A80 vram: 0x80240000 subsegments: - [0xEF7A80, c] - [0xEF7FB0, c] - [0xEF8010, c] - - [0xEF8250, data, dead/EF8250] + - [0xEF8250, data] - type: code start: 0xEFEB00 vram: 0x80240000 diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index 41bea27798..feb59cad56 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -7908,19 +7908,19 @@ world_twink_take_out = 0x802BD1F0; // type:data rom:0x325160 world_twink_update = 0x802BD20C; // type:data rom:0x32517C world_twink_use_ability = 0x802BD228; // type:data rom:0x325198 world_twink_put_away = 0x802BD244; // type:data rom:0x3251B4 -func_802C0000 = 0x802BD100; // type:func rom:0x3251D0 -func_802C00AC = 0x802BD1AC; // type:func rom:0x32527C -func_802C016C = 0x802BD26C; // type:func rom:0x32533C -func_802C022C = 0x802BD32C; // type:func rom:0x3253FC -func_802C0288 = 0x802BD388; // type:func rom:0x325458 -func_802C02E4 = 0x802BD3E4; // type:func rom:0x3254B4 -func_802C031C = 0x802BD41C; // type:func rom:0x3254EC -func_802C0358 = 0x802BD458; // type:func rom:0x325528 -func_802C03E8 = 0x802BD4E8; // type:func rom:0x3255B8 -D_802C0410 = 0x802C0410; // type:data rom:0x3255E0 -D_802C04F4 = 0x802C04F4; // type:data rom:0x3256C4 -D_802C0560 = 0x802C0560; // type:data rom:0x325730 -D_802C05CC_32579C = 0x802C05CC; // type:data rom:0x32579C +WorldItem_ShowUseSparkles = 0x802BD100; // type:func rom:0x3251D0 +WorldItem_ShowHPGain = 0x802BD1AC; // type:func rom:0x32527C +WorldItem_ShowFPGain = 0x802BD26C; // type:func rom:0x32533C +WorldItem_RestoreHP = 0x802BD32C; // type:func rom:0x3253FC +WorldItem_RestoreFP = 0x802BD388; // type:func rom:0x325458 +WorldItem_PauseTime = 0x802BD3E4; // type:func rom:0x3254B4 +WorldItem_UnpauseTime = 0x802BD41C; // type:func rom:0x3254EC +WorldItem_GetItemProperties = 0x802BD458; // type:func rom:0x325528 +WorldItem_ConsumeItem = 0x802BD4E8; // type:func rom:0x3255B8 +EVS_WorldItem_ShowUsedItem = 0x802C0410; // type:data rom:0x3255E0 +EVS_WorldItem_PlayEatingSounds = 0x802C04F4; // type:data rom:0x3256C4 +EVS_WorldItem_PlayDrinkingSounds = 0x802C0560; // type:data rom:0x325730 +EVS_World_UseItem = 0x802C05CC; // type:data rom:0x32579C func_E0200000 = 0xE0200000; // type:func rom:0x325AD0 func_E0200044 = 0xE0200044; // type:func rom:0x325B14 func_E02000AC = 0xE02000AC; // type:func rom:0x325B7C @@ -14914,7 +14914,7 @@ ShopResetSpeech = 0x80283EE0; // type:data rom:0x7E4D60 ShopEndSpeech = 0x80283F2C; // type:data rom:0x7E4DAC D_80283F58_7E4DD8 = 0x80283F58; // type:data rom:0x7E4DD8 BadgeShopInteract = 0x80284034; // type:data rom:0x7E4EB4 -D_80284054_7E4ED4 = 0x80284054; // type:data rom:0x7E4ED4 +ItemShopInteract = 0x80284054; // type:data rom:0x7E4ED4 func_80240000_7E73A0 = 0x80240000; // type:func rom:0x7E73A0 machi_80240030_7E73D0 = 0x80240030; // type:func rom:0x7E73D0 func_80240038_7E73D8 = 0x80240038; // type:func rom:0x7E73D8 @@ -14944,8 +14944,8 @@ mac_00_UpdateTexturePanSmooth = 0x802402E0; // type:func rom:0x7EAFF0 mac_00_UpdateTexturePanStepped = 0x80240404; // type:func rom:0x7EB114 func_802405EC_7EB2FC = 0x802405EC; // type:func rom:0x7EB2FC func_80240624_7EB334 = 0x80240624; // type:func rom:0x7EB334 -mac_00_Quizmo_StashVars = 0x80240630; // type:func rom:0x7EB340 -mac_00_Quizmo_GetItemName = 0x802406E4; // type:func rom:0x7EB3F4 +mac_00_StashVars = 0x80240630; // type:func rom:0x7EB340 +mac_00_GetItemName = 0x802406E4; // type:func rom:0x7EB3F4 mac_00_Quizmo_HideEntities = 0x80240748; // type:func rom:0x7EB458 mac_00_Quizmo_ShowEntities = 0x8024075C; // type:func rom:0x7EB46C mac_00_Quizmo_ShouldAppear = 0x8024076C; // type:func rom:0x7EB47C @@ -15016,7 +15016,7 @@ dup_mac_00_LetterDelivery_Init = 0x8024386C; // type:func rom:0x7EE57C dup_mac_00_LetterDelivery_CalcLetterPos = 0x8024395C; // type:func rom:0x7EE66C dup_mac_00_LetterDelivery_SaveNpcAnim = 0x80243AE8; // type:func rom:0x7EE7F8 dup_mac_00_LetterDelivery_RestoreNpcAnim = 0x80243B2C; // type:func rom:0x7EE83C -mac_00_Quizmo_varStash = 0x80245DC0; // type:data rom:0x7F0AD0 +mac_00_varStash = 0x80245DC0; // type:data rom:0x7F0AD0 mac_00_Quizmo_Answers = 0x80245E24; // type:data rom:0x7F0B34 D_80245E64_7F0B74 = 0x80245E64; // type:data rom:0x7F0B74 D_802483E8_7F30F8 = 0x802483E8; // type:data rom:0x7F30F8 @@ -15051,8 +15051,8 @@ mac_01_PatrolAI_Chase = 0x802419CC; // type:func rom:0x80224C dup_mac_01_PatrolAI_LosePlayer = 0x80241AEC; // type:func rom:0x80236C mac_01_PatrolNoAttackAI_15 = 0x80241B54; // type:func rom:0x8023D4 mac_01_PatrolNoAttackAI_Main = 0x80241C14; // type:func rom:0x802494 -mac_01_Quizmo_StashVars = 0x80241F10; // type:func rom:0x802790 -mac_01_Quizmo_GetItemName = 0x80241FC4; // type:func rom:0x802844 +mac_01_StashVars = 0x80241F10; // type:func rom:0x802790 +mac_01_GetItemName = 0x80241FC4; // type:func rom:0x802844 mac_01_Quizmo_HideEntities = 0x80242028; // type:func rom:0x8028A8 mac_01_Quizmo_ShowEntities = 0x8024203C; // type:func rom:0x8028BC mac_01_Quizmo_ShouldAppear = 0x8024204C; // type:func rom:0x8028CC @@ -15151,7 +15151,7 @@ D_80247F88_808808 = 0x80247F88; // type:data rom:0x808808 D_80248420_808CA0 = 0x80248420; // type:data rom:0x808CA0 D_802485E8_808E68 = 0x802485E8; // type:data rom:0x808E68 D_80248714_808F94 = 0x80248714; // type:data rom:0x808F94 -mac_01_Quizmo_varStash = 0x80248C30; // type:data rom:0x8094B0 +mac_01_varStash = 0x80248C30; // type:data rom:0x8094B0 mac_01_Quizmo_Answers = 0x80248C94; // type:data rom:0x809514 D_80248CD4_809554 = 0x80248CD4; // type:data rom:0x809554 D_8024D944_80E1C4 = 0x8024D944; // type:data rom:0x80E1C4 @@ -15188,8 +15188,8 @@ mac_02_PatrolAI_Chase = 0x8024127C; // type:func rom:0x82453C mac_02_PatrolAI_LosePlayer = 0x8024139C; // type:func rom:0x82465C mac_02_PatrolNoAttackAI_15 = 0x80241404; // type:func rom:0x8246C4 mac_02_PatrolNoAttackAI_Main = 0x802414C4; // type:func rom:0x824784 -mac_02_Quizmo_StashVars = 0x802417C0; // type:func rom:0x824A80 -mac_02_Quizmo_GetItemName = 0x80241874; // type:func rom:0x824B34 +mac_02_StashVars = 0x802417C0; // type:func rom:0x824A80 +mac_02_GetItemName = 0x80241874; // type:func rom:0x824B34 mac_02_Quizmo_HideEntities = 0x802418D8; // type:func rom:0x824B98 mac_02_Quizmo_ShowEntities = 0x802418EC; // type:func rom:0x824BAC mac_02_Quizmo_ShouldAppear = 0x802418FC; // type:func rom:0x824BBC @@ -15232,7 +15232,7 @@ mac_02_LetterDelivery_CalcLetterPos = 0x802431F4; // type:func rom:0x8264B4 mac_02_LetterDelivery_SaveNpcAnim = 0x80243380; // type:func rom:0x826640 mac_02_LetterDelivery_RestoreNpcAnim = 0x802433C4; // type:func rom:0x826684 mac_02_MonitorMusicProximityTrigger = 0x802433F0; // type:func rom:0x8266B0 -mac_02_Quizmo_varStash = 0x80246150; // type:data rom:0x829410 +mac_02_varStash = 0x80246150; // type:data rom:0x829410 mac_02_Quizmo_Answers = 0x802461B4; // type:data rom:0x829474 D_802461F4_8294B4 = 0x802461F4; // type:data rom:0x8294B4 D_80248778_82BA38 = 0x80248778; // type:data rom:0x82BA38 @@ -15256,8 +15256,8 @@ mac_03_Pipe_GetCameraYaw = 0x802401D0; // type:func rom:0x8319D0 mac_03_Pipe_GetPointAheadOfPlayer = 0x8024023C; // type:func rom:0x831A3C func_802402E0_831AE0 = 0x802402E0; // type:func rom:0x831AE0 mac_03_CosInterpMinMax = 0x80240320; // type:func rom:0x831B20 -mac_03_Quizmo_StashVars = 0x802404B0; // type:func rom:0x831CB0 -mac_03_Quizmo_GetItemName = 0x80240564; // type:func rom:0x831D64 +mac_03_StashVars = 0x802404B0; // type:func rom:0x831CB0 +mac_03_GetItemName = 0x80240564; // type:func rom:0x831D64 mac_03_Quizmo_HideEntities = 0x802405C8; // type:func rom:0x831DC8 mac_03_Quizmo_ShowEntities = 0x802405DC; // type:func rom:0x831DDC mac_03_Quizmo_ShouldAppear = 0x802405EC; // type:func rom:0x831DEC @@ -15308,7 +15308,7 @@ func_802425A8_833DA8 = 0x802425A8; // type:func rom:0x833DA8 func_80242608_833E08 = 0x80242608; // type:func rom:0x833E08 func_80242694_833E94 = 0x80242694; // type:func rom:0x833E94 func_802427D0_833FD0 = 0x802427D0; // type:func rom:0x833FD0 -mac_03_Quizmo_varStash = 0x80246644; // type:data rom:0x837E44 +mac_03_varStash = 0x80246644; // type:data rom:0x837E44 mac_03_Quizmo_Answers = 0x802466A8; // type:data rom:0x837EA8 D_802466E8_837EE8 = 0x802466E8; // type:data rom:0x837EE8 D_80248C6C_83A46C = 0x80248C6C; // type:data rom:0x83A46C @@ -15320,8 +15320,8 @@ func_80240194_842D64 = 0x80240194; // type:func rom:0x842D64 func_802401C0_842D90 = 0x802401C0; // type:func rom:0x842D90 mac_04_foliage_setup_shear_mtx = 0x80240220; // type:func rom:0x842DF0 mac_04_TransformFoliage = 0x80240290; // type:func rom:0x842E60 -mac_04_Quizmo_StashVars = 0x80240460; // type:func rom:0x843030 -mac_04_Quizmo_GetItemName = 0x80240514; // type:func rom:0x8430E4 +mac_04_StashVars = 0x80240460; // type:func rom:0x843030 +mac_04_GetItemName = 0x80240514; // type:func rom:0x8430E4 mac_04_Quizmo_HideEntities = 0x80240578; // type:func rom:0x843148 mac_04_Quizmo_ShowEntities = 0x8024058C; // type:func rom:0x84315C mac_04_Quizmo_ShouldAppear = 0x8024059C; // type:func rom:0x84316C @@ -15371,7 +15371,7 @@ func_80241D30_844900 = 0x80241D30; // type:func rom:0x844900 func_80241DAC_84497C = 0x80241DAC; // type:func rom:0x84497C mac_04_RemovePadlock = 0x80241EB0; // type:func rom:0x844A80 mac_04_MonitorMusicProximityTrigger = 0x80241EF0; // type:func rom:0x844AC0 -mac_04_Quizmo_varStash = 0x80243FE8; // type:data rom:0x846BB8 +mac_04_varStash = 0x80243FE8; // type:data rom:0x846BB8 mac_04_Quizmo_Answers = 0x8024404C; // type:data rom:0x846C1C D_8024408C_846C5C = 0x8024408C; // type:data rom:0x846C5C D_80246610_8491E0 = 0x80246610; // type:data rom:0x8491E0 @@ -15394,8 +15394,8 @@ mac_05_PatrolAI_Chase = 0x80240DDC; // type:func rom:0x852F4C mac_05_PatrolAI_LosePlayer = 0x80240EFC; // type:func rom:0x85306C mac_05_PatrolNoAttackAI_15 = 0x80240F64; // type:func rom:0x8530D4 mac_05_PatrolNoAttackAI_Main = 0x80241024; // type:func rom:0x853194 -mac_05_Quizmo_StashVars = 0x80241320; // type:func rom:0x853490 -mac_05_Quizmo_GetItemName = 0x802413D4; // type:func rom:0x853544 +mac_05_StashVars = 0x80241320; // type:func rom:0x853490 +mac_05_GetItemName = 0x802413D4; // type:func rom:0x853544 mac_05_Quizmo_HideEntities = 0x80241438; // type:func rom:0x8535A8 mac_05_Quizmo_ShowEntities = 0x8024144C; // type:func rom:0x8535BC mac_05_Quizmo_ShouldAppear = 0x8024145C; // type:func rom:0x8535CC @@ -15453,7 +15453,7 @@ mac_05_SetWhaleGeyserPos = 0x80243CD4; // type:func rom:0x855E44 mac_05_DisposeWhaleGeyser = 0x80243D78; // type:func rom:0x855EE8 func_80243DB0_855F20 = 0x80243DB0; // type:func rom:0x855F20 func_80243F0C_85607C = 0x80243F0C; // type:func rom:0x85607C -mac_05_Quizmo_varStash = 0x802450B0; // type:data rom:0x857220 +mac_05_varStash = 0x802450B0; // type:data rom:0x857220 mac_05_Quizmo_Answers = 0x80245114; // type:data rom:0x857284 D_80245154_8572C4 = 0x80245154; // type:data rom:0x8572C4 D_802476D8_859848 = 0x802476D8; // type:data rom:0x859848 @@ -15879,18 +15879,18 @@ kgr_02_func_80240730_8AAB80 = 0x80240730; // type:func rom:0x8AAB80 kgr_02_func_80240748_8AAB98 = 0x80240748; // type:func rom:0x8AAB98 kgr_02_HasBombetteExploded = 0x80240760; // type:func rom:0x8AABB0 kgr_02_D_80240970_8AADC0 = 0x80240970; // type:data rom:0x8AADC0 -func_80240000_8ABF90 = 0x80240000; // type:func rom:0x8ABF90 -func_80240388_8AC318 = 0x80240388; // type:func rom:0x8AC318 -func_802403B8_8AC348 = 0x802403B8; // type:func rom:0x8AC348 -func_802404A0_8AC430 = 0x802404A0; // type:func rom:0x8AC430 -func_802404E8_8AC478 = 0x802404E8; // type:func rom:0x8AC478 -func_80240530_8AC4C0 = 0x80240530; // type:func rom:0x8AC4C0 -func_80240584_8AC514 = 0x80240584; // type:func rom:0x8AC514 -func_802405A8_8AC538 = 0x802405A8; // type:func rom:0x8AC538 -func_802405CC_8AC55C = 0x802405CC; // type:func rom:0x8AC55C -func_802405F0_8AC580 = 0x802405F0; // type:func rom:0x8AC580 -func_80240BD8_8ACB68 = 0x80240BD8; // type:func rom:0x8ACB68 -func_80240CB0_8ACC40 = 0x80240CB0; // type:func rom:0x8ACC40 +kmr_00_func_80240000_8ABF90 = 0x80240000; // type:func rom:0x8ABF90 +kmr_00_func_80240388_8AC318 = 0x80240388; // type:func rom:0x8AC318 +kmr_00_func_802403B8_8AC348 = 0x802403B8; // type:func rom:0x8AC348 +kmr_00_func_802404A0_8AC430 = 0x802404A0; // type:func rom:0x8AC430 +kmr_00_func_802404E8_8AC478 = 0x802404E8; // type:func rom:0x8AC478 +kmr_00_func_80240530_8AC4C0 = 0x80240530; // type:func rom:0x8AC4C0 +kmr_00_func_80240584_8AC514 = 0x80240584; // type:func rom:0x8AC514 +kmr_00_func_802405A8_8AC538 = 0x802405A8; // type:func rom:0x8AC538 +kmr_00_func_802405CC_8AC55C = 0x802405CC; // type:func rom:0x8AC55C +kmr_00_func_802405F0_8AC580 = 0x802405F0; // type:func rom:0x8AC580 +kmr_00_func_80240BD8_8ACB68 = 0x80240BD8; // type:func rom:0x8ACB68 +kmr_00_UpdateStarSpiritBobbing = 0x80240CB0; // type:func rom:0x8ACC40 D_80242D60_8AECF0 = 0x80242D60; // type:data rom:0x8AECF0 kmr_02_Pipe_SetAnimFlag = 0x80240000; // type:func rom:0x8B0070 kmr_02_Pipe_GetCurrentFloor = 0x80240020; // type:func rom:0x8B0090 @@ -15900,8 +15900,8 @@ kmr_02_Pipe_GetCameraYaw = 0x802401D0; // type:func rom:0x8B0240 kmr_02_Pipe_GetPointAheadOfPlayer = 0x8024023C; // type:func rom:0x8B02AC func_802402E0_8B0350 = 0x802402E0; // type:func rom:0x8B0350 func_80240370_8B03E0 = 0x80240370; // type:func rom:0x8B03E0 -kmr_02_Quizmo_StashVars = 0x80240390; // type:func rom:0x8B0400 -kmr_02_Quizmo_GetItemName = 0x80240444; // type:func rom:0x8B04B4 +kmr_02_StashVars = 0x80240390; // type:func rom:0x8B0400 +kmr_02_GetItemName = 0x80240444; // type:func rom:0x8B04B4 kmr_02_Quizmo_HideEntities = 0x802404A8; // type:func rom:0x8B0518 kmr_02_Quizmo_ShowEntities = 0x802404BC; // type:func rom:0x8B052C kmr_02_Quizmo_ShouldAppear = 0x802404CC; // type:func rom:0x8B053C @@ -15988,7 +15988,7 @@ kmr_02_foliage_setup_shear_mtx = 0x80243760; // type:func rom:0x8B37D0 kmr_02_TransformFoliage = 0x802437D0; // type:func rom:0x8B3840 func_802439A0_8B3A10 = 0x802439A0; // type:func rom:0x8B3A10 D_80244B2C_8B4B9C = 0x80244B2C; // type:data rom:0x8B4B9C -kmr_02_Quizmo_varStash = 0x802455D0; // type:data rom:0x8B5640 +kmr_02_varStash = 0x802455D0; // type:data rom:0x8B5640 kmr_02_Quizmo_Answers = 0x80245634; // type:data rom:0x8B56A4 D_80245674_8B56E4 = 0x80245674; // type:data rom:0x8B56E4 D_80247E30_8B7EA0 = 0x80247E30; // type:data rom:0x8B7EA0 @@ -16045,17 +16045,17 @@ kmr_03_tree1Point = 0x802422A8; // type:data rom:0x8CA238 kmr_03_802422B8 = 0x802422B8; // type:data rom:0x8CA248 kmr_03_80242340 = 0x80242340; // type:data rom:0x8CA2D0 kmr_04_CheckPartnerFlags1000 = 0x80240000; // type:func rom:0x8CA900 -kmr_04_func_8024002C_8CA92C = 0x8024002C; // type:func rom:0x8CA92C +kmr_04_GetPlayerHP = 0x8024002C; // type:func rom:0x8CA92C kmr_04_foliage_setup_shear_mtx = 0x80240060; // type:func rom:0x8CA960 kmr_04_TransformFoliage = 0x802400D0; // type:func rom:0x8CA9D0 dup_kmr_04_CheckPartnerFlags1000 = 0x8024029C; // type:func rom:0x8CAB9C kmr_04_StashVars = 0x802402C8; // type:func rom:0x8CABC8 kmr_04_GetItemName = 0x8024037C; // type:func rom:0x8CAC7C -func_802403E0_8CACE0 = 0x802403E0; // type:func rom:0x8CACE0 -kmr_04_func_80240434_8CAD34 = 0x80240434; // type:func rom:0x8CAD34 +kmr_04_SetMessageImage_HammerBlock = 0x802403E0; // type:func rom:0x8CACE0 +kmr_04_GiveWoodenHammer = 0x80240434; // type:func rom:0x8CAD34 kmr_04_func_80240444_8CAD44 = 0x80240444; // type:func rom:0x8CAD44 -D_80241BF0_8CC4F0 = 0x80241BF0; // type:data rom:0x8CC4F0 -D_80242070_8CC970 = 0x80242070; // type:data rom:0x8CC970 +kmr_04_hammer_block_message_img = 0x80241BF0; // type:data rom:0x8CC4F0 +kmr_04_hammer_block_message_pal = 0x80242070; // type:data rom:0x8CC970 kmr_04_varStash = 0x802429F4; // type:data rom:0x8CD2F4 kmr_05_FlyingAI_WanderInit = 0x80240000; // type:func rom:0x8CE070 kmr_05_FlyingAI_Wander = 0x802401B0; // type:func rom:0x8CE220 @@ -16070,7 +16070,7 @@ kmr_05_FlyingAI_Init = 0x802411E8; // type:func rom:0x8CF258 kmr_05_FlyingAI_Main = 0x8024130C; // type:func rom:0x8CF37C kmr_05_foliage_setup_shear_mtx = 0x80241500; // type:func rom:0x8CF570 kmr_05_TransformFoliage = 0x80241570; // type:func rom:0x8CF5E0 -func_8024173C_8CF7AC = 0x8024173C; // type:func rom:0x8CF7AC +kmr_05_func_8024173C_8CF7AC = 0x8024173C; // type:func rom:0x8CF7AC kmr_05_FlyingAI_JumpVels = 0x80241B2C; // type:data rom:0x8CFB9C D_80243440_8D14B0 = 0x80243440; // type:data rom:0x8D14B0 D_80243448_8D14B8 = 0x80243448; // type:data rom:0x8D14B8 @@ -16086,14 +16086,14 @@ kmr_06_FlyingAI_Chase = 0x80240DF4; // type:func rom:0x8D2304 kmr_06_FlyingAI_LosePlayer = 0x80240E58; // type:func rom:0x8D2368 kmr_06_FlyingAI_Init = 0x802411E8; // type:func rom:0x8D26F8 kmr_06_FlyingAI_Main = 0x8024130C; // type:func rom:0x8D281C -func_80241500_8D2A10 = 0x80241500; // type:func rom:0x8D2A10 -func_802417A8_8D2CB8 = 0x802417A8; // type:func rom:0x8D2CB8 -func_802417E0_8D2CF0 = 0x802417E0; // type:func rom:0x8D2CF0 -func_80241950_8D2E60 = 0x80241950; // type:func rom:0x8D2E60 -func_802419EC_8D2EFC = 0x802419EC; // type:func rom:0x8D2EFC -func_80241A68_8D2F78 = 0x80241A68; // type:func rom:0x8D2F78 -func_80241C78_8D3188 = 0x80241C78; // type:func rom:0x8D3188 -func_80241CC8_8D31D8 = 0x80241CC8; // type:func rom:0x8D31D8 +kmr_06_appendGfx_sticker = 0x80241500; // type:func rom:0x8D2A10 +kmr_06_worker_render_sticker = 0x802417A8; // type:func rom:0x8D2CB8 +kmr_06_CreateSticker = 0x802417E0; // type:func rom:0x8D2CF0 +kmr_06_SetStickerPos = 0x80241950; // type:func rom:0x8D2E60 +kmr_06_SetStickerRotation = 0x802419EC; // type:func rom:0x8D2EFC +kmr_06_JumpStickerTo = 0x80241A68; // type:func rom:0x8D2F78 +kmr_06_SetStickerGravity = 0x80241C78; // type:func rom:0x8D3188 +kmr_06_DeleteSticker = 0x80241CC8; // type:func rom:0x8D31D8 kmr_06_FlyingAI_JumpVels = 0x802420BC; // type:data rom:0x8D35CC D_80242850_8D3D60 = 0x80242850; // type:data rom:0x8D3D60 D_80242858_8D3D68 = 0x80242858; // type:data rom:0x8D3D68 @@ -16750,8 +16750,8 @@ dro_01_PatrolAI_Chase = 0x80240F2C; // type:func rom:0x95C12C dro_01_PatrolAI_LosePlayer = 0x8024104C; // type:func rom:0x95C24C dro_01_PatrolNoAttackAI_15 = 0x802410B4; // type:func rom:0x95C2B4 dro_01_PatrolNoAttackAI_Main = 0x80241174; // type:func rom:0x95C374 -dro_01_Quizmo_StashVars = 0x80241470; // type:func rom:0x95C670 -dro_01_Quizmo_GetItemName = 0x80241524; // type:func rom:0x95C724 +dro_01_StashVars = 0x80241470; // type:func rom:0x95C670 +dro_01_GetItemName = 0x80241524; // type:func rom:0x95C724 dro_01_Quizmo_HideEntities = 0x80241588; // type:func rom:0x95C788 dro_01_Quizmo_ShowEntities = 0x8024159C; // type:func rom:0x95C79C dro_01_Quizmo_ShouldAppear = 0x802415AC; // type:func rom:0x95C7AC @@ -16782,26 +16782,26 @@ dro_01_AddPlayerHandsOffset = 0x80242560; // type:func rom:0x95D760 dro_01_func_80242730_95D930 = 0x80242730; // type:func rom:0x95D930 dro_01_func_80242784_95D984 = 0x80242784; // type:func rom:0x95D984 dro_01_BuildKeyItemChoiceList = 0x802427BC; // type:func rom:0x95D9BC -dro_01_func_80242858_95DA58 = 0x80242858; // type:func rom:0x95DA58 +dro_01_MonitorPlayerOrbiting = 0x80242858; // type:func rom:0x95DA58 dro_01_LetterDelivery_Init = 0x80242D98; // type:func rom:0x95DF98 dro_01_LetterDelivery_CalcLetterPos = 0x80242E88; // type:func rom:0x95E088 dro_01_LetterDelivery_SaveNpcAnim = 0x80243014; // type:func rom:0x95E214 dro_01_LetterDelivery_RestoreNpcAnim = 0x80243058; // type:func rom:0x95E258 -dro_01_func_80243084_95E284 = 0x80243084; // type:func rom:0x95E284 +dro_01_SaveSpinningRoofHintTime = 0x80243084; // type:func rom:0x95E284 dro_01_GetFloorCollider = 0x8024309C; // type:func rom:0x95E29C -dro_01_func_802430C8_95E2C8 = 0x802430C8; // type:func rom:0x95E2C8 -dro_01_func_802431B4_95E3B4 = 0x802431B4; // type:func rom:0x95E3B4 -dro_01_func_802431FC_95E3FC = 0x802431FC; // type:func rom:0x95E3FC -dro_01_func_80243350_95E550 = 0x80243350; // type:func rom:0x95E550 -dro_01_dup_StashVars = 0x80243460; // type:func rom:0x95E660 -dro_01_dup_GetItemName = 0x80243514; // type:func rom:0x95E714 -dro_01_func_80243578_95E778 = 0x80243578; // type:func rom:0x95E778 -dro_01_dup_Pipe_SetAnimFlag = 0x802435A0; // type:func rom:0x95E7A0 -dro_01_dup_Pipe_GetCurrentFloor = 0x802435C0; // type:func rom:0x95E7C0 -dro_01_dup_Pipe_AwaitDownInput = 0x802435D4; // type:func rom:0x95E7D4 -dro_01_dup_Pipe_GetEntryPos = 0x80243690; // type:func rom:0x95E890 -dro_01_dup_Pipe_GetCameraYaw = 0x80243770; // type:func rom:0x95E970 -dro_01_dup_Pipe_GetPointAheadOfPlayer = 0x802437DC; // type:func rom:0x95E9DC +dro_01_red_tree_orbit_listener = 0x802430C8; // type:func rom:0x95E2C8 +dro_01_HasBeenHalfHourSinceTreeOrbit = 0x802431B4; // type:func rom:0x95E3B4 +dro_01_GetRunToPos = 0x802431FC; // type:func rom:0x95E3FC +dro_01_AwaitPlayerApproachShop = 0x80243350; // type:func rom:0x95E550 +dro_01_Shop_StashVars = 0x80243460; // type:func rom:0x95E660 +dro_01_Shop_GetItemName = 0x80243514; // type:func rom:0x95E714 +dro_01_Shop_HideCoinCounter = 0x80243578; // type:func rom:0x95E778 +dro_01_Entity_Pipe_SetAnimFlag = 0x802435A0; // type:func rom:0x95E7A0 +dro_01_Entity_Pipe_GetCurrentFloor = 0x802435C0; // type:func rom:0x95E7C0 +dro_01_Entity_Pipe_AwaitDownInput = 0x802435D4; // type:func rom:0x95E7D4 +dro_01_Entity_Pipe_GetEntryPos = 0x80243690; // type:func rom:0x95E890 +dro_01_Entity_Pipe_GetCameraYaw = 0x80243770; // type:func rom:0x95E970 +dro_01_Entity_Pipe_GetPointAheadOfPlayer = 0x802437DC; // type:func rom:0x95E9DC dro_01_foliage_setup_shear_mtx = 0x80243880; // type:func rom:0x95EA80 dro_01_TransformFoliage = 0x802438F0; // type:func rom:0x95EAF0 dro_01_entryList = 0x80243AC0; // type:data rom:0x95ECC0 @@ -16829,7 +16829,7 @@ dro_01_npcSettings_80245108 = 0x80245108; // type:data rom:0x960308 dro_01_npcSettings_80245134 = 0x80245134; // type:data rom:0x960334 dro_01_npcSettings_80245160 = 0x80245160; // type:data rom:0x960360 dro_01_npcSettings_8024518C = 0x8024518C; // type:data rom:0x96038C -dro_01_Quizmo_varStash = 0x802451B8; // type:data rom:0x9603B8 +dro_01_varStash = 0x802451B8; // type:data rom:0x9603B8 dro_01_EVS_Quizmo_GiveItem_0 = 0x802451BC; // type:data rom:0x9603BC dro_01_EVS_Quizmo_GiveItem_16 = 0x802451EC; // type:data rom:0x9603EC dro_01_Quizmo_Answers = 0x8024521C; // type:data rom:0x96041C @@ -16867,30 +16867,30 @@ dro_01_80247D20 = 0x80247D20; // type:data rom:0x962F20 dro_01_80247D90 = 0x80247D90; // type:data rom:0x962F90 dro_01_D_80248088_963288 = 0x80248088; // type:data rom:0x963288 dro_01_80248090 = 0x80248090; // type:data rom:0x963290 -dro_01_interact_802480E0 = 0x802480E0; // type:data rom:0x9632E0 -dro_01_init_802481F8 = 0x802481F8; // type:data rom:0x9633F8 -dro_01_interact_8024821C = 0x8024821C; // type:data rom:0x96341C -dro_01_init_802483A8 = 0x802483A8; // type:data rom:0x9635A8 -dro_01_interact_802483CC = 0x802483CC; // type:data rom:0x9635CC -dro_01_init_802484E0 = 0x802484E0; // type:data rom:0x9636E0 +dro_01_EVS_NpcInteract_Mouser_01 = 0x802480E0; // type:data rom:0x9632E0 +dro_01_EVS_NpcInit_Mouser_01 = 0x802481F8; // type:data rom:0x9633F8 +dro_01_EVS_NpcInteract_Dryite_01 = 0x8024821C; // type:data rom:0x96341C +dro_01_EVS_NpcInit_Dryite_01 = 0x802483A8; // type:data rom:0x9635A8 +dro_01_EVS_NpcInteract_Dryite_02 = 0x802483CC; // type:data rom:0x9635CC +dro_01_EVS_NpcInit_Dryite_02 = 0x802484E0; // type:data rom:0x9636E0 dro_01_80248504 = 0x80248504; // type:data rom:0x963704 -dro_01_D_8024884C_963A4C = 0x8024884C; // type:data rom:0x963A4C +dro_01_RunAroundTarget = 0x8024884C; // type:data rom:0x963A4C dro_01_interact_80248864 = 0x80248864; // type:data rom:0x963A64 dro_01_init_80248AE4 = 0x80248AE4; // type:data rom:0x963CE4 -dro_01_interact_80248BA0 = 0x80248BA0; // type:data rom:0x963DA0 -dro_01_init_80248CC8 = 0x80248CC8; // type:data rom:0x963EC8 +dro_01_EVS_NpcInteract_Dryite_04 = 0x80248BA0; // type:data rom:0x963DA0 +dro_01_EVS_NpcInit_Dryite_04 = 0x80248CC8; // type:data rom:0x963EC8 dro_01_D_80248D4C_963F4C = 0x80248D4C; // type:data rom:0x963F4C -dro_01_interact_80248D54 = 0x80248D54; // type:data rom:0x963F54 -dro_01_init_80249168 = 0x80249168; // type:data rom:0x964368 -dro_01_idle_8024918C = 0x8024918C; // type:data rom:0x96438C -dro_01_interact_80249750 = 0x80249750; // type:data rom:0x964950 -dro_01_init_8024981C = 0x8024981C; // type:data rom:0x964A1C +dro_01_EVS_NpcInteract_Composer = 0x80248D54; // type:data rom:0x963F54 +dro_01_EVS_NpcInit_Composer = 0x80249168; // type:data rom:0x964368 +dro_01_EVS_NpcIdle_ShopOwner = 0x8024918C; // type:data rom:0x96438C +dro_01_EVS_NpcInteract_ShopOwner = 0x80249750; // type:data rom:0x964950 +dro_01_EVS_NpcInit_ShopOwner = 0x8024981C; // type:data rom:0x964A1C dro_01_interact_80249854 = 0x80249854; // type:data rom:0x964A54 dro_01_init_802498C4 = 0x802498C4; // type:data rom:0x964AC4 -dro_01_interact_802498E8 = 0x802498E8; // type:data rom:0x964AE8 +dro_01_EVS_NpcInteract_DojoGrad = 0x802498E8; // type:data rom:0x964AE8 dro_01_init_80249ABC = 0x80249ABC; // type:data rom:0x964CBC -dro_01_interact_80249AE0 = 0x80249AE0; // type:data rom:0x964CE0 -dro_01_init_80249B10 = 0x80249B10; // type:data rom:0x964D10 +dro_01_EVS_NpcInteract_Dryite_06 = 0x80249AE0; // type:data rom:0x964CE0 +dro_01_EVS_NpcInit_Dryite_06 = 0x80249B10; // type:data rom:0x964D10 dro_01_npcGroup_80249B34 = 0x80249B34; // type:data rom:0x964D34 dro_01_npcGroup_8024AE94 = 0x8024AE94; // type:data rom:0x966094 dro_01_npcGroupList_8024B464 = 0x8024B464; // type:data rom:0x966664 @@ -16923,10 +16923,9 @@ dro_01_toggleVis_8024C190 = 0x8024C190; // type:data rom:0x967390 dro_01_npcList_8024C200 = 0x8024C200; // type:data rom:0x967400 dro_01_npcList_8024C208 = 0x8024C208; // type:data rom:0x967408 dro_01_npcList_8024C210 = 0x8024C210; // type:data rom:0x967410 -dro_01_8024C218 = 0x8024C218; // type:data rom:0x967418 -dro_01_8024C2EC = 0x8024C2EC; // type:data rom:0x9674EC -dro_01_8024C41C = 0x8024C41C; // type:data rom:0x96761C -dro_01_8024C4C8 = 0x8024C4C8; // type:data rom:0x9676C8 +dro_01_EVS_SwingSign_Shop = 0x8024C2EC; // type:data rom:0x9674EC +dro_01_EVS_OpenShopDoor = 0x8024C41C; // type:data rom:0x96761C +dro_01_EVS_CloseShopDoor = 0x8024C4C8; // type:data rom:0x9676C8 dro_01_pad_C574 = 0x8024C574; // type:data rom:0x967774 dro_01_8024C580 = 0x8024C580; // type:data rom:0x967780 dro_01_8024C8D4 = 0x8024C8D4; // type:data rom:0x967AD4 @@ -16943,15 +16942,15 @@ dro_01_tree1_Trunk = 0x8024DD2C; // type:data rom:0x968F2C dro_01_tree1_Drops = 0x8024DD34; // type:data rom:0x968F34 dro_01_tree1 = 0x8024DD54; // type:data rom:0x968F54 dro_01_triggerCoord_8024DD68 = 0x8024DD68; // type:data rom:0x968F68 -dro_01_8024DD78 = 0x8024DD78; // type:data rom:0x968F78 +dro_01_EVS_SetupFoliage = 0x8024DD78; // type:data rom:0x968F78 D_8024DDE0_968FE0 = 0x8024DDE0; // type:data rom:0x968FE0 D_8024DDE8_968FE8 = 0x8024DDE8; // type:data rom:0x968FE8 dro_01_pad_XXX = 0x8024DFAC; // type:data rom:0x9691AC dro_01_dro_01_name_hack = 0x8024DFB0; // type:data rom:0x9691B0 dro_02_UnkFunc27 = 0x80240000; // type:func rom:0x9691C0 dro_02_UnkFunc26 = 0x80240124; // type:func rom:0x9692E4 -dro_02_Quizmo_StashVars = 0x80240300; // type:func rom:0x9694C0 -dro_02_Quizmo_GetItemName = 0x802403B4; // type:func rom:0x969574 +dro_02_StashVars = 0x80240300; // type:func rom:0x9694C0 +dro_02_GetItemName = 0x802403B4; // type:func rom:0x969574 dro_02_Quizmo_HideEntities = 0x80240418; // type:func rom:0x9695D8 dro_02_Quizmo_ShowEntities = 0x8024042C; // type:func rom:0x9695EC dro_02_Quizmo_ShouldAppear = 0x8024043C; // type:func rom:0x9695FC @@ -16978,14 +16977,14 @@ dro_02_Quizmo_UpdatePartnerPosition = 0x80241210; // type:func rom:0x96A3D0 dro_02_Quizmo_CreateReactionEffect = 0x802412F8; // type:func rom:0x96A4B8 dro_02_Quizmo_CreateWorker = 0x80241364; // type:func rom:0x96A524 dro_02_func_80241394_96A554 = 0x80241394; // type:func rom:0x96A554 -dro_02_func_802414C0_96A680 = 0x802414C0; // type:func rom:0x96A680 -dro_02_func_802415CC_96A78C = 0x802415CC; // type:func rom:0x96A78C -dro_02_func_802416FC_96A8BC = 0x802416FC; // type:func rom:0x96A8BC -dro_02_func_80241874_96AA34 = 0x80241874; // type:func rom:0x96AA34 -dro_02_func_8024190C_96AACC = 0x8024190C; // type:func rom:0x96AACC -dro_02_func_80242214_96B3D4 = 0x80242214; // type:func rom:0x96B3D4 -dro_02_func_8024240C_96B5CC = 0x8024240C; // type:func rom:0x96B5CC -dro_02_func_80242EAC_96C06C = 0x80242EAC; // type:func rom:0x96C06C +dro_02_DarkenWorld = 0x802414C0; // type:func rom:0x96A680 +dro_02_UndarkenWorld = 0x802415CC; // type:func rom:0x96A78C +dro_02_CreateRitualCards = 0x802416FC; // type:func rom:0x96A8BC +dro_02_DestroyRitualCards = 0x80241874; // type:func rom:0x96AA34 +dro_02_appendGfx_ritual_card = 0x8024190C; // type:func rom:0x96AACC +dro_02_GetCardOrientation = 0x80242214; // type:func rom:0x96B3D4 +dro_02_card_worker_update = 0x8024240C; // type:func rom:0x96B5CC +dro_02_card_worker_render = 0x80242EAC; // type:func rom:0x96C06C dro_02_func_8024303C_96C1FC = 0x8024303C; // type:func rom:0x96C1FC dro_02_func_80243068_96C228 = 0x80243068; // type:func rom:0x96C228 dro_02_GetNpcCollisionHeight = 0x80243094; // type:func rom:0x96C254 @@ -17036,7 +17035,7 @@ dro_02_80244A68 = 0x80244A68; // type:data rom:0x96DC28 dro_02_npcList_80244C64 = 0x80244C64; // type:data rom:0x96DE24 dro_02_npcList_80244C70 = 0x80244C70; // type:data rom:0x96DE30 dro_02_80244C78 = 0x80244C78; // type:data rom:0x96DE38 -dro_02_Quizmo_varStash = 0x80244DE0; // type:data rom:0x96DFA0 +dro_02_varStash = 0x80244DE0; // type:data rom:0x96DFA0 dro_02_EVS_Quizmo_GiveItem_0 = 0x80244DE4; // type:data rom:0x96DFA4 dro_02_EVS_Quizmo_GiveItem_16 = 0x80244E14; // type:data rom:0x96DFD4 dro_02_Quizmo_Answers = 0x80244E44; // type:data rom:0x96E004 @@ -17078,20 +17077,20 @@ dro_02_npcSettings_802475B0 = 0x802475B0; // type:data rom:0x970770 dro_02_D_802475DC_97079C = 0x802475DC; // type:data rom:0x97079C dro_02_D_802475E0_9707A0 = 0x802475E0; // type:data rom:0x9707A0 dro_02_pad_XX111 = 0x802475E4; // type:data rom:0x9707A4 -dro_02_image1 = 0x802475E8; // type:data rom:0x9707A8 -dro_02_image1_pal = 0x802477E8; // type:data rom:0x9709A8 -dro_02_D_80247808_9709C8 = 0x80247808; // type:data rom:0x9709C8 -dro_02_D_80247888_970A48 = 0x80247888; // type:data rom:0x970A48 -dro_02_D_802478C8_970A88 = 0x802478C8; // type:data rom:0x970A88 -dro_02_D_802479B8_970B78 = 0x802479B8; // type:data rom:0x970B78 -dro_02_D_80247A38_970BF8 = 0x80247A38; // type:data rom:0x970BF8 +dro_02_card = 0x802475E8; // segment:dro_02 type:data rom:0x9707A8 +dro_02_card_pal = 0x802477E8; // segment:dro_02 type:data rom:0x9709A8 +dro_02_card_1_vtx = 0x80247808; // segment:dro_02 type:data rom:0x9709C8 size:0x80 +dro_02_card_2_vtx = 0x80247888; // segment:dro_02 type:data rom:0x970A48 size:0x40 +dro_02_card_setup_gfx = 0x802478C8; // segment:dro_02 type:data rom:0x970A88 +dro_02_card_1_gfx = 0x802479B8; // segment:dro_02 type:data rom:0x970B78 +dro_02_card_2_gfx = 0x80247A38; // segment:dro_02 type:data rom:0x970BF8 dro_02_init_80247A80 = 0x80247A80; // type:data rom:0x970C40 dro_02_npcAI_80247A90 = 0x80247A90; // type:data rom:0x970C50 dro_02_80247AA0 = 0x80247AA0; // type:data rom:0x970C60 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_NpcSettings_Merlee = 0x80248754; // type:data rom:0x971914 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 @@ -17116,13 +17115,12 @@ dro_02_D_80248D08_971EC8 = 0x80248D08; // type:data rom:0x971EC8 dro_02_D_80248D34_971EF4 = 0x80248D34; // type:data rom:0x971EF4 dro_02_D_80248D60_971F20 = 0x80248D60; // type:data rom:0x971F20 dro_02_D_80248D8C_971F4C = 0x80248D8C; // type:data rom:0x971F4C -vtx_971F98 = 0x80248DD8; // type:data rom:0x971F98 -vtx_9722B8 = 0x802490F8; // type:data rom:0x9722B8 -dro_02_D_8024A3B8_973578 = 0x8024A3B8; // type:data rom:0x973578 -dro_02_image2 = 0x8024A520; // type:data rom:0x9736E0 +dro_02_toad_house_blanket_vtx = 0x80248DD8; // segment:dro_02 type:data rom:0x971F98 size:0x15E0 +dro_02_toad_house_blanket_gfx = 0x8024A3B8; // segment:dro_02 type:data rom:0x973578 +dro_02_toad_house_blanket_img = 0x8024A520; // segment:dro_02 type:data rom:0x9736E0 dro_02_8024AC14 = 0x8024AC14; // type:data rom:0x973DD4 dro_02_8024AC8C = 0x8024AC8C; // type:data rom:0x973E4C -dro_02_interact_8024ADE4 = 0x8024ADE4; // type:data rom:0x973FA4 +dro_02_EVS_NpcInteract_ToadHouseKeeper = 0x8024ADE4; // type:data rom:0x973FA4 dro_02_8024B18C = 0x8024B18C; // type:data rom:0x97434C dro_02_8024B20C = 0x8024B20C; // type:data rom:0x9743CC dro_02_8024B530 = 0x8024B530; // type:data rom:0x9746F0 @@ -17152,8 +17150,8 @@ dro_02_init_8024D130 = 0x8024D130; // type:data rom:0x9762F0 dro_02_idle_8024D154 = 0x8024D154; // type:data rom:0x976314 dro_02_init_8024D3E8 = 0x8024D3E8; // type:data rom:0x9765A8 dro_02_8024D434 = 0x8024D434; // type:data rom:0x9765F4 -dro_02_8024D494 = 0x8024D494; // type:data rom:0x976654 -dro_02_8024D700 = 0x8024D700; // type:data rom:0x9768C0 +dro_02_EVS_ToadHouse_GetInBed = 0x8024D494; // type:data rom:0x976654 +dro_02_EVS_ToadHouse_ReturnFromRest = 0x8024D700; // type:data rom:0x9768C0 dro_02_init_8024D790 = 0x8024D790; // type:data rom:0x976950 dro_02_npcGroup_8024D7B4 = 0x8024D7B4; // type:data rom:0x976974 dro_02_npcGroupList_8024EEF4 = 0x8024EEF4; // type:data rom:0x9780B4 @@ -17496,8 +17494,8 @@ nok_01_ToadHouse_InitScreenOverlay = 0x80240C80; // type:func rom:0x9C6060 nok_01_ToadHouse_PutPartnerAway = 0x80240CFC; // type:func rom:0x9C60DC nok_01_ToadHouse_GetPartnerBackOut = 0x80240D30; // type:func rom:0x9C6110 nok_01_ToadHouse_Stub = 0x80240D60; // type:func rom:0x9C6140 -nok_01_Quizmo_StashVars = 0x80240D68; // type:func rom:0x9C6148 -nok_01_Quizmo_GetItemName = 0x80240E1C; // type:func rom:0x9C61FC +nok_01_StashVars = 0x80240D68; // type:func rom:0x9C6148 +nok_01_GetItemName = 0x80240E1C; // type:func rom:0x9C61FC nok_01_Quizmo_HideEntities = 0x80240E80; // type:func rom:0x9C6260 nok_01_Quizmo_ShowEntities = 0x80240E94; // type:func rom:0x9C6274 nok_01_Quizmo_ShouldAppear = 0x80240EA4; // type:func rom:0x9C6284 @@ -17546,7 +17544,7 @@ func_802428D8_9C7CB8 = 0x802428D8; // type:func rom:0x9C7CB8 func_80242910_9C7CF0 = 0x80242910; // type:func rom:0x9C7CF0 nok_01_foliage_setup_shear_mtx = 0x80242930; // type:func rom:0x9C7D10 nok_01_TransformFoliage = 0x802429A0; // type:func rom:0x9C7D80 -nok_01_Quizmo_varStash = 0x80245F44; // type:data rom:0x9CB324 +nok_01_varStash = 0x80245F44; // type:data rom:0x9CB324 nok_01_Quizmo_Answers = 0x80245FA8; // type:data rom:0x9CB388 D_80245FE8_9CB3C8 = 0x80245FE8; // type:data rom:0x9CB3C8 D_8024856C_9CD94C = 0x8024856C; // type:data rom:0x9CD94C @@ -17561,7 +17559,7 @@ nok_02_Pipe_AwaitDownInput = 0x80240034; // type:func rom:0x9D7054 nok_02_Pipe_GetEntryPos = 0x802400F0; // type:func rom:0x9D7110 nok_02_Pipe_GetCameraYaw = 0x802401D0; // type:func rom:0x9D71F0 nok_02_Pipe_GetPointAheadOfPlayer = 0x8024023C; // type:func rom:0x9D725C -nok_02_StashVars = 0x802402E0; // type:func rom:0x9D7300 +dup_nok_02_StashVars = 0x802402E0; // type:func rom:0x9D7300 dup_nok_02_GetItemName = 0x80240394; // type:func rom:0x9D73B4 dup_nok_02_GetNpcCollisionHeight = 0x802403F8; // type:func rom:0x9D7418 dup_nok_02_AddPlayerHandsOffset = 0x80240454; // type:func rom:0x9D7474 @@ -17582,8 +17580,8 @@ nok_02_PatrolAI_Chase = 0x802413CC; // type:func rom:0x9D83EC nok_02_PatrolAI_LosePlayer = 0x802414EC; // type:func rom:0x9D850C nok_02_PatrolNoAttackAI_15 = 0x80241554; // type:func rom:0x9D8574 nok_02_PatrolNoAttackAI_Main = 0x80241614; // type:func rom:0x9D8634 -nok_02_Quizmo_StashVars = 0x80241910; // type:func rom:0x9D8930 -nok_02_Quizmo_GetItemName = 0x802419C4; // type:func rom:0x9D89E4 +nok_02_StashVars = 0x80241910; // type:func rom:0x9D8930 +nok_02_GetItemName = 0x802419C4; // type:func rom:0x9D89E4 nok_02_Quizmo_HideEntities = 0x80241A28; // type:func rom:0x9D8A48 nok_02_Quizmo_ShowEntities = 0x80241A3C; // type:func rom:0x9D8A5C nok_02_Quizmo_ShouldAppear = 0x80241A4C; // type:func rom:0x9D8A6C @@ -17642,10 +17640,10 @@ func_80244288_9DB2A8 = 0x80244288; // type:func rom:0x9DB2A8 func_802442E0_9DB300 = 0x802442E0; // type:func rom:0x9DB300 nok_02_foliage_setup_shear_mtx = 0x80244360; // type:func rom:0x9DB380 nok_02_TransformFoliage = 0x802443D0; // type:func rom:0x9DB3F0 -nok_02_varStash = 0x802453D0; // type:data rom:0x9DC3F0 +dup_nok_02_varStash = 0x802453D0; // type:data rom:0x9DC3F0 D_80245434_9DC454 = 0x80245434; // type:data rom:0x9DC454 D_80245438_9DC458 = 0x80245438; // type:data rom:0x9DC458 -nok_02_Quizmo_varStash = 0x802470C8; // type:data rom:0x9DE0E8 +nok_02_varStash = 0x802470C8; // type:data rom:0x9DE0E8 nok_02_Quizmo_Answers = 0x8024712C; // type:data rom:0x9DE14C D_8024716C_9DE18C = 0x8024716C; // type:data rom:0x9DE18C D_802496F0_9E0710 = 0x802496F0; // type:data rom:0x9E0710 @@ -17762,9 +17760,9 @@ nok_13_HoppingAI_ChaseInit = 0x802407CC; // type:func rom:0xA00DCC nok_13_HoppingAI_Chase = 0x802408AC; // type:func rom:0xA00EAC nok_13_HoppingAI_LosePlayer = 0x80240BAC; // type:func rom:0xA011AC nok_13_HoppingAI_Main = 0x80240BF0; // type:func rom:0xA011F0 -func_80240E20_A01420 = 0x80240E20; // type:func rom:0xA01420 +nok_13_MonitorPlayerOrbiting = 0x80240E20; // type:func rom:0xA01420 func_80241360_A01960 = 0x80241360; // type:func rom:0xA01960 -func_802413CC_A019CC = 0x802413CC; // type:func rom:0xA019CC +nok_13_musical_hill_orbit_listener = 0x802413CC; // type:func rom:0xA019CC D_80242134_A02734 = 0x80242134; // type:data rom:0xA02734 D_802421D0_A027D0 = 0x802421D0; // type:data rom:0xA027D0 func_80240000_A02840 = 0x80240000; // type:func rom:0xA02840 @@ -17951,8 +17949,8 @@ hos_03_ToadHouse_InitScreenOverlay = 0x802423BC; // type:func rom:0xA1D4BC hos_03_ToadHouse_PutPartnerAway = 0x80242438; // type:func rom:0xA1D538 hos_03_ToadHouse_GetPartnerBackOut = 0x8024246C; // type:func rom:0xA1D56C hos_03_ToadHouse_Stub = 0x8024249C; // type:func rom:0xA1D59C -hos_03_Quizmo_StashVars = 0x802424A4; // type:func rom:0xA1D5A4 -hos_03_Quizmo_GetItemName = 0x80242558; // type:func rom:0xA1D658 +hos_03_StashVars = 0x802424A4; // type:func rom:0xA1D5A4 +hos_03_GetItemName = 0x80242558; // type:func rom:0xA1D658 hos_03_Quizmo_HideEntities = 0x802425BC; // type:func rom:0xA1D6BC hos_03_Quizmo_ShowEntities = 0x802425D0; // type:func rom:0xA1D6D0 hos_03_Quizmo_ShouldAppear = 0x802425E0; // type:func rom:0xA1D6E0 @@ -17984,7 +17982,7 @@ D_80243BD0_A1ECD0 = 0x80243BD0; // type:data rom:0xA1ECD0 D_80243BD2_A1ECD2 = 0x80243BD2; // type:data rom:0xA1ECD2 D_80243BD4_A1ECD4 = 0x80243BD4; // type:data rom:0xA1ECD4 hos_03_FlyingAI_JumpVels = 0x802457F4; // type:data rom:0xA208F4 -hos_03_Quizmo_varStash = 0x8024801C; // type:data rom:0xA2311C +hos_03_varStash = 0x8024801C; // type:data rom:0xA2311C hos_03_Quizmo_Answers = 0x80248080; // type:data rom:0xA23180 D_802480C0_A231C0 = 0x802480C0; // type:data rom:0xA231C0 D_8024BD60_A26E60 = 0x8024BD60; // type:data rom:0xA26E60 @@ -19075,8 +19073,8 @@ tst_11_test_reflection_worker_partner = 0x80240730; // type:func rom:0xB1D180 tst_11_func_80240000_B1D760 = 0x80240000; // type:func rom:0xB1D760 tst_13_UnkDistFunc2 = 0x802400A0; // type:func rom:0xB1D800 tst_13_func_8024013C_B1D89C = 0x8024013C; // type:func rom:0xB1D89C -tst_13_shockwave_vtx = 0x802422B0; // type:data rom:0xB1FA10 size:0x5B0 -tst_13_shockwave_gfx = 0x80242860; // type:data rom:0xB1FFC0 +tst_13_shockwave_vtx = 0x802422B0; // type:data rom:0xB1FA10 segment:tst_13 size:0x5B0 +tst_13_shockwave_gfx = 0x80242860; // type:data rom:0xB1FFC0 segment:tst_13 tst_13_dummy_gfx = 0x80242BF0; // type:data rom:0xB20350 tst_13_D_80242BF8_B20358 = 0x80242BF8; // type:data rom:0xB20358 tst_13_D_80242BFC_B2035C = 0x80242D00; // type:data rom:0xB20460 @@ -19153,8 +19151,8 @@ jan_02_AddPlayerHandsOffset = 0x8024131C; // type:func rom:0xB2D78C func_802414EC_B2D95C = 0x802414EC; // type:func rom:0xB2D95C func_80241540_B2D9B0 = 0x80241540; // type:func rom:0xB2D9B0 func_80241578_B2D9E8 = 0x80241578; // type:func rom:0xB2D9E8 -jan_02_Quizmo_StashVars = 0x80241614; // type:func rom:0xB2DA84 -jan_02_Quizmo_GetItemName = 0x802416C8; // type:func rom:0xB2DB38 +jan_02_StashVars = 0x80241614; // type:func rom:0xB2DA84 +jan_02_GetItemName = 0x802416C8; // type:func rom:0xB2DB38 jan_02_Quizmo_HideEntities = 0x8024172C; // type:func rom:0xB2DB9C jan_02_Quizmo_ShowEntities = 0x80241740; // type:func rom:0xB2DBB0 jan_02_Quizmo_ShouldAppear = 0x80241750; // type:func rom:0xB2DBC0 @@ -19186,7 +19184,7 @@ jan_02_TransformFoliage = 0x80242750; // type:func rom:0xB2EBC0 D_80242BD8_B2F048 = 0x80242BD8; // type:data rom:0xB2F048 D_80243048_B2F4B8 = 0x80243048; // type:data rom:0xB2F4B8 D_8024304C_B2F4BC = 0x8024304C; // type:data rom:0xB2F4BC -jan_02_Quizmo_varStash = 0x802431E4; // type:data rom:0xB2F654 +jan_02_varStash = 0x802431E4; // type:data rom:0xB2F654 jan_02_Quizmo_Answers = 0x80243248; // type:data rom:0xB2F6B8 D_80243288_B2F6F8 = 0x80243288; // type:data rom:0xB2F6F8 D_802485C0_B34A30 = 0x802485C0; // type:data rom:0xB34A30 @@ -19230,8 +19228,8 @@ func_802419D8_B365A8 = 0x802419D8; // type:func rom:0xB365A8 func_80241A2C_B365FC = 0x80241A2C; // type:func rom:0xB365FC func_80241A64_B36634 = 0x80241A64; // type:func rom:0xB36634 func_80241B00_B366D0 = 0x80241B00; // type:func rom:0xB366D0 -jan_03_Quizmo_StashVars = 0x80241B9C; // type:func rom:0xB3676C -jan_03_Quizmo_GetItemName = 0x80241C50; // type:func rom:0xB36820 +jan_03_StashVars = 0x80241B9C; // type:func rom:0xB3676C +jan_03_GetItemName = 0x80241C50; // type:func rom:0xB36820 jan_03_Quizmo_HideEntities = 0x80241CB4; // type:func rom:0xB36884 jan_03_Quizmo_ShowEntities = 0x80241CC8; // type:func rom:0xB36898 jan_03_Quizmo_ShouldAppear = 0x80241CD8; // type:func rom:0xB368A8 @@ -19267,7 +19265,7 @@ jan_03_foliage_setup_shear_mtx = 0x80243050; // type:func rom:0xB37C20 jan_03_TransformFoliage = 0x802430C0; // type:func rom:0xB37C90 D_80247444_B3C014 = 0x80247444; // type:data rom:0xB3C014 D_80247448_B3C018 = 0x80247448; // type:data rom:0xB3C018 -jan_03_Quizmo_varStash = 0x80247764; // type:data rom:0xB3C334 +jan_03_varStash = 0x80247764; // type:data rom:0xB3C334 jan_03_Quizmo_Answers = 0x802477C8; // type:data rom:0xB3C398 D_80247808_B3C3D8 = 0x80247808; // type:data rom:0xB3C3D8 D_8024A5AC_B3F17C = 0x8024A5AC; // type:data rom:0xB3F17C @@ -23475,8 +23473,8 @@ func_8024053C_CF80AC = 0x8024053C; // type:func rom:0xCF80AC func_80240590_CF8100 = 0x80240590; // type:func rom:0xCF8100 func_802405C8_CF8138 = 0x802405C8; // type:func rom:0xCF8138 func_80240664_CF81D4 = 0x80240664; // type:func rom:0xCF81D4 -sam_01_Quizmo_StashVars = 0x80240700; // type:func rom:0xCF8270 -sam_01_Quizmo_GetItemName = 0x802407B4; // type:func rom:0xCF8324 +sam_01_StashVars = 0x80240700; // type:func rom:0xCF8270 +sam_01_GetItemName = 0x802407B4; // type:func rom:0xCF8324 sam_01_Quizmo_HideEntities = 0x80240818; // type:func rom:0xCF8388 sam_01_Quizmo_ShowEntities = 0x8024082C; // type:func rom:0xCF839C sam_01_Quizmo_ShouldAppear = 0x8024083C; // type:func rom:0xCF83AC @@ -23514,7 +23512,7 @@ sam_01_SomeItemEntityFunc = 0x80241DA8; // type:func rom:0xCF9918 sam_01_IsItemBadge = 0x80241EF8; // type:func rom:0xCF9A68 D_802432D0_CFAE40 = 0x802432D0; // type:data rom:0xCFAE40 D_802432D4_CFAE44 = 0x802432D4; // type:data rom:0xCFAE44 -sam_01_Quizmo_varStash = 0x802435F0; // type:data rom:0xCFB160 +sam_01_varStash = 0x802435F0; // type:data rom:0xCFB160 sam_01_Quizmo_Answers = 0x802436FC; // type:data rom:0xCFB26C D_8024373C_CFB2AC = 0x8024373C; // type:data rom:0xCFB2AC D_8024D8F0_D05460 = 0x8024D8F0; // type:data rom:0xD05460 @@ -23540,8 +23538,8 @@ sam_02_ToadHouse_InitScreenOverlay = 0x80240A44; // type:func rom:0xD06174 sam_02_ToadHouse_PutPartnerAway = 0x80240AC0; // type:func rom:0xD061F0 sam_02_ToadHouse_GetPartnerBackOut = 0x80240AF4; // type:func rom:0xD06224 sam_02_ToadHouse_Stub = 0x80240B24; // type:func rom:0xD06254 -sam_02_Quizmo_StashVars = 0x80240B2C; // type:func rom:0xD0625C -sam_02_Quizmo_GetItemName = 0x80240BE0; // type:func rom:0xD06310 +sam_02_StashVars = 0x80240B2C; // type:func rom:0xD0625C +sam_02_GetItemName = 0x80240BE0; // type:func rom:0xD06310 sam_02_Quizmo_HideEntities = 0x80240C44; // type:func rom:0xD06374 sam_02_Quizmo_ShowEntities = 0x80240C58; // type:func rom:0xD06388 sam_02_Quizmo_ShouldAppear = 0x80240C68; // type:func rom:0xD06398 @@ -23567,7 +23565,7 @@ sam_02_Quizmo_SpinPartner = 0x802419AC; // type:func rom:0xD070DC sam_02_Quizmo_UpdatePartnerPosition = 0x80241A3C; // type:func rom:0xD0716C sam_02_Quizmo_CreateReactionEffect = 0x80241B24; // type:func rom:0xD07254 sam_02_Quizmo_CreateWorker = 0x80241B90; // type:func rom:0xD072C0 -sam_02_Quizmo_varStash = 0x80246B60; // type:data rom:0xD0C290 +sam_02_varStash = 0x80246B60; // type:data rom:0xD0C290 sam_02_Quizmo_Answers = 0x80246BC4; // type:data rom:0xD0C2F4 D_80246C04_D0C334 = 0x80246C04; // type:data rom:0xD0C334 func_80240000_D110C0 = 0x80240000; // type:func rom:0xD110C0 @@ -23759,8 +23757,8 @@ sam_11_SetCamera0MoveFlag1 = 0x80240580; // type:func rom:0xD3AB50 func_8024059C_D3AB6C = 0x8024059C; // type:func rom:0xD3AB6C func_8024072C_D3ACFC = 0x8024072C; // type:func rom:0xD3ACFC func_80240754_D3AD24 = 0x80240754; // type:func rom:0xD3AD24 -sam_11_Quizmo_StashVars = 0x802407D0; // type:func rom:0xD3ADA0 -sam_11_Quizmo_GetItemName = 0x80240884; // type:func rom:0xD3AE54 +sam_11_StashVars = 0x802407D0; // type:func rom:0xD3ADA0 +sam_11_GetItemName = 0x80240884; // type:func rom:0xD3AE54 sam_11_Quizmo_HideEntities = 0x802408E8; // type:func rom:0xD3AEB8 sam_11_Quizmo_ShowEntities = 0x802408FC; // type:func rom:0xD3AECC sam_11_Quizmo_ShouldAppear = 0x8024090C; // type:func rom:0xD3AEDC @@ -23798,7 +23796,7 @@ func_80242074_D3C644 = 0x80242074; // type:func rom:0xD3C644 D_80243CC0_D3E290 = 0x80243CC0; // type:data rom:0xD3E290 D_80243CC4_D3E294 = 0x80243CC4; // type:data rom:0xD3E294 D_80243CC8_D3E298 = 0x80243CC8; // type:data rom:0xD3E298 -sam_11_Quizmo_varStash = 0x80244F78; // type:data rom:0xD3F548 +sam_11_varStash = 0x80244F78; // type:data rom:0xD3F548 sam_11_Quizmo_Answers = 0x80244FDC; // type:data rom:0xD3F5AC D_8024501C_D3F5EC = 0x8024501C; // type:data rom:0xD3F5EC D_80251430_D4BA00 = 0x80251430; // type:data rom:0xD4BA00 @@ -25236,51 +25234,51 @@ D_802BCBC0_E31510 = 0x802BCBC0; // type:data rom:0xE31510 D_802BCBC8_E31518 = 0x802BCBC8; // type:data rom:0xE31518 D_802BCBD0_E31520 = 0x802BCBD0; // type:data rom:0xE31520 D_802BCBD8_E31528 = 0x802BCBD8; // type:data rom:0xE31528 -EA0900_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xEA0900 -EA0900_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xEA0A24 -EA0C10_MeleeHitbox_30 = 0x80240310; // type:func rom:0xEA0C10 -EA0C10_MeleeHitbox_31 = 0x8024037C; // type:func rom:0xEA0C7C -EA0C10_MeleeHitbox_32 = 0x802403EC; // type:func rom:0xEA0CEC -EA0C10_MeleeHitbox_33 = 0x802404C4; // type:func rom:0xEA0DC4 -EA0C10_MeleeHitbox_CanSeePlayer = 0x80240518; // type:func rom:0xEA0E18 -EA0C10_MeleeHitbox_Main = 0x802406CC; // type:func rom:0xEA0FCC -EA0C10_WanderMeleeAI_Main = 0x8024097C; // type:func rom:0xEA127C -EA0C10_PiranhaPlantAI_00 = 0x80240C5C; // type:func rom:0xEA155C -EA0C10_PiranhaPlantAI_01 = 0x80240CC8; // type:func rom:0xEA15C8 -func_80240DC4_EA16C4 = 0x80240DC4; // type:func rom:0xEA16C4 -EA0C10_PiranhaPlantAI_11 = 0x80241804; // type:func rom:0xEA2104 -EA0C10_PiranhaPlantAI_12 = 0x80241894; // type:func rom:0xEA2194 -EA0C10_PiranhaPlantAI_13 = 0x80241994; // type:func rom:0xEA2294 -EA0C10_PiranhaPlantAI_14 = 0x802419F4; // type:func rom:0xEA22F4 -EA0C10_PiranhaPlantAI_Main = 0x80241AE0; // type:func rom:0xEA23E0 -EA0C10_set_script_owner_npc_anim = 0x80241D68; // type:func rom:0xEA2668 -EA0C10_UnkDistFunc = 0x80241DE4; // type:func rom:0xEA26E4 -EA0C10_UnkNpcAIFunc12 = 0x80241F18; // type:func rom:0xEA2818 -EA0C10_set_script_owner_npc_col_height = 0x8024207C; // type:func rom:0xEA297C -EA0C10_TackleAI_Main = 0x802420FC; // type:func rom:0xEA29FC -EA0C10_func_80240814_97BE44 = 0x80242568; // type:func rom:0xEA2E68 -EA0C10_AwaitPlayerNearNpc = 0x802425B0; // type:func rom:0xEA2EB0 -EA0C10_func_802408B4_97BEE4 = 0x80242608; // type:func rom:0xEA2F08 -EA0C10_StashVars = 0x8024267C; // type:func rom:0xEA2F7C -EA0C10_GetItemName = 0x80242730; // type:func rom:0xEA3030 -EA0C10_GetNpcCollisionHeight = 0x80242794; // type:func rom:0xEA3094 -EA0C10_AddPlayerHandsOffset = 0x802427F0; // type:func rom:0xEA30F0 +dead_kzn_17_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xEA0900 +dead_kzn_17_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xEA0A24 +dead_kzn_17_MeleeHitbox_30 = 0x80240310; // type:func rom:0xEA0C10 +dead_kzn_17_MeleeHitbox_31 = 0x8024037C; // type:func rom:0xEA0C7C +dead_kzn_17_MeleeHitbox_32 = 0x802403EC; // type:func rom:0xEA0CEC +dead_kzn_17_MeleeHitbox_33 = 0x802404C4; // type:func rom:0xEA0DC4 +dead_kzn_17_MeleeHitbox_CanSeePlayer = 0x80240518; // type:func rom:0xEA0E18 +dead_kzn_17_MeleeHitbox_Main = 0x802406CC; // type:func rom:0xEA0FCC +dead_kzn_17_WanderMeleeAI_Main = 0x8024097C; // type:func rom:0xEA127C +dead_kzn_17_PiranhaPlantAI_00 = 0x80240C5C; // type:func rom:0xEA155C +dead_kzn_17_PiranhaPlantAI_01 = 0x80240CC8; // type:func rom:0xEA15C8 +dead_kzn_17_func_80240DC4_EA16C4 = 0x80240DC4; // type:func rom:0xEA16C4 +dead_kzn_17_PiranhaPlantAI_11 = 0x80241804; // type:func rom:0xEA2104 +dead_kzn_17_PiranhaPlantAI_12 = 0x80241894; // type:func rom:0xEA2194 +dead_kzn_17_PiranhaPlantAI_13 = 0x80241994; // type:func rom:0xEA2294 +dead_kzn_17_PiranhaPlantAI_14 = 0x802419F4; // type:func rom:0xEA22F4 +dead_kzn_17_PiranhaPlantAI_Main = 0x80241AE0; // type:func rom:0xEA23E0 +dead_kzn_17_set_script_owner_npc_anim = 0x80241D68; // type:func rom:0xEA2668 +dead_kzn_17_UnkDistFunc = 0x80241DE4; // type:func rom:0xEA26E4 +dead_kzn_17_UnkNpcAIFunc12 = 0x80241F18; // type:func rom:0xEA2818 +dead_kzn_17_set_script_owner_npc_col_height = 0x8024207C; // type:func rom:0xEA297C +dead_kzn_17_TackleAI_Main = 0x802420FC; // type:func rom:0xEA29FC +dead_kzn_17_func_80240814_97BE44 = 0x80242568; // type:func rom:0xEA2E68 +dead_kzn_17_AwaitPlayerNearNpc = 0x802425B0; // type:func rom:0xEA2EB0 +dead_kzn_17_func_802408B4_97BEE4 = 0x80242608; // type:func rom:0xEA2F08 +dead_kzn_17_StashVars = 0x8024267C; // type:func rom:0xEA2F7C +dead_kzn_17_GetItemName = 0x80242730; // type:func rom:0xEA3030 +dead_kzn_17_GetNpcCollisionHeight = 0x80242794; // type:func rom:0xEA3094 +dead_kzn_17_AddPlayerHandsOffset = 0x802427F0; // type:func rom:0xEA30F0 func_802429C0_EA32C0 = 0x802429C0; // type:func rom:0xEA32C0 func_80242A14_EA3314 = 0x80242A14; // type:func rom:0xEA3314 func_80242A4C_EA334C = 0x80242A4C; // type:func rom:0xEA334C -EA0C10_LetterDelivery_Init = 0x80242AE8; // type:func rom:0xEA33E8 -EA0C10_LetterDelivery_CalcLetterPos = 0x80242BD8; // type:func rom:0xEA34D8 -EA0C10_LetterDelivery_SaveNpcAnim = 0x80242D64; // type:func rom:0xEA3664 -EA0C10_LetterDelivery_RestoreNpcAnim = 0x80242DA8; // type:func rom:0xEA36A8 -EA36E0_SpinyTrompHit = 0x80242DE0; // type:func rom:0xEA36E0 -EA36E0_GetActingPartner = 0x80242E00; // type:func rom:0xEA3700 -EA36E0_UnkFunc46 = 0x80242E2C; // type:func rom:0xEA372C +dead_kzn_17_LetterDelivery_Init = 0x80242AE8; // type:func rom:0xEA33E8 +dead_kzn_17_LetterDelivery_CalcLetterPos = 0x80242BD8; // type:func rom:0xEA34D8 +dead_kzn_17_LetterDelivery_SaveNpcAnim = 0x80242D64; // type:func rom:0xEA3664 +dead_kzn_17_LetterDelivery_RestoreNpcAnim = 0x80242DA8; // type:func rom:0xEA36A8 +dead_kzn_17_SpinyTrompHit = 0x80242DE0; // type:func rom:0xEA36E0 +dead_kzn_17_GetActingPartner = 0x80242E00; // type:func rom:0xEA3700 +dead_kzn_17_UnkFunc46 = 0x80242E2C; // type:func rom:0xEA372C func_80242EC4_EA37C4 = 0x80242EC4; // type:func rom:0xEA37C4 -EA36E0_UnkFunc48 = 0x80242F64; // type:func rom:0xEA3864 -EA36E0_UnkFunc49 = 0x80242F9C; // type:func rom:0xEA389C +dead_kzn_17_UnkFunc48 = 0x80242F64; // type:func rom:0xEA3864 +dead_kzn_17_UnkFunc49 = 0x80242F9C; // type:func rom:0xEA389C func_80243054_EA3954 = 0x80243054; // type:func rom:0xEA3954 -EA36E0_UnkFunc51 = 0x802430E4; // type:func rom:0xEA39E4 -EA0C10_varStash = 0x80244154; // type:data rom:0xEA4A54 +dead_kzn_17_UnkFunc51 = 0x802430E4; // type:func rom:0xEA39E4 +dead_kzn_17_varStash = 0x80244154; // type:data rom:0xEA4A54 D_802441B8_EA4AB8 = 0x802441B8; // type:data rom:0xEA4AB8 D_802441BC_EA4ABC = 0x802441BC; // type:data rom:0xEA4ABC ascii_EA6D70 = 0x80246470; // type:data rom:0xEA6D70 @@ -25298,19 +25296,19 @@ D_802466B8_EA6FB8 = 0x802466B8; // type:data rom:0xEA6FB8 D_802466C0_EA6FC0 = 0x802466C0; // type:data rom:0xEA6FC0 D_802466C8_EA6FC8 = 0x802466C8; // type:data rom:0xEA6FC8 func_80240000_EA6FD0 = 0x80240000; // type:func rom:0xEA6FD0 -EA7010_UpdateTexturePanSmooth = 0x80240040; // type:func rom:0xEA7010 -EA7010_UpdateTexturePanStepped = 0x80240164; // type:func rom:0xEA7134 -EA7320_SetCamera0Flag1000 = 0x80240350; // type:func rom:0xEA7320 -EA7320_UnsetCamera0Flag1000 = 0x8024036C; // type:func rom:0xEA733C +dead_kzn_18_UpdateTexturePanSmooth = 0x80240040; // type:func rom:0xEA7010 +dead_kzn_18_UpdateTexturePanStepped = 0x80240164; // type:func rom:0xEA7134 +dead_kzn_18_SetCamera0Flag1000 = 0x80240350; // type:func rom:0xEA7320 +dead_kzn_18_UnsetCamera0Flag1000 = 0x8024036C; // type:func rom:0xEA733C func_80240388_EA7358 = 0x80240388; // type:func rom:0xEA7358 -EA8AE0_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xEA8AE0 -EA8AE0_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xEA8C04 -EA8AE0_StarSpiritEffectFunc1 = 0x8024030C; // type:func rom:0xEA8DEC -EA8AE0_StarSpiritEffectFunc2 = 0x80240358; // type:func rom:0xEA8E38 -EA8AE0_StarSpiritEffectFunc3 = 0x802404B8; // type:func rom:0xEA8F98 -EA8AE0_StarSpiritEffectFunc4 = 0x802408C8; // type:func rom:0xEA93A8 -EA8AE0_StarSpiritEffectFunc5 = 0x80240908; // type:func rom:0xEA93E8 -EA8AE0_StarSpiritEffectFunc6 = 0x80240A14; // type:func rom:0xEA94F4 +dead_kzn_19_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xEA8AE0 +dead_kzn_19_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xEA8C04 +dead_kzn_19_StarSpiritEffectFunc1 = 0x8024030C; // type:func rom:0xEA8DEC +dead_kzn_19_StarSpiritEffectFunc2 = 0x80240358; // type:func rom:0xEA8E38 +dead_kzn_19_StarSpiritEffectFunc3 = 0x802404B8; // type:func rom:0xEA8F98 +dead_kzn_19_StarSpiritEffectFunc4 = 0x802408C8; // type:func rom:0xEA93A8 +dead_kzn_19_StarSpiritEffectFunc5 = 0x80240908; // type:func rom:0xEA93E8 +dead_kzn_19_StarSpiritEffectFunc6 = 0x80240A14; // type:func rom:0xEA94F4 func_80240B00_EA95E0 = 0x80240B00; // type:func rom:0xEA95E0 func_80240BD4_EA96B4 = 0x80240BD4; // type:func rom:0xEA96B4 func_80240CD8_EA97B8 = 0x80240CD8; // type:func rom:0xEA97B8 @@ -25319,74 +25317,74 @@ func_80240E2C_EA990C = 0x80240E2C; // type:func rom:0xEA990C func_802413C0_EA9EA0 = 0x802413C0; // type:func rom:0xEA9EA0 func_802413FC_EA9EDC = 0x802413FC; // type:func rom:0xEA9EDC func_8024140C_EA9EEC = 0x8024140C; // type:func rom:0xEA9EEC -EA8AE0_StashVars = 0x80241468; // type:func rom:0xEA9F48 -EA8AE0_GetItemName = 0x8024151C; // type:func rom:0xEA9FFC -EA8AE0_GetNpcCollisionHeight = 0x80241580; // type:func rom:0xEAA060 -EA8AE0_AddPlayerHandsOffset = 0x802415DC; // type:func rom:0xEAA0BC +dead_kzn_19_StashVars = 0x80241468; // type:func rom:0xEA9F48 +dead_kzn_19_GetItemName = 0x8024151C; // type:func rom:0xEA9FFC +dead_kzn_19_GetNpcCollisionHeight = 0x80241580; // type:func rom:0xEAA060 +dead_kzn_19_AddPlayerHandsOffset = 0x802415DC; // type:func rom:0xEAA0BC func_802417AC_EAA28C = 0x802417AC; // type:func rom:0xEAA28C func_80241800_EAA2E0 = 0x80241800; // type:func rom:0xEAA2E0 func_80241838_EAA318 = 0x80241838; // type:func rom:0xEAA318 -EA8AE0_LetterDelivery_Init = 0x802418D4; // type:func rom:0xEAA3B4 -EA8AE0_LetterDelivery_CalcLetterPos = 0x802419C4; // type:func rom:0xEAA4A4 -EA8AE0_LetterDelivery_SaveNpcAnim = 0x80241B50; // type:func rom:0xEAA630 -EA8AE0_LetterDelivery_RestoreNpcAnim = 0x80241B94; // type:func rom:0xEAA674 +dead_kzn_19_LetterDelivery_Init = 0x802418D4; // type:func rom:0xEAA3B4 +dead_kzn_19_LetterDelivery_CalcLetterPos = 0x802419C4; // type:func rom:0xEAA4A4 +dead_kzn_19_LetterDelivery_SaveNpcAnim = 0x80241B50; // type:func rom:0xEAA630 +dead_kzn_19_LetterDelivery_RestoreNpcAnim = 0x80241B94; // type:func rom:0xEAA674 func_80241BC0_EAA6A0 = 0x80241BC0; // type:func rom:0xEAA6A0 D_80243AD8_EAC5B8 = 0x80243AD8; // type:data rom:0xEAC5B8 D_80243BB8_EAC698 = 0x80243BB8; // type:data rom:0xEAC698 -EA8AE0_varStash = 0x80243D74; // type:data rom:0xEAC854 +dead_kzn_19_varStash = 0x80243D74; // type:data rom:0xEAC854 D_80243DD8_EAC8B8 = 0x80243DD8; // type:data rom:0xEAC8B8 D_80243DDC_EAC8BC = 0x80243DDC; // type:data rom:0xEAC8BC D_80248370_EB0E50 = 0x80248370; // type:data rom:0xEB0E50 -EB0E60_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xEB0E60 -EB0E60_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xEB0F84 -EB1170_StashVars = 0x80240310; // type:func rom:0xEB1170 -EB1170_GetItemName = 0x802403C4; // type:func rom:0xEB1224 -EB1170_GetNpcCollisionHeight = 0x80240428; // type:func rom:0xEB1288 -EB1170_AddPlayerHandsOffset = 0x80240484; // type:func rom:0xEB12E4 +dead_03_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xEB0E60 +dead_03_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xEB0F84 +dead_03_StashVars = 0x80240310; // type:func rom:0xEB1170 +dead_03_GetItemName = 0x802403C4; // type:func rom:0xEB1224 +dead_03_GetNpcCollisionHeight = 0x80240428; // type:func rom:0xEB1288 +dead_03_AddPlayerHandsOffset = 0x80240484; // type:func rom:0xEB12E4 func_80240654_EB14B4 = 0x80240654; // type:func rom:0xEB14B4 func_802406A8_EB1508 = 0x802406A8; // type:func rom:0xEB1508 func_802406E0_EB1540 = 0x802406E0; // type:func rom:0xEB1540 -EB1170_LetterDelivery_Init = 0x8024077C; // type:func rom:0xEB15DC -EB1170_LetterDelivery_CalcLetterPos = 0x8024086C; // type:func rom:0xEB16CC -EB1170_LetterDelivery_SaveNpcAnim = 0x802409F8; // type:func rom:0xEB1858 -EB1170_LetterDelivery_RestoreNpcAnim = 0x80240A3C; // type:func rom:0xEB189C +dead_03_LetterDelivery_Init = 0x8024077C; // type:func rom:0xEB15DC +dead_03_LetterDelivery_CalcLetterPos = 0x8024086C; // type:func rom:0xEB16CC +dead_03_LetterDelivery_SaveNpcAnim = 0x802409F8; // type:func rom:0xEB1858 +dead_03_LetterDelivery_RestoreNpcAnim = 0x80240A3C; // type:func rom:0xEB189C func_80240A68_EB18C8 = 0x80240A68; // type:func rom:0xEB18C8 func_80240A8C_EB18EC = 0x80240A8C; // type:func rom:0xEB18EC -EB1170_varStash = 0x80241780; // type:data rom:0xEB25E0 +dead_03_varStash = 0x80241780; // type:data rom:0xEB25E0 D_802417E4_EB2644 = 0x802417E4; // type:data rom:0xEB2644 D_802417E8_EB2648 = 0x802417E8; // type:data rom:0xEB2648 -EB5130_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xEB5130 -EB5130_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xEB5254 +dead_04_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xEB5130 +dead_04_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xEB5254 func_8024030C_EB543C = 0x8024030C; // type:func rom:0xEB543C func_80240340_EB5470 = 0x80240340; // type:func rom:0xEB5470 func_8024036C_EB549C = 0x8024036C; // type:func rom:0xEB549C -EB7230_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xEB7230 -EB7230_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xEB7354 -EB7540_SetEntityPositionF = 0x80240310; // type:func rom:0xEB7540 -EB7540_GetEntityPosition = 0x802403D8; // type:func rom:0xEB7608 +dead_kzn_23_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xEB7230 +dead_kzn_23_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xEB7354 +dead_kzn_23_SetEntityPositionF = 0x80240310; // type:func rom:0xEB7540 +dead_kzn_23_GetEntityPosition = 0x802403D8; // type:func rom:0xEB7608 func_80240478_EB76A8 = 0x80240478; // type:func rom:0xEB76A8 -EB7540_UnsetCamera0MoveFlag1 = 0x80240504; // type:func rom:0xEB7734 +dead_kzn_23_UnsetCamera0MoveFlag1 = 0x80240504; // type:func rom:0xEB7734 func_80240520_EB7750 = 0x80240520; // type:func rom:0xEB7750 D_80241C10_EB8E40 = 0x80241C10; // type:data rom:0xEB8E40 func_80240000_EB8E50 = 0x80240000; // type:func rom:0xEB8E50 -EB8E90_PatrolAI_MoveInit = 0x80240040; // type:func rom:0xEB8E90 -EB8E90_PatrolAI_Move = 0x80240198; // type:func rom:0xEB8FE8 -EB8E90_PatrolAI_LoiterInit = 0x80240440; // type:func rom:0xEB9290 -EB8E90_PatrolAI_Loiter = 0x80240500; // type:func rom:0xEB9350 -EB8E90_PatrolAI_PostLoiter = 0x802406BC; // type:func rom:0xEB950C -EB8E90_PatrolAI_JumpInit = 0x80240770; // type:func rom:0xEB95C0 -EB8E90_PatrolAI_Jump = 0x802407E4; // type:func rom:0xEB9634 -EB8E90_PatrolAI_ChaseInit = 0x8024085C; // type:func rom:0xEB96AC -EB8E90_PatrolAI_Chase = 0x8024098C; // type:func rom:0xEB97DC -EB8E90_PatrolAI_LosePlayer = 0x80240AAC; // type:func rom:0xEB98FC -EB8E90_PatrolNoAttackAI_15 = 0x80240B14; // type:func rom:0xEB9964 -EB8E90_PatrolNoAttackAI_Main = 0x80240BD4; // type:func rom:0xEB9A24 -EB8E90_PostChapter6StatUpdate = 0x80240EFC; // type:func rom:0xEB9D4C +dead_flo_00_PatrolAI_MoveInit = 0x80240040; // type:func rom:0xEB8E90 +dead_flo_00_PatrolAI_Move = 0x80240198; // type:func rom:0xEB8FE8 +dead_flo_00_PatrolAI_LoiterInit = 0x80240440; // type:func rom:0xEB9290 +dead_flo_00_PatrolAI_Loiter = 0x80240500; // type:func rom:0xEB9350 +dead_flo_00_PatrolAI_PostLoiter = 0x802406BC; // type:func rom:0xEB950C +dead_flo_00_PatrolAI_JumpInit = 0x80240770; // type:func rom:0xEB95C0 +dead_flo_00_PatrolAI_Jump = 0x802407E4; // type:func rom:0xEB9634 +dead_flo_00_PatrolAI_ChaseInit = 0x8024085C; // type:func rom:0xEB96AC +dead_flo_00_PatrolAI_Chase = 0x8024098C; // type:func rom:0xEB97DC +dead_flo_00_PatrolAI_LosePlayer = 0x80240AAC; // type:func rom:0xEB98FC +dead_flo_00_PatrolNoAttackAI_15 = 0x80240B14; // type:func rom:0xEB9964 +dead_flo_00_PatrolNoAttackAI_Main = 0x80240BD4; // type:func rom:0xEB9A24 +dead_flo_00_PostChapter6StatUpdate = 0x80240EFC; // type:func rom:0xEB9D4C func_80240F40_EB9D90 = 0x80240F40; // type:func rom:0xEB9D90 func_80240FB0_EB9E00 = 0x80240FB0; // type:func rom:0xEB9E00 func_802410E4_EB9F34 = 0x802410E4; // type:func rom:0xEB9F34 -EB9D90_CosInterpMinMax = 0x8024121C; // type:func rom:0xEBA06C -EB9D90_SyncStatusMenu = 0x802413AC; // type:func rom:0xEBA1FC +dead_flo_00_CosInterpMinMax = 0x8024121C; // type:func rom:0xEBA06C +dead_flo_00_SyncStatusMenu = 0x802413AC; // type:func rom:0xEBA1FC func_802413CC_EBA21C = 0x802413CC; // type:func rom:0xEBA21C func_802413EC_EBA23C = 0x802413EC; // type:func rom:0xEBA23C ascii_EC2000 = 0x802491B0; // type:data rom:0xEC2000 @@ -25398,146 +25396,146 @@ ascii_EC2028 = 0x802491D8; // type:data rom:0xEC2028 ascii_EC2030 = 0x802491E0; // type:data rom:0xEC2030 D_802491F0_EC2040 = 0x802491F0; // type:data rom:0xEC2040 D_802491F8_EC2048 = 0x802491F8; // type:data rom:0xEC2048 -EC2200_DeadUnkFunc1 = 0x80240000; // type:func rom:0xEC2200 -EC2240_StashVars = 0x80240040; // type:func rom:0xEC2240 -EC2240_GetItemName = 0x802400F4; // type:func rom:0xEC22F4 +dead_flo_03_DeadUnkFunc1 = 0x80240000; // type:func rom:0xEC2200 +dead_flo_03_StashVars = 0x80240040; // type:func rom:0xEC2240 +dead_flo_03_GetItemName = 0x802400F4; // type:func rom:0xEC22F4 func_80240158_EC2358 = 0x80240158; // type:func rom:0xEC2358 -EC2610_foliage_setup_shear_mtx = 0x80240410; // type:func rom:0xEC2610 -EC2610_TransformFoliage = 0x80240480; // type:func rom:0xEC2680 -EC2240_varStash = 0x80240F28; // type:data rom:0xEC3128 +dead_flo_03_foliage_setup_shear_mtx = 0x80240410; // type:func rom:0xEC2610 +dead_flo_03_TransformFoliage = 0x80240480; // type:func rom:0xEC2680 +dead_flo_03_varStash = 0x80240F28; // type:data rom:0xEC3128 D_80244F88_EC7188 = 0x80244F88; // type:data rom:0xEC7188 D_80244F90_EC7190 = 0x80244F90; // type:data rom:0xEC7190 D_80244F98_EC7198 = 0x80244F98; // type:data rom:0xEC7198 -EC71B0_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xEC71B0 -EC71B0_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xEC72D4 -EC71B0_SpawnSunEffect = 0x8024030C; // type:func rom:0xEC74BC +dead_flo_07_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xEC71B0 +dead_flo_07_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xEC72D4 +dead_flo_07_SpawnSunEffect = 0x8024030C; // type:func rom:0xEC74BC func_80240344_EC74F4 = 0x80240344; // type:func rom:0xEC74F4 -EC7590_foliage_setup_shear_mtx = 0x802403E0; // type:func rom:0xEC7590 -EC7590_TransformFoliage = 0x80240450; // type:func rom:0xEC7600 -EC7590_StashVars = 0x8024061C; // type:func rom:0xEC77CC -EC7590_GetItemName = 0x802406D0; // type:func rom:0xEC7880 +dead_flo_07_foliage_setup_shear_mtx = 0x802403E0; // type:func rom:0xEC7590 +dead_flo_07_TransformFoliage = 0x80240450; // type:func rom:0xEC7600 +dead_flo_07_StashVars = 0x8024061C; // type:func rom:0xEC77CC +dead_flo_07_GetItemName = 0x802406D0; // type:func rom:0xEC7880 D_80241BB0_EC8D60 = 0x80241BB0; // type:data rom:0xEC8D60 -EC9D00_SuperBlock_SetOverride40 = 0x80240000; // type:func rom:0xEC9D00 -EC9D00_SuperBlock_ClearOverride40 = 0x8024001C; // type:func rom:0xEC9D1C -EC9D00_SuperBlock_HideBlockContent = 0x8024003C; // type:func rom:0xEC9D3C -EC9D00_SuperBlock_GetPartnerRank = 0x80240068; // type:func rom:0xEC9D68 -EC9D00_SuperBlock_get_partner_rank = 0x802400D4; // type:func rom:0xEC9DD4 -EC9D00_SuperBlock_CountEligiblePartners = 0x80240120; // type:func rom:0xEC9E20 -EC9D00_SuperBlock_ShowSelectPartnerMenu = 0x802401CC; // type:func rom:0xEC9ECC -EC9D00_SuperBlock_SwitchToPartner = 0x8024041C; // type:func rom:0xECA11C -EC9D00_SuperBlock_LoadCurrentPartnerName = 0x80240448; // type:func rom:0xECA148 -EC9D00_SuperBlock_StartGlowEffect = 0x80240480; // type:func rom:0xECA180 -EC9D00_SuperBlock_EndGlowEffect = 0x80240510; // type:func rom:0xECA210 -EC9D00_SuperBlock_GatherEnergyFX = 0x80240544; // type:func rom:0xECA244 -EC9D00_SuperBlock_RadiateFaintEnergyFX = 0x802405A8; // type:func rom:0xECA2A8 -EC9D00_SuperBlock_AnimateEnergyOrbs = 0x80240600; // type:func rom:0xECA300 -EC9D00_SuperBlock_WhiteScreenFlash = 0x80240B38; // type:func rom:0xECA838 -EC9D00_SuperBlock_PartnerSparkles2 = 0x80240C78; // type:func rom:0xECA978 -EC9D00_SuperBlock_PartnerSparkles4 = 0x80240CC0; // type:func rom:0xECA9C0 -EC9D00_SuperBlock_WaitForPlayerToLand = 0x80240D08; // type:func rom:0xECAA08 -ECAA40_DeadUnkFunc1 = 0x80240D40; // type:func rom:0xECAA40 -ECAA80_UnkFloAI_ChaseInit = 0x80240D80; // type:func rom:0xECAA80 -ECAA80_UnkFloAI_Chase = 0x80241364; // type:func rom:0xECB064 -ECAA80_UnkFloAI_LosePlayer = 0x802414C8; // type:func rom:0xECB1C8 -ECAA80_UnkFloAI_Main = 0x8024150C; // type:func rom:0xECB20C -ECAA80_GetNpcCollisionHeight = 0x80241770; // type:func rom:0xECB470 -ECAA80_AddPlayerHandsOffset = 0x802417CC; // type:func rom:0xECB4CC +dead_flo_08_SuperBlock_SetOverride40 = 0x80240000; // type:func rom:0xEC9D00 +dead_flo_08_SuperBlock_ClearOverride40 = 0x8024001C; // type:func rom:0xEC9D1C +dead_flo_08_SuperBlock_HideBlockContent = 0x8024003C; // type:func rom:0xEC9D3C +dead_flo_08_SuperBlock_GetPartnerRank = 0x80240068; // type:func rom:0xEC9D68 +dead_flo_08_SuperBlock_get_partner_rank = 0x802400D4; // type:func rom:0xEC9DD4 +dead_flo_08_SuperBlock_CountEligiblePartners = 0x80240120; // type:func rom:0xEC9E20 +dead_flo_08_SuperBlock_ShowSelectPartnerMenu = 0x802401CC; // type:func rom:0xEC9ECC +dead_flo_08_SuperBlock_SwitchToPartner = 0x8024041C; // type:func rom:0xECA11C +dead_flo_08_SuperBlock_LoadCurrentPartnerName = 0x80240448; // type:func rom:0xECA148 +dead_flo_08_SuperBlock_StartGlowEffect = 0x80240480; // type:func rom:0xECA180 +dead_flo_08_SuperBlock_EndGlowEffect = 0x80240510; // type:func rom:0xECA210 +dead_flo_08_SuperBlock_GatherEnergyFX = 0x80240544; // type:func rom:0xECA244 +dead_flo_08_SuperBlock_RadiateFaintEnergyFX = 0x802405A8; // type:func rom:0xECA2A8 +dead_flo_08_SuperBlock_AnimateEnergyOrbs = 0x80240600; // type:func rom:0xECA300 +dead_flo_08_SuperBlock_WhiteScreenFlash = 0x80240B38; // type:func rom:0xECA838 +dead_flo_08_SuperBlock_PartnerSparkles2 = 0x80240C78; // type:func rom:0xECA978 +dead_flo_08_SuperBlock_PartnerSparkles4 = 0x80240CC0; // type:func rom:0xECA9C0 +dead_flo_08_SuperBlock_WaitForPlayerToLand = 0x80240D08; // type:func rom:0xECAA08 +dead_flo_08_DeadUnkFunc1 = 0x80240D40; // type:func rom:0xECAA40 +dead_flo_08_UnkFloAI_ChaseInit = 0x80240D80; // type:func rom:0xECAA80 +dead_flo_08_UnkFloAI_Chase = 0x80241364; // type:func rom:0xECB064 +dead_flo_08_UnkFloAI_LosePlayer = 0x802414C8; // type:func rom:0xECB1C8 +dead_flo_08_UnkFloAI_Main = 0x8024150C; // type:func rom:0xECB20C +dead_flo_08_GetNpcCollisionHeight = 0x80241770; // type:func rom:0xECB470 +dead_flo_08_AddPlayerHandsOffset = 0x802417CC; // type:func rom:0xECB4CC func_8024199C_ECB69C = 0x8024199C; // type:func rom:0xECB69C -ECAA80_ItemChoice_SaveSelected = 0x802419F0; // type:func rom:0xECB6F0 -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 -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 -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 -ED00D0_TransformFoliage = 0x80240150; // type:func rom:0xED0140 -ED0310_FlyingAI_WanderInit = 0x80240320; // type:func rom:0xED0310 -ED0310_FlyingAI_Wander = 0x802404D0; // type:func rom:0xED04C0 -ED0310_FlyingAI_LoiterInit = 0x80240AF8; // type:func rom:0xED0AE8 -ED0310_FlyingAI_Loiter = 0x80240BB8; // type:func rom:0xED0BA8 -ED0310_FlyingAI_JumpInit = 0x80240EFC; // type:func rom:0xED0EEC -ED0310_FlyingAI_Jump = 0x80240F74; // type:func rom:0xED0F64 -ED0310_FlyingAI_ChaseInit = 0x80240FE0; // type:func rom:0xED0FD0 -ED0310_FlyingAI_Chase = 0x80241114; // type:func rom:0xED1104 -ED0310_FlyingAI_LosePlayer = 0x80241178; // type:func rom:0xED1168 -ED0310_FlyingAI_Init = 0x80241508; // type:func rom:0xED14F8 -ED0310_FlyingAI_Main = 0x8024162C; // type:func rom:0xED161C +dead_flo_08_ItemChoice_SaveSelected = 0x802419F0; // type:func rom:0xECB6F0 +dead_flo_08_BuildItemChoiceList = 0x80241A28; // type:func rom:0xECB728 +dead_flo_08_FlowerGuard_SetItemEntityPosition = 0x80241AC4; // type:func rom:0xECB7C4 +dead_flo_08_FlowerGuard_JudgeItemTastiness = 0x80241B88; // type:func rom:0xECB888 +dead_flo_08_FlowerGuard_MakeItemList = 0x80241BF8; // type:func rom:0xECB8F8 +dead_flo_08_foliage_setup_shear_mtx = 0x80241C30; // type:func rom:0xECB930 +dead_flo_08_TransformFoliage = 0x80241CA0; // type:func rom:0xECB9A0 +dead_flo_08_UnkFunc43 = 0x80241E70; // type:func rom:0xECBB70 +dead_flo_08_SuperBlock_CantUpgradeMessages = 0x80241FE0; // type:data rom:0xECBCE0 +dead_flo_08_SuperBlock_PartnerIDs = 0x80241FE8; // type:data rom:0xECBCE8 +dead_flo_08_SuperBlock_UpgradeDescMessages = 0x80241FF8; // type:data rom:0xECBCF8 +dead_flo_08_SuperBlock_UpgradeOrbAngles = 0x80242038; // type:data rom:0xECBD38 +dead_flo_08_ItemChoice_HasSelectedItem = 0x802430B8; // type:data rom:0xECCDB8 +dead_flo_08_ItemChoice_SelectedItemID = 0x802430BC; // type:data rom:0xECCDBC +dead_flo_09_DeadUnkFunc1 = 0x80240000; // type:func rom:0xECFFF0 +dead_flo_09_UnkFunc43 = 0x80240040; // type:func rom:0xED0030 +dead_flo_09_foliage_setup_shear_mtx = 0x802400E0; // type:func rom:0xED00D0 +dead_flo_09_TransformFoliage = 0x80240150; // type:func rom:0xED0140 +dead_flo_09_FlyingAI_WanderInit = 0x80240320; // type:func rom:0xED0310 +dead_flo_09_FlyingAI_Wander = 0x802404D0; // type:func rom:0xED04C0 +dead_flo_09lo_09lo_09lo_09lo_09_FlyingAI_LoiterInit = 0x80240AF8; // type:func rom:0xED0AE8 +dead_flo_09_FlyingAI_Loiter = 0x80240BB8; // type:func rom:0xED0BA8 +dead_flo_09_FlyingAI_JumpInit = 0x80240EFC; // type:func rom:0xED0EEC +dead_flo_09lo_09_FlyingAI_Jump = 0x80240F74; // type:func rom:0xED0F64 +dead_flo_09_FlyingAI_ChaseInit = 0x80240FE0; // type:func rom:0xED0FD0 +dead_flo_09_FlyingAI_Chase = 0x80241114; // type:func rom:0xED1104 +dead_flo_09_FlyingAI_LosePlayer = 0x80241178; // type:func rom:0xED1168 +dead_flo_09_FlyingAI_Init = 0x80241508; // type:func rom:0xED14F8 +dead_flo_09_FlyingAI_Main = 0x8024162C; // type:func rom:0xED161C FlyingAI_JumpVels = 0x8024365C; // type:data rom:0xED364C D_802441D0_ED41C0 = 0x802441D0; // type:data rom:0xED41C0 D_802441D8_ED41C8 = 0x802441D8; // type:data rom:0xED41C8 D_802441E0_ED41D0 = 0x802441E0; // type:data rom:0xED41D0 -ED4220_get_tattle = 0x80240000; // type:func rom:0xED4220 -ED4260_DeadUnkFunc1 = 0x80240040; // type:func rom:0xED4260 -ED42A0_StashVars = 0x80240080; // type:func rom:0xED42A0 -ED42A0_GetItemName = 0x80240134; // type:func rom:0xED4354 -ED42A0_UpdateTexturePanSmooth = 0x80240198; // type:func rom:0xED43B8 -ED42A0_UpdateTexturePanStepped = 0x802402BC; // type:func rom:0xED44DC +dead_flo_10_get_tattle = 0x80240000; // type:func rom:0xED4220 +dead_flo_10_DeadUnkFunc1 = 0x80240040; // type:func rom:0xED4260 +dead_flo_10_StashVars = 0x80240080; // type:func rom:0xED42A0 +dead_flo_10_GetItemName = 0x80240134; // type:func rom:0xED4354 +dead_flo_10_UpdateTexturePanSmooth = 0x80240198; // type:func rom:0xED43B8 +dead_flo_10_UpdateTexturePanStepped = 0x802402BC; // type:func rom:0xED44DC func_802404B0_ED46D0 = 0x802404B0; // type:func rom:0xED46D0 func_80240B10_ED4D30 = 0x80240B10; // type:func rom:0xED4D30 -ED5540_foliage_setup_shear_mtx = 0x80241320; // type:func rom:0xED5540 -ED5540_TransformFoliage = 0x80241390; // type:func rom:0xED55B0 -ED42A0_varStash = 0x80241DA0; // type:data rom:0xED5FC0 +dead_flo_10_foliage_setup_shear_mtx = 0x80241320; // type:func rom:0xED5540 +dead_flo_10_TransformFoliage = 0x80241390; // type:func rom:0xED55B0 +dead_flo_10_varStash = 0x80241DA0; // type:data rom:0xED5FC0 D_80244160_ED8380 = 0x80244160; // type:data rom:0xED8380 D_80244BB8_ED8DD8 = 0x80244BB8; // type:data rom:0xED8DD8 D_80244BEC_ED8E0C = 0x80244BEC; // type:data rom:0xED8E0C -ED8E20_Pipe_SetAnimFlag = 0x80240000; // type:func rom:0xED8E20 -ED8E20_Pipe_GetCurrentFloor = 0x80240020; // type:func rom:0xED8E40 -ED8E20_Pipe_AwaitDownInput = 0x80240034; // type:func rom:0xED8E54 -ED8E20_Pipe_GetEntryPos = 0x802400F0; // type:func rom:0xED8F10 -ED8E20_Pipe_GetCameraYaw = 0x80240208; // type:func rom:0xED9028 -ED8E20_Pipe_GetPointAheadOfPlayer = 0x80240274; // type:func rom:0xED9094 +dead_flo_11_Pipe_SetAnimFlag = 0x80240000; // type:func rom:0xED8E20 +dead_flo_11_Pipe_GetCurrentFloor = 0x80240020; // type:func rom:0xED8E40 +dead_flo_11_Pipe_AwaitDownInput = 0x80240034; // type:func rom:0xED8E54 +dead_flo_11_Pipe_GetEntryPos = 0x802400F0; // type:func rom:0xED8F10 +dead_flo_11_Pipe_GetCameraYaw = 0x80240208; // type:func rom:0xED9028 +dead_flo_11_Pipe_GetPointAheadOfPlayer = 0x80240274; // type:func rom:0xED9094 func_80240318_ED9138 = 0x80240318; // type:func rom:0xED9138 D_80243170_EDBF90 = 0x80243170; // type:data rom:0xEDBF90 -func_80240000_EDBFE0 = 0x80240000; // type:func rom:0xEDBFE0 -EDC020_foliage_setup_shear_mtx = 0x80240040; // type:func rom:0xEDC020 -EDC020_TransformFoliage = 0x802400B0; // type:func rom:0xEDC090 -EDC020_StashVars = 0x8024027C; // type:func rom:0xEDC25C -EDC020_GetItemName = 0x80240330; // type:func rom:0xEDC310 -EDC020_GetNpcCollisionHeight = 0x80240394; // type:func rom:0xEDC374 -EDC020_AddPlayerHandsOffset = 0x802403F0; // type:func rom:0xEDC3D0 +dead_flo_12_func_80240000_EDBFE0 = 0x80240000; // type:func rom:0xEDBFE0 +dead_flo_12_foliage_setup_shear_mtx = 0x80240040; // type:func rom:0xEDC020 +dead_flo_12_TransformFoliage = 0x802400B0; // type:func rom:0xEDC090 +dead_flo_12_StashVars = 0x8024027C; // type:func rom:0xEDC25C +dead_flo_12_GetItemName = 0x80240330; // type:func rom:0xEDC310 +dead_flo_12_GetNpcCollisionHeight = 0x80240394; // type:func rom:0xEDC374 +dead_flo_12_AddPlayerHandsOffset = 0x802403F0; // type:func rom:0xEDC3D0 func_802405C0_EDC5A0 = 0x802405C0; // type:func rom:0xEDC5A0 func_80240614_EDC5F4 = 0x80240614; // type:func rom:0xEDC5F4 func_8024064C_EDC62C = 0x8024064C; // type:func rom:0xEDC62C -EDC020_varStash = 0x802417EC; // type:data rom:0xEDD7CC +dead_flo_12_varStash = 0x802417EC; // type:data rom:0xEDD7CC D_80241850_EDD830 = 0x80241850; // type:data rom:0xEDD830 D_80241854_EDD834 = 0x80241854; // type:data rom:0xEDD834 -func_80240000_EDE9C0 = 0x80240000; // type:func rom:0xEDE9C0 -EDEA00_ChangeNpcToPartner = 0x80240040; // type:func rom:0xEDEA00 -EDEA00_FlyingAI_WanderInit = 0x802401C4; // type:func rom:0xEDEB84 -EDEA00_FlyingAI_Wander = 0x80240374; // type:func rom:0xEDED34 -EDEA00_FlyingAI_LoiterInit = 0x8024099C; // type:func rom:0xEDF35C -EDEA00_FlyingAI_Loiter = 0x80240A5C; // type:func rom:0xEDF41C -EDEA00_FlyingAI_JumpInit = 0x80240DA0; // type:func rom:0xEDF760 -EDEA00_FlyingAI_Jump = 0x80240E18; // type:func rom:0xEDF7D8 -EDEA00_FlyingAI_ChaseInit = 0x80240E84; // type:func rom:0xEDF844 -EDEA00_FlyingAI_Chase = 0x80240FB8; // type:func rom:0xEDF978 -EDEA00_FlyingAI_LosePlayer = 0x8024101C; // type:func rom:0xEDF9DC -EDEA00_FlyingAI_Init = 0x802413AC; // type:func rom:0xEDFD6C -EDEA00_FlyingAI_Main = 0x802414D0; // type:func rom:0xEDFE90 -EDEA00_LakituAI_GetAvailableSpiny = 0x802416E8; // type:func rom:0xEE00A8 -EDEA00_LakituAI_Wander = 0x80241730; // type:func rom:0xEE00F0 -EDEA00_LakituAI_Loiter = 0x80241B94; // type:func rom:0xEE0554 -EDEA00_LakituAI_Main = 0x80241DE4; // type:func rom:0xEE07A4 -EDEA00_set_script_owner_npc_anim = 0x802422F0; // type:func rom:0xEE0CB0 -EDEA00_UnkDistFunc = 0x8024236C; // type:func rom:0xEE0D2C -EDEA00_UnkNpcAIFunc12 = 0x802424A0; // type:func rom:0xEE0E60 -EDEA00_set_script_owner_npc_col_height = 0x80242604; // type:func rom:0xEE0FC4 -EDEA00_TackleAI_Main = 0x80242684; // type:func rom:0xEE1044 -EDEA00_SpinyAI_Main = 0x80242AF0; // type:func rom:0xEE14B0 -EDEA00_UnkFunc42 = 0x80243418; // type:func rom:0xEE1DD8 +dead_flo_13_func_80240000_EDE9C0 = 0x80240000; // type:func rom:0xEDE9C0 +dead_flo_13_ChangeNpcToPartner = 0x80240040; // type:func rom:0xEDEA00 +dead_flo_13_FlyingAI_WanderInit = 0x802401C4; // type:func rom:0xEDEB84 +dead_flo_13_FlyingAI_Wander = 0x80240374; // type:func rom:0xEDED34 +dead_flo_13_FlyingAI_LoiterInit = 0x8024099C; // type:func rom:0xEDF35C +dead_flo_13_FlyingAI_Loiter = 0x80240A5C; // type:func rom:0xEDF41C +dead_flo_13_FlyingAI_JumpInit = 0x80240DA0; // type:func rom:0xEDF760 +dead_flo_13_FlyingAI_Jump = 0x80240E18; // type:func rom:0xEDF7D8 +dead_flo_13_FlyingAI_ChaseInit = 0x80240E84; // type:func rom:0xEDF844 +dead_flo_13_FlyingAI_Chase = 0x80240FB8; // type:func rom:0xEDF978 +dead_flo_13_FlyingAI_LosePlayer = 0x8024101C; // type:func rom:0xEDF9DC +dead_flo_13_FlyingAI_Init = 0x802413AC; // type:func rom:0xEDFD6C +dead_flo_13_FlyingAI_Main = 0x802414D0; // type:func rom:0xEDFE90 +dead_flo_13_LakituAI_GetAvailableSpiny = 0x802416E8; // type:func rom:0xEE00A8 +dead_flo_13_LakituAI_Wander = 0x80241730; // type:func rom:0xEE00F0 +dead_flo_13_LakituAI_Loiter = 0x80241B94; // type:func rom:0xEE0554 +dead_flo_13_LakituAI_Main = 0x80241DE4; // type:func rom:0xEE07A4 +dead_flo_13_set_script_owner_npc_anim = 0x802422F0; // type:func rom:0xEE0CB0 +dead_flo_13_UnkDistFunc = 0x8024236C; // type:func rom:0xEE0D2C +dead_flo_13_UnkNpcAIFunc12 = 0x802424A0; // type:func rom:0xEE0E60 +dead_flo_13_set_script_owner_npc_col_height = 0x80242604; // type:func rom:0xEE0FC4 +dead_flo_13_TackleAI_Main = 0x80242684; // type:func rom:0xEE1044 +dead_flo_13_SpinyAI_Main = 0x80242AF0; // type:func rom:0xEE14B0 +dead_flo_13_UnkFunc42 = 0x80243418; // type:func rom:0xEE1DD8 func_80243470_EE1E30 = 0x80243470; // type:func rom:0xEE1E30 func_80243584_EE1F44 = 0x80243584; // type:func rom:0xEE1F44 -EE2040_LoadPartyImage = 0x80243680; // type:func rom:0xEE2040 +dead_flo_13_LoadPartyImage = 0x80243680; // type:func rom:0xEE2040 FlyingAI_JumpVels = 0x802441DC; // type:data rom:0xEE2B9C D_80247AF0_EE64B0 = 0x80247AF0; // type:data rom:0xEE64B0 D_80247AF8_EE64B8 = 0x80247AF8; // type:data rom:0xEE64B8 @@ -25547,32 +25545,32 @@ D_80247B50_EE6510 = 0x80247B50; // type:data rom:0xEE6510 D_80247BB0_EE6570 = 0x80247BB0; // type:data rom:0xEE6570 D_80247BB8_EE6578 = 0x80247BB8; // type:data rom:0xEE6578 D_80247BE0_EE65A0 = 0x80247BE0; // type:data rom:0xEE65A0 -EE65B0_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xEE65B0 -EE65B0_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xEE66D4 +dead_flo_14_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xEE65B0 +dead_flo_14_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xEE66D4 func_8024030C_EE68BC = 0x8024030C; // type:func rom:0xEE68BC -EE65B0_UnkFunc43 = 0x80240340; // type:func rom:0xEE68F0 +dead_flo_14_UnkFunc43 = 0x80240340; // type:func rom:0xEE68F0 func_802403D4_EE6984 = 0x802403D4; // type:func rom:0xEE6984 func_8024042C_EE69DC = 0x8024042C; // type:func rom:0xEE69DC func_8024046C_EE6A1C = 0x8024046C; // type:func rom:0xEE6A1C func_80240504_EE6AB4 = 0x80240504; // type:func rom:0xEE6AB4 func_802407D4_EE6D84 = 0x802407D4; // type:func rom:0xEE6D84 -EE70C0_FlyingAI_WanderInit = 0x80240B10; // type:func rom:0xEE70C0 -EE70C0_FlyingAI_Wander = 0x80240CC0; // type:func rom:0xEE7270 -EE70C0_FlyingAI_LoiterInit = 0x802412E8; // type:func rom:0xEE7898 -EE70C0_FlyingAI_Loiter = 0x802413A8; // type:func rom:0xEE7958 -EE70C0_FlyingAI_JumpInit = 0x802416EC; // type:func rom:0xEE7C9C -EE70C0_FlyingAI_Jump = 0x80241764; // type:func rom:0xEE7D14 -EE70C0_FlyingAI_ChaseInit = 0x802417D0; // type:func rom:0xEE7D80 -EE70C0_FlyingAI_Chase = 0x80241904; // type:func rom:0xEE7EB4 -EE70C0_FlyingAI_LosePlayer = 0x80241968; // type:func rom:0xEE7F18 -EE70C0_FlyingAI_Init = 0x80241CF8; // type:func rom:0xEE82A8 -EE70C0_FlyingAI_Main = 0x80241E1C; // type:func rom:0xEE83CC -EE70C0_GetNpcCollisionHeight = 0x80242034; // type:func rom:0xEE85E4 -EE70C0_AddPlayerHandsOffset = 0x80242090; // type:func rom:0xEE8640 +dead_flo_14_FlyingAI_WanderInit = 0x80240B10; // type:func rom:0xEE70C0 +dead_flo_14_FlyingAI_Wander = 0x80240CC0; // type:func rom:0xEE7270 +dead_flo_14_FlyingAI_LoiterInit = 0x802412E8; // type:func rom:0xEE7898 +dead_flo_14_FlyingAI_Loiter = 0x802413A8; // type:func rom:0xEE7958 +dead_flo_14_FlyingAI_JumpInit = 0x802416EC; // type:func rom:0xEE7C9C +dead_flo_14_FlyingAI_Jump = 0x80241764; // type:func rom:0xEE7D14 +dead_flo_14_FlyingAI_ChaseInit = 0x802417D0; // type:func rom:0xEE7D80 +dead_flo_14_FlyingAI_Chase = 0x80241904; // type:func rom:0xEE7EB4 +dead_flo_14_FlyingAI_LosePlayer = 0x80241968; // type:func rom:0xEE7F18 +dead_flo_14_FlyingAI_Init = 0x80241CF8; // type:func rom:0xEE82A8 +dead_flo_14_FlyingAI_Main = 0x80241E1C; // type:func rom:0xEE83CC +dead_flo_14_GetNpcCollisionHeight = 0x80242034; // type:func rom:0xEE85E4 +dead_flo_14_AddPlayerHandsOffset = 0x80242090; // type:func rom:0xEE8640 func_80242260_EE8810 = 0x80242260; // type:func rom:0xEE8810 -EE70C0_ItemChoice_SaveSelected = 0x802422B4; // type:func rom:0xEE8864 +dead_flo_14_ItemChoice_SaveSelected = 0x802422B4; // type:func rom:0xEE8864 func_802422EC_EE889C = 0x802422EC; // type:func rom:0xEE889C -func_80242390_EE8940 = 0x80242390; // type:func rom:0xEE8940 +dead_flo_14_func_80242390_EE8940 = 0x80242390; // type:func rom:0xEE8940 D_802431FC_EE97AC = 0x802431FC; // type:data rom:0xEE97AC D_80243B44_EEA0F4 = 0x80243B44; // type:data rom:0xEEA0F4 D_80243B48_EEA0F8 = 0x80243B48; // type:data rom:0xEEA0F8 @@ -25589,88 +25587,88 @@ D_80245388_EEB938 = 0x80245388; // type:data rom:0xEEB938 D_80245390_EEB940 = 0x80245390; // type:data rom:0xEEB940 padding = 0x80240948; // type:data rom:0xEEB984 D_802453E0_EEB990 = 0x802453E0; // type:data rom:0xEEB990 -EED100_DeadUnkFunc1 = 0x80240000; // type:func rom:0xEED100 -EED140_UnkFunc43 = 0x80240040; // type:func rom:0xEED140 -EED1E0_SuperBlock_SetOverride40 = 0x802400E0; // type:func rom:0xEED1E0 -EED1E0_SuperBlock_ClearOverride40 = 0x802400FC; // type:func rom:0xEED1FC -EED1E0_SuperBlock_HideBlockContent = 0x8024011C; // type:func rom:0xEED21C -EED1E0_SuperBlock_GetPartnerRank = 0x80240148; // type:func rom:0xEED248 -EED1E0_SuperBlock_get_partner_rank = 0x802401B4; // type:func rom:0xEED2B4 -EED1E0_SuperBlock_CountEligiblePartners = 0x80240200; // type:func rom:0xEED300 -EED1E0_SuperBlock_ShowSelectPartnerMenu = 0x802402AC; // type:func rom:0xEED3AC -EED1E0_SuperBlock_SwitchToPartner = 0x802404FC; // type:func rom:0xEED5FC -EED1E0_SuperBlock_LoadCurrentPartnerName = 0x80240528; // type:func rom:0xEED628 -EED1E0_SuperBlock_StartGlowEffect = 0x80240560; // type:func rom:0xEED660 -EED1E0_SuperBlock_EndGlowEffect = 0x802405F0; // type:func rom:0xEED6F0 -EED1E0_SuperBlock_GatherEnergyFX = 0x80240624; // type:func rom:0xEED724 -EED1E0_SuperBlock_RadiateFaintEnergyFX = 0x80240688; // type:func rom:0xEED788 -EED1E0_SuperBlock_AnimateEnergyOrbs = 0x802406E0; // type:func rom:0xEED7E0 -EED1E0_SuperBlock_WhiteScreenFlash = 0x80240C18; // type:func rom:0xEEDD18 -EED1E0_SuperBlock_PartnerSparkles2 = 0x80240D58; // type:func rom:0xEEDE58 -EED1E0_SuperBlock_PartnerSparkles4 = 0x80240DA0; // type:func rom:0xEEDEA0 -EED1E0_SuperBlock_WaitForPlayerToLand = 0x80240DE8; // type:func rom:0xEEDEE8 -EED1E0_UnkFunc44 = 0x80240E18; // type:func rom:0xEEDF18 -EEDF50_FlyingAI_WanderInit = 0x80240E50; // type:func rom:0xEEDF50 -EEDF50_FlyingAI_Wander = 0x80241000; // type:func rom:0xEEE100 -EEDF50_FlyingAI_LoiterInit = 0x80241628; // type:func rom:0xEEE728 -EEDF50_FlyingAI_Loiter = 0x802416E8; // type:func rom:0xEEE7E8 -EEDF50_FlyingAI_JumpInit = 0x80241A2C; // type:func rom:0xEEEB2C -EEDF50_FlyingAI_Jump = 0x80241AA4; // type:func rom:0xEEEBA4 -EEDF50_FlyingAI_ChaseInit = 0x80241B10; // type:func rom:0xEEEC10 -EEDF50_FlyingAI_Chase = 0x80241C44; // type:func rom:0xEEED44 -EEDF50_FlyingAI_LosePlayer = 0x80241CA8; // type:func rom:0xEEEDA8 -EEDF50_FlyingAI_Init = 0x80242038; // type:func rom:0xEEF138 -EEDF50_FlyingAI_Main = 0x8024215C; // type:func rom:0xEEF25C -EEDF50_FlyingNoAttackAI_12 = 0x80242374; // type:func rom:0xEEF474 -EEDF50_FlyingNoAttackAI_13 = 0x802424A4; // type:func rom:0xEEF5A4 -EEDF50_FlyingNoAttackAI_20 = 0x80242724; // type:func rom:0xEEF824 -EEDF50_FlyingNoAttackAI_Main = 0x80242780; // type:func rom:0xEEF880 +dead_flo_16_DeadUnkFunc1 = 0x80240000; // type:func rom:0xEED100 +dead_flo_16_UnkFunc43 = 0x80240040; // type:func rom:0xEED140 +dead_flo_16_SuperBlock_SetOverride40 = 0x802400E0; // type:func rom:0xEED1E0 +dead_flo_16_SuperBlock_ClearOverride40 = 0x802400FC; // type:func rom:0xEED1FC +dead_flo_16_SuperBlock_HideBlockContent = 0x8024011C; // type:func rom:0xEED21C +dead_flo_16_SuperBlock_GetPartnerRank = 0x80240148; // type:func rom:0xEED248 +dead_flo_16_SuperBlock_get_partner_rank = 0x802401B4; // type:func rom:0xEED2B4 +dead_flo_16_SuperBlock_CountEligiblePartners = 0x80240200; // type:func rom:0xEED300 +dead_flo_16_SuperBlock_ShowSelectPartnerMenu = 0x802402AC; // type:func rom:0xEED3AC +dead_flo_16_SuperBlock_SwitchToPartner = 0x802404FC; // type:func rom:0xEED5FC +dead_flo_16_SuperBlock_LoadCurrentPartnerName = 0x80240528; // type:func rom:0xEED628 +dead_flo_16_SuperBlock_StartGlowEffect = 0x80240560; // type:func rom:0xEED660 +dead_flo_16_SuperBlock_EndGlowEffect = 0x802405F0; // type:func rom:0xEED6F0 +dead_flo_16_SuperBlock_GatherEnergyFX = 0x80240624; // type:func rom:0xEED724 +dead_flo_16_SuperBlock_RadiateFaintEnergyFX = 0x80240688; // type:func rom:0xEED788 +dead_flo_16_SuperBlock_AnimateEnergyOrbs = 0x802406E0; // type:func rom:0xEED7E0 +dead_flo_16_SuperBlock_WhiteScreenFlash = 0x80240C18; // type:func rom:0xEEDD18 +dead_flo_16_SuperBlock_PartnerSparkles2 = 0x80240D58; // type:func rom:0xEEDE58 +dead_flo_16_SuperBlock_PartnerSparkles4 = 0x80240DA0; // type:func rom:0xEEDEA0 +dead_flo_16_SuperBlock_WaitForPlayerToLand = 0x80240DE8; // type:func rom:0xEEDEE8 +dead_flo_16_UnkFunc44 = 0x80240E18; // type:func rom:0xEEDF18 +dead_flo_16_FlyingAI_WanderInit = 0x80240E50; // type:func rom:0xEEDF50 +dead_flo_16_FlyingAI_Wander = 0x80241000; // type:func rom:0xEEE100 +dead_flo_16_FlyingAI_LoiterInit = 0x80241628; // type:func rom:0xEEE728 +dead_flo_16_FlyingAI_Loiter = 0x802416E8; // type:func rom:0xEEE7E8 +dead_flo_16_FlyingAI_JumpInit = 0x80241A2C; // type:func rom:0xEEEB2C +dead_flo_16_FlyingAI_Jump = 0x80241AA4; // type:func rom:0xEEEBA4 +dead_flo_16_FlyingAI_ChaseInit = 0x80241B10; // type:func rom:0xEEEC10 +dead_flo_16_FlyingAI_Chase = 0x80241C44; // type:func rom:0xEEED44 +dead_flo_16_FlyingAI_LosePlayer = 0x80241CA8; // type:func rom:0xEEEDA8 +dead_flo_16_FlyingAI_Init = 0x80242038; // type:func rom:0xEEF138 +dead_flo_16_FlyingAI_Main = 0x8024215C; // type:func rom:0xEEF25C +dead_flo_16_FlyingNoAttackAI_12 = 0x80242374; // type:func rom:0xEEF474 +dead_flo_16_FlyingNoAttackAI_13 = 0x802424A4; // type:func rom:0xEEF5A4 +dead_flo_16_FlyingNoAttackAI_20 = 0x80242724; // type:func rom:0xEEF824 +dead_flo_16_FlyingNoAttackAI_Main = 0x80242780; // type:func rom:0xEEF880 func_802429A0_EEFAA0 = 0x802429A0; // type:func rom:0xEEFAA0 -EED1E0_SuperBlock_CantUpgradeMessages = 0x80243760; // type:data rom:0xEF0860 -EED1E0_SuperBlock_PartnerIDs = 0x80243768; // type:data rom:0xEF0868 -EED1E0_SuperBlock_UpgradeDescMessages = 0x80243778; // type:data rom:0xEF0878 -EED1E0_SuperBlock_UpgradeOrbAngles = 0x802437B8; // type:data rom:0xEF08B8 +dead_flo_16_SuperBlock_CantUpgradeMessages = 0x80243760; // type:data rom:0xEF0860 +dead_flo_16_SuperBlock_PartnerIDs = 0x80243768; // type:data rom:0xEF0868 +dead_flo_16_SuperBlock_UpgradeDescMessages = 0x80243778; // type:data rom:0xEF0878 +dead_flo_16_SuperBlock_UpgradeOrbAngles = 0x802437B8; // type:data rom:0xEF08B8 N(FlyingAI_JumpVels) = 0x80244070; // type:data rom:0xEF1170 D_80245450_EF2550 = 0x80245450; // type:data rom:0xEF2550 D_80245458_EF2558 = 0x80245458; // type:data rom:0xEF2558 D_80245460_EF2560 = 0x80245460; // type:data rom:0xEF2560 D_802454A8_EF25A8 = 0x802454A8; // type:data rom:0xEF25A8 -EF2610_DeadUnkFunc1 = 0x80240000; // type:func rom:0xEF2610 +dead_11_DeadUnkFunc1 = 0x80240000; // type:func rom:0xEF2610 func_80240040_EF2650 = 0x80240040; // type:func rom:0xEF2650 -EF2680_FlyingAI_WanderInit = 0x80240070; // type:func rom:0xEF2680 -EF2680_FlyingAI_Wander = 0x80240220; // type:func rom:0xEF2830 -EF2680_FlyingAI_LoiterInit = 0x80240848; // type:func rom:0xEF2E58 -EF2680_FlyingAI_Loiter = 0x80240908; // type:func rom:0xEF2F18 -EF2680_FlyingAI_JumpInit = 0x80240C4C; // type:func rom:0xEF325C -EF2680_FlyingAI_Jump = 0x80240CC4; // type:func rom:0xEF32D4 -EF2680_FlyingAI_ChaseInit = 0x80240D30; // type:func rom:0xEF3340 -EF2680_FlyingAI_Chase = 0x80240E64; // type:func rom:0xEF3474 -EF2680_FlyingAI_LosePlayer = 0x80240EC8; // type:func rom:0xEF34D8 -EF2680_FlyingAI_Init = 0x80241258; // type:func rom:0xEF3868 -EF2680_FlyingAI_Main = 0x8024137C; // type:func rom:0xEF398C -EF2680_LakituAI_GetAvailableSpiny = 0x80241594; // type:func rom:0xEF3BA4 -EF2680_LakituAI_Wander = 0x802415DC; // type:func rom:0xEF3BEC -EF2680_LakituAI_Loiter = 0x80241A40; // type:func rom:0xEF4050 -EF2680_LakituAI_Main = 0x80241C90; // type:func rom:0xEF42A0 -EF2680_set_script_owner_npc_anim = 0x8024219C; // type:func rom:0xEF47AC -EF2680_UnkDistFunc = 0x80242218; // type:func rom:0xEF4828 -EF2680_UnkNpcAIFunc12 = 0x8024234C; // type:func rom:0xEF495C -EF2680_set_script_owner_npc_col_height = 0x802424B0; // type:func rom:0xEF4AC0 -EF2680_TackleAI_Main = 0x80242530; // type:func rom:0xEF4B40 -EF2680_SpinyAI_Main = 0x8024299C; // type:func rom:0xEF4FAC +dead_11_FlyingAI_WanderInit = 0x80240070; // type:func rom:0xEF2680 +dead_11_FlyingAI_Wander = 0x80240220; // type:func rom:0xEF2830 +dead_11_FlyingAI_LoiterInit = 0x80240848; // type:func rom:0xEF2E58 +dead_11_FlyingAI_Loiter = 0x80240908; // type:func rom:0xEF2F18 +dead_11_FlyingAI_JumpInit = 0x80240C4C; // type:func rom:0xEF325C +dead_11_FlyingAI_Jump = 0x80240CC4; // type:func rom:0xEF32D4 +dead_11_FlyingAI_ChaseInit = 0x80240D30; // type:func rom:0xEF3340 +dead_11_FlyingAI_Chase = 0x80240E64; // type:func rom:0xEF3474 +dead_11_FlyingAI_LosePlayer = 0x80240EC8; // type:func rom:0xEF34D8 +dead_11_FlyingAI_Init = 0x80241258; // type:func rom:0xEF3868 +dead_11_FlyingAI_Main = 0x8024137C; // type:func rom:0xEF398C +dead_11_LakituAI_GetAvailableSpiny = 0x80241594; // type:func rom:0xEF3BA4 +dead_11_LakituAI_Wander = 0x802415DC; // type:func rom:0xEF3BEC +dead_11_LakituAI_Loiter = 0x80241A40; // type:func rom:0xEF4050 +dead_11_LakituAI_Main = 0x80241C90; // type:func rom:0xEF42A0 +dead_11_set_script_owner_npc_anim = 0x8024219C; // type:func rom:0xEF47AC +dead_11_UnkDistFunc = 0x80242218; // type:func rom:0xEF4828 +dead_11_UnkNpcAIFunc12 = 0x8024234C; // type:func rom:0xEF495C +dead_11_set_script_owner_npc_col_height = 0x802424B0; // type:func rom:0xEF4AC0 +dead_11_TackleAI_Main = 0x80242530; // type:func rom:0xEF4B40 +dead_11_SpinyAI_Main = 0x8024299C; // type:func rom:0xEF4FAC N(FlyingAI_JumpVels) = 0x802444BC; // type:data rom:0xEF6ACC D_802453B8_EF79C8 = 0x802453B8; // type:data rom:0xEF79C8 D_802453C0_EF79D0 = 0x802453C0; // type:data rom:0xEF79D0 D_80245408_EF7A18 = 0x80245408; // type:data rom:0xEF7A18 D_80245468_EF7A78 = 0x80245468; // type:data rom:0xEF7A78 -EF7A80_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xEF7A80 -EF7A80_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xEF7BA4 -EF7A80_DeadUnkFunc1 = 0x8024030C; // type:func rom:0xEF7D8C +dead_flo_18_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xEF7A80 +dead_flo_18_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xEF7BA4 +dead_flo_18_DeadUnkFunc1 = 0x8024030C; // type:func rom:0xEF7D8C func_80240340_EF7DC0 = 0x80240340; // type:func rom:0xEF7DC0 -EF7A80_CosInterpMinMax = 0x80240394; // type:func rom:0xEF7E14 -EF7FB0_UnkFunc42 = 0x80240530; // type:func rom:0xEF7FB0 -EF8010_foliage_setup_shear_mtx = 0x80240590; // type:func rom:0xEF8010 -EF8010_TransformFoliage = 0x80240600; // type:func rom:0xEF8080 +dead_flo_18_CosInterpMinMax = 0x80240394; // type:func rom:0xEF7E14 +dead_flo_18_UnkFunc42 = 0x80240530; // type:func rom:0xEF7FB0 +dead_flo_18_foliage_setup_shear_mtx = 0x80240590; // type:func rom:0xEF8010 +dead_flo_18_TransformFoliage = 0x80240600; // type:func rom:0xEF8080 EFEB00_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xEFEB00 EFEB00_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xEFEC24 EFEB00_DeadUnkFunc1 = 0x8024030C; // type:func rom:0xEFEE0C @@ -26059,7 +26057,7 @@ D_802429A4 = 0x802429A4; // type:data sbk_34_LetterDelivery_SavedNpcAnim = 0x802429A4; // type:data D_802429BC = 0x802429BC; // type:data flo_23_D_802429BC = 0x802429BC; // type:data -EDC020_D_802429E0 = 0x802429E0; // type:data +dead_flo_12_D_802429E0 = 0x802429E0; // type:data flo_12_D_802429E0 = 0x802429E0; // type:data D_80242A00 = 0x80242A00; // type:data D_80242AC4 = 0x80242AC4; // type:data @@ -26127,11 +26125,11 @@ D_802440FF = 0x802440FF; // type:data D_80244100 = 0x80244100; // type:data D_80244104 = 0x80244104; // type:data dro_02_pad_41B4 = 0x802441B4; // type:data -EB1170_D_802442D0 = 0x802442D0; // type:data +dead_03_D_802442D0 = 0x802442D0; // type:data code_eb1170_bss = 0x802442D0; // type:data kzn_20_bss = 0x802442D0; // type:data flo_17_pad_XXX = 0x802443D8; // type:data -EB1170_LetterDelivery_SavedNpcAnim = 0x80244494; // type:data +dead_03_LetterDelivery_SavedNpcAnim = 0x80244494; // type:data kzn_20_LetterDelivery_SavedNpcAnim = 0x80244494; // type:data flo_16_pad_44F8 = 0x802444F8; // type:data flo_25_pad_4734 = 0x80244734; // type:data @@ -26194,14 +26192,14 @@ flo_00_pad_5E2C = 0x80245E2C; // type:data kkj_19_D_802461F0 = 0x802461F0; // type:data hos_06_D_80246260 = 0x80246260; // type:data flo_08_ItemChoiceList = 0x802462C0; // type:data -ECAA80_ItemChoiceList = 0x802462F0; // type:data +dead_flo_08_ItemChoiceList = 0x802462F0; // type:data D_80246300 = 0x80246300; // type:data D_802463B8_kkj_19 = 0x802463B8; // D_80246424 = 0x80246424; // type:data hos_06_LetterDelivery_SavedNpcAnim = 0x80246424; // type:data flo_08_D_802462C4_pad = 0x8024642C; // type:data flo_08_FlowerGuard_ItemChoiceList = 0x80246430; // type:data -ECAA80_FlowerGuard_ItemChoiceList = 0x80246460; // type:data +dead_flo_08_FlowerGuard_ItemChoiceList = 0x80246460; // type:data D_80246528 = 0x80246528; // type:data D_8024652C = 0x8024652C; // type:data D_80246530 = 0x80246530; // type:data @@ -26222,13 +26220,13 @@ D_802465A0 = 0x802465A0; // type:data D_802465CC = 0x802465CC; // type:data D_802465F0 = 0x802465F0; // type:data flo_18_pad_66B4 = 0x802466B4; // type:data -EA0C10_D_802466D0 = 0x802466D0; // type:data +dead_kzn_17_D_802466D0 = 0x802466D0; // type:data D_80246794 = 0x80246794; // type:data kzn_02_LetterDelivery_SavedNpcAnim = 0x80246794; // type:data kzn_17_LetterDelivery_SavedNpcAnim = 0x802467B4; // type:data flo_00_pad_684C = 0x8024684C; // type:data D_80246894 = 0x80246894; // type:data -EA0C10_LetterDelivery_SavedNpcAnim = 0x80246894; // type:data +dead_kzn_17_LetterDelivery_SavedNpcAnim = 0x80246894; // type:data D_80246990 = 0x80246990; // type:data dgb_08_pad_69DC = 0x802469DC; // type:data D_80246A20 = 0x80246A20; // type:data @@ -26261,13 +26259,13 @@ D_80247DF0 = 0x80247DF0; // type:data D_80247E68 = 0x80247E68; // type:data D_80248380 = 0x80248380; // type:data kzn_19_VineRenderState = 0x80248380; // type:data -EA8AE0_D_80248388 = 0x80248388; // type:data +dead_kzn_19_D_80248388 = 0x80248388; // type:data D_802483C0 = 0x802483C0; // type:data D_802483C4 = 0x802483C4; // type:data D_802483D0 = 0x802483D0; // type:data iwa_10_D_80248480 = 0x80248480; // type:data D_8024854C = 0x8024854C; // type:data -EA8AE0_LetterDelivery_SavedNpcAnim = 0x8024854C; // type:data +dead_kzn_19_LetterDelivery_SavedNpcAnim = 0x8024854C; // type:data kzn_19_LetterDelivery_SavedNpcAnim = 0x8024854C; // type:data D_80248600 = 0x80248600; // type:data D_80248624 = 0x80248624; // type:data @@ -26352,8 +26350,7 @@ dro_02_D_8024EF80 = 0x8024EF80; // type:data gPausePanels = 0x8024EF80; // D_8024EF84 = 0x8024EF84; // type:data dro_02_D_8024EF84 = 0x8024EF84; // type:data -D_8024EF88 = 0x8024EF88; // type:data -dro_02_D_8024EF88 = 0x8024EF88; // type:data +dro_02_RitualStateTime = 0x8024EF88; // type:data dro_02_pad_D_8024EF8C = 0x8024EF8C; // type:data D_8024EF90 = 0x8024EF90; // type:data dro_02_D_8024EF90 = 0x8024EF90; // type:data @@ -26428,7 +26425,6 @@ D_8024F374 = 0x8024F374; // type:data D_8024F378 = 0x8024F378; // type:data D_8024F380 = 0x8024F380; // type:data dro_02_pad_D_8024F3B4 = 0x8024F3B4; // type:data -dro_02_LetterDelivery_SavedNpcAnim = 0x8024F3B8; // type:data D_8024F3F8 = 0x8024F3F8; // type:data D_8024F420 = 0x8024F420; // type:data D_8024F448 = 0x8024F448; // type:data @@ -26675,6 +26671,7 @@ EnterWalk = 0x80285960; // EnterWalkShort = 0x80285A60; // EnterSavePoint = 0x80285CB0; // ExitWalk = 0x80285CF4; // +EnterPostPipe = 0x80285C50; // ExitSingleDoor = 0x80285DAC; // EnterSingleDoor = 0x80285DD4; // ExitDoubleDoor = 0x80285E4C; // diff --git a/ver/us/undefined_syms.txt b/ver/us/undefined_syms.txt index 937f67d7e5..e385aa7b4f 100644 --- a/ver/us/undefined_syms.txt +++ b/ver/us/undefined_syms.txt @@ -210,7 +210,7 @@ D_80210000 = 0x80210000; func_80242040_8B20B0 = 0x80242040; spiked_goomba = 0x8021B0AC; paragoomba = 0x8021CD00; -EB1170_D_802442D0 = 0x802442D0; +dead_03_D_802442D0 = 0x802442D0; D_802AB513 = 0x802AB513; D_80247AF0_CCB300 = 0x80247AF0; @@ -319,7 +319,7 @@ D_802440FC = 0x802440FC; D_802440FF = 0x802440FF; D_80244100 = 0x80244100; D_80244104 = 0x80244104; -EB1170_D_802442D0 = 0x802442D0; +dead_03_D_802442D0 = 0x802442D0; kzn_20_LetterDelivery_SavedNpcAnim = 0x80244494; D_802447C0 = 0x802447C0; D_80244A20 = 0x80244A20; @@ -351,10 +351,10 @@ D_802459C0 = 0x802459C0; D_80245AB4 = 0x80245AB4; kkj_19_D_802461F0 = 0x802461F0; hos_06_D_80246260 = 0x80246260; -ECAA80_ItemChoiceList = 0x802462F0; +dead_flo_08_ItemChoiceList = 0x802462F0; D_80246300 = 0x80246300; D_80246424 = 0x80246424; -ECAA80_FlowerGuard_ItemChoiceList = 0x80246460; +dead_flo_08_FlowerGuard_ItemChoiceList = 0x80246460; D_8024652C = 0x8024652C; D_80246530 = 0x80246530; D_80246534 = 0x80246534; @@ -366,11 +366,11 @@ D_8024659C = 0x8024659C; D_802465A0 = 0x802465A0; D_802465CC = 0x802465CC; D_802465F0 = 0x802465F0; -EA0C10_D_802466D0 = 0x802466D0; +dead_kzn_17_D_802466D0 = 0x802466D0; D_80246794 = 0x80246794; -EB1170_LetterDelivery_SavedNpcAnim = 0x80244494; -EA8AE0_LetterDelivery_SavedNpcAnim = 0x8024854C; -EA0C10_LetterDelivery_SavedNpcAnim = 0x80246894; +dead_03_LetterDelivery_SavedNpcAnim = 0x80244494; +dead_kzn_19_LetterDelivery_SavedNpcAnim = 0x8024854C; +dead_kzn_17_LetterDelivery_SavedNpcAnim = 0x80246894; kmr_02_LetterDelivery_SavedNpcAnim = 0x8025811C; osr_01_LetterDelivery_SavedNpcAnim = 0x80242344; hos_06_LetterDelivery_SavedNpcAnim = 0x80246424; @@ -403,7 +403,7 @@ D_80247CA0 = 0x80247CA0; D_80247CB4 = 0x80247CB4; D_80247D00 = 0x80247D00; D_80247E68 = 0x80247E68; -EA8AE0_D_80248388 = 0x80248388; +dead_kzn_19_D_80248388 = 0x80248388; D_802483C0 = 0x802483C0; D_802483C4 = 0x802483C4; D_802483D0 = 0x802483D0; @@ -464,12 +464,11 @@ mac_02_D_8024E738 = 0x8024E738; end_00_CreditsData = 0x8024E960; sbk_30_D_80244A50 = 0x80244A50; kkj_18_D_80244CB0 = 0x80244CB0; -EDC020_D_802429E0 = 0x802429E0; +dead_flo_12_D_802429E0 = 0x802429E0; D_8024EA10 = 0x8024EA10; D_8024EA14 = 0x8024EA14; mac_02_LetterDelivery_SavedNpcAnim = 0x8024EA18; D_8024EF84 = 0x8024EF84; -D_8024EF88 = 0x8024EF88; D_8024EF90 = 0x8024EF90; D_8024EFB8 = 0x8024EFB8; D_8024EFC0 = 0x8024EFC0; @@ -735,3 +734,9 @@ D_8024F580_hos_05 = 0x8024F580; osr_00_802437C0 = 0x802437C0; mim_03_802424E0 = 0x802424E0; sam_04_80245210 = 0x80245210; + +// incorrectly-identified vtx addresses for tst_13 +D_802423D0 = 0x802423D0; +D_80242310 = 0x80242310; +flo_23_ConsumableChoiceList = 0x802426E0; +kmr_04_80243770 = 0x80243770;