diff --git a/include/dead.h b/include/dead.h index 6695fff95c..9c51423b79 100644 --- a/include/dead.h +++ b/include/dead.h @@ -227,7 +227,7 @@ #define RemoveItemEntity dead_RemoveItemEntity #define IsPlayerWithin dead_IsPlayerWithin #define IsPlayerOnValidFloor dead_IsPlayerOnValidFloor -#define GetCurrentPartner dead_GetCurrentPartner +#define GetPartnerInUse dead_GetPartnerInUse #define MakeEntity dead_MakeEntity #define Entity_SavePoint dead_Entity_SavePoint #define PopSong dead_PopSong diff --git a/include/script_api/common.h b/include/script_api/common.h index 1a83d6567b..d05cd55d33 100644 --- a/include/script_api/common.h +++ b/include/script_api/common.h @@ -204,7 +204,7 @@ 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 GetPartnerInUse(Evt* script, s32 isInitialCall); ApiStatus Disable8bitMario(Evt* script, s32 isInitialCall); ApiStatus PlaySoundAtPlayer(Evt* script, s32 isInitialCall); ApiStatus MakeLerp(Evt* script, s32 isInitialCall); diff --git a/src/evt/player_api.c b/src/evt/player_api.c index db8d494775..35517d849e 100644 --- a/src/evt/player_api.c +++ b/src/evt/player_api.c @@ -761,11 +761,12 @@ ApiStatus DisablePulseStone(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus GetCurrentPartner(Evt* script, s32 isInitialCall) { +// returns partnerID of current partner if using their ability, otherwise PARTNER_NONE +ApiStatus GetPartnerInUse(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; Bytecode outVar = *args++; PlayerData* playerData = &gPlayerData; - s32 currentPartner = 0; + s32 currentPartner = PARTNER_NONE; if (gPartnerActionStatus.partnerActionState != PARTNER_ACTION_NONE) { currentPartner = playerData->currentPartner; diff --git a/src/world/area_dgb/dgb_03/C31730.c b/src/world/area_dgb/dgb_03/C31730.c index b5d5e79b4d..fd74b95a17 100644 --- a/src/world/area_dgb/dgb_03/C31730.c +++ b/src/world/area_dgb/dgb_03/C31730.c @@ -213,7 +213,7 @@ static s32 N(pad_30D8)[] = { EvtScript N(802430E0) = { EVT_SET_GROUP(EVT_GROUP_00) EVT_LOOP(20) - EVT_CALL(GetCurrentPartner, LVarA) + EVT_CALL(GetPartnerInUse, LVarA) EVT_IF_NE(LVarA, 0) EVT_SET(LVar8, -1) EVT_RETURN @@ -227,7 +227,7 @@ EvtScript N(802430E0) = { EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(GetCurrentPartner, LVarA) + EVT_CALL(GetPartnerInUse, LVarA) EVT_IF_NE(LVarA, 0) EVT_SET(LVar8, -1) EVT_RETURN diff --git a/src/world/area_flo/flo_00/flo_00_5_beanstalk.c b/src/world/area_flo/flo_00/flo_00_5_beanstalk.c index 852c37912e..2ad20e9b0b 100644 --- a/src/world/area_flo/flo_00/flo_00_5_beanstalk.c +++ b/src/world/area_flo/flo_00/flo_00_5_beanstalk.c @@ -598,7 +598,7 @@ EvtScript N(EVS_BeanPatch_TryInteract) = { EVT_WAIT(1) EVT_GOTO(0) EVT_END_IF - EVT_CALL(GetCurrentPartner, LVar0) + EVT_CALL(GetPartnerInUse, LVar0) EVT_IF_NE(LVar0, PARTNER_NONE) EVT_RETURN EVT_END_IF diff --git a/src/world/area_flo/flo_03/flo_03_3_npc.c b/src/world/area_flo/flo_03/flo_03_3_npc.c index 6afd2cc491..0ffbf594e2 100644 --- a/src/world/area_flo/flo_03/flo_03_3_npc.c +++ b/src/world/area_flo/flo_03/flo_03_3_npc.c @@ -381,7 +381,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_01) = { EVT_CALL(GetNpcPos, NPC_MontyMole_01, LVar0, LVar1, LVar2) EVT_CALL(IsPlayerWithin, LVar0, LVar2, MV_NextBurrowTriggerRadius, LV_ShouldBurrow) EVT_END_IF - EVT_CALL(GetCurrentPartner, LVar9) + EVT_CALL(GetPartnerInUse, LVar9) EVT_IF_EQ(LVar9, PARTNER_BOW) EVT_SET(LVar3, FALSE) EVT_END_IF @@ -460,7 +460,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_02) = { EVT_CALL(GetNpcPos, NPC_MontyMole_02, LVar0, LVar1, LVar2) EVT_CALL(IsPlayerWithin, LVar0, LVar2, MV_NextBurrowTriggerRadius, LV_ShouldBurrow) EVT_END_IF - EVT_CALL(GetCurrentPartner, LVar9) + EVT_CALL(GetPartnerInUse, LVar9) EVT_IF_EQ(LVar9, PARTNER_BOW) EVT_SET(LV_ShouldBurrow, FALSE) EVT_END_IF @@ -539,7 +539,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_03) = { EVT_CALL(GetNpcPos, NPC_MontyMole_03, LVar0, LVar1, LVar2) EVT_CALL(IsPlayerWithin, LVar0, LVar2, MV_NextBurrowTriggerRadius, LV_ShouldBurrow) EVT_END_IF - EVT_CALL(GetCurrentPartner, LVar9) + EVT_CALL(GetPartnerInUse, LVar9) EVT_IF_EQ(LVar9, PARTNER_BOW) EVT_SET(LV_ShouldBurrow, FALSE) EVT_END_IF @@ -618,7 +618,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_04) = { EVT_CALL(GetNpcPos, NPC_MontyMole_04, LVar0, LVar1, LVar2) EVT_CALL(IsPlayerWithin, LVar0, LVar2, MV_NextBurrowTriggerRadius, LV_ShouldBurrow) EVT_END_IF - EVT_CALL(GetCurrentPartner, LVar9) + EVT_CALL(GetPartnerInUse, LVar9) EVT_IF_EQ(LVar9, PARTNER_BOW) EVT_SET(LV_ShouldBurrow, FALSE) EVT_END_IF diff --git a/src/world/area_flo/flo_10/flo_10_5_npc.c b/src/world/area_flo/flo_10/flo_10_5_npc.c index 2452473ee1..5f07173197 100644 --- a/src/world/area_flo/flo_10/flo_10_5_npc.c +++ b/src/world/area_flo/flo_10/flo_10_5_npc.c @@ -29,7 +29,7 @@ s32 N(KeyList)[] = { EvtScript N(EVS_OnInteract_WaterStoneSocket) = { EVT_IF_EQ(GF_FLO10_ShowedLilyTheWaterStone, TRUE) - EVT_CALL(GetCurrentPartner, LVarA) + EVT_CALL(GetPartnerInUse, LVarA) EVT_IF_NE(LVarA, 0) EVT_CALL(AwaitPlayerLeave, 0, 0, 19) EVT_RETURN diff --git a/src/world/area_flo/flo_14/flo_14_3_bubbles.c b/src/world/area_flo/flo_14/flo_14_3_bubbles.c index bde40571fa..b02632124e 100644 --- a/src/world/area_flo/flo_14/flo_14_3_bubbles.c +++ b/src/world/area_flo/flo_14/flo_14_3_bubbles.c @@ -109,7 +109,7 @@ EvtScript N(EVS_RideBigBubble) = { EVT_RETURN EVT_END_IF EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(GetCurrentPartner, LVar0) + EVT_CALL(GetPartnerInUse, LVar0) EVT_IF_NE(LVar0, PARTNER_NONE) EVT_CALL(InterruptUsePartner) EVT_WAIT(20) diff --git a/src/world/area_flo/flo_21/flo_21_4_npc.c b/src/world/area_flo/flo_21/flo_21_4_npc.c index f5f0d9d2b4..a18ab4cd39 100644 --- a/src/world/area_flo/flo_21/flo_21_4_npc.c +++ b/src/world/area_flo/flo_21/flo_21_4_npc.c @@ -99,7 +99,7 @@ EvtScript N(EVS_Scene_HuffNPuffAmbush) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(SetMusicTrack, 0, SONG_HUFF_N_PUFF_THEME, 0, 8) EVT_EXEC_GET_TID(N(EVS_PlayRumbleSounds), LVar9) - EVT_CALL(GetCurrentPartner, LVar0) + EVT_CALL(GetPartnerInUse, LVar0) EVT_IF_NE(LVar0, PARTNER_NONE) EVT_CALL(InterruptUsePartner) EVT_WAIT(20) diff --git a/src/world/area_iwa/iwa_04/iwa_04_4_npc.c b/src/world/area_iwa/iwa_04/iwa_04_4_npc.c index 45818c2712..9ed394cf79 100644 --- a/src/world/area_iwa/iwa_04/iwa_04_4_npc.c +++ b/src/world/area_iwa/iwa_04/iwa_04_4_npc.c @@ -78,7 +78,7 @@ EvtScript N(EVS_NpcAI_Buzzar) = { EVT_END_LOOP EVT_CALL(SetMusicTrack, 0, SONG_MINIBOSS_BATTLE, 0, 8) EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(GetCurrentPartner, LVar0) + EVT_CALL(GetPartnerInUse, LVar0) EVT_IF_NE(LVar0, 0) EVT_CALL(InterruptUsePartner) EVT_WAIT(5) diff --git a/src/world/area_kpa/kpa.h b/src/world/area_kpa/kpa.h index 7a2307505c..70bf5df5cc 100644 --- a/src/world/area_kpa/kpa.h +++ b/src/world/area_kpa/kpa.h @@ -2,29 +2,28 @@ #define _WORLD_AREA_KPA_KPA_H_ enum { - AB_KPA_0 = AreaByte(0), - AB_KPA_1 = AreaByte(1), - AB_KPA_2 = AreaByte(2), - AB_KPA_3 = AreaByte(3), - AB_KPA_4 = AreaByte(4), - AB_KPA_5 = AreaByte(5), - AB_KPA_6 = AreaByte(6), - AB_KPA_7 = AreaByte(7), - AB_KPA_8 = AreaByte(8), - AB_KPA_9 = AreaByte(9), - AB_KPA_A = AreaByte(10), - AB_KPA_B = AreaByte(11), - AB_KPA_C = AreaByte(12), - AB_KPA_D = AreaByte(13), - AB_KPA_E = AreaByte(14), - AB_KPA_F = AreaByte(15), + AB_KPA17_Toad1_Dialogue = AreaByte(1), + AB_KPA17_Toad2_Dialogue = AreaByte(2), + AB_KPA17_Toad3_Dialogue = AreaByte(3), + AB_KPA17_Toad4_Dialogue = AreaByte(4), + AB_KPA91_Toad2_Dialogue = AreaByte(5), + AB_KPA91_Toad3_Dialogue = AreaByte(6), + AB_KPA91_Dryite_Dialogue = AreaByte(7), + AB_KPA95_Toad2_Dialogue = AreaByte(8), + AB_KPA95_Toad3_Dialogue = AreaByte(9), + AB_KPA95_Penguin_Dialogue = AreaByte(10), + AB_KPA_MazeProgress = AreaByte(11), + AB_KPA82_QuizRound = AreaByte(12), + AB_KPA82_RightAnswers = AreaByte(13), + AB_KPA82_WrongAnswers = AreaByte(14), }; enum { - AF_KPA_03 = AreaFlag(3), - AF_KPA_04 = AreaFlag(4), - AF_KPA_05 = AreaFlag(5), - AF_KPA_06 = AreaFlag(6), + AF_KPA08_PlatformRaised = AreaFlag(3), + AF_KPA09_PlatformRaised = AreaFlag(4), + AF_KPA13_HitSwitchA = AreaFlag(5), + AF_KPA13_HitSwitchB = AreaFlag(6), + AF_KPA16_HitSwitch = AreaFlag(7), AF_KPA133_HitWaterSwitch = AreaFlag(8), AF_KPA134_HitWaterSwitch = AreaFlag(9), }; @@ -80,6 +79,11 @@ extern MapSettings kpa_130_settings; extern MapSettings kpa_133_settings; extern MapSettings kpa_134_settings; +s32 kpa_51_map_init(void); +s32 kpa_53_map_init(void); +s32 kpa_81_map_init(void); +s32 kpa_82_map_init(void); +s32 kpa_83_map_init(void); s32 kpa_100_map_init(void); s32 kpa_101_map_init(void); s32 kpa_114_map_init(void); diff --git a/src/world/area_kpa/kpa_01/kpa_01.h b/src/world/area_kpa/kpa_01/kpa_01.h index 999351fd77..cab78ea4e9 100644 --- a/src/world/area_kpa/kpa_01/kpa_01.h +++ b/src/world/area_kpa/kpa_01/kpa_01.h @@ -10,8 +10,8 @@ #include "mapfs/kpa_01_hit.h" enum { - NPC_BonyBeetle_01 = 0, - NPC_BonyBeetle_02 = 1, + NPC_BonyBeetle_01 = 0, + NPC_BonyBeetle_02 = 1, }; #define NAMESPACE kpa_01 diff --git a/src/world/area_kpa/kpa_03/kpa_03.h b/src/world/area_kpa/kpa_03/kpa_03.h index be0588bebf..71e393700f 100644 --- a/src/world/area_kpa/kpa_03/kpa_03.h +++ b/src/world/area_kpa/kpa_03/kpa_03.h @@ -15,12 +15,12 @@ #include "sprite/npc/BonyBeetle.h" enum { - NPC_Koopatrol_01 = 0, - NPC_Koopatrol_02 = 1, - NPC_BonyBeetle_01 = 2, - NPC_BonyBeetle_02 = 3, - NPC_Magikoopa_01 = 4, - NPC_Magikoopa_01_Spell = 5, + NPC_Koopatrol_01 = 0, + NPC_Koopatrol_02 = 1, + NPC_BonyBeetle_01 = 2, + NPC_BonyBeetle_02 = 3, + NPC_Magikoopa_01 = 4, + NPC_Magikoopa_01_Spell = 5, }; enum { diff --git a/src/world/area_kpa/kpa_04/kpa_04_3_statues.c b/src/world/area_kpa/kpa_04/kpa_04_3_statues.c index 7e15eb9233..b7da47b89a 100644 --- a/src/world/area_kpa/kpa_04/kpa_04_3_statues.c +++ b/src/world/area_kpa/kpa_04/kpa_04_3_statues.c @@ -5,7 +5,7 @@ EvtScript N(EVS_PushStatue_Impl) = { EVT_LOOP(20) - EVT_CALL(GetCurrentPartner, LVarA) + EVT_CALL(GetPartnerInUse, LVarA) EVT_IF_NE(LVarA, 0) EVT_SET(LVar9, 0) EVT_RETURN @@ -19,7 +19,7 @@ EvtScript N(EVS_PushStatue_Impl) = { EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(GetCurrentPartner, LVarA) + EVT_CALL(GetPartnerInUse, LVarA) EVT_IF_NE(LVarA, 0) EVT_SET(LVar9, 0) EVT_RETURN diff --git a/src/world/area_kpa/kpa_08/kpa_08.h b/src/world/area_kpa/kpa_08/kpa_08.h index f8326be7f6..7c6263a57d 100644 --- a/src/world/area_kpa/kpa_08/kpa_08.h +++ b/src/world/area_kpa/kpa_08/kpa_08.h @@ -12,8 +12,8 @@ #include "sprite/npc/Magikoopa.h" enum { - NPC_Magikoopa = 0, - NPC_Magikoopa_Spell = 1, + NPC_Magikoopa = 0, + NPC_Magikoopa_Spell = 1, }; #define NAMESPACE kpa_08 diff --git a/src/world/area_kpa/kpa_08/kpa_08_3_entity.c b/src/world/area_kpa/kpa_08/kpa_08_3_entity.c index 84181c42e6..c299e4d23e 100644 --- a/src/world/area_kpa/kpa_08/kpa_08_3_entity.c +++ b/src/world/area_kpa/kpa_08/kpa_08_3_entity.c @@ -16,10 +16,10 @@ API_CALLABLE(N(ElevatePlayer)) { } EvtScript N(EVS_ActivateSwitch) = { - EVT_IF_NE(AF_KPA_03, FALSE) + EVT_IF_NE(AF_KPA08_PlatformRaised, FALSE) EVT_RETURN EVT_END_IF - EVT_SET(AF_KPA_03, TRUE) + EVT_SET(AF_KPA08_PlatformRaised, TRUE) EVT_CALL(N(UnsetCamera0MoveFlag1)) EVT_THREAD EVT_SET_GROUP(EVT_GROUP_EF) @@ -79,14 +79,14 @@ EvtScript N(EVS_ActivateSwitch) = { EVT_END_IF EVT_END_LOOP EVT_CALL(TranslateGroup, MODEL_move2, 0, -99, -1) - EVT_SET(AF_KPA_03, FALSE) + EVT_SET(AF_KPA08_PlatformRaised, FALSE) EVT_END_THREAD EVT_RETURN EVT_END }; EvtScript N(EVS_MakeEntities) = { - EVT_SET(AF_KPA_03, FALSE) + EVT_SET(AF_KPA08_PlatformRaised, FALSE) EVT_CALL(MakeEntity, EVT_PTR(Entity_RedSwitch), 10, 0, 0, 0, MAKE_ENTITY_END) EVT_CALL(AssignScript, EVT_PTR(N(EVS_ActivateSwitch))) EVT_CALL(ParentColliderToModel, COLLIDER_o19, MODEL_m_yuka) diff --git a/src/world/area_kpa/kpa_09/kpa_09.h b/src/world/area_kpa/kpa_09/kpa_09.h index 997b023903..d8e0872d57 100644 --- a/src/world/area_kpa/kpa_09/kpa_09.h +++ b/src/world/area_kpa/kpa_09/kpa_09.h @@ -13,10 +13,10 @@ #include "sprite/npc/ThrownBone.h" enum { - NPC_DryBones = 0, - NPC_DryBones_Bone1 = 1, - NPC_DryBones_Bone2 = 2, - NPC_DryBones_Bone3 = 3, + NPC_DryBones = 0, + NPC_DryBones_Bone1 = 1, + NPC_DryBones_Bone2 = 2, + NPC_DryBones_Bone3 = 3, }; #define NAMESPACE kpa_09 diff --git a/src/world/area_kpa/kpa_09/kpa_09_3_entity.c b/src/world/area_kpa/kpa_09/kpa_09_3_entity.c index c72dbb9086..060a53073d 100644 --- a/src/world/area_kpa/kpa_09/kpa_09_3_entity.c +++ b/src/world/area_kpa/kpa_09/kpa_09_3_entity.c @@ -16,10 +16,10 @@ API_CALLABLE(N(ElevatePlayer)) { } EvtScript N(EVS_ActivateSwitch) = { - EVT_IF_NE(AF_KPA_04, FALSE) + EVT_IF_NE(AF_KPA09_PlatformRaised, FALSE) EVT_RETURN EVT_END_IF - EVT_SET(AF_KPA_04, TRUE) + EVT_SET(AF_KPA09_PlatformRaised, TRUE) EVT_CALL(N(UnsetCamera0MoveFlag1)) EVT_THREAD EVT_SET_GROUP(EVT_GROUP_EF) @@ -79,14 +79,14 @@ EvtScript N(EVS_ActivateSwitch) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_SET(AF_KPA_04, FALSE) + EVT_SET(AF_KPA09_PlatformRaised, FALSE) EVT_END_THREAD EVT_RETURN EVT_END }; EvtScript N(EVS_MakeEntities) = { - EVT_SET(AF_KPA_04, FALSE) + EVT_SET(AF_KPA09_PlatformRaised, FALSE) EVT_CALL(MakeEntity, EVT_PTR(Entity_RedSwitch), -325, 0, -8, 0, MAKE_ENTITY_END) EVT_CALL(AssignScript, EVT_PTR(N(EVS_ActivateSwitch))) EVT_CALL(ParentColliderToModel, COLLIDER_o19, MODEL_m_yuka) diff --git a/src/world/area_kpa/kpa_10/kpa_10.h b/src/world/area_kpa/kpa_10/kpa_10.h index 9a7d83a7fe..009b7e6f20 100644 --- a/src/world/area_kpa/kpa_10/kpa_10.h +++ b/src/world/area_kpa/kpa_10/kpa_10.h @@ -13,9 +13,9 @@ #include "sprite/npc/ToadGuard.h" enum { - NPC_Toad_01 = 0, - NPC_Toad_02 = 1, - NPC_ToadGuard = 2, + NPC_Toad_01 = 0, + NPC_Toad_02 = 1, + NPC_ToadGuard = 2, }; #define NAMESPACE kpa_10 diff --git a/src/world/area_kpa/kpa_102/kpa_102.h b/src/world/area_kpa/kpa_102/kpa_102.h index fe0d8c9600..d3e4cc0637 100644 --- a/src/world/area_kpa/kpa_102/kpa_102.h +++ b/src/world/area_kpa/kpa_102/kpa_102.h @@ -14,9 +14,16 @@ #include "sprite/npc/WorldKoopatrol.h" enum { - NPC_Koopatrol = 0, - NPC_FlyingMagikoopa = 1, // spell uses ID 2 - NPC_HammerBros = 50, // hammers use IDs 51-56 + NPC_Koopatrol = 0, + NPC_FlyingMagikoopa = 1, + NPC_FlyingMagikoopa_Spell = 2, + NPC_HammerBros = 50, + NPC_HammerBros_Hammer1 = 51, + NPC_HammerBros_Hammer2 = 52, + NPC_HammerBros_Hammer3 = 53, + NPC_HammerBros_Hammer4 = 54, + NPC_HammerBros_Hammer5 = 55, + NPC_HammerBros_Hammer6 = 56, }; #define NAMESPACE kpa_102 diff --git a/src/world/area_kpa/kpa_11/kpa_11.h b/src/world/area_kpa/kpa_11/kpa_11.h index 858c7f11ad..ac7fdf9167 100644 --- a/src/world/area_kpa/kpa_11/kpa_11.h +++ b/src/world/area_kpa/kpa_11/kpa_11.h @@ -14,10 +14,10 @@ #include "sprite/npc/ToadGuard.h" enum { - NPC_Koopatrol = 0, - NPC_Toad_01 = 1, - NPC_Toad_02 = 2, - NPC_ToadGuard = 3, + NPC_Koopatrol = 0, + NPC_Toad_01 = 1, + NPC_Toad_02 = 2, + NPC_ToadGuard = 3, }; #define NAMESPACE kpa_11 diff --git a/src/world/area_kpa/kpa_111/kpa_111.h b/src/world/area_kpa/kpa_111/kpa_111.h index 865b9c1d1f..9bad798047 100644 --- a/src/world/area_kpa/kpa_111/kpa_111.h +++ b/src/world/area_kpa/kpa_111/kpa_111.h @@ -13,14 +13,14 @@ #include "sprite/npc/ThrownBone.h" enum { - NPC_DryBones_01 = 0, - NPC_DryBones_01_Hitbox1 = 1, - NPC_DryBones_01_Hitbox2 = 2, - NPC_DryBones_01_Hitbox3 = 3, - NPC_DryBones_02 = 4, - NPC_DryBones_02_Hitbox1 = 5, - NPC_DryBones_02_Hitbox2 = 6, - NPC_DryBones_02_Hitbox3 = 7, + NPC_DryBones_01 = 0, + NPC_DryBones_01_Hitbox1 = 1, + NPC_DryBones_01_Hitbox2 = 2, + NPC_DryBones_01_Hitbox3 = 3, + NPC_DryBones_02 = 4, + NPC_DryBones_02_Hitbox1 = 5, + NPC_DryBones_02_Hitbox2 = 6, + NPC_DryBones_02_Hitbox3 = 7, }; #define NAMESPACE kpa_111 diff --git a/src/world/area_kpa/kpa_111/kpa_111_3_statues.c b/src/world/area_kpa/kpa_111/kpa_111_3_statues.c index 490ef87a45..35c14b03b7 100644 --- a/src/world/area_kpa/kpa_111/kpa_111_3_statues.c +++ b/src/world/area_kpa/kpa_111/kpa_111_3_statues.c @@ -6,7 +6,7 @@ EvtScript N(EVS_PushRightStatue_Impl) = { EVT_SET_GROUP(EVT_GROUP_00) EVT_LOOP(20) - EVT_CALL(GetCurrentPartner, LVarA) + EVT_CALL(GetPartnerInUse, LVarA) EVT_IF_NE(LVarA, 0) EVT_SET(LVar8, -1) EVT_RETURN @@ -20,7 +20,7 @@ EvtScript N(EVS_PushRightStatue_Impl) = { EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(GetCurrentPartner, LVarA) + EVT_CALL(GetPartnerInUse, LVarA) EVT_IF_NE(LVarA, 0) EVT_SET(LVar8, -1) EVT_RETURN diff --git a/src/world/area_kpa/kpa_113/kpa_113_4_statues.c b/src/world/area_kpa/kpa_113/kpa_113_4_statues.c index 9b633f2578..83942a32bb 100644 --- a/src/world/area_kpa/kpa_113/kpa_113_4_statues.c +++ b/src/world/area_kpa/kpa_113/kpa_113_4_statues.c @@ -6,7 +6,7 @@ EvtScript N(EVS_PushLeftStatue_Impl) = { EVT_SET_GROUP(EVT_GROUP_00) EVT_LOOP(20) - EVT_CALL(GetCurrentPartner, LVarA) + EVT_CALL(GetPartnerInUse, LVarA) EVT_IF_NE(LVarA, 0) EVT_SET(LVar8, -1) EVT_RETURN @@ -20,7 +20,7 @@ EvtScript N(EVS_PushLeftStatue_Impl) = { EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(GetCurrentPartner, LVarA) + EVT_CALL(GetPartnerInUse, LVarA) EVT_IF_NE(LVarA, 0) EVT_SET(LVar8, -1) EVT_RETURN diff --git a/src/world/area_kpa/kpa_115/kpa_115.h b/src/world/area_kpa/kpa_115/kpa_115.h index f43cee527a..d6fb17b2d5 100644 --- a/src/world/area_kpa/kpa_115/kpa_115.h +++ b/src/world/area_kpa/kpa_115/kpa_115.h @@ -10,7 +10,13 @@ #include "mapfs/kpa_115_hit.h" enum { - NPC_HammerBros = 20, // uses 21-26 for hammers + NPC_HammerBros = 20, + NPC_HammerBros_Hammer1 = 21, + NPC_HammerBros_Hammer2 = 22, + NPC_HammerBros_Hammer3 = 23, + NPC_HammerBros_Hammer4 = 24, + NPC_HammerBros_Hammer5 = 25, + NPC_HammerBros_Hammer6 = 26, }; #define NAMESPACE kpa_115 diff --git a/src/world/area_kpa/kpa_115/kpa_115_3_statues.c b/src/world/area_kpa/kpa_115/kpa_115_3_statues.c index 6b62700071..0182676066 100644 --- a/src/world/area_kpa/kpa_115/kpa_115_3_statues.c +++ b/src/world/area_kpa/kpa_115/kpa_115_3_statues.c @@ -6,7 +6,7 @@ EvtScript N(EVS_PushMiddleStatue_Impl) = { EVT_SET_GROUP(EVT_GROUP_00) EVT_LOOP(20) - EVT_CALL(GetCurrentPartner, LVarA) + EVT_CALL(GetPartnerInUse, LVarA) EVT_IF_NE(LVarA, 0) EVT_SET(LVar8, -1) EVT_RETURN @@ -20,7 +20,7 @@ EvtScript N(EVS_PushMiddleStatue_Impl) = { EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(GetCurrentPartner, LVarA) + EVT_CALL(GetPartnerInUse, LVarA) EVT_IF_NE(LVarA, 0) EVT_SET(LVar8, -1) EVT_RETURN diff --git a/src/world/area_kpa/kpa_13/kpa_13_3_entity.c b/src/world/area_kpa/kpa_13/kpa_13_3_entity.c index e9e0f4c0ad..9aca6ce66b 100644 --- a/src/world/area_kpa/kpa_13/kpa_13_3_entity.c +++ b/src/world/area_kpa/kpa_13/kpa_13_3_entity.c @@ -2,15 +2,15 @@ #include "entity.h" EvtScript N(EVS_MakeEntities) = { - EVT_SET(AF_KPA_05, FALSE) - EVT_SET(AF_KPA_06, FALSE) + EVT_SET(AF_KPA13_HitSwitchA, FALSE) + EVT_SET(AF_KPA13_HitSwitchB, FALSE) EVT_IF_EQ(GF_KPA13_BlueSwitchA, FALSE) EVT_CALL(MakeEntity, EVT_PTR(Entity_BlueSwitch), 285, 10, -55, 0, MAKE_ENTITY_END) - EVT_CALL(AssignSwitchFlag, EVT_INDEX_OF_AREA_FLAG(AF_KPA_05)) + EVT_CALL(AssignSwitchFlag, EVT_INDEX_OF_AREA_FLAG(AF_KPA13_HitSwitchA)) EVT_END_IF EVT_IF_EQ(GF_KPA13_BlueSwitchB, FALSE) EVT_CALL(MakeEntity, EVT_PTR(Entity_BlueSwitch), 935, 10, -55, 0, MAKE_ENTITY_END) - EVT_CALL(AssignSwitchFlag, EVT_INDEX_OF_AREA_FLAG(AF_KPA_06)) + EVT_CALL(AssignSwitchFlag, EVT_INDEX_OF_AREA_FLAG(AF_KPA13_HitSwitchB)) EVT_END_IF EVT_RETURN EVT_END diff --git a/src/world/area_kpa/kpa_13/kpa_13_4_platforms.c b/src/world/area_kpa/kpa_13/kpa_13_4_platforms.c index 34f10710c0..6d0d6dae11 100644 --- a/src/world/area_kpa/kpa_13/kpa_13_4_platforms.c +++ b/src/world/area_kpa/kpa_13/kpa_13_4_platforms.c @@ -45,7 +45,7 @@ EvtScript N(EVS_SetupPlatforms) = { EVT_CALL(UpdateColliderTransform, COLLIDER_o1070) EVT_IF_EQ(GF_KPA13_BlueSwitchA, FALSE) EVT_LABEL(11) - EVT_IF_EQ(AF_KPA_05, FALSE) + EVT_IF_EQ(AF_KPA13_HitSwitchA, FALSE) EVT_WAIT(1) EVT_GOTO(11) EVT_END_IF @@ -115,7 +115,7 @@ EvtScript N(EVS_SetupPlatforms) = { EVT_CALL(UpdateColliderTransform, COLLIDER_o1072) EVT_IF_EQ(GF_KPA13_BlueSwitchB, FALSE) EVT_LABEL(12) - EVT_IF_EQ(AF_KPA_06, FALSE) + EVT_IF_EQ(AF_KPA13_HitSwitchB, FALSE) EVT_WAIT(1) EVT_GOTO(12) EVT_END_IF diff --git a/src/world/area_kpa/kpa_130/kpa_130.h b/src/world/area_kpa/kpa_130/kpa_130.h index 7abd95d88d..3da269892f 100644 --- a/src/world/area_kpa/kpa_130/kpa_130.h +++ b/src/world/area_kpa/kpa_130/kpa_130.h @@ -13,34 +13,34 @@ #include "sprite/npc/BulletBill.h" enum { - NPC_BillBlaster_01 = 0, - NPC_BillBlaster_02 = 1, - NPC_BillBlaster_03 = 2, - NPC_BillBlaster_04 = 3, - NPC_BillBlaster_05 = 4, - NPC_BillBlaster_06 = 5, - NPC_BillBlaster_07 = 6, - NPC_BillBlaster_08 = 7, - NPC_BulletBill_01 = 50, - NPC_BulletBill_02 = 51, - NPC_BulletBill_03 = 52, - NPC_BulletBill_04 = 53, - NPC_BulletBill_05 = 54, - NPC_BulletBill_06 = 55, - NPC_BulletBill_07 = 56, - NPC_BulletBill_08 = 57, - NPC_BulletBill_09 = 58, - NPC_BulletBill_10 = 59, - NPC_BulletBill_11 = 60, - NPC_BulletBill_12 = 61, - NPC_BulletBill_13 = 62, - NPC_BulletBill_14 = 63, - NPC_BulletBill_15 = 64, - NPC_BulletBill_16 = 65, - NPC_BulletBill_17 = 66, - NPC_BulletBill_18 = 67, - NPC_BulletBill_19 = 68, - NPC_BulletBill_20 = 69, + NPC_BillBlaster_01 = 0, + NPC_BillBlaster_02 = 1, + NPC_BillBlaster_03 = 2, + NPC_BillBlaster_04 = 3, + NPC_BillBlaster_05 = 4, + NPC_BillBlaster_06 = 5, + NPC_BillBlaster_07 = 6, + NPC_BillBlaster_08 = 7, + NPC_BulletBill_01 = 50, + NPC_BulletBill_02 = 51, + NPC_BulletBill_03 = 52, + NPC_BulletBill_04 = 53, + NPC_BulletBill_05 = 54, + NPC_BulletBill_06 = 55, + NPC_BulletBill_07 = 56, + NPC_BulletBill_08 = 57, + NPC_BulletBill_09 = 58, + NPC_BulletBill_10 = 59, + NPC_BulletBill_11 = 60, + NPC_BulletBill_12 = 61, + NPC_BulletBill_13 = 62, + NPC_BulletBill_14 = 63, + NPC_BulletBill_15 = 64, + NPC_BulletBill_16 = 65, + NPC_BulletBill_17 = 66, + NPC_BulletBill_18 = 67, + NPC_BulletBill_19 = 68, + NPC_BulletBill_20 = 69, }; #define NAMESPACE kpa_130 diff --git a/src/world/area_kpa/kpa_133/kpa_133.h b/src/world/area_kpa/kpa_133/kpa_133.h index 93381218f4..89a5560158 100644 --- a/src/world/area_kpa/kpa_133/kpa_133.h +++ b/src/world/area_kpa/kpa_133/kpa_133.h @@ -10,7 +10,7 @@ #include "mapfs/kpa_133_hit.h" enum { - NPC_Dummy = 0, + NPC_Dummy = 0, }; enum { diff --git a/src/world/area_kpa/kpa_134/kpa_134.h b/src/world/area_kpa/kpa_134/kpa_134.h index 5f68df6f77..16372a5270 100644 --- a/src/world/area_kpa/kpa_134/kpa_134.h +++ b/src/world/area_kpa/kpa_134/kpa_134.h @@ -12,12 +12,12 @@ #include "sprite/npc/Toad.h" enum { - NPC_Dummy = 0, + NPC_Dummy = 0, }; enum { MV_SwitchEntityID = MapVar(0), - MV_Unk_01 = MapVar(1), + MV_PadlockEntityID = MapVar(1), }; #define NAMESPACE kpa_134 diff --git a/src/world/area_kpa/kpa_134/kpa_134_6_entity.c b/src/world/area_kpa/kpa_134/kpa_134_6_entity.c index 316a8a4488..32108c4c0c 100644 --- a/src/world/area_kpa/kpa_134/kpa_134_6_entity.c +++ b/src/world/area_kpa/kpa_134/kpa_134_6_entity.c @@ -63,9 +63,9 @@ EvtScript N(EVS_UnlockPrompt_Door) = { EVT_END_IF EVT_CALL(RemoveKeyItemAt, LVar1) EVT_SET(GF_KPA134_UnlockedDoor, TRUE) - EVT_CALL(N(GetEntityPosition), MV_Unk_01, LVar0, LVar1, LVar2) + EVT_CALL(N(GetEntityPosition), MV_PadlockEntityID, LVar0, LVar1, LVar2) EVT_CALL(PlaySoundAt, SOUND_269, 0, LVar0, LVar1, LVar2) - EVT_SET(LVar0, MV_Unk_01) + EVT_SET(LVar0, MV_PadlockEntityID) EVT_CALL(N(RemovePadlock)) EVT_SET(LVar1, 0) EVT_WAIT(5) @@ -79,7 +79,7 @@ EvtScript N(EVS_UnlockPrompt_Door) = { EvtScript N(EVS_MakeEntities) = { EVT_IF_EQ(GF_KPA134_UnlockedDoor, FALSE) EVT_CALL(MakeEntity, EVT_PTR(Entity_Padlock), 743, 10, 115, 270, MAKE_ENTITY_END) - EVT_SET(MV_Unk_01, LVar0) + EVT_SET(MV_PadlockEntityID, LVar0) EVT_BIND_PADLOCK(EVT_PTR(N(EVS_UnlockPrompt_Door)), TRIGGER_WALL_PRESS_A, EVT_ENTITY_INDEX(0), EVT_PTR(N(KeyList_BowsersCastle)), 0, 1) EVT_ELSE EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kpa_130_0)), TRIGGER_WALL_PRESS_A, COLLIDER_nno, 1, 0) diff --git a/src/world/area_kpa/kpa_14/A574B0.c b/src/world/area_kpa/kpa_14/A574B0.c deleted file mode 100644 index 552c9b6f10..0000000000 --- a/src/world/area_kpa/kpa_14/A574B0.c +++ /dev/null @@ -1,13 +0,0 @@ -#include "kpa_14.h" - -static char* N(exit_str_0) = "kpa_13"; -static char* N(exit_str_1) = "kpa_01"; -static char* N(exit_str_2) = "kpa_16"; - -s32 N(get_tattle)(void) { - if (!evt_get_variable(NULL, GF_KPA16_ShutOffLava)) { - return MSG_MapTattle_kpa_14_before; - } else { - return MSG_MapTattle_kpa_14_after; - } -} diff --git a/src/world/area_kpa/kpa_14/A574F0.c b/src/world/area_kpa/kpa_14/A574F0.c deleted file mode 100644 index 6f9b3d46e9..0000000000 --- a/src/world/area_kpa/kpa_14/A574F0.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "kpa_14.h" - -#include "world/common/atomic/TexturePan.inc.c" - -ApiStatus func_8024034C_A577FC(Evt* script, s32 isInitialCall) { - if (gPartnerActionStatus.partnerActionState != 0) { - script->varTable[9] = gPartnerActionStatus.actingPartner; - } else { - script->varTable[9] = -1; - } - return ApiStatus_DONE2; -} diff --git a/src/world/area_kpa/kpa_14/A57830.c b/src/world/area_kpa/kpa_14/A57830.c deleted file mode 100644 index a6215417a3..0000000000 --- a/src/world/area_kpa/kpa_14/A57830.c +++ /dev/null @@ -1,55 +0,0 @@ -#include "kpa_14.h" - -#include "world/common/todo/StashVars.inc.c" - -#include "world/common/todo/GetItemName.inc.c" - -#include "world/common/todo/SomeItemEntityFunc.inc.c" - -#include "world/common/todo/IsItemBadge.inc.c" - -#include "world/common/todo/RemovePadlock.inc.c" - -#include "world/common/todo/GetEntityPosition.inc.c" - -ApiStatus N(func_80240710_A57BC0)(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - CollisionStatus* collisionStatus = &gCollisionStatus; - - evt_set_variable(script, *args++, collisionStatus->floorBelow); - return ApiStatus_DONE2; -} - -ApiStatus func_8024073C_A57BEC(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32 xVel = evt_get_variable(script, *args++); - s32 floor = evt_get_variable(script, *args++); - s32 temp_a0 = evt_get_variable(script, *args++); - PlayerStatus* playerStatus = &gPlayerStatus; - - if (gCollisionStatus.currentFloor == floor || gCollisionStatus.lastTouchedFloor == floor) { - if (playerStatus->actionState != ACTION_STATE_TORNADO_JUMP && - playerStatus->actionState != ACTION_STATE_SPIN_JUMP && - temp_a0 == 0) - { - playerStatus->pushVelocity.x = xVel; - } - } - if (gPlayerData.currentPartner != PARTNER_NONE) { - Npc* partner = get_npc_unsafe(NPC_PARTNER); - - if (partner->currentFloor == floor) { - partner->pos.x += xVel; - } - } - return ApiStatus_DONE2; -} - -ApiStatus N(IsPartnerLakilester)(Evt* script, s32 isInitialCall) { - if (gPartnerActionStatus.actingPartner == PARTNER_LAKILESTER) { - script->varTable[9] = TRUE; - } else { - script->varTable[9] = FALSE; - } - return ApiStatus_DONE2; -} diff --git a/src/world/area_kpa/kpa_14/kpa_14.h b/src/world/area_kpa/kpa_14/kpa_14.h index 011d54e8b3..d87766fac3 100644 --- a/src/world/area_kpa/kpa_14/kpa_14.h +++ b/src/world/area_kpa/kpa_14/kpa_14.h @@ -2,8 +2,23 @@ /// @brief Bowser's Castle - Lava Channel 3 #include "common.h" -#include "../kpa.h" #include "message_ids.h" #include "map.h" +#include "../kpa.h" +#include "mapfs/kpa_14_shape.h" +#include "mapfs/kpa_14_hit.h" + +enum { + MV_PadlockEntityID = MapVar(0), + MV_LastFloorBeforeLavaFall = MapVar(10), + MV_TakingLavaFallDamage = MapVar(11), +}; + #define NAMESPACE kpa_14 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_SetupPlatforms); +extern EvtScript N(EVS_ExitDoor_kpa_01_0); +extern EvtScript N(EVS_MakeEntities); diff --git a/src/world/area_kpa/kpa_14/kpa_14_0_header.c b/src/world/area_kpa/kpa_14/kpa_14_0_header.c new file mode 100644 index 0000000000..115f264fec --- /dev/null +++ b/src/world/area_kpa/kpa_14/kpa_14_0_header.c @@ -0,0 +1,22 @@ +#include "kpa_14.h" + +s32 N(get_tattle)(void) { + if (!evt_get_variable(NULL, GF_KPA16_ShutOffLava)) { + return MSG_MapTattle_kpa_14_before; + } else { + return MSG_MapTattle_kpa_14_after; + } +} + +EntryList N(Entrances) = { + [kpa_14_ENTRY_0] { 30.0, 30.0, -150.0, 90.0 }, + [kpa_14_ENTRY_1] { 1990.0, 30.0, -150.0, 270.0 }, + [kpa_14_ENTRY_2] { 1776.0, 0.0, -187.0, 180.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { .get = &N(get_tattle) }, +}; diff --git a/src/world/area_kpa/kpa_14/kpa_14_1_music.c b/src/world/area_kpa/kpa_14/kpa_14_1_music.c new file mode 100644 index 0000000000..f63939fc0c --- /dev/null +++ b/src/world/area_kpa/kpa_14/kpa_14_1_music.c @@ -0,0 +1,17 @@ +#include "kpa_14.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) + EVT_IF_EQ(GF_KPA16_ShutOffLava, FALSE) + EVT_CALL(PlayAmbientSounds, AMBIENT_UNDER_SEA1) + EVT_ELSE + EVT_CALL(ClearAmbientSounds, 250) + EVT_END_IF + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetMusicTrackVolumes, TRACK_VOLS_KPA_1) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_14/kpa_14_2_main.c b/src/world/area_kpa/kpa_14/kpa_14_2_main.c new file mode 100644 index 0000000000..2b0345de3c --- /dev/null +++ b/src/world/area_kpa/kpa_14/kpa_14_2_main.c @@ -0,0 +1,263 @@ +#include "kpa_14.h" +#include "effects.h" + +#include "world/common/atomic/TexturePan.inc.c" +#include "world/common/atomic/TexturePan.data.inc.c" + +API_CALLABLE(N(GetActingPartner)) { + if (gPartnerActionStatus.partnerActionState != 0) { + script->varTable[9] = gPartnerActionStatus.actingPartner; + } else { + script->varTable[9] = -1; + } + return ApiStatus_DONE2; +} + +EvtScript N(EVS_ExitWalk_kpa_13_1) = EVT_EXIT_WALK(60, kpa_14_ENTRY_0, "kpa_13", kpa_13_ENTRY_1); + +EvtScript N(EVS_ExitDoor_kpa_01_0) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET(LVar0, kpa_14_ENTRY_1) + EVT_SET(LVar1, COLLIDER_deilitte) + EVT_IF_EQ(GF_KPA16_ShutOffLava, FALSE) + EVT_SET(LVar2, MODEL_o1035) + EVT_ELSE + EVT_SET(LVar2, MODEL_o1036) + EVT_END_IF + EVT_SET(LVar3, DOOR_SWING_OUT) + EVT_EXEC(ExitSingleDoor) + EVT_WAIT(17) + EVT_CALL(GotoMap, EVT_PTR("kpa_01"), kpa_01_ENTRY_0) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitWalk_kpa_16_0) = EVT_EXIT_WALK(60, kpa_14_ENTRY_2, "kpa_16", kpa_16_ENTRY_0); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_13_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_16_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(kpa_14_ENTRY_0) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_WAIT(1) + EVT_CASE_EQ(kpa_14_ENTRY_1) + EVT_SET(LVar0, kpa_14_ENTRY_1) + EVT_SET(LVar1, COLLIDER_deilitte) + EVT_SET(LVar2, MODEL_o1035) + EVT_SET(LVar3, DOOR_SWING_OUT) + EVT_EXEC(EnterSingleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_EQ(kpa_14_ENTRY_2) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_WAIT(1) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TexPan_Lava) = { + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_0) + TEX_PAN_PARAMS_STEP(-1000, 0,-2000, 0) + TEX_PAN_PARAMS_FREQ( 1, 0, 1, 0) + TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) + EVT_EXEC(N(EVS_UpdateTexturePan)) + EVT_END_THREAD + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_1) + TEX_PAN_PARAMS_STEP( -400, 0, -800, 0) + TEX_PAN_PARAMS_FREQ( 1, 0, 1, 0) + TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) + EVT_EXEC(N(EVS_UpdateTexturePan)) + EVT_END_THREAD + EVT_CALL(SetTexPanner, MODEL_o631, TEX_PANNER_1) + EVT_CALL(SetTexPanner, MODEL_o625, TEX_PANNER_1) + EVT_CALL(SetTexPanner, MODEL_o776, TEX_PANNER_1) + EVT_CALL(SetTexPanner, MODEL_o777, TEX_PANNER_1) + EVT_CALL(SetTexPanner, MODEL_o778, TEX_PANNER_1) + EVT_CALL(SetTexPanner, MODEL_o779, TEX_PANNER_1) + EVT_RETURN + EVT_END +}; + +LavaReset N(SafeFloorColliders)[] = { + { .colliderID = COLLIDER_o202, .pos = { 110.0, 30.0, -135.0 }}, + { .colliderID = COLLIDER_o201, .pos = { 345.0, 30.0, -135.0 }}, + { .colliderID = COLLIDER_o196, .pos = { 550.0, 30.0, -135.0 }}, + { .colliderID = COLLIDER_o197, .pos = { 800.0, 30.0, -135.0 }}, + { .colliderID = COLLIDER_o195, .pos = { 1045.0, 30.0, -135.0 }}, + { .colliderID = COLLIDER_o198, .pos = { 1400.0, 30.0, -135.0 }}, + { .colliderID = COLLIDER_o200, .pos = { 1590.0, 30.0, -90.0 }}, + { .colliderID = COLLIDER_o199, .pos = { 1940.0, 30.0, -135.0 }}, + { .colliderID = -1 } +}; + +EvtScript N(EVS_Touch_LeftOfLavaFall) = { + EVT_SET(MV_LastFloorBeforeLavaFall, COLLIDER_o195) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Touch_RightOfLavaFall) = { + EVT_SET(MV_LastFloorBeforeLavaFall, COLLIDER_o198) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeSmokeEffects) = { + EVT_LOOP(0) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, 1, 10) + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupLavaFall) = { + EVT_SET_GROUP(EVT_GROUP_0B) + EVT_LOOP(0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o854, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(N(GetActingPartner)) + EVT_SWITCH(LVar9) + EVT_CASE_EQ(8) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o854, COLLIDER_FLAGS_UPPER_MASK) + EVT_CASE_EQ(9) + EVT_CASE_DEFAULT + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_IF_LT(LVar1, 120) + EVT_SWITCH(LVar0) + EVT_CASE_RANGE(1200, 1245) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_SET(MV_TakingLavaFallDamage, TRUE) + EVT_CALL(SetPlayerActionState, ACTION_STATE_LAND) + EVT_EXEC_GET_TID(N(EVS_MakeSmokeEffects), LVar9) + EVT_IF_EQ(MV_LastFloorBeforeLavaFall, COLLIDER_o195) + EVT_SET(LVar5, 1045) + EVT_ELSE + EVT_SET(LVar5, 1400) + EVT_END_IF + EVT_WAIT(1) + EVT_CALL(InterruptUsePartner) + EVT_CALL(SetPlayerActionState, ACTION_STATE_HIT_LAVA) + EVT_WAIT(10) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar5, 30, -135) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar5, 30, -135) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(MakeLerp, LVar0, LVar5, 30, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetPlayerPos, LVar0, 250, -135) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(MakeLerp, 250, 30, 20, EASING_QUADRATIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetPlayerPos, LVar5, LVar0, -135) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(SetPlayerAnimation, ANIM_Mario_8001A) + EVT_CALL(MakeLerp, 30, 60, 5, EASING_QUADRATIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetPlayerPos, LVar5, LVar0, -135) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_KILL_THREAD(LVar9) + EVT_CALL(MakeLerp, 60, 30, 5, EASING_QUADRATIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetPlayerPos, LVar5, LVar0, -135) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_WAIT(5) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_WAIT(1) + EVT_SET(MV_TakingLavaFallDamage, FALSE) + EVT_END_SWITCH + EVT_END_IF + EVT_END_SWITCH + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_IF_EQ(GF_KPA16_ShutOffLava, FALSE) + EVT_CALL(EnableGroup, MODEL_after, FALSE) + EVT_EXEC(N(EVS_TexPan_Lava)) + EVT_ELSE + EVT_CALL(EnableGroup, MODEL_before, FALSE) + EVT_END_IF + EVT_EXEC(N(EVS_EnterMap)) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_IF_EQ(GF_KPA16_ShutOffLava, FALSE) + EVT_EXEC(N(EVS_SetupPlatforms)) + EVT_END_IF + EVT_IF_EQ(GF_KPA16_ShutOffLava, FALSE) + EVT_THREAD + EVT_WAIT(2) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o625, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o776, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o818, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o819, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o820, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o821, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o822, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o823, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o824, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o825, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o826, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o827, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o828, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o829, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o830, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o857, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o858, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_deilin, SURFACE_TYPE_LAVA) + EVT_THREAD + EVT_CALL(ResetFromLava, EVT_PTR(N(SafeFloorColliders))) + EVT_END_THREAD + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_Touch_LeftOfLavaFall)), TRIGGER_FLOOR_TOUCH, COLLIDER_o195, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_Touch_RightOfLavaFall)), TRIGGER_FLOOR_TOUCH, COLLIDER_o198, 1, 0) + EVT_EXEC(N(EVS_SetupLavaFall)) + EVT_END_THREAD + EVT_ELSE + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o854, COLLIDER_FLAGS_UPPER_MASK) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_14/kpa_14_3_entity.c b/src/world/area_kpa/kpa_14/kpa_14_3_entity.c new file mode 100644 index 0000000000..0c2f4d809f --- /dev/null +++ b/src/world/area_kpa/kpa_14/kpa_14_3_entity.c @@ -0,0 +1,70 @@ + +#include "kpa_14.h" +#include "entity.h" + +// similar to Chest.inc.c, except a script is missing... +#include "world/common/todo/StashVars.inc.c" +#include "world/common/todo/GetItemName.inc.c" +#include "world/common/todo/SomeItemEntityFunc.inc.c" +#include "world/common/todo/IsItemBadge.inc.c" + +s32** N(varStash) = NULL; + +EvtScript N(EVS_Chest_ShowGotItem) = { + EVT_SET_GROUP(EVT_GROUP_00) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_FULL) + EVT_WAIT(40) + EVT_CALL(ShowGotItem, LVar0, FALSE, 0) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_RETURN + EVT_RETURN + EVT_END +}; + +#include "world/common/todo/RemovePadlock.inc.c" +#include "world/common/todo/GetEntityPosition.inc.c" + +s32 N(KeyList_BowsersCastle)[] = { + ITEM_BOWSER_CASTLE_KEY, + ITEM_NONE +}; + +EvtScript N(EVS_UnlockPrompt_Door) = { + EVT_CALL(ShowKeyChoicePopup) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_00D8, 160, 40) + EVT_CALL(CloseChoicePopup) + EVT_RETURN + EVT_END_IF + EVT_IF_EQ(LVar0, -1) + EVT_CALL(CloseChoicePopup) + EVT_RETURN + EVT_END_IF + EVT_CALL(RemoveKeyItemAt, LVar1) + EVT_SET(GF_KPA14_UnlockedDoor, TRUE) + EVT_CALL(N(GetEntityPosition), MV_PadlockEntityID, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_269, 0, LVar0, LVar1, LVar2) + EVT_SET(LVar0, MV_PadlockEntityID) + EVT_CALL(N(RemovePadlock)) + EVT_SET(LVar1, 0) + EVT_WAIT(5) + EVT_CALL(CloseChoicePopup) + EVT_UNBIND + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoor_kpa_01_0)), TRIGGER_WALL_PRESS_A, COLLIDER_deilitte, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_IF_EQ(GF_KPA14_UnlockedDoor, FALSE) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Padlock), 1995, 40, -162, 270, MAKE_ENTITY_END) + EVT_SET(MV_PadlockEntityID, LVar0) + EVT_BIND_PADLOCK(EVT_PTR(N(EVS_UnlockPrompt_Door)), TRIGGER_WALL_PRESS_A, EVT_ENTITY_INDEX(0), EVT_PTR(N(KeyList_BowsersCastle)), 0, 1) + EVT_ELSE + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoor_kpa_01_0)), TRIGGER_WALL_PRESS_A, COLLIDER_deilitte, 1, 0) + EVT_END_IF + EVT_CALL(MakeItemEntity, ITEM_MYSTERY, 350, 30, -150, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_KPA14_Item_Mystery) + EVT_CALL(MakeItemEntity, ITEM_THUNDER_RAGE, 800, 30, -150, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_KPA14_Item_ThunderRage) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_14/kpa_14_4_platforms.c b/src/world/area_kpa/kpa_14/kpa_14_4_platforms.c new file mode 100644 index 0000000000..d8ca4e7591 --- /dev/null +++ b/src/world/area_kpa/kpa_14/kpa_14_4_platforms.c @@ -0,0 +1,103 @@ + +#include "kpa_14.h" + +API_CALLABLE(N(GetFloorBelow)) { + Bytecode* args = script->ptrReadPos; + s32 outVar = *args++; + + evt_set_variable(script, outVar, gCollisionStatus.floorBelow); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(AddPlatformPushVelocity)) { + Bytecode* args = script->ptrReadPos; + s32 velX = evt_get_variable(script, *args++); + s32 floor = evt_get_variable(script, *args++); + s32 temp_a0 = evt_get_variable(script, *args++); + PlayerStatus* playerStatus = &gPlayerStatus; + + if (gCollisionStatus.currentFloor == floor || gCollisionStatus.lastTouchedFloor == floor) { + if (playerStatus->actionState != ACTION_STATE_TORNADO_JUMP && + playerStatus->actionState != ACTION_STATE_SPIN_JUMP && + temp_a0 == 0) + { + playerStatus->pushVelocity.x = velX; + } + } + if (gPlayerData.currentPartner != PARTNER_NONE) { + Npc* partner = get_npc_unsafe(NPC_PARTNER); + + if (partner->currentFloor == floor) { + partner->pos.x += velX; + } + } + return ApiStatus_DONE2; +} + +API_CALLABLE(N(IsPartnerLakilester)) { + if (gPartnerActionStatus.actingPartner == PARTNER_LAKILESTER) { + script->varTable[9] = TRUE; + } else { + script->varTable[9] = FALSE; + } + return ApiStatus_DONE2; +} + +EvtScript N(EVS_SetupPlatforms) = { + EVT_SET_GROUP(EVT_GROUP_0B) + EVT_CALL(ParentColliderToModel, COLLIDER_o852, MODEL_o860) + EVT_SET(LVar0, 0) + EVT_SET(LVar3, 0) + EVT_LOOP(0) + EVT_CALL(MakeLerp, LVar0, 175, 175, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, MODEL_dai01, LVar0, 0, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_o852) + EVT_SET(LVar4, LVar0) + EVT_SUB(LVar4, LVar3) + EVT_SET(LVar3, LVar0) + EVT_CALL(N(AddPlatformPushVelocity), LVar4, COLLIDER_o852, MV_TakingLavaFallDamage) + EVT_IF_GT(LVar0, 145) + EVT_CALL(N(IsPartnerLakilester)) + EVT_IF_EQ(LVar9, 1) + EVT_CALL(N(GetFloorBelow), LVar2) + EVT_IF_EQ(LVar2, COLLIDER_o858) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_IF + EVT_END_IF + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_WAIT(20) + EVT_CALL(MakeLerp, LVar0, 0, 175, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, MODEL_dai01, LVar0, 0, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_o852) + EVT_SET(LVar4, LVar0) + EVT_SUB(LVar4, LVar3) + EVT_SET(LVar3, LVar0) + EVT_CALL(N(AddPlatformPushVelocity), LVar4, COLLIDER_o852, MV_TakingLavaFallDamage) + EVT_IF_LT(LVar0, 30) + EVT_CALL(N(IsPartnerLakilester)) + EVT_IF_EQ(LVar9, 1) + EVT_CALL(N(GetFloorBelow), LVar2) + EVT_IF_EQ(LVar2, COLLIDER_o857) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_IF + EVT_END_IF + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_WAIT(20) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_15/A59390.c b/src/world/area_kpa/kpa_15/A59390.c deleted file mode 100644 index 4f7f1b803b..0000000000 --- a/src/world/area_kpa/kpa_15/A59390.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "kpa_15.h" - -static char* N(exit_str_0) = "kpa_13"; -static char* N(exit_str_1) = ""; - -#include "world/common/atomic/TexturePan.inc.c" - diff --git a/src/world/area_kpa/kpa_15/A596A0.c b/src/world/area_kpa/kpa_15/A596A0.c deleted file mode 100644 index 5268e40e9d..0000000000 --- a/src/world/area_kpa/kpa_15/A596A0.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "kpa_15.h" - -#include "world/common/todo/StashVars.inc.c" - -#include "world/common/todo/GetItemName.inc.c" - -#include "world/common/todo/SomeItemEntityFunc.inc.c" - -#include "world/common/todo/IsItemBadge.inc.c" diff --git a/src/world/area_kpa/kpa_15/kpa_15.h b/src/world/area_kpa/kpa_15/kpa_15.h index 496c01ff8a..32e027a588 100644 --- a/src/world/area_kpa/kpa_15/kpa_15.h +++ b/src/world/area_kpa/kpa_15/kpa_15.h @@ -2,8 +2,15 @@ /// @brief Bowser's Castle - Lava Key Room #include "common.h" -#include "../kpa.h" #include "message_ids.h" #include "map.h" +#include "../kpa.h" +#include "mapfs/kpa_15_shape.h" +#include "mapfs/kpa_15_hit.h" + #define NAMESPACE kpa_15 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_MakeEntities); diff --git a/src/world/area_kpa/kpa_15/kpa_15_0_header.c b/src/world/area_kpa/kpa_15/kpa_15_0_header.c new file mode 100644 index 0000000000..f26f8781c5 --- /dev/null +++ b/src/world/area_kpa/kpa_15/kpa_15_0_header.c @@ -0,0 +1,12 @@ +#include "kpa_15.h" + +EntryList N(Entrances) = { + [kpa_15_ENTRY_0] { 12.0, 0.0, -97.0, 90.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_kpa_15 }, +}; diff --git a/src/world/area_kpa/kpa_15/kpa_15_1_music.c b/src/world/area_kpa/kpa_15/kpa_15_1_music.c new file mode 100644 index 0000000000..7690335766 --- /dev/null +++ b/src/world/area_kpa/kpa_15/kpa_15_1_music.c @@ -0,0 +1,15 @@ +#include "kpa_15.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) + EVT_IF_EQ(GF_KPA16_ShutOffLava, FALSE) + EVT_CALL(PlayAmbientSounds, AMBIENT_UNDER_SEA1) + EVT_END_IF + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetMusicTrackVolumes, TRACK_VOLS_KPA_1) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_15/kpa_15_2_main.c b/src/world/area_kpa/kpa_15/kpa_15_2_main.c new file mode 100644 index 0000000000..831a630027 --- /dev/null +++ b/src/world/area_kpa/kpa_15/kpa_15_2_main.c @@ -0,0 +1,58 @@ +#include "kpa_15.h" + +#include "world/common/atomic/TexturePan.inc.c" +#include "world/common/atomic/TexturePan.data.inc.c" + +EvtScript N(D_8024074C_A59ADC) = EVT_EXIT_WALK(40, kpa_15_ENTRY_0, "kpa_13", kpa_13_ENTRY_2); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(D_8024074C_A59ADC)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_802407D4_A59B64) = { + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80240800_A59B90) = { + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_0) + TEX_PAN_PARAMS_STEP( -400, 0, -800, 0) + TEX_PAN_PARAMS_FREQ( 1, 0, 1, 0) + TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) + EVT_EXEC(N(EVS_UpdateTexturePan)) + EVT_END_THREAD + EVT_CALL(SetTexPanner, MODEL_o811, 0) + EVT_CALL(SetTexPanner, MODEL_o813, 0) + EVT_CALL(SetTexPanner, MODEL_o814, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_IF_EQ(GF_KPA16_ShutOffLava, FALSE) + EVT_CALL(EnableGroup, MODEL_after, FALSE) + EVT_EXEC(N(D_80240800_A59B90)) + EVT_ELSE + EVT_CALL(EnableGroup, MODEL_before, FALSE) + EVT_END_IF + EVT_EXEC(N(D_802407D4_A59B64)) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_IF_EQ(GF_KPA16_ShutOffLava, FALSE) + EVT_THREAD + EVT_WAIT(2) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o781, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_deiliw, SURFACE_TYPE_LAVA) + EVT_END_THREAD + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_15/kpa_15_3_entity.c b/src/world/area_kpa/kpa_15/kpa_15_3_entity.c new file mode 100644 index 0000000000..212118b6d7 --- /dev/null +++ b/src/world/area_kpa/kpa_15/kpa_15_3_entity.c @@ -0,0 +1,15 @@ +#include "kpa_15.h" +#include "entity.h" + +#include "world/common/atomic/Chest.inc.c" + +EvtScript N(EVS_OpenChest_CastleKey) = EVT_OPEN_CHEST_KEY(ITEM_BOWSER_CASTLE_KEY, GF_KPA15_Chest_CastleKey2); + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_Chest), 220, 30, -100, 0, 0, MAKE_ENTITY_END) + EVT_CALL(AssignChestFlag, GF_KPA15_Chest_CastleKey2) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_OpenChest_CastleKey))) + EVT_RETURN + EVT_END +}; + diff --git a/src/world/area_kpa/kpa_16/A5A030.c b/src/world/area_kpa/kpa_16/A5A030.c deleted file mode 100644 index 7419f5abef..0000000000 --- a/src/world/area_kpa/kpa_16/A5A030.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "kpa_16.h" - -static char* N(exit_str_0) = "kpa_14"; -static char* N(exit_str_1) = ""; - -#include "world/common/atomic/TexturePan.inc.c" - diff --git a/src/world/area_kpa/kpa_16/A5A340.c b/src/world/area_kpa/kpa_16/A5A340.c deleted file mode 100644 index 347be49545..0000000000 --- a/src/world/area_kpa/kpa_16/A5A340.c +++ /dev/null @@ -1,16 +0,0 @@ -#include "kpa_16.h" - -ApiStatus func_80240310_A5A340(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - f32 zoom = evt_get_variable(script, *args++); - - set_screen_overlay_params_front(0, zoom); - return ApiStatus_DONE2; -} - -ApiStatus func_8024034C_A5A37C(Evt* script, s32 isInitialCall) { - snd_ambient_80055618(0, 1); - return ApiStatus_DONE2; -} - -#include "world/common/todo/GetFloorCollider.inc.c" diff --git a/src/world/area_kpa/kpa_16/kpa_16.h b/src/world/area_kpa/kpa_16/kpa_16.h index 659db3da28..fb6f0e416a 100644 --- a/src/world/area_kpa/kpa_16/kpa_16.h +++ b/src/world/area_kpa/kpa_16/kpa_16.h @@ -2,8 +2,35 @@ /// @brief Bowser's Castle - Lava Control Room #include "common.h" -#include "../kpa.h" #include "message_ids.h" #include "map.h" +#include "../kpa.h" +#include "mapfs/kpa_16_shape.h" +#include "mapfs/kpa_16_hit.h" + +#include "sprite/npc/WorldGoombario.h" +#include "sprite/npc/WorldKooper.h" +#include "sprite/npc/WorldBombette.h" +#include "sprite/npc/WorldParakarry.h" +#include "sprite/npc/WorldBow.h" +#include "sprite/npc/WorldWatt.h" +#include "sprite/npc/WorldSushie.h" +#include "sprite/npc/WorldLakilester.h" +#include "sprite/npc/WorldKoopatrol.h" +#include "sprite/npc/Magikoopa.h" + +enum { + NPC_Koopatrol_01 = 0, + NPC_Koopatrol_02 = 1, + NPC_Koopatrol_03 = 2, + NPC_Magikoopa = 3, +}; + #define NAMESPACE kpa_16 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_TexPan_Steam); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_kpa/kpa_16/kpa_16_0_header.c b/src/world/area_kpa/kpa_16/kpa_16_0_header.c new file mode 100644 index 0000000000..085987f864 --- /dev/null +++ b/src/world/area_kpa/kpa_16/kpa_16_0_header.c @@ -0,0 +1,12 @@ +#include "kpa_16.h" + +EntryList N(Entrances) = { + [kpa_16_ENTRY_0] { 25.0, 0.0, -92.0, 90.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_kpa_16 }, +}; diff --git a/src/world/area_kpa/kpa_16/kpa_16_1_music.c b/src/world/area_kpa/kpa_16/kpa_16_1_music.c new file mode 100644 index 0000000000..2ecfd8ed87 --- /dev/null +++ b/src/world/area_kpa/kpa_16/kpa_16_1_music.c @@ -0,0 +1,15 @@ +#include "kpa_16.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_IF_EQ(GF_KPA16_ShutOffLava, FALSE) + EVT_CALL(PlayAmbientSounds, AMBIENT_UNDER_SEA6) + EVT_END_IF + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetMusicTrackVolumes, TRACK_VOLS_KPA_1) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_16/kpa_16_2_main.c b/src/world/area_kpa/kpa_16/kpa_16_2_main.c new file mode 100644 index 0000000000..0a826c1e80 --- /dev/null +++ b/src/world/area_kpa/kpa_16/kpa_16_2_main.c @@ -0,0 +1,148 @@ +#include "kpa_16.h" + +#include "world/common/atomic/TexturePan.inc.c" +#include "world/common/atomic/TexturePan.data.inc.c" + +EvtScript N(EVS_ExitWalk_kpa_14_2) = EVT_EXIT_WALK(40, kpa_16_ENTRY_0, "kpa_14", kpa_14_ENTRY_2); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_14_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TexPan_Steam) = { + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_2) + TEX_PAN_PARAMS_STEP( 0, 400, 0, 800) + TEX_PAN_PARAMS_FREQ( 0, 1, 0, 1) + TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) + EVT_EXEC(N(EVS_UpdateTexturePan)) + EVT_END_THREAD + EVT_CALL(SetTexPanner, MODEL_o1157, TEX_PANNER_2) + EVT_CALL(SetTexPanner, MODEL_o1158, TEX_PANNER_2) + EVT_CALL(SetTexPanner, MODEL_o1159, TEX_PANNER_2) + EVT_CALL(SetTexPanner, MODEL_o1160, TEX_PANNER_2) + EVT_CALL(SetTexPanner, MODEL_o1162, TEX_PANNER_2) + EVT_CALL(SetTexPanner, MODEL_o1163, TEX_PANNER_2) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TexPan_Lava) = { + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_0) + TEX_PAN_PARAMS_STEP(-1200, 0, -600, 0) + TEX_PAN_PARAMS_FREQ( 1, 0, 1, 0) + TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) + EVT_EXEC(N(EVS_UpdateTexturePan)) + EVT_END_THREAD + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_1) + TEX_PAN_PARAMS_STEP( 6144, 0, 0, 0) + TEX_PAN_PARAMS_FREQ( 1, 0, 0, 0) + TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) + EVT_EXEC(N(EVS_UpdateTexturePan)) + EVT_END_THREAD + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_2) + TEX_PAN_PARAMS_STEP( -800, 0, -400, 0) + TEX_PAN_PARAMS_FREQ( 1, 0, 1, 0) + TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) + EVT_EXEC(N(EVS_UpdateTexturePan)) + EVT_END_THREAD + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_3) + TEX_PAN_PARAMS_STEP( 0, 3000, 0, 0) + TEX_PAN_PARAMS_FREQ( 0, 1, 0, 0) + TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) + EVT_EXEC(N(EVS_UpdateTexturePan)) + EVT_END_THREAD + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_4) + TEX_PAN_PARAMS_STEP( 0, 3200, 0, 0) + TEX_PAN_PARAMS_FREQ( 0, 1, 0, 0) + TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) + EVT_EXEC(N(EVS_UpdateTexturePan)) + EVT_END_THREAD + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_5) + TEX_PAN_PARAMS_STEP( 0, 2800, 0, 0) + TEX_PAN_PARAMS_FREQ( 0, 1, 0, 0) + TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) + EVT_EXEC(N(EVS_UpdateTexturePan)) + EVT_END_THREAD + EVT_CALL(SetTexPanner, MODEL_o1282, TEX_PANNER_0) + EVT_CALL(SetTexPanner, MODEL_o1283, TEX_PANNER_0) + EVT_CALL(SetTexPanner, MODEL_o1284, TEX_PANNER_1) + EVT_CALL(SetTexPanner, MODEL_o1285, TEX_PANNER_1) + EVT_CALL(SetTexPanner, MODEL_o1286, TEX_PANNER_1) + EVT_CALL(SetTexPanner, MODEL_o776, TEX_PANNER_2) + EVT_CALL(SetTexPanner, MODEL_o782, TEX_PANNER_2) + EVT_CALL(SetTexPanner, MODEL_o780, TEX_PANNER_2) + EVT_CALL(SetTexPanner, MODEL_o893, TEX_PANNER_2) + EVT_CALL(SetTexPanner, MODEL_o895, TEX_PANNER_2) + EVT_CALL(SetTexPanner, MODEL_o894, TEX_PANNER_2) + EVT_CALL(SetTexPanner, MODEL_o892, TEX_PANNER_2) + EVT_CALL(SetTexPanner, MODEL_o1331, TEX_PANNER_3) + EVT_CALL(SetTexPanner, MODEL_o1316, TEX_PANNER_4) + EVT_CALL(SetTexPanner, MODEL_o1321, TEX_PANNER_5) + EVT_CALL(SetTexPanner, MODEL_o1320, TEX_PANNER_5) + EVT_RETURN + EVT_END +}; + +LavaReset N(SafeFloorColliders)[] = { + { .colliderID = COLLIDER_o197, .pos = { 470.0, 30.0, -30.0 }}, + { .colliderID = COLLIDER_o202, .pos = { 470.0, 30.0, -30.0 }}, + { .colliderID = COLLIDER_o785, .pos = { 500.0, 230.0, -140.0 }}, + { .colliderID = -1 } +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_IF_EQ(GF_KPA16_Defeated_SwitchGuards, TRUE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o958, COLLIDER_FLAGS_UPPER_MASK) + EVT_END_IF + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_IF_EQ(GF_KPA16_ShutOffLava, FALSE) + EVT_CALL(EnableGroup, MODEL_after, FALSE) + EVT_EXEC(N(EVS_TexPan_Lava)) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o954, COLLIDER_FLAGS_UPPER_MASK) + EVT_ELSE + EVT_CALL(EnableGroup, MODEL_before, FALSE) + EVT_EXEC(N(EVS_TexPan_Steam)) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o782, COLLIDER_FLAGS_UPPER_MASK) + EVT_END_IF + EVT_EXEC(N(EVS_EnterMap)) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_IF_EQ(GF_KPA16_ShutOffLava, FALSE) + EVT_THREAD + EVT_WAIT(2) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o782, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o929, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o930, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o776, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o952, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o954, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_deiliw, SURFACE_TYPE_LAVA) + EVT_THREAD + EVT_CALL(ResetFromLava, EVT_PTR(N(SafeFloorColliders))) + EVT_END_THREAD + EVT_END_THREAD + EVT_ELSE + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o952, COLLIDER_FLAGS_UPPER_MASK) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_16/kpa_16_3_entity.c b/src/world/area_kpa/kpa_16/kpa_16_3_entity.c new file mode 100644 index 0000000000..7577a6a907 --- /dev/null +++ b/src/world/area_kpa/kpa_16/kpa_16_3_entity.c @@ -0,0 +1,11 @@ +#include "kpa_16.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_IF_EQ(GF_KPA16_ShutOffLava, FALSE) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BlueSwitch), 470, 230, -145, 0, MAKE_ENTITY_END) + EVT_CALL(AssignSwitchFlag, EVT_INDEX_OF_AREA_FLAG(AF_KPA16_HitSwitch)) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_16/kpa_16_4_npc.c b/src/world/area_kpa/kpa_16/kpa_16_4_npc.c new file mode 100644 index 0000000000..0091aae2a3 --- /dev/null +++ b/src/world/area_kpa/kpa_16/kpa_16_4_npc.c @@ -0,0 +1,332 @@ +#include "kpa_16.h" + +#include "world/common/enemy/complete/Koopatrol.h" +#include "world/common/enemy/complete/Magikoopa.h" + +API_CALLABLE(N(SetScreenBlackFadeAmount)) { + Bytecode* args = script->ptrReadPos; + f32 amount = evt_get_variable(script, *args++); + + set_screen_overlay_params_front(0, amount); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(MuteAmbience)) { + snd_ambient_80055618(0, 1); + return ApiStatus_DONE2; +} + +#include "world/common/todo/GetFloorCollider.inc.c" + +NpcSettings N(NpcSettings_Dummy) = { + .height = 40, + .radius = 24, + .level = 25, +}; + +EvtScript N(EVS_Scene_LavaShutoff) = { + EVT_LABEL(0) + EVT_IF_EQ(AF_KPA16_HitSwitch, FALSE) + EVT_WAIT(1) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(DisablePlayerInput, TRUE) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetPlayerActionState, LVar0) + EVT_IF_EQ(LVar0, ACTION_STATE_IDLE) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_WAIT(1) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(350.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 330, 230, -150) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(1) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 330, 170, -150) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_THREAD + EVT_CALL(N(MuteAmbience)) + EVT_SETF(LVar2, 1) + EVT_CALL(MakeLerp, 0, -20, 100, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_ADDF(LVar2, EVT_FLOAT(-0.01)) + EVT_CALL(TranslateModel, MODEL_o1283, 0, LVar0, 0) + EVT_CALL(TranslateModel, MODEL_o1282, 0, LVar0, 0) + EVT_CALL(ScaleModel, MODEL_o1282, LVar2, 1, 1) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_WAIT(50) + EVT_CALL(MakeLerp, 0, 255, 50, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(N(SetScreenBlackFadeAmount), LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o782, 0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o929, 0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o930, 0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o776, 0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o952, 0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o954, 0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_deiliw, 0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o952, COLLIDER_FLAGS_UPPER_MASK) + EVT_EXEC(N(EVS_TexPan_Steam)) + EVT_CALL(EnableGroup, MODEL_before, FALSE) + EVT_CALL(EnableGroup, MODEL_after, TRUE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o782, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o954, COLLIDER_FLAGS_UPPER_MASK) + EVT_SET(GF_KPA16_ShutOffLava, TRUE) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(MakeLerp, 255, 0, 50, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(N(SetScreenBlackFadeAmount), LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_WAIT(60) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(GetCurrentPartnerID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(PARTNER_GOOMBARIO) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 0, MSG_CH8_001B) + EVT_CASE_EQ(PARTNER_KOOPER) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldKooper_Talk, ANIM_WorldKooper_Idle, 0, MSG_CH8_001C) + EVT_CASE_EQ(PARTNER_BOMBETTE) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldBombette_Talk, ANIM_WorldBombette_Idle, 0, MSG_CH8_001D) + EVT_CASE_EQ(PARTNER_PARAKARRY) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldParakarry_Talk, ANIM_WorldParakarry_Idle, 0, MSG_CH8_001E) + EVT_CASE_EQ(PARTNER_BOW) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldBow_Talk, ANIM_WorldBow_Idle, 0, MSG_CH8_001F) + EVT_CASE_EQ(PARTNER_WATT) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldWatt_Talk, ANIM_WorldWatt_Idle, 0, MSG_CH8_0020) + EVT_CASE_EQ(PARTNER_SUSHIE) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldSushie_Talk, ANIM_WorldSushie_Idle, 0, MSG_CH8_0021) + EVT_CASE_EQ(PARTNER_LAKILESTER) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldLakilester_Talk, ANIM_WorldLakilester_Idle, 0, MSG_CH8_0022) + EVT_END_SWITCH + EVT_CALL(EnablePartnerAI) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ChargeAtPlayer) = { + EVT_CHILD_THREAD + EVT_WAIT(15) + EVT_CALL(SetNpcSpeed, NPC_Koopatrol_01, EVT_FLOAT(3.0)) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_01, 650, -145, 0) + EVT_END_CHILD_THREAD + EVT_CHILD_THREAD + EVT_WAIT(10) + EVT_CALL(SetNpcSpeed, NPC_Koopatrol_03, EVT_FLOAT(3.5)) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_03, 650, -165, 0) + EVT_END_CHILD_THREAD + EVT_WAIT(5) + EVT_CALL(SetNpcSpeed, NPC_Koopatrol_02, EVT_FLOAT(4.0)) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_02, 650, -120, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Guards) = { + EVT_LABEL(0) + EVT_WAIT(1) + EVT_CALL(N(GetFloorCollider), LVar0) + EVT_IF_NE(LVar0, COLLIDER_o785) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_IF_LT(LVar1, 230) + EVT_GOTO(0) + EVT_END_IF + EVT_IF_GT(LVar0, 710) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(PlaySoundAtNpc, NPC_Koopatrol_01, SOUND_262, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Koopatrol_02, SOUND_262, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Koopatrol_03, SOUND_262, 0) + EVT_CALL(ShowEmote, NPC_Koopatrol_01, EMOTE_EXCLAMATION, 0, 15, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_Koopatrol_02, EMOTE_EXCLAMATION, 0, 15, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_Koopatrol_03, EMOTE_EXCLAMATION, 0, 15, TRUE, 0, 0, 0, 0) + EVT_WAIT(15) + EVT_CALL(InterpNpcYaw, NPC_Koopatrol_01, 90, 0) + EVT_CALL(InterpNpcYaw, NPC_Koopatrol_02, 90, 0) + EVT_CALL(InterpNpcYaw, NPC_Koopatrol_03, 90, 0) + EVT_CALL(InterpNpcYaw, NPC_Magikoopa, 90, 0) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim06) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_02, ANIM_WorldKoopatrol_Anim06) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_03, ANIM_WorldKoopatrol_Anim06) + EVT_WAIT(10) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 555, 230, -150) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 555, 230, -150) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(300.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(10.0), EVT_FLOAT(-10.0)) + 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_THREAD + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) + EVT_CALL(PlayerMoveTo, 680, -145, 0) + EVT_CALL(InterpPlayerYaw, 270, 0) + EVT_END_THREAD + EVT_CALL(SetSelfVar, 0, 0) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_02, ANIM_WorldKoopatrol_Anim06) + EVT_CALL(SetNpcSpeed, NPC_Koopatrol_02, EVT_FLOAT(4.0)) + EVT_LABEL(10) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_02, 550, -165, 0) + EVT_WAIT(5) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_02, 510, -165, 0) + EVT_WAIT(5) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(NpcMoveTo, NPC_Koopatrol_02, 535, -165, 0) + EVT_CALL(SetSelfVar, 0, 2) + EVT_END_THREAD + EVT_CALL(InterpNpcYaw, NPC_Koopatrol_01, 270, 0) + EVT_CALL(SpeakToPlayer, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim06, ANIM_WorldKoopatrol_Anim06, 1, MSG_CH8_0017) + EVT_THREAD + EVT_WAIT(5) + EVT_CALL(SetNpcJumpscale, NPC_Koopatrol_03, EVT_FLOAT(1.0)) + EVT_CALL(GetNpcPos, NPC_Koopatrol_03, LVar0, LVar1, LVar2) + EVT_CALL(NpcJump0, NPC_Koopatrol_03, LVar0, LVar1, LVar2, 20) + EVT_END_THREAD + EVT_CALL(SpeakToPlayer, NPC_Koopatrol_03, ANIM_WorldKoopatrol_Anim06, ANIM_WorldKoopatrol_Anim06, 0, MSG_CH8_0018) + EVT_CALL(SetSelfVar, 0, 1) + EVT_LABEL(15) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_IF_EQ(LVar0, 1) + EVT_WAIT(1) + EVT_GOTO(15) + EVT_END_IF + EVT_CALL(InterpNpcYaw, NPC_Koopatrol_02, 270, 0) + EVT_CALL(InterpNpcYaw, NPC_Koopatrol_03, 270, 0) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim01) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_02, ANIM_WorldKoopatrol_Anim01) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_03, ANIM_WorldKoopatrol_Anim01) + EVT_CALL(SpeakToPlayer, NPC_Magikoopa, ANIM_Magikoopa_Anim02, ANIM_Magikoopa_Anim01, 0, MSG_CH8_0019) + EVT_THREAD + EVT_WAIT(15) + EVT_CALL(InterpNpcYaw, NPC_Koopatrol_03, 90, 0) + EVT_WAIT(10) + EVT_CALL(InterpNpcYaw, NPC_Koopatrol_01, 90, 0) + EVT_END_THREAD + EVT_CALL(SpeakToPlayer, NPC_Koopatrol_02, ANIM_WorldKoopatrol_Anim08, ANIM_WorldKoopatrol_Anim01, 0, MSG_CH8_001A) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim06) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_02, ANIM_WorldKoopatrol_Anim06) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_03, ANIM_WorldKoopatrol_Anim06) + EVT_EXEC(N(EVS_ChargeAtPlayer)) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_THREAD + EVT_LOOP(0) + EVT_WAIT(1) + EVT_IF_EQ(GF_KPA16_Defeated_SwitchGuards, TRUE) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_WAIT(30) + EVT_CALL(SetNpcPos, NPC_Koopatrol_01, NPC_DISPOSE_LOCATION) + EVT_CALL(SetNpcPos, NPC_Koopatrol_02, NPC_DISPOSE_LOCATION) + EVT_CALL(SetNpcPos, NPC_Koopatrol_03, NPC_DISPOSE_LOCATION) + EVT_CALL(SetNpcPos, NPC_Magikoopa, NPC_DISPOSE_LOCATION) + EVT_END_THREAD + EVT_CALL(StartBossBattle, SONG_SPECIAL_BATTLE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcDefeat_Guards) = { + EVT_CALL(GetBattleOutcome, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(OUTCOME_PLAYER_WON) + EVT_SET(GF_KPA16_Defeated_SwitchGuards, TRUE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o958, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(DoNpcDefeat) + EVT_CASE_EQ(OUTCOME_PLAYER_LOST) + EVT_CASE_EQ(OUTCOME_PLAYER_FLED) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Guards) = { + EVT_IF_EQ(GF_KPA16_ShutOffLava, FALSE) + EVT_EXEC(N(EVS_Scene_LavaShutoff)) + EVT_END_IF + EVT_IF_EQ(GF_KPA16_Defeated_SwitchGuards, FALSE) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Guards))) + EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_Guards))) + EVT_ELSE + EVT_CALL(RemoveNpc, NPC_Magikoopa) + EVT_CALL(RemoveNpc, NPC_Koopatrol_02) + EVT_CALL(RemoveNpc, NPC_Koopatrol_03) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_Guards)[] = { + { + .id = NPC_Koopatrol_01, + .settings = &N(NpcSettings_Dummy), + .pos = { 585.0f, 230.0f, -145.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000, + .init = &N(EVS_NpcInit_Guards), + .drops = KOOPATROL_DROPS, + .animations = KOOPATROL_ANIMS, + }, + { + .id = NPC_Koopatrol_02, + .settings = &N(NpcSettings_Dummy), + .pos = { 525.0f, 230.0f, -165.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000, + .drops = KOOPATROL_DROPS, + .animations = KOOPATROL_ANIMS, + }, + { + .id = NPC_Koopatrol_03, + .settings = &N(NpcSettings_Dummy), + .pos = { 550.0f, 230.0f, -120.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000, + .drops = KOOPATROL_DROPS, + .animations = KOOPATROL_ANIMS, + }, + { + .id = NPC_Magikoopa, + .settings = &N(NpcSettings_Dummy), + .pos = { 505.0f, 230.0f, -120.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000, + .drops = MAGIKOOPA_DROPS, + .animations = MAGIKOOPA_ANIMS, + }, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Guards), BTL_KPA_FORMATION_1D, BTL_KPA_STAGE_02), + {} +}; diff --git a/src/world/area_kpa/kpa_17/A5CA20.c b/src/world/area_kpa/kpa_17/A5CA20.c deleted file mode 100644 index abc2341711..0000000000 --- a/src/world/area_kpa/kpa_17/A5CA20.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "kpa_17.h" - -static char* N(exit_str_0) = "kpa_10"; -static char* N(exit_str_1) = "kpa_11"; diff --git a/src/world/area_kpa/kpa_17/kpa_17.h b/src/world/area_kpa/kpa_17/kpa_17.h index 7e30b70175..b6daa4f915 100644 --- a/src/world/area_kpa/kpa_17/kpa_17.h +++ b/src/world/area_kpa/kpa_17/kpa_17.h @@ -2,8 +2,30 @@ /// @brief Bowser's Castle - Lower Jail #include "common.h" -#include "../kpa.h" #include "message_ids.h" #include "map.h" +#include "../kpa.h" +#include "mapfs/kpa_17_shape.h" +#include "mapfs/kpa_17_hit.h" + +#include "sprite/npc/WorldBombette.h" +#include "sprite/npc/Toad.h" +#include "sprite/npc/ToadMinister.h" +#include "sprite/npc/ToadGuard.h" + +enum { + NPC_Toad_01 = 0, + NPC_Toad_02 = 1, + NPC_ToadGuard = 2, + NPC_ToadMinister = 3, +}; + #define NAMESPACE kpa_17 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_BlastWall); +extern EvtScript N(EVS_Scene_FallIntoCell); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_kpa/kpa_17/kpa_17_0_header.c b/src/world/area_kpa/kpa_17/kpa_17_0_header.c new file mode 100644 index 0000000000..3673281c7c --- /dev/null +++ b/src/world/area_kpa/kpa_17/kpa_17_0_header.c @@ -0,0 +1,13 @@ +#include "kpa_17.h" + +EntryList N(Entrances) = { + [kpa_17_ENTRY_0] { 1042.0, 250.0, -496.0, 90.0 }, + [kpa_17_ENTRY_1] { 1168.0, 30.0, -560.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_kpa_17 }, +}; diff --git a/src/world/area_kpa/kpa_17/kpa_17_1_music.c b/src/world/area_kpa/kpa_17/kpa_17_1_music.c new file mode 100644 index 0000000000..40a5488df8 --- /dev/null +++ b/src/world/area_kpa/kpa_17/kpa_17_1_music.c @@ -0,0 +1,13 @@ +#include "kpa_17.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) + EVT_CALL(ClearAmbientSounds, 250) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetMusicTrackVolumes, TRACK_VOLS_KPA_1) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_17/kpa_17_2_entity.c b/src/world/area_kpa/kpa_17/kpa_17_2_entity.c new file mode 100644 index 0000000000..438061a7de --- /dev/null +++ b/src/world/area_kpa/kpa_17/kpa_17_2_entity.c @@ -0,0 +1,13 @@ +#include "kpa_17.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_HeartBlock), 1000, 90, -575, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_WoodenCrate), 820, 60, -565, 0, -1, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_WoodenCrate), 820, 30, -565, 0, ITEM_TASTY_TONIC, MAKE_ENTITY_END) + EVT_CALL(AssignCrateFlag, GF_KPA17_Crate_TastyTonic) + EVT_CALL(MakeEntity, EVT_PTR(Entity_WoodenCrate), 855, 30, -565, 0, ITEM_LIFE_SHROOM, MAKE_ENTITY_END) + EVT_CALL(AssignCrateFlag, GF_KPA17_Crate_LifeShroom) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_17/kpa_17_3_main.c b/src/world/area_kpa/kpa_17/kpa_17_3_main.c new file mode 100644 index 0000000000..f57468242c --- /dev/null +++ b/src/world/area_kpa/kpa_17/kpa_17_3_main.c @@ -0,0 +1,61 @@ +#include "kpa_17.h" + +EvtScript N(EVS_ExitWalk_kpa_1X_2) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(UseExitHeading, 60, kpa_17_ENTRY_1) + EVT_EXEC(ExitWalk) + EVT_IF_EQ(GF_KPA16_ShutOffLava, FALSE) + EVT_CALL(GotoMap, EVT_PTR("kpa_11"), kpa_11_ENTRY_2) + EVT_ELSE + EVT_CALL(GotoMap, EVT_PTR("kpa_10"), kpa_10_ENTRY_2) + EVT_END_IF + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_1X_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, kpa_17_ENTRY_0) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_EXEC(N(EVS_Scene_FallIntoCell)) + EVT_ELSE + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +BombTrigger N(BombPos_Wall) = { + .pos = { 1186.0f, 30.0f, -562.0f }, + .radius = 0.0f +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) + EVT_SET(AB_KPA17_Toad1_Dialogue, 0) + EVT_SET(AB_KPA17_Toad2_Dialogue, 0) + EVT_SET(AB_KPA17_Toad3_Dialogue, 0) + EVT_SET(AB_KPA17_Toad4_Dialogue, 0) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_ALT_NO_LEAD() + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_IF_EQ(GF_KPA17_BombedWall, FALSE) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_BlastWall)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Wall)), 1, 0) + EVT_ELSE + EVT_CALL(SetGroupEnabled, MODEL_g296, 0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilitte, COLLIDER_FLAGS_UPPER_MASK) + EVT_END_IF + EVT_EXEC(N(EVS_SetupMusic)) + EVT_EXEC(N(EVS_EnterMap)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_17/kpa_17_4_npc.c b/src/world/area_kpa/kpa_17/kpa_17_4_npc.c new file mode 100644 index 0000000000..47e7ad39ec --- /dev/null +++ b/src/world/area_kpa/kpa_17/kpa_17_4_npc.c @@ -0,0 +1,257 @@ +#include "kpa_17.h" +#include "effects.h" + +#include "world/common/npc/Toad_Stationary.inc.c" + +EvtScript N(EVS_Scene_FallIntoCell) = { + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 1042, 30, -496) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 1042, 30, -496) + 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(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(InterpPlayerYaw, 270, 0) + EVT_WAIT(60) + EVT_CALL(PartnerIsFlying, LVar0) + EVT_IF_EQ(LVar0, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, TRUE) + EVT_ELSE + EVT_CALL(func_802CF56C, 1) + EVT_END_IF + EVT_CALL(PlaySoundAtPlayer, SOUND_161, 0) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_80018) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_LOOP(0) + EVT_SUB(LVar1, 16) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_IF_LE(LVar1, 30) + EVT_CALL(SetPlayerPos, LVar0, 30, LVar2) + EVT_CALL(PlaySoundAtPlayer, SOUND_3FB, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(SetPlayerAnimation, ANIM_Mario_80018) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 20, EVT_FLOAT(0.6)) + EVT_END_THREAD + EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) + EVT_CALL(PlayerJump1, 1030, 30, -496, 10) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_WAIT(1) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_WAIT(1) + EVT_CALL(InterpPlayerYaw, 90, 0) + EVT_WAIT(5) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_WAIT(1) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_WAIT(1) + EVT_CALL(ShowMessageAtScreenPos, MSG_CH8_0007, 1000, 0) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_WAIT(10) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(ClearPartnerMoveHistory, NPC_PARTNER) + EVT_CALL(func_802CF56C, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_BlastWall) = { + EVT_PLAY_EFFECT(EFFECT_BOMBETTE_BREAKING, 0, 8, 8, 1, 10, 30) + EVT_CALL(EnableModel, MODEL_g296, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilitte, COLLIDER_FLAGS_UPPER_MASK) + EVT_SET(GF_KPA17_BombedWall, TRUE) + EVT_CALL(WaitForPlayerInputEnabled) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_WAIT(80) + EVT_CALL(DisablePartnerAI, 0) + EVT_WAIT(5) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldBombette_Talk, ANIM_WorldBombette_Idle, 0, MSG_CH8_0016) + EVT_CALL(EnablePartnerAI) + EVT_WAIT(10) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_UNBIND + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Toad_01) = { + EVT_SWITCH(GF_KPA17_BombedWall) + EVT_CASE_EQ(0) + EVT_SWITCH(AB_KPA17_Toad1_Dialogue) + EVT_CASE_EQ(0) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_CH8_0009) + EVT_SET(AB_KPA17_Toad1_Dialogue, 1) + EVT_CASE_EQ(1) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_CH8_000A) + EVT_SET(AB_KPA17_Toad1_Dialogue, 0) + EVT_END_SWITCH + EVT_CASE_EQ(1) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_CH8_000B) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Toad_02) = { + EVT_SWITCH(GF_KPA17_BombedWall) + EVT_CASE_EQ(0) + EVT_SWITCH(AB_KPA17_Toad2_Dialogue) + EVT_CASE_EQ(0) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Blue_Talk, ANIM_Toad_Blue_Idle, 0, MSG_CH8_000C) + EVT_SET(AB_KPA17_Toad2_Dialogue, 1) + EVT_CASE_EQ(1) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Blue_Talk, ANIM_Toad_Blue_Idle, 0, MSG_CH8_000D) + EVT_SET(AB_KPA17_Toad2_Dialogue, 0) + EVT_END_SWITCH + EVT_CASE_EQ(1) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Blue_Talk, ANIM_Toad_Blue_Idle, 0, MSG_CH8_000E) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_ToadGuard) = { + EVT_SWITCH(GF_KPA17_BombedWall) + EVT_CASE_EQ(0) + EVT_SWITCH(AB_KPA17_Toad3_Dialogue) + EVT_CASE_EQ(0) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Yellow_Talk, ANIM_Toad_Yellow_Idle, 0, MSG_CH8_000F) + EVT_SET(AB_KPA17_Toad3_Dialogue, 1) + EVT_CASE_EQ(1) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Yellow_Talk, ANIM_Toad_Yellow_Idle, 0, MSG_CH8_0010) + EVT_SET(AB_KPA17_Toad3_Dialogue, 0) + EVT_END_SWITCH + EVT_CASE_EQ(1) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Yellow_Talk, ANIM_Toad_Yellow_Idle, 0, MSG_CH8_0011) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_ToadMinister) = { + EVT_SWITCH(GF_KPA17_BombedWall) + EVT_CASE_EQ(0) + EVT_SWITCH(AB_KPA17_Toad4_Dialogue) + EVT_CASE_EQ(0) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ToadMinister_Talk, ANIM_ToadMinister_Idle, 0, MSG_CH8_0012) + EVT_SET(AB_KPA17_Toad4_Dialogue, 1) + EVT_CASE_EQ(1) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ToadMinister_Talk, ANIM_ToadMinister_Idle, 0, MSG_CH8_0013) + EVT_SET(AB_KPA17_Toad4_Dialogue, 2) + EVT_CASE_EQ(2) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ToadMinister_Talk, ANIM_ToadMinister_Idle, 0, MSG_CH8_0014) + EVT_SET(AB_KPA17_Toad4_Dialogue, 1) + EVT_END_SWITCH + EVT_CASE_EQ(1) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ToadMinister_Talk, ANIM_ToadMinister_Idle, 0, MSG_CH8_0015) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Toad_01) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Toad_01))) + EVT_CALL(SetNpcPos, NPC_SELF, 813, 30, -394) + EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Toad_02) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Toad_02))) + EVT_CALL(SetNpcPos, NPC_SELF, 870, 30, -465) + EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_ToadGuard) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_ToadGuard))) + EVT_CALL(SetNpcPos, NPC_SELF, 930, 30, -400) + EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_ToadMinister) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_ToadMinister))) + EVT_CALL(SetNpcPos, NPC_SELF, 1100, 30, -450) + EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 0) + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_Prisoners)[] = { + { + .id = NPC_Toad_01, + .settings = &N(NpcSettings_Toad_Stationary), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .init = &N(EVS_NpcInit_Toad_01), + .drops = NPC_NO_DROPS, + .animations = TOAD_RED_ANIMS, + .tattle = MSG_NpcTattle_KPA_CaptiveToadA, + }, + { + .id = NPC_Toad_02, + .settings = &N(NpcSettings_Toad_Stationary), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .init = &N(EVS_NpcInit_Toad_02), + .drops = NPC_NO_DROPS, + .animations = TOAD_BLUE_ANIMS, + .tattle = MSG_NpcTattle_KPA_CaptiveToadB, + }, + { + .id = NPC_ToadGuard, + .settings = &N(NpcSettings_Toad_Stationary), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .init = &N(EVS_NpcInit_ToadGuard), + .drops = NPC_NO_DROPS, + .animations = TOAD_GUARD_YELLOW_ANIMS, + .tattle = MSG_NpcTattle_KPA_CaptiveSoldierA, + }, + { + .id = NPC_ToadMinister, + .settings = &N(NpcSettings_Toad_Stationary), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .init = &N(EVS_NpcInit_ToadMinister), + .drops = NPC_NO_DROPS, + .animations = { + .idle = ANIM_ToadMinister_Idle, + .walk = ANIM_ToadMinister_Idle, + .run = ANIM_ToadMinister_Idle, + .chase = ANIM_ToadMinister_Idle, + .anim_4 = ANIM_ToadMinister_Idle, + .anim_5 = ANIM_ToadMinister_Idle, + .death = ANIM_ToadMinister_Idle, + .hit = ANIM_ToadMinister_Idle, + .anim_8 = ANIM_ToadMinister_Idle, + .anim_9 = ANIM_ToadMinister_Idle, + .anim_A = ANIM_ToadMinister_Idle, + .anim_B = ANIM_ToadMinister_Idle, + .anim_C = ANIM_ToadMinister_Idle, + .anim_D = ANIM_ToadMinister_Idle, + .anim_E = ANIM_ToadMinister_Idle, + .anim_F = ANIM_ToadMinister_Idle, + }, + .tattle = MSG_NpcTattle_KPA_ToadMinister, + }, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Prisoners)), + {} +}; diff --git a/src/world/area_kpa/kpa_32/A5E0C0.c b/src/world/area_kpa/kpa_32/A5E0C0.c deleted file mode 100644 index ccda01844d..0000000000 --- a/src/world/area_kpa/kpa_32/A5E0C0.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "kpa_32.h" - -static char* N(exit_str_0) = "kpa_81"; -static char* N(exit_str_1) = "kpa_90"; -static char* N(exit_str_2) = "kpa_51"; -static char* N(exit_str_3) = "kpa_96"; - -#include "world/common/atomic/TexturePan.inc.c" - diff --git a/src/world/area_kpa/kpa_32/kpa_32.h b/src/world/area_kpa/kpa_32/kpa_32.h index 45e825b822..c4d53a7d88 100644 --- a/src/world/area_kpa/kpa_32/kpa_32.h +++ b/src/world/area_kpa/kpa_32/kpa_32.h @@ -2,8 +2,15 @@ /// @brief Bowser's Castle - Lower Grand Hall #include "common.h" -#include "../kpa.h" #include "message_ids.h" #include "map.h" +#include "../kpa.h" +#include "mapfs/kpa_32_shape.h" +#include "mapfs/kpa_32_hit.h" + #define NAMESPACE kpa_32 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_MakeEntities); diff --git a/src/world/area_kpa/kpa_32/kpa_32_0_header.c b/src/world/area_kpa/kpa_32/kpa_32_0_header.c new file mode 100644 index 0000000000..81a6c3e4a7 --- /dev/null +++ b/src/world/area_kpa/kpa_32/kpa_32_0_header.c @@ -0,0 +1,16 @@ +#include "kpa_32.h" + +EntryList N(Entrances) = { + [kpa_32_ENTRY_0] { -575.0, -50.0, -5.0, 90.0 }, + [kpa_32_ENTRY_1] { 545.0, -50.0, -5.0, 270.0 }, + [kpa_32_ENTRY_2] { 535.0, 140.0, 0.0, 270.0 }, + [kpa_32_ENTRY_3] { -535.0, 140.0, 0.0, 90.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_kpa_32 }, +}; diff --git a/src/world/area_kpa/kpa_32/kpa_32_1_music.c b/src/world/area_kpa/kpa_32/kpa_32_1_music.c new file mode 100644 index 0000000000..45bac620c8 --- /dev/null +++ b/src/world/area_kpa/kpa_32/kpa_32_1_music.c @@ -0,0 +1,12 @@ +#include "kpa_32.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetMusicTrackVolumes, TRACK_VOLS_KPA_2) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_32/kpa_32_2_entity.c b/src/world/area_kpa/kpa_32/kpa_32_2_entity.c new file mode 100644 index 0000000000..1433c4164f --- /dev/null +++ b/src/world/area_kpa/kpa_32/kpa_32_2_entity.c @@ -0,0 +1,8 @@ +#include "kpa_32.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_SavePoint), 0, 10, 0, 0, MAKE_ENTITY_END) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_32/kpa_32_3_main.c b/src/world/area_kpa/kpa_32/kpa_32_3_main.c new file mode 100644 index 0000000000..fc474eade4 --- /dev/null +++ b/src/world/area_kpa/kpa_32/kpa_32_3_main.c @@ -0,0 +1,116 @@ +#include "kpa_32.h" + +#include "world/common/atomic/TexturePan.inc.c" +#include "world/common/atomic/TexturePan.data.inc.c" + +EvtScript N(EVS_ExitDoors_kpa_81_2) = EVT_EXIT_DOUBLE_DOOR(kpa_32_ENTRY_0, "kpa_81", kpa_81_ENTRY_2, COLLIDER_ttw, MODEL_b4_doa, MODEL_o1256); +EvtScript N(EVS_ExitWalk_kpa_90_0) = EVT_EXIT_WALK(60, kpa_32_ENTRY_1, "kpa_90", kpa_90_ENTRY_0); +EvtScript N(EVS_ExitDoors_kpa_51_0) = EVT_EXIT_DOUBLE_DOOR(kpa_32_ENTRY_2, "kpa_51", kpa_51_ENTRY_0, COLLIDER_tte, MODEL_o1258, MODEL_o1257); +EvtScript N(EVS_ExitDoors_kpa_96_0) = EVT_EXIT_DOUBLE_DOOR(kpa_32_ENTRY_3, "kpa_96", kpa_96_ENTRY_0, COLLIDER_tt4, MODEL_o1248, MODEL_o1254); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kpa_81_2)), TRIGGER_WALL_PRESS_A, COLLIDER_ttw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_90_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deili3, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kpa_51_0)), TRIGGER_WALL_PRESS_A, COLLIDER_tte, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kpa_96_0)), TRIGGER_WALL_PRESS_A, COLLIDER_tt4, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetLoadType, LVar0) + EVT_IF_EQ(LVar0, 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(kpa_32_ENTRY_0) + EVT_SET(LVar0, kpa_32_ENTRY_0) + EVT_SET(LVar2, MODEL_o1256) + EVT_SET(LVar3, MODEL_b4_doa) + EVT_EXEC(EnterDoubleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_EQ(kpa_32_ENTRY_1) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_CASE_EQ(kpa_32_ENTRY_2) + EVT_SET(LVar0, 2) + EVT_SET(LVar2, MODEL_o1258) + EVT_SET(LVar3, MODEL_o1257) + EVT_EXEC(EnterDoubleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_EQ(kpa_32_ENTRY_3) + EVT_SET(LVar0, 3) + EVT_SET(LVar2, MODEL_o1248) + EVT_SET(LVar3, MODEL_o1254) + EVT_EXEC(EnterDoubleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_ALT_NO_LEAD() + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_CALL(EnableTexPanning, MODEL_o1287, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o1289, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o1293, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o1295, TRUE) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_1) + TEX_PAN_PARAMS_STEP( 20, 20, -20, -20) + TEX_PAN_PARAMS_FREQ( 1, 1, 1, 1) + TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) + EVT_EXEC(N(EVS_UpdateTexturePan)) + EVT_END_THREAD + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_2) + TEX_PAN_PARAMS_STEP( 20, 20, -20, -20) + TEX_PAN_PARAMS_FREQ( 1, 1, 1, 1) + TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) + EVT_EXEC(N(EVS_UpdateTexturePan)) + EVT_END_THREAD + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_3) + TEX_PAN_PARAMS_STEP( 20, 20, -20, -20) + TEX_PAN_PARAMS_FREQ( 1, 1, 1, 1) + TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) + EVT_EXEC(N(EVS_UpdateTexturePan)) + EVT_END_THREAD + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_4) + TEX_PAN_PARAMS_STEP( 20, 20, -20, -20) + TEX_PAN_PARAMS_FREQ( 1, 1, 1, 1) + TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) + EVT_EXEC(N(EVS_UpdateTexturePan)) + EVT_END_THREAD + EVT_THREAD + EVT_LOOP(0) + EVT_CALL(ScaleModel, MODEL_o1287, EVT_FLOAT(1.02), 1, EVT_FLOAT(1.02)) + EVT_CALL(ScaleModel, MODEL_o1289, EVT_FLOAT(1.02), 1, EVT_FLOAT(1.02)) + EVT_CALL(ScaleModel, MODEL_o1293, EVT_FLOAT(1.02), 1, EVT_FLOAT(1.02)) + EVT_CALL(ScaleModel, MODEL_o1295, EVT_FLOAT(1.02), 1, EVT_FLOAT(1.02)) + EVT_WAIT(10) + EVT_CALL(ScaleModel, MODEL_o1287, EVT_FLOAT(1.0), 1, EVT_FLOAT(1.0)) + EVT_CALL(ScaleModel, MODEL_o1289, EVT_FLOAT(1.0), 1, EVT_FLOAT(1.0)) + EVT_CALL(ScaleModel, MODEL_o1293, EVT_FLOAT(1.0), 1, EVT_FLOAT(1.0)) + EVT_CALL(ScaleModel, MODEL_o1295, EVT_FLOAT(1.0), 1, EVT_FLOAT(1.0)) + EVT_WAIT(10) + EVT_CALL(ScaleModel, MODEL_o1287, EVT_FLOAT(0.98), 1, EVT_FLOAT(0.98)) + EVT_CALL(ScaleModel, MODEL_o1289, EVT_FLOAT(0.98), 1, EVT_FLOAT(0.98)) + EVT_CALL(ScaleModel, MODEL_o1293, EVT_FLOAT(0.98), 1, EVT_FLOAT(0.98)) + EVT_CALL(ScaleModel, MODEL_o1295, EVT_FLOAT(0.98), 1, EVT_FLOAT(0.98)) + EVT_WAIT(10) + EVT_END_LOOP + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_33/A5F080.c b/src/world/area_kpa/kpa_33/A5F080.c deleted file mode 100644 index 270f71fc07..0000000000 --- a/src/world/area_kpa/kpa_33/A5F080.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "kpa_33.h" - -static char* N(exit_str_0) = "kpa_94"; -static char* N(exit_str_1) = "kpa_61"; -static char* N(exit_str_2) = "kpa_52"; -static char* N(exit_str_3) = "kpa_09"; - -#include "world/common/atomic/TexturePan.inc.c" - diff --git a/src/world/area_kpa/kpa_33/kpa_33.h b/src/world/area_kpa/kpa_33/kpa_33.h index fae9954c9b..7f3b961439 100644 --- a/src/world/area_kpa/kpa_33/kpa_33.h +++ b/src/world/area_kpa/kpa_33/kpa_33.h @@ -2,8 +2,15 @@ /// @brief Bowser's Castle - Upper Grand Hall #include "common.h" -#include "../kpa.h" #include "message_ids.h" #include "map.h" +#include "../kpa.h" +#include "mapfs/kpa_33_shape.h" +#include "mapfs/kpa_33_hit.h" + #define NAMESPACE kpa_33 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_MakeEntities); diff --git a/src/world/area_kpa/kpa_33/kpa_33_0_header.c b/src/world/area_kpa/kpa_33/kpa_33_0_header.c new file mode 100644 index 0000000000..124a75da5c --- /dev/null +++ b/src/world/area_kpa/kpa_33/kpa_33_0_header.c @@ -0,0 +1,16 @@ +#include "kpa_33.h" + +EntryList N(Entrances) = { + [kpa_33_ENTRY_0] { -547.0, -50.0, -5.0, 90.0 }, + [kpa_33_ENTRY_1] { 547.0, -50.0, -5.0, 270.0 }, + [kpa_33_ENTRY_2] { 550.0, 140.0, 0.0, 270.0 }, + [kpa_33_ENTRY_3] { -550.0, 140.0, 0.0, 90.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_kpa_33 }, +}; diff --git a/src/world/area_kpa/kpa_33/kpa_33_1_music.c b/src/world/area_kpa/kpa_33/kpa_33_1_music.c new file mode 100644 index 0000000000..39340b5951 --- /dev/null +++ b/src/world/area_kpa/kpa_33/kpa_33_1_music.c @@ -0,0 +1,13 @@ + +#include "kpa_33.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetMusicTrackVolumes, TRACK_VOLS_KPA_3) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_33/kpa_33_2_entity.c b/src/world/area_kpa/kpa_33/kpa_33_2_entity.c new file mode 100644 index 0000000000..930a080476 --- /dev/null +++ b/src/world/area_kpa/kpa_33/kpa_33_2_entity.c @@ -0,0 +1,8 @@ +#include "kpa_33.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_SavePoint), 0, 10, 0, 0, MAKE_ENTITY_END) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_33/kpa_33_3_main.c b/src/world/area_kpa/kpa_33/kpa_33_3_main.c new file mode 100644 index 0000000000..daa4cbb083 --- /dev/null +++ b/src/world/area_kpa/kpa_33/kpa_33_3_main.c @@ -0,0 +1,117 @@ + +#include "kpa_33.h" + +#include "world/common/atomic/TexturePan.inc.c" +#include "world/common/atomic/TexturePan.data.inc.c" + +EvtScript N(EVS_ExitWalk_kpa_94_1) = EVT_EXIT_WALK(60, kpa_33_ENTRY_0, "kpa_94", kpa_94_ENTRY_1); +EvtScript N(EVS_ExitDoors_kpa_61_1) = EVT_EXIT_DOUBLE_DOOR(kpa_33_ENTRY_1, "kpa_61", kpa_61_ENTRY_1, COLLIDER_tt3, MODEL_o1250, MODEL_b3_doa); +EvtScript N(EVS_ExitDoors_kpa_52_0) = EVT_EXIT_DOUBLE_DOOR(kpa_33_ENTRY_2, "kpa_52", kpa_52_ENTRY_0, COLLIDER_tte, MODEL_o1252, MODEL_o1253); +EvtScript N(EVS_ExitDoors_kpa_09_1) = EVT_EXIT_DOUBLE_DOOR(kpa_33_ENTRY_3, "kpa_09", kpa_09_ENTRY_1, COLLIDER_tt4, MODEL_o1258, MODEL_o1259); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_94_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kpa_61_1)), TRIGGER_WALL_PRESS_A, COLLIDER_tt3, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kpa_52_0)), TRIGGER_WALL_PRESS_A, COLLIDER_tte, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kpa_09_1)), TRIGGER_WALL_PRESS_A, COLLIDER_tt4, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetLoadType, LVar0) + EVT_IF_EQ(LVar0, 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(kpa_33_ENTRY_0) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_CASE_EQ(kpa_33_ENTRY_1) + EVT_SET(LVar0, kpa_33_ENTRY_1) + EVT_SET(LVar2, MODEL_o1250) + EVT_SET(LVar3, MODEL_b3_doa) + EVT_EXEC(EnterDoubleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_EQ(kpa_33_ENTRY_2) + EVT_SET(LVar0, kpa_33_ENTRY_2) + EVT_SET(LVar2, MODEL_o1252) + EVT_SET(LVar3, MODEL_o1253) + EVT_EXEC(EnterDoubleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_EQ(kpa_33_ENTRY_3) + EVT_SET(LVar0, kpa_33_ENTRY_3) + EVT_SET(LVar2, MODEL_o1258) + EVT_SET(LVar3, MODEL_o1259) + EVT_EXEC(EnterDoubleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_ALT_NO_LEAD() + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_CALL(EnableTexPanning, MODEL_o1286, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o1287, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o1289, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o1290, TRUE) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_1) + TEX_PAN_PARAMS_STEP( 20, 20, -20, -20) + TEX_PAN_PARAMS_FREQ( 1, 1, 1, 1) + TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) + EVT_EXEC(N(EVS_UpdateTexturePan)) + EVT_END_THREAD + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_2) + TEX_PAN_PARAMS_STEP( 20, 20, -20, -20) + TEX_PAN_PARAMS_FREQ( 1, 1, 1, 1) + TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) + EVT_EXEC(N(EVS_UpdateTexturePan)) + EVT_END_THREAD + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_3) + TEX_PAN_PARAMS_STEP( 20, 20, -20, -20) + TEX_PAN_PARAMS_FREQ( 1, 1, 1, 1) + TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) + EVT_EXEC(N(EVS_UpdateTexturePan)) + EVT_END_THREAD + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_4) + TEX_PAN_PARAMS_STEP( 20, 20, -20, -20) + TEX_PAN_PARAMS_FREQ( 1, 1, 1, 1) + TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) + EVT_EXEC(N(EVS_UpdateTexturePan)) + EVT_END_THREAD + EVT_THREAD + EVT_LOOP(0) + EVT_CALL(ScaleModel, MODEL_o1286, EVT_FLOAT(1.02), 1, EVT_FLOAT(1.02)) + EVT_CALL(ScaleModel, MODEL_o1287, EVT_FLOAT(1.02), 1, EVT_FLOAT(1.02)) + EVT_CALL(ScaleModel, MODEL_o1289, EVT_FLOAT(1.02), 1, EVT_FLOAT(1.02)) + EVT_CALL(ScaleModel, MODEL_o1290, EVT_FLOAT(1.02), 1, EVT_FLOAT(1.02)) + EVT_WAIT(10) + EVT_CALL(ScaleModel, MODEL_o1286, EVT_FLOAT(1.0), 1, EVT_FLOAT(1.0)) + EVT_CALL(ScaleModel, MODEL_o1287, EVT_FLOAT(1.0), 1, EVT_FLOAT(1.0)) + EVT_CALL(ScaleModel, MODEL_o1289, EVT_FLOAT(1.0), 1, EVT_FLOAT(1.0)) + EVT_CALL(ScaleModel, MODEL_o1290, EVT_FLOAT(1.0), 1, EVT_FLOAT(1.0)) + EVT_WAIT(10) + EVT_CALL(ScaleModel, MODEL_o1286, EVT_FLOAT(0.98), 1, EVT_FLOAT(0.98)) + EVT_CALL(ScaleModel, MODEL_o1287, EVT_FLOAT(0.98), 1, EVT_FLOAT(0.98)) + EVT_CALL(ScaleModel, MODEL_o1289, EVT_FLOAT(0.98), 1, EVT_FLOAT(0.98)) + EVT_CALL(ScaleModel, MODEL_o1290, EVT_FLOAT(0.98), 1, EVT_FLOAT(0.98)) + EVT_WAIT(10) + EVT_END_LOOP + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_40/A60040.c b/src/world/area_kpa/kpa_40/A60040.c deleted file mode 100644 index bb49ff0b99..0000000000 --- a/src/world/area_kpa/kpa_40/A60040.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "kpa_40.h" - -static char* N(exit_str_0) = "kpa_52"; -static char* N(exit_str_1) = "kpa_40"; -static char* N(exit_str_2) = "kpa_41"; diff --git a/src/world/area_kpa/kpa_40/kpa_40.h b/src/world/area_kpa/kpa_40/kpa_40.h index 20c63136c9..38464fe6d2 100644 --- a/src/world/area_kpa/kpa_40/kpa_40.h +++ b/src/world/area_kpa/kpa_40/kpa_40.h @@ -2,8 +2,14 @@ /// @brief Bowser's Castle - Maze Guide Room #include "common.h" -#include "../kpa.h" #include "message_ids.h" #include "map.h" +#include "../kpa.h" +#include "mapfs/kpa_40_shape.h" +#include "mapfs/kpa_40_hit.h" + #define NAMESPACE kpa_40 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); diff --git a/src/world/area_kpa/kpa_40/kpa_40_0_header.c b/src/world/area_kpa/kpa_40/kpa_40_0_header.c new file mode 100644 index 0000000000..63c488a836 --- /dev/null +++ b/src/world/area_kpa/kpa_40/kpa_40_0_header.c @@ -0,0 +1,15 @@ +#include "kpa_40.h" + +EntryList N(Entrances) = { + [kpa_40_ENTRY_0] { -490.0, 0.0, -80.0, 90.0 }, + [kpa_40_ENTRY_1] { 490.0, 0.0, -30.0, 270.0 }, + [kpa_40_ENTRY_2] { 490.0, 120.0, -130.0, 270.0 }, + [kpa_40_ENTRY_3] { -430.0, 133.0, -80.0, 90.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_kpa_40 }, +}; diff --git a/src/world/area_kpa/kpa_40/kpa_40_1_music.c b/src/world/area_kpa/kpa_40/kpa_40_1_music.c new file mode 100644 index 0000000000..2eef548432 --- /dev/null +++ b/src/world/area_kpa/kpa_40/kpa_40_1_music.c @@ -0,0 +1,13 @@ + +#include "kpa_40.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetMusicTrackVolumes, TRACK_VOLS_KPA_3) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_40/kpa_40_2_main.c b/src/world/area_kpa/kpa_40/kpa_40_2_main.c new file mode 100644 index 0000000000..454f469c30 --- /dev/null +++ b/src/world/area_kpa/kpa_40/kpa_40_2_main.c @@ -0,0 +1,54 @@ + +#include "kpa_40.h" + +EvtScript N(EVS_ExitDoors_kpa_52_1) = EVT_EXIT_DOUBLE_DOOR(kpa_40_ENTRY_0, "kpa_52", kpa_52_ENTRY_1, COLLIDER_ttw, MODEL_o526, MODEL_o525); +EvtScript N(EVS_ExitWalk_kpa_40_3) = EVT_EXIT_WALK(60, kpa_40_ENTRY_1, "kpa_40", kpa_40_ENTRY_3); + +EvtScript N(EVS_ExitWalk_kpa_41_3) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(UseExitHeading, 60, kpa_40_ENTRY_2) + EVT_EXEC(ExitWalk) + EVT_SET(AB_KPA_MazeProgress, 1) + EVT_CALL(GotoMap, EVT_PTR("kpa_41"), kpa_41_ENTRY_3) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kpa_52_1)), TRIGGER_WALL_PRESS_A, COLLIDER_ttw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_40_3)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie2, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_41_3)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(kpa_40_ENTRY_0) + EVT_SET(LVar0, kpa_40_ENTRY_0) + EVT_SET(LVar2, MODEL_o526) + EVT_SET(LVar3, MODEL_o525) + EVT_EXEC(EnterDoubleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_DEFAULT + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_RETURN + EVT_END +}; + + diff --git a/src/world/area_kpa/kpa_41/A60470.c b/src/world/area_kpa/kpa_41/A60470.c deleted file mode 100644 index 2e85bfccab..0000000000 --- a/src/world/area_kpa/kpa_41/A60470.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "kpa_41.h" - -static char* N(exit_str_0) = "kpa_40"; -static char* N(exit_str_1) = "kpa_41"; -static char* N(exit_str_2) = "kpa_102"; diff --git a/src/world/area_kpa/kpa_41/kpa_41.h b/src/world/area_kpa/kpa_41/kpa_41.h index 93bd189979..4bc73665b1 100644 --- a/src/world/area_kpa/kpa_41/kpa_41.h +++ b/src/world/area_kpa/kpa_41/kpa_41.h @@ -2,8 +2,14 @@ /// @brief Bowser's Castle - Maze Room #include "common.h" -#include "../kpa.h" #include "message_ids.h" #include "map.h" +#include "../kpa.h" +#include "mapfs/kpa_41_shape.h" +#include "mapfs/kpa_41_hit.h" + #define NAMESPACE kpa_41 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); diff --git a/src/world/area_kpa/kpa_41/kpa_41_0_header.c b/src/world/area_kpa/kpa_41/kpa_41_0_header.c new file mode 100644 index 0000000000..2446caa091 --- /dev/null +++ b/src/world/area_kpa/kpa_41/kpa_41_0_header.c @@ -0,0 +1,15 @@ +#include "kpa_41.h" + +EntryList N(Entrances) = { + [kpa_41_ENTRY_0] { -340.0, 0.0, -70.0, 90.0 }, + [kpa_41_ENTRY_1] { 340.0, 0.0, -70.0, 270.0 }, + [kpa_41_ENTRY_2] { 340.0, 119.0, -230.0, 270.0 }, + [kpa_41_ENTRY_3] { -340.0, 119.0, -230.0, 90.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_kpa_41 }, +}; diff --git a/src/world/area_kpa/kpa_41/kpa_41_1_music.c b/src/world/area_kpa/kpa_41/kpa_41_1_music.c new file mode 100644 index 0000000000..9caa5dec0e --- /dev/null +++ b/src/world/area_kpa/kpa_41/kpa_41_1_music.c @@ -0,0 +1,12 @@ +#include "kpa_41.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetMusicTrackVolumes, TRACK_VOLS_KPA_3) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_41/kpa_41_2_main.c b/src/world/area_kpa/kpa_41/kpa_41_2_main.c new file mode 100644 index 0000000000..aea4267232 --- /dev/null +++ b/src/world/area_kpa/kpa_41/kpa_41_2_main.c @@ -0,0 +1,84 @@ +#include "kpa_41.h" + +EvtScript N(EVS_ExitWalk_LowerLeft) = EVT_EXIT_WALK(60, kpa_41_ENTRY_0, "kpa_40", kpa_40_ENTRY_1); + +EvtScript N(EVS_ExitWalk_LowerRight) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(UseExitHeading, 60, kpa_41_ENTRY_1) + EVT_EXEC(ExitWalk) + EVT_SWITCH(AB_KPA_MazeProgress) + EVT_CASE_OR_EQ(1) + EVT_CASE_OR_EQ(2) + EVT_CASE_OR_EQ(4) + EVT_ADD(AB_KPA_MazeProgress, 1) + EVT_CALL(GotoMap, EVT_PTR("kpa_41"), kpa_41_ENTRY_0) + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(0) + EVT_CASE_OR_EQ(3) + EVT_CASE_OR_EQ(5) + EVT_CALL(GotoMap, EVT_PTR("kpa_40"), kpa_40_ENTRY_3) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitWalk_UpperLeft) = EVT_EXIT_WALK(60, kpa_41_ENTRY_3, "kpa_40", kpa_40_ENTRY_2); + +EvtScript N(EVS_ExitWalk_UpperRight) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(UseExitHeading, 60, kpa_41_ENTRY_2) + EVT_EXEC(ExitWalk) + EVT_SWITCH(AB_KPA_MazeProgress) + EVT_CASE_EQ(5) + EVT_SET(AB_KPA_MazeProgress, 0) + EVT_CALL(GotoMap, EVT_PTR("kpa_102"), kpa_102_ENTRY_0) + EVT_CASE_EQ(3) + EVT_ADD(AB_KPA_MazeProgress, 1) + EVT_CALL(GotoMap, EVT_PTR("kpa_41"), kpa_41_ENTRY_3) + EVT_CASE_OR_EQ(0) + EVT_CASE_OR_EQ(1) + EVT_CASE_OR_EQ(2) + EVT_CASE_OR_EQ(4) + EVT_CALL(GotoMap, EVT_PTR("kpa_40"), kpa_40_ENTRY_3) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_LowerLeft)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_LowerRight)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_UpperLeft)), TRIGGER_FLOOR_ABOVE, COLLIDER_deili3, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_UpperRight)), TRIGGER_FLOOR_ABOVE, COLLIDER_deili4, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(kpa_41_ENTRY_2) + EVT_SET(AB_KPA_MazeProgress, 5) + EVT_CASE_DEFAULT + EVT_END_SWITCH + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_EXEC(N(EVS_EnterMap)) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_RETURN + EVT_END +}; + diff --git a/src/world/area_kpa/kpa_50/A609D0.c b/src/world/area_kpa/kpa_50/A609D0.c deleted file mode 100644 index acb9ab13f6..0000000000 --- a/src/world/area_kpa/kpa_50/A609D0.c +++ /dev/null @@ -1,10 +0,0 @@ -#include "kpa_50.h" - -static char* N(exit_str_0) = "kpa_70"; -static char* N(exit_str_1) = "kpa_81"; - -#include "world/common/enemy/ai/RangedAttackAI.inc.c" - -#include "world/common/todo/GetEncounterEnemyIsOwner.inc.c" - -#include "world/common/enemy/ai/TackleAI.inc.c" diff --git a/src/world/area_kpa/kpa_50/kpa_50.h b/src/world/area_kpa/kpa_50/kpa_50.h index 8fc8844f5f..511fd125ac 100644 --- a/src/world/area_kpa/kpa_50/kpa_50.h +++ b/src/world/area_kpa/kpa_50/kpa_50.h @@ -2,8 +2,30 @@ /// @brief Bowser's Castle - Hall to Guard Door 1 #include "common.h" -#include "../kpa.h" #include "message_ids.h" #include "map.h" +#include "../kpa.h" +#include "mapfs/kpa_50_shape.h" +#include "mapfs/kpa_50_hit.h" + +#include "sprite/npc/HammerBros.h" +#include "sprite/npc/WorldKoopatrol.h" + +enum { + NPC_Koopatrol_01 = 0, + NPC_Koopatrol_02 = 1, + NPC_HammerBros = 10, + NPC_HammerBros_Hammer1 = 11, + NPC_HammerBros_Hammer2 = 12, + NPC_HammerBros_Hammer3 = 13, + NPC_HammerBros_Hammer4 = 14, + NPC_HammerBros_Hammer5 = 15, + NPC_HammerBros_Hammer6 = 16, +}; + #define NAMESPACE kpa_50 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_kpa/kpa_50/kpa_50_0_header.c b/src/world/area_kpa/kpa_50/kpa_50_0_header.c new file mode 100644 index 0000000000..4f59c014b0 --- /dev/null +++ b/src/world/area_kpa/kpa_50/kpa_50_0_header.c @@ -0,0 +1,13 @@ +#include "kpa_50.h" + +EntryList N(Entrances) = { + [kpa_50_ENTRY_0] { -480.0, 0.0, -28.0, 90.0 }, + [kpa_50_ENTRY_1] { 770.0, 0.0, -28.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_kpa_50 }, +}; diff --git a/src/world/area_kpa/kpa_50/kpa_50_1_music.c b/src/world/area_kpa/kpa_50/kpa_50_1_music.c new file mode 100644 index 0000000000..df0193d7c1 --- /dev/null +++ b/src/world/area_kpa/kpa_50/kpa_50_1_music.c @@ -0,0 +1,13 @@ +#include "kpa_50.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) + EVT_CALL(ClearAmbientSounds, 250) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetMusicTrackVolumes, TRACK_VOLS_KPA_1) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_50/kpa_50_2_main.c b/src/world/area_kpa/kpa_50/kpa_50_2_main.c new file mode 100644 index 0000000000..0c781dce97 --- /dev/null +++ b/src/world/area_kpa/kpa_50/kpa_50_2_main.c @@ -0,0 +1,43 @@ +#include "kpa_50.h" + +EvtScript N(EVS_ExitWalk_kpa_70_1) = EVT_EXIT_WALK(60, kpa_50_ENTRY_0, "kpa_70", kpa_70_ENTRY_1); +EvtScript N(EVS_ExitDoors_kpa_81_0) = EVT_EXIT_DOUBLE_DOOR(kpa_50_ENTRY_1, "kpa_81", kpa_81_ENTRY_0, COLLIDER_tte, MODEL_o324, MODEL_o322); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_70_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kpa_81_0)), TRIGGER_WALL_PRESS_A, COLLIDER_tte, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(kpa_50_ENTRY_0) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_CASE_EQ(kpa_50_ENTRY_1) + EVT_SET(LVar0, kpa_50_ENTRY_1) + EVT_SET(LVar2, MODEL_o324) + EVT_SET(LVar3, MODEL_o322) + EVT_EXEC(EnterDoubleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_CALL(SetGroupEnabled, MODEL_dw1, 0) + EVT_CALL(SetGroupEnabled, MODEL_dw2, 0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_tte, COLLIDER_FLAGS_UPPER_MASK) + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_50/kpa_50_3_npc.c b/src/world/area_kpa/kpa_50/kpa_50_3_npc.c new file mode 100644 index 0000000000..526182e442 --- /dev/null +++ b/src/world/area_kpa/kpa_50/kpa_50_3_npc.c @@ -0,0 +1,85 @@ +#include "kpa_50.h" + +#include "world/common/enemy/complete/HammerBros.inc.c" +#include "world/common/enemy/complete/Koopatrol_Wander.inc.c" + +StaticNpc N(NpcData_Koopatrol_01) = { + .id = NPC_Koopatrol_01, + .settings = &N(NpcSettings_Koopatrol_Wander), + .pos = { -251.0f, 0.0f, -30.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .drops = KOOPATROL_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -251, 0, -30 }, + .wanderSize = { 50 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { -251, 0, -30 }, + .detectSize = { 300 }, + } + }, + .animations = KOOPATROL_ANIMS, +}; + +StaticNpc N(NpcData_Koopatrol_02) = { + .id = NPC_Koopatrol_02, + .settings = &N(NpcSettings_Koopatrol_Wander), + .pos = { 100.0f, 0.0f, -30.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .drops = KOOPATROL_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 100, 0, -30 }, + .wanderSize = { 50 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 100, 0, -30 }, + .detectSize = { 300 }, + } + }, + .animations = KOOPATROL_ANIMS, +}; + +StaticNpc N(NpcData_HammerBros_01)[] = { + { + .id = NPC_HammerBros, + .settings = &N(NpcSettings_HammerBros), + .pos = { 450.0f, 0.0f, -30.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .drops = HAMMER_BROS_DROPS, + .territory = { + .wander = { + .isFlying = FALSE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 450, 0, -30 }, + .wanderSize = { 50 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 450, 0, -30 }, + .detectSize = { 300 }, + } + }, + .animations = HAMMER_BROS_ANIMS, + }, + HAMMER_BROS_HAMMER_HITBOX(NPC_HammerBros + 1), + HAMMER_BROS_HAMMER_HITBOX(NPC_HammerBros + 2), + HAMMER_BROS_HAMMER_HITBOX(NPC_HammerBros + 3), + HAMMER_BROS_HAMMER_HITBOX(NPC_HammerBros + 4), + HAMMER_BROS_HAMMER_HITBOX(NPC_HammerBros + 5), + HAMMER_BROS_HAMMER_HITBOX(NPC_HammerBros + 6), +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Koopatrol_01), BTL_KPA_FORMATION_18, BTL_KPA_STAGE_00), + NPC_GROUP(N(NpcData_Koopatrol_02), BTL_KPA_FORMATION_1A, BTL_KPA_STAGE_00), + NPC_GROUP(N(NpcData_HammerBros_01), BTL_KPA_FORMATION_0F, BTL_KPA_STAGE_00), + {} +}; diff --git a/src/world/area_kpa/kpa_51/A64090.c b/src/world/area_kpa/kpa_51/A64090.c deleted file mode 100644 index 98fefb0584..0000000000 --- a/src/world/area_kpa/kpa_51/A64090.c +++ /dev/null @@ -1,10 +0,0 @@ -#include "kpa_51.h" - -ApiStatus func_80240000_A64090(Evt* script, s32 isInitialCall) { - sprintf(wMapShapeName, "kpa_50_shape"); - sprintf(wMapHitName, "kpa_50_hit"); - return ApiStatus_BLOCK; -} - -const char* N(exit_str_0) = "kpa_32"; -const char* N(exit_str_1) = "kpa_133"; diff --git a/src/world/area_kpa/kpa_51/A640E0.c b/src/world/area_kpa/kpa_51/A640E0.c deleted file mode 100644 index dc9208c78a..0000000000 --- a/src/world/area_kpa/kpa_51/A640E0.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "kpa_51.h" - -#include "world/common/enemy/ai/MagikoopaAI.inc.c" - -#include "world/common/enemy/ai/TackleAI.inc.c" diff --git a/src/world/area_kpa/kpa_51/kpa_51.h b/src/world/area_kpa/kpa_51/kpa_51.h index ecfd4c37ef..734a8cec30 100644 --- a/src/world/area_kpa/kpa_51/kpa_51.h +++ b/src/world/area_kpa/kpa_51/kpa_51.h @@ -2,8 +2,26 @@ /// @brief Bowser's Castle - Hall to Water Puzzle #include "common.h" -#include "../kpa.h" #include "message_ids.h" #include "map.h" +#include "../kpa.h" +#include "mapfs/kpa_50_shape.h" +#include "mapfs/kpa_50_hit.h" + +#include "sprite/npc/Magikoopa.h" +#include "sprite/npc/WorldKoopatrol.h" + +enum { + NPC_Magikoopa_01 = 0, + NPC_Magikoopa_01_Spell = 1, + NPC_Magikoopa_02 = 2, + NPC_Magikoopa_02_Spell = 3, + NPC_Koopatrol = 4, +}; + #define NAMESPACE kpa_51 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_kpa/kpa_51/kpa_51_0_header.c b/src/world/area_kpa/kpa_51/kpa_51_0_header.c new file mode 100644 index 0000000000..6cc247c385 --- /dev/null +++ b/src/world/area_kpa/kpa_51/kpa_51_0_header.c @@ -0,0 +1,13 @@ +#include "kpa_51.h" + +EntryList N(Entrances) = { + [kpa_51_ENTRY_0] { -470.0, 0.0, -28.0, 90.0 }, + [kpa_51_ENTRY_1] { 745.0, 0.0, -28.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_kpa_51 }, +}; diff --git a/src/world/area_kpa/kpa_51/kpa_51_1_music.c b/src/world/area_kpa/kpa_51/kpa_51_1_music.c new file mode 100644 index 0000000000..9918007ef3 --- /dev/null +++ b/src/world/area_kpa/kpa_51/kpa_51_1_music.c @@ -0,0 +1,13 @@ + +#include "kpa_51.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetMusicTrackVolumes, TRACK_VOLS_KPA_2) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_51/kpa_51_2_main.c b/src/world/area_kpa/kpa_51/kpa_51_2_main.c new file mode 100644 index 0000000000..051831e747 --- /dev/null +++ b/src/world/area_kpa/kpa_51/kpa_51_2_main.c @@ -0,0 +1,52 @@ + +#include "kpa_51.h" + +s32 N(map_init)(void) { + sprintf(wMapShapeName, "kpa_50_shape"); + sprintf(wMapHitName, "kpa_50_hit"); + return FALSE; +} + +EvtScript N(EVS_ExitDoors_kpa_32_2) = EVT_EXIT_DOUBLE_DOOR(kpa_51_ENTRY_0, "kpa_32", kpa_32_ENTRY_2, COLLIDER_ttw, MODEL_o321, MODEL_o323); +EvtScript N(EVS_ExitDoors_kpa_133_0) = EVT_EXIT_DOUBLE_DOOR(kpa_51_ENTRY_1, "kpa_133", kpa_133_ENTRY_0, COLLIDER_tte, MODEL_o324, MODEL_o322); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kpa_32_2)), TRIGGER_WALL_PRESS_A, COLLIDER_ttw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kpa_133_0)), TRIGGER_WALL_PRESS_A, COLLIDER_tte, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(kpa_51_ENTRY_0) + EVT_SET(LVar0, kpa_51_ENTRY_0) + EVT_SET(LVar2, MODEL_o321) + EVT_SET(LVar3, MODEL_o323) + EVT_EXEC(EnterDoubleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_EQ(kpa_51_ENTRY_1) + EVT_SET(LVar0, kpa_51_ENTRY_1) + EVT_SET(LVar2, MODEL_o324) + EVT_SET(LVar3, MODEL_o322) + EVT_EXEC(EnterDoubleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_ttw, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_tte, COLLIDER_FLAGS_UPPER_MASK) + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_51/kpa_51_3_npc.c b/src/world/area_kpa/kpa_51/kpa_51_3_npc.c new file mode 100644 index 0000000000..dde0f0639b --- /dev/null +++ b/src/world/area_kpa/kpa_51/kpa_51_3_npc.c @@ -0,0 +1,89 @@ + +#include "kpa_51.h" + +#include "world/common/enemy/complete/Magikoopa.inc.c" +#include "world/common/enemy/complete/Koopatrol_Wander.inc.c" + +StaticNpc N(NpcData_Magikoopa_01)[] = { + { + .id = NPC_Magikoopa_01, + .settings = &N(NpcSettings_Magikoopa), + .pos = { -130.0f, 0.0f, -30.0f }, + .yaw = 90, + .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .drops = MAGIKOOPA_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { -130, 0, -30 }, + .wanderSize = { 100, 20 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { -130, 0, -30 }, + .detectSize = { 200 }, + } + }, + .animations = MAGIKOOPA_ANIMS, + .extraAnimations = N(ExtraAnims_Magikoopa), + .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, + }, + MAGIKOOPA_SPELL_HITBOX(NPC_Magikoopa_01 + 1) +}; + +StaticNpc N(NpcData_Magikoopa_02)[] = { + { + .id = NPC_Magikoopa_02, + .settings = &N(NpcSettings_Magikoopa), + .pos = { 150.0f, 0.0f, -30.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .drops = MAGIKOOPA_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 150, 0, -30 }, + .wanderSize = { 100, 20 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 150, 0, -30 }, + .detectSize = { 200 }, + } + }, + .animations = MAGIKOOPA_ANIMS, + .extraAnimations = N(ExtraAnims_Magikoopa), + .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, + }, + MAGIKOOPA_SPELL_HITBOX(NPC_Magikoopa_02 + 1) +}; + +StaticNpc N(NpcData_Koopatrol) = { + .id = NPC_Koopatrol, + .settings = &N(NpcSettings_Koopatrol_Wander), + .pos = { 0.0f, 0.0f, -30.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .drops = KOOPATROL_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 0, 0, -30 }, + .wanderSize = { 50 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, -30 }, + .detectSize = { 300 }, + } + }, + .animations = KOOPATROL_ANIMS, + .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Magikoopa_01), BTL_KPA_FORMATION_2C, BTL_KPA_STAGE_00), + NPC_GROUP(N(NpcData_Magikoopa_02), BTL_KPA_FORMATION_29, BTL_KPA_STAGE_00), + NPC_GROUP(N(NpcData_Koopatrol), BTL_KPA_FORMATION_24, BTL_KPA_STAGE_00), + {} +}; diff --git a/src/world/area_kpa/kpa_52/A67100.c b/src/world/area_kpa/kpa_52/A67100.c deleted file mode 100644 index 3bf9f0810d..0000000000 --- a/src/world/area_kpa/kpa_52/A67100.c +++ /dev/null @@ -1,10 +0,0 @@ -#include "kpa_52.h" - -static char* N(exit_str_0) = "kpa_33"; -static char* N(exit_str_1) = "kpa_40"; -static char* N(exit_str_2) = "kpa_08"; -static char* N(exit_str_3) = ""; - -#include "world/common/todo/RemovePadlock.inc.c" - -#include "world/common/todo/GetEntityPosition.inc.c" diff --git a/src/world/area_kpa/kpa_52/A671E0.c b/src/world/area_kpa/kpa_52/A671E0.c deleted file mode 100644 index ebe6bfcb86..0000000000 --- a/src/world/area_kpa/kpa_52/A671E0.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "kpa_52.h" - -#include "world/common/enemy/ai/RangedAttackAI.inc.c" - -#include "world/common/todo/GetEncounterEnemyIsOwner.inc.c" diff --git a/src/world/area_kpa/kpa_52/kpa_52.h b/src/world/area_kpa/kpa_52/kpa_52.h index 401ec8c656..a08ba07454 100644 --- a/src/world/area_kpa/kpa_52/kpa_52.h +++ b/src/world/area_kpa/kpa_52/kpa_52.h @@ -2,8 +2,40 @@ /// @brief Bowser's Castle - Split Level Hall #include "common.h" -#include "../kpa.h" #include "message_ids.h" #include "map.h" +#include "../kpa.h" +#include "mapfs/kpa_52_shape.h" +#include "mapfs/kpa_52_hit.h" + +#include "sprite/npc/HammerBros.h" + +enum { + NPC_HammerBros_01 = 10, + NPC_HammerBros_01_Hammer1 = 11, + NPC_HammerBros_01_Hammer2 = 12, + NPC_HammerBros_01_Hammer3 = 13, + NPC_HammerBros_01_Hammer4 = 14, + NPC_HammerBros_01_Hammer5 = 15, + NPC_HammerBros_01_Hammer6 = 16, + NPC_HammerBros_02 = 20, + NPC_HammerBros_02_Hammer1 = 21, + NPC_HammerBros_02_Hammer2 = 22, + NPC_HammerBros_02_Hammer3 = 23, + NPC_HammerBros_02_Hammer4 = 24, + NPC_HammerBros_02_Hammer5 = 25, + NPC_HammerBros_02_Hammer6 = 26, +}; + +enum { + MV_PadlockEntityID = MapVar(0), +}; + #define NAMESPACE kpa_52 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_ExitDoors_kpa_40_0); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_kpa/kpa_52/kpa_52_0_header.c b/src/world/area_kpa/kpa_52/kpa_52_0_header.c new file mode 100644 index 0000000000..0b2f150732 --- /dev/null +++ b/src/world/area_kpa/kpa_52/kpa_52_0_header.c @@ -0,0 +1,14 @@ +#include "kpa_52.h" + +EntryList N(Entrances) = { + [kpa_52_ENTRY_0] { -345.0, 0.0, -80.0, 90.0 }, + [kpa_52_ENTRY_1] { 330.0, 0.0, -25.0, 270.0 }, + [kpa_52_ENTRY_2] { 330.0, 119.0, -140.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_kpa_52 }, +}; diff --git a/src/world/area_kpa/kpa_52/kpa_52_1_music.c b/src/world/area_kpa/kpa_52/kpa_52_1_music.c new file mode 100644 index 0000000000..4c8c9f9869 --- /dev/null +++ b/src/world/area_kpa/kpa_52/kpa_52_1_music.c @@ -0,0 +1,12 @@ +#include "kpa_52.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetMusicTrackVolumes, TRACK_VOLS_KPA_3) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_52/kpa_52_2_entity.c b/src/world/area_kpa/kpa_52/kpa_52_2_entity.c new file mode 100644 index 0000000000..7e76d32bbb --- /dev/null +++ b/src/world/area_kpa/kpa_52/kpa_52_2_entity.c @@ -0,0 +1,49 @@ + +#include "kpa_52.h" +#include "entity.h" + +#include "world/common/todo/RemovePadlock.inc.c" +#include "world/common/todo/GetEntityPosition.inc.c" + +s32 N(KeyList_CastleDoor)[] = { + ITEM_BOWSER_CASTLE_KEY, + ITEM_NONE +}; + +EvtScript N(EVS_UnlockPrompt_Door) = { + EVT_CALL(ShowKeyChoicePopup) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_00D8, 160, 40) + EVT_CALL(CloseChoicePopup) + EVT_RETURN + EVT_END_IF + EVT_IF_EQ(LVar0, -1) + EVT_CALL(CloseChoicePopup) + EVT_RETURN + EVT_END_IF + EVT_CALL(RemoveKeyItemAt, LVar1) + EVT_SET(GF_KPA52_UnlockedDoor, TRUE) + EVT_CALL(N(GetEntityPosition), MV_PadlockEntityID, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_269, 0, LVar0, LVar1, LVar2) + EVT_SET(LVar0, MV_PadlockEntityID) + EVT_CALL(N(RemovePadlock)) + EVT_SET(LVar1, 0) + EVT_WAIT(5) + EVT_CALL(CloseChoicePopup) + EVT_UNBIND + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kpa_40_0)), TRIGGER_WALL_PRESS_A, COLLIDER_tte1, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_IF_EQ(GF_KPA52_UnlockedDoor, FALSE) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Padlock), 352, 10, -25, 270, MAKE_ENTITY_END) + EVT_SET(MV_PadlockEntityID, LVar0) + EVT_BIND_PADLOCK(EVT_PTR(N(EVS_UnlockPrompt_Door)), TRIGGER_WALL_PRESS_A, EVT_ENTITY_INDEX(0), EVT_PTR(N(KeyList_CastleDoor)), 0, 1) + EVT_ELSE + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kpa_40_0)), TRIGGER_WALL_PRESS_A, COLLIDER_tte1, 1, 0) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_52/kpa_52_3_main.c b/src/world/area_kpa/kpa_52/kpa_52_3_main.c new file mode 100644 index 0000000000..fa30736523 --- /dev/null +++ b/src/world/area_kpa/kpa_52/kpa_52_3_main.c @@ -0,0 +1,54 @@ + +#include "kpa_52.h" + +EvtScript N(EVS_ExitDoors_kpa_33_2) = EVT_EXIT_DOUBLE_DOOR(kpa_52_ENTRY_0, "kpa_33", kpa_33_ENTRY_2, COLLIDER_ttw, MODEL_o407, MODEL_o408); +EvtScript N(EVS_ExitDoors_kpa_40_0) = EVT_EXIT_DOUBLE_DOOR(kpa_52_ENTRY_1, "kpa_40", kpa_40_ENTRY_0, COLLIDER_tte1, MODEL_o410, MODEL_o409); +EvtScript N(EVS_ExitDoors_kpa_08_0) = EVT_EXIT_DOUBLE_DOOR(kpa_52_ENTRY_2, "kpa_08", kpa_08_ENTRY_0, COLLIDER_tte2, MODEL_o412, MODEL_o411); + +MAP_RODATA_PAD(1, strings); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kpa_33_2)), TRIGGER_WALL_PRESS_A, COLLIDER_ttw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kpa_08_0)), TRIGGER_WALL_PRESS_A, COLLIDER_tte2, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(kpa_52_ENTRY_0) + EVT_SET(LVar0, kpa_52_ENTRY_0) + EVT_SET(LVar2, MODEL_o407) + EVT_SET(LVar3, MODEL_o408) + EVT_EXEC(EnterDoubleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_EQ(kpa_52_ENTRY_1) + EVT_SET(LVar0, 1) + EVT_SET(LVar2, MODEL_o410) + EVT_SET(LVar3, MODEL_o409) + EVT_EXEC(EnterDoubleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_EQ(kpa_52_ENTRY_2) + EVT_SET(LVar0, 2) + EVT_SET(LVar2, MODEL_o412) + EVT_SET(LVar3, MODEL_o411) + EVT_EXEC(EnterDoubleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_52/kpa_52_4_npc.c b/src/world/area_kpa/kpa_52/kpa_52_4_npc.c new file mode 100644 index 0000000000..d9a70de80a --- /dev/null +++ b/src/world/area_kpa/kpa_52/kpa_52_4_npc.c @@ -0,0 +1,70 @@ + +#include "kpa_52.h" + +#include "world/common/enemy/complete/HammerBros.inc.c" + +StaticNpc N(NpcData_HammerBros_01)[] = { + { + .id = NPC_HammerBros_01, + .settings = &N(NpcSettings_HammerBros), + .pos = { 190.0f, 0.0f, -27.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .drops = HAMMER_BROS_DROPS, + .territory = { + .wander = { + .isFlying = FALSE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 190, 0, -27 }, + .wanderSize = { 50 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 190, 0, -27 }, + .detectSize = { 300 }, + } + }, + .animations = HAMMER_BROS_ANIMS, + }, + HAMMER_BROS_HAMMER_HITBOX(NPC_HammerBros_01 + 1), + HAMMER_BROS_HAMMER_HITBOX(NPC_HammerBros_01 + 2), + HAMMER_BROS_HAMMER_HITBOX(NPC_HammerBros_01 + 3), + HAMMER_BROS_HAMMER_HITBOX(NPC_HammerBros_01 + 4), + HAMMER_BROS_HAMMER_HITBOX(NPC_HammerBros_01 + 5), + HAMMER_BROS_HAMMER_HITBOX(NPC_HammerBros_01 + 6), +}; + +StaticNpc N(NpcData_HammerBros_02)[] = { + { + .id = NPC_HammerBros_02, + .settings = &N(NpcSettings_HammerBros), + .pos = { 190.0f, 120.0f, -145.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .drops = HAMMER_BROS_DROPS, + .territory = { + .wander = { + .isFlying = FALSE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 190, 120, -145 }, + .wanderSize = { 50 }, + .detectShape = SHAPE_RECT, + .detectPos = { 190, 120, -130 }, + .detectSize = { 140, 40 }, + } + }, + .animations = HAMMER_BROS_ANIMS, + }, + HAMMER_BROS_HAMMER_HITBOX(NPC_HammerBros_02 + 1), + HAMMER_BROS_HAMMER_HITBOX(NPC_HammerBros_02 + 2), + HAMMER_BROS_HAMMER_HITBOX(NPC_HammerBros_02 + 3), + HAMMER_BROS_HAMMER_HITBOX(NPC_HammerBros_02 + 4), + HAMMER_BROS_HAMMER_HITBOX(NPC_HammerBros_02 + 5), + HAMMER_BROS_HAMMER_HITBOX(NPC_HammerBros_02 + 6), +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_HammerBros_01), BTL_KPA_FORMATION_15, BTL_KPA_STAGE_00), + NPC_GROUP(N(NpcData_HammerBros_02), BTL_KPA_FORMATION_13, BTL_KPA_STAGE_00), + {} +}; diff --git a/src/world/area_kpa/kpa_53/A6ACA0.c b/src/world/area_kpa/kpa_53/A6ACA0.c deleted file mode 100644 index 977ed15832..0000000000 --- a/src/world/area_kpa/kpa_53/A6ACA0.c +++ /dev/null @@ -1,36 +0,0 @@ -#include "kpa_53.h" - -ApiStatus func_80240000_A6ACA0(Evt* script, s32 isInitialCall) { - gGameStatusPtr->playerSpriteSet = PLAYER_SPRITES_COMBINED_EPILOGUE; - sprintf(wMapShapeName, "kpa_50_shape"); - sprintf(wMapHitName, "kpa_50_hit"); - return ApiStatus_BLOCK; -} - -const char* N(exit_str_0) = "kpa_102"; -const char* N(exit_str_1) = "kpa_83"; - -ApiStatus func_80240050_A6ACF0(Evt* script, s32 isInitialCall) { - PlayerStatus* playerStatus = &gPlayerStatus; - Bytecode* args = script->ptrReadPos; - s32 npcID = evt_get_variable(script, *args++); - s32 outVar = *args++; - Npc* npc = resolve_npc(script, npcID); - u32 animID; - - if (npc == NULL) { - return ApiStatus_DONE2; - } - - npc->pos.x = (s32)(((s32)playerStatus->position.x - 700) * 0.85) + 765; - if (playerStatus->currentSpeed == 0.0f) { - animID = 0xA0001; - } else if (playerStatus->currentSpeed < 2.0f) { - animID = 0xA0002; - } else { - animID = 0xA0003; - } - npc->currentAnim = animID; - evt_set_variable(script, outVar, playerStatus->targetYaw); - return ApiStatus_DONE2; -} diff --git a/src/world/area_kpa/kpa_53/kpa_53.h b/src/world/area_kpa/kpa_53/kpa_53.h index 72b60bea3c..40b585c603 100644 --- a/src/world/area_kpa/kpa_53/kpa_53.h +++ b/src/world/area_kpa/kpa_53/kpa_53.h @@ -2,8 +2,25 @@ /// @brief Bowser's Castle - Fake Peach Hallway #include "common.h" -#include "../kpa.h" #include "message_ids.h" #include "map.h" +#include "../kpa.h" +#include "mapfs/kpa_50_shape.h" +#include "mapfs/kpa_50_hit.h" + +#include "sprite/npc/Duplighost.h" + +enum { + NPC_Follower = 0, + NPC_Guardian = 1, + NPC_Duplighost = 2, +}; + #define NAMESPACE kpa_53 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_ExitDoors_kpa_83_0); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_kpa/kpa_53/kpa_53_0_header.c b/src/world/area_kpa/kpa_53/kpa_53_0_header.c new file mode 100644 index 0000000000..8ae5cd7008 --- /dev/null +++ b/src/world/area_kpa/kpa_53/kpa_53_0_header.c @@ -0,0 +1,13 @@ +#include "kpa_53.h" + +EntryList N(Entrances) = { + [kpa_53_ENTRY_0] { -480.0, 0.0, -28.0, 90.0 }, + [kpa_53_ENTRY_1] { 768.0, 0.0, -28.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_kpa_53 }, +}; diff --git a/src/world/area_kpa/kpa_53/kpa_53_1_music.c b/src/world/area_kpa/kpa_53/kpa_53_1_music.c new file mode 100644 index 0000000000..586cc3c92c --- /dev/null +++ b/src/world/area_kpa/kpa_53/kpa_53_1_music.c @@ -0,0 +1,13 @@ + +#include "kpa_53.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetMusicTrackVolumes, TRACK_VOLS_KPA_3) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_53/kpa_53_2_main.c b/src/world/area_kpa/kpa_53/kpa_53_2_main.c new file mode 100644 index 0000000000..d5d765a1ce --- /dev/null +++ b/src/world/area_kpa/kpa_53/kpa_53_2_main.c @@ -0,0 +1,56 @@ + +#include "kpa_53.h" + +s32 N(map_init)(void) { + gGameStatusPtr->playerSpriteSet = PLAYER_SPRITES_COMBINED_EPILOGUE; + sprintf(wMapShapeName, "kpa_50_shape"); + sprintf(wMapHitName, "kpa_50_hit"); + return FALSE; +} + +EvtScript N(EVS_ExitDoors_kpa_102_1) = EVT_EXIT_DOUBLE_DOOR(kpa_53_ENTRY_0, "kpa_102", kpa_102_ENTRY_1, COLLIDER_ttw, MODEL_o321, MODEL_o323); +EvtScript N(EVS_ExitDoors_kpa_83_0) = EVT_EXIT_DOUBLE_DOOR(kpa_53_ENTRY_1, "kpa_83", kpa_83_ENTRY_0, COLLIDER_tte, MODEL_o324, MODEL_o322); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kpa_102_1)), TRIGGER_WALL_PRESS_A, COLLIDER_ttw, 1, 0) + EVT_IF_EQ(GF_KPA53_Defeated_PeachImposter, TRUE) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kpa_83_0)), TRIGGER_WALL_PRESS_A, COLLIDER_tte, 1, 0) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(kpa_53_ENTRY_0) + EVT_SET(LVar0, kpa_53_ENTRY_0) + EVT_SET(LVar2, MODEL_o321) + EVT_SET(LVar3, MODEL_o323) + EVT_EXEC(EnterDoubleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_EQ(kpa_53_ENTRY_1) + EVT_SET(LVar0, kpa_53_ENTRY_1) + EVT_SET(LVar2, MODEL_o324) + EVT_SET(LVar3, MODEL_o322) + EVT_EXEC(EnterDoubleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_ttw, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_tte, COLLIDER_FLAGS_UPPER_MASK) + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_53/kpa_53_3_npc.c b/src/world/area_kpa/kpa_53/kpa_53_3_npc.c new file mode 100644 index 0000000000..b5282386ba --- /dev/null +++ b/src/world/area_kpa/kpa_53/kpa_53_3_npc.c @@ -0,0 +1,448 @@ +#include "kpa_53.h" +#include "effects.h" + +API_CALLABLE(N(UpdateFollowerPosition)) { + PlayerStatus* playerStatus = &gPlayerStatus; + Bytecode* args = script->ptrReadPos; + s32 npcID = evt_get_variable(script, *args++); + s32 outVar = *args++; + Npc* npc = resolve_npc(script, npcID); + u32 animID; + + if (npc == NULL) { + return ApiStatus_DONE2; + } + + npc->pos.x = (s32)(((s32)playerStatus->position.x - 700) * 0.85) + 765; + if (playerStatus->currentSpeed == 0.0f) { + animID = ANIM_Peach_A0001; + } else if (playerStatus->currentSpeed < 2.0f) { + animID = ANIM_Peach_A0002; + } else { + animID = ANIM_Peach_A0003; + } + npc->currentAnim = animID; + evt_set_variable(script, outVar, playerStatus->targetYaw); + return ApiStatus_DONE2; +} + +NpcSettings N(NpcSettings_Peach) = { + .height = 46, + .radius = 36, + .level = 99, +}; + +NpcSettings N(NpcSettings_Duplighost) = { + .height = 30, + .radius = 45, + .level = 99, +}; + +EvtScript N(EVS_NpcAI_Duplighost_Flee) = { + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, -130) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetPlayerPos, LVar1, LVar2, LVar3) + EVT_IF_GE(LVar1, LVar0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, 0) + EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 45, 20, TRUE, 0, 0, 0, 0) + EVT_WAIT(20) + EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 5) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Duplighost_Anim04) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 150) + EVT_CALL(NpcMoveTo, NPC_SELF, LVar0, -30, 20) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Duplighost_Anim02) + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcAI_Duplighost_Caught) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(GetNpcPos, NPC_Follower, LVar2, LVar3, LVar4) + EVT_THREAD + EVT_ADD(LVar4, 15) + EVT_LOOP(8) + EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar2, LVar3, LVar4, 1, 1, 1, 1) + EVT_WAIT(5) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(PlaySoundAtNpc, NPC_Follower, SOUND_20B8, 0) + EVT_CALL(MakeLerp, 0, 1440, 20, EASING_QUADRATIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcRotation, NPC_Follower, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(PlaySoundAtNpc, NPC_Follower, SOUND_SMOKE_BURST, 0) + EVT_CALL(SetNpcPos, NPC_Guardian, NPC_DISPOSE_LOCATION) + EVT_CALL(SetNpcPos, NPC_Follower, NPC_DISPOSE_LOCATION) + EVT_CALL(EnableNpcShadow, NPC_Follower, FALSE) + EVT_CALL(SetNpcPos, NPC_SELF, LVar2, LVar3, LVar4) + EVT_CALL(SetNpcYaw, NPC_SELF, 270) + EVT_CALL(MakeLerp, -1440, 0, 20, EASING_QUADRATIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcRotation, NPC_SELF, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Duplighost_Anim05, ANIM_Duplighost_Anim02, 0, MSG_CH8_002D) + EVT_CALL(StartBossBattle, SONG_SPECIAL_BATTLE) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_IF_LT(LVar0, 700) + EVT_ADD(LVar0, 30) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Duplighost_Anim04) + EVT_CALL(NpcMoveTo, NPC_SELF, LVar0, LVar2, 35) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcDefeat_Duplighost) = { + EVT_CALL(RemoveNpc, NPC_Follower) + EVT_CALL(RemoveNpc, NPC_Guardian) + EVT_SET(GF_KPA53_Defeated_PeachImposter, TRUE) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kpa_83_0)), TRIGGER_WALL_PRESS_A, COLLIDER_tte, 1, 0) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(DoNpcDefeat) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Duplighost) = { + EVT_IF_EQ(GF_KPA53_Defeated_PeachImposter, FALSE) + EVT_IF_EQ(GF_KPA53_Met_PeachImposter, TRUE) + EVT_CALL(SetNpcPos, NPC_SELF, -120, 0, -30) + EVT_CALL(SetNpcYaw, NPC_SELF, 270) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcAI_Duplighost_Flee))) + EVT_END_IF + EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_Duplighost))) + EVT_ELSE + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Follower_FirstTime) = { + EVT_CALL(SetNpcAnimation, NPC_Follower, ANIM_Peach_C0000) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Follower, ANIM_Peach_C0026) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(0) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Peach_C0001, ANIM_Peach_C0026, 0, MSG_CH8_0023) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_WAIT(1) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007) + EVT_WAIT(35) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Peach_C0001, ANIM_Peach_C0026, 0, MSG_CH8_0024) + EVT_SET(GF_KPA53_Met_PeachImposter, TRUE) + EVT_CALL(SetSelfVar, 0, 1) + EVT_CALL(SetSelfVar, 1, 1) + EVT_CASE_EQ(1) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Peach_C0001, ANIM_Peach_C0026, 0, MSG_CH8_0025) + EVT_CALL(SetSelfVar, 0, 2) + EVT_CASE_EQ(2) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Peach_C0001, ANIM_Peach_C0026, 0, MSG_CH8_0026) + EVT_CALL(SetSelfVar, 0, 1) + EVT_END_SWITCH + EVT_CALL(SetNpcAnimation, NPC_Follower, ANIM_Peach_C0002) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Follower, ANIM_Peach_A0001) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Follower) = { + EVT_CALL(SetNpcAnimation, NPC_Follower, ANIM_Peach_C0000) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Follower, ANIM_Peach_C0026) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Peach_C0001, ANIM_Peach_C0026, 0, MSG_CH8_0027) + EVT_CALL(SetSelfVar, 0, 1) + EVT_CALL(SetSelfVar, 1, 1) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Peach_C0001, ANIM_Peach_C0026, 0, MSG_CH8_0028) + EVT_END_IF + EVT_CALL(SetNpcAnimation, NPC_Follower, ANIM_Peach_C0002) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Follower, ANIM_Peach_A0001) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcHit_Guardian_FirstTime) = { + EVT_CALL(GetOwnerEncounterTrigger, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(ENCOUNTER_TRIGGER_HAMMER) + EVT_CASE_OR_EQ(ENCOUNTER_TRIGGER_JUMP) + EVT_CASE_OR_EQ(ENCOUNTER_TRIGGER_PARTNER) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(SetNpcVar, NPC_Follower, 2, 1) + EVT_CALL(InterpNpcYaw, NPC_Follower, 270, 0) + EVT_CALL(SetNpcAnimation, NPC_Follower, ANIM_Peach_C0000) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Follower, ANIM_Peach_C0026) + EVT_CALL(SpeakToPlayer, NPC_Follower, ANIM_Peach_C0001, ANIM_Peach_C0026, 0, MSG_CH8_0029) + EVT_CALL(SetNpcAnimation, NPC_Follower, ANIM_Peach_C0002) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Follower, ANIM_Peach_A0001) + EVT_CALL(SetNpcVar, NPC_Follower, 2, 0) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcHit_Guardian) = { + EVT_CALL(GetOwnerEncounterTrigger, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(ENCOUNTER_TRIGGER_HAMMER) + EVT_CASE_OR_EQ(ENCOUNTER_TRIGGER_JUMP) + EVT_CASE_OR_EQ(ENCOUNTER_TRIGGER_PARTNER) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(SetNpcVar, NPC_Follower, 2, 1) + EVT_CALL(InterpNpcYaw, NPC_Follower, 270, 0) + EVT_CALL(SetNpcAnimation, NPC_Follower, ANIM_Peach_C0000) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Follower, ANIM_Peach_C0026) + EVT_CALL(GetSelfVar, 0, LVar1) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_CALL(SpeakToPlayer, NPC_Follower, ANIM_Peach_C0001, ANIM_Peach_C0026, 0, MSG_CH8_002A) + EVT_CALL(SetSelfVar, 0, 1) + EVT_CASE_EQ(1) + EVT_CALL(SpeakToPlayer, NPC_Follower, ANIM_Peach_C0001, ANIM_Peach_C0026, 0, MSG_CH8_002B) + EVT_CALL(SetSelfVar, 0, 2) + EVT_CASE_EQ(2) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_IF_LT(LVar0, 270) + EVT_CALL(SpeakToPlayer, NPC_Follower, ANIM_Peach_C0001, ANIM_Peach_C0026, 0, MSG_CH8_002B) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_Follower, ANIM_Peach_C0001, ANIM_Peach_C0026, 0, MSG_CH8_002C) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_8000000, 1) + EVT_CALL(BindNpcAI, NPC_Duplighost, EVT_PTR(N(EVS_NpcAI_Duplighost_Caught))) + EVT_END_IF + EVT_END_SWITCH + EVT_CALL(SetNpcAnimation, NPC_Follower, ANIM_Peach_C0002) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Follower, ANIM_Peach_A0001) + EVT_CALL(SetNpcVar, NPC_Follower, 2, 0) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Follower) = { + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(NpcFacePlayer, NPC_SELF, 0) + EVT_CALL(GetSelfVar, 1, LVar0) + EVT_IF_EQ(LVar0, 1) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_SET(LVarF, 0) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_SWITCH(LVarF) + EVT_CASE_EQ(0) + EVT_CALL(NpcFacePlayer, NPC_SELF, 0) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_IF_LE(LVar0, 700) + EVT_SET(LVarF, 1) + EVT_END_IF + EVT_CASE_EQ(1) + EVT_CALL(GetSelfVar, 2, LVar0) + EVT_IF_EQ(LVar0, 1) + EVT_BREAK_SWITCH + EVT_END_IF + EVT_CALL(N(UpdateFollowerPosition), 0, LVar0) + EVT_CALL(InterpNpcYaw, NPC_SELF, LVar0, 0) + EVT_CALL(GetNpcPos, NPC_SELF, LVar1, LVar2, LVar3) + EVT_CALL(InterpNpcYaw, NPC_Guardian, LVar0, 0) + EVT_CALL(SetNpcPos, NPC_Guardian, LVar1, LVar2, LVar3) + EVT_IF_LE(LVar1, 100) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Peach_A0001) + EVT_CALL(SetNpcPos, NPC_SELF, 765, 0, -30) + EVT_CALL(SetNpcPos, NPC_Guardian, 765, 0, -30) + EVT_CALL(SetNpcPos, NPC_Duplighost, 150, 0, -30) + EVT_CALL(SetNpcYaw, NPC_Duplighost, 270) + EVT_CALL(BindNpcAI, NPC_Duplighost, EVT_PTR(N(EVS_NpcAI_Duplighost_Flee))) + EVT_CALL(SetSelfVar, 0, 0) + EVT_CALL(BindNpcInteract, NPC_Follower, EVT_PTR(N(EVS_NpcInteract_Follower))) + EVT_CALL(SetNpcVar, NPC_Guardian, 0, 0) + EVT_CALL(BindNpcHit, NPC_Guardian, EVT_PTR(N(EVS_NpcHit_Guardian))) + EVT_SET(LVarF, 2) + EVT_END_IF + EVT_IF_GE(LVar1, 765) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Peach_A0001) + EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 0) + EVT_SET(LVarF, 0) + EVT_END_IF + EVT_CASE_EQ(2) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, 700) + EVT_SET(LVarF, 0) + EVT_END_IF + EVT_END_SWITCH + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Follower) = { + EVT_IF_EQ(GF_KPA53_Defeated_PeachImposter, FALSE) + EVT_CALL(SetNpcPos, NPC_SELF, 765, 0, -30) + EVT_IF_EQ(GF_KPA53_Met_PeachImposter, FALSE) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Follower_FirstTime))) + EVT_ELSE + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Follower))) + EVT_END_IF + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Follower))) + EVT_ELSE + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Guardian) = { + EVT_IF_EQ(GF_KPA53_Defeated_PeachImposter, FALSE) + EVT_CALL(SetNpcPos, NPC_SELF, 765, 0, -30) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, TRUE) + EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) + EVT_IF_EQ(GF_KPA53_Met_PeachImposter, FALSE) + EVT_CALL(BindNpcHit, NPC_SELF, EVT_PTR(N(EVS_NpcHit_Guardian_FirstTime))) + EVT_ELSE + EVT_CALL(BindNpcHit, NPC_SELF, EVT_PTR(N(EVS_NpcHit_Guardian))) + EVT_END_IF + EVT_ELSE + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_Imposter)[] = { + { + .id = NPC_Follower, + .settings = &N(NpcSettings_Peach), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_20000 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_800000, + .init = &N(EVS_NpcInit_Follower), + .drops = NPC_NO_DROPS, + .animations = { + .idle = ANIM_Peach_A0000, + .walk = ANIM_Peach_A0000, + .run = ANIM_Peach_A0000, + .chase = ANIM_Peach_A0000, + .anim_4 = ANIM_Peach_A0000, + .anim_5 = ANIM_Peach_A0000, + .death = ANIM_Peach_A0000, + .hit = ANIM_Peach_A0000, + .anim_8 = ANIM_Peach_A0000, + .anim_9 = ANIM_Peach_A0000, + .anim_A = ANIM_Peach_A0000, + .anim_B = ANIM_Peach_A0000, + .anim_C = ANIM_Peach_A0000, + .anim_D = ANIM_Peach_A0000, + .anim_E = ANIM_Peach_A0000, + .anim_F = ANIM_Peach_A0000, + }, + .tattle = MSG_NpcTattle_KPA_FakePrincessPeach, + }, + { + .id = NPC_Guardian, + .settings = &N(NpcSettings_Peach), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH, + .init = &N(EVS_NpcInit_Guardian), + .drops = NPC_NO_DROPS, + .animations = { + .idle = ANIM_Peach_A0000, + .walk = ANIM_Peach_A0000, + .run = ANIM_Peach_A0000, + .chase = ANIM_Peach_A0000, + .anim_4 = ANIM_Peach_A0000, + .anim_5 = ANIM_Peach_A0000, + .death = ANIM_Peach_A0000, + .hit = ANIM_Peach_A0000, + .anim_8 = ANIM_Peach_A0000, + .anim_9 = ANIM_Peach_A0000, + .anim_A = ANIM_Peach_A0000, + .anim_B = ANIM_Peach_A0000, + .anim_C = ANIM_Peach_A0000, + .anim_D = ANIM_Peach_A0000, + .anim_E = ANIM_Peach_A0000, + .anim_F = ANIM_Peach_A0000, + }, + .tattle = MSG_NpcTattle_KPA_FakePrincessPeach, + }, + { + .id = NPC_Duplighost, + .settings = &N(NpcSettings_Duplighost), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000, + .init = &N(EVS_NpcInit_Duplighost), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_SUPER_SHROOM, 5, 0 }, + { ITEM_MAPLE_SYRUP, 5, 0 }, + { ITEM_THUNDER_RAGE, 5, 0 }, + { ITEM_STOP_WATCH, 5, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(5), + .minCoinBonus = 1, + .maxCoinBonus = 3, + }, + .animations = { + .idle = ANIM_Duplighost_Anim02, + .walk = ANIM_Duplighost_Anim03, + .run = ANIM_Duplighost_Anim04, + .chase = ANIM_Duplighost_Anim04, + .anim_4 = ANIM_Duplighost_Anim02, + .anim_5 = ANIM_Duplighost_Anim02, + .death = ANIM_Duplighost_Anim0A, + .hit = ANIM_Duplighost_Anim0A, + .anim_8 = ANIM_Duplighost_Anim02, + .anim_9 = ANIM_Duplighost_Anim02, + .anim_A = ANIM_Duplighost_Anim02, + .anim_B = ANIM_Duplighost_Anim02, + .anim_C = ANIM_Duplighost_Anim02, + .anim_D = ANIM_Duplighost_Anim02, + .anim_E = ANIM_Duplighost_Anim02, + .anim_F = ANIM_Duplighost_Anim02, + }, + }, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Imposter), BTL_KPA3_FORMATION_02, BTL_KPA3_STAGE_00), + {} +}; diff --git a/src/world/area_kpa/kpa_53/kpa_53_4_entity.c b/src/world/area_kpa/kpa_53/kpa_53_4_entity.c new file mode 100644 index 0000000000..0e6990efe6 --- /dev/null +++ b/src/world/area_kpa/kpa_53/kpa_53_4_entity.c @@ -0,0 +1,9 @@ + +#include "kpa_53.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_HeartBlock), -415, 60, -75, 0, MAKE_ENTITY_END) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_60/A6CB00.c b/src/world/area_kpa/kpa_60/A6CB00.c deleted file mode 100644 index c8df58c0a7..0000000000 --- a/src/world/area_kpa/kpa_60/A6CB00.c +++ /dev/null @@ -1,14 +0,0 @@ -#include "kpa_60.h" - -static char* N(exit_str_0) = "kpa_70"; -static char* N(exit_str_1) = "kpa_10"; -static char* N(exit_str_2) = "kpa_11"; -static char* N(exit_str_3) = "kpa_63"; -static char* N(exit_str_4) = "kpa_63\0"; -static char* N(exit_str_5) = "kmr_22"; -static char* N(exit_str_6) = "hos_20"; -static char* N(exit_str_7) = ""; - -#include "world/common/todo/RemovePadlock.inc.c" - -#include "world/common/todo/GetEntityPosition.inc.c" diff --git a/src/world/area_kpa/kpa_60/A6CBE0.c b/src/world/area_kpa/kpa_60/A6CBE0.c deleted file mode 100644 index 98a5379295..0000000000 --- a/src/world/area_kpa/kpa_60/A6CBE0.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "kpa_60.h" - -#include "world/common/atomic/TexturePan.inc.c" - diff --git a/src/world/area_kpa/kpa_60/kpa_60.h b/src/world/area_kpa/kpa_60/kpa_60.h index 41ad0f4eca..e854bdb8e4 100644 --- a/src/world/area_kpa/kpa_60/kpa_60.h +++ b/src/world/area_kpa/kpa_60/kpa_60.h @@ -2,8 +2,26 @@ /// @brief Bowser's Castle - Ship Enter/Exit Scenes #include "common.h" -#include "../kpa.h" #include "message_ids.h" #include "map.h" +#include "../kpa.h" +#include "mapfs/kpa_60_shape.h" +#include "mapfs/kpa_60_hit.h" + +enum { + MV_PadLockEntityID = MapVar(0), + MV_Starship_PosX = MapVar(10), + MV_Starship_PosY = MapVar(11), + MV_Starship_PosZ = MapVar(12), + MV_Starship_Yaw = MapVar(13), +}; + #define NAMESPACE kpa_60 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_ExitDoor_kpa_70_0); +extern EvtScript N(EVS_Scene_Arrival); +extern EvtScript N(EVS_Scene_Departure); +extern EvtScript N(EVS_MakeEntities); diff --git a/src/world/area_kpa/kpa_60/kpa_60_0_header.c b/src/world/area_kpa/kpa_60/kpa_60_0_header.c new file mode 100644 index 0000000000..67d5404218 --- /dev/null +++ b/src/world/area_kpa/kpa_60/kpa_60_0_header.c @@ -0,0 +1,18 @@ +#include "kpa_60.h" + +EntryList N(Entrances) = { + [kpa_60_ENTRY_0] { -191.0, 0.0, -135.0, 180.0 }, + [kpa_60_ENTRY_1] { 276.0, 0.0, -305.0, 180.0 }, + [kpa_60_ENTRY_2] { 386.0, -25.0, -231.0, 180.0 }, + [kpa_60_ENTRY_3] { 75.0, 21.0, 600.0, 90.0 }, + [kpa_60_ENTRY_4] { 0.0, -1000.0, 0.0, 0.0 }, + [kpa_60_ENTRY_5] { 0.0, -1000.0, 0.0, 180.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_kpa_62 }, +}; diff --git a/src/world/area_kpa/kpa_60/kpa_60_1_music.c b/src/world/area_kpa/kpa_60/kpa_60_1_music.c new file mode 100644 index 0000000000..51e43d0968 --- /dev/null +++ b/src/world/area_kpa/kpa_60/kpa_60_1_music.c @@ -0,0 +1,14 @@ +#include "kpa_60.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_IF_NE(GB_StoryProgress, STORY_CH8_STAR_SHIP_ACTIVATED) + EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetMusicTrackVolumes, TRACK_VOLS_KPA_OUTSIDE) + EVT_END_THREAD + EVT_END_IF + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_60/kpa_60_2_entity.c b/src/world/area_kpa/kpa_60/kpa_60_2_entity.c new file mode 100644 index 0000000000..0f54ed1008 --- /dev/null +++ b/src/world/area_kpa/kpa_60/kpa_60_2_entity.c @@ -0,0 +1,50 @@ +#include "kpa_60.h" +#include "entity.h" + +#include "world/common/todo/RemovePadlock.inc.c" +#include "world/common/todo/GetEntityPosition.inc.c" + +s32 N(KeyList_FrontDoor)[] = { + ITEM_BOWSER_CASTLE_KEY, + ITEM_NONE +}; + +EvtScript N(EVS_UnlockPrompt_FrontDoor) = { + EVT_CALL(ShowKeyChoicePopup) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_00D8, 160, 40) + EVT_CALL(CloseChoicePopup) + EVT_RETURN + EVT_END_IF + EVT_IF_EQ(LVar0, -1) + EVT_CALL(CloseChoicePopup) + EVT_RETURN + EVT_END_IF + EVT_CALL(RemoveKeyItemAt, LVar1) + EVT_SET(GF_KPA62_UnlockedFrontDoor, TRUE) + EVT_CALL(N(GetEntityPosition), MV_PadLockEntityID, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_269, 0, LVar0, LVar1, LVar2) + EVT_SET(LVar0, MV_PadLockEntityID) + EVT_CALL(N(RemovePadlock)) + EVT_SET(LVar1, 0) + EVT_WAIT(5) + EVT_CALL(CloseChoicePopup) + EVT_UNBIND + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoor_kpa_70_0)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittn, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_IF_EQ(GF_KPA62_UnlockedFrontDoor, FALSE) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Padlock), -200, 10, -207, 0, MAKE_ENTITY_END) + EVT_SET(MV_PadLockEntityID, LVar0) + EVT_BIND_PADLOCK(EVT_PTR(N(EVS_UnlockPrompt_FrontDoor)), TRIGGER_WALL_PRESS_A, EVT_ENTITY_INDEX(0), EVT_PTR(N(KeyList_FrontDoor)), 0, 1) + EVT_ELSE + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoor_kpa_70_0)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittn, 1, 0) + EVT_END_IF + EVT_CALL(MakeEntity, EVT_PTR(Entity_RedBlock), -532, 145, -59, 0, ITEM_DEEP_FOCUS3, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_KPA62_BadgeBlock_DeepFocus3) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_60/kpa_60_3_main.c b/src/world/area_kpa/kpa_60/kpa_60_3_main.c new file mode 100644 index 0000000000..b9a805d3d7 --- /dev/null +++ b/src/world/area_kpa/kpa_60/kpa_60_3_main.c @@ -0,0 +1,227 @@ +#include "kpa_60.h" + +#include "world/common/atomic/TexturePan.inc.c" +#include "world/common/atomic/TexturePan.data.inc.c" + +EvtScript N(EVS_OpenAirshipDockDoor) = { + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitts, SOUND_1DF, 0) + EVT_CALL(EnableModel, MODEL_o1616, FALSE) + EVT_CALL(MakeLerp, 0, -10, 20, EASING_CUBIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, MODEL_o1650, LVar0, 0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(MakeLerp, 0, 45, 25, EASING_CUBIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, MODEL_o1650, -10, 0, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_CloseAirshipDockDoor) = { + EVT_CALL(MakeLerp, 45, 0, 25, EASING_CUBIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, MODEL_o1650, -10, 0, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(MakeLerp, -10, 0, 20, EASING_CUBIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, MODEL_o1650, LVar0, 0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(EnableModel, MODEL_o1616, TRUE) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitts, SOUND_1E0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitDoor_kpa_70_0) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_SET(LVar0, kpa_60_ENTRY_0) + EVT_SET(LVar1, COLLIDER_deilittn) + EVT_SET(LVar2, MODEL_o1647) + EVT_SET(LVar3, MODEL_o1646) + EVT_EXEC(ExitDoubleDoor) + EVT_WAIT(17) + EVT_CALL(GotoMap, EVT_PTR("kpa_70"), kpa_70_ENTRY_0) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitWalk_kpa_1X_Upper) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(UseExitHeading, 60, kpa_60_ENTRY_1) + EVT_EXEC(ExitWalk) + EVT_IF_EQ(GF_KPA16_ShutOffLava, FALSE) + EVT_CALL(GotoMap, EVT_PTR("kpa_11"), kpa_11_ENTRY_0) + EVT_ELSE + EVT_CALL(GotoMap, EVT_PTR("kpa_10"), kpa_10_ENTRY_0) + EVT_END_IF + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitWalk_kpa_1X_Lower) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(UseExitHeading, 60, kpa_60_ENTRY_2) + EVT_EXEC(ExitWalk) + EVT_IF_EQ(GF_KPA16_ShutOffLava, FALSE) + EVT_CALL(GotoMap, EVT_PTR("kpa_11"), kpa_11_ENTRY_3) + EVT_ELSE + EVT_CALL(GotoMap, EVT_PTR("kpa_10"), kpa_10_ENTRY_3) + EVT_END_IF + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitDoor_kpa_63_0) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_EXEC_WAIT(N(EVS_OpenAirshipDockDoor)) + EVT_WAIT(15) + EVT_CALL(UseExitHeading, 60, kpa_60_ENTRY_3) + EVT_EXEC(ExitWalk) + EVT_CALL(GotoMap, EVT_PTR("kpa_63"), kpa_63_ENTRY_0) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterFromAirshipDock) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetPlayerPos, -30, 21, 590) + EVT_CALL(SetNpcPos, NPC_PARTNER, -30, 21, 590) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_40, TRUE) + EVT_CALL(EnableModel, MODEL_o1616, FALSE) + EVT_CALL(TranslateModel, MODEL_o1650, -10, 0, 45) + EVT_THREAD + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) + EVT_CALL(PlayerMoveTo, 75, 580, 0) + EVT_END_THREAD + EVT_WAIT(15) + EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(3.0)) + EVT_CALL(NpcMoveTo, NPC_PARTNER, 65, 600, 0) + EVT_EXEC_WAIT(N(EVS_CloseAirshipDockDoor)) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_40, FALSE) + EVT_CALL(EnablePartnerAI) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_1X_Upper)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilise, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_1X_Lower)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoor_kpa_63_0)), TRIGGER_WALL_PRESS_A, COLLIDER_deilitts, 1, 0) + EVT_RETURN + EVT_END +}; + +// hide parts of the map not visibile from ground level. these include princess peach's castle, +// the castle grounds, and the large clown head hemisphere +EvtScript N(EVS_HideDistalGeometry) = { + EVT_CALL(EnableGroup, MODEL_g390, FALSE) + EVT_CALL(EnableGroup, MODEL_g391, FALSE) + EVT_CALL(EnableGroup, MODEL_g402, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(kpa_60_ENTRY_0) + EVT_EXEC_WAIT(N(EVS_HideDistalGeometry)) + EVT_SET(LVar2, MODEL_o1647) + EVT_SET(LVar3, MODEL_o1646) + EVT_EXEC_WAIT(EnterDoubleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_EQ(kpa_60_ENTRY_3) + EVT_EXEC_WAIT(N(EVS_HideDistalGeometry)) + EVT_THREAD + EVT_EXEC_WAIT(N(EVS_EnterFromAirshipDock)) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_END_THREAD + EVT_CASE_EQ(kpa_60_ENTRY_4) + EVT_EXEC(N(EVS_Scene_Arrival)) + EVT_CASE_EQ(kpa_60_ENTRY_5) + EVT_EXEC(N(EVS_Scene_Departure)) + EVT_CASE_DEFAULT + EVT_EXEC_WAIT(N(EVS_HideDistalGeometry)) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_WAIT(1) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TexPan_Lava) = { + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_0) + TEX_PAN_PARAMS_STEP( -400, 0, -800, 0) + TEX_PAN_PARAMS_FREQ( 1, 0, 1, 0) + TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) + EVT_EXEC(N(EVS_UpdateTexturePan)) + EVT_END_THREAD + EVT_CALL(SetTexPanner, MODEL_o1508, TEX_PANNER_0) + EVT_RETURN + EVT_END +}; + +LavaReset N(SafeFloorColliders)[] = { + { .colliderID = COLLIDER_o1559, .pos = { -455.0, -15.0, 35.0 }}, + { .colliderID = COLLIDER_o1560, .pos = { -545.0, 10.0, 15.0 }}, + { .colliderID = -1 } +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_ALT_NO_LEAD() + EVT_SET(GF_MAP_BowsersCastle, TRUE) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_EnterMap)) + EVT_IF_EQ(GF_KPA16_ShutOffLava, FALSE) + EVT_CALL(EnableGroup, MODEL_after, FALSE) + EVT_EXEC(N(EVS_TexPan_Lava)) + EVT_ELSE + EVT_CALL(EnableGroup, MODEL_before, FALSE) + EVT_END_IF + EVT_IF_EQ(GF_KPA16_ShutOffLava, FALSE) + EVT_THREAD + EVT_WAIT(3) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o1508, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_deilie, SURFACE_TYPE_LAVA) + EVT_THREAD + EVT_CALL(ResetFromLava, EVT_PTR(N(SafeFloorColliders))) + EVT_END_THREAD + EVT_END_THREAD + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_60/kpa_60_4_scenes.c b/src/world/area_kpa/kpa_60/kpa_60_4_scenes.c new file mode 100644 index 0000000000..6e7258a768 --- /dev/null +++ b/src/world/area_kpa/kpa_60/kpa_60_4_scenes.c @@ -0,0 +1,108 @@ +#include "kpa_60.h" + +EvtScript N(EVS_SetStarshipPosRot) = { + EVT_LOOP(0) + EVT_CALL(TranslateGroup, MODEL_g405, MV_Starship_PosX, MV_Starship_PosY, MV_Starship_PosZ) + EVT_CALL(RotateGroup, MODEL_g405, MV_Starship_Yaw, 0, 1, 0) + EVT_CALL(GetModelCenter, MODEL_o1638) + EVT_SUB(LVar0, 10) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 20) + EVT_CALL(SetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +Vec3f N(FlightPath_Arrival)[] = { + { -58.0, -166.0, -545.0 }, + { -116.0, -50.0, -759.0 }, + { -120.0, 160.0, -970.0 }, +}; + +EvtScript N(EVS_Scene_Arrival) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(SetPlayerActionState, ACTION_STATE_LAND) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE) + EVT_SET(MV_Starship_Yaw, 0) + EVT_SET(MV_Starship_PosX, 0) + EVT_SET(MV_Starship_PosY, 0) + EVT_SET(MV_Starship_PosZ, 0) + EVT_EXEC(N(EVS_SetStarshipPosRot)) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 30, 16, 4096) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 0, -70, 0) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 0, -70, 0) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(PlaySound, SOUND_182) + EVT_CALL(LoadPath, 45, EVT_PTR(N(FlightPath_Arrival)), ARRAY_COUNT(N(FlightPath_Arrival)), EASING_LINEAR) + EVT_LABEL(90) + EVT_CALL(GetNextPathPos) + EVT_SET(MV_Starship_PosX, LVar1) + EVT_SET(MV_Starship_PosY, LVar2) + EVT_SET(MV_Starship_PosZ, LVar3) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 1) + EVT_GOTO(90) + EVT_END_IF + EVT_WAIT(20) + EVT_IF_EQ(GF_StartedChapter8, FALSE) + EVT_WAIT(15) + EVT_SET(GF_StartedChapter8, TRUE) + EVT_CALL(FadeOutMusic, 0, 1500) + EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_22"), kmr_22_ENTRY_8, TRANSITION_6) + EVT_WAIT(100) + EVT_RETURN + EVT_END_IF + EVT_CALL(GotoMap, EVT_PTR("kpa_63"), kpa_63_ENTRY_1) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +Vec3f N(FlightPath_Departure)[] = { + { -120.0, 160.0, -970.0 }, + { -116.0, -50.0, -759.0 }, + { -58.0, -166.0, -545.0 }, + { 0.0, 0.0, 0.0 }, +}; + +EvtScript N(EVS_Scene_Departure) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(InterpPlayerYaw, 180, 1) + EVT_CALL(SetNpcYaw, NPC_PARTNER, 270) + EVT_SET(MV_Starship_Yaw, 180) + EVT_SET(MV_Starship_PosX, -120) + EVT_SET(MV_Starship_PosY, 160) + EVT_SET(MV_Starship_PosZ, -970) + EVT_EXEC(N(EVS_SetStarshipPosRot)) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 30, 16, 4096) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 0, -70, 0) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 0, -70, 0) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_THREAD + EVT_CALL(PlaySound, SOUND_183) + EVT_CALL(LoadPath, 45, EVT_PTR(N(FlightPath_Departure)), ARRAY_COUNT(N(FlightPath_Departure)), EASING_LINEAR) + EVT_LABEL(90) + EVT_CALL(GetNextPathPos) + EVT_SET(MV_Starship_PosX, LVar1) + EVT_SET(MV_Starship_PosY, LVar2) + EVT_SET(MV_Starship_PosZ, LVar3) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 1) + EVT_GOTO(90) + EVT_END_IF + EVT_END_THREAD + EVT_WAIT(40) + EVT_CALL(GotoMap, EVT_PTR("hos_20"), hos_20_ENTRY_2) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_61/A6E3E0.c b/src/world/area_kpa/kpa_61/A6E3E0.c deleted file mode 100644 index 5c23e89c43..0000000000 --- a/src/world/area_kpa/kpa_61/A6E3E0.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "kpa_61.h" - -static char* N(exit_str_0) = "kpa_82"; -static char* N(exit_str_1) = "kpa_33"; - -#include "world/common/atomic/TexturePan.inc.c" - diff --git a/src/world/area_kpa/kpa_61/A6E6F0.c b/src/world/area_kpa/kpa_61/A6E6F0.c deleted file mode 100644 index c101c71cd4..0000000000 --- a/src/world/area_kpa/kpa_61/A6E6F0.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "kpa_61.h" - -#include "world/common/enemy/ai/TackleAI.inc.c" - -#include "world/common/enemy/ai/FlyingMagikoopaAI.inc.c" diff --git a/src/world/area_kpa/kpa_61/kpa_61.h b/src/world/area_kpa/kpa_61/kpa_61.h index 5776bb591e..0f72c8b547 100644 --- a/src/world/area_kpa/kpa_61/kpa_61.h +++ b/src/world/area_kpa/kpa_61/kpa_61.h @@ -2,8 +2,25 @@ /// @brief Bowser's Castle - Battlement #include "common.h" -#include "../kpa.h" #include "message_ids.h" #include "map.h" +#include "../kpa.h" +#include "mapfs/kpa_61_shape.h" +#include "mapfs/kpa_61_hit.h" + +enum { + NPC_Koopatrol_01 = 0, + NPC_Koopatrol_02 = 1, + NPC_FlyingMagikoopa_01 = 2, + NPC_FlyingMagikoopa_01_Spell = 3, + NPC_FlyingMagikoopa_02 = 4, + NPC_FlyingMagikoopa_02_Spell = 5, +}; + #define NAMESPACE kpa_61 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_kpa/kpa_61/kpa_61_0_header.c b/src/world/area_kpa/kpa_61/kpa_61_0_header.c new file mode 100644 index 0000000000..f39df2cc40 --- /dev/null +++ b/src/world/area_kpa/kpa_61/kpa_61_0_header.c @@ -0,0 +1,14 @@ +#include "kpa_61.h" + +EntryList N(Entrances) = { + [kpa_61_ENTRY_0] { -100.0, -160.0, 116.0, 120.0 }, + [kpa_61_ENTRY_1] { -100.0, 200.0, 102.0, 120.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_kpa_61 }, +}; diff --git a/src/world/area_kpa/kpa_61/kpa_61_1_music.c b/src/world/area_kpa/kpa_61/kpa_61_1_music.c new file mode 100644 index 0000000000..50a230a638 --- /dev/null +++ b/src/world/area_kpa/kpa_61/kpa_61_1_music.c @@ -0,0 +1,12 @@ +#include "kpa_61.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetMusicTrackVolumes, TRACK_VOLS_KPA_OUTSIDE) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_61/kpa_61_2_main.c b/src/world/area_kpa/kpa_61/kpa_61_2_main.c new file mode 100644 index 0000000000..c7268db2e8 --- /dev/null +++ b/src/world/area_kpa/kpa_61/kpa_61_2_main.c @@ -0,0 +1,85 @@ +#include "kpa_61.h" + +#include "world/common/atomic/TexturePan.inc.c" +#include "world/common/atomic/TexturePan.data.inc.c" + +EvtScript N(EVS_ExitDoors_kpa_82_1) = EVT_EXIT_DOUBLE_DOOR(kpa_61_ENTRY_0, "kpa_82", kpa_82_ENTRY_1, COLLIDER_tts, MODEL_o34, MODEL_o33); +EvtScript N(EVS_ExitDoors_kpa_33_1) = EVT_EXIT_DOUBLE_DOOR(kpa_61_ENTRY_1, "kpa_33", kpa_33_ENTRY_1, COLLIDER_ttsw, MODEL_o37, MODEL_o38); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kpa_82_1)), TRIGGER_WALL_PRESS_A, COLLIDER_tts, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kpa_33_1)), TRIGGER_WALL_PRESS_A, COLLIDER_ttsw, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(kpa_61_ENTRY_0) + EVT_SET(LVar0, kpa_61_ENTRY_0) + EVT_SET(LVar2, MODEL_o34) + EVT_SET(LVar3, MODEL_o33) + EVT_EXEC(EnterDoubleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_EQ(kpa_61_ENTRY_1) + EVT_SET(LVar0, kpa_61_ENTRY_1) + EVT_SET(LVar2, MODEL_o37) + EVT_SET(LVar3, MODEL_o38) + EVT_EXEC(EnterDoubleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TexPan_Clouds) = { + EVT_CALL(EnableTexPanning, MODEL_kumo1, TRUE) + EVT_CALL(EnableTexPanning, MODEL_kumo2, TRUE) + EVT_CALL(EnableTexPanning, MODEL_kumo3, TRUE) + EVT_CALL(EnableTexPanning, MODEL_kumo4, TRUE) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_1) + TEX_PAN_PARAMS_STEP( -90, 0, 0, 0) + TEX_PAN_PARAMS_FREQ( 1, 1, 1, 1) + TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) + EVT_EXEC(N(EVS_UpdateTexturePan)) + EVT_END_THREAD + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_2) + TEX_PAN_PARAMS_STEP( -130, 0, 0, 0) + TEX_PAN_PARAMS_FREQ( 1, 1, 1, 1) + TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) + EVT_EXEC(N(EVS_UpdateTexturePan)) + EVT_END_THREAD + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_3) + TEX_PAN_PARAMS_STEP( -120, 0, 0, 0) + TEX_PAN_PARAMS_FREQ( 1, 1, 1, 1) + TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) + EVT_EXEC(N(EVS_UpdateTexturePan)) + EVT_END_THREAD + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_4) + TEX_PAN_PARAMS_STEP( -70, 0, 0, 0) + TEX_PAN_PARAMS_FREQ( 1, 1, 1, 1) + TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) + EVT_EXEC(N(EVS_UpdateTexturePan)) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_EXEC(N(EVS_TexPan_Clouds)) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_61/kpa_61_3_npc.c b/src/world/area_kpa/kpa_61/kpa_61_3_npc.c new file mode 100644 index 0000000000..046fe769a1 --- /dev/null +++ b/src/world/area_kpa/kpa_61/kpa_61_3_npc.c @@ -0,0 +1,110 @@ +#include "kpa_61.h" + +#include "world/common/enemy/complete/Koopatrol_Wander.inc.c" +#include "world/common/enemy/complete/FlyingMagikoopa.inc.c" + +StaticNpc N(NpcData_Koopatrol_01) = { + .id = NPC_Koopatrol_01, + .settings = &N(NpcSettings_Koopatrol_Wander), + .pos = { 300.0f, -160.0f, 140.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .drops = KOOPATROL_DROPS, + .territory = { + .wander = { + .isFlying = FALSE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 300, -160, 140 }, + .wanderSize = { 50 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 300, -160, 140 }, + .detectSize = { 200 }, + } + }, + .animations = KOOPATROL_ANIMS, +}; + +StaticNpc N(NpcData_Koopatrol_02) = { + .id = NPC_Koopatrol_02, + .settings = &N(NpcSettings_Koopatrol_Wander), + .pos = { 850.0f, -160.0f, 390.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .drops = KOOPATROL_DROPS, + .territory = { + .wander = { + .isFlying = FALSE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 850, -160, 390 }, + .wanderSize = { 50 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 850, -160, 390 }, + .detectSize = { 200 }, + } + }, + .animations = KOOPATROL_ANIMS, +}; + +StaticNpc N(NpcData_FlyingMagikoopa_01)[] = { + { + .id = NPC_FlyingMagikoopa_01, + .settings = &N(NpcSettings_FlyingMagikoopa), + .pos = { 500.0f, 250.0f, -50.0f }, + .yaw = 90, + .flags = ENEMY_FLAGS_800, + .drops = FLYING_MAGIKOOPA_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 500, 250, -50 }, + .wanderSize = { 120, 25 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 500, 250, -50 }, + .detectSize = { 200 }, + } + }, + .animations = FLYING_MAGIKOOPA_ANIMS, + .extraAnimations = N(ExtraAnims_FlyingMagikoopa), + .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, + }, + FLYING_MAGIKOOPA_SPELL_HITBOX(NPC_FlyingMagikoopa_01_Spell), +}; + +StaticNpc N(NpcData_FlyingMagikoopa_02)[] = { + { + .id = NPC_FlyingMagikoopa_02, + .settings = &N(NpcSettings_FlyingMagikoopa), + .pos = { 200.0f, 250.0f, -50.0f }, + .yaw = 90, + .flags = ENEMY_FLAGS_800, + .drops = FLYING_MAGIKOOPA_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 200, 250, -50 }, + .wanderSize = { 120, 25 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 200, 250, -50 }, + .detectSize = { 200 }, + } + }, + .animations = FLYING_MAGIKOOPA_ANIMS, + .extraAnimations = N(ExtraAnims_FlyingMagikoopa), + .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, + }, + FLYING_MAGIKOOPA_SPELL_HITBOX(NPC_FlyingMagikoopa_02_Spell), +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Koopatrol_01), BTL_KPA_FORMATION_23, BTL_KPA_STAGE_08), + NPC_GROUP(N(NpcData_Koopatrol_02), BTL_KPA_FORMATION_21, BTL_KPA_STAGE_08), + NPC_GROUP(N(NpcData_FlyingMagikoopa_01), BTL_KPA_FORMATION_35, BTL_KPA_STAGE_08), + NPC_GROUP(N(NpcData_FlyingMagikoopa_02), BTL_KPA_FORMATION_33, BTL_KPA_STAGE_08), + {} +}; diff --git a/src/world/area_kpa/kpa_61/kpa_61_4_entity.c b/src/world/area_kpa/kpa_61/kpa_61_4_entity.c new file mode 100644 index 0000000000..e5d50a67ca --- /dev/null +++ b/src/world/area_kpa/kpa_61/kpa_61_4_entity.c @@ -0,0 +1,14 @@ +#include "kpa_61.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), -225, -100, 175, 0, ITEM_SUPER_SHROOM, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_KPA61_ItemBlock_SuperShroomA) + EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), 60, -100, 60, 0, ITEM_MAPLE_SYRUP, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_KPA61_ItemBlock_MapleSyrup) + EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), 575, -100, 60, 0, ITEM_SUPER_SHROOM, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_KPA61_ItemBlock_SuperShroomB) + EVT_CALL(MakeItemEntity, ITEM_JAMMIN_JELLY, 1070, -40, 320, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_KPA61_Item_JamminJelly) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_62/A72220.c b/src/world/area_kpa/kpa_62/A72220.c deleted file mode 100644 index 9fad1ecd8c..0000000000 --- a/src/world/area_kpa/kpa_62/A72220.c +++ /dev/null @@ -1,10 +0,0 @@ -#include "kpa_62.h" - -static char* N(exit_str_0) = "kpa_70"; -static char* N(exit_str_1) = "kpa_10"; -static char* N(exit_str_2) = "kpa_11"; -static char* N(exit_str_3) = "kpa_63"; - -#include "world/common/todo/RemovePadlock.inc.c" - -#include "world/common/todo/GetEntityPosition.inc.c" diff --git a/src/world/area_kpa/kpa_62/A72300.c b/src/world/area_kpa/kpa_62/A72300.c deleted file mode 100644 index 9eecc4abfc..0000000000 --- a/src/world/area_kpa/kpa_62/A72300.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "kpa_62.h" - -#include "world/common/atomic/TexturePan.inc.c" - diff --git a/src/world/area_kpa/kpa_62/kpa_62.h b/src/world/area_kpa/kpa_62/kpa_62.h index ddefafa141..0bfe093143 100644 --- a/src/world/area_kpa/kpa_62/kpa_62.h +++ b/src/world/area_kpa/kpa_62/kpa_62.h @@ -2,8 +2,20 @@ /// @brief Bowser's Castle - Front Door Exterior #include "common.h" -#include "../kpa.h" #include "message_ids.h" #include "map.h" +#include "../kpa.h" +#include "mapfs/kpa_62_shape.h" +#include "mapfs/kpa_62_hit.h" + +enum { + MV_PadLockEntityID = MapVar(0), +}; + #define NAMESPACE kpa_62 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_ExitDoors_kpa_70_0); +extern EvtScript N(EVS_MakeEntities); diff --git a/src/world/area_kpa/kpa_62/kpa_62_0_header.c b/src/world/area_kpa/kpa_62/kpa_62_0_header.c new file mode 100644 index 0000000000..aaf6a5b732 --- /dev/null +++ b/src/world/area_kpa/kpa_62/kpa_62_0_header.c @@ -0,0 +1,16 @@ +#include "kpa_62.h" + +EntryList N(Entrances) = { + [kpa_62_ENTRY_0] { -191.0, 0.0, -135.0, 180.0 }, + [kpa_62_ENTRY_1] { 276.0, 0.0, -305.0, 180.0 }, + [kpa_62_ENTRY_2] { 386.0, -45.0, -231.0, 180.0 }, + [kpa_62_ENTRY_3] { 75.0, 21.0, 600.0, 90.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_kpa_62 }, +}; diff --git a/src/world/area_kpa/kpa_62/kpa_62_1_music.c b/src/world/area_kpa/kpa_62/kpa_62_1_music.c new file mode 100644 index 0000000000..0d75ad30e9 --- /dev/null +++ b/src/world/area_kpa/kpa_62/kpa_62_1_music.c @@ -0,0 +1,17 @@ +#include "kpa_62.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) + EVT_IF_EQ(GF_KPA16_ShutOffLava, FALSE) + EVT_CALL(PlayAmbientSounds, AMBIENT_UNDER_SEA5) + EVT_ELSE + EVT_CALL(ClearAmbientSounds, 250) + EVT_END_IF + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetMusicTrackVolumes, TRACK_VOLS_KPA_OUTSIDE) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_62/kpa_62_2_entity.c b/src/world/area_kpa/kpa_62/kpa_62_2_entity.c new file mode 100644 index 0000000000..eecb6509c1 --- /dev/null +++ b/src/world/area_kpa/kpa_62/kpa_62_2_entity.c @@ -0,0 +1,50 @@ +#include "kpa_62.h" +#include "entity.h" + +#include "world/common/todo/RemovePadlock.inc.c" +#include "world/common/todo/GetEntityPosition.inc.c" + +s32 N(KeyList_FrontDoor)[] = { + ITEM_BOWSER_CASTLE_KEY, + ITEM_NONE +}; + +EvtScript N(EVS_UnlockPrompt_FrontDoor) = { + EVT_CALL(ShowKeyChoicePopup) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_00D8, 160, 40) + EVT_CALL(CloseChoicePopup) + EVT_RETURN + EVT_END_IF + EVT_IF_EQ(LVar0, -1) + EVT_CALL(CloseChoicePopup) + EVT_RETURN + EVT_END_IF + EVT_CALL(RemoveKeyItemAt, LVar1) + EVT_SET(GF_KPA62_UnlockedFrontDoor, TRUE) + EVT_CALL(N(GetEntityPosition), MV_PadLockEntityID, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_269, 0, LVar0, LVar1, LVar2) + EVT_SET(LVar0, MV_PadLockEntityID) + EVT_CALL(N(RemovePadlock)) + EVT_SET(LVar1, 0) + EVT_WAIT(5) + EVT_CALL(CloseChoicePopup) + EVT_UNBIND + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kpa_70_0)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittn, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_IF_EQ(GF_KPA62_UnlockedFrontDoor, FALSE) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Padlock), -200, 10, -207, 0, MAKE_ENTITY_END) + EVT_SET(MV_PadLockEntityID, LVar0) + EVT_BIND_PADLOCK(EVT_PTR(N(EVS_UnlockPrompt_FrontDoor)), TRIGGER_WALL_PRESS_A, EVT_ENTITY_INDEX(0), EVT_PTR(N(KeyList_FrontDoor)), 0, 1) + EVT_ELSE + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kpa_70_0)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittn, 1, 0) + EVT_END_IF + EVT_CALL(MakeEntity, EVT_PTR(Entity_RedBlock), -532, 145, -59, 0, ITEM_DEEP_FOCUS3, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_KPA62_BadgeBlock_DeepFocus3) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_62/kpa_62_3_main.c b/src/world/area_kpa/kpa_62/kpa_62_3_main.c new file mode 100644 index 0000000000..e4689028da --- /dev/null +++ b/src/world/area_kpa/kpa_62/kpa_62_3_main.c @@ -0,0 +1,235 @@ +#include "kpa_62.h" + +#include "world/common/atomic/TexturePan.inc.c" +#include "world/common/atomic/TexturePan.data.inc.c" + +EvtScript N(EVS_OpenAirshipDockDoor) = { + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitts, SOUND_1DF, 0) + EVT_CALL(EnableModel, MODEL_o1616, FALSE) + EVT_CALL(MakeLerp, 0, -10, 20, EASING_CUBIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, MODEL_o1650, LVar0, 0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(MakeLerp, 0, 45, 25, EASING_CUBIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, MODEL_o1650, -10, 0, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_CloseAirshipDockDoor) = { + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitts, SOUND_1E0, 0) + EVT_CALL(MakeLerp, 45, 0, 25, EASING_CUBIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, MODEL_o1650, -10, 0, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(MakeLerp, -10, 0, 20, EASING_CUBIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, MODEL_o1650, LVar0, 0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(EnableModel, MODEL_o1616, TRUE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitDoors_kpa_70_0) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_SET(LVar0, kpa_62_ENTRY_0) + EVT_SET(LVar1, COLLIDER_deilittn) + EVT_SET(LVar2, MODEL_o1647) + EVT_SET(LVar3, MODEL_o1646) + EVT_EXEC(ExitDoubleDoor) + EVT_WAIT(17) + EVT_CALL(GotoMap, EVT_PTR("kpa_70"), kpa_70_ENTRY_0) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitWalk_kpa_1X_Upper) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(UseExitHeading, 60, kpa_62_ENTRY_1) + EVT_EXEC(ExitWalk) + EVT_IF_EQ(GF_KPA16_ShutOffLava, FALSE) + EVT_CALL(GotoMap, EVT_PTR("kpa_11"), kpa_11_ENTRY_0) + EVT_ELSE + EVT_CALL(GotoMap, EVT_PTR("kpa_10"), kpa_10_ENTRY_0) + EVT_END_IF + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitWalk_kpa_1X_Lower) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(UseExitHeading, 60, kpa_62_ENTRY_2) + EVT_EXEC(ExitWalk) + EVT_IF_EQ(GF_KPA16_ShutOffLava, FALSE) + EVT_CALL(GotoMap, EVT_PTR("kpa_11"), kpa_11_ENTRY_3) + EVT_ELSE + EVT_CALL(GotoMap, EVT_PTR("kpa_10"), kpa_10_ENTRY_3) + EVT_END_IF + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitDoor_kpa_63_0) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_EXEC_WAIT(N(EVS_OpenAirshipDockDoor)) + EVT_WAIT(15) + EVT_CALL(UseExitHeading, 60, kpa_62_ENTRY_3) + EVT_EXEC(ExitWalk) + EVT_CALL(GotoMap, EVT_PTR("kpa_63"), kpa_63_ENTRY_0) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterFromAirshipDock) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetPlayerPos, -30, 21, 590) + EVT_CALL(SetNpcPos, NPC_PARTNER, -30, 21, 590) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_40, TRUE) + EVT_CALL(EnableModel, MODEL_o1616, FALSE) + EVT_CALL(TranslateModel, MODEL_o1650, -10, 0, 45) + EVT_THREAD + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) + EVT_CALL(PlayerMoveTo, 75, 580, 0) + EVT_END_THREAD + EVT_WAIT(15) + EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(3.0)) + EVT_CALL(NpcMoveTo, NPC_PARTNER, 65, 600, 0) + EVT_EXEC_WAIT(N(EVS_CloseAirshipDockDoor)) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_40, FALSE) + EVT_CALL(EnablePartnerAI) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_1X_Upper)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilise, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_1X_Lower)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoor_kpa_63_0)), TRIGGER_WALL_PRESS_A, COLLIDER_deilitts, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_DisableLavaCollision) = { + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o1710, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o1508, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o1705, COLLIDER_FLAGS_UPPER_MASK) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(kpa_62_ENTRY_0) + EVT_EXEC_WAIT(N(EVS_DisableLavaCollision)) + EVT_SET(LVar2, MODEL_o1647) + EVT_SET(LVar3, MODEL_o1646) + EVT_EXEC_WAIT(EnterDoubleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_EQ(kpa_62_ENTRY_1) + EVT_EXEC_WAIT(N(EVS_DisableLavaCollision)) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_WAIT(1) + EVT_CASE_EQ(kpa_62_ENTRY_2) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_WAIT(1) + EVT_CASE_EQ(kpa_62_ENTRY_3) + EVT_EXEC_WAIT(N(EVS_DisableLavaCollision)) + EVT_THREAD + EVT_EXEC_WAIT(N(EVS_EnterFromAirshipDock)) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_END_THREAD + EVT_CASE_DEFAULT + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_WAIT(1) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TexPan_Lava) = { + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_0) + TEX_PAN_PARAMS_STEP( -400, 0, -800, 0) + TEX_PAN_PARAMS_FREQ( 1, 0, 1, 0) + TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) + EVT_EXEC(N(EVS_UpdateTexturePan)) + EVT_END_THREAD + EVT_CALL(SetTexPanner, MODEL_o1508, TEX_PANNER_0) + EVT_RETURN + EVT_END +}; + +LavaReset N(SafeFloorColliders)[] = { + { .colliderID = COLLIDER_o1559, .pos = { -455.0, -15.0, 35.0 }}, + { .colliderID = COLLIDER_o1560, .pos = { -545.0, 10.0, 15.0 }}, + { .colliderID = COLLIDER_o1692, .pos = { -426.0, -35.0, 70.0 }}, + { .colliderID = -1 } +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_ALT_NO_LEAD() + EVT_SET(GF_MAP_BowsersCastle, TRUE) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_EnterMap)) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_IF_EQ(GF_KPA16_ShutOffLava, FALSE) + EVT_CALL(EnableGroup, MODEL_after, FALSE) + EVT_EXEC(N(EVS_TexPan_Lava)) + EVT_ELSE + EVT_CALL(EnableGroup, MODEL_before, FALSE) + EVT_END_IF + EVT_IF_EQ(GF_KPA16_ShutOffLava, FALSE) + EVT_THREAD + EVT_WAIT(3) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o1508, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_deilie, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o1705, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o1706, SURFACE_TYPE_LAVA) + EVT_THREAD + EVT_CALL(ResetFromLava, EVT_PTR(N(SafeFloorColliders))) + EVT_END_THREAD + EVT_END_THREAD + EVT_END_IF + EVT_RETURN + EVT_END +}; + + diff --git a/src/world/area_kpa/kpa_63/A735B0.c b/src/world/area_kpa/kpa_63/A735B0.c deleted file mode 100644 index e2906ad1ec..0000000000 --- a/src/world/area_kpa/kpa_63/A735B0.c +++ /dev/null @@ -1,54 +0,0 @@ -#include "kpa_63.h" - -static char* N(exit_str_0) = "kpa_62"; -static char* N(exit_str_1) = "kpa_60"; - -ApiStatus func_80240000_A735B0(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - Npc* partner; - f32 x, y, z; - f32 yBase; - f32 angle; - f32 var_f20; - - if (isInitialCall) { - script->functionTemp[0] = evt_get_variable(script, *args++); - yBase = evt_get_variable(script, *args++); - angle = evt_get_variable(script, *args++); - switch (script->functionTemp[0]) { - case 0: - var_f20 = 0.0f; - break; - case 1: - var_f20 = 5.0f; - break; - } - } - - x = (sin_deg(angle) * var_f20) + -120.0f; - y = yBase - 11.0f; - z = (cos_deg(angle) * var_f20) + 225.0f; - - switch (script->functionTemp[0]) { - case 0: - gPlayerStatus.position.x = x; - gPlayerStatus.position.y = y; - gPlayerStatus.position.z = z; - break; - case 1: - partner = get_npc_safe(NPC_PARTNER); - if (partner != NULL) { - partner->pos.x = x; - partner->pos.y = y; - partner->pos.z = z; - partner->colliderPos.x = partner->pos.x; - partner->colliderPos.y = partner->pos.y; - partner->colliderPos.z = partner->pos.z; - partner->flags |= NPC_FLAG_DIRTY_SHADOW; - } - break; - default: - return ApiStatus_DONE2; - } - return ApiStatus_DONE2; -} diff --git a/src/world/area_kpa/kpa_63/kpa_63.h b/src/world/area_kpa/kpa_63/kpa_63.h index dde91e64ad..217eb2080e 100644 --- a/src/world/area_kpa/kpa_63/kpa_63.h +++ b/src/world/area_kpa/kpa_63/kpa_63.h @@ -2,8 +2,25 @@ /// @brief Bowser's Castle - Hanger #include "common.h" -#include "../kpa.h" #include "message_ids.h" #include "map.h" +#include "../kpa.h" +#include "mapfs/kpa_63_shape.h" +#include "mapfs/kpa_63_hit.h" + +enum { + MV_Starship_PosY = MapVar(10), + MV_Starship_Yaw = MapVar(11), + MV_PlayerOnBoard = MapVar(12), + MV_PartnerOnBoard = MapVar(13), +}; + #define NAMESPACE kpa_63 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_Starship_Arrive); +extern EvtScript N(EVS_Starship_Depart); +extern EvtScript N(EVS_SetupStarship); +extern EvtScript N(EVS_MakeEntities); diff --git a/src/world/area_kpa/kpa_63/kpa_63_0_header.c b/src/world/area_kpa/kpa_63/kpa_63_0_header.c new file mode 100644 index 0000000000..7d3485ab96 --- /dev/null +++ b/src/world/area_kpa/kpa_63/kpa_63_0_header.c @@ -0,0 +1,13 @@ +#include "kpa_63.h" + +EntryList N(Entrances) = { + [kpa_63_ENTRY_0] { 160.0, 0.0, 240.0, 0.0 }, + [kpa_63_ENTRY_1] { -40.0, 0.0, 225.0, 90.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_kpa_63 }, +}; diff --git a/src/world/area_kpa/kpa_63/kpa_63_1_music.c b/src/world/area_kpa/kpa_63/kpa_63_1_music.c new file mode 100644 index 0000000000..77d1f7b4ba --- /dev/null +++ b/src/world/area_kpa/kpa_63/kpa_63_1_music.c @@ -0,0 +1,27 @@ +#include "kpa_63.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(GetLoadType, LVar0) + EVT_IF_EQ(LVar0, 1) + EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetMusicTrackVolumes, TRACK_VOLS_KPA_OUTSIDE) + EVT_END_THREAD + EVT_CALL(ClearAmbientSounds, 250) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_RETURN + EVT_END_IF + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, kpa_63_ENTRY_0) + EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetMusicTrackVolumes, TRACK_VOLS_KPA_OUTSIDE) + EVT_END_THREAD + EVT_END_IF + EVT_CALL(ClearAmbientSounds, 250) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_63/kpa_63_2_entity.c b/src/world/area_kpa/kpa_63/kpa_63_2_entity.c new file mode 100644 index 0000000000..8ff5a0a3c5 --- /dev/null +++ b/src/world/area_kpa/kpa_63/kpa_63_2_entity.c @@ -0,0 +1,8 @@ +#include "kpa_63.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_SavePoint), 120, 60, 90, 0, MAKE_ENTITY_END) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_63/kpa_63_3_main.c b/src/world/area_kpa/kpa_63/kpa_63_3_main.c new file mode 100644 index 0000000000..bb11bc68d0 --- /dev/null +++ b/src/world/area_kpa/kpa_63/kpa_63_3_main.c @@ -0,0 +1,89 @@ +#include "kpa_63.h" + +EvtScript N(EVS_OpenHangerDoor) = { + EVT_CALL(PlaySoundAtCollider, COLLIDER_tts, SOUND_1DF, 0) + EVT_CALL(MakeLerp, 100, 0, 20, EASING_CUBIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_SETF(LVar5, LVar0) + EVT_MULF(LVar5, EVT_FLOAT(0.01)) + EVT_CALL(ScaleGroup, MODEL_g75, LVar5, 1, 1) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_CloseHangerDoor) = { + EVT_CALL(MakeLerp, 0, 100, 20, EASING_CUBIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_SETF(LVar5, LVar0) + EVT_MULF(LVar5, EVT_FLOAT(0.01)) + EVT_CALL(ScaleGroup, MODEL_g75, LVar5, 1, 1) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(PlaySoundAtCollider, COLLIDER_tts, SOUND_1E0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitDoor_kpa_62_3) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_EXEC(N(EVS_OpenHangerDoor)) + EVT_WAIT(15) + EVT_CALL(UseExitHeading, 60, kpa_63_ENTRY_0) + EVT_EXEC(ExitWalk) + EVT_CALL(GotoMap, EVT_PTR("kpa_62"), kpa_62_ENTRY_3) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoor_kpa_62_3)), TRIGGER_WALL_PRESS_A, COLLIDER_tts, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetLoadType, LVar0) + EVT_IF_EQ(LVar0, LOAD_FROM_FILE_SELECT) + EVT_EXEC(EnterSavePoint) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_RETURN + EVT_END_IF + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, kpa_63_ENTRY_1) + EVT_EXEC(N(EVS_Starship_Arrive)) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_ELSE + EVT_EXEC(N(EVS_CloseHangerDoor)) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_WAIT(1) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_ALT_NO_LEAD() + EVT_SET(GF_MAP_BowsersCastle, TRUE) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_EnterMap)) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_Starship_Depart)), TRIGGER_FLOOR_TOUCH, COLLIDER_o400, 1, 0) + EVT_EXEC(N(EVS_SetupStarship)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_63/kpa_63_4_scenes.c b/src/world/area_kpa/kpa_63/kpa_63_4_scenes.c new file mode 100644 index 0000000000..bc9ad82201 --- /dev/null +++ b/src/world/area_kpa/kpa_63/kpa_63_4_scenes.c @@ -0,0 +1,251 @@ +#include "kpa_63.h" + +API_CALLABLE(N(SetPassengerPos)) { + Bytecode* args = script->ptrReadPos; + Npc* partner; + f32 x, y, z; + f32 yBase; + f32 angle; + f32 radius; + + if (isInitialCall) { + script->functionTemp[0] = evt_get_variable(script, *args++); + yBase = evt_get_variable(script, *args++); + angle = evt_get_variable(script, *args++); + switch (script->functionTemp[0]) { + case 0: + radius = 0.0f; + break; + case 1: + radius = 5.0f; + break; + } + } + + x = (sin_deg(angle) * radius) + -120.0f; + y = yBase - 11.0f; + z = (cos_deg(angle) * radius) + 225.0f; + + switch (script->functionTemp[0]) { + case 0: + gPlayerStatus.position.x = x; + gPlayerStatus.position.y = y; + gPlayerStatus.position.z = z; + break; + case 1: + partner = get_npc_safe(NPC_PARTNER); + if (partner != NULL) { + partner->pos.x = x; + partner->pos.y = y; + partner->pos.z = z; + partner->colliderPos.x = partner->pos.x; + partner->colliderPos.y = partner->pos.y; + partner->colliderPos.z = partner->pos.z; + partner->flags |= NPC_FLAG_DIRTY_SHADOW; + } + break; + default: + return ApiStatus_DONE2; + } + return ApiStatus_DONE2; +} + +EvtScript N(EVS_UpdatePassengers) = { + EVT_IF_EQ(MV_PlayerOnBoard, TRUE) + EVT_CALL(N(SetPassengerPos), 0, LVar3, MV_Starship_Yaw) + EVT_END_IF + EVT_IF_EQ(MV_PartnerOnBoard, TRUE) + EVT_CALL(N(SetPassengerPos), 1, LVar3, MV_Starship_Yaw) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Starship_Update) = { + EVT_LABEL(0) + EVT_CALL(MakeLerp, 0, 100, 30, EASING_COS_IN_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_SETF(LVar3, LVar0) + EVT_MULF(LVar3, EVT_FLOAT(0.1)) + EVT_ADDF(LVar3, MV_Starship_PosY) + EVT_CALL(TranslateGroup, MODEL_g55, 0, LVar3, 0) + EVT_CALL(RotateGroup, MODEL_g55, MV_Starship_Yaw, 0, 1, 0) + EVT_EXEC(N(EVS_UpdatePassengers)) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(MakeLerp, 100, 0, 30, EASING_COS_IN_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_SETF(LVar3, LVar0) + EVT_MULF(LVar3, EVT_FLOAT(0.1)) + EVT_ADDF(LVar3, MV_Starship_PosY) + EVT_CALL(TranslateGroup, MODEL_g55, 0, LVar3, 0) + EVT_CALL(RotateGroup, MODEL_g55, MV_Starship_Yaw, 0, 1, 0) + EVT_EXEC(N(EVS_UpdatePassengers)) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Starship_Depart) = { + EVT_CALL(GetPartnerInUse, LVar9) + EVT_IF_NE(LVar9, PARTNER_NONE) + EVT_RETURN + EVT_END_IF + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(HidePlayerShadow, TRUE) + EVT_CALL(GetModelCenter, MODEL_o308) + EVT_ADD(LVar0, -5) + EVT_CALL(SetPlayerJumpscale, 0) + EVT_CALL(PlayerJump2, LVar0, LVar1, LVar2, 2) + EVT_CALL(SetPlayerActionState, ACTION_STATE_LAND) + EVT_SET(MV_PlayerOnBoard, TRUE) + EVT_CALL(InterpPlayerYaw, 225, 0) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(DisablePartnerAI, 0) + EVT_ADD(LVar2, 10) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_40 | NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcJumpscale, NPC_PARTNER, 1) + EVT_CALL(NpcJump0, NPC_PARTNER, LVar0, LVar1, LVar2, 15) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_SET(MV_PartnerOnBoard, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(EnableNpcShadow, NPC_PARTNER, FALSE) + EVT_WAIT(10) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_0188, 160, 40) + EVT_CALL(ShowChoice, MSG_Choice_000C) + EVT_CALL(CloseMessage) + EVT_IF_EQ(LVar0, 1) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(SetPlayerJumpscale, 2) + EVT_SET(MV_PlayerOnBoard, FALSE) + EVT_CALL(PlayerJump, -50, 0, 225, 13) + EVT_CALL(HidePlayerShadow, FALSE) + EVT_CALL(SetPlayerActionState, ACTION_STATE_LAND) + EVT_SET(MV_PartnerOnBoard, FALSE) + EVT_CALL(PartnerIsFlying, LVar0) + EVT_IF_EQ(LVar0, TRUE) + EVT_WAIT(10) + EVT_CALL(SetNpcJumpscale, NPC_PARTNER, 2) + EVT_CALL(NpcJump0, NPC_PARTNER, -65, 0, 225, 13) + EVT_END_IF + EVT_CALL(EnableNpcShadow, NPC_PARTNER, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_40, FALSE) + EVT_CALL(EnablePartnerAI) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END_IF + EVT_CALL(SetMusicTrack, 0, SONG_STARSHIP_THEME, 1, 8) + EVT_THREAD + EVT_CALL(PlaySoundAtPlayer, SOUND_17E, 0) + EVT_SET(LVar2, MV_Starship_PosY) + EVT_CALL(MakeLerp, 0, -110, 60, EASING_QUADRATIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_ADD(LVar0, LVar2) + EVT_SET(MV_Starship_PosY, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_WAIT(50) + EVT_CALL(GotoMap, EVT_PTR("kpa_60"), kpa_60_ENTRY_5) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Starship_Arrive) = { + EVT_SET(MV_Starship_PosY, -100) + EVT_SET(MV_Starship_Yaw, 180) + EVT_SET(MV_PlayerOnBoard, TRUE) + EVT_SET(MV_PartnerOnBoard, TRUE) + EVT_CALL(InterpPlayerYaw, 90, 0) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(SetPlayerActionState, ACTION_STATE_LAND) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -120, 0, 230) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -120, 0, 230) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(HidePlayerShadow, FALSE) + EVT_CALL(EnableNpcShadow, NPC_PARTNER, TRUE) + EVT_EXEC_GET_TID(N(EVS_UpdatePassengers), LVar9) + EVT_CALL(PlaySoundAtPlayer, SOUND_17F, 0) + EVT_THREAD + EVT_CALL(MakeLerp, -100, 0, 60, EASING_QUADRATIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_SET(MV_Starship_PosY, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_WAIT(20) + EVT_THREAD + EVT_CALL(InterpPlayerYaw, 270, 40) + EVT_END_THREAD + EVT_CALL(MakeLerp, 180, 0, 60, EASING_QUADRATIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_SET(MV_Starship_Yaw, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_KILL_THREAD(LVar9) + EVT_CALL(SetPlayerJumpscale, 2) + EVT_SET(MV_PlayerOnBoard, FALSE) + EVT_CALL(PlayerJump, -50, 0, 225, 13) + EVT_CALL(HidePlayerShadow, FALSE) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_SET(MV_PartnerOnBoard, FALSE) + EVT_CALL(PartnerIsFlying, LVar0) + EVT_IF_EQ(LVar0, TRUE) + EVT_WAIT(10) + EVT_CALL(SetNpcJumpscale, NPC_PARTNER, 2) + EVT_CALL(NpcJump0, NPC_PARTNER, -65, 0, 225, 13) + EVT_END_IF + EVT_CALL(EnableNpcShadow, NPC_PARTNER, TRUE) + EVT_CALL(EnablePartnerAI) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_WAIT(10) + EVT_IF_LT(GB_StoryProgress, STORY_CH8_REACHED_BOWSERS_CASTLE) + EVT_SET(GB_StoryProgress, STORY_CH8_REACHED_BOWSERS_CASTLE) + EVT_END_IF + EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetMusicTrackVolumes, TRACK_VOLS_KPA_OUTSIDE) + EVT_END_THREAD + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupStarship) = { + EVT_EXEC(N(EVS_Starship_Update)) + EVT_CALL(ParentColliderToModel, COLLIDER_o400, MODEL_o308) + EVT_LOOP(0) + EVT_CALL(UpdateColliderTransform, COLLIDER_o400) + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_70/A74870.c b/src/world/area_kpa/kpa_70/A74870.c deleted file mode 100644 index eb30be73c0..0000000000 --- a/src/world/area_kpa/kpa_70/A74870.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "kpa_70.h" - -static char* N(exit_str_0) = "kpa_62"; -static char* N(exit_str_1) = "kpa_50"; - -#include "world/common/atomic/TexturePan.inc.c" - diff --git a/src/world/area_kpa/kpa_70/A74B80.c b/src/world/area_kpa/kpa_70/A74B80.c deleted file mode 100644 index 832d06afec..0000000000 --- a/src/world/area_kpa/kpa_70/A74B80.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "kpa_70.h" - -#include "world/common/enemy/ai/TackleAI.inc.c" diff --git a/src/world/area_kpa/kpa_70/kpa_70.h b/src/world/area_kpa/kpa_70/kpa_70.h index cf019db766..aeccc7a1a0 100644 --- a/src/world/area_kpa/kpa_70/kpa_70.h +++ b/src/world/area_kpa/kpa_70/kpa_70.h @@ -2,8 +2,29 @@ /// @brief Bowser's Castle - Entry Lava Hall #include "common.h" -#include "../kpa.h" #include "message_ids.h" #include "map.h" +#include "../kpa.h" +#include "mapfs/kpa_70_shape.h" +#include "mapfs/kpa_70_hit.h" + +#include "animation_script.h" + +enum { + NPC_Koopatrol_01 = 0, + NPC_Koopatrol_02 = 1, +}; + #define NAMESPACE kpa_70 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern NpcGroupList N(DefaultNPCs); + +extern StaticAnimatorNode* N(ChainDriveSkeleton)[]; +extern AnimScript N(AS_ChainDriveAnim); + +ApiStatus InitAnimatedModels(Evt* script, s32 isInitialCall); +ApiStatus SetAnimatedModelRenderMode(Evt* script, s32 isInitialCall); +ApiStatus DeleteAnimatedModel(Evt* script, s32 isInitialCall); diff --git a/src/world/area_kpa/kpa_70/kpa_70_0_header.c b/src/world/area_kpa/kpa_70/kpa_70_0_header.c new file mode 100644 index 0000000000..b64a2745a9 --- /dev/null +++ b/src/world/area_kpa/kpa_70/kpa_70_0_header.c @@ -0,0 +1,13 @@ +#include "kpa_70.h" + +EntryList N(Entrances) = { + [kpa_70_ENTRY_0] { 13.0, 0.0, 134.0, 90.0 }, + [kpa_70_ENTRY_1] { 1233.0, 0.0, 126.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_kpa_70 }, +}; diff --git a/src/world/area_kpa/kpa_70/kpa_70_1_music.c b/src/world/area_kpa/kpa_70/kpa_70_1_music.c new file mode 100644 index 0000000000..e847f14749 --- /dev/null +++ b/src/world/area_kpa/kpa_70/kpa_70_1_music.c @@ -0,0 +1,13 @@ +#include "kpa_70.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) + EVT_CALL(PlayAmbientSounds, AMBIENT_UNDER_SEA1) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetMusicTrackVolumes, TRACK_VOLS_KPA_1) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_70/kpa_70_2_main.c b/src/world/area_kpa/kpa_70/kpa_70_2_main.c new file mode 100644 index 0000000000..e7341c369f --- /dev/null +++ b/src/world/area_kpa/kpa_70/kpa_70_2_main.c @@ -0,0 +1,109 @@ +#include "kpa_70.h" + +#include "world/common/atomic/TexturePan.inc.c" +#include "world/common/atomic/TexturePan.data.inc.c" + +EvtScript N(EVS_SetupChainDrive) = { + EVT_CALL(LoadAnimatedModel, 0, EVT_PTR(N(ChainDriveSkeleton))) + EVT_CALL(PlayModelAnimation, 0, EVT_PTR(N(AS_ChainDriveAnim))) + EVT_CALL(SetAnimatedModelRootPosition, 0, 0, 0, 0) + EVT_CALL(SetAnimatedModelRenderMode, 0, RENDER_MODE_SURFACE_OPA) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitDoors_kpa_62_0) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_WAIT(3) + EVT_SET(LVar0, kpa_70_ENTRY_0) + EVT_SET(LVar1, COLLIDER_deilittw) + EVT_SET(LVar2, MODEL_o1431) + EVT_SET(LVar3, MODEL_o1432) + EVT_EXEC(ExitDoubleDoor) + EVT_WAIT(17) + EVT_CALL(GotoMap, EVT_PTR("kpa_62"), kpa_62_ENTRY_0) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitWalk_kpa_50_0) = EVT_EXIT_WALK(60, kpa_70_ENTRY_1, "kpa_50", kpa_50_ENTRY_0); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_50_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TexPan_Lava) = { + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_0) + TEX_PAN_PARAMS_STEP( -400, 0, -800, 0) + TEX_PAN_PARAMS_FREQ( 1, 0, 1, 0) + TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) + EVT_EXEC(N(EVS_UpdateTexturePan)) + EVT_END_THREAD + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_1) + TEX_PAN_PARAMS_STEP( 1000, 0, 2000, 0) + TEX_PAN_PARAMS_FREQ( 1, 0, 1, 0) + TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) + EVT_EXEC(N(EVS_UpdateTexturePan)) + EVT_END_THREAD + EVT_CALL(SetTexPanner, MODEL_o1558, TEX_PANNER_0) + EVT_CALL(SetTexPanner, MODEL_o1825, TEX_PANNER_0) + EVT_CALL(SetTexPanner, MODEL_m01, TEX_PANNER_1) + EVT_CALL(SetTexPanner, MODEL_m02, TEX_PANNER_1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Update_Gears) = { + EVT_SET(LVar0, 0) + EVT_LOOP(0) + EVT_CALL(RotateModel, MODEL_o1773, LVar0, 0, 0, 1) + EVT_CALL(RotateModel, MODEL_o1774, LVar0, 0, 0, -1) + EVT_CALL(RotateModel, MODEL_o1777, LVar0, 0, 0, -1) + EVT_ADD(LVar0, 1) + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_CALL(InitAnimatedModels) + EVT_EXEC(N(EVS_SetupChainDrive)) + EVT_THREAD + EVT_CALL(PlaySoundAt, SOUND_80000051, 0, 800, 100, -200) + EVT_WAIT(28) + EVT_LOOP(0) + EVT_CALL(PlaySoundAt, SOUND_222, 0, 800, 100, -200) + EVT_WAIT(90) + EVT_END_LOOP + EVT_END_THREAD + EVT_EXEC(N(EVS_Update_Gears)) + EVT_EXEC(N(EVS_TexPan_Lava)) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kpa_62_0)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittw, 1, 0) + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(kpa_70_ENTRY_0) + EVT_THREAD + EVT_SET(LVar2, MODEL_o1431) + EVT_SET(LVar3, MODEL_o1432) + EVT_EXEC_WAIT(EnterDoubleDoor) + EVT_EXEC_WAIT(N(EVS_BindExitTriggers)) + EVT_END_THREAD + EVT_CASE_EQ(kpa_70_ENTRY_1) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_END_SWITCH + EVT_EXEC(N(EVS_SetupMusic)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_70/kpa_70_3_npc.c b/src/world/area_kpa/kpa_70/kpa_70_3_npc.c new file mode 100644 index 0000000000..e837681fa0 --- /dev/null +++ b/src/world/area_kpa/kpa_70/kpa_70_3_npc.c @@ -0,0 +1,53 @@ +#include "kpa_70.h" + +#include "world/common/enemy/complete/Koopatrol_Wander.inc.c" + +StaticNpc N(NpcData_Koopatrol_01) = { + .id = NPC_Koopatrol_01, + .settings = &N(NpcSettings_Koopatrol_Wander), + .pos = { 435.0f, 10.0f, 125.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_400, + .drops = KOOPATROL_DROPS, + .territory = { + .wander = { + .isFlying = FALSE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 435, 10, 125 }, + .wanderSize = { 50 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 435, 10, 125 }, + .detectSize = { 200 }, + } + }, + .animations = KOOPATROL_ANIMS, +}; + +StaticNpc N(NpcData_Koopatrol_02) = { + .id = NPC_Koopatrol_02, + .settings = &N(NpcSettings_Koopatrol_Wander), + .pos = { 815.0f, 10.0f, 125.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_400, + .drops = KOOPATROL_DROPS, + .territory = { + .wander = { + .isFlying = FALSE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 815, 10, 125 }, + .wanderSize = { 50 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 815, 10, 125 }, + .detectSize = { 200 }, + } + }, + .animations = KOOPATROL_ANIMS, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Koopatrol_01), BTL_KPA_FORMATION_18, BTL_KPA_STAGE_02), + NPC_GROUP(N(NpcData_Koopatrol_02), BTL_KPA_FORMATION_19, BTL_KPA_STAGE_02), + {} +}; diff --git a/src/world/area_kpa/kpa_70/kpa_70_4_chain_skele.c b/src/world/area_kpa/kpa_70/kpa_70_4_chain_skele.c new file mode 100644 index 0000000000..1ab4971fd2 --- /dev/null +++ b/src/world/area_kpa/kpa_70/kpa_70_4_chain_skele.c @@ -0,0 +1,83 @@ +#include "kpa_70.h" + +StaticAnimatorNode N(D_802417D0_A76040) = { + .pos = { 0.0f, 150.0f, 0.0f }, + .modelID = AS_MODEL_ID(MODEL_m03), + .vtxList = 0, + .vertexStartOffset = -1 +}; + +StaticAnimatorNode N(D_802417FC_A7606C) = { + .pos = { 69.0f, 250.0f, 0.0f }, + .sibling = &N(D_802417D0_A76040), + .modelID = AS_MODEL_ID(MODEL_m02), + .vtxList = 0, + .vertexStartOffset = -1 +}; + +StaticAnimatorNode N(D_80241828_A76098) = { + .pos = { 106.0f, 9.0f, 0.0f }, + .sibling = &N(D_802417FC_A7606C), + .modelID = AS_MODEL_ID(MODEL_m01), + .vtxList = 0, + .vertexStartOffset = -1 +}; + +StaticAnimatorNode N(D_80241854_A760C4) = { + .pos = { 0.0f, 0.0f, 0.0f }, + .sibling = &N(D_80241828_A76098), + .modelID = AS_MODEL_ID(MODEL_b03), + .vtxList = 0, + .vertexStartOffset = -1 +}; + +StaticAnimatorNode N(D_80241880_A760F0) = { + .pos = { 0.0f, 150.0f, 0.0f }, + .sibling = &N(D_80241854_A760C4), + .modelID = AS_MODEL_ID(MODEL_b02), + .vtxList = 0, + .vertexStartOffset = -1 +}; + +StaticAnimatorNode N(D_802418AC_A7611C) = { + .pos = { 30.0f, 180.0f, 0.0f }, + .rot = { AS_F(0.0f), AS_F(0.0f), AS_F(-89.99725f) }, + .sibling = &N(D_80241880_A760F0), + .modelID = AS_MODEL_ID(MODEL_b01), + .vtxList = 0, + .vertexStartOffset = -1 +}; + +StaticAnimatorNode N(D_802418D8_A76148) = { + .pos = { 0.0f, 0.0f, 0.0f }, + .sibling = &N(D_802418AC_A7611C), + .modelID = AS_MODEL_ID(MODEL_k02), + .vtxList = 0, + .vertexStartOffset = -1 +}; + +StaticAnimatorNode N(D_80241904_A76174) = { + .pos = { 0.0f, 0.0f, 0.0f }, + .sibling = &N(D_802418D8_A76148), + .modelID = AS_MODEL_ID(MODEL_k01), + .vtxList = 0, + .vertexStartOffset = -1 +}; + +StaticAnimatorNode N(D_80241930_A761A0) = { + .pos = { 0.0f, 0.0f, 0.0f }, + .child = &N(D_80241904_A76174), +}; + +StaticAnimatorNode* N(ChainDriveSkeleton)[] = { + &N(D_80241930_A761A0), + &N(D_80241904_A76174), + &N(D_802418D8_A76148), + &N(D_802418AC_A7611C), + &N(D_80241880_A760F0), + &N(D_80241854_A760C4), + &N(D_80241828_A76098), + &N(D_802417FC_A7606C), + &N(D_802417D0_A76040), + NULL +}; diff --git a/src/world/area_kpa/kpa_70/kpa_70_5_chain_anim.c b/src/world/area_kpa/kpa_70/kpa_70_5_chain_anim.c new file mode 100644 index 0000000000..d682175a38 --- /dev/null +++ b/src/world/area_kpa/kpa_70/kpa_70_5_chain_anim.c @@ -0,0 +1,938 @@ +#include "kpa_70.h" + +AnimScript N(AS_ChainDriveAnim) = { + 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, 30, 30, 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, 69, 300, 0, + AS_SET_SCALE, 7, AS_F(0.1), AS_F(0.1), AS_F(1.0), + AS_SET_ROTATION, 8, AS_F(0.0), AS_F(0.0), AS_F(0.0), + AS_SET_POS, 8, 70, 70, 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_WAIT, 1, + AS_SET_POS, 2, 0, -1, 0, + AS_SET_POS, 3, 0, 1, 0, + AS_SET_POS, 4, 30, 31, 0, + AS_SET_POS, 5, 0, 1, 0, + AS_SET_POS, 6, 0, -1, 0, + AS_SET_POS, 8, 70, 71, 0, + AS_SET_POS, 9, 0, 1, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -3, 0, + AS_SET_POS, 3, 0, 3, 0, + AS_SET_POS, 4, 30, 33, 0, + AS_SET_POS, 5, 0, 3, 0, + AS_SET_POS, 6, 0, -3, 0, + AS_SET_POS, 8, 70, 73, 0, + AS_SET_POS, 9, 0, 3, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -5, 0, + AS_SET_POS, 3, 0, 5, 0, + AS_SET_POS, 4, 30, 35, 0, + AS_SET_POS, 5, 0, 5, 0, + AS_SET_POS, 6, 0, -5, 0, + AS_SET_POS, 8, 70, 75, 0, + AS_SET_POS, 9, 0, 5, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -6, 0, + AS_SET_POS, 3, 0, 6, 0, + AS_SET_POS, 4, 30, 36, 0, + AS_SET_POS, 5, 0, 6, 0, + AS_SET_POS, 6, 0, -6, 0, + AS_SET_POS, 8, 70, 76, 0, + AS_SET_POS, 9, 0, 6, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -8, 0, + AS_SET_POS, 3, 0, 8, 0, + AS_SET_POS, 4, 30, 38, 0, + AS_SET_POS, 5, 0, 8, 0, + AS_SET_POS, 6, 0, -8, 0, + AS_SET_POS, 8, 70, 78, 0, + AS_SET_POS, 9, 0, 8, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -10, 0, + AS_SET_POS, 3, 0, 10, 0, + AS_SET_POS, 4, 30, 40, 0, + AS_SET_POS, 5, 0, 10, 0, + AS_SET_POS, 6, 0, -10, 0, + AS_SET_POS, 8, 70, 80, 0, + AS_SET_POS, 9, 0, 10, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -11, 0, + AS_SET_POS, 3, 0, 11, 0, + AS_SET_POS, 4, 30, 41, 0, + AS_SET_POS, 5, 0, 11, 0, + AS_SET_POS, 6, 0, -11, 0, + AS_SET_POS, 8, 70, 81, 0, + AS_SET_POS, 9, 0, 11, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -13, 0, + AS_SET_POS, 3, 0, 13, 0, + AS_SET_POS, 4, 30, 43, 0, + AS_SET_POS, 5, 0, 13, 0, + AS_SET_POS, 6, 0, -13, 0, + AS_SET_POS, 8, 70, 83, 0, + AS_SET_POS, 9, 0, 13, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -15, 0, + AS_SET_POS, 3, 0, 15, 0, + AS_SET_POS, 4, 30, 45, 0, + AS_SET_POS, 5, 0, 15, 0, + AS_SET_POS, 6, 0, -15, 0, + AS_SET_POS, 8, 70, 85, 0, + AS_SET_POS, 9, 0, 15, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -16, 0, + AS_SET_POS, 3, 0, 16, 0, + AS_SET_POS, 4, 30, 46, 0, + AS_SET_POS, 5, 0, 16, 0, + AS_SET_POS, 6, 0, -16, 0, + AS_SET_POS, 8, 70, 86, 0, + AS_SET_POS, 9, 0, 16, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -18, 0, + AS_SET_POS, 3, 0, 18, 0, + AS_SET_POS, 4, 30, 48, 0, + AS_SET_POS, 5, 0, 18, 0, + AS_SET_POS, 6, 0, -18, 0, + AS_SET_POS, 8, 70, 88, 0, + AS_SET_POS, 9, 0, 18, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -20, 0, + AS_SET_POS, 3, 0, 20, 0, + AS_SET_POS, 4, 30, 50, 0, + AS_SET_POS, 5, 0, 20, 0, + AS_SET_POS, 6, 0, -20, 0, + AS_SET_POS, 8, 70, 90, 0, + AS_SET_POS, 9, 0, 20, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -21, 0, + AS_SET_POS, 3, 0, 21, 0, + AS_SET_POS, 4, 30, 51, 0, + AS_SET_POS, 5, 0, 21, 0, + AS_SET_POS, 6, 0, -21, 0, + AS_SET_POS, 8, 70, 91, 0, + AS_SET_POS, 9, 0, 21, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -23, 0, + AS_SET_POS, 3, 0, 23, 0, + AS_SET_POS, 4, 30, 53, 0, + AS_SET_POS, 5, 0, 23, 0, + AS_SET_POS, 6, 0, -23, 0, + AS_SET_POS, 8, 70, 93, 0, + AS_SET_POS, 9, 0, 23, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -25, 0, + AS_SET_POS, 3, 0, 25, 0, + AS_SET_POS, 4, 30, 55, 0, + AS_SET_POS, 5, 0, 25, 0, + AS_SET_POS, 6, 0, -24, 0, + AS_SET_POS, 8, 70, 95, 0, + AS_SET_POS, 9, 0, 25, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -26, 0, + AS_SET_POS, 3, 0, 26, 0, + AS_SET_ROTATION, 4, AS_F(0.0), AS_F(0.0), AS_F(-0.48), + AS_SET_POS, 4, 30, 56, 0, + AS_SET_POS, 5, 0, 26, 0, + AS_SET_POS, 6, 0, -26, 0, + AS_SET_POS, 7, 70, 96, 0, + AS_SET_SCALE, 7, AS_F(0.105), AS_F(0.105), AS_F(1.0), + AS_SET_POS, 8, 70, 96, 0, + AS_SET_POS, 9, 0, 26, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -28, 0, + AS_SET_POS, 3, 0, 28, 0, + AS_SET_ROTATION, 4, AS_F(0.0), AS_F(0.0), AS_F(-1.905), + AS_SET_POS, 4, 30, 58, 0, + AS_SET_POS, 5, 0, 28, 0, + AS_SET_POS, 6, 0, -28, 0, + AS_SET_POS, 7, 71, 96, 0, + AS_SET_SCALE, 7, AS_F(0.12), AS_F(0.115), AS_F(1.0), + AS_SET_POS, 8, 71, 96, 0, + AS_SET_SCALE, 8, AS_F(1.005), AS_F(1.0), AS_F(1.0), + AS_SET_POS, 9, 0, 28, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, 0, 0, + AS_SET_POS, 3, 0, 0, 0, + AS_SET_ROTATION, 4, AS_F(0.0), AS_F(0.0), AS_F(-4.235), + AS_SET_POS, 4, 30, 60, 0, + AS_SET_POS, 5, 0, 30, 0, + AS_SET_POS, 6, 0, -30, 0, + AS_SET_POS, 7, 72, 96, 0, + AS_SET_SCALE, 7, AS_F(0.15), AS_F(0.145), AS_F(1.0), + AS_SET_POS, 8, 72, 96, 0, + AS_SET_SCALE, 8, AS_F(1.01), AS_F(1.0), AS_F(1.0), + AS_SET_POS, 9, 0, 30, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -1, 0, + AS_SET_POS, 3, 0, 1, 0, + AS_SET_ROTATION, 4, AS_F(0.0), AS_F(0.0), AS_F(-7.44), + AS_SET_POS, 4, 30, 61, 0, + AS_SET_POS, 5, 0, 31, 0, + AS_SET_POS, 6, 0, -31, 0, + AS_SET_POS, 7, 74, 96, 0, + AS_SET_SCALE, 7, AS_F(0.185), AS_F(0.17), AS_F(1.0), + AS_SET_POS, 8, 74, 96, 0, + AS_SET_SCALE, 8, AS_F(1.015), AS_F(1.0), AS_F(1.0), + AS_SET_POS, 9, 0, 31, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -3, 0, + AS_SET_POS, 3, 0, 3, 0, + AS_SET_ROTATION, 4, AS_F(0.0), AS_F(0.0), AS_F(-11.48), + AS_SET_POS, 4, 30, 63, 0, + AS_SET_POS, 5, 0, 33, 0, + AS_SET_POS, 6, 0, -33, 0, + AS_SET_POS, 7, 77, 94, 0, + AS_SET_SCALE, 7, AS_F(0.225), AS_F(0.21), AS_F(1.0), + AS_SET_POS, 8, 77, 94, 0, + AS_SET_POS, 9, 0, 33, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -4, 0, + AS_SET_POS, 3, 0, 4, 0, + AS_SET_ROTATION, 4, AS_F(0.0), AS_F(0.0), AS_F(-16.315), + AS_SET_POS, 4, 30, 65, 0, + AS_SET_POS, 5, 0, 35, 0, + AS_SET_POS, 6, 0, -34, 0, + AS_SET_POS, 7, 78, 92, 0, + AS_SET_SCALE, 7, AS_F(0.275), AS_F(0.245), AS_F(1.0), + AS_SET_POS, 8, 78, 92, 0, + AS_SET_SCALE, 8, AS_F(1.0), AS_F(1.0), AS_F(1.0), + AS_SET_POS, 9, 0, 35, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -6, 0, + AS_SET_POS, 3, 0, 6, 0, + AS_SET_ROTATION, 4, AS_F(0.0), AS_F(0.0), AS_F(-21.92), + AS_SET_POS, 4, 30, 66, 0, + AS_SET_POS, 5, 0, 36, 0, + AS_SET_POS, 6, 0, -36, 0, + AS_SET_POS, 7, 80, 89, 0, + AS_SET_SCALE, 7, AS_F(0.325), AS_F(0.29), AS_F(1.0), + AS_SET_POS, 8, 80, 89, 0, + AS_SET_SCALE, 8, AS_F(1.015), AS_F(1.0), AS_F(1.0), + AS_SET_POS, 9, 0, 36, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -8, 0, + AS_SET_POS, 3, 0, 8, 0, + AS_SET_ROTATION, 4, AS_F(0.0), AS_F(0.0), AS_F(-28.25), + AS_SET_POS, 4, 30, 68, 0, + AS_SET_POS, 5, 0, 38, 0, + AS_SET_POS, 6, 0, -38, 0, + AS_SET_POS, 7, 81, 86, 0, + AS_SET_SCALE, 7, AS_F(0.375), AS_F(0.33), AS_F(1.0), + AS_SET_POS, 8, 81, 86, 0, + AS_SET_SCALE, 8, AS_F(1.04), AS_F(1.0), AS_F(1.0), + AS_SET_POS, 9, 0, 38, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -10, 0, + AS_SET_POS, 3, 0, 10, 0, + AS_SET_ROTATION, 4, AS_F(0.0), AS_F(0.0), AS_F(-35.28), + AS_SET_POS, 4, 30, 70, 0, + AS_SET_POS, 5, 0, 40, 0, + AS_SET_POS, 6, 0, -40, 0, + AS_SET_POS, 7, 82, 81, 0, + AS_SET_SCALE, 7, AS_F(0.425), AS_F(0.375), AS_F(1.0), + AS_SET_POS, 8, 82, 81, 0, + AS_SET_SCALE, 8, AS_F(1.1), AS_F(1.0), AS_F(1.0), + AS_SET_POS, 9, 0, 40, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -11, 0, + AS_SET_POS, 3, 0, 11, 0, + AS_SET_ROTATION, 4, AS_F(0.0), AS_F(0.0), AS_F(-42.96), + AS_SET_POS, 4, 30, 71, 0, + AS_SET_POS, 5, 0, 41, 0, + AS_SET_POS, 6, 0, -41, 0, + AS_SET_POS, 7, 82, 77, 0, + AS_SET_SCALE, 7, AS_F(0.465), AS_F(0.41), AS_F(1.0), + AS_SET_POS, 8, 82, 77, 0, + AS_SET_SCALE, 8, AS_F(1.165), AS_F(1.0), AS_F(1.0), + AS_SET_POS, 9, 0, 41, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -13, 0, + AS_SET_POS, 3, 0, 13, 0, + AS_SET_ROTATION, 4, AS_F(0.0), AS_F(0.0), AS_F(-51.265), + AS_SET_POS, 4, 30, 73, 0, + AS_SET_POS, 5, 0, 43, 0, + AS_SET_POS, 6, 0, -43, 0, + AS_SET_POS, 7, 82, 71, 0, + AS_SET_SCALE, 7, AS_F(0.51), AS_F(0.445), AS_F(1.0), + AS_SET_POS, 8, 82, 71, 0, + AS_SET_SCALE, 8, AS_F(1.245), AS_F(1.0), AS_F(1.0), + AS_SET_POS, 9, 0, 43, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -14, 0, + AS_SET_POS, 3, 0, 14, 0, + AS_SET_ROTATION, 4, AS_F(0.0), AS_F(0.0), AS_F(-60.155), + AS_SET_POS, 4, 30, 75, 0, + AS_SET_POS, 5, 0, 45, 0, + AS_SET_POS, 6, 0, -44, 0, + AS_SET_POS, 7, 81, 66, 0, + AS_SET_SCALE, 7, AS_F(0.545), AS_F(0.48), AS_F(1.0), + AS_SET_POS, 8, 81, 66, 0, + AS_SET_SCALE, 8, AS_F(1.135), AS_F(1.0), AS_F(1.0), + AS_SET_POS, 9, 0, 45, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -16, 0, + AS_SET_POS, 3, 0, 16, 0, + AS_SET_ROTATION, 4, AS_F(0.0), AS_F(0.0), AS_F(-69.6), + AS_SET_POS, 4, 30, 76, 0, + AS_SET_POS, 5, 0, 46, 0, + AS_SET_POS, 6, 0, -46, 0, + AS_SET_POS, 7, 78, 60, 0, + AS_SET_SCALE, 7, AS_F(0.57), AS_F(0.5), AS_F(1.0), + AS_SET_POS, 8, 78, 60, 0, + AS_SET_SCALE, 8, AS_F(1.055), AS_F(1.0), AS_F(1.0), + AS_SET_POS, 9, 0, 46, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -18, 0, + AS_SET_POS, 3, 0, 18, 0, + AS_SET_ROTATION, 4, AS_F(0.0), AS_F(0.0), AS_F(-79.56), + AS_SET_POS, 4, 30, 78, 0, + AS_SET_POS, 5, 0, 48, 0, + AS_SET_POS, 6, 0, -48, 0, + AS_SET_POS, 7, 74, 55, 0, + AS_SET_SCALE, 7, AS_F(0.595), AS_F(0.515), AS_F(1.0), + AS_SET_POS, 8, 74, 55, 0, + AS_SET_SCALE, 8, AS_F(1.0), AS_F(1.0), AS_F(1.0), + AS_SET_POS, 9, 0, 48, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -20, 0, + AS_SET_POS, 3, 0, 20, 0, + AS_SET_ROTATION, 4, AS_F(0.0), AS_F(0.0), AS_F(-89.995), + AS_SET_POS, 4, 30, 80, 0, + AS_SET_POS, 5, 0, 50, 0, + AS_SET_POS, 6, 0, -49, 0, + AS_SET_POS, 7, 69, 50, 0, + AS_SET_SCALE, 7, AS_F(0.6), AS_F(0.52), AS_F(1.0), + AS_SET_POS, 8, 69, 50, 0, + AS_SET_POS, 9, 0, 50, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -21, 0, + AS_SET_POS, 3, 0, 21, 0, + AS_SET_ROTATION, 4, AS_F(0.0), AS_F(0.0), AS_F(-86.075), + AS_SET_POS, 4, 30, 81, 0, + AS_SET_POS, 5, 0, 51, 0, + AS_SET_POS, 6, 0, -51, 0, + AS_SET_POS, 7, 71, 54, 0, + AS_SET_SCALE, 7, AS_F(0.6), AS_F(0.575), AS_F(1.0), + AS_SET_POS, 8, 71, 54, 0, + AS_SET_POS, 9, 0, 51, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -23, 0, + AS_SET_POS, 3, 0, 23, 0, + AS_SET_ROTATION, 4, AS_F(0.0), AS_F(0.0), AS_F(-83.235), + AS_SET_POS, 4, 30, 83, 0, + AS_SET_POS, 5, 0, 53, 0, + AS_SET_POS, 6, 0, -53, 0, + AS_SET_POS, 7, 73, 58, 0, + AS_SET_SCALE, 7, AS_F(0.605), AS_F(0.61), AS_F(1.0), + AS_SET_POS, 8, 73, 58, 0, + AS_SET_POS, 9, 0, 53, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -25, 0, + AS_SET_POS, 3, 0, 25, 0, + AS_SET_ROTATION, 4, AS_F(0.0), AS_F(0.0), AS_F(-81.355), + AS_SET_POS, 4, 30, 85, 0, + AS_SET_POS, 5, 0, 55, 0, + AS_SET_POS, 6, 0, -54, 0, + AS_SET_POS, 7, 74, 61, 0, + AS_SET_SCALE, 7, AS_F(0.61), AS_F(0.65), AS_F(1.0), + AS_SET_POS, 8, 74, 61, 0, + AS_SET_POS, 9, 0, 55, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -26, 0, + AS_SET_POS, 3, 0, 26, 0, + AS_SET_ROTATION, 4, AS_F(0.0), AS_F(0.0), AS_F(-80.32), + AS_SET_POS, 4, 30, 86, 0, + AS_SET_POS, 5, 0, 56, 0, + AS_SET_POS, 6, 0, -56, 0, + AS_SET_POS, 7, 74, 63, 0, + AS_SET_SCALE, 7, AS_F(0.615), AS_F(0.665), AS_F(1.0), + AS_SET_POS, 8, 74, 63, 0, + AS_SET_POS, 9, 0, 56, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -28, 0, + AS_SET_POS, 3, 0, 28, 0, + AS_SET_ROTATION, 4, AS_F(0.0), AS_F(0.0), AS_F(-80.0), + AS_SET_POS, 4, 30, 88, 0, + AS_SET_POS, 5, 0, 58, 0, + AS_SET_POS, 6, 0, -58, 0, + AS_SET_POS, 7, 74, 65, 0, + AS_SET_SCALE, 7, AS_F(0.625), AS_F(0.685), AS_F(1.0), + AS_SET_POS, 8, 74, 65, 0, + AS_SET_POS, 9, 0, 58, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, 0, 0, + AS_SET_POS, 3, 0, 0, 0, + AS_SET_ROTATION, 4, AS_F(0.0), AS_F(0.0), AS_F(-80.32), + AS_SET_POS, 4, 30, 90, 0, + AS_SET_POS, 5, 0, 60, 0, + AS_SET_POS, 6, 0, -60, 0, + AS_SET_POS, 7, 74, 67, 0, + AS_SET_SCALE, 7, AS_F(0.635), AS_F(0.71), AS_F(1.0), + AS_SET_POS, 8, 74, 67, 0, + AS_SET_POS, 9, 0, 60, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -1, 0, + AS_SET_POS, 3, 0, 1, 0, + AS_SET_ROTATION, 4, AS_F(0.0), AS_F(0.0), AS_F(-81.355), + AS_SET_POS, 4, 30, 91, 0, + AS_SET_POS, 5, 0, 61, 0, + AS_SET_POS, 6, 0, -61, 0, + AS_SET_POS, 7, 74, 68, 0, + AS_SET_SCALE, 7, AS_F(0.655), AS_F(0.72), AS_F(1.0), + AS_SET_POS, 8, 74, 68, 0, + AS_SET_POS, 9, 0, 61, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -3, 0, + AS_SET_POS, 3, 0, 3, 0, + AS_SET_ROTATION, 4, AS_F(0.0), AS_F(0.0), AS_F(-83.235), + AS_SET_POS, 4, 30, 93, 0, + AS_SET_POS, 5, 0, 63, 0, + AS_SET_POS, 6, 0, -63, 0, + AS_SET_POS, 7, 73, 68, 0, + AS_SET_SCALE, 7, AS_F(0.665), AS_F(0.72), AS_F(1.0), + AS_SET_POS, 8, 73, 68, 0, + AS_SET_POS, 9, 0, 63, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -4, 0, + AS_SET_POS, 3, 0, 4, 0, + AS_SET_ROTATION, 4, AS_F(0.0), AS_F(0.0), AS_F(-86.075), + AS_SET_POS, 4, 30, 95, 0, + AS_SET_POS, 5, 0, 65, 0, + AS_SET_POS, 6, 0, -64, 0, + AS_SET_POS, 7, 71, 67, 0, + AS_SET_SCALE, 7, AS_F(0.68), AS_F(0.72), AS_F(1.0), + AS_SET_POS, 8, 71, 67, 0, + AS_SET_POS, 9, 0, 65, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -6, 0, + AS_SET_POS, 3, 0, 6, 0, + AS_SET_ROTATION, 4, AS_F(0.0), AS_F(0.0), AS_F(-89.995), + AS_SET_POS, 4, 30, 96, 0, + AS_SET_POS, 5, 0, 66, 0, + AS_SET_POS, 6, 0, -66, 0, + AS_SET_POS, 7, 69, 66, 0, + AS_SET_SCALE, 7, AS_F(0.705), AS_F(0.7), AS_F(1.0), + AS_SET_POS, 8, 69, 66, 0, + AS_SET_POS, 9, 0, 66, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -8, 0, + AS_SET_POS, 3, 0, 8, 0, + AS_SET_POS, 4, 30, 98, 0, + AS_SET_POS, 5, 0, 68, 0, + AS_SET_POS, 6, 0, -68, 0, + AS_SET_POS, 7, 69, 68, 0, + AS_SET_SCALE, 7, AS_F(0.72), AS_F(0.71), AS_F(1.0), + AS_SET_POS, 8, 69, 68, 0, + AS_SET_POS, 9, 0, 68, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -9, 0, + AS_SET_POS, 3, 0, 9, 0, + AS_SET_POS, 4, 30, 100, 0, + AS_SET_POS, 5, 0, 70, 0, + AS_SET_POS, 6, 0, -69, 0, + AS_SET_POS, 7, 69, 70, 0, + AS_SET_SCALE, 7, AS_F(0.735), AS_F(0.73), AS_F(1.0), + AS_SET_POS, 8, 69, 70, 0, + AS_SET_POS, 9, 0, 70, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -11, 0, + AS_SET_POS, 3, 0, 11, 0, + AS_SET_POS, 4, 30, 101, 0, + AS_SET_POS, 5, 0, 71, 0, + AS_SET_POS, 6, 0, -71, 0, + AS_SET_POS, 7, 69, 71, 0, + AS_SET_SCALE, 7, AS_F(0.76), AS_F(0.76), AS_F(1.0), + AS_SET_POS, 8, 69, 71, 0, + AS_SET_POS, 9, 0, 71, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -13, 0, + AS_SET_POS, 3, 0, 13, 0, + AS_SET_POS, 4, 30, 103, 0, + AS_SET_POS, 5, 0, 73, 0, + AS_SET_POS, 6, 0, -73, 0, + AS_SET_POS, 7, 69, 73, 0, + AS_SET_SCALE, 7, AS_F(0.775), AS_F(0.78), AS_F(1.0), + AS_SET_POS, 8, 69, 73, 0, + AS_SET_POS, 9, 0, 73, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -14, 0, + AS_SET_POS, 3, 0, 14, 0, + AS_SET_POS, 4, 30, 105, 0, + AS_SET_POS, 5, 0, 75, 0, + AS_SET_POS, 6, 0, -74, 0, + AS_SET_POS, 7, 69, 75, 0, + AS_SET_SCALE, 7, AS_F(0.795), AS_F(0.785), AS_F(1.0), + AS_SET_POS, 8, 69, 75, 0, + AS_SET_POS, 9, 0, 75, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -16, 0, + AS_SET_POS, 3, 0, 16, 0, + AS_SET_POS, 4, 30, 106, 0, + AS_SET_POS, 5, 0, 76, 0, + AS_SET_POS, 6, 0, -76, 0, + AS_SET_POS, 7, 69, 76, 0, + AS_SET_SCALE, 7, AS_F(0.82), AS_F(0.795), AS_F(1.0), + AS_SET_POS, 8, 69, 76, 0, + AS_SET_POS, 9, 0, 76, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -18, 0, + AS_SET_POS, 3, 0, 18, 0, + AS_SET_POS, 4, 30, 108, 0, + AS_SET_POS, 5, 0, 78, 0, + AS_SET_POS, 6, 0, -78, 0, + AS_SET_POS, 7, 69, 78, 0, + AS_SET_SCALE, 7, AS_F(0.835), AS_F(0.82), AS_F(1.0), + AS_SET_POS, 8, 69, 78, 0, + AS_SET_POS, 9, 0, 78, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -20, 0, + AS_SET_POS, 3, 0, 20, 0, + AS_SET_POS, 4, 30, 110, 0, + AS_SET_POS, 5, 0, 80, 0, + AS_SET_POS, 6, 0, -80, 0, + AS_SET_POS, 7, 69, 80, 0, + AS_SET_SCALE, 7, AS_F(0.855), AS_F(0.845), AS_F(1.0), + AS_SET_POS, 8, 69, 80, 0, + AS_SET_POS, 9, 0, 80, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -21, 0, + AS_SET_POS, 3, 0, 21, 0, + AS_SET_POS, 4, 30, 111, 0, + AS_SET_POS, 5, 0, 81, 0, + AS_SET_POS, 6, 0, -81, 0, + AS_SET_POS, 7, 69, 81, 0, + AS_SET_SCALE, 7, AS_F(0.875), AS_F(0.87), AS_F(1.0), + AS_SET_POS, 8, 69, 81, 0, + AS_SET_POS, 9, 0, 81, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -23, 0, + AS_SET_POS, 3, 0, 23, 0, + AS_SET_POS, 4, 30, 113, 0, + AS_SET_POS, 5, 0, 83, 0, + AS_SET_POS, 6, 0, -83, 0, + AS_SET_POS, 7, 69, 83, 0, + AS_SET_SCALE, 7, AS_F(0.895), AS_F(0.88), AS_F(1.0), + AS_SET_POS, 8, 69, 83, 0, + AS_SET_POS, 9, 0, 83, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -25, 0, + AS_SET_POS, 3, 0, 25, 0, + AS_SET_POS, 4, 30, 115, 0, + AS_SET_POS, 5, 0, 85, 0, + AS_SET_POS, 6, 0, -85, 0, + AS_SET_POS, 7, 69, 85, 0, + AS_SET_SCALE, 7, AS_F(0.91), AS_F(0.885), AS_F(1.0), + AS_SET_POS, 8, 69, 85, 0, + AS_SET_POS, 9, 0, 85, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -26, 0, + AS_SET_POS, 3, 0, 26, 0, + AS_SET_POS, 4, 30, 116, 0, + AS_SET_POS, 5, 0, 86, 0, + AS_SET_POS, 6, 0, -86, 0, + AS_SET_POS, 7, 69, 86, 0, + AS_SET_SCALE, 7, AS_F(0.93), AS_F(0.905), AS_F(1.0), + AS_SET_POS, 8, 69, 86, 0, + AS_SET_POS, 9, 0, 86, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -28, 0, + AS_SET_POS, 3, 0, 28, 0, + AS_SET_POS, 4, 30, 118, 0, + AS_SET_POS, 5, 0, 88, 0, + AS_SET_POS, 6, 0, -88, 0, + AS_SET_POS, 7, 69, 88, 0, + AS_SET_SCALE, 7, AS_F(0.94), AS_F(0.935), AS_F(1.0), + AS_SET_POS, 8, 69, 88, 0, + AS_SET_POS, 9, 0, 88, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, 0, 0, + AS_SET_POS, 3, 0, 0, 0, + AS_SET_POS, 4, 30, 120, 0, + AS_SET_POS, 5, 0, 90, 0, + AS_SET_POS, 6, 0, -89, 0, + AS_SET_POS, 7, 69, 90, 0, + AS_SET_SCALE, 7, AS_F(0.955), AS_F(0.955), AS_F(1.0), + AS_SET_POS, 8, 69, 90, 0, + AS_SET_POS, 9, 0, 90, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -1, 0, + AS_SET_POS, 3, 0, 1, 0, + AS_SET_POS, 4, 30, 121, 0, + AS_SET_POS, 5, 0, 91, 0, + AS_SET_POS, 6, 0, -91, 0, + AS_SET_POS, 7, 69, 91, 0, + AS_SET_SCALE, 7, AS_F(0.965), AS_F(0.965), AS_F(1.0), + AS_SET_POS, 8, 69, 91, 0, + AS_SET_POS, 9, 0, 91, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -3, 0, + AS_SET_POS, 3, 0, 3, 0, + AS_SET_POS, 4, 30, 123, 0, + AS_SET_POS, 5, 0, 93, 0, + AS_SET_POS, 6, 0, -93, 0, + AS_SET_POS, 7, 69, 93, 0, + AS_SET_SCALE, 7, AS_F(0.98), AS_F(0.97), AS_F(1.0), + AS_SET_POS, 8, 69, 93, 0, + AS_SET_POS, 9, 0, 93, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -5, 0, + AS_SET_POS, 3, 0, 5, 0, + AS_SET_POS, 4, 30, 125, 0, + AS_SET_POS, 5, 0, 95, 0, + AS_SET_POS, 6, 0, -94, 0, + AS_SET_POS, 7, 69, 95, 0, + AS_SET_SCALE, 7, AS_F(0.99), AS_F(0.995), AS_F(1.0), + AS_SET_POS, 8, 69, 95, 0, + AS_SET_POS, 9, 0, 95, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -6, 0, + AS_SET_POS, 3, 0, 6, 0, + AS_SET_POS, 4, 30, 126, 0, + AS_SET_POS, 5, 0, 96, 0, + AS_SET_POS, 6, 0, -96, 0, + AS_SET_POS, 7, 69, 96, 0, + AS_SET_SCALE, 7, AS_F(0.995), AS_F(1.015), AS_F(1.0), + AS_SET_POS, 8, 69, 96, 0, + AS_SET_POS, 9, 0, 96, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -8, 0, + AS_SET_POS, 3, 0, 8, 0, + AS_SET_POS, 4, 30, 128, 0, + AS_SET_POS, 5, 0, 98, 0, + AS_SET_POS, 6, 0, -98, 0, + AS_SET_POS, 7, 69, 98, 0, + AS_SET_SCALE, 7, AS_F(0.995), AS_F(1.04), AS_F(1.0), + AS_SET_POS, 8, 69, 98, 0, + AS_SET_POS, 9, 0, 98, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -10, 0, + AS_SET_POS, 3, 0, 10, 0, + AS_SET_POS, 4, 30, 130, 0, + AS_SET_POS, 5, 0, 100, 0, + AS_SET_POS, 6, 0, -99, 0, + AS_SET_POS, 7, 69, 100, 0, + AS_SET_SCALE, 7, AS_F(1.0), AS_F(1.05), AS_F(1.0), + AS_SET_POS, 8, 69, 100, 0, + AS_SET_POS, 9, 0, 100, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -11, 0, + AS_SET_POS, 3, 0, 11, 0, + AS_SET_POS, 4, 30, 131, 0, + AS_SET_POS, 5, 0, 101, 0, + AS_SET_POS, 6, 0, -101, 0, + AS_SET_POS, 7, 69, 101, 0, + AS_SET_SCALE, 7, AS_F(1.0), AS_F(1.06), AS_F(1.0), + AS_SET_POS, 8, 69, 101, 0, + AS_SET_POS, 9, 0, 101, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -13, 0, + AS_SET_POS, 3, 0, 13, 0, + AS_SET_POS, 4, 30, 133, 0, + AS_SET_POS, 5, 0, 103, 0, + AS_SET_POS, 6, 0, -103, 0, + AS_SET_POS, 7, 69, 103, 0, + AS_SET_SCALE, 7, AS_F(1.0), AS_F(1.08), AS_F(1.0), + AS_SET_POS, 8, 69, 103, 0, + AS_SET_POS, 9, 0, 103, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -14, 0, + AS_SET_POS, 3, 0, 14, 0, + AS_SET_POS, 4, 30, 134, 0, + AS_SET_POS, 5, 0, 104, 0, + AS_SET_POS, 6, 0, -104, 0, + AS_SET_POS, 7, 69, 104, 0, + AS_SET_SCALE, 7, AS_F(1.0), AS_F(1.11), AS_F(1.0), + AS_SET_POS, 8, 69, 104, 0, + AS_SET_POS, 9, 0, 104, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -16, 0, + AS_SET_POS, 3, 0, 16, 0, + AS_SET_POS, 4, 30, 136, 0, + AS_SET_POS, 5, 0, 106, 0, + AS_SET_POS, 6, 0, -106, 0, + AS_SET_POS, 7, 69, 106, 0, + AS_SET_SCALE, 7, AS_F(1.0), AS_F(1.135), AS_F(1.0), + AS_SET_POS, 8, 69, 106, 0, + AS_SET_POS, 9, 0, 106, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -18, 0, + AS_SET_POS, 3, 0, 18, 0, + AS_SET_POS, 4, 30, 138, 0, + AS_SET_POS, 5, 0, 108, 0, + AS_SET_POS, 6, 0, -108, 0, + AS_SET_POS, 7, 69, 108, 0, + AS_SET_SCALE, 7, AS_F(1.0), AS_F(1.15), AS_F(1.0), + AS_SET_POS, 8, 69, 108, 0, + AS_SET_POS, 9, 0, 108, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -20, 0, + AS_SET_POS, 3, 0, 20, 0, + AS_SET_POS, 4, 30, 140, 0, + AS_SET_POS, 5, 0, 110, 0, + AS_SET_POS, 6, 0, -109, 0, + AS_SET_POS, 7, 69, 110, 0, + AS_SET_SCALE, 7, AS_F(1.0), AS_F(1.155), AS_F(1.0), + AS_SET_POS, 8, 69, 110, 0, + AS_SET_POS, 9, 0, 110, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -21, 0, + AS_SET_POS, 3, 0, 21, 0, + AS_SET_POS, 4, 30, 141, 0, + AS_SET_POS, 5, 0, 111, 0, + AS_SET_POS, 6, 0, -111, 0, + AS_SET_POS, 7, 69, 111, 0, + AS_SET_SCALE, 7, AS_F(1.0), AS_F(1.175), AS_F(1.0), + AS_SET_POS, 8, 69, 111, 0, + AS_SET_POS, 9, 0, 111, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -23, 0, + AS_SET_POS, 3, 0, 23, 0, + AS_SET_POS, 4, 30, 143, 0, + AS_SET_POS, 5, 0, 113, 0, + AS_SET_POS, 6, 0, -113, 0, + AS_SET_POS, 7, 69, 113, 0, + AS_SET_SCALE, 7, AS_F(1.0), AS_F(1.2), AS_F(1.0), + AS_SET_POS, 8, 69, 113, 0, + AS_SET_POS, 9, 0, 113, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -25, 0, + AS_SET_POS, 3, 0, 25, 0, + AS_SET_POS, 4, 30, 145, 0, + AS_SET_POS, 5, 0, 115, 0, + AS_SET_POS, 6, 0, -114, 0, + AS_SET_POS, 7, 69, 115, 0, + AS_SET_SCALE, 7, AS_F(1.0), AS_F(1.22), AS_F(1.0), + AS_SET_POS, 8, 69, 115, 0, + AS_SET_POS, 9, 0, 115, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -26, 0, + AS_SET_POS, 3, 0, 26, 0, + AS_SET_POS, 4, 30, 146, 0, + AS_SET_POS, 5, 0, 116, 0, + AS_SET_POS, 6, 0, -116, 0, + AS_SET_POS, 7, 69, 116, 0, + AS_SET_SCALE, 7, AS_F(1.0), AS_F(1.225), AS_F(1.0), + AS_SET_POS, 8, 69, 116, 0, + AS_SET_POS, 9, 0, 116, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -28, 0, + AS_SET_POS, 3, 0, 28, 0, + AS_SET_POS, 4, 30, 148, 0, + AS_SET_POS, 5, 0, 118, 0, + AS_SET_POS, 6, 0, -118, 0, + AS_SET_POS, 7, 69, 118, 0, + AS_SET_SCALE, 7, AS_F(1.0), AS_F(1.235), AS_F(1.0), + AS_SET_POS, 8, 69, 118, 0, + AS_SET_POS, 9, 0, 118, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, 0, 0, + AS_SET_POS, 3, 0, 0, 0, + AS_SET_POS, 4, 30, 150, 0, + AS_SET_POS, 5, 0, 120, 0, + AS_SET_POS, 6, 0, 30, 0, + AS_SET_POS, 7, 69, 120, 0, + AS_SET_SCALE, 7, AS_F(1.0), AS_F(1.26), AS_F(1.0), + AS_SET_POS, 8, 69, 120, 0, + AS_SET_POS, 9, 0, 120, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -1, 0, + AS_SET_POS, 3, 0, 1, 0, + AS_SET_POS, 4, 30, 151, 0, + AS_SET_POS, 5, 0, 121, 0, + AS_SET_POS, 6, 0, 28, 0, + AS_SET_POS, 7, 69, 121, 0, + AS_SET_SCALE, 7, AS_F(1.0), AS_F(1.285), AS_F(1.0), + AS_SET_POS, 8, 69, 121, 0, + AS_SET_POS, 9, 0, 121, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -3, 0, + AS_SET_POS, 3, 0, 3, 0, + AS_SET_POS, 4, 30, 153, 0, + AS_SET_POS, 5, 0, 123, 0, + AS_SET_POS, 6, 0, 26, 0, + AS_SET_POS, 7, 69, 123, 0, + AS_SET_SCALE, 7, AS_F(1.0), AS_F(1.305), AS_F(1.0), + AS_SET_POS, 8, 69, 123, 0, + AS_SET_POS, 9, 0, 123, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -4, 0, + AS_SET_POS, 3, 0, 4, 0, + AS_SET_POS, 4, 30, 155, 0, + AS_SET_POS, 5, 0, 125, 0, + AS_SET_POS, 6, 0, 25, 0, + AS_SET_POS, 7, 69, 125, 0, + AS_SET_SCALE, 7, AS_F(1.0), AS_F(1.32), AS_F(1.0), + AS_SET_POS, 8, 69, 125, 0, + AS_SET_POS, 9, 0, 125, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -6, 0, + AS_SET_POS, 3, 0, 6, 0, + AS_SET_POS, 4, 30, 156, 0, + AS_SET_POS, 5, 0, 126, 0, + AS_SET_POS, 6, 0, 23, 0, + AS_SET_POS, 7, 69, 126, 0, + AS_SET_SCALE, 7, AS_F(1.0), AS_F(1.325), AS_F(1.0), + AS_SET_POS, 8, 69, 126, 0, + AS_SET_POS, 9, 0, 126, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -8, 0, + AS_SET_POS, 3, 0, 8, 0, + AS_SET_POS, 4, 30, 158, 0, + AS_SET_POS, 5, 0, 128, 0, + AS_SET_POS, 6, 0, 21, 0, + AS_SET_POS, 7, 69, 128, 0, + AS_SET_SCALE, 7, AS_F(1.0), AS_F(1.35), AS_F(1.0), + AS_SET_POS, 8, 69, 128, 0, + AS_SET_POS, 9, 0, 128, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -9, 0, + AS_SET_POS, 3, 0, 9, 0, + AS_SET_POS, 4, 30, 160, 0, + AS_SET_POS, 5, 0, 130, 0, + AS_SET_POS, 6, 0, 20, 0, + AS_SET_POS, 7, 69, 130, 0, + AS_SET_SCALE, 7, AS_F(1.0), AS_F(1.375), AS_F(1.0), + AS_SET_POS, 8, 69, 130, 0, + AS_SET_POS, 9, 0, 130, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -11, 0, + AS_SET_POS, 3, 0, 11, 0, + AS_SET_POS, 4, 30, 161, 0, + AS_SET_POS, 5, 0, 131, 0, + AS_SET_POS, 6, 0, 18, 0, + AS_SET_POS, 7, 69, 131, 0, + AS_SET_SCALE, 7, AS_F(1.0), AS_F(1.395), AS_F(1.0), + AS_SET_POS, 8, 69, 131, 0, + AS_SET_POS, 9, 0, 131, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -13, 0, + AS_SET_POS, 3, 0, 13, 0, + AS_SET_POS, 4, 30, 163, 0, + AS_SET_POS, 5, 0, 133, 0, + AS_SET_POS, 6, 0, 16, 0, + AS_SET_POS, 7, 69, 133, 0, + AS_SET_SCALE, 7, AS_F(1.0), AS_F(1.405), AS_F(1.0), + AS_SET_POS, 8, 69, 133, 0, + AS_SET_POS, 9, 0, 133, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -14, 0, + AS_SET_POS, 3, 0, 14, 0, + AS_SET_POS, 4, 30, 165, 0, + AS_SET_POS, 5, 0, 135, 0, + AS_SET_POS, 6, 0, 15, 0, + AS_SET_POS, 7, 69, 135, 0, + AS_SET_SCALE, 7, AS_F(1.0), AS_F(1.415), AS_F(1.0), + AS_SET_POS, 8, 69, 135, 0, + AS_SET_POS, 9, 0, 135, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -16, 0, + AS_SET_POS, 3, 0, 16, 0, + AS_SET_POS, 4, 30, 166, 0, + AS_SET_POS, 5, 0, 136, 0, + AS_SET_POS, 6, 0, 13, 0, + AS_SET_POS, 7, 69, 136, 0, + AS_SET_SCALE, 7, AS_F(1.0), AS_F(1.44), AS_F(1.0), + AS_SET_POS, 8, 69, 136, 0, + AS_SET_POS, 9, 0, 136, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -18, 0, + AS_SET_POS, 3, 0, 18, 0, + AS_SET_POS, 4, 30, 168, 0, + AS_SET_POS, 5, 0, 138, 0, + AS_SET_POS, 6, 0, 11, 0, + AS_SET_POS, 7, 69, 138, 0, + AS_SET_SCALE, 7, AS_F(1.0), AS_F(1.465), AS_F(1.0), + AS_SET_POS, 8, 69, 138, 0, + AS_SET_POS, 9, 0, 138, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -19, 0, + AS_SET_POS, 3, 0, 19, 0, + AS_SET_POS, 4, 30, 170, 0, + AS_SET_POS, 5, 0, 140, 0, + AS_SET_POS, 6, 0, 10, 0, + AS_SET_POS, 7, 69, 140, 0, + AS_SET_SCALE, 7, AS_F(1.0), AS_F(1.49), AS_F(1.0), + AS_SET_POS, 8, 69, 140, 0, + AS_SET_POS, 9, 0, 140, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -21, 0, + AS_SET_POS, 3, 0, 21, 0, + AS_SET_POS, 4, 30, 171, 0, + AS_SET_POS, 5, 0, 141, 0, + AS_SET_POS, 6, 0, 8, 0, + AS_SET_POS, 7, 69, 141, 0, + AS_SET_SCALE, 7, AS_F(1.0), AS_F(1.5), AS_F(1.0), + AS_SET_POS, 8, 69, 141, 0, + AS_SET_POS, 9, 0, 141, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -23, 0, + AS_SET_POS, 3, 0, 23, 0, + AS_SET_POS, 4, 30, 173, 0, + AS_SET_POS, 5, 0, 143, 0, + AS_SET_POS, 6, 0, 6, 0, + AS_SET_POS, 7, 72, 129, 0, + AS_SET_SCALE, 7, AS_F(0.905), AS_F(1.35), AS_F(1.0), + AS_SET_POS, 8, 69, 250, 0, + AS_SET_POS, 9, 0, 143, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -25, 0, + AS_SET_POS, 3, 0, 25, 0, + AS_SET_POS, 4, 30, 175, 0, + AS_SET_POS, 5, 0, 145, 0, + AS_SET_POS, 6, 0, 4, 0, + AS_SET_POS, 7, 82, 95, 0, + AS_SET_SCALE, 7, AS_F(0.68), AS_F(1.005), AS_F(1.0), + AS_SET_POS, 9, 0, 145, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -26, 0, + AS_SET_POS, 3, 0, 26, 0, + AS_SET_POS, 4, 30, 176, 0, + AS_SET_POS, 5, 0, 146, 0, + AS_SET_POS, 6, 0, 3, 0, + AS_SET_POS, 7, 93, 56, 0, + AS_SET_SCALE, 7, AS_F(0.41), AS_F(0.59), AS_F(1.0), + AS_SET_POS, 9, 0, 146, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, -28, 0, + AS_SET_POS, 3, 0, 28, 0, + AS_SET_POS, 4, 30, 178, 0, + AS_SET_POS, 5, 0, 148, 0, + AS_SET_POS, 6, 0, 1, 0, + AS_SET_POS, 7, 102, 23, 0, + AS_SET_SCALE, 7, AS_F(0.19), AS_F(0.24), AS_F(1.0), + AS_SET_POS, 9, 0, 148, 0, + AS_WAIT, 1, + AS_SET_POS, 2, 0, 0, 0, + AS_SET_POS, 3, 0, 0, 0, + AS_SET_POS, 4, 30, 180, 0, + AS_SET_POS, 5, 0, 150, 0, + AS_SET_POS, 6, 0, 0, 0, + AS_SET_POS, 7, 106, 9, 0, + AS_SET_SCALE, 7, AS_F(0.1), AS_F(0.1), AS_F(1.0), + AS_SET_POS, 9, 0, 150, 0, + AS_WAIT, 1, +AS_END_LOOP, +AS_END, +}; diff --git a/src/world/area_kpa/kpa_81/A784C0.c b/src/world/area_kpa/kpa_81/A784C0.c deleted file mode 100644 index b8c3f94c19..0000000000 --- a/src/world/area_kpa/kpa_81/A784C0.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "kpa_81.h" - -ApiStatus func_80240000_A784C0(Evt* script, s32 isInitialCall) { - sprintf(wMapShapeName, "kpa_80_shape"); - sprintf(wMapHitName, "kpa_80_hit"); - return ApiStatus_BLOCK; -} - -const char* N(exit_str_0) = "kpa_50"; -const char* N(exit_str_1) = "kpa_32"; -const char* N(exit_str_2) = "kpa_04"; -const char* N(exit_str_3) = "kpa_17"; diff --git a/src/world/area_kpa/kpa_81/A78510.c b/src/world/area_kpa/kpa_81/A78510.c deleted file mode 100644 index 7263520375..0000000000 --- a/src/world/area_kpa/kpa_81/A78510.c +++ /dev/null @@ -1,89 +0,0 @@ -#include "kpa_81.h" - -#include "world/common/todo/GetNpcCollisionHeight.inc.c" - -#include "world/common/todo/AddPlayerHandsOffset.inc.c" - -extern s32 N(ItemChoice_HasSelectedItem); -extern s32 N(ItemChoice_SelectedItemID); - -// Needs data migrated -#ifdef NON_MATCHING -ApiStatus func_8024027C_A7873C(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - - if (isInitialCall) { - kpa_81_ItemChoice_HasSelectedItem = 0; - } - if (kpa_81_ItemChoice_HasSelectedItem != 0) { - kpa_81_ItemChoice_HasSelectedItem = 0; - evt_set_variable(script, *args++, kpa_81_ItemChoice_SelectedItemID); - return ApiStatus_DONE2; - } - - return ApiStatus_BLOCK; -} -#else -INCLUDE_ASM(s32, "world/area_kpa/kpa_81/A78510", func_8024027C_A7873C); -#endif - -// Needs data migrated -#ifdef NON_MATCHING -ApiStatus func_802402D0_A78790(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - - kpa_81_ItemChoice_SelectedItemID = evt_get_variable(script, *args++); - kpa_81_ItemChoice_HasSelectedItem = 1; - return ApiStatus_DONE2; -} -#else - -ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - - N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++); - N(ItemChoice_HasSelectedItem) = TRUE; - return ApiStatus_DONE2; -} -#endif - -BSS s32 kpa_81_D_80242040[114]; -BSS s32 D_80242208[92]; - -ApiStatus func_80240308_A787C8(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++) { - kpa_81_D_80242040[i] = ptr[i]; - } - kpa_81_D_80242040[i] = 0; - } else { - for (i = 0; i < 112; i++) { - kpa_81_D_80242040[i] = i + 16; - kpa_81_D_80242040[112] = 0; - } - } - return ApiStatus_DONE2; -} - -ApiStatus func_802403A4_A78864(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_80242208[i] = ptr[i]; - } - D_80242208[i] = 0; - } else { - for (i = 0; i < 91; i++) { - D_80242208[i] = i + 128; - D_80242208[91] = 0; - } - } - return ApiStatus_DONE2; -} diff --git a/src/world/area_kpa/kpa_81/kpa_81.h b/src/world/area_kpa/kpa_81/kpa_81.h index ebef47a1f6..acb4e70510 100644 --- a/src/world/area_kpa/kpa_81/kpa_81.h +++ b/src/world/area_kpa/kpa_81/kpa_81.h @@ -2,8 +2,23 @@ /// @brief Bowser's Castle - Guard Door 1 #include "common.h" -#include "../kpa.h" #include "message_ids.h" #include "map.h" +#include "../kpa.h" +#include "mapfs/kpa_80_shape.h" +#include "mapfs/kpa_80_hit.h" + +#include "sprite/npc/Toad.h" + +enum { + NPC_Door = 0, +}; + #define NAMESPACE kpa_81 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern NpcGroupList N(DefaultNPCs); + +extern const char N(KPA_17)[]; diff --git a/src/world/area_kpa/kpa_81/kpa_81_0_header.c b/src/world/area_kpa/kpa_81/kpa_81_0_header.c new file mode 100644 index 0000000000..3c822b1035 --- /dev/null +++ b/src/world/area_kpa/kpa_81/kpa_81_0_header.c @@ -0,0 +1,15 @@ +#include "kpa_81.h" + +EntryList N(Entrances) = { + [kpa_81_ENTRY_0] { -195.0, 0.0, 150.0, 90.0 }, + [kpa_81_ENTRY_1] { 0.0, 200.0, 150.0, 0.0 }, + [kpa_81_ENTRY_2] { 150.0, 0.0, 150.0, 270.0 }, + [kpa_81_ENTRY_3] { 0.0, 0.0, 59.0, 180.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_kpa_81 }, +}; diff --git a/src/world/area_kpa/kpa_81/kpa_81_1_music.c b/src/world/area_kpa/kpa_81/kpa_81_1_music.c new file mode 100644 index 0000000000..897347ea99 --- /dev/null +++ b/src/world/area_kpa/kpa_81/kpa_81_1_music.c @@ -0,0 +1,12 @@ +#include "kpa_81.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetMusicTrackVolumes, TRACK_VOLS_KPA_1) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_81/kpa_81_2_main.c b/src/world/area_kpa/kpa_81/kpa_81_2_main.c new file mode 100644 index 0000000000..4d058d9ece --- /dev/null +++ b/src/world/area_kpa/kpa_81/kpa_81_2_main.c @@ -0,0 +1,154 @@ +#include "kpa_81.h" + +s32 N(map_init)(void) { + sprintf(wMapShapeName, "kpa_80_shape"); + sprintf(wMapHitName, "kpa_80_hit"); + return FALSE; +} + +s32 N(RightDoorModels)[] = { + MODEL_o140, + MODEL_o142, + MODEL_o121, + MODEL_g35, + MODEL_o116, + MODEL_o170, + -1 +}; + +s32 N(LeftDoorModels)[] = { + MODEL_o161, + MODEL_o162, + MODEL_o119, + MODEL_g33, + MODEL_o126, + MODEL_o171, + -1 +}; + +EvtScript N(EVS_ExitDoors_kpa_50_1) = EVT_EXIT_DOUBLE_DOOR(kpa_81_ENTRY_0, "kpa_50", kpa_50_ENTRY_1, COLLIDER_deilittw, MODEL_o174, MODEL_o173); + +EvtScript N(EVS_ExitDoors_kpa_32_0) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET(LVar0, kpa_81_ENTRY_2) + EVT_SET(LVar1, COLLIDER_o166) + EVT_SET(LVar2, EVT_PTR(N(RightDoorModels))) + EVT_SET(LVar3, EVT_PTR(N(LeftDoorModels))) + EVT_EXEC(BaseExitDoor) + EVT_WAIT(17) + EVT_CALL(GotoMap, EVT_PTR("kpa_32"), kpa_32_ENTRY_0) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitWalk_kpa_04_1) = EVT_EXIT_WALK(60, kpa_81_ENTRY_3, "kpa_04", kpa_04_ENTRY_1); + +// required to match -- needs to be forward-declared here +const char N(KPA_17)[] = "kpa_17"; + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kpa_50_1)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_04_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_IF_NE(GB_KPA81_BowserDoorState, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kpa_32_0)), TRIGGER_WALL_PRESS_A, COLLIDER_o166, 1, 0) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(kpa_81_ENTRY_0) + EVT_SET(LVar0, kpa_81_ENTRY_0) + EVT_SET(LVar2, MODEL_o174) + EVT_SET(LVar3, MODEL_o173) + EVT_EXEC(EnterDoubleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_EQ(kpa_81_ENTRY_2) + EVT_SET(LVar0, kpa_81_ENTRY_2) + EVT_SET(LVar2, EVT_PTR(N(LeftDoorModels))) + EVT_SET(LVar3, EVT_PTR(N(RightDoorModels))) + EVT_EXEC_WAIT(BaseEnterDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_EQ(kpa_81_ENTRY_3) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UnusedMoveStatue) = { + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_IF_LT(LVar0, 0) + EVT_RETURN + EVT_END_IF + EVT_CALL(ParentColliderToModel, COLLIDER_o146, MODEL_o145) + EVT_CALL(MakeLerp, 0, -40, 40, EASING_LINEAR) + EVT_LABEL(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, MODEL_o145, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o146, LVar0, 0, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_o146) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(0) + EVT_END_IF + EVT_UNBIND + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_ALT_NO_LEAD() + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_IF_NE(GB_KPA81_BowserDoorState, 0) + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(kpa_81_ENTRY_0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_UnusedMoveStatue)), TRIGGER_WALL_PRESS_A, COLLIDER_o146, 1, 0) + EVT_CASE_EQ(kpa_81_ENTRY_2) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_UnusedMoveStatue)), TRIGGER_WALL_PRESS_A, COLLIDER_o146, 1, 0) + EVT_CASE_EQ(kpa_81_ENTRY_3) + EVT_END_SWITCH + EVT_END_IF + EVT_CALL(ParentColliderToModel, COLLIDER_o146, MODEL_o145) + EVT_SWITCH(GB_KPA04_StatuePosition) + EVT_CASE_EQ(1) + EVT_CALL(TranslateModel, MODEL_o145, -50, 0, 0) + EVT_CALL(TranslateModel, MODEL_o146, -50, 0, 0) + EVT_CASE_EQ(2) + EVT_CALL(TranslateModel, MODEL_o145, 50, 0, 0) + EVT_CALL(TranslateModel, MODEL_o146, 50, 0, 0) + EVT_END_SWITCH + EVT_CALL(UpdateColliderTransform, COLLIDER_o146) + EVT_CALL(EnableModel, MODEL_o166, FALSE) + EVT_CALL(EnableModel, MODEL_m_, FALSE) + EVT_CALL(EnableModel, MODEL_m_kai, FALSE) + EVT_CALL(EnableModel, MODEL_m1, FALSE) + EVT_CALL(EnableModel, MODEL_m2, FALSE) + EVT_CALL(EnableModel, MODEL_m3, FALSE) + EVT_CALL(EnableModel, MODEL_m4, FALSE) + EVT_CALL(EnableModel, MODEL_m5, FALSE) + EVT_CALL(EnableModel, MODEL_m6, FALSE) + EVT_CALL(EnableModel, MODEL_m7, FALSE) + EVT_CALL(EnableModel, MODEL_b_, FALSE) + EVT_CALL(EnableModel, MODEL_b_kai, FALSE) + EVT_CALL(EnableModel, MODEL_b1, FALSE) + EVT_CALL(EnableModel, MODEL_b2, FALSE) + EVT_CALL(EnableModel, MODEL_b3, FALSE) + EVT_CALL(EnableModel, MODEL_b4, FALSE) + EVT_CALL(EnableModel, MODEL_b5, FALSE) + EVT_CALL(EnableModel, MODEL_b6, FALSE) + EVT_CALL(EnableModel, MODEL_b7, FALSE) + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_81/kpa_81_3_npc.c b/src/world/area_kpa/kpa_81/kpa_81_3_npc.c new file mode 100644 index 0000000000..621f0e3e97 --- /dev/null +++ b/src/world/area_kpa/kpa_81/kpa_81_3_npc.c @@ -0,0 +1,230 @@ +#include "kpa_81.h" + +#include "world/common/npc/Toad_Stationary.inc.c" + +#include "world/common/complete/KeyItemChoice.inc.c" +MAP_STATIC_PAD(1,choice); +#include "world/common/complete/NormalItemChoice.inc.c" + +EvtScript N(EVS_EnsurePartnerNeutral) = { + EVT_CALL(GetPartnerInUse, LVar0) + EVT_IF_NE(LVar0, PARTNER_NONE) + EVT_IF_EQ(LVar0, PARTNER_BOMBETTE) + EVT_LOOP(0) + EVT_CALL(GetPartnerInUse, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, PARTNER_NONE) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_ELSE + EVT_CALL(InterruptUsePartner) + EVT_WAIT(20) + EVT_END_IF + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Door) = { + EVT_IF_EQ(GB_KPA81_BowserDoorState, 2) + EVT_RETURN + EVT_END_IF + EVT_IF_EQ(GB_KPA81_BowserDoorState, 1) + EVT_SET(GB_KPA81_BowserDoorState, 2) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_WAIT(35) + EVT_CALL(SetCamType, CAM_DEFAULT, 6, FALSE) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 109, 0, 202) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(15.0), EVT_FLOAT(-10.0)) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(500.0)) + EVT_CALL(SetCamPosA, CAM_DEFAULT, EVT_FLOAT(133.0), EVT_FLOAT(100.0)) + EVT_CALL(SetCamPosB, CAM_DEFAULT, EVT_FLOAT(216.0), EVT_FLOAT(230.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_THREAD + EVT_CALL(SetMusicTrack, 0, SONG_FINAL_BOWSER_BATTLE, 1, 8) + EVT_WAIT(150) + EVT_CALL(FadeOutMusic, 0, 250) + EVT_WAIT(15) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_END_THREAD + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Red_Idle, ANIM_Toad_Red_Idle, 0, MSG_CH8_0008) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END_IF + EVT_WAIT(10) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(2.0)) + EVT_CALL(PlayerMoveTo, -115, LVar2, 0) + EVT_CALL(SetCamType, CAM_DEFAULT, 6, FALSE) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 109, 0, 202) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(15.0), EVT_FLOAT(-10.0)) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(500.0)) + EVT_CALL(SetCamPosA, CAM_DEFAULT, EVT_FLOAT(133.0), EVT_FLOAT(100.0)) + EVT_CALL(SetCamPosB, CAM_DEFAULT, EVT_FLOAT(216.0), EVT_FLOAT(230.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_THREAD + EVT_CALL(SetMusicTrack, 0, SONG_FINAL_BOWSER_BATTLE, 1, 8) + EVT_WAIT(150) + EVT_CALL(FadeOutMusic, 0, 250) + EVT_WAIT(15) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_END_THREAD + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Red_Idle, ANIM_Toad_Red_Idle, 0, MSG_CH8_0000) + EVT_CALL(ShowChoice, MSG_Choice_0013) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(ContinueSpeech, NPC_SELF, ANIM_Toad_Red_Idle, ANIM_Toad_Red_Idle, 0, MSG_CH8_0003) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_LABEL(100) + EVT_WAIT(1) + EVT_CALL(IsPlayerWithin, 120, 150, 30, LVar0) + EVT_IF_EQ(LVar0, 1) + EVT_GOTO(3) + EVT_END_IF + EVT_ADD(LVar1, 1) + EVT_IF_LE(LVar1, 300) + EVT_GOTO(100) + EVT_END_IF + EVT_CALL(DisablePlayerInput, TRUE) + EVT_EXEC_WAIT(N(EVS_EnsurePartnerNeutral)) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Red_Idle, ANIM_Toad_Red_Idle, 0, MSG_CH8_0004) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(AwaitPlayerApproach, 120, 150, 30) + EVT_GOTO(2) + EVT_ELSE + EVT_CALL(ContinueSpeech, NPC_SELF, ANIM_Toad_Red_Idle, ANIM_Toad_Red_Idle, 0, MSG_CH8_0002) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(AwaitPlayerApproach, 120, 150, 30) + EVT_END_IF + EVT_LABEL(2) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_EXEC_WAIT(N(EVS_EnsurePartnerNeutral)) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Red_Idle, ANIM_Toad_Red_Idle, 0, MSG_CH8_0001) + EVT_CALL(ShowChoice, MSG_Choice_0013) + EVT_IF_EQ(LVar0, 0) + EVT_GOTO(4) + EVT_ELSE + EVT_CALL(ContinueSpeech, NPC_SELF, ANIM_Toad_Red_Idle, ANIM_Toad_Red_Idle, 0, MSG_CH8_0002) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(AwaitPlayerLeave, 120, 150, 30) + EVT_CALL(AwaitPlayerApproach, 120, 150, 30) + EVT_GOTO(2) + EVT_END_IF + EVT_LABEL(3) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_EXEC_WAIT(N(EVS_EnsurePartnerNeutral)) + EVT_THREAD + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(NpcMoveTo, NPC_PARTNER, LVar0, LVar2, 10) + EVT_CALL(EnablePartnerAI) + EVT_END_THREAD + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Red_Idle, ANIM_Toad_Red_Idle, 0, MSG_CH8_0005) + EVT_GOTO(5) + EVT_LABEL(4) + EVT_EXEC_WAIT(N(EVS_EnsurePartnerNeutral)) + EVT_THREAD + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(NpcMoveTo, NPC_PARTNER, LVar0, LVar2, 10) + EVT_CALL(EnablePartnerAI) + EVT_END_THREAD + EVT_CALL(ContinueSpeech, NPC_SELF, ANIM_Toad_Red_Idle, ANIM_Toad_Red_Idle, 0, MSG_CH8_0006) + EVT_LABEL(5) + EVT_CALL(SetCamType, CAM_DEFAULT, 6, FALSE) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 163, -71, 108) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(20.0), EVT_FLOAT(-16.0)) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(500.0)) + EVT_CALL(SetCamPosA, CAM_DEFAULT, EVT_FLOAT(133.0), EVT_FLOAT(100.0)) + EVT_CALL(SetCamPosB, CAM_DEFAULT, EVT_FLOAT(216.0), EVT_FLOAT(230.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(EnableModel, MODEL_o166, TRUE) + EVT_THREAD + EVT_WAIT(25) + EVT_CALL(EnableModel, MODEL_o165, FALSE) + EVT_END_THREAD + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitts, SOUND_2091, 0) + EVT_CALL(MakeLerp, 0, 90, 30, EASING_COS_SLOW_OVERSHOOT) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o165, LVar0, 0, 0, -1) + EVT_CALL(RotateModel, MODEL_o167, LVar0, 0, 0, 1) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(SetPlayerAnimation, ANIM_Mario_80017) + EVT_WAIT(30) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_80018) + EVT_WAIT(10) + EVT_CALL(PlaySoundAtPlayer, SOUND_161, 0) + EVT_THREAD + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_LOOP(65) + EVT_SUB(LVar1, 16) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_CALL(GetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) + EVT_LOOP(65) + EVT_SUB(LVar1, 16) + EVT_CALL(SetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_WAIT(65) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_SET(GB_KPA81_BowserDoorState, 1) + EVT_CALL(GotoMap, EVT_PTR(N(KPA_17)), kpa_17_ENTRY_0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Door) = { + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Door))) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2 | NPC_FLAG_100 | NPC_FLAG_10000000, TRUE) + EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) + EVT_CALL(SetNpcPos, NPC_SELF, 184, 20, 150) + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_Door) = { + .id = NPC_Door, + .settings = &N(NpcSettings_Toad_Stationary), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_4000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .init = &N(EVS_NpcInit_Door), + .drops = NPC_NO_DROPS, + .animations = TOAD_RED_ANIMS, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Door), BTL_KMR_PART_1_FORMATION_00, BTL_KMR_PART_1_STAGE_00), + {} +}; diff --git a/src/world/area_kpa/kpa_82/A7A500.c b/src/world/area_kpa/kpa_82/A7A500.c deleted file mode 100644 index 51eb50d996..0000000000 --- a/src/world/area_kpa/kpa_82/A7A500.c +++ /dev/null @@ -1,10 +0,0 @@ -#include "kpa_82.h" - -ApiStatus func_80240000_A7A500(Evt* script, s32 isInitialCall) { - sprintf(wMapShapeName, "kpa_80_shape"); - sprintf(wMapHitName, "kpa_80_hit"); - return ApiStatus_BLOCK; -} - -const char* N(exit_str_0) = "kpa_113"; -const char* N(exit_str_1) = "kpa_61"; diff --git a/src/world/area_kpa/kpa_82/A7A550.c b/src/world/area_kpa/kpa_82/A7A550.c deleted file mode 100644 index 5e899abc6f..0000000000 --- a/src/world/area_kpa/kpa_82/A7A550.c +++ /dev/null @@ -1,59 +0,0 @@ -#include "kpa_82.h" - -#include "world/common/todo/GetNpcCollisionHeight.inc.c" - -#include "world/common/todo/AddPlayerHandsOffset.inc.c" - -INCLUDE_ASM(s32, "world/area_kpa/kpa_82/A7A550", func_8024027C_A7A77C); - -extern s32 N(ItemChoice_HasSelectedItem); -extern s32 N(ItemChoice_SelectedItemID); - -ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - - N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args); - N(ItemChoice_HasSelectedItem) = TRUE; - return ApiStatus_DONE2; -} - -BSS s32 D_80248F90[114]; -BSS s32 D_80249158[92]; - -ApiStatus func_80240308_A7A808(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_80248F90[i] = ptr[i]; - } - D_80248F90[i] = 0; - } else { - for (i = 0; i < 112; i++) { - D_80248F90[i] = i + 16; - D_80248F90[112] = 0; - } - } - return ApiStatus_DONE2; -} - -ApiStatus func_802403A4_A7A8A4(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_80249158[i] = ptr[i]; - } - D_80249158[i] = 0; - } else { - for (i = 0; i < 91; i++) { - D_80249158[i] = i + 128; - D_80249158[91] = 0; - } - } - return ApiStatus_DONE2; -} diff --git a/src/world/area_kpa/kpa_82/kpa_82.h b/src/world/area_kpa/kpa_82/kpa_82.h index fd34cee201..837d1cadaf 100644 --- a/src/world/area_kpa/kpa_82/kpa_82.h +++ b/src/world/area_kpa/kpa_82/kpa_82.h @@ -2,8 +2,69 @@ /// @brief Bowser's Castle - Guard Door 2 #include "common.h" -#include "../kpa.h" #include "message_ids.h" #include "map.h" +#include "../kpa.h" +#include "mapfs/kpa_80_shape.h" +#include "mapfs/kpa_80_hit.h" + +#include "sprite/npc/WorldBobomb.h" + +enum { + NPC_Dummy = 0, + NPC_AntiGuy_01 = 1, + NPC_AntiGuy_02 = 2, + NPC_AntiGuy_03 = 3, + NPC_Goomba_01 = 4, + NPC_Goomba_02 = 5, + NPC_Goomba_03 = 6, + NPC_Goomba_04 = 7, + NPC_Goomba_05 = 8, + NPC_RedShyGuy_01 = 10, + NPC_RedShyGuy_02 = 11, + NPC_RedShyGuy_03 = 12, + NPC_RedShyGuy_04 = 13, + NPC_RedShyGuy_05 = 14, + NPC_BlueShyGuy_01 = 16, + NPC_BlueShyGuy_02 = 17, + NPC_BlueShyGuy_03 = 18, + NPC_BlueShyGuy_04 = 19, + NPC_BlueShyGuy_05 = 20, + NPC_GreenShyGuy_01 = 22, + NPC_GreenShyGuy_02 = 23, + NPC_GreenShyGuy_03 = 24, + NPC_GreenShyGuy_04 = 25, + NPC_GreenShyGuy_05 = 26, + NPC_DarkTroopa_01 = 28, + NPC_DarkTroopa_02 = 29, + NPC_DarkTroopa_03 = 30, + NPC_DarkTroopa_04 = 31, + NPC_DarkTroopa_05 = 32, + NPC_KoopaTroopa_01 = 34, + NPC_KoopaTroopa_02 = 35, + NPC_KoopaTroopa_03 = 36, + NPC_KoopaTroopa_04 = 37, + NPC_KoopaTroopa_05 = 38, + NPC_Bobomb_01 = 40, + NPC_Bobomb_02 = 41, + NPC_Bobomb_03 = 42, + NPC_Bobomb_04 = 43, + NPC_Bobomb_05 = 44, +}; + +enum { + MV_LastAnswerResult = MapVar(0), + MV_Sync_TimesUp = MapVar(1), +}; + +enum { + MF_Sync_MusicChange = MapFlag(0), +}; + #define NAMESPACE kpa_82 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_ExitDoors_kpa_61_0); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_kpa/kpa_82/kpa_82_0_header.c b/src/world/area_kpa/kpa_82/kpa_82_0_header.c new file mode 100644 index 0000000000..b505574cae --- /dev/null +++ b/src/world/area_kpa/kpa_82/kpa_82_0_header.c @@ -0,0 +1,13 @@ +#include "kpa_82.h" + +EntryList N(Entrances) = { + [kpa_82_ENTRY_0] { -210.0, 0.0, 150.0, 90.0 }, + [kpa_82_ENTRY_1] { 150.0, 0.0, 150.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_kpa_82 }, +}; diff --git a/src/world/area_kpa/kpa_82/kpa_82_1_music.c b/src/world/area_kpa/kpa_82/kpa_82_1_music.c new file mode 100644 index 0000000000..a967139efb --- /dev/null +++ b/src/world/area_kpa/kpa_82/kpa_82_1_music.c @@ -0,0 +1,12 @@ +#include "kpa_82.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetMusicTrackVolumes, TRACK_VOLS_KPA_2) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_82/kpa_82_2_main.c b/src/world/area_kpa/kpa_82/kpa_82_2_main.c new file mode 100644 index 0000000000..ff8699b227 --- /dev/null +++ b/src/world/area_kpa/kpa_82/kpa_82_2_main.c @@ -0,0 +1,115 @@ +#include "kpa_82.h" + +s32 N(map_init)(void) { + sprintf(wMapShapeName, "kpa_80_shape"); + sprintf(wMapHitName, "kpa_80_hit"); + return FALSE; +} + +s32 N(RightDoorModels)[] = { + MODEL_o140, + MODEL_o142, + MODEL_o121, + MODEL_g35, + MODEL_o116, + MODEL_o170, + -1 +}; + +s32 N(LeftDoorModels)[] = { + MODEL_o161, + MODEL_o162, + MODEL_o119, + MODEL_g33, + MODEL_o126, + MODEL_o171, + -1 +}; + +EvtScript N(EVS_ExitDoors_kpa_113_1) = EVT_EXIT_DOUBLE_DOOR(kpa_82_ENTRY_0, "kpa_113", kpa_113_ENTRY_1, COLLIDER_deilittw, MODEL_o174, MODEL_o173); + +EvtScript N(EVS_ExitDoors_kpa_61_0) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET(LVar0, kpa_82_ENTRY_1) + EVT_SET(LVar1, COLLIDER_o166) + EVT_SET(LVar2, EVT_PTR(N(RightDoorModels))) + EVT_SET(LVar3, EVT_PTR(N(LeftDoorModels))) + EVT_EXEC(BaseExitDoor) + EVT_WAIT(17) + EVT_CALL(GotoMap, EVT_PTR("kpa_61"), kpa_61_ENTRY_0) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Inspect_FaceDoor) = { + EVT_IF_EQ(GF_KPA82_PassedThroughDoor, TRUE) + EVT_RETURN + EVT_END_IF + EVT_SET(GF_KPA82_PassedThroughDoor, TRUE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kpa_113_1)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittw, 1, 0) + EVT_IF_EQ(GB_KPA82_BowserDoorState, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_Inspect_FaceDoor)), TRIGGER_WALL_PRESS_A, COLLIDER_o166, 1, 0) + EVT_ELSE + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kpa_61_0)), TRIGGER_WALL_PRESS_A, COLLIDER_o166, 1, 0) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(kpa_82_ENTRY_0) + EVT_SET(LVar0, kpa_82_ENTRY_0) + EVT_SET(LVar2, MODEL_o174) + EVT_SET(LVar3, MODEL_o173) + EVT_EXEC(EnterDoubleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_EQ(kpa_82_ENTRY_1) + EVT_SET(LVar0, kpa_82_ENTRY_1) + EVT_SET(LVar2, EVT_PTR(N(LeftDoorModels))) + EVT_SET(LVar3, EVT_PTR(N(RightDoorModels))) + EVT_EXEC_WAIT(BaseEnterDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_ALT_NO_LEAD() + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_CALL(EnableModel, MODEL_o166, FALSE) + EVT_CALL(EnableModel, MODEL_m_, FALSE) + EVT_CALL(EnableModel, MODEL_m_kai, FALSE) + EVT_CALL(EnableModel, MODEL_m1, FALSE) + EVT_CALL(EnableModel, MODEL_m2, FALSE) + EVT_CALL(EnableModel, MODEL_m3, FALSE) + EVT_CALL(EnableModel, MODEL_m4, FALSE) + EVT_CALL(EnableModel, MODEL_m5, FALSE) + EVT_CALL(EnableModel, MODEL_m6, FALSE) + EVT_CALL(EnableModel, MODEL_m7, FALSE) + EVT_CALL(EnableModel, MODEL_b_, FALSE) + EVT_CALL(EnableModel, MODEL_b_kai, FALSE) + EVT_CALL(EnableModel, MODEL_b1, FALSE) + EVT_CALL(EnableModel, MODEL_b2, FALSE) + EVT_CALL(EnableModel, MODEL_b3, FALSE) + EVT_CALL(EnableModel, MODEL_b4, FALSE) + EVT_CALL(EnableModel, MODEL_b5, FALSE) + EVT_CALL(EnableModel, MODEL_b6, FALSE) + EVT_CALL(EnableModel, MODEL_b7, FALSE) + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_82/kpa_82_3_npc.c b/src/world/area_kpa/kpa_82/kpa_82_3_npc.c new file mode 100644 index 0000000000..5945c64c66 --- /dev/null +++ b/src/world/area_kpa/kpa_82/kpa_82_3_npc.c @@ -0,0 +1,2657 @@ +#include "kpa_82.h" + +#include "world/common/enemy/complete/Goomba.h" +#include "world/common/enemy/complete/KoopaTroopa.h" +#include "world/common/enemy/complete/DarkTroopa.h" +#include "world/common/enemy/complete/ShyGuy.h" + +enum { + ANSWER_CORRECT = 0, + ANSWER_WRONG = 1, +}; + +NpcSettings N(NpcSettings_AntiGuy) = { + .height = 23, + .radius = 22, + .level = 14, + .onHit = &EnemyNpcHit, + .onDefeat = &EnemyNpcDefeat, + .actionFlags = AI_ACTION_JUMP_WHEN_SEE_PLAYER, +}; + +MobileAISettings N(AISettings_Short) = { + .moveSpeed = 5.0f, + .moveTime = 1, + .alertRadius = 1.0f, + .playerSearchInterval = 1, + .chaseSpeed = 6.0f, + .chaseTurnRate = 10, + .chaseUpdateInterval = 1, + .chaseRadius = 1.0f, + .unk_AI_2C = 1, +}; + +EvtScript N(EVS_NpcAI_Short) = { + EVT_CALL(BasicAI_Main, EVT_PTR(N(AISettings_Short))) + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_Short) = { + .height = 22, + .radius = 24, + .level = 5, + .ai = &N(EVS_NpcAI_Short), +}; + +MobileAISettings N(AISettings_Koopa) = { + .moveSpeed = 5.0f, + .moveTime = 1, + .alertRadius = 1.0f, + .playerSearchInterval = 1, + .chaseSpeed = 6.0f, + .chaseTurnRate = 10, + .chaseUpdateInterval = 1, + .chaseRadius = 1.0f, + .unk_AI_2C = 1, +}; + +EvtScript N(EVS_NpcAI_KoopaTroopa) = { + EVT_CALL(BasicAI_Main, EVT_PTR(N(AISettings_Koopa))) + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_KoopaTroopa) = { + .height = 35, + .radius = 24, + .level = 18, + .ai = &N(EVS_NpcAI_KoopaTroopa), +}; + +MobileAISettings N(AISettings_ShyGuy) = { + .moveSpeed = 5.0f, + .moveTime = 1, + .alertRadius = 1.0f, + .playerSearchInterval = 1, + .chaseSpeed = 6.0f, + .chaseTurnRate = 10, + .chaseUpdateInterval = 1, + .chaseRadius = 1.0f, + .unk_AI_2C = 1, +}; + +EvtScript N(EVS_NpcAI_ShyGuy) = { + EVT_CALL(BasicAI_Main, EVT_PTR(N(AISettings_ShyGuy))) + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_ShyGuy) = { + .height = 23, + .radius = 22, + .level = 14, + .ai = &N(EVS_NpcAI_ShyGuy), +}; + +#include "world/common/complete/KeyItemChoice.inc.c" +MAP_STATIC_PAD(1,choice); +#include "world/common/complete/NormalItemChoice.inc.c" + +EvtScript N(EVS_SetCam_MeetingDoor) = { + EVT_CALL(SetCamType, CAM_DEFAULT, 4, FALSE) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(11.0), EVT_FLOAT(-10.0)) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(450.0)) + EVT_CALL(SetCamPosA, CAM_DEFAULT, EVT_FLOAT(88.0), EVT_FLOAT(256.6)) + EVT_CALL(SetCamPosB, CAM_DEFAULT, EVT_FLOAT(195.0), EVT_FLOAT(142.0)) + EVT_CALL(SetCamPosC, CAM_DEFAULT, EVT_FLOAT(0.0), EVT_FLOAT(0.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetCam_AfterBattle) = { + EVT_CALL(SetCamType, CAM_DEFAULT, 4, FALSE) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(5.0), EVT_FLOAT(-14.0)) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(375.0)) + EVT_CALL(SetCamPosA, CAM_DEFAULT, EVT_FLOAT(88.0), EVT_FLOAT(256.6)) + EVT_CALL(SetCamPosB, CAM_DEFAULT, EVT_FLOAT(195.0), EVT_FLOAT(142.0)) + EVT_CALL(SetCamPosC, CAM_DEFAULT, EVT_FLOAT(0.0), EVT_FLOAT(0.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetCam_AfterResult) = { + EVT_CALL(SetCamType, CAM_DEFAULT, 4, FALSE) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(11.0), EVT_FLOAT(-14.0)) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(450.0)) + EVT_CALL(SetCamPosA, CAM_DEFAULT, EVT_FLOAT(88.0), EVT_FLOAT(256.6)) + EVT_CALL(SetCamPosB, CAM_DEFAULT, EVT_FLOAT(195.0), EVT_FLOAT(142.0)) + EVT_CALL(SetCamPosC, CAM_DEFAULT, EVT_FLOAT(0.0), EVT_FLOAT(0.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetCam_AskQuestion) = { + EVT_CALL(SetCamType, CAM_DEFAULT, 4, FALSE) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(11.0), EVT_FLOAT(-10.5)) + EVT_CALL(SetCamPosA, CAM_DEFAULT, EVT_FLOAT(88.0), EVT_FLOAT(256.6)) + EVT_CALL(SetCamPosB, CAM_DEFAULT, EVT_FLOAT(195.0), EVT_FLOAT(142.0)) + EVT_CALL(SetCamPosC, CAM_DEFAULT, EVT_FLOAT(0.0), EVT_FLOAT(0.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetCam_ViewRoom) = { + EVT_CALL(SetCamType, CAM_DEFAULT, 4, FALSE) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, LVar6) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(470.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(16.0), EVT_FLOAT(-9.0)) + EVT_CALL(SetCamPosA, CAM_DEFAULT, EVT_FLOAT(-2.5), EVT_FLOAT(300.0)) + EVT_CALL(SetCamPosB, CAM_DEFAULT, EVT_FLOAT(-2.5), EVT_FLOAT(200.0)) + EVT_CALL(SetCamPosC, CAM_DEFAULT, EVT_FLOAT(0.0), EVT_FLOAT(0.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetCam_BeforeBattle) = { + EVT_CALL(SetCamType, CAM_DEFAULT, 4, FALSE) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, LVar6) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(470.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(16.0), EVT_FLOAT(-9.0)) + EVT_CALL(SetCamPosA, CAM_DEFAULT, EVT_FLOAT(50.0), EVT_FLOAT(300.0)) + EVT_CALL(SetCamPosB, CAM_DEFAULT, EVT_FLOAT(50.0), EVT_FLOAT(200.0)) + EVT_CALL(SetCamPosC, CAM_DEFAULT, EVT_FLOAT(0.0), EVT_FLOAT(0.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OpenDoors) = { + EVT_CALL(MakeLerp, 0, 60, 30, EASING_LINEAR) + EVT_CALL(PlaySound, SOUND_225) + EVT_LABEL(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, MODEL_o100, 0, LVar0, 0) + EVT_CALL(TranslateModel, MODEL_o101, 0, LVar0, 0) + EVT_CALL(TranslateModel, MODEL_o145, 0, LVar0, 0) + EVT_CALL(TranslateModel, MODEL_o146, 0, LVar0, 0) + EVT_CALL(TranslateModel, MODEL_o102, 0, LVar0, 0) + EVT_CALL(TranslateModel, MODEL_o103, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(StopSound, SOUND_0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_CloseDoors) = { + EVT_CALL(MakeLerp, 60, 0, 30, EASING_LINEAR) + EVT_CALL(PlaySound, SOUND_226) + EVT_LABEL(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, MODEL_o100, 0, LVar0, 0) + EVT_CALL(TranslateModel, MODEL_o101, 0, LVar0, 0) + EVT_CALL(TranslateModel, MODEL_o145, 0, LVar0, 0) + EVT_CALL(TranslateModel, MODEL_o146, 0, LVar0, 0) + EVT_CALL(TranslateModel, MODEL_o102, 0, LVar0, 0) + EVT_CALL(TranslateModel, MODEL_o103, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(StopSound, SOUND_0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ReleaseFrom_Door_0) = { + EVT_CALL(SetNpcAnimation, NPC_SELF, LVar3) + EVT_CALL(SetNpcPos, NPC_SELF, -100, 0, 0) + EVT_CALL(RandInt, 40, LVar1) + EVT_ADD(LVar1, -120) + EVT_CALL(NpcMoveTo, NPC_SELF, LVar1, 150, 30) + EVT_CALL(SetNpcAnimation, NPC_SELF, LVar4) + EVT_CALL(BindNpcAI, NPC_SELF, LVar5) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ReleaseFrom_Door_1) = { + EVT_CALL(SetNpcAnimation, NPC_SELF, LVar3) + EVT_CALL(SetNpcPos, NPC_SELF, 0, 0, 0) + EVT_CALL(RandInt, 40, LVar1) + EVT_ADD(LVar1, -20) + EVT_CALL(NpcMoveTo, NPC_SELF, LVar1, 150, 30) + EVT_CALL(SetNpcAnimation, NPC_SELF, LVar4) + EVT_CALL(BindNpcAI, NPC_SELF, LVar5) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ReleaseFrom_Door_2) = { + EVT_CALL(SetNpcAnimation, NPC_SELF, LVar3) + EVT_CALL(SetNpcPos, NPC_SELF, 100, 0, 0) + EVT_CALL(RandInt, 40, LVar1) + EVT_ADD(LVar1, 80) + EVT_CALL(NpcMoveTo, NPC_SELF, LVar1, 150, 30) + EVT_CALL(SetNpcAnimation, NPC_SELF, LVar4) + EVT_CALL(BindNpcAI, NPC_SELF, LVar5) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_WithdrawTo_Door_0) = { + EVT_CALL(SetNpcAnimation, NPC_SELF, LVar3) + EVT_CALL(RandInt, 20, LVar1) + EVT_ADD(LVar1, 20) + EVT_CALL(NpcMoveTo, NPC_SELF, -100, 0, LVar1) + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_WithdrawTo_Door_1) = { + EVT_CALL(SetNpcAnimation, NPC_SELF, LVar3) + EVT_CALL(RandInt, 20, LVar1) + EVT_ADD(LVar1, 20) + EVT_CALL(NpcMoveTo, NPC_SELF, 0, 0, LVar1) + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_WithdrawTo_Door_2) = { + EVT_CALL(SetNpcAnimation, NPC_SELF, LVar3) + EVT_CALL(RandInt, 20, LVar1) + EVT_ADD(LVar1, 20) + EVT_CALL(NpcMoveTo, NPC_SELF, 100, 0, LVar1) + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ReleaseFrom_RandomDoor) = { + EVT_CALL(RandInt, 2, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(0) + EVT_EXEC_WAIT(N(EVS_ReleaseFrom_Door_0)) + EVT_CASE_EQ(1) + EVT_EXEC_WAIT(N(EVS_ReleaseFrom_Door_1)) + EVT_CASE_EQ(2) + EVT_EXEC_WAIT(N(EVS_ReleaseFrom_Door_2)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_WithdrawTo_RandomDoor) = { + EVT_CALL(RandInt, 2, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(0) + EVT_EXEC_WAIT(N(EVS_WithdrawTo_Door_0)) + EVT_CASE_EQ(1) + EVT_EXEC_WAIT(N(EVS_WithdrawTo_Door_1)) + EVT_CASE_EQ(2) + EVT_EXEC_WAIT(N(EVS_WithdrawTo_Door_2)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Goomba) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Release_Goomba) = { + EVT_SET(LVar3, ANIM_Goomba_Run) + EVT_SET(LVar4, ANIM_Goomba_Idle) + EVT_SET(LVar5, EVT_PTR(N(EVS_NpcAI_Short))) + EVT_EXEC_WAIT(N(EVS_ReleaseFrom_RandomDoor)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Withdraw_Goomba) = { + EVT_SET(LVar3, ANIM_Goomba_Run) + EVT_EXEC_WAIT(N(EVS_WithdrawTo_RandomDoor)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_ShyGuy) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Release_RedShyGuy) = { + EVT_SET(LVar3, ANIM_ShyGuy_Red_Anim04) + EVT_SET(LVar4, ANIM_ShyGuy_Red_Anim01) + EVT_SET(LVar5, EVT_PTR(N(EVS_NpcAI_ShyGuy))) + EVT_EXEC_WAIT(N(EVS_ReleaseFrom_RandomDoor)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Withdraw_RedShyGuy) = { + EVT_SET(LVar3, ANIM_ShyGuy_Red_Anim04) + EVT_EXEC_WAIT(N(EVS_WithdrawTo_RandomDoor)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Release_RedShyGuy_Door_1) = { + EVT_SET(LVar3, ANIM_ShyGuy_Red_Anim04) + EVT_SET(LVar4, ANIM_ShyGuy_Red_Anim01) + EVT_SET(LVar5, EVT_PTR(N(EVS_NpcAI_ShyGuy))) + EVT_EXEC_WAIT(N(EVS_ReleaseFrom_Door_1)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Withdraw_RedShyGuy_Door_1) = { + EVT_SET(LVar3, ANIM_ShyGuy_Red_Anim04) + EVT_EXEC_WAIT(N(EVS_WithdrawTo_Door_1)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Release_BlueShyGuy) = { + EVT_SET(LVar3, ANIM_ShyGuy_Blue_Anim04) + EVT_SET(LVar4, ANIM_ShyGuy_Blue_Anim01) + EVT_SET(LVar5, EVT_PTR(N(EVS_NpcAI_ShyGuy))) + EVT_EXEC_WAIT(N(EVS_ReleaseFrom_RandomDoor)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Withdraw_BlueShyGuy) = { + EVT_SET(LVar3, ANIM_ShyGuy_Blue_Anim04) + EVT_EXEC_WAIT(N(EVS_WithdrawTo_RandomDoor)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Release_BlueShyGuy_Door_2) = { + EVT_SET(LVar3, ANIM_ShyGuy_Blue_Anim04) + EVT_SET(LVar4, ANIM_ShyGuy_Blue_Anim01) + EVT_SET(LVar5, EVT_PTR(N(EVS_NpcAI_ShyGuy))) + EVT_EXEC_WAIT(N(EVS_ReleaseFrom_Door_2)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Withdraw_BlueShyGuy_Door_2) = { + EVT_SET(LVar3, ANIM_ShyGuy_Blue_Anim04) + EVT_EXEC_WAIT(N(EVS_WithdrawTo_Door_2)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Release_GreenShyGuy) = { + EVT_SET(LVar3, ANIM_ShyGuy_Green_Anim04) + EVT_SET(LVar4, ANIM_ShyGuy_Green_Anim01) + EVT_SET(LVar5, EVT_PTR(N(EVS_NpcAI_ShyGuy))) + EVT_EXEC_WAIT(N(EVS_ReleaseFrom_RandomDoor)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Withdraw_GreenShyGuy) = { + EVT_SET(LVar3, ANIM_ShyGuy_Green_Anim04) + EVT_EXEC_WAIT(N(EVS_WithdrawTo_RandomDoor)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_KoopaTroopa) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Release_DarkTroopa) = { + EVT_SET(LVar3, ANIM_KoopaTroopa_Dark_Run) + EVT_SET(LVar4, ANIM_KoopaTroopa_Dark_Idle) + EVT_SET(LVar5, EVT_PTR(N(EVS_NpcAI_KoopaTroopa))) + EVT_EXEC_WAIT(N(EVS_ReleaseFrom_RandomDoor)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Withdraw_DarkTroopa) = { + EVT_SET(LVar3, ANIM_KoopaTroopa_Dark_Run) + EVT_EXEC_WAIT(N(EVS_WithdrawTo_RandomDoor)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Release_KoopaTroopa) = { + EVT_SET(LVar3, ANIM_KoopaTroopa_Run) + EVT_SET(LVar4, ANIM_KoopaTroopa_Idle) + EVT_SET(LVar5, EVT_PTR(N(EVS_NpcAI_KoopaTroopa))) + EVT_EXEC_WAIT(N(EVS_ReleaseFrom_RandomDoor)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Withdraw_KoopaTroopa) = { + EVT_SET(LVar3, ANIM_KoopaTroopa_Run) + EVT_EXEC_WAIT(N(EVS_WithdrawTo_RandomDoor)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Bobomb) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Release_Bobomb) = { + EVT_SET(LVar3, ANIM_WorldBobomb_Green_Run) + EVT_SET(LVar4, ANIM_WorldBobomb_Green_Idle) + EVT_SET(LVar5, EVT_PTR(N(EVS_NpcAI_Short))) + EVT_EXEC_WAIT(N(EVS_ReleaseFrom_RandomDoor)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Withdraw_Bobomb) = { + EVT_SET(LVar3, ANIM_WorldBobomb_Green_Run) + EVT_EXEC_WAIT(N(EVS_WithdrawTo_RandomDoor)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Release_Bobomb_Door_0) = { + EVT_SET(LVar3, ANIM_WorldBobomb_Green_Run) + EVT_SET(LVar4, ANIM_WorldBobomb_Green_Idle) + EVT_SET(LVar5, EVT_PTR(N(EVS_NpcAI_Short))) + EVT_EXEC_WAIT(N(EVS_ReleaseFrom_Door_0)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Withdraw_Bobomb_Door_0) = { + EVT_SET(LVar3, ANIM_WorldBobomb_Green_Run) + EVT_EXEC_WAIT(N(EVS_WithdrawTo_Door_0)) + EVT_RETURN + EVT_END +}; + +// special 'script' used only to organize the quiz waves +#define QS_NEXT(npcID, script) npcID, (s32) script, +#define QS_WAIT(n) -2, n, +#define QS_END -1, + +s32 N(QS_Release_Wave_0)[] = { + QS_NEXT(NPC_DarkTroopa_01, N(EVS_Release_DarkTroopa)) + QS_WAIT(5) + QS_NEXT(NPC_Goomba_01, N(EVS_Release_Goomba)) + QS_WAIT(5) + QS_NEXT(NPC_DarkTroopa_02, N(EVS_Release_DarkTroopa)) + QS_WAIT(5) + QS_NEXT(NPC_Goomba_02, N(EVS_Release_Goomba)) + QS_WAIT(5) + QS_NEXT(NPC_Goomba_03, N(EVS_Release_Goomba)) + QS_WAIT(5) + QS_NEXT(NPC_DarkTroopa_03, N(EVS_Release_DarkTroopa)) + QS_WAIT(5) + QS_NEXT(NPC_Goomba_04, N(EVS_Release_Goomba)) + QS_END +}; + +s32 N(QS_Release_Wave_1)[] = { + QS_NEXT(NPC_RedShyGuy_01, N(EVS_Release_RedShyGuy)) + QS_WAIT(5) + QS_NEXT(NPC_RedShyGuy_02, N(EVS_Release_RedShyGuy)) + QS_WAIT(10) + QS_NEXT(NPC_RedShyGuy_03, N(EVS_Release_RedShyGuy)) + QS_WAIT(8) + QS_NEXT(NPC_BlueShyGuy_01, N(EVS_Release_BlueShyGuy)) + QS_WAIT(3) + QS_NEXT(NPC_BlueShyGuy_02, N(EVS_Release_BlueShyGuy)) + QS_WAIT(6) + QS_NEXT(NPC_BlueShyGuy_03, N(EVS_Release_BlueShyGuy)) + QS_WAIT(7) + QS_NEXT(NPC_BlueShyGuy_04, N(EVS_Release_BlueShyGuy)) + QS_WAIT(5) + QS_NEXT(NPC_GreenShyGuy_01, N(EVS_Release_GreenShyGuy)) + QS_WAIT(4) + QS_NEXT(NPC_GreenShyGuy_02, N(EVS_Release_GreenShyGuy)) + QS_WAIT(6) + QS_NEXT(NPC_GreenShyGuy_03, N(EVS_Release_GreenShyGuy)) + QS_WAIT(5) + QS_NEXT(NPC_GreenShyGuy_04, N(EVS_Release_GreenShyGuy)) + QS_END +}; + +s32 N(QS_Release_Wave_2)[] = { + QS_NEXT(NPC_RedShyGuy_01, N(EVS_Release_RedShyGuy_Door_1)) + QS_NEXT(NPC_BlueShyGuy_01, N(EVS_Release_BlueShyGuy_Door_2)) + QS_NEXT(NPC_Bobomb_01, N(EVS_Release_Bobomb_Door_0)) + QS_WAIT(5) + QS_NEXT(NPC_RedShyGuy_02, N(EVS_Release_RedShyGuy_Door_1)) + QS_NEXT(NPC_BlueShyGuy_02, N(EVS_Release_BlueShyGuy_Door_2)) + QS_NEXT(NPC_Bobomb_02, N(EVS_Release_Bobomb_Door_0)) + QS_WAIT(5) + QS_NEXT(NPC_BlueShyGuy_03, N(EVS_Release_BlueShyGuy_Door_2)) + QS_WAIT(5) + QS_NEXT(NPC_BlueShyGuy_04, N(EVS_Release_BlueShyGuy_Door_2)) + QS_END +}; + +s32 N(QS_Release_Wave_3)[] = { + QS_NEXT(NPC_Goomba_01, N(EVS_Release_Goomba)) + QS_WAIT(8) + QS_NEXT(NPC_KoopaTroopa_01, N(EVS_Release_KoopaTroopa)) + QS_NEXT(NPC_KoopaTroopa_02, N(EVS_Release_KoopaTroopa)) + QS_WAIT(5) + QS_NEXT(NPC_BlueShyGuy_01, N(EVS_Release_BlueShyGuy)) + QS_NEXT(NPC_GreenShyGuy_01, N(EVS_Release_GreenShyGuy)) + QS_NEXT(NPC_BlueShyGuy_02, N(EVS_Release_BlueShyGuy)) + QS_WAIT(8) + QS_NEXT(NPC_Goomba_02, N(EVS_Release_Goomba)) + QS_NEXT(NPC_BlueShyGuy_03, N(EVS_Release_BlueShyGuy)) + QS_WAIT(5) + QS_NEXT(NPC_KoopaTroopa_03, N(EVS_Release_KoopaTroopa)) + QS_WAIT(5) + QS_NEXT(NPC_KoopaTroopa_04, N(EVS_Release_KoopaTroopa)) + QS_END +}; + +s32 N(QS_Release_Wave_4)[] = { + QS_NEXT(NPC_Goomba_01, N(EVS_Release_Goomba)) + QS_WAIT(5) + QS_NEXT(NPC_KoopaTroopa_01, N(EVS_Release_KoopaTroopa)) + QS_WAIT(5) + QS_NEXT(NPC_DarkTroopa_01, N(EVS_Release_DarkTroopa)) + QS_END +}; + +s32 N(QS_Release_Wave_5)[] = { + QS_NEXT(NPC_RedShyGuy_01, N(EVS_Release_RedShyGuy)) + QS_WAIT(5) + QS_NEXT(NPC_RedShyGuy_02, N(EVS_Release_RedShyGuy)) + QS_WAIT(4) + QS_NEXT(NPC_GreenShyGuy_01, N(EVS_Release_GreenShyGuy)) + QS_WAIT(8) + QS_NEXT(NPC_Bobomb_01, N(EVS_Release_Bobomb)) + QS_WAIT(5) + QS_NEXT(NPC_Bobomb_02, N(EVS_Release_Bobomb)) + QS_WAIT(8) + QS_NEXT(NPC_Bobomb_03, N(EVS_Release_Bobomb)) + QS_WAIT(5) + QS_NEXT(NPC_KoopaTroopa_01, N(EVS_Release_KoopaTroopa)) + QS_WAIT(10) + QS_NEXT(NPC_KoopaTroopa_02, N(EVS_Release_KoopaTroopa)) + QS_WAIT(5) + QS_NEXT(NPC_KoopaTroopa_03, N(EVS_Release_KoopaTroopa)) + QS_WAIT(8) + QS_NEXT(NPC_KoopaTroopa_04, N(EVS_Release_KoopaTroopa)) + QS_END +}; + +s32 N(QS_Release_Wave_6)[] = { + QS_NEXT(NPC_DarkTroopa_01, N(EVS_Release_DarkTroopa)) + QS_WAIT(10) + QS_NEXT(NPC_BlueShyGuy_01, N(EVS_Release_BlueShyGuy)) + QS_NEXT(NPC_Goomba_01, N(EVS_Release_Goomba)) + QS_WAIT(5) + QS_NEXT(NPC_BlueShyGuy_02, N(EVS_Release_BlueShyGuy)) + QS_NEXT(NPC_Goomba_02, N(EVS_Release_Goomba)) + QS_WAIT(5) + QS_NEXT(NPC_Goomba_03, N(EVS_Release_Goomba)) + QS_NEXT(NPC_DarkTroopa_02, N(EVS_Release_DarkTroopa)) + QS_WAIT(8) + QS_NEXT(NPC_DarkTroopa_03, N(EVS_Release_DarkTroopa)) + QS_WAIT(5) + QS_NEXT(NPC_RedShyGuy_01, N(EVS_Release_RedShyGuy)) + QS_WAIT(5) + QS_NEXT(NPC_RedShyGuy_02, N(EVS_Release_RedShyGuy)) + QS_END +}; + +s32 N(QS_Withdraw_Wave_0)[] = { + QS_NEXT(NPC_DarkTroopa_01, N(EVS_Withdraw_DarkTroopa)) + QS_NEXT(NPC_DarkTroopa_02, N(EVS_Withdraw_DarkTroopa)) + QS_NEXT(NPC_DarkTroopa_03, N(EVS_Withdraw_DarkTroopa)) + QS_NEXT(NPC_Goomba_01, N(EVS_Withdraw_Goomba)) + QS_NEXT(NPC_Goomba_02, N(EVS_Withdraw_Goomba)) + QS_NEXT(NPC_Goomba_03, N(EVS_Withdraw_Goomba)) + QS_NEXT(NPC_Goomba_04, N(EVS_Withdraw_Goomba)) + QS_END +}; + +s32 N(QS_Withdraw_Wave_1)[] = { + QS_NEXT(NPC_RedShyGuy_01, N(EVS_Withdraw_RedShyGuy)) + QS_NEXT(NPC_RedShyGuy_02, N(EVS_Withdraw_RedShyGuy)) + QS_NEXT(NPC_RedShyGuy_03, N(EVS_Withdraw_RedShyGuy)) + QS_NEXT(NPC_BlueShyGuy_01, N(EVS_Withdraw_BlueShyGuy)) + QS_NEXT(NPC_BlueShyGuy_02, N(EVS_Withdraw_BlueShyGuy)) + QS_NEXT(NPC_BlueShyGuy_03, N(EVS_Withdraw_BlueShyGuy)) + QS_NEXT(NPC_BlueShyGuy_04, N(EVS_Withdraw_BlueShyGuy)) + QS_NEXT(NPC_GreenShyGuy_01, N(EVS_Withdraw_GreenShyGuy)) + QS_NEXT(NPC_GreenShyGuy_02, N(EVS_Withdraw_GreenShyGuy)) + QS_NEXT(NPC_GreenShyGuy_03, N(EVS_Withdraw_GreenShyGuy)) + QS_NEXT(NPC_GreenShyGuy_04, N(EVS_Withdraw_GreenShyGuy)) + QS_END +}; + +s32 N(QS_Withdraw_Wave_2)[] = { + QS_NEXT(NPC_RedShyGuy_01, N(EVS_Withdraw_RedShyGuy_Door_1)) + QS_NEXT(NPC_RedShyGuy_02, N(EVS_Withdraw_RedShyGuy_Door_1)) + QS_NEXT(NPC_BlueShyGuy_01, N(EVS_Withdraw_BlueShyGuy_Door_2)) + QS_NEXT(NPC_BlueShyGuy_02, N(EVS_Withdraw_BlueShyGuy_Door_2)) + QS_NEXT(NPC_BlueShyGuy_03, N(EVS_Withdraw_BlueShyGuy_Door_2)) + QS_NEXT(NPC_BlueShyGuy_04, N(EVS_Withdraw_BlueShyGuy_Door_2)) + QS_NEXT(NPC_Bobomb_01, N(EVS_Withdraw_Bobomb_Door_0)) + QS_NEXT(NPC_Bobomb_02, N(EVS_Withdraw_Bobomb_Door_0)) + QS_END +}; + +s32 N(QS_Withdraw_Wave_3)[] = { + QS_NEXT(NPC_Goomba_01, N(EVS_Withdraw_Goomba)) + QS_NEXT(NPC_Goomba_02, N(EVS_Withdraw_Goomba)) + QS_NEXT(NPC_KoopaTroopa_01, N(EVS_Withdraw_KoopaTroopa)) + QS_NEXT(NPC_KoopaTroopa_02, N(EVS_Withdraw_KoopaTroopa)) + QS_NEXT(NPC_KoopaTroopa_03, N(EVS_Withdraw_KoopaTroopa)) + QS_NEXT(NPC_KoopaTroopa_04, N(EVS_Withdraw_KoopaTroopa)) + QS_NEXT(NPC_GreenShyGuy_01, N(EVS_Withdraw_GreenShyGuy)) + QS_NEXT(NPC_BlueShyGuy_01, N(EVS_Withdraw_BlueShyGuy)) + QS_NEXT(NPC_BlueShyGuy_02, N(EVS_Withdraw_BlueShyGuy)) + QS_NEXT(NPC_BlueShyGuy_03, N(EVS_Withdraw_BlueShyGuy)) + QS_END +}; + +s32 N(QS_Withdraw_Wave_4)[] = { + QS_NEXT(NPC_Goomba_01, N(EVS_Withdraw_Goomba)) + QS_NEXT(NPC_KoopaTroopa_01, N(EVS_Withdraw_KoopaTroopa)) + QS_NEXT(NPC_DarkTroopa_01, N(EVS_Withdraw_DarkTroopa)) + QS_END +}; + +s32 N(QS_Withdraw_Wave_5)[] = { + QS_NEXT(NPC_RedShyGuy_01, N(EVS_Withdraw_RedShyGuy)) + QS_NEXT(NPC_RedShyGuy_02, N(EVS_Withdraw_RedShyGuy)) + QS_NEXT(NPC_GreenShyGuy_01, N(EVS_Withdraw_GreenShyGuy)) + QS_NEXT(NPC_Bobomb_01, N(EVS_Withdraw_Bobomb)) + QS_NEXT(NPC_Bobomb_02, N(EVS_Withdraw_Bobomb)) + QS_NEXT(NPC_Bobomb_03, N(EVS_Withdraw_Bobomb)) + QS_NEXT(NPC_KoopaTroopa_01, N(EVS_Withdraw_KoopaTroopa)) + QS_NEXT(NPC_KoopaTroopa_02, N(EVS_Withdraw_KoopaTroopa)) + QS_NEXT(NPC_KoopaTroopa_03, N(EVS_Withdraw_KoopaTroopa)) + QS_NEXT(NPC_KoopaTroopa_04, N(EVS_Withdraw_KoopaTroopa)) + QS_END +}; + +s32 N(QS_Withdraw_Wave_6)[] = { + QS_NEXT(NPC_DarkTroopa_01, N(EVS_Withdraw_DarkTroopa)) + QS_NEXT(NPC_DarkTroopa_02, N(EVS_Withdraw_DarkTroopa)) + QS_NEXT(NPC_DarkTroopa_03, N(EVS_Withdraw_DarkTroopa)) + QS_NEXT(NPC_BlueShyGuy_01, N(EVS_Withdraw_BlueShyGuy)) + QS_NEXT(NPC_BlueShyGuy_02, N(EVS_Withdraw_BlueShyGuy)) + QS_NEXT(NPC_Goomba_01, N(EVS_Withdraw_Goomba)) + QS_NEXT(NPC_Goomba_02, N(EVS_Withdraw_Goomba)) + QS_NEXT(NPC_Goomba_03, N(EVS_Withdraw_Goomba)) + QS_NEXT(NPC_RedShyGuy_01, N(EVS_Withdraw_RedShyGuy)) + QS_NEXT(NPC_RedShyGuy_02, N(EVS_Withdraw_RedShyGuy)) + QS_END +}; + +EvtScript N(EVS_Release_Wave) = { + EVT_SWITCH(AB_KPA82_QuizRound) + EVT_CASE_EQ(0) + EVT_USE_BUF(EVT_PTR(N(QS_Release_Wave_0))) + EVT_CASE_EQ(1) + EVT_USE_BUF(EVT_PTR(N(QS_Release_Wave_1))) + EVT_CASE_EQ(2) + EVT_USE_BUF(EVT_PTR(N(QS_Release_Wave_2))) + EVT_CASE_EQ(3) + EVT_USE_BUF(EVT_PTR(N(QS_Release_Wave_3))) + EVT_CASE_EQ(4) + EVT_USE_BUF(EVT_PTR(N(QS_Release_Wave_4))) + EVT_CASE_EQ(5) + EVT_USE_BUF(EVT_PTR(N(QS_Release_Wave_5))) + EVT_CASE_EQ(6) + EVT_USE_BUF(EVT_PTR(N(QS_Release_Wave_6))) + EVT_END_SWITCH + EVT_LOOP(0) + EVT_BUF_READ2(LVarA, LVarB) + EVT_IF_EQ(LVarA, -1) + EVT_BREAK_LOOP + EVT_END_IF + EVT_IF_EQ(LVarA, -2) + EVT_WAIT(LVarB) + EVT_ELSE + EVT_CALL(BindNpcAI, LVarA, LVarB) + EVT_END_IF + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Withdraw_Wave) = { + EVT_SWITCH(AB_KPA82_QuizRound) + EVT_CASE_EQ(0) + EVT_USE_BUF(EVT_PTR(N(QS_Withdraw_Wave_0))) + EVT_CASE_EQ(1) + EVT_USE_BUF(EVT_PTR(N(QS_Withdraw_Wave_1))) + EVT_CASE_EQ(2) + EVT_USE_BUF(EVT_PTR(N(QS_Withdraw_Wave_2))) + EVT_CASE_EQ(3) + EVT_USE_BUF(EVT_PTR(N(QS_Withdraw_Wave_3))) + EVT_CASE_EQ(4) + EVT_USE_BUF(EVT_PTR(N(QS_Withdraw_Wave_4))) + EVT_CASE_EQ(5) + EVT_USE_BUF(EVT_PTR(N(QS_Withdraw_Wave_5))) + EVT_CASE_EQ(6) + EVT_USE_BUF(EVT_PTR(N(QS_Withdraw_Wave_6))) + EVT_END_SWITCH + EVT_LOOP(0) + EVT_BUF_READ2(LVarA, LVarB) + EVT_IF_EQ(LVarA, -1) + EVT_BREAK_LOOP + EVT_END_IF + EVT_IF_EQ(LVarA, -2) + EVT_WAIT(LVarB) + EVT_ELSE + EVT_CALL(BindNpcAI, LVarA, LVarB) + EVT_END_IF + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_AskQuestion) = { + EVT_EXEC_WAIT(N(EVS_SetCam_AskQuestion)) + EVT_SWITCH(AB_KPA82_QuizRound) + EVT_CASE_EQ(0) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ShyGuy_Black_Anim01, ANIM_ShyGuy_Black_Anim01, 0, MSG_CH8_0035) + EVT_CALL(ShowChoice, MSG_Choice_0046) + EVT_IF_EQ(LVar0, 0) + EVT_SET(LVar0, ANSWER_CORRECT) + EVT_ELSE + EVT_SET(LVar0, ANSWER_WRONG) + EVT_END_IF + EVT_CASE_EQ(1) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ShyGuy_Black_Anim01, ANIM_ShyGuy_Black_Anim01, 0, MSG_CH8_0036) + EVT_CALL(ShowChoice, MSG_Choice_0047) + EVT_IF_EQ(LVar0, 0) + EVT_SET(LVar0, ANSWER_CORRECT) + EVT_ELSE + EVT_SET(LVar0, ANSWER_WRONG) + EVT_END_IF + EVT_CASE_EQ(2) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ShyGuy_Black_Anim01, ANIM_ShyGuy_Black_Anim01, 0, MSG_CH8_0037) + EVT_CALL(ShowChoice, MSG_Choice_0048) + EVT_IF_EQ(LVar0, 1) + EVT_SET(LVar0, ANSWER_CORRECT) + EVT_ELSE + EVT_SET(LVar0, ANSWER_WRONG) + EVT_END_IF + EVT_CASE_EQ(3) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ShyGuy_Black_Anim01, ANIM_ShyGuy_Black_Anim01, 0, MSG_CH8_0038) + EVT_CALL(ShowChoice, MSG_Choice_0049) + EVT_IF_EQ(LVar0, 0) + EVT_SET(LVar0, ANSWER_CORRECT) + EVT_ELSE + EVT_SET(LVar0, ANSWER_WRONG) + EVT_END_IF + EVT_CASE_EQ(4) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ShyGuy_Black_Anim01, ANIM_ShyGuy_Black_Anim01, 0, MSG_CH8_0039) + EVT_CALL(ShowChoice, MSG_Choice_004A) + EVT_IF_EQ(LVar0, 0) + EVT_SET(LVar0, ANSWER_CORRECT) + EVT_ELSE + EVT_SET(LVar0, ANSWER_WRONG) + EVT_END_IF + EVT_CASE_EQ(5) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ShyGuy_Black_Anim01, ANIM_ShyGuy_Black_Anim01, 0, MSG_CH8_003A) + EVT_CALL(ShowChoice, MSG_Choice_004B) + EVT_IF_EQ(LVar0, 2) + EVT_SET(LVar0, ANSWER_CORRECT) + EVT_ELSE + EVT_SET(LVar0, ANSWER_WRONG) + EVT_END_IF + EVT_CASE_EQ(6) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ShyGuy_Black_Anim01, ANIM_ShyGuy_Black_Anim01, 0, MSG_CH8_003B) + EVT_CALL(ShowChoice, MSG_Choice_004C) + EVT_IF_EQ(LVar0, 1) + EVT_SET(LVar0, ANSWER_CORRECT) + EVT_ELSE + EVT_SET(LVar0, ANSWER_WRONG) + EVT_END_IF + EVT_END_SWITCH + EVT_SET(MV_LastAnswerResult, LVar0) + EVT_CALL(CloseMessage) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ShowUnknownCard) = { + EVT_CALL(EnableModel, MODEL_m_, TRUE) + EVT_CALL(MakeLerp, 180, LVar0, 60, EASING_QUADRATIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_IF_GE(LVar0, 360) + EVT_CALL(RotateGroup, MODEL_g47, LVar0, 0, 1, 0) + EVT_CALL(EnableGroup, MODEL_g47, TRUE) + EVT_CALL(EnableModel, MODEL_m_, FALSE) + EVT_ELSE + EVT_CALL(RotateModel, MODEL_m_, LVar0, 0, 1, 0) + EVT_END_IF + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TetherResultCardToDummyPos) = { + EVT_LOOP(0) + EVT_CALL(GetNpcPos, NPC_Dummy, LVar0, LVar1, LVar2) + EVT_SUB(LVar0, 0) + EVT_SUB(LVar1, 130) + EVT_SUB(LVar2, 50) + EVT_CALL(TranslateModel, LVarA, LVar0, LVar1, LVar2) + EVT_IF_EQ(LVarA, 85) + EVT_CALL(RotateModel, MODEL_b_kai, 180, 0, 1, 0) + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ScaleResultCard) = { + EVT_CALL(EnableModel, LVarA, TRUE) + EVT_CALL(MakeLerp, 100, 50, 30, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_SETF(LVar6, LVar0) + EVT_MULF(LVar6, EVT_FLOAT(0.01)) + EVT_CALL(ScaleModel, LVarA, LVar6, LVar6, 1) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MoveCardToScoreboard) = { + EVT_CALL(EnableModel, LVarA, TRUE) + EVT_CALL(SetNpcPos, NPC_Dummy, 0, 130, 50) + EVT_EXEC_GET_TID(N(EVS_TetherResultCardToDummyPos), LVarB) + EVT_EXEC(N(EVS_ScaleResultCard)) + EVT_WAIT(1) + EVT_SWITCH(AB_KPA82_QuizRound) + EVT_CASE_EQ(0) + EVT_SET(LVar0, 118) + EVT_SET(LVar1, 148) + EVT_SET(LVar2, 3) + EVT_CASE_EQ(1) + EVT_SET(LVar0, 78) + EVT_SET(LVar1, 148) + EVT_SET(LVar2, 3) + EVT_CASE_EQ(2) + EVT_SET(LVar0, 38) + EVT_SET(LVar1, 148) + EVT_SET(LVar2, 3) + EVT_CASE_EQ(3) + EVT_SET(LVar0, -1) + EVT_SET(LVar1, 148) + EVT_SET(LVar2, 3) + EVT_CASE_EQ(4) + EVT_SET(LVar0, -41) + EVT_SET(LVar1, 148) + EVT_SET(LVar2, 3) + EVT_CASE_EQ(5) + EVT_SET(LVar0, -81) + EVT_SET(LVar1, 148) + EVT_SET(LVar2, 3) + EVT_CASE_EQ(6) + EVT_SET(LVar0, -121) + EVT_SET(LVar1, 148) + EVT_SET(LVar2, 3) + EVT_END_SWITCH + EVT_CALL(SetNpcJumpscale, NPC_Dummy, EVT_FLOAT(0.0)) + EVT_CALL(NpcJump1, NPC_Dummy, LVar0, LVar1, LVar2, 30) + EVT_CALL(SetNpcPos, NPC_Dummy, 184, 20, 150) + EVT_KILL_THREAD(LVarB) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_GetCorrectScoreboardModel) = { + EVT_SWITCH(AB_KPA82_QuizRound) + EVT_CASE_EQ(0) + EVT_SET(LVar0, MODEL_m1) + EVT_CASE_EQ(1) + EVT_SET(LVar0, MODEL_m2) + EVT_CASE_EQ(2) + EVT_SET(LVar0, MODEL_m3) + EVT_CASE_EQ(3) + EVT_SET(LVar0, MODEL_m4) + EVT_CASE_EQ(4) + EVT_SET(LVar0, MODEL_m5) + EVT_CASE_EQ(5) + EVT_SET(LVar0, MODEL_m6) + EVT_CASE_EQ(6) + EVT_SET(LVar0, MODEL_m7) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_GetWrongScoreboardModel) = { + EVT_SWITCH(AB_KPA82_QuizRound) + EVT_CASE_EQ(0) + EVT_SET(LVar0, MODEL_b1) + EVT_CASE_EQ(1) + EVT_SET(LVar0, MODEL_b2) + EVT_CASE_EQ(2) + EVT_SET(LVar0, MODEL_b3) + EVT_CASE_EQ(3) + EVT_SET(LVar0, MODEL_b4) + EVT_CASE_EQ(4) + EVT_SET(LVar0, MODEL_b5) + EVT_CASE_EQ(5) + EVT_SET(LVar0, MODEL_b6) + EVT_CASE_EQ(6) + EVT_SET(LVar0, MODEL_b7) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ShowResultCard) = { + EVT_SET(LVar6, EVT_FLOAT(2.0)) + EVT_EXEC_WAIT(N(EVS_SetCam_ViewRoom)) + EVT_WAIT(5) + EVT_IF_EQ(MV_LastAnswerResult, ANSWER_CORRECT) + EVT_SET(LVar0, 2160) + EVT_EXEC_WAIT(N(EVS_ShowUnknownCard)) + EVT_CALL(PlaySound, SOUND_21C) + EVT_WAIT(10) + EVT_CALL(EnableGroup, MODEL_g47, FALSE) + EVT_SET(LVarA, MODEL_m_kai) + EVT_EXEC_WAIT(N(EVS_MoveCardToScoreboard)) + EVT_EXEC_WAIT(N(EVS_GetCorrectScoreboardModel)) + EVT_CALL(EnableModel, MODEL_m_kai, FALSE) + EVT_CALL(EnableModel, LVar0, TRUE) + EVT_WAIT(30) + EVT_ELSE + EVT_SET(LVar0, 2340) + EVT_EXEC_WAIT(N(EVS_ShowUnknownCard)) + EVT_CALL(PlaySound, SOUND_MENU_ERROR) + EVT_WAIT(10) + EVT_CALL(EnableGroup, MODEL_g47, FALSE) + EVT_SET(LVarA, MODEL_b_kai) + EVT_EXEC_WAIT(N(EVS_MoveCardToScoreboard)) + EVT_EXEC_WAIT(N(EVS_GetWrongScoreboardModel)) + EVT_CALL(EnableModel, MODEL_b_kai, FALSE) + EVT_CALL(EnableModel, LVar0, TRUE) + EVT_WAIT(30) + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_SetCam_AfterResult)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Door) = { + EVT_LABEL(1) + EVT_WAIT(1) + EVT_IF_EQ(GF_KPA82_PassedThroughDoor, FALSE) + EVT_GOTO(1) + EVT_END_IF + EVT_SET(GF_KPA82_PassedThroughDoor, FALSE) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_EXEC_WAIT(N(EVS_SetCam_MeetingDoor)) + EVT_SET(MF_Sync_MusicChange, FALSE) + EVT_THREAD + EVT_CALL(SetMusicTrack, 0, SONG_FINAL_BOWSER_BATTLE, 1, 8) + EVT_WAIT(150) + EVT_IF_NE(MF_Sync_MusicChange, FALSE) + EVT_GOTO(5) + EVT_END_IF + EVT_CALL(FadeOutMusic, 0, 250) + EVT_WAIT(15) + EVT_IF_NE(MF_Sync_MusicChange, FALSE) + EVT_GOTO(5) + EVT_END_IF + EVT_EXEC(N(EVS_SetupMusic)) + EVT_LABEL(5) + EVT_END_THREAD + EVT_IF_EQ(GF_KPA82_SpokeToDoor, FALSE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ShyGuy_Black_Anim01, ANIM_ShyGuy_Black_Anim01, 0, MSG_CH8_002E) + EVT_SET(GF_KPA82_SpokeToDoor, TRUE) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ShyGuy_Black_Anim01, ANIM_ShyGuy_Black_Anim01, 0, MSG_CH8_002F) + EVT_END_IF + EVT_CALL(ShowChoice, MSG_Choice_0013) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(ContinueSpeech, NPC_SELF, ANIM_ShyGuy_Black_Anim01, ANIM_ShyGuy_Black_Anim01, 0, MSG_CH8_0031) + EVT_ELSE + EVT_CALL(ContinueSpeech, NPC_SELF, ANIM_ShyGuy_Black_Anim01, ANIM_ShyGuy_Black_Anim01, 0, MSG_CH8_0030) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_SET(GF_KPA82_PassedThroughDoor, FALSE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_GOTO(1) + EVT_END_IF + EVT_CALL(ShowChoice, MSG_Choice_0013) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(ContinueSpeech, NPC_SELF, ANIM_ShyGuy_Black_Anim01, ANIM_ShyGuy_Black_Anim01, 0, MSG_CH8_0032) + EVT_ELSE + EVT_CALL(ContinueSpeech, NPC_SELF, ANIM_ShyGuy_Black_Anim01, ANIM_ShyGuy_Black_Anim01, 0, MSG_CH8_0033) + EVT_END_IF + EVT_CALL(DisablePartnerAI, 0) + EVT_THREAD + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o166, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(2.0)) + EVT_CALL(PlayerMoveTo, 175, 236, 20) + EVT_CALL(InterpPlayerYaw, 270, 0) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o166, COLLIDER_FLAGS_UPPER_MASK) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_JUMP) + EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(2.5)) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 0) + EVT_CALL(NpcMoveTo, NPC_PARTNER, 205, 236, 20) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_CALL(NpcFaceNpc, NPC_PARTNER, NPC_SELF, 0) + EVT_END_THREAD + EVT_SET(AB_KPA82_QuizRound, 0) + EVT_SET(AB_KPA82_RightAnswers, 0) + EVT_SET(AB_KPA82_WrongAnswers, 0) + EVT_LABEL(10) + EVT_SET(LVar6, EVT_FLOAT(2.0)) + EVT_EXEC_WAIT(N(EVS_SetCam_ViewRoom)) + EVT_SET(MF_Sync_MusicChange, TRUE) + EVT_WAIT(2) + EVT_CALL(SetMusicTrack, 0, SONG_NORMAL_BATTLE, 0, 8) + EVT_EXEC_WAIT(N(EVS_OpenDoors)) + EVT_EXEC_WAIT(N(EVS_Release_Wave)) + EVT_WAIT(200) + EVT_THREAD + EVT_CALL(ShowMessageAtScreenPos, MSG_CH8_0034, 300, 200) + EVT_SET(MV_Sync_TimesUp, TRUE) + EVT_END_THREAD + EVT_WAIT(60) + EVT_EXEC_WAIT(N(EVS_Withdraw_Wave)) + EVT_WAIT(35) + EVT_EXEC_WAIT(N(EVS_CloseDoors)) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_WAIT(30) + EVT_LABEL(12) + EVT_WAIT(1) + EVT_IF_EQ(MV_Sync_TimesUp, FALSE) + EVT_GOTO(12) + EVT_END_IF + EVT_SET(MV_Sync_TimesUp, FALSE) + EVT_EXEC_WAIT(N(EVS_AskQuestion)) + EVT_EXEC_WAIT(N(EVS_ShowResultCard)) + EVT_IF_EQ(MV_LastAnswerResult, ANSWER_CORRECT) + EVT_ADD(AB_KPA82_RightAnswers, 1) + EVT_IF_EQ(AB_KPA82_RightAnswers, 5) + EVT_GOTO(30) + EVT_END_IF + EVT_IF_EQ(AB_KPA82_RightAnswers, 4) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ShyGuy_Black_Anim01, ANIM_ShyGuy_Black_Anim01, 0, MSG_CH8_003D) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ShyGuy_Black_Anim01, ANIM_ShyGuy_Black_Anim01, 0, MSG_CH8_003C) + EVT_END_IF + EVT_ELSE + EVT_ADD(AB_KPA82_WrongAnswers, 1) + EVT_IF_EQ(AB_KPA82_WrongAnswers, 3) + EVT_GOTO(20) + EVT_END_IF + EVT_IF_EQ(AB_KPA82_WrongAnswers, 1) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ShyGuy_Black_Anim01, ANIM_ShyGuy_Black_Anim01, 0, MSG_CH8_003E) + EVT_END_IF + EVT_IF_EQ(AB_KPA82_WrongAnswers, 2) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ShyGuy_Black_Anim01, ANIM_ShyGuy_Black_Anim01, 0, MSG_CH8_0040) + EVT_END_IF + EVT_END_IF + EVT_ADD(AB_KPA82_QuizRound, 1) + EVT_GOTO(10) + EVT_LABEL(20) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ShyGuy_Black_Anim01, ANIM_ShyGuy_Black_Anim01, 0, MSG_CH8_0041) + EVT_SET(LVar6, EVT_FLOAT(2.0)) + EVT_EXEC_WAIT(N(EVS_SetCam_ViewRoom)) + EVT_CALL(SetNpcPos, NPC_AntiGuy_01, -100, 0, 0) + EVT_CALL(SetNpcPos, NPC_AntiGuy_02, 0, 0, 0) + EVT_CALL(SetNpcPos, NPC_AntiGuy_03, 100, 0, 0) + EVT_CALL(InterpPlayerYaw, 315, 0) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 315, 0) + EVT_EXEC_WAIT(N(EVS_OpenDoors)) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ShyGuy_Black_Anim01, ANIM_ShyGuy_Black_Anim01, 0, MSG_CH8_0042) + EVT_CALL(PlayerFaceNpc, NPC_AntiGuy_02, 5) + EVT_CALL(GetPlayerPos, LVar3, LVar4, LVar5) + EVT_SET(LVar6, EVT_FLOAT(3.0)) + EVT_EXEC_WAIT(N(EVS_SetCam_BeforeBattle)) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_AntiGuy_01, ANIM_ShyGuy_Black_Anim04) + EVT_CALL(NpcMoveTo, NPC_AntiGuy_01, LVar0, LVar2, 30) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_AntiGuy_02, ANIM_ShyGuy_Black_Anim04) + EVT_CALL(NpcMoveTo, NPC_AntiGuy_02, LVar0, LVar2, 30) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_AntiGuy_03, ANIM_ShyGuy_Black_Anim04) + EVT_CALL(NpcMoveTo, NPC_AntiGuy_03, LVar0, LVar2, 30) + EVT_END_THREAD + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_CALL(StartBossBattle, SONG_SPECIAL_BATTLE) + EVT_EXEC_WAIT(N(EVS_SetCam_AfterBattle)) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ShyGuy_Black_Anim01, ANIM_ShyGuy_Black_Anim01, 0, MSG_CH8_0043) + EVT_GOTO(40) + EVT_LABEL(30) + EVT_THREAD + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o166, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) + EVT_CALL(PlayerMoveTo, 120, 145, 0) + EVT_CALL(InterpPlayerYaw, 90, 0) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o166, COLLIDER_FLAGS_UPPER_MASK) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(3.5)) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0) + EVT_CALL(NpcMoveTo, NPC_PARTNER, 80, 145, 0) + EVT_CALL(EnablePartnerAI) + EVT_END_THREAD + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ShyGuy_Black_Anim01, ANIM_ShyGuy_Black_Anim01, 0, MSG_CH8_003F) + EVT_LABEL(40) + EVT_CALL(EnablePartnerAI) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_SET(GB_KPA82_BowserDoorState, 1) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kpa_61_0)), TRIGGER_WALL_PRESS_A, COLLIDER_o166, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcDefeat_Door) = { + EVT_CALL(GetBattleOutcome, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(OUTCOME_PLAYER_WON) + EVT_CALL(SetNpcPos, NPC_AntiGuy_01, NPC_DISPOSE_LOCATION) + EVT_CALL(SetNpcPos, NPC_AntiGuy_02, NPC_DISPOSE_LOCATION) + EVT_CALL(SetNpcPos, NPC_AntiGuy_03, NPC_DISPOSE_LOCATION) + EVT_CALL(SetPlayerPos, 120, 0, 145) + EVT_CALL(SetNpcPos, NPC_PARTNER, 80, 0, 145) + EVT_CALL(InterpPlayerYaw, 90, 0) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0) + EVT_CALL(TranslateModel, MODEL_o100, 0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o101, 0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o145, 0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o146, 0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o102, 0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o103, 0, 0, 0) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Door) = { + EVT_IF_EQ(GB_KPA82_BowserDoorState, 0) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Door))) + EVT_END_IF + EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_Door))) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2 | NPC_FLAG_100 | NPC_FLAG_10000000, TRUE) + EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) + EVT_CALL(SetNpcPos, NPC_SELF, 184, 20, 150) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Goomba) = { + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Goomba))) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_ShyGuy) = { + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_ShyGuy))) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_KoopaTroopa) = { + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_KoopaTroopa))) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Bobomb) = { + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Bobomb))) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_AntiGuy) = { + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_AntiGuys)[] = { + { + .id = NPC_Dummy, + .settings = &N(NpcSettings_AntiGuy), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_4000 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .init = &N(EVS_NpcInit_Door), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_ShyGuy_Black_Anim01, + .walk = ANIM_ShyGuy_Black_Anim02, + .run = ANIM_ShyGuy_Black_Anim03, + .chase = ANIM_ShyGuy_Black_Anim02, + .anim_4 = ANIM_ShyGuy_Black_Anim01, + .anim_5 = ANIM_ShyGuy_Black_Anim01, + .death = ANIM_ShyGuy_Black_Anim0C, + .hit = ANIM_ShyGuy_Black_Anim0C, + .anim_8 = ANIM_ShyGuy_Black_Anim15, + .anim_9 = ANIM_ShyGuy_Black_Anim12, + .anim_A = ANIM_ShyGuy_Black_Anim11, + .anim_B = ANIM_ShyGuy_Black_Anim10, + .anim_C = ANIM_ShyGuy_Black_Anim05, + .anim_D = ANIM_ShyGuy_Black_Anim01, + .anim_E = ANIM_ShyGuy_Black_Anim01, + .anim_F = ANIM_ShyGuy_Black_Anim01, + }, + }, + { + .id = NPC_AntiGuy_01, + .settings = &N(NpcSettings_AntiGuy), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .init = &N(EVS_NpcInit_AntiGuy), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_ShyGuy_Black_Anim01, + .walk = ANIM_ShyGuy_Black_Anim02, + .run = ANIM_ShyGuy_Black_Anim03, + .chase = ANIM_ShyGuy_Black_Anim02, + .anim_4 = ANIM_ShyGuy_Black_Anim01, + .anim_5 = ANIM_ShyGuy_Black_Anim01, + .death = ANIM_ShyGuy_Black_Anim0C, + .hit = ANIM_ShyGuy_Black_Anim0C, + .anim_8 = ANIM_ShyGuy_Black_Anim15, + .anim_9 = ANIM_ShyGuy_Black_Anim12, + .anim_A = ANIM_ShyGuy_Black_Anim11, + .anim_B = ANIM_ShyGuy_Black_Anim10, + .anim_C = ANIM_ShyGuy_Black_Anim05, + .anim_D = ANIM_ShyGuy_Black_Anim01, + .anim_E = ANIM_ShyGuy_Black_Anim01, + .anim_F = ANIM_ShyGuy_Black_Anim01, + }, + }, + { + .id = NPC_AntiGuy_02, + .settings = &N(NpcSettings_AntiGuy), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .init = &N(EVS_NpcInit_AntiGuy), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_ShyGuy_Black_Anim01, + .walk = ANIM_ShyGuy_Black_Anim02, + .run = ANIM_ShyGuy_Black_Anim03, + .chase = ANIM_ShyGuy_Black_Anim02, + .anim_4 = ANIM_ShyGuy_Black_Anim01, + .anim_5 = ANIM_ShyGuy_Black_Anim01, + .death = ANIM_ShyGuy_Black_Anim0C, + .hit = ANIM_ShyGuy_Black_Anim0C, + .anim_8 = ANIM_ShyGuy_Black_Anim15, + .anim_9 = ANIM_ShyGuy_Black_Anim12, + .anim_A = ANIM_ShyGuy_Black_Anim11, + .anim_B = ANIM_ShyGuy_Black_Anim10, + .anim_C = ANIM_ShyGuy_Black_Anim05, + .anim_D = ANIM_ShyGuy_Black_Anim01, + .anim_E = ANIM_ShyGuy_Black_Anim01, + .anim_F = ANIM_ShyGuy_Black_Anim01, + }, + }, + { + .id = NPC_AntiGuy_03, + .settings = &N(NpcSettings_AntiGuy), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .init = &N(EVS_NpcInit_AntiGuy), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_ShyGuy_Black_Anim01, + .walk = ANIM_ShyGuy_Black_Anim02, + .run = ANIM_ShyGuy_Black_Anim03, + .chase = ANIM_ShyGuy_Black_Anim02, + .anim_4 = ANIM_ShyGuy_Black_Anim01, + .anim_5 = ANIM_ShyGuy_Black_Anim01, + .death = ANIM_ShyGuy_Black_Anim0C, + .hit = ANIM_ShyGuy_Black_Anim0C, + .anim_8 = ANIM_ShyGuy_Black_Anim15, + .anim_9 = ANIM_ShyGuy_Black_Anim12, + .anim_A = ANIM_ShyGuy_Black_Anim11, + .anim_B = ANIM_ShyGuy_Black_Anim10, + .anim_C = ANIM_ShyGuy_Black_Anim05, + .anim_D = ANIM_ShyGuy_Black_Anim01, + .anim_E = ANIM_ShyGuy_Black_Anim01, + .anim_F = ANIM_ShyGuy_Black_Anim01, + }, + }, +}; + +StaticNpc N(NpcData_Goombas)[] = { + { + .id = NPC_Goomba_01, + .settings = &N(NpcSettings_Short), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .init = &N(EVS_NpcInit_Goomba), + .drops = GOOMBA_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 0, 0, 150 }, + .wanderSize = { 130, 100 }, + .detectShape = SHAPE_RECT, + .detectPos = { 0, 0, 150 }, + .detectSize = { 130, 100 }, + } + }, + .animations = GOOMBA_ANIMS, + }, + { + .id = NPC_Goomba_02, + .settings = &N(NpcSettings_Short), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .init = &N(EVS_NpcInit_Goomba), + .drops = GOOMBA_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 0, 0, 150 }, + .wanderSize = { 130, 100 }, + .detectShape = SHAPE_RECT, + .detectPos = { 0, 0, 150 }, + .detectSize = { 130, 100 }, + } + }, + .animations = GOOMBA_ANIMS, + }, + { + .id = NPC_Goomba_03, + .settings = &N(NpcSettings_Short), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .init = &N(EVS_NpcInit_Goomba), + .drops = GOOMBA_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 0, 0, 150 }, + .wanderSize = { 130, 100 }, + .detectShape = SHAPE_RECT, + .detectPos = { 0, 0, 150 }, + .detectSize = { 130, 100 }, + } + }, + .animations = GOOMBA_ANIMS, + }, + { + .id = NPC_Goomba_04, + .settings = &N(NpcSettings_Short), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .init = &N(EVS_NpcInit_Goomba), + .drops = GOOMBA_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 0, 0, 150 }, + .wanderSize = { 130, 100 }, + .detectShape = SHAPE_RECT, + .detectPos = { 0, 0, 150 }, + .detectSize = { 130, 100 }, + } + }, + .animations = GOOMBA_ANIMS, + }, + { + .id = NPC_Goomba_05, + .settings = &N(NpcSettings_Short), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .init = &N(EVS_NpcInit_Goomba), + .drops = GOOMBA_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 0, 0, 150 }, + .wanderSize = { 130, 100 }, + .detectShape = SHAPE_RECT, + .detectPos = { 0, 0, 150 }, + .detectSize = { 130, 100 }, + } + }, + .animations = GOOMBA_ANIMS, + }, +}; + +StaticNpc N(NpcData_RedShyGuys)[] = { + { + .id = NPC_RedShyGuy_01, + .settings = &N(NpcSettings_ShyGuy), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .init = &N(EVS_NpcInit_ShyGuy), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_DIZZY_DIAL, 2, 0 }, + { ITEM_SUPER_SHROOM, 2, 0 }, + { ITEM_THUNDER_BOLT, 2, 0 }, + { ITEM_DRIED_SHROOM, 2, 0 }, + { ITEM_SLEEPY_SHEEP, 2, 0 }, + { ITEM_POW_BLOCK, 2, 0 }, + { ITEM_FRIGHT_JAR, 2, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 2, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 0, 0, 150 }, + .wanderSize = { 130, 100 }, + .detectShape = SHAPE_RECT, + .detectPos = { 0, 0, 150 }, + .detectSize = { 130, 100 }, + } + }, + .animations = RED_SHY_GUY_ANIMS, + }, + { + .id = NPC_RedShyGuy_02, + .settings = &N(NpcSettings_ShyGuy), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .init = &N(EVS_NpcInit_ShyGuy), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_DIZZY_DIAL, 2, 0 }, + { ITEM_SUPER_SHROOM, 2, 0 }, + { ITEM_THUNDER_BOLT, 2, 0 }, + { ITEM_DRIED_SHROOM, 2, 0 }, + { ITEM_SLEEPY_SHEEP, 2, 0 }, + { ITEM_POW_BLOCK, 2, 0 }, + { ITEM_FRIGHT_JAR, 2, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 2, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 0, 0, 150 }, + .wanderSize = { 130, 100 }, + .detectShape = SHAPE_RECT, + .detectPos = { 0, 0, 150 }, + .detectSize = { 130, 100 }, + } + }, + .animations = RED_SHY_GUY_ANIMS, + }, + { + .id = NPC_RedShyGuy_03, + .settings = &N(NpcSettings_ShyGuy), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .init = &N(EVS_NpcInit_ShyGuy), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_DIZZY_DIAL, 2, 0 }, + { ITEM_SUPER_SHROOM, 2, 0 }, + { ITEM_THUNDER_BOLT, 2, 0 }, + { ITEM_DRIED_SHROOM, 2, 0 }, + { ITEM_SLEEPY_SHEEP, 2, 0 }, + { ITEM_POW_BLOCK, 2, 0 }, + { ITEM_FRIGHT_JAR, 2, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 2, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 0, 0, 150 }, + .wanderSize = { 130, 100 }, + .detectShape = SHAPE_RECT, + .detectPos = { 0, 0, 150 }, + .detectSize = { 130, 100 }, + } + }, + .animations = RED_SHY_GUY_ANIMS, + }, + { + .id = NPC_RedShyGuy_04, + .settings = &N(NpcSettings_ShyGuy), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .init = &N(EVS_NpcInit_ShyGuy), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_DIZZY_DIAL, 2, 0 }, + { ITEM_SUPER_SHROOM, 2, 0 }, + { ITEM_THUNDER_BOLT, 2, 0 }, + { ITEM_DRIED_SHROOM, 2, 0 }, + { ITEM_SLEEPY_SHEEP, 2, 0 }, + { ITEM_POW_BLOCK, 2, 0 }, + { ITEM_FRIGHT_JAR, 2, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 2, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 0, 0, 150 }, + .wanderSize = { 130, 100 }, + .detectShape = SHAPE_RECT, + .detectPos = { 0, 0, 150 }, + .detectSize = { 130, 100 }, + } + }, + .animations = RED_SHY_GUY_ANIMS, + }, + { + .id = NPC_RedShyGuy_05, + .settings = &N(NpcSettings_ShyGuy), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .init = &N(EVS_NpcInit_ShyGuy), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_DIZZY_DIAL, 2, 0 }, + { ITEM_SUPER_SHROOM, 2, 0 }, + { ITEM_THUNDER_BOLT, 2, 0 }, + { ITEM_DRIED_SHROOM, 2, 0 }, + { ITEM_SLEEPY_SHEEP, 2, 0 }, + { ITEM_POW_BLOCK, 2, 0 }, + { ITEM_FRIGHT_JAR, 2, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 2, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 0, 0, 150 }, + .wanderSize = { 130, 100 }, + .detectShape = SHAPE_RECT, + .detectPos = { 0, 0, 150 }, + .detectSize = { 130, 100 }, + } + }, + .animations = RED_SHY_GUY_ANIMS, + }, +}; + +StaticNpc N(NpcData_BlueShyGuys)[] = { + { + .id = NPC_BlueShyGuy_01, + .settings = &N(NpcSettings_ShyGuy), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .init = &N(EVS_NpcInit_ShyGuy), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_DIZZY_DIAL, 2, 0 }, + { ITEM_SUPER_SHROOM, 2, 0 }, + { ITEM_THUNDER_BOLT, 2, 0 }, + { ITEM_DRIED_SHROOM, 2, 0 }, + { ITEM_SLEEPY_SHEEP, 2, 0 }, + { ITEM_POW_BLOCK, 2, 0 }, + { ITEM_FRIGHT_JAR, 2, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 2, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 0, 0, 150 }, + .wanderSize = { 130, 100 }, + .detectShape = SHAPE_RECT, + .detectPos = { 0, 0, 150 }, + .detectSize = { 130, 100 }, + } + }, + .animations = BLUE_SHY_GUY_ANIMS, + }, + { + .id = NPC_BlueShyGuy_02, + .settings = &N(NpcSettings_ShyGuy), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .init = &N(EVS_NpcInit_ShyGuy), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_DIZZY_DIAL, 2, 0 }, + { ITEM_SUPER_SHROOM, 2, 0 }, + { ITEM_THUNDER_BOLT, 2, 0 }, + { ITEM_DRIED_SHROOM, 2, 0 }, + { ITEM_SLEEPY_SHEEP, 2, 0 }, + { ITEM_POW_BLOCK, 2, 0 }, + { ITEM_FRIGHT_JAR, 2, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 2, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 0, 0, 150 }, + .wanderSize = { 130, 100 }, + .detectShape = SHAPE_RECT, + .detectPos = { 0, 0, 150 }, + .detectSize = { 130, 100 }, + } + }, + .animations = BLUE_SHY_GUY_ANIMS, + }, + { + .id = NPC_BlueShyGuy_03, + .settings = &N(NpcSettings_ShyGuy), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .init = &N(EVS_NpcInit_ShyGuy), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_DIZZY_DIAL, 2, 0 }, + { ITEM_SUPER_SHROOM, 2, 0 }, + { ITEM_THUNDER_BOLT, 2, 0 }, + { ITEM_DRIED_SHROOM, 2, 0 }, + { ITEM_SLEEPY_SHEEP, 2, 0 }, + { ITEM_POW_BLOCK, 2, 0 }, + { ITEM_FRIGHT_JAR, 2, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 2, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 0, 0, 150 }, + .wanderSize = { 130, 100 }, + .detectShape = SHAPE_RECT, + .detectPos = { 0, 0, 150 }, + .detectSize = { 130, 100 }, + } + }, + .animations = BLUE_SHY_GUY_ANIMS, + }, + { + .id = NPC_BlueShyGuy_04, + .settings = &N(NpcSettings_ShyGuy), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .init = &N(EVS_NpcInit_ShyGuy), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_DIZZY_DIAL, 2, 0 }, + { ITEM_SUPER_SHROOM, 2, 0 }, + { ITEM_THUNDER_BOLT, 2, 0 }, + { ITEM_DRIED_SHROOM, 2, 0 }, + { ITEM_SLEEPY_SHEEP, 2, 0 }, + { ITEM_POW_BLOCK, 2, 0 }, + { ITEM_FRIGHT_JAR, 2, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 2, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 0, 0, 150 }, + .wanderSize = { 130, 100 }, + .detectShape = SHAPE_RECT, + .detectPos = { 0, 0, 150 }, + .detectSize = { 130, 100 }, + } + }, + .animations = BLUE_SHY_GUY_ANIMS, + }, + { + .id = NPC_BlueShyGuy_05, + .settings = &N(NpcSettings_ShyGuy), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .init = &N(EVS_NpcInit_ShyGuy), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_DIZZY_DIAL, 2, 0 }, + { ITEM_SUPER_SHROOM, 2, 0 }, + { ITEM_THUNDER_BOLT, 2, 0 }, + { ITEM_DRIED_SHROOM, 2, 0 }, + { ITEM_SLEEPY_SHEEP, 2, 0 }, + { ITEM_POW_BLOCK, 2, 0 }, + { ITEM_FRIGHT_JAR, 2, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 2, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 0, 0, 150 }, + .wanderSize = { 130, 100 }, + .detectShape = SHAPE_RECT, + .detectPos = { 0, 0, 150 }, + .detectSize = { 130, 100 }, + } + }, + .animations = BLUE_SHY_GUY_ANIMS, + }, +}; + +StaticNpc N(NpcData_GreenShyGuys)[] = { + { + .id = NPC_GreenShyGuy_01, + .settings = &N(NpcSettings_ShyGuy), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .init = &N(EVS_NpcInit_ShyGuy), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_DIZZY_DIAL, 2, 0 }, + { ITEM_SUPER_SHROOM, 2, 0 }, + { ITEM_THUNDER_BOLT, 2, 0 }, + { ITEM_DRIED_SHROOM, 2, 0 }, + { ITEM_SLEEPY_SHEEP, 2, 0 }, + { ITEM_POW_BLOCK, 2, 0 }, + { ITEM_FRIGHT_JAR, 2, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 2, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 0, 0, 150 }, + .wanderSize = { 130, 100 }, + .detectShape = SHAPE_RECT, + .detectPos = { 0, 0, 150 }, + .detectSize = { 130, 100 }, + } + }, + .animations = GREEN_SHY_GUY_ANIMS, + }, + { + .id = NPC_GreenShyGuy_02, + .settings = &N(NpcSettings_ShyGuy), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .init = &N(EVS_NpcInit_ShyGuy), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_DIZZY_DIAL, 2, 0 }, + { ITEM_SUPER_SHROOM, 2, 0 }, + { ITEM_THUNDER_BOLT, 2, 0 }, + { ITEM_DRIED_SHROOM, 2, 0 }, + { ITEM_SLEEPY_SHEEP, 2, 0 }, + { ITEM_POW_BLOCK, 2, 0 }, + { ITEM_FRIGHT_JAR, 2, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 2, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 0, 0, 150 }, + .wanderSize = { 130, 100 }, + .detectShape = SHAPE_RECT, + .detectPos = { 0, 0, 150 }, + .detectSize = { 130, 100 }, + } + }, + .animations = GREEN_SHY_GUY_ANIMS, + }, + { + .id = NPC_GreenShyGuy_03, + .settings = &N(NpcSettings_ShyGuy), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .init = &N(EVS_NpcInit_ShyGuy), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_DIZZY_DIAL, 2, 0 }, + { ITEM_SUPER_SHROOM, 2, 0 }, + { ITEM_THUNDER_BOLT, 2, 0 }, + { ITEM_DRIED_SHROOM, 2, 0 }, + { ITEM_SLEEPY_SHEEP, 2, 0 }, + { ITEM_POW_BLOCK, 2, 0 }, + { ITEM_FRIGHT_JAR, 2, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 2, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 0, 0, 150 }, + .wanderSize = { 130, 100 }, + .detectShape = SHAPE_RECT, + .detectPos = { 0, 0, 150 }, + .detectSize = { 130, 100 }, + } + }, + .animations = GREEN_SHY_GUY_ANIMS, + }, + { + .id = NPC_GreenShyGuy_04, + .settings = &N(NpcSettings_ShyGuy), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .init = &N(EVS_NpcInit_ShyGuy), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_DIZZY_DIAL, 2, 0 }, + { ITEM_SUPER_SHROOM, 2, 0 }, + { ITEM_THUNDER_BOLT, 2, 0 }, + { ITEM_DRIED_SHROOM, 2, 0 }, + { ITEM_SLEEPY_SHEEP, 2, 0 }, + { ITEM_POW_BLOCK, 2, 0 }, + { ITEM_FRIGHT_JAR, 2, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 2, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 0, 0, 150 }, + .wanderSize = { 130, 100 }, + .detectShape = SHAPE_RECT, + .detectPos = { 0, 0, 150 }, + .detectSize = { 130, 100 }, + } + }, + .animations = GREEN_SHY_GUY_ANIMS, + }, + { + .id = NPC_GreenShyGuy_05, + .settings = &N(NpcSettings_ShyGuy), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .init = &N(EVS_NpcInit_ShyGuy), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_DIZZY_DIAL, 2, 0 }, + { ITEM_SUPER_SHROOM, 2, 0 }, + { ITEM_THUNDER_BOLT, 2, 0 }, + { ITEM_DRIED_SHROOM, 2, 0 }, + { ITEM_SLEEPY_SHEEP, 2, 0 }, + { ITEM_POW_BLOCK, 2, 0 }, + { ITEM_FRIGHT_JAR, 2, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 2, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 0, 0, 150 }, + .wanderSize = { 130, 100 }, + .detectShape = SHAPE_RECT, + .detectPos = { 0, 0, 150 }, + .detectSize = { 130, 100 }, + } + }, + .animations = GREEN_SHY_GUY_ANIMS, + }, +}; + +StaticNpc N(NpcData_DarkTroopas)[] = { + { + .id = NPC_DarkTroopa_01, + .settings = &N(NpcSettings_KoopaTroopa), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .init = &N(EVS_NpcInit_KoopaTroopa), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_MUSHROOM, 3, 0 }, + { ITEM_KOOPA_LEAF, 7, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 1, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 0, 0, 150 }, + .wanderSize = { 130, 100 }, + .detectShape = SHAPE_RECT, + .detectPos = { 0, 0, 150 }, + .detectSize = { 130, 100 }, + } + }, + .animations = DARK_TROOPA_ANIMS, + }, + { + .id = NPC_DarkTroopa_02, + .settings = &N(NpcSettings_KoopaTroopa), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .init = &N(EVS_NpcInit_KoopaTroopa), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_MUSHROOM, 3, 0 }, + { ITEM_KOOPA_LEAF, 7, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 1, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 0, 0, 150 }, + .wanderSize = { 130, 100 }, + .detectShape = SHAPE_RECT, + .detectPos = { 0, 0, 150 }, + .detectSize = { 130, 100 }, + } + }, + .animations = DARK_TROOPA_ANIMS, + }, + { + .id = NPC_DarkTroopa_03, + .settings = &N(NpcSettings_KoopaTroopa), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .init = &N(EVS_NpcInit_KoopaTroopa), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_MUSHROOM, 3, 0 }, + { ITEM_KOOPA_LEAF, 7, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 1, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 0, 0, 150 }, + .wanderSize = { 130, 100 }, + .detectShape = SHAPE_RECT, + .detectPos = { 0, 0, 150 }, + .detectSize = { 130, 100 }, + } + }, + .animations = DARK_TROOPA_ANIMS, + }, + { + .id = NPC_DarkTroopa_04, + .settings = &N(NpcSettings_KoopaTroopa), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .init = &N(EVS_NpcInit_KoopaTroopa), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_MUSHROOM, 3, 0 }, + { ITEM_KOOPA_LEAF, 7, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 1, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 0, 0, 150 }, + .wanderSize = { 130, 100 }, + .detectShape = SHAPE_RECT, + .detectPos = { 0, 0, 150 }, + .detectSize = { 130, 100 }, + } + }, + .animations = DARK_TROOPA_ANIMS, + }, + { + .id = NPC_DarkTroopa_05, + .settings = &N(NpcSettings_KoopaTroopa), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .init = &N(EVS_NpcInit_KoopaTroopa), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_MUSHROOM, 3, 0 }, + { ITEM_KOOPA_LEAF, 7, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 1, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 0, 0, 150 }, + .wanderSize = { 130, 100 }, + .detectShape = SHAPE_RECT, + .detectPos = { 0, 0, 150 }, + .detectSize = { 130, 100 }, + } + }, + .animations = DARK_TROOPA_ANIMS, + }, +}; + +StaticNpc N(NpcData_KoopaTroopas)[] = { + { + .id = NPC_KoopaTroopa_01, + .settings = &N(NpcSettings_KoopaTroopa), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .init = &N(EVS_NpcInit_KoopaTroopa), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_MUSHROOM, 3, 0 }, + { ITEM_KOOPA_LEAF, 7, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 1, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 0, 0, 150 }, + .wanderSize = { 130, 100 }, + .detectShape = SHAPE_RECT, + .detectPos = { 0, 0, 150 }, + .detectSize = { 130, 100 }, + } + }, + .animations = KOOPA_TROOPA_ANIMS, + }, + { + .id = NPC_KoopaTroopa_02, + .settings = &N(NpcSettings_KoopaTroopa), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .init = &N(EVS_NpcInit_KoopaTroopa), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_MUSHROOM, 3, 0 }, + { ITEM_KOOPA_LEAF, 7, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 1, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 0, 0, 150 }, + .wanderSize = { 130, 100 }, + .detectShape = SHAPE_RECT, + .detectPos = { 0, 0, 150 }, + .detectSize = { 130, 100 }, + } + }, + .animations = KOOPA_TROOPA_ANIMS, + }, + { + .id = NPC_KoopaTroopa_03, + .settings = &N(NpcSettings_KoopaTroopa), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .init = &N(EVS_NpcInit_KoopaTroopa), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_MUSHROOM, 3, 0 }, + { ITEM_KOOPA_LEAF, 7, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 1, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 0, 0, 150 }, + .wanderSize = { 130, 100 }, + .detectShape = SHAPE_RECT, + .detectPos = { 0, 0, 150 }, + .detectSize = { 130, 100 }, + } + }, + .animations = KOOPA_TROOPA_ANIMS, + }, + { + .id = NPC_KoopaTroopa_04, + .settings = &N(NpcSettings_KoopaTroopa), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .init = &N(EVS_NpcInit_KoopaTroopa), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_MUSHROOM, 3, 0 }, + { ITEM_KOOPA_LEAF, 7, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 1, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 0, 0, 150 }, + .wanderSize = { 130, 100 }, + .detectShape = SHAPE_RECT, + .detectPos = { 0, 0, 150 }, + .detectSize = { 130, 100 }, + } + }, + .animations = KOOPA_TROOPA_ANIMS, + }, + { + .id = NPC_KoopaTroopa_05, + .settings = &N(NpcSettings_KoopaTroopa), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .init = &N(EVS_NpcInit_KoopaTroopa), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_MUSHROOM, 3, 0 }, + { ITEM_KOOPA_LEAF, 7, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 1, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 0, 0, 150 }, + .wanderSize = { 130, 100 }, + .detectShape = SHAPE_RECT, + .detectPos = { 0, 0, 150 }, + .detectSize = { 130, 100 }, + } + }, + .animations = KOOPA_TROOPA_ANIMS, + }, +}; + +StaticNpc N(NpcData_Bobombs)[] = { + { + .id = NPC_Bobomb_01, + .settings = &N(NpcSettings_Short), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .init = &N(EVS_NpcInit_Bobomb), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 0, 0, 150 }, + .wanderSize = { 130, 100 }, + .detectShape = SHAPE_RECT, + .detectPos = { 0, 0, 150 }, + .detectSize = { 130, 100 }, + } + }, + .animations = { + .idle = ANIM_WorldBobomb_Green_Idle, + .walk = ANIM_WorldBobomb_Green_Walk, + .run = ANIM_WorldBobomb_Green_Run, + .chase = ANIM_WorldBobomb_Green_Run, + .anim_4 = ANIM_WorldBobomb_Green_Idle, + .anim_5 = ANIM_WorldBobomb_Green_Idle, + .death = ANIM_WorldBobomb_Green_Still, + .hit = ANIM_WorldBobomb_Green_Still, + .anim_8 = ANIM_WorldBobomb_Green_Still, + .anim_9 = ANIM_WorldBobomb_Green_Still, + .anim_A = ANIM_WorldBobomb_Green_Still, + .anim_B = ANIM_WorldBobomb_Green_Still, + .anim_C = ANIM_WorldBobomb_Green_Still, + .anim_D = ANIM_WorldBobomb_Green_Still, + .anim_E = ANIM_WorldBobomb_Green_Still, + .anim_F = ANIM_WorldBobomb_Green_Still, + }, + }, + { + .id = NPC_Bobomb_02, + .settings = &N(NpcSettings_Short), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .init = &N(EVS_NpcInit_Bobomb), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 0, 0, 150 }, + .wanderSize = { 130, 100 }, + .detectShape = SHAPE_RECT, + .detectPos = { 0, 0, 150 }, + .detectSize = { 130, 100 }, + } + }, + .animations = { + .idle = ANIM_WorldBobomb_Green_Idle, + .walk = ANIM_WorldBobomb_Green_Walk, + .run = ANIM_WorldBobomb_Green_Run, + .chase = ANIM_WorldBobomb_Green_Run, + .anim_4 = ANIM_WorldBobomb_Green_Idle, + .anim_5 = ANIM_WorldBobomb_Green_Idle, + .death = ANIM_WorldBobomb_Green_Still, + .hit = ANIM_WorldBobomb_Green_Still, + .anim_8 = ANIM_WorldBobomb_Green_Still, + .anim_9 = ANIM_WorldBobomb_Green_Still, + .anim_A = ANIM_WorldBobomb_Green_Still, + .anim_B = ANIM_WorldBobomb_Green_Still, + .anim_C = ANIM_WorldBobomb_Green_Still, + .anim_D = ANIM_WorldBobomb_Green_Still, + .anim_E = ANIM_WorldBobomb_Green_Still, + .anim_F = ANIM_WorldBobomb_Green_Still, + }, + }, + { + .id = NPC_Bobomb_03, + .settings = &N(NpcSettings_Short), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .init = &N(EVS_NpcInit_Bobomb), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 0, 0, 150 }, + .wanderSize = { 130, 100 }, + .detectShape = SHAPE_RECT, + .detectPos = { 0, 0, 150 }, + .detectSize = { 130, 100 }, + } + }, + .animations = { + .idle = ANIM_WorldBobomb_Green_Idle, + .walk = ANIM_WorldBobomb_Green_Walk, + .run = ANIM_WorldBobomb_Green_Run, + .chase = ANIM_WorldBobomb_Green_Run, + .anim_4 = ANIM_WorldBobomb_Green_Idle, + .anim_5 = ANIM_WorldBobomb_Green_Idle, + .death = ANIM_WorldBobomb_Green_Still, + .hit = ANIM_WorldBobomb_Green_Still, + .anim_8 = ANIM_WorldBobomb_Green_Still, + .anim_9 = ANIM_WorldBobomb_Green_Still, + .anim_A = ANIM_WorldBobomb_Green_Still, + .anim_B = ANIM_WorldBobomb_Green_Still, + .anim_C = ANIM_WorldBobomb_Green_Still, + .anim_D = ANIM_WorldBobomb_Green_Still, + .anim_E = ANIM_WorldBobomb_Green_Still, + .anim_F = ANIM_WorldBobomb_Green_Still, + }, + }, + { + .id = NPC_Bobomb_04, + .settings = &N(NpcSettings_Short), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .init = &N(EVS_NpcInit_Bobomb), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 0, 0, 150 }, + .wanderSize = { 130, 100 }, + .detectShape = SHAPE_RECT, + .detectPos = { 0, 0, 150 }, + .detectSize = { 130, 100 }, + } + }, + .animations = { + .idle = ANIM_WorldBobomb_Green_Idle, + .walk = ANIM_WorldBobomb_Green_Walk, + .run = ANIM_WorldBobomb_Green_Run, + .chase = ANIM_WorldBobomb_Green_Run, + .anim_4 = ANIM_WorldBobomb_Green_Idle, + .anim_5 = ANIM_WorldBobomb_Green_Idle, + .death = ANIM_WorldBobomb_Green_Still, + .hit = ANIM_WorldBobomb_Green_Still, + .anim_8 = ANIM_WorldBobomb_Green_Still, + .anim_9 = ANIM_WorldBobomb_Green_Still, + .anim_A = ANIM_WorldBobomb_Green_Still, + .anim_B = ANIM_WorldBobomb_Green_Still, + .anim_C = ANIM_WorldBobomb_Green_Still, + .anim_D = ANIM_WorldBobomb_Green_Still, + .anim_E = ANIM_WorldBobomb_Green_Still, + .anim_F = ANIM_WorldBobomb_Green_Still, + }, + }, + { + .id = NPC_Bobomb_05, + .settings = &N(NpcSettings_Short), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .init = &N(EVS_NpcInit_Bobomb), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 0, 0, 150 }, + .wanderSize = { 130, 100 }, + .detectShape = SHAPE_RECT, + .detectPos = { 0, 0, 150 }, + .detectSize = { 130, 100 }, + } + }, + .animations = { + .idle = ANIM_WorldBobomb_Green_Idle, + .walk = ANIM_WorldBobomb_Green_Walk, + .run = ANIM_WorldBobomb_Green_Run, + .chase = ANIM_WorldBobomb_Green_Run, + .anim_4 = ANIM_WorldBobomb_Green_Idle, + .anim_5 = ANIM_WorldBobomb_Green_Idle, + .death = ANIM_WorldBobomb_Green_Still, + .hit = ANIM_WorldBobomb_Green_Still, + .anim_8 = ANIM_WorldBobomb_Green_Still, + .anim_9 = ANIM_WorldBobomb_Green_Still, + .anim_A = ANIM_WorldBobomb_Green_Still, + .anim_B = ANIM_WorldBobomb_Green_Still, + .anim_C = ANIM_WorldBobomb_Green_Still, + .anim_D = ANIM_WorldBobomb_Green_Still, + .anim_E = ANIM_WorldBobomb_Green_Still, + .anim_F = ANIM_WorldBobomb_Green_Still, + }, + }, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_AntiGuys), BTL_KPA3_FORMATION_00, BTL_KPA3_STAGE_00), + NPC_GROUP(N(NpcData_Goombas), BTL_KPA3_FORMATION_00, BTL_KPA3_STAGE_00), + NPC_GROUP(N(NpcData_RedShyGuys), BTL_KPA3_FORMATION_00, BTL_KPA3_STAGE_00), + NPC_GROUP(N(NpcData_BlueShyGuys), BTL_KPA3_FORMATION_00, BTL_KPA3_STAGE_00), + NPC_GROUP(N(NpcData_GreenShyGuys), BTL_KPA3_FORMATION_00, BTL_KPA3_STAGE_00), + NPC_GROUP(N(NpcData_DarkTroopas), BTL_KPA3_FORMATION_00, BTL_KPA3_STAGE_00), + NPC_GROUP(N(NpcData_KoopaTroopas), BTL_KPA3_FORMATION_00, BTL_KPA3_STAGE_00), + NPC_GROUP(N(NpcData_Bobombs), BTL_KPA3_FORMATION_00, BTL_KPA3_STAGE_00), + {} +}; diff --git a/src/world/area_kpa/kpa_83/A83490.c b/src/world/area_kpa/kpa_83/A83490.c deleted file mode 100644 index 51e4ec98da..0000000000 --- a/src/world/area_kpa/kpa_83/A83490.c +++ /dev/null @@ -1,10 +0,0 @@ -#include "kpa_83.h" - -ApiStatus func_80240000_A83490(Evt* script, s32 isInitialCall) { - sprintf(wMapShapeName, "kpa_80_shape"); - sprintf(wMapHitName, "kpa_80_hit"); - return ApiStatus_BLOCK; -} - -const char* N(exit_str_0) = "kpa_53"; -const char* N(exit_str_1) = "kpa_121"; diff --git a/src/world/area_kpa/kpa_83/A834E0.c b/src/world/area_kpa/kpa_83/A834E0.c deleted file mode 100644 index cd3de3b790..0000000000 --- a/src/world/area_kpa/kpa_83/A834E0.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "kpa_83.h" - -ApiStatus func_80240050_A834E0(Evt* script, s32 isInitialCall) { - gPlayerStatus.spriteFacingAngle = script->varTable[0]; - return ApiStatus_DONE2; -} diff --git a/src/world/area_kpa/kpa_83/kpa_83.h b/src/world/area_kpa/kpa_83/kpa_83.h index d51f9c10dd..930a66530c 100644 --- a/src/world/area_kpa/kpa_83/kpa_83.h +++ b/src/world/area_kpa/kpa_83/kpa_83.h @@ -2,8 +2,40 @@ /// @brief Bowser's Castle - Guard Door 3 #include "common.h" -#include "../kpa.h" #include "message_ids.h" #include "map.h" +#include "../kpa.h" +#include "mapfs/kpa_80_shape.h" +#include "mapfs/kpa_80_hit.h" + +#include "sprite/npc/KoopaBros.h" +#include "sprite/npc/Toad.h" +#include "sprite/npc/JrTroopa.h" + +enum { + NPC_Door = 0, + NPC_KoopaBrosBlk = 1, + NPC_KoopaBrosRed = 2, + NPC_KoopaBrosYlw = 3, + NPC_KoopaBrosGrn = 4, + NPC_JrTroopa = 5, +}; + +enum { + MV_KoopaBrosRed_HopScript = MapVar(0), + MV_KoopaBrosBlk_HopScript = MapVar(1), + MV_KoopaBrosYlw_HopScript = MapVar(2), + MV_KoopaBrosGrn_HopScript = MapVar(3), + MV_Sync_AfterBattleCamMovement = MapVar(4), +}; + +enum { + MF_DoneIntroMessage = MapFlag(0), +}; + #define NAMESPACE kpa_83 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_kpa/kpa_83/kpa_83_0_header.c b/src/world/area_kpa/kpa_83/kpa_83_0_header.c new file mode 100644 index 0000000000..b6608d86c1 --- /dev/null +++ b/src/world/area_kpa/kpa_83/kpa_83_0_header.c @@ -0,0 +1,13 @@ +#include "kpa_83.h"; + +EntryList N(Entrances) = { + [kpa_83_ENTRY_0] { -210.0, 0.0, 150.0, 90.0 }, + [kpa_83_ENTRY_1] { 150.0, 0.0, 150.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_kpa_83 }, +}; diff --git a/src/world/area_kpa/kpa_83/kpa_83_1_music.c b/src/world/area_kpa/kpa_83/kpa_83_1_music.c new file mode 100644 index 0000000000..7e1d42fd0b --- /dev/null +++ b/src/world/area_kpa/kpa_83/kpa_83_1_music.c @@ -0,0 +1,12 @@ +#include "kpa_83.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetMusicTrackVolumes, TRACK_VOLS_KPA_3) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_83/kpa_83_2_main.c b/src/world/area_kpa/kpa_83/kpa_83_2_main.c new file mode 100644 index 0000000000..f78a1f2b8b --- /dev/null +++ b/src/world/area_kpa/kpa_83/kpa_83_2_main.c @@ -0,0 +1,102 @@ +#include "kpa_83.h" + +s32 N(map_init)(void) { + sprintf(wMapShapeName, "kpa_80_shape"); + sprintf(wMapHitName, "kpa_80_hit"); + return FALSE; +} + +s32 N(RightDoorModels)[] = { + MODEL_o140, + MODEL_o142, + MODEL_o121, + MODEL_g35, + MODEL_o116, + MODEL_o170, + -1 +}; + +s32 N(LeftDoorModels)[] = { + MODEL_o161, + MODEL_o162, + MODEL_o119, + MODEL_g33, + MODEL_o126, + MODEL_o171, + -1 +}; + +EvtScript N(EVS_ExitDoors_kpa_53_1) = EVT_EXIT_DOUBLE_DOOR(kpa_83_ENTRY_0, "kpa_53", kpa_53_ENTRY_1, COLLIDER_deilittw, MODEL_o174, MODEL_o173); + +EvtScript N(EVS_ExitDoors_kpa_121_0) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET(LVar0, kpa_83_ENTRY_1) + EVT_SET(LVar1, COLLIDER_o166) + EVT_SET(LVar2, EVT_PTR(N(RightDoorModels))) + EVT_SET(LVar3, EVT_PTR(N(LeftDoorModels))) + EVT_EXEC(BaseExitDoor) + EVT_WAIT(17) + EVT_CALL(GotoMap, EVT_PTR("kpa_121"), kpa_121_ENTRY_0) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kpa_53_1)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kpa_121_0)), TRIGGER_WALL_PRESS_A, COLLIDER_o166, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(kpa_83_ENTRY_0) + EVT_SET(LVar0, kpa_83_ENTRY_0) + EVT_SET(LVar2, MODEL_o174) + EVT_SET(LVar3, MODEL_o173) + EVT_EXEC(EnterDoubleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_EQ(kpa_83_ENTRY_1) + EVT_SET(LVar0, kpa_83_ENTRY_1) + EVT_SET(LVar2, EVT_PTR(N(LeftDoorModels))) + EVT_SET(LVar3, EVT_PTR(N(RightDoorModels))) + EVT_EXEC_WAIT(BaseEnterDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_ALT_NO_LEAD() + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_CALL(EnableModel, MODEL_o166, FALSE) + EVT_CALL(EnableModel, MODEL_m_, FALSE) + EVT_CALL(EnableModel, MODEL_m_kai, FALSE) + EVT_CALL(EnableModel, MODEL_m1, FALSE) + EVT_CALL(EnableModel, MODEL_m2, FALSE) + EVT_CALL(EnableModel, MODEL_m3, FALSE) + EVT_CALL(EnableModel, MODEL_m4, FALSE) + EVT_CALL(EnableModel, MODEL_m5, FALSE) + EVT_CALL(EnableModel, MODEL_m6, FALSE) + EVT_CALL(EnableModel, MODEL_m7, FALSE) + EVT_CALL(EnableModel, MODEL_b_, FALSE) + EVT_CALL(EnableModel, MODEL_b_kai, FALSE) + EVT_CALL(EnableModel, MODEL_b1, FALSE) + EVT_CALL(EnableModel, MODEL_b2, FALSE) + EVT_CALL(EnableModel, MODEL_b3, FALSE) + EVT_CALL(EnableModel, MODEL_b4, FALSE) + EVT_CALL(EnableModel, MODEL_b5, FALSE) + EVT_CALL(EnableModel, MODEL_b6, FALSE) + EVT_CALL(EnableModel, MODEL_b7, FALSE) + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_83/kpa_83_3_npc.c b/src/world/area_kpa/kpa_83/kpa_83_3_npc.c new file mode 100644 index 0000000000..67abbf9a0d --- /dev/null +++ b/src/world/area_kpa/kpa_83/kpa_83_3_npc.c @@ -0,0 +1,600 @@ +#include "kpa_83.h" +#include "effects.h" + +#include "world/common/npc/Toad_Stationary.inc.c" +#include "world/common/npc/KoopaBros.h" + +NpcSettings N(NpcSettings_KoopaBros) = { + .height = 35, + .radius = 24, + .level = 6, + .onHit = &EnemyNpcHit, + .onDefeat = &EnemyNpcDefeat, +}; + +NpcSettings N(NpcSettings_JrTroopa) = { + .height = 32, + .radius = 24, + .level = 99, +}; + +API_CALLABLE(N(SetPlayerSpriteFacingAngle)) { + gPlayerStatus.spriteFacingAngle = script->varTable[0]; + return ApiStatus_DONE2; +} + +EvtScript N(EVS_FocusCam_LookAtDoor) = { + EVT_CALL(SetCamType, CAM_DEFAULT, 4, FALSE) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, LVar6) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(15.0), EVT_FLOAT(-10.0)) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(500.0)) + EVT_CALL(SetCamPosA, CAM_DEFAULT, EVT_FLOAT(88.0), EVT_FLOAT(256.6)) + EVT_CALL(SetCamPosB, CAM_DEFAULT, EVT_FLOAT(195.0), EVT_FLOAT(142.0)) + EVT_CALL(SetCamPosC, CAM_DEFAULT, EVT_FLOAT(0.0), EVT_FLOAT(0.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_FocusCam_AfterBattle) = { + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar3, LVar4, LVar5) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, LVar6) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(22.5), EVT_FLOAT(-13.0)) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(300.0)) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar3, LVar4, LVar5) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_FocusCam_InFrontOfDoor) = { + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar3, LVar4, LVar5) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, LVar6) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(22.5), EVT_FLOAT(-11.5)) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(300.0)) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar3, LVar4, LVar5) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_FocusCam_MidRoom) = { + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar3, LVar4, LVar5) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, LVar6) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(22.5), EVT_FLOAT(-10.0)) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(350.0)) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar3, LVar4, LVar5) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_FocusCam_JrTroopa) = { + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar3, LVar4, LVar5) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, LVar6) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(22.5), EVT_FLOAT(-13.0)) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(175.0)) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar3, LVar4, LVar5) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_KoopaBros_Hop) = { + EVT_SWITCH(LVar0) + EVT_CASE_EQ(NPC_KoopaBrosRed) + EVT_CALL(SetNpcJumpscale, NPC_KoopaBrosRed, EVT_FLOAT(1.0)) + EVT_CALL(GetNpcPos, NPC_KoopaBrosRed, LVar1, LVar2, LVar3) + EVT_CALL(NpcJump0, NPC_KoopaBrosRed, LVar1, LVar2, LVar3, 10) + EVT_CASE_EQ(NPC_KoopaBrosBlk) + EVT_CALL(SetNpcJumpscale, NPC_KoopaBrosBlk, EVT_FLOAT(1.0)) + EVT_CALL(GetNpcPos, NPC_KoopaBrosBlk, LVar1, LVar2, LVar3) + EVT_CALL(NpcJump0, NPC_KoopaBrosBlk, LVar1, LVar2, LVar3, 10) + EVT_CASE_EQ(NPC_KoopaBrosYlw) + EVT_CALL(SetNpcJumpscale, NPC_KoopaBrosYlw, EVT_FLOAT(1.0)) + EVT_CALL(GetNpcPos, NPC_KoopaBrosYlw, LVar1, LVar2, LVar3) + EVT_CALL(NpcJump0, NPC_KoopaBrosYlw, LVar1, LVar2, LVar3, 10) + EVT_CASE_EQ(NPC_KoopaBrosGrn) + EVT_CALL(SetNpcJumpscale, NPC_KoopaBrosGrn, EVT_FLOAT(1.0)) + EVT_CALL(GetNpcPos, NPC_KoopaBrosGrn, LVar1, LVar2, LVar3) + EVT_CALL(NpcJump0, NPC_KoopaBrosGrn, LVar1, LVar2, LVar3, 10) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_KoopaBros_SpinAround) = { + EVT_SET(LVarA, LVar0) + EVT_CALL(MakeLerp, 0, 11 * 180, 50, EASING_QUADRATIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcRotation, LVarA, 0, LVar0, 0) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_KoopaBros_FlingAway) = { + EVT_THREAD + EVT_CALL(PlaySoundAtNpc, LVar0, SOUND_HIT_NORMAL, 0) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(0.6)) + EVT_END_THREAD + EVT_SWITCH(LVar0) + EVT_CASE_EQ(NPC_KoopaBrosRed) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosRed, ANIM_KoopaBros_Red_Anim1E) + EVT_CALL(SetNpcJumpscale, NPC_KoopaBrosRed, EVT_FLOAT(0.7)) + EVT_CALL(NpcJump0, NPC_KoopaBrosRed, -50, 200, 170, 40) + EVT_CALL(SetNpcFlagBits, NPC_KoopaBrosRed, NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(SetNpcPos, NPC_KoopaBrosRed, NPC_DISPOSE_LOCATION) + EVT_CASE_EQ(NPC_KoopaBrosBlk) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosBlk, ANIM_KoopaBros_Black_Anim1E) + EVT_CALL(SetNpcJumpscale, NPC_KoopaBrosBlk, EVT_FLOAT(0.7)) + EVT_CALL(NpcJump0, NPC_KoopaBrosBlk, 0, 200, 127, 40) + EVT_CALL(SetNpcFlagBits, NPC_KoopaBrosRed, NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(SetNpcPos, NPC_KoopaBrosBlk, NPC_DISPOSE_LOCATION) + EVT_CASE_EQ(NPC_KoopaBrosYlw) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosYlw, ANIM_KoopaBros_Yellow_Anim1E) + EVT_CALL(SetNpcJumpscale, NPC_KoopaBrosYlw, EVT_FLOAT(0.7)) + EVT_CALL(NpcJump0, NPC_KoopaBrosYlw, 100, 200, 200, 40) + EVT_CALL(SetNpcFlagBits, NPC_KoopaBrosYlw, NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(SetNpcPos, NPC_KoopaBrosYlw, NPC_DISPOSE_LOCATION) + EVT_CASE_EQ(NPC_KoopaBrosGrn) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosGrn, ANIM_KoopaBros_Green_Anim1E) + EVT_CALL(SetNpcJumpscale, NPC_KoopaBrosGrn, EVT_FLOAT(0.7)) + EVT_CALL(NpcJump0, NPC_KoopaBrosGrn, 150, 200, 150, 40) + EVT_CALL(SetNpcFlagBits, NPC_KoopaBrosGrn, NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(SetNpcPos, NPC_KoopaBrosGrn, NPC_DISPOSE_LOCATION) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Door) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) + EVT_CALL(PlayerMoveTo, -150, LVar2, 0) + EVT_CALL(SetCamType, CAM_DEFAULT, 6, FALSE) + EVT_SET(LVar6, EVT_FLOAT(3.0)) + EVT_EXEC_WAIT(N(EVS_FocusCam_LookAtDoor)) + EVT_SET(MF_DoneIntroMessage, FALSE) + EVT_THREAD + EVT_CALL(SetMusicTrack, 0, SONG_FINAL_BOWSER_BATTLE, 1, 8) + EVT_WAIT(150) + EVT_IF_NE(MF_DoneIntroMessage, FALSE) + EVT_GOTO(5) + EVT_END_IF + EVT_CALL(FadeOutMusic, 0, 250) + EVT_WAIT(15) + EVT_IF_NE(MF_DoneIntroMessage, FALSE) + EVT_GOTO(5) + EVT_END_IF + EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) + EVT_WAIT(30) + EVT_IF_NE(MF_DoneIntroMessage, FALSE) + EVT_GOTO(5) + EVT_END_IF + EVT_CALL(SetMusicTrackVolumes, TRACK_VOLS_KPA_3) + EVT_LABEL(5) + EVT_END_THREAD + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Red_Idle, ANIM_Toad_Red_Idle, 0, MSG_CH8_0053) + EVT_SET(MF_DoneIntroMessage, TRUE) + EVT_WAIT(2) + EVT_CALL(SetMusicTrack, 0, SONG_KOOPA_BROS_THEME, 2, 8) + EVT_SET(LVar3, 65) + EVT_SET(LVar4, 0) + EVT_SET(LVar5, 150) + EVT_SET(LVar6, EVT_FLOAT(90.0)) + EVT_EXEC_WAIT(N(EVS_FocusCam_InFrontOfDoor)) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o166, COLLIDER_FLAGS_UPPER_MASK) + EVT_THREAD + EVT_CALL(SetNpcPos, NPC_KoopaBrosRed, 220, 180, 160) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosRed, ANIM_KoopaBros_Red_Anim11) + EVT_CALL(EnableNpcBlur, NPC_KoopaBrosRed, TRUE) + EVT_CALL(SetNpcJumpscale, NPC_KoopaBrosRed, EVT_FLOAT(1.0)) + EVT_CALL(SetNpcFlagBits, NPC_KoopaBrosRed, NPC_FLAG_GRAVITY, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_KoopaBrosRed, NPC_FLAG_ENABLE_HIT_SCRIPT, FALSE) + EVT_CALL(NpcMoveTo, NPC_KoopaBrosRed, 20, 160, 20) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBrosRed, SOUND_3E9, 0) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, 20, 0, 160, 0) + EVT_CALL(EnableNpcBlur, NPC_KoopaBrosRed, FALSE) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosRed, ANIM_KoopaBros_Red_Anim05) + EVT_CALL(SetNpcYaw, NPC_KoopaBrosRed, 270) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(5) + EVT_CALL(SetNpcPos, NPC_KoopaBrosBlk, 248, 180, 185) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosBlk, ANIM_KoopaBros_Black_Anim11) + EVT_CALL(EnableNpcBlur, NPC_KoopaBrosBlk, TRUE) + EVT_CALL(SetNpcJumpscale, NPC_KoopaBrosBlk, EVT_FLOAT(1.0)) + EVT_CALL(SetNpcFlagBits, NPC_KoopaBrosBlk, NPC_FLAG_GRAVITY, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_KoopaBrosBlk, NPC_FLAG_ENABLE_HIT_SCRIPT, FALSE) + EVT_CALL(NpcMoveTo, NPC_KoopaBrosBlk, 48, 185, 20) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBrosBlk, SOUND_3E9, 0) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, 48, 0, 185, 0) + EVT_CALL(EnableNpcBlur, NPC_KoopaBrosBlk, FALSE) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosBlk, ANIM_KoopaBros_Black_Anim05) + EVT_CALL(SetNpcYaw, NPC_KoopaBrosBlk, 270) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(10) + EVT_CALL(SetNpcPos, NPC_KoopaBrosYlw, 260, 180, 110) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosYlw, ANIM_KoopaBros_Yellow_Anim11) + EVT_CALL(EnableNpcBlur, NPC_KoopaBrosYlw, TRUE) + EVT_CALL(SetNpcJumpscale, NPC_KoopaBrosYlw, EVT_FLOAT(1.0)) + EVT_CALL(SetNpcFlagBits, NPC_KoopaBrosYlw, NPC_FLAG_GRAVITY, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_KoopaBrosYlw, NPC_FLAG_ENABLE_HIT_SCRIPT, FALSE) + EVT_CALL(NpcMoveTo, NPC_KoopaBrosYlw, 60, 110, 20) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBrosYlw, SOUND_3E9, 0) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, 60, 0, 110, 0) + EVT_CALL(EnableNpcBlur, NPC_KoopaBrosYlw, FALSE) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosYlw, ANIM_KoopaBros_Yellow_Anim05) + EVT_CALL(SetNpcYaw, NPC_KoopaBrosYlw, 270) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(15) + EVT_CALL(SetNpcPos, NPC_KoopaBrosGrn, 288, 180, 155) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosGrn, ANIM_KoopaBros_Green_Anim11) + EVT_CALL(EnableNpcBlur, NPC_KoopaBrosGrn, TRUE) + EVT_CALL(SetNpcJumpscale, NPC_KoopaBrosGrn, EVT_FLOAT(1.0)) + EVT_CALL(SetNpcFlagBits, NPC_KoopaBrosGrn, NPC_FLAG_GRAVITY, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_KoopaBrosGrn, NPC_FLAG_ENABLE_HIT_SCRIPT, FALSE) + EVT_CALL(NpcMoveTo, NPC_KoopaBrosGrn, 88, 155, 20) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBrosGrn, SOUND_3E9, 0) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, 88, 0, 155, 0) + EVT_CALL(EnableNpcBlur, NPC_KoopaBrosGrn, FALSE) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosGrn, ANIM_KoopaBros_Green_Anim05) + EVT_CALL(SetNpcYaw, NPC_KoopaBrosGrn, 270) + EVT_END_THREAD + EVT_WAIT(65) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o166, COLLIDER_FLAGS_UPPER_MASK) + EVT_THREAD + EVT_CALL(GetNpcPos, NPC_KoopaBrosRed, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 5) + EVT_ADD(LVar1, 30) + EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 40) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBrosRed, SOUND_20F3, 0) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosRed, ANIM_KoopaBros_Red_Anim1A) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(5) + EVT_CALL(GetNpcPos, NPC_KoopaBrosBlk, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 5) + EVT_ADD(LVar1, 30) + EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 40) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBrosBlk, SOUND_20F3, 0) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosBlk, ANIM_KoopaBros_Black_Anim1A) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(10) + EVT_CALL(GetNpcPos, NPC_KoopaBrosYlw, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 5) + EVT_ADD(LVar1, 30) + EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 40) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBrosYlw, SOUND_20F3, 0) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosYlw, ANIM_KoopaBros_Yellow_Anim1A) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(15) + EVT_CALL(GetNpcPos, NPC_KoopaBrosGrn, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 5) + EVT_ADD(LVar1, 30) + EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 40) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBrosGrn, SOUND_20F3, 0) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosGrn, ANIM_KoopaBros_Green_Anim1A) + EVT_END_THREAD + EVT_WAIT(45) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosRed, ANIM_KoopaBros_Red_Anim1A) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosBlk, ANIM_KoopaBros_Black_Anim1A) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosYlw, ANIM_KoopaBros_Yellow_Anim1A) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosGrn, ANIM_KoopaBros_Green_Anim1A) + EVT_THREAD + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) + EVT_CALL(PlayerMoveTo, -50, 150, 0) + EVT_END_THREAD + EVT_CALL(SpeakToPlayer, NPC_KoopaBrosRed, ANIM_KoopaBros_Red_Anim1A, ANIM_KoopaBros_Red_Anim1A, 0, MSG_CH8_0054) + EVT_SET(LVar3, 0) + EVT_SET(LVar4, 0) + EVT_SET(LVar5, 150) + EVT_SET(LVar6, EVT_FLOAT(3.0)) + EVT_EXEC_WAIT(N(EVS_FocusCam_MidRoom)) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosRed, ANIM_KoopaBros_Red_Anim04) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosBlk, ANIM_KoopaBros_Black_Anim04) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosYlw, ANIM_KoopaBros_Yellow_Anim04) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosGrn, ANIM_KoopaBros_Green_Anim04) + EVT_CALL(SpeakToPlayer, NPC_KoopaBrosRed, ANIM_KoopaBros_Red_Anim14, ANIM_KoopaBros_Red_Anim04, 0, MSG_CH8_0055) + EVT_CALL(ShowChoice, MSG_Choice_0013) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(ContinueSpeech, NPC_KoopaBrosRed, ANIM_KoopaBros_Red_Anim14, ANIM_KoopaBros_Red_Anim04, 0, MSG_CH8_0056) + EVT_ELSE + EVT_CALL(ContinueSpeech, NPC_KoopaBrosRed, ANIM_KoopaBros_Red_Anim14, ANIM_KoopaBros_Red_Anim04, 0, MSG_CH8_0057) + EVT_END_IF + EVT_SET(LVar6, EVT_FLOAT(3.0)) + EVT_EXEC_WAIT(N(EVS_FocusCam_LookAtDoor)) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Red_Idle, ANIM_Toad_Red_Idle, 0, MSG_CH8_0058) + EVT_SET(LVar3, 0) + EVT_SET(LVar4, 0) + EVT_SET(LVar5, 150) + EVT_SET(LVar6, EVT_FLOAT(90.0)) + EVT_EXEC_WAIT(N(EVS_FocusCam_MidRoom)) + EVT_CALL(SpeakToPlayer, NPC_KoopaBrosRed, ANIM_KoopaBros_Red_Anim14, ANIM_KoopaBros_Red_Anim04, 0, MSG_CH8_0059) + EVT_CALL(SetMusicTrack, 0, SONG_JR_TROOPA_THEME, 1, 8) + EVT_CALL(ShowMessageAtScreenPos, MSG_CH8_005A, 0, 150) + EVT_CALL(InterpPlayerYaw, 270, 0) + EVT_WAIT(10) + EVT_CALL(SetNpcPos, NPC_JrTroopa, -150, 0, 140) + EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_JrTroopa_ChargeArmsUp) + EVT_CALL(SetNpcSpeed, NPC_JrTroopa, EVT_FLOAT(8.0)) + EVT_THREAD + EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002B) + EVT_LOOP(0) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_JrTroopa, LVar3, LVar4, LVar5) + EVT_IF_LE(LVar0, LVar3) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(SetPlayerFlagBits, PS_FLAGS_NO_STATIC_COLLISION | PS_FLAGS_ROTATION_LOCKED | PS_FLAGS_FACE_FORWARDS, TRUE) + EVT_CALL(MakeLerp, 0, 11 * 180, 50, EASING_QUADRATIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(InterpPlayerYaw, LVar0, 0) + EVT_CALL(N(SetPlayerSpriteFacingAngle)) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(SetPlayerFlagBits, PS_FLAGS_NO_STATIC_COLLISION | PS_FLAGS_ROTATION_LOCKED | PS_FLAGS_FACE_FORWARDS, FALSE) + EVT_CALL(InterpPlayerYaw, 90, 0) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_END_THREAD + EVT_SET(LVar0, NPC_KoopaBrosRed) + EVT_EXEC_GET_TID(N(EVS_KoopaBros_Hop), MV_KoopaBrosRed_HopScript) + EVT_SET(LVar0, NPC_KoopaBrosBlk) + EVT_EXEC_GET_TID(N(EVS_KoopaBros_Hop), MV_KoopaBrosBlk_HopScript) + EVT_SET(LVar0, NPC_KoopaBrosYlw) + EVT_EXEC_GET_TID(N(EVS_KoopaBros_Hop), MV_KoopaBrosYlw_HopScript) + EVT_SET(LVar0, NPC_KoopaBrosGrn) + EVT_EXEC_GET_TID(N(EVS_KoopaBros_Hop), MV_KoopaBrosGrn_HopScript) + EVT_CALL(NpcMoveTo, NPC_JrTroopa, 22, 140, 0) + EVT_SET(LVar0, NPC_KoopaBrosRed) + EVT_EXEC(N(EVS_KoopaBros_SpinAround)) + EVT_CALL(NpcMoveTo, NPC_JrTroopa, 50, 140, 0) + EVT_SET(LVar0, NPC_KoopaBrosBlk) + EVT_EXEC(N(EVS_KoopaBros_SpinAround)) + EVT_CALL(NpcMoveTo, NPC_JrTroopa, 62, 140, 0) + EVT_SET(LVar0, NPC_KoopaBrosYlw) + EVT_EXEC(N(EVS_KoopaBros_SpinAround)) + EVT_CALL(NpcMoveTo, NPC_JrTroopa, 90, 140, 0) + EVT_SET(LVar0, NPC_KoopaBrosGrn) + EVT_EXEC(N(EVS_KoopaBros_SpinAround)) + EVT_CALL(NpcMoveTo, NPC_JrTroopa, 100, 140, 0) + EVT_CALL(NpcMoveTo, NPC_JrTroopa, 98, 140, 0) + EVT_KILL_THREAD(MV_KoopaBrosGrn_HopScript) + EVT_SET(LVar0, NPC_KoopaBrosGrn) + EVT_EXEC(N(EVS_KoopaBros_FlingAway)) + EVT_CALL(NpcMoveTo, NPC_JrTroopa, 25, 140, 0) + EVT_CALL(NpcMoveTo, NPC_JrTroopa, 70, 140, 0) + EVT_KILL_THREAD(MV_KoopaBrosYlw_HopScript) + EVT_SET(LVar0, NPC_KoopaBrosYlw) + EVT_EXEC(N(EVS_KoopaBros_FlingAway)) + EVT_CALL(NpcMoveTo, NPC_JrTroopa, 75, 140, 0) + EVT_CALL(NpcMoveTo, NPC_JrTroopa, 30, 140, 0) + EVT_KILL_THREAD(MV_KoopaBrosRed_HopScript) + EVT_SET(LVar0, NPC_KoopaBrosRed) + EVT_EXEC(N(EVS_KoopaBros_FlingAway)) + EVT_CALL(NpcMoveTo, NPC_JrTroopa, 25, 140, 0) + EVT_CALL(NpcMoveTo, NPC_JrTroopa, 58, 140, 0) + EVT_KILL_THREAD(MV_KoopaBrosBlk_HopScript) + EVT_SET(LVar0, NPC_KoopaBrosBlk) + EVT_EXEC(N(EVS_KoopaBros_FlingAway)) + EVT_CALL(NpcMoveTo, NPC_JrTroopa, 75, 140, 0) + EVT_CALL(InterpNpcYaw, NPC_JrTroopa, 270, 0) + EVT_WAIT(5) + EVT_CALL(GetNpcPos, NPC_JrTroopa, LVar0, LVar1, LVar2) + EVT_CALL(NpcMoveTo, NPC_JrTroopa, 100, 140, 0) + EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_JrTroopa_Idle) + EVT_CALL(SetNpcYaw, NPC_JrTroopa, 270) + EVT_CALL(ShowMessageAtScreenPos, MSG_CH8_005B, 160, 40) + EVT_WAIT(10) + EVT_SET(LVar3, 100) + EVT_SET(LVar4, 0) + EVT_SET(LVar5, 150) + EVT_SET(LVar6, EVT_FLOAT(3.0)) + EVT_EXEC_WAIT(N(EVS_FocusCam_JrTroopa)) + EVT_CALL(SpeakToPlayer, NPC_JrTroopa, ANIM_JrTroopa_Talk, ANIM_JrTroopa_Idle, 0, MSG_CH8_005C) + EVT_SET(LVar3, 0) + EVT_SET(LVar4, 0) + EVT_SET(LVar5, 150) + EVT_SET(LVar6, EVT_FLOAT(3.0)) + EVT_EXEC_WAIT(N(EVS_FocusCam_AfterBattle)) + EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_JrTroopa_ChargeArmsUp) + EVT_THREAD + EVT_WAIT(5) + EVT_CALL(SetNpcSpeed, NPC_JrTroopa, EVT_FLOAT(5.0)) + EVT_CALL(NpcMoveTo, NPC_JrTroopa, -30, 140, 0) + EVT_END_THREAD + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 60) + EVT_CALL(SetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_CALL(StartBossBattle, SONG_JR_TROOPA_BATTLE) + EVT_CALL(SpeakToPlayer, NPC_JrTroopa, ANIM_JrTroopa_Dizzy, ANIM_JrTroopa_Dizzy, 0, MSG_CH8_0061) + EVT_SET(MV_Sync_AfterBattleCamMovement, 0) + EVT_THREAD + EVT_SET(LVar3, 0) + EVT_SET(LVar4, 0) + EVT_SET(LVar5, 150) + EVT_SET(LVar6, EVT_FLOAT(3.0)) + EVT_EXEC_WAIT(N(EVS_FocusCam_AfterBattle)) + EVT_CALL(ShowMessageAtScreenPos, MSG_CH8_0062, 160, 40) + EVT_SET(MV_Sync_AfterBattleCamMovement, 1) + EVT_END_THREAD + EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_JrTroopa_ChargeArmsUp) + EVT_CALL(SetNpcSpeed, NPC_JrTroopa, EVT_FLOAT(8.0)) + EVT_CALL(NpcMoveTo, NPC_JrTroopa, -50, 140, 0) + EVT_CALL(InterpPlayerYaw, 270, 0) + EVT_CALL(NpcMoveTo, NPC_JrTroopa, -200, 140, 0) + EVT_CALL(SetNpcPos, NPC_JrTroopa, NPC_DISPOSE_LOCATION) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_LOOP(0) + EVT_IF_EQ(MV_Sync_AfterBattleCamMovement, 1) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_SET(LVar6, EVT_FLOAT(3.0)) + EVT_EXEC_WAIT(N(EVS_FocusCam_LookAtDoor)) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Red_Idle, ANIM_Toad_Red_Idle, 0, MSG_CH8_0063) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_SET(GB_KPA83_BowserDoorState, 1) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcDefeat_Door) = { + EVT_CALL(GetBattleOutcome, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(OUTCOME_PLAYER_WON) + EVT_SET(LVar3, 100) + EVT_SET(LVar4, 0) + EVT_SET(LVar5, 150) + EVT_SET(LVar6, EVT_FLOAT(90.0)) + EVT_EXEC_WAIT(N(EVS_FocusCam_JrTroopa)) + EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_JrTroopa_Dizzy) + EVT_CALL(SetNpcPos, NPC_JrTroopa, 100, 0, 140) + EVT_CALL(SetNpcPos, NPC_SELF, 184, 20, 150) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Door) = { + EVT_IF_EQ(GB_KPA83_BowserDoorState, 0) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Door))) + EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_Door))) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2 | NPC_FLAG_100 | NPC_FLAG_10000000, TRUE) + EVT_CALL(SetNpcPos, NPC_SELF, 184, 20, 150) + EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_KoopaBros) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_JrTroopa) = { + EVT_RETURN + EVT_END +}; + +s32 N(ExtraAnims_KoopaBros)[] = { + ANIM_KoopaBros_Black_Anim1E, + ANIM_KoopaBros_Black_Anim04, + ANIM_KoopaBros_Black_Anim05, + ANIM_KoopaBros_Black_Anim11, + ANIM_KoopaBros_Black_Anim1A, + ANIM_KoopaBros_Black_Anim14, + ANIM_KoopaBros_Black_Anim10, + ANIM_KoopaBros_Black_Anim15, + -1 +}; + +StaticNpc N(NpcData_Enemies)[] = { + { + .id = NPC_KoopaBrosBlk, + .settings = &N(NpcSettings_KoopaBros), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .init = &N(EVS_NpcInit_KoopaBros), + .drops = KOOPA_BROS_DROPS, + .animations = BLACK_KOOPA_BROS_ANIMS, + .extraAnimations = N(ExtraAnims_KoopaBros), + }, + { + .id = NPC_KoopaBrosRed, + .settings = &N(NpcSettings_KoopaBros), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .init = &N(EVS_NpcInit_KoopaBros), + .drops = KOOPA_BROS_DROPS, + .animations = RED_KOOPA_BROS_ANIMS, + .extraAnimations = N(ExtraAnims_KoopaBros), + }, + { + .id = NPC_KoopaBrosYlw, + .settings = &N(NpcSettings_KoopaBros), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .init = &N(EVS_NpcInit_KoopaBros), + .drops = KOOPA_BROS_DROPS, + .animations = YELLOW_KOOPA_BROS_ANIMS, + .extraAnimations = N(ExtraAnims_KoopaBros), + }, + { + .id = NPC_KoopaBrosGrn, + .settings = &N(NpcSettings_KoopaBros), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .init = &N(EVS_NpcInit_KoopaBros), + .drops = KOOPA_BROS_DROPS, + .animations = GREEN_KOOPA_BROS_ANIMS, + .extraAnimations = N(ExtraAnims_KoopaBros), + }, + { + .id = NPC_JrTroopa, + .settings = &N(NpcSettings_JrTroopa), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 90, + .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .init = &N(EVS_NpcInit_JrTroopa), + .drops = NPC_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, + }, + }, + { + .id = NPC_Door, + .settings = &N(NpcSettings_Toad_Stationary), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_4000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .init = &N(EVS_NpcInit_Door), + .drops = NPC_NO_DROPS, + .animations = TOAD_RED_ANIMS, + }, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Enemies), BTL_KMR_PART_3_FORMATION_07), + {} +}; diff --git a/src/world/area_kpa/kpa_91/kpa_91_2_main.c b/src/world/area_kpa/kpa_91/kpa_91_2_main.c index 1f48eb9a2c..9a3a97173e 100644 --- a/src/world/area_kpa/kpa_91/kpa_91_2_main.c +++ b/src/world/area_kpa/kpa_91/kpa_91_2_main.c @@ -34,9 +34,9 @@ EvtScript N(EVS_OpenCellDoor) = { EvtScript N(EVS_Main) = { EVT_SET(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) - EVT_SET(AB_KPA_5, 0) - EVT_SET(AB_KPA_7, 0) - EVT_SET(AB_KPA_6, 0) + EVT_SET(AB_KPA91_Toad2_Dialogue, 0) + EVT_SET(AB_KPA91_Dryite_Dialogue, 0) + EVT_SET(AB_KPA91_Toad3_Dialogue, 0) EVT_CALL(SetSpriteShading, SHADING_NONE) EVT_SETUP_CAMERA_ALT_NO_LEAD() EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) diff --git a/src/world/area_kpa/kpa_91/kpa_91_3_npc.c b/src/world/area_kpa/kpa_91/kpa_91_3_npc.c index 1491899f39..a77d9732a3 100644 --- a/src/world/area_kpa/kpa_91/kpa_91_3_npc.c +++ b/src/world/area_kpa/kpa_91/kpa_91_3_npc.c @@ -84,39 +84,39 @@ EvtScript N(EVS_NpcInteract_Toad_01) = { }; EvtScript N(EVS_NpcInteract_Toad_02) = { - EVT_SWITCH(AB_KPA_5) + EVT_SWITCH(AB_KPA91_Toad2_Dialogue) EVT_CASE_EQ(0) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Yellow_Talk, ANIM_Toad_Yellow_Idle, 0, MSG_CH8_0049) - EVT_SET(AB_KPA_5, 1) + EVT_SET(AB_KPA91_Toad2_Dialogue, 1) EVT_CASE_EQ(1) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Yellow_Talk, ANIM_Toad_Yellow_Idle, 0, MSG_CH8_004A) - EVT_SET(AB_KPA_5, 0) + EVT_SET(AB_KPA91_Toad2_Dialogue, 0) EVT_END_SWITCH EVT_RETURN EVT_END }; EvtScript N(EVS_NpcInteract_ToadGuard) = { - EVT_SWITCH(AB_KPA_6) + EVT_SWITCH(AB_KPA91_Toad3_Dialogue) EVT_CASE_EQ(0) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ToadGuard_Blue_Talk, ANIM_ToadGuard_Blue_Idle, 0, MSG_CH8_004B) - EVT_SET(AB_KPA_6, 1) + EVT_SET(AB_KPA91_Toad3_Dialogue, 1) EVT_CASE_EQ(1) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ToadGuard_Blue_Talk, ANIM_ToadGuard_Blue_Idle, 0, MSG_CH8_004C) - EVT_SET(AB_KPA_6, 0) + EVT_SET(AB_KPA91_Toad3_Dialogue, 0) EVT_END_SWITCH EVT_RETURN EVT_END }; EvtScript N(EVS_NpcInteract_Dryite) = { - EVT_SWITCH(AB_KPA_7) + EVT_SWITCH(AB_KPA91_Dryite_Dialogue) EVT_CASE_EQ(0) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Dryite_Green_Talk, ANIM_Dryite_Green_Idle, 0, MSG_CH8_004D) - EVT_SET(AB_KPA_7, 1) + EVT_SET(AB_KPA91_Dryite_Dialogue, 1) EVT_CASE_EQ(1) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Dryite_Green_Talk, ANIM_Dryite_Green_Idle, 0, MSG_CH8_004E) - EVT_SET(AB_KPA_7, 0) + EVT_SET(AB_KPA91_Dryite_Dialogue, 0) EVT_END_SWITCH EVT_RETURN EVT_END @@ -186,29 +186,8 @@ StaticNpc N(NpcData_Prisoners)[] = { .yaw = 0, .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, .init = &N(EVS_NpcInit_ToadGuard), - .drops = { - .dropFlags = NPC_DROP_FLAGS_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, - .animations = { - .idle = ANIM_ToadGuard_Red_Idle, - .walk = ANIM_ToadGuard_Red_Idle, - .run = ANIM_ToadGuard_Red_Idle, - .chase = ANIM_ToadGuard_Red_Idle, - .anim_4 = ANIM_ToadGuard_Red_Idle, - .anim_5 = ANIM_ToadGuard_Red_Idle, - .death = ANIM_ToadGuard_Red_Idle, - .hit = ANIM_ToadGuard_Red_Idle, - .anim_8 = ANIM_ToadGuard_Red_Idle, - .anim_9 = ANIM_ToadGuard_Red_Idle, - .anim_A = ANIM_ToadGuard_Red_Idle, - .anim_B = ANIM_ToadGuard_Red_Idle, - .anim_C = ANIM_ToadGuard_Red_Idle, - .anim_D = ANIM_ToadGuard_Red_Idle, - .anim_E = ANIM_ToadGuard_Red_Idle, - .anim_F = ANIM_ToadGuard_Red_Idle, - }, + .drops = TOAD_DROPS, + .animations = TOAD_GUARD_RED_ANIMS, .tattle = MSG_NpcTattle_KPA_CaptiveSoldierB, }, { diff --git a/src/world/area_kpa/kpa_95/kpa_95.h b/src/world/area_kpa/kpa_95/kpa_95.h index 29db7d1d71..3032affecc 100644 --- a/src/world/area_kpa/kpa_95/kpa_95.h +++ b/src/world/area_kpa/kpa_95/kpa_95.h @@ -15,11 +15,11 @@ #include "sprite/npc/WorldKoopatrol.h" enum { - NPC_Toad_01 = 0, - NPC_Toad_02 = 1, - NPC_ToadGuard = 2, - NPC_Penguin = 3, - NPC_Koopatrol = 4, + NPC_Toad_01 = 0, + NPC_Toad_02 = 1, + NPC_ToadGuard = 2, + NPC_Penguin = 3, + NPC_Koopatrol = 4, }; enum { diff --git a/src/world/area_kpa/kpa_95/kpa_95_4_npc.c b/src/world/area_kpa/kpa_95/kpa_95_4_npc.c index 6b27f88621..144d43d1d7 100644 --- a/src/world/area_kpa/kpa_95/kpa_95_4_npc.c +++ b/src/world/area_kpa/kpa_95/kpa_95_4_npc.c @@ -72,7 +72,7 @@ EvtScript N(EVS_ToadHouse_ReturnFromRest) = { EVT_CALL(UseSettingsFrom, CAM_DEFAULT, MV_LastPlayerPosX, MV_LastPlayerPosY, MV_LastPlayerPosZ) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(SetPanTarget, CAM_DEFAULT, MV_LastPlayerPosX, MV_LastPlayerPosY, MV_LastPlayerPosZ) - EVT_CALL(func_802D2520, 0x00010002, 0, 0, 0, 0, 0) + EVT_CALL(func_802D2520, ANIM_Mario_10002, 0, 0, 0, 0, 0) EVT_CALL(HidePlayerShadow, FALSE) EVT_CALL(SetPlayerPos, -139, 0, -90) EVT_CALL(PlayerMoveTo, -102, -130, 20) @@ -90,39 +90,39 @@ EvtScript N(EVS_NpcInteract_Toad_01) = { }; EvtScript N(EVS_NpcInteract_Toad_02) = { - EVT_SWITCH(AB_KPA_8) + EVT_SWITCH(AB_KPA95_Toad2_Dialogue) EVT_CASE_EQ(0) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Blue_Talk, ANIM_Toad_Blue_Idle, 0, MSG_CH8_0069) - EVT_SET(AB_KPA_8, 1) + EVT_SET(AB_KPA95_Toad2_Dialogue, 1) EVT_CASE_EQ(1) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Blue_Talk, ANIM_Toad_Blue_Idle, 0, MSG_CH8_006A) - EVT_SET(AB_KPA_8, 0) + EVT_SET(AB_KPA95_Toad2_Dialogue, 0) EVT_END_SWITCH EVT_RETURN EVT_END }; EvtScript N(EVS_NpcInteract_ToadGuard) = { - EVT_SWITCH(AB_KPA_9) + EVT_SWITCH(AB_KPA95_Toad3_Dialogue) EVT_CASE_EQ(0) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ToadGuard_Green_Talk, ANIM_ToadGuard_Green_Idle, 0, MSG_CH8_006B) - EVT_SET(AB_KPA_9, 1) + EVT_SET(AB_KPA95_Toad3_Dialogue, 1) EVT_CASE_EQ(1) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ToadGuard_Green_Talk, ANIM_ToadGuard_Green_Idle, 0, MSG_CH8_006C) - EVT_SET(AB_KPA_9, 0) + EVT_SET(AB_KPA95_Toad3_Dialogue, 0) EVT_END_SWITCH EVT_RETURN EVT_END }; EvtScript N(EVS_NpcInteract_Penguin) = { - EVT_SWITCH(AB_KPA_A) + EVT_SWITCH(AB_KPA95_Penguin_Dialogue) EVT_CASE_EQ(0) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Penguin_Talk, ANIM_Penguin_Idle, 0, MSG_CH8_006D) - EVT_SET(AB_KPA_A, 1) + EVT_SET(AB_KPA95_Penguin_Dialogue, 1) EVT_CASE_EQ(1) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Penguin_Talk, ANIM_Penguin_Idle, 0, MSG_CH8_006E) - EVT_SET(AB_KPA_A, 0) + EVT_SET(AB_KPA95_Penguin_Dialogue, 0) EVT_END_SWITCH EVT_RETURN EVT_END @@ -192,29 +192,8 @@ StaticNpc N(NpcData_Prisoners)[] = { .yaw = 0, .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, .init = &N(EVS_NpcInit_ToadGuard), - .drops = { - .dropFlags = NPC_DROP_FLAGS_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, - .animations = { - .idle = ANIM_ToadGuard_Red_Idle, - .walk = ANIM_ToadGuard_Red_Idle, - .run = ANIM_ToadGuard_Red_Idle, - .chase = ANIM_ToadGuard_Red_Idle, - .anim_4 = ANIM_ToadGuard_Red_Idle, - .anim_5 = ANIM_ToadGuard_Red_Idle, - .death = ANIM_ToadGuard_Red_Idle, - .hit = ANIM_ToadGuard_Red_Idle, - .anim_8 = ANIM_ToadGuard_Red_Idle, - .anim_9 = ANIM_ToadGuard_Red_Idle, - .anim_A = ANIM_ToadGuard_Red_Idle, - .anim_B = ANIM_ToadGuard_Red_Idle, - .anim_C = ANIM_ToadGuard_Red_Idle, - .anim_D = ANIM_ToadGuard_Red_Idle, - .anim_E = ANIM_ToadGuard_Red_Idle, - .anim_F = ANIM_ToadGuard_Red_Idle, - }, + .drops = TOAD_DROPS, + .animations = TOAD_GUARD_RED_ANIMS, .tattle = MSG_NpcTattle_KPA_CaptiveSoldierC, }, { @@ -224,11 +203,7 @@ StaticNpc N(NpcData_Prisoners)[] = { .yaw = 0, .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, .init = &N(EVS_NpcInit_Penguin), - .drops = { - .dropFlags = NPC_DROP_FLAGS_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .drops = NPC_NO_DROPS, .animations = { .idle = ANIM_Penguin_Idle, .walk = ANIM_Penguin_Walk, diff --git a/src/world/area_kpa/kpa_96/kpa_96.h b/src/world/area_kpa/kpa_96/kpa_96.h index b1ef0d85e3..5e126dd130 100644 --- a/src/world/area_kpa/kpa_96/kpa_96.h +++ b/src/world/area_kpa/kpa_96/kpa_96.h @@ -12,7 +12,7 @@ #include "sprite/npc/SpikedGoomba.h" enum { - NPC_SpikedGoomba = 0, + NPC_SpikedGoomba = 0, }; enum { diff --git a/src/world/area_kpa/kpa_96/kpa_96_3_npc.c b/src/world/area_kpa/kpa_96/kpa_96_3_npc.c index a6f7a01851..5a9ea1f92f 100644 --- a/src/world/area_kpa/kpa_96/kpa_96_3_npc.c +++ b/src/world/area_kpa/kpa_96/kpa_96_3_npc.c @@ -27,12 +27,12 @@ s32 N(ShopMessages)[] = { }; ShopItemData N(Inventory)[] = { - { .itemID = ITEM_MYSTERY, .price = 5, .descMsg = 0x0024002B }, - { .itemID = ITEM_DIZZY_DIAL, .price = 25, .descMsg = 0x00240029 }, - { .itemID = ITEM_POW_BLOCK, .price = 15, .descMsg = 0x00240027 }, - { .itemID = ITEM_THUNDER_RAGE, .price = 30, .descMsg = 0x00240002 }, - { .itemID = ITEM_MAPLE_SYRUP, .price = 30, .descMsg = 0x00240017 }, - { .itemID = ITEM_SUPER_SHROOM, .price = 30, .descMsg = 0x0024000A }, + { .itemID = ITEM_MYSTERY, .price = 5, .descMsg = MSG_ItemShopDesc_Mystery }, + { .itemID = ITEM_DIZZY_DIAL, .price = 25, .descMsg = MSG_ItemShopDesc_DizzyDial }, + { .itemID = ITEM_POW_BLOCK, .price = 15, .descMsg = MSG_ItemShopDesc_POWBlock }, + { .itemID = ITEM_THUNDER_RAGE, .price = 30, .descMsg = MSG_ItemShopDesc_ThunderRage }, + { .itemID = ITEM_MAPLE_SYRUP, .price = 30, .descMsg = MSG_ItemShopDesc_MapleSyrup }, + { .itemID = ITEM_SUPER_SHROOM, .price = 30, .descMsg = MSG_ItemShopDesc_SuperShroom }, {} }; @@ -147,11 +147,7 @@ StaticNpc N(NpcData_SpikedGoomba) = { .yaw = 90, .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_10000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_400000, .init = &N(EVS_NpcInit_SpikedGoomba), - .drops = { - .dropFlags = NPC_DROP_FLAGS_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .drops = NPC_NO_DROPS, .animations = { .idle = ANIM_SpikedGoomba_Idle, .walk = ANIM_SpikedGoomba_Walk, diff --git a/src/world/area_kzn/kzn_03/kzn_03_4_ziplines.c b/src/world/area_kzn/kzn_03/kzn_03_4_ziplines.c index 8f7b293dc0..dcaaa28535 100644 --- a/src/world/area_kzn/kzn_03/kzn_03_4_ziplines.c +++ b/src/world/area_kzn/kzn_03/kzn_03_4_ziplines.c @@ -75,7 +75,7 @@ EvtScript N(EVS_Zipline_TetherCameraToPlayer) = { }; EvtScript N(EVS_RideZipline) = { - EVT_CALL(GetCurrentPartner, LVar9) + EVT_CALL(GetPartnerInUse, LVar9) EVT_IF_EQ(LVar9, PARTNER_KOOPER) EVT_RETURN EVT_END_IF diff --git a/src/world/area_kzn/kzn_09/kzn_09_3_zipline.c b/src/world/area_kzn/kzn_09/kzn_09_3_zipline.c index 3fe90d098e..7a63cb9cc1 100644 --- a/src/world/area_kzn/kzn_09/kzn_09_3_zipline.c +++ b/src/world/area_kzn/kzn_09/kzn_09_3_zipline.c @@ -69,7 +69,7 @@ EvtScript N(EVS_Zipline_TetherCameraToPlayer) = { }; EvtScript N(EVS_RideZipline) = { - EVT_CALL(GetCurrentPartner, LVar9) + EVT_CALL(GetPartnerInUse, LVar9) EVT_IF_EQ(LVar9, PARTNER_KOOPER) EVT_RETURN EVT_END_IF diff --git a/src/world/area_kzn/kzn_09/kzn_09_4_npc.c b/src/world/area_kzn/kzn_09/kzn_09_4_npc.c index e1bc81fea1..d7881c92c9 100644 --- a/src/world/area_kzn/kzn_09/kzn_09_4_npc.c +++ b/src/world/area_kzn/kzn_09/kzn_09_4_npc.c @@ -31,7 +31,7 @@ EvtScript N(EVS_Scene_KoloradoFallsDown) = { EVT_RETURN EVT_END_IF EVT_CALL(AwaitPlayerLeave, -455, -60, 85) - EVT_CALL(GetCurrentPartner, LVar0) + EVT_CALL(GetPartnerInUse, LVar0) EVT_IF_NE(LVar0, PARTNER_NONE) EVT_CALL(InterruptUsePartner) EVT_END_IF diff --git a/src/world/area_kzn/kzn_10/kzn_10_2_tromp.c b/src/world/area_kzn/kzn_10/kzn_10_2_tromp.c index d1723a2fbb..d9de0a72d8 100644 --- a/src/world/area_kzn/kzn_10/kzn_10_2_tromp.c +++ b/src/world/area_kzn/kzn_10/kzn_10_2_tromp.c @@ -127,7 +127,7 @@ EvtScript N(EVS_SetupSpinyTromp) = { EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 4, UNK_FUNC_50_LVar1, LVar2, 0) EVT_EXEC(N(D_80241224_C7F3A4)) EVT_THREAD - EVT_CALL(GetCurrentPartner, LVar0) + EVT_CALL(GetPartnerInUse, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(PARTNER_PARAKARRY) EVT_CASE_EQ(PARTNER_BOW) diff --git a/src/world/area_mac/mac_03/mac_03_7_oinks.c b/src/world/area_mac/mac_03/mac_03_7_oinks.c index bfe740e390..bbdbc38dee 100644 --- a/src/world/area_mac/mac_03/mac_03_7_oinks.c +++ b/src/world/area_mac/mac_03/mac_03_7_oinks.c @@ -154,7 +154,7 @@ API_CALLABLE(N(PopLilOinkList)) { } EvtScript N(EVS_TurnCrank) = { - EVT_CALL(GetCurrentPartner, LVar0) + EVT_CALL(GetPartnerInUse, LVar0) EVT_IF_EQ(LVar0, PARTNER_LAKILESTER) EVT_RETURN EVT_END_IF @@ -310,7 +310,7 @@ EvtScript N(EVS_UseMachinePrompt) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_IF_EQ(MF_Unk_08, FALSE) EVT_EXEC(N(EVS_LilOinkExplanation)) - EVT_CALL(GetCurrentPartner, LVar0) + EVT_CALL(GetPartnerInUse, LVar0) EVT_IF_NE(LVar0, PARTNER_NONE) EVT_CALL(InterruptUsePartner) EVT_WAIT(10) diff --git a/src/world/area_mim/mim_07/mim_07_6_npc.c b/src/world/area_mim/mim_07/mim_07_6_npc.c index 1ccf931732..53d9907920 100644 --- a/src/world/area_mim/mim_07/mim_07_6_npc.c +++ b/src/world/area_mim/mim_07/mim_07_6_npc.c @@ -66,7 +66,7 @@ EvtScript N(EVS_NpcIdle_JrTroopa) = { EVT_GOTO(10) EVT_END_IF EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(GetCurrentPartner, LVar0) + EVT_CALL(GetPartnerInUse, LVar0) EVT_IF_NE(LVar0, PARTNER_NONE) EVT_CALL(InterruptUsePartner) EVT_WAIT(20) diff --git a/src/world/area_obk/obk_08/obk_08_3_cabinets.c b/src/world/area_obk/obk_08/obk_08_3_cabinets.c index 936f214fe7..d40816bb49 100644 --- a/src/world/area_obk/obk_08/obk_08_3_cabinets.c +++ b/src/world/area_obk/obk_08/obk_08_3_cabinets.c @@ -21,7 +21,7 @@ API_CALLABLE(N(DamagePlayer1HP)) { return ApiStatus_DONE2; } -EvtScript N(EVS_GetCurrentPartnerAnims) = { +EvtScript N(EVS_GetPartnerInUseAnims) = { EVT_CALL(GetCurrentPartnerID, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(PARTNER_GOOMBARIO) @@ -58,10 +58,10 @@ EvtScript N(EVS_CrushPlayer) = { EVT_CALL(DisablePartnerAI, 0) EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_100, TRUE) EVT_CALL(GetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) - EVT_EXEC_WAIT(N(EVS_GetCurrentPartnerAnims)) + EVT_EXEC_WAIT(N(EVS_GetPartnerInUseAnims)) EVT_CALL(SetNpcAnimation, NPC_PARTNER, LVarA) EVT_CALL(NpcMoveTo, NPC_PARTNER, -93, LVar2, 15) - EVT_EXEC_WAIT(N(EVS_GetCurrentPartnerAnims)) + EVT_EXEC_WAIT(N(EVS_GetPartnerInUseAnims)) EVT_CALL(SetNpcAnimation, NPC_PARTNER, LVarB) EVT_WAIT(15) EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_100, FALSE) diff --git a/src/world/area_tik/tik_09/tik_09_4_entity.c b/src/world/area_tik/tik_09/tik_09_4_entity.c index 4d7915ae16..1c9c3da3cb 100644 --- a/src/world/area_tik/tik_09/tik_09_4_entity.c +++ b/src/world/area_tik/tik_09/tik_09_4_entity.c @@ -6,7 +6,7 @@ EvtScript N(EVS_SpawnSwitch) = { EVT_CALL(AwaitPlayerLeave, -10, 10, 50) EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(GetCurrentPartner, LVar0) + EVT_CALL(GetPartnerInUse, LVar0) EVT_IF_NE(LVar0, 8) EVT_LOOP(0) EVT_CALL(GetPlayerActionState, LVar0) diff --git a/src/world/area_trd/trd_05/trd_05_3_trap.c b/src/world/area_trd/trd_05/trd_05_3_trap.c index 80f16db504..4f38023223 100644 --- a/src/world/area_trd/trd_05/trd_05_3_trap.c +++ b/src/world/area_trd/trd_05/trd_05_3_trap.c @@ -269,7 +269,7 @@ EvtScript N(EVS_OnHitTrapTrigger) = { EVT_GOTO(10) EVT_END_IF EVT_LOOP(0) - EVT_CALL(GetCurrentPartner, LVar0) + EVT_CALL(GetPartnerInUse, LVar0) EVT_IF_EQ(LVar0, 0) EVT_BREAK_LOOP EVT_END_IF diff --git a/src/world/common/atomic/Chest.inc.c b/src/world/common/atomic/Chest.inc.c index a12f0e3cb3..3a553cecfa 100644 --- a/src/world/common/atomic/Chest.inc.c +++ b/src/world/common/atomic/Chest.inc.c @@ -11,7 +11,7 @@ EvtScript N(EVS_Chest_ShowGotItem) = { EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_FULL) EVT_WAIT(40) - EVT_CALL(ShowGotItem, LVar0, 0, 0) + EVT_CALL(ShowGotItem, LVar0, FALSE, 0) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) EVT_RETURN EVT_RETURN diff --git a/src/world/common/atomic/kzn_SpinyTromp.inc.c b/src/world/common/atomic/kzn_SpinyTromp.inc.c index f3a540087f..58672cb57a 100644 --- a/src/world/common/atomic/kzn_SpinyTromp.inc.c +++ b/src/world/common/atomic/kzn_SpinyTromp.inc.c @@ -30,13 +30,13 @@ ApiStatus N(SpinyTromp_GetActingPartner)(Evt* script, s32 isInitialCall) { EvtScript N(D_80240D10_C7EE90) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_LABEL(10) - EVT_CALL(GetCurrentPartner, LVar0) + EVT_CALL(GetPartnerInUse, LVar0) EVT_IF_NE(LVar0, 0) EVT_CALL(InterruptUsePartner) EVT_END_IF EVT_LABEL(0) EVT_WAIT(1) - EVT_CALL(GetCurrentPartner, LVar0) + EVT_CALL(GetPartnerInUse, LVar0) EVT_IF_NE(LVar0, 0) EVT_CALL(GetCurrentPartnerID, LVar0) EVT_IF_EQ(LVar0, PARTNER_BOW) diff --git a/src/world/common/enemy/complete/ShyGuy.h b/src/world/common/enemy/complete/ShyGuy.h index 2dae8a0281..aa0f98bbad 100644 --- a/src/world/common/enemy/complete/ShyGuy.h +++ b/src/world/common/enemy/complete/ShyGuy.h @@ -27,3 +27,43 @@ .anim_E = ANIM_ShyGuy_Red_Anim01, \ .anim_F = ANIM_ShyGuy_Red_Anim01, \ } + +#define BLUE_SHY_GUY_ANIMS \ +{ \ + .idle = ANIM_ShyGuy_Blue_Anim01, \ + .walk = ANIM_ShyGuy_Blue_Anim02, \ + .run = ANIM_ShyGuy_Blue_Anim03, \ + .chase = ANIM_ShyGuy_Blue_Anim03, \ + .anim_4 = ANIM_ShyGuy_Blue_Anim01, \ + .anim_5 = ANIM_ShyGuy_Blue_Anim01, \ + .death = ANIM_ShyGuy_Blue_Anim0C, \ + .hit = ANIM_ShyGuy_Blue_Anim0C, \ + .anim_8 = ANIM_ShyGuy_Blue_Anim15, \ + .anim_9 = ANIM_ShyGuy_Blue_Anim12, \ + .anim_A = ANIM_ShyGuy_Blue_Anim11, \ + .anim_B = ANIM_ShyGuy_Blue_Anim10, \ + .anim_C = ANIM_ShyGuy_Blue_Anim05, \ + .anim_D = ANIM_ShyGuy_Blue_Anim01, \ + .anim_E = ANIM_ShyGuy_Blue_Anim01, \ + .anim_F = ANIM_ShyGuy_Blue_Anim01, \ +} + +#define GREEN_SHY_GUY_ANIMS \ +{ \ + .idle = ANIM_ShyGuy_Green_Anim01, \ + .walk = ANIM_ShyGuy_Green_Anim02, \ + .run = ANIM_ShyGuy_Green_Anim03, \ + .chase = ANIM_ShyGuy_Green_Anim03, \ + .anim_4 = ANIM_ShyGuy_Green_Anim01, \ + .anim_5 = ANIM_ShyGuy_Green_Anim01, \ + .death = ANIM_ShyGuy_Green_Anim0C, \ + .hit = ANIM_ShyGuy_Green_Anim0C, \ + .anim_8 = ANIM_ShyGuy_Green_Anim15, \ + .anim_9 = ANIM_ShyGuy_Green_Anim12, \ + .anim_A = ANIM_ShyGuy_Green_Anim11, \ + .anim_B = ANIM_ShyGuy_Green_Anim10, \ + .anim_C = ANIM_ShyGuy_Green_Anim05, \ + .anim_D = ANIM_ShyGuy_Green_Anim01, \ + .anim_E = ANIM_ShyGuy_Green_Anim01, \ + .anim_F = ANIM_ShyGuy_Green_Anim01, \ +} diff --git a/src/world/common/entity/Pipe.data.inc.c b/src/world/common/entity/Pipe.data.inc.c index c78b9058db..b79e8d0a5f 100644 --- a/src/world/common/entity/Pipe.data.inc.c +++ b/src/world/common/entity/Pipe.data.inc.c @@ -126,7 +126,7 @@ EvtScript N(EVS_Pipe_ExitVertical) = { EVT_IF_EQ(LVar0, 0) EVT_RETURN EVT_END_IF - EVT_CALL(GetCurrentPartner, LVar0) + EVT_CALL(GetPartnerInUse, LVar0) EVT_IF_NE(LVar0, PARTNER_NONE) EVT_CALL(GetCurrentPartnerID, LVar1) EVT_IF_NE(LVar1, PARTNER_WATT) @@ -186,7 +186,7 @@ EvtScript N(EVS_Pipe_ExitHorizontal) = { EVT_IF_EQ(LVar0, ACTION_STATE_SPIN) EVT_RETURN EVT_END_IF - EVT_CALL(GetCurrentPartner, LVar0) + EVT_CALL(GetPartnerInUse, LVar0) EVT_IF_NE(LVar0, PARTNER_NONE) EVT_CALL(GetCurrentPartnerID, LVar1) EVT_IF_NE(LVar1, PARTNER_WATT) diff --git a/src/world/common/entity/PipeData.inc.c b/src/world/common/entity/PipeData.inc.c index a67fe9b0a1..9be3166e5b 100644 --- a/src/world/common/entity/PipeData.inc.c +++ b/src/world/common/entity/PipeData.inc.c @@ -125,7 +125,7 @@ EvtScript N(Pipe_ExitVertical) = { EVT_IF_EQ(LVar0, 0) EVT_RETURN EVT_END_IF - EVT_CALL(GetCurrentPartner, LVar0) + EVT_CALL(GetPartnerInUse, LVar0) EVT_IF_NE(LVar0, 0) EVT_CALL(GetCurrentPartnerID, LVar1) EVT_IF_NE(LVar1, PARTNER_WATT) @@ -185,7 +185,7 @@ EvtScript N(Pipe_ExitHorizontal) = { EVT_IF_EQ(LVar0, ACTION_STATE_SPIN) EVT_RETURN EVT_END_IF - EVT_CALL(GetCurrentPartner, LVar0) + EVT_CALL(GetPartnerInUse, LVar0) EVT_IF_NE(LVar0, 0) EVT_CALL(GetCurrentPartnerID, LVar1) EVT_IF_NE(LVar1, PARTNER_WATT) diff --git a/src/world/dead/area_flo/flo_00/flo_00_5_beanstalk.c b/src/world/dead/area_flo/flo_00/flo_00_5_beanstalk.c index 852c37912e..2ad20e9b0b 100644 --- a/src/world/dead/area_flo/flo_00/flo_00_5_beanstalk.c +++ b/src/world/dead/area_flo/flo_00/flo_00_5_beanstalk.c @@ -598,7 +598,7 @@ EvtScript N(EVS_BeanPatch_TryInteract) = { EVT_WAIT(1) EVT_GOTO(0) EVT_END_IF - EVT_CALL(GetCurrentPartner, LVar0) + EVT_CALL(GetPartnerInUse, LVar0) EVT_IF_NE(LVar0, PARTNER_NONE) EVT_RETURN EVT_END_IF diff --git a/src/world/dead/area_flo/flo_03/flo_03_3_npc.c b/src/world/dead/area_flo/flo_03/flo_03_3_npc.c index d529fdc6f4..bcdf477437 100644 --- a/src/world/dead/area_flo/flo_03/flo_03_3_npc.c +++ b/src/world/dead/area_flo/flo_03/flo_03_3_npc.c @@ -385,7 +385,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_01) = { EVT_CALL(GetNpcPos, NPC_MontyMole_01, LVar0, LVar1, LVar2) EVT_CALL(IsPlayerWithin, LVar0, LVar2, MV_NextBurrowTriggerRadius, LV_ShouldBurrow) EVT_END_IF - EVT_CALL(GetCurrentPartner, LVar9) + EVT_CALL(GetPartnerInUse, LVar9) EVT_IF_EQ(LVar9, PARTNER_BOW) EVT_SET(LVar3, FALSE) EVT_END_IF @@ -464,7 +464,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_02) = { EVT_CALL(GetNpcPos, NPC_MontyMole_02, LVar0, LVar1, LVar2) EVT_CALL(IsPlayerWithin, LVar0, LVar2, MV_NextBurrowTriggerRadius, LV_ShouldBurrow) EVT_END_IF - EVT_CALL(GetCurrentPartner, LVar9) + EVT_CALL(GetPartnerInUse, LVar9) EVT_IF_EQ(LVar9, PARTNER_BOW) EVT_SET(LV_ShouldBurrow, FALSE) EVT_END_IF @@ -543,7 +543,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_03) = { EVT_CALL(GetNpcPos, NPC_MontyMole_03, LVar0, LVar1, LVar2) EVT_CALL(IsPlayerWithin, LVar0, LVar2, MV_NextBurrowTriggerRadius, LV_ShouldBurrow) EVT_END_IF - EVT_CALL(GetCurrentPartner, LVar9) + EVT_CALL(GetPartnerInUse, LVar9) EVT_IF_EQ(LVar9, PARTNER_BOW) EVT_SET(LV_ShouldBurrow, FALSE) EVT_END_IF @@ -622,7 +622,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_04) = { EVT_CALL(GetNpcPos, NPC_MontyMole_04, LVar0, LVar1, LVar2) EVT_CALL(IsPlayerWithin, LVar0, LVar2, MV_NextBurrowTriggerRadius, LV_ShouldBurrow) EVT_END_IF - EVT_CALL(GetCurrentPartner, LVar9) + EVT_CALL(GetPartnerInUse, LVar9) EVT_IF_EQ(LVar9, PARTNER_BOW) EVT_SET(LV_ShouldBurrow, FALSE) EVT_END_IF diff --git a/src/world/dead/area_flo/flo_10/flo_10_5_npc.c b/src/world/dead/area_flo/flo_10/flo_10_5_npc.c index 2452473ee1..5f07173197 100644 --- a/src/world/dead/area_flo/flo_10/flo_10_5_npc.c +++ b/src/world/dead/area_flo/flo_10/flo_10_5_npc.c @@ -29,7 +29,7 @@ s32 N(KeyList)[] = { EvtScript N(EVS_OnInteract_WaterStoneSocket) = { EVT_IF_EQ(GF_FLO10_ShowedLilyTheWaterStone, TRUE) - EVT_CALL(GetCurrentPartner, LVarA) + EVT_CALL(GetPartnerInUse, LVarA) EVT_IF_NE(LVarA, 0) EVT_CALL(AwaitPlayerLeave, 0, 0, 19) EVT_RETURN diff --git a/src/world/dead/area_flo/flo_14/flo_14_3_bubbles.c b/src/world/dead/area_flo/flo_14/flo_14_3_bubbles.c index 8d0a9b4833..2e1f40039a 100644 --- a/src/world/dead/area_flo/flo_14/flo_14_3_bubbles.c +++ b/src/world/dead/area_flo/flo_14/flo_14_3_bubbles.c @@ -109,7 +109,7 @@ EvtScript N(EVS_RideBigBubble) = { EVT_RETURN EVT_END_IF EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(GetCurrentPartner, LVar0) + EVT_CALL(GetPartnerInUse, LVar0) EVT_IF_NE(LVar0, PARTNER_NONE) EVT_CALL(InterruptUsePartner) EVT_WAIT(20) diff --git a/src/world/script_api/7E0E80.c b/src/world/script_api/7E0E80.c index f0b400c284..1f59abce05 100644 --- a/src/world/script_api/7E0E80.c +++ b/src/world/script_api/7E0E80.c @@ -39,7 +39,7 @@ EvtScript ShopEndSpeech = { }; EvtScript D_80283F58_7E4DD8 = { - EVT_CALL(GetCurrentPartner, LVar1) + EVT_CALL(GetPartnerInUse, LVar1) EVT_IF_EQ(LVar1, 0) EVT_GOTO(10) EVT_END_IF diff --git a/src/world/world.c b/src/world/world.c index 71ee3ec692..5a9bf50dde 100644 --- a/src/world/world.c +++ b/src/world/world.c @@ -498,26 +498,26 @@ MapConfig kpa_maps[] = { { MAP(kpa_11), .songVariation = 1, .sfxReverb = 3 }, { MAP(kpa_12), .songVariation = 1, .sfxReverb = 3 }, { MAP(kpa_13), .songVariation = 1, .sfxReverb = 3 }, - { MAP_UNSPLIT(kpa_14, 0x802408A0), .songVariation = 1, .sfxReverb = 3 }, - { MAP_UNSPLIT(kpa_15, 0x802405E0), .songVariation = 1, .sfxReverb = 3 }, - { MAP_UNSPLIT(kpa_16, 0x802403B0), .songVariation = 1, .sfxReverb = 3 }, - { MAP_UNSPLIT(kpa_17, 0x80240020), .songVariation = 1, .sfxReverb = 2 }, - { MAP_UNSPLIT(kpa_32, 0x80240350), .bgName = "kpa_bg", .songVariation = 1, .sfxReverb = 3 }, - { MAP_UNSPLIT(kpa_33, 0x80240350), .bgName = "kpa_bg", .songVariation = 1, .sfxReverb = 3 }, - { MAP_UNSPLIT(kpa_40, 0x80240040), .songVariation = 1, .sfxReverb = 2 }, - { MAP_UNSPLIT(kpa_41, 0x80240040), .songVariation = 1, .sfxReverb = 2 }, - { MAP_UNSPLIT(kpa_50, 0x80241A40), .songVariation = 1, .sfxReverb = 2 }, - { MAP_UNSPLIT(kpa_51, 0x80241C40), .songVariation = 1, .sfxReverb = 2, .init = (MapInit)0x80240000 }, - { MAP_UNSPLIT(kpa_52, 0x80241360), .songVariation = 1, .sfxReverb = 2 }, - { MAP_UNSPLIT(kpa_53, 0x80240190), .songVariation = 1, .sfxReverb = 2, .init = (MapInit)0x80240000 }, - { MAP_UNSPLIT(kpa_60, 0x80240450), .bgName = "kpa_bg" }, - { MAP_UNSPLIT(kpa_61, 0x80242360), .bgName = "kpa_bg" }, - { MAP_UNSPLIT(kpa_62, 0x80240430), .bgName = "kpa_bg" }, - { MAP_UNSPLIT(kpa_63, 0x802401B0), .songVariation = 1, .sfxReverb = 2 }, - { MAP_UNSPLIT(kpa_70, 0x80240B10), .songVariation = 1, .sfxReverb = 3 }, - { MAP_UNSPLIT(kpa_81, 0x80240480), .songVariation = 1, .sfxReverb = 2, .init = (MapInit)0x80240000 }, - { MAP_UNSPLIT(kpa_82, 0x80240460), .songVariation = 1, .sfxReverb = 2, .init = (MapInit)0x80240000 }, - { MAP_UNSPLIT(kpa_83, 0x80240090), .songVariation = 1, .sfxReverb = 2, .init = (MapInit)0x80240000 }, + { MAP(kpa_14), .songVariation = 1, .sfxReverb = 3 }, + { MAP(kpa_15), .songVariation = 1, .sfxReverb = 3 }, + { MAP(kpa_16), .songVariation = 1, .sfxReverb = 3 }, + { MAP(kpa_17), .songVariation = 1, .sfxReverb = 2 }, + { MAP(kpa_32), .bgName = "kpa_bg", .songVariation = 1, .sfxReverb = 3 }, + { MAP(kpa_33), .bgName = "kpa_bg", .songVariation = 1, .sfxReverb = 3 }, + { MAP(kpa_40), .songVariation = 1, .sfxReverb = 2 }, + { MAP(kpa_41), .songVariation = 1, .sfxReverb = 2 }, + { MAP(kpa_50), .songVariation = 1, .sfxReverb = 2 }, + { MAP_WITH_INIT(kpa_51), .songVariation = 1, .sfxReverb = 2 }, + { MAP(kpa_52), .songVariation = 1, .sfxReverb = 2 }, + { MAP_WITH_INIT(kpa_53), .songVariation = 1, .sfxReverb = 2 }, + { MAP(kpa_60), .bgName = "kpa_bg" }, + { MAP(kpa_61), .bgName = "kpa_bg" }, + { MAP(kpa_62), .bgName = "kpa_bg" }, + { MAP(kpa_63), .songVariation = 1, .sfxReverb = 2 }, + { MAP(kpa_70), .songVariation = 1, .sfxReverb = 3 }, + { MAP_WITH_INIT(kpa_81), .songVariation = 1, .sfxReverb = 2 }, + { MAP_WITH_INIT(kpa_82), .songVariation = 1, .sfxReverb = 2 }, + { MAP_WITH_INIT(kpa_83), .songVariation = 1, .sfxReverb = 2 }, { MAP(kpa_90), .songVariation = 1, .sfxReverb = 2 }, { MAP(kpa_91), .songVariation = 1, .sfxReverb = 2 }, { MAP(kpa_94), .songVariation = 1, .sfxReverb = 2 }, diff --git a/src/world_use_item.c b/src/world_use_item.c index afb1a7eaad..6ddc34c227 100644 --- a/src/world_use_item.c +++ b/src/world_use_item.c @@ -149,7 +149,7 @@ EvtScript EVS_WorldItem_PlayDrinkingSounds = { EvtScript EVS_World_UseItem = { EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(GetCurrentPartner, LVar0) + EVT_CALL(GetPartnerInUse, LVar0) EVT_IF_NE(LVar0, 0) EVT_CALL(InterruptUsePartner) EVT_WAIT(20) diff --git a/tools/ignored_funcs.txt b/tools/ignored_funcs.txt index 50f52a9402..420a947f86 100644 --- a/tools/ignored_funcs.txt +++ b/tools/ignored_funcs.txt @@ -149,7 +149,7 @@ dead_MakeItemEntity = 0x802E4310; dead_RemoveItemEntity = 0x802E461C; dead_IsPlayerWithin = 0x802E1FB4; dead_IsPlayerOnValidFloor = 0x802DFABC; -dead_GetCurrentPartner = 0x802E0158; +dead_GetPartnerInUse = 0x802E0158; dead_MakeEntity = 0x8011A58C; dead_CreatePushBlockGrid = 0x80283420; dead_SetPushBlock = 0x8028364C; diff --git a/tools/splat_ext/msg.yaml b/tools/splat_ext/msg.yaml index 437a04f95d..a9e7d7f8ea 100644 --- a/tools/splat_ext/msg.yaml +++ b/tools/splat_ext/msg.yaml @@ -4748,7 +4748,7 @@ - [0x19, 0x0154, MapTattle_pra_39] - [0x19, 0x0155, MapTattle_pra_40] - [0x19, 0x0156, MapTattle_kpa_63] -- [0x19, 0x0157, MapTattle_kpa_60] +- [0x19, 0x0157, MapTattle_kpa_62] - [0x19, 0x0158, MapTattle_kpa_10] - [0x19, 0x0159, MapTattle_kpa_70] - [0x19, 0x015A, MapTattle_kpa_50] diff --git a/ver/us/asm/data/world/area_hos/hos_01/A11760.data.s b/ver/us/asm/data/world/area_hos/hos_01/A11760.data.s index 4713d288fb..cc0a699732 100644 --- a/ver/us/asm/data/world/area_hos/hos_01/A11760.data.s +++ b/ver/us/asm/data/world/area_hos/hos_01/A11760.data.s @@ -15,7 +15,7 @@ dlabel D_802413BC_A11C3C .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80245990, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241418_A11C98 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000005A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000008, 0x00000001, 0x00000014, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000046, 0x00000001, 0x80245580, 0x00000043, 0x00000003, GotoMap, 0x80245998, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x0000001B, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000005A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000008, 0x00000001, 0x00000014, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000046, 0x00000001, 0x80245580, 0x00000043, 0x00000003, GotoMap, 0x80245998, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241540_A11DC0 .word 0x00000047, 0x00000005, D_802413BC_A11C3C, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000047, 0x00000005, D_80241418_A11C98, 0x00000080, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_hos/hos_02/A18E50.data.s b/ver/us/asm/data/world/area_hos/hos_02/A18E50.data.s index 9ecd0e842e..dccfe92f75 100644 --- a/ver/us/asm/data/world/area_hos/hos_02/A18E50.data.s +++ b/ver/us/asm/data/world/area_hos/hos_02/A18E50.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80242C30_A18E50 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000008, 0x00000001, 0x00000014, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000046, 0x00000001, 0x80244B80, 0x00000043, 0x00000003, GotoMap, 0x80244DD0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000008, 0x00000001, 0x00000014, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000046, 0x00000001, 0x80244B80, 0x00000043, 0x00000003, GotoMap, 0x80244DD0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242D38_A18F58 .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80244DD8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_hos/hos_04/A27F20.data.s b/ver/us/asm/data/world/area_hos/hos_04/A27F20.data.s index 273cad3391..356097d38b 100644 --- a/ver/us/asm/data/world/area_hos/hos_04/A27F20.data.s +++ b/ver/us/asm/data/world/area_hos/hos_04/A27F20.data.s @@ -12,4 +12,4 @@ dlabel D_80241108_A27FD8 .word 0x00000047, 0x00000005, D_80241050_A27F20, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802410AC_A27F7C, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241150_A28020 -.word 0x00000024, 0x00000002, 0xF9718935, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000001, 0x7FFFFE00, 0x0000000A, 0x00000002, 0xF8405D94, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFD8A, 0x00000000, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFD6C, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFDCB, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFDCB, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000546, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A1680, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF24A3E80, 0xF248EA80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF24BD880, 0xF24B4280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A8A80, 0xF24A5C80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7B1A, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C80, D_80241108_A27FD8, 0x00000046, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000014, 0x00000024, 0x00000002, 0xF8405D94, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF9718935, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000057, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80241108_A27FD8, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80241108_A27FD8, 0x00000044, 0x00000001, EnterWalk, 0x00000016, 0x00000001, 0x00000002, 0x00000044, 0x00000001, 0x802421E0, 0x00000016, 0x00000001, 0x00000003, 0x00000046, 0x00000001, 0x80241E48, 0x00000016, 0x00000001, 0x00000004, 0x00000046, 0x00000001, 0x80241B8C, 0x00000016, 0x00000001, 0x00000005, 0x00000043, 0x00000003, EnableGroup, 0x000000A6, 0x00000000, 0x00000044, 0x00000001, 0x802425C0, 0x00000016, 0x00000001, 0x00000006, 0x00000043, 0x00000003, EnableGroup, 0x000000A6, 0x00000000, 0x00000044, 0x00000001, 0x80242A64, 0x00000016, 0x00000001, 0x00000007, 0x00000043, 0x00000003, EnableGroup, 0x000000A6, 0x00000000, 0x00000044, 0x00000001, 0x80242E14, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000001D, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x802421C4, 0x00000057, 0x00000000, 0x00000044, 0x00000001, 0x80241790, 0x00000046, 0x00000001, 0x80240F58, 0x00000044, 0x00000001, D_80241150_A28020, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x80243294, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xF9718935, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000001, 0x7FFFFE00, 0x0000000A, 0x00000002, 0xF8405D94, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFD8A, 0x00000000, 0x00000000, 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFD6C, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFDCB, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFDCB, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000546, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A1680, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF24A3E80, 0xF248EA80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF24BD880, 0xF24B4280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A8A80, 0xF24A5C80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7B1A, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C80, D_80241108_A27FD8, 0x00000046, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000014, 0x00000024, 0x00000002, 0xF8405D94, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF9718935, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000057, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80241108_A27FD8, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80241108_A27FD8, 0x00000044, 0x00000001, EnterWalk, 0x00000016, 0x00000001, 0x00000002, 0x00000044, 0x00000001, 0x802421E0, 0x00000016, 0x00000001, 0x00000003, 0x00000046, 0x00000001, 0x80241E48, 0x00000016, 0x00000001, 0x00000004, 0x00000046, 0x00000001, 0x80241B8C, 0x00000016, 0x00000001, 0x00000005, 0x00000043, 0x00000003, EnableGroup, 0x000000A6, 0x00000000, 0x00000044, 0x00000001, 0x802425C0, 0x00000016, 0x00000001, 0x00000006, 0x00000043, 0x00000003, EnableGroup, 0x000000A6, 0x00000000, 0x00000044, 0x00000001, 0x80242A64, 0x00000016, 0x00000001, 0x00000007, 0x00000043, 0x00000003, EnableGroup, 0x000000A6, 0x00000000, 0x00000044, 0x00000001, 0x80242E14, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000001D, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x802421C4, 0x00000057, 0x00000000, 0x00000044, 0x00000001, 0x80241790, 0x00000046, 0x00000001, 0x80240F58, 0x00000044, 0x00000001, D_80241150_A28020, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x80243294, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_hos/hos_05/A30810.data.s b/ver/us/asm/data/world/area_hos/hos_05/A30810.data.s index 5fd6636b91..ba1a90f800 100644 --- a/ver/us/asm/data/world/area_hos/hos_05/A30810.data.s +++ b/ver/us/asm/data/world/area_hos/hos_05/A30810.data.s @@ -21,7 +21,7 @@ dlabel D_802466E8_A30928 .word 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000000F, 0x00000014, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C85, 0xFE363C80, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFE363C82, 0xFE363C85, 0xFE363C84, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C82, 0xFE363C85, 0xFE363C84, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0xFE363C82, 0xFE363C85, 0xFE363C84, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0xFE363C82, 0xFE363C85, 0xFE363C84, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0xFE363C82, 0xFE363C85, 0xFE363C84, 0x00000043, 0x00000005, GetNpcPos, 0x00000005, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000043, 0x00000005, SetNpcPos, 0x00000005, 0xFE363C82, 0xFE363C85, 0xFE363C84, 0x00000043, 0x00000005, GetNpcPos, 0x00000006, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000043, 0x00000005, SetNpcPos, 0x00000006, 0xFE363C82, 0xFE363C85, 0xFE363C84, 0x00000003, 0x00000001, 0x0000000A, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, GetNpcVar, 0x00000000, 0x00000000, 0xFE363C86, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x0000000F, 0x00000000, 0x00000014, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C85, 0xFE363C80, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFE363C82, 0xFE363C85, 0xFE363C84, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C82, 0xFE363C85, 0xFE363C84, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0xFE363C82, 0xFE363C85, 0xFE363C84, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0xFE363C82, 0xFE363C85, 0xFE363C84, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0xFE363C82, 0xFE363C85, 0xFE363C84, 0x00000043, 0x00000005, GetNpcPos, 0x00000005, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000043, 0x00000005, SetNpcPos, 0x00000005, 0xFE363C82, 0xFE363C85, 0xFE363C84, 0x00000043, 0x00000005, GetNpcPos, 0x00000006, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000043, 0x00000005, SetNpcPos, 0x00000006, 0xFE363C82, 0xFE363C85, 0xFE363C84, 0x00000003, 0x00000001, 0x0000000B, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, GetNpcVar, 0x00000000, 0x00000000, 0xFE363C86, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000000, 0x00000004, 0x00000001, 0x0000000B, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80246BF0_A30E30 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C82, 0x00000055, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000008, 0x00000001, 0x0000000F, 0x00000013, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_802D2C14, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000000, 0x00000050, 0x0000000A, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x00000088, 0x00000050, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x00000088, 0x00000050, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2527280, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000000, 0xFFFFFFCE, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AA280, 0xF24A7080, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8080, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x000000DC, 0xFFFFFEED, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A6880, 0xF24A6E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00120002, 0x00120001, 0x00000200, 0x000A0069, 0x00000043, 0x00000002, func_802D2C14, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x00000088, 0x00000050, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF253DA80, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000000, 0xFFFFFFCE, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AA280, 0xF24A7080, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000168, 0x00000019, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000000, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0x00000002, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0x00000003, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0x00000004, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0x00000005, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0x00000006, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000056, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00400000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00120003, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A874D, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00120001, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, PlaySoundAt, 0xB000001F, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00400000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00130003, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A874D, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00130001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00400000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00140003, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000002, 0xF24A874D, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00140001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00400000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00150003, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000003, 0xF24A874D, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00150001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000004, 0x00400000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00160003, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000004, 0xF24A874D, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00160001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000005, 0x00400000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00170004, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000005, 0xF24A874D, 0x00000043, 0x00000005, GetNpcPos, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00170001, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000006, 0x00400000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00180003, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000006, 0xF24A874D, 0x00000043, 0x00000005, GetNpcPos, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00180001, 0x00000056, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000033, 0x00000002, 0x00000000, 0x0000009A, 0x00000055, 0xF24A85B4, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000008, 0x00000001, 0x00000073, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000188, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x0000000F, PlayEffect, 0x00000052, 0x00000004, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xF24A7BB4, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000006, PlaySoundAt, 0xB000001F, 0x00000000, 0x0000000A, 0x0000009A, 0x00000058, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0x0000000A, 0x0000009A, 0x00000058, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000006, PlaySoundAt, 0xB000001F, 0x00000000, 0x0000000A, 0x0000009A, 0x00000058, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0x0000000A, 0x0000009A, 0x00000058, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000006, PlaySoundAt, 0xB000001F, 0x00000000, 0xFFFFFFF6, 0x0000009A, 0x00000058, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0xFFFFFFF6, 0x0000009A, 0x00000058, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000006, PlaySoundAt, 0xB000001F, 0x00000000, 0x0000000A, 0x0000009A, 0x00000058, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0x0000000A, 0x0000009A, 0x00000058, 0x00000019, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001001F, 0x00000005, 0x00000001, 0x00000003, 0x00000043, 0x00000006, PlaySoundAt, 0xB000001F, 0x00000000, 0x00000000, 0x0000009A, 0x00000058, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0x00000000, 0x0000009A, 0x00000058, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000006, PlaySoundAt, 0xB000001F, 0x00000000, 0xFFFFFFF6, 0x0000009A, 0x00000058, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0xFFFFFFF6, 0x0000009A, 0x00000058, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000006, PlaySoundAt, 0xB000001F, 0x00000000, 0x0000000A, 0x0000009A, 0x00000058, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0x0000000A, 0x0000009A, 0x00000058, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80240830_A2AA70, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0198, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x000000DC, 0xFFFFFEED, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A6880, 0xF24A6E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00120002, 0x00120001, 0x00000200, 0x000A006A, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x00000088, 0x00000050, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2527280, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000000, 0xFFFFFFCE, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A9A80, 0xF24A5AE7, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000001E, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000005C, 0x00000046, 0x00000001, 0x8024E148, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x000000DC, 0xFFFFFEED, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A6880, 0xF24A6E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00120002, 0x00120001, 0x00000200, 0x000A006B, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00130007, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00150005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00170007, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000009, 0x7FFFFE00, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000004, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8480, 0x00000043, 0x00000003, EnableModel, 0x00000071, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000079, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C82, 0x00000055, 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000008, 0x00000001, 0x0000000F, 0x00000013, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_802D2C14, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000000, 0x00000050, 0x0000000A, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x00000088, 0x00000050, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x00000088, 0x00000050, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2527280, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000000, 0xFFFFFFCE, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AA280, 0xF24A7080, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8080, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x000000DC, 0xFFFFFEED, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A6880, 0xF24A6E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00120002, 0x00120001, 0x00000200, 0x000A0069, 0x00000043, 0x00000002, func_802D2C14, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x00000088, 0x00000050, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF253DA80, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000000, 0xFFFFFFCE, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AA280, 0xF24A7080, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000168, 0x00000019, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000000, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0x00000002, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0x00000003, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0x00000004, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0x00000005, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0x00000006, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000056, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00400000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00120003, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A874D, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00120001, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, PlaySoundAt, 0xB000001F, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00400000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00130003, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A874D, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00130001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00400000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00140003, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000002, 0xF24A874D, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00140001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00400000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00150003, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000003, 0xF24A874D, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00150001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000004, 0x00400000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00160003, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000004, 0xF24A874D, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00160001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000005, 0x00400000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00170004, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000005, 0xF24A874D, 0x00000043, 0x00000005, GetNpcPos, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00170001, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000006, 0x00400000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00180003, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000006, 0xF24A874D, 0x00000043, 0x00000005, GetNpcPos, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00180001, 0x00000056, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000033, 0x00000002, 0x00000000, 0x0000009A, 0x00000055, 0xF24A85B4, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000008, 0x00000001, 0x00000073, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000188, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x0000000F, PlayEffect, 0x00000052, 0x00000004, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xF24A7BB4, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000006, PlaySoundAt, 0xB000001F, 0x00000000, 0x0000000A, 0x0000009A, 0x00000058, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0x0000000A, 0x0000009A, 0x00000058, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000006, PlaySoundAt, 0xB000001F, 0x00000000, 0x0000000A, 0x0000009A, 0x00000058, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0x0000000A, 0x0000009A, 0x00000058, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000006, PlaySoundAt, 0xB000001F, 0x00000000, 0xFFFFFFF6, 0x0000009A, 0x00000058, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0xFFFFFFF6, 0x0000009A, 0x00000058, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000006, PlaySoundAt, 0xB000001F, 0x00000000, 0x0000000A, 0x0000009A, 0x00000058, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0x0000000A, 0x0000009A, 0x00000058, 0x00000019, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001001F, 0x00000005, 0x00000001, 0x00000003, 0x00000043, 0x00000006, PlaySoundAt, 0xB000001F, 0x00000000, 0x00000000, 0x0000009A, 0x00000058, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0x00000000, 0x0000009A, 0x00000058, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000006, PlaySoundAt, 0xB000001F, 0x00000000, 0xFFFFFFF6, 0x0000009A, 0x00000058, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0xFFFFFFF6, 0x0000009A, 0x00000058, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000006, PlaySoundAt, 0xB000001F, 0x00000000, 0x0000000A, 0x0000009A, 0x00000058, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0x0000000A, 0x0000009A, 0x00000058, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80240830_A2AA70, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0198, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x000000DC, 0xFFFFFEED, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A6880, 0xF24A6E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00120002, 0x00120001, 0x00000200, 0x000A006A, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x00000088, 0x00000050, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2527280, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000000, 0xFFFFFFCE, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A9A80, 0xF24A5AE7, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000001E, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000005C, 0x00000046, 0x00000001, 0x8024E148, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x000000DC, 0xFFFFFEED, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A6880, 0xF24A6E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00120002, 0x00120001, 0x00000200, 0x000A006B, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00130007, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00150005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00170007, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000009, 0x7FFFFE00, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000004, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8480, 0x00000043, 0x00000003, EnableModel, 0x00000071, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000079, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80247D54_A31F94 .word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000021, 0x00000002, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00130007, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00150005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00170007, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000016, 0x00000001, 0x0000005B, 0x00000044, 0x00000001, D_802466E8_A30928, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80246BF0_A30E30, 0x00000013, 0x00000000, 0x0000001B, 0x00000001, 0x0000005C, 0x00000044, 0x00000001, D_802466E8_A30928, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_hos/hos_05/A37E70.data.s b/ver/us/asm/data/world/area_hos/hos_05/A37E70.data.s index 97e9f59142..cb3179053e 100644 --- a/ver/us/asm/data/world/area_hos/hos_05/A37E70.data.s +++ b/ver/us/asm/data/world/area_hos/hos_05/A37E70.data.s @@ -21,4 +21,4 @@ dlabel D_8024DFF0_A38230 .word 0x00000008, 0x0000000B, 0x0000000C, 0x00000018, 0x00000072, 0x0000008B, 0x0000FFFF, 0x00000043, 0x00000003, EnableGroup, 0x0000006F, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000008A, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000005C, 0x00000043, 0x00000003, EnableModel, 0x00000093, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, SetModelCustomGfx, 0x00000093, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000004, SetCustomGfxBuilders, 0x00000000, func_8024564C_A2F88C, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000093, 0x00000001, 0x00000043, 0x00000002, func_8024569C_A2F8DC, 0x0000007F, 0x00000043, 0x00000003, EnableGroup, 0x00000090, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000071, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000079, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000009, 0x7FFFFE00, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000004, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8480, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000004, dup_hos_05_UnkFunc27, 0x00000002, 0x00000000, 0x00000003, 0x00000043, 0x00000004, dup_hos_05_UnkFunc27, 0x00000001, D_8024DFF0_A38230, 0x00000003, 0x00000043, 0x00000008, func_802452C4_A2F504, 0x000000FF, 0x000000FF, 0x000000FF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000008, func_802452C4_A2F504, 0x00000066, 0x00000066, 0x00000066, 0x00000000, 0x00000000, 0x00000000, 0x0000003C, 0x00000057, 0x00000000, 0x00000044, 0x00000001, D_8024DED8_A38118, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8B, 0x00000000, 0x00000044, 0x00000001, D_8024DCD4_A37F14, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000009, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFA6, 0x00000024, 0x00000002, 0xFE363C82, 0x00000046, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFC4, 0x00000024, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 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_8024DC30_A37E70, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000091, 0x00000009, 0x00000043, 0x00000006, PlaySoundAt, 0x000000A3, 0x00000000, 0x00000000, 0x000000FA, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000035, 0x00000002, 0x00000000, 0x000000FA, 0x00000000, 0x0000000A, 0xFE363C89, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetModelCustomGfx, 0x00000091, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000004, SetCustomGfxBuilders, 0x00000001, func_802456C8_A2F908, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000092, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000C8, 0x0000004B, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000002, func_80245718_A2F958, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000004, SetModelCustomGfx, 0x00000093, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000004, SetCustomGfxBuilders, 0x00000000, func_8024564C_A2F88C, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000093, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000007F, 0x0000003C, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000002, func_8024569C_A2F8DC, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000006, PlaySoundAt, 0x000004A3, 0x00000000, 0x00000000, 0x000000FA, 0x00000000, 0x00000043, 0x00000002, func_802D7B10, 0xFE363C89, 0x00000043, 0x00000003, EnableGroup, 0x00000090, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x000000C8, 0x00000000, 0x0000002D, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000002, func_80245718_A2F958, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000092, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFF92, 0x0000005A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFD050F8A, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFAB, 0x0000003C, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000008, func_802452C4_A2F504, 0x000000FF, 0x000000FF, 0x000000FF, 0x00000000, 0x00000000, 0x00000000, 0x0000003C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024E760_A389A0 -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0x0000008D, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFB, 0x0000000A, 0x00000002, 0xFD050F8C, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x0000000A, 0x00000002, 0xFD050F8D, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C89, 0x0000000B, 0x00000002, 0xFE363C89, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000001, 0x00000045, 0x00000002, D_8024E760_A389A0, 0xFE363C89, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, GetModelCenter, 0x0000008D, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFB, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000000, 0x00000043, 0x00000005, PlayerJump2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000002, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000001, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A8080, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000024, 0x00000002, 0xFD050F8D, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0188, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000C, 0x00000043, 0x00000001, CloseMessage, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000049, 0x00000001, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8D, 0x00000000, 0x00000043, 0x00000002, PartnerIsFlying, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0x0000002D, 0x000000A2, 0x00000019, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000005, PlayerJump, 0x00000019, 0x000000A2, 0x0000002D, 0x0000000A, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000005D, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000062, 0x00000000, 0x00000008, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000062, 0x00000001, 0x00000008, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000001, func_802457C0_A2FA00, 0x00000057, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x0000017D, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFD050F8B, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000003E8, 0x00000064, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000024, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000005D, 0x00000043, 0x00000003, GotoMap, 0x8024F290, 0x00000002, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x8024F288, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x000000B4, 0xFFFFFFFB, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x000000B4, 0xFFFFFFFB, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2531280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF249EE80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000001, 0x00000024, 0x00000002, 0xFD050F8D, 0x00000001, 0x00000045, 0x00000002, D_8024E760_A389A0, 0xFE363C89, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFEA2, 0xFFFFFFBA, 0x0000003C, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002F, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x0000017F, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x000002EE, 0xFFFFFFAB, 0x0000005A, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000049, 0x00000001, 0xFE363C89, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000005, PlayerJump, 0x00000019, 0x000000A2, 0x0000002D, 0x0000000A, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8D, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000004, 0x00000016, 0x00000001, 0x00000009, 0x00000016, 0x00000001, 0x00000006, 0x00000016, 0x00000001, 0x00000008, 0x0000001C, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0x0000002D, 0x000000A2, 0x00000019, 0x0000000A, 0x00000023, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000063, 0x00000000, 0x00000008, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8480, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0x0000008D, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFB, 0x0000000A, 0x00000002, 0xFD050F8C, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x0000000A, 0x00000002, 0xFD050F8D, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C89, 0x0000000B, 0x00000002, 0xFE363C89, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000001, 0x00000045, 0x00000002, D_8024E760_A389A0, 0xFE363C89, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, GetModelCenter, 0x0000008D, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFB, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000000, 0x00000043, 0x00000005, PlayerJump2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000002, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000001, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A8080, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000024, 0x00000002, 0xFD050F8D, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0188, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000C, 0x00000043, 0x00000001, CloseMessage, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000049, 0x00000001, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8D, 0x00000000, 0x00000043, 0x00000002, PartnerIsFlying, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0x0000002D, 0x000000A2, 0x00000019, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000005, PlayerJump, 0x00000019, 0x000000A2, 0x0000002D, 0x0000000A, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000005D, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000062, 0x00000000, 0x00000008, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000062, 0x00000001, 0x00000008, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000001, func_802457C0_A2FA00, 0x00000057, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x0000017D, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFD050F8B, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000003E8, 0x00000064, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000024, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000005D, 0x00000043, 0x00000003, GotoMap, 0x8024F290, 0x00000002, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x8024F288, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x000000B4, 0xFFFFFFFB, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x000000B4, 0xFFFFFFFB, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2531280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF249EE80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000001, 0x00000024, 0x00000002, 0xFD050F8D, 0x00000001, 0x00000045, 0x00000002, D_8024E760_A389A0, 0xFE363C89, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFEA2, 0xFFFFFFBA, 0x0000003C, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002F, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x0000017F, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x000002EE, 0xFFFFFFAB, 0x0000005A, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000049, 0x00000001, 0xFE363C89, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000005, PlayerJump, 0x00000019, 0x000000A2, 0x0000002D, 0x0000000A, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8D, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000004, 0x00000016, 0x00000001, 0x00000009, 0x00000016, 0x00000001, 0x00000006, 0x00000016, 0x00000001, 0x00000008, 0x0000001C, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0x0000002D, 0x000000A2, 0x00000019, 0x0000000A, 0x00000023, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000063, 0x00000000, 0x00000008, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8480, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_01/B299B0.data.s b/ver/us/asm/data/world/area_jan/jan_01/B299B0.data.s index 1dcff34b59..1b85e8d7ed 100644 --- a/ver/us/asm/data/world/area_jan/jan_01/B299B0.data.s +++ b/ver/us/asm/data/world/area_jan/jan_01/B299B0.data.s @@ -24,7 +24,7 @@ dlabel D_80241AB4_B29AE4 .word 0x00000045, 0x00000002, D_80241A70_B29AA0, 0xFE363C89, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000140, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00B60006, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8C80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000096, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C80, 0x0000003C, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000000, 0x00000049, 0x00000001, 0xFE363C89, 0x00000043, 0x00000001, jan_01_UnsetCamera0Flag1000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241BCC_B29BFC -.word 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00B6000B, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFDA8, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x0010000D, 0x00000140, 0x0000003C, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000000, 0x00000000, 0x00000019, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFC, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0xFFFFFFFC, 0x00000000, 0x00000000, 0x00000019, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0x000001AE, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x00100010, 0x00000000, 0x0000003C, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000004, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00B60007, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x000000FA, 0x0000005A, 0x00000005, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFCE, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C83, 0xFE363C82, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C83, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000001, jan_01_SetCamera0Flag1000, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B60008, 0x00B60001, 0x00000000, 0x00100011, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000000C, 0x00000046, 0x00000001, D_80241AB4_B29AE4, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000002, func_802D2C14, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B60009, 0x00B60001, 0x00000000, 0x0010000F, 0x00000024, 0x00000002, 0xF8406044, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000002, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000000C, 0x00000046, 0x00000001, D_80241AB4_B29AE4, 0x00000043, 0x00000002, func_802D2C14, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x0000004D, 0x00000001, 0x0000000B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00B6000B, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFDA8, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x0010000D, 0x00000140, 0x0000003C, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000000, 0x00000000, 0x00000019, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFC, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0xFFFFFFFC, 0x00000000, 0x00000000, 0x00000019, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0x000001AE, 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x00100010, 0x00000000, 0x0000003C, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000004, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00B60007, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x000000FA, 0x0000005A, 0x00000005, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFCE, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C83, 0xFE363C82, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C83, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000001, jan_01_SetCamera0Flag1000, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B60008, 0x00B60001, 0x00000000, 0x00100011, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000000C, 0x00000046, 0x00000001, D_80241AB4_B29AE4, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000002, func_802D2C14, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B60009, 0x00B60001, 0x00000000, 0x0010000F, 0x00000024, 0x00000002, 0xF8406044, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000002, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000000C, 0x00000046, 0x00000001, D_80241AB4_B29AE4, 0x00000043, 0x00000002, func_802D2C14, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x0000004D, 0x00000001, 0x0000000B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242114_B2A144 .word 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000016, 0x00000001, 0x00000006, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000023, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xF9718889, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B60009, 0x00B60002, 0x00000000, 0x0010000E, 0x00000024, 0x00000002, 0xF9718889, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -36,7 +36,7 @@ dlabel D_802422D8_B2A308 .word 0x00000058, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C83, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFF38, 0x00000027, 0x00000002, 0xFE363C84, 0x000000C8, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C80, 0x00000021, 0x00000002, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x10000000, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x01000000, 0x00000001, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x10000000, 0x00000001, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000024, 0x00000002, 0xF9718889, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000027, 0x00000002, 0xFE363C88, 0x00000014, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0x00000005, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A8A80, 0x00000024, 0x00000002, 0xFE363C84, 0x00000028, 0x00000024, 0x00000002, 0xFE363C85, 0x0000005A, 0x00000024, 0x00000002, 0xFE363C86, 0x0000002D, 0x00000005, 0x00000001, 0x00000000, 0x00000029, 0x00000002, 0xFE363C84, 0xFFFFFFFF, 0x00000029, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000029, 0x00000002, 0xFE363C86, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C84, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C80, 0x00000012, 0xFE363C82, 0x0000000F, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000000E1, 0x00000000, 0x0000000B, 0x00000002, 0xF9718889, 0x00000001, 0x00000058, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0xFE363C85, 0x00000002, 0x00000043, 0x0000000F, PlayEffect, 0x00000018, 0x00000003, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000059, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C84, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C80, 0xFFFFFFF4, 0xFE363C82, 0x0000000F, 0x00000003, 0x00000001, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF9718889, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242634_B2A664 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60001, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C83, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000027, 0x00000002, 0xFE363C84, 0xFFFFFFE2, 0x00000012, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000027, 0x00000002, 0xFE363C84, 0x0000001E, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C84, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000001, jan_01_SetCamera0Flag1000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000140, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60006, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8680, 0x0000000C, 0x00000002, 0xFE363C82, 0xFFFFFFD3, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFD3, 0x00000013, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFE363C84, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60001, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60001, 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C83, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000027, 0x00000002, 0xFE363C84, 0xFFFFFFE2, 0x00000012, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000027, 0x00000002, 0xFE363C84, 0x0000001E, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C84, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000001, jan_01_SetCamera0Flag1000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000140, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60006, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8680, 0x0000000C, 0x00000002, 0xFE363C82, 0xFFFFFFD3, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFD3, 0x00000013, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFE363C84, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60001, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242938_B2A968 .word 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x002B0304, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_802422D8_B2A308, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_80242634_B2A664, 0x00000012, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_03/B37E60.data.s b/ver/us/asm/data/world/area_jan/jan_03/B37E60.data.s index 8e05852431..10317a8774 100644 --- a/ver/us/asm/data/world/area_jan/jan_03/B37E60.data.s +++ b/ver/us/asm/data/world/area_jan/jan_03/B37E60.data.s @@ -9,10 +9,10 @@ dlabel D_80243310_B37EE0 .word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000021, 0x00000002, 0x0000000E, 0x0000000F, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000027, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000026, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000088, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802433C0_B37F90 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, jan_03_Pipe_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, jan_03_Pipe_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, jan_03_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, jan_03_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, jan_03_Pipe_AwaitDownInput, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 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, 0x00000046, 0x00000001, D_80243BE0_B387B0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, jan_03_Pipe_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, jan_03_Pipe_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, jan_03_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, jan_03_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, jan_03_Pipe_AwaitDownInput, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPartnerInUse, 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, 0x00000046, 0x00000001, D_80243BE0_B387B0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243BE0_B387B0 -.word 0x00000043, 0x00000001, jan_03_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, jan_03_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, jan_03_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, jan_03_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, jan_03_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, jan_03_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, jan_03_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 +.word 0x00000043, 0x00000001, jan_03_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, jan_03_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, jan_03_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, jan_03_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, GetPartnerInUse, 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, jan_03_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, jan_03_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, jan_03_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 D_802440F0_B38CC0 .word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, jan_03_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, jan_03_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_07/B5ACA0.data.s b/ver/us/asm/data/world/area_jan/jan_07/B5ACA0.data.s index c448a63f34..b7b1e1c4c3 100644 --- a/ver/us/asm/data/world/area_jan/jan_07/B5ACA0.data.s +++ b/ver/us/asm/data/world/area_jan/jan_07/B5ACA0.data.s @@ -36,7 +36,7 @@ dlabel D_80241EC8_B5B738 .word 0x0000000A, 0x00000002, 0xF5DE0180, 0x0000000F, 0x0000000A, 0x00000002, 0xF840604F, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00970306, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_8024178C_B5AFFC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241F48_B5B7B8 -.word 0x00000058, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0xFFFFFF42, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x01000000, 0x00000001, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x10000000, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x10000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000043, 0x00000004, SetNpcCollisionSize, 0x00000001, 0x00000030, 0x00000028, 0x00000043, 0x00000004, SetNpcCollisionSize, 0x00000002, 0x00000030, 0x00000028, 0x00000043, 0x00000004, AwaitPlayerApproach, 0x0000003C, 0x00000014, 0x0000008C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000056, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFFC4, 0x00000000, 0x00000014, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x00000014, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000010E, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00360004, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000002, 0x00000000, 0x00000000, 0x00000026, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00360004, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000001, 0x00000000, 0x00000000, 0x00000023, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00360001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00360001, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00360004, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C80, 0x00000018, 0x00000043, 0x00000005, SetNpcRotation, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x000020B1, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00360001, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00360004, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C80, 0x00000018, 0x00000043, 0x00000005, SetNpcRotation, 0x00000002, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x000020B1, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00360001, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00360004, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00360004, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000C, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000005, SetNpcRotation, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0x00000002, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x000020B2, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000C, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000005, SetNpcRotation, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0x00000002, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x000020B2, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000C, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000005, SetNpcRotation, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0x00000002, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x000020B2, 0x00000000, 0x00000005, 0x00000001, 0x00000003, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x000020B3, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00360005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00360005, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00360006, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00360006, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x000003B2, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, StartBossBattle, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000058, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0xFFFFFF42, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x01000000, 0x00000001, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x10000000, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x10000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000043, 0x00000004, SetNpcCollisionSize, 0x00000001, 0x00000030, 0x00000028, 0x00000043, 0x00000004, SetNpcCollisionSize, 0x00000002, 0x00000030, 0x00000028, 0x00000043, 0x00000004, AwaitPlayerApproach, 0x0000003C, 0x00000014, 0x0000008C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000056, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFFC4, 0x00000000, 0x00000014, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x00000014, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000010E, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00360004, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000002, 0x00000000, 0x00000000, 0x00000026, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00360004, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000001, 0x00000000, 0x00000000, 0x00000023, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00360001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00360001, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00360004, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C80, 0x00000018, 0x00000043, 0x00000005, SetNpcRotation, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x000020B1, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00360001, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00360004, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C80, 0x00000018, 0x00000043, 0x00000005, SetNpcRotation, 0x00000002, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x000020B1, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00360001, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00360004, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00360004, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000C, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000005, SetNpcRotation, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0x00000002, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x000020B2, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000C, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000005, SetNpcRotation, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0x00000002, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x000020B2, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000C, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000005, SetNpcRotation, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0x00000002, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x000020B2, 0x00000000, 0x00000005, 0x00000001, 0x00000003, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x000020B3, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00360005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00360005, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00360006, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00360006, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x000003B2, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, StartBossBattle, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024263C_B5BEAC .word 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000014, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000014, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2524A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_09/B673D0.data.s b/ver/us/asm/data/world/area_jan/jan_09/B673D0.data.s index 578a6b0272..f89c82d08f 100644 --- a/ver/us/asm/data/world/area_jan/jan_09/B673D0.data.s +++ b/ver/us/asm/data/world/area_jan/jan_09/B673D0.data.s @@ -9,10 +9,10 @@ dlabel D_802419A0_B67450 .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, jan_09_Pipe_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, jan_09_Pipe_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, jan_09_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, jan_09_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802420E4_B67B94 -.word 0x00000043, 0x00000001, jan_09_Pipe_AwaitDownInput, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 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, 0x00000046, 0x00000001, D_802421C0_B67C70, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, jan_09_Pipe_AwaitDownInput, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPartnerInUse, 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, 0x00000046, 0x00000001, D_802421C0_B67C70, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802421C0_B67C70 -.word 0x00000043, 0x00000001, jan_09_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, jan_09_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, jan_09_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, jan_09_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, jan_09_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, jan_09_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, jan_09_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 +.word 0x00000043, 0x00000001, jan_09_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, jan_09_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, jan_09_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, jan_09_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, GetPartnerInUse, 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, jan_09_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, jan_09_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, jan_09_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 D_802426D0_B68180 .word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, jan_09_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, jan_09_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_11/B710F0.data.s b/ver/us/asm/data/world/area_jan/jan_11/B710F0.data.s index 7d6684488f..6de27233ab 100644 --- a/ver/us/asm/data/world/area_jan/jan_11/B710F0.data.s +++ b/ver/us/asm/data/world/area_jan/jan_11/B710F0.data.s @@ -3,13 +3,13 @@ .section .data dlabel D_80240890_B710F0 -.word 0x00000056, 0x00000000, 0x00000043, 0x00000001, jan_11_DarkRoomUpdate, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, jan_11_Pipe_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, jan_11_Pipe_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, jan_11_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, jan_11_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, jan_11_Pipe_AwaitDownInput, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 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, 0x00000046, 0x00000001, D_802410DC_B7193C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000056, 0x00000000, 0x00000043, 0x00000001, jan_11_DarkRoomUpdate, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, jan_11_Pipe_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, jan_11_Pipe_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, jan_11_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, jan_11_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, jan_11_Pipe_AwaitDownInput, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPartnerInUse, 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, 0x00000046, 0x00000001, D_802410DC_B7193C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802410DC_B7193C .word 0x00000043, 0x00000001, jan_11_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, jan_11_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, jan_11_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, jan_11_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 dlabel D_802412B8_B71B18 -.word 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, jan_11_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, jan_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, 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, jan_11_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 +.word 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, GetPartnerInUse, 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, jan_11_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, jan_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, 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, jan_11_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 D_802415EC_B71E4C .word 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C83, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C84, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C86, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C87, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C87, 0x00000003, 0x00000024, 0x00000002, 0xFE363C88, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C89, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C8A, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8B, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C8C, 0xF4ACD481, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_16/B80540.data.s b/ver/us/asm/data/world/area_jan/jan_16/B80540.data.s index 6880f52d70..d6e2bcb06d 100644 --- a/ver/us/asm/data/world/area_jan/jan_16/B80540.data.s +++ b/ver/us/asm/data/world/area_jan/jan_16/B80540.data.s @@ -27,7 +27,7 @@ dlabel D_802409F8_B809F8 .word 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8A, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8A, 0x0000002E, 0x00000002, 0xFE363C80, 0xF24A7A6C, 0x0000002E, 0x00000002, 0xFE363C81, 0xF24A7AA9, 0x0000002C, 0x00000002, 0xFE363C80, 0x00000001, 0x0000002C, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, ScaleGroup, 0x00000015, 0xFE363C80, 0xFE363C81, 0x00000001, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000001, 0x0000000F, 0x00000002, 0xFE363C8F, 0x00000258, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x0000002E, 0x00000002, 0xFE363C80, 0xF24A7A50, 0x0000002C, 0x00000002, 0xFD050F8A, 0xFE363C80, 0x0000002E, 0x00000002, 0xFD050F8A, 0xF24A7DE0, 0x0000002C, 0x00000002, 0xFE363C8A, 0xFD050F8A, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240B3C_B80B3C -.word 0x00000044, 0x00000001, D_802409F8_B809F8, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000023, 0x00000064, 0x0000014A, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000023, 0x00000064, 0x0000014A, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000023, 0x00000000, 0x0000014A, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7DB4, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0x00000023, 0x00000258, 0x00000154, 0x00000043, 0x00000005, MakeLerp, 0x00000258, 0x00000082, 0x0000000F, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000004, SetPlayerPos, 0x00000023, 0xFE363C80, 0x00000154, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000014, 0x00000000, 0x00000023, 0x00000078, 0x00000154, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000014, 0x00000000, 0x00000037, 0x00000078, 0x0000014A, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000002C, 0x00000002, 0xFD050F8A, 0xF24A5C80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x000000BE, 0x0000015E, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7F4D, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A8280, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000166, 0x00000000, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFFDD, 0x00000000, 0x00000181, 0x0000001E, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0x00000023, 0x00000082, 0x0000014A, 0x0000000F, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000003, 0x00000043, 0x0000000F, PlayEffect, 0x00000014, 0x00000000, 0x00000023, 0x00000078, 0x00000154, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000014, 0x00000000, 0x00000037, 0x00000078, 0x00000154, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x0000002C, 0x00000002, 0xFD050F8A, 0xF24A5C80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFFDD, 0x00000000, 0x00000181, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A81B4, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A8280, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFFFFFFF6, 0x00000000, 0x0000018B, 0x00000014, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000044, 0x00000001, D_802409F8_B809F8, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000023, 0x00000064, 0x0000014A, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000023, 0x00000064, 0x0000014A, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000023, 0x00000000, 0x0000014A, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7DB4, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0x00000023, 0x00000258, 0x00000154, 0x00000043, 0x00000005, MakeLerp, 0x00000258, 0x00000082, 0x0000000F, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000004, SetPlayerPos, 0x00000023, 0xFE363C80, 0x00000154, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000014, 0x00000000, 0x00000023, 0x00000078, 0x00000154, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000014, 0x00000000, 0x00000037, 0x00000078, 0x0000014A, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000002C, 0x00000002, 0xFD050F8A, 0xF24A5C80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x000000BE, 0x0000015E, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7F4D, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A8280, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000166, 0x00000000, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFFDD, 0x00000000, 0x00000181, 0x0000001E, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0x00000023, 0x00000082, 0x0000014A, 0x0000000F, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000003, 0x00000043, 0x0000000F, PlayEffect, 0x00000014, 0x00000000, 0x00000023, 0x00000078, 0x00000154, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000014, 0x00000000, 0x00000037, 0x00000078, 0x00000154, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x0000002C, 0x00000002, 0xFD050F8A, 0xF24A5C80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFFDD, 0x00000000, 0x00000181, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A81B4, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A8280, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFFFFFFF6, 0x00000000, 0x0000018B, 0x00000014, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241074_B81074 .word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000024, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, D_80242C50_B82C50, 0x00000046, 0x00000001, 0x80242C70, 0x00000044, 0x00000001, D_802412D4_B812D4, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x00000044, 0x00000001, D_80240B3C_B80B3C, 0x00000044, 0x00000001, D_802407D4_B807D4, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802407D4_B807D4, 0x00000044, 0x00000001, EnterWalk, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802405D0_B805D0, 0x00000044, 0x00000001, 0x802436D4, 0x00000044, 0x00000001, D_80240838_B80838, 0x00000043, 0x00000004, jan_16_UnkFunc27, 0x00000000, 0xFFFFFFFF, 0x00000003, 0x00000043, 0x00000004, jan_16_UnkFunc27, 0x00000002, 0x00000000, 0x00000003, 0x00000043, 0x0000000B, jan_16_UnkFunc26, 0x00000003, 0x000000FF, 0x000000FF, 0x000000FF, 0x00000000, 0x00000000, 0x00000019, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_22/B85AE0.data.s b/ver/us/asm/data/world/area_jan/jan_22/B85AE0.data.s index 29c272cc57..8e1b16ff8a 100644 --- a/ver/us/asm/data/world/area_jan/jan_22/B85AE0.data.s +++ b/ver/us/asm/data/world/area_jan/jan_22/B85AE0.data.s @@ -78,7 +78,7 @@ dlabel D_80242620_B867A0 .word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242688_B86808 -.word 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C89, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000002, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000003, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000008, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, IsPlayerWithin, 0x000000C8, 0x00000000, 0x00000019, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000140, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFB, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7C80, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x0000000A, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000013, 0x00000000, 0x00000045, 0x00000002, D_80242620_B867A0, 0xFE363C87, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000004, PlaySoundAtModel, 0x00000043, 0x00000186, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000AA, 0x0000003C, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C86, 0xFE363C80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C83, 0xFE363C86, 0xFE363C85, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C88, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0x00000005, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFB, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C86, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFFB, 0x00000027, 0x00000002, 0xFE363C85, 0x00000005, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFE363C82, 0xF24D9A80, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002F, 0x00000002, 0xFE363C82, 0xF24D9A80, 0x00000043, 0x00000005, ScaleModel, 0x00000040, 0x00000001, 0xFE363C82, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x0000003D, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000003E, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000049, 0x00000001, 0xFE363C87, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, PlaySoundAtModel, 0x00000043, 0x00000186, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x000000AA, 0x00000000, 0x0000003C, 0x00000005, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFE363C82, 0xF24D9A80, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002F, 0x00000002, 0xFE363C82, 0xF24D9A80, 0x00000043, 0x00000005, ScaleModel, 0x00000040, 0x00000001, 0xFE363C82, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x0000003D, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000003E, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7E80, 0x00000043, 0x00000005, PlayerJump, 0x0000010E, 0x000000CD, 0x0000000F, 0x00000014, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0x0000011D, 0x0000000F, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PartnerIsFlying, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0x00000104, 0x000000CD, 0x0000000F, 0x0000000F, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C89, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000002, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000003, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000008, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, IsPlayerWithin, 0x000000C8, 0x00000000, 0x00000019, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000140, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFB, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7C80, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x0000000A, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000013, 0x00000000, 0x00000045, 0x00000002, D_80242620_B867A0, 0xFE363C87, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000004, PlaySoundAtModel, 0x00000043, 0x00000186, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000AA, 0x0000003C, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C86, 0xFE363C80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C83, 0xFE363C86, 0xFE363C85, 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C88, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0x00000005, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFB, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C86, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFFB, 0x00000027, 0x00000002, 0xFE363C85, 0x00000005, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFE363C82, 0xF24D9A80, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002F, 0x00000002, 0xFE363C82, 0xF24D9A80, 0x00000043, 0x00000005, ScaleModel, 0x00000040, 0x00000001, 0xFE363C82, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x0000003D, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000003E, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000049, 0x00000001, 0xFE363C87, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, PlaySoundAtModel, 0x00000043, 0x00000186, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x000000AA, 0x00000000, 0x0000003C, 0x00000005, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFE363C82, 0xF24D9A80, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002F, 0x00000002, 0xFE363C82, 0xF24D9A80, 0x00000043, 0x00000005, ScaleModel, 0x00000040, 0x00000001, 0xFE363C82, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x0000003D, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000003E, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7E80, 0x00000043, 0x00000005, PlayerJump, 0x0000010E, 0x000000CD, 0x0000000F, 0x00000014, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0x0000011D, 0x0000000F, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PartnerIsFlying, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0x00000104, 0x000000CD, 0x0000000F, 0x0000000F, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242CE4_B86E64 .word 0x00000047, 0x00000005, D_80242688_B86808, 0x00000080, 0x0000001E, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000018, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000001E, 0x7FFFFE00, 0x00000043, 0x00000005, ScaleModel, 0x00000040, 0x00000001, 0xF24A7B20, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x0000003D, 0x00000000, 0x000000B2, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000003E, 0x00000000, 0x000000B2, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000001E, 0x7FFFFE00, 0x00000043, 0x00000005, ScaleModel, 0x00000040, 0x00000001, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x0000003D, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000003E, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -123,7 +123,7 @@ dlabel D_8024511C_B8929C .word 0x00000058, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000140, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000096, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00B60006, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8A80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C80, 0x0000003C, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80245208_B89388 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFE48, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001000BC, 0x00000140, 0x0000003C, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000000, 0x00000000, 0x00000019, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFC, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0xFFFFFFFC, 0x00000000, 0x00000000, 0x00000019, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000096, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, func_802D2C14, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0x00000004, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000140, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001000C0, 0x00000000, 0x0000003C, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000004, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00B60007, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8E80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFCE, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C83, 0xFE363C82, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C83, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5C80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000001, jan_22_SetCamera0Flag1000, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B60008, 0x00B60001, 0x00000000, 0x001000C1, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000002, 0x00000043, 0x00000002, func_802D2C14, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000002, func_802D2C14, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xF8406044, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B60009, 0x00B60001, 0x00000000, 0x001000BE, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B60009, 0x00B60001, 0x00000000, 0x001000BF, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000002, 0x00000043, 0x00000002, func_802D2C14, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x0000004D, 0x00000001, 0x0000000B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000046, 0x00000024, 0x00000002, 0xFE363C80, 0x00000046, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000012C, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00B60006, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8C80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C80, 0x0000003C, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000000D, 0x00000057, 0x00000000, 0x00000045, 0x00000002, D_8024511C_B8929C, 0xFE363C89, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000001, jan_22_UnsetCamera0Flag1000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8E80, 0x00000049, 0x00000001, 0xFE363C89, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000003, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000023, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000000D, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFE48, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001000BC, 0x00000140, 0x0000003C, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000000, 0x00000000, 0x00000019, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFC, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0xFFFFFFFC, 0x00000000, 0x00000000, 0x00000019, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000096, 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, func_802D2C14, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0x00000004, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000140, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001000C0, 0x00000000, 0x0000003C, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000004, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00B60007, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8E80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFCE, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C83, 0xFE363C82, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C83, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5C80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000001, jan_22_SetCamera0Flag1000, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B60008, 0x00B60001, 0x00000000, 0x001000C1, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000002, 0x00000043, 0x00000002, func_802D2C14, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000002, func_802D2C14, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xF8406044, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B60009, 0x00B60001, 0x00000000, 0x001000BE, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B60009, 0x00B60001, 0x00000000, 0x001000BF, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000002, 0x00000043, 0x00000002, func_802D2C14, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x0000004D, 0x00000001, 0x0000000B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000046, 0x00000024, 0x00000002, 0xFE363C80, 0x00000046, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000012C, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00B60006, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8C80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C80, 0x0000003C, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000000D, 0x00000057, 0x00000000, 0x00000045, 0x00000002, D_8024511C_B8929C, 0xFE363C89, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000001, jan_22_UnsetCamera0Flag1000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8E80, 0x00000049, 0x00000001, 0xFE363C89, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000003, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000023, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000000D, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802458B0_B89A30 .word 0x00000003, 0x00000001, 0x00000000, 0x0000000B, 0x00000002, 0xF5DE0180, 0x0000000E, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000055, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001000C5, 0x00000000, 0x0000003C, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFC, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0xFFFFFFFC, 0x00000000, 0x00000000, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFF06, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B60008, 0x00B60001, 0x00000000, 0x001000C6, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00B60006, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFE2A, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_22/B8D910.data.s b/ver/us/asm/data/world/area_jan/jan_22/B8D910.data.s index 400e697353..bbb274b3f5 100644 --- a/ver/us/asm/data/world/area_jan/jan_22/B8D910.data.s +++ b/ver/us/asm/data/world/area_jan/jan_22/B8D910.data.s @@ -12,4 +12,4 @@ dlabel D_802497C0_B8D940 .word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80249828_B8D9A8 -.word 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C89, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000002, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000003, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C80, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000026, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000019, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x00000045, 0x00000002, D_802497C0_B8D940, 0xFE363C89, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000140, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xF4ACD484, 0x00000028, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFB, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7C80, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xF4ACD483, 0xFE363C80, 0xFE363C81, 0x00000008, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000000, 0x00000043, 0x00000005, PlayerJump, 0xF4ACD483, 0xF4ACD484, 0xF4ACD485, 0x00000007, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008000D, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000002, PlaySound, 0x80000019, 0x00000058, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B58A, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xF4ACD486, 0x00000024, 0x00000002, 0xF70F2E80, 0xF4ACD486, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000005, func_80241020_B851A0, 0xFAA2B58A, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000000B, 0x00000002, 0xF70F2E80, 0xFE363C80, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000003E8, 0x00000046, 0x00000001, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000002, func_80241168_B852E8, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD481, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD482, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, func_802412E0_B85460, 0xF4ACD487, 0xF4ACD488, 0x0000000A, 0x00000002, 0xFE363C88, 0x00008000, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00002087, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00800000, 0x00000001, 0x00000024, 0x00000002, 0xFAA2B58A, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x80000019, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000026, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000026, 0x00008000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000019, 0x7FFFFE00, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000049, 0x00000001, 0xFE363C89, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x8000001A, 0x00000058, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B58B, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xF4ACD486, 0x00000024, 0x00000002, 0xF70F2E81, 0xF4ACD486, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000005, func_802410C4_B85244, 0xFAA2B58B, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000000B, 0x00000002, 0xF70F2E81, 0xFE363C80, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002A, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000002, func_80241168_B852E8, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD481, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD482, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B58B, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x8000001A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000003E, 0x00000002, 0x00000009, 0xFE363C80, 0x0000003C, 0x00000001, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD480, D_80249790_B8D910, 0x00000024, 0x00000002, 0xF4ACD481, 0x00000063, 0x00000024, 0x00000002, 0xF4ACD482, 0x00000065, 0x00000024, 0x00000002, 0xF4ACD483, 0x000001FB, 0x00000024, 0x00000002, 0xF4ACD484, 0x0000011D, 0x00000024, 0x00000002, 0xF4ACD485, 0xFFFFFFE6, 0x00000024, 0x00000002, 0xF4ACD486, 0x00000002, 0x00000024, 0x00000002, 0xF4ACD487, 0x0000031B, 0x00000024, 0x00000002, 0xF4ACD488, 0x000003AC, 0x00000047, 0x00000005, D_80249828_B8D9A8, 0x00000800, 0x00000022, 0x00000001, 0x00000000, 0x00000044, 0x00000001, 0x80246780, 0x0000003E, 0x00000002, 0x00000009, 0xFE363C80, 0x0000003C, 0x00000001, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD480, D_802497A8_B8D928, 0x00000024, 0x00000002, 0xF4ACD481, 0x00000070, 0x00000024, 0x00000002, 0xF4ACD482, 0x00000072, 0x00000024, 0x00000002, 0xF4ACD483, 0x000003CE, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000087, 0x00000024, 0x00000002, 0xF4ACD485, 0x0000004A, 0x00000024, 0x00000002, 0xF4ACD486, 0x00000003, 0x00000024, 0x00000002, 0xF4ACD487, 0x00000320, 0x00000024, 0x00000002, 0xF4ACD488, 0x000003A2, 0x00000047, 0x00000005, D_80249828_B8D9A8, 0x00000800, 0x00000018, 0x00000001, 0x00000000, 0x00000044, 0x00000001, 0x802467DC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C89, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000002, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000003, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C80, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000026, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000019, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x00000045, 0x00000002, D_802497C0_B8D940, 0xFE363C89, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000140, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xF4ACD484, 0x00000028, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFB, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7C80, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xF4ACD483, 0xFE363C80, 0xFE363C81, 0x00000008, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000000, 0x00000043, 0x00000005, PlayerJump, 0xF4ACD483, 0xF4ACD484, 0xF4ACD485, 0x00000007, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008000D, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000002, PlaySound, 0x80000019, 0x00000058, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B58A, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xF4ACD486, 0x00000024, 0x00000002, 0xF70F2E80, 0xF4ACD486, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000005, func_80241020_B851A0, 0xFAA2B58A, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000000B, 0x00000002, 0xF70F2E80, 0xFE363C80, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000003E8, 0x00000046, 0x00000001, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000002, func_80241168_B852E8, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD481, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD482, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, func_802412E0_B85460, 0xF4ACD487, 0xF4ACD488, 0x0000000A, 0x00000002, 0xFE363C88, 0x00008000, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00002087, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00800000, 0x00000001, 0x00000024, 0x00000002, 0xFAA2B58A, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x80000019, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000026, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000026, 0x00008000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000019, 0x7FFFFE00, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000049, 0x00000001, 0xFE363C89, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x8000001A, 0x00000058, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B58B, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xF4ACD486, 0x00000024, 0x00000002, 0xF70F2E81, 0xF4ACD486, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000005, func_802410C4_B85244, 0xFAA2B58B, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000000B, 0x00000002, 0xF70F2E81, 0xFE363C80, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002A, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000002, func_80241168_B852E8, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD481, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD482, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B58B, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x8000001A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000003E, 0x00000002, 0x00000009, 0xFE363C80, 0x0000003C, 0x00000001, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD480, D_80249790_B8D910, 0x00000024, 0x00000002, 0xF4ACD481, 0x00000063, 0x00000024, 0x00000002, 0xF4ACD482, 0x00000065, 0x00000024, 0x00000002, 0xF4ACD483, 0x000001FB, 0x00000024, 0x00000002, 0xF4ACD484, 0x0000011D, 0x00000024, 0x00000002, 0xF4ACD485, 0xFFFFFFE6, 0x00000024, 0x00000002, 0xF4ACD486, 0x00000002, 0x00000024, 0x00000002, 0xF4ACD487, 0x0000031B, 0x00000024, 0x00000002, 0xF4ACD488, 0x000003AC, 0x00000047, 0x00000005, D_80249828_B8D9A8, 0x00000800, 0x00000022, 0x00000001, 0x00000000, 0x00000044, 0x00000001, 0x80246780, 0x0000003E, 0x00000002, 0x00000009, 0xFE363C80, 0x0000003C, 0x00000001, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD480, D_802497A8_B8D928, 0x00000024, 0x00000002, 0xF4ACD481, 0x00000070, 0x00000024, 0x00000002, 0xF4ACD482, 0x00000072, 0x00000024, 0x00000002, 0xF4ACD483, 0x000003CE, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000087, 0x00000024, 0x00000002, 0xF4ACD485, 0x0000004A, 0x00000024, 0x00000002, 0xF4ACD486, 0x00000003, 0x00000024, 0x00000002, 0xF4ACD487, 0x00000320, 0x00000024, 0x00000002, 0xF4ACD488, 0x000003A2, 0x00000047, 0x00000005, D_80249828_B8D9A8, 0x00000800, 0x00000018, 0x00000001, 0x00000000, 0x00000044, 0x00000001, 0x802467DC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_23/B8FCD0.data.s b/ver/us/asm/data/world/area_jan/jan_23/B8FCD0.data.s index 91494c4ee7..88c8dfb672 100644 --- a/ver/us/asm/data/world/area_jan/jan_23/B8FCD0.data.s +++ b/ver/us/asm/data/world/area_jan/jan_23/B8FCD0.data.s @@ -12,7 +12,7 @@ dlabel D_80240070_B8FD40 .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80243760, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802400CC_B8FD9C -.word 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C81, 0x0000006E, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000026, 0x00000002, 0xFD050F85, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000008, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A8680, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x0000000F, 0x00000012, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, MakeLerp, 0xFE363C83, 0xFFFFFE0C, 0x0000000F, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x0000000D, 0x00000004, 0x00000001, 0x0000000B, 0x00000016, 0x00000001, 0x0000000F, 0x00000003, 0x00000001, 0x0000000B, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0x000000FA, 0x00000064, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFFFFFF9C, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xFD050F85, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000023, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, MakeLerp, 0xFE363C83, 0xFFFFFE0C, 0x0000000F, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C81, 0xFFFFFF9C, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F85, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0x000000FA, 0x00000064, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, GotoMap, 0x80243768, 0x00000004, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C81, 0x0000006E, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000026, 0x00000002, 0xFD050F85, 0x00000000, 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000008, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A8680, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x0000000F, 0x00000012, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, MakeLerp, 0xFE363C83, 0xFFFFFE0C, 0x0000000F, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x0000000D, 0x00000004, 0x00000001, 0x0000000B, 0x00000016, 0x00000001, 0x0000000F, 0x00000003, 0x00000001, 0x0000000B, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0x000000FA, 0x00000064, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFFFFFF9C, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xFD050F85, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000023, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, MakeLerp, 0xFE363C83, 0xFFFFFE0C, 0x0000000F, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C81, 0xFFFFFF9C, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F85, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0x000000FA, 0x00000064, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, GotoMap, 0x80243768, 0x00000004, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802405A8_B90278 .word 0x00000047, 0x00000005, D_80240070_B8FD40, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000044, 0x00000001, D_802400CC_B8FD9C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_25/B07940.data.s b/ver/us/asm/data/world/area_kkj/kkj_25/B07940.data.s index af39da12a1..4820bd31ec 100644 --- a/ver/us/asm/data/world/area_kkj/kkj_25/B07940.data.s +++ b/ver/us/asm/data/world/area_kkj/kkj_25/B07940.data.s @@ -12,7 +12,7 @@ dlabel D_80241034_B07A34 .word 0x00000047, 0x00000005, D_80240F90_B07990, 0x00000100, 0x00000002, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241060_B07A60 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D7E, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFD7B, 0x00000000, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFD6C, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000096, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000002, 0x000001C5, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000050, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000002, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000004, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFDA3, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24BE280, 0x00000024, 0x00000002, 0xF8405D7E, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24BE280, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000002, 0x00000024, 0x00000002, 0xFE363C83, 0x00000004, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000044, 0x00000001, D_80241034_B07A34, 0x00000044, 0x00000001, 0x80245AF0, 0x00000016, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x80248998, 0x00000016, 0x00000001, 0x00000002, 0x00000044, 0x00000001, 0x8024B254, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D7E, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFD7B, 0x00000000, 0x00000000, 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFD6C, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000096, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000002, 0x000001C5, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000050, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000002, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000004, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFDA3, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24BE280, 0x00000024, 0x00000002, 0xF8405D7E, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24BE280, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000002, 0x00000024, 0x00000002, 0xFE363C83, 0x00000004, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000044, 0x00000001, D_80241034_B07A34, 0x00000044, 0x00000001, 0x80245AF0, 0x00000016, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x80248998, 0x00000016, 0x00000001, 0x00000002, 0x00000044, 0x00000001, 0x8024B254, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024132C_B07D2C .word 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000006, RotateGroup, 0x00000094, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000098, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x0000009C, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x000000A0, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x000000A4, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000005A, 0x00000005, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000006, RotateGroup, 0x00000096, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x0000009A, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x0000009E, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x000000A2, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_25/B0B310.data.s b/ver/us/asm/data/world/area_kkj/kkj_25/B0B310.data.s index 98d140fde4..d0f1126af4 100644 --- a/ver/us/asm/data/world/area_kkj/kkj_25/B0B310.data.s +++ b/ver/us/asm/data/world/area_kkj/kkj_25/B0B310.data.s @@ -72,7 +72,7 @@ dlabel D_80245784_B0C184 .word 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, kkj_25_GetEntityPosition, 0xFD050F80, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFF3, 0x00000005, 0x0000000A, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, kkj_25_SetEntityPositionF, 0xFD050F80, 0xFE363C87, 0xFE363C80, 0xFE363C89, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, kkj_25_SetEntityPositionF, 0xFD050F80, 0xFE363C87, 0xFFFFFFEC, 0xFE363C89, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00010000, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800012, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800013, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x0080000E, 0x00000043, 0x00000002, PlaySound, 0x000003BC, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000001, 0xF24A8280, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFD050F8A, 0x0000000B, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000007BC, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x0000012C, 0x00000000, 0x00000000, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x0000208B, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000020A0, 0x00000000, 0x00000024, 0x00000002, 0xF971889A, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000016, 0x00000001, 0x00000003, 0x00000016, 0x00000001, 0x00000007, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C81, 0x00000013, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80245AB0_B0C4B0 -.word 0x00000057, 0x00000054, 0x00000051, 0x0000004E, 0x0000004B, 0x00000048, 0x00000045, 0x00000042, 0x0000003F, 0x0000003C, 0x00000039, 0x00000036, 0x00000033, 0x00000030, 0x0000002D, 0x0000002A, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000002, kkj_25_GetFloorCollider, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x0000000B, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000003, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000008, 0x00000043, 0x00000001, WaitForPlayerTouchingFloor, 0x00000013, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x0000000C, 0x00000002, 0xFE363C85, 0x00000000, 0x00000027, 0x00000002, 0xFE363C85, 0x00000019, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFE7, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFF6, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7DB4, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C83, 0xFE363C81, 0xFE363C85, 0x0000000C, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00800006, 0x00800002, 0x00000000, 0x0013007C, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x0000015E, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000015E, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001C2, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00800006, 0x00800002, 0x00000000, 0x0013007D, 0x00000046, 0x00000001, D_80245784_B0C184, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF6A, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF6A, 0x00000000, 0x00000064, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000000FA, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AE280, 0xF24A3280, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFFFFFE20, 0xFFFFFE20, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000000, 0x000001E0, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000057, 0x00000054, 0x00000051, 0x0000004E, 0x0000004B, 0x00000048, 0x00000045, 0x00000042, 0x0000003F, 0x0000003C, 0x00000039, 0x00000036, 0x00000033, 0x00000030, 0x0000002D, 0x0000002A, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000002, kkj_25_GetFloorCollider, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x0000000B, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C80, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000003, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000008, 0x00000043, 0x00000001, WaitForPlayerTouchingFloor, 0x00000013, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x0000000C, 0x00000002, 0xFE363C85, 0x00000000, 0x00000027, 0x00000002, 0xFE363C85, 0x00000019, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFE7, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFF6, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7DB4, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C83, 0xFE363C81, 0xFE363C85, 0x0000000C, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00800006, 0x00800002, 0x00000000, 0x0013007C, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x0000015E, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000015E, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001C2, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00800006, 0x00800002, 0x00000000, 0x0013007D, 0x00000046, 0x00000001, D_80245784_B0C184, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF6A, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF6A, 0x00000000, 0x00000064, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000000FA, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AE280, 0xF24A3280, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFFFFFE20, 0xFFFFFE20, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000000, 0x000001E0, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80245F20_B0C920 .word 0x00000030, 0x00000001, D_80245AB0_B0C4B0, 0x00000026, 0x00000002, 0xFE363C81, 0xF24A7E80, 0x00000024, 0x00000002, 0xFE363C82, 0x00000001, 0x00000005, 0x00000001, 0x00000010, 0x00000031, 0x00000001, 0xFE363C83, 0x00000026, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x0000002D, 0x00000002, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000005, TranslateGroup, 0xFE363C83, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000005, TranslateGroup, 0xFE363C83, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000005, TranslateGroup, 0xFE363C83, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x0000002D, 0x00000002, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000005, TranslateGroup, 0xFE363C83, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C82, 0x00000008, 0x0000002C, 0x00000002, 0xFE363C81, 0xF24A7C80, 0x00000012, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C81, 0xF24A7C80, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000008, 0x00000001, 0x00000003, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_14/A57D20.data.s b/ver/us/asm/data/world/area_kpa/kpa_14/A57D20.data.s deleted file mode 100644 index 2efb5cc10f..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_14/A57D20.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240870_A57D20 -.word 0x41F00000, 0x41F00000, 0xC3160000, 0x42B40000, 0x44F8C000, 0x41F00000, 0xC3160000, 0x43870000, 0x44DE0000, 0x00000000, 0xC33B0000, 0x43340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241570, D_80240870_A57D20, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, kpa_14_get_tattle, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000064, 0x00000000, 0x00000008, 0x0000000A, 0x00000002, 0xF8406194, 0x00000000, 0x00000043, 0x00000002, PlayAmbientSounds, 0x00000004, 0x00000012, 0x00000000, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000013, 0x00000000, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetMusicTrackVolumes, 0x00000005, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_14/A57E40.data.s b/ver/us/asm/data/world/area_kpa/kpa_14/A57E40.data.s deleted file mode 100644 index eab96d9b1b..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_14/A57E40.data.s +++ /dev/null @@ -1,36 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240990_A57E40 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kpa_14_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_14_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240A2C_A57EDC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241EC0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000058, 0x0000000A, 0x00000002, 0xF8406194, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000006A, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x000000CB, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000044, 0x00000001, ExitSingleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80241EC8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240B5C_A5800C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241ED0, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240BB8_A58068 -.word 0x00000047, 0x00000005, D_80240A2C_A57EDC, 0x00080000, 0x00000053, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240B5C_A5800C, 0x00080000, 0x0000005A, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240C00_A580B0 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80240BB8_A58068, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000058, 0x00000024, 0x00000002, 0xFE363C82, 0x0000006A, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000044, 0x00000001, EnterSingleDoor, 0x00000044, 0x00000001, D_80240BB8_A58068, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, D_80240BB8_A58068, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240D00_A581B0 -.word 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFC18, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFF830, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80240990_A57E40, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFCE0, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80240990_A57E40, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x0000005F, 0x00000001, 0x00000043, 0x00000003, SetTexPanner, 0x00000060, 0x00000001, 0x00000043, 0x00000003, SetTexPanner, 0x00000061, 0x00000001, 0x00000043, 0x00000003, SetTexPanner, 0x00000062, 0x00000001, 0x00000043, 0x00000003, SetTexPanner, 0x00000063, 0x00000001, 0x00000043, 0x00000003, SetTexPanner, 0x00000064, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240F60_A58410 -.word 0x00000010, 0x42DC0000, 0x41F00000, 0xC3070000, 0x0000000F, 0x43AC8000, 0x41F00000, 0xC3070000, 0x0000000A, 0x44098000, 0x41F00000, 0xC3070000, 0x0000000B, 0x44480000, 0x41F00000, 0xC3070000, 0x00000009, 0x4482A000, 0x41F00000, 0xC3070000, 0x0000000C, 0x44AF0000, 0x41F00000, 0xC3070000, 0x0000000E, 0x44C6C000, 0x41F00000, 0xC2B40000, 0x0000000D, 0x44F28000, 0x41F00000, 0xC3070000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80240FF0_A584A0 -.word 0x00000024, 0x00000002, 0xFD050F8A, 0x00000009, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241010_A584C0 -.word 0x00000024, 0x00000002, 0xFD050F8A, 0x0000000C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241030_A584E0 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000027, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802410BC_A5856C -.word 0x0000004D, 0x00000001, 0x0000000B, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000060, 0x7FFFFE00, 0x00000043, 0x00000001, func_8024034C_A577FC, 0x00000014, 0x00000001, 0xFE363C89, 0x00000016, 0x00000001, 0x00000008, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000060, 0x7FFFFE00, 0x00000016, 0x00000001, 0x00000009, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C81, 0x00000078, 0x00000014, 0x00000001, 0xFE363C80, 0x00000021, 0x00000002, 0x000004B0, 0x000004DD, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000024, 0x00000002, 0xFD050F8B, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000045, 0x00000002, D_80241030_A584E0, 0xFE363C89, 0x0000000A, 0x00000002, 0xFD050F8A, 0x00000009, 0x00000024, 0x00000002, 0xFE363C85, 0x00000415, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000578, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000017, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0x0000001E, 0xFFFFFF79, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0x0000001E, 0xFFFFFF79, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0xFE363C85, 0x0000001E, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0x000000FA, 0xFFFFFF79, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x000000FA, 0x0000001E, 0x00000014, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C85, 0xFE363C80, 0xFFFFFF79, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008001A, 0x00000043, 0x00000005, MakeLerp, 0x0000001E, 0x0000003C, 0x00000005, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C85, 0xFE363C80, 0xFFFFFF79, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000049, 0x00000001, 0xFE363C89, 0x00000043, 0x00000005, MakeLerp, 0x0000003C, 0x0000001E, 0x00000005, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C85, 0xFE363C80, 0xFFFFFF79, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFD050F8B, 0x00000000, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000016, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000046, 0x00000001, 0x80241AC4, 0x0000000A, 0x00000002, 0xF8406194, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x000000CD, 0x00000000, 0x00000044, 0x00000001, D_80240D00_A581B0, 0x00000012, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000006C, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_80240C00_A580B0, 0x00000044, 0x00000001, 0x802408E0, 0x0000000A, 0x00000002, 0xF8406194, 0x00000000, 0x00000044, 0x00000001, 0x80241BB0, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8406194, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000012, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000013, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000014, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000015, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000016, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000017, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000018, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000019, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000001A, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000001B, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000001C, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000001D, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000001E, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000001F, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000020, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000064, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000065, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000005A, 0x00000003, 0x00000056, 0x00000000, 0x00000043, 0x00000002, ResetFromLava, D_80240F60_A58410, 0x00000057, 0x00000000, 0x00000047, 0x00000005, D_80240FF0_A584A0, 0x00000080, 0x00000009, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241010_A584C0, 0x00000080, 0x0000000C, 0x00000001, 0x00000000, 0x00000044, 0x00000001, D_802410BC_A5856C, 0x00000057, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000060, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_14/A58DB0.data.s b/ver/us/asm/data/world/area_kpa/kpa_14/A58DB0.data.s deleted file mode 100644 index a5264a6182..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_14/A58DB0.data.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel kpa_14_varStash -.word 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000002, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024196C_A58E1C -.word 0x0000001A, 0x00000000 - -dlabel D_80241974_A58E24 -.word 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00D8, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000024, 0x00000002, 0xF8406190, 0x00000001, 0x00000043, 0x00000005, kpa_14_GetEntityPosition, 0xFD050F80, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, PlaySoundAt, 0x00000269, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000043, 0x00000001, kpa_14_RemovePadlock, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000047, 0x00000005, 0x80240A88, 0x00000100, 0x00000058, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8406190, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Padlock, 0x000007CB, 0x00000028, 0xFFFFFF5E, 0x0000010E, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x0000004E, 0x00000006, D_80241974_A58E24, 0x00000100, 0x00004000, D_8024196C_A58E1C, 0x00000000, 0x00000001, 0x00000012, 0x00000000, 0x00000047, 0x00000005, 0x80240A88, 0x00000100, 0x00000058, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000096, 0x0000015E, 0x0000001E, 0xFFFFFF6A, 0x00000011, 0xF8406191, 0x00000043, 0x00000007, MakeItemEntity, 0x00000082, 0x00000320, 0x0000001E, 0xFFFFFF6A, 0x00000011, 0xF8406192, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_14/A59060.data.s b/ver/us/asm/data/world/area_kpa/kpa_14/A59060.data.s deleted file mode 100644 index b3ee386937..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_14/A59060.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241BB0_A59060 -.word 0x0000004D, 0x00000001, 0x0000000B, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000005E, 0x00000067, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0x000000AF, 0x000000AF, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000069, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000005E, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000004, func_8024073C_A57BEC, 0xFE363C84, 0x0000005E, 0xFD050F8B, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000091, 0x00000043, 0x00000001, kpa_14_IsPartnerLakilester, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, kpa_14_func_80240710_A57BC0, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000065, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0x00000000, 0x000000AF, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000069, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000005E, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000004, func_8024073C_A57BEC, 0xFE363C84, 0x0000005E, 0xFD050F8B, 0x0000000C, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000001, kpa_14_IsPartnerLakilester, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, kpa_14_func_80240710_A57BC0, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000064, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_15/A59960.data.s b/ver/us/asm/data/world/area_kpa/kpa_15/A59960.data.s deleted file mode 100644 index 00d51cc343..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_15/A59960.data.s +++ /dev/null @@ -1,27 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802405D0_A59960 -.word 0x41400000, 0x00000000, 0xC2C20000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240938_A59CC8, D_802405D0_A59960, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190166 - -dlabel D_80240620_A599B0 -.word 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000064, 0x00000000, 0x00000008, 0x0000000A, 0x00000002, 0xF8406194, 0x00000000, 0x00000043, 0x00000002, PlayAmbientSounds, 0x00000004, 0x00000013, 0x00000000, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetMusicTrackVolumes, 0x00000005, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802406B0_A59A40 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kpa_15_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_15_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024074C_A59ADC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240C90, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802407A8_A59B38 -.word 0x00000047, 0x00000005, D_8024074C_A59ADC, 0x00080000, 0x00000014, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802407D4_A59B64 -.word 0x00000024, 0x00000002, 0xFE363C80, D_802407A8_A59B38, 0x00000044, 0x00000001, EnterWalk, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240800_A59B90 -.word 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFCE0, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802406B0_A59A40, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240938_A59CC8 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000016, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000046, 0x00000001, 0x80240C38, 0x0000000A, 0x00000002, 0xF8406194, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000042, 0x00000000, 0x00000044, 0x00000001, D_80240800_A59B90, 0x00000012, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000021, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_802407D4_A59B64, 0x00000044, 0x00000001, D_80240620_A599B0, 0x0000000A, 0x00000002, 0xF8406194, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000004, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000014, 0x00000003, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_15/A59E30.data.s b/ver/us/asm/data/world/area_kpa/kpa_15/A59E30.data.s deleted file mode 100644 index cd5c0251c4..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_15/A59E30.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel kpa_15_varStash -.word 0x00000000 - -dlabel D_80240AA4_A59E34 -.word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000002, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240B0C_A59E9C -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000046, 0x00000001, D_80240AA4_A59E34, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, AddItem, 0xFE363C8A, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C8A, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, AddBadge, 0xFE363C8A, 0xFE363C80, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240BEC_A59F7C -.word 0x00000024, 0x00000002, 0xFE363C8A, 0x0000001A, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000001, 0x00000024, 0x00000002, 0xF8406193, 0x00000001, 0x00000046, 0x00000001, D_80240B0C_A59E9C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_Chest, 0x000000DC, 0x0000001E, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8406193, 0x00000043, 0x00000002, AssignScript, D_80240BEC_A59F7C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_16/A5A3D0.data.s b/ver/us/asm/data/world/area_kpa/kpa_16/A5A3D0.data.s deleted file mode 100644 index f97185b336..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_16/A5A3D0.data.s +++ /dev/null @@ -1,36 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802403A0_A5A3D0 -.word 0x41C80000, 0x00000000, 0xC2B80000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240E5C_A5AE8C, D_802403A0_A5A3D0, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190167 - -dlabel D_802403F0_A5A420 -.word 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000064, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x0000000A, 0x00000002, 0xF8406194, 0x00000000, 0x00000043, 0x00000002, PlayAmbientSounds, 0x0000000B, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetMusicTrackVolumes, 0x00000005, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240480_A5A4B0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kpa_16_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_16_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024051C_A5A54C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802429E0, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240578_A5A5A8 -.word 0x00000047, 0x00000005, D_8024051C_A5A54C, 0x00080000, 0x00000032, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802405A4_A5A5D4 -.word 0x00000024, 0x00000002, 0xFE363C80, D_80240578_A5A5A8, 0x00000044, 0x00000001, EnterWalk, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802405D0_A5A600 -.word 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000190, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000320, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 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_80240480_A5A4B0, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x000000EC, 0x00000002, 0x00000043, 0x00000003, SetTexPanner, 0x000000ED, 0x00000002, 0x00000043, 0x00000003, SetTexPanner, 0x000000EE, 0x00000002, 0x00000043, 0x00000003, SetTexPanner, 0x000000EF, 0x00000002, 0x00000043, 0x00000003, SetTexPanner, 0x000000F0, 0x00000002, 0x00000043, 0x00000003, SetTexPanner, 0x000000F1, 0x00000002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240744_A5A774 -.word 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFB50, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFDA8, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80240480_A5A4B0, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00001800, 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_80240480_A5A4B0, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFCE0, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80240480_A5A4B0, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000BB8, 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_80240480_A5A4B0, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000C80, 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_80240480_A5A4B0, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000005, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000AF0, 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_80240480_A5A4B0, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000010, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000014, 0x00000001, 0x00000043, 0x00000003, SetTexPanner, 0x00000016, 0x00000001, 0x00000043, 0x00000003, SetTexPanner, 0x00000018, 0x00000001, 0x00000043, 0x00000003, SetTexPanner, 0x00000009, 0x00000002, 0x00000043, 0x00000003, SetTexPanner, 0x0000000A, 0x00000002, 0x00000043, 0x00000003, SetTexPanner, 0x0000000B, 0x00000002, 0x00000043, 0x00000003, SetTexPanner, 0x0000000E, 0x00000002, 0x00000043, 0x00000003, SetTexPanner, 0x0000000C, 0x00000002, 0x00000043, 0x00000003, SetTexPanner, 0x0000000D, 0x00000002, 0x00000043, 0x00000003, SetTexPanner, 0x0000000F, 0x00000002, 0x00000043, 0x00000003, SetTexPanner, 0x0000001A, 0x00000003, 0x00000043, 0x00000003, SetTexPanner, 0x0000001B, 0x00000004, 0x00000043, 0x00000003, SetTexPanner, 0x0000001C, 0x00000005, 0x00000043, 0x00000003, SetTexPanner, 0x0000001D, 0x00000005, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240E1C_A5AE4C -.word 0x00000028, 0x43EB0000, 0x41F00000, 0xC1F00000, 0x00000029, 0x43EB0000, 0x41F00000, 0xC1F00000, 0x00000027, 0x43FA0000, 0x43660000, 0xC30C0000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80240E5C_A5AE8C -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000016, 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, 0xF8406195, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000037, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x802429BC, 0x00000046, 0x00000001, D_802410F0_A5B120, 0x0000000A, 0x00000002, 0xF8406194, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x000000FC, 0x00000000, 0x00000044, 0x00000001, D_80240744_A5A774, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002F, 0x7FFFFE00, 0x00000012, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000082, 0x00000000, 0x00000044, 0x00000001, D_802405D0_A5A600, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002E, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_802405A4_A5A5D4, 0x00000044, 0x00000001, D_802403F0_A5A420, 0x0000000A, 0x00000002, 0xF8406194, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000002E, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000002B, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000002C, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000002D, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000036, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000002F, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000032, 0x00000003, 0x00000056, 0x00000000, 0x00000043, 0x00000002, ResetFromLava, D_80240E1C_A5AE4C, 0x00000057, 0x00000000, 0x00000057, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000036, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802410F0_A5B120 -.word 0x0000000A, 0x00000002, 0xF8406194, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0x000001D6, 0x000000E6, 0xFFFFFF6F, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignSwitchFlag, 0x00000007, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_16/A5B180.data.s b/ver/us/asm/data/world/area_kpa/kpa_16/A5B180.data.s deleted file mode 100644 index 916cfebc46..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_16/A5B180.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241150_A5B180 -.word 0x00000000, 0x00280018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190000 - -dlabel D_8024117C_A5B1AC -.word 0x00000003, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF9718887, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24FF280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000014A, 0x000000E6, 0xFFFFFF6A, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000014A, 0x000000AA, 0xFFFFFF6A, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_8024034C_A5A37C, 0x00000026, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFEC, 0x00000064, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24A7A76, 0x00000043, 0x00000005, TranslateModel, 0x00000012, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000010, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, ScaleModel, 0x00000010, 0xFE363C82, 0x00000001, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x00000032, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000002, func_80240310_A5A340, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000002E, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000002B, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000002C, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000002D, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000036, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000002F, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000032, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000036, 0x7FFFFE00, 0x00000044, 0x00000001, D_802405D0_A5A600, 0x00000043, 0x00000003, EnableGroup, 0x00000082, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x000000FC, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002E, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000002F, 0x7FFFFE00, 0x00000024, 0x00000002, 0xF8406194, 0x00000001, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24BE280, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x00000032, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000002, func_80240310_A5A340, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00010008, 0x00010001, 0x00000000, 0x0013001B, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x0002000D, 0x00020003, 0x00000000, 0x0013001C, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x0003000E, 0x00030003, 0x00000000, 0x0013001D, 0x00000016, 0x00000001, 0x00000004, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0x0013001E, 0x00000016, 0x00000001, 0x00000009, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00050004, 0x00050001, 0x00000000, 0x0013001F, 0x00000016, 0x00000001, 0x00000006, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00060004, 0x00060001, 0x00000000, 0x00130020, 0x00000016, 0x00000001, 0x00000007, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00070004, 0x00070001, 0x00000000, 0x00130021, 0x00000016, 0x00000001, 0x00000008, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00080009, 0x00080001, 0x00000000, 0x00130022, 0x00000023, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802417F8_A5B828 -.word 0x00000058, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x0000028A, 0xFFFFFF6F, 0x00000000, 0x00000059, 0x00000000, 0x00000058, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000002, 0xF24A8880, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0x0000028A, 0xFFFFFF5B, 0x00000000, 0x00000059, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A8A80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x0000028A, 0xFFFFFF88, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802418DC_A5B90C -.word 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, kpa_16_GetFloorCollider, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000027, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C81, 0x000000E6, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C80, 0x000002C6, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x00000262, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00000262, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000000, 0x00000000, 0x0000000F, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000001, 0x00000000, 0x00000000, 0x0000000F, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000002, 0x00000000, 0x00000000, 0x0000000F, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0x0000005A, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00580006, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580006, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00580006, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x0000022B, 0x000000E6, 0xFFFFFF6A, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000022B, 0x000000E6, 0xFFFFFF6A, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AA280, 0xF24A5280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000056, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0x000002A8, 0xFFFFFF6F, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580006, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A8A80, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x00000226, 0xFFFFFF5B, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x000001FE, 0xFFFFFF5B, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x00000217, 0xFFFFFF5B, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000002, 0x00000057, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00580006, 0x00580006, 0x00000001, 0x00130017, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000002, 0xF24A7E80, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00580006, 0x00580006, 0x00000000, 0x00130018, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000003, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000F, 0x00000013, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000010E, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0x0000010E, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00580001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00580001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00560002, 0x00560001, 0x00000000, 0x00130019, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000005A, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00580008, 0x00580001, 0x00000000, 0x0013001A, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24BE280, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00580006, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580006, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00580006, 0x00000044, 0x00000001, D_802417F8_A5B828, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF8406195, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, StartBossBattle, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802420B4_A5C0E4 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF8406195, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000037, 0x7FFFFE00, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242140_A5C170 -.word 0x0000000A, 0x00000002, 0xF8406194, 0x00000000, 0x00000044, 0x00000001, D_8024117C_A5B1AC, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8406195, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_802418DC_A5B90C, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_802420B4_A5C0E4, 0x00000012, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0x00000003, 0x00000043, 0x00000002, RemoveNpc, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0x00000002, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802421FC_A5C22C -.word 0x00000000, D_80241150_A5B180, 0x44124000, 0x43660000, 0xC3110000, 0x00C42D05, D_80242140_A5C170, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980005, 0x3FFF2666, 0x4CCC0005, 0x3FFF3FFF, 0x3FFF0005, 0x33326665, 0x33320005, 0x33327FFF, 0x26660005, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00580001, 0x00580004, 0x00580006, 0x00580006, 0x00580001, 0x00580001, 0x00580010, 0x00580010, 0x0058000C, 0x0058000B, 0x0058000D, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80241150_A5B180, 0x44034000, 0x43660000, 0xC3250000, 0x00C42D05, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980005, 0x3FFF2666, 0x4CCC0005, 0x3FFF3FFF, 0x3FFF0005, 0x33326665, 0x33320005, 0x33327FFF, 0x26660005, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00580001, 0x00580004, 0x00580006, 0x00580006, 0x00580001, 0x00580001, 0x00580010, 0x00580010, 0x0058000C, 0x0058000B, 0x0058000D, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, D_80241150_A5B180, 0x44098000, 0x43660000, 0xC2F00000, 0x00C42D05, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980005, 0x3FFF2666, 0x4CCC0005, 0x3FFF3FFF, 0x3FFF0005, 0x33326665, 0x33320005, 0x33327FFF, 0x26660005, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00580001, 0x00580004, 0x00580006, 0x00580006, 0x00580001, 0x00580001, 0x00580010, 0x00580010, 0x0058000C, 0x0058000B, 0x0058000D, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000003, D_80241150_A5B180, 0x43FC8000, 0x43660000, 0xC2F00000, 0x00C40D05, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x00050000, 0x00A30005, 0x00000082, 0x00050000, 0x00920005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0005, 0x33322666, 0x33320005, 0x33323FFF, 0x33320005, 0x33326665, 0x33320005, 0x33327FFF, 0x26660005, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00560001, 0x00560001, 0x00560001, 0x00560001, 0x00560001, 0x00560001, 0x00560004, 0x00560004, 0x00560002, 0x00560003, 0x00560001, 0x00560001, 0x00560001, 0x00560001, 0x00560001, 0x00560001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000004, D_802421FC_A5C22C, 0x221D0003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_17/A5CA20.data.s b/ver/us/asm/data/world/area_kpa/kpa_17/A5CA20.data.s deleted file mode 100644 index ecb01df3a1..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_17/A5CA20.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240000_A5CA20 -.word 0x44824000, 0x437A0000, 0xC3F80000, 0x42B40000, 0x44920000, 0x41F00000, 0xC40C0000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802402F0, D_80240000_A5CA20, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0019015F, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000064, 0x00000000, 0x00000008, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetMusicTrackVolumes, 0x00000005, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_17/A5CB00.data.s b/ver/us/asm/data/world/area_kpa/kpa_17/A5CB00.data.s deleted file mode 100644 index 3cfacffc2e..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_17/A5CB00.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802400E0_A5CB00 -.word 0x00000043, 0x00000007, MakeEntity, Entity_HeartBlock, 0x000003E8, 0x0000005A, 0xFFFFFDC1, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_WoodenCrate, 0x00000334, 0x0000003C, 0xFFFFFDCB, 0x00000000, 0xFFFFFFFF, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_WoodenCrate, 0x00000334, 0x0000001E, 0xFFFFFDCB, 0x00000000, 0x00000089, 0x80000000, 0x00000043, 0x00000002, AssignCrateFlag, 0xF8406197, 0x00000043, 0x00000008, MakeEntity, Entity_WoodenCrate, 0x00000357, 0x0000001E, 0xFFFFFDCB, 0x00000000, 0x00000095, 0x80000000, 0x00000043, 0x00000002, AssignCrateFlag, 0xF8406198, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_17/A5CBD0.data.s b/ver/us/asm/data/world/area_kpa/kpa_17/A5CBD0.data.s deleted file mode 100644 index 22fc6e1242..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_17/A5CBD0.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802401B0_A5CBD0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x0000000A, 0x00000002, 0xF8406194, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x80241698, 0x00000002, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x80241690, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240240_A5CC60 -.word 0x00000047, 0x00000005, D_802401B0_A5CBD0, 0x00080000, 0x0000000E, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024026C_A5CC8C -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000044, 0x00000001, D_80240240_A5CC60, 0x00000044, 0x00000001, 0x802404C8, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80240240_A5CC60, 0x00000044, 0x00000001, EnterWalk, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802402E0_A5CD00 -.word 0x44944000, 0x41F00000, 0xC40C8000, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000016, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E82, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E83, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E84, 0x00000000, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x80241674, 0x00000046, 0x00000001, D_802400E0_A5CB00, 0x0000000A, 0x00000002, 0xF8406196, 0x00000000, 0x00000047, 0x00000005, 0x80240854, 0x00100000, D_802402E0_A5CD00, 0x00000001, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000008, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000010, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0x80240060, 0x00000044, 0x00000001, D_8024026C_A5CC8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_17/A5CE90.data.s b/ver/us/asm/data/world/area_kpa/kpa_17/A5CE90.data.s deleted file mode 100644 index b661419720..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_17/A5CE90.data.s +++ /dev/null @@ -1,33 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240470_A5CE90 -.word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00170013, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000412, 0x0000001E, 0xFFFFFE10, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000412, 0x0000001E, 0xFFFFFE10, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000002, PartnerIsFlying, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000161, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080018, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000000, 0x00000028, 0x00000002, 0xFE363C81, 0x00000010, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0x0000001E, 0xFE363C82, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x000003FB, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080018, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000014, 0xF24A7CE7, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7E80, 0x00000043, 0x00000005, PlayerJump1, 0x00000406, 0x0000001E, 0xFFFFFE10, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x00130007, 0x000003E8, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, ClearPartnerMoveHistory, 0xFFFFFFFC, 0x00000043, 0x00000002, func_802CF56C, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000042, 0x00000000, 0x00000008, 0x00000008, 0x00000001, 0x0000000A, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000008, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000010, 0x7FFFFE00, 0x00000024, 0x00000002, 0xF8406196, 0x00000001, 0x00000043, 0x00000001, WaitForPlayerInputEnabled, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x0003000E, 0x00030003, 0x00000000, 0x00130016, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240978_A5D398 -.word 0x00000014, 0x00000001, 0xF8406196, 0x00000016, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF70F2E81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0x00130009, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0x0013000A, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000000, 0x00000023, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0x0013000B, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240A60_A5D480 -.word 0x00000014, 0x00000001, 0xF8406196, 0x00000016, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF70F2E82, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830204, 0x00830201, 0x00000000, 0x0013000C, 0x00000024, 0x00000002, 0xF70F2E82, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830204, 0x00830201, 0x00000000, 0x0013000D, 0x00000024, 0x00000002, 0xF70F2E82, 0x00000000, 0x00000023, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830204, 0x00830201, 0x00000000, 0x0013000E, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240B48_A5D568 -.word 0x00000014, 0x00000001, 0xF8406196, 0x00000016, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF70F2E83, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830304, 0x00830301, 0x00000000, 0x0013000F, 0x00000024, 0x00000002, 0xF70F2E83, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830304, 0x00830301, 0x00000000, 0x00130010, 0x00000024, 0x00000002, 0xF70F2E83, 0x00000000, 0x00000023, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830304, 0x00830301, 0x00000000, 0x00130011, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240C30_A5D650 -.word 0x00000014, 0x00000001, 0xF8406196, 0x00000016, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF70F2E84, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00890004, 0x00890001, 0x00000000, 0x00130012, 0x00000024, 0x00000002, 0xF70F2E84, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00890004, 0x00890001, 0x00000000, 0x00130013, 0x00000024, 0x00000002, 0xF70F2E84, 0x00000002, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00890004, 0x00890001, 0x00000000, 0x00130014, 0x00000024, 0x00000002, 0xF70F2E84, 0x00000001, 0x00000023, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00890004, 0x00890001, 0x00000000, 0x00130015, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240D54_A5D774 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80240978_A5D398, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x0000032D, 0x0000001E, 0xFFFFFE76, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240DAC_A5D7CC -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80240A60_A5D480, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000366, 0x0000001E, 0xFFFFFE2F, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240E04_A5D824 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80240B48_A5D568, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x000003A2, 0x0000001E, 0xFFFFFE70, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240E5C_A5D87C -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80240C30_A5D650, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x0000044C, 0x0000001E, 0xFFFFFE3E, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240EB4_A5D8D4 -.word 0x00000000, D_80240470_A5CE90, 0x00000000, 0xC47A0000, 0x00000000, 0x00000D01, D_80240D54_A5D774, 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, 0x00830001, 0x00830002, 0x00830003, 0x00830003, 0x00830001, 0x00830001, 0x00830006, 0x00830006, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00000000, 0x00000000, 0x00000000, 0x001A0113, 0x00000001, D_80240470_A5CE90, 0x00000000, 0xC47A0000, 0x00000000, 0x00000D01, D_80240DAC_A5D7CC, 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, 0x00830201, 0x00830202, 0x00830203, 0x00830203, 0x00830201, 0x00830201, 0x00830206, 0x00830206, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00000000, 0x00000000, 0x00000000, 0x001A0114, 0x00000002, D_80240470_A5CE90, 0x00000000, 0xC47A0000, 0x00000000, 0x00000D01, D_80240E04_A5D824, 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, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00000000, 0x00000000, 0x00000000, 0x001A0115, 0x00000003, D_80240470_A5CE90, 0x00000000, 0xC47A0000, 0x00000000, 0x00000D01, D_80240E5C_A5D87C, 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, 0x00890001, 0x00890001, 0x00890001, 0x00890001, 0x00890001, 0x00890001, 0x00890001, 0x00890001, 0x00890001, 0x00890001, 0x00890001, 0x00890001, 0x00890001, 0x00890001, 0x00890001, 0x00890001, 0x00000000, 0x00000000, 0x00000000, 0x001A0116, 0x00000004, D_80240EB4_A5D8D4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_32/A5E3D0.data.s b/ver/us/asm/data/world/area_kpa/kpa_32/A5E3D0.data.s deleted file mode 100644 index 842ea68f14..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_32/A5E3D0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240310_A5E3D0 -.word 0xC40FC000, 0xC2480000, 0xC0A00000, 0x42B40000, 0x44084000, 0xC2480000, 0xC0A00000, 0x43870000, 0x4405C000, 0x430C0000, 0x00000000, 0x43870000, 0xC405C000, 0x430C0000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240944, D_80240310_A5E3D0, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x0019016B, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000064, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetMusicTrackVolumes, 0x00000006, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_32/A5E4C0.data.s b/ver/us/asm/data/world/area_kpa/kpa_32/A5E4C0.data.s deleted file mode 100644 index 8676f2826d..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_32/A5E4C0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240400_A5E4C0 -.word 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x00000000, 0x0000000A, 0x00000000, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_32/A5E500.data.s b/ver/us/asm/data/world/area_kpa/kpa_32/A5E500.data.s deleted file mode 100644 index 410f82bd9a..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_32/A5E500.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240440_A5E500 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kpa_32_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_32_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802404DC_A5E59C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000015, 0x00000024, 0x00000002, 0xFE363C82, 0x0000007F, 0x00000024, 0x00000002, 0xFE363C83, 0x00000081, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80240FA0, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240580_A5E640 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240FA8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802405DC_A5E69C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001A, 0x00000024, 0x00000002, 0xFE363C82, 0x0000006E, 0x00000024, 0x00000002, 0xFE363C83, 0x0000006C, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80240FB0, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240680_A5E740 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0x00000023, 0x00000024, 0x00000002, 0xFE363C82, 0x00000073, 0x00000024, 0x00000002, 0xFE363C83, 0x00000075, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80240FB8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240724_A5E7E4 -.word 0x00000047, 0x00000005, D_802404DC_A5E59C, 0x00000100, 0x00000015, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240580_A5E640, 0x00080000, 0x0000001E, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802405DC_A5E69C, 0x00000100, 0x0000001A, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240680_A5E740, 0x00000100, 0x00000023, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802407A4_A5E864 -.word 0x00000043, 0x00000002, GetLoadType, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000044, 0x00000001, EnterSavePoint, 0x00000044, 0x00000001, D_80240724_A5E7E4, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000081, 0x00000024, 0x00000002, 0xFE363C83, 0x0000007F, 0x00000044, 0x00000001, EnterDoubleDoor, 0x00000044, 0x00000001, D_80240724_A5E7E4, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, D_80240724_A5E7E4, 0x00000044, 0x00000001, EnterWalk, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0x0000006E, 0x00000024, 0x00000002, 0xFE363C83, 0x0000006C, 0x00000044, 0x00000001, EnterDoubleDoor, 0x00000044, 0x00000001, D_80240724_A5E7E4, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C82, 0x00000073, 0x00000024, 0x00000002, 0xFE363C83, 0x00000075, 0x00000044, 0x00000001, EnterDoubleDoor, 0x00000044, 0x00000001, D_80240724_A5E7E4, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000016, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000046, 0x00000001, D_80240400_A5E4C0, 0x00000044, 0x00000001, D_802407A4_A5E864, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x80240390, 0x00000043, 0x00000003, EnableTexPanning, 0x00000044, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000047, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000004A, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000004D, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000014, 0x00000024, 0x00000002, 0xFE363C82, 0x00000014, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFEC, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFEC, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 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_80240440_A5E500, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00000014, 0x00000024, 0x00000002, 0xFE363C82, 0x00000014, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFEC, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFEC, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 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_80240440_A5E500, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0x00000014, 0x00000024, 0x00000002, 0xFE363C82, 0x00000014, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFEC, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFEC, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 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_80240440_A5E500, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000024, 0x00000002, 0xFE363C81, 0x00000014, 0x00000024, 0x00000002, 0xFE363C82, 0x00000014, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFEC, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFEC, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 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_80240440_A5E500, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, ScaleModel, 0x00000044, 0xF24A7E95, 0x00000001, 0xF24A7E95, 0x00000043, 0x00000005, ScaleModel, 0x00000047, 0xF24A7E95, 0x00000001, 0xF24A7E95, 0x00000043, 0x00000005, ScaleModel, 0x0000004A, 0xF24A7E95, 0x00000001, 0xF24A7E95, 0x00000043, 0x00000005, ScaleModel, 0x0000004D, 0xF24A7E95, 0x00000001, 0xF24A7E95, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, ScaleModel, 0x00000044, 0xF24A7E80, 0x00000001, 0xF24A7E80, 0x00000043, 0x00000005, ScaleModel, 0x00000047, 0xF24A7E80, 0x00000001, 0xF24A7E80, 0x00000043, 0x00000005, ScaleModel, 0x0000004A, 0xF24A7E80, 0x00000001, 0xF24A7E80, 0x00000043, 0x00000005, ScaleModel, 0x0000004D, 0xF24A7E80, 0x00000001, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, ScaleModel, 0x00000044, 0xF24A7E6C, 0x00000001, 0xF24A7E6C, 0x00000043, 0x00000005, ScaleModel, 0x00000047, 0xF24A7E6C, 0x00000001, 0xF24A7E6C, 0x00000043, 0x00000005, ScaleModel, 0x0000004A, 0xF24A7E6C, 0x00000001, 0xF24A7E6C, 0x00000043, 0x00000005, ScaleModel, 0x0000004D, 0xF24A7E6C, 0x00000001, 0xF24A7E6C, 0x00000008, 0x00000001, 0x0000000A, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_33/A5F390.data.s b/ver/us/asm/data/world/area_kpa/kpa_33/A5F390.data.s deleted file mode 100644 index 8366146607..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_33/A5F390.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240310_A5F390 -.word 0xC408C000, 0xC2480000, 0xC0A00000, 0x42B40000, 0x4408C000, 0xC2480000, 0xC0A00000, 0x43870000, 0x44098000, 0x430C0000, 0x00000000, 0x43870000, 0xC4098000, 0x430C0000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240944, D_80240310_A5F390, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190178, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000064, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetMusicTrackVolumes, 0x00000007, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_33/A5F480.data.s b/ver/us/asm/data/world/area_kpa/kpa_33/A5F480.data.s deleted file mode 100644 index 9439949c22..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_33/A5F480.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240400_A5F480 -.word 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x00000000, 0x0000000A, 0x00000000, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_33/A5F4C0.data.s b/ver/us/asm/data/world/area_kpa/kpa_33/A5F4C0.data.s deleted file mode 100644 index 32fef9291e..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_33/A5F4C0.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240440_A5F4C0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kpa_33_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_33_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802404DC_A5F55C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240FA0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240538_A5F5B8 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C82, 0x0000007C, 0x00000024, 0x00000002, 0xFE363C83, 0x0000007A, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80240FA8, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802405DC_A5F65C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00000019, 0x00000024, 0x00000002, 0xFE363C82, 0x0000006B, 0x00000024, 0x00000002, 0xFE363C83, 0x0000006D, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80240FB0, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240680_A5F700 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0x00000023, 0x00000024, 0x00000002, 0xFE363C82, 0x00000070, 0x00000024, 0x00000002, 0xFE363C83, 0x00000072, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80240FB8, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240724_A5F7A4 -.word 0x00000047, 0x00000005, D_802404DC_A5F55C, 0x00080000, 0x00000014, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240538_A5F5B8, 0x00000100, 0x0000001E, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802405DC_A5F65C, 0x00000100, 0x00000019, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240680_A5F700, 0x00000100, 0x00000023, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802407A4_A5F824 -.word 0x00000043, 0x00000002, GetLoadType, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000044, 0x00000001, EnterSavePoint, 0x00000044, 0x00000001, D_80240724_A5F7A4, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80240724_A5F7A4, 0x00000044, 0x00000001, EnterWalk, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0x0000007C, 0x00000024, 0x00000002, 0xFE363C83, 0x0000007A, 0x00000044, 0x00000001, EnterDoubleDoor, 0x00000044, 0x00000001, D_80240724_A5F7A4, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0x0000006B, 0x00000024, 0x00000002, 0xFE363C83, 0x0000006D, 0x00000044, 0x00000001, EnterDoubleDoor, 0x00000044, 0x00000001, D_80240724_A5F7A4, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C82, 0x00000070, 0x00000024, 0x00000002, 0xFE363C83, 0x00000072, 0x00000044, 0x00000001, EnterDoubleDoor, 0x00000044, 0x00000001, D_80240724_A5F7A4, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000016, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000046, 0x00000001, D_80240400_A5F480, 0x00000044, 0x00000001, D_802407A4_A5F824, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x80240390, 0x00000043, 0x00000003, EnableTexPanning, 0x00000045, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000048, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000004B, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000004E, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000014, 0x00000024, 0x00000002, 0xFE363C82, 0x00000014, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFEC, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFEC, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 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_80240440_A5F4C0, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00000014, 0x00000024, 0x00000002, 0xFE363C82, 0x00000014, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFEC, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFEC, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 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_80240440_A5F4C0, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0x00000014, 0x00000024, 0x00000002, 0xFE363C82, 0x00000014, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFEC, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFEC, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 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_80240440_A5F4C0, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000024, 0x00000002, 0xFE363C81, 0x00000014, 0x00000024, 0x00000002, 0xFE363C82, 0x00000014, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFEC, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFEC, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 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_80240440_A5F4C0, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, ScaleModel, 0x00000045, 0xF24A7E95, 0x00000001, 0xF24A7E95, 0x00000043, 0x00000005, ScaleModel, 0x00000048, 0xF24A7E95, 0x00000001, 0xF24A7E95, 0x00000043, 0x00000005, ScaleModel, 0x0000004B, 0xF24A7E95, 0x00000001, 0xF24A7E95, 0x00000043, 0x00000005, ScaleModel, 0x0000004E, 0xF24A7E95, 0x00000001, 0xF24A7E95, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, ScaleModel, 0x00000045, 0xF24A7E80, 0x00000001, 0xF24A7E80, 0x00000043, 0x00000005, ScaleModel, 0x00000048, 0xF24A7E80, 0x00000001, 0xF24A7E80, 0x00000043, 0x00000005, ScaleModel, 0x0000004B, 0xF24A7E80, 0x00000001, 0xF24A7E80, 0x00000043, 0x00000005, ScaleModel, 0x0000004E, 0xF24A7E80, 0x00000001, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, ScaleModel, 0x00000045, 0xF24A7E6C, 0x00000001, 0xF24A7E6C, 0x00000043, 0x00000005, ScaleModel, 0x00000048, 0xF24A7E6C, 0x00000001, 0xF24A7E6C, 0x00000043, 0x00000005, ScaleModel, 0x0000004B, 0xF24A7E6C, 0x00000001, 0xF24A7E6C, 0x00000043, 0x00000005, ScaleModel, 0x0000004E, 0xF24A7E6C, 0x00000001, 0xF24A7E6C, 0x00000008, 0x00000001, 0x0000000A, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_40/A60040.data.s b/ver/us/asm/data/world/area_kpa/kpa_40/A60040.data.s deleted file mode 100644 index fc14ea5597..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_40/A60040.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240000_A60040 -.word 0xC3F50000, 0x00000000, 0xC2A00000, 0x42B40000, 0x43F50000, 0x00000000, 0xC1F00000, 0x43870000, 0x43F50000, 0x42F00000, 0xC3020000, 0x43870000, 0xC3D70000, 0x43050000, 0xC2A00000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8024036C, D_80240000_A60040, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190174, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000064, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetMusicTrackVolumes, 0x00000007, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_40/A60130.data.s b/ver/us/asm/data/world/area_kpa/kpa_40/A60130.data.s deleted file mode 100644 index 190a7f689e..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_40/A60130.data.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802400F0_A60130 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000009, 0x00000024, 0x00000002, 0xFE363C82, 0x00000059, 0x00000024, 0x00000002, 0xFE363C83, 0x00000057, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80240410, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240194_A601D4 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240418, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802401F0_A60230 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000024, 0x00000002, 0xF70F2E8B, 0x00000001, 0x00000043, 0x00000003, GotoMap, 0x80240420, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024025C_A6029C -.word 0x00000047, 0x00000005, D_802400F0_A60130, 0x00000100, 0x00000009, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240194_A601D4, 0x00080000, 0x00000013, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802401F0_A60230, 0x00080000, 0x0000000E, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802402C0_A60300 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000059, 0x00000024, 0x00000002, 0xFE363C83, 0x00000057, 0x00000044, 0x00000001, EnterDoubleDoor, 0x00000044, 0x00000001, D_8024025C_A6029C, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024025C_A6029C, 0x00000044, 0x00000001, EnterWalk, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000016, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000044, 0x00000001, D_802402C0_A60300, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x80240080, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_41/A60470.data.s b/ver/us/asm/data/world/area_kpa/kpa_41/A60470.data.s deleted file mode 100644 index f465f88806..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_41/A60470.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240000_A60470 -.word 0xC3AA0000, 0x00000000, 0xC28C0000, 0x42B40000, 0x43AA0000, 0x00000000, 0xC28C0000, 0x43870000, 0x43AA0000, 0x42EE0000, 0xC3660000, 0x43870000, 0xC3AA0000, 0x42EE0000, 0xC3660000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8024049C, D_80240000_A60470, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190175, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000064, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetMusicTrackVolumes, 0x00000007, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_41/A60560.data.s b/ver/us/asm/data/world/area_kpa/kpa_41/A60560.data.s deleted file mode 100644 index b1de381455..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_41/A60560.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802400F0_A60560 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240540, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024014C_A605BC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000014, 0x00000001, 0xF70F2E8B, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x00000027, 0x00000002, 0xF70F2E8B, 0x00000001, 0x00000043, 0x00000003, GotoMap, 0x80240548, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000003, 0x0000001D, 0x00000001, 0x00000005, 0x00000043, 0x00000003, GotoMap, 0x80240540, 0x00000003, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240238_A606A8 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240540, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240294_A60704 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000014, 0x00000001, 0xF70F2E8B, 0x00000016, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xF70F2E8B, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x80240550, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000027, 0x00000002, 0xF70F2E8B, 0x00000001, 0x00000043, 0x00000003, GotoMap, 0x80240548, 0x00000003, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x00000043, 0x00000003, GotoMap, 0x80240540, 0x00000003, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024039C_A6080C -.word 0x00000047, 0x00000005, D_802400F0_A60560, 0x00080000, 0x0000000C, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024014C_A605BC, 0x00080000, 0x00000011, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240238_A606A8, 0x00080000, 0x00000016, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240294_A60704, 0x00080000, 0x0000001B, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024041C_A6088C -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xF70F2E8B, 0x00000005, 0x0000001C, 0x00000000, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024039C_A6080C, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000016, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000044, 0x00000001, D_8024041C_A6088C, 0x00000044, 0x00000001, 0x80240080, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_50/A623F0.data.s b/ver/us/asm/data/world/area_kpa/kpa_50/A623F0.data.s deleted file mode 100644 index 3b35a2014d..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_50/A623F0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241A20_A623F0 -.word 0xC3F00000, 0x00000000, 0xC1E00000, 0x42B40000, 0x44408000, 0x00000000, 0xC1E00000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241CF8, D_80241A20_A623F0, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0019015A, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000064, 0x00000000, 0x00000008, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetMusicTrackVolumes, 0x00000005, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_50/A624D0.data.s b/ver/us/asm/data/world/area_kpa/kpa_50/A624D0.data.s deleted file mode 100644 index 841e1672a8..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_50/A624D0.data.s +++ /dev/null @@ -1,66 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241B00_A624D0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80243490, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241B5C_A6252C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000E, 0x00000024, 0x00000002, 0xFE363C82, 0x00000087, 0x00000024, 0x00000002, 0xFE363C83, 0x00000085, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80243498, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241C00_A625D0 -.word 0x00000047, 0x00000005, D_80241B00_A624D0, 0x00080000, 0x00000008, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241B5C_A6252C, 0x00000100, 0x0000000E, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241C48_A62618 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80241C00_A625D0, 0x00000044, 0x00000001, EnterWalk, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0x00000087, 0x00000024, 0x00000002, 0xFE363C83, 0x00000085, 0x00000044, 0x00000001, EnterDoubleDoor, 0x00000044, 0x00000001, D_80241C00_A625D0, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000016, 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, 0x00000001, D_80243460_A63E30, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000082, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000084, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000000E, 0x7FFFFE00, 0x00000044, 0x00000001, D_80241C48_A62618, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x80241A80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241DF0_A627C0 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000005, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, OnPlayerFled, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241EC0_A62890 -.word 0x3FC00000, 0x0000001E, 0x0000001E, 0x42F00000, 0x41A00000, 0x00000005, 0x40400000, 0x0000005A, 0x00000003, 0x430C0000, 0x41A00000, 0x00000000 - -dlabel D_80241EF0_A628C0 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000046, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000006, 0x00000043, 0x00000002, kpa_50_RangedAttackAI_Main, D_80241EC0_A62890, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241F60_A62930 -.word 0x00000000, 0x00240018, 0x00000000, 0x00000000, D_80241EF0_A628C0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x001B0000 - -dlabel D_80241F8C_A6295C -.word 0x40ACCCCD, 0x00000000, 0x00000000, 0x41500000, 0x3FB33333, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80241FBC_A6298C -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000014, 0x00000043, 0x00000002, kpa_50_ProjectileAI_Main, D_80241F8C_A6295C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242018_A629E8 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242028_A629F8 -.word 0x00000043, 0x00000001, kpa_50_GetEncounterEnemyIsOwner, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80242018_A629E8, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000003, 0x00000043, 0x00000001, kpa_50_ProjectileAI_Reflect, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000020, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000001, func_800457F8, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80241FBC_A6298C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802421F0_A62BC0 -.word 0x00000000, 0x000C000C, 0x00000000, 0x00000000, D_80241FBC_A6298C, D_80242028_A629F8, 0x00000000, D_80241DF0_A627C0, 0x00000000, 0x00000000, 0x00000008 - -dlabel D_8024221C_A62BEC -.word 0x005A000D, 0xFFFFFFFF - -dlabel D_80242224_A62BF4 -.word 0x3F800000, 0x0000001E, 0x00000032, 0x42B40000, 0x42200000, 0x00000002, 0x41300000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 - -dlabel D_80242254_A62C24 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000005, 0x00000043, 0x00000002, kpa_50_TackleAI_Main, D_80242224_A62BF4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802422C4_A62C94 -.word 0x00000000, 0x00280018, 0x00000000, 0x00000000, D_80242254_A62C24, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000 - -dlabel D_802422F0_A62CC0 -.word 0x00000000, D_802422C4_A62C94, 0xC37B0000, 0x00000000, 0xC1F00000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980005, 0x3FFF2666, 0x4CCC0005, 0x3FFF3FFF, 0x3FFF0005, 0x33326665, 0x33320005, 0x33327FFF, 0x26660005, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0xFFFFFF05, 0x00000000, 0xFFFFFFE2, 0x00000032, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFF05, 0x00000000, 0xFFFFFFE2, 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, 0x00580001, 0x00580004, 0x00580006, 0x00580006, 0x00580001, 0x00580001, 0x00580010, 0x00580010, 0x0058000C, 0x0058000B, 0x0058000D, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802424E0_A62EB0 -.word 0x00000001, D_802422C4_A62C94, 0x42C80000, 0x00000000, 0xC1F00000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980005, 0x3FFF2666, 0x4CCC0005, 0x3FFF3FFF, 0x3FFF0005, 0x33326665, 0x33320005, 0x33327FFF, 0x26660005, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0x00000064, 0x00000000, 0xFFFFFFE2, 0x00000032, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000064, 0x00000000, 0xFFFFFFE2, 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, 0x00580001, 0x00580004, 0x00580006, 0x00580006, 0x00580001, 0x00580001, 0x00580010, 0x00580010, 0x0058000C, 0x0058000B, 0x0058000D, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802426D0_A630A0 -.word 0x0000000A, D_80241F60_A62930, 0x43E10000, 0x00000000, 0xC1F00000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x00050000, 0x00A30005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980004, 0x3FFF2666, 0x4CCC0004, 0x3FFF3FFF, 0x3FFF0004, 0x33326665, 0x33320004, 0x33327FFF, 0x26660004, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0003, 0x33322666, 0x33320003, 0x33323FFF, 0x33320003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0x000001C2, 0x00000000, 0xFFFFFFE2, 0x00000032, 0x00000000, 0xFFFF8001, 0x00000000, 0x000001C2, 0x00000000, 0xFFFFFFE2, 0x0000012C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x005A0002, 0x005A0004, 0x005A0007, 0x005A0007, 0x005A0002, 0x005A0002, 0x005A000E, 0x005A000E, 0x005A0018, 0x005A0019, 0x005A0002, 0x005A0002, 0x005A0002, 0x005A0002, 0x005A0002, 0x005A0002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000B, D_802421F0_A62BC0, 0x00000000, 0xC47A0000, 0x00000000, 0x00800C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 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, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 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, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x00000000, 0x00000000, D_8024221C_A62BEC, 0x00000000, 0x0000000C, D_802421F0_A62BC0, 0x00000000, 0xC47A0000, 0x00000000, 0x00800C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 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, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 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, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x00000000, 0x00000000, D_8024221C_A62BEC, 0x00000000, 0x0000000D, D_802421F0_A62BC0, 0x00000000, 0xC47A0000, 0x00000000, 0x00800C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 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, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 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, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x00000000, 0x00000000, D_8024221C_A62BEC, 0x00000000, 0x0000000E, D_802421F0_A62BC0, 0x00000000, 0xC47A0000, 0x00000000, 0x00800C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 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, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 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, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x00000000, 0x00000000, D_8024221C_A62BEC, 0x00000000, 0x0000000F, D_802421F0_A62BC0, 0x00000000, 0xC47A0000, 0x00000000, 0x00800C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 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, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 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, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x00000000, 0x00000000, D_8024221C_A62BEC, 0x00000000, 0x00000010, D_802421F0_A62BC0, 0x00000000, 0xC47A0000, 0x00000000, 0x00800C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 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, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 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, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x00000000, 0x00000000, D_8024221C_A62BEC, 0x00000000 - -dlabel D_80243460_A63E30 -.word 0x00000001, D_802422F0_A62CC0, 0x22180001, 0x00000001, D_802424E0_A62EB0, 0x221A0001, 0x00000007, D_802426D0_A630A0, 0x220F0001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_51/A65CB0.data.s b/ver/us/asm/data/world/area_kpa/kpa_51/A65CB0.data.s deleted file mode 100644 index 186ac32c89..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_51/A65CB0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241C20_A65CB0 -.word 0xC3EB0000, 0x00000000, 0xC1E00000, 0x42B40000, 0x443A4000, 0x00000000, 0xC1E00000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241F5C, D_80241C20_A65CB0, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0019015D, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000064, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetMusicTrackVolumes, 0x00000006, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_51/A65D80.data.s b/ver/us/asm/data/world/area_kpa/kpa_51/A65D80.data.s deleted file mode 100644 index 121b436e35..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_51/A65D80.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241CF0_A65D80 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000009, 0x00000024, 0x00000002, 0xFE363C82, 0x00000081, 0x00000024, 0x00000002, 0xFE363C83, 0x00000083, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80242F3C, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241D94_A65E24 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000E, 0x00000024, 0x00000002, 0xFE363C82, 0x00000087, 0x00000024, 0x00000002, 0xFE363C83, 0x00000085, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80242F44, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241E38_A65EC8 -.word 0x00000047, 0x00000005, D_80241CF0_A65D80, 0x00000100, 0x00000009, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241D94_A65E24, 0x00000100, 0x0000000E, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241E80_A65F10 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000081, 0x00000024, 0x00000002, 0xFE363C83, 0x00000083, 0x00000044, 0x00000001, EnterDoubleDoor, 0x00000044, 0x00000001, D_80241E38_A65EC8, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0x00000087, 0x00000024, 0x00000002, 0xFE363C83, 0x00000085, 0x00000044, 0x00000001, EnterDoubleDoor, 0x00000044, 0x00000001, D_80241E38_A65EC8, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000016, 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, 0x00000001, 0x80242EEC, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000009, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000000E, 0x7FFFFE00, 0x00000044, 0x00000001, D_80241E80_A65F10, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x80241C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_51/A660E0.data.s b/ver/us/asm/data/world/area_kpa/kpa_51/A660E0.data.s deleted file mode 100644 index d4ac5dd5e0..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_51/A660E0.data.s +++ /dev/null @@ -1,66 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel kpa_51_MagikoopaAI_TeleportAnim -.float 0.8 - -dlabel D_80242054_A660E4 -.float 1.0 - -dlabel D_80242058_A660E8 -.byte 0xC8, 0x00, 0x00, 0x00, 0x3F, 0x19, 0x99, 0x9A, 0x3F, 0x80, 0x00, 0x00, 0xB4, 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0xA0, 0x00, 0x00, 0x00, 0x3E, 0xCC, 0xCC, 0xCD, 0x3F, 0x80, 0x00, 0x00, 0x8C, 0x00, 0x00, 0x00, 0x3E, 0x99, 0x99, 0x9A, 0x3F, 0x8C, 0xCC, 0xCD, 0x78, 0x00, 0x00, 0x00, 0x3E, 0x4C, 0xCC, 0xCD, 0x3F, 0xA6, 0x66, 0x66, 0x6E, 0x00, 0x00, 0x00, 0x3E, 0x19, 0x99, 0x9A, 0x3F, 0xCC, 0xCC, 0xCD, 0x64, 0x00, 0x00, 0x00, 0x3D, 0xF5, 0xC2, 0x8F, 0x40, 0x00, 0x00, 0x00, 0x5A, 0x00, 0x00, 0x00, 0x3D, 0xE1, 0x47, 0xAE, 0x40, 0x40, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00, 0x3D, 0xCC, 0xCC, 0xCD, 0x40, 0x80, 0x00, 0x00, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -dlabel D_802420D4_A66164 -.word 0x3F800000, 0x00000078, 0x0000001E, 0x42C80000, 0x00000000, 0x0000000A, 0x40400000, 0x0000005A, 0x0000000F, 0x43480000, 0x00000000, 0x00000001 - -dlabel D_80242104_A66194 -.word 0x00000043, 0x00000002, kpa_51_MagikoopaAI_Main, D_802420D4_A66164, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242124_A661B4 -.word 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802421B0_A66240 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, kpa_51_MagikoopaAI_OnPlayerWon, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, kpa_51_MagikoopaAI_OnPlayerFled, 0x00000043, 0x00000002, OnPlayerFled, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242230_A662C0 -.word 0x00000000, 0x0020001C, 0x00000000, 0x00000000, D_80242104_A66194, D_80242124_A661B4, 0x00000000, D_802421B0_A66240, 0x00000000, 0x00000000, 0x001A0000 - -dlabel D_8024225C_A662EC -.word 0x00560000, 0x00560001, 0x00560001, 0x00560001, 0x00560002, 0x00560003, 0x00560004, 0xFFFFFFFF - -dlabel D_8024227C_A6630C -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000028, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802422B4_A66344 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000037, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802422EC_A6637C -.word 0x00000043, 0x00000001, kpa_51_MagikoopaAI_SpellMain, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242308_A66398 -.word 0x00000043, 0x00000001, kpa_51_MagikoopaAI_OnHitInit, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_51_MagikoopaAI_OnHit, 0x00000044, 0x00000001, EnemyNpcHit, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024235C_A663EC -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, OnPlayerFled, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242418_A664A8 -.word 0x00560000, 0x00000000, D_8024227C_A6630C, 0x00000000, D_802422EC_A6637C, D_80242308_A66398, 0x00000000, D_8024235C_A663EC, 0x00000000, 0x00000000, 0x00000000, 0x00570000, 0x00000000, D_802422B4_A66344, 0x00000000, D_802422EC_A6637C, D_80242308_A66398, 0x00000000, D_8024235C_A663EC, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80242470_A66500 -.word 0x3F800000, 0x0000001E, 0x00000032, 0x42B40000, 0x42200000, 0x00000002, 0x41300000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 - -dlabel D_802424A0_A66530 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000005, 0x00000043, 0x00000002, kpa_51_TackleAI_Main, D_80242470_A66500, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242510_A665A0 -.word 0x00000000, 0x00280018, 0x00000000, 0x00000000, D_802424A0_A66530, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000 - -dlabel D_8024253C_A665CC -.word 0x00000000, D_80242230_A662C0, 0xC3020000, 0x00000000, 0xC1F00000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x8005008C, 0x00050000, 0x00A30005, 0x00000082, 0x00050000, 0x00920005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0005, 0x33322666, 0x33320005, 0x33323FFF, 0x33320005, 0x33326665, 0x33320005, 0x33327FFF, 0x26660005, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0xFFFFFF7E, 0x00000000, 0xFFFFFFE2, 0x00000064, 0x00000014, 0xFFFF8001, 0x00000001, 0xFFFFFF7E, 0x00000000, 0xFFFFFFE2, 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, 0x00560001, 0x00560001, 0x00560001, 0x00560001, 0x00560001, 0x00560001, 0x00560004, 0x00560004, 0x00560002, 0x00560003, 0x00560001, 0x00560001, 0x00560001, 0x00560001, 0x00560001, 0x00560001, 0x00000003, 0x00000000, D_8024225C_A662EC, 0x00000000, 0x00000001, D_80242418_A664A8, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 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, 0x00560000, 0x00560000, 0x00560000, 0x00560000, 0x00560000, 0x00560000, 0x00560000, 0x00560000, 0x00560000, 0x00560000, 0x00560000, 0x00560000, 0x00560000, 0x00560000, 0x00560000, 0x00560000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_8024291C_A669AC -.word 0x00000002, D_80242230_A662C0, 0x43160000, 0x00000000, 0xC1F00000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x00050000, 0x00A30005, 0x00000082, 0x00050000, 0x00920005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0005, 0x33322666, 0x33320005, 0x33323FFF, 0x33320005, 0x33326665, 0x33320005, 0x33327FFF, 0x26660005, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0x00000096, 0x00000000, 0xFFFFFFE2, 0x00000064, 0x00000014, 0xFFFF8001, 0x00000001, 0x00000096, 0x00000000, 0xFFFFFFE2, 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, 0x00560001, 0x00560001, 0x00560001, 0x00560001, 0x00560001, 0x00560001, 0x00560004, 0x00560004, 0x00560002, 0x00560003, 0x00560001, 0x00560001, 0x00560001, 0x00560001, 0x00560001, 0x00560001, 0x00000003, 0x00000000, D_8024225C_A662EC, 0x00000000, 0x00000003, D_80242418_A664A8, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 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, 0x00560000, 0x00560000, 0x00560000, 0x00560000, 0x00560000, 0x00560000, 0x00560000, 0x00560000, 0x00560000, 0x00560000, 0x00560000, 0x00560000, 0x00560000, 0x00560000, 0x00560000, 0x00560000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80242CFC_A66D8C -.word 0x00000004, D_80242510_A665A0, 0x00000000, 0x00000000, 0xC1F00000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980005, 0x3FFF2666, 0x4CCC0005, 0x3FFF3FFF, 0x3FFF0005, 0x33326665, 0x33320005, 0x33327FFF, 0x26660005, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0x00000000, 0x00000000, 0xFFFFFFE2, 0x00000032, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFE2, 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, 0x00580001, 0x00580004, 0x00580006, 0x00580006, 0x00580001, 0x00580001, 0x00580010, 0x00580010, 0x0058000C, 0x0058000B, 0x0058000D, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000002, D_8024253C_A665CC, 0x222C0001, 0x00000002, D_8024291C_A669AC, 0x22290001, 0x00000001, D_80242CFC_A66D8C, 0x22240001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_52/A68430.data.s b/ver/us/asm/data/world/area_kpa/kpa_52/A68430.data.s deleted file mode 100644 index ba4ae44d77..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_52/A68430.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241330_A68430 -.word 0xC3AC8000, 0x00000000, 0xC2A00000, 0x42B40000, 0x43A50000, 0x00000000, 0xC1C80000, 0x43870000, 0x43A50000, 0x42EE0000, 0xC30C0000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241974, D_80241330_A68430, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190171, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000064, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetMusicTrackVolumes, 0x00000007, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_52/A68510.data.s b/ver/us/asm/data/world/area_kpa/kpa_52/A68510.data.s deleted file mode 100644 index acc9f221a7..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_52/A68510.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241410_A68510 -.word 0x0000001A, 0x00000000 - -dlabel D_80241418_A68518 -.word 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00D8, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000024, 0x00000002, 0xF8406199, 0x00000001, 0x00000043, 0x00000005, kpa_52_GetEntityPosition, 0xFD050F80, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, PlaySoundAt, 0x00000269, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000043, 0x00000001, kpa_52_RemovePadlock, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000047, 0x00000005, 0x802416B4, 0x00000100, 0x0000000F, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8406199, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Padlock, 0x00000160, 0x0000000A, 0xFFFFFFE7, 0x0000010E, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x0000004E, 0x00000006, D_80241418_A68518, 0x00000100, 0x00004000, D_80241410_A68510, 0x00000000, 0x00000001, 0x00000012, 0x00000000, 0x00000047, 0x00000005, 0x802416B4, 0x00000100, 0x0000000F, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_52/A68710.data.s b/ver/us/asm/data/world/area_kpa/kpa_52/A68710.data.s deleted file mode 100644 index f443a2be32..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_52/A68710.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241610_A68710 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000014, 0x00000024, 0x00000002, 0xFE363C82, 0x00000078, 0x00000024, 0x00000002, 0xFE363C83, 0x0000007A, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x802439C0, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C82, 0x0000007E, 0x00000024, 0x00000002, 0xFE363C83, 0x0000007C, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x802439C8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241758_A68858 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00000019, 0x00000024, 0x00000002, 0xFE363C82, 0x00000082, 0x00000024, 0x00000002, 0xFE363C83, 0x00000080, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x802439D0, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802417FC_A688FC -.word 0x00000047, 0x00000005, D_80241610_A68710, 0x00000100, 0x00000014, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241758_A68858, 0x00000100, 0x00000019, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241844_A68944 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000078, 0x00000024, 0x00000002, 0xFE363C83, 0x0000007A, 0x00000044, 0x00000001, EnterDoubleDoor, 0x00000044, 0x00000001, D_802417FC_A688FC, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0x0000007E, 0x00000024, 0x00000002, 0xFE363C83, 0x0000007C, 0x00000044, 0x00000001, EnterDoubleDoor, 0x00000044, 0x00000001, D_802417FC_A688FC, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0x00000082, 0x00000024, 0x00000002, 0xFE363C83, 0x00000080, 0x00000044, 0x00000001, EnterDoubleDoor, 0x00000044, 0x00000001, D_802417FC_A688FC, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000016, 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, 0x00000001, 0x80243994, 0x00000046, 0x00000001, 0x80241568, 0x00000044, 0x00000001, D_80241844_A68944, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x802413A0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_52/A68B40.data.s b/ver/us/asm/data/world/area_kpa/kpa_52/A68B40.data.s deleted file mode 100644 index d5feb5f655..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_52/A68B40.data.s +++ /dev/null @@ -1,39 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241A40_A68B40 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000005, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, OnPlayerFled, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241B10_A68C10 -.word 0x3FC00000, 0x0000001E, 0x0000001E, 0x42F00000, 0x41A00000, 0x00000005, 0x40400000, 0x0000005A, 0x00000003, 0x430C0000, 0x41A00000, 0x00000000 - -dlabel D_80241B40_A68C40 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000046, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000006, 0x00000043, 0x00000002, kpa_52_RangedAttackAI_Main, D_80241B10_A68C10, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241BB0_A68CB0 -.word 0x00000000, 0x00240018, 0x00000000, 0x00000000, D_80241B40_A68C40, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x001B0000 - -dlabel D_80241BDC_A68CDC -.word 0x40ACCCCD, 0x00000000, 0x00000000, 0x41500000, 0x3FB33333, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80241C0C_A68D0C -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000014, 0x00000043, 0x00000002, kpa_52_ProjectileAI_Main, D_80241BDC_A68CDC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241C68_A68D68 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241C78_A68D78 -.word 0x00000043, 0x00000001, kpa_52_GetEncounterEnemyIsOwner, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80241C68_A68D68, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000003, 0x00000043, 0x00000001, kpa_52_ProjectileAI_Reflect, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000020, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000001, func_800457F8, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80241C0C_A68D0C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241E40_A68F40 -.word 0x00000000, 0x000C000C, 0x00000000, 0x00000000, D_80241C0C_A68D0C, D_80241C78_A68D78, 0x00000000, D_80241A40_A68B40, 0x00000000, 0x00000000, 0x00000008 - -dlabel D_80241E6C_A68F6C -.word 0x005A000D, 0xFFFFFFFF - -dlabel D_80241E74_A68F74 -.word 0x0000000A, D_80241BB0_A68CB0, 0x433E0000, 0x00000000, 0xC1D80000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x00050000, 0x00A30005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980004, 0x3FFF2666, 0x4CCC0004, 0x3FFF3FFF, 0x3FFF0004, 0x33326665, 0x33320004, 0x33327FFF, 0x26660004, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0003, 0x33322666, 0x33320003, 0x33323FFF, 0x33320003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0x000000BE, 0x00000000, 0xFFFFFFE5, 0x00000032, 0x00000000, 0xFFFF8001, 0x00000000, 0x000000BE, 0x00000000, 0xFFFFFFE5, 0x0000012C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x005A0002, 0x005A0004, 0x005A0007, 0x005A0007, 0x005A0002, 0x005A0002, 0x005A000E, 0x005A000E, 0x005A0018, 0x005A0019, 0x005A0002, 0x005A0002, 0x005A0002, 0x005A0002, 0x005A0002, 0x005A0002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000B, D_80241E40_A68F40, 0x00000000, 0xC47A0000, 0x00000000, 0x00800C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 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, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 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, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x00000000, 0x00000000, D_80241E6C_A68F6C, 0x00000000, 0x0000000C, D_80241E40_A68F40, 0x00000000, 0xC47A0000, 0x00000000, 0x00800C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 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, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 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, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x00000000, 0x00000000, D_80241E6C_A68F6C, 0x00000000, 0x0000000D, D_80241E40_A68F40, 0x00000000, 0xC47A0000, 0x00000000, 0x00800C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 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, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 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, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x00000000, 0x00000000, D_80241E6C_A68F6C, 0x00000000, 0x0000000E, D_80241E40_A68F40, 0x00000000, 0xC47A0000, 0x00000000, 0x00800C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 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, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 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, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x00000000, 0x00000000, D_80241E6C_A68F6C, 0x00000000, 0x0000000F, D_80241E40_A68F40, 0x00000000, 0xC47A0000, 0x00000000, 0x00800C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 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, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 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, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x00000000, 0x00000000, D_80241E6C_A68F6C, 0x00000000, 0x00000010, D_80241E40_A68F40, 0x00000000, 0xC47A0000, 0x00000000, 0x00800C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 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, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 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, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x00000000, 0x00000000, D_80241E6C_A68F6C, 0x00000000 - -dlabel D_80242C04_A69D04 -.word 0x00000014, D_80241BB0_A68CB0, 0x433E0000, 0x42F00000, 0xC3110000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x00050000, 0x00A30005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980004, 0x3FFF2666, 0x4CCC0004, 0x3FFF3FFF, 0x3FFF0004, 0x33326665, 0x33320004, 0x33327FFF, 0x26660004, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0003, 0x33322666, 0x33320003, 0x33323FFF, 0x33320003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0x000000BE, 0x00000078, 0xFFFFFF6F, 0x00000032, 0x00000000, 0xFFFF8001, 0x00000000, 0x000000BE, 0x00000078, 0xFFFFFF7E, 0x0000008C, 0x00000028, 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, 0x005A0002, 0x005A0004, 0x005A0007, 0x005A0007, 0x005A0002, 0x005A0002, 0x005A000E, 0x005A000E, 0x005A0018, 0x005A0019, 0x005A0002, 0x005A0002, 0x005A0002, 0x005A0002, 0x005A0002, 0x005A0002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000015, D_80241E40_A68F40, 0x00000000, 0xC47A0000, 0x00000000, 0x00800C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 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, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 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, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x00000000, 0x00000000, D_80241E6C_A68F6C, 0x00000000, 0x00000016, D_80241E40_A68F40, 0x00000000, 0xC47A0000, 0x00000000, 0x00800C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 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, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 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, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x00000000, 0x00000000, D_80241E6C_A68F6C, 0x00000000, 0x00000017, D_80241E40_A68F40, 0x00000000, 0xC47A0000, 0x00000000, 0x00800C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 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, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 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, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x00000000, 0x00000000, D_80241E6C_A68F6C, 0x00000000, 0x00000018, D_80241E40_A68F40, 0x00000000, 0xC47A0000, 0x00000000, 0x00800C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 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, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 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, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x00000000, 0x00000000, D_80241E6C_A68F6C, 0x00000000, 0x00000019, D_80241E40_A68F40, 0x00000000, 0xC47A0000, 0x00000000, 0x00800C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 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, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 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, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x00000000, 0x00000000, D_80241E6C_A68F6C, 0x00000000, 0x0000001A, D_80241E40_A68F40, 0x00000000, 0xC47A0000, 0x00000000, 0x00800C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 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, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 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, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x00000000, 0x00000000, D_80241E6C_A68F6C, 0x00000000, 0x00000007, D_80241E74_A68F74, 0x22150001, 0x00000007, D_80242C04_A69D04, 0x22130001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_53/A6AE10.data.s b/ver/us/asm/data/world/area_kpa/kpa_53/A6AE10.data.s deleted file mode 100644 index 02db088603..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_53/A6AE10.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240170_A6AE10 -.word 0xC3F00000, 0x00000000, 0xC1E00000, 0x42B40000, 0x44400000, 0x00000000, 0xC1E00000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802404C4, D_80240170_A6AE10, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0019017E, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000064, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetMusicTrackVolumes, 0x00000007, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_53/A6AEE0.data.s b/ver/us/asm/data/world/area_kpa/kpa_53/A6AEE0.data.s deleted file mode 100644 index c349154f06..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_53/A6AEE0.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240240_A6AEE0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000009, 0x00000024, 0x00000002, 0xFE363C82, 0x00000081, 0x00000024, 0x00000002, 0xFE363C83, 0x00000083, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80241E3C, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802402E4_A6AF84 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000E, 0x00000024, 0x00000002, 0xFE363C82, 0x00000087, 0x00000024, 0x00000002, 0xFE363C83, 0x00000085, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80241E44, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240388_A6B028 -.word 0x00000047, 0x00000005, D_80240240_A6AEE0, 0x00000100, 0x00000009, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF840619B, 0x00000001, 0x00000047, 0x00000005, D_802402E4_A6AF84, 0x00000100, 0x0000000E, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802403E8_A6B088 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000081, 0x00000024, 0x00000002, 0xFE363C83, 0x00000083, 0x00000044, 0x00000001, EnterDoubleDoor, 0x00000044, 0x00000001, D_80240388_A6B028, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0x00000087, 0x00000024, 0x00000002, 0xFE363C83, 0x00000085, 0x00000044, 0x00000001, EnterDoubleDoor, 0x00000044, 0x00000001, D_80240388_A6B028, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000016, 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, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x80241DBC, 0x00000046, 0x00000001, 0x80241DE0, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000009, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000000E, 0x7FFFFE00, 0x00000044, 0x00000001, D_802403E8_A6B088, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x802401D0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_53/A6B270.data.s b/ver/us/asm/data/world/area_kpa/kpa_53/A6B270.data.s deleted file mode 100644 index cdb2c047eb..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_53/A6B270.data.s +++ /dev/null @@ -1,45 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802405D0_A6B270 -.word 0x00000000, 0x002E0024, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_802405FC_A6B29C -.word 0x00000000, 0x001E002D, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80240628_A6B2C8 -.word 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFF7E, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000000F, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0xFFFFFFFF, 0x00000000, 0x0000002D, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x004E0004, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000096, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C80, 0xFFFFFFE2, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x004E0002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802407D4_A6B474 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000056, 0x00000000, 0x00000027, 0x00000002, 0xFE363C84, 0x0000000F, 0x00000005, 0x00000001, 0x00000008, 0x00000043, 0x0000000F, PlayEffect, 0x00000001, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000020B8, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000005A0, 0x00000014, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000000, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000002CD, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFA60, 0x00000000, 0x00000014, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x004E0005, 0x004E0002, 0x00000000, 0x0013002D, 0x00000043, 0x00000002, StartBossBattle, 0x00000003, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0x000002BC, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x004E0004, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C80, 0xFE363C82, 0x00000023, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240AF4_A6B794 -.word 0x00000043, 0x00000002, RemoveNpc, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0x00000001, 0x00000024, 0x00000002, 0xF840619B, 0x00000001, 0x00000047, 0x00000005, D_802402E4_A6AF84, 0x00000100, 0x0000000E, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240B6C_A6B80C -.word 0x0000000A, 0x00000002, 0xF840619B, 0x00000000, 0x0000000A, 0x00000002, 0xF840619A, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFF88, 0x00000000, 0xFFFFFFE2, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80240628_A6B2C8, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_80240AF4_A6B794, 0x00000012, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240C1C_A6B8BC -.word 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x000C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x000C0026, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x000C0001, 0x000C0026, 0x00000000, 0x00130023, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x000C0001, 0x000C0026, 0x00000000, 0x00130024, 0x00000024, 0x00000002, 0xF840619A, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x000C0001, 0x000C0026, 0x00000000, 0x00130025, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000002, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x000C0001, 0x000C0026, 0x00000000, 0x00130026, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000023, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x000C0002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x000A0001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240DF8_A6BA98 -.word 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x000C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x000C0026, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x000C0001, 0x000C0026, 0x00000000, 0x00130027, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x000C0001, 0x000C0026, 0x00000000, 0x00130028, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x000C0002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x000A0001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240F0C_A6BBAC -.word 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000002, 0x00000001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x000C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x000C0026, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x000C0001, 0x000C0026, 0x00000000, 0x00130029, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x000C0002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x000A0001, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000002, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024105C_A6BCFC -.word 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000002, 0x00000001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x000C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x000C0026, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C81, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x000C0001, 0x000C0026, 0x00000000, 0x0013002A, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x000C0001, 0x000C0026, 0x00000000, 0x0013002B, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000002, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0x0000010E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x000C0001, 0x000C0026, 0x00000000, 0x0013002B, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x000C0001, 0x000C0026, 0x00000000, 0x0013002C, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x08000000, 0x00000001, 0x00000043, 0x00000003, BindNpcAI, 0x00000002, D_802407D4_A6B474, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x000C0002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x000A0001, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000002, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802412E0_A6BF80 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000001, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000014, 0x00000001, 0xFE363C8F, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000E, 0x00000002, 0xFE363C80, 0x000002BC, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, GetSelfVar, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000022, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_80240050_A6ACF0, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000000E, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x000A0001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x000002FD, 0x00000000, 0xFFFFFFE2, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x000002FD, 0x00000000, 0xFFFFFFE2, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000096, 0x00000000, 0xFFFFFFE2, 0x00000043, 0x00000003, SetNpcYaw, 0x00000002, 0x0000010E, 0x00000043, 0x00000003, BindNpcAI, 0x00000002, D_80240628_A6B2C8, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0x00000000, D_80240DF8_A6BA98, 0x00000043, 0x00000004, SetNpcVar, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000003, BindNpcHit, 0x00000001, D_8024105C_A6BCFC, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000002, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C81, 0x000002FD, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x000A0001, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0x000002BC, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241664_A6C304 -.word 0x0000000A, 0x00000002, 0xF840619B, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x000002FD, 0x00000000, 0xFFFFFFE2, 0x0000000A, 0x00000002, 0xF840619A, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80240C1C_A6B8BC, 0x00000012, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80240DF8_A6BA98, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_802412E0_A6BF80, 0x00000012, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024171C_A6C3BC -.word 0x0000000A, 0x00000002, 0xF840619B, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x000002FD, 0x00000000, 0xFFFFFFE2, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000002, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x0000000A, 0x00000002, 0xF840619A, 0x00000000, 0x00000043, 0x00000003, BindNpcHit, 0xFFFFFFFF, D_80240F0C_A6BBAC, 0x00000012, 0x00000000, 0x00000043, 0x00000003, BindNpcHit, 0xFFFFFFFF, D_8024105C_A6BCFC, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802417EC_A6C48C -.word 0x00000000, D_802405D0_A6B270, 0x00000000, 0xC47A0000, 0x00000000, 0x00A60D0D, D_80241664_A6C304, 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, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x001A0120, 0x00000001, D_802405D0_A6B270, 0x00000000, 0xC47A0000, 0x00000000, 0x01B40F0C, D_8024171C_A6C3BC, 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, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x001A0120, 0x00000002, D_802405FC_A6B29C, 0x00000000, 0xC47A0000, 0x00000000, 0x00E40D09, D_80240B6C_A6B80C, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x00050000, 0x00A30005, 0x00000082, 0x00050000, 0x00920005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0005, 0x33322666, 0x33320005, 0x33323FFF, 0x33320005, 0x33326665, 0x33320005, 0x33327FFF, 0x26660005, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x004E0002, 0x004E0003, 0x004E0004, 0x004E0004, 0x004E0002, 0x004E0002, 0x004E000A, 0x004E000A, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000003, D_802417EC_A6C48C, 0x24020001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_53/A6CA80.data.s b/ver/us/asm/data/world/area_kpa/kpa_53/A6CA80.data.s deleted file mode 100644 index fbaca7fa04..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_53/A6CA80.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241DE0_A6CA80 -.word 0x00000043, 0x00000007, MakeEntity, Entity_HeartBlock, 0xFFFFFE61, 0x0000003C, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_60/A6CEF0.data.s b/ver/us/asm/data/world/area_kpa/kpa_60/A6CEF0.data.s deleted file mode 100644 index 21d9ae1cdc..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_60/A6CEF0.data.s +++ /dev/null @@ -1,72 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802403F0_A6CEF0 -.word 0xC33F0000, 0x00000000, 0xC3070000, 0x43340000, 0x438A0000, 0x00000000, 0xC3988000, 0x43340000, 0x43C10000, 0xC1C80000, 0xC3670000, 0x43340000, 0x42960000, 0x41A80000, 0x44160000, 0x42B40000, 0x00000000, 0xC47A0000, 0x00000000, 0x00000000, 0x00000000, 0xC47A0000, 0x00000000, 0x43340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_8024113C_A6DC3C, D_802403F0_A6CEF0, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190157, 0x0000000B, 0x00000002, 0xF5DE0180, 0x0000005C, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000064, 0x00000000, 0x00000008, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetMusicTrackVolumes, 0x00000004, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240510_A6D010 -.word 0x0000001A, 0x00000000 - -dlabel D_80240518_A6D018 -.word 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00D8, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000024, 0x00000002, 0xF840619C, 0x00000001, 0x00000043, 0x00000005, kpa_60_GetEntityPosition, 0xFD050F80, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, PlaySoundAt, 0x00000269, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000043, 0x00000001, kpa_60_RemovePadlock, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000047, 0x00000005, D_80240A64_A6D564, 0x00000100, 0x0000001F, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240668_A6D168 -.word 0x0000000A, 0x00000002, 0xF840619C, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Padlock, 0xFFFFFF38, 0x0000000A, 0xFFFFFF31, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x0000004E, 0x00000006, D_80240518_A6D018, 0x00000100, 0x00004000, D_80240510_A6D010, 0x00000000, 0x00000001, 0x00000012, 0x00000000, 0x00000047, 0x00000005, D_80240A64_A6D564, 0x00000100, 0x0000001F, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_RedBlock, 0xFFFFFDEC, 0x00000091, 0xFFFFFFC5, 0x00000000, 0x00000133, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840619D, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240740_A6D240 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kpa_60_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_60_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802407DC_A6D2DC -.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000001B, 0x000001DF, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000003E, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFF6, 0x00000014, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000040, 0xFE363C80, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000002D, 0x00000019, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000040, 0xFFFFFFF6, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240920_A6D420 -.word 0x00000043, 0x00000005, MakeLerp, 0x0000002D, 0x00000000, 0x00000019, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000040, 0xFFFFFFF6, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFF6, 0x00000000, 0x00000014, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000040, 0xFE363C80, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000003E, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000001B, 0x000001E0, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240A64_A6D564 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001F, 0x00000024, 0x00000002, 0xFE363C82, 0x0000000D, 0x00000024, 0x00000002, 0xFE363C83, 0x0000000B, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x802418A0, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240B18_A6D618 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x0000000A, 0x00000002, 0xF8406194, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x802418B0, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x802418A8, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240BA8_A6D6A8 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x0000000A, 0x00000002, 0xF8406194, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x802418B0, 0x00000003, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x802418A8, 0x00000003, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240C38_A6D738 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000046, 0x00000001, D_802407DC_A6D2DC, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802418B8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240CBC_A6D7BC -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFFE2, 0x00000015, 0x0000024E, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFFE2, 0x00000015, 0x0000024E, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000003E, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000040, 0xFFFFFFF6, 0x00000000, 0x0000002D, 0x00000056, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0x0000004B, 0x00000244, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x00000041, 0x00000258, 0x00000000, 0x00000046, 0x00000001, D_80240920_A6D420, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240E1C_A6D91C -.word 0x00000047, 0x00000005, D_80240B18_A6D618, 0x00080000, 0x00000021, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240BA8_A6D6A8, 0x00080000, 0x00000024, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240C38_A6D738, 0x00000100, 0x0000001B, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240E80_A6D980 -.word 0x00000043, 0x00000003, EnableGroup, 0x00000007, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000000A, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000022, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240ECC_A6D9CC -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_80240E80_A6D980, 0x00000024, 0x00000002, 0xFE363C82, 0x0000000D, 0x00000024, 0x00000002, 0xFE363C83, 0x0000000B, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000044, 0x00000001, D_80240E1C_A6D91C, 0x00000016, 0x00000001, 0x00000003, 0x00000046, 0x00000001, D_80240E80_A6D980, 0x00000056, 0x00000000, 0x00000046, 0x00000001, D_80240CBC_A6D7BC, 0x00000044, 0x00000001, D_80240E1C_A6D91C, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000004, 0x00000044, 0x00000001, D_802413C4_A6DEC4, 0x00000016, 0x00000001, 0x00000005, 0x00000044, 0x00000001, D_80241670_A6E170, 0x0000001C, 0x00000000, 0x00000046, 0x00000001, D_80240E80_A6D980, 0x00000024, 0x00000002, 0xFE363C80, D_80240E1C_A6D91C, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240FFC_A6DAFC -.word 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFCE0, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80240740_A6D240, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x0000004A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024110C_A6DC0C -.word 0x0000000D, 0xC3E38000, 0xC1700000, 0x420C0000, 0x0000000E, 0xC4084000, 0x41200000, 0x41700000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_8024113C_A6DC3C -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000016, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF8406349, 0x00000001, 0x00000046, 0x00000001, D_80240668_A6D168, 0x00000044, 0x00000001, D_80240ECC_A6D9CC, 0x0000000A, 0x00000002, 0xF8406194, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000008C, 0x00000000, 0x00000044, 0x00000001, D_80240FFC_A6DAFC, 0x00000012, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000006A, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8406194, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000009, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000024, 0x00000003, 0x00000056, 0x00000000, 0x00000043, 0x00000002, ResetFromLava, D_8024110C_A6DC0C, 0x00000057, 0x00000000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802412D0_A6DDD0 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000092, 0xFD050F8A, 0xFD050F8B, 0xFD050F8C, 0x00000043, 0x00000006, RotateGroup, 0x00000092, 0xFD050F8D, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0x0000008F, 0x00000028, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802413A0_A6DEA0 -.word 0xC2680000, 0xC3260000, 0xC4084000, 0xC2E80000, 0xC2480000, 0xC43DC000, 0xC2F00000, 0x43200000, 0xC4728000 - -dlabel D_802413C4_A6DEC4 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8D, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8B, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000000, 0x00000044, 0x00000001, D_802412D0_A6DDD0, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x0000001E, 0x00000010, 0x00001000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0xFFFFFFBA, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0xFFFFFFBA, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000182, 0x00000043, 0x00000005, LoadPath, 0x0000002D, D_802413A0_A6DEA0, 0x00000003, 0x00000000, 0x00000003, 0x00000001, 0x0000005A, 0x00000043, 0x00000001, GetNextPathPos, 0x00000024, 0x00000002, 0xFD050F8A, 0xFE363C81, 0x00000024, 0x00000002, 0xFD050F8B, 0xFE363C82, 0x00000024, 0x00000002, 0xFD050F8C, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x0000005A, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x0000000A, 0x00000002, 0xF8405B88, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000024, 0x00000002, 0xF8405B88, 0x00000001, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000005DC, 0x00000043, 0x00000004, GotoMapSpecial, 0x802418C8, 0x00000008, 0x00000006, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x802418C0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241640_A6E140 -.word 0xC2F00000, 0x43200000, 0xC4728000, 0xC2E80000, 0xC2480000, 0xC43DC000, 0xC2680000, 0xC3260000, 0xC4084000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80241670_A6E170 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x000000B4, 0x00000001, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFC, 0x0000010E, 0x00000024, 0x00000002, 0xFD050F8D, 0x000000B4, 0x00000024, 0x00000002, 0xFD050F8A, 0xFFFFFF88, 0x00000024, 0x00000002, 0xFD050F8B, 0x000000A0, 0x00000024, 0x00000002, 0xFD050F8C, 0xFFFFFC36, 0x00000044, 0x00000001, D_802412D0_A6DDD0, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x0000001E, 0x00000010, 0x00001000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0xFFFFFFBA, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0xFFFFFFBA, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000183, 0x00000043, 0x00000005, LoadPath, 0x0000002D, D_80241640_A6E140, 0x00000004, 0x00000000, 0x00000003, 0x00000001, 0x0000005A, 0x00000043, 0x00000001, GetNextPathPos, 0x00000024, 0x00000002, 0xFD050F8A, 0xFE363C81, 0x00000024, 0x00000002, 0xFD050F8B, 0xFE363C82, 0x00000024, 0x00000002, 0xFD050F8C, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x0000005A, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000003, GotoMap, 0x802418D0, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_61/A70720.data.s b/ver/us/asm/data/world/area_kpa/kpa_61/A70720.data.s deleted file mode 100644 index ddc33a85bf..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_61/A70720.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242340_A70720 -.word 0xC2C80000, 0xC3200000, 0x42E80000, 0x42F00000, 0xC2C80000, 0x43480000, 0x42CC0000, 0x42F00000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80242B28, D_80242340_A70720, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190177, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000064, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetMusicTrackVolumes, 0x00000004, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_61/A707F0.data.s b/ver/us/asm/data/world/area_kpa/kpa_61/A707F0.data.s deleted file mode 100644 index ed33a69da5..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_61/A707F0.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242410_A707F0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kpa_61_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_61_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802424AC_A7088C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000D, 0x00000024, 0x00000002, 0xFE363C82, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C83, 0x00000019, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80243CC0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242550_A70930 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000012, 0x00000024, 0x00000002, 0xFE363C82, 0x0000001D, 0x00000024, 0x00000002, 0xFE363C83, 0x0000001F, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80243CC8, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802425F4_A709D4 -.word 0x00000047, 0x00000005, D_802424AC_A7088C, 0x00000100, 0x0000000D, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80242550_A70930, 0x00000100, 0x00000012, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024263C_A70A1C -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C83, 0x00000019, 0x00000044, 0x00000001, EnterDoubleDoor, 0x00000044, 0x00000001, D_802425F4_A709D4, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0x0000001D, 0x00000024, 0x00000002, 0xFE363C83, 0x0000001F, 0x00000044, 0x00000001, EnterDoubleDoor, 0x00000044, 0x00000001, D_802425F4_A709D4, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242718_A70AF8 -.word 0x00000043, 0x00000003, EnableTexPanning, 0x00000014, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000015, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000016, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000017, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFA6, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 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_80242410_A707F0, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF7E, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 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_80242410_A707F0, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF88, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 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_80242410_A707F0, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFBA, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 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_80242410_A707F0, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000016, 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, 0x00000001, 0x80243B98, 0x00000046, 0x00000001, 0x80243BE0, 0x00000044, 0x00000001, D_8024263C_A70A1C, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, D_80242718_A70AF8, 0x00000044, 0x00000001, 0x802423A0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_61/A70FE0.data.s b/ver/us/asm/data/world/area_kpa/kpa_61/A70FE0.data.s deleted file mode 100644 index e9aac223e6..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_61/A70FE0.data.s +++ /dev/null @@ -1,57 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242C00_A70FE0 -.word 0x3F800000, 0x0000001E, 0x00000032, 0x42B40000, 0x42200000, 0x00000002, 0x41300000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 - -dlabel D_80242C30_A71010 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000005, 0x00000043, 0x00000002, kpa_61_TackleAI_Main, D_80242C00_A70FE0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242CA0_A71080 -.word 0x00000000, 0x00280018, 0x00000000, 0x00000000, D_80242C30_A71010, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000 - -dlabel D_80242CCC_A710AC -.word 0x3FC00000, 0x0000003C, 0x0000001E, 0x42C80000, 0x41A00000, 0x00000003, 0x40A00000, 0x0000003C, 0x0000000A, 0x43160000, 0x41A00000, 0x00000001 - -dlabel D_80242CFC_A710DC -.word 0x00000043, 0x00000002, kpa_61_FlyingMagikoopaAI_Main, D_80242CCC_A710AC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242D1C_A710FC -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, OnPlayerFled, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242DB8_A71198 -.word 0x00000000, 0x00210020, 0x00000000, 0x00000000, D_80242CFC_A710DC, EnemyNpcHit, 0x00000000, D_80242D1C_A710FC, 0x00000000, 0x00000000, 0x001A0000 - -dlabel D_80242DE4_A711C4 -.word 0x00570000, 0x00570001, 0x00570001, 0x00570001, 0x00570002, 0x00570003, 0x00570004, 0xFFFFFFFF - -dlabel D_80242E04_A711E4 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000028, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242E3C_A7121C -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000037, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242E74_A71254 -.word 0x00000043, 0x00000001, kpa_61_MagikoopaAI_SpellMain, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242E90_A71270 -.word 0x00000043, 0x00000001, kpa_61_FlyingMagikoopaAI_OnHitInit, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_61_FlyingMagikoopaAI_OnHit, 0x00000044, 0x00000001, EnemyNpcHit, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242EE4_A712C4 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, OnPlayerFled, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00560000, 0x00000000, D_80242E04_A711E4, 0x00000000, D_80242E74_A71254, D_80242E90_A71270, 0x00000000, D_80242EE4_A712C4, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80242FCC_A713AC -.word 0x00570000, 0x00000000, D_80242E3C_A7121C, 0x00000000, D_80242E74_A71254, D_80242E90_A71270, 0x00000000, D_80242EE4_A712C4, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80242FF8_A713D8 -.word 0x00000000, D_80242CA0_A71080, 0x43960000, 0xC3200000, 0x430C0000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980005, 0x3FFF2666, 0x4CCC0005, 0x3FFF3FFF, 0x3FFF0005, 0x33326665, 0x33320005, 0x33327FFF, 0x26660005, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0x0000012C, 0xFFFFFF60, 0x0000008C, 0x00000032, 0x00000000, 0xFFFF8001, 0x00000000, 0x0000012C, 0xFFFFFF60, 0x0000008C, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00580001, 0x00580004, 0x00580006, 0x00580006, 0x00580001, 0x00580001, 0x00580010, 0x00580010, 0x0058000C, 0x0058000B, 0x0058000D, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802431E8_A715C8 -.word 0x00000001, D_80242CA0_A71080, 0x44548000, 0xC3200000, 0x43C30000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980005, 0x3FFF2666, 0x4CCC0005, 0x3FFF3FFF, 0x3FFF0005, 0x33326665, 0x33320005, 0x33327FFF, 0x26660005, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0x00000352, 0xFFFFFF60, 0x00000186, 0x00000032, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000352, 0xFFFFFF60, 0x00000186, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00580001, 0x00580004, 0x00580006, 0x00580006, 0x00580001, 0x00580001, 0x00580010, 0x00580010, 0x0058000C, 0x0058000B, 0x0058000D, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802433D8_A717B8 -.word 0x00000002, D_80242DB8_A71198, 0x43FA0000, 0x437A0000, 0xC2480000, 0x00000800, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x8005008C, 0x00050000, 0x00A30005, 0x00000082, 0x00050000, 0x00920005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0005, 0x33322666, 0x33320005, 0x33323FFF, 0x33320005, 0x33326665, 0x33320005, 0x33327FFF, 0x26660005, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0x000001F4, 0x000000FA, 0xFFFFFFCE, 0x00000078, 0x00000019, 0xFFFF8001, 0x00000001, 0x000001F4, 0x000000FA, 0xFFFFFFCE, 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, 0x00570000, 0x00570001, 0x00570001, 0x00570001, 0x00570001, 0x00570001, 0x00570004, 0x00570004, 0x00570002, 0x00570003, 0x00570001, 0x00570001, 0x00570001, 0x00570001, 0x00570001, 0x00570001, 0x00000003, 0x00000000, D_80242DE4_A711C4, 0x00000000, 0x00000003, D_80242FCC_A713AC, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 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, 0x00570000, 0x00570000, 0x00570000, 0x00570000, 0x00570000, 0x00570000, 0x00570000, 0x00570000, 0x00570000, 0x00570000, 0x00570000, 0x00570000, 0x00570000, 0x00570000, 0x00570000, 0x00570000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802437B8_A71B98 -.word 0x00000004, D_80242DB8_A71198, 0x43480000, 0x437A0000, 0xC2480000, 0x00000800, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x8005008C, 0x00050000, 0x00A30005, 0x00000082, 0x00050000, 0x00920005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0005, 0x33322666, 0x33320005, 0x33323FFF, 0x33320005, 0x33326665, 0x33320005, 0x33327FFF, 0x26660005, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0x000000C8, 0x000000FA, 0xFFFFFFCE, 0x00000078, 0x00000019, 0xFFFF8001, 0x00000001, 0x000000C8, 0x000000FA, 0xFFFFFFCE, 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, 0x00570000, 0x00570001, 0x00570001, 0x00570001, 0x00570001, 0x00570001, 0x00570004, 0x00570004, 0x00570002, 0x00570003, 0x00570001, 0x00570001, 0x00570001, 0x00570001, 0x00570001, 0x00570001, 0x00000003, 0x00000000, D_80242DE4_A711C4, 0x00000000, 0x00000005, D_80242FCC_A713AC, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 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, 0x00570000, 0x00570000, 0x00570000, 0x00570000, 0x00570000, 0x00570000, 0x00570000, 0x00570000, 0x00570000, 0x00570000, 0x00570000, 0x00570000, 0x00570000, 0x00570000, 0x00570000, 0x00570000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80242FF8_A713D8, 0x22230009, 0x00000001, D_802431E8_A715C8, 0x22210009, 0x00000002, D_802433D8_A717B8, 0x22350009, 0x00000002, D_802437B8_A71B98, 0x22330009, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_61/A71FC0.data.s b/ver/us/asm/data/world/area_kpa/kpa_61/A71FC0.data.s deleted file mode 100644 index e61f01148c..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_61/A71FC0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80243BE0_A71FC0 -.word 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0xFFFFFF1F, 0xFFFFFF9C, 0x000000AF, 0x00000000, 0x0000008C, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840619F, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x0000003C, 0xFFFFFF9C, 0x0000003C, 0x00000000, 0x000000A3, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84061A0, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x0000023F, 0xFFFFFF9C, 0x0000003C, 0x00000000, 0x0000008C, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84061A1, 0x00000043, 0x00000007, MakeItemEntity, 0x000000A2, 0x0000042E, 0xFFFFFFD8, 0x00000140, 0x00000011, 0xF84061A2, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_62/A72610.data.s b/ver/us/asm/data/world/area_kpa/kpa_62/A72610.data.s deleted file mode 100644 index d8bf75184f..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_62/A72610.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802403F0_A72610 -.word 0xC33F0000, 0x00000000, 0xC3070000, 0x43340000, 0x438A0000, 0x00000000, 0xC3988000, 0x43340000, 0x43C10000, 0xC2340000, 0xC3670000, 0x43340000, 0x42960000, 0x41A80000, 0x44160000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802411A0, D_802403F0_A72610, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190157, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000064, 0x00000000, 0x00000008, 0x0000000A, 0x00000002, 0xF8406194, 0x00000000, 0x00000043, 0x00000002, PlayAmbientSounds, 0x0000000A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000013, 0x00000000, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetMusicTrackVolumes, 0x00000004, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_62/A72740.data.s b/ver/us/asm/data/world/area_kpa/kpa_62/A72740.data.s deleted file mode 100644 index 3d3e44f315..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_62/A72740.data.s +++ /dev/null @@ -1,51 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240520_A72740 -.word 0x0000001A, 0x00000000 - -dlabel D_80240528_A72748 -.word 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00D8, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000024, 0x00000002, 0xF840619C, 0x00000001, 0x00000043, 0x00000005, kpa_62_GetEntityPosition, 0xFD050F80, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, PlaySoundAt, 0x00000269, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000043, 0x00000001, kpa_62_RemovePadlock, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000047, 0x00000005, D_80240A74_A72C94, 0x00000100, 0x00000024, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240678_A72898 -.word 0x0000000A, 0x00000002, 0xF840619C, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Padlock, 0xFFFFFF38, 0x0000000A, 0xFFFFFF31, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x0000004E, 0x00000006, D_80240528_A72748, 0x00000100, 0x00004000, D_80240520_A72740, 0x00000000, 0x00000001, 0x00000012, 0x00000000, 0x00000047, 0x00000005, D_80240A74_A72C94, 0x00000100, 0x00000024, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_RedBlock, 0xFFFFFDEC, 0x00000091, 0xFFFFFFC5, 0x00000000, 0x00000133, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840619D, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240750_A72970 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kpa_62_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_62_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802407EC_A72A0C -.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000020, 0x000001DF, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000026, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFF6, 0x00000014, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000028, 0xFE363C80, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000002D, 0x00000019, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000028, 0xFFFFFFF6, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240930_A72B50 -.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000020, 0x000001E0, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x0000002D, 0x00000000, 0x00000019, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000028, 0xFFFFFFF6, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFF6, 0x00000000, 0x00000014, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000028, 0xFE363C80, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000026, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240A74_A72C94 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000024, 0x00000024, 0x00000002, 0xFE363C82, 0x00000002, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80241370, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240B28_A72D48 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x0000000A, 0x00000002, 0xF8406194, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x80241380, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x80241378, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240BB8_A72DD8 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x0000000A, 0x00000002, 0xF8406194, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x80241380, 0x00000003, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x80241378, 0x00000003, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240C48_A72E68 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000046, 0x00000001, D_802407EC_A72A0C, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241388, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240CCC_A72EEC -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFFE2, 0x00000015, 0x0000024E, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFFE2, 0x00000015, 0x0000024E, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000026, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000028, 0xFFFFFFF6, 0x00000000, 0x0000002D, 0x00000056, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0x0000004B, 0x00000244, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x00000041, 0x00000258, 0x00000000, 0x00000046, 0x00000001, D_80240930_A72B50, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240E2C_A7304C -.word 0x00000047, 0x00000005, D_80240B28_A72D48, 0x00080000, 0x00000026, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240BB8_A72DD8, 0x00080000, 0x00000029, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240C48_A72E68, 0x00000100, 0x00000020, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240E90_A730B0 -.word 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000010, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000009, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000A, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240EE8_A73108 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_80240E90_A730B0, 0x00000024, 0x00000002, 0xFE363C82, 0x00000002, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000044, 0x00000001, D_80240E2C_A7304C, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_80240E90_A730B0, 0x00000024, 0x00000002, 0xFE363C80, D_80240E2C_A7304C, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, D_80240E2C_A7304C, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000046, 0x00000001, D_80240E90_A730B0, 0x00000056, 0x00000000, 0x00000046, 0x00000001, D_80240CCC_A72EEC, 0x00000044, 0x00000001, D_80240E2C_A7304C, 0x00000057, 0x00000000, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80240E2C_A7304C, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241050_A73270 -.word 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFCE0, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80240750_A72970, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000032, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241160_A73380 -.word 0x00000012, 0xC3E38000, 0xC1700000, 0x420C0000, 0x00000013, 0xC4084000, 0x41200000, 0x41700000, 0x00000018, 0xC3D50000, 0xC20C0000, 0x428C0000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000016, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF8406349, 0x00000001, 0x00000046, 0x00000001, D_80240678_A72898, 0x00000044, 0x00000001, D_80240EE8_A73108, 0x00000044, 0x00000001, 0x80240470, 0x0000000A, 0x00000002, 0xF8406194, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000074, 0x00000000, 0x00000044, 0x00000001, D_80241050_A73270, 0x00000012, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000052, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8406194, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000009, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000029, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000000A, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000000B, 0x00000003, 0x00000056, 0x00000000, 0x00000043, 0x00000002, ResetFromLava, D_80241160_A73380, 0x00000057, 0x00000000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_63/A73740.data.s b/ver/us/asm/data/world/area_kpa/kpa_63/A73740.data.s deleted file mode 100644 index 4a75b21ca6..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_63/A73740.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240190_A73740 -.word 0x43200000, 0x00000000, 0x43700000, 0x00000000, 0xC2200000, 0x00000000, 0x43610000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8024068C, D_80240190_A73740, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190156, 0x00000043, 0x00000002, GetLoadType, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000064, 0x00000000, 0x00000008, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetMusicTrackVolumes, 0x00000004, 0x00000057, 0x00000000, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000064, 0x00000000, 0x00000008, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetMusicTrackVolumes, 0x00000004, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_63/A738E0.data.s b/ver/us/asm/data/world/area_kpa/kpa_63/A738E0.data.s deleted file mode 100644 index 9837ffa99c..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_63/A738E0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240330_A738E0 -.word 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x00000078, 0x0000003C, 0x0000005A, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_63/A73920.data.s b/ver/us/asm/data/world/area_kpa/kpa_63/A73920.data.s deleted file mode 100644 index f0dfb0e462..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_63/A73920.data.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240370_A73920 -.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000012, 0x000001DF, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000064, 0x00000000, 0x00000014, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFE363C85, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C85, 0xF24A7A8B, 0x00000043, 0x00000005, ScaleGroup, 0x00000041, 0xFE363C85, 0x00000001, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024043C_A739EC -.word 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000064, 0x00000014, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFE363C85, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C85, 0xF24A7A8B, 0x00000043, 0x00000005, ScaleGroup, 0x00000041, 0xFE363C85, 0x00000001, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000012, 0x000001E0, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240508_A73AB8 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000044, 0x00000001, D_80240370_A73920, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802412B0, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024058C_A73B3C -.word 0x00000047, 0x00000005, D_80240508_A73AB8, 0x00000100, 0x00000012, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802405B8_A73B68 -.word 0x00000043, 0x00000002, GetLoadType, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000044, 0x00000001, EnterSavePoint, 0x00000044, 0x00000001, D_8024058C_A73B3C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000044, 0x00000001, 0x80240E14, 0x00000044, 0x00000001, D_8024058C_A73B3C, 0x00000012, 0x00000000, 0x00000044, 0x00000001, D_8024043C_A739EC, 0x00000024, 0x00000002, 0xFE363C80, D_8024058C_A73B3C, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000016, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF8406349, 0x00000001, 0x00000046, 0x00000001, D_80240330_A738E0, 0x00000044, 0x00000001, D_802405B8_A73B68, 0x00000044, 0x00000001, 0x802401F0, 0x00000047, 0x00000005, 0x802409D8, 0x00000080, 0x00000014, 0x00000001, 0x00000000, 0x00000044, 0x00000001, 0x80241250, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_63/A73D30.data.s b/ver/us/asm/data/world/area_kpa/kpa_63/A73D30.data.s deleted file mode 100644 index 636d2b1ae1..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_63/A73D30.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240780_A73D30 -.word 0x0000000A, 0x00000002, 0xFD050F8C, 0x00000001, 0x00000043, 0x00000004, func_80240000_A735B0, 0x00000000, 0xFE363C83, 0xFD050F8B, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F8D, 0x00000001, 0x00000043, 0x00000004, func_80240000_A735B0, 0x00000001, 0xFE363C83, 0xFD050F8B, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802407F0_A73DA0 -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000064, 0x0000001E, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C83, 0xF24A7AE7, 0x0000002C, 0x00000002, 0xFE363C83, 0xFD050F8A, 0x00000043, 0x00000005, TranslateGroup, 0x0000004E, 0x00000000, 0xFE363C83, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x0000004E, 0xFD050F8B, 0x00000000, 0x00000001, 0x00000000, 0x00000044, 0x00000001, D_80240780_A73D30, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000064, 0x00000000, 0x0000001E, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C83, 0xF24A7AE7, 0x0000002C, 0x00000002, 0xFE363C83, 0xFD050F8A, 0x00000043, 0x00000005, TranslateGroup, 0x0000004E, 0x00000000, 0xFE363C83, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x0000004E, 0xFD050F8B, 0x00000000, 0x00000001, 0x00000000, 0x00000044, 0x00000001, D_80240780_A73D30, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C89, 0x0000000B, 0x00000002, 0xFE363C89, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, GetModelCenter, 0x0000004B, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFB, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000000, 0x00000043, 0x00000005, PlayerJump2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000002, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000001, 0x00000043, 0x00000003, InterpPlayerYaw, 0x000000E1, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000027, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000140, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000024, 0x00000002, 0xFD050F8D, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0188, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000C, 0x00000043, 0x00000001, CloseMessage, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000002, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000000, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFFCE, 0x00000000, 0x000000E1, 0x0000000D, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000024, 0x00000002, 0xFD050F8D, 0x00000000, 0x00000043, 0x00000002, PartnerIsFlying, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0x00000002, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFFFFFFBF, 0x00000000, 0x000000E1, 0x0000000D, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000062, 0x00000001, 0x00000008, 0x00000056, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x0000017E, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFD050F8A, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFF92, 0x0000003C, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000024, 0x00000002, 0xFD050F8A, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000003, GotoMap, 0x802412B8, 0x00000005, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8A, 0xFFFFFF9C, 0x00000024, 0x00000002, 0xFD050F8B, 0x000000B4, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000001, 0x00000024, 0x00000002, 0xFD050F8D, 0x00000001, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF88, 0x00000000, 0x000000E6, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF88, 0x00000000, 0x000000E6, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000045, 0x00000002, D_80240780_A73D30, 0xFE363C89, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x0000017F, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFF9C, 0x00000000, 0x0000003C, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFD050F8A, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000028, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x000000B4, 0x00000000, 0x0000003C, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000049, 0x00000001, 0xFE363C89, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000002, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000000, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFFCE, 0x00000000, 0x000000E1, 0x0000000D, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8D, 0x00000000, 0x00000043, 0x00000002, PartnerIsFlying, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0x00000002, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFFFFFFBF, 0x00000000, 0x000000E1, 0x0000000D, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000005E, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000005E, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000064, 0x00000000, 0x00000008, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetMusicTrackVolumes, 0x00000004, 0x00000057, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000044, 0x00000001, D_802407F0_A73DA0, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000014, 0x0000004B, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000014, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_70/A75360.data.s b/ver/us/asm/data/world/area_kpa/kpa_70/A75360.data.s deleted file mode 100644 index 2e46f34478..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_70/A75360.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240AF0_A75360 -.word 0x41500000, 0x00000000, 0x43060000, 0x42B40000, 0x449A2000, 0x00000000, 0x42FC0000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802410F4, D_80240AF0_A75360, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190159, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000064, 0x00000000, 0x00000008, 0x00000043, 0x00000002, PlayAmbientSounds, 0x00000004, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetMusicTrackVolumes, 0x00000005, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_70/A75440.data.s b/ver/us/asm/data/world/area_kpa/kpa_70/A75440.data.s deleted file mode 100644 index 7ac25ac569..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_70/A75440.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240BD0_A75440 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kpa_70_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_70_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240C6C_A754DC -.word 0x00000043, 0x00000003, LoadAnimatedModel, 0x00000000, 0x8024195C, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000000, 0x80241990, 0x00000043, 0x00000005, SetAnimatedModelRootPosition, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetAnimatedModelRenderMode, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240CD4_A75544 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000008, 0x00000024, 0x00000002, 0xFE363C82, 0x000000D0, 0x00000024, 0x00000002, 0xFE363C83, 0x000000CE, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80243BE0, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240D84_A755F4 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80243BE8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240DE0_A75650 -.word 0x00000047, 0x00000005, D_80240D84_A755F4, 0x00080000, 0x00000003, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240E0C_A7567C -.word 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFCE0, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80240BD0_A75440, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x000003E8, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x000007D0, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80240BD0_A75440, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x000000CA, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x000000C3, 0x00000001, 0x00000043, 0x00000003, SetTexPanner, 0x000000C5, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241044_A758B4 -.word 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x000000B6, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x000000B8, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x000000BA, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000016, 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, 0x00000001, 0x802417AC, 0x00000043, 0x00000001, InitAnimatedModels, 0x00000044, 0x00000001, D_80240C6C_A754DC, 0x00000056, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x80000051, 0x00000000, 0x00000320, 0x00000064, 0xFFFFFF38, 0x00000008, 0x00000001, 0x0000001C, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00000222, 0x00000000, 0x00000320, 0x00000064, 0xFFFFFF38, 0x00000008, 0x00000001, 0x0000005A, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000044, 0x00000001, D_80241044_A758B4, 0x00000044, 0x00000001, D_80240E0C_A7567C, 0x00000047, 0x00000005, D_80240CD4_A75544, 0x00000100, 0x00000008, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x000000D0, 0x00000024, 0x00000002, 0xFE363C83, 0x000000CE, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000046, 0x00000001, D_80240DE0_A75650, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, D_80240DE0_A75650, 0x00000044, 0x00000001, EnterWalk, 0x00000023, 0x00000000, 0x00000044, 0x00000001, 0x80240B50, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_70/A75B70.data.s b/ver/us/asm/data/world/area_kpa/kpa_70/A75B70.data.s deleted file mode 100644 index dbf9cd2682..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_70/A75B70.data.s +++ /dev/null @@ -1,45 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241300_A75B70 -.word 0x3F800000, 0x0000001E, 0x00000032, 0x42B40000, 0x42200000, 0x00000002, 0x41300000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 - -dlabel D_80241330_A75BA0 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000005, 0x00000043, 0x00000002, kpa_70_TackleAI_Main, D_80241300_A75B70, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802413A0_A75C10 -.word 0x00000000, 0x00280018, 0x00000000, 0x00000000, D_80241330_A75BA0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000 - -dlabel D_802413CC_A75C3C -.word 0x00000000, D_802413A0_A75C10, 0x43D98000, 0x41200000, 0x42FA0000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980005, 0x3FFF2666, 0x4CCC0005, 0x3FFF3FFF, 0x3FFF0005, 0x33326665, 0x33320005, 0x33327FFF, 0x26660005, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0x000001B3, 0x0000000A, 0x0000007D, 0x00000032, 0x00000000, 0xFFFF8001, 0x00000000, 0x000001B3, 0x0000000A, 0x0000007D, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00580001, 0x00580004, 0x00580006, 0x00580006, 0x00580001, 0x00580001, 0x00580010, 0x00580010, 0x0058000C, 0x0058000B, 0x0058000D, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802415BC_A75E2C -.word 0x00000001, D_802413A0_A75C10, 0x444BC000, 0x41200000, 0x42FA0000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980005, 0x3FFF2666, 0x4CCC0005, 0x3FFF3FFF, 0x3FFF0005, 0x33326665, 0x33320005, 0x33327FFF, 0x26660005, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0x0000032F, 0x0000000A, 0x0000007D, 0x00000032, 0x00000000, 0xFFFF8001, 0x00000000, 0x0000032F, 0x0000000A, 0x0000007D, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00580001, 0x00580004, 0x00580006, 0x00580006, 0x00580001, 0x00580001, 0x00580010, 0x00580010, 0x0058000C, 0x0058000B, 0x0058000D, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_802413CC_A75C3C, 0x22180003, 0x00000001, D_802415BC_A75E2C, 0x22190003, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802417D0_A76040 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x43160000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF0000, 0x00000000, 0x00C80000 - -dlabel D_802417FC_A7606C -.word 0x00000000, 0x00000000, 0x00000000, 0x428A0000, 0x437A0000, 0x00000000, D_802417D0_A76040, 0x00000000, 0xFFFF0000, 0x00000000, 0x00C60000 - -dlabel D_80241828_A76098 -.word 0x00000000, 0x00000000, 0x00000000, 0x42D40000, 0x41100000, 0x00000000, D_802417FC_A7606C, 0x00000000, 0xFFFF0000, 0x00000000, 0x00C40000 - -dlabel D_80241854_A760C4 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80241828_A76098, 0x00000000, 0xFFFF0000, 0x00000000, 0x00C30000 - -dlabel D_80241880_A760F0 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x43160000, 0x00000000, D_80241854_A760C4, 0x00000000, 0xFFFF0000, 0x00000000, 0x00C20000 - -dlabel D_802418AC_A7611C -.word 0x00000000, 0x00000000, 0xC0010000, 0x41F00000, 0x43340000, 0x00000000, D_80241880_A760F0, 0x00000000, 0xFFFF0000, 0x00000000, 0x00C00000 - -dlabel D_802418D8_A76148 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802418AC_A7611C, 0x00000000, 0xFFFF0000, 0x00000000, 0x00BF0000 - -dlabel D_80241904_A76174 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802418D8_A76148, 0x00000000, 0xFFFF0000, 0x00000000, 0x00BE0000 - -dlabel D_80241930_A761A0 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80241904_A76174, 0x00000000, 0x00000000, 0x00000000, D_80241930_A761A0, D_80241904_A76174, D_802418D8_A76148, D_802418AC_A7611C, D_80241880_A760F0, D_80241854_A760C4, D_80241828_A76098, D_802417FC_A7606C, D_802417D0_A76040, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 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, 0x0004001E, 0x001E0000, 0x00110004, 0x00B600B6, 0x00B60005, 0x00050000, 0x00000000, 0x00080005, 0x00000000, 0x00000011, 0x000500B6, 0x00B600B6, 0x00050006, 0x00000000, 0x00000008, 0x00060000, 0x00000000, 0x00110006, 0x00B600B6, 0x00B60005, 0x00070000, 0x00000000, 0x00080007, 0x0045012C, 0x00000011, 0x00070012, 0x001200B6, 0x00050008, 0x00000000, 0x00000008, 0x00080046, 0x00460000, 0x00110008, 0x00B600B6, 0x00B60005, 0x00090000, 0x00000000, 0x00080009, 0x00000000, 0x00000011, 0x000900B6, 0x00B600B6, 0x00010001, 0x00080002, 0x0000FFFF, 0x00000008, 0x00030000, 0x00010000, 0x00080004, 0x001E001F, 0x00000008, 0x00050000, 0x00010000, 0x00080006, 0x0000FFFF, 0x00000008, 0x00080046, 0x00470000, 0x00080009, 0x00000001, 0x00000001, 0x00010008, 0x00020000, 0xFFFD0000, 0x00080003, 0x00000003, 0x00000008, 0x0004001E, 0x00210000, 0x00080005, 0x00000003, 0x00000008, 0x00060000, 0xFFFD0000, 0x00080008, 0x00460049, 0x00000008, 0x00090000, 0x00030000, 0x00010001, 0x00080002, 0x0000FFFB, 0x00000008, 0x00030000, 0x00050000, 0x00080004, 0x001E0023, 0x00000008, 0x00050000, 0x00050000, 0x00080006, 0x0000FFFB, 0x00000008, 0x00080046, 0x004B0000, 0x00080009, 0x00000005, 0x00000001, 0x00010008, 0x00020000, 0xFFFA0000, 0x00080003, 0x00000006, 0x00000008, 0x0004001E, 0x00240000, 0x00080005, 0x00000006, 0x00000008, 0x00060000, 0xFFFA0000, 0x00080008, 0x0046004C, 0x00000008, 0x00090000, 0x00060000, 0x00010001, 0x00080002, 0x0000FFF8, 0x00000008, 0x00030000, 0x00080000, 0x00080004, 0x001E0026, 0x00000008, 0x00050000, 0x00080000, 0x00080006, 0x0000FFF8, 0x00000008, 0x00080046, 0x004E0000, 0x00080009, 0x00000008, 0x00000001, 0x00010008, 0x00020000, 0xFFF60000, 0x00080003, 0x0000000A, 0x00000008, 0x0004001E, 0x00280000, 0x00080005, 0x0000000A, 0x00000008, 0x00060000, 0xFFF60000, 0x00080008, 0x00460050, 0x00000008, 0x00090000, 0x000A0000, 0x00010001, 0x00080002, 0x0000FFF5, 0x00000008, 0x00030000, 0x000B0000, 0x00080004, 0x001E0029, 0x00000008, 0x00050000, 0x000B0000, 0x00080006, 0x0000FFF5, 0x00000008, 0x00080046, 0x00510000, 0x00080009, 0x0000000B, 0x00000001, 0x00010008, 0x00020000, 0xFFF30000, 0x00080003, 0x0000000D, 0x00000008, 0x0004001E, 0x002B0000, 0x00080005, 0x0000000D, 0x00000008, 0x00060000, 0xFFF30000, 0x00080008, 0x00460053, 0x00000008, 0x00090000, 0x000D0000, 0x00010001, 0x00080002, 0x0000FFF1, 0x00000008, 0x00030000, 0x000F0000, 0x00080004, 0x001E002D, 0x00000008, 0x00050000, 0x000F0000, 0x00080006, 0x0000FFF1, 0x00000008, 0x00080046, 0x00550000, 0x00080009, 0x0000000F, 0x00000001, 0x00010008, 0x00020000, 0xFFF00000, 0x00080003, 0x00000010, 0x00000008, 0x0004001E, 0x002E0000, 0x00080005, 0x00000010, 0x00000008, 0x00060000, 0xFFF00000, 0x00080008, 0x00460056, 0x00000008, 0x00090000, 0x00100000, 0x00010001, 0x00080002, 0x0000FFEE, 0x00000008, 0x00030000, 0x00120000, 0x00080004, 0x001E0030, 0x00000008, 0x00050000, 0x00120000, 0x00080006, 0x0000FFEE, 0x00000008, 0x00080046, 0x00580000, 0x00080009, 0x00000012, 0x00000001, 0x00010008, 0x00020000, 0xFFEC0000, 0x00080003, 0x00000014, 0x00000008, 0x0004001E, 0x00320000, 0x00080005, 0x00000014, 0x00000008, 0x00060000, 0xFFEC0000, 0x00080008, 0x0046005A, 0x00000008, 0x00090000, 0x00140000, 0x00010001, 0x00080002, 0x0000FFEB, 0x00000008, 0x00030000, 0x00150000, 0x00080004, 0x001E0033, 0x00000008, 0x00050000, 0x00150000, 0x00080006, 0x0000FFEB, 0x00000008, 0x00080046, 0x005B0000, 0x00080009, 0x00000015, 0x00000001, 0x00010008, 0x00020000, 0xFFE90000, 0x00080003, 0x00000017, 0x00000008, 0x0004001E, 0x00350000, 0x00080005, 0x00000017, 0x00000008, 0x00060000, 0xFFE90000, 0x00080008, 0x0046005D, 0x00000008, 0x00090000, 0x00170000, 0x00010001, 0x00080002, 0x0000FFE7, 0x00000008, 0x00030000, 0x00190000, 0x00080004, 0x001E0037, 0x00000008, 0x00050000, 0x00190000, 0x00080006, 0x0000FFE8, 0x00000008, 0x00080046, 0x005F0000, 0x00080009, 0x00000019, 0x00000001, 0x00010008, 0x00020000, 0xFFE60000, 0x00080003, 0x0000001A, 0x00000005, 0x00040000, 0x0000FFA9, 0x00080004, 0x001E0038, 0x00000008, 0x00050000, 0x001A0000, 0x00080006, 0x0000FFE6, 0x00000008, 0x00070046, 0x00600000, 0x00110007, 0x00130013, 0x00B60008, 0x00080046, 0x00600000, 0x00080009, 0x0000001A, 0x00000001, 0x00010008, 0x00020000, 0xFFE40000, 0x00080003, 0x0000001C, 0x00000005, 0x00040000, 0x0000FEA5, 0x00080004, 0x001E003A, 0x00000008, 0x00050000, 0x001C0000, 0x00080006, 0x0000FFE4, 0x00000008, 0x00070047, 0x00600000, 0x00110007, 0x00160015, 0x00B60008, 0x00080047, 0x00600000, 0x00110008, 0x00B700B6, 0x00B60008, 0x00090000, 0x001C0000, 0x00010001, 0x00080002, 0x00000000, 0x00000008, 0x00030000, 0x00000000, 0x00050004, 0x00000000, 0xFCFD0008, 0x0004001E, 0x003C0000, 0x00080005, 0x0000001E, 0x00000008, 0x00060000, 0xFFE20000, 0x00080007, 0x00480060, 0x00000011, 0x0007001B, 0x001A00B6, 0x00080008, 0x00480060, 0x00000011, 0x000800B8, 0x00B600B6, 0x00080009, 0x0000001E, 0x00000001, 0x00010008, 0x00020000, 0xFFFF0000, 0x00080003, 0x00000001, 0x00000005, 0x00040000, 0x0000FAB6, 0x00080004, 0x001E003D, 0x00000008, 0x00050000, 0x001F0000, 0x00080006, 0x0000FFE1, 0x00000008, 0x0007004A, 0x00600000, 0x00110007, 0x0022001F, 0x00B60008, 0x0008004A, 0x00600000, 0x00110008, 0x00B900B6, 0x00B60008, 0x00090000, 0x001F0000, 0x00010001, 0x00080002, 0x0000FFFD, 0x00000008, 0x00030000, 0x00030000, 0x00050004, 0x00000000, 0xF7D60008, 0x0004001E, 0x003F0000, 0x00080005, 0x00000021, 0x00000008, 0x00060000, 0xFFDF0000, 0x00080007, 0x004D005E, 0x00000011, 0x00070029, 0x002600B6, 0x00080008, 0x004D005E, 0x00000008, 0x00090000, 0x00210000, 0x00010001, 0x00080002, 0x0000FFFC, 0x00000008, 0x00030000, 0x00040000, 0x00050004, 0x00000000, 0xF4660008, 0x0004001E, 0x00410000, 0x00080005, 0x00000023, 0x00000008, 0x00060000, 0xFFDE0000, 0x00080007, 0x004E005C, 0x00000011, 0x00070032, 0x002D00B6, 0x00080008, 0x004E005C, 0x00000011, 0x000800B6, 0x00B600B6, 0x00080009, 0x00000023, 0x00000001, 0x00010008, 0x00020000, 0xFFFA0000, 0x00080003, 0x00000006, 0x00000005, 0x00040000, 0x0000F06A, 0x00080004, 0x001E0042, 0x00000008, 0x00050000, 0x00240000, 0x00080006, 0x0000FFDC, 0x00000008, 0x00070050, 0x00590000, 0x00110007, 0x003B0035, 0x00B60008, 0x00080050, 0x00590000, 0x00110008, 0x00B900B6, 0x00B60008, 0x00090000, 0x00240000, 0x00010001, 0x00080002, 0x0000FFF8, 0x00000008, 0x00030000, 0x00080000, 0x00050004, 0x00000000, 0xEBE90008, 0x0004001E, 0x00440000, 0x00080005, 0x00000026, 0x00000008, 0x00060000, 0xFFDA0000, 0x00080007, 0x00510056, 0x00000011, 0x00070044, 0x003C00B6, 0x00080008, 0x00510056, 0x00000011, 0x000800BD, 0x00B600B6, 0x00080009, 0x00000026, 0x00000001, 0x00010008, 0x00020000, 0xFFF60000, 0x00080003, 0x0000000A, 0x00000005, 0x00040000, 0x0000E6EA, 0x00080004, 0x001E0046, 0x00000008, 0x00050000, 0x00280000, 0x00080006, 0x0000FFD8, 0x00000008, 0x00070052, 0x00510000, 0x00110007, 0x004D0044, 0x00B60008, 0x00080052, 0x00510000, 0x00110008, 0x00C800B6, 0x00B60008, 0x00090000, 0x00280000, 0x00010001, 0x00080002, 0x0000FFF5, 0x00000008, 0x00030000, 0x000B0000, 0x00050004, 0x00000000, 0xE1740008, 0x0004001E, 0x00470000, 0x00080005, 0x00000029, 0x00000008, 0x00060000, 0xFFD70000, 0x00080007, 0x0052004D, 0x00000011, 0x00070055, 0x004B00B6, 0x00080008, 0x0052004D, 0x00000011, 0x000800D4, 0x00B600B6, 0x00080009, 0x00000029, 0x00000001, 0x00010008, 0x00020000, 0xFFF30000, 0x00080003, 0x0000000D, 0x00000005, 0x00040000, 0x0000DB8C, 0x00080004, 0x001E0049, 0x00000008, 0x00050000, 0x002B0000, 0x00080006, 0x0000FFD5, 0x00000008, 0x00070052, 0x00470000, 0x00110007, 0x005D0051, 0x00B60008, 0x00080052, 0x00470000, 0x00110008, 0x00E300B6, 0x00B60008, 0x00090000, 0x002B0000, 0x00010001, 0x00080002, 0x0000FFF2, 0x00000008, 0x00030000, 0x000E0000, 0x00050004, 0x00000000, 0xD5390008, 0x0004001E, 0x004B0000, 0x00080005, 0x0000002D, 0x00000008, 0x00060000, 0xFFD40000, 0x00080007, 0x00510042, 0x00000011, 0x00070063, 0x005700B6, 0x00080008, 0x00510042, 0x00000011, 0x000800CF, 0x00B600B6, 0x00080009, 0x0000002D, 0x00000001, 0x00010008, 0x00020000, 0xFFF00000, 0x00080003, 0x00000010, 0x00000005, 0x00040000, 0x0000CE82, 0x00080004, 0x001E004C, 0x00000008, 0x00050000, 0x002E0000, 0x00080006, 0x0000FFD2, 0x00000008, 0x0007004E, 0x003C0000, 0x00110007, 0x0068005B, 0x00B60008, 0x0008004E, 0x003C0000, 0x00110008, 0x00C000B6, 0x00B60008, 0x00090000, 0x002E0000, 0x00010001, 0x00080002, 0x0000FFEE, 0x00000008, 0x00030000, 0x00120000, 0x00050004, 0x00000000, 0xC76D0008, 0x0004001E, 0x004E0000, 0x00080005, 0x00000030, 0x00000008, 0x00060000, 0xFFD00000, 0x00080007, 0x004A0037, 0x00000011, 0x0007006C, 0x005E00B6, 0x00080008, 0x004A0037, 0x00000011, 0x000800B6, 0x00B600B6, 0x00080009, 0x00000030, 0x00000001, 0x00010008, 0x00020000, 0xFFEC0000, 0x00080003, 0x00000014, 0x00000005, 0x00040000, 0x0000C001, 0x00080004, 0x001E0050, 0x00000008, 0x00050000, 0x00320000, 0x00080006, 0x0000FFCF, 0x00000008, 0x00070045, 0x00320000, 0x00110007, 0x006D005F, 0x00B60008, 0x00080045, 0x00320000, 0x00080009, 0x00000032, 0x00000001, 0x00010008, 0x00020000, 0xFFEB0000, 0x00080003, 0x00000015, 0x00000005, 0x00040000, 0x0000C2CB, 0x00080004, 0x001E0051, 0x00000008, 0x00050000, 0x00330000, 0x00080006, 0x0000FFCD, 0x00000008, 0x00070047, 0x00360000, 0x00110007, 0x006D0069, 0x00B60008, 0x00080047, 0x00360000, 0x00080009, 0x00000033, 0x00000001, 0x00010008, 0x00020000, 0xFFE90000, 0x00080003, 0x00000017, 0x00000005, 0x00040000, 0x0000C4D0, 0x00080004, 0x001E0053, 0x00000008, 0x00050000, 0x00350000, 0x00080006, 0x0000FFCB, 0x00000008, 0x00070049, 0x003A0000, 0x00110007, 0x006E006F, 0x00B60008, 0x00080049, 0x003A0000, 0x00080009, 0x00000035, 0x00000001, 0x00010008, 0x00020000, 0xFFE70000, 0x00080003, 0x00000019, 0x00000005, 0x00040000, 0x0000C626, 0x00080004, 0x001E0055, 0x00000008, 0x00050000, 0x00370000, 0x00080006, 0x0000FFCA, 0x00000008, 0x0007004A, 0x003D0000, 0x00110007, 0x006F0076, 0x00B60008, 0x0008004A, 0x003D0000, 0x00080009, 0x00000037, 0x00000001, 0x00010008, 0x00020000, 0xFFE60000, 0x00080003, 0x0000001A, 0x00000005, 0x00040000, 0x0000C6E3, 0x00080004, 0x001E0056, 0x00000008, 0x00050000, 0x00380000, 0x00080006, 0x0000FFC8, 0x00000008, 0x0007004A, 0x003F0000, 0x00110007, 0x00700079, 0x00B60008, 0x0008004A, 0x003F0000, 0x00080009, 0x00000038, 0x00000001, 0x00010008, 0x00020000, 0xFFE40000, 0x00080003, 0x0000001C, 0x00000005, 0x00040000, 0x0000C71D, 0x00080004, 0x001E0058, 0x00000008, 0x00050000, 0x003A0000, 0x00080006, 0x0000FFC6, 0x00000008, 0x0007004A, 0x00410000, 0x00110007, 0x0072007D, 0x00B60008, 0x0008004A, 0x00410000, 0x00080009, 0x0000003A, 0x00000001, 0x00010008, 0x00020000, 0x00000000, 0x00080003, 0x00000000, 0x00000005, 0x00040000, 0x0000C6E3, 0x00080004, 0x001E005A, 0x00000008, 0x00050000, 0x003C0000, 0x00080006, 0x0000FFC4, 0x00000008, 0x0007004A, 0x00430000, 0x00110007, 0x00740081, 0x00B60008, 0x0008004A, 0x00430000, 0x00080009, 0x0000003C, 0x00000001, 0x00010008, 0x00020000, 0xFFFF0000, 0x00080003, 0x00000001, 0x00000005, 0x00040000, 0x0000C626, 0x00080004, 0x001E005B, 0x00000008, 0x00050000, 0x003D0000, 0x00080006, 0x0000FFC3, 0x00000008, 0x0007004A, 0x00440000, 0x00110007, 0x00770083, 0x00B60008, 0x0008004A, 0x00440000, 0x00080009, 0x0000003D, 0x00000001, 0x00010008, 0x00020000, 0xFFFD0000, 0x00080003, 0x00000003, 0x00000005, 0x00040000, 0x0000C4D0, 0x00080004, 0x001E005D, 0x00000008, 0x00050000, 0x003F0000, 0x00080006, 0x0000FFC1, 0x00000008, 0x00070049, 0x00440000, 0x00110007, 0x00790083, 0x00B60008, 0x00080049, 0x00440000, 0x00080009, 0x0000003F, 0x00000001, 0x00010008, 0x00020000, 0xFFFC0000, 0x00080003, 0x00000004, 0x00000005, 0x00040000, 0x0000C2CB, 0x00080004, 0x001E005F, 0x00000008, 0x00050000, 0x00410000, 0x00080006, 0x0000FFC0, 0x00000008, 0x00070047, 0x00430000, 0x00110007, 0x007C0083, 0x00B60008, 0x00080047, 0x00430000, 0x00080009, 0x00000041, 0x00000001, 0x00010008, 0x00020000, 0xFFFA0000, 0x00080003, 0x00000006, 0x00000005, 0x00040000, 0x0000C001, 0x00080004, 0x001E0060, 0x00000008, 0x00050000, 0x00420000, 0x00080006, 0x0000FFBE, 0x00000008, 0x00070045, 0x00420000, 0x00110007, 0x0080007F, 0x00B60008, 0x00080045, 0x00420000, 0x00080009, 0x00000042, 0x00000001, 0x00010008, 0x00020000, 0xFFF80000, 0x00080003, 0x00000008, 0x00000008, 0x0004001E, 0x00620000, 0x00080005, 0x00000044, 0x00000008, 0x00060000, 0xFFBC0000, 0x00080007, 0x00450044, 0x00000011, 0x00070083, 0x008100B6, 0x00080008, 0x00450044, 0x00000008, 0x00090000, 0x00440000, 0x00010001, 0x00080002, 0x0000FFF7, 0x00000008, 0x00030000, 0x00090000, 0x00080004, 0x001E0064, 0x00000008, 0x00050000, 0x00460000, 0x00080006, 0x0000FFBB, 0x00000008, 0x00070045, 0x00460000, 0x00110007, 0x00860085, 0x00B60008, 0x00080045, 0x00460000, 0x00080009, 0x00000046, 0x00000001, 0x00010008, 0x00020000, 0xFFF50000, 0x00080003, 0x0000000B, 0x00000008, 0x0004001E, 0x00650000, 0x00080005, 0x00000047, 0x00000008, 0x00060000, 0xFFB90000, 0x00080007, 0x00450047, 0x00000011, 0x0007008A, 0x008A00B6, 0x00080008, 0x00450047, 0x00000008, 0x00090000, 0x00470000, 0x00010001, 0x00080002, 0x0000FFF3, 0x00000008, 0x00030000, 0x000D0000, 0x00080004, 0x001E0067, 0x00000008, 0x00050000, 0x00490000, 0x00080006, 0x0000FFB7, 0x00000008, 0x00070045, 0x00490000, 0x00110007, 0x008D008E, 0x00B60008, 0x00080045, 0x00490000, 0x00080009, 0x00000049, 0x00000001, 0x00010008, 0x00020000, 0xFFF20000, 0x00080003, 0x0000000E, 0x00000008, 0x0004001E, 0x00690000, 0x00080005, 0x0000004B, 0x00000008, 0x00060000, 0xFFB60000, 0x00080007, 0x0045004B, 0x00000011, 0x00070091, 0x008F00B6, 0x00080008, 0x0045004B, 0x00000008, 0x00090000, 0x004B0000, 0x00010001, 0x00080002, 0x0000FFF0, 0x00000008, 0x00030000, 0x00100000, 0x00080004, 0x001E006A, 0x00000008, 0x00050000, 0x004C0000, 0x00080006, 0x0000FFB4, 0x00000008, 0x00070045, 0x004C0000, 0x00110007, 0x00950091, 0x00B60008, 0x00080045, 0x004C0000, 0x00080009, 0x0000004C, 0x00000001, 0x00010008, 0x00020000, 0xFFEE0000, 0x00080003, 0x00000012, 0x00000008, 0x0004001E, 0x006C0000, 0x00080005, 0x0000004E, 0x00000008, 0x00060000, 0xFFB20000, 0x00080007, 0x0045004E, 0x00000011, 0x00070098, 0x009500B6, 0x00080008, 0x0045004E, 0x00000008, 0x00090000, 0x004E0000, 0x00010001, 0x00080002, 0x0000FFEC, 0x00000008, 0x00030000, 0x00140000, 0x00080004, 0x001E006E, 0x00000008, 0x00050000, 0x00500000, 0x00080006, 0x0000FFB0, 0x00000008, 0x00070045, 0x00500000, 0x00110007, 0x009C009A, 0x00B60008, 0x00080045, 0x00500000, 0x00080009, 0x00000050, 0x00000001, 0x00010008, 0x00020000, 0xFFEB0000, 0x00080003, 0x00000015, 0x00000008, 0x0004001E, 0x006F0000, 0x00080005, 0x00000051, 0x00000008, 0x00060000, 0xFFAF0000, 0x00080007, 0x00450051, 0x00000011, 0x0007009F, 0x009E00B6, 0x00080008, 0x00450051, 0x00000008, 0x00090000, 0x00510000, 0x00010001, 0x00080002, 0x0000FFE9, 0x00000008, 0x00030000, 0x00170000, 0x00080004, 0x001E0071, 0x00000008, 0x00050000, 0x00530000, 0x00080006, 0x0000FFAD, 0x00000008, 0x00070045, 0x00530000, 0x00110007, 0x00A300A0, 0x00B60008, 0x00080045, 0x00530000, 0x00080009, 0x00000053, 0x00000001, 0x00010008, 0x00020000, 0xFFE70000, 0x00080003, 0x00000019, 0x00000008, 0x0004001E, 0x00730000, 0x00080005, 0x00000055, 0x00000008, 0x00060000, 0xFFAB0000, 0x00080007, 0x00450055, 0x00000011, 0x000700A6, 0x00A100B6, 0x00080008, 0x00450055, 0x00000008, 0x00090000, 0x00550000, 0x00010001, 0x00080002, 0x0000FFE6, 0x00000008, 0x00030000, 0x001A0000, 0x00080004, 0x001E0074, 0x00000008, 0x00050000, 0x00560000, 0x00080006, 0x0000FFAA, 0x00000008, 0x00070045, 0x00560000, 0x00110007, 0x00A900A5, 0x00B60008, 0x00080045, 0x00560000, 0x00080009, 0x00000056, 0x00000001, 0x00010008, 0x00020000, 0xFFE40000, 0x00080003, 0x0000001C, 0x00000008, 0x0004001E, 0x00760000, 0x00080005, 0x00000058, 0x00000008, 0x00060000, 0xFFA80000, 0x00080007, 0x00450058, 0x00000011, 0x000700AB, 0x00AA00B6, 0x00080008, 0x00450058, 0x00000008, 0x00090000, 0x00580000, 0x00010001, 0x00080002, 0x00000000, 0x00000008, 0x00030000, 0x00000000, 0x00080004, 0x001E0078, 0x00000008, 0x00050000, 0x005A0000, 0x00080006, 0x0000FFA7, 0x00000008, 0x00070045, 0x005A0000, 0x00110007, 0x00AE00AE, 0x00B60008, 0x00080045, 0x005A0000, 0x00080009, 0x0000005A, 0x00000001, 0x00010008, 0x00020000, 0xFFFF0000, 0x00080003, 0x00000001, 0x00000008, 0x0004001E, 0x00790000, 0x00080005, 0x0000005B, 0x00000008, 0x00060000, 0xFFA50000, 0x00080007, 0x0045005B, 0x00000011, 0x000700B0, 0x00B000B6, 0x00080008, 0x0045005B, 0x00000008, 0x00090000, 0x005B0000, 0x00010001, 0x00080002, 0x0000FFFD, 0x00000008, 0x00030000, 0x00030000, 0x00080004, 0x001E007B, 0x00000008, 0x00050000, 0x005D0000, 0x00080006, 0x0000FFA3, 0x00000008, 0x00070045, 0x005D0000, 0x00110007, 0x00B200B1, 0x00B60008, 0x00080045, 0x005D0000, 0x00080009, 0x0000005D, 0x00000001, 0x00010008, 0x00020000, 0xFFFB0000, 0x00080003, 0x00000005, 0x00000008, 0x0004001E, 0x007D0000, 0x00080005, 0x0000005F, 0x00000008, 0x00060000, 0xFFA20000, 0x00080007, 0x0045005F, 0x00000011, 0x000700B4, 0x00B500B6, 0x00080008, 0x0045005F, 0x00000008, 0x00090000, 0x005F0000, 0x00010001, 0x00080002, 0x0000FFFA, 0x00000008, 0x00030000, 0x00060000, 0x00080004, 0x001E007E, 0x00000008, 0x00050000, 0x00600000, 0x00080006, 0x0000FFA0, 0x00000008, 0x00070045, 0x00600000, 0x00110007, 0x00B500B9, 0x00B60008, 0x00080045, 0x00600000, 0x00080009, 0x00000060, 0x00000001, 0x00010008, 0x00020000, 0xFFF80000, 0x00080003, 0x00000008, 0x00000008, 0x0004001E, 0x00800000, 0x00080005, 0x00000062, 0x00000008, 0x00060000, 0xFF9E0000, 0x00080007, 0x00450062, 0x00000011, 0x000700B5, 0x00BD00B6, 0x00080008, 0x00450062, 0x00000008, 0x00090000, 0x00620000, 0x00010001, 0x00080002, 0x0000FFF6, 0x00000008, 0x00030000, 0x000A0000, 0x00080004, 0x001E0082, 0x00000008, 0x00050000, 0x00640000, 0x00080006, 0x0000FF9D, 0x00000008, 0x00070045, 0x00640000, 0x00110007, 0x00B600BF, 0x00B60008, 0x00080045, 0x00640000, 0x00080009, 0x00000064, 0x00000001, 0x00010008, 0x00020000, 0xFFF50000, 0x00080003, 0x0000000B, 0x00000008, 0x0004001E, 0x00830000, 0x00080005, 0x00000065, 0x00000008, 0x00060000, 0xFF9B0000, 0x00080007, 0x00450065, 0x00000011, 0x000700B6, 0x00C100B6, 0x00080008, 0x00450065, 0x00000008, 0x00090000, 0x00650000, 0x00010001, 0x00080002, 0x0000FFF3, 0x00000008, 0x00030000, 0x000D0000, 0x00080004, 0x001E0085, 0x00000008, 0x00050000, 0x00670000, 0x00080006, 0x0000FF99, 0x00000008, 0x00070045, 0x00670000, 0x00110007, 0x00B600C5, 0x00B60008, 0x00080045, 0x00670000, 0x00080009, 0x00000067, 0x00000001, 0x00010008, 0x00020000, 0xFFF20000, 0x00080003, 0x0000000E, 0x00000008, 0x0004001E, 0x00860000, 0x00080005, 0x00000068, 0x00000008, 0x00060000, 0xFF980000, 0x00080007, 0x00450068, 0x00000011, 0x000700B6, 0x00CA00B6, 0x00080008, 0x00450068, 0x00000008, 0x00090000, 0x00680000, 0x00010001, 0x00080002, 0x0000FFF0, 0x00000008, 0x00030000, 0x00100000, 0x00080004, 0x001E0088, 0x00000008, 0x00050000, 0x006A0000, 0x00080006, 0x0000FF96, 0x00000008, 0x00070045, 0x006A0000, 0x00110007, 0x00B600CF, 0x00B60008, 0x00080045, 0x006A0000, 0x00080009, 0x0000006A, 0x00000001, 0x00010008, 0x00020000, 0xFFEE0000, 0x00080003, 0x00000012, 0x00000008, 0x0004001E, 0x008A0000, 0x00080005, 0x0000006C, 0x00000008, 0x00060000, 0xFF940000, 0x00080007, 0x0045006C, 0x00000011, 0x000700B6, 0x00D100B6, 0x00080008, 0x0045006C, 0x00000008, 0x00090000, 0x006C0000, 0x00010001, 0x00080002, 0x0000FFEC, 0x00000008, 0x00030000, 0x00140000, 0x00080004, 0x001E008C, 0x00000008, 0x00050000, 0x006E0000, 0x00080006, 0x0000FF93, 0x00000008, 0x00070045, 0x006E0000, 0x00110007, 0x00B600D2, 0x00B60008, 0x00080045, 0x006E0000, 0x00080009, 0x0000006E, 0x00000001, 0x00010008, 0x00020000, 0xFFEB0000, 0x00080003, 0x00000015, 0x00000008, 0x0004001E, 0x008D0000, 0x00080005, 0x0000006F, 0x00000008, 0x00060000, 0xFF910000, 0x00080007, 0x0045006F, 0x00000011, 0x000700B6, 0x00D600B6, 0x00080008, 0x0045006F, 0x00000008, 0x00090000, 0x006F0000, 0x00010001, 0x00080002, 0x0000FFE9, 0x00000008, 0x00030000, 0x00170000, 0x00080004, 0x001E008F, 0x00000008, 0x00050000, 0x00710000, 0x00080006, 0x0000FF8F, 0x00000008, 0x00070045, 0x00710000, 0x00110007, 0x00B600DA, 0x00B60008, 0x00080045, 0x00710000, 0x00080009, 0x00000071, 0x00000001, 0x00010008, 0x00020000, 0xFFE70000, 0x00080003, 0x00000019, 0x00000008, 0x0004001E, 0x00910000, 0x00080005, 0x00000073, 0x00000008, 0x00060000, 0xFF8E0000, 0x00080007, 0x00450073, 0x00000011, 0x000700B6, 0x00DE00B6, 0x00080008, 0x00450073, 0x00000008, 0x00090000, 0x00730000, 0x00010001, 0x00080002, 0x0000FFE6, 0x00000008, 0x00030000, 0x001A0000, 0x00080004, 0x001E0092, 0x00000008, 0x00050000, 0x00740000, 0x00080006, 0x0000FF8C, 0x00000008, 0x00070045, 0x00740000, 0x00110007, 0x00B600DF, 0x00B60008, 0x00080045, 0x00740000, 0x00080009, 0x00000074, 0x00000001, 0x00010008, 0x00020000, 0xFFE40000, 0x00080003, 0x0000001C, 0x00000008, 0x0004001E, 0x00940000, 0x00080005, 0x00000076, 0x00000008, 0x00060000, 0xFF8A0000, 0x00080007, 0x00450076, 0x00000011, 0x000700B6, 0x00E100B6, 0x00080008, 0x00450076, 0x00000008, 0x00090000, 0x00760000, 0x00010001, 0x00080002, 0x00000000, 0x00000008, 0x00030000, 0x00000000, 0x00080004, 0x001E0096, 0x00000008, 0x00050000, 0x00780000, 0x00080006, 0x0000001E, 0x00000008, 0x00070045, 0x00780000, 0x00110007, 0x00B600E5, 0x00B60008, 0x00080045, 0x00780000, 0x00080009, 0x00000078, 0x00000001, 0x00010008, 0x00020000, 0xFFFF0000, 0x00080003, 0x00000001, 0x00000008, 0x0004001E, 0x00970000, 0x00080005, 0x00000079, 0x00000008, 0x00060000, 0x001C0000, 0x00080007, 0x00450079, 0x00000011, 0x000700B6, 0x00EA00B6, 0x00080008, 0x00450079, 0x00000008, 0x00090000, 0x00790000, 0x00010001, 0x00080002, 0x0000FFFD, 0x00000008, 0x00030000, 0x00030000, 0x00080004, 0x001E0099, 0x00000008, 0x00050000, 0x007B0000, 0x00080006, 0x0000001A, 0x00000008, 0x00070045, 0x007B0000, 0x00110007, 0x00B600EE, 0x00B60008, 0x00080045, 0x007B0000, 0x00080009, 0x0000007B, 0x00000001, 0x00010008, 0x00020000, 0xFFFC0000, 0x00080003, 0x00000004, 0x00000008, 0x0004001E, 0x009B0000, 0x00080005, 0x0000007D, 0x00000008, 0x00060000, 0x00190000, 0x00080007, 0x0045007D, 0x00000011, 0x000700B6, 0x00F000B6, 0x00080008, 0x0045007D, 0x00000008, 0x00090000, 0x007D0000, 0x00010001, 0x00080002, 0x0000FFFA, 0x00000008, 0x00030000, 0x00060000, 0x00080004, 0x001E009C, 0x00000008, 0x00050000, 0x007E0000, 0x00080006, 0x00000017, 0x00000008, 0x00070045, 0x007E0000, 0x00110007, 0x00B600F1, 0x00B60008, 0x00080045, 0x007E0000, 0x00080009, 0x0000007E, 0x00000001, 0x00010008, 0x00020000, 0xFFF80000, 0x00080003, 0x00000008, 0x00000008, 0x0004001E, 0x009E0000, 0x00080005, 0x00000080, 0x00000008, 0x00060000, 0x00150000, 0x00080007, 0x00450080, 0x00000011, 0x000700B6, 0x00F600B6, 0x00080008, 0x00450080, 0x00000008, 0x00090000, 0x00800000, 0x00010001, 0x00080002, 0x0000FFF7, 0x00000008, 0x00030000, 0x00090000, 0x00080004, 0x001E00A0, 0x00000008, 0x00050000, 0x00820000, 0x00080006, 0x00000014, 0x00000008, 0x00070045, 0x00820000, 0x00110007, 0x00B600FA, 0x00B60008, 0x00080045, 0x00820000, 0x00080009, 0x00000082, 0x00000001, 0x00010008, 0x00020000, 0xFFF50000, 0x00080003, 0x0000000B, 0x00000008, 0x0004001E, 0x00A10000, 0x00080005, 0x00000083, 0x00000008, 0x00060000, 0x00120000, 0x00080007, 0x00450083, 0x00000011, 0x000700B6, 0x00FE00B6, 0x00080008, 0x00450083, 0x00000008, 0x00090000, 0x00830000, 0x00010001, 0x00080002, 0x0000FFF3, 0x00000008, 0x00030000, 0x000D0000, 0x00080004, 0x001E00A3, 0x00000008, 0x00050000, 0x00850000, 0x00080006, 0x00000010, 0x00000008, 0x00070045, 0x00850000, 0x00110007, 0x00B60100, 0x00B60008, 0x00080045, 0x00850000, 0x00080009, 0x00000085, 0x00000001, 0x00010008, 0x00020000, 0xFFF20000, 0x00080003, 0x0000000E, 0x00000008, 0x0004001E, 0x00A50000, 0x00080005, 0x00000087, 0x00000008, 0x00060000, 0x000F0000, 0x00080007, 0x00450087, 0x00000011, 0x000700B6, 0x010200B6, 0x00080008, 0x00450087, 0x00000008, 0x00090000, 0x00870000, 0x00010001, 0x00080002, 0x0000FFF0, 0x00000008, 0x00030000, 0x00100000, 0x00080004, 0x001E00A6, 0x00000008, 0x00050000, 0x00880000, 0x00080006, 0x0000000D, 0x00000008, 0x00070045, 0x00880000, 0x00110007, 0x00B60106, 0x00B60008, 0x00080045, 0x00880000, 0x00080009, 0x00000088, 0x00000001, 0x00010008, 0x00020000, 0xFFEE0000, 0x00080003, 0x00000012, 0x00000008, 0x0004001E, 0x00A80000, 0x00080005, 0x0000008A, 0x00000008, 0x00060000, 0x000B0000, 0x00080007, 0x0045008A, 0x00000011, 0x000700B6, 0x010B00B6, 0x00080008, 0x0045008A, 0x00000008, 0x00090000, 0x008A0000, 0x00010001, 0x00080002, 0x0000FFED, 0x00000008, 0x00030000, 0x00130000, 0x00080004, 0x001E00AA, 0x00000008, 0x00050000, 0x008C0000, 0x00080006, 0x0000000A, 0x00000008, 0x00070045, 0x008C0000, 0x00110007, 0x00B6010F, 0x00B60008, 0x00080045, 0x008C0000, 0x00080009, 0x0000008C, 0x00000001, 0x00010008, 0x00020000, 0xFFEB0000, 0x00080003, 0x00000015, 0x00000008, 0x0004001E, 0x00AB0000, 0x00080005, 0x0000008D, 0x00000008, 0x00060000, 0x00080000, 0x00080007, 0x0045008D, 0x00000011, 0x000700B6, 0x011100B6, 0x00080008, 0x0045008D, 0x00000008, 0x00090000, 0x008D0000, 0x00010001, 0x00080002, 0x0000FFE9, 0x00000008, 0x00030000, 0x00170000, 0x00080004, 0x001E00AD, 0x00000008, 0x00050000, 0x008F0000, 0x00080006, 0x00000006, 0x00000008, 0x00070048, 0x00810000, 0x00110007, 0x00A500F6, 0x00B60008, 0x00080045, 0x00FA0000, 0x00080009, 0x0000008F, 0x00000001, 0x00010008, 0x00020000, 0xFFE70000, 0x00080003, 0x00000019, 0x00000008, 0x0004001E, 0x00AF0000, 0x00080005, 0x00000091, 0x00000008, 0x00060000, 0x00040000, 0x00080007, 0x0052005F, 0x00000011, 0x0007007C, 0x00B700B6, 0x00080009, 0x00000091, 0x00000001, 0x00010008, 0x00020000, 0xFFE60000, 0x00080003, 0x0000001A, 0x00000008, 0x0004001E, 0x00B00000, 0x00080005, 0x00000092, 0x00000008, 0x00060000, 0x00030000, 0x00080007, 0x005D0038, 0x00000011, 0x0007004B, 0x006B00B6, 0x00080009, 0x00000092, 0x00000001, 0x00010008, 0x00020000, 0xFFE40000, 0x00080003, 0x0000001C, 0x00000008, 0x0004001E, 0x00B20000, 0x00080005, 0x00000094, 0x00000008, 0x00060000, 0x00010000, 0x00080007, 0x00660017, 0x00000011, 0x00070023, 0x002C00B6, 0x00080009, 0x00000094, 0x00000001, 0x00010008, 0x00020000, 0x00000000, 0x00080003, 0x00000000, 0x00000008, 0x0004001E, 0x00B40000, 0x00080005, 0x00000096, 0x00000008, 0x00060000, 0x00000000, 0x00080007, 0x006A0009, 0x00000011, 0x00070012, 0x001200B6, 0x00080009, 0x00000096, 0x00000001, 0x00010003, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_81/A78900.data.s b/ver/us/asm/data/world/area_kpa/kpa_81/A78900.data.s deleted file mode 100644 index 84b104aec2..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_81/A78900.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240440_A78900 -.word 0xC3430000, 0x00000000, 0x43160000, 0x42B40000, 0x00000000, 0x43480000, 0x43160000, 0x00000000, 0x43160000, 0x00000000, 0x43160000, 0x43870000, 0x00000000, 0x00000000, 0x426C0000, 0x43340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8024099C, D_80240440_A78900, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0019015E, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000064, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetMusicTrackVolumes, 0x00000005, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_81/A789F0.data.s b/ver/us/asm/data/world/area_kpa/kpa_81/A789F0.data.s deleted file mode 100644 index e676b32509..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_81/A789F0.data.s +++ /dev/null @@ -1,27 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240530_A789F0 -.word 0x0000002D, 0x0000002E, 0x0000002F, 0x00000034, 0x00000035, 0x00000037, 0xFFFFFFFF - -dlabel D_8024054C_A78A0C -.word 0x00000039, 0x0000003A, 0x0000003B, 0x00000040, 0x00000041, 0x00000043, 0xFFFFFFFF - -dlabel D_80240568_A78A28 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000014, 0x00000024, 0x00000002, 0xFE363C82, 0x0000004E, 0x00000024, 0x00000002, 0xFE363C83, 0x0000004C, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x8024201C, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024060C_A78ACC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00000010, 0x00000024, 0x00000002, 0xFE363C82, D_80240530_A789F0, 0x00000024, 0x00000002, 0xFE363C83, D_8024054C_A78A0C, 0x00000044, 0x00000001, BaseExitDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80242024, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802406B0_A78B70 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x8024202C, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024070C_A78BCC -.word 0x00000047, 0x00000005, D_80240568_A78A28, 0x00000100, 0x00000014, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802406B0_A78B70, 0x00080000, 0x0000001B, 0x00000001, 0x00000000, 0x0000000B, 0x00000002, 0xF5DE02AA, 0x00000000, 0x00000047, 0x00000005, D_8024060C_A78ACC, 0x00000100, 0x00000010, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240788_A78C48 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000004E, 0x00000024, 0x00000002, 0xFE363C83, 0x0000004C, 0x00000044, 0x00000001, EnterDoubleDoor, 0x00000044, 0x00000001, D_8024070C_A78BCC, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, D_8024054C_A78A0C, 0x00000024, 0x00000002, 0xFE363C83, D_80240530_A789F0, 0x00000046, 0x00000001, BaseEnterDoor, 0x00000044, 0x00000001, D_8024070C_A78BCC, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, D_8024070C_A78BCC, 0x00000044, 0x00000001, EnterWalk, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024088C_A78D4C -.word 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000000B, 0x00000027, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFD8, 0x00000028, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000027, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000028, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000000B, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000016, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x80241FE0, 0x0000000B, 0x00000002, 0xF5DE02AA, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024088C_A78D4C, 0x00000100, 0x0000000B, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000047, 0x00000005, D_8024088C_A78D4C, 0x00000100, 0x0000000B, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000000B, 0x00000027, 0x00000014, 0x00000001, 0xF5DE02B0, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x00000027, 0xFFFFFFCE, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000028, 0xFFFFFFCE, 0x00000000, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, TranslateModel, 0x00000027, 0x00000032, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000028, 0x00000032, 0x00000000, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000000B, 0x00000043, 0x00000003, EnableModel, 0x0000000C, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000052, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000054, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005A, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005B, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005C, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005D, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005E, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005F, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000060, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000055, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000061, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000062, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000063, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000064, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000065, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000066, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000067, 0x00000000, 0x00000044, 0x00000001, D_80240788_A78C48, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x802404C0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_81/A79200.data.s b/ver/us/asm/data/world/area_kpa/kpa_81/A79200.data.s deleted file mode 100644 index e8cd7125a3..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_81/A79200.data.s +++ /dev/null @@ -1,30 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240D40_A79200 -.word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00170013, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel kpa_81_ItemChoice_HasSelectedItem -.word 0x00000000 - -dlabel kpa_81_ItemChoice_SelectedItemID -.word 0x00000000 - -dlabel D_80240DA0_A79260 -.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, kpa_81_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, kpa_81_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240308_A787C8, 0xFE363C80, 0x0000004E, 0x00000006, D_80240DA0_A79260, 0x00000010, 0x00000000, kpa_81_D_80242040, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024027C_A7873C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240F34_A793F4 -.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, kpa_81_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, kpa_81_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802403A4_A78864, 0xFE363C80, 0x0000004E, 0x00000006, D_80240F34_A793F4, 0x00000010, 0x00000000, D_80242208, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024027C_A7873C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802410B8_A79578 -.word 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000008, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241178_A79638 -.word 0x0000000A, 0x00000002, 0xF5DE02AA, 0x00000002, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02AA, 0x00000001, 0x00000024, 0x00000002, 0xF5DE02AA, 0x00000002, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000006D, 0x00000000, 0x000000CA, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5280, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2524A80, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF24C8E80, 0xF24C0A80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF24DDA80, 0xF24E1280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000056, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000005, 0x00000001, 0x00000008, 0x00000008, 0x00000001, 0x00000096, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000000FA, 0x00000008, 0x00000001, 0x0000000F, 0x00000044, 0x00000001, 0x802404C0, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830001, 0x00830001, 0x00000000, 0x00130008, 0x00000044, 0x00000001, 0x802404C0, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8280, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFF8D, 0xFE363C82, 0x00000000, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000006D, 0x00000000, 0x000000CA, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5280, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2524A80, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF24C8E80, 0xF24C0A80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF24DDA80, 0xF24E1280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000056, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000005, 0x00000001, 0x00000008, 0x00000008, 0x00000001, 0x00000096, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000000FA, 0x00000008, 0x00000001, 0x0000000F, 0x00000044, 0x00000001, 0x802404C0, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830001, 0x00830001, 0x00000000, 0x00130000, 0x00000043, 0x00000002, ShowChoice, 0x001E0013, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830001, 0x00830001, 0x00000000, 0x00130003, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000003, 0x00000001, 0x00000064, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, IsPlayerWithin, 0x00000078, 0x00000096, 0x0000001E, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000003, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C81, 0x0000012C, 0x00000004, 0x00000001, 0x00000064, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000046, 0x00000001, D_802410B8_A79578, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830001, 0x00830001, 0x00000000, 0x00130004, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000004, AwaitPlayerApproach, 0x00000078, 0x00000096, 0x0000001E, 0x00000004, 0x00000001, 0x00000002, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830001, 0x00830001, 0x00000000, 0x00130002, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000004, AwaitPlayerApproach, 0x00000078, 0x00000096, 0x0000001E, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000046, 0x00000001, D_802410B8_A79578, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830001, 0x00830001, 0x00000000, 0x00130001, 0x00000043, 0x00000002, ShowChoice, 0x001E0013, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000004, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830001, 0x00830001, 0x00000000, 0x00130002, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000004, AwaitPlayerLeave, 0x00000078, 0x00000096, 0x0000001E, 0x00000043, 0x00000004, AwaitPlayerApproach, 0x00000078, 0x00000096, 0x0000001E, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000003, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000046, 0x00000001, D_802410B8_A79578, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFE363C80, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830001, 0x00830001, 0x00000000, 0x00130005, 0x00000004, 0x00000001, 0x00000005, 0x00000003, 0x00000001, 0x00000004, 0x00000046, 0x00000001, D_802410B8_A79578, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFE363C80, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830001, 0x00830001, 0x00000000, 0x00130006, 0x00000003, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000A3, 0xFFFFFFB9, 0x0000006C, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ACA80, 0xF24A3A80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2524A80, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF24C8E80, 0xF24C0A80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF24DDA80, 0xF24E1280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, EnableModel, 0x0000000C, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000003, EnableModel, 0x00000046, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000001A, 0x00002091, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x0000001E, 0x00000007, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000046, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000048, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080017, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080018, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000161, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000041, 0x00000028, 0x00000002, 0xFE363C81, 0x00000010, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000041, 0x00000028, 0x00000002, 0xFE363C81, 0x00000010, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000041, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000024, 0x00000002, 0xF5DE02AA, 0x00000001, 0x00000043, 0x00000003, GotoMap, 0x80242034, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241D84_A7A244 -.word 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80241178_A79638, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x10000102, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x000000B8, 0x00000014, 0x00000096, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241DF0_A7A2B0 -.word 0x00000000, D_80240D40_A79200, 0x00000000, 0xC47A0000, 0x00000000, 0x03504D08, D_80241D84_A7A244, 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, 0x00830001, 0x00830002, 0x00830003, 0x00830003, 0x00830001, 0x00830001, 0x00830006, 0x00830006, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80241DF0_A7A2B0, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_82/A7A940.data.s b/ver/us/asm/data/world/area_kpa/kpa_82/A7A940.data.s deleted file mode 100644 index 6f7763c952..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_82/A7A940.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240440_A7A940 -.word 0xC3520000, 0x00000000, 0x43160000, 0x42B40000, 0x43160000, 0x00000000, 0x43160000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240830, D_80240440_A7A940, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190176, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000064, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetMusicTrackVolumes, 0x00000006, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_82/A7AA10.data.s b/ver/us/asm/data/world/area_kpa/kpa_82/A7AA10.data.s deleted file mode 100644 index 202aef567f..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_82/A7AA10.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240510_A7AA10 -.word 0x0000002D, 0x0000002E, 0x0000002F, 0x00000034, 0x00000035, 0x00000037, 0xFFFFFFFF - -dlabel D_8024052C_A7AA2C -.word 0x00000039, 0x0000003A, 0x0000003B, 0x00000040, 0x00000041, 0x00000043, 0xFFFFFFFF - -dlabel D_80240548_A7AA48 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000014, 0x00000024, 0x00000002, 0xFE363C82, 0x0000004E, 0x00000024, 0x00000002, 0xFE363C83, 0x0000004C, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80248F7C, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802405EC_A7AAEC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000010, 0x00000024, 0x00000002, 0xFE363C82, D_80240510_A7AA10, 0x00000024, 0x00000002, 0xFE363C83, D_8024052C_A7AA2C, 0x00000044, 0x00000001, BaseExitDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80248F84, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240690_A7AB90 -.word 0x0000000A, 0x00000002, 0xF84061A3, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF84061A3, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802406D0_A7ABD0 -.word 0x00000047, 0x00000005, D_80240548_A7AA48, 0x00000100, 0x00000014, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02AB, 0x00000000, 0x00000047, 0x00000005, D_80240690_A7AB90, 0x00000100, 0x00000010, 0x00000001, 0x00000000, 0x00000012, 0x00000000, 0x00000047, 0x00000005, D_802405EC_A7AAEC, 0x00000100, 0x00000010, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240754_A7AC54 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000004E, 0x00000024, 0x00000002, 0xFE363C83, 0x0000004C, 0x00000044, 0x00000001, EnterDoubleDoor, 0x00000044, 0x00000001, D_802406D0_A7ABD0, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, D_8024052C_A7AA2C, 0x00000024, 0x00000002, 0xFE363C83, D_80240510_A7AA10, 0x00000046, 0x00000001, BaseEnterDoor, 0x00000044, 0x00000001, D_802406D0_A7ABD0, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000016, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x80248EF4, 0x00000043, 0x00000003, EnableModel, 0x0000000C, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000052, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000054, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005A, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005B, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005C, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005D, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005E, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005F, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000060, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000055, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000061, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000062, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000063, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000064, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000065, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000066, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000067, 0x00000000, 0x00000044, 0x00000001, D_80240754_A7AC54, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x802404A0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_82/A7AF80.data.s b/ver/us/asm/data/world/area_kpa/kpa_82/A7AF80.data.s deleted file mode 100644 index 85fdea8201..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_82/A7AF80.data.s +++ /dev/null @@ -1,285 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240A80_A7AF80 -.word 0x00000000, 0x00170016, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0001 - -dlabel D_80240AAC_A7AFAC -.word 0x40A00000, 0x00000001, 0x00000000, 0x3F800000, 0x00000000, 0x00000001, 0x40C00000, 0x0000000A, 0x00000001, 0x3F800000, 0x00000000, 0x00000001 - -dlabel D_80240ADC_A7AFDC -.word 0x00000043, 0x00000002, BasicAI_Main, D_80240AAC_A7AFAC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240AFC_A7AFFC -.word 0x00000000, 0x00160018, 0x00000000, 0x00000000, D_80240ADC_A7AFDC, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00050000 - -dlabel D_80240B28_A7B028 -.word 0x40A00000, 0x00000001, 0x00000000, 0x3F800000, 0x00000000, 0x00000001, 0x40C00000, 0x0000000A, 0x00000001, 0x3F800000, 0x00000000, 0x00000001 - -dlabel D_80240B58_A7B058 -.word 0x00000043, 0x00000002, BasicAI_Main, D_80240B28_A7B028, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240B78_A7B078 -.word 0x00000000, 0x00230018, 0x00000000, 0x00000000, D_80240B58_A7B058, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00120000 - -dlabel D_80240BA4_A7B0A4 -.word 0x40A00000, 0x00000001, 0x00000000, 0x3F800000, 0x00000000, 0x00000001, 0x40C00000, 0x0000000A, 0x00000001, 0x3F800000, 0x00000000, 0x00000001 - -dlabel D_80240BD4_A7B0D4 -.word 0x00000043, 0x00000002, BasicAI_Main, D_80240BA4_A7B0A4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240BF4_A7B0F4 -.word 0x00000000, 0x00170016, 0x00000000, 0x00000000, D_80240BD4_A7B0D4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000E0000 - -dlabel kpa_82_ItemChoice_HasSelectedItem -.word 0x00000000 - -dlabel kpa_82_ItemChoice_SelectedItemID -.word 0x00000000 - -dlabel D_80240C28_A7B128 -.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, kpa_82_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, kpa_82_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240308_A7A808, 0xFE363C80, 0x0000004E, 0x00000006, D_80240C28_A7B128, 0x00000010, 0x00000000, D_80248F90, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024027C_A7A77C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240DBC_A7B2BC -.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, kpa_82_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, kpa_82_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802403A4_A7A8A4, 0xFE363C80, 0x0000004E, 0x00000006, D_80240DBC_A7B2BC, 0x00000010, 0x00000000, D_80249158, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024027C_A7A77C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240F40_A7B440 -.word 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AA680, 0xF24A5280, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2518280, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF24BDA80, 0xF24E7CE7, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF24D8680, 0xF24CB280, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0xF24A7A80, 0xF24A7A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024101C_A7B51C -.word 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A8E80, 0xF24A4280, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2505680, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF24BDA80, 0xF24E7CE7, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF24D8680, 0xF24CB280, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0xF24A7A80, 0xF24A7A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802410F8_A7B5F8 -.word 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AA680, 0xF24A4280, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2518280, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF24BDA80, 0xF24E7CE7, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF24D8680, 0xF24CB280, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0xF24A7A80, 0xF24A7A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802411D4_A7B6D4 -.word 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AA680, 0xF24A5080, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF24BDA80, 0xF24E7CE7, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF24D8680, 0xF24CB280, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0xF24A7A80, 0xF24A7A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024129C_A7B79C -.word 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xFE363C86, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF251D280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABA80, 0xF24A5680, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF24A7080, 0xF24F2A80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF24A7080, 0xF24D9A80, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0xF24A7A80, 0xF24A7A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241378_A7B878 -.word 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xFE363C86, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF251D280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABA80, 0xF24A5680, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF24B4280, 0xF24F2A80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF24B4280, 0xF24D9A80, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0xF24A7A80, 0xF24A7A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241454_A7B954 -.word 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000003C, 0x0000001E, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000225, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000021, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000027, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000028, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000025, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241590_A7BA90 -.word 0x00000043, 0x00000005, MakeLerp, 0x0000003C, 0x00000000, 0x0000001E, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000226, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000021, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000027, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000028, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000025, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802416CC_A7BBCC -.word 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0xFE363C83, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x00000028, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFF88, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C81, 0x00000096, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0xFE363C84, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, 0xFE363C85, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241774_A7BC74 -.word 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0xFE363C83, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x00000028, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFEC, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C81, 0x00000096, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0xFE363C84, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, 0xFE363C85, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024181C_A7BD1C -.word 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0xFE363C83, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x00000028, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C81, 0x00000050, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C81, 0x00000096, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0xFE363C84, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, 0xFE363C85, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802418C4_A7BDC4 -.word 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0xFE363C83, 0x00000043, 0x00000003, RandInt, 0x00000014, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFF9C, 0x00000000, 0xFE363C81, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241944_A7BE44 -.word 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0xFE363C83, 0x00000043, 0x00000003, RandInt, 0x00000014, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x00000000, 0x00000000, 0xFE363C81, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802419C4_A7BEC4 -.word 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0xFE363C83, 0x00000043, 0x00000003, RandInt, 0x00000014, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x00000064, 0x00000000, 0xFE363C81, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241A44_A7BF44 -.word 0x00000043, 0x00000003, RandInt, 0x00000002, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802416CC_A7BBCC, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_80241774_A7BC74, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_8024181C_A7BD1C, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241AC4_A7BFC4 -.word 0x00000043, 0x00000003, RandInt, 0x00000002, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802418C4_A7BDC4, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_80241944_A7BE44, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802419C4_A7BEC4, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241B44_A7C044 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241B54_A7C054 -.word 0x00000024, 0x00000002, 0xFE363C83, 0x00260003, 0x00000024, 0x00000002, 0xFE363C84, 0x00260001, 0x00000024, 0x00000002, 0xFE363C85, D_80240ADC_A7AFDC, 0x00000046, 0x00000001, D_80241A44_A7BF44, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241BA0_A7C0A0 -.word 0x00000024, 0x00000002, 0xFE363C83, 0x00260003, 0x00000046, 0x00000001, D_80241AC4_A7BFC4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241BCC_A7C0CC -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241BDC_A7C0DC -.word 0x00000024, 0x00000002, 0xFE363C83, 0x003B0004, 0x00000024, 0x00000002, 0xFE363C84, 0x003B0001, 0x00000024, 0x00000002, 0xFE363C85, D_80240BD4_A7B0D4, 0x00000046, 0x00000001, D_80241A44_A7BF44, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241C28_A7C128 -.word 0x00000024, 0x00000002, 0xFE363C83, 0x003B0004, 0x00000046, 0x00000001, D_80241AC4_A7BFC4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241C54_A7C154 -.word 0x00000024, 0x00000002, 0xFE363C83, 0x003B0004, 0x00000024, 0x00000002, 0xFE363C84, 0x003B0001, 0x00000024, 0x00000002, 0xFE363C85, D_80240BD4_A7B0D4, 0x00000046, 0x00000001, D_80241774_A7BC74, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241CA0_A7C1A0 -.word 0x00000024, 0x00000002, 0xFE363C83, 0x003B0004, 0x00000046, 0x00000001, D_80241944_A7BE44, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241CCC_A7C1CC -.word 0x00000024, 0x00000002, 0xFE363C83, 0x003B0104, 0x00000024, 0x00000002, 0xFE363C84, 0x003B0101, 0x00000024, 0x00000002, 0xFE363C85, D_80240BD4_A7B0D4, 0x00000046, 0x00000001, D_80241A44_A7BF44, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241D18_A7C218 -.word 0x00000024, 0x00000002, 0xFE363C83, 0x003B0104, 0x00000046, 0x00000001, D_80241AC4_A7BFC4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241D44_A7C244 -.word 0x00000024, 0x00000002, 0xFE363C83, 0x003B0104, 0x00000024, 0x00000002, 0xFE363C84, 0x003B0101, 0x00000024, 0x00000002, 0xFE363C85, D_80240BD4_A7B0D4, 0x00000046, 0x00000001, D_8024181C_A7BD1C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241D90_A7C290 -.word 0x00000024, 0x00000002, 0xFE363C83, 0x003B0104, 0x00000046, 0x00000001, D_802419C4_A7BEC4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241DBC_A7C2BC -.word 0x00000024, 0x00000002, 0xFE363C83, 0x003B0204, 0x00000024, 0x00000002, 0xFE363C84, 0x003B0201, 0x00000024, 0x00000002, 0xFE363C85, D_80240BD4_A7B0D4, 0x00000046, 0x00000001, D_80241A44_A7BF44, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241E08_A7C308 -.word 0x00000024, 0x00000002, 0xFE363C83, 0x003B0204, 0x00000046, 0x00000001, D_80241AC4_A7BFC4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241E34_A7C334 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241E44_A7C344 -.word 0x00000024, 0x00000002, 0xFE363C83, 0x00290004, 0x00000024, 0x00000002, 0xFE363C84, 0x00290001, 0x00000024, 0x00000002, 0xFE363C85, D_80240B58_A7B058, 0x00000046, 0x00000001, D_80241A44_A7BF44, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241E90_A7C390 -.word 0x00000024, 0x00000002, 0xFE363C83, 0x00290004, 0x00000046, 0x00000001, D_80241AC4_A7BFC4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241EBC_A7C3BC -.word 0x00000024, 0x00000002, 0xFE363C83, 0x00290104, 0x00000024, 0x00000002, 0xFE363C84, 0x00290101, 0x00000024, 0x00000002, 0xFE363C85, D_80240B58_A7B058, 0x00000046, 0x00000001, D_80241A44_A7BF44, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241F08_A7C408 -.word 0x00000024, 0x00000002, 0xFE363C83, 0x00290104, 0x00000046, 0x00000001, D_80241AC4_A7BFC4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241F34_A7C434 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241F44_A7C444 -.word 0x00000024, 0x00000002, 0xFE363C83, 0x00910003, 0x00000024, 0x00000002, 0xFE363C84, 0x00910001, 0x00000024, 0x00000002, 0xFE363C85, D_80240ADC_A7AFDC, 0x00000046, 0x00000001, D_80241A44_A7BF44, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241F90_A7C490 -.word 0x00000024, 0x00000002, 0xFE363C83, 0x00910003, 0x00000046, 0x00000001, D_80241AC4_A7BFC4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241FBC_A7C4BC -.word 0x00000024, 0x00000002, 0xFE363C83, 0x00910003, 0x00000024, 0x00000002, 0xFE363C84, 0x00910001, 0x00000024, 0x00000002, 0xFE363C85, D_80240ADC_A7AFDC, 0x00000046, 0x00000001, D_802416CC_A7BBCC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242008_A7C508 -.word 0x00000024, 0x00000002, 0xFE363C83, 0x00910003, 0x00000046, 0x00000001, D_802418C4_A7BDC4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242034_A7C534 -.word 0x0000001C, D_80241E44_A7C344, 0xFFFFFFFE, 0x00000005, 0x00000004, D_80241B54_A7C054, 0xFFFFFFFE, 0x00000005, 0x0000001D, D_80241E44_A7C344, 0xFFFFFFFE, 0x00000005, 0x00000005, D_80241B54_A7C054, 0xFFFFFFFE, 0x00000005, 0x00000006, D_80241B54_A7C054, 0xFFFFFFFE, 0x00000005, 0x0000001E, D_80241E44_A7C344, 0xFFFFFFFE, 0x00000005, 0x00000007, D_80241B54_A7C054, 0xFFFFFFFF - -dlabel D_802420A0_A7C5A0 -.word 0x0000000A, D_80241BDC_A7C0DC, 0xFFFFFFFE, 0x00000005, 0x0000000B, D_80241BDC_A7C0DC, 0xFFFFFFFE, 0x0000000A, 0x0000000C, D_80241BDC_A7C0DC, 0xFFFFFFFE, 0x00000008, 0x00000010, D_80241CCC_A7C1CC, 0xFFFFFFFE, 0x00000003, 0x00000011, D_80241CCC_A7C1CC, 0xFFFFFFFE, 0x00000006, 0x00000012, D_80241CCC_A7C1CC, 0xFFFFFFFE, 0x00000007, 0x00000013, D_80241CCC_A7C1CC, 0xFFFFFFFE, 0x00000005, 0x00000016, D_80241DBC_A7C2BC, 0xFFFFFFFE, 0x00000004, 0x00000017, D_80241DBC_A7C2BC, 0xFFFFFFFE, 0x00000006, 0x00000018, D_80241DBC_A7C2BC, 0xFFFFFFFE, 0x00000005, 0x00000019, D_80241DBC_A7C2BC, 0xFFFFFFFF - -dlabel D_8024214C_A7C64C -.word 0x0000000A, D_80241C54_A7C154, 0x00000010, D_80241D44_A7C244, 0x00000028, D_80241FBC_A7C4BC, 0xFFFFFFFE, 0x00000005, 0x0000000B, D_80241C54_A7C154, 0x00000011, D_80241D44_A7C244, 0x00000029, D_80241FBC_A7C4BC, 0xFFFFFFFE, 0x00000005, 0x00000012, D_80241D44_A7C244, 0xFFFFFFFE, 0x00000005, 0x00000013, D_80241D44_A7C244, 0xFFFFFFFF - -dlabel D_802421A8_A7C6A8 -.word 0x00000004, D_80241B54_A7C054, 0xFFFFFFFE, 0x00000008, 0x00000022, D_80241EBC_A7C3BC, 0x00000023, D_80241EBC_A7C3BC, 0xFFFFFFFE, 0x00000005, 0x00000010, D_80241CCC_A7C1CC, 0x00000016, D_80241DBC_A7C2BC, 0x00000011, D_80241CCC_A7C1CC, 0xFFFFFFFE, 0x00000008, 0x00000005, D_80241B54_A7C054, 0x00000012, D_80241CCC_A7C1CC, 0xFFFFFFFE, 0x00000005, 0x00000024, D_80241EBC_A7C3BC, 0xFFFFFFFE, 0x00000005, 0x00000025, D_80241EBC_A7C3BC, 0xFFFFFFFF - -dlabel D_80242224_A7C724 -.word 0x00000004, D_80241B54_A7C054, 0xFFFFFFFE, 0x00000005, 0x00000022, D_80241EBC_A7C3BC, 0xFFFFFFFE, 0x00000005, 0x0000001C, D_80241E44_A7C344, 0xFFFFFFFF - -dlabel D_80242250_A7C750 -.word 0x0000000A, D_80241BDC_A7C0DC, 0xFFFFFFFE, 0x00000005, 0x0000000B, D_80241BDC_A7C0DC, 0xFFFFFFFE, 0x00000004, 0x00000016, D_80241DBC_A7C2BC, 0xFFFFFFFE, 0x00000008, 0x00000028, D_80241F44_A7C444, 0xFFFFFFFE, 0x00000005, 0x00000029, D_80241F44_A7C444, 0xFFFFFFFE, 0x00000008, 0x0000002A, D_80241F44_A7C444, 0xFFFFFFFE, 0x00000005, 0x00000022, D_80241EBC_A7C3BC, 0xFFFFFFFE, 0x0000000A, 0x00000023, D_80241EBC_A7C3BC, 0xFFFFFFFE, 0x00000005, 0x00000024, D_80241EBC_A7C3BC, 0xFFFFFFFE, 0x00000008, 0x00000025, D_80241EBC_A7C3BC, 0xFFFFFFFF - -dlabel D_802422EC_A7C7EC -.word 0x0000001C, D_80241E44_A7C344, 0xFFFFFFFE, 0x0000000A, 0x00000010, D_80241CCC_A7C1CC, 0x00000004, D_80241B54_A7C054, 0xFFFFFFFE, 0x00000005, 0x00000011, D_80241CCC_A7C1CC, 0x00000005, D_80241B54_A7C054, 0xFFFFFFFE, 0x00000005, 0x00000006, D_80241B54_A7C054, 0x0000001D, D_80241E44_A7C344, 0xFFFFFFFE, 0x00000008, 0x0000001E, D_80241E44_A7C344, 0xFFFFFFFE, 0x00000005, 0x0000000A, D_80241BDC_A7C0DC, 0xFFFFFFFE, 0x00000005, 0x0000000B, D_80241BDC_A7C0DC, 0xFFFFFFFF - -dlabel D_80242370_A7C870 -.word 0x0000001C, D_80241E90_A7C390, 0x0000001D, D_80241E90_A7C390, 0x0000001E, D_80241E90_A7C390, 0x00000004, D_80241BA0_A7C0A0, 0x00000005, D_80241BA0_A7C0A0, 0x00000006, D_80241BA0_A7C0A0, 0x00000007, D_80241BA0_A7C0A0, 0xFFFFFFFF - -dlabel D_802423AC_A7C8AC -.word 0x0000000A, D_80241C28_A7C128, 0x0000000B, D_80241C28_A7C128, 0x0000000C, D_80241C28_A7C128, 0x00000010, D_80241D18_A7C218, 0x00000011, D_80241D18_A7C218, 0x00000012, D_80241D18_A7C218, 0x00000013, D_80241D18_A7C218, 0x00000016, D_80241E08_A7C308, 0x00000017, D_80241E08_A7C308, 0x00000018, D_80241E08_A7C308, 0x00000019, D_80241E08_A7C308, 0xFFFFFFFF - -dlabel D_80242408_A7C908 -.word 0x0000000A, D_80241CA0_A7C1A0, 0x0000000B, D_80241CA0_A7C1A0, 0x00000010, D_80241D90_A7C290, 0x00000011, D_80241D90_A7C290, 0x00000012, D_80241D90_A7C290, 0x00000013, D_80241D90_A7C290, 0x00000028, D_80242008_A7C508, 0x00000029, D_80242008_A7C508, 0xFFFFFFFF - -dlabel D_8024244C_A7C94C -.word 0x00000004, D_80241BA0_A7C0A0, 0x00000005, D_80241BA0_A7C0A0, 0x00000022, D_80241F08_A7C408, 0x00000023, D_80241F08_A7C408, 0x00000024, D_80241F08_A7C408, 0x00000025, D_80241F08_A7C408, 0x00000016, D_80241E08_A7C308, 0x00000010, D_80241D18_A7C218, 0x00000011, D_80241D18_A7C218, 0x00000012, D_80241D18_A7C218, 0xFFFFFFFF - -dlabel D_802424A0_A7C9A0 -.word 0x00000004, D_80241BA0_A7C0A0, 0x00000022, D_80241F08_A7C408, 0x0000001C, D_80241E90_A7C390, 0xFFFFFFFF - -dlabel D_802424BC_A7C9BC -.word 0x0000000A, D_80241C28_A7C128, 0x0000000B, D_80241C28_A7C128, 0x00000016, D_80241E08_A7C308, 0x00000028, D_80241F90_A7C490, 0x00000029, D_80241F90_A7C490, 0x0000002A, D_80241F90_A7C490, 0x00000022, D_80241F08_A7C408, 0x00000023, D_80241F08_A7C408, 0x00000024, D_80241F08_A7C408, 0x00000025, D_80241F08_A7C408, 0xFFFFFFFF - -dlabel D_80242510_A7CA10 -.word 0x0000001C, D_80241E90_A7C390, 0x0000001D, D_80241E90_A7C390, 0x0000001E, D_80241E90_A7C390, 0x00000010, D_80241D18_A7C218, 0x00000011, D_80241D18_A7C218, 0x00000004, D_80241BA0_A7C0A0, 0x00000005, D_80241BA0_A7C0A0, 0x00000006, D_80241BA0_A7C0A0, 0x0000000A, D_80241C28_A7C128, 0x0000000B, D_80241C28_A7C128, 0xFFFFFFFF - -dlabel D_80242564_A7CA64 -.word 0x00000014, 0x00000001, 0xF70F2E8C, 0x00000016, 0x00000001, 0x00000000, 0x00000030, 0x00000001, D_80242034_A7C534, 0x00000016, 0x00000001, 0x00000001, 0x00000030, 0x00000001, D_802420A0_A7C5A0, 0x00000016, 0x00000001, 0x00000002, 0x00000030, 0x00000001, D_8024214C_A7C64C, 0x00000016, 0x00000001, 0x00000003, 0x00000030, 0x00000001, D_802421A8_A7C6A8, 0x00000016, 0x00000001, 0x00000004, 0x00000030, 0x00000001, D_80242224_A7C724, 0x00000016, 0x00000001, 0x00000005, 0x00000030, 0x00000001, D_80242250_A7C750, 0x00000016, 0x00000001, 0x00000006, 0x00000030, 0x00000001, D_802422EC_A7C7EC, 0x00000023, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000032, 0x00000002, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFFFFFFFF, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFFFFFFFE, 0x00000008, 0x00000001, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFE363C8A, 0xFE363C8B, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802426B4_A7CBB4 -.word 0x00000014, 0x00000001, 0xF70F2E8C, 0x00000016, 0x00000001, 0x00000000, 0x00000030, 0x00000001, D_80242370_A7C870, 0x00000016, 0x00000001, 0x00000001, 0x00000030, 0x00000001, D_802423AC_A7C8AC, 0x00000016, 0x00000001, 0x00000002, 0x00000030, 0x00000001, D_80242408_A7C908, 0x00000016, 0x00000001, 0x00000003, 0x00000030, 0x00000001, D_8024244C_A7C94C, 0x00000016, 0x00000001, 0x00000004, 0x00000030, 0x00000001, D_802424A0_A7C9A0, 0x00000016, 0x00000001, 0x00000005, 0x00000030, 0x00000001, D_802424BC_A7C9BC, 0x00000016, 0x00000001, 0x00000006, 0x00000030, 0x00000001, D_80242510_A7CA10, 0x00000023, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000032, 0x00000002, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFFFFFFFF, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFFFFFFFE, 0x00000008, 0x00000001, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFE363C8A, 0xFE363C8B, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242804_A7CD04 -.word 0x00000046, 0x00000001, D_802411D4_A7B6D4, 0x00000014, 0x00000001, 0xF70F2E8C, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x003B0501, 0x003B0501, 0x00000000, 0x00130035, 0x00000043, 0x00000002, ShowChoice, 0x001E0046, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x003B0501, 0x003B0501, 0x00000000, 0x00130036, 0x00000043, 0x00000002, ShowChoice, 0x001E0047, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x003B0501, 0x003B0501, 0x00000000, 0x00130037, 0x00000043, 0x00000002, ShowChoice, 0x001E0048, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x003B0501, 0x003B0501, 0x00000000, 0x00130038, 0x00000043, 0x00000002, ShowChoice, 0x001E0049, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000004, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x003B0501, 0x003B0501, 0x00000000, 0x00130039, 0x00000043, 0x00000002, ShowChoice, 0x001E004A, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000005, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x003B0501, 0x003B0501, 0x00000000, 0x0013003A, 0x00000043, 0x00000002, ShowChoice, 0x001E004B, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000006, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x003B0501, 0x003B0501, 0x00000000, 0x0013003B, 0x00000043, 0x00000002, ShowChoice, 0x001E004C, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000001, CloseMessage, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242BB4_A7D0B4 -.word 0x00000043, 0x00000003, EnableModel, 0x00000052, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x000000B4, 0xFE363C80, 0x0000003C, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x0000000F, 0x00000002, 0xFE363C80, 0x00000168, 0x00000043, 0x00000006, RotateGroup, 0x00000056, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000056, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000052, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000052, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242CC8_A7D1C8 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000000, 0x00000028, 0x00000002, 0xFE363C81, 0x00000082, 0x00000028, 0x00000002, 0xFE363C82, 0x00000032, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000055, 0x00000043, 0x00000006, RotateModel, 0x00000055, 0x000000B4, 0x00000000, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242D98_A7D298 -.word 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x00000064, 0x00000032, 0x0000001E, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFE363C86, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C86, 0xF24A7A8B, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xFE363C86, 0xFE363C86, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242E60_A7D360 -.word 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0x00000082, 0x00000032, 0x00000045, 0x00000002, D_80242CC8_A7D1C8, 0xFE363C8B, 0x00000044, 0x00000001, D_80242D98_A7D298, 0x00000008, 0x00000001, 0x00000001, 0x00000014, 0x00000001, 0xF70F2E8C, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000076, 0x00000024, 0x00000002, 0xFE363C81, 0x00000094, 0x00000024, 0x00000002, 0xFE363C82, 0x00000003, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x0000004E, 0x00000024, 0x00000002, 0xFE363C81, 0x00000094, 0x00000024, 0x00000002, 0xFE363C82, 0x00000003, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x00000026, 0x00000024, 0x00000002, 0xFE363C81, 0x00000094, 0x00000024, 0x00000002, 0xFE363C82, 0x00000003, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFE363C81, 0x00000094, 0x00000024, 0x00000002, 0xFE363C82, 0x00000003, 0x00000016, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFD7, 0x00000024, 0x00000002, 0xFE363C81, 0x00000094, 0x00000024, 0x00000002, 0xFE363C82, 0x00000003, 0x00000016, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFAF, 0x00000024, 0x00000002, 0xFE363C81, 0x00000094, 0x00000024, 0x00000002, 0xFE363C82, 0x00000003, 0x00000016, 0x00000001, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFF87, 0x00000024, 0x00000002, 0xFE363C81, 0x00000094, 0x00000024, 0x00000002, 0xFE363C82, 0x00000003, 0x00000023, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x000000B8, 0x00000014, 0x00000096, 0x00000049, 0x00000001, 0xFE363C8B, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802430DC_A7D5DC -.word 0x00000014, 0x00000001, 0xF70F2E8C, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000005A, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x0000005B, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x0000005C, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0x0000005D, 0x00000016, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFE363C80, 0x0000005E, 0x00000016, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000005F, 0x00000016, 0x00000001, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0x00000060, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802431C4_A7D6C4 -.word 0x00000014, 0x00000001, 0xF70F2E8C, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000061, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000062, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x00000063, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0x00000064, 0x00000016, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFE363C80, 0x00000065, 0x00000016, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C80, 0x00000066, 0x00000016, 0x00000001, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0x00000067, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802432AC_A7D7AC -.word 0x00000024, 0x00000002, 0xFE363C86, 0xF24A8280, 0x00000046, 0x00000001, D_8024129C_A7B79C, 0x00000008, 0x00000001, 0x00000005, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000870, 0x00000046, 0x00000001, D_80242BB4_A7D0B4, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableGroup, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000054, 0x00000046, 0x00000001, D_80242E60_A7D360, 0x00000046, 0x00000001, D_802430DC_A7D5DC, 0x00000043, 0x00000003, EnableModel, 0x00000054, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000924, 0x00000046, 0x00000001, D_80242BB4_A7D0B4, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableGroup, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000055, 0x00000046, 0x00000001, D_80242E60_A7D360, 0x00000046, 0x00000001, D_802431C4_A7D6C4, 0x00000043, 0x00000003, EnableModel, 0x00000055, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802410F8_A7B5F8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243460_A7D960 -.word 0x00000003, 0x00000001, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF84061A3, 0x00000000, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF84061A3, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000046, 0x00000001, D_80240F40_A7B440, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000005, 0x00000001, 0x00000008, 0x00000008, 0x00000001, 0x00000096, 0x0000000B, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000004, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000000FA, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000004, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0x802404A0, 0x00000003, 0x00000001, 0x00000005, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xF84061A4, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x003B0501, 0x003B0501, 0x00000000, 0x0013002E, 0x00000024, 0x00000002, 0xF84061A4, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x003B0501, 0x003B0501, 0x00000000, 0x0013002F, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E0013, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x003B0501, 0x003B0501, 0x00000000, 0x00130031, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x003B0501, 0x003B0501, 0x00000000, 0x00130030, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF84061A3, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E0013, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x003B0501, 0x003B0501, 0x00000000, 0x00130032, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x003B0501, 0x003B0501, 0x00000000, 0x00130033, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000010, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8280, 0x00000043, 0x00000004, PlayerMoveTo, 0x000000AF, 0x000000EC, 0x00000014, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000010, 0x7FFFFE00, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000102, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8480, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000010E, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x000000CD, 0x000000EC, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFFFFFFFF, 0x00000000, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E8C, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E8D, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E8E, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C86, 0xF24A8280, 0x00000046, 0x00000001, D_8024129C_A7B79C, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000002, 0x00000000, 0x00000008, 0x00000046, 0x00000001, D_80241454_A7B954, 0x00000046, 0x00000001, D_80242564_A7CA64, 0x00000008, 0x00000001, 0x000000C8, 0x00000056, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x00130034, 0x0000012C, 0x000000C8, 0x00000024, 0x00000002, 0xFD050F81, 0x00000001, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000046, 0x00000001, D_802426B4_A7CBB4, 0x00000008, 0x00000001, 0x00000023, 0x00000046, 0x00000001, D_80241590_A7BA90, 0x00000044, 0x00000001, 0x802404A0, 0x00000008, 0x00000001, 0x0000001E, 0x00000003, 0x00000001, 0x0000000C, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFD050F81, 0x00000000, 0x00000004, 0x00000001, 0x0000000C, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, 0x00000000, 0x00000046, 0x00000001, D_80242804_A7CD04, 0x00000046, 0x00000001, D_802432AC_A7D7AC, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000000, 0x00000027, 0x00000002, 0xF70F2E8D, 0x00000001, 0x0000000A, 0x00000002, 0xF70F2E8D, 0x00000005, 0x00000004, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF70F2E8D, 0x00000004, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x003B0501, 0x003B0501, 0x00000000, 0x0013003D, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x003B0501, 0x003B0501, 0x00000000, 0x0013003C, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xF70F2E8E, 0x00000001, 0x0000000A, 0x00000002, 0xF70F2E8E, 0x00000003, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF70F2E8E, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x003B0501, 0x003B0501, 0x00000000, 0x0013003E, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF70F2E8E, 0x00000002, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x003B0501, 0x003B0501, 0x00000000, 0x00130040, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xF70F2E8C, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x003B0501, 0x003B0501, 0x00000000, 0x00130041, 0x00000024, 0x00000002, 0xFE363C86, 0xF24A8280, 0x00000046, 0x00000001, D_8024129C_A7B79C, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000013B, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000013B, 0x00000000, 0x00000046, 0x00000001, D_80241454_A7B954, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x003B0501, 0x003B0501, 0x00000000, 0x00130042, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000002, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C86, 0xF24A8680, 0x00000046, 0x00000001, D_80241378_A7B878, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x003B0504, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x003B0504, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x003B0504, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000057, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, StartBossBattle, 0x00000003, 0x00000046, 0x00000001, D_8024101C_A7B51C, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x003B0501, 0x003B0501, 0x00000000, 0x00130043, 0x00000004, 0x00000001, 0x00000028, 0x00000003, 0x00000001, 0x0000001E, 0x00000056, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000010, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000078, 0x00000091, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000010, 0x7FFFFE00, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8880, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x00000050, 0x00000091, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x003B0501, 0x003B0501, 0x00000000, 0x0013003F, 0x00000003, 0x00000001, 0x00000028, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF5DE02AB, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000047, 0x00000005, D_802405EC_A7AAEC, 0x00000100, 0x00000010, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243FD0_A7E4D0 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0x00000078, 0x00000000, 0x00000091, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000050, 0x00000000, 0x00000091, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000021, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000027, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000028, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000025, 0x00000000, 0x00000000, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024416C_A7E66C -.word 0x0000000A, 0x00000002, 0xF5DE02AB, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80243460_A7D960, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_80243FD0_A7E4D0, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x10000102, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x000000B8, 0x00000014, 0x00000096, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244204_A7E704 -.word 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80241B44_A7C044, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244258_A7E758 -.word 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80241BCC_A7C0CC, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802442AC_A7E7AC -.word 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80241E34_A7C334, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244300_A7E800 -.word 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80241F34_A7C434, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244354_A7E854 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244364_A7E864 -.word 0x00000000, D_80240A80_A7AF80, 0x00000000, 0xC47A0000, 0x00000000, 0x03F44F0C, D_8024416C_A7E66C, 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, 0x003B0501, 0x003B0502, 0x003B0503, 0x003B0502, 0x003B0501, 0x003B0501, 0x003B050C, 0x003B050C, 0x003B0515, 0x003B0512, 0x003B0511, 0x003B0510, 0x003B0505, 0x003B0501, 0x003B0501, 0x003B0501, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80240A80_A7AF80, 0x00000000, 0xC47A0000, 0x00000000, 0x03D40F08, D_80244354_A7E854, 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, 0x003B0501, 0x003B0502, 0x003B0503, 0x003B0502, 0x003B0501, 0x003B0501, 0x003B050C, 0x003B050C, 0x003B0515, 0x003B0512, 0x003B0511, 0x003B0510, 0x003B0505, 0x003B0501, 0x003B0501, 0x003B0501, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, D_80240A80_A7AF80, 0x00000000, 0xC47A0000, 0x00000000, 0x03D40F08, D_80244354_A7E854, 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, 0x003B0501, 0x003B0502, 0x003B0503, 0x003B0502, 0x003B0501, 0x003B0501, 0x003B050C, 0x003B050C, 0x003B0515, 0x003B0512, 0x003B0511, 0x003B0510, 0x003B0505, 0x003B0501, 0x003B0501, 0x003B0501, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000003, D_80240A80_A7AF80, 0x00000000, 0xC47A0000, 0x00000000, 0x03D40F08, D_80244354_A7E854, 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, 0x003B0501, 0x003B0502, 0x003B0503, 0x003B0502, 0x003B0501, 0x003B0501, 0x003B050C, 0x003B050C, 0x003B0515, 0x003B0512, 0x003B0511, 0x003B0510, 0x003B0505, 0x003B0501, 0x003B0501, 0x003B0501, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80244B24_A7F024 -.word 0x00000004, D_80240AFC_A7AFFC, 0x00000000, 0xC47A0000, 0x00000000, 0x03F40F08, D_80244204_A7E704, 0x00000000, 0x00000000, 0x00000000, 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, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0xFFFF8001, 0x00000001, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0x00000001, 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, 0x00260001, 0x00260002, 0x00260003, 0x00260003, 0x00260001, 0x00260001, 0x00260005, 0x00260005, 0x00260003, 0x00260003, 0x00260003, 0x00260003, 0x00260003, 0x00260003, 0x00260003, 0x00260003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000005, D_80240AFC_A7AFFC, 0x00000000, 0xC47A0000, 0x00000000, 0x03F40F08, D_80244204_A7E704, 0x00000000, 0x00000000, 0x00000000, 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, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0xFFFF8001, 0x00000001, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0x00000001, 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, 0x00260001, 0x00260002, 0x00260003, 0x00260003, 0x00260001, 0x00260001, 0x00260005, 0x00260005, 0x00260003, 0x00260003, 0x00260003, 0x00260003, 0x00260003, 0x00260003, 0x00260003, 0x00260003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, D_80240AFC_A7AFFC, 0x00000000, 0xC47A0000, 0x00000000, 0x03F40F08, D_80244204_A7E704, 0x00000000, 0x00000000, 0x00000000, 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, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0xFFFF8001, 0x00000001, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0x00000001, 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, 0x00260001, 0x00260002, 0x00260003, 0x00260003, 0x00260001, 0x00260001, 0x00260005, 0x00260005, 0x00260003, 0x00260003, 0x00260003, 0x00260003, 0x00260003, 0x00260003, 0x00260003, 0x00260003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000007, D_80240AFC_A7AFFC, 0x00000000, 0xC47A0000, 0x00000000, 0x03F40F08, D_80244204_A7E704, 0x00000000, 0x00000000, 0x00000000, 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, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0xFFFF8001, 0x00000001, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0x00000001, 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, 0x00260001, 0x00260002, 0x00260003, 0x00260003, 0x00260001, 0x00260001, 0x00260005, 0x00260005, 0x00260003, 0x00260003, 0x00260003, 0x00260003, 0x00260003, 0x00260003, 0x00260003, 0x00260003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, D_80240AFC_A7AFFC, 0x00000000, 0xC47A0000, 0x00000000, 0x03F40F08, D_80244204_A7E704, 0x00000000, 0x00000000, 0x00000000, 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, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0xFFFF8001, 0x00000001, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0x00000001, 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, 0x00260001, 0x00260002, 0x00260003, 0x00260003, 0x00260001, 0x00260001, 0x00260005, 0x00260005, 0x00260003, 0x00260003, 0x00260003, 0x00260003, 0x00260003, 0x00260003, 0x00260003, 0x00260003, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802454D4_A7F9D4 -.word 0x0000000A, D_80240BF4_A7B0F4, 0x00000000, 0xC47A0000, 0x00000000, 0x03F40F08, D_80244258_A7E758, 0x00000000, 0x00000000, 0x00000000, 0x8005009A, 0x00020000, 0x008C0002, 0x00000084, 0x00020000, 0x008D0002, 0x0000008F, 0x00020000, 0x00900002, 0x00000098, 0x00020000, 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, 0x00020000, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0xFFFF8001, 0x00000001, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0x00000001, 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, 0x003B0001, 0x003B0002, 0x003B0003, 0x003B0003, 0x003B0001, 0x003B0001, 0x003B000C, 0x003B000C, 0x003B0015, 0x003B0012, 0x003B0011, 0x003B0010, 0x003B0005, 0x003B0001, 0x003B0001, 0x003B0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000B, D_80240BF4_A7B0F4, 0x00000000, 0xC47A0000, 0x00000000, 0x03F40F08, D_80244258_A7E758, 0x00000000, 0x00000000, 0x00000000, 0x8005009A, 0x00020000, 0x008C0002, 0x00000084, 0x00020000, 0x008D0002, 0x0000008F, 0x00020000, 0x00900002, 0x00000098, 0x00020000, 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, 0x00020000, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0xFFFF8001, 0x00000001, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0x00000001, 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, 0x003B0001, 0x003B0002, 0x003B0003, 0x003B0003, 0x003B0001, 0x003B0001, 0x003B000C, 0x003B000C, 0x003B0015, 0x003B0012, 0x003B0011, 0x003B0010, 0x003B0005, 0x003B0001, 0x003B0001, 0x003B0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000C, D_80240BF4_A7B0F4, 0x00000000, 0xC47A0000, 0x00000000, 0x03F40F08, D_80244258_A7E758, 0x00000000, 0x00000000, 0x00000000, 0x8005009A, 0x00020000, 0x008C0002, 0x00000084, 0x00020000, 0x008D0002, 0x0000008F, 0x00020000, 0x00900002, 0x00000098, 0x00020000, 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, 0x00020000, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0xFFFF8001, 0x00000001, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0x00000001, 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, 0x003B0001, 0x003B0002, 0x003B0003, 0x003B0003, 0x003B0001, 0x003B0001, 0x003B000C, 0x003B000C, 0x003B0015, 0x003B0012, 0x003B0011, 0x003B0010, 0x003B0005, 0x003B0001, 0x003B0001, 0x003B0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000D, D_80240BF4_A7B0F4, 0x00000000, 0xC47A0000, 0x00000000, 0x03F40F08, D_80244258_A7E758, 0x00000000, 0x00000000, 0x00000000, 0x8005009A, 0x00020000, 0x008C0002, 0x00000084, 0x00020000, 0x008D0002, 0x0000008F, 0x00020000, 0x00900002, 0x00000098, 0x00020000, 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, 0x00020000, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0xFFFF8001, 0x00000001, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0x00000001, 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, 0x003B0001, 0x003B0002, 0x003B0003, 0x003B0003, 0x003B0001, 0x003B0001, 0x003B000C, 0x003B000C, 0x003B0015, 0x003B0012, 0x003B0011, 0x003B0010, 0x003B0005, 0x003B0001, 0x003B0001, 0x003B0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000E, D_80240BF4_A7B0F4, 0x00000000, 0xC47A0000, 0x00000000, 0x03F40F08, D_80244258_A7E758, 0x00000000, 0x00000000, 0x00000000, 0x8005009A, 0x00020000, 0x008C0002, 0x00000084, 0x00020000, 0x008D0002, 0x0000008F, 0x00020000, 0x00900002, 0x00000098, 0x00020000, 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, 0x00020000, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0xFFFF8001, 0x00000001, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0x00000001, 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, 0x003B0001, 0x003B0002, 0x003B0003, 0x003B0003, 0x003B0001, 0x003B0001, 0x003B000C, 0x003B000C, 0x003B0015, 0x003B0012, 0x003B0011, 0x003B0010, 0x003B0005, 0x003B0001, 0x003B0001, 0x003B0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80245E84_A80384 -.word 0x00000010, D_80240BF4_A7B0F4, 0x00000000, 0xC47A0000, 0x00000000, 0x03F40F08, D_80244258_A7E758, 0x00000000, 0x00000000, 0x00000000, 0x8005009A, 0x00020000, 0x008C0002, 0x00000084, 0x00020000, 0x008D0002, 0x0000008F, 0x00020000, 0x00900002, 0x00000098, 0x00020000, 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, 0x00020000, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0xFFFF8001, 0x00000001, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0x00000001, 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, 0x003B0101, 0x003B0102, 0x003B0103, 0x003B0103, 0x003B0101, 0x003B0101, 0x003B010C, 0x003B010C, 0x003B0115, 0x003B0112, 0x003B0111, 0x003B0110, 0x003B0105, 0x003B0101, 0x003B0101, 0x003B0101, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000011, D_80240BF4_A7B0F4, 0x00000000, 0xC47A0000, 0x00000000, 0x03F40F08, D_80244258_A7E758, 0x00000000, 0x00000000, 0x00000000, 0x8005009A, 0x00020000, 0x008C0002, 0x00000084, 0x00020000, 0x008D0002, 0x0000008F, 0x00020000, 0x00900002, 0x00000098, 0x00020000, 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, 0x00020000, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0xFFFF8001, 0x00000001, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0x00000001, 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, 0x003B0101, 0x003B0102, 0x003B0103, 0x003B0103, 0x003B0101, 0x003B0101, 0x003B010C, 0x003B010C, 0x003B0115, 0x003B0112, 0x003B0111, 0x003B0110, 0x003B0105, 0x003B0101, 0x003B0101, 0x003B0101, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000012, D_80240BF4_A7B0F4, 0x00000000, 0xC47A0000, 0x00000000, 0x03F40F08, D_80244258_A7E758, 0x00000000, 0x00000000, 0x00000000, 0x8005009A, 0x00020000, 0x008C0002, 0x00000084, 0x00020000, 0x008D0002, 0x0000008F, 0x00020000, 0x00900002, 0x00000098, 0x00020000, 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, 0x00020000, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0xFFFF8001, 0x00000001, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0x00000001, 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, 0x003B0101, 0x003B0102, 0x003B0103, 0x003B0103, 0x003B0101, 0x003B0101, 0x003B010C, 0x003B010C, 0x003B0115, 0x003B0112, 0x003B0111, 0x003B0110, 0x003B0105, 0x003B0101, 0x003B0101, 0x003B0101, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000013, D_80240BF4_A7B0F4, 0x00000000, 0xC47A0000, 0x00000000, 0x03F40F08, D_80244258_A7E758, 0x00000000, 0x00000000, 0x00000000, 0x8005009A, 0x00020000, 0x008C0002, 0x00000084, 0x00020000, 0x008D0002, 0x0000008F, 0x00020000, 0x00900002, 0x00000098, 0x00020000, 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, 0x00020000, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0xFFFF8001, 0x00000001, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0x00000001, 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, 0x003B0101, 0x003B0102, 0x003B0103, 0x003B0103, 0x003B0101, 0x003B0101, 0x003B010C, 0x003B010C, 0x003B0115, 0x003B0112, 0x003B0111, 0x003B0110, 0x003B0105, 0x003B0101, 0x003B0101, 0x003B0101, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000014, D_80240BF4_A7B0F4, 0x00000000, 0xC47A0000, 0x00000000, 0x03F40F08, D_80244258_A7E758, 0x00000000, 0x00000000, 0x00000000, 0x8005009A, 0x00020000, 0x008C0002, 0x00000084, 0x00020000, 0x008D0002, 0x0000008F, 0x00020000, 0x00900002, 0x00000098, 0x00020000, 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, 0x00020000, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0xFFFF8001, 0x00000001, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0x00000001, 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, 0x003B0101, 0x003B0102, 0x003B0103, 0x003B0103, 0x003B0101, 0x003B0101, 0x003B010C, 0x003B010C, 0x003B0115, 0x003B0112, 0x003B0111, 0x003B0110, 0x003B0105, 0x003B0101, 0x003B0101, 0x003B0101, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80246834_A80D34 -.word 0x00000016, D_80240BF4_A7B0F4, 0x00000000, 0xC47A0000, 0x00000000, 0x03F40F08, D_80244258_A7E758, 0x00000000, 0x00000000, 0x00000000, 0x8005009A, 0x00020000, 0x008C0002, 0x00000084, 0x00020000, 0x008D0002, 0x0000008F, 0x00020000, 0x00900002, 0x00000098, 0x00020000, 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, 0x00020000, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0xFFFF8001, 0x00000001, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0x00000001, 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, 0x003B0201, 0x003B0202, 0x003B0203, 0x003B0203, 0x003B0201, 0x003B0201, 0x003B020C, 0x003B020C, 0x003B0215, 0x003B0212, 0x003B0211, 0x003B0210, 0x003B0205, 0x003B0201, 0x003B0201, 0x003B0201, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000017, D_80240BF4_A7B0F4, 0x00000000, 0xC47A0000, 0x00000000, 0x03F40F08, D_80244258_A7E758, 0x00000000, 0x00000000, 0x00000000, 0x8005009A, 0x00020000, 0x008C0002, 0x00000084, 0x00020000, 0x008D0002, 0x0000008F, 0x00020000, 0x00900002, 0x00000098, 0x00020000, 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, 0x00020000, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0xFFFF8001, 0x00000001, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0x00000001, 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, 0x003B0201, 0x003B0202, 0x003B0203, 0x003B0203, 0x003B0201, 0x003B0201, 0x003B020C, 0x003B020C, 0x003B0215, 0x003B0212, 0x003B0211, 0x003B0210, 0x003B0205, 0x003B0201, 0x003B0201, 0x003B0201, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000018, D_80240BF4_A7B0F4, 0x00000000, 0xC47A0000, 0x00000000, 0x03F40F08, D_80244258_A7E758, 0x00000000, 0x00000000, 0x00000000, 0x8005009A, 0x00020000, 0x008C0002, 0x00000084, 0x00020000, 0x008D0002, 0x0000008F, 0x00020000, 0x00900002, 0x00000098, 0x00020000, 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, 0x00020000, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0xFFFF8001, 0x00000001, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0x00000001, 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, 0x003B0201, 0x003B0202, 0x003B0203, 0x003B0203, 0x003B0201, 0x003B0201, 0x003B020C, 0x003B020C, 0x003B0215, 0x003B0212, 0x003B0211, 0x003B0210, 0x003B0205, 0x003B0201, 0x003B0201, 0x003B0201, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000019, D_80240BF4_A7B0F4, 0x00000000, 0xC47A0000, 0x00000000, 0x03F40F08, D_80244258_A7E758, 0x00000000, 0x00000000, 0x00000000, 0x8005009A, 0x00020000, 0x008C0002, 0x00000084, 0x00020000, 0x008D0002, 0x0000008F, 0x00020000, 0x00900002, 0x00000098, 0x00020000, 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, 0x00020000, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0xFFFF8001, 0x00000001, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0x00000001, 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, 0x003B0201, 0x003B0202, 0x003B0203, 0x003B0203, 0x003B0201, 0x003B0201, 0x003B020C, 0x003B020C, 0x003B0215, 0x003B0212, 0x003B0211, 0x003B0210, 0x003B0205, 0x003B0201, 0x003B0201, 0x003B0201, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000001A, D_80240BF4_A7B0F4, 0x00000000, 0xC47A0000, 0x00000000, 0x03F40F08, D_80244258_A7E758, 0x00000000, 0x00000000, 0x00000000, 0x8005009A, 0x00020000, 0x008C0002, 0x00000084, 0x00020000, 0x008D0002, 0x0000008F, 0x00020000, 0x00900002, 0x00000098, 0x00020000, 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, 0x00020000, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0xFFFF8001, 0x00000001, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0x00000001, 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, 0x003B0201, 0x003B0202, 0x003B0203, 0x003B0203, 0x003B0201, 0x003B0201, 0x003B020C, 0x003B020C, 0x003B0215, 0x003B0212, 0x003B0211, 0x003B0210, 0x003B0205, 0x003B0201, 0x003B0201, 0x003B0201, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802471E4_A816E4 -.word 0x0000001C, D_80240B78_A7B078, 0x00000000, 0xC47A0000, 0x00000000, 0x03F40F08, D_802442AC_A7E7AC, 0x00000000, 0x00000000, 0x00000000, 0x8005008A, 0x00030000, 0x00A60007, 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, 0x00000001, 0x00010000, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0xFFFF8001, 0x00000001, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0x00000001, 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, 0x00290002, 0x00290002, 0x00290002, 0x00290002, 0x00290002, 0x00290002, 0x0029000B, 0x0029000B, 0x00290007, 0x00290006, 0x00290008, 0x00290000, 0x00290004, 0x00290004, 0x00290004, 0x00290004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000001D, D_80240B78_A7B078, 0x00000000, 0xC47A0000, 0x00000000, 0x03F40F08, D_802442AC_A7E7AC, 0x00000000, 0x00000000, 0x00000000, 0x8005008A, 0x00030000, 0x00A60007, 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, 0x00000001, 0x00010000, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0xFFFF8001, 0x00000001, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0x00000001, 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, 0x00290002, 0x00290002, 0x00290002, 0x00290002, 0x00290002, 0x00290002, 0x0029000B, 0x0029000B, 0x00290007, 0x00290006, 0x00290008, 0x00290000, 0x00290004, 0x00290004, 0x00290004, 0x00290004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000001E, D_80240B78_A7B078, 0x00000000, 0xC47A0000, 0x00000000, 0x03F40F08, D_802442AC_A7E7AC, 0x00000000, 0x00000000, 0x00000000, 0x8005008A, 0x00030000, 0x00A60007, 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, 0x00000001, 0x00010000, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0xFFFF8001, 0x00000001, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0x00000001, 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, 0x00290002, 0x00290002, 0x00290002, 0x00290002, 0x00290002, 0x00290002, 0x0029000B, 0x0029000B, 0x00290007, 0x00290006, 0x00290008, 0x00290000, 0x00290004, 0x00290004, 0x00290004, 0x00290004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000001F, D_80240B78_A7B078, 0x00000000, 0xC47A0000, 0x00000000, 0x03F40F08, D_802442AC_A7E7AC, 0x00000000, 0x00000000, 0x00000000, 0x8005008A, 0x00030000, 0x00A60007, 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, 0x00000001, 0x00010000, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0xFFFF8001, 0x00000001, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0x00000001, 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, 0x00290002, 0x00290002, 0x00290002, 0x00290002, 0x00290002, 0x00290002, 0x0029000B, 0x0029000B, 0x00290007, 0x00290006, 0x00290008, 0x00290000, 0x00290004, 0x00290004, 0x00290004, 0x00290004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000020, D_80240B78_A7B078, 0x00000000, 0xC47A0000, 0x00000000, 0x03F40F08, D_802442AC_A7E7AC, 0x00000000, 0x00000000, 0x00000000, 0x8005008A, 0x00030000, 0x00A60007, 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, 0x00000001, 0x00010000, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0xFFFF8001, 0x00000001, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0x00000001, 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, 0x00290002, 0x00290002, 0x00290002, 0x00290002, 0x00290002, 0x00290002, 0x0029000B, 0x0029000B, 0x00290007, 0x00290006, 0x00290008, 0x00290000, 0x00290004, 0x00290004, 0x00290004, 0x00290004, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80247B94_A82094 -.word 0x00000022, D_80240B78_A7B078, 0x00000000, 0xC47A0000, 0x00000000, 0x03F40F08, D_802442AC_A7E7AC, 0x00000000, 0x00000000, 0x00000000, 0x8005008A, 0x00030000, 0x00A60007, 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, 0x00000001, 0x00010000, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0xFFFF8001, 0x00000001, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0x00000001, 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, 0x00290101, 0x00290103, 0x00290104, 0x00290104, 0x00290101, 0x00290101, 0x0029010B, 0x0029010B, 0x00290107, 0x00290106, 0x00290108, 0x00290104, 0x00290104, 0x00290104, 0x00290104, 0x00290104, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000023, D_80240B78_A7B078, 0x00000000, 0xC47A0000, 0x00000000, 0x03F40F08, D_802442AC_A7E7AC, 0x00000000, 0x00000000, 0x00000000, 0x8005008A, 0x00030000, 0x00A60007, 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, 0x00000001, 0x00010000, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0xFFFF8001, 0x00000001, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0x00000001, 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, 0x00290101, 0x00290103, 0x00290104, 0x00290104, 0x00290101, 0x00290101, 0x0029010B, 0x0029010B, 0x00290107, 0x00290106, 0x00290108, 0x00290104, 0x00290104, 0x00290104, 0x00290104, 0x00290104, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, D_80240B78_A7B078, 0x00000000, 0xC47A0000, 0x00000000, 0x03F40F08, D_802442AC_A7E7AC, 0x00000000, 0x00000000, 0x00000000, 0x8005008A, 0x00030000, 0x00A60007, 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, 0x00000001, 0x00010000, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0xFFFF8001, 0x00000001, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0x00000001, 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, 0x00290101, 0x00290103, 0x00290104, 0x00290104, 0x00290101, 0x00290101, 0x0029010B, 0x0029010B, 0x00290107, 0x00290106, 0x00290108, 0x00290104, 0x00290104, 0x00290104, 0x00290104, 0x00290104, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000025, D_80240B78_A7B078, 0x00000000, 0xC47A0000, 0x00000000, 0x03F40F08, D_802442AC_A7E7AC, 0x00000000, 0x00000000, 0x00000000, 0x8005008A, 0x00030000, 0x00A60007, 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, 0x00000001, 0x00010000, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0xFFFF8001, 0x00000001, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0x00000001, 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, 0x00290101, 0x00290103, 0x00290104, 0x00290104, 0x00290101, 0x00290101, 0x0029010B, 0x0029010B, 0x00290107, 0x00290106, 0x00290108, 0x00290104, 0x00290104, 0x00290104, 0x00290104, 0x00290104, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000026, D_80240B78_A7B078, 0x00000000, 0xC47A0000, 0x00000000, 0x03F40F08, D_802442AC_A7E7AC, 0x00000000, 0x00000000, 0x00000000, 0x8005008A, 0x00030000, 0x00A60007, 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, 0x00000001, 0x00010000, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0xFFFF8001, 0x00000001, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0x00000001, 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, 0x00290101, 0x00290103, 0x00290104, 0x00290104, 0x00290101, 0x00290101, 0x0029010B, 0x0029010B, 0x00290107, 0x00290106, 0x00290108, 0x00290104, 0x00290104, 0x00290104, 0x00290104, 0x00290104, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80248544_A82A44 -.word 0x00000028, D_80240AFC_A7AFFC, 0x00000000, 0xC47A0000, 0x00000000, 0x03F40F08, D_80244300_A7E800, 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, 0x00000096, 0x00000082, 0x00000064, 0xFFFF8001, 0x00000001, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0x00000001, 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, 0x00910001, 0x00910002, 0x00910003, 0x00910003, 0x00910001, 0x00910001, 0x00910000, 0x00910000, 0x00910000, 0x00910000, 0x00910000, 0x00910000, 0x00910000, 0x00910000, 0x00910000, 0x00910000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000029, D_80240AFC_A7AFFC, 0x00000000, 0xC47A0000, 0x00000000, 0x03F40F08, D_80244300_A7E800, 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, 0x00000096, 0x00000082, 0x00000064, 0xFFFF8001, 0x00000001, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0x00000001, 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, 0x00910001, 0x00910002, 0x00910003, 0x00910003, 0x00910001, 0x00910001, 0x00910000, 0x00910000, 0x00910000, 0x00910000, 0x00910000, 0x00910000, 0x00910000, 0x00910000, 0x00910000, 0x00910000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000002A, D_80240AFC_A7AFFC, 0x00000000, 0xC47A0000, 0x00000000, 0x03F40F08, D_80244300_A7E800, 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, 0x00000096, 0x00000082, 0x00000064, 0xFFFF8001, 0x00000001, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0x00000001, 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, 0x00910001, 0x00910002, 0x00910003, 0x00910003, 0x00910001, 0x00910001, 0x00910000, 0x00910000, 0x00910000, 0x00910000, 0x00910000, 0x00910000, 0x00910000, 0x00910000, 0x00910000, 0x00910000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000002B, D_80240AFC_A7AFFC, 0x00000000, 0xC47A0000, 0x00000000, 0x03F40F08, D_80244300_A7E800, 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, 0x00000096, 0x00000082, 0x00000064, 0xFFFF8001, 0x00000001, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0x00000001, 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, 0x00910001, 0x00910002, 0x00910003, 0x00910003, 0x00910001, 0x00910001, 0x00910000, 0x00910000, 0x00910000, 0x00910000, 0x00910000, 0x00910000, 0x00910000, 0x00910000, 0x00910000, 0x00910000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000002C, D_80240AFC_A7AFFC, 0x00000000, 0xC47A0000, 0x00000000, 0x03F40F08, D_80244300_A7E800, 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, 0x00000096, 0x00000082, 0x00000064, 0xFFFF8001, 0x00000001, 0x00000000, 0x00000000, 0x00000096, 0x00000082, 0x00000064, 0x00000001, 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, 0x00910001, 0x00910002, 0x00910003, 0x00910003, 0x00910001, 0x00910001, 0x00910000, 0x00910000, 0x00910000, 0x00910000, 0x00910000, 0x00910000, 0x00910000, 0x00910000, 0x00910000, 0x00910000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000004, D_80244364_A7E864, 0x24000001, 0x00000005, D_80244B24_A7F024, 0x24000001, 0x00000005, D_802454D4_A7F9D4, 0x24000001, 0x00000005, D_80245E84_A80384, 0x24000001, 0x00000005, D_80246834_A80D34, 0x24000001, 0x00000005, D_802471E4_A816E4, 0x24000001, 0x00000005, D_80247B94_A82094, 0x24000001, 0x00000005, D_80248544_A82A44, 0x24000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_83/A83500.data.s b/ver/us/asm/data/world/area_kpa/kpa_83/A83500.data.s deleted file mode 100644 index 66f4c79436..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_83/A83500.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240070_A83500 -.word 0xC3520000, 0x00000000, 0x43160000, 0x42B40000, 0x43160000, 0x00000000, 0x43160000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802403E4, D_80240070_A83500, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190170, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000064, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetMusicTrackVolumes, 0x00000007, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_83/A835D0.data.s b/ver/us/asm/data/world/area_kpa/kpa_83/A835D0.data.s deleted file mode 100644 index d32848686b..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_83/A835D0.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240140_A835D0 -.word 0x0000002D, 0x0000002E, 0x0000002F, 0x00000034, 0x00000035, 0x00000037, 0xFFFFFFFF - -dlabel D_8024015C_A835EC -.word 0x00000039, 0x0000003A, 0x0000003B, 0x00000040, 0x00000041, 0x00000043, 0xFFFFFFFF - -dlabel D_80240178_A83608 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000014, 0x00000024, 0x00000002, 0xFE363C82, 0x0000004E, 0x00000024, 0x00000002, 0xFE363C83, 0x0000004C, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x8024330C, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024021C_A836AC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000010, 0x00000024, 0x00000002, 0xFE363C82, D_80240140_A835D0, 0x00000024, 0x00000002, 0xFE363C83, D_8024015C_A835EC, 0x00000044, 0x00000001, BaseExitDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80243314, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802402C0_A83750 -.word 0x00000047, 0x00000005, D_80240178_A83608, 0x00000100, 0x00000014, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024021C_A836AC, 0x00000100, 0x00000010, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240308_A83798 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000004E, 0x00000024, 0x00000002, 0xFE363C83, 0x0000004C, 0x00000044, 0x00000001, EnterDoubleDoor, 0x00000044, 0x00000001, D_802402C0_A83750, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, D_8024015C_A835EC, 0x00000024, 0x00000002, 0xFE363C83, D_80240140_A835D0, 0x00000046, 0x00000001, BaseEnterDoor, 0x00000044, 0x00000001, D_802402C0_A83750, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000016, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x802432D0, 0x00000043, 0x00000003, EnableModel, 0x0000000C, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000052, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000054, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005A, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005B, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005C, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005D, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005E, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005F, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000060, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000055, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000061, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000062, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000063, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000064, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000065, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000066, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000067, 0x00000000, 0x00000044, 0x00000001, D_80240308_A83798, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x802400D0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_83/A83AC0.data.s b/ver/us/asm/data/world/area_kpa/kpa_83/A83AC0.data.s deleted file mode 100644 index ea8e76b085..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_83/A83AC0.data.s +++ /dev/null @@ -1,57 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240630_A83AC0 -.word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00170013, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80240688_A83B18 -.word 0x00000000, 0x00230018, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 - -dlabel D_802406B4_A83B44 -.word 0x00000000, 0x00200018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_802406E0_A83B70 -.word 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xFE363C86, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5280, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2524A80, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF24BDA80, 0xF24E7CE7, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF24D8680, 0xF24CB280, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0xF24A7A80, 0xF24A7A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802407BC_A83C4C -.word 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xFE363C86, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AD480, 0xF24A4680, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240858_A83CE8 -.word 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xFE363C86, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AD480, 0xF24A4C80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802408F4_A83D84 -.word 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xFE363C86, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AD480, 0xF24A5280, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24FF280, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240990_A83E20 -.word 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xFE363C86, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AD480, 0xF24A4680, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24D3680, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240A2C_A83EBC -.word 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000002, 0xF24A7E80, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000006, NpcJump0, 0x00000002, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000000A, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A7E80, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000000A, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000003, 0xF24A7E80, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000000A, 0x00000016, 0x00000001, 0x00000004, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000004, 0xF24A7E80, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000000A, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240BC0_A84050 -.word 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000007BC, 0x00000032, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0xFE363C8A, 0x00000000, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240C64_A840F4 -.word 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFE363C80, 0x000000E9, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000005, 0xF24A7CE7, 0x00000057, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x0066011E, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000002, 0xF24A7D4D, 0x00000043, 0x00000006, NpcJump0, 0x00000002, 0xFFFFFFCE, 0x000000C8, 0x000000AA, 0x00000028, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000200, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0066001E, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A7D4D, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0x00000000, 0x000000C8, 0x0000007F, 0x00000028, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000200, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x0066021E, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000003, 0xF24A7D4D, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0x00000064, 0x000000C8, 0x000000C8, 0x00000028, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000200, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000016, 0x00000001, 0x00000004, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x0066031E, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000004, 0xF24A7D4D, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0x00000096, 0x000000C8, 0x00000096, 0x00000028, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000004, 0x00000200, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240EEC_A8437C -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFF6A, 0xFE363C82, 0x00000000, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0xF24A8680, 0x00000046, 0x00000001, D_802406E0_A83B70, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000005, 0x00000001, 0x00000008, 0x00000008, 0x00000001, 0x00000096, 0x0000000B, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000004, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000000FA, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000004, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000064, 0x00000000, 0x00000008, 0x00000008, 0x00000001, 0x0000001E, 0x0000000B, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000004, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetMusicTrackVolumes, 0x00000007, 0x00000003, 0x00000001, 0x00000005, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830001, 0x00830001, 0x00000000, 0x00130053, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000052, 0x00000002, 0x00000008, 0x00000024, 0x00000002, 0xFE363C83, 0x00000041, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000096, 0x00000024, 0x00000002, 0xFE363C86, 0xF24BE280, 0x00000046, 0x00000001, D_80240858_A83CE8, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000010, 0x7FFFFE00, 0x00000056, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x000000DC, 0x000000B4, 0x000000A0, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00660111, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000002, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000002, 0xF24A7E80, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000200, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000008, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0x00000014, 0x000000A0, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x000003E9, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000001, 0x00000014, 0x00000000, 0x000000A0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000002, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00660105, 0x00000043, 0x00000003, SetNpcYaw, 0x00000002, 0x0000010E, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x000000F8, 0x000000B4, 0x000000B9, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00660011, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A7E80, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000200, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000008, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x00000030, 0x000000B9, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x000003E9, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000001, 0x00000030, 0x00000000, 0x000000B9, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00660005, 0x00000043, 0x00000003, SetNpcYaw, 0x00000001, 0x0000010E, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x00000104, 0x000000B4, 0x0000006E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00660211, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000003, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000003, 0xF24A7E80, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000200, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000008, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0x0000003C, 0x0000006E, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0x000003E9, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000001, 0x0000003C, 0x00000000, 0x0000006E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000003, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00660205, 0x00000043, 0x00000003, SetNpcYaw, 0x00000003, 0x0000010E, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0x00000120, 0x000000B4, 0x0000009B, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00660311, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000004, 0xF24A7E80, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000004, 0x00000200, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000004, 0x00000008, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000004, 0x00000058, 0x0000009B, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000004, 0x000003E9, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000001, 0x00000058, 0x00000000, 0x0000009B, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000004, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00660305, 0x00000043, 0x00000003, SetNpcYaw, 0x00000004, 0x0000010E, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000041, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000010, 0x7FFFFE00, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000005, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x0000000F, PlayEffect, 0x0000001A, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x000020F3, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x0066011A, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000005, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x0000000F, PlayEffect, 0x0000001A, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x000020F3, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0066001A, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000005, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x0000000F, PlayEffect, 0x0000001A, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0x000020F3, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x0066021A, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000005, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x0000000F, PlayEffect, 0x0000001A, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000004, 0x000020F3, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x0066031A, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x0066011A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0066001A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x0066021A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x0066031A, 0x00000056, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFFCE, 0x00000096, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x0066011A, 0x0066011A, 0x00000000, 0x00130054, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000096, 0x00000024, 0x00000002, 0xFE363C86, 0xF24A8680, 0x00000046, 0x00000001, D_802408F4_A83D84, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00660104, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00660004, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00660204, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00660304, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00660114, 0x00660104, 0x00000000, 0x00130055, 0x00000043, 0x00000002, ShowChoice, 0x001E0013, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000002, 0x00660114, 0x00660104, 0x00000000, 0x00130056, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000002, 0x00660114, 0x00660104, 0x00000000, 0x00130057, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0xF24A8680, 0x00000046, 0x00000001, D_802406E0_A83B70, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830001, 0x00830001, 0x00000000, 0x00130058, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000096, 0x00000024, 0x00000002, 0xFE363C86, 0xF24BE280, 0x00000046, 0x00000001, D_802408F4_A83D84, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00660114, 0x00660104, 0x00000000, 0x00130059, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000047, 0x00000001, 0x00000008, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x0013005A, 0x00000000, 0x00000096, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetNpcPos, 0x00000005, 0xFFFFFF6A, 0x00000000, 0x0000008C, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x0021000B, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000005, 0xF24A9A80, 0x00000056, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002B, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000005, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x0000000E, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x10101000, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000007BC, 0x00000032, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, func_80240050_A834E0, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x10101000, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000045, 0x00000002, D_80240A2C_A83EBC, 0xFD050F80, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000045, 0x00000002, D_80240A2C_A83EBC, 0xFD050F81, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000045, 0x00000002, D_80240A2C_A83EBC, 0xFD050F82, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000045, 0x00000002, D_80240A2C_A83EBC, 0xFD050F83, 0x00000043, 0x00000005, NpcMoveTo, 0x00000005, 0x00000016, 0x0000008C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000044, 0x00000001, D_80240BC0_A84050, 0x00000043, 0x00000005, NpcMoveTo, 0x00000005, 0x00000032, 0x0000008C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000044, 0x00000001, D_80240BC0_A84050, 0x00000043, 0x00000005, NpcMoveTo, 0x00000005, 0x0000003E, 0x0000008C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000044, 0x00000001, D_80240BC0_A84050, 0x00000043, 0x00000005, NpcMoveTo, 0x00000005, 0x0000005A, 0x0000008C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000044, 0x00000001, D_80240BC0_A84050, 0x00000043, 0x00000005, NpcMoveTo, 0x00000005, 0x00000064, 0x0000008C, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000005, 0x00000062, 0x0000008C, 0x00000000, 0x00000049, 0x00000001, 0xFD050F83, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000044, 0x00000001, D_80240C64_A840F4, 0x00000043, 0x00000005, NpcMoveTo, 0x00000005, 0x00000019, 0x0000008C, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000005, 0x00000046, 0x0000008C, 0x00000000, 0x00000049, 0x00000001, 0xFD050F82, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000044, 0x00000001, D_80240C64_A840F4, 0x00000043, 0x00000005, NpcMoveTo, 0x00000005, 0x0000004B, 0x0000008C, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000005, 0x0000001E, 0x0000008C, 0x00000000, 0x00000049, 0x00000001, 0xFD050F80, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000044, 0x00000001, D_80240C64_A840F4, 0x00000043, 0x00000005, NpcMoveTo, 0x00000005, 0x00000019, 0x0000008C, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000005, 0x0000003A, 0x0000008C, 0x00000000, 0x00000049, 0x00000001, 0xFD050F81, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000044, 0x00000001, D_80240C64_A840F4, 0x00000043, 0x00000005, NpcMoveTo, 0x00000005, 0x0000004B, 0x0000008C, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000005, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, GetNpcPos, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, NpcMoveTo, 0x00000005, 0x00000064, 0x0000008C, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00210003, 0x00000043, 0x00000003, SetNpcYaw, 0x00000005, 0x0000010E, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x0013005B, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C83, 0x00000064, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000096, 0x00000024, 0x00000002, 0xFE363C86, 0xF24A8680, 0x00000046, 0x00000001, D_80240990_A83E20, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000005, 0x00210016, 0x00210003, 0x00000000, 0x0013005C, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000096, 0x00000024, 0x00000002, 0xFE363C86, 0xF24A8680, 0x00000046, 0x00000001, D_802407BC_A83C4C, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x0021000B, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000005, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000005, 0xFFFFFFE2, 0x0000008C, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, StartBossBattle, 0x00000004, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000005, 0x0021001D, 0x0021001D, 0x00000000, 0x00130061, 0x00000024, 0x00000002, 0xFD050F84, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000096, 0x00000024, 0x00000002, 0xFE363C86, 0xF24A8680, 0x00000046, 0x00000001, D_802407BC_A83C4C, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x00130062, 0x000000A0, 0x00000028, 0x00000024, 0x00000002, 0xFD050F84, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x0021000B, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000005, 0xF24A9A80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000005, 0xFFFFFFCE, 0x0000008C, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000005, 0xFFFFFF38, 0x0000008C, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000005, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000044, 0x00000001, 0x802400D0, 0x00000005, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F84, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0xF24A8680, 0x00000046, 0x00000001, D_802406E0_A83B70, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830001, 0x00830001, 0x00000000, 0x00130063, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF5DE02AC, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024257C_A85A0C -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000064, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000096, 0x00000024, 0x00000002, 0xFE363C86, 0xF24BE280, 0x00000046, 0x00000001, D_80240990_A83E20, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x0021001D, 0x00000043, 0x00000005, SetNpcPos, 0x00000005, 0x00000064, 0x00000000, 0x0000008C, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x000000B8, 0x00000014, 0x00000096, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242654_A85AE4 -.word 0x0000000A, 0x00000002, 0xF5DE02AC, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80240EEC_A8437C, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_8024257C_A85A0C, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x10000102, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x000000B8, 0x00000014, 0x00000096, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802426EC_A85B7C -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802426FC_A85B8C -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024270C_A85B9C -.word 0x0066001E, 0x00660004, 0x00660005, 0x00660011, 0x0066001A, 0x00660014, 0x00660010, 0x00660015, 0xFFFFFFFF - -dlabel D_80242730_A85BC0 -.word 0x00000001, D_80240688_A83B18, 0x00000000, 0xC47A0000, 0x00000000, 0x03700F08, D_802426EC_A85B7C, 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, 0x00660004, 0x00660002, 0x00660003, 0x00660003, 0x00660004, 0x00660004, 0x0066000A, 0x0066000A, 0x00660003, 0x00660003, 0x00660003, 0x00660003, 0x00660003, 0x00660003, 0x00660003, 0x00660003, 0x00000000, 0x00000000, D_8024270C_A85B9C, 0x00000000, 0x00000002, D_80240688_A83B18, 0x00000000, 0xC47A0000, 0x00000000, 0x03700F08, D_802426EC_A85B7C, 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, 0x00660104, 0x00660102, 0x00660103, 0x00660103, 0x00660104, 0x00660104, 0x0066010A, 0x0066010A, 0x00660103, 0x00660103, 0x00660103, 0x00660103, 0x00660103, 0x00660103, 0x00660103, 0x00660103, 0x00000000, 0x00000000, D_8024270C_A85B9C, 0x00000000, 0x00000003, D_80240688_A83B18, 0x00000000, 0xC47A0000, 0x00000000, 0x03700D08, D_802426EC_A85B7C, 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, 0x00660204, 0x00660202, 0x00660203, 0x00660203, 0x00660204, 0x00660204, 0x0066020A, 0x0066020A, 0x00660203, 0x00660203, 0x00660203, 0x00660203, 0x00660203, 0x00660203, 0x00660203, 0x00660203, 0x00000000, 0x00000000, D_8024270C_A85B9C, 0x00000000, 0x00000004, D_80240688_A83B18, 0x00000000, 0xC47A0000, 0x00000000, 0x03700F08, D_802426EC_A85B7C, 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, 0x00660304, 0x00660302, 0x00660303, 0x00660303, 0x00660304, 0x00660304, 0x0066030A, 0x0066030A, 0x00660303, 0x00660303, 0x00660303, 0x00660303, 0x00660303, 0x00660303, 0x00660303, 0x00660303, 0x00000000, 0x00000000, D_8024270C_A85B9C, 0x00000000, 0x00000005, D_802406B4_A83B44, 0x00000000, 0xC47A0000, 0x00000000, 0x03700F08, D_802426FC_A85B8C, 0x00000000, 0x00000000, 0x0000005A, 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, 0x00000000, D_80240630_A83AC0, 0x00000000, 0xC47A0000, 0x00000000, 0x03704F0C, D_80242654_A85AE4, 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, 0x00830001, 0x00830002, 0x00830003, 0x00830003, 0x00830001, 0x00830001, 0x00830006, 0x00830006, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, D_80242730_A85BC0, 0x02070000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 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 9956810b51..998ff3ccfc 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 @@ -3,10 +3,10 @@ .section .data dlabel D_802446A0_9DB6C0 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, nok_02_Pipe_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, nok_02_Pipe_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, nok_02_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, nok_02_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, nok_02_Pipe_AwaitDownInput, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 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, 0x00000046, 0x00000001, D_80244EC0_9DBEE0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, nok_02_Pipe_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, nok_02_Pipe_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, nok_02_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, nok_02_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, nok_02_Pipe_AwaitDownInput, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPartnerInUse, 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, 0x00000046, 0x00000001, D_80244EC0_9DBEE0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 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 +.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, GetPartnerInUse, 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 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 diff --git a/ver/us/asm/data/world/area_nok/nok_15/A09750.data.s b/ver/us/asm/data/world/area_nok/nok_15/A09750.data.s index 60289102cb..ca7e76fe88 100644 --- a/ver/us/asm/data/world/area_nok/nok_15/A09750.data.s +++ b/ver/us/asm/data/world/area_nok/nok_15/A09750.data.s @@ -6,10 +6,10 @@ dlabel D_80242850_A09750 .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, nok_15_Pipe_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, nok_15_Pipe_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, nok_15_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, nok_15_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242F94_A09E94 -.word 0x00000043, 0x00000001, nok_15_Pipe_AwaitDownInput, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 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, 0x00000046, 0x00000001, D_80243070_A09F70, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, nok_15_Pipe_AwaitDownInput, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPartnerInUse, 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, 0x00000046, 0x00000001, D_80243070_A09F70, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243070_A09F70 -.word 0x00000043, 0x00000001, nok_15_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, nok_15_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, nok_15_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, nok_15_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_15_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, nok_15_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_15_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 +.word 0x00000043, 0x00000001, nok_15_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, nok_15_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, nok_15_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, nok_15_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, GetPartnerInUse, 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_15_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, nok_15_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_15_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 D_80243580_A0A480 .word 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80244CD0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_03/DA8190.data.s b/ver/us/asm/data/world/area_omo/omo_03/DA8190.data.s index 001222fc60..391c8a7527 100644 --- a/ver/us/asm/data/world/area_omo/omo_03/DA8190.data.s +++ b/ver/us/asm/data/world/area_omo/omo_03/DA8190.data.s @@ -39,10 +39,10 @@ dlabel D_8024556C_DAA7AC .word 0x00000043, 0x00000003, SetTexPanner, 0x0000008E, 0x00000002, 0x00000043, 0x00000003, EnableTexPanning, 0x0000008E, 0x00000001, 0x00000024, 0x00000002, 0xFD050F89, 0x00008000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000002, 0x00000000, 0xFD050F89, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C85, 0x00000002, 0x0000000D, 0x00000002, 0xFE363C85, 0x00000168, 0x00000028, 0x00000002, 0xFE363C85, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000008E, 0xFE363C85, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFAA2B581, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000010E, 0x00000043, 0x00000003, EnableTexPanning, 0x00000099, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x00000093, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000005A, 0x00000043, 0x00000003, EnableTexPanning, 0x00000093, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x00000099, 0x00000001, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C82, 0x00000168, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0xF9718882, 0x00000043, 0x00000005, MakeLerp, 0xFE363C85, 0xFE363C82, 0x0000003C, 0x00000008, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFFF, 0x00000003, 0x00000001, 0x0000000B, 0x00000043, 0x00000001, UpdateLerp, 0x0000000C, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0xFFFFFFFF, 0x0000000B, 0x00000002, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000002, PlaySound, 0x000001F9, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000043, 0x00000006, RotateModel, 0x0000008E, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xF9718882, 0xFE363C86, 0x00000004, 0x00000001, 0x00000015, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000B, 0x00000013, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FA, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000024, 0x00000002, 0xFD050F89, 0x00004000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFD050F89, 0x0000C000, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000014, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF9718882, 0xFE363C86, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000015, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C80, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024598C_DAABCC -.word 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B581, 0x00000001, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B581, 0x00000001, 0x00000024, 0x00000002, 0xF9718882, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFEE, 0x0000000F, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000092, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000093, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000037, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000038, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFEE, 0x00000000, 0x0000000F, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000092, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000093, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000037, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000038, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B581, 0x00000001, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B581, 0x00000001, 0x00000024, 0x00000002, 0xF9718882, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFEE, 0x0000000F, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000092, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000093, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000037, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000038, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFEE, 0x00000000, 0x0000000F, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000092, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000093, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000037, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000038, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80245BC4_DAAE04 -.word 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B581, 0x00000001, 0x0000000A, 0x00000002, 0xF9718882, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B581, 0x00000001, 0x00000024, 0x00000002, 0xF9718882, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFEE, 0x0000000F, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000098, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000099, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003D, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003E, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFEE, 0x00000000, 0x0000000F, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000098, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000099, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003D, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003E, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B581, 0x00000001, 0x0000000A, 0x00000002, 0xF9718882, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B581, 0x00000001, 0x00000024, 0x00000002, 0xF9718882, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFEE, 0x0000000F, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000098, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000099, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003D, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003E, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFEE, 0x00000000, 0x0000000F, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000098, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000099, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003D, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003E, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80245DFC_DAB03C .word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, omo_03_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, omo_03_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_06/DB9060.data.s b/ver/us/asm/data/world/area_omo/omo_06/DB9060.data.s index b837592784..64fb9d0a35 100644 --- a/ver/us/asm/data/world/area_omo/omo_06/DB9060.data.s +++ b/ver/us/asm/data/world/area_omo/omo_06/DB9060.data.s @@ -33,10 +33,10 @@ dlabel D_8024364C_DBAF5C .word 0x00000043, 0x00000003, SetTexPanner, 0x00000073, 0x00000002, 0x00000043, 0x00000003, EnableTexPanning, 0x00000073, 0x00000001, 0x00000024, 0x00000002, 0xFD050F89, 0x00008000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000002, 0x00000000, 0xFD050F89, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C85, 0x00000002, 0x0000000D, 0x00000002, 0xFE363C85, 0x00000168, 0x00000028, 0x00000002, 0xFE363C85, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000073, 0xFE363C85, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFAA2B581, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000010E, 0x00000043, 0x00000003, EnableTexPanning, 0x0000007E, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x00000078, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000005A, 0x00000043, 0x00000003, EnableTexPanning, 0x00000078, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x0000007E, 0x00000001, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C82, 0x00000168, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0xF9718882, 0x00000043, 0x00000005, MakeLerp, 0xFE363C85, 0xFE363C82, 0x0000003C, 0x00000008, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFFF, 0x00000003, 0x00000001, 0x0000000B, 0x00000043, 0x00000001, UpdateLerp, 0x0000000C, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0xFFFFFFFF, 0x0000000B, 0x00000002, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000002, PlaySound, 0x000001F9, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000043, 0x00000006, RotateModel, 0x00000073, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xF9718882, 0xFE363C86, 0x00000004, 0x00000001, 0x00000015, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000B, 0x00000013, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FA, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000024, 0x00000002, 0xFD050F89, 0x00004000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFD050F89, 0x0000C000, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000014, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF9718882, 0xFE363C86, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000015, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C80, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243A6C_DBB37C -.word 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B581, 0x00000001, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B581, 0x00000001, 0x00000024, 0x00000002, 0xF9718882, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFEE, 0x0000000F, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000077, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000078, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000039, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003A, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFEE, 0x00000000, 0x0000000F, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000077, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000078, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000039, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003A, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B581, 0x00000001, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B581, 0x00000001, 0x00000024, 0x00000002, 0xF9718882, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFEE, 0x0000000F, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000077, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000078, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000039, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003A, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFEE, 0x00000000, 0x0000000F, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000077, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000078, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000039, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003A, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243CA4_DBB5B4 -.word 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B581, 0x00000001, 0x0000000A, 0x00000002, 0xF9718882, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B581, 0x00000001, 0x00000024, 0x00000002, 0xF9718882, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFEE, 0x0000000F, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x0000007D, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000007E, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003F, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000040, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFEE, 0x00000000, 0x0000000F, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x0000007D, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000007E, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003F, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000040, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B581, 0x00000001, 0x0000000A, 0x00000002, 0xF9718882, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B581, 0x00000001, 0x00000024, 0x00000002, 0xF9718882, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFEE, 0x0000000F, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x0000007D, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000007E, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003F, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000040, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFEE, 0x00000000, 0x0000000F, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x0000007D, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000007E, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003F, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000040, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243EDC_DBB7EC .word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, omo_06_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, omo_06_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_08/DC8100.data.s b/ver/us/asm/data/world/area_omo/omo_08/DC8100.data.s index 29ed2f03cd..23466801f3 100644 --- a/ver/us/asm/data/world/area_omo/omo_08/DC8100.data.s +++ b/ver/us/asm/data/world/area_omo/omo_08/DC8100.data.s @@ -33,10 +33,10 @@ dlabel D_80245C2C_DC9FFC .word 0x00000043, 0x00000003, SetTexPanner, 0x0000008F, 0x00000002, 0x00000043, 0x00000003, EnableTexPanning, 0x0000008F, 0x00000001, 0x00000024, 0x00000002, 0xFD050F89, 0x00008000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000002, 0x00000000, 0xFD050F89, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C85, 0x00000002, 0x0000000D, 0x00000002, 0xFE363C85, 0x00000168, 0x00000028, 0x00000002, 0xFE363C85, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000008F, 0xFE363C85, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFAA2B581, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000010E, 0x00000043, 0x00000003, EnableTexPanning, 0x0000009A, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x00000094, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000005A, 0x00000043, 0x00000003, EnableTexPanning, 0x00000094, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x0000009A, 0x00000001, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C82, 0x00000168, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0xF9718882, 0x00000043, 0x00000005, MakeLerp, 0xFE363C85, 0xFE363C82, 0x0000003C, 0x00000008, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFFF, 0x00000003, 0x00000001, 0x0000000B, 0x00000043, 0x00000001, UpdateLerp, 0x0000000C, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0xFFFFFFFF, 0x0000000B, 0x00000002, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000002, PlaySound, 0x000001F9, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000043, 0x00000006, RotateModel, 0x0000008F, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xF9718882, 0xFE363C86, 0x00000004, 0x00000001, 0x00000015, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000B, 0x00000013, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FA, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000024, 0x00000002, 0xFD050F89, 0x00004000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFD050F89, 0x0000C000, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000014, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF9718882, 0xFE363C86, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000015, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C80, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024604C_DCA41C -.word 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B581, 0x00000001, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B581, 0x00000001, 0x00000024, 0x00000002, 0xF9718882, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFEE, 0x0000000F, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000093, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000094, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000034, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000035, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFEE, 0x00000000, 0x0000000F, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000093, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000094, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000034, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000035, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B581, 0x00000001, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B581, 0x00000001, 0x00000024, 0x00000002, 0xF9718882, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFEE, 0x0000000F, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000093, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000094, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000034, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000035, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFEE, 0x00000000, 0x0000000F, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000093, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000094, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000034, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000035, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80246284_DCA654 -.word 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B581, 0x00000001, 0x0000000A, 0x00000002, 0xF9718882, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B581, 0x00000001, 0x00000024, 0x00000002, 0xF9718882, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFEE, 0x0000000F, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000099, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000009A, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003B, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003A, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFEE, 0x00000000, 0x0000000F, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000099, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000009A, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003B, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003A, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B581, 0x00000001, 0x0000000A, 0x00000002, 0xF9718882, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B581, 0x00000001, 0x00000024, 0x00000002, 0xF9718882, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFEE, 0x0000000F, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000099, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000009A, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003B, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003A, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFEE, 0x00000000, 0x0000000F, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000099, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000009A, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003B, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003A, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802464BC_DCA88C .word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, omo_08_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, omo_08_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_10/DD8A60.data.s b/ver/us/asm/data/world/area_omo/omo_10/DD8A60.data.s index bd19d54ac4..a3d7169f0a 100644 --- a/ver/us/asm/data/world/area_omo/omo_10/DD8A60.data.s +++ b/ver/us/asm/data/world/area_omo/omo_10/DD8A60.data.s @@ -33,10 +33,10 @@ dlabel D_80242FAC_DDA95C .word 0x00000043, 0x00000003, SetTexPanner, 0x00000082, 0x00000002, 0x00000043, 0x00000003, EnableTexPanning, 0x00000082, 0x00000001, 0x00000024, 0x00000002, 0xFD050F89, 0x00008000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000002, 0x00000000, 0xFD050F89, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C85, 0x00000002, 0x0000000D, 0x00000002, 0xFE363C85, 0x00000168, 0x00000028, 0x00000002, 0xFE363C85, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000082, 0xFE363C85, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFAA2B581, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000010E, 0x00000043, 0x00000003, EnableTexPanning, 0x0000008D, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x00000087, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000005A, 0x00000043, 0x00000003, EnableTexPanning, 0x00000087, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x0000008D, 0x00000001, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C82, 0x00000168, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0xF9718882, 0x00000043, 0x00000005, MakeLerp, 0xFE363C85, 0xFE363C82, 0x0000003C, 0x00000008, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFFF, 0x00000003, 0x00000001, 0x0000000B, 0x00000043, 0x00000001, UpdateLerp, 0x0000000C, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0xFFFFFFFF, 0x0000000B, 0x00000002, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000002, PlaySound, 0x000001F9, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000043, 0x00000006, RotateModel, 0x00000082, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xF9718882, 0xFE363C86, 0x00000004, 0x00000001, 0x00000015, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000B, 0x00000013, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FA, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000024, 0x00000002, 0xFD050F89, 0x00004000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFD050F89, 0x0000C000, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000014, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF9718882, 0xFE363C86, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000015, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C80, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802433CC_DDAD7C -.word 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B581, 0x00000001, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B581, 0x00000001, 0x00000024, 0x00000002, 0xF9718882, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFEE, 0x0000000F, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000086, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000087, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000033, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000034, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFEE, 0x00000000, 0x0000000F, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000086, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000087, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000033, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000034, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B581, 0x00000001, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B581, 0x00000001, 0x00000024, 0x00000002, 0xF9718882, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFEE, 0x0000000F, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000086, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000087, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000033, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000034, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFEE, 0x00000000, 0x0000000F, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000086, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000087, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000033, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000034, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243604_DDAFB4 -.word 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B581, 0x00000001, 0x0000000A, 0x00000002, 0xF9718882, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B581, 0x00000001, 0x00000024, 0x00000002, 0xF9718882, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFEE, 0x0000000F, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x0000008C, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008D, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000039, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003A, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFEE, 0x00000000, 0x0000000F, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x0000008C, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008D, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000039, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003A, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B581, 0x00000001, 0x0000000A, 0x00000002, 0xF9718882, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B581, 0x00000001, 0x00000024, 0x00000002, 0xF9718882, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFEE, 0x0000000F, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x0000008C, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008D, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000039, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003A, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFEE, 0x00000000, 0x0000000F, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x0000008C, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008D, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000039, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003A, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024383C_DDB1EC .word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, omo_10_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, omo_10_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_12/DDFB60.data.s b/ver/us/asm/data/world/area_omo/omo_12/DDFB60.data.s index b03f72a18a..8115cba607 100644 --- a/ver/us/asm/data/world/area_omo/omo_12/DDFB60.data.s +++ b/ver/us/asm/data/world/area_omo/omo_12/DDFB60.data.s @@ -15,7 +15,7 @@ dlabel D_802408D4_DDFBE4 .word 0x0000004D, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF70F2E81, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0xF70F2E82, 0x00000027, 0x00000002, 0xFE363C83, 0x00000080, 0x00000043, 0x00000005, func_80240314_DDF624, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0xF70F2E82, 0x00000027, 0x00000002, 0xFE363C83, 0x00000080, 0x00000043, 0x00000005, func_80240314_DDF624, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0xF70F2E82, 0x00000027, 0x00000002, 0xFE363C83, 0x00000080, 0x00000043, 0x00000005, func_80240314_DDF624, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000016, 0x00000001, 0x00000004, 0x00000043, 0x00000001, func_802403D8_DDF6E8, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000000, 0x00000016, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C83, 0xF70F2E82, 0x00000027, 0x00000002, 0xFE363C83, 0x00000080, 0x00000043, 0x00000005, func_80240314_DDF624, 0x00000000, 0xFFFFFC18, 0x00000000, 0xFE363C83, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000000, 0x00000016, 0x00000001, 0x00000006, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000005, 0x00000024, 0x00000002, 0xF70F2E82, 0x0000007F, 0x00000044, 0x00000001, D_802408D4_DDFBE4, 0x00000018, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000003, 0x00000024, 0x00000002, 0xF70F2E82, 0x00000066, 0x00000044, 0x00000001, D_802408D4_DDFBE4, 0x0000001B, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802408A8_DDFBB8, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0x00000046, 0x00000014, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000F004E, 0x000000A0, 0x00000028, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFFFFFF6A, 0x00000000, 0x00000014, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF6A, 0x00000000, 0x00000014, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF6A, 0x00000000, 0x00000014, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24FF280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5680, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C82, 0x00000020, 0x00000027, 0x00000002, 0xFE363C83, 0x0000000A, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000064, 0x0000003C, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, func_80240314_DDF624, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x006D0005, 0x006D0001, 0x00000000, 0x000F004F, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000032, 0x00000000, 0x00000014, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7D4D, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000001, 0x00000024, 0x00000002, 0xF70F2E82, 0xFFFFFFE4, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x006D0006, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x00000000, 0x00000014, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x006D0001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x006D0005, 0x006D0001, 0x00000000, 0x000F0050, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000A, 0xF24A7C80, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x006D000F, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008000A, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000004, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240F38_DE0248 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00060006, 0x00060001, 0x00000005, 0x000F005C, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00060006, 0x00060001, 0x00000005, 0x000F005C, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240FF4_DE0304 .word 0x00000000, 0x00000000, 0x00000000, 0x41C80000, 0xC0A00000, 0x00000000, 0x42700000, 0x41F00000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_15/DE9670.data.s b/ver/us/asm/data/world/area_omo/omo_15/DE9670.data.s index 162fe0c2f2..552c4f91be 100644 --- a/ver/us/asm/data/world/area_omo/omo_15/DE9670.data.s +++ b/ver/us/asm/data/world/area_omo/omo_15/DE9670.data.s @@ -9,7 +9,7 @@ dlabel D_80240F2C_DE969C .word 0x00000008, 0xFFFFFFDD, 0xFFFFFF10, 0x00000007, 0xFFFFFFFB, 0xFFFFFF4C, 0x00000006, 0x0000000A, 0xFFFFFF88, 0x00000006, 0x00000019, 0xFFFFFFC4, 0x00000006, 0x00000019, 0x0000003C, 0x00000006, 0x0000000A, 0x00000078, 0x00000007, 0xFFFFFFFB, 0x000000B4, 0x00000008, 0xFFFFFFDD, 0x000000F0, 0x00000006, 0x0000001E, 0x00000000 dlabel D_80240F98_DE9708 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_802D2C14, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, func_802D2C14, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x0076000A, 0x00760002, 0x00000000, 0x000F005F, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000000FA, 0xFFFFFFCE, 0x0000000A, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000FA, 0xFFFFFFCE, 0x0000000A, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF24DAE80, 0xF24AA680, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x0076000A, 0x00760002, 0x00000000, 0x000F0060, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x0076000A, 0x00760002, 0x00000000, 0x000F0061, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x0076000A, 0x00760002, 0x00000000, 0x000F0062, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFF38, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000005, 0x00000001, 0x00000009, 0x00000043, 0x00000003, SetNpcAnimation, 0xFE363C80, 0x003B0002, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x0076000C, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000F0063, 0x000000A0, 0x00000028, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00760002, 0x00000008, 0x00000001, 0x00000014, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000005, 0x00000001, 0x00000009, 0x00000043, 0x00000003, SetNpcAnimation, 0xFE363C80, 0x003B0001, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00760002, 0x0076000A, 0x00000000, 0x000F0064, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x8000004D, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000005, 0x00000001, 0x00000009, 0x00000043, 0x00000004, SetNpcVar, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24FA280, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F7A80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000030, 0x00000001, D_80240F2C_DE969C, 0x00000005, 0x00000001, 0x00000009, 0x00000033, 0x00000003, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetNpcSpeed, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C80, 0xFE363C82, 0x00000000, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24BE280, 0x00000008, 0x00000001, 0x00000014, 0x00000003, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetNpcVar, 0x00000009, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000028, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00000108, 0x00000106, 0x00000000, 0x000F0075, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000096, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8480, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x00000BB8, 0x00000044, 0x00000001, D_802408E0_DE9050, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_802D2C14, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, func_802D2C14, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x0076000A, 0x00760002, 0x00000000, 0x000F005F, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000000FA, 0xFFFFFFCE, 0x0000000A, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000FA, 0xFFFFFFCE, 0x0000000A, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF24DAE80, 0xF24AA680, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x0076000A, 0x00760002, 0x00000000, 0x000F0060, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x0076000A, 0x00760002, 0x00000000, 0x000F0061, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x0076000A, 0x00760002, 0x00000000, 0x000F0062, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFF38, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000005, 0x00000001, 0x00000009, 0x00000043, 0x00000003, SetNpcAnimation, 0xFE363C80, 0x003B0002, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x0076000C, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000F0063, 0x000000A0, 0x00000028, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00760002, 0x00000008, 0x00000001, 0x00000014, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000005, 0x00000001, 0x00000009, 0x00000043, 0x00000003, SetNpcAnimation, 0xFE363C80, 0x003B0001, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00760002, 0x0076000A, 0x00000000, 0x000F0064, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x8000004D, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000005, 0x00000001, 0x00000009, 0x00000043, 0x00000004, SetNpcVar, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24FA280, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F7A80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000030, 0x00000001, D_80240F2C_DE969C, 0x00000005, 0x00000001, 0x00000009, 0x00000033, 0x00000003, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetNpcSpeed, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C80, 0xFE363C82, 0x00000000, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24BE280, 0x00000008, 0x00000001, 0x00000014, 0x00000003, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetNpcVar, 0x00000009, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000028, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00000108, 0x00000106, 0x00000000, 0x000F0075, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000096, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8480, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x00000BB8, 0x00000044, 0x00000001, D_802408E0_DE9050, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024157C_DE9CEC .word 0x00000001, 0x00000041, 0x00000000, 0x00000057, 0x00000000, 0x00000011, 0x0000002E, 0x00000001, 0xFFFFFFE8, 0x00000000, 0xFFFFFFF5, 0x00000000, 0xFFFFFFC1, 0xFFFFFFF0, 0x00000000, 0xFFFFFF88, 0x0000002B, 0x00000001, 0xFFFFFF54, 0x00000000, 0x00000019, 0x00000000, 0xFFFFFF16, 0x00000017, 0x00000000, 0xFFFFFEC0, 0x0000001E, 0x00000000, 0xFFFFFE70, 0x00000000, 0xFFFFFFFF diff --git a/ver/us/asm/data/world/area_pra/pra_22/D78BF0.data.s b/ver/us/asm/data/world/area_pra/pra_22/D78BF0.data.s index 1e21da7683..1a40c243cb 100644 --- a/ver/us/asm/data/world/area_pra/pra_22/D78BF0.data.s +++ b/ver/us/asm/data/world/area_pra/pra_22/D78BF0.data.s @@ -21,7 +21,7 @@ dlabel D_80240510_D78D90 .word 0x00000043, 0x00000002, GetLoadType, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, EnterSavePoint, 0x00000044, 0x00000001, D_802404C8_D78D48, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000002A, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000046, 0x00000001, EnterSingleDoor, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, D_80240370_D78BF0, 0x00000024, 0x00000002, 0xFE363C83, D_80240378_D78BF8, 0x00000046, 0x00000001, BaseEnterDoor, 0x00000023, 0x00000000, 0x00000044, 0x00000001, D_802404C8_D78D48, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240608_D78E88 -.word 0x00000005, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_22_UnkFunc11, 0xFE363C89, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000064, 0xF24A7CE7, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C82, 0xFE363C86, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0xFE363C81, 0x00000064, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000001, func_802400DC_D7895C, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080002, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000008, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFE363C86, 0xFE363C87, 0x00000064, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000001C, 0x80000010, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000021, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000026, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001C, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x80000010, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000005, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_22_UnkFunc11, 0xFE363C89, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000064, 0xF24A7CE7, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C82, 0xFE363C86, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0xFE363C81, 0x00000064, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000001, func_802400DC_D7895C, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080002, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000008, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFE363C86, 0xFE363C87, 0x00000064, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000001C, 0x80000010, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000021, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000026, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001C, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x80000010, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240AB0_D79330 .word 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000E, 0x00000002, 0xFE363C80, 0x00000151, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000032, 0x00000024, 0x00000002, 0xFE363C88, 0x00000002, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C80, 0x0000019D, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0xFFFFFFCE, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000012, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x0000001C, 0x00000046, 0x00000001, D_80240608_D78E88, 0x0000000B, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000054, 0x00000024, 0x00000002, 0xF5DE029E, 0xFE363C88, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000A, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000048, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000015, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000018, 0x00000018, 0x00000028, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000046, 0x00000001, 0x80241088, 0x00000044, 0x00000001, 0x80240330, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000054, 0x00000047, 0x00000005, D_80240AB0_D79330, 0x00000040, 0x0000001C, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000012, 0x00000000, 0x00000014, 0x00000001, 0xF5DE029E, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFCE, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFCE, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x00000032, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001C, 0x00000021, 0x00000043, 0x00000005, TranslateModel, 0x00000021, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000026, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001C, 0x00000044, 0x00000001, D_80240510_D78D90, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sam/sam_01/D01D90.data.s b/ver/us/asm/data/world/area_sam/sam_01/D01D90.data.s index e6c9acd59e..2cbca6e266 100644 --- a/ver/us/asm/data/world/area_sam/sam_01/D01D90.data.s +++ b/ver/us/asm/data/world/area_sam/sam_01/D01D90.data.s @@ -12,4 +12,4 @@ dlabel D_8024A460_D01FD0 .word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000013, 0x000001C1, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000050, 0x00000014, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000029, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024A510_D02080 -.word 0x00000043, 0x00000005, MakeLerp, 0x00000050, 0x00000000, 0x00000014, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000029, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000013, 0x000001C2, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000100, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xF246CA1A, 0xF24A7A80, 0xF249C41A, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF245CA80, 0xF249A3B4, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_8024A460_D01FD0, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_8024A510_D02080, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000040, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0xFFFFFF01, 0x00000000, 0x0000001C, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000002, 0xF24A8280, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFF01, 0xFFFFFFE2, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00CF0004, 0x00CF0001, 0x00000000, 0x00120005, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF01, 0x00000000, 0xFFFFFF6A, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF250BA80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A801A, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFEE4, 0x00000000, 0xFFFFFF5B, 0x00000043, 0x00000003, InterpPlayerYaw, 0x000000B4, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFEC0, 0x00000000, 0xFFFFFF42, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x000000B4, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFF01, 0xFFFFFFD8, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFF01, 0xFFFFFF5B, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000000, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x00000000, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFF01, 0xFFFFFF47, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000002, 0x00000000, 0x00000000, 0x0000001E, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0002, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000002, 0xF24A7C80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFF01, 0xFFFFFF38, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0006, 0x00000008, 0x00000001, 0x00000023, 0x00000056, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000079, 0x00000000, 0x00000008, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0009, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00CF0009, 0x00CF0009, 0x00000000, 0x00120006, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000008, SetMotionBlurParams, 0x00000000, 0x00000000, 0x00000000, 0x00000140, 0x000000F0, 0x00000080, 0x0000000A, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24DC280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24AA280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF250BA80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24AA280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000006, 0x00000000, 0x00000043, 0x00000008, SetMotionBlurParams, 0x00000000, 0x00000000, 0x00000000, 0x00000140, 0x000000F0, 0x00000000, 0x0000000A, 0x00000003, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000002, 0xF24A9280, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0003, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFF01, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0xFFFFFF01, 0x00000000, 0x0000003C, 0x00000008, 0x00000001, 0x0000001E, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002B, 0x00000008, 0x00000001, 0x0000003C, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x00120007, 0x000000A0, 0x00000028, 0x00000003, 0x00000001, 0x00000064, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000064, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF253DA80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7CE7, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, InterpPlayerYaw, 0x000000B4, 0x00000005, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000000, 0x00000005, 0x00000008, 0x00000001, 0x0000005A, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, InterpPlayerYaw, 0x000000B4, 0x00000005, 0x00000057, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xF246CA1A, 0xF24A7A80, 0xF249C41A, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF245CA80, 0xF249A3B4, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFECE, 0x00000000, 0xFFFFFF8C, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00CF0009, 0x00CF0009, 0x00000005, 0x00120008, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_8024A460_D01FD0, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000046, 0x00000001, D_8024A510_D02080, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0xFFFFFF01, 0x00000000, 0x00000032, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000003, 0xF24A8280, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFFFFFF01, 0xFFFFFFB5, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00001, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0xFFFFFF01, 0x00000000, 0x00000050, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000002, 0xF24A8280, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFF01, 0xFFFFFFEC, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0001, 0x00000003, 0x00000001, 0x00000005, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00CF0008, 0x00CF0007, 0x00000000, 0x00120009, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0x000000B4, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF01, 0x00000000, 0xFFFFFF6A, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF250BA80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A801A, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFEC5, 0xFFFFFF6A, 0x00000014, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFFFFFF01, 0xFFFFFF4C, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00001, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFF01, 0xFFFFFFBA, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0001, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00006, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x0012000A, 0x00000003, 0x00000001, 0x00000006, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000006, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00CF0008, 0x00CF0007, 0x00000000, 0x0012000B, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xF2452880, 0xF24A7A80, 0xF247A7B4, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF2433E80, 0xF24D4A80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF2471E80, 0xF247BE80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AC080, 0xF24A5A80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24E6280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, GetAngleToPlayer, 0x00000003, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x0000000D, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x0012000C, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00090000, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x0012000D, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00CF0008, 0x00CF0007, 0x00000000, 0x0012000E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00090000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x0012000F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00010008, 0x00010001, 0x00000000, 0x00000003, 0x00120010, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x0002000D, 0x00020003, 0x00000000, 0x00000003, 0x00120011, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x0003000E, 0x00030003, 0x00000000, 0x00000003, 0x00120012, 0x00000016, 0x00000001, 0x00000004, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0x00000003, 0x00120013, 0x00000016, 0x00000001, 0x00000009, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00050004, 0x00050001, 0x00000000, 0x00000003, 0x00120014, 0x00000016, 0x00000001, 0x00000006, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00060004, 0x00060001, 0x00000000, 0x00000003, 0x00120015, 0x00000016, 0x00000001, 0x00000007, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00070004, 0x00070001, 0x00000000, 0x00000003, 0x00120016, 0x00000016, 0x00000001, 0x00000008, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00080009, 0x00080001, 0x00000000, 0x00000003, 0x00120017, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x00120018, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00005, 0x00D00007, 0x00000000, 0x00120019, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x0012001A, 0x00000043, 0x00000005, SetNpcPos, 0x00000009, 0xFFFFFF6A, 0x00000000, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000009, 0x0000005A, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000A, 0xFFFFFFA6, 0x00000000, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000A, 0x0000010E, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000B, 0xFFFFFF88, 0x00000000, 0xFFFFFFE2, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000B, 0x000000B4, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000C, 0xFFFFFF88, 0x00000000, 0x0000001E, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000C, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000003F, 0x00000024, 0x00000002, 0xF5DE028E, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, 0x00000000, 0x00000024, 0x00000002, 0xFD050F82, 0x00000000, 0x00000024, 0x00000002, 0xFD050F83, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000008, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000102, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFFFFFEFA, 0xFFFFFF99, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000057, 0x00000000, 0x00000043, 0x00000003, GetAngleToPlayer, 0x00000003, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x0012001D, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFF01, 0x00000000, 0xFFFFFF79, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x0012001E, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00002, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000003, 0xF24A8280, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00006, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000005, 0x0012001F, 0x00000043, 0x00000003, GetAngleToPlayer, 0x00000003, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C82, 0x00000014, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000004, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000102, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFFFFFECE, 0xFFFFFF8C, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000004, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00002, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000003, 0xF24A8280, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x00120020, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C83, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C82, 0xFE363C85, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C81, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C82, 0xF24A8280, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00D10004, 0x00D10001, 0x00000000, 0x00120021, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000002, 0x00000003, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000004, 0x00000003, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00005, 0x00D00007, 0x00000000, 0x00120022, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000002, 0x00000004, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000003, 0x00000004, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000004, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000004, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00D10004, 0x00D10001, 0x00000000, 0x00120023, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000004, 0x00000002, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000003, 0x00000002, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000002, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00CF0008, 0x00CF0007, 0x00000000, 0x00120024, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AC080, 0xF24A6080, 0x00000043, 0x00000004, sam_01_GetLeftRightPoints, 0xFE363C80, 0xFE363C82, 0x0000002D, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000002, 0x00000003, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000004, 0x00000003, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00005, 0x00D00007, 0x00000000, 0x00120025, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0006, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000003E4, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0005, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0006, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000003E4, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0005, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0006, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, sam_01_GetLeftRightPoints, 0xFE363C80, 0xFE363C82, 0xFFFFFFA1, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000001F4, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00CE0006, 0x00CE0006, 0x00000000, 0x00120026, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000003, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000002, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000004, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000003E4, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0005, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0006, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000003E4, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0005, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0006, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000B, 0x00000027, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFFFFFEF2, 0x00000000, 0xFFFFFF33, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0007, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x0000032C, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C80, 0x00000000, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000007A, 0x00000000, 0x00000008, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00CE0004, 0x00CE0001, 0x00000000, 0x00120027, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x000000B4, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000002, 0xF24A7E80, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00CF0004, 0x00CF0001, 0x00000000, 0x00120028, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00CE0004, 0x00CE0001, 0x00000000, 0x00120029, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, SpeakToNpc, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x00000000, 0x0012002A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0x00000000, 0x00CE0004, 0x00CE0001, 0x00000000, 0x00000003, 0x0012002B, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24EDA80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00CE000B, 0x00CE0001, 0x00000000, 0x0012002C, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x000000C8, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000003, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000004, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000002, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000D, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0002, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000001, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFEC0, 0xFFFFFEFE, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x000000B4, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0001, 0x00000008, 0x00000001, 0x0000001E, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C82, 0x00000014, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000008, 0x00000043, 0x00000005, GetNpcPos, 0x0000000D, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000002C, 0x00000002, 0xFE363C81, 0xF24A7F80, 0x00000043, 0x00000005, SetNpcPos, 0x0000000D, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE000A, 0x00000008, 0x00000001, 0x0000001E, 0x00000045, 0x00000002, D_8024A220_D01D90, 0xFE363C8A, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFE7, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF245CA80, 0xF24A7A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7BB4, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0008, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFDD, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000005, 0x00000001, 0x00000007, 0x00000043, 0x00000005, GetNpcPos, 0x0000000D, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x0000000D, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000000, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000007, SpeakToNpc, 0x00000000, 0x00CE0004, 0x00CE0001, 0x00000000, 0x00000004, 0x0012002D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0009, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFFB, 0x00000043, 0x00000005, NpcMoveTo, 0x00000004, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00D10005, 0x00000043, 0x00000007, SpeakToNpc, 0x00000004, 0x00D10007, 0x00D10006, 0x00000000, 0x00000000, 0x0012002E, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0x00000000, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0x00000000, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000003, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x0012002F, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7BB4, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFF07, 0xFFFFFF93, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0001, 0x00000005, 0x00000001, 0x00000064, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000000, 0x00000003, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000064, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000002, 0x00000003, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000003, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFFFFFF2E, 0xFFFFFFB0, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFFFFFF06, 0xFFFFFFF6, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000100, 0x00000000, 0x00000046, 0x00000001, D_8024A460_D01FD0, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFFFFFF06, 0x00000032, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00CE0004, 0x00CE0001, 0x00000000, 0x00120030, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00D10007, 0x00D10006, 0x00000000, 0x00120031, 0x00000045, 0x00000002, D_8024A380_D01EF0, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000004, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00D10008, 0x00000043, 0x00000005, NpcMoveTo, 0x00000004, 0xFFFFFF06, 0x00000032, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00D10006, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFD050F84, 0x00000046, 0x00000001, D_8024A510_D02080, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000043, 0x00000044, 0x00000001, 0x80241FB0, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00CE0004, 0x00CE0001, 0x00000005, 0x00120032, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24E6280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00CE0004, 0x00CE0001, 0x00000000, 0x00120033, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00CE0004, 0x00CE0001, 0x00000000, 0x00120034, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000004, 0x00000004, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000004, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, 0x00000000, 0x00000024, 0x00000002, 0xFD050F82, 0x00000000, 0x00000024, 0x00000002, 0xFD050F83, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000040, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000040, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000D, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000005, MakeLerp, 0x00000050, 0x00000000, 0x00000014, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000029, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000013, 0x000001C2, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000100, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xF246CA1A, 0xF24A7A80, 0xF249C41A, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF245CA80, 0xF249A3B4, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_8024A460_D01FD0, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_8024A510_D02080, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000040, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0xFFFFFF01, 0x00000000, 0x0000001C, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000002, 0xF24A8280, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFF01, 0xFFFFFFE2, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00CF0004, 0x00CF0001, 0x00000000, 0x00120005, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF01, 0x00000000, 0xFFFFFF6A, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF250BA80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A801A, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFEE4, 0x00000000, 0xFFFFFF5B, 0x00000043, 0x00000003, InterpPlayerYaw, 0x000000B4, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFEC0, 0x00000000, 0xFFFFFF42, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x000000B4, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFF01, 0xFFFFFFD8, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFF01, 0xFFFFFF5B, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000000, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x00000000, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFF01, 0xFFFFFF47, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000002, 0x00000000, 0x00000000, 0x0000001E, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0002, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000002, 0xF24A7C80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFF01, 0xFFFFFF38, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0006, 0x00000008, 0x00000001, 0x00000023, 0x00000056, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000079, 0x00000000, 0x00000008, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0009, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00CF0009, 0x00CF0009, 0x00000000, 0x00120006, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000008, SetMotionBlurParams, 0x00000000, 0x00000000, 0x00000000, 0x00000140, 0x000000F0, 0x00000080, 0x0000000A, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24DC280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24AA280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF250BA80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24AA280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000006, 0x00000000, 0x00000043, 0x00000008, SetMotionBlurParams, 0x00000000, 0x00000000, 0x00000000, 0x00000140, 0x000000F0, 0x00000000, 0x0000000A, 0x00000003, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000002, 0xF24A9280, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0003, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFF01, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0xFFFFFF01, 0x00000000, 0x0000003C, 0x00000008, 0x00000001, 0x0000001E, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002B, 0x00000008, 0x00000001, 0x0000003C, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x00120007, 0x000000A0, 0x00000028, 0x00000003, 0x00000001, 0x00000064, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000064, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF253DA80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7CE7, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, InterpPlayerYaw, 0x000000B4, 0x00000005, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000000, 0x00000005, 0x00000008, 0x00000001, 0x0000005A, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, InterpPlayerYaw, 0x000000B4, 0x00000005, 0x00000057, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xF246CA1A, 0xF24A7A80, 0xF249C41A, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF245CA80, 0xF249A3B4, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFECE, 0x00000000, 0xFFFFFF8C, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00CF0009, 0x00CF0009, 0x00000005, 0x00120008, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_8024A460_D01FD0, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000046, 0x00000001, D_8024A510_D02080, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0xFFFFFF01, 0x00000000, 0x00000032, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000003, 0xF24A8280, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFFFFFF01, 0xFFFFFFB5, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00001, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0xFFFFFF01, 0x00000000, 0x00000050, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000002, 0xF24A8280, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFF01, 0xFFFFFFEC, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0001, 0x00000003, 0x00000001, 0x00000005, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00CF0008, 0x00CF0007, 0x00000000, 0x00120009, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0x000000B4, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF01, 0x00000000, 0xFFFFFF6A, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF250BA80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A801A, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFEC5, 0xFFFFFF6A, 0x00000014, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFFFFFF01, 0xFFFFFF4C, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00001, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFF01, 0xFFFFFFBA, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0001, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00006, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x0012000A, 0x00000003, 0x00000001, 0x00000006, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000006, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00CF0008, 0x00CF0007, 0x00000000, 0x0012000B, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xF2452880, 0xF24A7A80, 0xF247A7B4, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF2433E80, 0xF24D4A80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF2471E80, 0xF247BE80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AC080, 0xF24A5A80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24E6280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, GetAngleToPlayer, 0x00000003, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x0000000D, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x0012000C, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00090000, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x0012000D, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00CF0008, 0x00CF0007, 0x00000000, 0x0012000E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00090000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x0012000F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00010008, 0x00010001, 0x00000000, 0x00000003, 0x00120010, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x0002000D, 0x00020003, 0x00000000, 0x00000003, 0x00120011, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x0003000E, 0x00030003, 0x00000000, 0x00000003, 0x00120012, 0x00000016, 0x00000001, 0x00000004, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0x00000003, 0x00120013, 0x00000016, 0x00000001, 0x00000009, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00050004, 0x00050001, 0x00000000, 0x00000003, 0x00120014, 0x00000016, 0x00000001, 0x00000006, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00060004, 0x00060001, 0x00000000, 0x00000003, 0x00120015, 0x00000016, 0x00000001, 0x00000007, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00070004, 0x00070001, 0x00000000, 0x00000003, 0x00120016, 0x00000016, 0x00000001, 0x00000008, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00080009, 0x00080001, 0x00000000, 0x00000003, 0x00120017, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x00120018, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00005, 0x00D00007, 0x00000000, 0x00120019, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x0012001A, 0x00000043, 0x00000005, SetNpcPos, 0x00000009, 0xFFFFFF6A, 0x00000000, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000009, 0x0000005A, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000A, 0xFFFFFFA6, 0x00000000, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000A, 0x0000010E, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000B, 0xFFFFFF88, 0x00000000, 0xFFFFFFE2, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000B, 0x000000B4, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000C, 0xFFFFFF88, 0x00000000, 0x0000001E, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000C, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000003F, 0x00000024, 0x00000002, 0xF5DE028E, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, 0x00000000, 0x00000024, 0x00000002, 0xFD050F82, 0x00000000, 0x00000024, 0x00000002, 0xFD050F83, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000008, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000102, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFFFFFEFA, 0xFFFFFF99, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000057, 0x00000000, 0x00000043, 0x00000003, GetAngleToPlayer, 0x00000003, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x0012001D, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFF01, 0x00000000, 0xFFFFFF79, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x0012001E, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00002, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000003, 0xF24A8280, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00006, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000005, 0x0012001F, 0x00000043, 0x00000003, GetAngleToPlayer, 0x00000003, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C82, 0x00000014, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000004, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000102, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFFFFFECE, 0xFFFFFF8C, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000004, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00002, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000003, 0xF24A8280, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x00120020, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C83, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C82, 0xFE363C85, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C81, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C82, 0xF24A8280, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00D10004, 0x00D10001, 0x00000000, 0x00120021, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000002, 0x00000003, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000004, 0x00000003, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00005, 0x00D00007, 0x00000000, 0x00120022, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000002, 0x00000004, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000003, 0x00000004, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000004, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000004, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00D10004, 0x00D10001, 0x00000000, 0x00120023, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000004, 0x00000002, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000003, 0x00000002, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000002, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00CF0008, 0x00CF0007, 0x00000000, 0x00120024, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AC080, 0xF24A6080, 0x00000043, 0x00000004, sam_01_GetLeftRightPoints, 0xFE363C80, 0xFE363C82, 0x0000002D, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000002, 0x00000003, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000004, 0x00000003, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00005, 0x00D00007, 0x00000000, 0x00120025, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0006, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000003E4, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0005, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0006, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000003E4, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0005, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0006, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, sam_01_GetLeftRightPoints, 0xFE363C80, 0xFE363C82, 0xFFFFFFA1, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000001F4, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00CE0006, 0x00CE0006, 0x00000000, 0x00120026, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000003, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000002, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000004, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000003E4, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0005, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0006, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000003E4, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0005, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0006, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000B, 0x00000027, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFFFFFEF2, 0x00000000, 0xFFFFFF33, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0007, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x0000032C, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C80, 0x00000000, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000007A, 0x00000000, 0x00000008, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00CE0004, 0x00CE0001, 0x00000000, 0x00120027, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x000000B4, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000002, 0xF24A7E80, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00CF0004, 0x00CF0001, 0x00000000, 0x00120028, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00CE0004, 0x00CE0001, 0x00000000, 0x00120029, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, SpeakToNpc, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x00000000, 0x0012002A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0x00000000, 0x00CE0004, 0x00CE0001, 0x00000000, 0x00000003, 0x0012002B, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24EDA80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00CE000B, 0x00CE0001, 0x00000000, 0x0012002C, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x000000C8, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000003, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000004, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000002, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000D, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0002, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000001, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFEC0, 0xFFFFFEFE, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x000000B4, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0001, 0x00000008, 0x00000001, 0x0000001E, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C82, 0x00000014, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000008, 0x00000043, 0x00000005, GetNpcPos, 0x0000000D, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000002C, 0x00000002, 0xFE363C81, 0xF24A7F80, 0x00000043, 0x00000005, SetNpcPos, 0x0000000D, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE000A, 0x00000008, 0x00000001, 0x0000001E, 0x00000045, 0x00000002, D_8024A220_D01D90, 0xFE363C8A, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFE7, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF245CA80, 0xF24A7A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7BB4, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0008, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFDD, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000005, 0x00000001, 0x00000007, 0x00000043, 0x00000005, GetNpcPos, 0x0000000D, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x0000000D, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000000, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000007, SpeakToNpc, 0x00000000, 0x00CE0004, 0x00CE0001, 0x00000000, 0x00000004, 0x0012002D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0009, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFFB, 0x00000043, 0x00000005, NpcMoveTo, 0x00000004, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00D10005, 0x00000043, 0x00000007, SpeakToNpc, 0x00000004, 0x00D10007, 0x00D10006, 0x00000000, 0x00000000, 0x0012002E, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0x00000000, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0x00000000, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000003, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x0012002F, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7BB4, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFF07, 0xFFFFFF93, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0001, 0x00000005, 0x00000001, 0x00000064, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000000, 0x00000003, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000064, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000002, 0x00000003, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000003, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFFFFFF2E, 0xFFFFFFB0, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFFFFFF06, 0xFFFFFFF6, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000100, 0x00000000, 0x00000046, 0x00000001, D_8024A460_D01FD0, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFFFFFF06, 0x00000032, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00CE0004, 0x00CE0001, 0x00000000, 0x00120030, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00D10007, 0x00D10006, 0x00000000, 0x00120031, 0x00000045, 0x00000002, D_8024A380_D01EF0, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000004, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00D10008, 0x00000043, 0x00000005, NpcMoveTo, 0x00000004, 0xFFFFFF06, 0x00000032, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00D10006, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFD050F84, 0x00000046, 0x00000001, D_8024A510_D02080, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000043, 0x00000044, 0x00000001, 0x80241FB0, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00CE0004, 0x00CE0001, 0x00000005, 0x00120032, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24E6280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00CE0004, 0x00CE0001, 0x00000000, 0x00120033, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00CE0004, 0x00CE0001, 0x00000000, 0x00120034, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000004, 0x00000004, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000004, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, 0x00000000, 0x00000024, 0x00000002, 0xFD050F82, 0x00000000, 0x00000024, 0x00000002, 0xFD050F83, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000040, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000040, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000D, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sam/sam_02/D07440.data.s b/ver/us/asm/data/world/area_sam/sam_02/D07440.data.s index 7613a59cf2..a3e20abc52 100644 --- a/ver/us/asm/data/world/area_sam/sam_02/D07440.data.s +++ b/ver/us/asm/data/world/area_sam/sam_02/D07440.data.s @@ -6,10 +6,10 @@ dlabel D_80241D10_D07440 .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, sam_02_Pipe_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, sam_02_Pipe_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, sam_02_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, sam_02_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242454_D07B84 -.word 0x00000043, 0x00000001, sam_02_Pipe_AwaitDownInput, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 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, 0x00000046, 0x00000001, D_80242530_D07C60, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, sam_02_Pipe_AwaitDownInput, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPartnerInUse, 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, 0x00000046, 0x00000001, D_80242530_D07C60, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242530_D07C60 -.word 0x00000043, 0x00000001, sam_02_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, sam_02_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, sam_02_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, sam_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, sam_02_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, sam_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, sam_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 +.word 0x00000043, 0x00000001, sam_02_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, sam_02_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, sam_02_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, sam_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, GetPartnerInUse, 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, sam_02_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, sam_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, sam_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 D_80242A40_D08170 .word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, sam_02_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, sam_02_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 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, sam_02_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, sam_02_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 diff --git a/ver/us/asm/data/world/area_sam/sam_06/D23E50.data.s b/ver/us/asm/data/world/area_sam/sam_06/D23E50.data.s index 11e88e4a70..5fd39c0acc 100644 --- a/ver/us/asm/data/world/area_sam/sam_06/D23E50.data.s +++ b/ver/us/asm/data/world/area_sam/sam_06/D23E50.data.s @@ -168,13 +168,13 @@ dlabel D_802477A8_D27638 .word 0x00000024, 0x00000002, 0xFE363C84, 0x0000000A, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000005, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000003, GetNpcYaw, 0x00000000, 0xFE363C83, 0x0000000F, 0x00000002, 0xFE363C83, 0x0000005A, 0x0000000E, 0x00000002, 0xFE363C83, 0x0000010E, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C84, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C82, 0xFE363C84, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C82, 0xFE363C84, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetItemPos, 0xFD050F80, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C84, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802478D4_D27764 -.word 0x00000043, 0x00000001, WaitForPlayerInputEnabled, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000008, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000043, 0x00000001, WaitForPlayerTouchingFloor, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFF10, 0x0000012C, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00D20004, 0x00D20001, 0x00000000, 0x001200E9, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24E6280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5C80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00D20004, 0x00D20001, 0x00000000, 0x001200EA, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF06, 0x00000000, 0x0000012C, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF06, 0x00000000, 0x0000012C, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2524A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00D20002, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFF92, 0x0000012C, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00D20001, 0x00000043, 0x00000003, GetAngleToPlayer, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00D20004, 0x00D20001, 0x00000000, 0x001200EB, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000024, 0x00000002, 0xF9718885, 0x00000001, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000046, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00D20002, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFFB2, 0x0000011F, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7C80, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFFE7, 0x00000014, 0x000000FD, 0x00000011, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00D20001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00D20002, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFFD8, 0x0000002D, 0x000000BC, 0x00000011, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00D20001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00D20002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFFA6, 0x000000BE, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00D20001, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, WaitForPlayerInputEnabled, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000008, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000043, 0x00000001, WaitForPlayerTouchingFloor, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFF10, 0x0000012C, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00D20004, 0x00D20001, 0x00000000, 0x001200E9, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24E6280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5C80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00D20004, 0x00D20001, 0x00000000, 0x001200EA, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF06, 0x00000000, 0x0000012C, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF06, 0x00000000, 0x0000012C, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2524A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00D20002, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFF92, 0x0000012C, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00D20001, 0x00000043, 0x00000003, GetAngleToPlayer, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00D20004, 0x00D20001, 0x00000000, 0x001200EB, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000024, 0x00000002, 0xF9718885, 0x00000001, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000046, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00D20002, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFFB2, 0x0000011F, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7C80, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFFE7, 0x00000014, 0x000000FD, 0x00000011, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00D20001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00D20002, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFFD8, 0x0000002D, 0x000000BC, 0x00000011, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00D20001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00D20002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFFA6, 0x000000BE, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00D20001, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80247D8C_D27C1C -.word 0x00000003, 0x00000001, 0x0000003C, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000004, 0x00000001, 0x0000003C, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000008, 0x00000004, 0x00000001, 0x0000003C, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C81, 0xFFFFFFC4, 0x00000004, 0x00000001, 0x0000003C, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C82, 0x00000014, 0x00000004, 0x00000001, 0x0000003C, 0x00000013, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C83, 0x0000012C, 0x00000004, 0x00000001, 0x0000003C, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000008, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000043, 0x00000001, WaitForPlayerTouchingFloor, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00D20004, 0x00D20001, 0x00000000, 0x001200EC, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000047, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00D20002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFF92, 0x00000091, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFF7D, 0x0000003C, 0x0000005B, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00D20001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00D20002, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFF8B, 0x0000005A, 0x00000007, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00D20001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00D20002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x00000000, 0xFFFFFF71, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00D20001, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000003, 0x00000001, 0x0000003C, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000004, 0x00000001, 0x0000003C, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000008, 0x00000004, 0x00000001, 0x0000003C, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C81, 0xFFFFFFC4, 0x00000004, 0x00000001, 0x0000003C, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C82, 0x00000014, 0x00000004, 0x00000001, 0x0000003C, 0x00000013, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C83, 0x0000012C, 0x00000004, 0x00000001, 0x0000003C, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000008, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000043, 0x00000001, WaitForPlayerTouchingFloor, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00D20004, 0x00D20001, 0x00000000, 0x001200EC, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000047, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00D20002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFF92, 0x00000091, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFF7D, 0x0000003C, 0x0000005B, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00D20001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00D20002, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFF8B, 0x0000005A, 0x00000007, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00D20001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00D20002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x00000000, 0xFFFFFF71, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00D20001, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802480C4_D27F54 -.word 0x00000043, 0x00000004, AwaitPlayerApproach, 0x00000000, 0xFFFFFF74, 0x0000003C, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000008, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000043, 0x00000001, WaitForPlayerTouchingFloor, 0x00000013, 0x00000000, 0x00000043, 0x00000001, WaitForPlayerTouchingFloor, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00D20004, 0x00D20001, 0x00000000, 0x001200ED, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00D20002, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x0000001B, 0xFFFFFF88, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0x0000000F, 0xFFFFFFA6, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000005D, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000018, 0x000001C1, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x0000000A, 0x00000004, 0x00000003, 0x00000001, 0x00000046, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000004B, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000046, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF9718881, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000005D, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00D20002, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x00000000, 0xFFFFFEB6, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00D20001, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A81B4, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000018, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000019, 0x7FFFFE00, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000000, 0xFFFFFF38, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8F, 0x0000005E, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00800000, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000A, 0x00800000, 0x00000001, 0x00000043, 0x00000001, func_80242538_D223C8, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x0000000A, 0x00000001, 0x00000003, 0x00000001, 0x00000047, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0x0000004A, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateGroup, 0x00000047, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFE363C82, 0x0000005A, 0x00000028, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000043, 0x00000006, RotateModel, 0x0000004B, 0xFE363C82, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000047, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000047, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000018, 0x000001C2, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000000, 0xFFFFFF10, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000018, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000019, 0x7FFFFE00, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, GetAngleToPlayer, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00D20004, 0x00D20001, 0x00000000, 0x001200EE, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24E6280, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF24D9D4D, 0xF2457680, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF24A7D4D, 0xF2457680, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ACE80, 0xF24A4080, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00D20004, 0x00D20001, 0x00000000, 0x001200EF, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00D20004, 0x00D20001, 0x00000000, 0x001200F0, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24EC680, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF24D9D4D, 0xF2469280, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF24A7D4D, 0xF2469280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ACE80, 0xF24A4280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00D20002, 0x00000045, 0x00000002, D_80247698_D27528, 0xFE363C8A, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x00000000, 0xFFFFFEED, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000045, 0x00000002, D_802477A8_D27638, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000005, SetItemPos, 0xFD050F80, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00D20001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000024, 0x00000002, 0xFE363C80, 0x00000032, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_802443D4_D24264, 0x00000043, 0x00000002, AddKeyItem, 0x00000032, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00D20004, 0x00D20001, 0x00000000, 0x001200F1, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF24D9D4D, 0xF2457680, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF24A7D4D, 0xF2457680, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7D4D, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00D20002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x00000000, 0xFFFFFEB6, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00D20001, 0x00000043, 0x00000003, GetAngleToPlayer, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00D20004, 0x00D20001, 0x00000000, 0x001200F2, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0x00000000, D_802475A0_D27430, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000004, AwaitPlayerApproach, 0x00000000, 0xFFFFFF74, 0x0000003C, 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000008, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000043, 0x00000001, WaitForPlayerTouchingFloor, 0x00000013, 0x00000000, 0x00000043, 0x00000001, WaitForPlayerTouchingFloor, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00D20004, 0x00D20001, 0x00000000, 0x001200ED, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00D20002, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x0000001B, 0xFFFFFF88, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0x0000000F, 0xFFFFFFA6, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000005D, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000018, 0x000001C1, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x0000000A, 0x00000004, 0x00000003, 0x00000001, 0x00000046, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000004B, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000046, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF9718881, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000005D, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00D20002, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x00000000, 0xFFFFFEB6, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00D20001, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A81B4, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000018, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000019, 0x7FFFFE00, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000000, 0xFFFFFF38, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8F, 0x0000005E, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00800000, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000A, 0x00800000, 0x00000001, 0x00000043, 0x00000001, func_80242538_D223C8, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x0000000A, 0x00000001, 0x00000003, 0x00000001, 0x00000047, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0x0000004A, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateGroup, 0x00000047, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFE363C82, 0x0000005A, 0x00000028, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000043, 0x00000006, RotateModel, 0x0000004B, 0xFE363C82, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000047, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000047, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000018, 0x000001C2, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000000, 0xFFFFFF10, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000018, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000019, 0x7FFFFE00, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, GetAngleToPlayer, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00D20004, 0x00D20001, 0x00000000, 0x001200EE, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24E6280, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF24D9D4D, 0xF2457680, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF24A7D4D, 0xF2457680, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ACE80, 0xF24A4080, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00D20004, 0x00D20001, 0x00000000, 0x001200EF, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00D20004, 0x00D20001, 0x00000000, 0x001200F0, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24EC680, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF24D9D4D, 0xF2469280, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF24A7D4D, 0xF2469280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ACE80, 0xF24A4280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00D20002, 0x00000045, 0x00000002, D_80247698_D27528, 0xFE363C8A, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x00000000, 0xFFFFFEED, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000045, 0x00000002, D_802477A8_D27638, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000005, SetItemPos, 0xFD050F80, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00D20001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000024, 0x00000002, 0xFE363C80, 0x00000032, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_802443D4_D24264, 0x00000043, 0x00000002, AddKeyItem, 0x00000032, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00D20004, 0x00D20001, 0x00000000, 0x001200F1, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF24D9D4D, 0xF2457680, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF24A7D4D, 0xF2457680, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7D4D, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00D20002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x00000000, 0xFFFFFEB6, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00D20001, 0x00000043, 0x00000003, GetAngleToPlayer, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00D20004, 0x00D20001, 0x00000000, 0x001200F2, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0x00000000, D_802475A0_D27430, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80248B98_D28A28 .word 0x00000008, 0x00000001, 0x00000003, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000046, 0x00000046, 0x00000001, D_802478D4_D27764, 0x00000046, 0x00000001, D_80247D8C_D27C1C, 0x00000046, 0x00000001, D_802480C4_D27F54, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE0180, 0x00000046, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFFFFFFA6, 0x0000002D, 0x000000BE, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000046, 0x00000001, D_80247D8C_D27C1C, 0x00000046, 0x00000001, D_802480C4_D27F54, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE0180, 0x00000047, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0x0000005A, 0xFFFFFF71, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000046, 0x00000001, D_802480C4_D27F54, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFFFFFFE4, 0xFFFFFFB0, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000000, 0xFFFFFF9C, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000005D, 0x00000001, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000047, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0x0000005A, 0xFFFFFF4C, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000018, 0x000001C1, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x0000000A, 0x00000001, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000004B, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00D20002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x00000028, 0xFFFFFF74, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00D20001, 0x00000043, 0x00000005, MakeLerp, 0x0000005A, 0x00000000, 0x0000000A, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000004B, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000018, 0x000001C2, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000005D, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000000, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00D20004, 0x00D20001, 0x00000000, 0x001200F3, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000005D, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000018, 0x000001C1, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x0000000A, 0x00000001, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000004B, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00D20002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x00000000, 0xFFFFFF4C, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x00000000, 0xFFFFFED4, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00D20001, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x0000005A, 0x00000000, 0x0000000A, 0x00000001, 0x00000003, 0x00000001, 0x00000003, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000004B, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000003, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000018, 0x000001C2, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000005D, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000024, 0x00000002, 0xF9718885, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000048, 0x00000002, 0x00000000, 0x00000001, 0x00000000 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 3b84ae6184..6d62636ebd 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 @@ -78,13 +78,13 @@ dlabel D_80243E24_D3E3F4 .word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000002, 0xFE363C81, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C83, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243EB4_D3E484 -.word 0x00000043, 0x00000001, func_8024072C_D3ACFC, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000008, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001000B, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000002, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000004, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000006, 0x00000000, 0x00000043, 0x00000001, sam_11_UnsetCamera0MoveFlag1, 0x00000024, 0x00000002, 0xFE363C83, 0x000001F4, 0x00000045, 0x00000002, D_80243E24_D3E3F4, 0xFE363C8A, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000167, 0x00000000, 0x00000043, 0x00000001, func_8024059C_D3AB6C, 0x00000043, 0x00000002, StopSound, 0x00000167, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7C80, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFF6A, 0x00000145, 0xFFFFFED4, 0x00000028, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000001, 0x00000005, 0xF24A7E80, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000002, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000006, 0x00000001, 0x00000043, 0x00000001, sam_11_SetCamera0MoveFlag1, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, func_8024072C_D3ACFC, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000008, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001000B, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000002, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000004, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000006, 0x00000000, 0x00000043, 0x00000001, sam_11_UnsetCamera0MoveFlag1, 0x00000024, 0x00000002, 0xFE363C83, 0x000001F4, 0x00000045, 0x00000002, D_80243E24_D3E3F4, 0xFE363C8A, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000167, 0x00000000, 0x00000043, 0x00000001, func_8024059C_D3AB6C, 0x00000043, 0x00000002, StopSound, 0x00000167, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7C80, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFF6A, 0x00000145, 0xFFFFFED4, 0x00000028, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000001, 0x00000005, 0xF24A7E80, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000002, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000006, 0x00000001, 0x00000043, 0x00000001, sam_11_SetCamera0MoveFlag1, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802440F8_D3E6C8 .word 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x000000F5, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000014, 0x0000000A, 0x00000000, 0x00000028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000005, 0x00000001, 0x00000007, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, RandInt, 0x0000001E, 0xFE363C83, 0x00000043, 0x00000003, RandInt, 0x0000001E, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFF1, 0x00000027, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x00000027, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802442D8_D3E8A8 -.word 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0xFFFFFF29, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFF33, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C82, 0xFFFFFE7A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C82, 0xFFFFFE89, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_8024072C_D3ACFC, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000008, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFF2E, 0xFE363C81, 0xFFFFFE84, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002B, 0x00000008, 0x00000001, 0x0000001E, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C81, 0x00000005, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000162, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000001, 0x0000000A, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFF2A, 0x00000096, 0xFFFFFE89, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFF2A, 0x00000096, 0xFFFFFE8E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002F, 0x00000008, 0x00000001, 0x0000000A, 0x00000044, 0x00000001, D_802440F8_D3E6C8, 0x00000046, 0x00000001, D_80243C40_D3E210, 0x00000046, 0x00000001, D_80243DBC_D3E38C, 0x00000044, 0x00000001, D_80243D70_D3E340, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24D9A80, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF247E680, 0xF2484A80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A4A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000028, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000041, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000002, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00830004, 0x00830001, 0x00000000, 0x001200CC, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24D9A80, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF246FA80, 0xF2486A80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF2487E80, 0xF2459280, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5680, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00830004, 0x00830001, 0x00000000, 0x001200CD, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0xFFFFFF29, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFF33, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C82, 0xFFFFFE7A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C82, 0xFFFFFE89, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_8024072C_D3ACFC, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000008, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFF2E, 0xFE363C81, 0xFFFFFE84, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002B, 0x00000008, 0x00000001, 0x0000001E, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C81, 0x00000005, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000162, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000001, 0x0000000A, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFF2A, 0x00000096, 0xFFFFFE89, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFF2A, 0x00000096, 0xFFFFFE8E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002F, 0x00000008, 0x00000001, 0x0000000A, 0x00000044, 0x00000001, D_802440F8_D3E6C8, 0x00000046, 0x00000001, D_80243C40_D3E210, 0x00000046, 0x00000001, D_80243DBC_D3E38C, 0x00000044, 0x00000001, D_80243D70_D3E340, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24D9A80, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF247E680, 0xF2484A80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A4A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000028, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000041, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000002, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00830004, 0x00830001, 0x00000000, 0x001200CC, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24D9A80, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF246FA80, 0xF2486A80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF2487E80, 0xF2459280, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5680, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00830004, 0x00830001, 0x00000000, 0x001200CD, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244964_D3EF34 .word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C80, 0x000000BE, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C80, 0x000000E6, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xFE363C81, 0x0000015E, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C81, 0x00000175, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xFE363C82, 0xFFFFFEB1, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C82, 0xFFFFFED1, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B582, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80243DBC_D3E38C, 0x00000044, 0x00000001, D_80243CCC_D3E29C, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_sam/sam_12/D4C2A0.data.s b/ver/us/asm/data/world/area_sam/sam_12/D4C2A0.data.s index a6235b248a..d0154ad28b 100644 --- a/ver/us/asm/data/world/area_sam/sam_12/D4C2A0.data.s +++ b/ver/us/asm/data/world/area_sam/sam_12/D4C2A0.data.s @@ -15,4 +15,4 @@ dlabel D_80240A78_D4C498 .word 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000000B1, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000005, 0x00000001, 0x00000008, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240B30_D4C550 -.word 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008001D, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x0000032F, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000008, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000000A0, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000A0, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0x0000005A, 0x00000000, 0x00000000, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_802409E0_D4C400, 0xFE363C89, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x000000C8, 0x00000032, 0x00000000, 0x00000044, 0x00000001, D_80240A78_D4C498, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x00000139, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7A80, 0x00000005, 0x00000001, 0x00000064, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000045, 0x00000002, D_80240894_D4C2B4, 0xFE363C88, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00B10002, 0x00B10001, 0x00000000, 0x00120133, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24DFE80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5C80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF2524A80, 0xF24B6A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00B10002, 0x00B10001, 0x00000000, 0x00120134, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000A0, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF250BA80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5280, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00B10002, 0x00B10001, 0x00000000, 0x00120135, 0x00000045, 0x00000002, D_80240B30_D4C550, 0xFE363C8A, 0x00000043, 0x00000005, EndSpeech, 0x00000000, 0x00B10002, 0x00B10001, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7A80, 0x00000005, 0x00000001, 0x00000032, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A8EE7, 0x00000043, 0x00000002, func_80240090_D4BAB0, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000007, func_80240238_D4BC58, 0xFFFFFFA6, 0x00000006, 0xFFFFFFFB, 0x00000002, 0x00000000, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24E7680, 0x00000005, 0x00000001, 0x00000064, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A704D, 0x00000043, 0x00000002, func_80240090_D4BAB0, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00B10002, 0x00B10001, 0x00000000, 0x00120136, 0x00000003, 0x00000001, 0x00000006, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000006, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, RemoveEffect, 0xFE363C87, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x000002F1, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008001E, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24DFE80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5C80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF2524A80, 0xF24B6A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00B10002, 0x00B10001, 0x00000000, 0x00120137, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000E6, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF24E1280, 0xF24B6A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, sam_12_PlayRisingBubble, 0x000000E8, 0x0000001F, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7A80, 0x00000005, 0x00000001, 0x00000032, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A7CFB, 0x00000043, 0x00000005, func_802400C0_D4BAE0, 0xFD050F80, 0xF24E1280, 0xFE363C80, 0xF24A7A80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000A0, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF250BA80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00B10002, 0x00B10001, 0x00000000, 0x00120138, 0x00000049, 0x00000001, 0xFE363C88, 0x00000049, 0x00000001, 0xFE363C89, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000005, 0x00000001, 0x00000005, 0x00000028, 0x00000002, 0xFE363C80, 0x00000005, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000002, 0x000000E6, 0x0000001E, 0x00000000, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000005, 0x00000001, 0x00000064, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A7680, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000004C, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008001D, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x0000032F, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000008, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000000A0, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000A0, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0x0000005A, 0x00000000, 0x00000000, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_802409E0_D4C400, 0xFE363C89, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x000000C8, 0x00000032, 0x00000000, 0x00000044, 0x00000001, D_80240A78_D4C498, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x00000139, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7A80, 0x00000005, 0x00000001, 0x00000064, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000045, 0x00000002, D_80240894_D4C2B4, 0xFE363C88, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00B10002, 0x00B10001, 0x00000000, 0x00120133, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24DFE80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5C80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF2524A80, 0xF24B6A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00B10002, 0x00B10001, 0x00000000, 0x00120134, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000A0, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF250BA80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5280, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00B10002, 0x00B10001, 0x00000000, 0x00120135, 0x00000045, 0x00000002, D_80240B30_D4C550, 0xFE363C8A, 0x00000043, 0x00000005, EndSpeech, 0x00000000, 0x00B10002, 0x00B10001, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7A80, 0x00000005, 0x00000001, 0x00000032, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A8EE7, 0x00000043, 0x00000002, func_80240090_D4BAB0, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000007, func_80240238_D4BC58, 0xFFFFFFA6, 0x00000006, 0xFFFFFFFB, 0x00000002, 0x00000000, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24E7680, 0x00000005, 0x00000001, 0x00000064, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A704D, 0x00000043, 0x00000002, func_80240090_D4BAB0, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00B10002, 0x00B10001, 0x00000000, 0x00120136, 0x00000003, 0x00000001, 0x00000006, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000006, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, RemoveEffect, 0xFE363C87, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x000002F1, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008001E, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24DFE80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5C80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF2524A80, 0xF24B6A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00B10002, 0x00B10001, 0x00000000, 0x00120137, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000E6, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF24E1280, 0xF24B6A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, sam_12_PlayRisingBubble, 0x000000E8, 0x0000001F, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7A80, 0x00000005, 0x00000001, 0x00000032, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A7CFB, 0x00000043, 0x00000005, func_802400C0_D4BAE0, 0xFD050F80, 0xF24E1280, 0xFE363C80, 0xF24A7A80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000A0, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF250BA80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00B10002, 0x00B10001, 0x00000000, 0x00120138, 0x00000049, 0x00000001, 0xFE363C88, 0x00000049, 0x00000001, 0xFE363C89, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000005, 0x00000001, 0x00000005, 0x00000028, 0x00000002, 0xFE363C80, 0x00000005, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000002, 0x000000E6, 0x0000001E, 0x00000000, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000005, 0x00000001, 0x00000064, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A7680, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000004C, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_8024027C_A7873C.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_8024027C_A7873C.s deleted file mode 100644 index cc5676c22d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_8024027C_A7873C.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024027C_A7873C -/* A7873C 8024027C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A78740 80240280 AFBF0010 */ sw $ra, 0x10($sp) -/* A78744 80240284 10A00003 */ beqz $a1, .L80240294 -/* A78748 80240288 8C86000C */ lw $a2, 0xc($a0) -/* A7874C 8024028C 3C018024 */ lui $at, %hi(kpa_81_ItemChoice_HasSelectedItem) -/* A78750 80240290 AC200D98 */ sw $zero, %lo(kpa_81_ItemChoice_HasSelectedItem)($at) -.L80240294: -/* A78754 80240294 3C038024 */ lui $v1, %hi(kpa_81_ItemChoice_HasSelectedItem) -/* A78758 80240298 24630D98 */ addiu $v1, $v1, %lo(kpa_81_ItemChoice_HasSelectedItem) -/* A7875C 8024029C 8C620000 */ lw $v0, ($v1) -/* A78760 802402A0 54400003 */ bnel $v0, $zero, .L802402B0 -/* A78764 802402A4 AC600000 */ sw $zero, ($v1) -/* A78768 802402A8 080900B1 */ j .L802402C4 -/* A7876C 802402AC 0000102D */ daddu $v0, $zero, $zero -.L802402B0: -/* A78770 802402B0 8CC50000 */ lw $a1, ($a2) -/* A78774 802402B4 3C068024 */ lui $a2, %hi(kpa_81_ItemChoice_SelectedItemID) -/* A78778 802402B8 0C0B2026 */ jal evt_set_variable -/* A7877C 802402BC 8CC60D9C */ lw $a2, %lo(kpa_81_ItemChoice_SelectedItemID)($a2) -/* A78780 802402C0 24020002 */ addiu $v0, $zero, 2 -.L802402C4: -/* A78784 802402C4 8FBF0010 */ lw $ra, 0x10($sp) -/* A78788 802402C8 03E00008 */ jr $ra -/* A7878C 802402CC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_82/A7A550/func_8024027C_A7A77C.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_82/A7A550/func_8024027C_A7A77C.s deleted file mode 100644 index fafa51c1f3..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_82/A7A550/func_8024027C_A7A77C.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024027C_A7A77C -/* A7A77C 8024027C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A7A780 80240280 AFBF0010 */ sw $ra, 0x10($sp) -/* A7A784 80240284 10A00003 */ beqz $a1, .L80240294 -/* A7A788 80240288 8C86000C */ lw $a2, 0xc($a0) -/* A7A78C 8024028C 3C018024 */ lui $at, %hi(kpa_82_ItemChoice_HasSelectedItem) -/* A7A790 80240290 AC200C20 */ sw $zero, %lo(kpa_82_ItemChoice_HasSelectedItem)($at) -.L80240294: -/* A7A794 80240294 3C038024 */ lui $v1, %hi(kpa_82_ItemChoice_HasSelectedItem) -/* A7A798 80240298 24630C20 */ addiu $v1, $v1, %lo(kpa_82_ItemChoice_HasSelectedItem) -/* A7A79C 8024029C 8C620000 */ lw $v0, ($v1) -/* A7A7A0 802402A0 54400003 */ bnel $v0, $zero, .L802402B0 -/* A7A7A4 802402A4 AC600000 */ sw $zero, ($v1) -/* A7A7A8 802402A8 080900B1 */ j .L802402C4 -/* A7A7AC 802402AC 0000102D */ daddu $v0, $zero, $zero -.L802402B0: -/* A7A7B0 802402B0 8CC50000 */ lw $a1, ($a2) -/* A7A7B4 802402B4 3C068024 */ lui $a2, %hi(kpa_82_ItemChoice_SelectedItemID) -/* A7A7B8 802402B8 0C0B2026 */ jal evt_set_variable -/* A7A7BC 802402BC 8CC60C24 */ lw $a2, %lo(kpa_82_ItemChoice_SelectedItemID)($a2) -/* A7A7C0 802402C0 24020002 */ addiu $v0, $zero, 2 -.L802402C4: -/* A7A7C4 802402C4 8FBF0010 */ lw $ra, 0x10($sp) -/* A7A7C8 802402C8 03E00008 */ jr $ra -/* A7A7CC 802402CC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml index 9ef8a840d1..b677efee93 100644 --- a/ver/us/splat.yaml +++ b/ver/us/splat.yaml @@ -11158,231 +11158,228 @@ segments: start: 0xA574B0 vram: 0x80240000 subsegments: - - [0xA574B0, c] - - [0xA574F0, c] - - [0xA57830, c] - - [0xA57D20, data] - - [0xA57E40, data] - - [0xA58DB0, data] - - [0xA59060, data] - - [0xA59370] + - [0xA574B0, c, kpa_14_0_header] + - [0xA574F0, c, kpa_14_1_music] + - [0xA574F0, c, kpa_14_2_main] + - [0xA57830, c, kpa_14_3_entity] + - [0xA57D20, c, kpa_14_4_platforms] + - [0xA57D20] - name: kpa_15 dir: world/area_kpa/kpa_15 type: code start: 0xA59390 vram: 0x80240000 subsegments: - - [0xA59390, c] - - [0xA596A0, c] - - [0xA59960, data] - - [0xA59E30, data] - - [0xA5A020] + - [0xA59390, c, kpa_15_0_header] + - [0xA59390, c, kpa_15_1_music] + - [0xA59390, c, kpa_15_2_main] + - [0xA596A0, c, kpa_15_3_entity] + - [0xA59960] - name: kpa_16 dir: world/area_kpa/kpa_16 type: code start: 0xA5A030 vram: 0x80240000 subsegments: - - [0xA5A030, c] - - [0xA5A340, c] - - [0xA5A3D0, data] - - [0xA5B180, data] - - [0xA5CA10] + - [0xA5A030, c, kpa_16_0_header] + - [0xA5A030, c, kpa_16_1_music] + - [0xA5A030, c, kpa_16_2_main] + - [0xA5A340, c, kpa_16_3_entity] + - [0xA5A340, c, kpa_16_4_npc] + - [0xA5A3D0] - name: kpa_17 dir: world/area_kpa/kpa_17 type: code start: 0xA5CA20 vram: 0x80240000 subsegments: - - [0xA5CA20, c] - - [0xA5CA20, data] - - [0xA5CB00, data] - - [0xA5CBD0, data] - - [0xA5CE90, data] - - [0xA5E0B0] + - [0xA5CA20, c, kpa_17_0_header] + - [0xA5CA20, c, kpa_17_1_music] + - [0xA5CA20, c, kpa_17_2_entity] + - [0xA5CA20, c, kpa_17_3_main] + - [0xA5CA20, c, kpa_17_4_npc] + - [0xA5CA20] - name: kpa_32 dir: world/area_kpa/kpa_32 type: code start: 0xA5E0C0 vram: 0x80240000 subsegments: - - [0xA5E0C0, c] - - [0xA5E3D0, data] - - [0xA5E4C0, data] - - [0xA5E500, data] - - [0xA5F060] + - [0xA5E0C0, c, kpa_32_0_header] + - [0xA5E0C0, c, kpa_32_1_music] + - [0xA5E0C0, c, kpa_32_2_entity] + - [0xA5E0C0, c, kpa_32_3_main] + - [0xA5E3D0] - name: kpa_33 dir: world/area_kpa/kpa_33 type: code start: 0xA5F080 vram: 0x80240000 subsegments: - - [0xA5F080, c] - - [0xA5F390, data] - - [0xA5F480, data] - - [0xA5F4C0, data] - - [0xA60020] + - [0xA5F080, c, kpa_33_0_header] + - [0xA5F080, c, kpa_33_1_music] + - [0xA5F080, c, kpa_33_2_entity] + - [0xA5F080, c, kpa_33_3_main] + - [0xA5F390] - name: kpa_40 dir: world/area_kpa/kpa_40 type: code start: 0xA60040 vram: 0x80240000 subsegments: - - [0xA60040, c] - - [0xA60040, data] - - [0xA60130, data] - - [0xA60450] + - [0xA60040, c, kpa_40_0_header] + - [0xA60040, c, kpa_40_1_music] + - [0xA60040, c, kpa_40_2_main] + - [0xA60040] - name: kpa_41 dir: world/area_kpa/kpa_41 type: code start: 0xA60470 vram: 0x80240000 subsegments: - - [0xA60470, c] - - [0xA60470, data] - - [0xA60560, data] - - [0xA609B0] + - [0xA60470, c, kpa_41_0_header] + - [0xA60470, c, kpa_41_1_music] + - [0xA60470, c, kpa_41_2_main] + - [0xA60470] - name: kpa_50 dir: world/area_kpa/kpa_50 type: code start: 0xA609D0 vram: 0x80240000 subsegments: - - [0xA609D0, c] - - [0xA623F0, data] - - [0xA624D0, data] - - [0xA63E60] + - [0xA609D0, c, kpa_50_0_header] + - [0xA609D0, c, kpa_50_1_music] + - [0xA609D0, c, kpa_50_2_main] + - [0xA609D0, c, kpa_50_3_npc] + - [0xA623F0] - name: kpa_51 dir: world/area_kpa/kpa_51 type: code start: 0xA64090 vram: 0x80240000 subsegments: - - [0xA64090, c] - - [0xA640E0, c] - - [0xA65CB0, data] - - [0xA65D80, data] - - [0xA660E0, data] - - [0xA66FB0] + - [0xA64090, c, kpa_51_0_header] + - [0xA640E0, c, kpa_51_1_music] + - [0xA640E0, c, kpa_51_2_main] + - [0xA640E0, c, kpa_51_3_npc] + - [0xA65CB0] - name: kpa_52 dir: world/area_kpa/kpa_52 type: code start: 0xA67100 vram: 0x80240000 subsegments: - - [0xA67100, c] - - [0xA671E0, c] - - [0xA68430, data] - - [0xA68510, data] - - [0xA68710, data] - - [0xA68B40, data] - - [0xA6AAC0] + - [0xA67100, c, kpa_52_0_header] + - [0xA67100, c, kpa_52_1_music] + - [0xA67100, c, kpa_52_2_entity] + - [0xA671E0, c, kpa_52_3_main] + - [0xA671E0, c, kpa_52_4_npc] + - [0xA68430] - name: kpa_53 dir: world/area_kpa/kpa_53 type: code start: 0xA6ACA0 vram: 0x80240000 subsegments: - - [0xA6ACA0, c] - - [0xA6AE10, data] - - [0xA6AEE0, data] - - [0xA6B270, data] - - [0xA6CA80, data] - - [0xA6CAC0] + - [0xA6ACA0, c, kpa_53_0_header] + - [0xA6ACF0, c, kpa_53_1_music] + - [0xA6ACF0, c, kpa_53_2_main] + - [0xA6ACF0, c, kpa_53_3_npc] + - [0xA6AE10, c, kpa_53_4_entity] + - [0xA6AE10] - name: kpa_60 dir: world/area_kpa/kpa_60 type: code start: 0xA6CB00 vram: 0x80240000 subsegments: - - [0xA6CB00, c] - - [0xA6CBE0, c] - - [0xA6CEF0, data] - - [0xA6E3A0] + - [0xA6CB00, c, kpa_60_0_header] + - [0xA6CB00, c, kpa_60_1_music] + - [0xA6CB00, c, kpa_60_2_entity] + - [0xA6CBE0, c, kpa_60_3_main] + - [0xA6CEF0, c, kpa_60_4_scenes] + - [0xA6CEF0] - name: kpa_61 dir: world/area_kpa/kpa_61 type: code start: 0xA6E3E0 vram: 0x80240000 subsegments: - - [0xA6E3E0, c] - - [0xA6E6F0, c] - - [0xA70720, data] - - [0xA707F0, data] - - [0xA70FE0, data] - - [0xA71FC0, data] - - [0xA720A0] + - [0xA6E3E0, c, kpa_61_0_header] + - [0xA6E3E0, c, kpa_61_1_music] + - [0xA6E3E0, c, kpa_61_2_main] + - [0xA6E6F0, c, kpa_61_3_npc] + - [0xA70720, c, kpa_61_4_entity] + - [0xA70720] - name: kpa_62 dir: world/area_kpa/kpa_62 type: code start: 0xA72220 vram: 0x80240000 subsegments: - - [0xA72220, c] - - [0xA72300, c] - - [0xA72610, data] - - [0xA72740, data] - - [0xA73590] + - [0xA72220, c, kpa_62_0_header] + - [0xA72220, c, kpa_62_1_music] + - [0xA72220, c, kpa_62_2_entity] + - [0xA72300, c, kpa_62_3_main] + - [0xA72610] - name: kpa_63 dir: world/area_kpa/kpa_63 type: code start: 0xA735B0 vram: 0x80240000 subsegments: - - [0xA735B0, c] - - [0xA73740, data] - - [0xA738E0, data] - - [0xA73920, data] - - [0xA73D30, data] - - [0xA74860] + - [0xA735B0, c, kpa_63_0_header] + - [0xA735B0, c, kpa_63_1_music] + - [0xA735B0, c, kpa_63_2_entity] + - [0xA735B0, c, kpa_63_3_main] + - [0xA735B0, c, kpa_63_4_scenes] + - [0xA73740] - name: kpa_70 dir: world/area_kpa/kpa_70 type: code start: 0xA74870 vram: 0x80240000 subsegments: - - [0xA74870, c] - - [0xA74B80, c] - - [0xA75360, data] - - [0xA75440, data] - - [0xA75B70, data] - - [0xA78450] + - [0xA74870, c, kpa_70_0_header] + - [0xA74870, c, kpa_70_1_music] + - [0xA74870, c, kpa_70_2_main] + - [0xA74B80, c, kpa_70_3_npc] + - [0xA75360, c, kpa_70_4_chain_skele] + - [0xA75360, c, kpa_70_5_chain_anim] + - [0xA75360] - name: kpa_81 dir: world/area_kpa/kpa_81 type: code start: 0xA784C0 vram: 0x80240000 subsegments: - - [0xA784C0, c] - - [0xA78510, c] - - [0xA78900, data] - - [0xA789F0, data] - - [0xA79200, data] - - [0xA7A4C0] + - [0xA784C0, c, kpa_81_0_header] + - [0xA784C0, c, kpa_81_1_music] + - [0xA784C0, c, kpa_81_2_main] + - [0xA78510, c, kpa_81_3_npc] + - [0xA78900] - name: kpa_82 dir: world/area_kpa/kpa_82 type: code start: 0xA7A500 vram: 0x80240000 subsegments: - - [0xA7A500, c] - - [0xA7A550, c] - - [0xA7A940, data] - - [0xA7AA10, data] - - [0xA7AF80, data] - - [0xA83460] + - [0xA7A500, c, kpa_82_0_header] + - [0xA7A500, c, kpa_82_1_music] + - [0xA7A500, c, kpa_82_2_main] + - [0xA7A550, c, kpa_82_3_npc] + - [0xA7A940] - name: kpa_83 dir: world/area_kpa/kpa_83 type: code start: 0xA83490 vram: 0x80240000 subsegments: - - [0xA83490, c] - - [0xA834E0, c] - - [0xA83500, data] - - [0xA835D0, data] - - [0xA83AC0, data] - - [0xA86780] + - [0xA83490, c, kpa_83_0_header] + - [0xA83490, c, kpa_83_1_music] + - [0xA83490, c, kpa_83_2_main] + - [0xA834E0, c, kpa_83_3_npc] + - [0xA83500] - name: kpa_90 dir: world/area_kpa/kpa_90 type: code diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index 74abc00a82..c13238161b 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -5445,7 +5445,7 @@ func_802D2520 = 0x802D2520; // type:func rom:0xF6ED0 func_802D286C = 0x802D286C; // type:func rom:0xF721C func_802D2884 = 0x802D2884; // type:func rom:0xF7234 DisablePulseStone = 0x802D2AA8; // type:func rom:0xF7458 -GetCurrentPartner = 0x802D2B0C; // type:func rom:0xF74BC +GetPartnerInUse = 0x802D2B0C; // type:func rom:0xF74BC ForceUsePartner = 0x802D2B50; // type:func rom:0xF7500 InterruptUsePartner = 0x802D2B6C; // type:func rom:0xF751C Disable8bitMario = 0x802D2B88; // type:func rom:0xF7538 @@ -18518,15 +18518,15 @@ func_80240444_A56364 = 0x80240444; // type:func rom:0xA56364 kpa_14_get_tattle = 0x80240000; // type:func rom:0xA574B0 kpa_14_UpdateTexturePanSmooth = 0x80240040; // type:func rom:0xA574F0 kpa_14_UpdateTexturePanStepped = 0x80240164; // type:func rom:0xA57614 -func_8024034C_A577FC = 0x8024034C; // type:func rom:0xA577FC +GetActingPartner = 0x8024034C; // type:func rom:0xA577FC kpa_14_StashVars = 0x80240380; // type:func rom:0xA57830 kpa_14_GetItemName = 0x80240434; // type:func rom:0xA578E4 kpa_14_SomeItemEntityFunc = 0x80240498; // type:func rom:0xA57948 kpa_14_IsItemBadge = 0x802405E8; // type:func rom:0xA57A98 kpa_14_RemovePadlock = 0x8024063C; // type:func rom:0xA57AEC kpa_14_GetEntityPosition = 0x80240670; // type:func rom:0xA57B20 -kpa_14_func_80240710_A57BC0 = 0x80240710; // type:func rom:0xA57BC0 -func_8024073C_A57BEC = 0x8024073C; // type:func rom:0xA57BEC +kpa_14_GetFloorBelow = 0x80240710; // type:func rom:0xA57BC0 +AddPlatformPushVelocity = 0x8024073C; // type:func rom:0xA57BEC func_80240840_A57CF0 = 0x80240840; // type:func rom:0xA57CF0 kpa_14_varStash = 0x80241900; // type:data rom:0xA58DB0 kpa_15_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xA59390 @@ -18538,8 +18538,8 @@ kpa_15_IsItemBadge = 0x80240578; // type:func rom:0xA59908 kpa_15_varStash = 0x80240AA0; // type:data rom:0xA59E30 kpa_16_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xA5A030 kpa_16_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xA5A154 -func_80240310_A5A340 = 0x80240310; // type:func rom:0xA5A340 -func_8024034C_A5A37C = 0x8024034C; // type:func rom:0xA5A37C +SetScreenBlackFadeAmount = 0x80240310; // type:func rom:0xA5A340 +MuteAmbience = 0x8024034C; // type:func rom:0xA5A37C kpa_16_GetFloorCollider = 0x80240370; // type:func rom:0xA5A3A0 kpa_32_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xA5E0C0 kpa_32_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xA5E1E4 diff --git a/ver/us/undefined_syms.txt b/ver/us/undefined_syms.txt index d8fae10712..aa2f884dba 100644 --- a/ver/us/undefined_syms.txt +++ b/ver/us/undefined_syms.txt @@ -414,7 +414,7 @@ dead_WaitForPlayerInputEnabled = WaitForPlayerInputEnabled + 0xD620; dead_func_802D2520 = func_802D2520 + 0xD620; dead_func_802D286C = func_802D286C + 0xD64C; dead_func_802D2884 = func_802D2884 + 0xD64C; -dead_GetCurrentPartner = GetCurrentPartner + 0xD64C; +dead_GetPartnerInUse = GetPartnerInUse + 0xD64C; dead_InterruptUsePartner = InterruptUsePartner + 0xD64C; dead_func_802D2C14 = func_802D2C14 + 0xD64C; dead_PlaySoundAtPlayer = PlaySoundAtPlayer + 0xD64C;