diff --git a/include/common_structs.h b/include/common_structs.h index 5b7f2c5864..14115597da 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -1778,45 +1778,6 @@ typedef struct DecorationTable { /* 0x8C6 */ DecorationUnk unk_8C6[2]; } DecorationTable; // size = 0x8E8 -typedef struct PopupMenu { - /* 0x000 */ struct HudScript* ptrIcon[32]; - /* 0x080 */ char unk_80[0x4]; - /* 0x084 */ s32 nameMsg[32]; - /* 0x104 */ char unk_104[0x4]; - /* 0x108 */ s32 userIndex[32]; // used to map menu order to a user-ID for each item - /* 0x188 */ char unk_188[0x4]; - /* 0x18C */ s32 enabled[32]; - /* 0x20C */ char unk_20C[0x4]; - /* 0x210 */ s32 value[32]; // sale price, etc - /* 0x290 */ char unk_290[0x4]; - /* 0x294 */ s32 descMsg[32]; - /* 0x314 */ char unk_314[0x4]; - /* 0x318 */ s32 popupType; // C = keys - /* 0x31C */ s32 unk_31C; - /* 0x320 */ s32 unk_320; - /* 0x324 */ s32 numEntries; - /* 0x328 */ s32 initialPos; - /* 0x32C */ s16 result; - /* 0x32E */ char unk_32E[0x2]; -} PopupMenu; // size = 0x330 - -typedef struct Shop { - /* 0x000 */ s16 flags; - /* 0x002 */ s16 numItems; - /* 0x004 */ s16 numSpecialPrices; - /* 0x006 */ char unk_06[0x2]; - /* 0x008 */ s32 currentItemSlot; - /* 0x00C */ s32 selectedStoreItemSlot; - /* 0x010 */ ShopOwner* owner; - /* 0x014 */ ShopItemLocation* ItemDataPositions; - /* 0x018 */ ShopItemData* staticInventory; - /* 0x01C */ ShopSellPriceData* staticPriceList; - /* 0x020 */ s32 costIconID; - /* 0x024 */ s32 inventoryItemFlags; - /* 0x028 */ PopupMenu itemSelectMenu; - /* 0x358 */ s32 unk_358; -} Shop; // size = 0x35C - typedef struct Encounter { /* 0x00 */ s32 count; /* 0x04 */ struct Enemy* enemy[16]; diff --git a/include/dead.h b/include/dead.h index c85a7fc68b..e31b79eaaf 100644 --- a/include/dead.h +++ b/include/dead.h @@ -103,5 +103,12 @@ #define func_8004A3E8 func_8004E808 #define gCurrentEncounter dead_gCurrentEncounter #define fx_motion_blur_flame dead_fx_motion_blur_flame +#define wPartnerHudScripts dead_wPartnerHudScripts +#define wDisabledPartnerHudScripts dead_wDisabledPartnerHudScripts +#define create_popup_menu dead_create_popup_menu +#define hide_popup_menu dead_hide_popup_menu +#define destroy_popup_menu dead_destroy_popup_menu +#define heap_free dead_heap_free +#define entity_upgrade_block_hide_content dead_entity_upgrade_block_hide_content #endif diff --git a/include/enums.h b/include/enums.h index 126cbb5e1e..b575113c2f 100644 --- a/include/enums.h +++ b/include/enums.h @@ -675,6 +675,8 @@ enum SoundIDs { SOUND_2118 = 0x00002118, SOUND_2119 = 0x00002119, SOUND_211A = 0x0000211A, + SOUND_212D = 0x0000212D, + SOUND_212E = 0x0000212E, }; enum Cams { @@ -1715,7 +1717,10 @@ enum TriggerFlags { }; enum ItemEntityFlags { - ITEM_ENTITY_FLAGS_TINY = 0x00004000, + ITEM_ENTITY_FLAGS_40 = 0x00000040, + ITEM_ENTITY_FLAGS_TINY = 0x00004000, + ITEM_ENTITY_FLAGS_TRANSPARENT = 0x00080000, + ITEM_ENTITY_FLAGS_100000 = 0x00100000, }; enum Buttons { @@ -1960,7 +1965,7 @@ enum PlayerStatusAnimFlags { PLAYER_STATUS_ANIM_FLAGS_20000 = 0x00020000, PLAYER_STATUS_ANIM_FLAGS_40000 = 0x00040000, PLAYER_STATUS_ANIM_FLAGS_80000 = 0x00080000, - PLAYER_STATUS_ANIM_FLAGS_100000 = 0x00100000, + PLAYER_STATUS_ANIM_FLAGS_100000 = 0x00100000, ///< set when using pipes PLAYER_STATUS_ANIM_FLAGS_200000 = 0x00200000, PLAYER_STATUS_ANIM_FLAGS_400000 = 0x00400000, PLAYER_STATUS_ANIM_FLAGS_800000 = 0x00800000, @@ -1974,6 +1979,22 @@ enum PlayerStatusAnimFlags { PLAYER_STATUS_ANIM_FLAGS_80000000 = 0x80000000, }; +enum PopupType { + POPUP_MENU_USE_ITEM = 0x0, + POPUP_MENU_SWITCH_PARTNER = 0x1, + POPUP_MENU_THROW_AWAY_ITEM = 0x2, + POPUP_MENU_TRADE_FOR_BADGE = 0x3, + POPUP_MENU_UPGRADE_PARTNER = 0x4, + POPUP_MENU_SELL_ITEM = 0x5, + POPUP_MENU_CHECK_ITEM = 0x6, + POPUP_MENU_CLAIM_ITEM = 0x7, + POPUP_MENU_READ_LETTER = 0x8, + POPUP_MENU_TAKE_FROM_CHEST = 0x9, + POPUP_MENU_READ_DIARY_PAGE = 0xA, + POPUP_MENU_READ_POSTCARD = 0xB, + POPUP_MENU_USEKEY = 0xC +}; + /// not really enum RenderMode { RENDER_MODE_SURF_SOLID_AA_ZB_LAYER0 = 0x00000000, diff --git a/include/evt.h b/include/evt.h index be17374b2b..c917031d99 100644 --- a/include/evt.h +++ b/include/evt.h @@ -139,4 +139,11 @@ typedef s32 ApiStatus; #define ApiStatus_REPEAT 3 /* Call again immediately */ #define ApiStatus_FINISH 255 /* Corresponds to EVT_FINISH */ +typedef enum EventGroup { + EVT_GROUP_0 = 0x00, + EVT_GROUP_B = 0x0B, + EVT_GROUP_1B = 0x1B, + EVT_GROUP_EF = 0xEF +} EventGroup; + #endif diff --git a/include/functions.h b/include/functions.h index 3fca704659..f3086a245e 100644 --- a/include/functions.h +++ b/include/functions.h @@ -215,7 +215,6 @@ void phys_init_integrator_for_current_state(void); void phys_player_land(void); void phys_main_collision_below(void); -void create_popup_menu(PopupMenu*); s32 npc_test_move_simple_without_slipping(s32, f32*, f32*, f32*, f32, f32, f32, f32); void update_collider_transform(s16 colliderID); diff --git a/include/script_api/common.h b/include/script_api/common.h index 816ca6bfb8..60820c0d5a 100644 --- a/include/script_api/common.h +++ b/include/script_api/common.h @@ -161,7 +161,6 @@ ApiStatus SwitchMessage(Evt* script, s32 isInitialCall); ApiStatus ShowChoice(Evt* script, s32 isInitialCall); ApiStatus CloseChoice(Evt* script, s32 isInitialCall); ApiStatus CancelMessage(Evt* script, s32 isInitialCall); -ApiStatus CancelMessageAndBlock(void); // ??? ApiStatus SetMessageImages(Evt* script, s32 isInitialCall); ApiStatus SetMessageMsg(Evt* script, s32 isInitialCall); ApiStatus SetMessageValue(Evt* script, s32 isInitialCall); diff --git a/include/script_api/macros.h b/include/script_api/macros.h index bece5d84c4..bbdaeb76a1 100644 --- a/include/script_api/macros.h +++ b/include/script_api/macros.h @@ -520,7 +520,7 @@ #define EXIT_WALK_SCRIPT(walkDistance, exitIdx, map, entryIdx) \ { \ - EVT_SET_GROUP(0x1B) \ + EVT_SET_GROUP(EVT_GROUP_1B) \ EVT_CALL(UseExitHeading, walkDistance, exitIdx) \ EVT_EXEC(ExitWalk) \ EVT_CALL(GotoMap, EVT_PTR(map), entryIdx) \ diff --git a/src/3251D0.c b/src/3251D0.c index 915348dc37..68fb84b08c 100644 --- a/src/3251D0.c +++ b/src/3251D0.c @@ -107,7 +107,7 @@ ApiStatus func_802C03E8(Evt* script, s32 isInitialCall) { } EvtScript D_802C0410 = { - EVT_SET_GROUP(0) + EVT_SET_GROUP(EVT_GROUP_0) EVT_CALL(SetPlayerAnimation, ANIM_GOT_ITEM) EVT_CALL(GetPlayerPos, LW(0), LW(1), LW(2)) EVT_ADD(LW(1), 45) @@ -149,7 +149,7 @@ EvtScript D_802C0560 = { }; EvtScript D_802C05CC_32579C = { - EVT_SET_GROUP(0) + EVT_SET_GROUP(EVT_GROUP_0) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(GetCurrentPartner, LW(0)) EVT_IF_NE(LW(0), 0) diff --git a/src/C50A0.c b/src/C50A0.c index 2785198bbc..1a30628ce4 100644 --- a/src/C50A0.c +++ b/src/C50A0.c @@ -195,7 +195,7 @@ void update_item_entities(void) { s32 coin; s32 i; - if (!(gOverrideFlags & 0xC00)) { + if (!(gOverrideFlags & (GLOBAL_OVERRIDES_400 | GLOBAL_OVERRIDES_800))) { for (i = 0; i < 0x100; i++) { entity = D_801565A0[i]; @@ -287,11 +287,11 @@ void draw_item_entities(void) { for (i = 0; i < MAX_ITEM_ENTITIES; i++) { ItemEntity* itemEntity = D_801565A0[i]; - if (itemEntity != NULL && itemEntity->flags != 0 && !(itemEntity->flags & 0x40) && - (itemEntity->flags & (1 << gCurrentCamID)) && !(itemEntity->flags & 0x100000) && + if (itemEntity != NULL && itemEntity->flags != 0 && !(itemEntity->flags & ITEM_ENTITY_FLAGS_40) && + (itemEntity->flags & (1 << gCurrentCamID)) && !(itemEntity->flags & ITEM_ENTITY_FLAGS_100000) && !(itemEntity->unk_1D != -1 && D_80155D88 != itemEntity->unk_1D)) { - if (!(itemEntity->flags & 0x80000)) { + if (!(itemEntity->flags & ITEM_ENTITY_FLAGS_TRANSPARENT)) { rtPtr->renderMode = RENDER_MODE_ALPHATEST; } else { rtPtr->renderMode = RENDER_MODE_SURFACE_XLU_LAYER1; diff --git a/src/EC9D00.c b/src/EC9D00.c index 5160ae44ed..9d0afde07b 100644 --- a/src/EC9D00.c +++ b/src/EC9D00.c @@ -7,35 +7,4 @@ #define gPartnerActionStatus dead_gPartnerActionStatus2 -#include "world/common/SetOverrideFlags_40.inc.c" - -#include "world/common/UnkFunc17.inc.c" - -ApiStatus func_8024003C_EC9D3C(Evt* script, s32 isInitialCall) { - func_802F3B00(evt_get_variable(script, *script->ptrReadPos)); - return ApiStatus_DONE2; -} - -#include "world/common/UnkFunc18.inc.c" - -INCLUDE_ASM(s32, "EC9D00", func_802401CC_EC9ECC); - -#include "world/common/SwitchToPartner.inc.c" - -#include "world/common/UnkFunc19.inc.c" - -#include "world/common/UnkFunc20.inc.c" - -#include "world/common/UnkFunc39.inc.c" - -#include "world/common/UnkFunc21.inc.c" - -#include "world/common/UnkFunc22.inc.c" - -#include "world/common/UnkFunc60.inc.c" - -#include "world/common/UnkFunc23.inc.c" - -#include "world/common/UnkPartnerPosFuncs.inc.c" - -#include "world/common/UnkFunc40.inc.c" +#include "world/common/atomic/SuperBlock.inc.c" diff --git a/src/ED8E20.c b/src/ED8E20.c index 7c43a4fc39..1131d03dcc 100644 --- a/src/ED8E20.c +++ b/src/ED8E20.c @@ -5,16 +5,19 @@ #define NAMESPACE ED8E20 -#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" +ApiStatus N(DeadPipe_SetAnimFlag)(Evt* script, s32 isInitialCall) { + gPlayerStatusPtr->animFlags |= PLAYER_STATUS_ANIM_FLAGS_100000; + return ApiStatus_DONE2; +} -// Variation of GetCurrentFloor that is non-equivalent -ApiStatus N(DeadGetCurrentFloor)(Evt* script, s32 isInitialCall) { +// Variation of Pipe_GetCurrentFloor that is non-equivalent +ApiStatus N(DeadPipe_GetCurrentFloor)(Evt* script, s32 isInitialCall) { script->varTable[0] = dead_gCollisionStatus.pushingAgainstWall; return ApiStatus_DONE2; } -// Variation of UnkFunc25 that is non-equivalent -ApiStatus N(DeadUnkFunc25)(Evt* script, s32 isInitialCall) { +// Variation of Pipe_AwaitDownInput that is non-equivalent +ApiStatus N(DeadPipe_AwaitDownInput)(Evt* script, s32 isInitialCall) { CollisionStatus* collisionStatus = &gCollisionStatus; s32 stickX, stickY; @@ -36,8 +39,8 @@ ApiStatus N(DeadUnkFunc25)(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -// Variation of GetEntryPos with a debug print at the end -ApiStatus N(DeadGetEntryPos)(Evt* script, s32 isInitialCall) { +// Variation of Pipe_GetEntryPos with a debug print at the end +ApiStatus N(DeadPipe_GetEntryPos)(Evt* script, s32 isInitialCall) { MapConfig* mapConfig = get_current_map_header(); s32 index = evt_get_variable(script, EVT_VAR(0)); @@ -49,9 +52,25 @@ ApiStatus N(DeadGetEntryPos)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -#include "world/common/GetCurrentCameraYawClamped180.inc.c" +ApiStatus N(DeadPipe_GetCameraYaw)(Evt* script, s32 isInitialCall) { + script->varTable[0] = clamp_angle(gCameras[gCurrentCameraID].currentYaw + 180.0f); + return ApiStatus_DONE2; +} -#include "world/common/SomeXYZFunc2.inc.c" +ApiStatus N(DeadPipe_GetPointAheadOfPlayer)(Evt* script, s32 isInitialStatus) { + PlayerStatus* playerStatus = &gPlayerStatus; + f32 r = evt_get_float_variable(script, *script->ptrReadPos); + f32 x = playerStatus->position.x; + f32 y = playerStatus->position.y; + f32 z = playerStatus->position.z; + + add_vec2D_polar(&x, &z, r, playerStatus->targetYaw); + evt_set_float_variable(script, EVT_VAR(0), x); + evt_set_float_variable(script, EVT_VAR(1), y); + evt_set_float_variable(script, EVT_VAR(2), z); + + return ApiStatus_DONE2; +} ApiStatus func_80240318_ED9138(Evt* script, s32 isInitialCall) { dead_fx_sun(0, 0, 0, 0, 0, 0); diff --git a/src/EED1E0.c b/src/EED1E0.c index 48aeb9e4c5..98e554768e 100644 --- a/src/EED1E0.c +++ b/src/EED1E0.c @@ -7,37 +7,6 @@ #define gPartnerActionStatus dead_gPartnerActionStatus2 -#include "world/common/SetOverrideFlags_40.inc.c" - -#include "world/common/UnkFunc17.inc.c" - -ApiStatus func_8024011C_EED21C(Evt* script, s32 isInitialCall) { - func_802F3B00(evt_get_variable(script, *script->ptrReadPos)); - return ApiStatus_DONE2; -} - -#include "world/common/UnkFunc18.inc.c" - -INCLUDE_ASM(s32, "EED1E0", func_802402AC_EED3AC); - -#include "world/common/SwitchToPartner.inc.c" - -#include "world/common/UnkFunc19.inc.c" - -#include "world/common/UnkFunc20.inc.c" - -#include "world/common/UnkFunc39.inc.c" - -#include "world/common/UnkFunc21.inc.c" - -#include "world/common/UnkFunc22.inc.c" - -#include "world/common/UnkFunc60.inc.c" - -#include "world/common/UnkFunc23.inc.c" - -#include "world/common/UnkPartnerPosFuncs.inc.c" - -#include "world/common/UnkFunc40.inc.c" +#include "world/common/atomic/SuperBlock.inc.c" #include "world/common/UnkFunc44.inc.c" diff --git a/src/battle/area_trd_part_2/actor/fake_bowser.c b/src/battle/area_trd_part_2/actor/fake_bowser.c index 47d3264d9f..93e6cdbf21 100644 --- a/src/battle/area_trd_part_2/actor/fake_bowser.c +++ b/src/battle/area_trd_part_2/actor/fake_bowser.c @@ -405,7 +405,7 @@ EvtScript N(8021B0E4) = { EVT_USE_ARRAY(D_80235FC0) EVT_CALL(N(StartRumbleWithParams), 256, 30) EVT_THREAD - EVT_SET_GROUP(0) + EVT_SET_GROUP(EVT_GROUP_0) EVT_CALL(ShakeCam, 1, 0, 20, EVT_FLOAT(3.0)) EVT_END_THREAD EVT_CALL(SetPartFlagBits, ACTOR_SELF, 5, ACTOR_PART_FLAG_100000, 1) @@ -431,35 +431,35 @@ EvtScript N(8021B0E4) = { EVT_WAIT_FRAMES(30) EVT_CALL(PlaySoundAtModel, 15, 482, 0) EVT_THREAD - EVT_SET_GROUP(0) + EVT_SET_GROUP(EVT_GROUP_0) EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(1.0)) EVT_END_THREAD EVT_CALL(N(StartRumbleWithParams), 100, 20) EVT_WAIT_FRAMES(20) EVT_CALL(PlaySoundAtModel, 11, 482, 0) EVT_THREAD - EVT_SET_GROUP(0) + EVT_SET_GROUP(EVT_GROUP_0) EVT_CALL(ShakeCam, 1, 0, 10, EVT_FLOAT(1.5)) EVT_END_THREAD EVT_CALL(N(StartRumbleWithParams), 150, 20) EVT_WAIT_FRAMES(30) EVT_CALL(PlaySoundAtModel, 9, 482, 0) EVT_THREAD - EVT_SET_GROUP(0) + EVT_SET_GROUP(EVT_GROUP_0) EVT_CALL(ShakeCam, 1, 0, 10, EVT_FLOAT(1.0)) EVT_END_THREAD EVT_CALL(N(StartRumbleWithParams), 100, 20) EVT_WAIT_FRAMES(30) EVT_CALL(PlaySoundAtModel, 31, 482, 0) EVT_THREAD - EVT_SET_GROUP(0) + EVT_SET_GROUP(EVT_GROUP_0) EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(0.7)) EVT_END_THREAD EVT_CALL(N(StartRumbleWithParams), 70, 20) EVT_WAIT_FRAMES(20) EVT_CALL(PlaySoundAtModel, 25, 482, 0) EVT_THREAD - EVT_SET_GROUP(0) + EVT_SET_GROUP(EVT_GROUP_0) EVT_CALL(ShakeCam, 1, 0, 10, EVT_FLOAT(1.0)) EVT_END_THREAD EVT_CALL(N(StartRumbleWithParams), 100, 20) @@ -467,12 +467,12 @@ EvtScript N(8021B0E4) = { EVT_CALL(PlaySoundAtModel, 43, 482, 0) EVT_CALL(N(StartRumbleWithParams), 60, 20) EVT_THREAD - EVT_SET_GROUP(0) + EVT_SET_GROUP(EVT_GROUP_0) EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(0.6)) EVT_END_THREAD EVT_WAIT_FRAMES(20) EVT_THREAD - EVT_SET_GROUP(0) + EVT_SET_GROUP(EVT_GROUP_0) EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(0.3)) EVT_END_THREAD EVT_CALL(N(StartRumbleWithParams), 30, 20) diff --git a/src/evt/cam_api.c b/src/evt/cam_api.c index 9c86e42e45..43cf5bb7b3 100644 --- a/src/evt/cam_api.c +++ b/src/evt/cam_api.c @@ -2,14 +2,14 @@ #include "camera.h" EvtScript ShakeCam1 = { - EVT_SET_GROUP(0) + EVT_SET_GROUP(EVT_GROUP_0) EVT_CALL(ShakeCam, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_FIXED(1.0)) EVT_RETURN EVT_END }; EvtScript ShakeCamX = { - EVT_SET_GROUP(0) + EVT_SET_GROUP(EVT_GROUP_0) EVT_CALL(ShakeCam, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(3)) EVT_RETURN EVT_END diff --git a/src/evt/msg_api.c b/src/evt/msg_api.c index 2fd78ed6ee..236ab54b28 100644 --- a/src/evt/msg_api.c +++ b/src/evt/msg_api.c @@ -143,10 +143,9 @@ ApiStatus CancelMessage(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -// XXX: possibly not an api function and should be renamed accordingly -ApiStatus CancelMessageAndBlock(void) { +s32 cancel_current_message(void) { cancel_message(gCurrentPrintContext); - return ApiStatus_BLOCK; + return 0; } ApiStatus SetMessageImages(Evt* script, s32 isInitialCall) { diff --git a/src/hud_element.h b/src/hud_element.h index 54c4ced029..6799a0f388 100644 --- a/src/hud_element.h +++ b/src/hud_element.h @@ -105,6 +105,45 @@ enum { HUD_ELEMENT_DRAW_FIRST_WITHOUT_CLIPPING = 2, }; +typedef struct PopupMenu { + /* 0x000 */ HudScript* ptrIcon[32]; + /* 0x080 */ char unk_80[0x4]; + /* 0x084 */ s32 nameMsg[32]; + /* 0x104 */ char unk_104[0x4]; + /* 0x108 */ s32 userIndex[32]; // used to map menu order to a user-ID for each item + /* 0x188 */ char unk_188[0x4]; + /* 0x18C */ s32 enabled[32]; + /* 0x20C */ char unk_20C[0x4]; + /* 0x210 */ s32 value[32]; // sale price, etc + /* 0x290 */ char unk_290[0x4]; + /* 0x294 */ s32 descMsg[32]; + /* 0x314 */ char unk_314[0x4]; + /* 0x318 */ s32 popupType; // C = keys + /* 0x31C */ s32 unk_31C; + /* 0x320 */ s32 unk_320; + /* 0x324 */ s32 numEntries; + /* 0x328 */ s32 initialPos; + /* 0x32C */ s16 result; + /* 0x32E */ char unk_32E[0x2]; +} PopupMenu; // size = 0x330 + +typedef struct Shop { + /* 0x000 */ s16 flags; + /* 0x002 */ s16 numItems; + /* 0x004 */ s16 numSpecialPrices; + /* 0x006 */ char unk_06[0x2]; + /* 0x008 */ s32 currentItemSlot; + /* 0x00C */ s32 selectedStoreItemSlot; + /* 0x010 */ ShopOwner* owner; + /* 0x014 */ ShopItemLocation* ItemDataPositions; + /* 0x018 */ ShopItemData* staticInventory; + /* 0x01C */ ShopSellPriceData* staticPriceList; + /* 0x020 */ s32 costIconID; + /* 0x024 */ s32 inventoryItemFlags; + /* 0x028 */ PopupMenu itemSelectMenu; + /* 0x358 */ s32 unk_358; +} Shop; // size = 0x35C + typedef struct HudScriptPair { /* 0x00 */ HudScript* enabled; /* 0x04 */ HudScript* disabled; @@ -284,4 +323,7 @@ void copy_world_hud_element_ref_to_battle(s32 worldID, s32 battleID); void hud_element_set_aux_cache(void* base, s32 size); + +void create_popup_menu(PopupMenu*); + #endif diff --git a/src/msg.c b/src/msg.c index 1cdf4e1a61..df5dbdb975 100644 --- a/src/msg.c +++ b/src/msg.c @@ -703,51 +703,51 @@ MessagePrintState* msg_get_printer_for_msg(s32 msgID, s32* donePrintingWriteback return _msg_get_printer_for_msg(msgID, donePrintingWriteback, 0); } -#ifdef NON_EQUIVALENT MessagePrintState* _msg_get_printer_for_msg(s32 msgID, s32* donePrintingWriteback, s32 arg2) { - if (msgID != 0) { - s8* srcBuffer = (s8*) msgID; - s32 i; + MessagePrintState* printer; + s8* srcBuffer; + s32 height; + s32 width; + s32 maxLineChars; + s32 numLines; + s32 maxLinesPerPage; + s32 i; - if (msgID >= 0) { - srcBuffer = load_message_to_buffer(srcBuffer); - } + if (msgID == 0) { + return NULL; + } + + srcBuffer = (s8*) msgID; + if (msgID >= 0) { + srcBuffer = load_message_to_buffer((s32)srcBuffer); + } - for (i = 0; i < ARRAY_COUNT(gMessagePrinters); i++) { - MessagePrintState* printer = &gMessagePrinters[i]; + for (i = 0; i < ARRAY_COUNT(gMessagePrinters); i++) { + printer = &gMessagePrinters[i]; - if (!(printer->stateFlags & 2)) { - s32 height; - s32 width; - s32 maxLineChars; - s32 numLines; - s32 maxLinesPerPage; + if (!(printer->stateFlags & MSG_STATE_FLAG_2)) { + initialize_printer(printer, 1, arg2); + printer->windowState = MSG_WINDOW_STATE_INIT; + printer->srcBuffer = srcBuffer; + printer->msgID = msgID; + printer->stateFlags |= MSG_STATE_FLAG_2; + get_msg_properties(msgID, &height, &width, &maxLineChars, &numLines, &maxLinesPerPage, NULL, 0); + printer->msgHeight = height; + printer->msgWidth = width; + printer->maxLineChars = maxLineChars; + printer->numLines = numLines; + printer->maxLinesPerPage = maxLinesPerPage; + printer->closedWritebackBool = donePrintingWriteback; - initialize_printer(printer, 1, arg2); - printer->windowState = MSG_WINDOW_STATE_INIT; - printer->srcBuffer = srcBuffer; - printer->msgID = msgID; - printer->stateFlags |= 2; - get_msg_properties(msgID, &height, &width, &maxLineChars, &numLines, &maxLinesPerPage, NULL, 0); - printer->msgHeight = height; - printer->msgWidth = width; - printer->maxLineChars = maxLineChars; - printer->numLines = numLines; - printer->maxLinesPerPage = maxLinesPerPage; - printer->closedWritebackBool = donePrintingWriteback; - - if (donePrintingWriteback != NULL) { - *donePrintingWriteback = FALSE; - } - return printer; + if (donePrintingWriteback != NULL) { + *donePrintingWriteback = FALSE; } + return printer; } } + return NULL; } -#else -INCLUDE_ASM(MessagePrintState*, "msg", _msg_get_printer_for_msg, s32 msgID, s32* donePrintingWriteback, s32 arg2); -#endif s32 msg_printer_load_msg(s32 msgID, MessagePrintState* printer) { s8* buffer; @@ -1042,7 +1042,25 @@ void msg_draw_rewind_arrow(s32 printerIndex) { INCLUDE_ASM(s32, "msg", msg_draw_choice_pointer); -INCLUDE_ASM(s32, "msg", draw_digit); +void draw_digit(u32 img, s32 charset, s32 posX, s32 posY) { + MessageNumber* num = &gMsgNumbers[charset]; + + gDPLoadTextureTile_4b(gMasterGfxPos++, + img, G_IM_FMT_CI, + num->texWidth , num->texHeight, + 0, 0, + num->texWidth - 1, num->texHeight - 1, + 0, + G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, + G_TX_NOMASK, G_TX_NOMASK, + G_TX_NOLOD, G_TX_NOLOD); + gSPTextureRectangle(gMasterGfxPos++, + 4 * posX, 4 * posY, + 4 * (posX + num->texWidth), 4 * (posY + num->texHeight), + G_TX_RENDERTILE, + 0, 0, + 1 << 10, 1 << 10); +} INCLUDE_ASM(void, "msg", draw_number, s32 value, s32 x, s32 y, s32 arg3, s32 palette, s32 opacity, s32 style); diff --git a/src/world/area_arn/arn_07/BECDF0.c b/src/world/area_arn/arn_07/BECDF0.c index 36162ba9a3..4231d95575 100644 --- a/src/world/area_arn/arn_07/BECDF0.c +++ b/src/world/area_arn/arn_07/BECDF0.c @@ -148,7 +148,7 @@ EvtScript N(80242498) = { }; EvtScript N(exitSingleDoor_802428D4) = { - EVT_SET_GROUP(27) + EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(DisablePlayerInput, TRUE) EVT_SET(EVT_VAR(0), 0) EVT_SET(EVT_VAR(1), 10) diff --git a/src/world/area_arn/arn_07/events.c b/src/world/area_arn/arn_07/events.c index c513d5eea1..ab1c062335 100644 --- a/src/world/area_arn/arn_07/events.c +++ b/src/world/area_arn/arn_07/events.c @@ -51,7 +51,7 @@ EvtScript N(802437AC) = { }; EvtScript N(802439B0) = { - EVT_SET_GROUP(0) + EVT_SET_GROUP(EVT_GROUP_0) EVT_CALL(SetTimeFreezeMode, 1) EVT_CALL(ShowKeyChoicePopup) EVT_IF_EQ(EVT_VAR(0), 0) diff --git a/src/world/area_arn/arn_08/events.c b/src/world/area_arn/arn_08/events.c index 7aab3a2d6a..a1e8aedef3 100644 --- a/src/world/area_arn/arn_08/events.c +++ b/src/world/area_arn/arn_08/events.c @@ -11,7 +11,7 @@ enum { }; EvtScript N(802403B0) = { - EVT_SET_GROUP(27) + EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(ClearDefeatedEnemies) EVT_SET(EVT_VAR(0), 0) diff --git a/src/world/area_arn/arn_09/events.c b/src/world/area_arn/arn_09/events.c index 4dd322d622..c3c1047e8f 100644 --- a/src/world/area_arn/arn_09/events.c +++ b/src/world/area_arn/arn_09/events.c @@ -4,7 +4,7 @@ extern s32 D_000001E4; EvtScript N(80240140) = { - EVT_SET_GROUP(27) + EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(DisablePlayerInput, TRUE) EVT_SET(EVT_VAR(0), 0) EVT_SET(EVT_VAR(1), 5) diff --git a/src/world/area_arn/arn_10/events.c b/src/world/area_arn/arn_10/events.c index cadbf66d2c..ce10dd9735 100644 --- a/src/world/area_arn/arn_10/events.c +++ b/src/world/area_arn/arn_10/events.c @@ -3,7 +3,7 @@ #include "sprite/npc/goomba.h" EvtScript N(exitSingleDoor_80240100) = { - EVT_SET_GROUP(27) + EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(DisablePlayerInput, TRUE) EVT_SET(EVT_VAR(0), 0) EVT_SET(EVT_VAR(1), 6) @@ -18,7 +18,7 @@ EvtScript N(exitSingleDoor_80240100) = { }; EvtScript N(exitSingleDoor_802401A4) = { - EVT_SET_GROUP(27) + EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(DisablePlayerInput, TRUE) EVT_SET(EVT_VAR(0), 1) EVT_SET(EVT_VAR(1), 11) diff --git a/src/world/area_arn/arn_11/events.c b/src/world/area_arn/arn_11/events.c index 71de8732f1..db9113b236 100644 --- a/src/world/area_arn/arn_11/events.c +++ b/src/world/area_arn/arn_11/events.c @@ -56,7 +56,7 @@ EvtScript N(802401BC) = { }; EvtScript N(exitSingleDoor_80240428) = { - EVT_SET_GROUP(27) + EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(DisablePlayerInput, TRUE) EVT_SET(EVT_VAR(0), 0) EVT_SET(EVT_VAR(1), 2) diff --git a/src/world/area_arn/arn_12/events.c b/src/world/area_arn/arn_12/events.c index 31a72086b1..fabcf8304d 100644 --- a/src/world/area_arn/arn_12/events.c +++ b/src/world/area_arn/arn_12/events.c @@ -3,7 +3,7 @@ #include "sprite/npc/goomba.h" EvtScript N(exitSingleDoor_80240100) = { - EVT_SET_GROUP(27) + EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(DisablePlayerInput, TRUE) EVT_SET(EVT_VAR(0), 0) EVT_SET(EVT_VAR(1), 2) @@ -18,7 +18,7 @@ EvtScript N(exitSingleDoor_80240100) = { }; EvtScript N(exitSingleDoor_802401A4) = { - EVT_SET_GROUP(27) + EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(DisablePlayerInput, TRUE) EVT_SET(EVT_VAR(0), 1) EVT_SET(EVT_VAR(1), 7) diff --git a/src/world/area_arn/arn_13/events.c b/src/world/area_arn/arn_13/events.c index 9e184dd0dc..b818d6ee25 100644 --- a/src/world/area_arn/arn_13/events.c +++ b/src/world/area_arn/arn_13/events.c @@ -3,7 +3,7 @@ #include "sprite/npc/tubbas_heart.h" EvtScript N(exitSingleDoor_80240100) = { - EVT_SET_GROUP(27) + EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(DisablePlayerInput, TRUE) EVT_SET(EVT_VAR(0), 0) EVT_SET(EVT_VAR(1), 2) @@ -18,7 +18,7 @@ EvtScript N(exitSingleDoor_80240100) = { }; EvtScript N(exitSingleDoor_802401A4) = { - EVT_SET_GROUP(27) + EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(DisablePlayerInput, TRUE) EVT_SET(EVT_VAR(0), 1) EVT_SET(EVT_VAR(1), 7) diff --git a/src/world/area_dgb/dgb_00/BFA0A0.c b/src/world/area_dgb/dgb_00/BFA0A0.c index 26ea20e601..084cc4ff32 100644 --- a/src/world/area_dgb/dgb_00/BFA0A0.c +++ b/src/world/area_dgb/dgb_00/BFA0A0.c @@ -42,7 +42,7 @@ static s32 N(pad_1B8)[] = { EvtScript N(exitWalk_802401C0) = EXIT_WALK_SCRIPT(60, 0, "arn_04", 1); EvtScript N(exitDoubleDoor_8024021C) = { - EVT_SET_GROUP(27) + EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 3) EVT_SET(EVT_VAR(0), 1) diff --git a/src/world/area_dgb/dgb_00/BFA100.c b/src/world/area_dgb/dgb_00/BFA100.c index 9faa1b2a3e..9b8501704c 100644 --- a/src/world/area_dgb/dgb_00/BFA100.c +++ b/src/world/area_dgb/dgb_00/BFA100.c @@ -216,7 +216,7 @@ EvtScript N(80240DDC) = { }; EvtScript N(80240F50) = { - EVT_SET_GROUP(239) + EVT_SET_GROUP(EVT_GROUP_EF) EVT_LOOP(0) EVT_CALL(RandInt, 50, EVT_VAR(0)) EVT_ADD(EVT_VAR(0), 80) diff --git a/src/world/area_dgb/dgb_01/BFD9A0.c b/src/world/area_dgb/dgb_01/BFD9A0.c index 9e7b3e632a..da8243a17d 100644 --- a/src/world/area_dgb/dgb_01/BFD9A0.c +++ b/src/world/area_dgb/dgb_01/BFD9A0.c @@ -41,7 +41,7 @@ static s32 N(pad_3548)[] = { }; EvtScript N(exitDoubleDoor_80243550) = { - EVT_SET_GROUP(27) + EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 3) EVT_SET(EVT_VAR(0), 0) @@ -57,7 +57,7 @@ EvtScript N(exitDoubleDoor_80243550) = { }; EvtScript N(exitDoubleDoor_80243604) = { - EVT_SET_GROUP(27) + EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 3) EVT_SET(EVT_VAR(0), 1) @@ -73,7 +73,7 @@ EvtScript N(exitDoubleDoor_80243604) = { }; EvtScript N(exitDoubleDoor_802436B8) = { - EVT_SET_GROUP(27) + EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 3) EVT_SET(EVT_VAR(0), 2) @@ -89,7 +89,7 @@ EvtScript N(exitDoubleDoor_802436B8) = { }; EvtScript N(exitDoubleDoor_8024376C) = { - EVT_SET_GROUP(27) + EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 3) EVT_SET(EVT_VAR(0), 3) @@ -105,7 +105,7 @@ EvtScript N(exitDoubleDoor_8024376C) = { }; EvtScript N(exitDoubleDoor_80243820) = { - EVT_SET_GROUP(27) + EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 3) EVT_SET(EVT_VAR(0), 4) @@ -121,7 +121,7 @@ EvtScript N(exitDoubleDoor_80243820) = { }; EvtScript N(exitDoubleDoor_802438D4) = { - EVT_SET_GROUP(27) + EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 3) EVT_SET(EVT_VAR(0), 5) @@ -137,7 +137,7 @@ EvtScript N(exitDoubleDoor_802438D4) = { }; EvtScript N(exitDoubleDoor_80243988) = { - EVT_SET_GROUP(27) + EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 3) EVT_SET(EVT_VAR(0), 6) @@ -434,7 +434,7 @@ EvtScript N(802449C4) = { }; EvtScript N(80244AD0) = { - EVT_SET_GROUP(0) + EVT_SET_GROUP(EVT_GROUP_0) EVT_SUSPEND_GROUP(1) EVT_CALL(ShowKeyChoicePopup) EVT_IF_EQ(EVT_VAR(0), 0) @@ -861,7 +861,7 @@ EvtScript N(npcAI_80244D54) = { EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(func_802D2B6C) EVT_CALL(DisablePartnerAI, 0) - EVT_SET_GROUP(0) + EVT_SET_GROUP(EVT_GROUP_0) EVT_CALL(SetTimeFreezeMode, 1) EVT_CALL(GetPlayerPos, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_ADD(EVT_VAR(1), 20) diff --git a/src/world/area_dgb/dgb_02/C2EBA0.c b/src/world/area_dgb/dgb_02/C2EBA0.c index 33d350853f..e74cae8445 100644 --- a/src/world/area_dgb/dgb_02/C2EBA0.c +++ b/src/world/area_dgb/dgb_02/C2EBA0.c @@ -43,7 +43,7 @@ static s32 N(pad_1548)[] = { }; EvtScript N(exitDoubleDoor_80241550) = { - EVT_SET_GROUP(27) + EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 3) EVT_SET(EVT_VAR(0), 0) @@ -59,7 +59,7 @@ EvtScript N(exitDoubleDoor_80241550) = { }; EvtScript N(exitDoubleDoor_80241604) = { - EVT_SET_GROUP(27) + EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 3) EVT_SET(EVT_VAR(0), 1) @@ -75,7 +75,7 @@ EvtScript N(exitDoubleDoor_80241604) = { }; EvtScript N(exitSingleDoor_802416B8) = { - EVT_SET_GROUP(27) + EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 0) EVT_SET(EVT_VAR(0), 2) @@ -91,7 +91,7 @@ EvtScript N(exitSingleDoor_802416B8) = { }; EvtScript N(exitSingleDoor_8024176C) = { - EVT_SET_GROUP(27) + EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 0) EVT_SET(EVT_VAR(0), 3) diff --git a/src/world/area_dgb/dgb_03/C31730.c b/src/world/area_dgb/dgb_03/C31730.c index 939f97d210..5cab6b1e95 100644 --- a/src/world/area_dgb/dgb_03/C31730.c +++ b/src/world/area_dgb/dgb_03/C31730.c @@ -47,7 +47,7 @@ static s32 N(pad_2908)[] = { }; EvtScript N(exitDoubleDoor_80242910) = { - EVT_SET_GROUP(27) + EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 3) EVT_SET(EVT_VAR(0), 1) @@ -63,7 +63,7 @@ EvtScript N(exitDoubleDoor_80242910) = { }; EvtScript N(exitDoubleDoor_802429C4) = { - EVT_SET_GROUP(27) + EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 3) EVT_SET(EVT_VAR(0), 4) @@ -79,7 +79,7 @@ EvtScript N(exitDoubleDoor_802429C4) = { }; EvtScript N(exitDoubleDoor_80242A78) = { - EVT_SET_GROUP(27) + EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 3) EVT_SET(EVT_VAR(0), 0) @@ -97,7 +97,7 @@ EvtScript N(exitDoubleDoor_80242A78) = { EvtScript N(exitWalk_80242B2C) = EXIT_WALK_SCRIPT(26, 2, "dgb_13", 0); EvtScript N(exitSingleDoor_80242B88) = { - EVT_SET_GROUP(27) + EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 0) EVT_SET(EVT_VAR(0), 2) @@ -113,7 +113,7 @@ EvtScript N(exitSingleDoor_80242B88) = { }; EvtScript N(exitDoubleDoor_80242C3C) = { - EVT_SET_GROUP(27) + EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 3) EVT_SET(EVT_VAR(0), 3) @@ -212,7 +212,7 @@ static s32 N(pad_30D8)[] = { }; EvtScript N(802430E0) = { - EVT_SET_GROUP(0) + EVT_SET_GROUP(EVT_GROUP_0) EVT_LOOP(20) EVT_CALL(GetCurrentPartner, EVT_VAR(10)) EVT_IF_NE(EVT_VAR(10), 0) @@ -345,7 +345,7 @@ static s32 N(pad_3738)[] = { }; EvtScript N(80243740) = { - EVT_SET_GROUP(0) + EVT_SET_GROUP(EVT_GROUP_0) EVT_SUSPEND_GROUP(1) EVT_CALL(ShowKeyChoicePopup) EVT_IF_EQ(EVT_VAR(0), 0) diff --git a/src/world/area_dgb/dgb_04/C36530.c b/src/world/area_dgb/dgb_04/C36530.c index 8323cf7941..0ef3a8cb5b 100644 --- a/src/world/area_dgb/dgb_04/C36530.c +++ b/src/world/area_dgb/dgb_04/C36530.c @@ -4,9 +4,6 @@ #include "sprite/npc/sentinel.h" #include "message_ids.h" -extern s32 wPartnerHudScripts[]; -extern s32 wDisabledPartnerHudScripts[]; - enum { NPC_SENTINEL, }; @@ -41,7 +38,7 @@ static s32 N(pad_3208)[] = { }; EvtScript N(exitSingleDoor_80243210) = { - EVT_SET_GROUP(27) + EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 0) EVT_SET(EVT_VAR(0), 0) @@ -57,7 +54,7 @@ EvtScript N(exitSingleDoor_80243210) = { }; EvtScript N(exitDoubleDoor_802432C4) = { - EVT_SET_GROUP(27) + EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 3) EVT_SET(EVT_VAR(0), 1) @@ -160,7 +157,7 @@ EvtScript N(npcAI_802435E4) = { EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(func_802D2B6C) EVT_CALL(DisablePartnerAI, 0) - EVT_SET_GROUP(0) + EVT_SET_GROUP(EVT_GROUP_0) EVT_CALL(SetTimeFreezeMode, 1) EVT_CALL(GetPlayerPos, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_ADD(EVT_VAR(1), 20) @@ -272,147 +269,13 @@ NpcGroupList N(npcGroupList_80243D18) = { {}, }; -s32 N(D_80243D30_C3A260)[] = { - 0x001D00F0, 0x001D00F1, -}; - -s16 N(D_80243D38_C3A268)[] = { - 0x0001, 0x0002, 0x0003, 0x0004, - 0x0009, 0x0006, 0x0007, 0x0008 -}; - -s32 N(D_80243D48_C3A278)[8][2] = { - { 0x001D00E0, 0x001D00E1 }, { 0x001D00E2, 0x001D00E3 }, - { 0x001D00E4, 0x001D00E5 }, { 0x001D00E6, 0x001D00E7 }, - { 0x001D00E8, 0x001D00E9 }, { 0x001D00EA, 0x001D00EB }, - { 0x001D00EC, 0x001D00ED }, { 0x001D00EE, 0x001D00EF } -}; - -f32 N(bigFuncFloats)[] = { - 140.0f, 180.0f, 220.0f -}; - -EvtScript N(80243D94) = { - EVT_WAIT_FRAMES(10) - EVT_CALL(PlaySound, 0x212D) - EVT_CALL(N(UnkFunc21), EVT_MAP_VAR(0)) - EVT_WAIT_FRAMES(85) - EVT_THREAD - EVT_CALL(PlaySound, 0x212E) - EVT_CALL(N(func_80242F08_C39438), 70, 70) - EVT_WAIT_FRAMES(27) - EVT_CALL(PlaySound, SOUND_208E) - EVT_CALL(N(func_80242F08_C39438), 50, 50) - EVT_END_THREAD - EVT_THREAD - EVT_WAIT_FRAMES(3) - EVT_CALL(N(func_8024240C_C3893C), EVT_MAP_VAR(0)) - EVT_END_THREAD - EVT_THREAD - EVT_WAIT_FRAMES(47) - EVT_CALL(N(UnkFunc22)) - EVT_CALL(N(UnkPartnerPosFunc)) - EVT_WAIT_FRAMES(5) - EVT_CALL(N(UnkPartnerPosFunc2)) - EVT_WAIT_FRAMES(5) - EVT_CALL(N(UnkPartnerPosFunc)) - EVT_END_THREAD - EVT_WAIT_FRAMES(3) - EVT_CALL(N(UnkFunc60), EVT_MAP_VAR(0)) - EVT_WAIT_FRAMES(30) - EVT_RETURN - EVT_END -}; - -EvtScript N(80243EF8) = { - EVT_IF_EQ(EVT_SAVE_FLAG(1046), 1) - EVT_RETURN - EVT_END_IF - EVT_CALL(IsStartingConversation, EVT_VAR(0)) - EVT_IF_EQ(EVT_VAR(0), 1) - EVT_RETURN - EVT_END_IF - EVT_CALL(N(UnkFunc24)) - EVT_IF_EQ(EVT_VAR(0), 1) - EVT_RETURN - EVT_END_IF - EVT_CALL(ModifyGlobalOverrideFlags, 1, 2097152) - EVT_CALL(N(SetOverrideFlags_40)) - EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(DisablePartnerAI, 0) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, ((NPC_FLAG_100)), TRUE) - EVT_CALL(N(UnkFunc20), EVT_MAP_VAR(0), EVT_VAR(9)) - EVT_CALL(FindKeyItem, ITEM_ULTRA_STONE, EVT_VAR(12)) - EVT_CALL(N(UnkFunc38)) - EVT_IF_EQ(EVT_VAR(0), -1) - EVT_CALL(ShowMessageAtScreenPos, MESSAGE_ID(0x1D, 0x00DC), 160, 40) - EVT_WAIT_FRAMES(10) - EVT_CALL(N(UnkFunc39), EVT_VAR(9)) - EVT_CALL(DisablePlayerInput, FALSE) - EVT_CALL(EnablePartnerAI) - EVT_CALL(ModifyGlobalOverrideFlags, 0, 2097152) - EVT_CALL(N(UnkFunc17)) - EVT_RETURN - EVT_END_IF - EVT_IF_EQ(EVT_SAVE_FLAG(438), 0) - EVT_SET(EVT_SAVE_FLAG(438), 1) - EVT_CALL(ShowMessageAtScreenPos, MESSAGE_ID(0x1D, 0x00DA), 160, 40) - EVT_ELSE - EVT_CALL(ShowMessageAtScreenPos, MESSAGE_ID(0x1D, 0x00DB), 160, 40) - EVT_END_IF - EVT_CALL(N(func_8024259C_C38ACC)) - EVT_IF_EQ(EVT_VAR(0), -1) - EVT_CALL(N(UnkFunc39), EVT_VAR(9)) - EVT_CALL(DisablePlayerInput, FALSE) - EVT_CALL(EnablePartnerAI) - EVT_CALL(ModifyGlobalOverrideFlags, 0, 2097152) - EVT_CALL(N(UnkFunc17)) - EVT_RETURN - EVT_END_IF - EVT_SET(EVT_VAR(10), EVT_VAR(0)) - EVT_SET(EVT_VAR(11), EVT_VAR(1)) - EVT_CALL(EnablePartnerAI) - EVT_CALL(GetCurrentPartnerID, EVT_VAR(0)) - EVT_IF_NE(EVT_VAR(0), EVT_VAR(11)) - EVT_CALL(N(SwitchToPartner), EVT_VAR(11)) - EVT_ELSE - EVT_CALL(func_802CF56C, 2) - EVT_END_IF - EVT_WAIT_FRAMES(10) - EVT_CALL(ShowMessageAtScreenPos, MESSAGE_ID(0x1D, 0x00DF), 160, 40) - EVT_CALL(ShowChoice, MESSAGE_ID(0x1E, 0x000D)) - EVT_CALL(CloseMessage) - EVT_IF_NE(EVT_VAR(0), 0) - EVT_CALL(N(UnkFunc39), EVT_VAR(9)) - EVT_CALL(DisablePlayerInput, FALSE) - EVT_CALL(EnablePartnerAI) - EVT_CALL(ModifyGlobalOverrideFlags, 0, 2097152) - EVT_CALL(N(UnkFunc17)) - EVT_RETURN - EVT_END_IF - EVT_EXEC_WAIT(N(80243D94)) - EVT_CALL(N(UnkFunc18), EVT_VAR(11), EVT_VAR(13)) - EVT_SET(EVT_SAVE_FLAG(1046), 1) - EVT_CALL(N(UnkFunc39), EVT_VAR(9)) - EVT_CALL(N(UnkFunc19)) - EVT_IF_EQ(EVT_VAR(13), 1) - EVT_CALL(ShowMessageAtScreenPos, MESSAGE_ID(0x1D, 0x00DD), 160, 40) - EVT_ELSE - EVT_CALL(ShowMessageAtScreenPos, MESSAGE_ID(0x1D, 0x00DE), 160, 40) - EVT_END_IF - EVT_CALL(DisablePlayerInput, FALSE) - EVT_CALL(EnablePartnerAI) - EVT_CALL(ModifyGlobalOverrideFlags, 0, 2097152) - EVT_CALL(N(UnkFunc17)) - EVT_RETURN - EVT_END -}; +#define SUPER_BLOCK_MAPVAR EVT_MAP_VAR(0) +#define SUPER_BLOCK_GAMEFLAG EVT_SAVE_FLAG(1046) +#include "world/common/atomic/SuperBlockData.inc.c" EvtScript N(makeEntities) = { EVT_CALL(MakeEntity, 0x802EA910, 500, -360, 110, 0, MAKE_ENTITY_END) - EVT_SET(EVT_MAP_VAR(0), EVT_VAR(0)) - EVT_CALL(AssignBlockFlag, EVT_SAVE_FLAG(1046)) - EVT_CALL(AssignScript, EVT_PTR(N(80243EF8))) + EVT_SETUP_SUPER_BLOCK(SUPER_BLOCK_MAPVAR, SUPER_BLOCK_GAMEFLAG) EVT_RETURN EVT_END }; @@ -744,177 +607,6 @@ ApiStatus N(func_80242154_C38684)(Evt* script, s32 isInitialCall) { return (script->functionTemp[0] == 100) * ApiStatus_DONE2; } -#include "world/common/SetOverrideFlags_40.inc.c" - -#include "world/common/UnkFunc17.inc.c" - -ApiStatus N(func_8024240C_C3893C)(Evt* script, s32 isInitialCall) { - entity_upgrade_block_hide_content(evt_get_variable(script, *script->ptrReadPos)); - return ApiStatus_DONE2; -} - -#include "world/common/UnkFunc18.inc.c" - -#ifdef NON_EQUIVALENT -typedef struct { - s32 unk_00[8]; - char unk_20[0x64]; - s32 unk_84[8]; - char unk_A4[0x64]; - s32 unk_108[8]; - char unk_128[0x64]; - s32 unk_18C[8]; - char unk_1AC[0x64]; - s32 unk_210[8]; - char unk_230[0x64]; - s32 unk_294[8]; - char unk_2B4[0x64]; - s32 unk_318; - char unk_31C[8]; - s32 unk_324; - s32 unk_328; - s16 unk_32C; -} N(UnkStruct); - -ApiStatus N(func_8024259C_C38ACC)(Evt* script, s32 isInitialCall) { - PlayerData* playerData = &gPlayerData; - N(UnkStruct)* ptr; - s32 i; - s32 partnerLevel; - s32 var, partnerActiveCount; - s32 idx; - - if (isInitialCall) { - script->functionTemp[2] = heap_malloc(0x330); - ptr = script->functionTemp[2]; - - partnerActiveCount = 0; - var = script->varTable[12] >= 0; - - for (i = 0; i < 8; i++) { - idx = N(D_80243D38_C3A268)[i]; - - if (playerData->partners[idx].enabled) { - ptr->unk_108[i] = idx; - ptr->unk_84[i] = *gPartnerPopupProperties[idx]; - partnerLevel = N(UnkFunc37)(idx, var); - if (partnerLevel >= 0) { - ptr->unk_00[i] = wPartnerHudScripts[idx]; - ptr->unk_18C[i] = 1; - ptr->unk_294[i] = N(D_80243D48_C3A278)[i][partnerLevel]; - } else { - ptr->unk_00[i] = wDisabledPartnerHudScripts[idx]; - ptr->unk_18C[i] = 0; - ptr->unk_294[i] = N(D_80243D30_C3A260)[var]; - } - ptr->unk_210[i] = playerData->partners[idx].level; - partnerActiveCount++; - } - } - - ptr->unk_318 = 4; - ptr->unk_324 = partnerActiveCount; - ptr->unk_328 = 0; - create_popup_menu(ptr); - script->functionTemp[0] = 0; - } - - ptr = script->functionTemp[2]; - if (script->functionTemp[0] == 0) { - script->functionTemp[1] = ptr->unk_32C; - if (script->functionTemp[1] != 0) { - hide_popup_menu(); - } else { - return ApiStatus_BLOCK; - } - } - - script->functionTemp[0]++; - - if (script->functionTemp[0] < 15) { - return ApiStatus_BLOCK; - } - - destroy_popup_menu(); - if (script->functionTemp[1] != 0xFF) { - script->varTable[0] = gPartnerPopupProperties[ptr->unk_108[script->functionTemp[1] - 1]][0]; - script->varTable[1] = ptr->unk_108[script->functionTemp[1] - 1]; - } else { - script->varTable[0] = -1; - } - - heap_free(script->functionTemp[2]); - - return ApiStatus_DONE2; -} -#else -INCLUDE_ASM(ApiStatus, "world/area_dgb/dgb_04/C36530", dgb_04_func_8024259C_C38ACC, Evt* script, - s32 isInitialCall) -#endif - -#include "world/common/SwitchToPartner.inc.c" - -#include "world/common/UnkFunc19.inc.c" - -#include "world/common/UnkFunc20.inc.c" - -#include "world/common/UnkFunc39.inc.c" - -#include "world/common/UnkFunc21.inc.c" - -#include "world/common/UnkFunc22.inc.c" - -#include "world/common/UnkFunc60.inc.c" - -s32 N(func_80242F08_C39438)(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32 ret = 0; - - if (isInitialCall) { - script->varTable[0] = evt_get_variable(script, *args++); - script->varTable[1] = evt_get_variable(script, *args++); - script->functionTemp[0] = 0; - script->functionTemp[1] = 0; - set_screen_overlay_color(0, 0xD0, 0xD0, 0xD0); - } - - switch (script->functionTemp[0]) { - case 0: - if (script->functionTemp[1] == 0xFF) { - script->functionTemp[0] = 1; - script->functionTemp[2] = 0; - } - script->functionTemp[1] += script->varTable[0]; - if (script->functionTemp[1] >= 0x100) { - script->functionTemp[1] = 0xFF; - } - break; - - case 1: - script->functionTemp[2]++; - if (script->functionTemp[2] >= 2) { - script->functionTemp[0] = 2; - } - break; - - case 2: - if (script->functionTemp[1] == 0) { - ret = 1; - } - script->functionTemp[1] -= script->varTable[1]; - if (script->functionTemp[1] < 0) { - script->functionTemp[1] = 0; - } - break; - } - - set_screen_overlay_params_front(1, script->functionTemp[1]); - - return ret; -} - -#include "world/common/UnkPartnerPosFuncs.inc.c" - -#include "world/common/UnkFunc24.inc.c" +#include "world/common/atomic/SuperBlock.inc.c" const char N(dgb_00_name_hack)[] = "dgb_00"; diff --git a/src/world/area_dgb/dgb_04/dgb_04.h b/src/world/area_dgb/dgb_04/dgb_04.h index 7f21ff70d4..d517284364 100644 --- a/src/world/area_dgb/dgb_04/dgb_04.h +++ b/src/world/area_dgb/dgb_04/dgb_04.h @@ -6,24 +6,7 @@ #define NAMESPACE dgb_04 -ApiStatus N(SetOverrideFlags_40)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkPartnerPosFunc)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkPartnerPosFunc2)(Evt* script, s32 isInitialCall); ApiStatus N(func_80242154_C38684)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkFunc17)(Evt* script, s32 isInitialCall); -ApiStatus N(func_8024240C_C3893C)(Evt *script, s32 isInitialCall); -ApiStatus N(UnkFunc18)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkFunc38)(Evt* script, s32 isInitialCall); -ApiStatus N(func_8024259C_C38ACC)(Evt* script, s32 isInitialCall); -ApiStatus N(SwitchToPartner)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkFunc19)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkFunc20)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkFunc39)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkFunc21)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkFunc22)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkFunc60)(Evt* script, s32 isInitialCall); -ApiStatus N(func_80242F08_C39438)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkFunc24)(Evt* script, s32 isInitialCall); extern NpcGroupList N(npcGroupList_80243D18); extern EvtScript N(main); diff --git a/src/world/area_dgb/dgb_05/C3AA10.c b/src/world/area_dgb/dgb_05/C3AA10.c index 92323f9898..85591e2989 100644 --- a/src/world/area_dgb/dgb_05/C3AA10.c +++ b/src/world/area_dgb/dgb_05/C3AA10.c @@ -40,7 +40,7 @@ static s32 N(pad_1578)[] = { }; EvtScript N(exitSingleDoor_80241580) = { - EVT_SET_GROUP(27) + EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 0) EVT_SET(EVT_VAR(0), 0) diff --git a/src/world/area_dgb/dgb_06/C3D080.c b/src/world/area_dgb/dgb_06/C3D080.c index a2c747527f..063cb23b56 100644 --- a/src/world/area_dgb/dgb_06/C3D080.c +++ b/src/world/area_dgb/dgb_06/C3D080.c @@ -36,7 +36,7 @@ static s32 N(pad_3B8)[] = { }; EvtScript N(exitSingleDoor_802403C0) = { - EVT_SET_GROUP(27) + EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 0) EVT_SET(EVT_VAR(0), 0) @@ -89,7 +89,7 @@ static s32** N(varTable) = NULL; #include "world/common/StashVars.inc.c" EvtScript N(80240624) = { - EVT_SET_GROUP(0) + EVT_SET_GROUP(EVT_GROUP_0) EVT_CALL(SetTimeFreezeMode, 2) EVT_WAIT_FRAMES(40) EVT_CALL(ShowGotItem, EVT_VAR(0), 0, 0) diff --git a/src/world/area_dgb/dgb_07/C3DBF0.c b/src/world/area_dgb/dgb_07/C3DBF0.c index f2f280ffa6..4f6540df22 100644 --- a/src/world/area_dgb/dgb_07/C3DBF0.c +++ b/src/world/area_dgb/dgb_07/C3DBF0.c @@ -39,7 +39,7 @@ static s32 N(pad_1528)[] = { }; EvtScript N(exitSingleDoor_80241530) = { - EVT_SET_GROUP(27) + EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 0) EVT_SET(EVT_VAR(0), 0) diff --git a/src/world/area_dgb/dgb_08/C3FDB0.c b/src/world/area_dgb/dgb_08/C3FDB0.c index 1213f95df8..7aa98ea63c 100644 --- a/src/world/area_dgb/dgb_08/C3FDB0.c +++ b/src/world/area_dgb/dgb_08/C3FDB0.c @@ -50,7 +50,7 @@ static s32 N(pad_3D88)[] = { }; EvtScript N(exitDoubleDoor_80243D90) = { - EVT_SET_GROUP(27) + EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 3) EVT_SET(EVT_VAR(0), 0) @@ -66,7 +66,7 @@ EvtScript N(exitDoubleDoor_80243D90) = { }; EvtScript N(exitDoubleDoor_80243E44) = { - EVT_SET_GROUP(27) + EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 3) EVT_SET(EVT_VAR(0), 1) @@ -308,7 +308,7 @@ EvtScript N(npcAI_802444E4) = { EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(func_802D2B6C) EVT_CALL(DisablePartnerAI, 0) - EVT_SET_GROUP(0) + EVT_SET_GROUP(EVT_GROUP_0) EVT_CALL(SetTimeFreezeMode, 1) EVT_CALL(GetPlayerPos, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_ADD(EVT_VAR(1), 20) diff --git a/src/world/area_dgb/dgb_09/C46BE0.c b/src/world/area_dgb/dgb_09/C46BE0.c index f732f6ffd0..9cfc2d39ad 100644 --- a/src/world/area_dgb/dgb_09/C46BE0.c +++ b/src/world/area_dgb/dgb_09/C46BE0.c @@ -45,7 +45,7 @@ static s32 N(pad_3918)[] = { }; EvtScript N(exitDoubleDoor_80243920) = { - EVT_SET_GROUP(27) + EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 3) EVT_SET(EVT_VAR(0), 0) @@ -61,7 +61,7 @@ EvtScript N(exitDoubleDoor_80243920) = { }; EvtScript N(exitDoubleDoor_802439D4) = { - EVT_SET_GROUP(27) + EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 3) EVT_SET(EVT_VAR(0), 1) @@ -77,7 +77,7 @@ EvtScript N(exitDoubleDoor_802439D4) = { }; EvtScript N(exitSingleDoor_80243A88) = { - EVT_SET_GROUP(27) + EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 0) EVT_SET(EVT_VAR(0), 2) @@ -360,7 +360,7 @@ EvtScript N(npcAI_802443DC) = { EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(func_802D2B6C) EVT_CALL(DisablePartnerAI, 0) - EVT_SET_GROUP(0) + EVT_SET_GROUP(EVT_GROUP_0) EVT_CALL(SetTimeFreezeMode, 1) EVT_CALL(GetPlayerPos, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_ADD(EVT_VAR(1), 20) diff --git a/src/world/area_dgb/dgb_11/C4D3E0.c b/src/world/area_dgb/dgb_11/C4D3E0.c index 7f3865ffe2..dbe21a048f 100644 --- a/src/world/area_dgb/dgb_11/C4D3E0.c +++ b/src/world/area_dgb/dgb_11/C4D3E0.c @@ -35,7 +35,7 @@ static s32 N(pad_168)[] = { }; EvtScript N(exitSingleDoor_80240170) = { - EVT_SET_GROUP(27) + EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 0) EVT_SET(EVT_VAR(0), 0) diff --git a/src/world/area_dgb/dgb_12/C4DEF0.c b/src/world/area_dgb/dgb_12/C4DEF0.c index 896bd0b5a9..2e6966777c 100644 --- a/src/world/area_dgb/dgb_12/C4DEF0.c +++ b/src/world/area_dgb/dgb_12/C4DEF0.c @@ -31,7 +31,7 @@ static s32 N(pad_3A8)[] = { }; EvtScript N(exitSingleDoor_802403B0) = { - EVT_SET_GROUP(27) + EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 0) EVT_SET(EVT_VAR(0), 0) @@ -80,7 +80,7 @@ s32 N(lavaResetList_802405C0)[] = { }; EvtScript N(802405E0) = { - EVT_SET_GROUP(239) + EVT_SET_GROUP(EVT_GROUP_EF) EVT_CALL(ModifyColliderFlags, 3, 12, 0x00000002) EVT_CALL(ModifyColliderFlags, 3, 0, 0x00000002) EVT_CALL(ModifyColliderFlags, 3, 14, 0x00000002) @@ -134,7 +134,7 @@ static s32** N(varTable) = NULL; #include "world/common/StashVars.inc.c" EvtScript N(80240874) = { - EVT_SET_GROUP(0) + EVT_SET_GROUP(EVT_GROUP_0) EVT_CALL(SetTimeFreezeMode, 2) EVT_WAIT_FRAMES(40) EVT_CALL(ShowGotItem, EVT_VAR(0), 0, 0) diff --git a/src/world/area_dgb/dgb_14/C4F030.c b/src/world/area_dgb/dgb_14/C4F030.c index fe92381109..7b235768cf 100644 --- a/src/world/area_dgb/dgb_14/C4F030.c +++ b/src/world/area_dgb/dgb_14/C4F030.c @@ -31,7 +31,7 @@ static s32 N(pad_F8)[] = { }; EvtScript N(exitDoubleDoor_80240100) = { - EVT_SET_GROUP(27) + EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 3) EVT_SET(EVT_VAR(0), 1) @@ -47,7 +47,7 @@ EvtScript N(exitDoubleDoor_80240100) = { }; EvtScript N(exitDoubleDoor_802401B4) = { - EVT_SET_GROUP(27) + EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 3) EVT_SET(EVT_VAR(0), 0) diff --git a/src/world/area_dgb/dgb_15/C4F510.c b/src/world/area_dgb/dgb_15/C4F510.c index bd2ecd1701..09fd8e854e 100644 --- a/src/world/area_dgb/dgb_15/C4F510.c +++ b/src/world/area_dgb/dgb_15/C4F510.c @@ -46,7 +46,7 @@ s32 N(itemList_802419C0)[] = { }; EvtScript N(exitDoubleDoor_802419C8) = { - EVT_SET_GROUP(27) + EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 3) EVT_SET(EVT_VAR(0), 0) @@ -62,7 +62,7 @@ EvtScript N(exitDoubleDoor_802419C8) = { }; EvtScript N(exitDoubleDoor_80241A7C) = { - EVT_SET_GROUP(27) + EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 3) EVT_SET(EVT_VAR(0), 1) @@ -78,7 +78,7 @@ EvtScript N(exitDoubleDoor_80241A7C) = { }; EvtScript N(exitSingleDoor_80241B30) = { - EVT_SET_GROUP(27) + EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 0) EVT_SET(EVT_VAR(0), 2) @@ -420,7 +420,7 @@ static s32 N(pad_2AC8)[] = { }; EvtScript N(80242AD0) = { - EVT_SET_GROUP(0) + EVT_SET_GROUP(EVT_GROUP_0) EVT_SUSPEND_GROUP(1) EVT_CALL(ShowKeyChoicePopup) EVT_IF_EQ(EVT_VAR(0), 0) diff --git a/src/world/area_dgb/dgb_16/C52540.c b/src/world/area_dgb/dgb_16/C52540.c index 94cd3ce542..86d9ffc2d1 100644 --- a/src/world/area_dgb/dgb_16/C52540.c +++ b/src/world/area_dgb/dgb_16/C52540.c @@ -48,7 +48,7 @@ static s32 N(pad_1518)[] = { }; EvtScript N(exitSingleDoor_80241520) = { - EVT_SET_GROUP(27) + EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 0) EVT_SET(EVT_VAR(0), 0) diff --git a/src/world/area_dgb/dgb_17/C55A60.c b/src/world/area_dgb/dgb_17/C55A60.c index f0010ab2c1..9d5b31cb76 100644 --- a/src/world/area_dgb/dgb_17/C55A60.c +++ b/src/world/area_dgb/dgb_17/C55A60.c @@ -31,7 +31,7 @@ static s32 N(pad_F8)[] = { }; EvtScript N(exitDoubleDoor_80240100) = { - EVT_SET_GROUP(27) + EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 3) EVT_SET(EVT_VAR(0), 0) @@ -47,7 +47,7 @@ EvtScript N(exitDoubleDoor_80240100) = { }; EvtScript N(exitDoubleDoor_802401B4) = { - EVT_SET_GROUP(27) + EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 3) EVT_SET(EVT_VAR(0), 1) diff --git a/src/world/area_dgb/dgb_18/C55F40.c b/src/world/area_dgb/dgb_18/C55F40.c index 94ab200dcd..7f396d2eab 100644 --- a/src/world/area_dgb/dgb_18/C55F40.c +++ b/src/world/area_dgb/dgb_18/C55F40.c @@ -42,7 +42,7 @@ static s32 N(pad_1358)[] = { }; EvtScript N(exitDoubleDoor_80241360) = { - EVT_SET_GROUP(27) + EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 3) EVT_SET(EVT_VAR(0), 0) @@ -386,7 +386,7 @@ EvtScript N(idle_80242494) = { }; EvtScript N(npcAI_802426B0) = { - EVT_SET_GROUP(11) + EVT_SET_GROUP(EVT_GROUP_B) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2039, 0) EVT_CALL(ShowSleepBubble, 0, 0, 50, 2, 552, 111, 128, 30, EVT_VAR(0)) EVT_WAIT_FRAMES(360) @@ -411,7 +411,7 @@ EvtScript N(npcAI_802426B0) = { }; EvtScript N(npcAI_80242834) = { - EVT_SET_GROUP(11) + EVT_SET_GROUP(EVT_GROUP_B) EVT_CALL(SetNpcAnimation, 0, NPC_ANIM_world_tubba_Palette_00_Anim_D) EVT_THREAD EVT_LOOP(0) @@ -654,7 +654,7 @@ static s32 N(pad_36D8)[] = { s32** N(varTable) = NULL; // StashVars.inc.c data EvtScript N(802436E4) = { - EVT_SET_GROUP(0) + EVT_SET_GROUP(EVT_GROUP_0) EVT_CALL(SetTimeFreezeMode, 2) EVT_WAIT_FRAMES(40) EVT_CALL(ShowGotItem, EVT_VAR(0), 0, 0) diff --git a/src/world/area_dro/dro_01/95B200.c b/src/world/area_dro/dro_01/95B200.c index b0db98d8d0..2f1e9cc84c 100644 --- a/src/world/area_dro/dro_01/95B200.c +++ b/src/world/area_dro/dro_01/95B200.c @@ -1,16 +1,6 @@ #include "dro_01.h" -#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" - -#include "world/common/GetCurrentFloor.inc.c" - -#include "world/common/UnkFunc25.inc.c" - -#include "world/common/GetEntryPos.inc.c" - -#include "world/common/GetCurrentCameraYawClamped180.inc.c" - -#include "world/common/SomeXYZFunc2.inc.c" +#include "world/common/atomic/Pipe.inc.c" #include "world/common/UnkFunc27.inc.c" diff --git a/src/world/area_dro/dro_01/95B7E0.c b/src/world/area_dro/dro_01/95B7E0.c index 6cd3ea499d..7bbeecf086 100644 --- a/src/world/area_dro/dro_01/95B7E0.c +++ b/src/world/area_dro/dro_01/95B7E0.c @@ -108,245 +108,10 @@ EvtScript N(80243BB0) = { EVT_END }; -EvtScript N(80243C30) = { - EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(DisablePlayerPhysics, TRUE) - EVT_CALL(DisablePartnerAI, 0) - EVT_CALL(HidePlayerShadow, TRUE) - EVT_CALL(SetPlayerAnimation, ANIM_STAND_STILL) - EVT_CALL(GetCurrentPartnerID, EVT_VAR(0)) - EVT_IF_NE(EVT_VAR(0), 0) - EVT_CALL(EnableNpcShadow, NPC_PARTNER, FALSE) - EVT_CALL(SetNpcPos, NPC_PARTNER, 0, -1000, 0) - EVT_END_IF - EVT_CALL(GetEntryID, EVT_VAR(0)) - EVT_CALL(N(GetEntryPos)) - EVT_SUB(EVT_VAR(2), 40) - EVT_CALL(SetPlayerPos, EVT_VAR(1), EVT_VAR(2), EVT_VAR(3)) - EVT_CALL(InterpPlayerYaw, EVT_VAR(4), 0) - EVT_CALL(PlaySound, 355) - EVT_CALL(func_802D286C, 256) - EVT_CALL(func_802D2520, ANIM_STAND_STILL, 5, 2, 1, 1, 0) - EVT_CALL(GetPlayerPos, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) - EVT_LOOP(40) - EVT_ADD(EVT_VAR(1), 1) - EVT_CALL(SetPlayerPos, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) - EVT_WAIT_FRAMES(1) - EVT_END_LOOP - EVT_WAIT_FRAMES(3) - EVT_CALL(GetCurrentPartnerID, EVT_VAR(0)) - EVT_IF_NE(EVT_VAR(0), 0) - EVT_THREAD - EVT_CALL(DisablePartnerAI, 0) - EVT_CALL(GetPlayerPos, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) - EVT_SUB(EVT_VAR(2), 3) - EVT_CALL(SetNpcPos, NPC_PARTNER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, ((NPC_FLAG_2)), FALSE) - EVT_CALL(EnablePartnerAI) - EVT_CALL(EnableNpcShadow, NPC_PARTNER, TRUE) - EVT_END_THREAD - EVT_END_IF - EVT_WAIT_FRAMES(2) - EVT_CALL(func_802D2520, ANIM_STAND_STILL, 0, 0, 0, 0, 0) - EVT_WAIT_FRAMES(1) - EVT_CALL(SetPlayerAnimation, ANIM_10002) - EVT_CALL(DisablePlayerPhysics, FALSE) - EVT_CALL(DisablePlayerInput, FALSE) - EVT_CALL(HidePlayerShadow, FALSE) - EVT_LABEL(0) - EVT_CALL(N(GetCurrentFloor)) - EVT_WAIT_FRAMES(1) - EVT_IF_NE(EVT_VAR(0), -1) - EVT_GOTO(0) - EVT_END_IF - EVT_EXEC(EVT_VAR(10)) - EVT_RETURN - EVT_END -}; - -EvtScript N(80243F84) = { - EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(DisablePlayerPhysics, TRUE) - EVT_CALL(HidePlayerShadow, TRUE) - EVT_CALL(ModifyColliderFlags, 0, EVT_VAR(11), 0x7FFFFE00) - EVT_CALL(GetEntryID, EVT_VAR(0)) - EVT_CALL(N(GetEntryPos)) - EVT_SET(EVT_VAR(5), EVT_VAR(1)) - EVT_SET(EVT_VAR(6), EVT_VAR(2)) - EVT_SET(EVT_VAR(7), EVT_VAR(3)) - EVT_ADD(EVT_VAR(2), 2) - EVT_CALL(SetPlayerPos, EVT_VAR(1), EVT_VAR(2), EVT_VAR(3)) - EVT_CALL(InterpPlayerYaw, EVT_VAR(4), 0) - EVT_IF_EQ(EVT_VAR(4), 90) - EVT_ADD(EVT_VAR(5), 40) - EVT_ELSE - EVT_SUB(EVT_VAR(5), 40) - EVT_END_IF - EVT_CALL(UseSettingsFrom, 0, EVT_VAR(5), EVT_VAR(6), EVT_VAR(7)) - EVT_CALL(SetPanTarget, 0, EVT_VAR(5), EVT_VAR(6), EVT_VAR(7)) - EVT_CALL(SetCamSpeed, 0, EVT_FIXED(90.0)) - EVT_CALL(PanToTarget, 0, 0, 1) - EVT_CALL(GetCurrentPartnerID, EVT_VAR(0)) - EVT_IF_NE(EVT_VAR(0), 0) - EVT_CALL(DisablePartnerAI, 0) - EVT_CALL(EnableNpcShadow, NPC_PARTNER, FALSE) - EVT_CALL(SetNpcPos, NPC_PARTNER, 0, -1000, 0) - EVT_CALL(InterpNpcYaw, NPC_PARTNER, EVT_VAR(0), 0) - EVT_END_IF - EVT_WAIT_FRAMES(1) - EVT_CALL(PlaySound, 355) - EVT_THREAD - EVT_WAIT_FRAMES(25) - EVT_CALL(HidePlayerShadow, FALSE) - EVT_END_THREAD - EVT_CALL(func_802D286C, 2304) - EVT_CALL(func_802D2520, ANIM_10002, 5, 3, 1, 1, 0) - EVT_LOOP(40) - EVT_CALL(N(SomeXYZFunc2), EVT_FIXED(1.0)) - EVT_CALL(SetPlayerPos, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) - EVT_WAIT_FRAMES(1) - EVT_END_LOOP - EVT_CALL(GetCurrentPartnerID, EVT_VAR(0)) - EVT_IF_NE(EVT_VAR(0), 0) - EVT_THREAD - EVT_CALL(GetPlayerPos, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) - EVT_SUB(EVT_VAR(2), 3) - EVT_CALL(SetNpcPos, NPC_PARTNER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) - EVT_CALL(EnableNpcShadow, NPC_PARTNER, TRUE) - EVT_CALL(EnablePartnerAI) - EVT_END_THREAD - EVT_END_IF - EVT_WAIT_FRAMES(5) - EVT_CALL(func_802D2520, ANIM_10002, 0, 0, 0, 0, 0) - EVT_CALL(ModifyColliderFlags, 1, EVT_VAR(11), 0x7FFFFE00) - EVT_CALL(DisablePlayerInput, FALSE) - EVT_CALL(DisablePlayerPhysics, FALSE) - EVT_CALL(PanToTarget, 0, 0, 0) - EVT_EXEC(EVT_VAR(10)) - EVT_RETURN - EVT_END -}; - -EvtScript N(80244374) = { - EVT_CALL(N(UnkFunc25)) - EVT_IF_EQ(EVT_VAR(0), 0) - EVT_RETURN - EVT_END_IF - EVT_CALL(GetCurrentPartner, EVT_VAR(0)) - EVT_IF_NE(EVT_VAR(0), 0) - EVT_CALL(GetCurrentPartnerID, EVT_VAR(1)) - EVT_IF_NE(EVT_VAR(1), 6) - EVT_RETURN - EVT_ELSE - EVT_CALL(func_802D2B6C) - EVT_CALL(DisablePlayerInput, TRUE) - EVT_END_IF - EVT_ELSE - EVT_CALL(DisablePlayerInput, TRUE) - EVT_END_IF - EVT_EXEC_WAIT(N(80244450)) - EVT_RETURN - EVT_END -}; - -EvtScript N(80244450) = { - EVT_CALL(N(SetPlayerStatusAnimFlags100000)) - EVT_SET_GROUP(27) - EVT_CALL(DisablePlayerPhysics, TRUE) - EVT_CALL(HidePlayerShadow, TRUE) - EVT_SET(EVT_VAR(0), EVT_VAR(10)) - EVT_CALL(N(GetEntryPos)) - EVT_CALL(PlayerMoveTo, EVT_VAR(1), EVT_VAR(3), 3) - EVT_SET(EVT_VAR(0), EVT_VAR(10)) - EVT_CALL(N(GetEntryPos)) - EVT_CALL(SetPlayerPos, EVT_VAR(1), EVT_VAR(2), EVT_VAR(3)) - EVT_CALL(SetPlayerFlagBits, 2097152, 1) - EVT_CALL(N(GetCurrentCameraYawClamped180)) - EVT_CALL(InterpPlayerYaw, EVT_VAR(0), 0) - EVT_WAIT_FRAMES(2) - EVT_CALL(SetPlayerFlagBits, 2097152, 0) - EVT_CALL(PlaySound, 355) - EVT_CALL(GetPlayerPos, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) - EVT_THREAD - EVT_WAIT_FRAMES(4) - EVT_LOOP(40) - EVT_SUB(EVT_VAR(1), 1) - EVT_CALL(SetPlayerPos, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) - EVT_WAIT_FRAMES(1) - EVT_END_LOOP - EVT_END_THREAD - EVT_CALL(func_802D286C, 2048) - EVT_CALL(func_802D2520, ANIM_10002, 5, 2, 1, 1, 0) - EVT_WAIT_FRAMES(25) - EVT_EXEC_WAIT(EVT_VAR(12)) - EVT_RETURN - EVT_END -}; - -EvtScript N(8024462C) = { - EVT_CALL(IsPlayerOnValidFloor, EVT_VAR(0)) - EVT_IF_EQ(EVT_VAR(0), 0) - EVT_RETURN - EVT_END_IF - EVT_CALL(GetPlayerActionState, EVT_VAR(0)) - EVT_IF_EQ(EVT_VAR(0), 26) - EVT_RETURN - EVT_END_IF - EVT_CALL(GetCurrentPartner, EVT_VAR(0)) - EVT_IF_NE(EVT_VAR(0), 0) - EVT_CALL(GetCurrentPartnerID, EVT_VAR(1)) - EVT_IF_NE(EVT_VAR(1), 6) - EVT_RETURN - EVT_ELSE - EVT_CALL(func_802D2B6C) - EVT_CALL(DisablePlayerInput, TRUE) - EVT_END_IF - EVT_ELSE - EVT_CALL(DisablePlayerInput, TRUE) - EVT_END_IF - EVT_SET_GROUP(27) - EVT_CALL(N(SetPlayerStatusAnimFlags100000)) - EVT_CALL(DisablePlayerPhysics, TRUE) - EVT_CALL(ModifyColliderFlags, 0, EVT_VAR(11), 0x7FFFFE00) - EVT_SET(EVT_VAR(0), EVT_VAR(10)) - EVT_CALL(N(GetEntryPos)) - EVT_SET(EVT_VAR(5), EVT_VAR(1)) - EVT_SET(EVT_VAR(6), EVT_VAR(2)) - EVT_ADD(EVT_VAR(6), 2) - EVT_SET(EVT_VAR(7), EVT_VAR(3)) - EVT_SET(EVT_VAR(8), EVT_VAR(4)) - EVT_ADD(EVT_VAR(8), 180) - EVT_IF_GE(EVT_VAR(4), 360) - EVT_SUB(EVT_VAR(4), 360) - EVT_END_IF - EVT_CALL(InterpPlayerYaw, EVT_VAR(8), 1) - EVT_WAIT_FRAMES(1) - EVT_CALL(PlaySound, 355) - EVT_CALL(GetPlayerPos, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) - EVT_CALL(SetPlayerPos, EVT_VAR(0), EVT_VAR(6), EVT_VAR(7)) - EVT_CALL(SetPlayerAnimation, ANIM_STAND_STILL) - EVT_CALL(func_802D286C, 2048) - EVT_CALL(func_802D2520, ANIM_STAND_STILL, 5, 3, 1, 1, 0) - EVT_THREAD - EVT_WAIT_FRAMES(8) - EVT_CALL(HidePlayerShadow, TRUE) - EVT_END_THREAD - EVT_THREAD - EVT_WAIT_FRAMES(3) - EVT_LOOP(40) - EVT_CALL(N(SomeXYZFunc2), EVT_FIXED(1.0)) - EVT_CALL(SetPlayerPos, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) - EVT_WAIT_FRAMES(1) - EVT_END_LOOP - EVT_END_THREAD - EVT_WAIT_FRAMES(25) - EVT_EXEC_WAIT(EVT_VAR(12)) - EVT_RETURN - EVT_END -}; +#include "world/common/atomic/PipeData.inc.c" EvtScript N(exitWalk_80244960) = { - EVT_SET_GROUP(27) + EVT_SET_GROUP(EVT_GROUP_1B) EVT_SET(EVT_SAVE_FLAG(761), 0) EVT_CALL(UseExitHeading, 60, 0) EVT_EXEC(ExitWalk) @@ -419,7 +184,7 @@ EvtScript N(enterWalk_80244C14) = { EVT_CALL(DisablePlayerInput, FALSE) EVT_END_IF EVT_SET(EVT_VAR(10), EVT_PTR(N(80244A28))) - EVT_EXEC_WAIT(N(80243C30)) + EVT_EXEC_WAIT(N(Pipe_EnterVertical)) EVT_CASE_OR_EQ(3) EVT_CASE_OR_EQ(4) EVT_EXEC_WAIT(N(80244A70)) @@ -2684,7 +2449,7 @@ EvtScript N(8024C580) = { EVT_CALL(SetNpcPos, NPC_PARTNER, 0, -1000, 0) EVT_END_IF EVT_CALL(GetEntryID, EVT_VAR(0)) - EVT_CALL(N(dup_GetEntryPos)) + EVT_CALL(N(dup_Pipe_GetEntryPos)) EVT_SUB(EVT_VAR(2), 40) EVT_CALL(SetPlayerPos, EVT_VAR(1), EVT_VAR(2), EVT_VAR(3)) EVT_CALL(InterpPlayerYaw, EVT_VAR(4), 0) @@ -2718,7 +2483,7 @@ EvtScript N(8024C580) = { EVT_CALL(DisablePlayerInput, FALSE) EVT_CALL(HidePlayerShadow, FALSE) EVT_LABEL(0) - EVT_CALL(N(dup_GetCurrentFloor)) + EVT_CALL(N(dup_Pipe_GetCurrentFloor)) EVT_WAIT_FRAMES(1) EVT_IF_NE(EVT_VAR(0), -1) EVT_GOTO(0) @@ -2734,7 +2499,7 @@ EvtScript N(8024C8D4) = { EVT_CALL(HidePlayerShadow, TRUE) EVT_CALL(ModifyColliderFlags, 0, EVT_VAR(11), 0x7FFFFE00) EVT_CALL(GetEntryID, EVT_VAR(0)) - EVT_CALL(N(dup_GetEntryPos)) + EVT_CALL(N(dup_Pipe_GetEntryPos)) EVT_SET(EVT_VAR(5), EVT_VAR(1)) EVT_SET(EVT_VAR(6), EVT_VAR(2)) EVT_SET(EVT_VAR(7), EVT_VAR(3)) @@ -2766,7 +2531,7 @@ EvtScript N(8024C8D4) = { EVT_CALL(func_802D286C, 2304) EVT_CALL(func_802D2520, ANIM_10002, 5, 3, 1, 1, 0) EVT_LOOP(40) - EVT_CALL(N(dup_SomeXYZFunc2), EVT_FIXED(1.0)) + EVT_CALL(N(dup_Pipe_GetPointAheadOfPlayer), EVT_FIXED(1.0)) EVT_CALL(SetPlayerPos, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_WAIT_FRAMES(1) EVT_END_LOOP @@ -2792,7 +2557,7 @@ EvtScript N(8024C8D4) = { }; EvtScript N(8024CCC4) = { - EVT_CALL(N(dup_UnkFunc25)) + EVT_CALL(N(dup_Pipe_AwaitDownInput)) EVT_IF_EQ(EVT_VAR(0), 0) EVT_RETURN EVT_END_IF @@ -2814,18 +2579,18 @@ EvtScript N(8024CCC4) = { }; EvtScript N(8024CDA0) = { - EVT_CALL(N(dup_SetPlayerStatusAnimFlags100000)) - EVT_SET_GROUP(27) + EVT_CALL(N(dup_Pipe_SetAnimFlag)) + EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(HidePlayerShadow, TRUE) EVT_SET(EVT_VAR(0), EVT_VAR(10)) - EVT_CALL(N(dup_GetEntryPos)) + EVT_CALL(N(dup_Pipe_GetEntryPos)) EVT_CALL(PlayerMoveTo, EVT_VAR(1), EVT_VAR(3), 3) EVT_SET(EVT_VAR(0), EVT_VAR(10)) - EVT_CALL(N(dup_GetEntryPos)) + EVT_CALL(N(dup_Pipe_GetEntryPos)) EVT_CALL(SetPlayerPos, EVT_VAR(1), EVT_VAR(2), EVT_VAR(3)) EVT_CALL(SetPlayerFlagBits, 2097152, 1) - EVT_CALL(N(dup_GetCurrentCameraYawClamped180)) + EVT_CALL(N(dup_Pipe_GetCameraYaw)) EVT_CALL(InterpPlayerYaw, EVT_VAR(0), 0) EVT_WAIT_FRAMES(2) EVT_CALL(SetPlayerFlagBits, 2097152, 0) @@ -2868,12 +2633,12 @@ EvtScript N(8024CF7C) = { EVT_ELSE EVT_CALL(DisablePlayerInput, TRUE) EVT_END_IF - EVT_SET_GROUP(27) - EVT_CALL(N(dup_SetPlayerStatusAnimFlags100000)) + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(N(dup_Pipe_SetAnimFlag)) EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(ModifyColliderFlags, 0, EVT_VAR(11), 0x7FFFFE00) EVT_SET(EVT_VAR(0), EVT_VAR(10)) - EVT_CALL(N(dup_GetEntryPos)) + EVT_CALL(N(dup_Pipe_GetEntryPos)) EVT_SET(EVT_VAR(5), EVT_VAR(1)) EVT_SET(EVT_VAR(6), EVT_VAR(2)) EVT_ADD(EVT_VAR(6), 2) @@ -2898,7 +2663,7 @@ EvtScript N(8024CF7C) = { EVT_THREAD EVT_WAIT_FRAMES(3) EVT_LOOP(40) - EVT_CALL(N(dup_SomeXYZFunc2), EVT_FIXED(1.0)) + EVT_CALL(N(dup_Pipe_GetPointAheadOfPlayer), EVT_FIXED(1.0)) EVT_CALL(SetPlayerPos, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_WAIT_FRAMES(1) EVT_END_LOOP diff --git a/src/world/area_dro/dro_01/95E7A0.c b/src/world/area_dro/dro_01/95E7A0.c index ea42497082..02b1d6c689 100644 --- a/src/world/area_dro/dro_01/95E7A0.c +++ b/src/world/area_dro/dro_01/95E7A0.c @@ -1,27 +1,7 @@ #include "dro_01.h" #define NAMESPACE dro_01_dup -#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" -#define NAMESPACE dro_01 - -#define NAMESPACE dro_01_dup -#include "world/common/GetCurrentFloor.inc.c" -#define NAMESPACE dro_01 - -#define NAMESPACE dro_01_dup -#include "world/common/UnkFunc25.inc.c" -#define NAMESPACE dro_01 - -#define NAMESPACE dro_01_dup -#include "world/common/GetEntryPos.inc.c" -#define NAMESPACE dro_01 - -#define NAMESPACE dro_01_dup -#include "world/common/GetCurrentCameraYawClamped180.inc.c" -#define NAMESPACE dro_01 - -#define NAMESPACE dro_01_dup -#include "world/common/SomeXYZFunc2.inc.c" +#include "world/common/atomic/Pipe.inc.c" #define NAMESPACE dro_01 #include "common/foliage.inc.c" diff --git a/src/world/area_dro/dro_01/dro_01.h b/src/world/area_dro/dro_01/dro_01.h index 0af382e82f..5f9ec4812e 100644 --- a/src/world/area_dro/dro_01/dro_01.h +++ b/src/world/area_dro/dro_01/dro_01.h @@ -19,18 +19,13 @@ typedef struct { } N(shopPrice); ApiStatus N(GetCamVfov)(Evt* script, s32 isInitialCall); -ApiStatus N(GetCurrentCameraYawClamped180)(Evt* script, s32 isInitialCall); -ApiStatus N(GetCurrentFloor)(Evt* script, s32 isInitialCall); -ApiStatus N(GetEntryPos)(Evt* script, s32 isInitialCall); ApiStatus N(GetGameStatus75)(Evt* script, s32 isInitialCall); ApiStatus N(GetNpcUnsafeOwner2)(Evt* script, s32 isInitialCall); ApiStatus N(Set80151310_0)(Evt* script, s32 isInitialCall); ApiStatus N(Set80151310_1)(Evt* script, s32 isInitialCall); ApiStatus N(SetCamVfov)(Evt* script, s32 isInitialCall); ApiStatus N(SetManyVars)(Evt* script, s32 isInitialCall); -ApiStatus N(SetPlayerStatusAnimFlags100000)(Evt* script, s32 isInitialCall); ApiStatus N(TransformFoliage)(Evt* script, s32 isInitialCall); -ApiStatus N(SomeXYZFunc2)(Evt* script, s32 isInitialCall); ApiStatus N(AddPlayerHandsOffset)(Evt* script, s32 isInitialCall); ApiStatus N(UnkAlphaFunc)(Evt* script, s32 isInitialCall); ApiStatus N(UnkCameraFunc)(Evt* script, s32 isInitialCall); @@ -38,7 +33,6 @@ ApiStatus N(UnkMovePartner)(Evt* script, s32 isInitialCall); ApiStatus N(UnkRotatePartner)(Evt* script, s32 isInitialCall); ApiStatus N(UnkRotatePlayer)(Evt* script, s32 isInitialCall); ApiStatus N(UnkYawFunc)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkFunc25)(Evt* script, s32 isInitialCall); ApiStatus N(UnkFunc27)(Evt* script, s32 isInitialCall); ApiStatus N(UnkFunc26)(Evt* script, s32 isInitialCall); ApiStatus N(UnkNpcAIMainFunc)(Evt* script, s32 isInitialCall); @@ -66,12 +60,12 @@ ApiStatus N(func_802431B4_95E3B4)(Evt* script, s32 isInitialCall); ApiStatus N(func_802431FC_95E3FC)(Evt* script, s32 isInitialCall); ApiStatus N(func_80243350_95E550)(Evt* script, s32 isInitialCall); ApiStatus N(func_80243578_95E778)(Evt* script, s32 isInitialCall); -ApiStatus N(dup_UnkFunc25)(Evt* script, s32 isInitialCall); -ApiStatus N(dup_GetCurrentCameraYawClamped180)(Evt* script, s32 isInitialCall); -ApiStatus N(dup_GetCurrentFloor)(Evt* script, s32 isInitialCall); -ApiStatus N(dup_GetEntryPos)(Evt* script, s32 isInitialCall); -ApiStatus N(dup_SetPlayerStatusAnimFlags100000)(Evt* script, s32 isInitialCall); -ApiStatus N(dup_SomeXYZFunc2)(Evt* script, s32 isInitialCall); +ApiStatus N(dup_Pipe_AwaitDownInput)(Evt* script, s32 isInitialCall); +ApiStatus N(dup_Pipe_GetCameraYaw)(Evt* script, s32 isInitialCall); +ApiStatus N(dup_Pipe_GetCurrentFloor)(Evt* script, s32 isInitialCall); +ApiStatus N(dup_Pipe_GetEntryPos)(Evt* script, s32 isInitialCall); +ApiStatus N(dup_Pipe_SetAnimFlag)(Evt* script, s32 isInitialCall); +ApiStatus N(dup_Pipe_GetPointAheadOfPlayer)(Evt* script, s32 isInitialCall); extern s32** N(varTable); extern N(shopInventory) N(shopInventory_8024B4FC)[]; diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c index d0857eafa7..446575f1c9 100644 --- a/src/world/area_dro/dro_02/9694C0.c +++ b/src/world/area_dro/dro_02/9694C0.c @@ -367,7 +367,7 @@ EvtScript N(toggleVis_8024468C) = { }; EvtScript N(8024486C) = { - EVT_SET_GROUP(0) + EVT_SET_GROUP(EVT_GROUP_0) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(func_802D2C14, 1) EVT_CALL(PlayerMoveTo, 230, 10, 20) @@ -401,7 +401,7 @@ EvtScript N(8024486C) = { }; EvtScript N(80244A68) = { - EVT_SET_GROUP(0) + EVT_SET_GROUP(EVT_GROUP_0) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(func_802D2C14, 1) EVT_CALL(PlayerMoveTo, 230, -70, 20) diff --git a/src/world/area_flo/flo_03/CA72E0.c b/src/world/area_flo/flo_03/CA72E0.c index 9481b1c958..1cbd321123 100644 --- a/src/world/area_flo/flo_03/CA72E0.c +++ b/src/world/area_flo/flo_03/CA72E0.c @@ -72,7 +72,7 @@ EvtScript N(80240814) = { }; EvtScript N(80240880) = { - EVT_SET_GROUP(11) + EVT_SET_GROUP(EVT_GROUP_B) EVT_SET(EVT_VAR(10), EVT_VAR(0)) EVT_SET(EVT_VAR(11), EVT_VAR(1)) EVT_SET(EVT_VAR(12), EVT_VAR(2)) diff --git a/src/world/area_flo/flo_07/CAC5D0.c b/src/world/area_flo/flo_07/CAC5D0.c index 71b961c0f6..f685562242 100644 --- a/src/world/area_flo/flo_07/CAC5D0.c +++ b/src/world/area_flo/flo_07/CAC5D0.c @@ -55,7 +55,7 @@ static s32 N(pad_8CC) = { }; EvtScript N(updateTexturePan_802408D0) = { - EVT_SET_GROUP(0) + EVT_SET_GROUP(EVT_GROUP_0) EVT_IF_EQ(EVT_VAR(5), 1) EVT_IF_EQ(EVT_VAR(6), 1) EVT_IF_EQ(EVT_VAR(7), 1) @@ -72,7 +72,7 @@ EvtScript N(updateTexturePan_802408D0) = { }; EvtScript N(8024096C) = { - EVT_SET_GROUP(11) + EVT_SET_GROUP(EVT_GROUP_B) EVT_SET(EVT_VAR(10), EVT_VAR(0)) EVT_SET(EVT_VAR(11), EVT_VAR(1)) EVT_SET(EVT_VAR(12), EVT_VAR(2)) diff --git a/src/world/area_flo/flo_08/CAED40.c b/src/world/area_flo/flo_08/CAED40.c index e90a79fe1b..ee41e2cda6 100644 --- a/src/world/area_flo/flo_08/CAED40.c +++ b/src/world/area_flo/flo_08/CAED40.c @@ -1,133 +1,3 @@ #include "flo_08.h" -extern s32 wPartnerHudScripts[]; -extern s32 wDisabledPartnerHudScripts[]; -extern s32 gPartnerPopupProperties[11][4]; - -#include "world/common/SetOverrideFlags_40.inc.c" - -#include "world/common/UnkFunc17.inc.c" - -ApiStatus N(func_8024003C_CAED7C)(Evt* script, s32 isInitialCall) { - entity_upgrade_block_hide_content(evt_get_variable(script, *script->ptrReadPos)); - return ApiStatus_DONE2; -} - -#include "world/common/UnkFunc18.inc.c" - -#ifdef NON_EQUIVALENT -typedef struct { - s32 unk_00[8]; - char unk_20[0x64]; - s32 unk_84[8]; - char unk_A4[0x64]; - s32 unk_108[8]; - char unk_128[0x64]; - s32 unk_18C[8]; - char unk_1AC[0x64]; - s32 unk_210[8]; - char unk_230[0x64]; - s32 unk_294[8]; - char unk_2B4[0x64]; - s32 unk_318; - char unk_31C[8]; - s32 unk_324; - s32 unk_328; - s16 unk_32C; -} N(UnkStruct); - -ApiStatus N(func_802401CC_CAEF0C)(Evt* script, s32 isInitialCall) { - PlayerData* playerData = &gPlayerData; - N(UnkStruct)* ptr; - s32 i; - s32 partnerLevel; - s32 var, partnerActiveCount; - s32 idx; - - if (isInitialCall) { - script->functionTemp[2] = heap_malloc(0x330); - ptr = script->functionTemp[2]; - - partnerActiveCount = 0; - var = script->varTable[12] >= 0; - - for (i = 0; i < 8; i++) { - idx = N(D_80241FB8_CB0CF8)[i]; - - if (playerData->partners[idx].enabled) { - ptr->unk_108[i] = idx; - ptr->unk_84[i] = *gPartnerPopupProperties[idx]; - partnerLevel = N(UnkFunc37)(idx, var); - if (partnerLevel >= 0) { - ptr->unk_00[i] = wPartnerHudScripts[idx]; - ptr->unk_18C[i] = 1; - ptr->unk_294[i] = N(D_80241FC8_CB0D08)[i][partnerLevel]; - } else { - ptr->unk_00[i] = wDisabledPartnerHudScripts[idx]; - ptr->unk_18C[i] = 0; - ptr->unk_294[i] = N(D_80241FB0_CB0CF0)[var]; - } - ptr->unk_210[i] = playerData->partners[idx].level; - partnerActiveCount++; - } - } - - ptr->unk_318 = 4; - ptr->unk_324 = partnerActiveCount; - ptr->unk_328 = 0; - create_popup_menu(ptr); - script->functionTemp[0] = 0; - } - - ptr = script->functionTemp[2]; - if (script->functionTemp[0] == 0) { - script->functionTemp[1] = ptr->unk_32C; - if (script->functionTemp[1] != 0) { - hide_popup_menu(); - } else { - return ApiStatus_BLOCK; - } - } - - script->functionTemp[0]++; - - if (script->functionTemp[0] < 15) { - return ApiStatus_BLOCK; - } - - destroy_popup_menu(); - if (script->functionTemp[1] != 0xFF) { - script->varTable[0] = gPartnerPopupProperties[ptr->unk_108[script->functionTemp[1] - 1]][0]; - script->varTable[1] = ptr->unk_108[script->functionTemp[1] - 1]; - } else { - script->varTable[0] = -1; - } - - heap_free(script->functionTemp[2]); - - return ApiStatus_DONE2; -} -#else -INCLUDE_ASM(ApiStatus, "world/area_flo/flo_08/CAED40", flo_08_func_802401CC_CAEF0C, Evt* script, - s32 isInitialCall); -#endif - -#include "world/common/SwitchToPartner.inc.c" - -#include "world/common/UnkFunc19.inc.c" - -#include "world/common/UnkFunc20.inc.c" - -#include "world/common/UnkFunc39.inc.c" - -#include "world/common/UnkFunc21.inc.c" - -#include "world/common/UnkFunc22.inc.c" - -#include "world/common/UnkFunc60.inc.c" - -#include "world/common/UnkFunc23.inc.c" - -#include "world/common/UnkPartnerPosFuncs.inc.c" - -#include "world/common/UnkFunc40.inc.c" +#include "world/common/atomic/SuperBlock.inc.c" diff --git a/src/world/area_flo/flo_08/CAFAC0.c b/src/world/area_flo/flo_08/CAFAC0.c index 782f917a31..3795e36bbb 100644 --- a/src/world/area_flo/flo_08/CAFAC0.c +++ b/src/world/area_flo/flo_08/CAFAC0.c @@ -47,154 +47,20 @@ EvtScript N(80241F40) = { EVT_END }; -s32 N(D_80241FB0_CB0CF0)[] = { - 0x001D00F0, 0x001D00F1, -}; - -s16 N(D_80241FB8_CB0CF8)[] = { - 0x0001, 0x0002, 0x0003, 0x0004, - 0x0009, 0x0006, 0x0007, 0x0008 -}; - -s32 N(D_80241FC8_CB0D08)[8][2] = { - { 0x001D00E0, 0x001D00E1 }, { 0x001D00E2, 0x001D00E3 }, - { 0x001D00E4, 0x001D00E5 }, { 0x001D00E6, 0x001D00E7 }, - { 0x001D00E8, 0x001D00E9 }, { 0x001D00EA, 0x001D00EB }, - { 0x001D00EC, 0x001D00ED }, { 0x001D00EE, 0x001D00EF } -}; - -f32 N(bigFuncFloats)[3] = { - 140.0f, 180.0f, 220.0f -}; - -EvtScript N(80242014) = { - EVT_WAIT_FRAMES(10) - EVT_CALL(PlaySound, 0x212D) - EVT_CALL(N(UnkFunc21), EVT_MAP_VAR(0)) - EVT_WAIT_FRAMES(85) - EVT_THREAD - EVT_CALL(PlaySound, 0x212E) - EVT_CALL(N(UnkFunc23), 70, 70) - EVT_WAIT_FRAMES(27) - EVT_CALL(PlaySound, SOUND_208E) - EVT_CALL(N(UnkFunc23), 50, 50) - EVT_END_THREAD - EVT_THREAD - EVT_WAIT_FRAMES(3) - EVT_CALL(N(func_8024003C_CAED7C), EVT_MAP_VAR(0)) - EVT_END_THREAD - EVT_THREAD - EVT_WAIT_FRAMES(47) - EVT_CALL(N(UnkFunc22)) - EVT_CALL(N(UnkPartnerPosFunc)) - EVT_WAIT_FRAMES(5) - EVT_CALL(N(UnkPartnerPosFunc2)) - EVT_WAIT_FRAMES(5) - EVT_CALL(N(UnkPartnerPosFunc)) - EVT_END_THREAD - EVT_WAIT_FRAMES(3) - EVT_CALL(N(UnkFunc60), EVT_MAP_VAR(0)) - EVT_WAIT_FRAMES(30) - EVT_RETURN - EVT_END -}; - -EvtScript N(80242178) = { - EVT_IF_EQ(EVT_SAVE_FLAG(1402), 1) - EVT_RETURN - EVT_END_IF - EVT_CALL(IsStartingConversation, EVT_VAR(0)) - EVT_IF_EQ(EVT_VAR(0), 1) - EVT_RETURN - EVT_END_IF - EVT_CALL(N(UnkFunc40)) - EVT_IF_EQ(EVT_VAR(0), 1) - EVT_RETURN - EVT_END_IF - EVT_CALL(ModifyGlobalOverrideFlags, 1, 2097152) - EVT_CALL(N(SetOverrideFlags_40)) - EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(DisablePartnerAI, 0) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, ((NPC_FLAG_100)), TRUE) - EVT_CALL(N(UnkFunc20), EVT_MAP_VAR(0), EVT_VAR(9)) - EVT_CALL(FindKeyItem, ITEM_ULTRA_STONE, EVT_VAR(12)) - EVT_CALL(N(UnkFunc38)) - EVT_IF_EQ(EVT_VAR(0), -1) - EVT_CALL(ShowMessageAtScreenPos, MESSAGE_ID(0x1D, 0x00DC), 160, 40) - EVT_WAIT_FRAMES(10) - EVT_CALL(N(UnkFunc39), EVT_VAR(9)) - EVT_CALL(DisablePlayerInput, FALSE) - EVT_CALL(EnablePartnerAI) - EVT_CALL(ModifyGlobalOverrideFlags, 0, 2097152) - EVT_CALL(N(UnkFunc17)) - EVT_RETURN - EVT_END_IF - EVT_IF_EQ(EVT_SAVE_FLAG(438), 0) - EVT_SET(EVT_SAVE_FLAG(438), 1) - EVT_CALL(ShowMessageAtScreenPos, MESSAGE_ID(0x1D, 0x00DA), 160, 40) - EVT_ELSE - EVT_CALL(ShowMessageAtScreenPos, MESSAGE_ID(0x1D, 0x00DB), 160, 40) - EVT_END_IF - EVT_CALL(N(func_802401CC_CAEF0C)) - EVT_IF_EQ(EVT_VAR(0), -1) - EVT_CALL(N(UnkFunc39), EVT_VAR(9)) - EVT_CALL(DisablePlayerInput, FALSE) - EVT_CALL(EnablePartnerAI) - EVT_CALL(ModifyGlobalOverrideFlags, 0, 2097152) - EVT_CALL(N(UnkFunc17)) - EVT_RETURN - EVT_END_IF - EVT_SET(EVT_VAR(10), EVT_VAR(0)) - EVT_SET(EVT_VAR(11), EVT_VAR(1)) - EVT_CALL(EnablePartnerAI) - EVT_CALL(GetCurrentPartnerID, EVT_VAR(0)) - EVT_IF_NE(EVT_VAR(0), EVT_VAR(11)) - EVT_CALL(N(SwitchToPartner), EVT_VAR(11)) - EVT_ELSE - EVT_CALL(func_802CF56C, 2) - EVT_END_IF - EVT_WAIT_FRAMES(10) - EVT_CALL(ShowMessageAtScreenPos, MESSAGE_ID(0x1D, 0x00DF), 160, 40) - EVT_CALL(ShowChoice, MESSAGE_ID(0x1E, 0x000D)) - EVT_CALL(CloseMessage) - EVT_IF_NE(EVT_VAR(0), 0) - EVT_CALL(N(UnkFunc39), EVT_VAR(9)) - EVT_CALL(DisablePlayerInput, FALSE) - EVT_CALL(EnablePartnerAI) - EVT_CALL(ModifyGlobalOverrideFlags, 0, 2097152) - EVT_CALL(N(UnkFunc17)) - EVT_RETURN - EVT_END_IF - EVT_EXEC_WAIT(N(80242014)) - EVT_CALL(N(UnkFunc18), EVT_VAR(11), EVT_VAR(13)) - EVT_SET(EVT_SAVE_FLAG(1402), 1) - EVT_CALL(N(UnkFunc39), EVT_VAR(9)) - EVT_CALL(N(UnkFunc19)) - EVT_IF_EQ(EVT_VAR(13), 1) - EVT_CALL(ShowMessageAtScreenPos, MESSAGE_ID(0x1D, 0x00DD), 160, 40) - EVT_ELSE - EVT_CALL(ShowMessageAtScreenPos, MESSAGE_ID(0x1D, 0x00DE), 160, 40) - EVT_END_IF - EVT_CALL(DisablePlayerInput, FALSE) - EVT_CALL(EnablePartnerAI) - EVT_CALL(ModifyGlobalOverrideFlags, 0, 2097152) - EVT_CALL(N(UnkFunc17)) - EVT_RETURN - EVT_END -}; +#define SUPER_BLOCK_MAPVAR EVT_MAP_VAR(0) +#define SUPER_BLOCK_GAMEFLAG EVT_SAVE_FLAG(1402) +#include "world/common/atomic/SuperBlockData.inc.c" EvtScript N(makeEntities) = { EVT_CALL(MakeEntity, 0x802EA910, -780, 120, -110, 0, MAKE_ENTITY_END) - EVT_SET(EVT_MAP_VAR(0), EVT_VAR(0)) - EVT_CALL(AssignBlockFlag, EVT_SAVE_FLAG(1402)) - EVT_CALL(AssignScript, EVT_PTR(N(80242178))) + EVT_SETUP_SUPER_BLOCK(SUPER_BLOCK_MAPVAR, SUPER_BLOCK_GAMEFLAG) EVT_CALL(MakeItemEntity, ITEM_STAR_PIECE, 510, 0, -90, 17, EVT_SAVE_FLAG(1381)) EVT_RETURN EVT_END }; EvtScript N(80242680) = { - EVT_SET_GROUP(11) + EVT_SET_GROUP(EVT_GROUP_B) EVT_SET(EVT_VAR(10), EVT_VAR(0)) EVT_SET(EVT_VAR(11), EVT_VAR(1)) EVT_SET(EVT_VAR(12), EVT_VAR(2)) @@ -1205,7 +1071,7 @@ ApiStatus N(func_802419C4_CB0704)(Evt* script, s32 isInitialCall) { ApiStatus N(func_802419FC_CB073C)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = evt_get_variable(script, *args); + s32* ptr = (s32*)evt_get_variable(script, *args); s32 i; if (ptr != NULL) { @@ -1316,7 +1182,7 @@ static s32 N(pad_598C) = { }; EvtScript N(80245990) = { - EVT_SET_GROUP(11) + EVT_SET_GROUP(EVT_GROUP_B) EVT_SET(EVT_VAR(10), EVT_VAR(0)) EVT_SET(EVT_VAR(11), EVT_VAR(1)) EVT_SET(EVT_VAR(12), EVT_VAR(2)) diff --git a/src/world/area_flo/flo_08/flo_08.h b/src/world/area_flo/flo_08/flo_08.h index e125600be3..f9f787c2a9 100644 --- a/src/world/area_flo/flo_08/flo_08.h +++ b/src/world/area_flo/flo_08/flo_08.h @@ -7,24 +7,7 @@ #define NAMESPACE flo_08 ApiStatus N(AddPlayerHandsOffset)(Evt* script, s32 isInitialCall); -ApiStatus N(SetOverrideFlags_40)(Evt* script, s32 isInitialCall); ApiStatus N(TransformFoliage)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkFunc17)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkFunc18)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkFunc19)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkFunc20)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkFunc21)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkFunc22)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkFunc23)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkPartnerPosFunc)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkPartnerPosFunc2)(Evt* script, s32 isInitialCall); -ApiStatus N(func_8024003C_CAED7C)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkFunc38)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802401CC_CAEF0C)(Evt* script, s32 isInitialCall); -ApiStatus N(SwitchToPartner)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkFunc39)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkFunc60)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkFunc40)(Evt* script, s32 isInitialCall); ApiStatus N(func_80240D40_CAFA80)(Evt* script, s32 isInitialCall); ApiStatus N(func_8024150C_CB024C)(Evt* script, s32 isInitialCall); ApiStatus N(func_80241970_CB06B0)(Evt* script, s32 isInitialCall); @@ -39,8 +22,4 @@ extern NpcGroupList N(npcGroupList_80244EC4); extern EvtScript N(80245914); extern EvtScript N(80245F5C); extern EvtScript N(main); -extern s32 N(D_80241FB0_CB0CF0)[]; -extern s16 N(D_80241FB8_CB0CF8)[]; -extern s32 N(D_80241FC8_CB0D08)[8][2]; -extern f32 N(bigFuncFloats)[3]; extern s32 D_802462C0_B4AA30; diff --git a/src/world/area_flo/flo_09/CB50E0.c b/src/world/area_flo/flo_09/CB50E0.c index 12a7b04c15..fb34cbdc9d 100644 --- a/src/world/area_flo/flo_09/CB50E0.c +++ b/src/world/area_flo/flo_09/CB50E0.c @@ -35,7 +35,7 @@ EvtScript N(80241880) = { }; EvtScript N(802418F0) = { - EVT_SET_GROUP(11) + EVT_SET_GROUP(EVT_GROUP_B) EVT_SET(EVT_VAR(10), EVT_VAR(0)) EVT_SET(EVT_VAR(11), EVT_VAR(1)) EVT_SET(EVT_VAR(12), EVT_VAR(2)) @@ -149,7 +149,7 @@ static s32 N(pad_2004)[] = { }; EvtScript N(80242010) = { - EVT_SET_GROUP(11) + EVT_SET_GROUP(EVT_GROUP_B) EVT_SET(EVT_VAR(10), EVT_VAR(0)) EVT_SET(EVT_VAR(11), EVT_VAR(1)) EVT_SET(EVT_VAR(12), EVT_VAR(2)) diff --git a/src/world/area_flo/flo_11/CBDCD0.c b/src/world/area_flo/flo_11/CBDCD0.c index afbdaca218..c82f009a38 100644 --- a/src/world/area_flo/flo_11/CBDCD0.c +++ b/src/world/area_flo/flo_11/CBDCD0.c @@ -38,7 +38,7 @@ EvtScript N(802403E0) = { }; EvtScript N(80240450) = { - EVT_SET_GROUP(11) + EVT_SET_GROUP(EVT_GROUP_B) EVT_SET(EVT_VAR(10), EVT_VAR(0)) EVT_SET(EVT_VAR(11), EVT_VAR(1)) EVT_SET(EVT_VAR(12), EVT_VAR(2)) @@ -78,249 +78,14 @@ EvtScript N(80240450) = { EVT_END }; -EvtScript N(802406FC) = { - EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(DisablePlayerPhysics, TRUE) - EVT_CALL(DisablePartnerAI, 0) - EVT_CALL(HidePlayerShadow, TRUE) - EVT_CALL(SetPlayerAnimation, ANIM_STAND_STILL) - EVT_CALL(GetCurrentPartnerID, EVT_VAR(0)) - EVT_IF_NE(EVT_VAR(0), 0) - EVT_CALL(EnableNpcShadow, NPC_PARTNER, FALSE) - EVT_CALL(SetNpcPos, NPC_PARTNER, 0, -1000, 0) - EVT_END_IF - EVT_CALL(GetEntryID, EVT_VAR(0)) - EVT_CALL(N(GetEntryPos)) - EVT_SUB(EVT_VAR(2), 40) - EVT_CALL(SetPlayerPos, EVT_VAR(1), EVT_VAR(2), EVT_VAR(3)) - EVT_CALL(InterpPlayerYaw, EVT_VAR(4), 0) - EVT_CALL(PlaySound, 0x163) - EVT_CALL(func_802D286C, 256) - EVT_CALL(func_802D2520, ANIM_STAND_STILL, 5, 2, 1, 1, 0) - EVT_CALL(GetPlayerPos, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) - EVT_LOOP(40) - EVT_ADD(EVT_VAR(1), 1) - EVT_CALL(SetPlayerPos, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) - EVT_WAIT_FRAMES(1) - EVT_END_LOOP - EVT_WAIT_FRAMES(3) - EVT_CALL(GetCurrentPartnerID, EVT_VAR(0)) - EVT_IF_NE(EVT_VAR(0), 0) - EVT_THREAD - EVT_CALL(DisablePartnerAI, 0) - EVT_CALL(GetPlayerPos, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) - EVT_SUB(EVT_VAR(2), 3) - EVT_CALL(SetNpcPos, NPC_PARTNER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, ((NPC_FLAG_2)), FALSE) - EVT_CALL(EnablePartnerAI) - EVT_CALL(EnableNpcShadow, NPC_PARTNER, TRUE) - EVT_END_THREAD - EVT_END_IF - EVT_WAIT_FRAMES(2) - EVT_CALL(func_802D2520, ANIM_STAND_STILL, 0, 0, 0, 0, 0) - EVT_WAIT_FRAMES(1) - EVT_CALL(SetPlayerAnimation, ANIM_10002) - EVT_CALL(DisablePlayerPhysics, FALSE) - EVT_CALL(DisablePlayerInput, FALSE) - EVT_CALL(HidePlayerShadow, FALSE) - EVT_LABEL(0) - EVT_CALL(N(GetCurrentFloor)) - EVT_WAIT_FRAMES(1) - EVT_IF_NE(EVT_VAR(0), -1) - EVT_GOTO(0) - EVT_END_IF - EVT_EXEC(EVT_VAR(10)) - EVT_RETURN - EVT_END -}; - -EvtScript N(80240A50) = { - EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(DisablePlayerPhysics, TRUE) - EVT_CALL(HidePlayerShadow, TRUE) - EVT_CALL(ModifyColliderFlags, 0, EVT_VAR(11), 0x7FFFFE00) - EVT_CALL(GetEntryID, EVT_VAR(0)) - EVT_CALL(N(GetEntryPos)) - EVT_SET(EVT_VAR(5), EVT_VAR(1)) - EVT_SET(EVT_VAR(6), EVT_VAR(2)) - EVT_SET(EVT_VAR(7), EVT_VAR(3)) - EVT_ADD(EVT_VAR(2), 2) - EVT_CALL(SetPlayerPos, EVT_VAR(1), EVT_VAR(2), EVT_VAR(3)) - EVT_CALL(InterpPlayerYaw, EVT_VAR(4), 0) - EVT_IF_EQ(EVT_VAR(4), 90) - EVT_ADD(EVT_VAR(5), 40) - EVT_ELSE - EVT_SUB(EVT_VAR(5), 40) - EVT_END_IF - EVT_CALL(UseSettingsFrom, 0, EVT_VAR(5), EVT_VAR(6), EVT_VAR(7)) - EVT_CALL(SetPanTarget, 0, EVT_VAR(5), EVT_VAR(6), EVT_VAR(7)) - EVT_CALL(SetCamSpeed, 0, EVT_FIXED(90.0)) - EVT_CALL(PanToTarget, 0, 0, 1) - EVT_CALL(GetCurrentPartnerID, EVT_VAR(0)) - EVT_IF_NE(EVT_VAR(0), 0) - EVT_CALL(DisablePartnerAI, 0) - EVT_CALL(EnableNpcShadow, NPC_PARTNER, FALSE) - EVT_CALL(SetNpcPos, NPC_PARTNER, 0, -1000, 0) - EVT_CALL(InterpNpcYaw, NPC_PARTNER, EVT_VAR(0), 0) - EVT_END_IF - EVT_WAIT_FRAMES(1) - EVT_CALL(PlaySound, 0x163) - EVT_THREAD - EVT_WAIT_FRAMES(25) - EVT_CALL(HidePlayerShadow, FALSE) - EVT_END_THREAD - EVT_CALL(func_802D286C, 2304) - EVT_CALL(func_802D2520, ANIM_10002, 5, 3, 1, 1, 0) - EVT_LOOP(40) - EVT_CALL(N(SomeXYZFunc2), EVT_FIXED(1.0)) - EVT_CALL(SetPlayerPos, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) - EVT_WAIT_FRAMES(1) - EVT_END_LOOP - EVT_CALL(GetCurrentPartnerID, EVT_VAR(0)) - EVT_IF_NE(EVT_VAR(0), 0) - EVT_THREAD - EVT_CALL(GetPlayerPos, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) - EVT_SUB(EVT_VAR(2), 3) - EVT_CALL(SetNpcPos, NPC_PARTNER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) - EVT_CALL(EnableNpcShadow, NPC_PARTNER, TRUE) - EVT_CALL(EnablePartnerAI) - EVT_END_THREAD - EVT_END_IF - EVT_WAIT_FRAMES(5) - EVT_CALL(func_802D2520, ANIM_10002, 0, 0, 0, 0, 0) - EVT_CALL(ModifyColliderFlags, 1, EVT_VAR(11), 0x7FFFFE00) - EVT_CALL(DisablePlayerInput, FALSE) - EVT_CALL(DisablePlayerPhysics, FALSE) - EVT_CALL(PanToTarget, 0, 0, 0) - EVT_EXEC(EVT_VAR(10)) - EVT_RETURN - EVT_END -}; - -EvtScript N(80240E40) = { - EVT_CALL(N(UnkFunc25)) - EVT_IF_EQ(EVT_VAR(0), 0) - EVT_RETURN - EVT_END_IF - EVT_CALL(GetCurrentPartner, EVT_VAR(0)) - EVT_IF_NE(EVT_VAR(0), 0) - EVT_CALL(GetCurrentPartnerID, EVT_VAR(1)) - EVT_IF_NE(EVT_VAR(1), 6) - EVT_RETURN - EVT_ELSE - EVT_CALL(func_802D2B6C) - EVT_CALL(DisablePlayerInput, TRUE) - EVT_END_IF - EVT_ELSE - EVT_CALL(DisablePlayerInput, TRUE) - EVT_END_IF - EVT_EXEC_WAIT(N(80240F1C)) - EVT_RETURN - EVT_END -}; - -EvtScript N(80240F1C) = { - EVT_CALL(N(SetPlayerStatusAnimFlags100000)) - EVT_SET_GROUP(27) - EVT_CALL(DisablePlayerPhysics, TRUE) - EVT_CALL(HidePlayerShadow, TRUE) - EVT_SET(EVT_VAR(0), EVT_VAR(10)) - EVT_CALL(N(GetEntryPos)) - EVT_CALL(PlayerMoveTo, EVT_VAR(1), EVT_VAR(3), 3) - EVT_SET(EVT_VAR(0), EVT_VAR(10)) - EVT_CALL(N(GetEntryPos)) - EVT_CALL(SetPlayerPos, EVT_VAR(1), EVT_VAR(2), EVT_VAR(3)) - EVT_CALL(SetPlayerFlagBits, 2097152, 1) - EVT_CALL(N(GetCurrentCameraYawClamped180)) - EVT_CALL(InterpPlayerYaw, EVT_VAR(0), 0) - EVT_WAIT_FRAMES(2) - EVT_CALL(SetPlayerFlagBits, 2097152, 0) - EVT_CALL(PlaySound, 0x163) - EVT_CALL(GetPlayerPos, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) - EVT_THREAD - EVT_WAIT_FRAMES(4) - EVT_LOOP(40) - EVT_SUB(EVT_VAR(1), 1) - EVT_CALL(SetPlayerPos, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) - EVT_WAIT_FRAMES(1) - EVT_END_LOOP - EVT_END_THREAD - EVT_CALL(func_802D286C, 2048) - EVT_CALL(func_802D2520, ANIM_10002, 5, 2, 1, 1, 0) - EVT_WAIT_FRAMES(25) - EVT_EXEC_WAIT(EVT_VAR(12)) - EVT_RETURN - EVT_END -}; - -EvtScript N(802410F8) = { - EVT_CALL(IsPlayerOnValidFloor, EVT_VAR(0)) - EVT_IF_EQ(EVT_VAR(0), 0) - EVT_RETURN - EVT_END_IF - EVT_CALL(GetPlayerActionState, EVT_VAR(0)) - EVT_IF_EQ(EVT_VAR(0), 26) - EVT_RETURN - EVT_END_IF - EVT_CALL(GetCurrentPartner, EVT_VAR(0)) - EVT_IF_NE(EVT_VAR(0), 0) - EVT_CALL(GetCurrentPartnerID, EVT_VAR(1)) - EVT_IF_NE(EVT_VAR(1), 6) - EVT_RETURN - EVT_ELSE - EVT_CALL(func_802D2B6C) - EVT_CALL(DisablePlayerInput, TRUE) - EVT_END_IF - EVT_ELSE - EVT_CALL(DisablePlayerInput, TRUE) - EVT_END_IF - EVT_SET_GROUP(27) - EVT_CALL(N(SetPlayerStatusAnimFlags100000)) - EVT_CALL(DisablePlayerPhysics, TRUE) - EVT_CALL(ModifyColliderFlags, 0, EVT_VAR(11), 0x7FFFFE00) - EVT_SET(EVT_VAR(0), EVT_VAR(10)) - EVT_CALL(N(GetEntryPos)) - EVT_SET(EVT_VAR(5), EVT_VAR(1)) - EVT_SET(EVT_VAR(6), EVT_VAR(2)) - EVT_ADD(EVT_VAR(6), 2) - EVT_SET(EVT_VAR(7), EVT_VAR(3)) - EVT_SET(EVT_VAR(8), EVT_VAR(4)) - EVT_ADD(EVT_VAR(8), 180) - EVT_IF_GE(EVT_VAR(4), 360) - EVT_SUB(EVT_VAR(4), 360) - EVT_END_IF - EVT_CALL(InterpPlayerYaw, EVT_VAR(8), 1) - EVT_WAIT_FRAMES(1) - EVT_CALL(PlaySound, 0x163) - EVT_CALL(GetPlayerPos, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) - EVT_CALL(SetPlayerPos, EVT_VAR(0), EVT_VAR(6), EVT_VAR(7)) - EVT_CALL(SetPlayerAnimation, ANIM_STAND_STILL) - EVT_CALL(func_802D286C, 2048) - EVT_CALL(func_802D2520, ANIM_STAND_STILL, 5, 3, 1, 1, 0) - EVT_THREAD - EVT_WAIT_FRAMES(8) - EVT_CALL(HidePlayerShadow, TRUE) - EVT_END_THREAD - EVT_THREAD - EVT_WAIT_FRAMES(3) - EVT_LOOP(40) - EVT_CALL(N(SomeXYZFunc2), EVT_FIXED(1.0)) - EVT_CALL(SetPlayerPos, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) - EVT_WAIT_FRAMES(1) - EVT_END_LOOP - EVT_END_THREAD - EVT_WAIT_FRAMES(25) - EVT_EXEC_WAIT(EVT_VAR(12)) - EVT_RETURN - EVT_END -}; +#include "world/common/atomic/PipeData.inc.c" EvtScript N(exitWalk_8024142C) = EXIT_WALK_SCRIPT(60, 0, "flo_23", 1); EvtScript N(exitWalk_80241488) = EXIT_WALK_SCRIPT(60, 1, "flo_12", 0); EvtScript N(802414E4) = { - EVT_SET_GROUP(27) + EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(GotoMap, EVT_PTR("flo_11"), 5) EVT_WAIT_FRAMES(100) EVT_RETURN @@ -328,7 +93,7 @@ EvtScript N(802414E4) = { }; EvtScript N(80241520) = { - EVT_SET_GROUP(27) + EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(GotoMap, EVT_PTR("flo_11"), 6) EVT_WAIT_FRAMES(100) EVT_RETURN @@ -336,7 +101,7 @@ EvtScript N(80241520) = { }; EvtScript N(8024155C) = { - EVT_SET_GROUP(27) + EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(GotoMap, EVT_PTR("flo_11"), 7) EVT_WAIT_FRAMES(100) EVT_RETURN @@ -344,7 +109,7 @@ EvtScript N(8024155C) = { }; EvtScript N(80241598) = { - EVT_SET_GROUP(27) + EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(GotoMap, EVT_PTR("flo_11"), 2) EVT_WAIT_FRAMES(100) EVT_RETURN @@ -352,7 +117,7 @@ EvtScript N(80241598) = { }; EvtScript N(802415D4) = { - EVT_SET_GROUP(27) + EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(GotoMap, EVT_PTR("flo_11"), 3) EVT_WAIT_FRAMES(100) EVT_RETURN @@ -360,7 +125,7 @@ EvtScript N(802415D4) = { }; EvtScript N(80241610) = { - EVT_SET_GROUP(27) + EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(GotoMap, EVT_PTR("flo_11"), 4) EVT_WAIT_FRAMES(100) EVT_RETURN @@ -371,7 +136,7 @@ EvtScript N(8024164C) = { EVT_SET(EVT_VAR(10), EVT_VAR(0)) EVT_SET(EVT_VAR(11), EVT_VAR(1)) EVT_SET(EVT_VAR(12), EVT_VAR(2)) - EVT_EXEC_WAIT(N(80240E40)) + EVT_EXEC_WAIT(N(Pipe_ExitVertical)) EVT_RETURN EVT_END }; @@ -427,7 +192,7 @@ EvtScript N(main) = { EVT_WAIT_FRAMES(1) EVT_ELSE EVT_SET(EVT_VAR(10), EVT_PTR(N(80241698))) - EVT_EXEC(N(802406FC)) + EVT_EXEC(N(Pipe_EnterVertical)) EVT_WAIT_FRAMES(1) EVT_END_IF EVT_EXEC_WAIT(N(802403E0)) @@ -885,17 +650,7 @@ EvtScript N(makeEntities) = { EVT_END }; -#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" - -#include "world/common/GetCurrentFloor.inc.c" - -#include "world/common/UnkFunc25.inc.c" - -#include "world/common/GetEntryPos.inc.c" - -#include "world/common/GetCurrentCameraYawClamped180.inc.c" - -#include "world/common/SomeXYZFunc2.inc.c" +#include "world/common/atomic/Pipe.inc.c" void fx_sun(); diff --git a/src/world/area_flo/flo_11/flo_11.h b/src/world/area_flo/flo_11/flo_11.h index 791206ed89..734fea5ac1 100644 --- a/src/world/area_flo/flo_11/flo_11.h +++ b/src/world/area_flo/flo_11/flo_11.h @@ -6,12 +6,6 @@ #define NAMESPACE flo_11 -ApiStatus N(GetCurrentCameraYawClamped180)(Evt* script, s32 isInitialCall); -ApiStatus N(GetCurrentFloor)(Evt* script, s32 isInitialCall); -ApiStatus N(GetEntryPos)(Evt* script, s32 isInitialCall); -ApiStatus N(SetPlayerStatusAnimFlags100000)(Evt* script, s32 isInitialCall); -ApiStatus N(SomeXYZFunc2)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkFunc25)(Evt* script, s32 isInitialCall); ApiStatus N(func_802402E0_CBDFB0)(Evt* script, s32 isInitialCall); extern NpcGroupList N(npcGroupList_802430D4); diff --git a/src/world/area_flo/flo_12/CC0E70.c b/src/world/area_flo/flo_12/CC0E70.c index 79bff8909b..b26a094328 100644 --- a/src/world/area_flo/flo_12/CC0E70.c +++ b/src/world/area_flo/flo_12/CC0E70.c @@ -57,7 +57,7 @@ static s32 N(pad_86C) = { }; EvtScript N(80240870) = { - EVT_SET_GROUP(11) + EVT_SET_GROUP(EVT_GROUP_B) EVT_SET(EVT_VAR(10), EVT_VAR(0)) EVT_SET(EVT_VAR(11), EVT_VAR(1)) EVT_SET(EVT_VAR(12), EVT_VAR(2)) diff --git a/src/world/area_flo/flo_13/CC3850.c b/src/world/area_flo/flo_13/CC3850.c index f8361263b8..0a2725fdce 100644 --- a/src/world/area_flo/flo_13/CC3850.c +++ b/src/world/area_flo/flo_13/CC3850.c @@ -118,7 +118,7 @@ static s32 N(pad_3A3C) = { }; EvtScript N(80243A40) = { - EVT_SET_GROUP(11) + EVT_SET_GROUP(EVT_GROUP_B) EVT_SET(EVT_VAR(10), EVT_VAR(0)) EVT_SET(EVT_VAR(11), EVT_VAR(1)) EVT_SET(EVT_VAR(12), EVT_VAR(2)) diff --git a/src/world/area_flo/flo_14/CCB310.c b/src/world/area_flo/flo_14/CCB310.c index ce6ee8af37..2e06919a55 100644 --- a/src/world/area_flo/flo_14/CCB310.c +++ b/src/world/area_flo/flo_14/CCB310.c @@ -26,7 +26,7 @@ EvtScript N(802423F0) = { }; EvtScript N(updateTexturePan_80242460) = { - EVT_SET_GROUP(0) + EVT_SET_GROUP(EVT_GROUP_0) EVT_IF_EQ(EVT_VAR(5), 1) EVT_IF_EQ(EVT_VAR(6), 1) EVT_IF_EQ(EVT_VAR(7), 1) @@ -150,7 +150,7 @@ static s32 N(pad_2BF4)[] = { }; EvtScript N(80242C00) = { - EVT_SET_GROUP(11) + EVT_SET_GROUP(EVT_GROUP_B) EVT_SET(EVT_VAR(10), EVT_VAR(0)) EVT_SET(EVT_VAR(11), EVT_VAR(1)) EVT_SET(EVT_VAR(12), EVT_VAR(2)) @@ -417,7 +417,7 @@ s32 N(D_80243B18_CCEE28) = { }; EvtScript N(80243B1C) = { - EVT_SET_GROUP(0) + EVT_SET_GROUP(EVT_GROUP_0) EVT_SET(EVT_VAR(15), EVT_VAR(0)) EVT_LABEL(0) EVT_IF_EQ(EVT_AREA_FLAG(35), 1) diff --git a/src/world/area_flo/flo_16/CD1F10.c b/src/world/area_flo/flo_16/CD1F10.c index 66852f0f6d..1a6c022a54 100644 --- a/src/world/area_flo/flo_16/CD1F10.c +++ b/src/world/area_flo/flo_16/CD1F10.c @@ -1,10 +1,6 @@ #include "flo_16.h" #include "message_ids.h" -extern s32 wPartnerHudScripts[]; -extern s32 wDisabledPartnerHudScripts[]; -extern s32 gPartnerPopupProperties[11][4]; - EntryList N(entryList) = { { -720.0f, 0.0f, 0.0f, 90.0f }, { 710.0f, 100.0f, 0.0f, 270.0f }, @@ -99,7 +95,7 @@ EvtScript N(main) = { }; EvtScript N(80242EA0) = { - EVT_SET_GROUP(11) + EVT_SET_GROUP(EVT_GROUP_B) EVT_SET(EVT_VAR(10), EVT_VAR(0)) EVT_SET(EVT_VAR(11), EVT_VAR(1)) EVT_SET(EVT_VAR(12), EVT_VAR(2)) @@ -241,141 +237,9 @@ static s32 N(pad_36FC) = { 0x00000000, }; -s32 N(D_80243700_CD5530)[] = { - 0x001D00F0, 0x001D00F1, -}; - -s16 N(D_80243708_CD5538)[] = { - 0x0001, 0x0002, 0x0003, 0x0004, - 0x0009, 0x0006, 0x0007, 0x0008 -}; - -s32 N(D_80243718_CD5548)[8][2] = { - { 0x001D00E0, 0x001D00E1 }, { 0x001D00E2, 0x001D00E3 }, - { 0x001D00E4, 0x001D00E5 }, { 0x001D00E6, 0x001D00E7 }, - { 0x001D00E8, 0x001D00E9 }, { 0x001D00EA, 0x001D00EB }, - { 0x001D00EC, 0x001D00ED }, { 0x001D00EE, 0x001D00EF } -}; - -f32 N(bigFuncFloats)[] = { - 140.0f, 180.0f, 220.0f, -}; - -EvtScript N(80243764) = { - EVT_WAIT_FRAMES(10) - EVT_CALL(PlaySound, 0x212D) - EVT_CALL(N(UnkFunc21), EVT_MAP_VAR(0)) - EVT_WAIT_FRAMES(85) - EVT_THREAD - EVT_CALL(PlaySound, 0x212E) - EVT_CALL(N(UnkFunc23), 70, 70) - EVT_WAIT_FRAMES(27) - EVT_CALL(PlaySound, SOUND_208E) - EVT_CALL(N(UnkFunc23), 50, 50) - EVT_END_THREAD - EVT_THREAD - EVT_WAIT_FRAMES(3) - EVT_CALL(N(func_8024011C_CD1F4C), EVT_MAP_VAR(0)) - EVT_END_THREAD - EVT_THREAD - EVT_WAIT_FRAMES(47) - EVT_CALL(N(UnkFunc22)) - EVT_CALL(N(UnkPartnerPosFunc)) - EVT_WAIT_FRAMES(5) - EVT_CALL(N(UnkPartnerPosFunc2)) - EVT_WAIT_FRAMES(5) - EVT_CALL(N(UnkPartnerPosFunc)) - EVT_END_THREAD - EVT_WAIT_FRAMES(3) - EVT_CALL(N(UnkFunc60), EVT_MAP_VAR(0)) - EVT_WAIT_FRAMES(30) - EVT_RETURN - EVT_END -}; - -EvtScript N(802438C8) = { - EVT_IF_EQ(EVT_SAVE_FLAG(1403), 1) - EVT_RETURN - EVT_END_IF - EVT_CALL(IsStartingConversation, EVT_VAR(0)) - EVT_IF_EQ(EVT_VAR(0), 1) - EVT_RETURN - EVT_END_IF - EVT_CALL(N(UnkFunc24)) - EVT_IF_EQ(EVT_VAR(0), 1) - EVT_RETURN - EVT_END_IF - EVT_CALL(ModifyGlobalOverrideFlags, 1, 2097152) - EVT_CALL(N(SetOverrideFlags_40)) - EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(DisablePartnerAI, 0) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, ((NPC_FLAG_100)), TRUE) - EVT_CALL(N(UnkFunc20), EVT_MAP_VAR(0), EVT_VAR(9)) - EVT_CALL(FindKeyItem, ITEM_ULTRA_STONE, EVT_VAR(12)) - EVT_CALL(N(UnkFunc38)) - EVT_IF_EQ(EVT_VAR(0), -1) - EVT_CALL(ShowMessageAtScreenPos, MESSAGE_ID(0x1D, 0x00DC), 160, 40) - EVT_WAIT_FRAMES(10) - EVT_CALL(N(UnkFunc39), EVT_VAR(9)) - EVT_CALL(DisablePlayerInput, FALSE) - EVT_CALL(EnablePartnerAI) - EVT_CALL(ModifyGlobalOverrideFlags, 0, 2097152) - EVT_CALL(N(UnkFunc17)) - EVT_RETURN - EVT_END_IF - EVT_IF_EQ(EVT_SAVE_FLAG(438), 0) - EVT_SET(EVT_SAVE_FLAG(438), 1) - EVT_CALL(ShowMessageAtScreenPos, MESSAGE_ID(0x1D, 0x00DA), 160, 40) - EVT_ELSE - EVT_CALL(ShowMessageAtScreenPos, MESSAGE_ID(0x1D, 0x00DB), 160, 40) - EVT_END_IF - EVT_CALL(N(func_802402AC_CD20DC)) - EVT_IF_EQ(EVT_VAR(0), -1) - EVT_CALL(N(UnkFunc39), EVT_VAR(9)) - EVT_CALL(DisablePlayerInput, FALSE) - EVT_CALL(EnablePartnerAI) - EVT_CALL(ModifyGlobalOverrideFlags, 0, 2097152) - EVT_CALL(N(UnkFunc17)) - EVT_RETURN - EVT_END_IF - EVT_SET(EVT_VAR(10), EVT_VAR(0)) - EVT_SET(EVT_VAR(11), EVT_VAR(1)) - EVT_CALL(EnablePartnerAI) - EVT_CALL(GetCurrentPartnerID, EVT_VAR(0)) - EVT_IF_NE(EVT_VAR(0), EVT_VAR(11)) - EVT_CALL(N(SwitchToPartner), EVT_VAR(11)) - EVT_ELSE - EVT_CALL(func_802CF56C, 2) - EVT_END_IF - EVT_WAIT_FRAMES(10) - EVT_CALL(ShowMessageAtScreenPos, MESSAGE_ID(0x1D, 0x00DF), 160, 40) - EVT_CALL(ShowChoice, MESSAGE_ID(0x1E, 0x000D)) - EVT_CALL(CloseMessage) - EVT_IF_NE(EVT_VAR(0), 0) - EVT_CALL(N(UnkFunc39), EVT_VAR(9)) - EVT_CALL(DisablePlayerInput, FALSE) - EVT_CALL(EnablePartnerAI) - EVT_CALL(ModifyGlobalOverrideFlags, 0, 2097152) - EVT_CALL(N(UnkFunc17)) - EVT_RETURN - EVT_END_IF - EVT_EXEC_WAIT(N(80243764)) - EVT_CALL(N(UnkFunc18), EVT_VAR(11), EVT_VAR(13)) - EVT_SET(EVT_SAVE_FLAG(1403), 1) - EVT_CALL(N(UnkFunc39), EVT_VAR(9)) - EVT_CALL(N(UnkFunc19)) - EVT_IF_EQ(EVT_VAR(13), 1) - EVT_CALL(ShowMessageAtScreenPos, MESSAGE_ID(0x1D, 0x00DD), 160, 40) - EVT_ELSE - EVT_CALL(ShowMessageAtScreenPos, MESSAGE_ID(0x1D, 0x00DE), 160, 40) - EVT_END_IF - EVT_CALL(DisablePlayerInput, FALSE) - EVT_CALL(EnablePartnerAI) - EVT_CALL(ModifyGlobalOverrideFlags, 0, 2097152) - EVT_CALL(N(UnkFunc17)) - EVT_RETURN - EVT_END -}; +#define SUPER_BLOCK_MAPVAR EVT_MAP_VAR(0) +#define SUPER_BLOCK_GAMEFLAG EVT_SAVE_FLAG(1403) +#include "world/common/atomic/SuperBlockData.inc.c" EvtScript N(80243D48) = { EVT_LABEL(0) @@ -424,141 +288,13 @@ EvtScript N(makeEntities) = { EVT_SET(EVT_AREA_FLAG(39), 0) EVT_BIND_TRIGGER(N(80243E80), TRIGGER_FLOOR_TOUCH, 20, 1, 0) EVT_CALL(MakeEntity, 0x802EA910, 350, 240, -100, 0, MAKE_ENTITY_END) - EVT_SET(EVT_MAP_VAR(0), EVT_VAR(0)) - EVT_CALL(AssignBlockFlag, EVT_SAVE_FLAG(1403)) - EVT_CALL(AssignScript, EVT_PTR(N(802438C8))) + EVT_SETUP_SUPER_BLOCK(SUPER_BLOCK_MAPVAR, SUPER_BLOCK_GAMEFLAG) EVT_CALL(MakeEntity, 0x802EAA30, 472, 100, -100, 0, MAKE_ENTITY_END) EVT_CALL(AssignScript, EVT_PTR(N(80243DB0))) EVT_RETURN EVT_END }; -#include "world/common/SetOverrideFlags_40.inc.c" - -#include "world/common/UnkFunc17.inc.c" - -ApiStatus N(func_8024011C_CD1F4C)(Evt* script, s32 isInitialCall) { - entity_upgrade_block_hide_content(evt_get_variable(script, *script->ptrReadPos)); - return ApiStatus_DONE2; -} - -#include "world/common/UnkFunc18.inc.c" - -#ifdef NON_EQUIVALENT -typedef struct { - s32 unk_00[8]; - char unk_20[0x64]; - s32 unk_84[8]; - char unk_A4[0x64]; - s32 unk_108[8]; - char unk_128[0x64]; - s32 unk_18C[8]; - char unk_1AC[0x64]; - s32 unk_210[8]; - char unk_230[0x64]; - s32 unk_294[8]; - char unk_2B4[0x64]; - s32 unk_318; - char unk_31C[8]; - s32 unk_324; - s32 unk_328; - s16 unk_32C; -} N(UnkStruct); - -ApiStatus N(func_802402AC_CD20DC)(Evt* script, s32 isInitialCall) { - PlayerData* playerData = &gPlayerData; - N(UnkStruct)* ptr; - s32 i; - s32 partnerLevel; - s32 var, partnerActiveCount; - s32 idx; - - if (isInitialCall) { - script->functionTemp[2] = heap_malloc(0x330); - ptr = script->functionTemp[2]; - - partnerActiveCount = 0; - var = script->varTable[12] >= 0; - - for (i = 0; i < 8; i++) { - idx = N(D_80243708_CD5538)[i]; - - if (playerData->partners[idx].enabled) { - ptr->unk_108[i] = idx; - ptr->unk_84[i] = *gPartnerPopupProperties[idx]; - partnerLevel = N(UnkFunc37)(idx, var); - if (partnerLevel >= 0) { - ptr->unk_00[i] = wPartnerHudScripts[idx]; - ptr->unk_18C[i] = 1; - ptr->unk_294[i] = N(D_80243718_CD5548)[i][partnerLevel]; - } else { - ptr->unk_00[i] = wDisabledPartnerHudScripts[idx]; - ptr->unk_18C[i] = 0; - ptr->unk_294[i] = N(D_80243700_CD5530)[var]; - } - ptr->unk_210[i] = playerData->partners[idx].level; - partnerActiveCount++; - } - } - - ptr->unk_318 = 4; - ptr->unk_324 = partnerActiveCount; - ptr->unk_328 = 0; - create_popup_menu(ptr); - script->functionTemp[0] = 0; - } - - ptr = script->functionTemp[2]; - if (script->functionTemp[0] == 0) { - script->functionTemp[1] = ptr->unk_32C; - if (script->functionTemp[1] != 0) { - hide_popup_menu(); - } else { - return ApiStatus_BLOCK; - } - } - - script->functionTemp[0]++; - - if (script->functionTemp[0] < 15) { - return ApiStatus_BLOCK; - } - - destroy_popup_menu(); - if (script->functionTemp[1] != 0xFF) { - script->varTable[0] = gPartnerPopupProperties[ptr->unk_108[script->functionTemp[1] - 1]][0]; - script->varTable[1] = ptr->unk_108[script->functionTemp[1] - 1]; - } else { - script->varTable[0] = -1; - } - - heap_free(script->functionTemp[2]); - - return ApiStatus_DONE2; -} -#else -INCLUDE_ASM(ApiStatus, "world/area_flo/flo_16/CD1F10", flo_16_func_802402AC_CD20DC, Evt* script, - s32 isInitialCall); -#endif - -#include "world/common/SwitchToPartner.inc.c" - -#include "world/common/UnkFunc19.inc.c" - -#include "world/common/UnkFunc20.inc.c" - -#include "world/common/UnkFunc39.inc.c" - -#include "world/common/UnkFunc21.inc.c" - -#include "world/common/UnkFunc22.inc.c" - -#include "world/common/UnkFunc60.inc.c" - -#include "world/common/UnkFunc23.inc.c" - -#include "world/common/UnkPartnerPosFuncs.inc.c" - -#include "world/common/UnkFunc24.inc.c" +#include "world/common/atomic/SuperBlock.inc.c" #include "world/common/UnkFunc44.inc.c" diff --git a/src/world/area_flo/flo_16/flo_16.h b/src/world/area_flo/flo_16/flo_16.h index 61271e8dc5..72b6b41275 100644 --- a/src/world/area_flo/flo_16/flo_16.h +++ b/src/world/area_flo/flo_16/flo_16.h @@ -6,25 +6,8 @@ #define NAMESPACE flo_16 -ApiStatus N(SetOverrideFlags_40)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkFunc17)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkFunc18)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkFunc19)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkFunc20)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkFunc21)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkFunc22)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkFunc23)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkFunc24)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkFunc38)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkFunc39)(Evt* script, s32 isInitialCall); ApiStatus N(UnkFunc43)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkPartnerPosFunc)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkPartnerPosFunc2)(Evt* script, s32 isInitialCall); ApiStatus N(func_80240000_CD1E30)(Evt* script, s32 isInitialCall); -ApiStatus N(func_8024011C_CD1F4C)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802402AC_CD20DC)(Evt* script, s32 isInitialCall); -ApiStatus N(SwitchToPartner)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkFunc60)(Evt* script, s32 isInitialCall); ApiStatus N(UnkFunc44)(Evt* script, s32 isInitialCall); ApiStatus N(UnkNpcAIMainFunc10)(Evt* script, s32 isInitialCall); ApiStatus N(func_80242940_CD4770)(Evt* script, s32 isInitialCall); diff --git a/src/world/area_flo/flo_17/CD7350.c b/src/world/area_flo/flo_17/CD7350.c index 9b05a559e7..9b8ef9252d 100644 --- a/src/world/area_flo/flo_17/CD7350.c +++ b/src/world/area_flo/flo_17/CD7350.c @@ -37,7 +37,7 @@ EvtScript N(80243280) = { }; EvtScript N(802432F0) = { - EVT_SET_GROUP(11) + EVT_SET_GROUP(EVT_GROUP_B) EVT_SET(EVT_VAR(10), EVT_VAR(0)) EVT_SET(EVT_VAR(11), EVT_VAR(1)) EVT_SET(EVT_VAR(12), EVT_VAR(2)) diff --git a/src/world/area_flo/flo_18/CDC6A0.c b/src/world/area_flo/flo_18/CDC6A0.c index 9498840446..83f614155e 100644 --- a/src/world/area_flo/flo_18/CDC6A0.c +++ b/src/world/area_flo/flo_18/CDC6A0.c @@ -43,7 +43,7 @@ static s32 N(pad_8B8)[] = { }; EvtScript N(updateTexturePan_802408C0) = { - EVT_SET_GROUP(0) + EVT_SET_GROUP(EVT_GROUP_0) EVT_IF_EQ(EVT_VAR(5), 1) EVT_IF_EQ(EVT_VAR(6), 1) EVT_IF_EQ(EVT_VAR(7), 1) @@ -152,7 +152,7 @@ static s32 N(pad_E88)[] = { }; EvtScript N(80240E90) = { - EVT_SET_GROUP(11) + EVT_SET_GROUP(EVT_GROUP_B) EVT_LOOP(0) EVT_CALL(PlayEffect, 0x5E, 0, EVT_FIXED(-16.0), EVT_FIXED(102.0), EVT_FIXED(-4.1), EVT_FIXED(80.9), EVT_FIXED(102.0), EVT_FIXED(-4.1), EVT_FIXED(0.5), 6, 0, 0, 0, 0) EVT_CALL(N(func_80240340_CDC9E0)) diff --git a/src/world/area_flo/flo_19/CE36F0.c b/src/world/area_flo/flo_19/CE36F0.c index 4dfc90c51e..f40576454e 100644 --- a/src/world/area_flo/flo_19/CE36F0.c +++ b/src/world/area_flo/flo_19/CE36F0.c @@ -78,7 +78,7 @@ static s32 N(pad_AF4)[] = { }; EvtScript N(updateTexturePan_80240B00) = { - EVT_SET_GROUP(0) + EVT_SET_GROUP(EVT_GROUP_0) EVT_IF_EQ(EVT_VAR(5), 1) EVT_IF_EQ(EVT_VAR(6), 1) EVT_IF_EQ(EVT_VAR(7), 1) @@ -181,7 +181,7 @@ static s32 N(pad_1044)[] = { }; EvtScript N(80241050) = { - EVT_SET_GROUP(239) + EVT_SET_GROUP(EVT_GROUP_EF) EVT_SET(EVT_VAR(15), 0) EVT_LABEL(0) EVT_SETF(EVT_VAR(0), EVT_FIXED(-215.4375)) diff --git a/src/world/area_flo/flo_21/CE6700.c b/src/world/area_flo/flo_21/CE6700.c index f3a7f6fbe5..9e537e05b9 100644 --- a/src/world/area_flo/flo_21/CE6700.c +++ b/src/world/area_flo/flo_21/CE6700.c @@ -49,7 +49,7 @@ EvtScript N(80240D40) = { #include "world/common/StarSpiritEffectFunc.inc.c" EvtScript N(80240DA0) = { - EVT_SET_GROUP(0) + EVT_SET_GROUP(EVT_GROUP_0) EVT_IF_EQ(EVT_VAR(5), 1) EVT_IF_EQ(EVT_VAR(6), 1) EVT_IF_EQ(EVT_VAR(7), 1) diff --git a/src/world/area_flo/flo_23/CEE2A0.c b/src/world/area_flo/flo_23/CEE2A0.c index 0d78631560..246964fbd0 100644 --- a/src/world/area_flo/flo_23/CEE2A0.c +++ b/src/world/area_flo/flo_23/CEE2A0.c @@ -40,7 +40,7 @@ EvtScript N(80240D30) = { }; EvtScript N(80240DA0) = { - EVT_SET_GROUP(11) + EVT_SET_GROUP(EVT_GROUP_B) EVT_SET(EVT_VAR(10), EVT_VAR(0)) EVT_SET(EVT_VAR(11), EVT_VAR(1)) EVT_SET(EVT_VAR(12), EVT_VAR(2)) diff --git a/src/world/area_flo/flo_24/CF0980.c b/src/world/area_flo/flo_24/CF0980.c index 232d98319c..4a4058cbd6 100644 --- a/src/world/area_flo/flo_24/CF0980.c +++ b/src/world/area_flo/flo_24/CF0980.c @@ -29,7 +29,7 @@ EvtScript N(80240600) = { }; EvtScript N(80240690) = { - EVT_SET_GROUP(11) + EVT_SET_GROUP(EVT_GROUP_B) EVT_SET(EVT_VAR(10), EVT_VAR(0)) EVT_SET(EVT_VAR(11), EVT_VAR(1)) EVT_SET(EVT_VAR(12), EVT_VAR(2)) @@ -182,7 +182,7 @@ EvtScript N(80241728) = { }; EvtScript N(updateTexturePan_802417A0) = { - EVT_SET_GROUP(0) + EVT_SET_GROUP(EVT_GROUP_0) EVT_IF_EQ(EVT_VAR(5), 1) EVT_IF_EQ(EVT_VAR(6), 1) EVT_IF_EQ(EVT_VAR(7), 1) diff --git a/src/world/area_flo/flo_25/CF2C10.c b/src/world/area_flo/flo_25/CF2C10.c index 865e8be696..819db45a09 100644 --- a/src/world/area_flo/flo_25/CF2C10.c +++ b/src/world/area_flo/flo_25/CF2C10.c @@ -40,7 +40,7 @@ EvtScript N(80242330) = { }; EvtScript N(802423A0) = { - EVT_SET_GROUP(11) + EVT_SET_GROUP(EVT_GROUP_B) EVT_SET(EVT_VAR(10), EVT_VAR(0)) EVT_SET(EVT_VAR(11), EVT_VAR(1)) EVT_SET(EVT_VAR(12), EVT_VAR(2)) diff --git a/src/world/area_flo/flo_25/CF4BC0.c b/src/world/area_flo/flo_25/CF4BC0.c index 812096c81a..e2bd31fad0 100644 --- a/src/world/area_flo/flo_25/CF4BC0.c +++ b/src/world/area_flo/flo_25/CF4BC0.c @@ -53,7 +53,7 @@ static s32 N(pad_4734)[] = { }; EvtScript N(80244740) = { - EVT_SET_GROUP(11) + EVT_SET_GROUP(EVT_GROUP_B) EVT_SET(EVT_VAR(10), EVT_VAR(0)) EVT_SET(EVT_VAR(11), EVT_VAR(1)) EVT_SET(EVT_VAR(12), EVT_VAR(2)) diff --git a/src/world/area_gv/gv_01/E1E460.c b/src/world/area_gv/gv_01/E1E460.c index 60906273cb..19d15aaeb8 100644 --- a/src/world/area_gv/gv_01/E1E460.c +++ b/src/world/area_gv/gv_01/E1E460.c @@ -2,17 +2,7 @@ #include "sprite.h" #include "hud_element.h" -#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" - -#include "world/common/GetCurrentFloor.inc.c" - -#include "world/common/UnkFunc25.inc.c" - -#include "world/common/GetEntryPos.inc.c" - -#include "world/common/GetCurrentCameraYawClamped180.inc.c" - -#include "world/common/SomeXYZFunc2.inc.c" +#include "world/common/atomic/Pipe.inc.c" #include "world/common/UpdateTexturePan.inc.c" diff --git a/src/world/area_isk/isk_10/988B60.c b/src/world/area_isk/isk_10/988B60.c index bf167f8005..b6befc8ec2 100644 --- a/src/world/area_isk/isk_10/988B60.c +++ b/src/world/area_isk/isk_10/988B60.c @@ -5,34 +5,6 @@ static char* N(exit_str_1) = "isk_14"; static char* N(exit_str_2) = "isk_18"; static char* N(exit_str_3) = ""; -#include "world/common/SetOverrideFlags_40.inc.c" - -#include "world/common/UnkFunc17.inc.c" - -INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_8024003C_988B9C); - -#include "world/common/UnkFunc18.inc.c" - -INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_802401CC_988D2C); - -#include "world/common/SwitchToPartner.inc.c" - -#include "world/common/UnkFunc19.inc.c" - -#include "world/common/UnkFunc20.inc.c" - -#include "world/common/UnkFunc39.inc.c" - -#include "world/common/UnkFunc21.inc.c" - -#include "world/common/UnkFunc22.inc.c" - -#include "world/common/UnkFunc60.inc.c" - -#include "world/common/UnkFunc23.inc.c" - -#include "world/common/UnkPartnerPosFuncs.inc.c" - -#include "world/common/UnkFunc24.inc.c" +#include "world/common/atomic/SuperBlock.inc.c" INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_80240D38_989898); diff --git a/src/world/area_iwa/iwa_10/91E6D0.c b/src/world/area_iwa/iwa_10/91E6D0.c index f154e362a0..15397fc759 100644 --- a/src/world/area_iwa/iwa_10/91E6D0.c +++ b/src/world/area_iwa/iwa_10/91E6D0.c @@ -2,32 +2,4 @@ #include "common/UnkFloatFunc.inc.c" -#include "world/common/SetOverrideFlags_40.inc.c" - -#include "world/common/UnkFunc17.inc.c" - -INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_8024032C_91E89C); - -#include "world/common/UnkFunc18.inc.c" - -INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_802404BC_91EA2C); - -#include "world/common/SwitchToPartner.inc.c" - -#include "world/common/UnkFunc19.inc.c" - -#include "world/common/UnkFunc20.inc.c" - -#include "world/common/UnkFunc39.inc.c" - -#include "world/common/UnkFunc21.inc.c" - -#include "world/common/UnkFunc22.inc.c" - -#include "world/common/UnkFunc60.inc.c" - -#include "world/common/UnkFunc23.inc.c" - -#include "world/common/UnkPartnerPosFuncs.inc.c" - -#include "world/common/UnkFunc40.inc.c" +#include "world/common/atomic/SuperBlock.inc.c" diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c index e3e0070fd5..148e26b9c0 100644 --- a/src/world/area_jan/jan_03/B34BD0.c +++ b/src/world/area_jan/jan_03/B34BD0.c @@ -7,17 +7,7 @@ static char* N(exit_str_3) = ""; #define UNK_ALPHA_FUNC_NPC 17 -#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" - -#include "world/common/GetCurrentFloor.inc.c" - -#include "world/common/UnkFunc25.inc.c" - -#include "world/common/GetEntryPos.inc.c" - -#include "world/common/GetCurrentCameraYawClamped180.inc.c" - -#include "world/common/SomeXYZFunc2.inc.c" +#include "world/common/atomic/Pipe.inc.c" #include "world/common/UpdateTexturePan.inc.c" diff --git a/src/world/area_jan/jan_08/B5E910.c b/src/world/area_jan/jan_08/B5E910.c index 378846c156..2b3a3e4a0e 100644 --- a/src/world/area_jan/jan_08/B5E910.c +++ b/src/world/area_jan/jan_08/B5E910.c @@ -1,31 +1,3 @@ #include "jan_08.h" -#include "world/common/SetOverrideFlags_40.inc.c" - -#include "world/common/UnkFunc17.inc.c" - -INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E910", func_8024069C_B5E94C); - -#include "world/common/UnkFunc18.inc.c" - -INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E910", func_8024082C_B5EADC); - -#include "world/common/SwitchToPartner.inc.c" - -#include "world/common/UnkFunc19.inc.c" - -#include "world/common/UnkFunc20.inc.c" - -#include "world/common/UnkFunc39.inc.c" - -#include "world/common/UnkFunc21.inc.c" - -#include "world/common/UnkFunc22.inc.c" - -#include "world/common/UnkFunc60.inc.c" - -#include "world/common/UnkFunc23.inc.c" - -#include "world/common/UnkPartnerPosFuncs.inc.c" - -#include "world/common/UnkFunc40.inc.c" +#include "world/common/atomic/SuperBlock.inc.c" diff --git a/src/world/area_jan/jan_09/B65AB0.c b/src/world/area_jan/jan_09/B65AB0.c index c90a2f500b..64a0159d99 100644 --- a/src/world/area_jan/jan_09/B65AB0.c +++ b/src/world/area_jan/jan_09/B65AB0.c @@ -5,17 +5,7 @@ static char* N(exit_str_1) = "jan_08"; static char* N(exit_str_2) = "jan_06"; static char* N(exit_str_3) = "jan_11"; -#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" - -#include "world/common/GetCurrentFloor.inc.c" - -#include "world/common/UnkFunc25.inc.c" - -#include "world/common/GetEntryPos.inc.c" - -#include "world/common/GetCurrentCameraYawClamped180.inc.c" - -#include "world/common/SomeXYZFunc2.inc.c" +#include "world/common/atomic/Pipe.inc.c" #include "world/common/UpdateTexturePan.inc.c" diff --git a/src/world/area_jan/jan_11/B70860.c b/src/world/area_jan/jan_11/B70860.c index d926334888..58803d70f7 100644 --- a/src/world/area_jan/jan_11/B70860.c +++ b/src/world/area_jan/jan_11/B70860.c @@ -5,16 +5,6 @@ static char* N(exit_str_1) = ""; #include "world/common/DarkRoom.inc.c" -#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" - -#include "world/common/GetCurrentFloor.inc.c" - -#include "world/common/UnkFunc25.inc.c" - -#include "world/common/GetEntryPos.inc.c" - -#include "world/common/GetCurrentCameraYawClamped180.inc.c" - -#include "world/common/SomeXYZFunc2.inc.c" +#include "world/common/atomic/Pipe.inc.c" #include "world/common/UnkPosFunc2.inc.c" diff --git a/src/world/area_kmr/kmr_02/8B0070.c b/src/world/area_kmr/kmr_02/8B0070.c index a3fbf7de73..97cddf1b09 100644 --- a/src/world/area_kmr/kmr_02/8B0070.c +++ b/src/world/area_kmr/kmr_02/8B0070.c @@ -7,17 +7,7 @@ static char* N(exit_str_3) = ""; #define UNK_ALPHA_FUNC_NPC 8 -#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" - -#include "world/common/GetCurrentFloor.inc.c" - -#include "world/common/UnkFunc25.inc.c" - -#include "world/common/GetEntryPos.inc.c" - -#include "world/common/GetCurrentCameraYawClamped180.inc.c" - -#include "world/common/SomeXYZFunc2.inc.c" +#include "world/common/atomic/Pipe.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802402E0_8B0350); diff --git a/src/world/area_kmr/kmr_12/events.c b/src/world/area_kmr/kmr_12/events.c index 31ebaebc39..9d93f3da02 100644 --- a/src/world/area_kmr/kmr_12/events.c +++ b/src/world/area_kmr/kmr_12/events.c @@ -61,7 +61,7 @@ NpcSettings N(goombaNpcSettings) = { /// @bug Never returns EvtScript N(ReadWestSign) = { - EVT_SET_GROUP(0) + EVT_SET_GROUP(EVT_GROUP_0) // "Eat a Mushroom to regain your energy!" EVT_SUSPEND_GROUP(1) @@ -208,7 +208,7 @@ EvtScript N(ReadEastSign) = { EVT_IF_EQ(LW(0), 1) EVT_RETURN EVT_END_IF - EVT_SET_GROUP(0) + EVT_SET_GROUP(EVT_GROUP_0) EVT_CALL(SetTimeFreezeMode, 1) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(ShowMessageAtScreenPos, MSG_kmr_12_sign_to_fortress, 160, 40) diff --git a/src/world/area_kmr/kmr_20/8EBE50.c b/src/world/area_kmr/kmr_20/8EBE50.c index f26034ecd6..dbe55e4f05 100644 --- a/src/world/area_kmr/kmr_20/8EBE50.c +++ b/src/world/area_kmr/kmr_20/8EBE50.c @@ -1,16 +1,6 @@ #include "kmr_20.h" -#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" - -#include "world/common/GetCurrentFloor.inc.c" - -#include "world/common/UnkFunc25.inc.c" - -#include "world/common/GetEntryPos.inc.c" - -#include "world/common/GetCurrentCameraYawClamped180.inc.c" - -#include "world/common/SomeXYZFunc2.inc.c" +#include "world/common/atomic/Pipe.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_80240310_8EC130); diff --git a/src/world/area_kmr/kmr_20/8ED0C0.c b/src/world/area_kmr/kmr_20/8ED0C0.c index 23eee9b259..4979013df3 100644 --- a/src/world/area_kmr/kmr_20/8ED0C0.c +++ b/src/world/area_kmr/kmr_20/8ED0C0.c @@ -24,4 +24,4 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_8024159C_8ED3BC); INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_802415C4_8ED3E4); -#include "world/common/UnkFunc40.inc.c" +#include "world/common/WaitForPlayerToLand.inc.c" diff --git a/src/world/area_kmr/kmr_20/8ED5A0.c b/src/world/area_kmr/kmr_20/8ED5A0.c index 315cd657d8..4e9636f1e8 100644 --- a/src/world/area_kmr/kmr_20/8ED5A0.c +++ b/src/world/area_kmr/kmr_20/8ED5A0.c @@ -1,27 +1,7 @@ #include "kmr_20.h" #define NAMESPACE dup_kmr_20 -#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" -#define NAMESPACE kmr_20 - -#define NAMESPACE dup_kmr_20 -#include "world/common/GetCurrentFloor.inc.c" -#define NAMESPACE kmr_20 - -#define NAMESPACE dup_kmr_20 -#include "world/common/UnkFunc25.inc.c" -#define NAMESPACE kmr_20 - -#define NAMESPACE dup_kmr_20 -#include "world/common/GetEntryPos.inc.c" -#define NAMESPACE kmr_20 - -#define NAMESPACE dup_kmr_20 -#include "world/common/GetCurrentCameraYawClamped180.inc.c" -#define NAMESPACE kmr_20 - -#define NAMESPACE dup_kmr_20 -#include "world/common/SomeXYZFunc2.inc.c" +#include "world/common/atomic/Pipe.inc.c" #define NAMESPACE kmr_20 #define NAMESPACE dup3_kmr_20 diff --git a/src/world/area_kmr/kmr_20/8EDB70.c b/src/world/area_kmr/kmr_20/8EDB70.c index 3a7efcf821..39cb18a455 100644 --- a/src/world/area_kmr/kmr_20/8EDB70.c +++ b/src/world/area_kmr/kmr_20/8EDB70.c @@ -1,27 +1,7 @@ #include "kmr_20.h" #define NAMESPACE dup2_kmr_20 -#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" -#define NAMESPACE kmr_20 - -#define NAMESPACE dup2_kmr_20 -#include "world/common/GetCurrentFloor.inc.c" -#define NAMESPACE kmr_20 - -#define NAMESPACE dup2_kmr_20 -#include "world/common/UnkFunc25.inc.c" -#define NAMESPACE kmr_20 - -#define NAMESPACE dup2_kmr_20 -#include "world/common/GetEntryPos.inc.c" -#define NAMESPACE kmr_20 - -#define NAMESPACE dup2_kmr_20 -#include "world/common/GetCurrentCameraYawClamped180.inc.c" -#define NAMESPACE kmr_20 - -#define NAMESPACE dup2_kmr_20 -#include "world/common/SomeXYZFunc2.inc.c" +#include "world/common/atomic/Pipe.inc.c" #define NAMESPACE kmr_20 INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EDB70", func_80242030_8EDE50); diff --git a/src/world/area_kzn/kzn_04/C68440.c b/src/world/area_kzn/kzn_04/C68440.c index 29fd0bcd29..60d4907ca1 100644 --- a/src/world/area_kzn/kzn_04/C68440.c +++ b/src/world/area_kzn/kzn_04/C68440.c @@ -1,31 +1,4 @@ #include "kzn_04.h" -#include "world/common/SetOverrideFlags_40.inc.c" +#include "world/common/atomic/SuperBlock.inc.c" -#include "world/common/UnkFunc17.inc.c" - -INCLUDE_ASM(s32, "world/area_kzn/kzn_04/C68440", func_8024034C_C6847C); - -#include "world/common/UnkFunc18.inc.c" - -INCLUDE_ASM(s32, "world/area_kzn/kzn_04/C68440", func_802404DC_C6860C); - -#include "world/common/SwitchToPartner.inc.c" - -#include "world/common/UnkFunc19.inc.c" - -#include "world/common/UnkFunc20.inc.c" - -#include "world/common/UnkFunc39.inc.c" - -#include "world/common/UnkFunc21.inc.c" - -#include "world/common/UnkFunc22.inc.c" - -#include "world/common/UnkFunc60.inc.c" - -#include "world/common/UnkFunc23.inc.c" - -#include "world/common/UnkPartnerPosFuncs.inc.c" - -#include "world/common/UnkFunc40.inc.c" diff --git a/src/world/area_kzn/kzn_06/C6CC30.c b/src/world/area_kzn/kzn_06/C6CC30.c index e2fcbe9ee7..b4398efcb6 100644 --- a/src/world/area_kzn/kzn_06/C6CC30.c +++ b/src/world/area_kzn/kzn_06/C6CC30.c @@ -1,3 +1,4 @@ #include "kzn_06.h" +// push block gravity INCLUDE_ASM(s32, "world/area_kzn/kzn_06/C6CC30", func_80240310_C6CC30); diff --git a/src/world/area_kzn/kzn_07/C6EA50.c b/src/world/area_kzn/kzn_07/C6EA50.c index 3d9f6a9c45..d95799543b 100644 --- a/src/world/area_kzn/kzn_07/C6EA50.c +++ b/src/world/area_kzn/kzn_07/C6EA50.c @@ -1,5 +1,6 @@ #include "kzn_07.h" +// push block gravity INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_80240720_C6EA50); INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_802407F4_C6EB24); diff --git a/src/world/area_kzn/kzn_09/C76CE0.c b/src/world/area_kzn/kzn_09/C76CE0.c index 7045e2e8e5..e069c40c83 100644 --- a/src/world/area_kzn/kzn_09/C76CE0.c +++ b/src/world/area_kzn/kzn_09/C76CE0.c @@ -3,32 +3,5 @@ static char* N(exit_str_0) = "kzn_03"; static char* N(exit_str_1) = "kzn_10"; -#include "world/common/SetOverrideFlags_40.inc.c" +#include "world/common/atomic/SuperBlock.inc.c" -#include "world/common/UnkFunc17.inc.c" - -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C76CE0", func_8024003C_C76D1C); - -#include "world/common/UnkFunc18.inc.c" - -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C76CE0", func_802401CC_C76EAC); - -#include "world/common/SwitchToPartner.inc.c" - -#include "world/common/UnkFunc19.inc.c" - -#include "world/common/UnkFunc20.inc.c" - -#include "world/common/UnkFunc39.inc.c" - -#include "world/common/UnkFunc21.inc.c" - -#include "world/common/UnkFunc22.inc.c" - -#include "world/common/UnkFunc60.inc.c" - -#include "world/common/UnkFunc23.inc.c" - -#include "world/common/UnkPartnerPosFuncs.inc.c" - -#include "world/common/UnkFunc40.inc.c" diff --git a/src/world/area_mac/mac_00/7EAD10.c b/src/world/area_mac/mac_00/7EAD10.c index ac1f7eb091..6ea437cf0f 100644 --- a/src/world/area_mac/mac_00/7EAD10.c +++ b/src/world/area_mac/mac_00/7EAD10.c @@ -7,17 +7,7 @@ static char* N(exit_str_3) = "kmr_20"; static char* N(exit_str_4) = "mac_00"; static char* N(exit_str_5) = "\0\0\0\0"; -#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" - -#include "world/common/GetCurrentFloor.inc.c" - -#include "world/common/UnkFunc25.inc.c" - -#include "world/common/GetEntryPos.inc.c" - -#include "world/common/GetCurrentCameraYawClamped180.inc.c" - -#include "world/common/SomeXYZFunc2.inc.c" +#include "world/common/atomic/Pipe.inc.c" #include "world/common/UpdateTexturePan.inc.c" diff --git a/src/world/area_mac/mac_02/8232C0.c b/src/world/area_mac/mac_02/8232C0.c index 1ea3e6fa2d..b2286ff112 100644 --- a/src/world/area_mac/mac_02/8232C0.c +++ b/src/world/area_mac/mac_02/8232C0.c @@ -7,17 +7,7 @@ static char* N(exit_str_3) = "mac_03"; static char* N(exit_str_4) = "tik_06"; static char* N(exit_str_5) = "tik_15"; -#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" - -#include "world/common/GetCurrentFloor.inc.c" - -#include "world/common/UnkFunc25.inc.c" - -#include "world/common/GetEntryPos.inc.c" - -#include "world/common/GetCurrentCameraYawClamped180.inc.c" - -#include "world/common/SomeXYZFunc2.inc.c" +#include "world/common/atomic/Pipe.inc.c" #include "world/common/UpdateTexturePan.inc.c" diff --git a/src/world/area_mac/mac_03/831800.c b/src/world/area_mac/mac_03/831800.c index 0da2fc62b2..ad737ff399 100644 --- a/src/world/area_mac/mac_03/831800.c +++ b/src/world/area_mac/mac_03/831800.c @@ -5,16 +5,6 @@ static char* N(exit_str_1) = "mgm_00"; static char* N(exit_str_2) = "iwa_11"; static char* N(exit_str_3) = "mac_03"; -#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" - -#include "world/common/GetCurrentFloor.inc.c" - -#include "world/common/UnkFunc25.inc.c" - -#include "world/common/GetEntryPos.inc.c" - -#include "world/common/GetCurrentCameraYawClamped180.inc.c" - -#include "world/common/SomeXYZFunc2.inc.c" +#include "world/common/atomic/Pipe.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_03/831800", func_802402E0_831AE0); diff --git a/src/world/area_mgm/mgm_00/E0E7A0.c b/src/world/area_mgm/mgm_00/E0E7A0.c index f1d6a52842..95ed8b534a 100644 --- a/src/world/area_mgm/mgm_00/E0E7A0.c +++ b/src/world/area_mgm/mgm_00/E0E7A0.c @@ -5,17 +5,7 @@ static char* N(exit_str_1) = "mgm_01"; static char* N(exit_str_2) = "mgm_02"; static char* N(exit_str_3) = ""; -#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" - -#include "world/common/GetCurrentFloor.inc.c" - -#include "world/common/UnkFunc25.inc.c" - -#include "world/common/GetEntryPos.inc.c" - -#include "world/common/GetCurrentCameraYawClamped180.inc.c" - -#include "world/common/SomeXYZFunc2.inc.c" +#include "world/common/atomic/Pipe.inc.c" #include "world/common/UnkNpcAIFunc24.inc.c" diff --git a/src/world/area_mim/mim_11/BB7070.c b/src/world/area_mim/mim_11/BB7070.c index 5a309df61f..998b80fa30 100644 --- a/src/world/area_mim/mim_11/BB7070.c +++ b/src/world/area_mim/mim_11/BB7070.c @@ -7,17 +7,7 @@ static char* N(exit_str_3) = "obk_01"; static char* N(exit_str_4) = "tik_09"; static char* N(exit_str_5) = ""; -#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" - -#include "world/common/GetCurrentFloor.inc.c" - -#include "world/common/UnkFunc25.inc.c" - -#include "world/common/GetEntryPos.inc.c" - -#include "world/common/GetCurrentCameraYawClamped180.inc.c" - -#include "world/common/SomeXYZFunc2.inc.c" +#include "world/common/atomic/Pipe.inc.c" #include "world/common/UpdateTexturePan.inc.c" diff --git a/src/world/area_nok/nok_02/9D7020.c b/src/world/area_nok/nok_02/9D7020.c index 1541574e2b..d41f156505 100644 --- a/src/world/area_nok/nok_02/9D7020.c +++ b/src/world/area_nok/nok_02/9D7020.c @@ -5,17 +5,7 @@ static char* N(exit_str_1) = "nok_03"; static char* N(exit_str_2) = "tik_01"; static char* N(exit_str_3) = ""; -#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" - -#include "world/common/GetCurrentFloor.inc.c" - -#include "world/common/UnkFunc25.inc.c" - -#include "world/common/GetEntryPos.inc.c" - -#include "world/common/GetCurrentCameraYawClamped180.inc.c" - -#include "world/common/SomeXYZFunc2.inc.c" +#include "world/common/atomic/Pipe.inc.c" #include "world/common/StashVars.inc.c" diff --git a/src/world/area_nok/nok_15/A06F00.c b/src/world/area_nok/nok_15/A06F00.c index 0a414d70a7..039483dc52 100644 --- a/src/world/area_nok/nok_15/A06F00.c +++ b/src/world/area_nok/nok_15/A06F00.c @@ -5,17 +5,7 @@ static char* N(exit_str_1) = "trd_00"; static char* N(exit_str_2) = "nok_15"; static char* N(exit_str_3) = ""; -#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" - -#include "world/common/GetCurrentFloor.inc.c" - -#include "world/common/UnkFunc25.inc.c" - -#include "world/common/GetEntryPos.inc.c" - -#include "world/common/GetCurrentCameraYawClamped180.inc.c" - -#include "world/common/SomeXYZFunc2.inc.c" +#include "world/common/atomic/Pipe.inc.c" #include "world/common/set_script_owner_npc_anim.inc.c" diff --git a/src/world/area_omo/omo_11/DDCFC0.c b/src/world/area_omo/omo_11/DDCFC0.c index 5473b70248..2b68c568a7 100644 --- a/src/world/area_omo/omo_11/DDCFC0.c +++ b/src/world/area_omo/omo_11/DDCFC0.c @@ -1,31 +1,3 @@ #include "omo_11.h" -#include "world/common/SetOverrideFlags_40.inc.c" - -#include "world/common/UnkFunc17.inc.c" - -INCLUDE_ASM(s32, "world/area_omo/omo_11/DDCFC0", func_802407CC_DDCFFC); - -#include "world/common/UnkFunc18.inc.c" - -INCLUDE_ASM(s32, "world/area_omo/omo_11/DDCFC0", func_8024095C_DDD18C); - -#include "world/common/SwitchToPartner.inc.c" - -#include "world/common/UnkFunc19.inc.c" - -#include "world/common/UnkFunc20.inc.c" - -#include "world/common/UnkFunc39.inc.c" - -#include "world/common/UnkFunc21.inc.c" - -#include "world/common/UnkFunc22.inc.c" - -#include "world/common/UnkFunc60.inc.c" - -#include "world/common/UnkFunc23.inc.c" - -#include "world/common/UnkPartnerPosFuncs.inc.c" - -#include "world/common/UnkFunc40.inc.c" +#include "world/common/atomic/SuperBlock.inc.c" diff --git a/src/world/area_pra/pra_01/D4D060.c b/src/world/area_pra/pra_01/D4D060.c index e11b112527..d93d59ddf4 100644 --- a/src/world/area_pra/pra_01/D4D060.c +++ b/src/world/area_pra/pra_01/D4D060.c @@ -1,6 +1,6 @@ #include "pra_01.h" -#include "world/common/reflection.inc.c" +#include "world/common/atomic/Reflection.inc.c" #include "common/UnkFogFunc.inc.c" diff --git a/src/world/area_pra/pra_02/D50010.c b/src/world/area_pra/pra_02/D50010.c index a4e09aa9b1..f0b1bdcfa5 100644 --- a/src/world/area_pra/pra_02/D50010.c +++ b/src/world/area_pra/pra_02/D50010.c @@ -1,6 +1,6 @@ #include "pra_02.h" -#include "world/common/reflection.inc.c" +#include "world/common/atomic/Reflection.inc.c" #include "world/common/GetNpcCollisionHeight.inc.c" diff --git a/src/world/area_pra/pra_05/D55BD0.c b/src/world/area_pra/pra_05/D55BD0.c index c8dbd5cd9a..bd7d56999c 100644 --- a/src/world/area_pra/pra_05/D55BD0.c +++ b/src/world/area_pra/pra_05/D55BD0.c @@ -1,6 +1,6 @@ #include "pra_05.h" -#include "world/common/reflection.inc.c" +#include "world/common/atomic/Reflection.inc.c" #include "world/common/StashVars.inc.c" diff --git a/src/world/area_pra/pra_06/D57430.c b/src/world/area_pra/pra_06/D57430.c index 8dccbc439c..cdedabf880 100644 --- a/src/world/area_pra/pra_06/D57430.c +++ b/src/world/area_pra/pra_06/D57430.c @@ -2,4 +2,4 @@ INCLUDE_ASM(s32, "world/area_pra/pra_06/D57430", func_80240000_D57430); -#include "world/common/reflection.inc.c" +#include "world/common/atomic/Reflection.inc.c" diff --git a/src/world/area_pra/pra_09/D588B0.c b/src/world/area_pra/pra_09/D588B0.c index 69461cc700..29312ea722 100644 --- a/src/world/area_pra/pra_09/D588B0.c +++ b/src/world/area_pra/pra_09/D588B0.c @@ -1,6 +1,6 @@ #include "pra_09.h" -#include "world/common/reflection.inc.c" +#include "world/common/atomic/Reflection.inc.c" #include "world/common/GetNpcCollisionHeight.inc.c" diff --git a/src/world/area_pra/pra_10/D5F2D0.c b/src/world/area_pra/pra_10/D5F2D0.c index 88921736a6..2e3c6cd52c 100644 --- a/src/world/area_pra/pra_10/D5F2D0.c +++ b/src/world/area_pra/pra_10/D5F2D0.c @@ -1,5 +1,5 @@ #include "pra_10.h" -#include "world/common/reflection.inc.c" +#include "world/common/atomic/Reflection.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_10/D5F2D0", func_80240F20_D601D0); diff --git a/src/world/area_pra/pra_11/D61520.c b/src/world/area_pra/pra_11/D61520.c index b623da40a2..88fe610e64 100644 --- a/src/world/area_pra/pra_11/D61520.c +++ b/src/world/area_pra/pra_11/D61520.c @@ -1,6 +1,6 @@ #include "pra_11.h" -#include "world/common/reflection.inc.c" +#include "world/common/atomic/Reflection.inc.c" #include "world/common/StashVars.inc.c" diff --git a/src/world/area_pra/pra_12/D62D10.c b/src/world/area_pra/pra_12/D62D10.c index ed2b705e70..84130ff03e 100644 --- a/src/world/area_pra/pra_12/D62D10.c +++ b/src/world/area_pra/pra_12/D62D10.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_12/D62D10", func_80240000_D62D10); -#include "world/common/reflection.inc.c" +#include "world/common/atomic/Reflection.inc.c" #include "world/common/StashVars.inc.c" diff --git a/src/world/area_pra/pra_13/D64600.c b/src/world/area_pra/pra_13/D64600.c index ea6c7a073d..8a9b9102c1 100644 --- a/src/world/area_pra/pra_13/D64600.c +++ b/src/world/area_pra/pra_13/D64600.c @@ -1,6 +1,6 @@ #include "pra_13.h" -#include "world/common/reflection.inc.c" +#include "world/common/atomic/Reflection.inc.c" #include "world/common/GetNpcCollisionHeight.inc.c" diff --git a/src/world/area_pra/pra_14/D67D20.c b/src/world/area_pra/pra_14/D67D20.c index a5428649a7..802fcd5325 100644 --- a/src/world/area_pra/pra_14/D67D20.c +++ b/src/world/area_pra/pra_14/D67D20.c @@ -1,6 +1,6 @@ #include "pra_14.h" -#include "world/common/reflection.inc.c" +#include "world/common/atomic/Reflection.inc.c" #include "world/common/StashVars.inc.c" diff --git a/src/world/area_pra/pra_16/D69B40.c b/src/world/area_pra/pra_16/D69B40.c index 95947ee932..6bc2ddf01e 100644 --- a/src/world/area_pra/pra_16/D69B40.c +++ b/src/world/area_pra/pra_16/D69B40.c @@ -1,3 +1,3 @@ #include "pra_16.h" -#include "world/common/reflection.inc.c" +#include "world/common/atomic/Reflection.inc.c" diff --git a/src/world/area_pra/pra_18/D6B640.c b/src/world/area_pra/pra_18/D6B640.c index cd59d0e025..a2502f539e 100644 --- a/src/world/area_pra/pra_18/D6B640.c +++ b/src/world/area_pra/pra_18/D6B640.c @@ -1,3 +1,3 @@ #include "pra_18.h" -#include "world/common/reflection.inc.c" +#include "world/common/atomic/Reflection.inc.c" diff --git a/src/world/area_pra/pra_19/D6E9D0.c b/src/world/area_pra/pra_19/D6E9D0.c index a96745f449..ceeb9ede7e 100644 --- a/src/world/area_pra/pra_19/D6E9D0.c +++ b/src/world/area_pra/pra_19/D6E9D0.c @@ -1,6 +1,6 @@ #include "pra_19.h" -#include "world/common/reflection.inc.c" +#include "world/common/atomic/Reflection.inc.c" #include "world/common/GetNpcCollisionHeight.inc.c" diff --git a/src/world/area_pra/pra_20/D763C0.c b/src/world/area_pra/pra_20/D763C0.c index 8d7c7c9799..853d2c4d4b 100644 --- a/src/world/area_pra/pra_20/D763C0.c +++ b/src/world/area_pra/pra_20/D763C0.c @@ -1,3 +1,3 @@ #include "pra_20.h" -#include "world/common/reflection.inc.c" +#include "world/common/atomic/Reflection.inc.c" diff --git a/src/world/area_pra/pra_27/D799F0.c b/src/world/area_pra/pra_27/D799F0.c index c5742f3aa4..de21bcf4fb 100644 --- a/src/world/area_pra/pra_27/D799F0.c +++ b/src/world/area_pra/pra_27/D799F0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_27/D799F0", func_80240000_D799F0); -#include "world/common/reflection.inc.c" +#include "world/common/atomic/Reflection.inc.c" #include "world/common/StashVars.inc.c" diff --git a/src/world/area_pra/pra_28/D7B2A0.c b/src/world/area_pra/pra_28/D7B2A0.c index d319a55de8..b0fd97467e 100644 --- a/src/world/area_pra/pra_28/D7B2A0.c +++ b/src/world/area_pra/pra_28/D7B2A0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_28/D7B2A0", func_80240000_D7B2A0); -#include "world/common/reflection.inc.c" +#include "world/common/atomic/Reflection.inc.c" #include "world/common/StashVars.inc.c" diff --git a/src/world/area_pra/pra_29/D7CB70.c b/src/world/area_pra/pra_29/D7CB70.c index d9c69d0f39..dbda527863 100644 --- a/src/world/area_pra/pra_29/D7CB70.c +++ b/src/world/area_pra/pra_29/D7CB70.c @@ -1,6 +1,6 @@ #include "pra_29.h" -#include "world/common/reflection.inc.c" +#include "world/common/atomic/Reflection.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_29/D7CB70", func_80240F20_D7DA70); diff --git a/src/world/area_pra/pra_33/D89700.c b/src/world/area_pra/pra_33/D89700.c index 84cec471ac..4546a46708 100644 --- a/src/world/area_pra/pra_33/D89700.c +++ b/src/world/area_pra/pra_33/D89700.c @@ -1,6 +1,6 @@ #include "pra_33.h" -#include "world/common/reflection.inc.c" +#include "world/common/atomic/Reflection.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_33/D89700", func_80240F20_D8A600); diff --git a/src/world/area_pra/pra_34/D8B3D0.c b/src/world/area_pra/pra_34/D8B3D0.c index 18f8c5a1dd..1c768bd9d6 100644 --- a/src/world/area_pra/pra_34/D8B3D0.c +++ b/src/world/area_pra/pra_34/D8B3D0.c @@ -1,6 +1,6 @@ #include "pra_34.h" -#include "world/common/reflection.inc.c" +#include "world/common/atomic/Reflection.inc.c" #include "world/common/SetEntityFlags100000.inc.c" diff --git a/src/world/area_pra/pra_35/D8D270.c b/src/world/area_pra/pra_35/D8D270.c index ebe4ef0adf..a404e2d81b 100644 --- a/src/world/area_pra/pra_35/D8D270.c +++ b/src/world/area_pra/pra_35/D8D270.c @@ -1,6 +1,6 @@ #include "pra_35.h" -#include "world/common/reflection.inc.c" +#include "world/common/atomic/Reflection.inc.c" #include "world/common/UnkNpcAIFunc24.inc.c" diff --git a/src/world/area_pra/pra_36/D91700.c b/src/world/area_pra/pra_36/D91700.c index 947bd2e044..6c8660e973 100644 --- a/src/world/area_pra/pra_36/D91700.c +++ b/src/world/area_pra/pra_36/D91700.c @@ -2,4 +2,4 @@ INCLUDE_ASM(s32, "world/area_pra/pra_36/D91700", func_80240000_D91700); -#include "world/common/reflection.inc.c" +#include "world/common/atomic/Reflection.inc.c" diff --git a/src/world/area_pra/pra_37/D92F40.c b/src/world/area_pra/pra_37/D92F40.c index 0973bf5125..86acc38675 100644 --- a/src/world/area_pra/pra_37/D92F40.c +++ b/src/world/area_pra/pra_37/D92F40.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_37/D92F40", func_80240000_D92F40); -#include "world/common/reflection.inc.c" +#include "world/common/atomic/Reflection.inc.c" #include "world/common/UnkNpcAIFunc6.inc.c" diff --git a/src/world/area_pra/pra_38/D955F0.c b/src/world/area_pra/pra_38/D955F0.c index 3546bcfc23..ee4030554a 100644 --- a/src/world/area_pra/pra_38/D955F0.c +++ b/src/world/area_pra/pra_38/D955F0.c @@ -2,6 +2,6 @@ INCLUDE_ASM(s32, "world/area_pra/pra_38/D955F0", func_80240000_D955F0); -#include "world/common/reflection.inc.c" +#include "world/common/atomic/Reflection.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_38/D955F0", func_80240F50_D96540); diff --git a/src/world/area_pra/pra_39/D97890.c b/src/world/area_pra/pra_39/D97890.c index ff0664a9ac..2e69615c36 100644 --- a/src/world/area_pra/pra_39/D97890.c +++ b/src/world/area_pra/pra_39/D97890.c @@ -2,6 +2,6 @@ INCLUDE_ASM(s32, "world/area_pra/pra_39/D97890", func_80240000_D97890); -#include "world/common/reflection.inc.c" +#include "world/common/atomic/Reflection.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_39/D97890", func_80240F50_D987E0); diff --git a/src/world/area_pra/pra_40/D999D0.c b/src/world/area_pra/pra_40/D999D0.c index e6e3558632..05cee079cf 100644 --- a/src/world/area_pra/pra_40/D999D0.c +++ b/src/world/area_pra/pra_40/D999D0.c @@ -1,3 +1,3 @@ #include "pra_40.h" -#include "world/common/reflection.inc.c" +#include "world/common/atomic/Reflection.inc.c" diff --git a/src/world/area_sam/sam_02/D05730.c b/src/world/area_sam/sam_02/D05730.c index 89ed333a98..53c517790b 100644 --- a/src/world/area_sam/sam_02/D05730.c +++ b/src/world/area_sam/sam_02/D05730.c @@ -5,17 +5,7 @@ static char* N(exit_str_1) = "sam_11"; static char* N(exit_str_2) = "tik_17"; static char* N(exit_str_3) = ""; -#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" - -#include "world/common/GetCurrentFloor.inc.c" - -#include "world/common/UnkFunc25.inc.c" - -#include "world/common/GetEntryPos.inc.c" - -#include "world/common/GetCurrentCameraYawClamped180.inc.c" - -#include "world/common/SomeXYZFunc2.inc.c" +#include "world/common/atomic/Pipe.inc.c" #include "world/common/UpdateTexturePan.inc.c" diff --git a/src/world/area_sam/sam_08/D2FC80.c b/src/world/area_sam/sam_08/D2FC80.c index cdad7e6edd..207b23a826 100644 --- a/src/world/area_sam/sam_08/D2FC80.c +++ b/src/world/area_sam/sam_08/D2FC80.c @@ -3,32 +3,4 @@ static char* N(exit_str_0) = "sam_07"; static char* N(exit_str_1) = "sam_09"; -#include "world/common/SetOverrideFlags_40.inc.c" - -#include "world/common/UnkFunc17.inc.c" - -INCLUDE_ASM(s32, "world/area_sam/sam_08/D2FC80", func_8024003C_D2FCBC); - -#include "world/common/UnkFunc18.inc.c" - -INCLUDE_ASM(s32, "world/area_sam/sam_08/D2FC80", func_802401CC_D2FE4C); - -#include "world/common/SwitchToPartner.inc.c" - -#include "world/common/UnkFunc19.inc.c" - -#include "world/common/UnkFunc20.inc.c" - -#include "world/common/UnkFunc39.inc.c" - -#include "world/common/UnkFunc21.inc.c" - -#include "world/common/UnkFunc22.inc.c" - -#include "world/common/UnkFunc60.inc.c" - -#include "world/common/UnkFunc23.inc.c" - -#include "world/common/UnkPartnerPosFuncs.inc.c" - -#include "world/common/UnkFunc40.inc.c" +#include "world/common/atomic/SuperBlock.inc.c" diff --git a/src/world/area_sbk/sbk_56/953FC0.c b/src/world/area_sbk/sbk_56/953FC0.c index 6c10290b45..afb17d9d3a 100644 --- a/src/world/area_sbk/sbk_56/953FC0.c +++ b/src/world/area_sbk/sbk_56/953FC0.c @@ -11,32 +11,4 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_80240038_953FF8); INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_8024005C_95401C); -#include "world/common/SetOverrideFlags_40.inc.c" - -#include "world/common/UnkFunc17.inc.c" - -INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_802400BC_95407C); - -#include "world/common/UnkFunc18.inc.c" - -INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_8024024C_95420C); - -#include "world/common/SwitchToPartner.inc.c" - -#include "world/common/UnkFunc19.inc.c" - -#include "world/common/UnkFunc20.inc.c" - -#include "world/common/UnkFunc39.inc.c" - -#include "world/common/UnkFunc21.inc.c" - -#include "world/common/UnkFunc22.inc.c" - -#include "world/common/UnkFunc60.inc.c" - -#include "world/common/UnkFunc23.inc.c" - -#include "world/common/UnkPartnerPosFuncs.inc.c" - -#include "world/common/UnkFunc40.inc.c" +#include "world/common/atomic/SuperBlock.inc.c" diff --git a/src/world/area_tik/tik_01/8694B0.c b/src/world/area_tik/tik_01/8694B0.c index 41f9507a13..9fd4b399bc 100644 --- a/src/world/area_tik/tik_01/8694B0.c +++ b/src/world/area_tik/tik_01/8694B0.c @@ -9,14 +9,4 @@ static char* N(exit_str_5) = ""; #include "world/common/UpdateTexturePan.inc.c" -#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" - -#include "world/common/GetCurrentFloor.inc.c" - -#include "world/common/UnkFunc25.inc.c" - -#include "world/common/GetEntryPos.inc.c" - -#include "world/common/GetCurrentCameraYawClamped180.inc.c" - -#include "world/common/SomeXYZFunc2.inc.c" +#include "world/common/atomic/Pipe.inc.c" diff --git a/src/world/area_tik/tik_03/86EB00.c b/src/world/area_tik/tik_03/86EB00.c index 857de7d22c..d89f71c4be 100644 --- a/src/world/area_tik/tik_03/86EB00.c +++ b/src/world/area_tik/tik_03/86EB00.c @@ -5,17 +5,7 @@ static char* N(exit_str_1) = "tik_04"; static char* N(exit_str_2) = "tik_03"; static char* N(exit_str_3) = ""; -#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" - -#include "world/common/GetCurrentFloor.inc.c" - -#include "world/common/UnkFunc25.inc.c" - -#include "world/common/GetEntryPos.inc.c" - -#include "world/common/GetCurrentCameraYawClamped180.inc.c" - -#include "world/common/SomeXYZFunc2.inc.c" +#include "world/common/atomic/Pipe.inc.c" #include "world/common/UpdateTexturePan.inc.c" diff --git a/src/world/area_tik/tik_04/871A30.c b/src/world/area_tik/tik_04/871A30.c index e2f0cdd15c..861e63d186 100644 --- a/src/world/area_tik/tik_04/871A30.c +++ b/src/world/area_tik/tik_04/871A30.c @@ -7,14 +7,4 @@ static char* N(exit_str_3) = "tik_12"; #include "world/common/UpdateTexturePan.inc.c" -#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" - -#include "world/common/GetCurrentFloor.inc.c" - -#include "world/common/UnkFunc25.inc.c" - -#include "world/common/GetEntryPos.inc.c" - -#include "world/common/GetCurrentCameraYawClamped180.inc.c" - -#include "world/common/SomeXYZFunc2.inc.c" +#include "world/common/atomic/Pipe.inc.c" diff --git a/src/world/area_tik/tik_06/876EE0.c b/src/world/area_tik/tik_06/876EE0.c index def4ea637d..723232327c 100644 --- a/src/world/area_tik/tik_06/876EE0.c +++ b/src/world/area_tik/tik_06/876EE0.c @@ -7,17 +7,7 @@ static char* N(exit_str_3) = "tik_08"; static char* N(exit_str_4) = "tik_08\0"; static char* N(exit_str_5) = ""; -#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" - -#include "world/common/GetCurrentFloor.inc.c" - -#include "world/common/UnkFunc25.inc.c" - -#include "world/common/GetEntryPos.inc.c" - -#include "world/common/GetCurrentCameraYawClamped180.inc.c" - -#include "world/common/SomeXYZFunc2.inc.c" +#include "world/common/atomic/Pipe.inc.c" #include "world/common/UpdateTexturePan.inc.c" diff --git a/src/world/area_tik/tik_07/879BE0.c b/src/world/area_tik/tik_07/879BE0.c index ceb87f4e52..1c723c2b1c 100644 --- a/src/world/area_tik/tik_07/879BE0.c +++ b/src/world/area_tik/tik_07/879BE0.c @@ -3,44 +3,6 @@ static char* N(exit_str_0) = "tik_04"; static char* N(exit_str_1) = "tik_07"; -#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" +#include "world/common/atomic/Pipe.inc.c" -#include "world/common/GetCurrentFloor.inc.c" - -#include "world/common/UnkFunc25.inc.c" - -#include "world/common/GetEntryPos.inc.c" - -#include "world/common/GetCurrentCameraYawClamped180.inc.c" - -#include "world/common/SomeXYZFunc2.inc.c" - -#include "world/common/SetOverrideFlags_40.inc.c" - -#include "world/common/UnkFunc17.inc.c" - -INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_8024031C_879EFC); - -#include "world/common/UnkFunc18.inc.c" - -INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_802404AC_87A08C); - -#include "world/common/SwitchToPartner.inc.c" - -#include "world/common/UnkFunc19.inc.c" - -#include "world/common/UnkFunc20.inc.c" - -#include "world/common/UnkFunc39.inc.c" - -#include "world/common/UnkFunc21.inc.c" - -#include "world/common/UnkFunc22.inc.c" - -#include "world/common/UnkFunc60.inc.c" - -#include "world/common/UnkFunc23.inc.c" - -#include "world/common/UnkPartnerPosFuncs.inc.c" - -#include "world/common/UnkFunc40.inc.c" +#include "world/common/atomic/SuperBlock.inc.c" diff --git a/src/world/area_tik/tik_08/87EDF0.c b/src/world/area_tik/tik_08/87EDF0.c index 13902d86af..3a9af7ef94 100644 --- a/src/world/area_tik/tik_08/87EDF0.c +++ b/src/world/area_tik/tik_08/87EDF0.c @@ -5,17 +5,7 @@ static char* N(exit_str_1) = "tik_20"; static char* N(exit_str_2) = "tik_06"; static char* N(exit_str_3) = "jan_03"; -#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" - -#include "world/common/GetCurrentFloor.inc.c" - -#include "world/common/UnkFunc25.inc.c" - -#include "world/common/GetEntryPos.inc.c" - -#include "world/common/GetCurrentCameraYawClamped180.inc.c" - -#include "world/common/SomeXYZFunc2.inc.c" +#include "world/common/atomic/Pipe.inc.c" #include "world/common/UpdateTexturePan.inc.c" diff --git a/src/world/area_tik/tik_09/8821C0.c b/src/world/area_tik/tik_09/8821C0.c index 7a7bda29e6..f6b1b8f3d9 100644 --- a/src/world/area_tik/tik_09/8821C0.c +++ b/src/world/area_tik/tik_09/8821C0.c @@ -5,17 +5,7 @@ static char* N(exit_str_1) = "tik_08"; static char* N(exit_str_2) = "mim_11"; static char* N(exit_str_3) = ""; -#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" - -#include "world/common/GetCurrentFloor.inc.c" - -#include "world/common/UnkFunc25.inc.c" - -#include "world/common/GetEntryPos.inc.c" - -#include "world/common/GetCurrentCameraYawClamped180.inc.c" - -#include "world/common/SomeXYZFunc2.inc.c" +#include "world/common/atomic/Pipe.inc.c" #include "world/common/UpdateTexturePan.inc.c" diff --git a/src/world/area_tik/tik_10/8866D0.c b/src/world/area_tik/tik_10/8866D0.c index af98ebaf50..c4d202e5f2 100644 --- a/src/world/area_tik/tik_10/8866D0.c +++ b/src/world/area_tik/tik_10/8866D0.c @@ -2,32 +2,4 @@ #include "world/common/UnkPosFunc2.inc.c" -#include "world/common/SetOverrideFlags_40.inc.c" - -#include "world/common/UnkFunc17.inc.c" - -INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_802406BC_886A7C); - -#include "world/common/UnkFunc18.inc.c" - -INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_8024084C_886C0C); - -#include "world/common/SwitchToPartner.inc.c" - -#include "world/common/UnkFunc19.inc.c" - -#include "world/common/UnkFunc20.inc.c" - -#include "world/common/UnkFunc39.inc.c" - -#include "world/common/UnkFunc21.inc.c" - -#include "world/common/UnkFunc22.inc.c" - -#include "world/common/UnkFunc60.inc.c" - -#include "world/common/UnkFunc23.inc.c" - -#include "world/common/UnkPartnerPosFuncs.inc.c" - -#include "world/common/UnkFunc40.inc.c" +#include "world/common/atomic/SuperBlock.inc.c" diff --git a/src/world/area_tik/tik_12/888BD0.c b/src/world/area_tik/tik_12/888BD0.c index 27765d2218..a4a0221f1b 100644 --- a/src/world/area_tik/tik_12/888BD0.c +++ b/src/world/area_tik/tik_12/888BD0.c @@ -3,17 +3,7 @@ static char* N(exit_str_0) = "tik_04"; static char* N(exit_str_1) = ""; -#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" - -#include "world/common/GetCurrentFloor.inc.c" - -#include "world/common/UnkFunc25.inc.c" - -#include "world/common/GetEntryPos.inc.c" - -#include "world/common/GetCurrentCameraYawClamped180.inc.c" - -#include "world/common/SomeXYZFunc2.inc.c" +#include "world/common/atomic/Pipe.inc.c" #include "world/common/UpdateTexturePan.inc.c" diff --git a/src/world/area_tik/tik_12/8891C0.c b/src/world/area_tik/tik_12/8891C0.c index 9ebe4678fd..ca4eabdbd4 100644 --- a/src/world/area_tik/tik_12/8891C0.c +++ b/src/world/area_tik/tik_12/8891C0.c @@ -10,32 +10,4 @@ #include "world/common/CheckItemFlags40.inc.c" -#include "world/common/SetOverrideFlags_40.inc.c" - -#include "world/common/UnkFunc17.inc.c" - -INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80240C58_889828); - -#include "world/common/UnkFunc18.inc.c" - -INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80240DE8_8899B8); - -#include "world/common/SwitchToPartner.inc.c" - -#include "world/common/UnkFunc19.inc.c" - -#include "world/common/UnkFunc20.inc.c" - -#include "world/common/UnkFunc39.inc.c" - -#include "world/common/UnkFunc21.inc.c" - -#include "world/common/UnkFunc22.inc.c" - -#include "world/common/UnkFunc60.inc.c" - -#include "world/common/UnkFunc23.inc.c" - -#include "world/common/UnkPartnerPosFuncs.inc.c" - -#include "world/common/UnkFunc40.inc.c" +#include "world/common/atomic/SuperBlock.inc.c" diff --git a/src/world/area_tik/tik_14/88D600.c b/src/world/area_tik/tik_14/88D600.c index 4079be1269..81893df338 100644 --- a/src/world/area_tik/tik_14/88D600.c +++ b/src/world/area_tik/tik_14/88D600.c @@ -3,17 +3,7 @@ static char* N(exit_str_0) = "tik_15"; static char* N(exit_str_1) = "tik_21"; -#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" - -#include "world/common/GetCurrentFloor.inc.c" - -#include "world/common/UnkFunc25.inc.c" - -#include "world/common/GetEntryPos.inc.c" - -#include "world/common/GetCurrentCameraYawClamped180.inc.c" - -#include "world/common/SomeXYZFunc2.inc.c" +#include "world/common/atomic/Pipe.inc.c" #include "world/common/UpdateTexturePan.inc.c" diff --git a/src/world/area_tik/tik_15/88FBA0.c b/src/world/area_tik/tik_15/88FBA0.c index bfe313aa66..e221a92181 100644 --- a/src/world/area_tik/tik_15/88FBA0.c +++ b/src/world/area_tik/tik_15/88FBA0.c @@ -3,17 +3,7 @@ static char* N(exit_str_0) = "tik_14"; static char* N(exit_str_1) = "mac_02"; -#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" - -#include "world/common/GetCurrentFloor.inc.c" - -#include "world/common/UnkFunc25.inc.c" - -#include "world/common/GetEntryPos.inc.c" - -#include "world/common/GetCurrentCameraYawClamped180.inc.c" - -#include "world/common/SomeXYZFunc2.inc.c" +#include "world/common/atomic/Pipe.inc.c" #include "world/common/UpdateTexturePan.inc.c" diff --git a/src/world/area_tik/tik_17/892A50.c b/src/world/area_tik/tik_17/892A50.c index 1c7123a128..d26467ca44 100644 --- a/src/world/area_tik/tik_17/892A50.c +++ b/src/world/area_tik/tik_17/892A50.c @@ -1,31 +1,3 @@ #include "tik_17.h" -#include "world/common/SetOverrideFlags_40.inc.c" - -#include "world/common/UnkFunc17.inc.c" - -INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_8024006C_892A8C); - -#include "world/common/UnkFunc18.inc.c" - -INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_802401FC_892C1C); - -#include "world/common/SwitchToPartner.inc.c" - -#include "world/common/UnkFunc19.inc.c" - -#include "world/common/UnkFunc20.inc.c" - -#include "world/common/UnkFunc39.inc.c" - -#include "world/common/UnkFunc21.inc.c" - -#include "world/common/UnkFunc22.inc.c" - -#include "world/common/UnkFunc60.inc.c" - -#include "world/common/UnkFunc23.inc.c" - -#include "world/common/UnkPartnerPosFuncs.inc.c" - -#include "world/common/UnkFunc40.inc.c" +#include "world/common/atomic/SuperBlock.inc.c" diff --git a/src/world/area_tik/tik_17/893790.c b/src/world/area_tik/tik_17/893790.c index 5f8dd5aa92..fbef87a889 100644 --- a/src/world/area_tik/tik_17/893790.c +++ b/src/world/area_tik/tik_17/893790.c @@ -1,16 +1,6 @@ #include "tik_17.h" -#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" - -#include "world/common/GetCurrentFloor.inc.c" - -#include "world/common/UnkFunc25.inc.c" - -#include "world/common/GetEntryPos.inc.c" - -#include "world/common/GetCurrentCameraYawClamped180.inc.c" - -#include "world/common/SomeXYZFunc2.inc.c" +#include "world/common/atomic/Pipe.inc.c" #include "world/common/UpdateTexturePan.inc.c" diff --git a/src/world/area_tik/tik_19/8975E0.c b/src/world/area_tik/tik_19/8975E0.c index 0282d4dd2e..7ece36ae91 100644 --- a/src/world/area_tik/tik_19/8975E0.c +++ b/src/world/area_tik/tik_19/8975E0.c @@ -3,17 +3,7 @@ static char* N(exit_str_0) = "mac_00"; static char* N(exit_str_1) = ""; -#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" - -#include "world/common/GetCurrentFloor.inc.c" - -#include "world/common/UnkFunc25.inc.c" - -#include "world/common/GetEntryPos.inc.c" - -#include "world/common/GetCurrentCameraYawClamped180.inc.c" - -#include "world/common/SomeXYZFunc2.inc.c" +#include "world/common/atomic/Pipe.inc.c" #include "world/common/UpdateTexturePan.inc.c" diff --git a/src/world/area_tik/tik_19/897BD0.c b/src/world/area_tik/tik_19/897BD0.c index a98c03973d..5f53dd6897 100644 --- a/src/world/area_tik/tik_19/897BD0.c +++ b/src/world/area_tik/tik_19/897BD0.c @@ -1,31 +1,3 @@ #include "tik_19.h" -#include "world/common/SetOverrideFlags_40.inc.c" - -#include "world/common/UnkFunc17.inc.c" - -INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_8024062C_897C0C); - -#include "world/common/UnkFunc18.inc.c" - -INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_802407BC_897D9C); - -#include "world/common/SwitchToPartner.inc.c" - -#include "world/common/UnkFunc19.inc.c" - -#include "world/common/UnkFunc20.inc.c" - -#include "world/common/UnkFunc39.inc.c" - -#include "world/common/UnkFunc21.inc.c" - -#include "world/common/UnkFunc22.inc.c" - -#include "world/common/UnkFunc60.inc.c" - -#include "world/common/UnkFunc23.inc.c" - -#include "world/common/UnkPartnerPosFuncs.inc.c" - -#include "world/common/UnkFunc40.inc.c" +#include "world/common/atomic/SuperBlock.inc.c" diff --git a/src/world/area_tik/tik_20/89A350.c b/src/world/area_tik/tik_20/89A350.c index 1cfe588e03..265e8c4126 100644 --- a/src/world/area_tik/tik_20/89A350.c +++ b/src/world/area_tik/tik_20/89A350.c @@ -7,16 +7,6 @@ static char* N(exit_str_3) = ""; #include "world/common/UpdateTexturePan.inc.c" -#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" - -#include "world/common/GetCurrentFloor.inc.c" - -#include "world/common/UnkFunc25.inc.c" - -#include "world/common/GetEntryPos.inc.c" - -#include "world/common/GetCurrentCameraYawClamped180.inc.c" - -#include "world/common/SomeXYZFunc2.inc.c" +#include "world/common/atomic/Pipe.inc.c" #include "world/common/UnkPosFunc2.inc.c" diff --git a/src/world/area_tik/tik_21/89D7A0.c b/src/world/area_tik/tik_21/89D7A0.c index 393ea4821e..df2eadf6c5 100644 --- a/src/world/area_tik/tik_21/89D7A0.c +++ b/src/world/area_tik/tik_21/89D7A0.c @@ -7,16 +7,6 @@ static char* N(exit_str_3) = ""; #include "world/common/UpdateTexturePan.inc.c" -#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" - -#include "world/common/GetCurrentFloor.inc.c" - -#include "world/common/UnkFunc25.inc.c" - -#include "world/common/GetEntryPos.inc.c" - -#include "world/common/GetCurrentCameraYawClamped180.inc.c" - -#include "world/common/SomeXYZFunc2.inc.c" +#include "world/common/atomic/Pipe.inc.c" #include "world/common/UnkPosFunc2.inc.c" diff --git a/src/world/area_tik/tik_22/89FEF0.c b/src/world/area_tik/tik_22/89FEF0.c index 658c728b0c..22ff2a2926 100644 --- a/src/world/area_tik/tik_22/89FEF0.c +++ b/src/world/area_tik/tik_22/89FEF0.c @@ -2,17 +2,7 @@ #include "world/common/UpdateTexturePan.inc.c" -#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" - -#include "world/common/GetCurrentFloor.inc.c" - -#include "world/common/UnkFunc25.inc.c" - -#include "world/common/GetEntryPos.inc.c" - -#include "world/common/GetCurrentCameraYawClamped180.inc.c" - -#include "world/common/SomeXYZFunc2.inc.c" +#include "world/common/atomic/Pipe.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_22/89FEF0", func_8024061C_8A04DC); diff --git a/src/world/area_tik/tik_23/8A23D0.c b/src/world/area_tik/tik_23/8A23D0.c index fcff1b6fb7..059c6bb5a9 100644 --- a/src/world/area_tik/tik_23/8A23D0.c +++ b/src/world/area_tik/tik_23/8A23D0.c @@ -3,17 +3,7 @@ static char* N(exit_str_0) = "tik_24"; static char* N(exit_str_1) = "tik_20"; -#include "world/common/SetPlayerStatusAnimFlags100000.inc.c" - -#include "world/common/GetCurrentFloor.inc.c" - -#include "world/common/UnkFunc25.inc.c" - -#include "world/common/GetEntryPos.inc.c" - -#include "world/common/GetCurrentCameraYawClamped180.inc.c" - -#include "world/common/SomeXYZFunc2.inc.c" +#include "world/common/atomic/Pipe.inc.c" #include "world/common/UpdateTexturePan.inc.c" diff --git a/src/world/common/GetCurrentCameraYawClamped180.inc.c b/src/world/common/GetCurrentCameraYawClamped180.inc.c deleted file mode 100644 index 4a50e98d0d..0000000000 --- a/src/world/common/GetCurrentCameraYawClamped180.inc.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "common.h" -#include "npc.h" - -ApiStatus N(GetCurrentCameraYawClamped180)(Evt* script, s32 isInitialCall) { - script->varTable[0] = clamp_angle(gCameras[gCurrentCameraID].currentYaw + 180.0f); - return ApiStatus_DONE2; -} diff --git a/src/world/common/GetCurrentFloor.inc.c b/src/world/common/GetCurrentFloor.inc.c deleted file mode 100644 index 7972b91912..0000000000 --- a/src/world/common/GetCurrentFloor.inc.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "common.h" -#include "npc.h" - -ApiStatus N(GetCurrentFloor)(Evt* script, s32 isInitialCall) { - script->varTable[0] = gCollisionStatus.currentFloor; - return ApiStatus_DONE2; -} diff --git a/src/world/common/GetEntryPos.inc.c b/src/world/common/GetEntryPos.inc.c deleted file mode 100644 index bca44d73e8..0000000000 --- a/src/world/common/GetEntryPos.inc.c +++ /dev/null @@ -1,13 +0,0 @@ -#include "common.h" -#include "npc.h" - -ApiStatus N(GetEntryPos)(Evt* script, s32 isInitialCall) { - MapConfig* mapConfig = get_current_map_header(); - s32 index = evt_get_variable(script, EVT_VAR(0)); - - evt_set_variable(script, EVT_VAR(1), ((Vec4f*)*mapConfig->entryList)[index].x); - evt_set_variable(script, EVT_VAR(2), ((Vec4f*)*mapConfig->entryList)[index].y); - evt_set_variable(script, EVT_VAR(3), ((Vec4f*)*mapConfig->entryList)[index].z); - evt_set_variable(script, EVT_VAR(4), ((Vec4f*)*mapConfig->entryList)[index].yaw); - return ApiStatus_DONE2; -} diff --git a/src/world/common/SetOverrideFlags_40.inc.c b/src/world/common/SetOverrideFlags_40.inc.c deleted file mode 100644 index d66f2dcb4e..0000000000 --- a/src/world/common/SetOverrideFlags_40.inc.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "common.h" -#include "npc.h" - -ApiStatus N(SetOverrideFlags_40)(Evt* script, s32 isInitialCall) { - gOverrideFlags |= GLOBAL_OVERRIDES_40; - return ApiStatus_DONE2; -} diff --git a/src/world/common/SetPlayerStatusAnimFlags100000.inc.c b/src/world/common/SetPlayerStatusAnimFlags100000.inc.c deleted file mode 100644 index b4c7a6b580..0000000000 --- a/src/world/common/SetPlayerStatusAnimFlags100000.inc.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "common.h" -#include "npc.h" - -ApiStatus N(SetPlayerStatusAnimFlags100000)(Evt* script, s32 isInitialCall) { - gPlayerStatusPtr->animFlags |= 0x100000; - return ApiStatus_DONE2; -} diff --git a/src/world/common/SomeXYZFunc2.inc.c b/src/world/common/SomeXYZFunc2.inc.c deleted file mode 100644 index 820fac8ebe..0000000000 --- a/src/world/common/SomeXYZFunc2.inc.c +++ /dev/null @@ -1,17 +0,0 @@ -#include "common.h" -#include "npc.h" - -ApiStatus N(SomeXYZFunc2)(Evt* script, s32 isInitialStatus) { - PlayerStatus* playerStatus = &gPlayerStatus; - f32 r = evt_get_float_variable(script, *script->ptrReadPos); - f32 x = playerStatus->position.x; - f32 y = playerStatus->position.y; - f32 z = playerStatus->position.z; - - add_vec2D_polar(&x, &z, r, playerStatus->targetYaw); - evt_set_float_variable(script, EVT_VAR(0), x); - evt_set_float_variable(script, EVT_VAR(1), y); - evt_set_float_variable(script, EVT_VAR(2), z); - - return ApiStatus_DONE2; -} diff --git a/src/world/common/UnkFunc17.inc.c b/src/world/common/UnkFunc17.inc.c deleted file mode 100644 index 4ee30e5fd1..0000000000 --- a/src/world/common/UnkFunc17.inc.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "common.h" -#include "npc.h" - -ApiStatus N(UnkFunc17)(Evt* script, s32 isInitialCall) { - gOverrideFlags &= ~GLOBAL_OVERRIDES_40; - return ApiStatus_DONE2; -} diff --git a/src/world/common/UnkFunc18.inc.c b/src/world/common/UnkFunc18.inc.c deleted file mode 100644 index a6176caca8..0000000000 --- a/src/world/common/UnkFunc18.inc.c +++ /dev/null @@ -1,43 +0,0 @@ -#include "common.h" -#include "npc.h" - -ApiStatus N(UnkFunc18)(Evt* script, s32 isInitialCall) { - PlayerData* playerData = &gPlayerData; - Bytecode* args = script->ptrReadPos; - s32 partnerIdx = evt_get_variable(script, *args++); - s32 evt_var = *args++; - - playerData->partners[partnerIdx].level++; - evt_set_variable(script, evt_var, playerData->partners[partnerIdx].level); - - return ApiStatus_DONE2; -} - -s32 N(UnkFunc37)(s32 idx, s16 arg1) { - if (!gPlayerData.partners[idx].enabled) { - return -1; - } - - if (gPlayerData.partners[idx].level <= arg1) { - return gPlayerData.partners[idx].level; - } - - return -1; -} - -ApiStatus N(UnkFunc38)(Evt* script, s32 isInitialCall) { - PlayerData* playerData = &gPlayerData; - s32 i; - s16 var = script->varTable[12] >= 0; - - script->varTable[0] = -1; - - for (i = 1; i < ARRAY_COUNT(playerData->partners); i++) { - if (playerData->partners[i].enabled && N(UnkFunc37)(i, var) != -1) { - script->varTable[0] = 1; - break; - } - } - - return ApiStatus_DONE2; -} diff --git a/src/world/common/UnkFunc19.inc.c b/src/world/common/UnkFunc19.inc.c deleted file mode 100644 index 5026a3dc8d..0000000000 --- a/src/world/common/UnkFunc19.inc.c +++ /dev/null @@ -1,10 +0,0 @@ -#include "common.h" -#include "npc.h" - -extern s32 gPartnerPopupProperties[11][4]; - -ApiStatus N(UnkFunc19)(Evt* script, s32 isInitialCall) { - set_message_msg(gPartnerPopupProperties[gPlayerData.currentPartner][0], 0); - - return ApiStatus_DONE2; -} diff --git a/src/world/common/UnkFunc20.inc.c b/src/world/common/UnkFunc20.inc.c deleted file mode 100644 index 51833c8fe2..0000000000 --- a/src/world/common/UnkFunc20.inc.c +++ /dev/null @@ -1,16 +0,0 @@ -#include "common.h" -#include "npc.h" -#include "effects.h" - -ApiStatus N(UnkFunc20)(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32 entityIdx = evt_get_variable(script, *args++); - Entity* entity = get_entity_by_index(entityIdx); - s32 evt_var = *args++; - EffectInstance* effectInst = fx_energy_orb_wave(0, entity->position.x, entity->position.y + 12.5f, entity->position.z, 0.7f, - 0); - - evt_set_variable(script, evt_var, (s32) effectInst); - - return ApiStatus_DONE2; -} diff --git a/src/world/common/UnkFunc21.inc.c b/src/world/common/UnkFunc21.inc.c deleted file mode 100644 index 2963c49b51..0000000000 --- a/src/world/common/UnkFunc21.inc.c +++ /dev/null @@ -1,10 +0,0 @@ -#include "common.h" -#include "npc.h" - -ApiStatus N(UnkFunc21)(Evt* script, s32 isInitialCall) { - Entity* entity = get_entity_by_index(evt_get_variable(script, *script->ptrReadPos)); - - fx_radial_shimmer(4, entity->position.x, entity->position.y + 12.5f, entity->position.z, 1.0f, 0x4B); - - return ApiStatus_DONE2; -} diff --git a/src/world/common/UnkFunc22.inc.c b/src/world/common/UnkFunc22.inc.c deleted file mode 100644 index cd268efff3..0000000000 --- a/src/world/common/UnkFunc22.inc.c +++ /dev/null @@ -1,10 +0,0 @@ -#include "common.h" -#include "npc.h" - -ApiStatus N(UnkFunc22)(Evt* script, s32 isInitialCall) { - Npc* npc = get_npc_safe(-4); - - fx_radial_shimmer(9, npc->pos.x, npc->pos.y + 12.5f, npc->pos.z, 1.0f, 0x1E); - - return ApiStatus_DONE2; -} diff --git a/src/world/common/UnkFunc23.inc.c b/src/world/common/UnkFunc23.inc.c deleted file mode 100644 index 157ab4c41c..0000000000 --- a/src/world/common/UnkFunc23.inc.c +++ /dev/null @@ -1,49 +0,0 @@ -#include "common.h" -#include "npc.h" - -s32 N(UnkFunc23)(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32 ret = 0; - - if (isInitialCall) { - script->varTable[0] = evt_get_variable(script, *args++); - script->varTable[1] = evt_get_variable(script, *args++); - script->functionTemp[0] = 0; - script->functionTemp[1] = 0; - set_screen_overlay_color(0, 0xD0, 0xD0, 0xD0); - } - - switch (script->functionTemp[0]) { - case 0: - if (script->functionTemp[1] == 0xFF) { - script->functionTemp[0] = 1; - script->functionTemp[2] = 0; - } - script->functionTemp[1] += script->varTable[0]; - if (script->functionTemp[1] >= 0x100) { - script->functionTemp[1] = 0xFF; - } - break; - - case 1: - script->functionTemp[2]++; - if (script->functionTemp[2] >= 2) { - script->functionTemp[0] = 2; - } - break; - - case 2: - if (script->functionTemp[1] == 0) { - ret = 1; - } - script->functionTemp[1] -= script->varTable[1]; - if (script->functionTemp[1] < 0) { - script->functionTemp[1] = 0; - } - break; - } - - set_screen_overlay_params_front(1, script->functionTemp[1]); - - return ret; -} diff --git a/src/world/common/UnkFunc25.inc.c b/src/world/common/UnkFunc25.inc.c deleted file mode 100644 index 577b98f05d..0000000000 --- a/src/world/common/UnkFunc25.inc.c +++ /dev/null @@ -1,24 +0,0 @@ -#include "common.h" -#include "npc.h" - -ApiStatus N(UnkFunc25)(Evt* script, s32 isInitialCall) { - CollisionStatus* collisionStatus = &gCollisionStatus; - s32 stickX, stickY; - - if (collisionStatus->currentFloor != script->varTable[11]) { - script->varTable[0] = FALSE; - return ApiStatus_DONE2; - } - - stickX = abs(gGameStatusPtr->stickX); - stickY = gGameStatusPtr->stickY; - - if (stickX != 0 || stickY != 0) { - if (atan2(0.0f, 0.0f, stickX, stickY) < 60.0f) { - script->varTable[0] = TRUE; - return ApiStatus_DONE2; - } - } - - return ApiStatus_BLOCK; -} diff --git a/src/world/common/UnkFunc39.inc.c b/src/world/common/UnkFunc39.inc.c deleted file mode 100644 index f9cfe301f7..0000000000 --- a/src/world/common/UnkFunc39.inc.c +++ /dev/null @@ -1,10 +0,0 @@ -#include "common.h" -#include "npc.h" - -ApiStatus N(UnkFunc39)(Evt* script, s32 isInitialCall) { - EffectGraphics* effect = (EffectGraphics*)evt_get_variable(script, *script->ptrReadPos); - - effect->flags |= 0x10; - - return ApiStatus_DONE2; -} diff --git a/src/world/common/UnkFunc40.inc.c b/src/world/common/UnkFunc40.inc.c deleted file mode 100644 index 4eab916b5d..0000000000 --- a/src/world/common/UnkFunc40.inc.c +++ /dev/null @@ -1,10 +0,0 @@ -#include "common.h" -#include "npc.h" - -ApiStatus N(UnkFunc40)(Evt* script, s32 isInitialCall) { - script->varTable[0] = 0; - if ((gPartnerActionStatus.actionState.b[0] != 0) && (gPartnerActionStatus.actionState.b[3] == 3)) { - script->varTable[0] = 1; - } - return ApiStatus_DONE2; -} diff --git a/src/world/common/UnkFunc60.inc.c b/src/world/common/UnkFunc60.inc.c deleted file mode 100644 index acd7460de9..0000000000 --- a/src/world/common/UnkFunc60.inc.c +++ /dev/null @@ -1,142 +0,0 @@ -#include "common.h" -#include "npc.h" -#include "effects.h" - -typedef struct { - s32 unk_00; - s32 unk_04; - EffectGraphics* unk_08[3]; // TODO this is wrong - f32 unk_14[3]; - f32 unk_20[3]; - f32 unk_2C[3]; - f32 unk_38[3]; - f32 unk_44[3]; - f32 unk_50[3]; - Entity* unk_5C; - s32 unk_60; - s32 unk_64; -} N(UserData); - -extern f32 N(bigFuncFloats)[]; - -ApiStatus N(UnkFunc60)(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - Npc* partner = get_npc_safe(NPC_PARTNER); - N(UserData)* userData; - f32 sinTheta, cosTheta; - f32 x; - f32 t1; - s32 i; - - sin_cos_deg(gCameras[gCurrentCameraID].currentYaw, &sinTheta, &cosTheta); - - if (isInitialCall) { - script->userData = (N(UserData)*)general_heap_malloc(0x68); - userData = (N(UserData)*)script->userData; - - userData->unk_5C = get_entity_by_index(evt_get_variable(script, *args++)); - - for (i = 0; i < ARRAY_COUNT(userData->unk_08); i++) { - userData->unk_08[i] = (EffectGraphics*) fx_motion_blur_flame(0, userData->unk_5C->position.x, - userData->unk_5C->position.y + 12.5f, - userData->unk_5C->position.z, 1.0f, -1); - t1 = 0.0f; - userData->unk_2C[i] = t1; - userData->unk_20[i] = t1; - userData->unk_14[i] = t1; - userData->unk_50[i] = t1; - userData->unk_44[i] = t1; - userData->unk_38[i] = t1; - } - - userData->unk_00 = 0; - userData->unk_04 = 0; - userData->unk_60 = 0; - userData->unk_64 = 0; - - t1 = 50.0f; - for (i = 0; i < ARRAY_COUNT(userData->unk_38); i++) { - x = 0.0f; - add_vec2D_polar(&x, &userData->unk_44[i], t1, N(bigFuncFloats)[i]); - userData->unk_38[i] = cosTheta * x; - userData->unk_50[i] = sinTheta * x; - userData->unk_38[i] = partner->pos.x - (userData->unk_5C->position.x + userData->unk_38[i]); - userData->unk_44[i] = partner->pos.y - (userData->unk_5C->position.y + userData->unk_44[i]); - userData->unk_50[i] = partner->pos.z - (userData->unk_5C->position.z + userData->unk_50[i]); - } - } - - userData = (N(UserData)*)script->userData; - switch (userData->unk_00) { - case 0: - t1 = update_lerp(5, 0.0f, 50.0f, userData->unk_60, 20); - for (i = 0; i < ARRAY_COUNT(userData->unk_20); i++) { - x = userData->unk_20[i] = 0.0f; - add_vec2D_polar(&x, &userData->unk_20[i], t1, N(bigFuncFloats)[i]); - userData->unk_14[i] = cosTheta * x; - userData->unk_2C[i] = sinTheta * x; - } - - userData->unk_60++; - if (userData->unk_60 >= 0x15) { - userData->unk_00 = 1; - userData->unk_60 = 0; - } - break; - case 1: - t1 = 50.0f; - for (i = 0; i < ARRAY_COUNT(userData->unk_20); i++) { - x = userData->unk_20[i] = 0.0f; - add_vec2D_polar(&x, &userData->unk_20[i], t1, N(bigFuncFloats)[i]); - userData->unk_14[i] = cosTheta * x; - userData->unk_2C[i] = sinTheta * x; - } - - userData->unk_60++; - if (userData->unk_60 > 15) { - userData->unk_60 = 15; - userData->unk_00 = 2; - } - break; - case 2: - userData->unk_60++; - if (userData->unk_60 > 30) { - for (i = 0; i < ARRAY_COUNT(userData->unk_08); i++) { - userData->unk_08[i]->flags |= 0x10; - } - return ApiStatus_DONE2; - } - break; - } - - switch (userData->unk_04) { - case 0: - userData->unk_64++; - if (userData->unk_64 > 15) { - userData->unk_04 = 1; - userData->unk_64 = 0; - } - break; - case 1: - for (i = 0; i < ARRAY_COUNT(userData->unk_14); i++) { - userData->unk_14[i] += update_lerp(1, 0.0f, userData->unk_38[i], userData->unk_64, 20); - userData->unk_20[i] += update_lerp(1, 0.0f, userData->unk_44[i], userData->unk_64, 20); - userData->unk_2C[i] += update_lerp(1, 0.0f, userData->unk_50[i], userData->unk_64, 20); - } - - userData->unk_64++; - if (userData->unk_64 > 20) { - userData->unk_04 = 2; - userData->unk_64 = 0; - } - break; - } - - for (i = 0; i < ARRAY_COUNT(userData->unk_08); i++) { - ((EffectInstanceData*)userData->unk_08[i]->freeDelay)->rotation.x = userData->unk_14[i]; - ((EffectInstanceData*)userData->unk_08[i]->freeDelay)->rotation.y = userData->unk_20[i]; - ((EffectInstanceData*)userData->unk_08[i]->freeDelay)->rotation.z = userData->unk_2C[i]; - } - - return ApiStatus_BLOCK; -} diff --git a/src/world/common/UnkPartnerPosFuncs.inc.c b/src/world/common/UnkPartnerPosFuncs.inc.c index f34e9336fd..f282f33860 100644 --- a/src/world/common/UnkPartnerPosFuncs.inc.c +++ b/src/world/common/UnkPartnerPosFuncs.inc.c @@ -1,13 +1,13 @@ #include "common.h" -ApiStatus N(UnkPartnerPosFunc)(Evt* script, s32 isInitialCall) { +ApiStatus N(SuperBlock_PartnerSparkles2)(Evt* script, s32 isInitialCall) { Npc* partner = get_npc_safe(NPC_PARTNER); fx_sparkles(2, partner->pos.x, partner->pos.y + 30.0f, partner->pos.z, 30.0f); return ApiStatus_DONE2; } -ApiStatus N(UnkPartnerPosFunc2)(Evt* script, s32 isInitialCall) { +ApiStatus N(SuperBlock_PartnerSparkles4)(Evt* script, s32 isInitialCall) { Npc* partner = get_npc_safe(NPC_PARTNER); fx_sparkles(4, partner->pos.x, partner->pos.y + 30.0f, partner->pos.z, 30.0f); diff --git a/src/world/common/UnkFunc24.inc.c b/src/world/common/WaitForPlayerToLand.inc.c similarity index 78% rename from src/world/common/UnkFunc24.inc.c rename to src/world/common/WaitForPlayerToLand.inc.c index b3d5ce22cb..dbd5618095 100644 --- a/src/world/common/UnkFunc24.inc.c +++ b/src/world/common/WaitForPlayerToLand.inc.c @@ -1,11 +1,10 @@ #include "common.h" #include "npc.h" -ApiStatus N(UnkFunc24)(Evt* script, s32 isInitialCall) { +ApiStatus N(WaitForPlayerToLand)(Evt* script, s32 isInitialCall) { script->varTable[0] = 0; if ((gPartnerActionStatus.actionState.b[0] != 0) && (gPartnerActionStatus.actionState.b[3] == 3)) { script->varTable[0] = 1; } - return ApiStatus_DONE2; } diff --git a/src/world/common/atomic/Pipe.inc.c b/src/world/common/atomic/Pipe.inc.c new file mode 100644 index 0000000000..16d0140aa0 --- /dev/null +++ b/src/world/common/atomic/Pipe.inc.c @@ -0,0 +1,65 @@ +#include "common.h" +#include "npc.h" + +ApiStatus N(Pipe_SetAnimFlag)(Evt* script, s32 isInitialCall) { + gPlayerStatusPtr->animFlags |= PLAYER_STATUS_ANIM_FLAGS_100000; + return ApiStatus_DONE2; +} + +ApiStatus N(Pipe_GetCurrentFloor)(Evt* script, s32 isInitialCall) { + script->varTable[0] = gCollisionStatus.currentFloor; + return ApiStatus_DONE2; +} + +ApiStatus N(Pipe_AwaitDownInput)(Evt* script, s32 isInitialCall) { + CollisionStatus* collisionStatus = &gCollisionStatus; + s32 stickX, stickY; + + if (collisionStatus->currentFloor != script->varTable[11]) { + script->varTable[0] = FALSE; + return ApiStatus_DONE2; + } + + stickX = abs(gGameStatusPtr->stickX); + stickY = gGameStatusPtr->stickY; + + if (stickX != 0 || stickY != 0) { + if (atan2(0.0f, 0.0f, stickX, stickY) < 60.0f) { + script->varTable[0] = TRUE; + return ApiStatus_DONE2; + } + } + + return ApiStatus_BLOCK; +} + +ApiStatus N(Pipe_GetEntryPos)(Evt* script, s32 isInitialCall) { + MapConfig* mapConfig = get_current_map_header(); + s32 index = evt_get_variable(script, EVT_VAR(0)); + + evt_set_variable(script, EVT_VAR(1), ((Vec4f*)*mapConfig->entryList)[index].x); + evt_set_variable(script, EVT_VAR(2), ((Vec4f*)*mapConfig->entryList)[index].y); + evt_set_variable(script, EVT_VAR(3), ((Vec4f*)*mapConfig->entryList)[index].z); + evt_set_variable(script, EVT_VAR(4), ((Vec4f*)*mapConfig->entryList)[index].yaw); + return ApiStatus_DONE2; +} + +ApiStatus N(Pipe_GetCameraYaw)(Evt* script, s32 isInitialCall) { + script->varTable[0] = clamp_angle(gCameras[gCurrentCameraID].currentYaw + 180.0f); + return ApiStatus_DONE2; +} + +ApiStatus N(Pipe_GetPointAheadOfPlayer)(Evt* script, s32 isInitialStatus) { + PlayerStatus* playerStatus = &gPlayerStatus; + f32 r = evt_get_float_variable(script, *script->ptrReadPos); + f32 x = playerStatus->position.x; + f32 y = playerStatus->position.y; + f32 z = playerStatus->position.z; + + add_vec2D_polar(&x, &z, r, playerStatus->targetYaw); + evt_set_float_variable(script, EVT_VAR(0), x); + evt_set_float_variable(script, EVT_VAR(1), y); + evt_set_float_variable(script, EVT_VAR(2), z); + + return ApiStatus_DONE2; +} diff --git a/src/world/common/atomic/Pipe.inc.h b/src/world/common/atomic/Pipe.inc.h new file mode 100644 index 0000000000..652cdf1f1d --- /dev/null +++ b/src/world/common/atomic/Pipe.inc.h @@ -0,0 +1,14 @@ +#include "common.h" + +ApiStatus N(Pipe_GetCameraYaw)(Evt* script, s32 isInitialCall); +ApiStatus N(Pipe_GetCurrentFloor)(Evt* script, s32 isInitialCall); +ApiStatus N(Pipe_GetEntryPos)(Evt* script, s32 isInitialCall); +ApiStatus N(Pipe_SetAnimFlag)(Evt* script, s32 isInitialCall); +ApiStatus N(Pipe_GetPointAheadOfPlayer)(Evt* script, s32 isInitialCall); +ApiStatus N(Pipe_AwaitDownInput)(Evt* script, s32 isInitialCall); + +extern EvtScript N(Pipe_EnterVertical); +extern EvtScript N(Pipe_EnterHorizontal); +extern EvtScript N(Pipe_ExitVertical); +extern EvtScript N(Pipe_ScriptD); +extern EvtScript N(Pipe_ExitHorizontal); diff --git a/src/world/common/atomic/PipeData.inc.c b/src/world/common/atomic/PipeData.inc.c new file mode 100644 index 0000000000..b28e5b6062 --- /dev/null +++ b/src/world/common/atomic/PipeData.inc.c @@ -0,0 +1,239 @@ +#include "common.h" +#include "Pipe.inc.h" + +EvtScript N(Pipe_EnterVertical) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(HidePlayerShadow, TRUE) + EVT_CALL(SetPlayerAnimation, ANIM_STAND_STILL) + EVT_CALL(GetCurrentPartnerID, EVT_VAR(0)) + EVT_IF_NE(EVT_VAR(0), PARTNER_NONE) + EVT_CALL(EnableNpcShadow, NPC_PARTNER, FALSE) + EVT_CALL(SetNpcPos, NPC_PARTNER, 0, -1000, 0) + EVT_END_IF + EVT_CALL(GetEntryID, EVT_VAR(0)) + EVT_CALL(N(Pipe_GetEntryPos)) + EVT_SUB(EVT_VAR(2), 40) + EVT_CALL(SetPlayerPos, EVT_VAR(1), EVT_VAR(2), EVT_VAR(3)) + EVT_CALL(InterpPlayerYaw, EVT_VAR(4), 0) + EVT_CALL(PlaySound, SOUND_ENTER_PIPE) + EVT_CALL(func_802D286C, 0x100) + EVT_CALL(func_802D2520, ANIM_STAND_STILL, 5, 2, 1, 1, 0) + EVT_CALL(GetPlayerPos, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) + EVT_LOOP(40) + EVT_ADD(EVT_VAR(1), 1) + EVT_CALL(SetPlayerPos, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) + EVT_WAIT_FRAMES(1) + EVT_END_LOOP + EVT_WAIT_FRAMES(3) + EVT_CALL(GetCurrentPartnerID, EVT_VAR(0)) + EVT_IF_NE(EVT_VAR(0), 0) + EVT_THREAD + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(GetPlayerPos, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) + EVT_SUB(EVT_VAR(2), 3) + EVT_CALL(SetNpcPos, NPC_PARTNER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, ((NPC_FLAG_2)), FALSE) + EVT_CALL(EnablePartnerAI) + EVT_CALL(EnableNpcShadow, NPC_PARTNER, TRUE) + EVT_END_THREAD + EVT_END_IF + EVT_WAIT_FRAMES(2) + EVT_CALL(func_802D2520, ANIM_STAND_STILL, 0, 0, 0, 0, 0) + EVT_WAIT_FRAMES(1) + EVT_CALL(SetPlayerAnimation, ANIM_10002) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(HidePlayerShadow, FALSE) + EVT_LABEL(0) + EVT_CALL(N(Pipe_GetCurrentFloor)) + EVT_WAIT_FRAMES(1) + EVT_IF_NE(EVT_VAR(0), -1) + EVT_GOTO(0) + EVT_END_IF + EVT_EXEC(EVT_VAR(10)) + EVT_RETURN + EVT_END +}; + +EvtScript N(Pipe_EnterHorizontal) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(HidePlayerShadow, TRUE) + EVT_CALL(ModifyColliderFlags, 0, EVT_VAR(11), 0x7FFFFE00) + EVT_CALL(GetEntryID, EVT_VAR(0)) + EVT_CALL(N(Pipe_GetEntryPos)) + EVT_SET(EVT_VAR(5), EVT_VAR(1)) + EVT_SET(EVT_VAR(6), EVT_VAR(2)) + EVT_SET(EVT_VAR(7), EVT_VAR(3)) + EVT_ADD(EVT_VAR(2), 2) + EVT_CALL(SetPlayerPos, EVT_VAR(1), EVT_VAR(2), EVT_VAR(3)) + EVT_CALL(InterpPlayerYaw, EVT_VAR(4), 0) + EVT_IF_EQ(EVT_VAR(4), 90) + EVT_ADD(EVT_VAR(5), 40) + EVT_ELSE + EVT_SUB(EVT_VAR(5), 40) + EVT_END_IF + EVT_CALL(UseSettingsFrom, 0, EVT_VAR(5), EVT_VAR(6), EVT_VAR(7)) + EVT_CALL(SetPanTarget, 0, EVT_VAR(5), EVT_VAR(6), EVT_VAR(7)) + EVT_CALL(SetCamSpeed, 0, EVT_FIXED(90.0)) + EVT_CALL(PanToTarget, 0, 0, 1) + EVT_CALL(GetCurrentPartnerID, EVT_VAR(0)) + EVT_IF_NE(EVT_VAR(0), PARTNER_NONE) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(EnableNpcShadow, NPC_PARTNER, FALSE) + EVT_CALL(SetNpcPos, NPC_PARTNER, 0, -1000, 0) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, EVT_VAR(0), 0) + EVT_END_IF + EVT_WAIT_FRAMES(1) + EVT_CALL(PlaySound, SOUND_ENTER_PIPE) + EVT_THREAD + EVT_WAIT_FRAMES(25) + EVT_CALL(HidePlayerShadow, FALSE) + EVT_END_THREAD + EVT_CALL(func_802D286C, 0x900) + EVT_CALL(func_802D2520, ANIM_10002, 5, 3, 1, 1, 0) + EVT_LOOP(40) + EVT_CALL(N(Pipe_GetPointAheadOfPlayer), EVT_FIXED(1.0)) + EVT_CALL(SetPlayerPos, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) + EVT_WAIT_FRAMES(1) + EVT_END_LOOP + EVT_CALL(GetCurrentPartnerID, EVT_VAR(0)) + EVT_IF_NE(EVT_VAR(0), PARTNER_NONE) + EVT_THREAD + EVT_CALL(GetPlayerPos, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) + EVT_SUB(EVT_VAR(2), 3) + EVT_CALL(SetNpcPos, NPC_PARTNER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) + EVT_CALL(EnableNpcShadow, NPC_PARTNER, TRUE) + EVT_CALL(EnablePartnerAI) + EVT_END_THREAD + EVT_END_IF + EVT_WAIT_FRAMES(5) + EVT_CALL(func_802D2520, ANIM_10002, 0, 0, 0, 0, 0) + EVT_CALL(ModifyColliderFlags, 1, EVT_VAR(11), 0x7FFFFE00) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(PanToTarget, 0, 0, 0) + EVT_EXEC(EVT_VAR(10)) + EVT_RETURN + EVT_END +}; + +EvtScript N(Pipe_ExitVertical) = { + EVT_CALL(N(Pipe_AwaitDownInput)) + EVT_IF_EQ(EVT_VAR(0), 0) + EVT_RETURN + EVT_END_IF + EVT_CALL(GetCurrentPartner, EVT_VAR(0)) + EVT_IF_NE(EVT_VAR(0), 0) + EVT_CALL(GetCurrentPartnerID, EVT_VAR(1)) + EVT_IF_NE(EVT_VAR(1), PARTNER_WATT) + EVT_RETURN + EVT_ELSE + EVT_CALL(func_802D2B6C) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_END_IF + EVT_ELSE + EVT_CALL(DisablePlayerInput, TRUE) + EVT_END_IF + EVT_EXEC_WAIT(N(Pipe_ScriptD)) + EVT_RETURN + EVT_END +}; + +EvtScript N(Pipe_ScriptD) = { + EVT_CALL(N(Pipe_SetAnimFlag)) + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(HidePlayerShadow, TRUE) + EVT_SET(EVT_VAR(0), EVT_VAR(10)) + EVT_CALL(N(Pipe_GetEntryPos)) + EVT_CALL(PlayerMoveTo, EVT_VAR(1), EVT_VAR(3), 3) + EVT_SET(EVT_VAR(0), EVT_VAR(10)) + EVT_CALL(N(Pipe_GetEntryPos)) + EVT_CALL(SetPlayerPos, EVT_VAR(1), EVT_VAR(2), EVT_VAR(3)) + EVT_CALL(SetPlayerFlagBits, PLAYER_STATUS_ANIM_FLAGS_200000, TRUE) + EVT_CALL(N(Pipe_GetCameraYaw)) + EVT_CALL(InterpPlayerYaw, EVT_VAR(0), 0) + EVT_WAIT_FRAMES(2) + EVT_CALL(SetPlayerFlagBits, PLAYER_STATUS_ANIM_FLAGS_200000, FALSE) + EVT_CALL(PlaySound, SOUND_ENTER_PIPE) + EVT_CALL(GetPlayerPos, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) + EVT_THREAD + EVT_WAIT_FRAMES(4) + EVT_LOOP(40) + EVT_SUB(EVT_VAR(1), 1) + EVT_CALL(SetPlayerPos, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) + EVT_WAIT_FRAMES(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(func_802D286C, 0x800) + EVT_CALL(func_802D2520, ANIM_10002, 5, 2, 1, 1, 0) + EVT_WAIT_FRAMES(25) + EVT_EXEC_WAIT(EVT_VAR(12)) + EVT_RETURN + EVT_END +}; + +EvtScript N(Pipe_ExitHorizontal) = { + EVT_CALL(IsPlayerOnValidFloor, EVT_VAR(0)) + EVT_IF_EQ(EVT_VAR(0), 0) + EVT_RETURN + EVT_END_IF + EVT_CALL(GetPlayerActionState, EVT_VAR(0)) + EVT_IF_EQ(EVT_VAR(0), ACTION_STATE_SPIN) + EVT_RETURN + EVT_END_IF + EVT_CALL(GetCurrentPartner, EVT_VAR(0)) + EVT_IF_NE(EVT_VAR(0), 0) + EVT_CALL(GetCurrentPartnerID, EVT_VAR(1)) + EVT_IF_NE(EVT_VAR(1), PARTNER_WATT) + EVT_RETURN + EVT_ELSE + EVT_CALL(func_802D2B6C) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_END_IF + EVT_ELSE + EVT_CALL(DisablePlayerInput, TRUE) + EVT_END_IF + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(N(Pipe_SetAnimFlag)) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(ModifyColliderFlags, 0, EVT_VAR(11), 0x7FFFFE00) + EVT_SET(EVT_VAR(0), EVT_VAR(10)) + EVT_CALL(N(Pipe_GetEntryPos)) + EVT_SET(EVT_VAR(5), EVT_VAR(1)) + EVT_SET(EVT_VAR(6), EVT_VAR(2)) + EVT_ADD(EVT_VAR(6), 2) + EVT_SET(EVT_VAR(7), EVT_VAR(3)) + EVT_SET(EVT_VAR(8), EVT_VAR(4)) + EVT_ADD(EVT_VAR(8), 180) + EVT_IF_GE(EVT_VAR(4), 360) + EVT_SUB(EVT_VAR(4), 360) + EVT_END_IF + EVT_CALL(InterpPlayerYaw, EVT_VAR(8), 1) + EVT_WAIT_FRAMES(1) + EVT_CALL(PlaySound, SOUND_ENTER_PIPE) + EVT_CALL(GetPlayerPos, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) + EVT_CALL(SetPlayerPos, EVT_VAR(0), EVT_VAR(6), EVT_VAR(7)) + EVT_CALL(SetPlayerAnimation, ANIM_STAND_STILL) + EVT_CALL(func_802D286C, 0x800) + EVT_CALL(func_802D2520, ANIM_STAND_STILL, 5, 3, 1, 1, 0) + EVT_THREAD + EVT_WAIT_FRAMES(8) + EVT_CALL(HidePlayerShadow, TRUE) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT_FRAMES(3) + EVT_LOOP(40) + EVT_CALL(N(Pipe_GetPointAheadOfPlayer), EVT_FIXED(1.0)) + EVT_CALL(SetPlayerPos, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) + EVT_WAIT_FRAMES(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_WAIT_FRAMES(25) + EVT_EXEC_WAIT(EVT_VAR(12)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/common/reflection.inc.c b/src/world/common/atomic/Reflection.inc.c similarity index 100% rename from src/world/common/reflection.inc.c rename to src/world/common/atomic/Reflection.inc.c diff --git a/src/world/common/atomic/SuperBlock.inc.c b/src/world/common/atomic/SuperBlock.inc.c new file mode 100644 index 0000000000..ea5b750ec5 --- /dev/null +++ b/src/world/common/atomic/SuperBlock.inc.c @@ -0,0 +1,393 @@ +#include "common.h" +#include "npc.h" +#include "effects.h" +#include "SuperBlock.inc.h" +#include "hud_element.h" + +extern s32 gPartnerPopupProperties[11][4]; + +extern HudScript* wPartnerHudScripts[]; +extern HudScript* wDisabledPartnerHudScripts[]; + +ApiStatus N(SuperBlock_SetOverride40)(Evt* script, s32 isInitialCall) { + gOverrideFlags |= GLOBAL_OVERRIDES_40; + return ApiStatus_DONE2; +} + +ApiStatus N(SuperBlock_ClearOverride40)(Evt* script, s32 isInitialCall) { + gOverrideFlags &= ~GLOBAL_OVERRIDES_40; + return ApiStatus_DONE2; +} + +ApiStatus N(SuperBlock_HideBlockContent)(Evt* script, s32 isInitialCall) { + entity_upgrade_block_hide_content(evt_get_variable(script, *script->ptrReadPos)); + return ApiStatus_DONE2; +} + +ApiStatus N(SuperBlock_GetPartnerRank)(Evt* script, s32 isInitialCall) { + PlayerData* playerData = &gPlayerData; + Bytecode* args = script->ptrReadPos; + s32 partnerIdx = evt_get_variable(script, *args++); + s32 evt_var = *args++; + + playerData->partners[partnerIdx].level++; + evt_set_variable(script, evt_var, playerData->partners[partnerIdx].level); + + return ApiStatus_DONE2; +} + +s32 N(SuperBlock_get_partner_rank)(s32 idx, s16 maxLevel) { + if (!gPlayerData.partners[idx].enabled) { + return -1; + } + + if (gPlayerData.partners[idx].level <= maxLevel) { + return gPlayerData.partners[idx].level; + } + + return -1; +} + +ApiStatus N(SuperBlock_CountEligiblePartners)(Evt* script, s32 isInitialCall) { + PlayerData* playerData = &gPlayerData; + s16 var = script->varTable[12] >= 0; + s32 i; + + script->varTable[0] = -1; + + for (i = 1; i < ARRAY_COUNT(playerData->partners); i++) { + if (playerData->partners[i].enabled && N(SuperBlock_get_partner_rank)(i, var) != -1) { + script->varTable[0] = 1; + break; + } + } + + return ApiStatus_DONE2; +} + +ApiStatus N(SuperBlock_ShowSelectPartnerMenu)(Evt* script, s32 isInitialCall) { + PlayerData* playerData = &gPlayerData; + PopupMenu* popupMenu; + s32 partnerID; + s32 canUpgradePartner; + s32 hasUltraStone; + s32 entryIndex; + s32 i; + + // create the 'partner upgrade' popup menu + if (isInitialCall) { + popupMenu = heap_malloc(sizeof(PopupMenu)); + script->functionTempPtr[2] = popupMenu; + hasUltraStone = script->varTable[12] >= 0; + + // build the popup menu entries from unlocked partners + entryIndex = 0; + for (i = 0; i < ARRAY_COUNT(N(SuperBlock_PartnerIDs)); i++) { + partnerID = N(SuperBlock_PartnerIDs)[i]; + if (playerData->partners[partnerID].enabled) { + popupMenu->userIndex[entryIndex] = partnerID; + popupMenu->nameMsg[entryIndex] = gPartnerPopupProperties[partnerID][0]; + canUpgradePartner = N(SuperBlock_get_partner_rank)(partnerID, hasUltraStone); + if (canUpgradePartner >= 0) { + popupMenu->ptrIcon[entryIndex] = wPartnerHudScripts[partnerID]; + popupMenu->enabled[entryIndex] = TRUE; + popupMenu->descMsg[entryIndex] = N(SuperBlock_UpgradeDescMessages)[i][canUpgradePartner]; + } else { + popupMenu->ptrIcon[entryIndex] = wDisabledPartnerHudScripts[partnerID]; + popupMenu->enabled[entryIndex] = FALSE; + popupMenu->descMsg[entryIndex] = N(SuperBlock_CantUpgradeMessages)[hasUltraStone]; + } + popupMenu->value[entryIndex] = playerData->partners[partnerID].level; + entryIndex++; + } + } + + popupMenu->popupType = POPUP_MENU_UPGRADE_PARTNER; + popupMenu->numEntries = entryIndex; + popupMenu->initialPos = 0; + create_popup_menu(popupMenu); + script->functionTemp[0] = 0; + } + + // wait for player to close popup + popupMenu = script->functionTempPtr[2]; + if (script->functionTemp[0] == 0) { + script->functionTemp[1] = popupMenu->result; + if (script->functionTemp[1] == 0) { + return ApiStatus_BLOCK; + } + hide_popup_menu(); + } + + // wait for popup to hide + script->functionTemp[0]++; + if (script->functionTemp[0] < 15) { + return ApiStatus_BLOCK; + } + destroy_popup_menu(); + + if (script->functionTemp[1] != 255) { + script->varTable[0] = gPartnerPopupProperties[popupMenu->userIndex[script->functionTemp[1] - 1]][0]; + script->varTable[1] = popupMenu->userIndex[script->functionTemp[1] - 1]; + } else { + script->varTable[0] = -1; + } + + heap_free(script->functionTempPtr[2]); + return ApiStatus_DONE2; +} + +ApiStatus N(SuperBlock_SwitchToPartner)(Evt* script, s32 isInitialCall) { + switch_to_partner(evt_get_variable(script, *script->ptrReadPos)); + return ApiStatus_DONE2; +} + +ApiStatus N(SuperBlock_LoadCurrentPartnerName)(Evt* script, s32 isInitialCall) { + set_message_msg(gPartnerPopupProperties[gPlayerData.currentPartner][0], 0); + return ApiStatus_DONE2; +} + +ApiStatus N(SuperBlock_StartGlowEffect)(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 entityIdx = evt_get_variable(script, *args++); + Entity* entity = get_entity_by_index(entityIdx); + s32 effectPtrOutVar = *args++; + EffectInstance* effectInst = fx_energy_orb_wave(0, entity->position.x, entity->position.y + 12.5f, entity->position.z, 0.7f, 0); + + evt_set_variable(script, effectPtrOutVar, (s32) effectInst); + return ApiStatus_DONE2; +} + +ApiStatus N(SuperBlock_EndGlowEffect)(Evt* script, s32 isInitialCall) { + EffectInstance* effect = (EffectInstance*)evt_get_variable(script, *script->ptrReadPos); + + effect->flags |= EFFECT_INSTANCE_FLAGS_10; + return ApiStatus_DONE2; +} + +ApiStatus N(SuperBlock_GatherEnergyFX)(Evt* script, s32 isInitialCall) { + Entity* entity = get_entity_by_index(evt_get_variable(script, *script->ptrReadPos)); + + fx_radial_shimmer(4, entity->position.x, entity->position.y + 12.5f, entity->position.z, 1.0f, 75); + return ApiStatus_DONE2; +} + +ApiStatus N(SuperBlock_RadiateFaintEnergyFX)(Evt* script, s32 isInitialCall) { + Npc* npc = get_npc_safe(NPC_PARTNER); + + fx_radial_shimmer(9, npc->pos.x, npc->pos.y + 12.5f, npc->pos.z, 1.0f, 30); + return ApiStatus_DONE2; +} + +typedef struct BlurFlameEffectData { + s32 unk_00; + s32 unk_04; + s32 unk_08; + s32 unk_0C; + Vec3f position; +} BlurFlameEffectData; + +typedef struct EnergyOrbSet { + s32 scatterState; + s32 gatherState; + EffectInstance* orbEffects[SUPER_BLOCK_NUM_ORBS]; + f32 posX[SUPER_BLOCK_NUM_ORBS]; + f32 posY[SUPER_BLOCK_NUM_ORBS]; + f32 posZ[SUPER_BLOCK_NUM_ORBS]; + f32 partnerPosX[SUPER_BLOCK_NUM_ORBS]; + f32 partnerPosY[SUPER_BLOCK_NUM_ORBS]; + f32 partnerPosZ[SUPER_BLOCK_NUM_ORBS]; + Entity* superBlock; + s32 scatterStateTime; + s32 gatherStateTime; +} EnergyOrbSet; + +ApiStatus N(SuperBlock_AnimateEnergyOrbs)(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + Npc* partner = get_npc_safe(NPC_PARTNER); + EnergyOrbSet* userData; + f32 sinTheta, cosTheta; + f32 x; + f32 t1; + s32 i; + + sin_cos_deg(gCameras[gCurrentCameraID].currentYaw, &sinTheta, &cosTheta); + + if (isInitialCall) { + script->userData = (EnergyOrbSet*)general_heap_malloc(sizeof(EnergyOrbSet)); + userData = (EnergyOrbSet*)script->userData; + + userData->superBlock = get_entity_by_index(evt_get_variable(script, *args++)); + + for (i = 0; i < SUPER_BLOCK_NUM_ORBS; i++) { + userData->orbEffects[i] = (EffectInstance*)fx_motion_blur_flame(0, userData->superBlock->position.x, + userData->superBlock->position.y + 12.5f, + userData->superBlock->position.z, 1.0f, -1); + t1 = 0.0f; + userData->posZ[i] = t1; + userData->posY[i] = t1; + userData->posX[i] = t1; + userData->partnerPosZ[i] = t1; + userData->partnerPosY[i] = t1; + userData->partnerPosX[i] = t1; + } + + userData->scatterState = 0; + userData->gatherState = 0; + userData->scatterStateTime = 0; + userData->gatherStateTime = 0; + + t1 = 50.0f; + for (i = 0; i < SUPER_BLOCK_NUM_ORBS; i++) { + x = 0.0f; + add_vec2D_polar(&x, &userData->partnerPosY[i], t1, N(SuperBlock_UpgradeOrbAngles)[i]); + userData->partnerPosX[i] = cosTheta * x; + userData->partnerPosZ[i] = sinTheta * x; + userData->partnerPosX[i] = partner->pos.x - (userData->superBlock->position.x + userData->partnerPosX[i]); + userData->partnerPosY[i] = partner->pos.y - (userData->superBlock->position.y + userData->partnerPosY[i]); + userData->partnerPosZ[i] = partner->pos.z - (userData->superBlock->position.z + userData->partnerPosZ[i]); + } + } + + userData = (EnergyOrbSet*)script->userData; + switch (userData->scatterState) { + case 0: + t1 = update_lerp(EASING_CUBIC_OUT, 0.0f, 50.0f, userData->scatterStateTime, 20); + for (i = 0; i < SUPER_BLOCK_NUM_ORBS; i++) { + x = userData->posY[i] = 0.0f; + add_vec2D_polar(&x, &userData->posY[i], t1, N(SuperBlock_UpgradeOrbAngles)[i]); + userData->posX[i] = cosTheta * x; + userData->posZ[i] = sinTheta * x; + } + + userData->scatterStateTime++; + if (userData->scatterStateTime >= 21) { + userData->scatterState = 1; + userData->scatterStateTime = 0; + } + break; + case 1: + t1 = 50.0f; + for (i = 0; i < SUPER_BLOCK_NUM_ORBS; i++) { + x = userData->posY[i] = 0.0f; + add_vec2D_polar(&x, &userData->posY[i], t1, N(SuperBlock_UpgradeOrbAngles)[i]); + userData->posX[i] = cosTheta * x; + userData->posZ[i] = sinTheta * x; + } + + userData->scatterStateTime++; + if (userData->scatterStateTime > 15) { + userData->scatterStateTime = 15; + userData->scatterState = 2; + } + break; + case 2: + userData->scatterStateTime++; + if (userData->scatterStateTime > 30) { + for (i = 0; i < SUPER_BLOCK_NUM_ORBS; i++) { + userData->orbEffects[i]->flags |= EFFECT_INSTANCE_FLAGS_10; + } + return ApiStatus_DONE2; + } + break; + } + + switch (userData->gatherState) { + case 0: + userData->gatherStateTime++; + if (userData->gatherStateTime > 15) { + userData->gatherState = 1; + userData->gatherStateTime = 0; + } + break; + case 1: + for (i = 0; i < SUPER_BLOCK_NUM_ORBS; i++) { + userData->posX[i] += update_lerp(EASING_QUADRATIC_IN, 0.0f, userData->partnerPosX[i], userData->gatherStateTime, 20); + userData->posY[i] += update_lerp(EASING_QUADRATIC_IN, 0.0f, userData->partnerPosY[i], userData->gatherStateTime, 20); + userData->posZ[i] += update_lerp(EASING_QUADRATIC_IN, 0.0f, userData->partnerPosZ[i], userData->gatherStateTime, 20); + } + + userData->gatherStateTime++; + if (userData->gatherStateTime > 20) { + userData->gatherState = 2; + userData->gatherStateTime = 0; + } + break; + } + + for (i = 0; i < SUPER_BLOCK_NUM_ORBS; i++) { + ((BlurFlameEffectData*)userData->orbEffects[i]->data)->position.x = userData->posX[i]; + ((BlurFlameEffectData*)userData->orbEffects[i]->data)->position.y = userData->posY[i]; + ((BlurFlameEffectData*)userData->orbEffects[i]->data)->position.z = userData->posZ[i]; + } + + return ApiStatus_BLOCK; +} + +s32 N(SuperBlock_WhiteScreenFlash)(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 ret = 0; + + if (isInitialCall) { + script->varTable[0] = evt_get_variable(script, *args++); + script->varTable[1] = evt_get_variable(script, *args++); + script->functionTemp[0] = 0; + script->functionTemp[1] = 0; + set_screen_overlay_color(0, 208, 208, 208); + } + + switch (script->functionTemp[0]) { + case 0: + if (script->functionTemp[1] == 255) { + script->functionTemp[0] = 1; + script->functionTemp[2] = 0; + } + script->functionTemp[1] += script->varTable[0]; + if (script->functionTemp[1] > 255) { + script->functionTemp[1] = 255; + } + break; + + case 1: + script->functionTemp[2]++; + if (script->functionTemp[2] >= 2) { + script->functionTemp[0] = 2; + } + break; + + case 2: + if (script->functionTemp[1] == 0) { + ret = 1; + } + script->functionTemp[1] -= script->varTable[1]; + if (script->functionTemp[1] < 0) { + script->functionTemp[1] = 0; + } + break; + } + + set_screen_overlay_params_front(1, script->functionTemp[1]); + + return ret; +} + +ApiStatus N(SuperBlock_PartnerSparkles2)(Evt* script, s32 isInitialCall) { + Npc* partner = get_npc_safe(NPC_PARTNER); + fx_sparkles(2, partner->pos.x, partner->pos.y + 30.0f, partner->pos.z, 30.0f); + return ApiStatus_DONE2; +} + +ApiStatus N(SuperBlock_PartnerSparkles4)(Evt* script, s32 isInitialCall) { + Npc* partner = get_npc_safe(NPC_PARTNER); + fx_sparkles(4, partner->pos.x, partner->pos.y + 30.0f, partner->pos.z, 30.0f); + return ApiStatus_DONE2; +} + +ApiStatus N(SuperBlock_WaitForPlayerToLand)(Evt* script, s32 isInitialCall) { + script->varTable[0] = FALSE; + if ((gPartnerActionStatus.actionState.b[0] != 0) && (gPartnerActionStatus.actionState.b[3] == 3)) { + script->varTable[0] = TRUE; + } + return ApiStatus_DONE2; +} + diff --git a/src/world/common/atomic/SuperBlock.inc.h b/src/world/common/atomic/SuperBlock.inc.h new file mode 100644 index 0000000000..53b180bc46 --- /dev/null +++ b/src/world/common/atomic/SuperBlock.inc.h @@ -0,0 +1,32 @@ +#ifndef SUPER_BLOCK_INC_H +#define SUPER_BLOCK_INC_H + +#include "common.h" + +#define SUPER_BLOCK_NUM_ORBS 3 + +ApiStatus N(SuperBlock_SetOverride40)(Evt* script, s32 isInitialCall); +ApiStatus N(SuperBlock_ClearOverride40)(Evt* script, s32 isInitialCall); +ApiStatus N(SuperBlock_HideBlockContent)(Evt *script, s32 isInitialCall); +ApiStatus N(SuperBlock_GetPartnerRank)(Evt* script, s32 isInitialCall); +s32 N(SuperBlock_get_partner_rank)(s32 idx, s16 maxLevel); +ApiStatus N(SuperBlock_CountEligiblePartners)(Evt* script, s32 isInitialCall); +ApiStatus N(SuperBlock_ShowSelectPartnerMenu)(Evt* script, s32 isInitialCall); +ApiStatus N(SuperBlock_SwitchToPartner)(Evt* script, s32 isInitialCall); +ApiStatus N(SuperBlock_LoadCurrentPartnerName)(Evt* script, s32 isInitialCall); +ApiStatus N(SuperBlock_StartGlowEffect)(Evt* script, s32 isInitialCall); +ApiStatus N(SuperBlock_EndGlowEffect)(Evt* script, s32 isInitialCall); +ApiStatus N(SuperBlock_GatherEnergyFX)(Evt* script, s32 isInitialCall); +ApiStatus N(SuperBlock_RadiateFaintEnergyFX)(Evt* script, s32 isInitialCall); +ApiStatus N(SuperBlock_AnimateEnergyOrbs)(Evt* script, s32 isInitialCall); +ApiStatus N(SuperBlock_WhiteScreenFlash)(Evt* script, s32 isInitialCall); +ApiStatus N(SuperBlock_PartnerSparkles2)(Evt* script, s32 isInitialCall); +ApiStatus N(SuperBlock_PartnerSparkles4)(Evt* script, s32 isInitialCall); +ApiStatus N(SuperBlock_WaitForPlayerToLand)(Evt* script, s32 isInitialCall); + +extern s32 N(SuperBlock_CantUpgradeMessages)[2]; +extern s16 N(SuperBlock_PartnerIDs)[8]; +extern s32 N(SuperBlock_UpgradeDescMessages)[8][2]; +extern f32 N(SuperBlock_UpgradeOrbAngles)[SUPER_BLOCK_NUM_ORBS]; + +#endif diff --git a/src/world/common/atomic/SuperBlockData.inc.c b/src/world/common/atomic/SuperBlockData.inc.c new file mode 100644 index 0000000000..080ad77f4b --- /dev/null +++ b/src/world/common/atomic/SuperBlockData.inc.c @@ -0,0 +1,164 @@ +#include "common.h" +#include "SuperBlock.inc.h" + +// map-specific parameters for this data +// which saved byte to associate this block with +#ifndef SUPER_BLOCK_GAMEFLAG + #define SUPER_BLOCK_GAMEFLAG EVT_SAVE_FLAG(0) +#endif +// which map var to store +#ifndef SUPER_BLOCK_MAPVAR + #define SUPER_BLOCK_MAPVAR EVT_MAP_VAR(0) +#endif + +// use this in a script macro calling MakeEntity for this super block +#define EVT_SETUP_SUPER_BLOCK(mapVar,gameFlag) \ + EVT_SET(mapVar, EVT_VAR(0))\ + EVT_CALL(AssignBlockFlag, gameFlag)\ + EVT_CALL(AssignScript, EVT_PTR(N(SuperBlock_OnHit))) + +s32 N(SuperBlock_CantUpgradeMessages)[2] = { + MESSAGE_ID(0x1D,0xF0), MESSAGE_ID(0x1D,0xF1) +}; + +s16 N(SuperBlock_PartnerIDs)[8] = { + PARTNER_GOOMBARIO, + PARTNER_KOOPER, + PARTNER_BOMBETTE, + PARTNER_PARAKARRY, + PARTNER_BOW, + PARTNER_WATT, + PARTNER_SUSHIE, + PARTNER_LAKILESTER +}; + +s32 N(SuperBlock_UpgradeDescMessages)[8][2] = { + { MESSAGE_ID(0x1D,0xE0), MESSAGE_ID(0x1D,0xE1) }, + { MESSAGE_ID(0x1D,0xE2), MESSAGE_ID(0x1D,0xE3) }, + { MESSAGE_ID(0x1D,0xE4), MESSAGE_ID(0x1D,0xE5) }, + { MESSAGE_ID(0x1D,0xE6), MESSAGE_ID(0x1D,0xE7) }, + { MESSAGE_ID(0x1D,0xE8), MESSAGE_ID(0x1D,0xE9) }, + { MESSAGE_ID(0x1D,0xEA), MESSAGE_ID(0x1D,0xEB) }, + { MESSAGE_ID(0x1D,0xEC), MESSAGE_ID(0x1D,0xED) }, + { MESSAGE_ID(0x1D,0xEE), MESSAGE_ID(0x1D,0xEF) } +}; + +f32 N(SuperBlock_UpgradeOrbAngles)[SUPER_BLOCK_NUM_ORBS] = { + 140.0f, 180.0f, 220.0f +}; + +EvtScript N(SuperBlock_ShowUpgradeEffects) = { + EVT_WAIT_FRAMES(10) + EVT_CALL(PlaySound, SOUND_212D) + EVT_CALL(N(SuperBlock_GatherEnergyFX), SUPER_BLOCK_MAPVAR) + EVT_WAIT_FRAMES(85) + EVT_THREAD + EVT_CALL(PlaySound, SOUND_212E) + EVT_CALL(N(SuperBlock_WhiteScreenFlash), 70, 70) + EVT_WAIT_FRAMES(27) + EVT_CALL(PlaySound, SOUND_208E) + EVT_CALL(N(SuperBlock_WhiteScreenFlash), 50, 50) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT_FRAMES(3) + EVT_CALL(N(SuperBlock_HideBlockContent), SUPER_BLOCK_MAPVAR) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT_FRAMES(47) + EVT_CALL(N(SuperBlock_RadiateFaintEnergyFX)) + EVT_CALL(N(SuperBlock_PartnerSparkles2)) + EVT_WAIT_FRAMES(5) + EVT_CALL(N(SuperBlock_PartnerSparkles4)) + EVT_WAIT_FRAMES(5) + EVT_CALL(N(SuperBlock_PartnerSparkles2)) + EVT_END_THREAD + EVT_WAIT_FRAMES(3) + EVT_CALL(N(SuperBlock_AnimateEnergyOrbs), SUPER_BLOCK_MAPVAR) + EVT_WAIT_FRAMES(30) + EVT_RETURN + EVT_END +}; + +EvtScript N(SuperBlock_OnHit) = { + EVT_IF_EQ(SUPER_BLOCK_GAMEFLAG, 1) + EVT_RETURN + EVT_END_IF + EVT_CALL(IsStartingConversation, EVT_VAR(0)) + EVT_IF_EQ(EVT_VAR(0), 1) + EVT_RETURN + EVT_END_IF + EVT_CALL(N(SuperBlock_WaitForPlayerToLand)) + EVT_IF_EQ(EVT_VAR(0), 1) + EVT_RETURN + EVT_END_IF + EVT_CALL(ModifyGlobalOverrideFlags, 1, GLOBAL_OVERRIDES_CANT_PICK_UP_ITEMS) + EVT_CALL(N(SuperBlock_SetOverride40)) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_100, TRUE) + EVT_CALL(N(SuperBlock_StartGlowEffect), SUPER_BLOCK_MAPVAR, EVT_VAR(9)) + EVT_CALL(FindKeyItem, ITEM_ULTRA_STONE, EVT_VAR(12)) + EVT_CALL(N(SuperBlock_CountEligiblePartners)) + EVT_IF_EQ(EVT_VAR(0), -1) + EVT_CALL(ShowMessageAtScreenPos, MESSAGE_ID(0x1D,0xDC), 160, 40) + EVT_WAIT_FRAMES(10) + EVT_CALL(N(SuperBlock_EndGlowEffect), EVT_VAR(9)) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(EnablePartnerAI) + EVT_CALL(ModifyGlobalOverrideFlags, 0, GLOBAL_OVERRIDES_CANT_PICK_UP_ITEMS) + EVT_CALL(N(SuperBlock_ClearOverride40)) + EVT_RETURN + EVT_END_IF + EVT_IF_EQ(EVT_SAVE_FLAG(438), 0) + EVT_SET(EVT_SAVE_FLAG(438), 1) + EVT_CALL(ShowMessageAtScreenPos, MESSAGE_ID(0x1D,0xDA), 160, 40) + EVT_ELSE + EVT_CALL(ShowMessageAtScreenPos, MESSAGE_ID(0x1D,0xDB), 160, 40) + EVT_END_IF + EVT_CALL(N(SuperBlock_ShowSelectPartnerMenu)) + EVT_IF_EQ(EVT_VAR(0), -1) + EVT_CALL(N(SuperBlock_EndGlowEffect), EVT_VAR(9)) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(EnablePartnerAI) + EVT_CALL(ModifyGlobalOverrideFlags, 0, GLOBAL_OVERRIDES_CANT_PICK_UP_ITEMS) + EVT_CALL(N(SuperBlock_ClearOverride40)) + EVT_RETURN + EVT_END_IF + EVT_SET(EVT_VAR(10), EVT_VAR(0)) + EVT_SET(EVT_VAR(11), EVT_VAR(1)) + EVT_CALL(EnablePartnerAI) + EVT_CALL(GetCurrentPartnerID, EVT_VAR(0)) + EVT_IF_NE(EVT_VAR(0), EVT_VAR(11)) + EVT_CALL(N(SuperBlock_SwitchToPartner), EVT_VAR(11)) + EVT_ELSE + EVT_CALL(func_802CF56C, 2) + EVT_END_IF + EVT_WAIT_FRAMES(10) + EVT_CALL(ShowMessageAtScreenPos, MESSAGE_ID(0x1D,0x0DF), 160, 40) + EVT_CALL(ShowChoice, MESSAGE_ID(0x1E,0x0D)) + EVT_CALL(CloseMessage) + EVT_IF_NE(EVT_VAR(0), 0) + EVT_CALL(N(SuperBlock_EndGlowEffect), EVT_VAR(9)) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(EnablePartnerAI) + EVT_CALL(ModifyGlobalOverrideFlags, 0, GLOBAL_OVERRIDES_CANT_PICK_UP_ITEMS) + EVT_CALL(N(SuperBlock_ClearOverride40)) + EVT_RETURN + EVT_END_IF + EVT_EXEC_WAIT(N(SuperBlock_ShowUpgradeEffects)) + EVT_CALL(N(SuperBlock_GetPartnerRank), EVT_VAR(11), EVT_VAR(13)) + EVT_SET(SUPER_BLOCK_GAMEFLAG, 1) + EVT_CALL(N(SuperBlock_EndGlowEffect), EVT_VAR(9)) + EVT_CALL(N(SuperBlock_LoadCurrentPartnerName)) + EVT_IF_EQ(EVT_VAR(13), 1) + EVT_CALL(ShowMessageAtScreenPos, MESSAGE_ID(0x1D,0xDD), 160, 40) + EVT_ELSE + EVT_CALL(ShowMessageAtScreenPos, MESSAGE_ID(0x1D,0xDE), 160, 40) + EVT_END_IF + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(EnablePartnerAI) + EVT_CALL(ModifyGlobalOverrideFlags, 0, GLOBAL_OVERRIDES_CANT_PICK_UP_ITEMS) + EVT_CALL(N(SuperBlock_ClearOverride40)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/partner/goombario.c b/src/world/partner/goombario.c index 148f81eb82..7dd29ee376 100644 --- a/src/world/partner/goombario.c +++ b/src/world/partner/goombario.c @@ -237,7 +237,7 @@ void world_goombario_pre_battle(Npc* goombario) { if (goombarioActionStatus->actionState.b[0] != 0) { set_time_freeze_mode(TIME_FREEZE_NORMAL); enable_player_input(); - CancelMessageAndBlock(); + cancel_current_message(); partner_clear_player_tracking(goombario); goombarioActionStatus->actionState.b[0] = 0; goombarioActionStatus->actionState.b[3] = 0; diff --git a/tools/ignored_funcs.txt b/tools/ignored_funcs.txt index 75121de305..1c9b17b5f3 100644 --- a/tools/ignored_funcs.txt +++ b/tools/ignored_funcs.txt @@ -32,7 +32,7 @@ dead_rand_int = 0x8002ACEC; dead_get_npc_safe = 0x8003E534; // get_npc_safe dead_heap_malloc = 0x8002BFD4; dead_general_heap_malloc = 0x8002BF18; -func_8002C01C = 0x8002C01C; +dead_heap_free = 0x8002C01C; dead_evt_set_variable = 0x802D5468; dead_sin_deg = 0x8002B5DC; dead_cos_deg = 0x8002B640; @@ -65,10 +65,10 @@ dead_get_model_list_index_from_tree_index = 0x80125270; dead_get_model_from_list_index = 0x80124F44; dead_guTranslateF = 0x8006CAC0; func_800775D0 = 0x800775D0; -func_802F3B00 = 0x802F3B00; -func_800FCD0C = 0x800FCD0C; -func_800F9260 = 0x800F9260; -func_800F93E8 = 0x800F93E8; +dead_entity_upgrade_block_hide_content = 0x802F3B00; +dead_create_popup_menu = 0x800FCD0C; +dead_hide_popup_menu = 0x800F9260; +dead_destroy_popup_menu = 0x800F93E8; dead_switch_to_partner = 0x800F2D5C; dead_set_message_msg = 0x80130C74; dead_fx_energy_orb_wave = 0x800769D0; diff --git a/ver/us/asm/data/9DE60.data.s b/ver/us/asm/data/9DE60.data.s index 83e88a206c..70977cfb59 100644 --- a/ver/us/asm/data/9DE60.data.s +++ b/ver/us/asm/data/9DE60.data.s @@ -333,7 +333,7 @@ dlabel HudScript_StatusDigit0 .word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x0000003C, 0x800FFF80, 0x80100000, 0x00000003, 0x00000000 dlabel HudScript_StatusDigit1 -.word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x0000003C, 0x80100020, D_801000A0, 0x00000003, 0x00000000 +.word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x0000003C, 0x80100020, 0x801000A0, 0x00000003, 0x00000000 dlabel HudScript_StatusDigit2 .word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000002, 0x0000003C, 0x801000C0, 0x80100140, 0x00000003, 0x00000000 diff --git a/ver/us/asm/data/ECBC10.data.s b/ver/us/asm/data/ECBC10.data.s index a878bd8479..de553b4c32 100644 --- a/ver/us/asm/data/ECBC10.data.s +++ b/ver/us/asm/data/ECBC10.data.s @@ -8,23 +8,23 @@ dlabel D_80241F10_ECBC10 dlabel D_80241F70_ECBC70 .word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000030, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000031, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 -dlabel D_80241FE0_ECBCE0 +dlabel EC9D00_SuperBlock_CantUpgradeMessages .word 0x001D00F0, 0x001D00F1 -dlabel D_80241FE8_ECBCE8 +dlabel EC9D00_SuperBlock_PartnerIDs .word 0x00010002, 0x00030004, 0x00090006, 0x00070008 -dlabel D_80241FF8_ECBCF8 +dlabel EC9D00_SuperBlock_UpgradeDescMessages .word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF -dlabel EC9D00_bigFuncFloats +dlabel EC9D00_SuperBlock_UpgradeOrbAngles .word 0x430C0000, 0x43340000, 0x435C0000 dlabel D_80242044_ECBD44 -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, 0x802E37A0, 0x0000212D, 0x00000043, 0x00000002, EC9D00_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802E37A0, 0x0000212E, 0x00000043, 0x00000003, EC9D00_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, 0x802E37A0, 0x0000208E, 0x00000043, 0x00000003, EC9D00_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024003C_EC9D3C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, EC9D00_UnkFunc22, 0x00000043, 0x00000001, EC9D00_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, EC9D00_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, EC9D00_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, EC9D00_UnkFunc60, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, 0x802E37A0, 0x0000212D, 0x00000043, 0x00000002, EC9D00_SuperBlock_GatherEnergyFX, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802E37A0, 0x0000212E, 0x00000043, 0x00000003, EC9D00_SuperBlock_WhiteScreenFlash, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, 0x802E37A0, 0x0000208E, 0x00000043, 0x00000003, EC9D00_SuperBlock_WhiteScreenFlash, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, EC9D00_SuperBlock_HideBlockContent, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, EC9D00_SuperBlock_RadiateFaintEnergyFX, 0x00000043, 0x00000001, EC9D00_SuperBlock_PartnerSparkles2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, EC9D00_SuperBlock_PartnerSparkles4, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, EC9D00_SuperBlock_PartnerSparkles2, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, EC9D00_SuperBlock_AnimateEnergyOrbs, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802421A8_ECBEA8 -.word 0x0000000A, 0x00000002, 0xF84060FA, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x80048290, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EC9D00_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000001, 0x00200000, 0x00000043, 0x00000001, EC9D00_SetOverrideFlags_40, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, EC9D00_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, 0x802E4064, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, EC9D00_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, EC9D00_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, EC9D00_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802401CC_EC9ECC, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, EC9D00_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, EC9D00_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, EC9D00_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, 0x802DCACC, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, 0x802DE138, 0x001E000D, 0x00000043, 0x00000001, 0x802DE040, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, EC9D00_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, EC9D00_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80242044_ECBD44, 0x00000043, 0x00000003, EC9D00_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF84060FA, 0x00000001, 0x00000043, 0x00000002, EC9D00_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, EC9D00_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, EC9D00_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF84060FA, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x80048290, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EC9D00_SuperBlock_WaitForPlayerToLand, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000001, 0x00200000, 0x00000043, 0x00000001, EC9D00_SuperBlock_SetOverride40, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, EC9D00_SuperBlock_StartGlowEffect, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, 0x802E4064, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, EC9D00_SuperBlock_CountEligiblePartners, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, EC9D00_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, EC9D00_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EC9D00_SuperBlock_ShowSelectPartnerMenu, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, EC9D00_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, EC9D00_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, EC9D00_SuperBlock_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, 0x802DCACC, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, 0x802DE138, 0x001E000D, 0x00000043, 0x00000001, 0x802DE040, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, EC9D00_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, EC9D00_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80242044_ECBD44, 0x00000043, 0x00000003, EC9D00_SuperBlock_GetPartnerRank, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF84060FA, 0x00000001, 0x00000043, 0x00000002, EC9D00_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000001, EC9D00_SuperBlock_LoadCurrentPartnerName, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, EC9D00_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242628_ECC328 .word 0x00000043, 0x00000007, 0x8011A58C, 0x802F8DC0, 0xFFFFFCF4, 0x00000078, 0xFFFFFF92, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, 0x8011A8C0, 0xF84060FA, 0x00000043, 0x00000002, 0x8011A804, D_802421A8_ECBEA8, 0x00000043, 0x00000007, 0x802E4310, 0x0000015C, 0x000001FE, 0x00000000, 0xFFFFFFA6, 0x00000011, 0xF84060E5, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/ED9170.data.s b/ver/us/asm/data/ED9170.data.s index 2e8211bcd4..19f5b91d72 100644 --- a/ver/us/asm/data/ED9170.data.s +++ b/ver/us/asm/data/ED9170.data.s @@ -9,13 +9,13 @@ dlabel D_80240410_ED9230 .word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000030, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000031, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, 0x802E1D00, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024072C_ED954C -.word 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000002, 0x802DE3C0, 0x00000001, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010000, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, 0x802DC7C8, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x00000043, 0x00000001, ED8E20_DeadGetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, 0x802DEF5C, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, 0x802E37A0, 0x00000163, 0x00000043, 0x00000002, D_802DFEB8, 0x00000100, 0x00000043, 0x00000007, 0x802DFB40, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802DC7C8, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, 0x802DFB40, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000002, 0x802DE404, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000002, 0x802DE3C0, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, ED8E20_DeadGetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000002, 0x802DE3C0, 0x00000001, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x00000043, 0x00000001, ED8E20_DeadGetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, 0x802DEF5C, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000003, 0x802DC7C8, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, 0x802E37A0, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, 0x802DE3C0, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, D_802DFEB8, 0x00000900, 0x00000043, 0x00000007, 0x802DFB40, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, ED8E20_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802DC7C8, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, 0x802DFB40, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000002, 0x802DE404, 0x00000000, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000002, 0x802DE3C0, 0x00000001, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010000, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, 0x802DC7C8, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x00000043, 0x00000001, ED8E20_DeadPipe_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, 0x802DEF5C, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, 0x802E37A0, 0x00000163, 0x00000043, 0x00000002, D_802DFEB8, 0x00000100, 0x00000043, 0x00000007, 0x802DFB40, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802DC7C8, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, 0x802DFB40, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000002, 0x802DE404, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000002, 0x802DE3C0, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, ED8E20_DeadPipe_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000002, 0x802DE3C0, 0x00000001, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x00000043, 0x00000001, ED8E20_DeadPipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, 0x802DEF5C, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000003, 0x802DC7C8, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, 0x802E37A0, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, 0x802DE3C0, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, D_802DFEB8, 0x00000900, 0x00000043, 0x00000007, 0x802DFB40, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, ED8E20_DeadPipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802DC7C8, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, 0x802DFB40, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000002, 0x802DE404, 0x00000000, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240E70_ED9C90 -.word 0x00000043, 0x00000001, ED8E20_DeadUnkFunc25, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802E0158, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, 0x802E01B8, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80240F4C_ED9D6C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, ED8E20_DeadPipe_AwaitDownInput, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802E0158, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, 0x802E01B8, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80240F4C_ED9D6C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240F4C_ED9D6C -.word 0x00000043, 0x00000001, ED8E20_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000002, 0x802DE3C0, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, ED8E20_DeadGetEntryPos, 0x00000043, 0x00000004, 0x802DE754, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, ED8E20_DeadGetEntryPos, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, 0x802DF380, 0x00200000, 0x00000001, 0x00000043, 0x00000001, ED8E20_GetCurrentCameraYawClamped180, 0x00000043, 0x00000003, 0x802DEF5C, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, 0x802DF380, 0x00200000, 0x00000000, 0x00000043, 0x00000002, 0x802E37A0, 0x00000163, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, D_802DFEB8, 0x00000800, 0x00000043, 0x00000007, 0x802DFB40, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DFABC, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, D_802DF3F0, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802E0158, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, 0x802E01B8, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, ED8E20_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, ED8E20_DeadGetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802DEF5C, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, 0x802E37A0, 0x00000163, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010000, 0x00000043, 0x00000002, D_802DFEB8, 0x00000800, 0x00000043, 0x00000007, 0x802DFB40, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, 0x802DE3C0, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, ED8E20_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, ED8E20_DeadPipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000002, 0x802DE3C0, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, ED8E20_DeadPipe_GetEntryPos, 0x00000043, 0x00000004, 0x802DE754, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, ED8E20_DeadPipe_GetEntryPos, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, 0x802DF380, 0x00200000, 0x00000001, 0x00000043, 0x00000001, ED8E20_DeadPipe_GetCameraYaw, 0x00000043, 0x00000003, 0x802DEF5C, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, 0x802DF380, 0x00200000, 0x00000000, 0x00000043, 0x00000002, 0x802E37A0, 0x00000163, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, D_802DFEB8, 0x00000800, 0x00000043, 0x00000007, 0x802DFB40, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DFABC, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, D_802DF3F0, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802E0158, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, 0x802E01B8, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, ED8E20_DeadPipe_SetAnimFlag, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, ED8E20_DeadPipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802DEF5C, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, 0x802E37A0, 0x00000163, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010000, 0x00000043, 0x00000002, D_802DFEB8, 0x00000800, 0x00000043, 0x00000007, 0x802DFB40, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, 0x802DE3C0, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, ED8E20_DeadPipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024145C_EDA27C .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x802431A8, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/EEFAD0.data.s b/ver/us/asm/data/EEFAD0.data.s index b464aaba93..4fb59ccd76 100644 --- a/ver/us/asm/data/EEFAD0.data.s +++ b/ver/us/asm/data/EEFAD0.data.s @@ -32,23 +32,23 @@ dlabel D_802431AC_EF02AC dlabel D_802434CC_EF05CC .word 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000014, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFD1C, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF74, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFEFC, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFC9, 0x00000024, 0x00000002, 0xFE363C84, 0x00000064, 0x00000044, 0x00000001, D_80242F00_EF0000, 0x00000024, 0x00000002, 0xFE363C80, 0x000000FA, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF74, 0x00000024, 0x00000002, 0xFE363C82, 0x000002D5, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFC9, 0x00000024, 0x00000002, 0xFE363C84, 0x000000B4, 0x00000044, 0x00000001, D_80242F00_EF0000, 0x00000043, 0x00000002, 0x802D6400, 0x00000041, 0x00000024, 0x00000002, 0xFE363C83, 0x00000041, 0x00000024, 0x00000002, 0xFE363C84, 0x00000042, 0x00000024, 0x00000002, 0xFE363C85, 0x00000043, 0x00000024, 0x00000002, 0xFE363C86, 0x00000044, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, D_802431AC_EF02AC, 0x00000043, 0x00000002, 0x802D6400, 0x00000047, 0x00000024, 0x00000002, 0xFE363C83, 0x00000047, 0x00000024, 0x00000002, 0xFE363C84, 0x00000048, 0x00000024, 0x00000002, 0xFE363C85, 0x00000049, 0x00000024, 0x00000002, 0xFE363C86, 0x0000004A, 0x00000024, 0x00000002, 0xFE363C8A, 0x000000AE, 0x00000044, 0x00000001, D_802431AC_EF02AC, 0x00000043, 0x00000002, 0x802D6400, 0x0000004F, 0x00000024, 0x00000002, 0xFE363C83, 0x0000004F, 0x00000024, 0x00000002, 0xFE363C84, 0x00000050, 0x00000024, 0x00000002, 0xFE363C85, 0x00000051, 0x00000024, 0x00000002, 0xFE363C86, 0x00000052, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, D_802431AC_EF02AC, 0x00000043, 0x00000002, 0x802D6400, 0x00000055, 0x00000024, 0x00000002, 0xFE363C83, 0x00000055, 0x00000024, 0x00000002, 0xFE363C84, 0x00000056, 0x00000024, 0x00000002, 0xFE363C85, 0x00000057, 0x00000024, 0x00000002, 0xFE363C86, 0x00000058, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, D_802431AC_EF02AC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 -dlabel D_80243760_EF0860 +dlabel EED1E0_SuperBlock_CantUpgradeMessages .word 0x001D00F0, 0x001D00F1 -dlabel D_80243768_EF0868 +dlabel EED1E0_SuperBlock_PartnerIDs .word 0x00010002, 0x00030004, 0x00090006, 0x00070008 -dlabel D_80243778_EF0878 +dlabel EED1E0_SuperBlock_UpgradeDescMessages .word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF -dlabel EED1E0_bigFuncFloats +dlabel EED1E0_SuperBlock_UpgradeOrbAngles .word 0x430C0000, 0x43340000, 0x435C0000 dlabel D_802437C4_EF08C4 -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, 0x802E37A0, 0x0000212D, 0x00000043, 0x00000002, EED1E0_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802E37A0, 0x0000212E, 0x00000043, 0x00000003, EED1E0_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, 0x802E37A0, 0x0000208E, 0x00000043, 0x00000003, EED1E0_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024011C_EED21C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, EED1E0_UnkFunc22, 0x00000043, 0x00000001, EED1E0_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, EED1E0_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, EED1E0_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, EED1E0_UnkFunc60, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, 0x802E37A0, 0x0000212D, 0x00000043, 0x00000002, EED1E0_SuperBlock_GatherEnergyFX, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802E37A0, 0x0000212E, 0x00000043, 0x00000003, EED1E0_SuperBlock_WhiteScreenFlash, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, 0x802E37A0, 0x0000208E, 0x00000043, 0x00000003, EED1E0_SuperBlock_WhiteScreenFlash, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, EED1E0_SuperBlock_HideBlockContent, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, EED1E0_SuperBlock_RadiateFaintEnergyFX, 0x00000043, 0x00000001, EED1E0_SuperBlock_PartnerSparkles2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, EED1E0_SuperBlock_PartnerSparkles4, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, EED1E0_SuperBlock_PartnerSparkles2, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, EED1E0_SuperBlock_AnimateEnergyOrbs, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243928_EF0A28 -.word 0x0000000A, 0x00000002, 0xF84060FB, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x80048290, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EED1E0_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000001, 0x00200000, 0x00000043, 0x00000001, EED1E0_SetOverrideFlags_40, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, EED1E0_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, 0x802E4064, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, EED1E0_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, EED1E0_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, EED1E0_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802402AC_EED3AC, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, EED1E0_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, EED1E0_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, EED1E0_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, 0x802DCACC, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, 0x802DE138, 0x001E000D, 0x00000043, 0x00000001, 0x802DE040, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, EED1E0_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, EED1E0_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802437C4_EF08C4, 0x00000043, 0x00000003, EED1E0_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF84060FB, 0x00000001, 0x00000043, 0x00000002, EED1E0_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, EED1E0_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, EED1E0_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF84060FB, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x80048290, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EED1E0_SuperBlock_WaitForPlayerToLand, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000001, 0x00200000, 0x00000043, 0x00000001, EED1E0_SuperBlock_SetOverride40, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, EED1E0_SuperBlock_StartGlowEffect, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, 0x802E4064, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, EED1E0_SuperBlock_CountEligiblePartners, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, EED1E0_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, EED1E0_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EED1E0_SuperBlock_ShowSelectPartnerMenu, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, EED1E0_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, EED1E0_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, EED1E0_SuperBlock_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, 0x802DCACC, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, 0x802DE138, 0x001E000D, 0x00000043, 0x00000001, 0x802DE040, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, EED1E0_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, EED1E0_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802437C4_EF08C4, 0x00000043, 0x00000003, EED1E0_SuperBlock_GetPartnerRank, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF84060FB, 0x00000001, 0x00000043, 0x00000002, EED1E0_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000001, EED1E0_SuperBlock_LoadCurrentPartnerName, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, EED1E0_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243DA8_EF0EA8 .word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D83DC, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_gv/gv_01/E1EC20.data.s b/ver/us/asm/data/world/area_gv/gv_01/E1EC20.data.s index 56728cfb50..f5b8a646df 100644 --- a/ver/us/asm/data/world/area_gv/gv_01/E1EC20.data.s +++ b/ver/us/asm/data/world/area_gv/gv_01/E1EC20.data.s @@ -3,10 +3,10 @@ .section .data dlabel D_802407C0_E1EC20 -.word 0x00000000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80241748_E1FBA8, D_802407C0_E1EC20, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 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, gv_01_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, gv_01_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, gv_01_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, gv_01_SomeXYZFunc2, 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, gv_01_UnkFunc25, 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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241030_E1F490, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80241748_E1FBA8, D_802407C0_E1EC20, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 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, gv_01_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, gv_01_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, gv_01_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, gv_01_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, gv_01_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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241030_E1F490, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241030_E1F490 -.word 0x00000043, 0x00000001, gv_01_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, gv_01_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, gv_01_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, gv_01_GetCurrentCameraYawClamped180, 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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, gv_01_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, gv_01_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, gv_01_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, gv_01_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, gv_01_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, gv_01_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, gv_01_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, gv_01_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, gv_01_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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, gv_01_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, gv_01_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, gv_01_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, 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, gv_01_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, gv_01_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802415DC_E1FA3C .word 0x000000C8, 0x000000AA, 0x0000008C, 0x0000006E, 0x00000050, 0x00000032, 0x00000014, 0x0000000A, 0x0000001A, 0x0000001D, 0x0000001E, 0x0000001D, 0x0000001A, 0x0000000A, 0x00000000, 0x0000000C, 0x0000000F, 0x00000010, 0x0000000F, 0x0000000B, 0x00000006, 0x00000000, 0x00000004, 0x00000003, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_10/989910.data.s b/ver/us/asm/data/world/area_isk/isk_10/989910.data.s index 1a1163f892..f77b130d85 100644 --- a/ver/us/asm/data/world/area_isk/isk_10/989910.data.s +++ b/ver/us/asm/data/world/area_isk/isk_10/989910.data.s @@ -20,23 +20,23 @@ dlabel D_80240F34_989A94 dlabel D_80240F98_989AF8 .word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000B, 0x00000043, 0x00000002, SetSpriteShading, 0x00020007, 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, SetCamSpeed, 0x00000000, 0xF24A85B4, 0x00000046, 0x00000001, D_802418E0_98A440, 0x00000046, 0x00000001, 0x80241CD4, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFC7, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000018, 0x00000000, 0x00000008, 0x00000018, 0x00000001, 0xFFFFFFC8, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000019, 0x00000000, 0x00000008, 0x0000001B, 0x00000001, 0xFFFFFFC8, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000018, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80240F34_989A94, 0x00000044, 0x00000001, EnterWalk, 0x00000002, 0x00000000, 0x00000001, 0x00000000 -dlabel D_80241100_989C60 +dlabel isk_10_SuperBlock_CantUpgradeMessages .word 0x001D00F0, 0x001D00F1 -dlabel D_80241108_989C68 +dlabel isk_10_SuperBlock_PartnerIDs .word 0x00010002, 0x00030004, 0x00090006, 0x00070008 -dlabel D_80241118_989C78 +dlabel isk_10_SuperBlock_UpgradeDescMessages .word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF -dlabel isk_10_bigFuncFloats +dlabel isk_10_SuperBlock_UpgradeOrbAngles .word 0x430C0000, 0x43340000, 0x435C0000 dlabel D_80241164_989CC4 -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, isk_10_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, isk_10_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, isk_10_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024003C_988B9C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, isk_10_UnkFunc22, 0x00000043, 0x00000001, isk_10_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, isk_10_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, isk_10_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, isk_10_UnkFunc60, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, isk_10_SuperBlock_GatherEnergyFX, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, isk_10_SuperBlock_WhiteScreenFlash, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, isk_10_SuperBlock_WhiteScreenFlash, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, isk_10_SuperBlock_HideBlockContent, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, isk_10_SuperBlock_RadiateFaintEnergyFX, 0x00000043, 0x00000001, isk_10_SuperBlock_PartnerSparkles2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, isk_10_SuperBlock_PartnerSparkles4, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, isk_10_SuperBlock_PartnerSparkles2, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, isk_10_SuperBlock_AnimateEnergyOrbs, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802412C8_989E28 -.word 0x0000000A, 0x00000002, 0xF8405F07, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, isk_10_UnkFunc24, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, isk_10_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, isk_10_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, isk_10_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, isk_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, isk_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802401CC_988D2C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, isk_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, isk_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, isk_10_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, isk_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, isk_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241164_989CC4, 0x00000043, 0x00000003, isk_10_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405F07, 0x00000001, 0x00000043, 0x00000002, isk_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, isk_10_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, isk_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF8405F07, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, isk_10_SuperBlock_WaitForPlayerToLand, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, isk_10_SuperBlock_SetOverride40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, isk_10_SuperBlock_StartGlowEffect, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, isk_10_SuperBlock_CountEligiblePartners, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, isk_10_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, isk_10_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, isk_10_SuperBlock_ShowSelectPartnerMenu, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, isk_10_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, isk_10_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, isk_10_SuperBlock_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, isk_10_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, isk_10_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241164_989CC4, 0x00000043, 0x00000003, isk_10_SuperBlock_GetPartnerRank, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405F07, 0x00000001, 0x00000043, 0x00000002, isk_10_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000001, isk_10_SuperBlock_LoadCurrentPartnerName, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, isk_10_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241748_98A2A8 .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFD050F89, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A801A, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFDBF, 0xFFFFFCF4, 0xFFFFFFB5, 0x0000000F, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A85B4, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0xFFFFFDF8, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A801A, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFDCF, 0xFFFFFDF8, 0x00000017, 0x0000001E, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A85B4, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_iwa/iwa_10/923FD0.data.s b/ver/us/asm/data/world/area_iwa/iwa_10/923FD0.data.s index 2050437832..08a42723e9 100644 --- a/ver/us/asm/data/world/area_iwa/iwa_10/923FD0.data.s +++ b/ver/us/asm/data/world/area_iwa/iwa_10/923FD0.data.s @@ -2,23 +2,23 @@ .section .data -dlabel D_80245A60_923FD0 +dlabel iwa_10_SuperBlock_CantUpgradeMessages .word 0x001D00F0, 0x001D00F1 -dlabel D_80245A68_923FD8 +dlabel iwa_10_SuperBlock_PartnerIDs .word 0x00010002, 0x00030004, 0x00090006, 0x00070008 -dlabel D_80245A78_923FE8 +dlabel iwa_10_SuperBlock_UpgradeDescMessages .word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF -dlabel iwa_10_bigFuncFloats +dlabel iwa_10_SuperBlock_UpgradeOrbAngles .word 0x430C0000, 0x43340000, 0x435C0000 dlabel D_80245AC4_924034 -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, iwa_10_UnkFunc21, 0xFD050F8B, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, iwa_10_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, iwa_10_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024032C_91E89C, 0xFD050F8B, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, iwa_10_UnkFunc22, 0x00000043, 0x00000001, iwa_10_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, iwa_10_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, iwa_10_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, iwa_10_UnkFunc60, 0xFD050F8B, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, iwa_10_SuperBlock_GatherEnergyFX, 0xFD050F8B, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, iwa_10_SuperBlock_WhiteScreenFlash, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, iwa_10_SuperBlock_WhiteScreenFlash, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, iwa_10_SuperBlock_HideBlockContent, 0xFD050F8B, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, iwa_10_SuperBlock_RadiateFaintEnergyFX, 0x00000043, 0x00000001, iwa_10_SuperBlock_PartnerSparkles2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, iwa_10_SuperBlock_PartnerSparkles4, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, iwa_10_SuperBlock_PartnerSparkles2, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, iwa_10_SuperBlock_AnimateEnergyOrbs, 0xFD050F8B, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80245C28_924198 -.word 0x0000000A, 0x00000002, 0xF8405E51, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, iwa_10_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, iwa_10_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, iwa_10_UnkFunc20, 0xFD050F8B, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, iwa_10_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, iwa_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, iwa_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802404BC_91EA2C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, iwa_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, iwa_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, iwa_10_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, iwa_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, iwa_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80245AC4_924034, 0x00000043, 0x00000003, iwa_10_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405E51, 0x00000001, 0x00000043, 0x00000002, iwa_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, iwa_10_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, iwa_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF8405E51, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, iwa_10_SuperBlock_WaitForPlayerToLand, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, iwa_10_SuperBlock_SetOverride40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, iwa_10_SuperBlock_StartGlowEffect, 0xFD050F8B, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, iwa_10_SuperBlock_CountEligiblePartners, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, iwa_10_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, iwa_10_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, iwa_10_SuperBlock_ShowSelectPartnerMenu, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, iwa_10_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, iwa_10_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, iwa_10_SuperBlock_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, iwa_10_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, iwa_10_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80245AC4_924034, 0x00000043, 0x00000003, iwa_10_SuperBlock_GetPartnerRank, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405E51, 0x00000001, 0x00000043, 0x00000002, iwa_10_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000001, iwa_10_SuperBlock_LoadCurrentPartnerName, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, iwa_10_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802460A8_924618 .word 0x00000024, 0x00000002, 0xF8405E50, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E50, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA1E4, 0xFFFFFBF0, 0x000000A0, 0xFFFFFE57, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802460A8_924618, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0xFFFFFABA, 0x000000DC, 0xFFFFFF2E, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405E51, 0x00000043, 0x00000002, AssignScript, D_80245C28_924198, 0x00000043, 0x00000008, MakeEntity, 0x802BCD9C, 0xFFFFFCF4, 0x00000000, 0xFFFFFF1D, 0xFFFFFFF1, 0x0000010E, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802BCD9C, 0xFFFFFB7B, 0x00000046, 0xFFFFFEE6, 0x00000028, 0x00000078, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802BCD9C, 0xFFFFFC7B, 0x000000B9, 0xFFFFFDD5, 0x00000000, 0x00000078, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0xFFFFFDF3, 0x00000050, 0x00000073, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA7E0, 0xFFFFFD26, 0x00000113, 0xFFFFFE02, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 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 256e25f3d5..332ff810d5 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_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_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_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_SomeXYZFunc2, 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_UnkFunc25, 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, func_802D2B6C, 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, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 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_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, jan_03_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, jan_03_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, jan_03_GetCurrentCameraYawClamped180, 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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, jan_03_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, jan_03_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_SomeXYZFunc2, 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, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 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_08/B620B0.data.s b/ver/us/asm/data/world/area_jan/jan_08/B620B0.data.s index 49cf6b1200..2b9a86218f 100644 --- a/ver/us/asm/data/world/area_jan/jan_08/B620B0.data.s +++ b/ver/us/asm/data/world/area_jan/jan_08/B620B0.data.s @@ -2,20 +2,20 @@ .section .data -dlabel D_80243E00_B620B0 +dlabel jan_08_SuperBlock_CantUpgradeMessages .word 0x001D00F0, 0x001D00F1 -dlabel D_80243E08_B620B8 +dlabel jan_08_SuperBlock_PartnerIDs .word 0x00010002, 0x00030004, 0x00090006, 0x00070008 -dlabel D_80243E18_B620C8 +dlabel jan_08_SuperBlock_UpgradeDescMessages .word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF -dlabel jan_08_bigFuncFloats +dlabel jan_08_SuperBlock_UpgradeOrbAngles .word 0x430C0000, 0x43340000, 0x435C0000 dlabel D_80243E64_B62114 -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, jan_08_UnkFunc21, 0xFD050F82, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, jan_08_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, jan_08_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024069C_B5E94C, 0xFD050F82, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, jan_08_UnkFunc22, 0x00000043, 0x00000001, jan_08_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, jan_08_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, jan_08_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, jan_08_UnkFunc60, 0xFD050F82, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, jan_08_SuperBlock_GatherEnergyFX, 0xFD050F82, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, jan_08_SuperBlock_WhiteScreenFlash, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, jan_08_SuperBlock_WhiteScreenFlash, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, jan_08_SuperBlock_HideBlockContent, 0xFD050F82, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, jan_08_SuperBlock_RadiateFaintEnergyFX, 0x00000043, 0x00000001, jan_08_SuperBlock_PartnerSparkles2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, jan_08_SuperBlock_PartnerSparkles4, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, jan_08_SuperBlock_PartnerSparkles2, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, jan_08_SuperBlock_AnimateEnergyOrbs, 0xFD050F82, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243FC8_B62278 -.word 0x0000000A, 0x00000002, 0xF840607E, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, jan_08_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, jan_08_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, jan_08_UnkFunc20, 0xFD050F82, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, jan_08_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, jan_08_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, jan_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_8024082C_B5EADC, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, jan_08_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, jan_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, jan_08_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, jan_08_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, jan_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80243E64_B62114, 0x00000043, 0x00000003, jan_08_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF840607E, 0x00000001, 0x00000043, 0x00000002, jan_08_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, jan_08_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, jan_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x000000FA, 0x0000003C, 0x0000012C, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F82, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840607E, 0x00000043, 0x00000002, AssignScript, D_80243FC8_B62278, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x0000004B, 0xFFFFFFC4, 0x0000005A, 0x00000011, 0xF840607F, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x00000064, 0xFFFFFFC4, 0x0000005A, 0x00000011, 0xF8406080, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x0000007D, 0xFFFFFFC4, 0x0000005A, 0x00000011, 0xF8406081, 0x00000043, 0x00000007, MakeEntity, D_802BCBD8_E31528, 0x00000036, 0x00000000, 0xFFFFFE84, 0x00000023, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0x00000018, 0x0000003C, 0xFFFFFE66, 0x00000000, 0x00000082, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406061, 0x00000043, 0x00000007, MakeEntity, 0x802BCBFC, 0xFFFFFE3E, 0x00000000, 0x000000A6, 0x000000AA, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF840607E, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, jan_08_SuperBlock_WaitForPlayerToLand, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, jan_08_SuperBlock_SetOverride40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, jan_08_SuperBlock_StartGlowEffect, 0xFD050F82, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, jan_08_SuperBlock_CountEligiblePartners, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, jan_08_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, jan_08_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, jan_08_SuperBlock_ShowSelectPartnerMenu, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, jan_08_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, jan_08_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, jan_08_SuperBlock_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, jan_08_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, jan_08_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80243E64_B62114, 0x00000043, 0x00000003, jan_08_SuperBlock_GetPartnerRank, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF840607E, 0x00000001, 0x00000043, 0x00000002, jan_08_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000001, jan_08_SuperBlock_LoadCurrentPartnerName, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, jan_08_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x000000FA, 0x0000003C, 0x0000012C, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F82, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840607E, 0x00000043, 0x00000002, AssignScript, D_80243FC8_B62278, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x0000004B, 0xFFFFFFC4, 0x0000005A, 0x00000011, 0xF840607F, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x00000064, 0xFFFFFFC4, 0x0000005A, 0x00000011, 0xF8406080, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x0000007D, 0xFFFFFFC4, 0x0000005A, 0x00000011, 0xF8406081, 0x00000043, 0x00000007, MakeEntity, D_802BCBD8_E31528, 0x00000036, 0x00000000, 0xFFFFFE84, 0x00000023, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0x00000018, 0x0000003C, 0xFFFFFE66, 0x00000000, 0x00000082, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406061, 0x00000043, 0x00000007, MakeEntity, 0x802BCBFC, 0xFFFFFE3E, 0x00000000, 0x000000A6, 0x000000AA, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 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 b74e2f96de..7e0e35b46b 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 @@ -6,13 +6,13 @@ dlabel D_80241920_B673D0 .word 0x00000000, 0x00000000, 0x43F00000, 0x00000000, 0x43F00000, 0x00000000, 0x00000000, 0x43870000, 0xC3F00000, 0xC1A00000, 0x00000000, 0x42B40000, 0xC3310000, 0x42FA0000, 0xC3D98000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802429C4_B68474, D_80241920_B673D0, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x001900F5 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_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_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_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_SomeXYZFunc2, 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 +.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_UnkFunc25, 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, func_802D2B6C, 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, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 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_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, jan_09_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, jan_09_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, jan_09_GetCurrentCameraYawClamped180, 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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, jan_09_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, jan_09_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_SomeXYZFunc2, 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, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 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 c3e4192951..e846806e3d 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_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_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_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_SomeXYZFunc2, 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_UnkFunc25, 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, func_802D2B6C, 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, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 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_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, jan_11_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, jan_11_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, jan_11_GetCurrentCameraYawClamped180, 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 +.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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, jan_11_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, jan_11_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_SomeXYZFunc2, 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, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 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_kmr/kmr_02/8B3D10.data.s b/ver/us/asm/data/world/area_kmr/kmr_02/8B3D10.data.s index 0dca21bae1..2471114c11 100644 --- a/ver/us/asm/data/world/area_kmr/kmr_02/8B3D10.data.s +++ b/ver/us/asm/data/world/area_kmr/kmr_02/8B3D10.data.s @@ -3,10 +3,10 @@ .section .data dlabel D_80243CA0_8B3D10 -.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, kmr_02_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, kmr_02_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, kmr_02_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, kmr_02_SomeXYZFunc2, 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, kmr_02_UnkFunc25, 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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802444C0_8B4530, 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, kmr_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, kmr_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, kmr_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, kmr_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, kmr_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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802444C0_8B4530, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802444C0_8B4530 -.word 0x00000043, 0x00000001, kmr_02_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, kmr_02_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, kmr_02_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, kmr_02_GetCurrentCameraYawClamped180, 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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, kmr_02_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, kmr_02_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, kmr_02_SomeXYZFunc2, 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, kmr_02_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, kmr_02_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, kmr_02_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, kmr_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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, kmr_02_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, kmr_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, kmr_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_802449D0_8B4A40 .word 0x3FC00000, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 diff --git a/ver/us/asm/data/world/area_kmr/kmr_20/8EEBC0.data.s b/ver/us/asm/data/world/area_kmr/kmr_20/8EEBC0.data.s index b3af52784a..b74aaa09c5 100644 --- a/ver/us/asm/data/world/area_kmr/kmr_20/8EEBC0.data.s +++ b/ver/us/asm/data/world/area_kmr/kmr_20/8EEBC0.data.s @@ -3,13 +3,13 @@ .section .data dlabel D_80242DA0_8EEBC0 -.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, kmr_20_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, kmr_20_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, kmr_20_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, kmr_20_SomeXYZFunc2, 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 +.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, kmr_20_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, kmr_20_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, kmr_20_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, kmr_20_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_802434E4_8EF304 -.word 0x00000043, 0x00000001, kmr_20_UnkFunc25, 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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802435C0_8EF3E0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, kmr_20_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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802435C0_8EF3E0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802435C0_8EF3E0 -.word 0x00000043, 0x00000001, kmr_20_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, kmr_20_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, kmr_20_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, kmr_20_GetCurrentCameraYawClamped180, 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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, kmr_20_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, kmr_20_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, kmr_20_SomeXYZFunc2, 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, kmr_20_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, kmr_20_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, kmr_20_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, kmr_20_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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, kmr_20_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, kmr_20_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, kmr_20_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_80243AD0_8EF8F0 .word 0x00000044, 0x00000001, 0x80242D78, 0x00000043, 0x00000003, GotoMap, 0x80253000, 0x00000004, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_20/8F3130.data.s b/ver/us/asm/data/world/area_kmr/kmr_20/8F3130.data.s index ba10a6695e..1327b54230 100644 --- a/ver/us/asm/data/world/area_kmr/kmr_20/8F3130.data.s +++ b/ver/us/asm/data/world/area_kmr/kmr_20/8F3130.data.s @@ -81,4 +81,4 @@ dlabel D_80249EFC_8F5D1C .word 0x00000043, 0x00000001, func_802415C4_8ED3E4, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFFD3, 0x0000001E, 0xFFFFFFBA, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFFB5, 0x0000001E, 0xFFFFFFBA, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000044, 0x00000001, 0x80242C40, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80249FE4_8F5E04 -.word 0x00000043, 0x00000001, kmr_20_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, kmr_20_UnkFunc35, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802499FC_8F581C, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C83, 0x00000043, 0x00000001, kmr_20_DoesPlayerNeedSleep, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0xFE363C88, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E0007, 0x00000008, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000001, CloseMessage, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, CloseMessage, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000001, kmr_20_Call800E9894, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802494FC_8F531C, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kmr_20_GetPartnerCall800EB168, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_80249A5C_8F587C, 0xFE363C89, 0x00000043, 0x00000002, kmr_20_AwaitScriptComplete, 0xFE363C89, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x0000003C, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, kmr_20_UnkFunc32, 0x00000003, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, FullyRestoreSP, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80249484_8F52A4, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kmr_20_Call800EB168, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, kmr_20_UnkFunc32, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000005A, 0x00000045, 0x00000002, D_80249EFC_8F5D1C, 0xFE363C89, 0x00000043, 0x00000002, kmr_20_AwaitScriptComplete, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000001, kmr_20_Call800E98C4SyncStatusMenu, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80249FE4_8F5E04, 0x00000100, 0x00000023, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000001, kmr_20_WaitForPlayerToLand, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, kmr_20_UnkFunc35, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802499FC_8F581C, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C83, 0x00000043, 0x00000001, kmr_20_DoesPlayerNeedSleep, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0xFE363C88, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E0007, 0x00000008, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000001, CloseMessage, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, CloseMessage, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000001, kmr_20_Call800E9894, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802494FC_8F531C, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kmr_20_GetPartnerCall800EB168, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_80249A5C_8F587C, 0xFE363C89, 0x00000043, 0x00000002, kmr_20_AwaitScriptComplete, 0xFE363C89, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x0000003C, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, kmr_20_UnkFunc32, 0x00000003, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, FullyRestoreSP, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80249484_8F52A4, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kmr_20_Call800EB168, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, kmr_20_UnkFunc32, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000005A, 0x00000045, 0x00000002, D_80249EFC_8F5D1C, 0xFE363C89, 0x00000043, 0x00000002, kmr_20_AwaitScriptComplete, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000001, kmr_20_Call800E98C4SyncStatusMenu, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80249FE4_8F5E04, 0x00000100, 0x00000023, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_20/8F9D30.data.s b/ver/us/asm/data/world/area_kmr/kmr_20/8F9D30.data.s index 2234c64197..3f3a8172f1 100644 --- a/ver/us/asm/data/world/area_kmr/kmr_20/8F9D30.data.s +++ b/ver/us/asm/data/world/area_kmr/kmr_20/8F9D30.data.s @@ -3,19 +3,19 @@ .section .data dlabel D_8024DF10_8F9D30 -.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, dup_kmr_20_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, dup_kmr_20_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, dup_kmr_20_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, dup_kmr_20_SomeXYZFunc2, 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, dup_kmr_20_UnkFunc25, 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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_8024E730_8FA550, 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, dup_kmr_20_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, dup_kmr_20_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, dup_kmr_20_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, dup_kmr_20_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, dup_kmr_20_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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_8024E730_8FA550, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024E730_8FA550 -.word 0x00000043, 0x00000001, dup_kmr_20_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, dup_kmr_20_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, dup_kmr_20_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, dup_kmr_20_GetCurrentCameraYawClamped180, 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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, dup_kmr_20_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, dup_kmr_20_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, dup_kmr_20_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 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, dup3_kmr_20_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, dup3_kmr_20_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, 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, PlaySound, 0x00000165, 0x00000043, 0x00000002, PlaySound, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dup3_kmr_20_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000166, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dup3_kmr_20_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, dup3_kmr_20_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C84, 0x00000165, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, dup3_kmr_20_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000030, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000005, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000033, 0x00000003, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8B, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8B, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000030, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000005, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x0000000F, PlayEffect, 0x00000014, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000046, 0x00000001, 0xFE363C85, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, dup_kmr_20_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, dup_kmr_20_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, dup_kmr_20_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, dup_kmr_20_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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, dup_kmr_20_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, dup_kmr_20_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, dup_kmr_20_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, 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, dup3_kmr_20_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, dup3_kmr_20_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, 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, PlaySound, 0x00000165, 0x00000043, 0x00000002, PlaySound, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dup3_kmr_20_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000166, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dup3_kmr_20_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, dup3_kmr_20_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C84, 0x00000165, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, dup3_kmr_20_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000030, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000005, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000033, 0x00000003, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8B, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8B, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000030, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000005, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x0000000F, PlayEffect, 0x00000014, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000046, 0x00000001, 0xFE363C85, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024F5A4_8FB3C4 .word 0x00000043, 0x00000003, GetNpcAnimation, 0x00000001, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00820008, 0x0000001D, 0x00000001, 0x00820009, 0x0000001D, 0x00000001, 0x0082001D, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x0082000A, 0x0000001D, 0x00000001, 0x0082000B, 0x0000001D, 0x00000001, 0x0082001E, 0x00000024, 0x00000002, 0xFE363C81, 0x00000005, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000058, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0xB0000019, 0x00000000, 0x00000008, 0x00000001, 0xFE363C81, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024F6BC_8FB4DC -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000043, 0x00000001, dup_kmr_20_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000043, 0x00000001, dup_kmr_20_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000163, 0x00000000, 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, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000043, 0x00000001, dup_kmr_20_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000043, 0x00000001, dup_kmr_20_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000163, 0x00000000, 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, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024F840_8FB660 -.word 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000008, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000043, 0x00000001, dup_kmr_20_GetEntryPos, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000043, 0x00000001, dup_kmr_20_GetEntryPos, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00000163, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000007, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, func_802CFE2C, 0x00000001, 0x00000800, 0x00000043, 0x00000007, func_802CFD30, 0x00000001, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000000FA, 0x0000001E, 0xFFFFFFB0, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80241CF0_8EDB10, 0xF24A81B4, 0x00000043, 0x00000007, func_802CB008, 0x00000000, 0x00000001, 0x000000FA, 0x0000001E, 0xFFFFFFB0, 0x0000000A, 0x00000043, 0x00000002, func_80241CF0_8EDB10, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000008, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000043, 0x00000001, dup_kmr_20_Pipe_GetEntryPos, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000043, 0x00000001, dup_kmr_20_Pipe_GetEntryPos, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00000163, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000007, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, func_802CFE2C, 0x00000001, 0x00000800, 0x00000043, 0x00000007, func_802CFD30, 0x00000001, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000000FA, 0x0000001E, 0xFFFFFFB0, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80241CF0_8EDB10, 0xF24A81B4, 0x00000043, 0x00000007, func_802CB008, 0x00000000, 0x00000001, 0x000000FA, 0x0000001E, 0xFFFFFFB0, 0x0000000A, 0x00000043, 0x00000002, func_80241CF0_8EDB10, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024FAAC_8FB8CC .word 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetNpcVar, 0x00000001, 0x00000000, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetNpcVar, 0x00000001, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -30,10 +30,10 @@ dlabel D_8024FD28_8FBB48 .word 0x00000003, 0x00000022, 0x00000023, 0x00000024 dlabel D_8024FD38_8FBB58 -.word 0x00000003, 0x000001A6, 0x00000025, 0xFFFFFF3D, 0x000001A6, 0x00000030, 0xFFFFFF3D, 0x000001A6, 0x0000000C, 0xFFFFFF3D, D_8024FD28_8FBB48, 0x00000000, D_8024FD38_8FBB58, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003E, 0x00000000, 0x00000008, 0x00000057, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFFCE, 0x0000001E, 0xFFFFFFB0, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x000000DC, 0x0000001E, 0xFFFFFFB0, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x000002D0, 0x000000DC, 0xFFFFFF6A, 0x00000043, 0x00000003, SetNpcYaw, 0x00000000, 0x0000010E, 0x00000043, 0x00000003, EnableGroup, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000006B, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000226, 0x00000000, 0x00000014, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000226, 0x00000000, 0x00000014, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000226, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A4280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001C2, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7D4D, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000046, 0x0000003C, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x0000005A, 0xFE363C80, 0x00000000, 0x00000000, 0x00000026, 0x00000002, 0xFE363C82, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000043, 0x00000005, TranslateGroup, 0x0000005C, 0xFE363C82, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000032, 0x00000028, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x0000005E, 0xFE363C80, 0x00000000, 0x00000000, 0x00000026, 0x00000002, 0xFE363C82, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000043, 0x00000005, TranslateGroup, 0x00000060, 0xFE363C82, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000032, 0x00000028, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000062, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000006A, 0xFE363C80, 0x00000000, 0x00000000, 0x00000026, 0x00000002, 0xFE363C82, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000043, 0x00000005, TranslateGroup, 0x00000064, 0xFE363C82, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000066, 0xFE363C82, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000068, 0xFE363C82, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000078, 0x00000043, 0x00000008, NpcFlyTo, 0x00000000, 0x000001AE, 0x00000014, 0xFFFFFF5B, 0x0000003C, 0xFFFFFFF6, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000002D, 0x0000000A, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000000E0, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0x00000002, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0x00000002, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0x00000002, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0xFFFFFFFD, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0xFFFFFFFD, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0xFFFFFFFD, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0x00000002, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0x00000002, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0x00000002, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0xFFFFFFFD, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0xFFFFFFFD, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0xFFFFFFFD, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x000000DC, 0x00000005, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00040006, 0x00040001, 0x00000005, 0x0000001E, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000008, NpcFlyTo, 0x00000000, 0x00000168, 0x00000104, 0x0000003C, 0x0000003C, 0xFFFFFFF6, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000044, 0x00000001, D_8024FCE4_8FBB04, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0082000A, 0x00000045, 0x00000002, D_8024F5A4_8FB3C4, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A8A80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x000001C2, 0xFFFFFFB0, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x000001AE, 0xFFFFFF5B, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820004, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x000000E0, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820005, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000010E, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0082000B, 0x00000045, 0x00000002, D_8024F5A4_8FB3C4, 0xFE363C8A, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x000001C2, 0xFFFFFFB0, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x00000122, 0xFFFFFFBA, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, EnableGroup, 0x00000091, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x000000A5, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x000000B2, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000010C, 0x00000001, 0x00000043, 0x00000001, func_80241C9C_8EDABC, 0x00000043, 0x00000006, RotateGroup, 0x00000075, 0x0000005A, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000072, 0x0000005A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000075, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000072, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000000FA, 0x0000001E, 0xFFFFFFB0, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000FA, 0x0000001E, 0xFFFFFFB0, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000001, func_80241D1C_8EDB3C, 0x00000044, 0x00000001, D_8024FB88_8FB9A8, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820009, 0x00000045, 0x00000002, D_8024F5A4_8FB3C4, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A8280, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x000000F0, 0xFFFFFFB0, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820005, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00820015, 0x00820005, 0x00000000, 0x0000001F, 0x00000008, 0x00000001, 0x0000000A, 0x00000044, 0x00000001, D_8024FAAC_8FB8CC, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820009, 0x00000045, 0x00000002, D_8024F5A4_8FB3C4, 0xFE363C8A, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x000000E6, 0xFFFFFF7E, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x0000006E, 0xFFFFFF92, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820005, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000004, SetNpcVar, 0x00000001, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, func_802D1270, 0x00000046, 0xFFFFFFB0, 0xF24A8280, 0x00000043, 0x00000004, func_802D1270, 0x00000046, 0xFFFFFF92, 0xF24A8280, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00820015, 0x00820005, 0x00000000, 0x00000020, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820018, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820006, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00820016, 0x00820006, 0x00000000, 0x00000021, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820019, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000073, 0x00000000, 0x00000008, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000043, 0x00000004, GotoMapSpecial, 0x80253008, 0x00000003, 0x00000007, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x000000DC, 0x0000001E, 0xFFFFFFBA, 0x00000043, 0x00000003, SetNpcYaw, 0x00000001, 0x0000005A, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000140, 0x0000001E, 0xFFFFFFBA, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000140, 0x0000001E, 0xFFFFFFBA, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003F, 0x00000001, 0x00000008, 0x00000044, 0x00000001, D_8024FCE4_8FBB04, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0082000A, 0x00000045, 0x00000002, D_8024F5A4_8FB3C4, 0xFE363C8A, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x00000140, 0xFFFFFFBA, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x000001CC, 0xFFFFFFBA, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x0000023A, 0xFFFFFF56, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820004, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000057, 0x00000000, 0x00000043, 0x00000004, func_802D1270, 0x00000140, 0xFFFFFFBA, 0xF24A8680, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_802D1270, 0x000001CC, 0xFFFFFFBA, 0xF24A8680, 0x00000043, 0x00000004, func_802D1270, 0x0000023A, 0xFFFFFF56, 0xF24A8680, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7E80, 0x00000043, 0x00000005, PlayerJump, 0x00000252, 0x0000001E, 0xFFFFFF28, 0x0000000F, 0x00000046, 0x00000001, D_8024F6BC_8FB4DC, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0082000C, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0082000D, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00002081, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820004, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00000148, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0x00000252, 0x0000001E, 0xFFFFFF28, 0x0000000F, 0x00000046, 0x00000001, D_8024F840_8FB660, 0x00000044, 0x00000001, 0x80242D78, 0x00000043, 0x00000003, GotoMap, 0x80253010, 0x00000005, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x00000002, DisablePlayerInput, 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, dup2_kmr_20_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, dup2_kmr_20_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, dup2_kmr_20_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, dup2_kmr_20_SomeXYZFunc2, 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, dup2_kmr_20_UnkFunc25, 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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802517E0_8FD600, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000003, 0x000001A6, 0x00000025, 0xFFFFFF3D, 0x000001A6, 0x00000030, 0xFFFFFF3D, 0x000001A6, 0x0000000C, 0xFFFFFF3D, D_8024FD28_8FBB48, 0x00000000, D_8024FD38_8FBB58, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003E, 0x00000000, 0x00000008, 0x00000057, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFFCE, 0x0000001E, 0xFFFFFFB0, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x000000DC, 0x0000001E, 0xFFFFFFB0, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x000002D0, 0x000000DC, 0xFFFFFF6A, 0x00000043, 0x00000003, SetNpcYaw, 0x00000000, 0x0000010E, 0x00000043, 0x00000003, EnableGroup, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000006B, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000226, 0x00000000, 0x00000014, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000226, 0x00000000, 0x00000014, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000226, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A4280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001C2, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7D4D, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000046, 0x0000003C, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x0000005A, 0xFE363C80, 0x00000000, 0x00000000, 0x00000026, 0x00000002, 0xFE363C82, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000043, 0x00000005, TranslateGroup, 0x0000005C, 0xFE363C82, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000032, 0x00000028, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x0000005E, 0xFE363C80, 0x00000000, 0x00000000, 0x00000026, 0x00000002, 0xFE363C82, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000043, 0x00000005, TranslateGroup, 0x00000060, 0xFE363C82, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000032, 0x00000028, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000062, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000006A, 0xFE363C80, 0x00000000, 0x00000000, 0x00000026, 0x00000002, 0xFE363C82, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000043, 0x00000005, TranslateGroup, 0x00000064, 0xFE363C82, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000066, 0xFE363C82, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000068, 0xFE363C82, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000078, 0x00000043, 0x00000008, NpcFlyTo, 0x00000000, 0x000001AE, 0x00000014, 0xFFFFFF5B, 0x0000003C, 0xFFFFFFF6, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000002D, 0x0000000A, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000000E0, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0x00000002, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0x00000002, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0x00000002, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0xFFFFFFFD, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0xFFFFFFFD, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0xFFFFFFFD, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0x00000002, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0x00000002, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0x00000002, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0xFFFFFFFD, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0xFFFFFFFD, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0xFFFFFFFD, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x000000DC, 0x00000005, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00040006, 0x00040001, 0x00000005, 0x0000001E, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000008, NpcFlyTo, 0x00000000, 0x00000168, 0x00000104, 0x0000003C, 0x0000003C, 0xFFFFFFF6, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000044, 0x00000001, D_8024FCE4_8FBB04, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0082000A, 0x00000045, 0x00000002, D_8024F5A4_8FB3C4, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A8A80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x000001C2, 0xFFFFFFB0, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x000001AE, 0xFFFFFF5B, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820004, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x000000E0, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820005, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000010E, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0082000B, 0x00000045, 0x00000002, D_8024F5A4_8FB3C4, 0xFE363C8A, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x000001C2, 0xFFFFFFB0, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x00000122, 0xFFFFFFBA, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, EnableGroup, 0x00000091, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x000000A5, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x000000B2, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000010C, 0x00000001, 0x00000043, 0x00000001, func_80241C9C_8EDABC, 0x00000043, 0x00000006, RotateGroup, 0x00000075, 0x0000005A, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000072, 0x0000005A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000075, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000072, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000000FA, 0x0000001E, 0xFFFFFFB0, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000FA, 0x0000001E, 0xFFFFFFB0, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000001, func_80241D1C_8EDB3C, 0x00000044, 0x00000001, D_8024FB88_8FB9A8, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820009, 0x00000045, 0x00000002, D_8024F5A4_8FB3C4, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A8280, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x000000F0, 0xFFFFFFB0, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820005, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00820015, 0x00820005, 0x00000000, 0x0000001F, 0x00000008, 0x00000001, 0x0000000A, 0x00000044, 0x00000001, D_8024FAAC_8FB8CC, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820009, 0x00000045, 0x00000002, D_8024F5A4_8FB3C4, 0xFE363C8A, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x000000E6, 0xFFFFFF7E, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x0000006E, 0xFFFFFF92, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820005, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000004, SetNpcVar, 0x00000001, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, func_802D1270, 0x00000046, 0xFFFFFFB0, 0xF24A8280, 0x00000043, 0x00000004, func_802D1270, 0x00000046, 0xFFFFFF92, 0xF24A8280, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00820015, 0x00820005, 0x00000000, 0x00000020, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820018, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820006, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00820016, 0x00820006, 0x00000000, 0x00000021, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820019, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000073, 0x00000000, 0x00000008, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000043, 0x00000004, GotoMapSpecial, 0x80253008, 0x00000003, 0x00000007, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x000000DC, 0x0000001E, 0xFFFFFFBA, 0x00000043, 0x00000003, SetNpcYaw, 0x00000001, 0x0000005A, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000140, 0x0000001E, 0xFFFFFFBA, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000140, 0x0000001E, 0xFFFFFFBA, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003F, 0x00000001, 0x00000008, 0x00000044, 0x00000001, D_8024FCE4_8FBB04, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0082000A, 0x00000045, 0x00000002, D_8024F5A4_8FB3C4, 0xFE363C8A, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x00000140, 0xFFFFFFBA, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x000001CC, 0xFFFFFFBA, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x0000023A, 0xFFFFFF56, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820004, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000057, 0x00000000, 0x00000043, 0x00000004, func_802D1270, 0x00000140, 0xFFFFFFBA, 0xF24A8680, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_802D1270, 0x000001CC, 0xFFFFFFBA, 0xF24A8680, 0x00000043, 0x00000004, func_802D1270, 0x0000023A, 0xFFFFFF56, 0xF24A8680, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7E80, 0x00000043, 0x00000005, PlayerJump, 0x00000252, 0x0000001E, 0xFFFFFF28, 0x0000000F, 0x00000046, 0x00000001, D_8024F6BC_8FB4DC, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0082000C, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0082000D, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00002081, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820004, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00000148, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0x00000252, 0x0000001E, 0xFFFFFF28, 0x0000000F, 0x00000046, 0x00000001, D_8024F840_8FB660, 0x00000044, 0x00000001, 0x80242D78, 0x00000043, 0x00000003, GotoMap, 0x80253010, 0x00000005, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x00000002, DisablePlayerInput, 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, dup2_kmr_20_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, dup2_kmr_20_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, dup2_kmr_20_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, dup2_kmr_20_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, dup2_kmr_20_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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802517E0_8FD600, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802517E0_8FD600 -.word 0x00000043, 0x00000001, dup2_kmr_20_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, dup2_kmr_20_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, dup2_kmr_20_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, dup2_kmr_20_GetCurrentCameraYawClamped180, 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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, dup2_kmr_20_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, dup2_kmr_20_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, dup2_kmr_20_SomeXYZFunc2, 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, dup2_kmr_20_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, dup2_kmr_20_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, dup2_kmr_20_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, dup2_kmr_20_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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, dup2_kmr_20_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, dup2_kmr_20_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, dup2_kmr_20_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_80251CF0_8FDB10 .word 0x00000043, 0x00000003, GetNpcAnimation, 0x00000001, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00820008, 0x0000001D, 0x00000001, 0x00820009, 0x0000001D, 0x00000001, 0x0082001D, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x0082000A, 0x0000001D, 0x00000001, 0x0082000B, 0x0000001D, 0x00000001, 0x0082001E, 0x00000024, 0x00000002, 0xFE363C81, 0x00000005, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000058, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0xB0000019, 0x00000000, 0x00000008, 0x00000001, 0xFE363C81, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -48,10 +48,10 @@ dlabel D_80251F68_8FDD88 .word 0x00000043, 0x00000003, EnableGroup, 0x00000080, 0x00000001, 0x00000046, 0x00000001, D_80251E08_8FDC28, 0x00000008, 0x00000001, 0x0000001E, 0x00000046, 0x00000001, D_80251EB8_8FDCD8, 0x00000043, 0x00000003, EnableGroup, 0x00000080, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80251FC4_8FDDE4 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000043, 0x00000001, dup2_kmr_20_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000043, 0x00000001, dup2_kmr_20_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000163, 0x00000000, 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, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000043, 0x00000001, dup2_kmr_20_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000043, 0x00000001, dup2_kmr_20_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000163, 0x00000000, 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, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80252148_8FDF68 -.word 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000008, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000043, 0x00000001, dup2_kmr_20_GetEntryPos, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000043, 0x00000001, dup2_kmr_20_GetEntryPos, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00000163, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000007, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, func_802CFE2C, 0x00000001, 0x00000800, 0x00000043, 0x00000007, func_802CFD30, 0x00000001, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000001, func_80242144_8EDF64, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080024, 0x00000043, 0x00000004, SetPlayerPos, 0x0000005F, 0x0000002C, 0xFFFFFFD8, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000096, 0x0000002C, 0xFFFFFFD8, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000096, 0x0000002C, 0xFFFFFFD8, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A6280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00820017, 0x00820007, 0x00000000, 0x0001000D, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080025, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00820017, 0x00820007, 0x00000000, 0x0001000E, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, GotoMap, 0x80253018, 0x00000004, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000001, func_80242144_8EDF64, 0x00000043, 0x00000004, SetPlayerPos, 0x0000005F, 0x0000002C, 0xFFFFFFD8, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080024, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000096, 0x0000002C, 0xFFFFFFD8, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000096, 0x0000002C, 0xFFFFFFD8, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A6280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000006, PlaySoundAt, 0x000000E0, 0x00000000, 0x000001AE, 0x00000000, 0xFFFFFF47, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000263, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000002, 0x00000000, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00000263, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000001, 0x00000002, 0x00000000, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00820017, 0x00820007, 0x00000000, 0x00010021, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0x000000B4, 0x0000001E, 0xFFFFFFEC, 0x0000000A, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0082000D, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00002081, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0082000E, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0082000F, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00000148, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820008, 0x00000045, 0x00000002, D_80251CF0_8FDB10, 0xFE363C8A, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x000000F0, 0xFFFFFFEC, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0082001D, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x000000F0, 0xFFFFFFB0, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820004, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000000A, 0x00000044, 0x00000001, D_80251E08_8FDC28, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820008, 0x00000045, 0x00000002, D_80251CF0_8FDB10, 0xFE363C8A, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x0000012C, 0xFFFFFFB0, 0x0000001E, 0x00000046, 0x00000001, D_80251EB8_8FDCD8, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000005A, 0x00000043, 0x00000003, SetNpcYaw, 0x00000001, 0x0000010E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820009, 0x00000045, 0x00000002, D_80251CF0_8FDB10, 0xFE363C8A, 0x00000044, 0x00000001, D_80251E08_8FDC28, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x000000F0, 0xFFFFFFB0, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820005, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000046, 0x00000001, D_80251EB8_8FDCD8, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00820015, 0x00820005, 0x00000000, 0x00010022, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, func_80242084_8EDEA4, 0x00000043, 0x00000003, EnableGroup, 0x00000091, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x000000A5, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x000000B2, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000010C, 0x00000000, 0x00000043, 0x00000001, func_80242030_8EDE50, 0x00000043, 0x00000006, RotateGroup, 0x00000075, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000072, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000075, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x00000072, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000154, 0x0000001E, 0xFFFFFFBA, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000154, 0x0000001E, 0xFFFFFFBA, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0x000000F0, 0x0000001E, 0xFFFFFFB5, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820004, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x000000C8, 0x0000001E, 0xFFFFFFB5, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, func_802420EC_8EDF0C, 0x00000043, 0x00000001, func_8024216C_8EDF8C, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003F, 0x00000000, 0x00000008, 0x00000044, 0x00000001, D_80251F68_8FDD88, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0082000A, 0x00000045, 0x00000002, D_80251CF0_8FDB10, 0xFE363C8A, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x00000140, 0xFFFFFFBA, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x000001CC, 0xFFFFFFBA, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x0000023A, 0xFFFFFF56, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820004, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000057, 0x00000000, 0x00000043, 0x00000004, func_802D1270, 0x00000140, 0xFFFFFFBA, 0xF24A8680, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_802D1270, 0x000001CC, 0xFFFFFFBA, 0xF24A8680, 0x00000043, 0x00000004, func_802D1270, 0x0000023A, 0xFFFFFF56, 0xF24A8680, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7E80, 0x00000043, 0x00000005, PlayerJump, 0x00000252, 0x0000001E, 0xFFFFFF28, 0x0000000F, 0x00000046, 0x00000001, D_80251FC4_8FDDE4, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0082000C, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0082000D, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00002081, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820004, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00000148, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0x00000252, 0x0000001E, 0xFFFFFF28, 0x0000000F, 0x00000046, 0x00000001, D_80252148_8FDF68, 0x00000044, 0x00000001, 0x80242D78, 0x00000043, 0x00000003, GotoMap, 0x80253020, 0x00000007, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000008, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000043, 0x00000001, dup2_kmr_20_Pipe_GetEntryPos, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000043, 0x00000001, dup2_kmr_20_Pipe_GetEntryPos, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00000163, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000007, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, func_802CFE2C, 0x00000001, 0x00000800, 0x00000043, 0x00000007, func_802CFD30, 0x00000001, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000001, func_80242144_8EDF64, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080024, 0x00000043, 0x00000004, SetPlayerPos, 0x0000005F, 0x0000002C, 0xFFFFFFD8, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000096, 0x0000002C, 0xFFFFFFD8, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000096, 0x0000002C, 0xFFFFFFD8, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A6280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00820017, 0x00820007, 0x00000000, 0x0001000D, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080025, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00820017, 0x00820007, 0x00000000, 0x0001000E, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, GotoMap, 0x80253018, 0x00000004, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000001, func_80242144_8EDF64, 0x00000043, 0x00000004, SetPlayerPos, 0x0000005F, 0x0000002C, 0xFFFFFFD8, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080024, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000096, 0x0000002C, 0xFFFFFFD8, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000096, 0x0000002C, 0xFFFFFFD8, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A6280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000006, PlaySoundAt, 0x000000E0, 0x00000000, 0x000001AE, 0x00000000, 0xFFFFFF47, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000263, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000002, 0x00000000, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00000263, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000001, 0x00000002, 0x00000000, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00820017, 0x00820007, 0x00000000, 0x00010021, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0x000000B4, 0x0000001E, 0xFFFFFFEC, 0x0000000A, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0082000D, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00002081, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0082000E, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0082000F, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00000148, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820008, 0x00000045, 0x00000002, D_80251CF0_8FDB10, 0xFE363C8A, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x000000F0, 0xFFFFFFEC, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0082001D, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x000000F0, 0xFFFFFFB0, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820004, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000000A, 0x00000044, 0x00000001, D_80251E08_8FDC28, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820008, 0x00000045, 0x00000002, D_80251CF0_8FDB10, 0xFE363C8A, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x0000012C, 0xFFFFFFB0, 0x0000001E, 0x00000046, 0x00000001, D_80251EB8_8FDCD8, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000005A, 0x00000043, 0x00000003, SetNpcYaw, 0x00000001, 0x0000010E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820009, 0x00000045, 0x00000002, D_80251CF0_8FDB10, 0xFE363C8A, 0x00000044, 0x00000001, D_80251E08_8FDC28, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x000000F0, 0xFFFFFFB0, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820005, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000046, 0x00000001, D_80251EB8_8FDCD8, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00820015, 0x00820005, 0x00000000, 0x00010022, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, func_80242084_8EDEA4, 0x00000043, 0x00000003, EnableGroup, 0x00000091, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x000000A5, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x000000B2, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000010C, 0x00000000, 0x00000043, 0x00000001, func_80242030_8EDE50, 0x00000043, 0x00000006, RotateGroup, 0x00000075, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000072, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000075, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x00000072, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000154, 0x0000001E, 0xFFFFFFBA, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000154, 0x0000001E, 0xFFFFFFBA, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0x000000F0, 0x0000001E, 0xFFFFFFB5, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820004, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x000000C8, 0x0000001E, 0xFFFFFFB5, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, func_802420EC_8EDF0C, 0x00000043, 0x00000001, func_8024216C_8EDF8C, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003F, 0x00000000, 0x00000008, 0x00000044, 0x00000001, D_80251F68_8FDD88, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0082000A, 0x00000045, 0x00000002, D_80251CF0_8FDB10, 0xFE363C8A, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x00000140, 0xFFFFFFBA, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x000001CC, 0xFFFFFFBA, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x0000023A, 0xFFFFFF56, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820004, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000057, 0x00000000, 0x00000043, 0x00000004, func_802D1270, 0x00000140, 0xFFFFFFBA, 0xF24A8680, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_802D1270, 0x000001CC, 0xFFFFFFBA, 0xF24A8680, 0x00000043, 0x00000004, func_802D1270, 0x0000023A, 0xFFFFFF56, 0xF24A8680, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7E80, 0x00000043, 0x00000005, PlayerJump, 0x00000252, 0x0000001E, 0xFFFFFF28, 0x0000000F, 0x00000046, 0x00000001, D_80251FC4_8FDDE4, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0082000C, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0082000D, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00002081, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820004, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00000148, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0x00000252, 0x0000001E, 0xFFFFFF28, 0x0000000F, 0x00000046, 0x00000001, D_80252148_8FDF68, 0x00000044, 0x00000001, 0x80242D78, 0x00000043, 0x00000003, GotoMap, 0x80253020, 0x00000007, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80252D50_8FEB70 .word 0xE3000A01, 0x00000000, 0xE200001C, 0x00504240, 0xFCFFFFFF, 0xFFFDF6FB, 0xE3001801, 0x000000C0, 0xE3001A01, 0x00000030, 0xE3001700, 0x00000000, 0xE2001E01, 0x00000000, 0x00000000, 0x00000000, 0xFA000000, 0xFF000000, 0xF648C0A4, 0x0007409C, 0xF607C310, 0x0007409C, 0xF648C310, 0x0048809C, 0xF648C310, 0x0007430C, 0xDF000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kzn/kzn_04/C69D70.data.s b/ver/us/asm/data/world/area_kzn/kzn_04/C69D70.data.s index bf5b1e742a..d305bf1aa5 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_04/C69D70.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_04/C69D70.data.s @@ -2,20 +2,20 @@ .section .data -dlabel D_80241C40_C69D70 +dlabel kzn_04_SuperBlock_CantUpgradeMessages .word 0x001D00F0, 0x001D00F1 -dlabel D_80241C48_C69D78 +dlabel kzn_04_SuperBlock_PartnerIDs .word 0x00010002, 0x00030004, 0x00090006, 0x00070008 -dlabel D_80241C58_C69D88 +dlabel kzn_04_SuperBlock_UpgradeDescMessages .word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF -dlabel kzn_04_bigFuncFloats +dlabel kzn_04_SuperBlock_UpgradeOrbAngles .word 0x430C0000, 0x43340000, 0x435C0000 dlabel D_80241CA4_C69DD4 -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, kzn_04_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, kzn_04_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, kzn_04_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024034C_C6847C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, kzn_04_UnkFunc22, 0x00000043, 0x00000001, kzn_04_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, kzn_04_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, kzn_04_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, kzn_04_UnkFunc60, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, kzn_04_SuperBlock_GatherEnergyFX, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, kzn_04_SuperBlock_WhiteScreenFlash, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, kzn_04_SuperBlock_WhiteScreenFlash, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, kzn_04_SuperBlock_HideBlockContent, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, kzn_04_SuperBlock_RadiateFaintEnergyFX, 0x00000043, 0x00000001, kzn_04_SuperBlock_PartnerSparkles2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, kzn_04_SuperBlock_PartnerSparkles4, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, kzn_04_SuperBlock_PartnerSparkles2, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, kzn_04_SuperBlock_AnimateEnergyOrbs, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241E08_C69F38 -.word 0x0000000A, 0x00000002, 0xF84060B0, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_04_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, kzn_04_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, kzn_04_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, kzn_04_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, kzn_04_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_04_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802404DC_C6860C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, kzn_04_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_04_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, kzn_04_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, kzn_04_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_04_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241CA4_C69DD4, 0x00000043, 0x00000003, kzn_04_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF84060B0, 0x00000001, 0x00000043, 0x00000002, kzn_04_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, kzn_04_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_04_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x00000212, 0x00000230, 0x00000019, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84060B0, 0x00000043, 0x00000002, AssignScript, D_80241E08_C69F38, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF84060B0, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_04_SuperBlock_WaitForPlayerToLand, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, kzn_04_SuperBlock_SetOverride40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, kzn_04_SuperBlock_StartGlowEffect, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, kzn_04_SuperBlock_CountEligiblePartners, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, kzn_04_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_04_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_04_SuperBlock_ShowSelectPartnerMenu, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, kzn_04_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_04_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, kzn_04_SuperBlock_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, kzn_04_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_04_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241CA4_C69DD4, 0x00000043, 0x00000003, kzn_04_SuperBlock_GetPartnerRank, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF84060B0, 0x00000001, 0x00000043, 0x00000002, kzn_04_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000001, kzn_04_SuperBlock_LoadCurrentPartnerName, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_04_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x00000212, 0x00000230, 0x00000019, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84060B0, 0x00000043, 0x00000002, AssignScript, D_80241E08_C69F38, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kzn/kzn_09/C7A9E0.data.s b/ver/us/asm/data/world/area_kzn/kzn_09/C7A9E0.data.s index dce94b0532..65bad5a3b8 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_09/C7A9E0.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_09/C7A9E0.data.s @@ -2,20 +2,20 @@ .section .data -dlabel D_80243D00_C7A9E0 +dlabel kzn_09_SuperBlock_CantUpgradeMessages .word 0x001D00F0, 0x001D00F1 -dlabel D_80243D08_C7A9E8 +dlabel kzn_09_SuperBlock_PartnerIDs .word 0x00010002, 0x00030004, 0x00090006, 0x00070008 -dlabel D_80243D18_C7A9F8 +dlabel kzn_09_SuperBlock_UpgradeDescMessages .word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF -dlabel kzn_09_bigFuncFloats +dlabel kzn_09_SuperBlock_UpgradeOrbAngles .word 0x430C0000, 0x43340000, 0x435C0000 dlabel D_80243D64_C7AA44 -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, kzn_09_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, kzn_09_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, kzn_09_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024003C_C76D1C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, kzn_09_UnkFunc22, 0x00000043, 0x00000001, kzn_09_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, kzn_09_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, kzn_09_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, kzn_09_UnkFunc60, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, kzn_09_SuperBlock_GatherEnergyFX, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, kzn_09_SuperBlock_WhiteScreenFlash, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, kzn_09_SuperBlock_WhiteScreenFlash, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, kzn_09_SuperBlock_HideBlockContent, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, kzn_09_SuperBlock_RadiateFaintEnergyFX, 0x00000043, 0x00000001, kzn_09_SuperBlock_PartnerSparkles2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, kzn_09_SuperBlock_PartnerSparkles4, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, kzn_09_SuperBlock_PartnerSparkles2, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, kzn_09_SuperBlock_AnimateEnergyOrbs, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243EC8_C7ABA8 -.word 0x0000000A, 0x00000002, 0xF84060B1, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_09_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, kzn_09_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, kzn_09_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, kzn_09_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, kzn_09_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_09_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802401CC_C76EAC, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, kzn_09_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_09_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, kzn_09_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, kzn_09_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_09_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80243D64_C7AA44, 0x00000043, 0x00000003, kzn_09_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF84060B1, 0x00000001, 0x00000043, 0x00000002, kzn_09_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, kzn_09_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_09_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x00000082, 0x000001E0, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84060B1, 0x00000043, 0x00000002, AssignScript, D_80243EC8_C7ABA8, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0x0000015E, 0x0000015E, 0x00000037, 0x00000000, 0x00000023, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF84060BA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF84060B1, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_09_SuperBlock_WaitForPlayerToLand, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, kzn_09_SuperBlock_SetOverride40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, kzn_09_SuperBlock_StartGlowEffect, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, kzn_09_SuperBlock_CountEligiblePartners, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, kzn_09_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_09_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_09_SuperBlock_ShowSelectPartnerMenu, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, kzn_09_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_09_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, kzn_09_SuperBlock_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, kzn_09_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_09_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80243D64_C7AA44, 0x00000043, 0x00000003, kzn_09_SuperBlock_GetPartnerRank, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF84060B1, 0x00000001, 0x00000043, 0x00000002, kzn_09_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000001, kzn_09_SuperBlock_LoadCurrentPartnerName, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_09_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x00000082, 0x000001E0, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84060B1, 0x00000043, 0x00000002, AssignScript, D_80243EC8_C7ABA8, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0x0000015E, 0x0000015E, 0x00000037, 0x00000000, 0x00000023, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF84060BA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/mac_00/7EE870.data.s b/ver/us/asm/data/world/area_mac/mac_00/7EE870.data.s index 42b6654bee..f2154d38b8 100644 --- a/ver/us/asm/data/world/area_mac/mac_00/7EE870.data.s +++ b/ver/us/asm/data/world/area_mac/mac_00/7EE870.data.s @@ -9,13 +9,13 @@ dlabel D_80243C20_7EE930 .word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000016, 0x00000001, 0xFFFFFF80, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003F, 0x00000001, 0x00000008, 0x00000016, 0x00000001, 0x00000060, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003F, 0x00000000, 0x00000008, 0x00000021, 0x00000002, 0xFFFFFFF3, 0x00000005, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000004A, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000044, 0x00000001, 0x8024E420, 0x00000023, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000005, 0x0000001D, 0x00000001, 0x00000006, 0x0000001D, 0x00000001, 0x00000007, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243D40_7EEA50 -.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, mac_00_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, mac_00_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, mac_00_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, mac_00_SomeXYZFunc2, 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 +.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, mac_00_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, mac_00_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, mac_00_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, mac_00_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_80244484_7EF194 -.word 0x00000043, 0x00000001, mac_00_UnkFunc25, 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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80244560_7EF270, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, mac_00_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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80244560_7EF270, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244560_7EF270 -.word 0x00000043, 0x00000001, mac_00_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mac_00_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mac_00_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, mac_00_GetCurrentCameraYawClamped180, 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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, mac_00_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mac_00_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, mac_00_SomeXYZFunc2, 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, mac_00_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mac_00_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mac_00_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, mac_00_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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, mac_00_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mac_00_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, mac_00_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_80244A70_7EF780 .word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, mac_00_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_00_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/mac_02/8268F0.data.s b/ver/us/asm/data/world/area_mac/mac_02/8268F0.data.s index a64d3574ae..34914cec39 100644 --- a/ver/us/asm/data/world/area_mac/mac_02/8268F0.data.s +++ b/ver/us/asm/data/world/area_mac/mac_02/8268F0.data.s @@ -3,13 +3,13 @@ .section .data dlabel D_80243630_8268F0 -.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, mac_02_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, mac_02_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, mac_02_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, mac_02_SomeXYZFunc2, 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 +.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, mac_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, mac_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, mac_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, mac_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_80243D74_827034 -.word 0x00000043, 0x00000001, mac_02_UnkFunc25, 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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80243E50_827110, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, mac_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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80243E50_827110, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243E50_827110 -.word 0x00000043, 0x00000001, mac_02_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mac_02_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mac_02_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, mac_02_GetCurrentCameraYawClamped180, 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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, mac_02_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mac_02_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, mac_02_SomeXYZFunc2, 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, mac_02_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mac_02_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mac_02_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, mac_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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, mac_02_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mac_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, mac_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_80244360_827620 .word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, mac_02_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_02_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/mac_03/834170.data.s b/ver/us/asm/data/world/area_mac/mac_03/834170.data.s index 3ab3502192..7a88176665 100644 --- a/ver/us/asm/data/world/area_mac/mac_03/834170.data.s +++ b/ver/us/asm/data/world/area_mac/mac_03/834170.data.s @@ -3,13 +3,13 @@ .section .data dlabel D_80242970_834170 -.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, mac_03_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, mac_03_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, mac_03_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, mac_03_SomeXYZFunc2, 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 +.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, mac_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, mac_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, mac_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, mac_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 dlabel D_802430B4_8348B4 -.word 0x00000043, 0x00000001, mac_03_UnkFunc25, 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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80243190_834990, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, mac_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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80243190_834990, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243190_834990 -.word 0x00000043, 0x00000001, mac_03_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mac_03_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mac_03_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, mac_03_GetCurrentCameraYawClamped180, 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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, mac_03_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mac_03_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, mac_03_SomeXYZFunc2, 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, mac_03_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mac_03_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mac_03_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, mac_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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, mac_03_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mac_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, mac_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_802436A0_834EA0 .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802513B0, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_mgm/mgm_00/E0FF60.data.s b/ver/us/asm/data/world/area_mgm/mgm_00/E0FF60.data.s index bbd6017e35..b05eb8acb9 100644 --- a/ver/us/asm/data/world/area_mgm/mgm_00/E0FF60.data.s +++ b/ver/us/asm/data/world/area_mgm/mgm_00/E0FF60.data.s @@ -9,19 +9,19 @@ dlabel D_80241850_E0FFF0 .word 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241860_E10000 -.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, mgm_00_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, mgm_00_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 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, mgm_00_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, mgm_00_Pipe_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241BB4_E10354 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, mgm_00_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, mgm_00_SomeXYZFunc2, 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 +.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, mgm_00_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, mgm_00_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_80241FA4_E10744 -.word 0x00000043, 0x00000001, mgm_00_UnkFunc25, 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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80242080_E10820, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, mgm_00_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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80242080_E10820, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242080_E10820 -.word 0x00000043, 0x00000001, mgm_00_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mgm_00_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mgm_00_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, mgm_00_GetCurrentCameraYawClamped180, 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 +.word 0x00000043, 0x00000001, mgm_00_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mgm_00_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mgm_00_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, mgm_00_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_8024225C_E109FC -.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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, mgm_00_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mgm_00_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, mgm_00_SomeXYZFunc2, 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, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, mgm_00_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mgm_00_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, mgm_00_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_80242590_E10D30 .word 0x00000043, 0x00000003, GotoMap, 0x80243DD0, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_11/BB7C30.data.s b/ver/us/asm/data/world/area_mim/mim_11/BB7C30.data.s index 4ff00686ce..ac37e872f9 100644 --- a/ver/us/asm/data/world/area_mim/mim_11/BB7C30.data.s +++ b/ver/us/asm/data/world/area_mim/mim_11/BB7C30.data.s @@ -9,10 +9,10 @@ dlabel D_80240C60_BB7CD0 .word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFD0, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001B, 0x00000001, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001A, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000043, 0x00000002, PlayAmbientSounds, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240CE0_BB7D50 -.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, mim_11_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, mim_11_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, mim_11_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, mim_11_SomeXYZFunc2, 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, mim_11_UnkFunc25, 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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241500_BB8570, 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, mim_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, mim_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, mim_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, mim_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, mim_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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241500_BB8570, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241500_BB8570 -.word 0x00000043, 0x00000001, mim_11_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mim_11_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mim_11_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, mim_11_GetCurrentCameraYawClamped180, 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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, mim_11_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mim_11_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, mim_11_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, mim_11_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mim_11_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, mim_11_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mim_11_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mim_11_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, mim_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, 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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, mim_11_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mim_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, mim_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, 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, mim_11_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mim_11_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241AAC_BB8B1C .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFCE0, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFCE0, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000001, 0x00000001, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24B1A80, 0xF2497C20, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000002D0, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x00000059, 0x00000054, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000059, 0x00000054, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000004B, 0x00000000, 0x00000135, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000001, func_8024066C_BB76DC, 0x00000008, 0x00000001, 0x0000001E, 0x00000058, 0x00000000, 0x00000043, 0x00000001, func_80240790_BB7800, 0x00000008, 0x00000001, 0x0000005A, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFFFFFEA2, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFD43, 0x00000000, 0xFFFFFFDE, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFD43, 0x00000000, 0xFFFFFFDE, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFE69, 0x00000067, 0x00000078, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFFFFFFFC, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00010008, 0x00010001, 0x00000005, 0x000E0024, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x0002000D, 0x00020003, 0x00000005, 0x000E0025, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x0003000E, 0x00030003, 0x00000005, 0x000E0026, 0x00000016, 0x00000001, 0x00000004, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0x000E0027, 0x00000023, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000005DC, 0x00000043, 0x00000004, GotoMapSpecial, 0x802442E0, 0x00000004, 0x0000000B, 0x00000008, 0x00000001, 0x00000064 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 a367fd09e7..b01482b960 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_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_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_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_SomeXYZFunc2, 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_UnkFunc25, 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, func_802D2B6C, 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, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 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_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, nok_02_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, nok_02_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, nok_02_GetCurrentCameraYawClamped180, 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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, nok_02_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, nok_02_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_SomeXYZFunc2, 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, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, nok_02_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, nok_02_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, nok_02_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel nok_02_varTable .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 2912b3fdaa..3a97830cb6 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 @@ -3,13 +3,13 @@ .section .data 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_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_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_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_SomeXYZFunc2, 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 +.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_UnkFunc25, 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, func_802D2B6C, 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, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 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_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, nok_15_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, nok_15_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, nok_15_GetCurrentCameraYawClamped180, 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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, nok_15_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, nok_15_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_SomeXYZFunc2, 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, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 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_11/DDDD90.data.s b/ver/us/asm/data/world/area_omo/omo_11/DDDD90.data.s index 1d5581bfe3..856c0bbfb1 100644 --- a/ver/us/asm/data/world/area_omo/omo_11/DDDD90.data.s +++ b/ver/us/asm/data/world/area_omo/omo_11/DDDD90.data.s @@ -44,23 +44,23 @@ dlabel D_802419DC_DDE20C dlabel D_80241BF8_DDE428 .word 0x0000004D, 0x00000001, 0x0000000B, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000027, 0x0000003F, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000032, 0x0000004A, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000029, 0x00000041, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000002A, 0x00000042, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000002C, 0x00000044, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000002D, 0x00000045, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000002F, 0x00000047, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000030, 0x00000048, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_802401A0_DDC9D0, 0x00000057, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000035, 0x0000004D, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000036, 0x0000004E, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000038, 0x00000050, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000039, 0x00000051, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000003B, 0x00000053, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000003C, 0x00000054, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000003E, 0x00000056, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000003F, 0x00000057, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000041, 0x00000059, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000042, 0x0000005A, 0x00000024, 0x00000002, 0xFE363C80, D_80241790_DDDFC0, 0x00000044, 0x00000001, D_802417E0_DDE010, 0x00000024, 0x00000002, 0xFE363C80, D_802417A0_DDDFD0, 0x00000044, 0x00000001, D_802417E0_DDE010, 0x00000024, 0x00000002, 0xFE363C80, D_802417B0_DDDFE0, 0x00000044, 0x00000001, D_802417E0_DDE010, 0x00000024, 0x00000002, 0xFE363C80, D_802417C0_DDDFF0, 0x00000044, 0x00000001, D_802419DC_DDE20C, 0x00000024, 0x00000002, 0xFE363C80, D_802417D0_DDE000, 0x00000044, 0x00000001, D_802417E0_DDE010, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240000_DDC830, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 -dlabel D_80241E40_DDE670 +dlabel omo_11_SuperBlock_CantUpgradeMessages .word 0x001D00F0, 0x001D00F1 -dlabel D_80241E48_DDE678 +dlabel omo_11_SuperBlock_PartnerIDs .word 0x00010002, 0x00030004, 0x00090006, 0x00070008 -dlabel D_80241E58_DDE688 +dlabel omo_11_SuperBlock_UpgradeDescMessages .word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF -dlabel omo_11_bigFuncFloats +dlabel omo_11_SuperBlock_UpgradeOrbAngles .word 0x430C0000, 0x43340000, 0x435C0000 dlabel D_80241EA4_DDE6D4 -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, omo_11_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, omo_11_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, omo_11_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_802407CC_DDCFFC, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, omo_11_UnkFunc22, 0x00000043, 0x00000001, omo_11_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, omo_11_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, omo_11_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, omo_11_UnkFunc60, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, omo_11_SuperBlock_GatherEnergyFX, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, omo_11_SuperBlock_WhiteScreenFlash, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, omo_11_SuperBlock_WhiteScreenFlash, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, omo_11_SuperBlock_HideBlockContent, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, omo_11_SuperBlock_RadiateFaintEnergyFX, 0x00000043, 0x00000001, omo_11_SuperBlock_PartnerSparkles2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, omo_11_SuperBlock_PartnerSparkles4, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, omo_11_SuperBlock_PartnerSparkles2, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, omo_11_SuperBlock_AnimateEnergyOrbs, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242008_DDE838 -.word 0x0000000A, 0x00000002, 0xF840602A, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, omo_11_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, omo_11_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, omo_11_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, omo_11_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, omo_11_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, omo_11_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_8024095C_DDD18C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, omo_11_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, omo_11_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, omo_11_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, omo_11_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, omo_11_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241EA4_DDE6D4, 0x00000043, 0x00000003, omo_11_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF840602A, 0x00000001, 0x00000043, 0x00000002, omo_11_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, omo_11_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, omo_11_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF840602A, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, omo_11_SuperBlock_WaitForPlayerToLand, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, omo_11_SuperBlock_SetOverride40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, omo_11_SuperBlock_StartGlowEffect, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, omo_11_SuperBlock_CountEligiblePartners, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, omo_11_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, omo_11_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, omo_11_SuperBlock_ShowSelectPartnerMenu, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, omo_11_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, omo_11_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, omo_11_SuperBlock_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, omo_11_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, omo_11_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241EA4_DDE6D4, 0x00000043, 0x00000003, omo_11_SuperBlock_GetPartnerRank, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF840602A, 0x00000001, 0x00000043, 0x00000002, omo_11_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000001, omo_11_SuperBlock_LoadCurrentPartnerName, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, omo_11_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242488_DDECB8 .word 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0xFFFFFF8D, 0x0000010E, 0xFFFFFF88, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840602A, 0x00000043, 0x00000002, AssignScript, D_80242008_DDE838, 0x00000043, 0x00000007, MakeEntity, 0x802EA0E8, 0x0000013B, 0x0000010E, 0xFFFFFF9C, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406019, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0x000002AD, 0x0000003C, 0xFFFFFF9C, 0x00000000, 0x0000008B, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840601D, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0xFFFFFDA8, 0x0000003C, 0xFFFFFFCE, 0x00000000, 0x00000081, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840601E, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0xFFFFFF9C, 0x0000003C, 0xFFFFFFD3, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840601C, 0x00000043, 0x00000008, MakeEntity, 0x802EA5D0, 0xFFFFFF6A, 0x0000003C, 0xFFFFFFD3, 0x00000000, 0x00000132, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840601A, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0xFFFFFF38, 0x0000003C, 0xFFFFFFD3, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840601B, 0x00000002, 0x00000000, 0x00000001, 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 ab362c71d1..9f95adcfde 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 @@ -3,13 +3,13 @@ .section .data 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_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_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_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_SomeXYZFunc2, 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 +.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_UnkFunc25, 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, func_802D2B6C, 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, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 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_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, sam_02_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, sam_02_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, sam_02_GetCurrentCameraYawClamped180, 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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, sam_02_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, sam_02_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_SomeXYZFunc2, 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, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 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_08/D314C0.data.s b/ver/us/asm/data/world/area_sam/sam_08/D314C0.data.s index 0fbab221ce..f4ed8b4cdf 100644 --- a/ver/us/asm/data/world/area_sam/sam_08/D314C0.data.s +++ b/ver/us/asm/data/world/area_sam/sam_08/D314C0.data.s @@ -11,23 +11,23 @@ dlabel D_8024189C_D3151C dlabel D_802418F8_D31578 .word 0x00000047, 0x00000005, D_80241840_D314C0, 0x00080000, 0x0000000F, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024189C_D3151C, 0x00080000, 0x00000014, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000002B, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80243924, 0x00000046, 0x00000001, D_80242128_D31DA8, 0x00000046, 0x00000001, 0x80241810, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000000, 0x00000008, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000004, 0x00000008, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000006, 0x00000008, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000008, 0x00000008, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000002, 0x00000008, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000000F, 0x00000008, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000014, 0x00000008, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000001B, 0x7FFFFE00, 0x00000046, 0x00000001, 0x80246424, 0x00000024, 0x00000002, 0xFE363C80, D_802418F8_D31578, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 -dlabel D_80241AE0_D31760 +dlabel sam_08_SuperBlock_CantUpgradeMessages .word 0x001D00F0, 0x001D00F1 -dlabel D_80241AE8_D31768 +dlabel sam_08_SuperBlock_PartnerIDs .word 0x00010002, 0x00030004, 0x00090006, 0x00070008 -dlabel D_80241AF8_D31778 +dlabel sam_08_SuperBlock_UpgradeDescMessages .word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF -dlabel sam_08_bigFuncFloats +dlabel sam_08_SuperBlock_UpgradeOrbAngles .word 0x430C0000, 0x43340000, 0x435C0000 dlabel D_80241B44_D317C4 -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, sam_08_UnkFunc21, 0xFD050F81, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, sam_08_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, sam_08_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024003C_D2FCBC, 0xFD050F81, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, sam_08_UnkFunc22, 0x00000043, 0x00000001, sam_08_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, sam_08_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, sam_08_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, sam_08_UnkFunc60, 0xFD050F81, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, sam_08_SuperBlock_GatherEnergyFX, 0xFD050F81, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, sam_08_SuperBlock_WhiteScreenFlash, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, sam_08_SuperBlock_WhiteScreenFlash, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, sam_08_SuperBlock_HideBlockContent, 0xFD050F81, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, sam_08_SuperBlock_RadiateFaintEnergyFX, 0x00000043, 0x00000001, sam_08_SuperBlock_PartnerSparkles2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, sam_08_SuperBlock_PartnerSparkles4, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, sam_08_SuperBlock_PartnerSparkles2, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, sam_08_SuperBlock_AnimateEnergyOrbs, 0xFD050F81, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241CA8_D31928 -.word 0x0000000A, 0x00000002, 0xF8406131, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, sam_08_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, sam_08_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, sam_08_UnkFunc20, 0xFD050F81, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, sam_08_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, sam_08_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sam_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802401CC_D2FE4C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, sam_08_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sam_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, sam_08_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, sam_08_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sam_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241B44_D317C4, 0x00000043, 0x00000003, sam_08_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8406131, 0x00000001, 0x00000043, 0x00000002, sam_08_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, sam_08_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sam_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF8406131, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, sam_08_SuperBlock_WaitForPlayerToLand, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, sam_08_SuperBlock_SetOverride40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, sam_08_SuperBlock_StartGlowEffect, 0xFD050F81, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, sam_08_SuperBlock_CountEligiblePartners, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, sam_08_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sam_08_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, sam_08_SuperBlock_ShowSelectPartnerMenu, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, sam_08_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sam_08_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, sam_08_SuperBlock_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, sam_08_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sam_08_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241B44_D317C4, 0x00000043, 0x00000003, sam_08_SuperBlock_GetPartnerRank, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8406131, 0x00000001, 0x00000043, 0x00000002, sam_08_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000001, sam_08_SuperBlock_LoadCurrentPartnerName, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sam_08_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242128_D31DA8 .word 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0xFFFFFCE0, 0x000000D2, 0xFFFFFF7E, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F81, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406131, 0x00000043, 0x00000002, AssignScript, D_80241CA8_D31928, 0x00000043, 0x00000007, MakeItemEntity, 0x00000085, 0xFFFFFCFE, 0xFFFFFF10, 0x0000001E, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000004B, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0xFFFFFC40, 0xFFFFFF88, 0xFFFFFFDB, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000006, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_56/9553F0.data.s b/ver/us/asm/data/world/area_sbk/sbk_56/9553F0.data.s index f0bf992877..ace86112dc 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_56/9553F0.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_56/9553F0.data.s @@ -2,23 +2,23 @@ .section .data -dlabel D_80241430_9553F0 +dlabel sbk_56_SuperBlock_CantUpgradeMessages .word 0x001D00F0, 0x001D00F1 -dlabel D_80241438_9553F8 +dlabel sbk_56_SuperBlock_PartnerIDs .word 0x00010002, 0x00030004, 0x00090006, 0x00070008 -dlabel D_80241448_955408 +dlabel sbk_56_SuperBlock_UpgradeDescMessages .word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF -dlabel sbk_56_bigFuncFloats +dlabel sbk_56_SuperBlock_UpgradeOrbAngles .word 0x430C0000, 0x43340000, 0x435C0000 dlabel D_80241494_955454 -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, sbk_56_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, sbk_56_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, sbk_56_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_802400BC_95407C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, sbk_56_UnkFunc22, 0x00000043, 0x00000001, sbk_56_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, sbk_56_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, sbk_56_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, sbk_56_UnkFunc60, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, sbk_56_SuperBlock_GatherEnergyFX, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, sbk_56_SuperBlock_WhiteScreenFlash, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, sbk_56_SuperBlock_WhiteScreenFlash, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, sbk_56_SuperBlock_HideBlockContent, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, sbk_56_SuperBlock_RadiateFaintEnergyFX, 0x00000043, 0x00000001, sbk_56_SuperBlock_PartnerSparkles2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, sbk_56_SuperBlock_PartnerSparkles4, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, sbk_56_SuperBlock_PartnerSparkles2, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, sbk_56_SuperBlock_AnimateEnergyOrbs, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802415F8_9555B8 -.word 0x0000000A, 0x00000002, 0xF8405EBD, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, sbk_56_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, sbk_56_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, sbk_56_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, sbk_56_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, sbk_56_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sbk_56_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_8024024C_95420C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, sbk_56_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sbk_56_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, sbk_56_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, sbk_56_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sbk_56_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241494_955454, 0x00000043, 0x00000003, sbk_56_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405EBD, 0x00000001, 0x00000043, 0x00000002, sbk_56_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, sbk_56_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sbk_56_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA7E0, 0x0000012C, 0x0000003C, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0xFFFFFFCE, 0x0000003C, 0x00000113, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EBD, 0x00000043, 0x00000002, AssignScript, D_802415F8_9555B8, 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, sbk_56_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, sbk_56_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 +.word 0x0000000A, 0x00000002, 0xF8405EBD, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, sbk_56_SuperBlock_WaitForPlayerToLand, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, sbk_56_SuperBlock_SetOverride40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, sbk_56_SuperBlock_StartGlowEffect, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, sbk_56_SuperBlock_CountEligiblePartners, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, sbk_56_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sbk_56_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, sbk_56_SuperBlock_ShowSelectPartnerMenu, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, sbk_56_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sbk_56_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, sbk_56_SuperBlock_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, sbk_56_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sbk_56_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241494_955454, 0x00000043, 0x00000003, sbk_56_SuperBlock_GetPartnerRank, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405EBD, 0x00000001, 0x00000043, 0x00000002, sbk_56_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000001, sbk_56_SuperBlock_LoadCurrentPartnerName, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sbk_56_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA7E0, 0x0000012C, 0x0000003C, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0xFFFFFFCE, 0x0000003C, 0x00000113, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EBD, 0x00000043, 0x00000002, AssignScript, D_802415F8_9555B8, 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, sbk_56_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, sbk_56_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241E60_955E20 .word 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, PlaySound, 0x00000165, 0x00000043, 0x00000002, PlaySound, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, sbk_56_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000166, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, sbk_56_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, sbk_56_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C84, 0x00000165, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, sbk_56_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000030, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000005, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000033, 0x00000003, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8B, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8B, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000030, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000005, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x0000000F, PlayEffect, 0x00000014, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000046, 0x00000001, 0xFE363C85, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_01/86A030.data.s b/ver/us/asm/data/world/area_tik/tik_01/86A030.data.s index 4dbea1cd28..03d0c743db 100644 --- a/ver/us/asm/data/world/area_tik/tik_01/86A030.data.s +++ b/ver/us/asm/data/world/area_tik/tik_01/86A030.data.s @@ -6,10 +6,10 @@ dlabel D_80240B80_86A030 .word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_01_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_01_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240C1C_86A0CC -.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, tik_01_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, tik_01_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, tik_01_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, tik_01_SomeXYZFunc2, 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, tik_01_UnkFunc25, 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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_8024143C_86A8EC, 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, tik_01_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, tik_01_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, tik_01_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, tik_01_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, tik_01_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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_8024143C_86A8EC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024143C_86A8EC -.word 0x00000043, 0x00000001, tik_01_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_01_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_01_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_01_GetCurrentCameraYawClamped180, 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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_01_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_01_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, tik_01_SomeXYZFunc2, 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, tik_01_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_01_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_01_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_01_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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_01_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_01_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, tik_01_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_8024194C_86ADFC .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80243260, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_03/86F670.data.s b/ver/us/asm/data/world/area_tik/tik_03/86F670.data.s index 60fad12852..2bf3a5be3f 100644 --- a/ver/us/asm/data/world/area_tik/tik_03/86F670.data.s +++ b/ver/us/asm/data/world/area_tik/tik_03/86F670.data.s @@ -3,16 +3,16 @@ .section .data dlabel D_80240B70_86F670 -.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, tik_03_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, tik_03_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 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, tik_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, tik_03_Pipe_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240EC4_86F9C4 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_03_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, tik_03_SomeXYZFunc2, 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, tik_03_UnkFunc25, 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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241390_86FE90, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_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, tik_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, tik_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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241390_86FE90, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241390_86FE90 -.word 0x00000043, 0x00000001, tik_03_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_03_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_03_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_03_GetCurrentCameraYawClamped180, 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 +.word 0x00000043, 0x00000001, tik_03_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_03_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_03_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_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 dlabel D_8024156C_87006C -.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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_03_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_03_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, tik_03_SomeXYZFunc2, 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, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_03_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_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, tik_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_802418A0_8703A0 .word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_03_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_03_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_04/872750.data.s b/ver/us/asm/data/world/area_tik/tik_04/872750.data.s index 0e669ba7c3..19228fa41a 100644 --- a/ver/us/asm/data/world/area_tik/tik_04/872750.data.s +++ b/ver/us/asm/data/world/area_tik/tik_04/872750.data.s @@ -6,19 +6,19 @@ dlabel D_80240D20_872750 .word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_04_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_04_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240DBC_8727EC -.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, tik_04_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, tik_04_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 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, tik_04_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, tik_04_Pipe_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241110_872B40 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_04_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, tik_04_SomeXYZFunc2, 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 +.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_04_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, tik_04_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_80241500_872F30 -.word 0x00000043, 0x00000001, tik_04_UnkFunc25, 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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802415DC_87300C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, tik_04_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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802415DC_87300C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802415DC_87300C -.word 0x00000043, 0x00000001, tik_04_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_04_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_04_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_04_GetCurrentCameraYawClamped180, 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 +.word 0x00000043, 0x00000001, tik_04_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_04_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_04_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_04_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_802417B8_8731E8 -.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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_04_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_04_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, tik_04_SomeXYZFunc2, 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, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_04_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_04_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, tik_04_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_80241AEC_87351C .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80243370, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_06/8778F0.data.s b/ver/us/asm/data/world/area_tik/tik_06/8778F0.data.s index 7e5e0bfb7a..de3b8f6552 100644 --- a/ver/us/asm/data/world/area_tik/tik_06/8778F0.data.s +++ b/ver/us/asm/data/world/area_tik/tik_06/8778F0.data.s @@ -3,19 +3,19 @@ .section .data dlabel D_80240A10_8778F0 -.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, tik_06_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, tik_06_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 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, tik_06_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, tik_06_Pipe_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240D64_877C44 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_06_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, tik_06_SomeXYZFunc2, 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 +.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_06_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, tik_06_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_80241154_878034 -.word 0x00000043, 0x00000001, tik_06_UnkFunc25, 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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241230_878110, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, tik_06_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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241230_878110, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241230_878110 -.word 0x00000043, 0x00000001, tik_06_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_06_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_06_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_06_GetCurrentCameraYawClamped180, 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 +.word 0x00000043, 0x00000001, tik_06_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_06_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_06_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_06_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_8024140C_8782EC -.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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_06_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_06_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, tik_06_SomeXYZFunc2, 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, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_06_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_06_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, tik_06_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_80241740_878620 .word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_06_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_06_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_07/87C570.data.s b/ver/us/asm/data/world/area_tik/tik_07/87C570.data.s index 6e0eef8538..337d9686c2 100644 --- a/ver/us/asm/data/world/area_tik/tik_07/87C570.data.s +++ b/ver/us/asm/data/world/area_tik/tik_07/87C570.data.s @@ -3,13 +3,13 @@ .section .data dlabel D_80242990_87C570 -.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, tik_07_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, tik_07_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, tik_07_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, tik_07_SomeXYZFunc2, 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 +.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, tik_07_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, tik_07_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, tik_07_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, tik_07_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_802430D4_87CCB4 -.word 0x00000043, 0x00000001, tik_07_UnkFunc25, 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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802431B0_87CD90, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, tik_07_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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802431B0_87CD90, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802431B0_87CD90 -.word 0x00000043, 0x00000001, tik_07_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_07_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_07_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_07_GetCurrentCameraYawClamped180, 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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_07_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_07_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, tik_07_SomeXYZFunc2, 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, tik_07_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_07_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_07_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_07_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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_07_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_07_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, tik_07_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_802436C0_87D2A0 .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802451A0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_07/87D5D0.data.s b/ver/us/asm/data/world/area_tik/tik_07/87D5D0.data.s index 261a9a3b23..5f685d5581 100644 --- a/ver/us/asm/data/world/area_tik/tik_07/87D5D0.data.s +++ b/ver/us/asm/data/world/area_tik/tik_07/87D5D0.data.s @@ -2,23 +2,23 @@ .section .data -dlabel D_802439F0_87D5D0 +dlabel tik_07_SuperBlock_CantUpgradeMessages .word 0x001D00F0, 0x001D00F1 -dlabel D_802439F8_87D5D8 +dlabel tik_07_SuperBlock_PartnerIDs .word 0x00010002, 0x00030004, 0x00090006, 0x00070008 -dlabel D_80243A08_87D5E8 +dlabel tik_07_SuperBlock_UpgradeDescMessages .word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF -dlabel tik_07_bigFuncFloats +dlabel tik_07_SuperBlock_UpgradeOrbAngles .word 0x430C0000, 0x43340000, 0x435C0000 dlabel D_80243A54_87D634 -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, tik_07_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, tik_07_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, tik_07_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024031C_879EFC, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, tik_07_UnkFunc22, 0x00000043, 0x00000001, tik_07_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_07_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_07_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, tik_07_UnkFunc60, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, tik_07_SuperBlock_GatherEnergyFX, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, tik_07_SuperBlock_WhiteScreenFlash, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, tik_07_SuperBlock_WhiteScreenFlash, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, tik_07_SuperBlock_HideBlockContent, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, tik_07_SuperBlock_RadiateFaintEnergyFX, 0x00000043, 0x00000001, tik_07_SuperBlock_PartnerSparkles2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_07_SuperBlock_PartnerSparkles4, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_07_SuperBlock_PartnerSparkles2, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, tik_07_SuperBlock_AnimateEnergyOrbs, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243BB8_87D798 -.word 0x0000000A, 0x00000002, 0xF8405D31, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_07_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, tik_07_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, tik_07_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, tik_07_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, tik_07_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_07_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802404AC_87A08C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, tik_07_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_07_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, tik_07_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, tik_07_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_07_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80243A54_87D634, 0x00000043, 0x00000003, tik_07_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405D31, 0x00000001, 0x00000043, 0x00000002, tik_07_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, tik_07_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_07_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0x00000132, 0x0000005A, 0xFFFFFF98, 0x00000011, 0xF8405D14, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x00000334, 0x00000046, 0xFFFFFFFB, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D31, 0x00000043, 0x00000002, AssignScript, D_80243BB8_87D798, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF8405D31, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_07_SuperBlock_WaitForPlayerToLand, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, tik_07_SuperBlock_SetOverride40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, tik_07_SuperBlock_StartGlowEffect, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, tik_07_SuperBlock_CountEligiblePartners, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, tik_07_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_07_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_07_SuperBlock_ShowSelectPartnerMenu, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, tik_07_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_07_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, tik_07_SuperBlock_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, tik_07_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_07_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80243A54_87D634, 0x00000043, 0x00000003, tik_07_SuperBlock_GetPartnerRank, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405D31, 0x00000001, 0x00000043, 0x00000002, tik_07_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000001, tik_07_SuperBlock_LoadCurrentPartnerName, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_07_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0x00000132, 0x0000005A, 0xFFFFFF98, 0x00000011, 0xF8405D14, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x00000334, 0x00000046, 0xFFFFFFFB, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D31, 0x00000043, 0x00000002, AssignScript, D_80243BB8_87D798, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802440C0_87DCA0 .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_tik/tik_08/87F9A0.data.s b/ver/us/asm/data/world/area_tik/tik_08/87F9A0.data.s index 9411cb7e85..db35c83137 100644 --- a/ver/us/asm/data/world/area_tik/tik_08/87F9A0.data.s +++ b/ver/us/asm/data/world/area_tik/tik_08/87F9A0.data.s @@ -3,16 +3,16 @@ .section .data dlabel D_80240BB0_87F9A0 -.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, tik_08_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, tik_08_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 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, tik_08_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, tik_08_Pipe_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240F04_87FCF4 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_08_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, tik_08_SomeXYZFunc2, 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, tik_08_UnkFunc25, 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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802413D0_8801C0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_08_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, tik_08_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, tik_08_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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802413D0_8801C0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802413D0_8801C0 -.word 0x00000043, 0x00000001, tik_08_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_08_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_08_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_08_GetCurrentCameraYawClamped180, 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 +.word 0x00000043, 0x00000001, tik_08_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_08_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_08_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_08_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_802415AC_88039C -.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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_08_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_08_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, tik_08_SomeXYZFunc2, 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, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_08_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_08_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, tik_08_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_802418E0_8806D0 .word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_08_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_08_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_09/883500.data.s b/ver/us/asm/data/world/area_tik/tik_09/883500.data.s index 0bb7cfbdf2..b21eb4a22a 100644 --- a/ver/us/asm/data/world/area_tik/tik_09/883500.data.s +++ b/ver/us/asm/data/world/area_tik/tik_09/883500.data.s @@ -3,10 +3,10 @@ .section .data dlabel D_80241340_883500 -.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, tik_09_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, tik_09_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, tik_09_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, tik_09_SomeXYZFunc2, 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, tik_09_UnkFunc25, 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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241B60_883D20, 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, tik_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, tik_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, tik_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, tik_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, 0x00000043, 0x00000001, tik_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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241B60_883D20, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241B60_883D20 -.word 0x00000043, 0x00000001, tik_09_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_09_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_09_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_09_GetCurrentCameraYawClamped180, 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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_09_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_09_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, tik_09_SomeXYZFunc2, 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, tik_09_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_09_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_09_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_09_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_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, tik_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_80242070_884230 .word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_09_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_09_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_10/8883F0.data.s b/ver/us/asm/data/world/area_tik/tik_10/8883F0.data.s index 296f17b044..19ab66f259 100644 --- a/ver/us/asm/data/world/area_tik/tik_10/8883F0.data.s +++ b/ver/us/asm/data/world/area_tik/tik_10/8883F0.data.s @@ -2,20 +2,20 @@ .section .data -dlabel D_80242030_8883F0 +dlabel tik_10_SuperBlock_CantUpgradeMessages .word 0x001D00F0, 0x001D00F1 -dlabel D_80242038_8883F8 +dlabel tik_10_SuperBlock_PartnerIDs .word 0x00010002, 0x00030004, 0x00090006, 0x00070008 -dlabel D_80242048_888408 +dlabel tik_10_SuperBlock_UpgradeDescMessages .word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF -dlabel tik_10_bigFuncFloats +dlabel tik_10_SuperBlock_UpgradeOrbAngles .word 0x430C0000, 0x43340000, 0x435C0000 dlabel D_80242094_888454 -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, tik_10_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, tik_10_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, tik_10_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_802406BC_886A7C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, tik_10_UnkFunc22, 0x00000043, 0x00000001, tik_10_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_10_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_10_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, tik_10_UnkFunc60, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, tik_10_SuperBlock_GatherEnergyFX, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, tik_10_SuperBlock_WhiteScreenFlash, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, tik_10_SuperBlock_WhiteScreenFlash, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, tik_10_SuperBlock_HideBlockContent, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, tik_10_SuperBlock_RadiateFaintEnergyFX, 0x00000043, 0x00000001, tik_10_SuperBlock_PartnerSparkles2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_10_SuperBlock_PartnerSparkles4, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_10_SuperBlock_PartnerSparkles2, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, tik_10_SuperBlock_AnimateEnergyOrbs, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802421F8_8885B8 -.word 0x0000000A, 0x00000002, 0xF8405D32, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_10_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, tik_10_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, tik_10_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, tik_10_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, tik_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_8024084C_886C0C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, tik_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, tik_10_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, tik_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80242094_888454, 0x00000043, 0x00000003, tik_10_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405D32, 0x00000001, 0x00000043, 0x00000002, tik_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, tik_10_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0xFFFFFF74, 0x000000A0, 0xFFFFFFD8, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D32, 0x00000043, 0x00000002, AssignScript, D_802421F8_8885B8, 0x00000043, 0x00000008, CreatePushBlockGrid, 0x00000000, 0x00000007, 0x00000006, 0xFFFFFFC0, 0xFFFFFFF1, 0xFFFFFFA2, 0x00000000, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000001, 0x00000004, 0x00000001, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0xFFFFFFCC, 0x00000046, 0xFFFFFFE0, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D15, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0x00000017, 0x00000046, 0xFFFFFFE0, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D16, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0x00000062, 0x00000046, 0xFFFFFFE0, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D17, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF8405D32, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_10_SuperBlock_WaitForPlayerToLand, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, tik_10_SuperBlock_SetOverride40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, tik_10_SuperBlock_StartGlowEffect, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, tik_10_SuperBlock_CountEligiblePartners, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, tik_10_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_10_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_10_SuperBlock_ShowSelectPartnerMenu, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, tik_10_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_10_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, tik_10_SuperBlock_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, tik_10_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_10_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80242094_888454, 0x00000043, 0x00000003, tik_10_SuperBlock_GetPartnerRank, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405D32, 0x00000001, 0x00000043, 0x00000002, tik_10_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000001, tik_10_SuperBlock_LoadCurrentPartnerName, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_10_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0xFFFFFF74, 0x000000A0, 0xFFFFFFD8, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D32, 0x00000043, 0x00000002, AssignScript, D_802421F8_8885B8, 0x00000043, 0x00000008, CreatePushBlockGrid, 0x00000000, 0x00000007, 0x00000006, 0xFFFFFFC0, 0xFFFFFFF1, 0xFFFFFFA2, 0x00000000, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000001, 0x00000004, 0x00000001, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0xFFFFFFCC, 0x00000046, 0xFFFFFFE0, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D15, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0x00000017, 0x00000046, 0xFFFFFFE0, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D16, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0x00000062, 0x00000046, 0xFFFFFFE0, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D17, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_12/88AEA0.data.s b/ver/us/asm/data/world/area_tik/tik_12/88AEA0.data.s index 0a6bf3ec7c..b9214c9219 100644 --- a/ver/us/asm/data/world/area_tik/tik_12/88AEA0.data.s +++ b/ver/us/asm/data/world/area_tik/tik_12/88AEA0.data.s @@ -3,16 +3,16 @@ .section .data dlabel D_802422D0_88AEA0 -.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, tik_12_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, tik_12_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 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, tik_12_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, tik_12_Pipe_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242624_88B1F4 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_12_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, tik_12_SomeXYZFunc2, 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, tik_12_UnkFunc25, 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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80242AF0_88B6C0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_12_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, tik_12_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, tik_12_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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80242AF0_88B6C0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242AF0_88B6C0 -.word 0x00000043, 0x00000001, tik_12_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_12_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_12_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_12_GetCurrentCameraYawClamped180, 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 +.word 0x00000043, 0x00000001, tik_12_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_12_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_12_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_12_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_80242CCC_88B89C -.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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_12_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_12_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, tik_12_SomeXYZFunc2, 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, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_12_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_12_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, tik_12_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_80243000_88BBD0 .word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_12_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_12_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_12/88C810.data.s b/ver/us/asm/data/world/area_tik/tik_12/88C810.data.s index 46c11288e2..999a5f62fd 100644 --- a/ver/us/asm/data/world/area_tik/tik_12/88C810.data.s +++ b/ver/us/asm/data/world/area_tik/tik_12/88C810.data.s @@ -5,23 +5,23 @@ dlabel tik_12_varTable .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_80243CAC_88C87C +dlabel tik_12_SuperBlock_CantUpgradeMessages .word 0x001D00F0, 0x001D00F1 -dlabel D_80243CB4_88C884 +dlabel tik_12_SuperBlock_PartnerIDs .word 0x00010002, 0x00030004, 0x00090006, 0x00070008 -dlabel D_80243CC4_88C894 +dlabel tik_12_SuperBlock_UpgradeDescMessages .word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF -dlabel tik_12_bigFuncFloats +dlabel tik_12_SuperBlock_UpgradeOrbAngles .word 0x430C0000, 0x43340000, 0x435C0000 dlabel D_80243D10_88C8E0 -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, tik_12_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, tik_12_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, tik_12_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240C58_889828, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, tik_12_UnkFunc22, 0x00000043, 0x00000001, tik_12_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_12_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_12_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, tik_12_UnkFunc60, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, tik_12_SuperBlock_GatherEnergyFX, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, tik_12_SuperBlock_WhiteScreenFlash, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, tik_12_SuperBlock_WhiteScreenFlash, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, tik_12_SuperBlock_HideBlockContent, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, tik_12_SuperBlock_RadiateFaintEnergyFX, 0x00000043, 0x00000001, tik_12_SuperBlock_PartnerSparkles2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_12_SuperBlock_PartnerSparkles4, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_12_SuperBlock_PartnerSparkles2, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, tik_12_SuperBlock_AnimateEnergyOrbs, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243E74_88CA44 -.word 0x0000000A, 0x00000002, 0xF8405D33, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_12_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, tik_12_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, tik_12_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, tik_12_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, tik_12_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_12_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240DE8_8899B8, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, tik_12_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_12_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, tik_12_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, tik_12_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_12_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80243D10_88C8E0, 0x00000043, 0x00000003, tik_12_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405D33, 0x00000001, 0x00000043, 0x00000002, tik_12_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, tik_12_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_12_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF8405D33, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_12_SuperBlock_WaitForPlayerToLand, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, tik_12_SuperBlock_SetOverride40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, tik_12_SuperBlock_StartGlowEffect, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, tik_12_SuperBlock_CountEligiblePartners, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, tik_12_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_12_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_12_SuperBlock_ShowSelectPartnerMenu, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, tik_12_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_12_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, tik_12_SuperBlock_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, tik_12_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_12_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80243D10_88C8E0, 0x00000043, 0x00000003, tik_12_SuperBlock_GetPartnerRank, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405D33, 0x00000001, 0x00000043, 0x00000002, tik_12_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000001, tik_12_SuperBlock_LoadCurrentPartnerName, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_12_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802442F4_88CEC4 .word 0x00000024, 0x00000002, 0xF8405D0B, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_14/88DFF0.data.s b/ver/us/asm/data/world/area_tik/tik_14/88DFF0.data.s index 8a082633e0..2916d9081f 100644 --- a/ver/us/asm/data/world/area_tik/tik_14/88DFF0.data.s +++ b/ver/us/asm/data/world/area_tik/tik_14/88DFF0.data.s @@ -3,16 +3,16 @@ .section .data dlabel D_802409F0_88DFF0 -.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, tik_14_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, tik_14_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 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, tik_14_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, tik_14_Pipe_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240D44_88E344 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_14_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, tik_14_SomeXYZFunc2, 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, tik_14_UnkFunc25, 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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241210_88E810, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_14_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, tik_14_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, tik_14_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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241210_88E810, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241210_88E810 -.word 0x00000043, 0x00000001, tik_14_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_14_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_14_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_14_GetCurrentCameraYawClamped180, 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 +.word 0x00000043, 0x00000001, tik_14_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_14_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_14_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_14_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_802413EC_88E9EC -.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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_14_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_14_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, tik_14_SomeXYZFunc2, 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, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_14_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_14_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, tik_14_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_80241720_88ED20 .word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_14_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_14_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_15/890740.data.s b/ver/us/asm/data/world/area_tik/tik_15/890740.data.s index 0e6f7dcd89..4e8028bb47 100644 --- a/ver/us/asm/data/world/area_tik/tik_15/890740.data.s +++ b/ver/us/asm/data/world/area_tik/tik_15/890740.data.s @@ -3,16 +3,16 @@ .section .data dlabel D_80240BA0_890740 -.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, tik_15_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, tik_15_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 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, tik_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, tik_15_Pipe_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240EF4_890A94 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_15_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, tik_15_SomeXYZFunc2, 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, tik_15_UnkFunc25, 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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802413C0_890F60, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_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, tik_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, 0x00000043, 0x00000001, tik_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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802413C0_890F60, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802413C0_890F60 -.word 0x00000043, 0x00000001, tik_15_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_15_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_15_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_15_GetCurrentCameraYawClamped180, 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 +.word 0x00000043, 0x00000001, tik_15_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_15_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_15_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_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 dlabel D_8024159C_89113C -.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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_15_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_15_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, tik_15_SomeXYZFunc2, 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, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_15_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_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, tik_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_802418D0_891470 .word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_15_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_15_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_17/893E40.data.s b/ver/us/asm/data/world/area_tik/tik_17/893E40.data.s index 0ee1ebb987..1615ba3788 100644 --- a/ver/us/asm/data/world/area_tik/tik_17/893E40.data.s +++ b/ver/us/asm/data/world/area_tik/tik_17/893E40.data.s @@ -2,20 +2,20 @@ .section .data -dlabel D_80241420_893E40 +dlabel tik_17_SuperBlock_CantUpgradeMessages .word 0x001D00F0, 0x001D00F1 -dlabel D_80241428_893E48 +dlabel tik_17_SuperBlock_PartnerIDs .word 0x00010002, 0x00030004, 0x00090006, 0x00070008 -dlabel D_80241438_893E58 +dlabel tik_17_SuperBlock_UpgradeDescMessages .word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF -dlabel tik_17_bigFuncFloats +dlabel tik_17_SuperBlock_UpgradeOrbAngles .word 0x430C0000, 0x43340000, 0x435C0000 dlabel D_80241484_893EA4 -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, tik_17_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, tik_17_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, tik_17_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024006C_892A8C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, tik_17_UnkFunc22, 0x00000043, 0x00000001, tik_17_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_17_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_17_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, tik_17_UnkFunc60, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, tik_17_SuperBlock_GatherEnergyFX, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, tik_17_SuperBlock_WhiteScreenFlash, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, tik_17_SuperBlock_WhiteScreenFlash, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, tik_17_SuperBlock_HideBlockContent, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, tik_17_SuperBlock_RadiateFaintEnergyFX, 0x00000043, 0x00000001, tik_17_SuperBlock_PartnerSparkles2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_17_SuperBlock_PartnerSparkles4, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_17_SuperBlock_PartnerSparkles2, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, tik_17_SuperBlock_AnimateEnergyOrbs, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802415E8_894008 -.word 0x0000000A, 0x00000002, 0xF8405D34, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_17_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, tik_17_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, tik_17_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, tik_17_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, tik_17_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_17_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802401FC_892C1C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, tik_17_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_17_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, tik_17_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, tik_17_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_17_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241484_893EA4, 0x00000043, 0x00000003, tik_17_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405D34, 0x00000001, 0x00000043, 0x00000002, tik_17_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, tik_17_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_17_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0xFFFFFF7E, 0x00000032, 0x00000000, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D34, 0x00000043, 0x00000002, AssignScript, D_802415E8_894008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF8405D34, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_17_SuperBlock_WaitForPlayerToLand, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, tik_17_SuperBlock_SetOverride40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, tik_17_SuperBlock_StartGlowEffect, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, tik_17_SuperBlock_CountEligiblePartners, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, tik_17_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_17_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_17_SuperBlock_ShowSelectPartnerMenu, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, tik_17_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_17_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, tik_17_SuperBlock_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, tik_17_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_17_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241484_893EA4, 0x00000043, 0x00000003, tik_17_SuperBlock_GetPartnerRank, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405D34, 0x00000001, 0x00000043, 0x00000002, tik_17_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000001, tik_17_SuperBlock_LoadCurrentPartnerName, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_17_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0xFFFFFF7E, 0x00000032, 0x00000000, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D34, 0x00000043, 0x00000002, AssignScript, D_802415E8_894008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_17/8944F0.data.s b/ver/us/asm/data/world/area_tik/tik_17/8944F0.data.s index f7be0adfd4..59b1752d97 100644 --- a/ver/us/asm/data/world/area_tik/tik_17/8944F0.data.s +++ b/ver/us/asm/data/world/area_tik/tik_17/8944F0.data.s @@ -3,19 +3,19 @@ .section .data dlabel D_80241AD0_8944F0 -.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, tik_17_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, tik_17_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 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, tik_17_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, tik_17_Pipe_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241E24_894844 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_17_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, tik_17_SomeXYZFunc2, 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 +.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_17_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, tik_17_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_80242214_894C34 -.word 0x00000043, 0x00000001, tik_17_UnkFunc25, 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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802422F0_894D10, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, tik_17_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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802422F0_894D10, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802422F0_894D10 -.word 0x00000043, 0x00000001, tik_17_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_17_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_17_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_17_GetCurrentCameraYawClamped180, 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 +.word 0x00000043, 0x00000001, tik_17_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_17_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_17_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_17_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_802424CC_894EEC -.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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_17_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_17_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, tik_17_SomeXYZFunc2, 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, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_17_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_17_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, tik_17_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_80242800_895220 .word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_17_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_17_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_19/898990.data.s b/ver/us/asm/data/world/area_tik/tik_19/898990.data.s index 422458b35b..11ababf549 100644 --- a/ver/us/asm/data/world/area_tik/tik_19/898990.data.s +++ b/ver/us/asm/data/world/area_tik/tik_19/898990.data.s @@ -3,16 +3,16 @@ .section .data dlabel D_802413B0_898990 -.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, tik_19_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, tik_19_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 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, tik_19_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, tik_19_Pipe_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241704_898CE4 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_19_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, tik_19_SomeXYZFunc2, 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, tik_19_UnkFunc25, 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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241BD0_8991B0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_19_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, tik_19_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, tik_19_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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241BD0_8991B0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241BD0_8991B0 -.word 0x00000043, 0x00000001, tik_19_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_19_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_19_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_19_GetCurrentCameraYawClamped180, 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 +.word 0x00000043, 0x00000001, tik_19_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_19_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_19_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_19_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_80241DAC_89938C -.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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_19_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_19_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, tik_19_SomeXYZFunc2, 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, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_19_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_19_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, tik_19_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_802420E0_8996C0 .word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_19_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_19_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_19/899C90.data.s b/ver/us/asm/data/world/area_tik/tik_19/899C90.data.s index bd8b5f0d4d..62f774adf4 100644 --- a/ver/us/asm/data/world/area_tik/tik_19/899C90.data.s +++ b/ver/us/asm/data/world/area_tik/tik_19/899C90.data.s @@ -2,20 +2,20 @@ .section .data -dlabel D_802426B0_899C90 +dlabel tik_19_SuperBlock_CantUpgradeMessages .word 0x001D00F0, 0x001D00F1 -dlabel D_802426B8_899C98 +dlabel tik_19_SuperBlock_PartnerIDs .word 0x00010002, 0x00030004, 0x00090006, 0x00070008 -dlabel D_802426C8_899CA8 +dlabel tik_19_SuperBlock_UpgradeDescMessages .word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF -dlabel tik_19_bigFuncFloats +dlabel tik_19_SuperBlock_UpgradeOrbAngles .word 0x430C0000, 0x43340000, 0x435C0000 dlabel D_80242714_899CF4 -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, tik_19_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, tik_19_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, tik_19_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024062C_897C0C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, tik_19_UnkFunc22, 0x00000043, 0x00000001, tik_19_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_19_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_19_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, tik_19_UnkFunc60, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, tik_19_SuperBlock_GatherEnergyFX, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, tik_19_SuperBlock_WhiteScreenFlash, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, tik_19_SuperBlock_WhiteScreenFlash, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, tik_19_SuperBlock_HideBlockContent, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, tik_19_SuperBlock_RadiateFaintEnergyFX, 0x00000043, 0x00000001, tik_19_SuperBlock_PartnerSparkles2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_19_SuperBlock_PartnerSparkles4, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_19_SuperBlock_PartnerSparkles2, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, tik_19_SuperBlock_AnimateEnergyOrbs, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242878_899E58 -.word 0x0000000A, 0x00000002, 0xF8405D35, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_19_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, tik_19_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, tik_19_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, tik_19_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, tik_19_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_19_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802407BC_897D9C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, tik_19_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_19_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, tik_19_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, tik_19_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_19_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80242714_899CF4, 0x00000043, 0x00000003, tik_19_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405D35, 0x00000001, 0x00000043, 0x00000002, tik_19_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, tik_19_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_19_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x000002F8, 0x0000004B, 0xFFFFFFF6, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D35, 0x00000043, 0x00000002, AssignScript, D_80242878_899E58, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF8405D35, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_19_SuperBlock_WaitForPlayerToLand, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, tik_19_SuperBlock_SetOverride40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, tik_19_SuperBlock_StartGlowEffect, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, tik_19_SuperBlock_CountEligiblePartners, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, tik_19_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_19_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_19_SuperBlock_ShowSelectPartnerMenu, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, tik_19_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_19_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, tik_19_SuperBlock_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, tik_19_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_19_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80242714_899CF4, 0x00000043, 0x00000003, tik_19_SuperBlock_GetPartnerRank, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405D35, 0x00000001, 0x00000043, 0x00000002, tik_19_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000001, tik_19_SuperBlock_LoadCurrentPartnerName, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_19_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x000002F8, 0x0000004B, 0xFFFFFFF6, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D35, 0x00000043, 0x00000002, AssignScript, D_80242878_899E58, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_20/89B530.data.s b/ver/us/asm/data/world/area_tik/tik_20/89B530.data.s index cbf66df31f..ed5310825c 100644 --- a/ver/us/asm/data/world/area_tik/tik_20/89B530.data.s +++ b/ver/us/asm/data/world/area_tik/tik_20/89B530.data.s @@ -6,13 +6,13 @@ dlabel D_802411E0_89B530 .word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_20_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_20_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024127C_89B5CC -.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, tik_20_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, tik_20_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, tik_20_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, tik_20_SomeXYZFunc2, 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 +.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, tik_20_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, tik_20_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, tik_20_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, tik_20_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_802419C0_89BD10 -.word 0x00000043, 0x00000001, tik_20_UnkFunc25, 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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241A9C_89BDEC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, tik_20_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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241A9C_89BDEC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241A9C_89BDEC -.word 0x00000043, 0x00000001, tik_20_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_20_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_20_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_20_GetCurrentCameraYawClamped180, 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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_20_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_20_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, tik_20_SomeXYZFunc2, 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, tik_20_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_20_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_20_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_20_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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_20_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_20_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, tik_20_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_80241FAC_89C2FC .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802433D0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_21/89E1A0.data.s b/ver/us/asm/data/world/area_tik/tik_21/89E1A0.data.s index 7652fa02b8..02751228b2 100644 --- a/ver/us/asm/data/world/area_tik/tik_21/89E1A0.data.s +++ b/ver/us/asm/data/world/area_tik/tik_21/89E1A0.data.s @@ -6,13 +6,13 @@ dlabel D_80240A00_89E1A0 .word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_21_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_21_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240A9C_89E23C -.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, tik_21_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, tik_21_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, tik_21_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, tik_21_SomeXYZFunc2, 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 +.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, tik_21_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, tik_21_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, tik_21_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, tik_21_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_802411E0_89E980 -.word 0x00000043, 0x00000001, tik_21_UnkFunc25, 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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802412BC_89EA5C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, tik_21_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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802412BC_89EA5C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802412BC_89EA5C -.word 0x00000043, 0x00000001, tik_21_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_21_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_21_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_21_GetCurrentCameraYawClamped180, 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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_21_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_21_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, tik_21_SomeXYZFunc2, 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, tik_21_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_21_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_21_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_21_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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_21_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_21_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, tik_21_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_802417CC_89EF6C .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242700, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_22/8A0930.data.s b/ver/us/asm/data/world/area_tik/tik_22/8A0930.data.s index 851a0d590f..e55f10fee3 100644 --- a/ver/us/asm/data/world/area_tik/tik_22/8A0930.data.s +++ b/ver/us/asm/data/world/area_tik/tik_22/8A0930.data.s @@ -6,13 +6,13 @@ dlabel D_80240A70_8A0930 .word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_22_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_22_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240B0C_8A09CC -.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, tik_22_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, tik_22_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, tik_22_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, tik_22_SomeXYZFunc2, 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 +.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, tik_22_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, tik_22_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, tik_22_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, tik_22_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_80241250_8A1110 -.word 0x00000043, 0x00000001, tik_22_UnkFunc25, 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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_8024132C_8A11EC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, tik_22_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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_8024132C_8A11EC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024132C_8A11EC -.word 0x00000043, 0x00000001, tik_22_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_22_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_22_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_22_GetCurrentCameraYawClamped180, 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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_22_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_22_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, tik_22_SomeXYZFunc2, 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, tik_22_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_22_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_22_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_22_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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_22_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_22_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, tik_22_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_8024183C_8A16FC .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000001, func_8024061C_8A04DC, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000006, 0x00000024, 0x00000002, 0xFE363C82, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C83, 0x0000000D, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80242500, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_23/8A35A0.data.s b/ver/us/asm/data/world/area_tik/tik_23/8A35A0.data.s index 54d9df7f2e..847fb0baf8 100644 --- a/ver/us/asm/data/world/area_tik/tik_23/8A35A0.data.s +++ b/ver/us/asm/data/world/area_tik/tik_23/8A35A0.data.s @@ -3,16 +3,16 @@ .section .data dlabel D_802411D0_8A35A0 -.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, tik_23_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, tik_23_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 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, tik_23_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, tik_23_Pipe_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241524_8A38F4 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_23_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, tik_23_SomeXYZFunc2, 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, tik_23_UnkFunc25, 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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802419F0_8A3DC0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_23_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, tik_23_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, tik_23_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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802419F0_8A3DC0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802419F0_8A3DC0 -.word 0x00000043, 0x00000001, tik_23_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_23_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_23_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_23_GetCurrentCameraYawClamped180, 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 +.word 0x00000043, 0x00000001, tik_23_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_23_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_23_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_23_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_80241BCC_8A3F9C -.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, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_23_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_23_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, tik_23_SomeXYZFunc2, 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, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_23_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_23_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, tik_23_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_80241F00_8A42D0 .word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_23_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_23_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/nonmatchings/EC9D00/func_802401CC_EC9ECC.s b/ver/us/asm/nonmatchings/EC9D00/func_802401CC_EC9ECC.s deleted file mode 100644 index d9823af7ff..0000000000 --- a/ver/us/asm/nonmatchings/EC9D00/func_802401CC_EC9ECC.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401CC_EC9ECC -/* EC9ECC 802401CC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* EC9ED0 802401D0 AFB5002C */ sw $s5, 0x2c($sp) -/* EC9ED4 802401D4 0080A82D */ daddu $s5, $a0, $zero -/* EC9ED8 802401D8 AFBE0038 */ sw $fp, 0x38($sp) -/* EC9EDC 802401DC 3C1E8011 */ lui $fp, %hi(dead_gPlayerData) -/* EC9EE0 802401E0 27DE7840 */ addiu $fp, $fp, %lo(dead_gPlayerData) -/* EC9EE4 802401E4 AFBF003C */ sw $ra, 0x3c($sp) -/* EC9EE8 802401E8 AFB70034 */ sw $s7, 0x34($sp) -/* EC9EEC 802401EC AFB60030 */ sw $s6, 0x30($sp) -/* EC9EF0 802401F0 AFB40028 */ sw $s4, 0x28($sp) -/* EC9EF4 802401F4 AFB30024 */ sw $s3, 0x24($sp) -/* EC9EF8 802401F8 AFB20020 */ sw $s2, 0x20($sp) -/* EC9EFC 802401FC AFB1001C */ sw $s1, 0x1c($sp) -/* EC9F00 80240200 10A0004F */ beqz $a1, .L80240340 -/* EC9F04 80240204 AFB00018 */ sw $s0, 0x18($sp) -/* EC9F08 80240208 0C00AFF5 */ jal dead_heap_malloc -/* EC9F0C 8024020C 24040330 */ addiu $a0, $zero, 0x330 -/* EC9F10 80240210 0040982D */ daddu $s3, $v0, $zero -/* EC9F14 80240214 0000B02D */ daddu $s6, $zero, $zero -/* EC9F18 80240218 02C0902D */ daddu $s2, $s6, $zero -/* EC9F1C 8024021C 3C148024 */ lui $s4, %hi(D_80241FE8_ECBCE8) -/* EC9F20 80240220 26941FE8 */ addiu $s4, $s4, %lo(D_80241FE8_ECBCE8) -/* EC9F24 80240224 0260882D */ daddu $s1, $s3, $zero -/* EC9F28 80240228 8EA200B4 */ lw $v0, 0xb4($s5) -/* EC9F2C 8024022C 3C038024 */ lui $v1, %hi(D_80241FE0_ECBCE0) -/* EC9F30 80240230 24631FE0 */ addiu $v1, $v1, %lo(D_80241FE0_ECBCE0) -/* EC9F34 80240234 AEB30078 */ sw $s3, 0x78($s5) -/* EC9F38 80240238 00021027 */ nor $v0, $zero, $v0 -/* EC9F3C 8024023C 0002BFC2 */ srl $s7, $v0, 0x1f -/* EC9F40 80240240 00171080 */ sll $v0, $s7, 2 -/* EC9F44 80240244 00431021 */ addu $v0, $v0, $v1 -/* EC9F48 80240248 AFA20010 */ sw $v0, 0x10($sp) -.L8024024C: -/* EC9F4C 8024024C 86900000 */ lh $s0, ($s4) -/* EC9F50 80240250 001010C0 */ sll $v0, $s0, 3 -/* EC9F54 80240254 03C21021 */ addu $v0, $fp, $v0 -/* EC9F58 80240258 90420014 */ lbu $v0, 0x14($v0) -/* EC9F5C 8024025C 5040002E */ beql $v0, $zero, .L80240318 -/* EC9F60 80240260 26520001 */ addiu $s2, $s2, 1 -/* EC9F64 80240264 00101100 */ sll $v0, $s0, 4 -/* EC9F68 80240268 3C068009 */ lui $a2, %hi(D_80094900) -/* EC9F6C 8024026C 24C64900 */ addiu $a2, $a2, %lo(D_80094900) -/* EC9F70 80240270 00461021 */ addu $v0, $v0, $a2 -/* EC9F74 80240274 0200202D */ daddu $a0, $s0, $zero -/* EC9F78 80240278 AE300108 */ sw $s0, 0x108($s1) -/* EC9F7C 8024027C 8C420000 */ lw $v0, ($v0) -/* EC9F80 80240280 02E0282D */ daddu $a1, $s7, $zero -/* EC9F84 80240284 0C090035 */ jal EC9D00_UnkFunc37 -/* EC9F88 80240288 AE220084 */ sw $v0, 0x84($s1) -/* EC9F8C 8024028C 0040202D */ daddu $a0, $v0, $zero -/* EC9F90 80240290 04800011 */ bltz $a0, .L802402D8 -/* EC9F94 80240294 00101080 */ sll $v0, $s0, 2 -/* EC9F98 80240298 3C068010 */ lui $a2, %hi(D_80100060) -/* EC9F9C 8024029C 24C60060 */ addiu $a2, $a2, %lo(D_80100060) -/* EC9FA0 802402A0 00461021 */ addu $v0, $v0, $a2 -/* EC9FA4 802402A4 8C430000 */ lw $v1, ($v0) -/* EC9FA8 802402A8 24020001 */ addiu $v0, $zero, 1 -/* EC9FAC 802402AC AE22018C */ sw $v0, 0x18c($s1) -/* EC9FB0 802402B0 00041080 */ sll $v0, $a0, 2 -/* EC9FB4 802402B4 3C068024 */ lui $a2, %hi(D_80241FF8_ECBCF8) -/* EC9FB8 802402B8 24C61FF8 */ addiu $a2, $a2, %lo(D_80241FF8_ECBCF8) -/* EC9FBC 802402BC AE230000 */ sw $v1, ($s1) -/* EC9FC0 802402C0 001218C0 */ sll $v1, $s2, 3 -/* EC9FC4 802402C4 00431021 */ addu $v0, $v0, $v1 -/* EC9FC8 802402C8 00461021 */ addu $v0, $v0, $a2 -/* EC9FCC 802402CC 8C420000 */ lw $v0, ($v0) -/* EC9FD0 802402D0 080900BF */ j .L802402FC -/* EC9FD4 802402D4 AE220294 */ sw $v0, 0x294($s1) -.L802402D8: -/* EC9FD8 802402D8 3C068010 */ lui $a2, %hi(D_801000A0) -/* EC9FDC 802402DC 24C600A0 */ addiu $a2, $a2, %lo(D_801000A0) -/* EC9FE0 802402E0 00461021 */ addu $v0, $v0, $a2 -/* EC9FE4 802402E4 8C420000 */ lw $v0, ($v0) -/* EC9FE8 802402E8 AE20018C */ sw $zero, 0x18c($s1) -/* EC9FEC 802402EC AE220000 */ sw $v0, ($s1) -/* EC9FF0 802402F0 8FA60010 */ lw $a2, 0x10($sp) -/* EC9FF4 802402F4 8CC20000 */ lw $v0, ($a2) -/* EC9FF8 802402F8 AE220294 */ sw $v0, 0x294($s1) -.L802402FC: -/* EC9FFC 802402FC 001010C0 */ sll $v0, $s0, 3 -/* ECA000 80240300 03C21021 */ addu $v0, $fp, $v0 -/* ECA004 80240304 80420015 */ lb $v0, 0x15($v0) -/* ECA008 80240308 26D60001 */ addiu $s6, $s6, 1 -/* ECA00C 8024030C AE220210 */ sw $v0, 0x210($s1) -/* ECA010 80240310 26310004 */ addiu $s1, $s1, 4 -/* ECA014 80240314 26520001 */ addiu $s2, $s2, 1 -.L80240318: -/* ECA018 80240318 2A420008 */ slti $v0, $s2, 8 -/* ECA01C 8024031C 1440FFCB */ bnez $v0, .L8024024C -/* ECA020 80240320 26940002 */ addiu $s4, $s4, 2 -/* ECA024 80240324 0260202D */ daddu $a0, $s3, $zero -/* ECA028 80240328 24020004 */ addiu $v0, $zero, 4 -/* ECA02C 8024032C AC820318 */ sw $v0, 0x318($a0) -/* ECA030 80240330 AC960324 */ sw $s6, 0x324($a0) -/* ECA034 80240334 0C03F343 */ jal func_800FCD0C -/* ECA038 80240338 AC800328 */ sw $zero, 0x328($a0) -/* ECA03C 8024033C AEA00070 */ sw $zero, 0x70($s5) -.L80240340: -/* ECA040 80240340 8EA20070 */ lw $v0, 0x70($s5) -/* ECA044 80240344 8EB30078 */ lw $s3, 0x78($s5) -/* ECA048 80240348 14400008 */ bnez $v0, .L8024036C -/* ECA04C 8024034C 24420001 */ addiu $v0, $v0, 1 -/* ECA050 80240350 8662032C */ lh $v0, 0x32c($s3) -/* ECA054 80240354 10400009 */ beqz $v0, .L8024037C -/* ECA058 80240358 AEA20074 */ sw $v0, 0x74($s5) -/* ECA05C 8024035C 0C03E498 */ jal func_800F9260 -/* ECA060 80240360 00000000 */ nop -/* ECA064 80240364 8EA20070 */ lw $v0, 0x70($s5) -/* ECA068 80240368 24420001 */ addiu $v0, $v0, 1 -.L8024036C: -/* ECA06C 8024036C AEA20070 */ sw $v0, 0x70($s5) -/* ECA070 80240370 2842000F */ slti $v0, $v0, 0xf -/* ECA074 80240374 10400003 */ beqz $v0, .L80240384 -/* ECA078 80240378 00000000 */ nop -.L8024037C: -/* ECA07C 8024037C 080900FB */ j .L802403EC -/* ECA080 80240380 0000102D */ daddu $v0, $zero, $zero -.L80240384: -/* ECA084 80240384 0C03E4FA */ jal func_800F93E8 -/* ECA088 80240388 00000000 */ nop -/* ECA08C 8024038C 8EA30074 */ lw $v1, 0x74($s5) -/* ECA090 80240390 240200FF */ addiu $v0, $zero, 0xff -/* ECA094 80240394 10620010 */ beq $v1, $v0, .L802403D8 -/* ECA098 80240398 2462FFFF */ addiu $v0, $v1, -1 -/* ECA09C 8024039C 00021080 */ sll $v0, $v0, 2 -/* ECA0A0 802403A0 02621021 */ addu $v0, $s3, $v0 -/* ECA0A4 802403A4 8C420108 */ lw $v0, 0x108($v0) -/* ECA0A8 802403A8 00021100 */ sll $v0, $v0, 4 -/* ECA0AC 802403AC 3C038009 */ lui $v1, %hi(D_80094900) -/* ECA0B0 802403B0 00621821 */ addu $v1, $v1, $v0 -/* ECA0B4 802403B4 8C634900 */ lw $v1, %lo(D_80094900)($v1) -/* ECA0B8 802403B8 8EA20074 */ lw $v0, 0x74($s5) -/* ECA0BC 802403BC 2442FFFF */ addiu $v0, $v0, -1 -/* ECA0C0 802403C0 00021080 */ sll $v0, $v0, 2 -/* ECA0C4 802403C4 02621021 */ addu $v0, $s3, $v0 -/* ECA0C8 802403C8 AEA30084 */ sw $v1, 0x84($s5) -/* ECA0CC 802403CC 8C420108 */ lw $v0, 0x108($v0) -/* ECA0D0 802403D0 080900F8 */ j .L802403E0 -/* ECA0D4 802403D4 AEA20088 */ sw $v0, 0x88($s5) -.L802403D8: -/* ECA0D8 802403D8 2402FFFF */ addiu $v0, $zero, -1 -/* ECA0DC 802403DC AEA20084 */ sw $v0, 0x84($s5) -.L802403E0: -/* ECA0E0 802403E0 0C00B007 */ jal func_8002C01C -/* ECA0E4 802403E4 8EA40078 */ lw $a0, 0x78($s5) -/* ECA0E8 802403E8 24020002 */ addiu $v0, $zero, 2 -.L802403EC: -/* ECA0EC 802403EC 8FBF003C */ lw $ra, 0x3c($sp) -/* ECA0F0 802403F0 8FBE0038 */ lw $fp, 0x38($sp) -/* ECA0F4 802403F4 8FB70034 */ lw $s7, 0x34($sp) -/* ECA0F8 802403F8 8FB60030 */ lw $s6, 0x30($sp) -/* ECA0FC 802403FC 8FB5002C */ lw $s5, 0x2c($sp) -/* ECA100 80240400 8FB40028 */ lw $s4, 0x28($sp) -/* ECA104 80240404 8FB30024 */ lw $s3, 0x24($sp) -/* ECA108 80240408 8FB20020 */ lw $s2, 0x20($sp) -/* ECA10C 8024040C 8FB1001C */ lw $s1, 0x1c($sp) -/* ECA110 80240410 8FB00018 */ lw $s0, 0x18($sp) -/* ECA114 80240414 03E00008 */ jr $ra -/* ECA118 80240418 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/EED1E0/func_802402AC_EED3AC.s b/ver/us/asm/nonmatchings/EED1E0/func_802402AC_EED3AC.s deleted file mode 100644 index 828c456c7e..0000000000 --- a/ver/us/asm/nonmatchings/EED1E0/func_802402AC_EED3AC.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402AC_EED3AC -/* EED3AC 802402AC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* EED3B0 802402B0 AFB5002C */ sw $s5, 0x2c($sp) -/* EED3B4 802402B4 0080A82D */ daddu $s5, $a0, $zero -/* EED3B8 802402B8 AFBE0038 */ sw $fp, 0x38($sp) -/* EED3BC 802402BC 3C1E8011 */ lui $fp, %hi(dead_gPlayerData) -/* EED3C0 802402C0 27DE7840 */ addiu $fp, $fp, %lo(dead_gPlayerData) -/* EED3C4 802402C4 AFBF003C */ sw $ra, 0x3c($sp) -/* EED3C8 802402C8 AFB70034 */ sw $s7, 0x34($sp) -/* EED3CC 802402CC AFB60030 */ sw $s6, 0x30($sp) -/* EED3D0 802402D0 AFB40028 */ sw $s4, 0x28($sp) -/* EED3D4 802402D4 AFB30024 */ sw $s3, 0x24($sp) -/* EED3D8 802402D8 AFB20020 */ sw $s2, 0x20($sp) -/* EED3DC 802402DC AFB1001C */ sw $s1, 0x1c($sp) -/* EED3E0 802402E0 10A0004F */ beqz $a1, .L80240420 -/* EED3E4 802402E4 AFB00018 */ sw $s0, 0x18($sp) -/* EED3E8 802402E8 0C00AFF5 */ jal dead_heap_malloc -/* EED3EC 802402EC 24040330 */ addiu $a0, $zero, 0x330 -/* EED3F0 802402F0 0040982D */ daddu $s3, $v0, $zero -/* EED3F4 802402F4 0000B02D */ daddu $s6, $zero, $zero -/* EED3F8 802402F8 02C0902D */ daddu $s2, $s6, $zero -/* EED3FC 802402FC 3C148024 */ lui $s4, %hi(D_80243768_EF0868) -/* EED400 80240300 26943768 */ addiu $s4, $s4, %lo(D_80243768_EF0868) -/* EED404 80240304 0260882D */ daddu $s1, $s3, $zero -/* EED408 80240308 8EA200B4 */ lw $v0, 0xb4($s5) -/* EED40C 8024030C 3C038024 */ lui $v1, %hi(D_80243760_EF0860) -/* EED410 80240310 24633760 */ addiu $v1, $v1, %lo(D_80243760_EF0860) -/* EED414 80240314 AEB30078 */ sw $s3, 0x78($s5) -/* EED418 80240318 00021027 */ nor $v0, $zero, $v0 -/* EED41C 8024031C 0002BFC2 */ srl $s7, $v0, 0x1f -/* EED420 80240320 00171080 */ sll $v0, $s7, 2 -/* EED424 80240324 00431021 */ addu $v0, $v0, $v1 -/* EED428 80240328 AFA20010 */ sw $v0, 0x10($sp) -.L8024032C: -/* EED42C 8024032C 86900000 */ lh $s0, ($s4) -/* EED430 80240330 001010C0 */ sll $v0, $s0, 3 -/* EED434 80240334 03C21021 */ addu $v0, $fp, $v0 -/* EED438 80240338 90420014 */ lbu $v0, 0x14($v0) -/* EED43C 8024033C 5040002E */ beql $v0, $zero, .L802403F8 -/* EED440 80240340 26520001 */ addiu $s2, $s2, 1 -/* EED444 80240344 00101100 */ sll $v0, $s0, 4 -/* EED448 80240348 3C068009 */ lui $a2, %hi(D_80094900) -/* EED44C 8024034C 24C64900 */ addiu $a2, $a2, %lo(D_80094900) -/* EED450 80240350 00461021 */ addu $v0, $v0, $a2 -/* EED454 80240354 0200202D */ daddu $a0, $s0, $zero -/* EED458 80240358 AE300108 */ sw $s0, 0x108($s1) -/* EED45C 8024035C 8C420000 */ lw $v0, ($v0) -/* EED460 80240360 02E0282D */ daddu $a1, $s7, $zero -/* EED464 80240364 0C09006D */ jal EED1E0_UnkFunc37 -/* EED468 80240368 AE220084 */ sw $v0, 0x84($s1) -/* EED46C 8024036C 0040202D */ daddu $a0, $v0, $zero -/* EED470 80240370 04800011 */ bltz $a0, .L802403B8 -/* EED474 80240374 00101080 */ sll $v0, $s0, 2 -/* EED478 80240378 3C068010 */ lui $a2, %hi(D_80100060) -/* EED47C 8024037C 24C60060 */ addiu $a2, $a2, %lo(D_80100060) -/* EED480 80240380 00461021 */ addu $v0, $v0, $a2 -/* EED484 80240384 8C430000 */ lw $v1, ($v0) -/* EED488 80240388 24020001 */ addiu $v0, $zero, 1 -/* EED48C 8024038C AE22018C */ sw $v0, 0x18c($s1) -/* EED490 80240390 00041080 */ sll $v0, $a0, 2 -/* EED494 80240394 3C068024 */ lui $a2, %hi(D_80243778_EF0878) -/* EED498 80240398 24C63778 */ addiu $a2, $a2, %lo(D_80243778_EF0878) -/* EED49C 8024039C AE230000 */ sw $v1, ($s1) -/* EED4A0 802403A0 001218C0 */ sll $v1, $s2, 3 -/* EED4A4 802403A4 00431021 */ addu $v0, $v0, $v1 -/* EED4A8 802403A8 00461021 */ addu $v0, $v0, $a2 -/* EED4AC 802403AC 8C420000 */ lw $v0, ($v0) -/* EED4B0 802403B0 080900F7 */ j .L802403DC -/* EED4B4 802403B4 AE220294 */ sw $v0, 0x294($s1) -.L802403B8: -/* EED4B8 802403B8 3C068010 */ lui $a2, %hi(D_801000A0) -/* EED4BC 802403BC 24C600A0 */ addiu $a2, $a2, %lo(D_801000A0) -/* EED4C0 802403C0 00461021 */ addu $v0, $v0, $a2 -/* EED4C4 802403C4 8C420000 */ lw $v0, ($v0) -/* EED4C8 802403C8 AE20018C */ sw $zero, 0x18c($s1) -/* EED4CC 802403CC AE220000 */ sw $v0, ($s1) -/* EED4D0 802403D0 8FA60010 */ lw $a2, 0x10($sp) -/* EED4D4 802403D4 8CC20000 */ lw $v0, ($a2) -/* EED4D8 802403D8 AE220294 */ sw $v0, 0x294($s1) -.L802403DC: -/* EED4DC 802403DC 001010C0 */ sll $v0, $s0, 3 -/* EED4E0 802403E0 03C21021 */ addu $v0, $fp, $v0 -/* EED4E4 802403E4 80420015 */ lb $v0, 0x15($v0) -/* EED4E8 802403E8 26D60001 */ addiu $s6, $s6, 1 -/* EED4EC 802403EC AE220210 */ sw $v0, 0x210($s1) -/* EED4F0 802403F0 26310004 */ addiu $s1, $s1, 4 -/* EED4F4 802403F4 26520001 */ addiu $s2, $s2, 1 -.L802403F8: -/* EED4F8 802403F8 2A420008 */ slti $v0, $s2, 8 -/* EED4FC 802403FC 1440FFCB */ bnez $v0, .L8024032C -/* EED500 80240400 26940002 */ addiu $s4, $s4, 2 -/* EED504 80240404 0260202D */ daddu $a0, $s3, $zero -/* EED508 80240408 24020004 */ addiu $v0, $zero, 4 -/* EED50C 8024040C AC820318 */ sw $v0, 0x318($a0) -/* EED510 80240410 AC960324 */ sw $s6, 0x324($a0) -/* EED514 80240414 0C03F343 */ jal func_800FCD0C -/* EED518 80240418 AC800328 */ sw $zero, 0x328($a0) -/* EED51C 8024041C AEA00070 */ sw $zero, 0x70($s5) -.L80240420: -/* EED520 80240420 8EA20070 */ lw $v0, 0x70($s5) -/* EED524 80240424 8EB30078 */ lw $s3, 0x78($s5) -/* EED528 80240428 14400008 */ bnez $v0, .L8024044C -/* EED52C 8024042C 24420001 */ addiu $v0, $v0, 1 -/* EED530 80240430 8662032C */ lh $v0, 0x32c($s3) -/* EED534 80240434 10400009 */ beqz $v0, .L8024045C -/* EED538 80240438 AEA20074 */ sw $v0, 0x74($s5) -/* EED53C 8024043C 0C03E498 */ jal func_800F9260 -/* EED540 80240440 00000000 */ nop -/* EED544 80240444 8EA20070 */ lw $v0, 0x70($s5) -/* EED548 80240448 24420001 */ addiu $v0, $v0, 1 -.L8024044C: -/* EED54C 8024044C AEA20070 */ sw $v0, 0x70($s5) -/* EED550 80240450 2842000F */ slti $v0, $v0, 0xf -/* EED554 80240454 10400003 */ beqz $v0, .L80240464 -/* EED558 80240458 00000000 */ nop -.L8024045C: -/* EED55C 8024045C 08090133 */ j .L802404CC -/* EED560 80240460 0000102D */ daddu $v0, $zero, $zero -.L80240464: -/* EED564 80240464 0C03E4FA */ jal func_800F93E8 -/* EED568 80240468 00000000 */ nop -/* EED56C 8024046C 8EA30074 */ lw $v1, 0x74($s5) -/* EED570 80240470 240200FF */ addiu $v0, $zero, 0xff -/* EED574 80240474 10620010 */ beq $v1, $v0, .L802404B8 -/* EED578 80240478 2462FFFF */ addiu $v0, $v1, -1 -/* EED57C 8024047C 00021080 */ sll $v0, $v0, 2 -/* EED580 80240480 02621021 */ addu $v0, $s3, $v0 -/* EED584 80240484 8C420108 */ lw $v0, 0x108($v0) -/* EED588 80240488 00021100 */ sll $v0, $v0, 4 -/* EED58C 8024048C 3C038009 */ lui $v1, %hi(D_80094900) -/* EED590 80240490 00621821 */ addu $v1, $v1, $v0 -/* EED594 80240494 8C634900 */ lw $v1, %lo(D_80094900)($v1) -/* EED598 80240498 8EA20074 */ lw $v0, 0x74($s5) -/* EED59C 8024049C 2442FFFF */ addiu $v0, $v0, -1 -/* EED5A0 802404A0 00021080 */ sll $v0, $v0, 2 -/* EED5A4 802404A4 02621021 */ addu $v0, $s3, $v0 -/* EED5A8 802404A8 AEA30084 */ sw $v1, 0x84($s5) -/* EED5AC 802404AC 8C420108 */ lw $v0, 0x108($v0) -/* EED5B0 802404B0 08090130 */ j .L802404C0 -/* EED5B4 802404B4 AEA20088 */ sw $v0, 0x88($s5) -.L802404B8: -/* EED5B8 802404B8 2402FFFF */ addiu $v0, $zero, -1 -/* EED5BC 802404BC AEA20084 */ sw $v0, 0x84($s5) -.L802404C0: -/* EED5C0 802404C0 0C00B007 */ jal func_8002C01C -/* EED5C4 802404C4 8EA40078 */ lw $a0, 0x78($s5) -/* EED5C8 802404C8 24020002 */ addiu $v0, $zero, 2 -.L802404CC: -/* EED5CC 802404CC 8FBF003C */ lw $ra, 0x3c($sp) -/* EED5D0 802404D0 8FBE0038 */ lw $fp, 0x38($sp) -/* EED5D4 802404D4 8FB70034 */ lw $s7, 0x34($sp) -/* EED5D8 802404D8 8FB60030 */ lw $s6, 0x30($sp) -/* EED5DC 802404DC 8FB5002C */ lw $s5, 0x2c($sp) -/* EED5E0 802404E0 8FB40028 */ lw $s4, 0x28($sp) -/* EED5E4 802404E4 8FB30024 */ lw $s3, 0x24($sp) -/* EED5E8 802404E8 8FB20020 */ lw $s2, 0x20($sp) -/* EED5EC 802404EC 8FB1001C */ lw $s1, 0x1c($sp) -/* EED5F0 802404F0 8FB00018 */ lw $s0, 0x18($sp) -/* EED5F4 802404F4 03E00008 */ jr $ra -/* EED5F8 802404F8 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/msg/_msg_get_printer_for_msg.s b/ver/us/asm/nonmatchings/msg/_msg_get_printer_for_msg.s deleted file mode 100644 index 8d5f22f2a3..0000000000 --- a/ver/us/asm/nonmatchings/msg/_msg_get_printer_for_msg.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel _msg_get_printer_for_msg -/* BC01C 8012591C 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* BC020 80125920 AFB70054 */ sw $s7, 0x54($sp) -/* BC024 80125924 0080B82D */ daddu $s7, $a0, $zero -/* BC028 80125928 AFBE0058 */ sw $fp, 0x58($sp) -/* BC02C 8012592C 00A0F02D */ daddu $fp, $a1, $zero -/* BC030 80125930 AFBF005C */ sw $ra, 0x5c($sp) -/* BC034 80125934 AFB60050 */ sw $s6, 0x50($sp) -/* BC038 80125938 AFB5004C */ sw $s5, 0x4c($sp) -/* BC03C 8012593C AFB40048 */ sw $s4, 0x48($sp) -/* BC040 80125940 AFB30044 */ sw $s3, 0x44($sp) -/* BC044 80125944 AFB20040 */ sw $s2, 0x40($sp) -/* BC048 80125948 AFB1003C */ sw $s1, 0x3c($sp) -/* BC04C 8012594C AFB00038 */ sw $s0, 0x38($sp) -/* BC050 80125950 12E00038 */ beqz $s7, .L80125A34 -/* BC054 80125954 AFA60068 */ sw $a2, 0x68($sp) -/* BC058 80125958 06E00004 */ bltz $s7, .L8012596C -/* BC05C 8012595C 02E0982D */ daddu $s3, $s7, $zero -/* BC060 80125960 0C049623 */ jal load_message_to_buffer -/* BC064 80125964 02E0202D */ daddu $a0, $s7, $zero -/* BC068 80125968 0040982D */ daddu $s3, $v0, $zero -.L8012596C: -/* BC06C 8012596C 0000182D */ daddu $v1, $zero, $zero -/* BC070 80125970 27B10020 */ addiu $s1, $sp, 0x20 -/* BC074 80125974 27B20024 */ addiu $s2, $sp, 0x24 -/* BC078 80125978 27B40028 */ addiu $s4, $sp, 0x28 -/* BC07C 8012597C 27B5002C */ addiu $s5, $sp, 0x2c -/* BC080 80125980 27B60030 */ addiu $s6, $sp, 0x30 -/* BC084 80125984 3C108015 */ lui $s0, %hi(gMessagePrinters) -/* BC088 80125988 26104C30 */ addiu $s0, $s0, %lo(gMessagePrinters) -.L8012598C: -/* BC08C 8012598C 8E0204FC */ lw $v0, 0x4fc($s0) -/* BC090 80125990 30420002 */ andi $v0, $v0, 2 -/* BC094 80125994 14400024 */ bnez $v0, .L80125A28 -/* BC098 80125998 24630001 */ addiu $v1, $v1, 1 -/* BC09C 8012599C 0200202D */ daddu $a0, $s0, $zero -/* BC0A0 801259A0 8FA60068 */ lw $a2, 0x68($sp) -/* BC0A4 801259A4 0C0495A9 */ jal initialize_printer -/* BC0A8 801259A8 24050001 */ addiu $a1, $zero, 1 -/* BC0AC 801259AC 02E0202D */ daddu $a0, $s7, $zero -/* BC0B0 801259B0 0220282D */ daddu $a1, $s1, $zero -/* BC0B4 801259B4 0240302D */ daddu $a2, $s2, $zero -/* BC0B8 801259B8 24080001 */ addiu $t0, $zero, 1 -/* BC0BC 801259BC 8E0204FC */ lw $v0, 0x4fc($s0) -/* BC0C0 801259C0 0280382D */ daddu $a3, $s4, $zero -/* BC0C4 801259C4 A20804F8 */ sb $t0, 0x4f8($s0) -/* BC0C8 801259C8 AE130000 */ sw $s3, ($s0) -/* BC0CC 801259CC AE040008 */ sw $a0, 8($s0) -/* BC0D0 801259D0 34420002 */ ori $v0, $v0, 2 -/* BC0D4 801259D4 AE0204FC */ sw $v0, 0x4fc($s0) -/* BC0D8 801259D8 AFB50010 */ sw $s5, 0x10($sp) -/* BC0DC 801259DC AFB60014 */ sw $s6, 0x14($sp) -/* BC0E0 801259E0 AFA00018 */ sw $zero, 0x18($sp) -/* BC0E4 801259E4 0C0497DA */ jal get_msg_properties -/* BC0E8 801259E8 AFA0001C */ sw $zero, 0x1c($sp) -/* BC0EC 801259EC 96220002 */ lhu $v0, 2($s1) -/* BC0F0 801259F0 A6020536 */ sh $v0, 0x536($s0) -/* BC0F4 801259F4 96420002 */ lhu $v0, 2($s2) -/* BC0F8 801259F8 A6020538 */ sh $v0, 0x538($s0) -/* BC0FC 801259FC 92820003 */ lbu $v0, 3($s4) -/* BC100 80125A00 A202053A */ sb $v0, 0x53a($s0) -/* BC104 80125A04 92A20003 */ lbu $v0, 3($s5) -/* BC108 80125A08 A202053B */ sb $v0, 0x53b($s0) -/* BC10C 80125A0C 92C20003 */ lbu $v0, 3($s6) -/* BC110 80125A10 AE1E0504 */ sw $fp, 0x504($s0) -/* BC114 80125A14 13C00002 */ beqz $fp, .L80125A20 -/* BC118 80125A18 A202053C */ sb $v0, 0x53c($s0) -/* BC11C 80125A1C AFC00000 */ sw $zero, ($fp) -.L80125A20: -/* BC120 80125A20 0804968E */ j .L80125A38 -/* BC124 80125A24 0200102D */ daddu $v0, $s0, $zero -.L80125A28: -/* BC128 80125A28 28620003 */ slti $v0, $v1, 3 -/* BC12C 80125A2C 1440FFD7 */ bnez $v0, .L8012598C -/* BC130 80125A30 26100558 */ addiu $s0, $s0, 0x558 -.L80125A34: -/* BC134 80125A34 0000102D */ daddu $v0, $zero, $zero -.L80125A38: -/* BC138 80125A38 8FBF005C */ lw $ra, 0x5c($sp) -/* BC13C 80125A3C 8FBE0058 */ lw $fp, 0x58($sp) -/* BC140 80125A40 8FB70054 */ lw $s7, 0x54($sp) -/* BC144 80125A44 8FB60050 */ lw $s6, 0x50($sp) -/* BC148 80125A48 8FB5004C */ lw $s5, 0x4c($sp) -/* BC14C 80125A4C 8FB40048 */ lw $s4, 0x48($sp) -/* BC150 80125A50 8FB30044 */ lw $s3, 0x44($sp) -/* BC154 80125A54 8FB20040 */ lw $s2, 0x40($sp) -/* BC158 80125A58 8FB1003C */ lw $s1, 0x3c($sp) -/* BC15C 80125A5C 8FB00038 */ lw $s0, 0x38($sp) -/* BC160 80125A60 03E00008 */ jr $ra -/* BC164 80125A64 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/ver/us/asm/nonmatchings/msg/draw_digit.s b/ver/us/asm/nonmatchings/msg/draw_digit.s deleted file mode 100644 index 213bb32db9..0000000000 --- a/ver/us/asm/nonmatchings/msg/draw_digit.s +++ /dev/null @@ -1,123 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel draw_digit -/* BDBC0 801274C0 3C0A800A */ lui $t2, %hi(gMasterGfxPos) -/* BDBC4 801274C4 254AA66C */ addiu $t2, $t2, %lo(gMasterGfxPos) -/* BDBC8 801274C8 3C028015 */ lui $v0, %hi(gMsgNumbers) -/* BDBCC 801274CC 2442C340 */ addiu $v0, $v0, %lo(gMsgNumbers) -/* BDBD0 801274D0 00054880 */ sll $t1, $a1, 2 -/* BDBD4 801274D4 01254821 */ addu $t1, $t1, $a1 -/* BDBD8 801274D8 00094880 */ sll $t1, $t1, 2 -/* BDBDC 801274DC 01224821 */ addu $t1, $t1, $v0 -/* BDBE0 801274E0 8D480000 */ lw $t0, ($t2) -/* BDBE4 801274E4 3C050700 */ lui $a1, 0x700 -/* BDBE8 801274E8 0100582D */ daddu $t3, $t0, $zero -/* BDBEC 801274EC 25080008 */ addiu $t0, $t0, 8 -/* BDBF0 801274F0 AD480000 */ sw $t0, ($t2) -/* BDBF4 801274F4 91220005 */ lbu $v0, 5($t1) -/* BDBF8 801274F8 25030008 */ addiu $v1, $t0, 8 -/* BDBFC 801274FC AD640004 */ sw $a0, 4($t3) -/* BDC00 80127500 AD430000 */ sw $v1, ($t2) -/* BDC04 80127504 3C03FD48 */ lui $v1, 0xfd48 -/* BDC08 80127508 00021042 */ srl $v0, $v0, 1 -/* BDC0C 8012750C 2442FFFF */ addiu $v0, $v0, -1 -/* BDC10 80127510 30420FFF */ andi $v0, $v0, 0xfff -/* BDC14 80127514 00431025 */ or $v0, $v0, $v1 -/* BDC18 80127518 AD620000 */ sw $v0, ($t3) -/* BDC1C 8012751C 91220005 */ lbu $v0, 5($t1) -/* BDC20 80127520 25030010 */ addiu $v1, $t0, 0x10 -/* BDC24 80127524 AD050004 */ sw $a1, 4($t0) -/* BDC28 80127528 AD430000 */ sw $v1, ($t2) -/* BDC2C 8012752C 3C03E600 */ lui $v1, 0xe600 -/* BDC30 80127530 AD030008 */ sw $v1, 8($t0) -/* BDC34 80127534 25030018 */ addiu $v1, $t0, 0x18 -/* BDC38 80127538 AD00000C */ sw $zero, 0xc($t0) -/* BDC3C 8012753C AD430000 */ sw $v1, ($t2) -/* BDC40 80127540 3C03F400 */ lui $v1, 0xf400 -/* BDC44 80127544 AD030010 */ sw $v1, 0x10($t0) -/* BDC48 80127548 3C03F548 */ lui $v1, 0xf548 -/* BDC4C 8012754C 00021042 */ srl $v0, $v0, 1 -/* BDC50 80127550 24420007 */ addiu $v0, $v0, 7 -/* BDC54 80127554 000210C2 */ srl $v0, $v0, 3 -/* BDC58 80127558 00021240 */ sll $v0, $v0, 9 -/* BDC5C 8012755C 00431025 */ or $v0, $v0, $v1 -/* BDC60 80127560 AD020000 */ sw $v0, ($t0) -/* BDC64 80127564 91220005 */ lbu $v0, 5($t1) -/* BDC68 80127568 91240006 */ lbu $a0, 6($t1) -/* BDC6C 8012756C 25030020 */ addiu $v1, $t0, 0x20 -/* BDC70 80127570 AD430000 */ sw $v1, ($t2) -/* BDC74 80127574 3C03E700 */ lui $v1, 0xe700 -/* BDC78 80127578 AD030018 */ sw $v1, 0x18($t0) -/* BDC7C 8012757C 25030028 */ addiu $v1, $t0, 0x28 -/* BDC80 80127580 AD00001C */ sw $zero, 0x1c($t0) -/* BDC84 80127584 AD430000 */ sw $v1, ($t2) -/* BDC88 80127588 25030030 */ addiu $v1, $t0, 0x30 -/* BDC8C 8012758C 2442FFFF */ addiu $v0, $v0, -1 -/* BDC90 80127590 00021040 */ sll $v0, $v0, 1 -/* BDC94 80127594 30420FFF */ andi $v0, $v0, 0xfff -/* BDC98 80127598 00021300 */ sll $v0, $v0, 0xc -/* BDC9C 8012759C 2484FFFF */ addiu $a0, $a0, -1 -/* BDCA0 801275A0 00042080 */ sll $a0, $a0, 2 -/* BDCA4 801275A4 30840FFF */ andi $a0, $a0, 0xfff -/* BDCA8 801275A8 00852025 */ or $a0, $a0, $a1 -/* BDCAC 801275AC 00441025 */ or $v0, $v0, $a0 -/* BDCB0 801275B0 AD020014 */ sw $v0, 0x14($t0) -/* BDCB4 801275B4 91220005 */ lbu $v0, 5($t1) -/* BDCB8 801275B8 3C050400 */ lui $a1, 0x400 -/* BDCBC 801275BC AD000024 */ sw $zero, 0x24($t0) -/* BDCC0 801275C0 AD430000 */ sw $v1, ($t2) -/* BDCC4 801275C4 3C03F200 */ lui $v1, 0xf200 -/* BDCC8 801275C8 AD030028 */ sw $v1, 0x28($t0) -/* BDCCC 801275CC 3C03F540 */ lui $v1, 0xf540 -/* BDCD0 801275D0 25040038 */ addiu $a0, $t0, 0x38 -/* BDCD4 801275D4 00021042 */ srl $v0, $v0, 1 -/* BDCD8 801275D8 24420007 */ addiu $v0, $v0, 7 -/* BDCDC 801275DC 000210C2 */ srl $v0, $v0, 3 -/* BDCE0 801275E0 00021240 */ sll $v0, $v0, 9 -/* BDCE4 801275E4 00431025 */ or $v0, $v0, $v1 -/* BDCE8 801275E8 AD020020 */ sw $v0, 0x20($t0) -/* BDCEC 801275EC 91220005 */ lbu $v0, 5($t1) -/* BDCF0 801275F0 91230006 */ lbu $v1, 6($t1) -/* BDCF4 801275F4 34A50400 */ ori $a1, $a1, 0x400 -/* BDCF8 801275F8 AD440000 */ sw $a0, ($t2) -/* BDCFC 801275FC 3C04E400 */ lui $a0, 0xe400 -/* BDD00 80127600 2442FFFF */ addiu $v0, $v0, -1 -/* BDD04 80127604 00021080 */ sll $v0, $v0, 2 -/* BDD08 80127608 30420FFF */ andi $v0, $v0, 0xfff -/* BDD0C 8012760C 00021300 */ sll $v0, $v0, 0xc -/* BDD10 80127610 2463FFFF */ addiu $v1, $v1, -1 -/* BDD14 80127614 00031880 */ sll $v1, $v1, 2 -/* BDD18 80127618 30630FFF */ andi $v1, $v1, 0xfff -/* BDD1C 8012761C 00431025 */ or $v0, $v0, $v1 -/* BDD20 80127620 AD02002C */ sw $v0, 0x2c($t0) -/* BDD24 80127624 91230005 */ lbu $v1, 5($t1) -/* BDD28 80127628 91220006 */ lbu $v0, 6($t1) -/* BDD2C 8012762C 00C31821 */ addu $v1, $a2, $v1 -/* BDD30 80127630 00031880 */ sll $v1, $v1, 2 -/* BDD34 80127634 30630FFF */ andi $v1, $v1, 0xfff -/* BDD38 80127638 00031B00 */ sll $v1, $v1, 0xc -/* BDD3C 8012763C 00E21021 */ addu $v0, $a3, $v0 -/* BDD40 80127640 00021080 */ sll $v0, $v0, 2 -/* BDD44 80127644 30420FFF */ andi $v0, $v0, 0xfff -/* BDD48 80127648 00441025 */ or $v0, $v0, $a0 -/* BDD4C 8012764C 00621825 */ or $v1, $v1, $v0 -/* BDD50 80127650 00063080 */ sll $a2, $a2, 2 -/* BDD54 80127654 30C60FFF */ andi $a2, $a2, 0xfff -/* BDD58 80127658 00063300 */ sll $a2, $a2, 0xc -/* BDD5C 8012765C 00073880 */ sll $a3, $a3, 2 -/* BDD60 80127660 30E70FFF */ andi $a3, $a3, 0xfff -/* BDD64 80127664 00C73025 */ or $a2, $a2, $a3 -/* BDD68 80127668 25020040 */ addiu $v0, $t0, 0x40 -/* BDD6C 8012766C AD030030 */ sw $v1, 0x30($t0) -/* BDD70 80127670 AD060034 */ sw $a2, 0x34($t0) -/* BDD74 80127674 AD420000 */ sw $v0, ($t2) -/* BDD78 80127678 3C02E100 */ lui $v0, 0xe100 -/* BDD7C 8012767C AD020038 */ sw $v0, 0x38($t0) -/* BDD80 80127680 25020048 */ addiu $v0, $t0, 0x48 -/* BDD84 80127684 AD00003C */ sw $zero, 0x3c($t0) -/* BDD88 80127688 AD420000 */ sw $v0, ($t2) -/* BDD8C 8012768C 3C02F100 */ lui $v0, 0xf100 -/* BDD90 80127690 AD020040 */ sw $v0, 0x40($t0) -/* BDD94 80127694 03E00008 */ jr $ra -/* BDD98 80127698 AD050044 */ sw $a1, 0x44($t0) diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/dgb_04_func_8024259C_C38ACC.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/dgb_04_func_8024259C_C38ACC.s deleted file mode 100644 index 342d2796f0..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/dgb_04_func_8024259C_C38ACC.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel dgb_04_func_8024259C_C38ACC -/* C38ACC 8024259C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* C38AD0 802425A0 AFB5002C */ sw $s5, 0x2c($sp) -/* C38AD4 802425A4 0080A82D */ daddu $s5, $a0, $zero -/* C38AD8 802425A8 AFBE0038 */ sw $fp, 0x38($sp) -/* C38ADC 802425AC 3C1E8011 */ lui $fp, %hi(gPlayerData) -/* C38AE0 802425B0 27DEF290 */ addiu $fp, $fp, %lo(gPlayerData) -/* C38AE4 802425B4 AFBF003C */ sw $ra, 0x3c($sp) -/* C38AE8 802425B8 AFB70034 */ sw $s7, 0x34($sp) -/* C38AEC 802425BC AFB60030 */ sw $s6, 0x30($sp) -/* C38AF0 802425C0 AFB40028 */ sw $s4, 0x28($sp) -/* C38AF4 802425C4 AFB30024 */ sw $s3, 0x24($sp) -/* C38AF8 802425C8 AFB20020 */ sw $s2, 0x20($sp) -/* C38AFC 802425CC AFB1001C */ sw $s1, 0x1c($sp) -/* C38B00 802425D0 10A0004F */ beqz $a1, .L80242710 -/* C38B04 802425D4 AFB00018 */ sw $s0, 0x18($sp) -/* C38B08 802425D8 0C00AB39 */ jal heap_malloc -/* C38B0C 802425DC 24040330 */ addiu $a0, $zero, 0x330 -/* C38B10 802425E0 0040982D */ daddu $s3, $v0, $zero -/* C38B14 802425E4 0000B02D */ daddu $s6, $zero, $zero -/* C38B18 802425E8 02C0902D */ daddu $s2, $s6, $zero -/* C38B1C 802425EC 3C148024 */ lui $s4, %hi(dgb_04_D_80243D38_C3A268) -/* C38B20 802425F0 26943D38 */ addiu $s4, $s4, %lo(dgb_04_D_80243D38_C3A268) -/* C38B24 802425F4 0260882D */ daddu $s1, $s3, $zero -/* C38B28 802425F8 8EA200B4 */ lw $v0, 0xb4($s5) -/* C38B2C 802425FC 3C038024 */ lui $v1, %hi(dgb_04_D_80243D30_C3A260) -/* C38B30 80242600 24633D30 */ addiu $v1, $v1, %lo(dgb_04_D_80243D30_C3A260) -/* C38B34 80242604 AEB30078 */ sw $s3, 0x78($s5) -/* C38B38 80242608 00021027 */ nor $v0, $zero, $v0 -/* C38B3C 8024260C 0002BFC2 */ srl $s7, $v0, 0x1f -/* C38B40 80242610 00171080 */ sll $v0, $s7, 2 -/* C38B44 80242614 00431021 */ addu $v0, $v0, $v1 -/* C38B48 80242618 AFA20010 */ sw $v0, 0x10($sp) -.L8024261C: -/* C38B4C 8024261C 86900000 */ lh $s0, ($s4) -/* C38B50 80242620 001010C0 */ sll $v0, $s0, 3 -/* C38B54 80242624 03C21021 */ addu $v0, $fp, $v0 -/* C38B58 80242628 90420014 */ lbu $v0, 0x14($v0) -/* C38B5C 8024262C 5040002E */ beql $v0, $zero, .L802426E8 -/* C38B60 80242630 26520001 */ addiu $s2, $s2, 1 -/* C38B64 80242634 00101100 */ sll $v0, $s0, 4 -/* C38B68 80242638 3C068009 */ lui $a2, %hi(gPartnerPopupProperties) -/* C38B6C 8024263C 24C6EF20 */ addiu $a2, $a2, %lo(gPartnerPopupProperties) -/* C38B70 80242640 00461021 */ addu $v0, $v0, $a2 -/* C38B74 80242644 0200202D */ daddu $a0, $s0, $zero -/* C38B78 80242648 AE300108 */ sw $s0, 0x108($s1) -/* C38B7C 8024264C 8C420000 */ lw $v0, ($v0) -/* C38B80 80242650 02E0282D */ daddu $a1, $s7, $zero -/* C38B84 80242654 0C090929 */ jal dgb_04_UnkFunc37 -/* C38B88 80242658 AE220084 */ sw $v0, 0x84($s1) -/* C38B8C 8024265C 0040202D */ daddu $a0, $v0, $zero -/* C38B90 80242660 04800011 */ bltz $a0, .L802426A8 -/* C38B94 80242664 00101080 */ sll $v0, $s0, 2 -/* C38B98 80242668 3C06800F */ lui $a2, %hi(wPartnerHudScripts) -/* C38B9C 8024266C 24C67F00 */ addiu $a2, $a2, %lo(wPartnerHudScripts) -/* C38BA0 80242670 00461021 */ addu $v0, $v0, $a2 -/* C38BA4 80242674 8C430000 */ lw $v1, ($v0) -/* C38BA8 80242678 24020001 */ addiu $v0, $zero, 1 -/* C38BAC 8024267C AE22018C */ sw $v0, 0x18c($s1) -/* C38BB0 80242680 00041080 */ sll $v0, $a0, 2 -/* C38BB4 80242684 3C068024 */ lui $a2, %hi(dgb_04_D_80243D48_C3A278) -/* C38BB8 80242688 24C63D48 */ addiu $a2, $a2, %lo(dgb_04_D_80243D48_C3A278) -/* C38BBC 8024268C AE230000 */ sw $v1, ($s1) -/* C38BC0 80242690 001218C0 */ sll $v1, $s2, 3 -/* C38BC4 80242694 00431021 */ addu $v0, $v0, $v1 -/* C38BC8 80242698 00461021 */ addu $v0, $v0, $a2 -/* C38BCC 8024269C 8C420000 */ lw $v0, ($v0) -/* C38BD0 802426A0 080909B3 */ j .L802426CC -/* C38BD4 802426A4 AE220294 */ sw $v0, 0x294($s1) -.L802426A8: -/* C38BD8 802426A8 3C06800F */ lui $a2, %hi(wDisabledPartnerHudScripts) -/* C38BDC 802426AC 24C67F40 */ addiu $a2, $a2, %lo(wDisabledPartnerHudScripts) -/* C38BE0 802426B0 00461021 */ addu $v0, $v0, $a2 -/* C38BE4 802426B4 8C420000 */ lw $v0, ($v0) -/* C38BE8 802426B8 AE20018C */ sw $zero, 0x18c($s1) -/* C38BEC 802426BC AE220000 */ sw $v0, ($s1) -/* C38BF0 802426C0 8FA60010 */ lw $a2, 0x10($sp) -/* C38BF4 802426C4 8CC20000 */ lw $v0, ($a2) -/* C38BF8 802426C8 AE220294 */ sw $v0, 0x294($s1) -.L802426CC: -/* C38BFC 802426CC 001010C0 */ sll $v0, $s0, 3 -/* C38C00 802426D0 03C21021 */ addu $v0, $fp, $v0 -/* C38C04 802426D4 80420015 */ lb $v0, 0x15($v0) -/* C38C08 802426D8 26D60001 */ addiu $s6, $s6, 1 -/* C38C0C 802426DC AE220210 */ sw $v0, 0x210($s1) -/* C38C10 802426E0 26310004 */ addiu $s1, $s1, 4 -/* C38C14 802426E4 26520001 */ addiu $s2, $s2, 1 -.L802426E8: -/* C38C18 802426E8 2A420008 */ slti $v0, $s2, 8 -/* C38C1C 802426EC 1440FFCB */ bnez $v0, .L8024261C -/* C38C20 802426F0 26940002 */ addiu $s4, $s4, 2 -/* C38C24 802426F4 0260202D */ daddu $a0, $s3, $zero -/* C38C28 802426F8 24020004 */ addiu $v0, $zero, 4 -/* C38C2C 802426FC AC820318 */ sw $v0, 0x318($a0) -/* C38C30 80242700 AC960324 */ sw $s6, 0x324($a0) -/* C38C34 80242704 0C03D390 */ jal create_popup_menu -/* C38C38 80242708 AC800328 */ sw $zero, 0x328($a0) -/* C38C3C 8024270C AEA00070 */ sw $zero, 0x70($s5) -.L80242710: -/* C38C40 80242710 8EA20070 */ lw $v0, 0x70($s5) -/* C38C44 80242714 8EB30078 */ lw $s3, 0x78($s5) -/* C38C48 80242718 14400008 */ bnez $v0, .L8024273C -/* C38C4C 8024271C 24420001 */ addiu $v0, $v0, 1 -/* C38C50 80242720 8662032C */ lh $v0, 0x32c($s3) -/* C38C54 80242724 10400009 */ beqz $v0, .L8024274C -/* C38C58 80242728 AEA20074 */ sw $v0, 0x74($s5) -/* C38C5C 8024272C 0C03C4EC */ jal hide_popup_menu -/* C38C60 80242730 00000000 */ nop -/* C38C64 80242734 8EA20070 */ lw $v0, 0x70($s5) -/* C38C68 80242738 24420001 */ addiu $v0, $v0, 1 -.L8024273C: -/* C38C6C 8024273C AEA20070 */ sw $v0, 0x70($s5) -/* C38C70 80242740 2842000F */ slti $v0, $v0, 0xf -/* C38C74 80242744 10400003 */ beqz $v0, .L80242754 -/* C38C78 80242748 00000000 */ nop -.L8024274C: -/* C38C7C 8024274C 080909EF */ j .L802427BC -/* C38C80 80242750 0000102D */ daddu $v0, $zero, $zero -.L80242754: -/* C38C84 80242754 0C03C54E */ jal destroy_popup_menu -/* C38C88 80242758 00000000 */ nop -/* C38C8C 8024275C 8EA30074 */ lw $v1, 0x74($s5) -/* C38C90 80242760 240200FF */ addiu $v0, $zero, 0xff -/* C38C94 80242764 10620010 */ beq $v1, $v0, .L802427A8 -/* C38C98 80242768 2462FFFF */ addiu $v0, $v1, -1 -/* C38C9C 8024276C 00021080 */ sll $v0, $v0, 2 -/* C38CA0 80242770 02621021 */ addu $v0, $s3, $v0 -/* C38CA4 80242774 8C420108 */ lw $v0, 0x108($v0) -/* C38CA8 80242778 00021100 */ sll $v0, $v0, 4 -/* C38CAC 8024277C 3C038009 */ lui $v1, %hi(gPartnerPopupProperties) -/* C38CB0 80242780 00621821 */ addu $v1, $v1, $v0 -/* C38CB4 80242784 8C63EF20 */ lw $v1, %lo(gPartnerPopupProperties)($v1) -/* C38CB8 80242788 8EA20074 */ lw $v0, 0x74($s5) -/* C38CBC 8024278C 2442FFFF */ addiu $v0, $v0, -1 -/* C38CC0 80242790 00021080 */ sll $v0, $v0, 2 -/* C38CC4 80242794 02621021 */ addu $v0, $s3, $v0 -/* C38CC8 80242798 AEA30084 */ sw $v1, 0x84($s5) -/* C38CCC 8024279C 8C420108 */ lw $v0, 0x108($v0) -/* C38CD0 802427A0 080909EC */ j .L802427B0 -/* C38CD4 802427A4 AEA20088 */ sw $v0, 0x88($s5) -.L802427A8: -/* C38CD8 802427A8 2402FFFF */ addiu $v0, $zero, -1 -/* C38CDC 802427AC AEA20084 */ sw $v0, 0x84($s5) -.L802427B0: -/* C38CE0 802427B0 0C00AB4B */ jal heap_free -/* C38CE4 802427B4 8EA40078 */ lw $a0, 0x78($s5) -/* C38CE8 802427B8 24020002 */ addiu $v0, $zero, 2 -.L802427BC: -/* C38CEC 802427BC 8FBF003C */ lw $ra, 0x3c($sp) -/* C38CF0 802427C0 8FBE0038 */ lw $fp, 0x38($sp) -/* C38CF4 802427C4 8FB70034 */ lw $s7, 0x34($sp) -/* C38CF8 802427C8 8FB60030 */ lw $s6, 0x30($sp) -/* C38CFC 802427CC 8FB5002C */ lw $s5, 0x2c($sp) -/* C38D00 802427D0 8FB40028 */ lw $s4, 0x28($sp) -/* C38D04 802427D4 8FB30024 */ lw $s3, 0x24($sp) -/* C38D08 802427D8 8FB20020 */ lw $s2, 0x20($sp) -/* C38D0C 802427DC 8FB1001C */ lw $s1, 0x1c($sp) -/* C38D10 802427E0 8FB00018 */ lw $s0, 0x18($sp) -/* C38D14 802427E4 03E00008 */ jr $ra -/* C38D18 802427E8 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/flo_08_func_802401CC_CAEF0C.s b/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/flo_08_func_802401CC_CAEF0C.s deleted file mode 100644 index 3a5fc4d0e9..0000000000 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/flo_08_func_802401CC_CAEF0C.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel flo_08_func_802401CC_CAEF0C -/* CAEF0C 802401CC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* CAEF10 802401D0 AFB5002C */ sw $s5, 0x2c($sp) -/* CAEF14 802401D4 0080A82D */ daddu $s5, $a0, $zero -/* CAEF18 802401D8 AFBE0038 */ sw $fp, 0x38($sp) -/* CAEF1C 802401DC 3C1E8011 */ lui $fp, %hi(gPlayerData) -/* CAEF20 802401E0 27DEF290 */ addiu $fp, $fp, %lo(gPlayerData) -/* CAEF24 802401E4 AFBF003C */ sw $ra, 0x3c($sp) -/* CAEF28 802401E8 AFB70034 */ sw $s7, 0x34($sp) -/* CAEF2C 802401EC AFB60030 */ sw $s6, 0x30($sp) -/* CAEF30 802401F0 AFB40028 */ sw $s4, 0x28($sp) -/* CAEF34 802401F4 AFB30024 */ sw $s3, 0x24($sp) -/* CAEF38 802401F8 AFB20020 */ sw $s2, 0x20($sp) -/* CAEF3C 802401FC AFB1001C */ sw $s1, 0x1c($sp) -/* CAEF40 80240200 10A0004F */ beqz $a1, .L80240340 -/* CAEF44 80240204 AFB00018 */ sw $s0, 0x18($sp) -/* CAEF48 80240208 0C00AB39 */ jal heap_malloc -/* CAEF4C 8024020C 24040330 */ addiu $a0, $zero, 0x330 -/* CAEF50 80240210 0040982D */ daddu $s3, $v0, $zero -/* CAEF54 80240214 0000B02D */ daddu $s6, $zero, $zero -/* CAEF58 80240218 02C0902D */ daddu $s2, $s6, $zero -/* CAEF5C 8024021C 3C148024 */ lui $s4, %hi(flo_08_D_80241FB8_CB0CF8) -/* CAEF60 80240220 26941FB8 */ addiu $s4, $s4, %lo(flo_08_D_80241FB8_CB0CF8) -/* CAEF64 80240224 0260882D */ daddu $s1, $s3, $zero -/* CAEF68 80240228 8EA200B4 */ lw $v0, 0xb4($s5) -/* CAEF6C 8024022C 3C038024 */ lui $v1, %hi(flo_08_D_80241FB0_CB0CF0) -/* CAEF70 80240230 24631FB0 */ addiu $v1, $v1, %lo(flo_08_D_80241FB0_CB0CF0) -/* CAEF74 80240234 AEB30078 */ sw $s3, 0x78($s5) -/* CAEF78 80240238 00021027 */ nor $v0, $zero, $v0 -/* CAEF7C 8024023C 0002BFC2 */ srl $s7, $v0, 0x1f -/* CAEF80 80240240 00171080 */ sll $v0, $s7, 2 -/* CAEF84 80240244 00431021 */ addu $v0, $v0, $v1 -/* CAEF88 80240248 AFA20010 */ sw $v0, 0x10($sp) -.L8024024C: -/* CAEF8C 8024024C 86900000 */ lh $s0, ($s4) -/* CAEF90 80240250 001010C0 */ sll $v0, $s0, 3 -/* CAEF94 80240254 03C21021 */ addu $v0, $fp, $v0 -/* CAEF98 80240258 90420014 */ lbu $v0, 0x14($v0) -/* CAEF9C 8024025C 5040002E */ beql $v0, $zero, .L80240318 -/* CAEFA0 80240260 26520001 */ addiu $s2, $s2, 1 -/* CAEFA4 80240264 00101100 */ sll $v0, $s0, 4 -/* CAEFA8 80240268 3C068009 */ lui $a2, %hi(gPartnerPopupProperties) -/* CAEFAC 8024026C 24C6EF20 */ addiu $a2, $a2, %lo(gPartnerPopupProperties) -/* CAEFB0 80240270 00461021 */ addu $v0, $v0, $a2 -/* CAEFB4 80240274 0200202D */ daddu $a0, $s0, $zero -/* CAEFB8 80240278 AE300108 */ sw $s0, 0x108($s1) -/* CAEFBC 8024027C 8C420000 */ lw $v0, ($v0) -/* CAEFC0 80240280 02E0282D */ daddu $a1, $s7, $zero -/* CAEFC4 80240284 0C090035 */ jal flo_08_UnkFunc37 -/* CAEFC8 80240288 AE220084 */ sw $v0, 0x84($s1) -/* CAEFCC 8024028C 0040202D */ daddu $a0, $v0, $zero -/* CAEFD0 80240290 04800011 */ bltz $a0, .L802402D8 -/* CAEFD4 80240294 00101080 */ sll $v0, $s0, 2 -/* CAEFD8 80240298 3C06800F */ lui $a2, %hi(wPartnerHudScripts) -/* CAEFDC 8024029C 24C67F00 */ addiu $a2, $a2, %lo(wPartnerHudScripts) -/* CAEFE0 802402A0 00461021 */ addu $v0, $v0, $a2 -/* CAEFE4 802402A4 8C430000 */ lw $v1, ($v0) -/* CAEFE8 802402A8 24020001 */ addiu $v0, $zero, 1 -/* CAEFEC 802402AC AE22018C */ sw $v0, 0x18c($s1) -/* CAEFF0 802402B0 00041080 */ sll $v0, $a0, 2 -/* CAEFF4 802402B4 3C068024 */ lui $a2, %hi(flo_08_D_80241FC8_CB0D08) -/* CAEFF8 802402B8 24C61FC8 */ addiu $a2, $a2, %lo(flo_08_D_80241FC8_CB0D08) -/* CAEFFC 802402BC AE230000 */ sw $v1, ($s1) -/* CAF000 802402C0 001218C0 */ sll $v1, $s2, 3 -/* CAF004 802402C4 00431021 */ addu $v0, $v0, $v1 -/* CAF008 802402C8 00461021 */ addu $v0, $v0, $a2 -/* CAF00C 802402CC 8C420000 */ lw $v0, ($v0) -/* CAF010 802402D0 080900BF */ j .L802402FC -/* CAF014 802402D4 AE220294 */ sw $v0, 0x294($s1) -.L802402D8: -/* CAF018 802402D8 3C06800F */ lui $a2, %hi(wDisabledPartnerHudScripts) -/* CAF01C 802402DC 24C67F40 */ addiu $a2, $a2, %lo(wDisabledPartnerHudScripts) -/* CAF020 802402E0 00461021 */ addu $v0, $v0, $a2 -/* CAF024 802402E4 8C420000 */ lw $v0, ($v0) -/* CAF028 802402E8 AE20018C */ sw $zero, 0x18c($s1) -/* CAF02C 802402EC AE220000 */ sw $v0, ($s1) -/* CAF030 802402F0 8FA60010 */ lw $a2, 0x10($sp) -/* CAF034 802402F4 8CC20000 */ lw $v0, ($a2) -/* CAF038 802402F8 AE220294 */ sw $v0, 0x294($s1) -.L802402FC: -/* CAF03C 802402FC 001010C0 */ sll $v0, $s0, 3 -/* CAF040 80240300 03C21021 */ addu $v0, $fp, $v0 -/* CAF044 80240304 80420015 */ lb $v0, 0x15($v0) -/* CAF048 80240308 26D60001 */ addiu $s6, $s6, 1 -/* CAF04C 8024030C AE220210 */ sw $v0, 0x210($s1) -/* CAF050 80240310 26310004 */ addiu $s1, $s1, 4 -/* CAF054 80240314 26520001 */ addiu $s2, $s2, 1 -.L80240318: -/* CAF058 80240318 2A420008 */ slti $v0, $s2, 8 -/* CAF05C 8024031C 1440FFCB */ bnez $v0, .L8024024C -/* CAF060 80240320 26940002 */ addiu $s4, $s4, 2 -/* CAF064 80240324 0260202D */ daddu $a0, $s3, $zero -/* CAF068 80240328 24020004 */ addiu $v0, $zero, 4 -/* CAF06C 8024032C AC820318 */ sw $v0, 0x318($a0) -/* CAF070 80240330 AC960324 */ sw $s6, 0x324($a0) -/* CAF074 80240334 0C03D390 */ jal create_popup_menu -/* CAF078 80240338 AC800328 */ sw $zero, 0x328($a0) -/* CAF07C 8024033C AEA00070 */ sw $zero, 0x70($s5) -.L80240340: -/* CAF080 80240340 8EA20070 */ lw $v0, 0x70($s5) -/* CAF084 80240344 8EB30078 */ lw $s3, 0x78($s5) -/* CAF088 80240348 14400008 */ bnez $v0, .L8024036C -/* CAF08C 8024034C 24420001 */ addiu $v0, $v0, 1 -/* CAF090 80240350 8662032C */ lh $v0, 0x32c($s3) -/* CAF094 80240354 10400009 */ beqz $v0, .L8024037C -/* CAF098 80240358 AEA20074 */ sw $v0, 0x74($s5) -/* CAF09C 8024035C 0C03C4EC */ jal hide_popup_menu -/* CAF0A0 80240360 00000000 */ nop -/* CAF0A4 80240364 8EA20070 */ lw $v0, 0x70($s5) -/* CAF0A8 80240368 24420001 */ addiu $v0, $v0, 1 -.L8024036C: -/* CAF0AC 8024036C AEA20070 */ sw $v0, 0x70($s5) -/* CAF0B0 80240370 2842000F */ slti $v0, $v0, 0xf -/* CAF0B4 80240374 10400003 */ beqz $v0, .L80240384 -/* CAF0B8 80240378 00000000 */ nop -.L8024037C: -/* CAF0BC 8024037C 080900FB */ j .L802403EC -/* CAF0C0 80240380 0000102D */ daddu $v0, $zero, $zero -.L80240384: -/* CAF0C4 80240384 0C03C54E */ jal destroy_popup_menu -/* CAF0C8 80240388 00000000 */ nop -/* CAF0CC 8024038C 8EA30074 */ lw $v1, 0x74($s5) -/* CAF0D0 80240390 240200FF */ addiu $v0, $zero, 0xff -/* CAF0D4 80240394 10620010 */ beq $v1, $v0, .L802403D8 -/* CAF0D8 80240398 2462FFFF */ addiu $v0, $v1, -1 -/* CAF0DC 8024039C 00021080 */ sll $v0, $v0, 2 -/* CAF0E0 802403A0 02621021 */ addu $v0, $s3, $v0 -/* CAF0E4 802403A4 8C420108 */ lw $v0, 0x108($v0) -/* CAF0E8 802403A8 00021100 */ sll $v0, $v0, 4 -/* CAF0EC 802403AC 3C038009 */ lui $v1, %hi(gPartnerPopupProperties) -/* CAF0F0 802403B0 00621821 */ addu $v1, $v1, $v0 -/* CAF0F4 802403B4 8C63EF20 */ lw $v1, %lo(gPartnerPopupProperties)($v1) -/* CAF0F8 802403B8 8EA20074 */ lw $v0, 0x74($s5) -/* CAF0FC 802403BC 2442FFFF */ addiu $v0, $v0, -1 -/* CAF100 802403C0 00021080 */ sll $v0, $v0, 2 -/* CAF104 802403C4 02621021 */ addu $v0, $s3, $v0 -/* CAF108 802403C8 AEA30084 */ sw $v1, 0x84($s5) -/* CAF10C 802403CC 8C420108 */ lw $v0, 0x108($v0) -/* CAF110 802403D0 080900F8 */ j .L802403E0 -/* CAF114 802403D4 AEA20088 */ sw $v0, 0x88($s5) -.L802403D8: -/* CAF118 802403D8 2402FFFF */ addiu $v0, $zero, -1 -/* CAF11C 802403DC AEA20084 */ sw $v0, 0x84($s5) -.L802403E0: -/* CAF120 802403E0 0C00AB4B */ jal heap_free -/* CAF124 802403E4 8EA40078 */ lw $a0, 0x78($s5) -/* CAF128 802403E8 24020002 */ addiu $v0, $zero, 2 -.L802403EC: -/* CAF12C 802403EC 8FBF003C */ lw $ra, 0x3c($sp) -/* CAF130 802403F0 8FBE0038 */ lw $fp, 0x38($sp) -/* CAF134 802403F4 8FB70034 */ lw $s7, 0x34($sp) -/* CAF138 802403F8 8FB60030 */ lw $s6, 0x30($sp) -/* CAF13C 802403FC 8FB5002C */ lw $s5, 0x2c($sp) -/* CAF140 80240400 8FB40028 */ lw $s4, 0x28($sp) -/* CAF144 80240404 8FB30024 */ lw $s3, 0x24($sp) -/* CAF148 80240408 8FB20020 */ lw $s2, 0x20($sp) -/* CAF14C 8024040C 8FB1001C */ lw $s1, 0x1c($sp) -/* CAF150 80240410 8FB00018 */ lw $s0, 0x18($sp) -/* CAF154 80240414 03E00008 */ jr $ra -/* CAF158 80240418 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/flo_16_func_802402AC_CD20DC.s b/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/flo_16_func_802402AC_CD20DC.s deleted file mode 100644 index dc11c541f2..0000000000 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/flo_16_func_802402AC_CD20DC.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402AC_CD20DC -/* CD20DC 802402AC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* CD20E0 802402B0 AFB5002C */ sw $s5, 0x2c($sp) -/* CD20E4 802402B4 0080A82D */ daddu $s5, $a0, $zero -/* CD20E8 802402B8 AFBE0038 */ sw $fp, 0x38($sp) -/* CD20EC 802402BC 3C1E8011 */ lui $fp, %hi(gPlayerData) -/* CD20F0 802402C0 27DEF290 */ addiu $fp, $fp, %lo(gPlayerData) -/* CD20F4 802402C4 AFBF003C */ sw $ra, 0x3c($sp) -/* CD20F8 802402C8 AFB70034 */ sw $s7, 0x34($sp) -/* CD20FC 802402CC AFB60030 */ sw $s6, 0x30($sp) -/* CD2100 802402D0 AFB40028 */ sw $s4, 0x28($sp) -/* CD2104 802402D4 AFB30024 */ sw $s3, 0x24($sp) -/* CD2108 802402D8 AFB20020 */ sw $s2, 0x20($sp) -/* CD210C 802402DC AFB1001C */ sw $s1, 0x1c($sp) -/* CD2110 802402E0 10A0004F */ beqz $a1, .L80240420 -/* CD2114 802402E4 AFB00018 */ sw $s0, 0x18($sp) -/* CD2118 802402E8 0C00AB39 */ jal heap_malloc -/* CD211C 802402EC 24040330 */ addiu $a0, $zero, 0x330 -/* CD2120 802402F0 0040982D */ daddu $s3, $v0, $zero -/* CD2124 802402F4 0000B02D */ daddu $s6, $zero, $zero -/* CD2128 802402F8 02C0902D */ daddu $s2, $s6, $zero -/* CD212C 802402FC 3C148024 */ lui $s4, %hi(flo_16_D_80243708_CD5538) -/* CD2130 80240300 26943708 */ addiu $s4, $s4, %lo(flo_16_D_80243708_CD5538) -/* CD2134 80240304 0260882D */ daddu $s1, $s3, $zero -/* CD2138 80240308 8EA200B4 */ lw $v0, 0xb4($s5) -/* CD213C 8024030C 3C038024 */ lui $v1, %hi(flo_16_D_80243700_CD5530) -/* CD2140 80240310 24633700 */ addiu $v1, $v1, %lo(flo_16_D_80243700_CD5530) -/* CD2144 80240314 AEB30078 */ sw $s3, 0x78($s5) -/* CD2148 80240318 00021027 */ nor $v0, $zero, $v0 -/* CD214C 8024031C 0002BFC2 */ srl $s7, $v0, 0x1f -/* CD2150 80240320 00171080 */ sll $v0, $s7, 2 -/* CD2154 80240324 00431021 */ addu $v0, $v0, $v1 -/* CD2158 80240328 AFA20010 */ sw $v0, 0x10($sp) -.L8024032C: -/* CD215C 8024032C 86900000 */ lh $s0, ($s4) -/* CD2160 80240330 001010C0 */ sll $v0, $s0, 3 -/* CD2164 80240334 03C21021 */ addu $v0, $fp, $v0 -/* CD2168 80240338 90420014 */ lbu $v0, 0x14($v0) -/* CD216C 8024033C 5040002E */ beql $v0, $zero, .L802403F8 -/* CD2170 80240340 26520001 */ addiu $s2, $s2, 1 -/* CD2174 80240344 00101100 */ sll $v0, $s0, 4 -/* CD2178 80240348 3C068009 */ lui $a2, %hi(gPartnerPopupProperties) -/* CD217C 8024034C 24C6EF20 */ addiu $a2, $a2, %lo(gPartnerPopupProperties) -/* CD2180 80240350 00461021 */ addu $v0, $v0, $a2 -/* CD2184 80240354 0200202D */ daddu $a0, $s0, $zero -/* CD2188 80240358 AE300108 */ sw $s0, 0x108($s1) -/* CD218C 8024035C 8C420000 */ lw $v0, ($v0) -/* CD2190 80240360 02E0282D */ daddu $a1, $s7, $zero -/* CD2194 80240364 0C09006D */ jal flo_16_UnkFunc37 -/* CD2198 80240368 AE220084 */ sw $v0, 0x84($s1) -/* CD219C 8024036C 0040202D */ daddu $a0, $v0, $zero -/* CD21A0 80240370 04800011 */ bltz $a0, .L802403B8 -/* CD21A4 80240374 00101080 */ sll $v0, $s0, 2 -/* CD21A8 80240378 3C06800F */ lui $a2, %hi(wPartnerHudScripts) -/* CD21AC 8024037C 24C67F00 */ addiu $a2, $a2, %lo(wPartnerHudScripts) -/* CD21B0 80240380 00461021 */ addu $v0, $v0, $a2 -/* CD21B4 80240384 8C430000 */ lw $v1, ($v0) -/* CD21B8 80240388 24020001 */ addiu $v0, $zero, 1 -/* CD21BC 8024038C AE22018C */ sw $v0, 0x18c($s1) -/* CD21C0 80240390 00041080 */ sll $v0, $a0, 2 -/* CD21C4 80240394 3C068024 */ lui $a2, %hi(flo_16_D_80243718_CD5548) -/* CD21C8 80240398 24C63718 */ addiu $a2, $a2, %lo(flo_16_D_80243718_CD5548) -/* CD21CC 8024039C AE230000 */ sw $v1, ($s1) -/* CD21D0 802403A0 001218C0 */ sll $v1, $s2, 3 -/* CD21D4 802403A4 00431021 */ addu $v0, $v0, $v1 -/* CD21D8 802403A8 00461021 */ addu $v0, $v0, $a2 -/* CD21DC 802403AC 8C420000 */ lw $v0, ($v0) -/* CD21E0 802403B0 080900F7 */ j .L802403DC -/* CD21E4 802403B4 AE220294 */ sw $v0, 0x294($s1) -.L802403B8: -/* CD21E8 802403B8 3C06800F */ lui $a2, %hi(wDisabledPartnerHudScripts) -/* CD21EC 802403BC 24C67F40 */ addiu $a2, $a2, %lo(wDisabledPartnerHudScripts) -/* CD21F0 802403C0 00461021 */ addu $v0, $v0, $a2 -/* CD21F4 802403C4 8C420000 */ lw $v0, ($v0) -/* CD21F8 802403C8 AE20018C */ sw $zero, 0x18c($s1) -/* CD21FC 802403CC AE220000 */ sw $v0, ($s1) -/* CD2200 802403D0 8FA60010 */ lw $a2, 0x10($sp) -/* CD2204 802403D4 8CC20000 */ lw $v0, ($a2) -/* CD2208 802403D8 AE220294 */ sw $v0, 0x294($s1) -.L802403DC: -/* CD220C 802403DC 001010C0 */ sll $v0, $s0, 3 -/* CD2210 802403E0 03C21021 */ addu $v0, $fp, $v0 -/* CD2214 802403E4 80420015 */ lb $v0, 0x15($v0) -/* CD2218 802403E8 26D60001 */ addiu $s6, $s6, 1 -/* CD221C 802403EC AE220210 */ sw $v0, 0x210($s1) -/* CD2220 802403F0 26310004 */ addiu $s1, $s1, 4 -/* CD2224 802403F4 26520001 */ addiu $s2, $s2, 1 -.L802403F8: -/* CD2228 802403F8 2A420008 */ slti $v0, $s2, 8 -/* CD222C 802403FC 1440FFCB */ bnez $v0, .L8024032C -/* CD2230 80240400 26940002 */ addiu $s4, $s4, 2 -/* CD2234 80240404 0260202D */ daddu $a0, $s3, $zero -/* CD2238 80240408 24020004 */ addiu $v0, $zero, 4 -/* CD223C 8024040C AC820318 */ sw $v0, 0x318($a0) -/* CD2240 80240410 AC960324 */ sw $s6, 0x324($a0) -/* CD2244 80240414 0C03D390 */ jal create_popup_menu -/* CD2248 80240418 AC800328 */ sw $zero, 0x328($a0) -/* CD224C 8024041C AEA00070 */ sw $zero, 0x70($s5) -.L80240420: -/* CD2250 80240420 8EA20070 */ lw $v0, 0x70($s5) -/* CD2254 80240424 8EB30078 */ lw $s3, 0x78($s5) -/* CD2258 80240428 14400008 */ bnez $v0, .L8024044C -/* CD225C 8024042C 24420001 */ addiu $v0, $v0, 1 -/* CD2260 80240430 8662032C */ lh $v0, 0x32c($s3) -/* CD2264 80240434 10400009 */ beqz $v0, .L8024045C -/* CD2268 80240438 AEA20074 */ sw $v0, 0x74($s5) -/* CD226C 8024043C 0C03C4EC */ jal hide_popup_menu -/* CD2270 80240440 00000000 */ nop -/* CD2274 80240444 8EA20070 */ lw $v0, 0x70($s5) -/* CD2278 80240448 24420001 */ addiu $v0, $v0, 1 -.L8024044C: -/* CD227C 8024044C AEA20070 */ sw $v0, 0x70($s5) -/* CD2280 80240450 2842000F */ slti $v0, $v0, 0xf -/* CD2284 80240454 10400003 */ beqz $v0, .L80240464 -/* CD2288 80240458 00000000 */ nop -.L8024045C: -/* CD228C 8024045C 08090133 */ j .L802404CC -/* CD2290 80240460 0000102D */ daddu $v0, $zero, $zero -.L80240464: -/* CD2294 80240464 0C03C54E */ jal destroy_popup_menu -/* CD2298 80240468 00000000 */ nop -/* CD229C 8024046C 8EA30074 */ lw $v1, 0x74($s5) -/* CD22A0 80240470 240200FF */ addiu $v0, $zero, 0xff -/* CD22A4 80240474 10620010 */ beq $v1, $v0, .L802404B8 -/* CD22A8 80240478 2462FFFF */ addiu $v0, $v1, -1 -/* CD22AC 8024047C 00021080 */ sll $v0, $v0, 2 -/* CD22B0 80240480 02621021 */ addu $v0, $s3, $v0 -/* CD22B4 80240484 8C420108 */ lw $v0, 0x108($v0) -/* CD22B8 80240488 00021100 */ sll $v0, $v0, 4 -/* CD22BC 8024048C 3C038009 */ lui $v1, %hi(gPartnerPopupProperties) -/* CD22C0 80240490 00621821 */ addu $v1, $v1, $v0 -/* CD22C4 80240494 8C63EF20 */ lw $v1, %lo(gPartnerPopupProperties)($v1) -/* CD22C8 80240498 8EA20074 */ lw $v0, 0x74($s5) -/* CD22CC 8024049C 2442FFFF */ addiu $v0, $v0, -1 -/* CD22D0 802404A0 00021080 */ sll $v0, $v0, 2 -/* CD22D4 802404A4 02621021 */ addu $v0, $s3, $v0 -/* CD22D8 802404A8 AEA30084 */ sw $v1, 0x84($s5) -/* CD22DC 802404AC 8C420108 */ lw $v0, 0x108($v0) -/* CD22E0 802404B0 08090130 */ j .L802404C0 -/* CD22E4 802404B4 AEA20088 */ sw $v0, 0x88($s5) -.L802404B8: -/* CD22E8 802404B8 2402FFFF */ addiu $v0, $zero, -1 -/* CD22EC 802404BC AEA20084 */ sw $v0, 0x84($s5) -.L802404C0: -/* CD22F0 802404C0 0C00AB4B */ jal heap_free -/* CD22F4 802404C4 8EA40078 */ lw $a0, 0x78($s5) -/* CD22F8 802404C8 24020002 */ addiu $v0, $zero, 2 -.L802404CC: -/* CD22FC 802404CC 8FBF003C */ lw $ra, 0x3c($sp) -/* CD2300 802404D0 8FBE0038 */ lw $fp, 0x38($sp) -/* CD2304 802404D4 8FB70034 */ lw $s7, 0x34($sp) -/* CD2308 802404D8 8FB60030 */ lw $s6, 0x30($sp) -/* CD230C 802404DC 8FB5002C */ lw $s5, 0x2c($sp) -/* CD2310 802404E0 8FB40028 */ lw $s4, 0x28($sp) -/* CD2314 802404E4 8FB30024 */ lw $s3, 0x24($sp) -/* CD2318 802404E8 8FB20020 */ lw $s2, 0x20($sp) -/* CD231C 802404EC 8FB1001C */ lw $s1, 0x1c($sp) -/* CD2320 802404F0 8FB00018 */ lw $s0, 0x18($sp) -/* CD2324 802404F4 03E00008 */ jr $ra -/* CD2328 802404F8 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_8024003C_988B9C.s b/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_8024003C_988B9C.s deleted file mode 100644 index 2472d96099..0000000000 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_8024003C_988B9C.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024003C_988B9C -/* 988B9C 8024003C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 988BA0 80240040 AFBF0010 */ sw $ra, 0x10($sp) -/* 988BA4 80240044 8C82000C */ lw $v0, 0xc($a0) -/* 988BA8 80240048 0C0B1EAF */ jal evt_get_variable -/* 988BAC 8024004C 8C450000 */ lw $a1, ($v0) -/* 988BB0 80240050 0C0B95A4 */ jal entity_upgrade_block_hide_content -/* 988BB4 80240054 0040202D */ daddu $a0, $v0, $zero -/* 988BB8 80240058 8FBF0010 */ lw $ra, 0x10($sp) -/* 988BBC 8024005C 24020002 */ addiu $v0, $zero, 2 -/* 988BC0 80240060 03E00008 */ jr $ra -/* 988BC4 80240064 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_802401CC_988D2C.s b/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_802401CC_988D2C.s deleted file mode 100644 index 52fc07b3ef..0000000000 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_802401CC_988D2C.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401CC_988D2C -/* 988D2C 802401CC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 988D30 802401D0 AFB5002C */ sw $s5, 0x2c($sp) -/* 988D34 802401D4 0080A82D */ daddu $s5, $a0, $zero -/* 988D38 802401D8 AFBE0038 */ sw $fp, 0x38($sp) -/* 988D3C 802401DC 3C1E8011 */ lui $fp, %hi(gPlayerData) -/* 988D40 802401E0 27DEF290 */ addiu $fp, $fp, %lo(gPlayerData) -/* 988D44 802401E4 AFBF003C */ sw $ra, 0x3c($sp) -/* 988D48 802401E8 AFB70034 */ sw $s7, 0x34($sp) -/* 988D4C 802401EC AFB60030 */ sw $s6, 0x30($sp) -/* 988D50 802401F0 AFB40028 */ sw $s4, 0x28($sp) -/* 988D54 802401F4 AFB30024 */ sw $s3, 0x24($sp) -/* 988D58 802401F8 AFB20020 */ sw $s2, 0x20($sp) -/* 988D5C 802401FC AFB1001C */ sw $s1, 0x1c($sp) -/* 988D60 80240200 10A0004F */ beqz $a1, .L80240340 -/* 988D64 80240204 AFB00018 */ sw $s0, 0x18($sp) -/* 988D68 80240208 0C00AB39 */ jal heap_malloc -/* 988D6C 8024020C 24040330 */ addiu $a0, $zero, 0x330 -/* 988D70 80240210 0040982D */ daddu $s3, $v0, $zero -/* 988D74 80240214 0000B02D */ daddu $s6, $zero, $zero -/* 988D78 80240218 02C0902D */ daddu $s2, $s6, $zero -/* 988D7C 8024021C 3C148024 */ lui $s4, %hi(D_80241108_989C68) -/* 988D80 80240220 26941108 */ addiu $s4, $s4, %lo(D_80241108_989C68) -/* 988D84 80240224 0260882D */ daddu $s1, $s3, $zero -/* 988D88 80240228 8EA200B4 */ lw $v0, 0xb4($s5) -/* 988D8C 8024022C 3C038024 */ lui $v1, %hi(D_80241100_989C60) -/* 988D90 80240230 24631100 */ addiu $v1, $v1, %lo(D_80241100_989C60) -/* 988D94 80240234 AEB30078 */ sw $s3, 0x78($s5) -/* 988D98 80240238 00021027 */ nor $v0, $zero, $v0 -/* 988D9C 8024023C 0002BFC2 */ srl $s7, $v0, 0x1f -/* 988DA0 80240240 00171080 */ sll $v0, $s7, 2 -/* 988DA4 80240244 00431021 */ addu $v0, $v0, $v1 -/* 988DA8 80240248 AFA20010 */ sw $v0, 0x10($sp) -.L8024024C: -/* 988DAC 8024024C 86900000 */ lh $s0, ($s4) -/* 988DB0 80240250 001010C0 */ sll $v0, $s0, 3 -/* 988DB4 80240254 03C21021 */ addu $v0, $fp, $v0 -/* 988DB8 80240258 90420014 */ lbu $v0, 0x14($v0) -/* 988DBC 8024025C 5040002E */ beql $v0, $zero, .L80240318 -/* 988DC0 80240260 26520001 */ addiu $s2, $s2, 1 -/* 988DC4 80240264 00101100 */ sll $v0, $s0, 4 -/* 988DC8 80240268 3C068009 */ lui $a2, %hi(gPartnerPopupProperties) -/* 988DCC 8024026C 24C6EF20 */ addiu $a2, $a2, %lo(gPartnerPopupProperties) -/* 988DD0 80240270 00461021 */ addu $v0, $v0, $a2 -/* 988DD4 80240274 0200202D */ daddu $a0, $s0, $zero -/* 988DD8 80240278 AE300108 */ sw $s0, 0x108($s1) -/* 988DDC 8024027C 8C420000 */ lw $v0, ($v0) -/* 988DE0 80240280 02E0282D */ daddu $a1, $s7, $zero -/* 988DE4 80240284 0C090035 */ jal isk_10_UnkFunc37 -/* 988DE8 80240288 AE220084 */ sw $v0, 0x84($s1) -/* 988DEC 8024028C 0040202D */ daddu $a0, $v0, $zero -/* 988DF0 80240290 04800011 */ bltz $a0, .L802402D8 -/* 988DF4 80240294 00101080 */ sll $v0, $s0, 2 -/* 988DF8 80240298 3C06800F */ lui $a2, %hi(wPartnerHudScripts) -/* 988DFC 8024029C 24C67F00 */ addiu $a2, $a2, %lo(wPartnerHudScripts) -/* 988E00 802402A0 00461021 */ addu $v0, $v0, $a2 -/* 988E04 802402A4 8C430000 */ lw $v1, ($v0) -/* 988E08 802402A8 24020001 */ addiu $v0, $zero, 1 -/* 988E0C 802402AC AE22018C */ sw $v0, 0x18c($s1) -/* 988E10 802402B0 00041080 */ sll $v0, $a0, 2 -/* 988E14 802402B4 3C068024 */ lui $a2, %hi(D_80241118_989C78) -/* 988E18 802402B8 24C61118 */ addiu $a2, $a2, %lo(D_80241118_989C78) -/* 988E1C 802402BC AE230000 */ sw $v1, ($s1) -/* 988E20 802402C0 001218C0 */ sll $v1, $s2, 3 -/* 988E24 802402C4 00431021 */ addu $v0, $v0, $v1 -/* 988E28 802402C8 00461021 */ addu $v0, $v0, $a2 -/* 988E2C 802402CC 8C420000 */ lw $v0, ($v0) -/* 988E30 802402D0 080900BF */ j .L802402FC -/* 988E34 802402D4 AE220294 */ sw $v0, 0x294($s1) -.L802402D8: -/* 988E38 802402D8 3C06800F */ lui $a2, %hi(wDisabledPartnerHudScripts) -/* 988E3C 802402DC 24C67F40 */ addiu $a2, $a2, %lo(wDisabledPartnerHudScripts) -/* 988E40 802402E0 00461021 */ addu $v0, $v0, $a2 -/* 988E44 802402E4 8C420000 */ lw $v0, ($v0) -/* 988E48 802402E8 AE20018C */ sw $zero, 0x18c($s1) -/* 988E4C 802402EC AE220000 */ sw $v0, ($s1) -/* 988E50 802402F0 8FA60010 */ lw $a2, 0x10($sp) -/* 988E54 802402F4 8CC20000 */ lw $v0, ($a2) -/* 988E58 802402F8 AE220294 */ sw $v0, 0x294($s1) -.L802402FC: -/* 988E5C 802402FC 001010C0 */ sll $v0, $s0, 3 -/* 988E60 80240300 03C21021 */ addu $v0, $fp, $v0 -/* 988E64 80240304 80420015 */ lb $v0, 0x15($v0) -/* 988E68 80240308 26D60001 */ addiu $s6, $s6, 1 -/* 988E6C 8024030C AE220210 */ sw $v0, 0x210($s1) -/* 988E70 80240310 26310004 */ addiu $s1, $s1, 4 -/* 988E74 80240314 26520001 */ addiu $s2, $s2, 1 -.L80240318: -/* 988E78 80240318 2A420008 */ slti $v0, $s2, 8 -/* 988E7C 8024031C 1440FFCB */ bnez $v0, .L8024024C -/* 988E80 80240320 26940002 */ addiu $s4, $s4, 2 -/* 988E84 80240324 0260202D */ daddu $a0, $s3, $zero -/* 988E88 80240328 24020004 */ addiu $v0, $zero, 4 -/* 988E8C 8024032C AC820318 */ sw $v0, 0x318($a0) -/* 988E90 80240330 AC960324 */ sw $s6, 0x324($a0) -/* 988E94 80240334 0C03D390 */ jal create_popup_menu -/* 988E98 80240338 AC800328 */ sw $zero, 0x328($a0) -/* 988E9C 8024033C AEA00070 */ sw $zero, 0x70($s5) -.L80240340: -/* 988EA0 80240340 8EA20070 */ lw $v0, 0x70($s5) -/* 988EA4 80240344 8EB30078 */ lw $s3, 0x78($s5) -/* 988EA8 80240348 14400008 */ bnez $v0, .L8024036C -/* 988EAC 8024034C 24420001 */ addiu $v0, $v0, 1 -/* 988EB0 80240350 8662032C */ lh $v0, 0x32c($s3) -/* 988EB4 80240354 10400009 */ beqz $v0, .L8024037C -/* 988EB8 80240358 AEA20074 */ sw $v0, 0x74($s5) -/* 988EBC 8024035C 0C03C4EC */ jal hide_popup_menu -/* 988EC0 80240360 00000000 */ nop -/* 988EC4 80240364 8EA20070 */ lw $v0, 0x70($s5) -/* 988EC8 80240368 24420001 */ addiu $v0, $v0, 1 -.L8024036C: -/* 988ECC 8024036C AEA20070 */ sw $v0, 0x70($s5) -/* 988ED0 80240370 2842000F */ slti $v0, $v0, 0xf -/* 988ED4 80240374 10400003 */ beqz $v0, .L80240384 -/* 988ED8 80240378 00000000 */ nop -.L8024037C: -/* 988EDC 8024037C 080900FB */ j .L802403EC -/* 988EE0 80240380 0000102D */ daddu $v0, $zero, $zero -.L80240384: -/* 988EE4 80240384 0C03C54E */ jal destroy_popup_menu -/* 988EE8 80240388 00000000 */ nop -/* 988EEC 8024038C 8EA30074 */ lw $v1, 0x74($s5) -/* 988EF0 80240390 240200FF */ addiu $v0, $zero, 0xff -/* 988EF4 80240394 10620010 */ beq $v1, $v0, .L802403D8 -/* 988EF8 80240398 2462FFFF */ addiu $v0, $v1, -1 -/* 988EFC 8024039C 00021080 */ sll $v0, $v0, 2 -/* 988F00 802403A0 02621021 */ addu $v0, $s3, $v0 -/* 988F04 802403A4 8C420108 */ lw $v0, 0x108($v0) -/* 988F08 802403A8 00021100 */ sll $v0, $v0, 4 -/* 988F0C 802403AC 3C038009 */ lui $v1, %hi(gPartnerPopupProperties) -/* 988F10 802403B0 00621821 */ addu $v1, $v1, $v0 -/* 988F14 802403B4 8C63EF20 */ lw $v1, %lo(gPartnerPopupProperties)($v1) -/* 988F18 802403B8 8EA20074 */ lw $v0, 0x74($s5) -/* 988F1C 802403BC 2442FFFF */ addiu $v0, $v0, -1 -/* 988F20 802403C0 00021080 */ sll $v0, $v0, 2 -/* 988F24 802403C4 02621021 */ addu $v0, $s3, $v0 -/* 988F28 802403C8 AEA30084 */ sw $v1, 0x84($s5) -/* 988F2C 802403CC 8C420108 */ lw $v0, 0x108($v0) -/* 988F30 802403D0 080900F8 */ j .L802403E0 -/* 988F34 802403D4 AEA20088 */ sw $v0, 0x88($s5) -.L802403D8: -/* 988F38 802403D8 2402FFFF */ addiu $v0, $zero, -1 -/* 988F3C 802403DC AEA20084 */ sw $v0, 0x84($s5) -.L802403E0: -/* 988F40 802403E0 0C00AB4B */ jal heap_free -/* 988F44 802403E4 8EA40078 */ lw $a0, 0x78($s5) -/* 988F48 802403E8 24020002 */ addiu $v0, $zero, 2 -.L802403EC: -/* 988F4C 802403EC 8FBF003C */ lw $ra, 0x3c($sp) -/* 988F50 802403F0 8FBE0038 */ lw $fp, 0x38($sp) -/* 988F54 802403F4 8FB70034 */ lw $s7, 0x34($sp) -/* 988F58 802403F8 8FB60030 */ lw $s6, 0x30($sp) -/* 988F5C 802403FC 8FB5002C */ lw $s5, 0x2c($sp) -/* 988F60 80240400 8FB40028 */ lw $s4, 0x28($sp) -/* 988F64 80240404 8FB30024 */ lw $s3, 0x24($sp) -/* 988F68 80240408 8FB20020 */ lw $s2, 0x20($sp) -/* 988F6C 8024040C 8FB1001C */ lw $s1, 0x1c($sp) -/* 988F70 80240410 8FB00018 */ lw $s0, 0x18($sp) -/* 988F74 80240414 03E00008 */ jr $ra -/* 988F78 80240418 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_8024032C_91E89C.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_8024032C_91E89C.s deleted file mode 100644 index bd693f01bd..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_8024032C_91E89C.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024032C_91E89C -/* 91E89C 8024032C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 91E8A0 80240330 AFBF0010 */ sw $ra, 0x10($sp) -/* 91E8A4 80240334 8C82000C */ lw $v0, 0xc($a0) -/* 91E8A8 80240338 0C0B1EAF */ jal evt_get_variable -/* 91E8AC 8024033C 8C450000 */ lw $a1, ($v0) -/* 91E8B0 80240340 0C0B95A4 */ jal entity_upgrade_block_hide_content -/* 91E8B4 80240344 0040202D */ daddu $a0, $v0, $zero -/* 91E8B8 80240348 8FBF0010 */ lw $ra, 0x10($sp) -/* 91E8BC 8024034C 24020002 */ addiu $v0, $zero, 2 -/* 91E8C0 80240350 03E00008 */ jr $ra -/* 91E8C4 80240354 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_802404BC_91EA2C.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_802404BC_91EA2C.s deleted file mode 100644 index d59fc0fd33..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_802404BC_91EA2C.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404BC_91EA2C -/* 91EA2C 802404BC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 91EA30 802404C0 AFB5002C */ sw $s5, 0x2c($sp) -/* 91EA34 802404C4 0080A82D */ daddu $s5, $a0, $zero -/* 91EA38 802404C8 AFBE0038 */ sw $fp, 0x38($sp) -/* 91EA3C 802404CC 3C1E8011 */ lui $fp, %hi(gPlayerData) -/* 91EA40 802404D0 27DEF290 */ addiu $fp, $fp, %lo(gPlayerData) -/* 91EA44 802404D4 AFBF003C */ sw $ra, 0x3c($sp) -/* 91EA48 802404D8 AFB70034 */ sw $s7, 0x34($sp) -/* 91EA4C 802404DC AFB60030 */ sw $s6, 0x30($sp) -/* 91EA50 802404E0 AFB40028 */ sw $s4, 0x28($sp) -/* 91EA54 802404E4 AFB30024 */ sw $s3, 0x24($sp) -/* 91EA58 802404E8 AFB20020 */ sw $s2, 0x20($sp) -/* 91EA5C 802404EC AFB1001C */ sw $s1, 0x1c($sp) -/* 91EA60 802404F0 10A0004F */ beqz $a1, .L80240630 -/* 91EA64 802404F4 AFB00018 */ sw $s0, 0x18($sp) -/* 91EA68 802404F8 0C00AB39 */ jal heap_malloc -/* 91EA6C 802404FC 24040330 */ addiu $a0, $zero, 0x330 -/* 91EA70 80240500 0040982D */ daddu $s3, $v0, $zero -/* 91EA74 80240504 0000B02D */ daddu $s6, $zero, $zero -/* 91EA78 80240508 02C0902D */ daddu $s2, $s6, $zero -/* 91EA7C 8024050C 3C148024 */ lui $s4, %hi(D_80245A68_923FD8) -/* 91EA80 80240510 26945A68 */ addiu $s4, $s4, %lo(D_80245A68_923FD8) -/* 91EA84 80240514 0260882D */ daddu $s1, $s3, $zero -/* 91EA88 80240518 8EA200B4 */ lw $v0, 0xb4($s5) -/* 91EA8C 8024051C 3C038024 */ lui $v1, %hi(D_80245A60_923FD0) -/* 91EA90 80240520 24635A60 */ addiu $v1, $v1, %lo(D_80245A60_923FD0) -/* 91EA94 80240524 AEB30078 */ sw $s3, 0x78($s5) -/* 91EA98 80240528 00021027 */ nor $v0, $zero, $v0 -/* 91EA9C 8024052C 0002BFC2 */ srl $s7, $v0, 0x1f -/* 91EAA0 80240530 00171080 */ sll $v0, $s7, 2 -/* 91EAA4 80240534 00431021 */ addu $v0, $v0, $v1 -/* 91EAA8 80240538 AFA20010 */ sw $v0, 0x10($sp) -.L8024053C: -/* 91EAAC 8024053C 86900000 */ lh $s0, ($s4) -/* 91EAB0 80240540 001010C0 */ sll $v0, $s0, 3 -/* 91EAB4 80240544 03C21021 */ addu $v0, $fp, $v0 -/* 91EAB8 80240548 90420014 */ lbu $v0, 0x14($v0) -/* 91EABC 8024054C 5040002E */ beql $v0, $zero, .L80240608 -/* 91EAC0 80240550 26520001 */ addiu $s2, $s2, 1 -/* 91EAC4 80240554 00101100 */ sll $v0, $s0, 4 -/* 91EAC8 80240558 3C068009 */ lui $a2, %hi(gPartnerPopupProperties) -/* 91EACC 8024055C 24C6EF20 */ addiu $a2, $a2, %lo(gPartnerPopupProperties) -/* 91EAD0 80240560 00461021 */ addu $v0, $v0, $a2 -/* 91EAD4 80240564 0200202D */ daddu $a0, $s0, $zero -/* 91EAD8 80240568 AE300108 */ sw $s0, 0x108($s1) -/* 91EADC 8024056C 8C420000 */ lw $v0, ($v0) -/* 91EAE0 80240570 02E0282D */ daddu $a1, $s7, $zero -/* 91EAE4 80240574 0C0900F1 */ jal iwa_10_UnkFunc37 -/* 91EAE8 80240578 AE220084 */ sw $v0, 0x84($s1) -/* 91EAEC 8024057C 0040202D */ daddu $a0, $v0, $zero -/* 91EAF0 80240580 04800011 */ bltz $a0, .L802405C8 -/* 91EAF4 80240584 00101080 */ sll $v0, $s0, 2 -/* 91EAF8 80240588 3C06800F */ lui $a2, %hi(wPartnerHudScripts) -/* 91EAFC 8024058C 24C67F00 */ addiu $a2, $a2, %lo(wPartnerHudScripts) -/* 91EB00 80240590 00461021 */ addu $v0, $v0, $a2 -/* 91EB04 80240594 8C430000 */ lw $v1, ($v0) -/* 91EB08 80240598 24020001 */ addiu $v0, $zero, 1 -/* 91EB0C 8024059C AE22018C */ sw $v0, 0x18c($s1) -/* 91EB10 802405A0 00041080 */ sll $v0, $a0, 2 -/* 91EB14 802405A4 3C068024 */ lui $a2, %hi(D_80245A78_923FE8) -/* 91EB18 802405A8 24C65A78 */ addiu $a2, $a2, %lo(D_80245A78_923FE8) -/* 91EB1C 802405AC AE230000 */ sw $v1, ($s1) -/* 91EB20 802405B0 001218C0 */ sll $v1, $s2, 3 -/* 91EB24 802405B4 00431021 */ addu $v0, $v0, $v1 -/* 91EB28 802405B8 00461021 */ addu $v0, $v0, $a2 -/* 91EB2C 802405BC 8C420000 */ lw $v0, ($v0) -/* 91EB30 802405C0 0809017B */ j .L802405EC -/* 91EB34 802405C4 AE220294 */ sw $v0, 0x294($s1) -.L802405C8: -/* 91EB38 802405C8 3C06800F */ lui $a2, %hi(wDisabledPartnerHudScripts) -/* 91EB3C 802405CC 24C67F40 */ addiu $a2, $a2, %lo(wDisabledPartnerHudScripts) -/* 91EB40 802405D0 00461021 */ addu $v0, $v0, $a2 -/* 91EB44 802405D4 8C420000 */ lw $v0, ($v0) -/* 91EB48 802405D8 AE20018C */ sw $zero, 0x18c($s1) -/* 91EB4C 802405DC AE220000 */ sw $v0, ($s1) -/* 91EB50 802405E0 8FA60010 */ lw $a2, 0x10($sp) -/* 91EB54 802405E4 8CC20000 */ lw $v0, ($a2) -/* 91EB58 802405E8 AE220294 */ sw $v0, 0x294($s1) -.L802405EC: -/* 91EB5C 802405EC 001010C0 */ sll $v0, $s0, 3 -/* 91EB60 802405F0 03C21021 */ addu $v0, $fp, $v0 -/* 91EB64 802405F4 80420015 */ lb $v0, 0x15($v0) -/* 91EB68 802405F8 26D60001 */ addiu $s6, $s6, 1 -/* 91EB6C 802405FC AE220210 */ sw $v0, 0x210($s1) -/* 91EB70 80240600 26310004 */ addiu $s1, $s1, 4 -/* 91EB74 80240604 26520001 */ addiu $s2, $s2, 1 -.L80240608: -/* 91EB78 80240608 2A420008 */ slti $v0, $s2, 8 -/* 91EB7C 8024060C 1440FFCB */ bnez $v0, .L8024053C -/* 91EB80 80240610 26940002 */ addiu $s4, $s4, 2 -/* 91EB84 80240614 0260202D */ daddu $a0, $s3, $zero -/* 91EB88 80240618 24020004 */ addiu $v0, $zero, 4 -/* 91EB8C 8024061C AC820318 */ sw $v0, 0x318($a0) -/* 91EB90 80240620 AC960324 */ sw $s6, 0x324($a0) -/* 91EB94 80240624 0C03D390 */ jal create_popup_menu -/* 91EB98 80240628 AC800328 */ sw $zero, 0x328($a0) -/* 91EB9C 8024062C AEA00070 */ sw $zero, 0x70($s5) -.L80240630: -/* 91EBA0 80240630 8EA20070 */ lw $v0, 0x70($s5) -/* 91EBA4 80240634 8EB30078 */ lw $s3, 0x78($s5) -/* 91EBA8 80240638 14400008 */ bnez $v0, .L8024065C -/* 91EBAC 8024063C 24420001 */ addiu $v0, $v0, 1 -/* 91EBB0 80240640 8662032C */ lh $v0, 0x32c($s3) -/* 91EBB4 80240644 10400009 */ beqz $v0, .L8024066C -/* 91EBB8 80240648 AEA20074 */ sw $v0, 0x74($s5) -/* 91EBBC 8024064C 0C03C4EC */ jal hide_popup_menu -/* 91EBC0 80240650 00000000 */ nop -/* 91EBC4 80240654 8EA20070 */ lw $v0, 0x70($s5) -/* 91EBC8 80240658 24420001 */ addiu $v0, $v0, 1 -.L8024065C: -/* 91EBCC 8024065C AEA20070 */ sw $v0, 0x70($s5) -/* 91EBD0 80240660 2842000F */ slti $v0, $v0, 0xf -/* 91EBD4 80240664 10400003 */ beqz $v0, .L80240674 -/* 91EBD8 80240668 00000000 */ nop -.L8024066C: -/* 91EBDC 8024066C 080901B7 */ j .L802406DC -/* 91EBE0 80240670 0000102D */ daddu $v0, $zero, $zero -.L80240674: -/* 91EBE4 80240674 0C03C54E */ jal destroy_popup_menu -/* 91EBE8 80240678 00000000 */ nop -/* 91EBEC 8024067C 8EA30074 */ lw $v1, 0x74($s5) -/* 91EBF0 80240680 240200FF */ addiu $v0, $zero, 0xff -/* 91EBF4 80240684 10620010 */ beq $v1, $v0, .L802406C8 -/* 91EBF8 80240688 2462FFFF */ addiu $v0, $v1, -1 -/* 91EBFC 8024068C 00021080 */ sll $v0, $v0, 2 -/* 91EC00 80240690 02621021 */ addu $v0, $s3, $v0 -/* 91EC04 80240694 8C420108 */ lw $v0, 0x108($v0) -/* 91EC08 80240698 00021100 */ sll $v0, $v0, 4 -/* 91EC0C 8024069C 3C038009 */ lui $v1, %hi(gPartnerPopupProperties) -/* 91EC10 802406A0 00621821 */ addu $v1, $v1, $v0 -/* 91EC14 802406A4 8C63EF20 */ lw $v1, %lo(gPartnerPopupProperties)($v1) -/* 91EC18 802406A8 8EA20074 */ lw $v0, 0x74($s5) -/* 91EC1C 802406AC 2442FFFF */ addiu $v0, $v0, -1 -/* 91EC20 802406B0 00021080 */ sll $v0, $v0, 2 -/* 91EC24 802406B4 02621021 */ addu $v0, $s3, $v0 -/* 91EC28 802406B8 AEA30084 */ sw $v1, 0x84($s5) -/* 91EC2C 802406BC 8C420108 */ lw $v0, 0x108($v0) -/* 91EC30 802406C0 080901B4 */ j .L802406D0 -/* 91EC34 802406C4 AEA20088 */ sw $v0, 0x88($s5) -.L802406C8: -/* 91EC38 802406C8 2402FFFF */ addiu $v0, $zero, -1 -/* 91EC3C 802406CC AEA20084 */ sw $v0, 0x84($s5) -.L802406D0: -/* 91EC40 802406D0 0C00AB4B */ jal heap_free -/* 91EC44 802406D4 8EA40078 */ lw $a0, 0x78($s5) -/* 91EC48 802406D8 24020002 */ addiu $v0, $zero, 2 -.L802406DC: -/* 91EC4C 802406DC 8FBF003C */ lw $ra, 0x3c($sp) -/* 91EC50 802406E0 8FBE0038 */ lw $fp, 0x38($sp) -/* 91EC54 802406E4 8FB70034 */ lw $s7, 0x34($sp) -/* 91EC58 802406E8 8FB60030 */ lw $s6, 0x30($sp) -/* 91EC5C 802406EC 8FB5002C */ lw $s5, 0x2c($sp) -/* 91EC60 802406F0 8FB40028 */ lw $s4, 0x28($sp) -/* 91EC64 802406F4 8FB30024 */ lw $s3, 0x24($sp) -/* 91EC68 802406F8 8FB20020 */ lw $s2, 0x20($sp) -/* 91EC6C 802406FC 8FB1001C */ lw $s1, 0x1c($sp) -/* 91EC70 80240700 8FB00018 */ lw $s0, 0x18($sp) -/* 91EC74 80240704 03E00008 */ jr $ra -/* 91EC78 80240708 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_8024069C_B5E94C.s b/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_8024069C_B5E94C.s deleted file mode 100644 index 077e57f2ce..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_8024069C_B5E94C.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024069C_B5E94C -/* B5E94C 8024069C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B5E950 802406A0 AFBF0010 */ sw $ra, 0x10($sp) -/* B5E954 802406A4 8C82000C */ lw $v0, 0xc($a0) -/* B5E958 802406A8 0C0B1EAF */ jal evt_get_variable -/* B5E95C 802406AC 8C450000 */ lw $a1, ($v0) -/* B5E960 802406B0 0C0B95A4 */ jal entity_upgrade_block_hide_content -/* B5E964 802406B4 0040202D */ daddu $a0, $v0, $zero -/* B5E968 802406B8 8FBF0010 */ lw $ra, 0x10($sp) -/* B5E96C 802406BC 24020002 */ addiu $v0, $zero, 2 -/* B5E970 802406C0 03E00008 */ jr $ra -/* B5E974 802406C4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_8024082C_B5EADC.s b/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_8024082C_B5EADC.s deleted file mode 100644 index f24f6f8ed9..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_8024082C_B5EADC.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024082C_B5EADC -/* B5EADC 8024082C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* B5EAE0 80240830 AFB5002C */ sw $s5, 0x2c($sp) -/* B5EAE4 80240834 0080A82D */ daddu $s5, $a0, $zero -/* B5EAE8 80240838 AFBE0038 */ sw $fp, 0x38($sp) -/* B5EAEC 8024083C 3C1E8011 */ lui $fp, %hi(gPlayerData) -/* B5EAF0 80240840 27DEF290 */ addiu $fp, $fp, %lo(gPlayerData) -/* B5EAF4 80240844 AFBF003C */ sw $ra, 0x3c($sp) -/* B5EAF8 80240848 AFB70034 */ sw $s7, 0x34($sp) -/* B5EAFC 8024084C AFB60030 */ sw $s6, 0x30($sp) -/* B5EB00 80240850 AFB40028 */ sw $s4, 0x28($sp) -/* B5EB04 80240854 AFB30024 */ sw $s3, 0x24($sp) -/* B5EB08 80240858 AFB20020 */ sw $s2, 0x20($sp) -/* B5EB0C 8024085C AFB1001C */ sw $s1, 0x1c($sp) -/* B5EB10 80240860 10A0004F */ beqz $a1, .L802409A0 -/* B5EB14 80240864 AFB00018 */ sw $s0, 0x18($sp) -/* B5EB18 80240868 0C00AB39 */ jal heap_malloc -/* B5EB1C 8024086C 24040330 */ addiu $a0, $zero, 0x330 -/* B5EB20 80240870 0040982D */ daddu $s3, $v0, $zero -/* B5EB24 80240874 0000B02D */ daddu $s6, $zero, $zero -/* B5EB28 80240878 02C0902D */ daddu $s2, $s6, $zero -/* B5EB2C 8024087C 3C148024 */ lui $s4, %hi(D_80243E08_B620B8) -/* B5EB30 80240880 26943E08 */ addiu $s4, $s4, %lo(D_80243E08_B620B8) -/* B5EB34 80240884 0260882D */ daddu $s1, $s3, $zero -/* B5EB38 80240888 8EA200B4 */ lw $v0, 0xb4($s5) -/* B5EB3C 8024088C 3C038024 */ lui $v1, %hi(D_80243E00_B620B0) -/* B5EB40 80240890 24633E00 */ addiu $v1, $v1, %lo(D_80243E00_B620B0) -/* B5EB44 80240894 AEB30078 */ sw $s3, 0x78($s5) -/* B5EB48 80240898 00021027 */ nor $v0, $zero, $v0 -/* B5EB4C 8024089C 0002BFC2 */ srl $s7, $v0, 0x1f -/* B5EB50 802408A0 00171080 */ sll $v0, $s7, 2 -/* B5EB54 802408A4 00431021 */ addu $v0, $v0, $v1 -/* B5EB58 802408A8 AFA20010 */ sw $v0, 0x10($sp) -.L802408AC: -/* B5EB5C 802408AC 86900000 */ lh $s0, ($s4) -/* B5EB60 802408B0 001010C0 */ sll $v0, $s0, 3 -/* B5EB64 802408B4 03C21021 */ addu $v0, $fp, $v0 -/* B5EB68 802408B8 90420014 */ lbu $v0, 0x14($v0) -/* B5EB6C 802408BC 5040002E */ beql $v0, $zero, .L80240978 -/* B5EB70 802408C0 26520001 */ addiu $s2, $s2, 1 -/* B5EB74 802408C4 00101100 */ sll $v0, $s0, 4 -/* B5EB78 802408C8 3C068009 */ lui $a2, %hi(gPartnerPopupProperties) -/* B5EB7C 802408CC 24C6EF20 */ addiu $a2, $a2, %lo(gPartnerPopupProperties) -/* B5EB80 802408D0 00461021 */ addu $v0, $v0, $a2 -/* B5EB84 802408D4 0200202D */ daddu $a0, $s0, $zero -/* B5EB88 802408D8 AE300108 */ sw $s0, 0x108($s1) -/* B5EB8C 802408DC 8C420000 */ lw $v0, ($v0) -/* B5EB90 802408E0 02E0282D */ daddu $a1, $s7, $zero -/* B5EB94 802408E4 0C0901CD */ jal jan_08_UnkFunc37 -/* B5EB98 802408E8 AE220084 */ sw $v0, 0x84($s1) -/* B5EB9C 802408EC 0040202D */ daddu $a0, $v0, $zero -/* B5EBA0 802408F0 04800011 */ bltz $a0, .L80240938 -/* B5EBA4 802408F4 00101080 */ sll $v0, $s0, 2 -/* B5EBA8 802408F8 3C06800F */ lui $a2, %hi(wPartnerHudScripts) -/* B5EBAC 802408FC 24C67F00 */ addiu $a2, $a2, %lo(wPartnerHudScripts) -/* B5EBB0 80240900 00461021 */ addu $v0, $v0, $a2 -/* B5EBB4 80240904 8C430000 */ lw $v1, ($v0) -/* B5EBB8 80240908 24020001 */ addiu $v0, $zero, 1 -/* B5EBBC 8024090C AE22018C */ sw $v0, 0x18c($s1) -/* B5EBC0 80240910 00041080 */ sll $v0, $a0, 2 -/* B5EBC4 80240914 3C068024 */ lui $a2, %hi(D_80243E18_B620C8) -/* B5EBC8 80240918 24C63E18 */ addiu $a2, $a2, %lo(D_80243E18_B620C8) -/* B5EBCC 8024091C AE230000 */ sw $v1, ($s1) -/* B5EBD0 80240920 001218C0 */ sll $v1, $s2, 3 -/* B5EBD4 80240924 00431021 */ addu $v0, $v0, $v1 -/* B5EBD8 80240928 00461021 */ addu $v0, $v0, $a2 -/* B5EBDC 8024092C 8C420000 */ lw $v0, ($v0) -/* B5EBE0 80240930 08090257 */ j .L8024095C -/* B5EBE4 80240934 AE220294 */ sw $v0, 0x294($s1) -.L80240938: -/* B5EBE8 80240938 3C06800F */ lui $a2, %hi(wDisabledPartnerHudScripts) -/* B5EBEC 8024093C 24C67F40 */ addiu $a2, $a2, %lo(wDisabledPartnerHudScripts) -/* B5EBF0 80240940 00461021 */ addu $v0, $v0, $a2 -/* B5EBF4 80240944 8C420000 */ lw $v0, ($v0) -/* B5EBF8 80240948 AE20018C */ sw $zero, 0x18c($s1) -/* B5EBFC 8024094C AE220000 */ sw $v0, ($s1) -/* B5EC00 80240950 8FA60010 */ lw $a2, 0x10($sp) -/* B5EC04 80240954 8CC20000 */ lw $v0, ($a2) -/* B5EC08 80240958 AE220294 */ sw $v0, 0x294($s1) -.L8024095C: -/* B5EC0C 8024095C 001010C0 */ sll $v0, $s0, 3 -/* B5EC10 80240960 03C21021 */ addu $v0, $fp, $v0 -/* B5EC14 80240964 80420015 */ lb $v0, 0x15($v0) -/* B5EC18 80240968 26D60001 */ addiu $s6, $s6, 1 -/* B5EC1C 8024096C AE220210 */ sw $v0, 0x210($s1) -/* B5EC20 80240970 26310004 */ addiu $s1, $s1, 4 -/* B5EC24 80240974 26520001 */ addiu $s2, $s2, 1 -.L80240978: -/* B5EC28 80240978 2A420008 */ slti $v0, $s2, 8 -/* B5EC2C 8024097C 1440FFCB */ bnez $v0, .L802408AC -/* B5EC30 80240980 26940002 */ addiu $s4, $s4, 2 -/* B5EC34 80240984 0260202D */ daddu $a0, $s3, $zero -/* B5EC38 80240988 24020004 */ addiu $v0, $zero, 4 -/* B5EC3C 8024098C AC820318 */ sw $v0, 0x318($a0) -/* B5EC40 80240990 AC960324 */ sw $s6, 0x324($a0) -/* B5EC44 80240994 0C03D390 */ jal create_popup_menu -/* B5EC48 80240998 AC800328 */ sw $zero, 0x328($a0) -/* B5EC4C 8024099C AEA00070 */ sw $zero, 0x70($s5) -.L802409A0: -/* B5EC50 802409A0 8EA20070 */ lw $v0, 0x70($s5) -/* B5EC54 802409A4 8EB30078 */ lw $s3, 0x78($s5) -/* B5EC58 802409A8 14400008 */ bnez $v0, .L802409CC -/* B5EC5C 802409AC 24420001 */ addiu $v0, $v0, 1 -/* B5EC60 802409B0 8662032C */ lh $v0, 0x32c($s3) -/* B5EC64 802409B4 10400009 */ beqz $v0, .L802409DC -/* B5EC68 802409B8 AEA20074 */ sw $v0, 0x74($s5) -/* B5EC6C 802409BC 0C03C4EC */ jal hide_popup_menu -/* B5EC70 802409C0 00000000 */ nop -/* B5EC74 802409C4 8EA20070 */ lw $v0, 0x70($s5) -/* B5EC78 802409C8 24420001 */ addiu $v0, $v0, 1 -.L802409CC: -/* B5EC7C 802409CC AEA20070 */ sw $v0, 0x70($s5) -/* B5EC80 802409D0 2842000F */ slti $v0, $v0, 0xf -/* B5EC84 802409D4 10400003 */ beqz $v0, .L802409E4 -/* B5EC88 802409D8 00000000 */ nop -.L802409DC: -/* B5EC8C 802409DC 08090293 */ j .L80240A4C -/* B5EC90 802409E0 0000102D */ daddu $v0, $zero, $zero -.L802409E4: -/* B5EC94 802409E4 0C03C54E */ jal destroy_popup_menu -/* B5EC98 802409E8 00000000 */ nop -/* B5EC9C 802409EC 8EA30074 */ lw $v1, 0x74($s5) -/* B5ECA0 802409F0 240200FF */ addiu $v0, $zero, 0xff -/* B5ECA4 802409F4 10620010 */ beq $v1, $v0, .L80240A38 -/* B5ECA8 802409F8 2462FFFF */ addiu $v0, $v1, -1 -/* B5ECAC 802409FC 00021080 */ sll $v0, $v0, 2 -/* B5ECB0 80240A00 02621021 */ addu $v0, $s3, $v0 -/* B5ECB4 80240A04 8C420108 */ lw $v0, 0x108($v0) -/* B5ECB8 80240A08 00021100 */ sll $v0, $v0, 4 -/* B5ECBC 80240A0C 3C038009 */ lui $v1, %hi(gPartnerPopupProperties) -/* B5ECC0 80240A10 00621821 */ addu $v1, $v1, $v0 -/* B5ECC4 80240A14 8C63EF20 */ lw $v1, %lo(gPartnerPopupProperties)($v1) -/* B5ECC8 80240A18 8EA20074 */ lw $v0, 0x74($s5) -/* B5ECCC 80240A1C 2442FFFF */ addiu $v0, $v0, -1 -/* B5ECD0 80240A20 00021080 */ sll $v0, $v0, 2 -/* B5ECD4 80240A24 02621021 */ addu $v0, $s3, $v0 -/* B5ECD8 80240A28 AEA30084 */ sw $v1, 0x84($s5) -/* B5ECDC 80240A2C 8C420108 */ lw $v0, 0x108($v0) -/* B5ECE0 80240A30 08090290 */ j .L80240A40 -/* B5ECE4 80240A34 AEA20088 */ sw $v0, 0x88($s5) -.L80240A38: -/* B5ECE8 80240A38 2402FFFF */ addiu $v0, $zero, -1 -/* B5ECEC 80240A3C AEA20084 */ sw $v0, 0x84($s5) -.L80240A40: -/* B5ECF0 80240A40 0C00AB4B */ jal heap_free -/* B5ECF4 80240A44 8EA40078 */ lw $a0, 0x78($s5) -/* B5ECF8 80240A48 24020002 */ addiu $v0, $zero, 2 -.L80240A4C: -/* B5ECFC 80240A4C 8FBF003C */ lw $ra, 0x3c($sp) -/* B5ED00 80240A50 8FBE0038 */ lw $fp, 0x38($sp) -/* B5ED04 80240A54 8FB70034 */ lw $s7, 0x34($sp) -/* B5ED08 80240A58 8FB60030 */ lw $s6, 0x30($sp) -/* B5ED0C 80240A5C 8FB5002C */ lw $s5, 0x2c($sp) -/* B5ED10 80240A60 8FB40028 */ lw $s4, 0x28($sp) -/* B5ED14 80240A64 8FB30024 */ lw $s3, 0x24($sp) -/* B5ED18 80240A68 8FB20020 */ lw $s2, 0x20($sp) -/* B5ED1C 80240A6C 8FB1001C */ lw $s1, 0x1c($sp) -/* B5ED20 80240A70 8FB00018 */ lw $s0, 0x18($sp) -/* B5ED24 80240A74 03E00008 */ jr $ra -/* B5ED28 80240A78 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_802403E0_8CACE0.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_802403E0_8CACE0.s index a6aac3916c..7d624894e2 100644 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_802403E0_8CACE0.s +++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_802403E0_8CACE0.s @@ -3,8 +3,8 @@ glabel func_802403E0_8CACE0 /* 8CACE0 802403E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8CACE4 802403E4 3C048024 */ lui $a0, %hi(dro_01_dup_GetCurrentCameraYawClamped180) -/* 8CACE8 802403E8 24843770 */ addiu $a0, $a0, %lo(dro_01_dup_GetCurrentCameraYawClamped180) +/* 8CACE4 802403E4 3C048024 */ lui $a0, %hi(dro_01_dup_Pipe_GetCameraYaw) +/* 8CACE8 802403E8 24843770 */ addiu $a0, $a0, %lo(dro_01_dup_Pipe_GetCameraYaw) /* 8CACEC 802403EC 3C028024 */ lui $v0, %hi(D_80241BF0_8CC4F0) /* 8CACF0 802403F0 24421BF0 */ addiu $v0, $v0, %lo(D_80241BF0_8CC4F0) /* 8CACF4 802403F4 AFBF0010 */ sw $ra, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240210_8FF090.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240210_8FF090.s index bf427734ee..37a941da0a 100644 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240210_8FF090.s +++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240210_8FF090.s @@ -22,8 +22,8 @@ glabel func_80240210_8FF090 /* 8FF0B8 80240238 0040882D */ daddu $s1, $v0, $zero /* 8FF0BC 8024023C 0220202D */ daddu $a0, $s1, $zero /* 8FF0C0 80240240 0040282D */ daddu $a1, $v0, $zero -/* 8FF0C4 80240244 3C108024 */ lui $s0, %hi(tik_07_UnkFunc39) -/* 8FF0C8 80240248 261007F0 */ addiu $s0, $s0, %lo(tik_07_UnkFunc39) +/* 8FF0C4 80240244 3C108024 */ lui $s0, %hi(tik_07_SuperBlock_EndGlowEffect) +/* 8FF0C8 80240248 261007F0 */ addiu $s0, $s0, %lo(tik_07_SuperBlock_EndGlowEffect) /* 8FF0CC 8024024C 0C01BB7C */ jal decode_yay0 /* 8FF0D0 80240250 AE050000 */ sw $a1, ($s0) /* 8FF0D4 80240254 0C00AB1E */ jal general_heap_free diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_8024034C_C6847C.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_8024034C_C6847C.s deleted file mode 100644 index 53c68d3abc..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_8024034C_C6847C.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024034C_C6847C -/* C6847C 8024034C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C68480 80240350 AFBF0010 */ sw $ra, 0x10($sp) -/* C68484 80240354 8C82000C */ lw $v0, 0xc($a0) -/* C68488 80240358 0C0B1EAF */ jal evt_get_variable -/* C6848C 8024035C 8C450000 */ lw $a1, ($v0) -/* C68490 80240360 0C0B95A4 */ jal entity_upgrade_block_hide_content -/* C68494 80240364 0040202D */ daddu $a0, $v0, $zero -/* C68498 80240368 8FBF0010 */ lw $ra, 0x10($sp) -/* C6849C 8024036C 24020002 */ addiu $v0, $zero, 2 -/* C684A0 80240370 03E00008 */ jr $ra -/* C684A4 80240374 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_802404DC_C6860C.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_802404DC_C6860C.s deleted file mode 100644 index 100d01d961..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_802404DC_C6860C.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404DC_C6860C -/* C6860C 802404DC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* C68610 802404E0 AFB5002C */ sw $s5, 0x2c($sp) -/* C68614 802404E4 0080A82D */ daddu $s5, $a0, $zero -/* C68618 802404E8 AFBE0038 */ sw $fp, 0x38($sp) -/* C6861C 802404EC 3C1E8011 */ lui $fp, %hi(gPlayerData) -/* C68620 802404F0 27DEF290 */ addiu $fp, $fp, %lo(gPlayerData) -/* C68624 802404F4 AFBF003C */ sw $ra, 0x3c($sp) -/* C68628 802404F8 AFB70034 */ sw $s7, 0x34($sp) -/* C6862C 802404FC AFB60030 */ sw $s6, 0x30($sp) -/* C68630 80240500 AFB40028 */ sw $s4, 0x28($sp) -/* C68634 80240504 AFB30024 */ sw $s3, 0x24($sp) -/* C68638 80240508 AFB20020 */ sw $s2, 0x20($sp) -/* C6863C 8024050C AFB1001C */ sw $s1, 0x1c($sp) -/* C68640 80240510 10A0004F */ beqz $a1, .L80240650 -/* C68644 80240514 AFB00018 */ sw $s0, 0x18($sp) -/* C68648 80240518 0C00AB39 */ jal heap_malloc -/* C6864C 8024051C 24040330 */ addiu $a0, $zero, 0x330 -/* C68650 80240520 0040982D */ daddu $s3, $v0, $zero -/* C68654 80240524 0000B02D */ daddu $s6, $zero, $zero -/* C68658 80240528 02C0902D */ daddu $s2, $s6, $zero -/* C6865C 8024052C 3C148024 */ lui $s4, %hi(D_80241C48_C69D78) -/* C68660 80240530 26941C48 */ addiu $s4, $s4, %lo(D_80241C48_C69D78) -/* C68664 80240534 0260882D */ daddu $s1, $s3, $zero -/* C68668 80240538 8EA200B4 */ lw $v0, 0xb4($s5) -/* C6866C 8024053C 3C038024 */ lui $v1, %hi(D_80241C40_C69D70) -/* C68670 80240540 24631C40 */ addiu $v1, $v1, %lo(D_80241C40_C69D70) -/* C68674 80240544 AEB30078 */ sw $s3, 0x78($s5) -/* C68678 80240548 00021027 */ nor $v0, $zero, $v0 -/* C6867C 8024054C 0002BFC2 */ srl $s7, $v0, 0x1f -/* C68680 80240550 00171080 */ sll $v0, $s7, 2 -/* C68684 80240554 00431021 */ addu $v0, $v0, $v1 -/* C68688 80240558 AFA20010 */ sw $v0, 0x10($sp) -.L8024055C: -/* C6868C 8024055C 86900000 */ lh $s0, ($s4) -/* C68690 80240560 001010C0 */ sll $v0, $s0, 3 -/* C68694 80240564 03C21021 */ addu $v0, $fp, $v0 -/* C68698 80240568 90420014 */ lbu $v0, 0x14($v0) -/* C6869C 8024056C 5040002E */ beql $v0, $zero, .L80240628 -/* C686A0 80240570 26520001 */ addiu $s2, $s2, 1 -/* C686A4 80240574 00101100 */ sll $v0, $s0, 4 -/* C686A8 80240578 3C068009 */ lui $a2, %hi(gPartnerPopupProperties) -/* C686AC 8024057C 24C6EF20 */ addiu $a2, $a2, %lo(gPartnerPopupProperties) -/* C686B0 80240580 00461021 */ addu $v0, $v0, $a2 -/* C686B4 80240584 0200202D */ daddu $a0, $s0, $zero -/* C686B8 80240588 AE300108 */ sw $s0, 0x108($s1) -/* C686BC 8024058C 8C420000 */ lw $v0, ($v0) -/* C686C0 80240590 02E0282D */ daddu $a1, $s7, $zero -/* C686C4 80240594 0C0900F9 */ jal kzn_04_UnkFunc37 -/* C686C8 80240598 AE220084 */ sw $v0, 0x84($s1) -/* C686CC 8024059C 0040202D */ daddu $a0, $v0, $zero -/* C686D0 802405A0 04800011 */ bltz $a0, .L802405E8 -/* C686D4 802405A4 00101080 */ sll $v0, $s0, 2 -/* C686D8 802405A8 3C06800F */ lui $a2, %hi(wPartnerHudScripts) -/* C686DC 802405AC 24C67F00 */ addiu $a2, $a2, %lo(wPartnerHudScripts) -/* C686E0 802405B0 00461021 */ addu $v0, $v0, $a2 -/* C686E4 802405B4 8C430000 */ lw $v1, ($v0) -/* C686E8 802405B8 24020001 */ addiu $v0, $zero, 1 -/* C686EC 802405BC AE22018C */ sw $v0, 0x18c($s1) -/* C686F0 802405C0 00041080 */ sll $v0, $a0, 2 -/* C686F4 802405C4 3C068024 */ lui $a2, %hi(D_80241C58_C69D88) -/* C686F8 802405C8 24C61C58 */ addiu $a2, $a2, %lo(D_80241C58_C69D88) -/* C686FC 802405CC AE230000 */ sw $v1, ($s1) -/* C68700 802405D0 001218C0 */ sll $v1, $s2, 3 -/* C68704 802405D4 00431021 */ addu $v0, $v0, $v1 -/* C68708 802405D8 00461021 */ addu $v0, $v0, $a2 -/* C6870C 802405DC 8C420000 */ lw $v0, ($v0) -/* C68710 802405E0 08090183 */ j .L8024060C -/* C68714 802405E4 AE220294 */ sw $v0, 0x294($s1) -.L802405E8: -/* C68718 802405E8 3C06800F */ lui $a2, %hi(wDisabledPartnerHudScripts) -/* C6871C 802405EC 24C67F40 */ addiu $a2, $a2, %lo(wDisabledPartnerHudScripts) -/* C68720 802405F0 00461021 */ addu $v0, $v0, $a2 -/* C68724 802405F4 8C420000 */ lw $v0, ($v0) -/* C68728 802405F8 AE20018C */ sw $zero, 0x18c($s1) -/* C6872C 802405FC AE220000 */ sw $v0, ($s1) -/* C68730 80240600 8FA60010 */ lw $a2, 0x10($sp) -/* C68734 80240604 8CC20000 */ lw $v0, ($a2) -/* C68738 80240608 AE220294 */ sw $v0, 0x294($s1) -.L8024060C: -/* C6873C 8024060C 001010C0 */ sll $v0, $s0, 3 -/* C68740 80240610 03C21021 */ addu $v0, $fp, $v0 -/* C68744 80240614 80420015 */ lb $v0, 0x15($v0) -/* C68748 80240618 26D60001 */ addiu $s6, $s6, 1 -/* C6874C 8024061C AE220210 */ sw $v0, 0x210($s1) -/* C68750 80240620 26310004 */ addiu $s1, $s1, 4 -/* C68754 80240624 26520001 */ addiu $s2, $s2, 1 -.L80240628: -/* C68758 80240628 2A420008 */ slti $v0, $s2, 8 -/* C6875C 8024062C 1440FFCB */ bnez $v0, .L8024055C -/* C68760 80240630 26940002 */ addiu $s4, $s4, 2 -/* C68764 80240634 0260202D */ daddu $a0, $s3, $zero -/* C68768 80240638 24020004 */ addiu $v0, $zero, 4 -/* C6876C 8024063C AC820318 */ sw $v0, 0x318($a0) -/* C68770 80240640 AC960324 */ sw $s6, 0x324($a0) -/* C68774 80240644 0C03D390 */ jal create_popup_menu -/* C68778 80240648 AC800328 */ sw $zero, 0x328($a0) -/* C6877C 8024064C AEA00070 */ sw $zero, 0x70($s5) -.L80240650: -/* C68780 80240650 8EA20070 */ lw $v0, 0x70($s5) -/* C68784 80240654 8EB30078 */ lw $s3, 0x78($s5) -/* C68788 80240658 14400008 */ bnez $v0, .L8024067C -/* C6878C 8024065C 24420001 */ addiu $v0, $v0, 1 -/* C68790 80240660 8662032C */ lh $v0, 0x32c($s3) -/* C68794 80240664 10400009 */ beqz $v0, .L8024068C -/* C68798 80240668 AEA20074 */ sw $v0, 0x74($s5) -/* C6879C 8024066C 0C03C4EC */ jal hide_popup_menu -/* C687A0 80240670 00000000 */ nop -/* C687A4 80240674 8EA20070 */ lw $v0, 0x70($s5) -/* C687A8 80240678 24420001 */ addiu $v0, $v0, 1 -.L8024067C: -/* C687AC 8024067C AEA20070 */ sw $v0, 0x70($s5) -/* C687B0 80240680 2842000F */ slti $v0, $v0, 0xf -/* C687B4 80240684 10400003 */ beqz $v0, .L80240694 -/* C687B8 80240688 00000000 */ nop -.L8024068C: -/* C687BC 8024068C 080901BF */ j .L802406FC -/* C687C0 80240690 0000102D */ daddu $v0, $zero, $zero -.L80240694: -/* C687C4 80240694 0C03C54E */ jal destroy_popup_menu -/* C687C8 80240698 00000000 */ nop -/* C687CC 8024069C 8EA30074 */ lw $v1, 0x74($s5) -/* C687D0 802406A0 240200FF */ addiu $v0, $zero, 0xff -/* C687D4 802406A4 10620010 */ beq $v1, $v0, .L802406E8 -/* C687D8 802406A8 2462FFFF */ addiu $v0, $v1, -1 -/* C687DC 802406AC 00021080 */ sll $v0, $v0, 2 -/* C687E0 802406B0 02621021 */ addu $v0, $s3, $v0 -/* C687E4 802406B4 8C420108 */ lw $v0, 0x108($v0) -/* C687E8 802406B8 00021100 */ sll $v0, $v0, 4 -/* C687EC 802406BC 3C038009 */ lui $v1, %hi(gPartnerPopupProperties) -/* C687F0 802406C0 00621821 */ addu $v1, $v1, $v0 -/* C687F4 802406C4 8C63EF20 */ lw $v1, %lo(gPartnerPopupProperties)($v1) -/* C687F8 802406C8 8EA20074 */ lw $v0, 0x74($s5) -/* C687FC 802406CC 2442FFFF */ addiu $v0, $v0, -1 -/* C68800 802406D0 00021080 */ sll $v0, $v0, 2 -/* C68804 802406D4 02621021 */ addu $v0, $s3, $v0 -/* C68808 802406D8 AEA30084 */ sw $v1, 0x84($s5) -/* C6880C 802406DC 8C420108 */ lw $v0, 0x108($v0) -/* C68810 802406E0 080901BC */ j .L802406F0 -/* C68814 802406E4 AEA20088 */ sw $v0, 0x88($s5) -.L802406E8: -/* C68818 802406E8 2402FFFF */ addiu $v0, $zero, -1 -/* C6881C 802406EC AEA20084 */ sw $v0, 0x84($s5) -.L802406F0: -/* C68820 802406F0 0C00AB4B */ jal heap_free -/* C68824 802406F4 8EA40078 */ lw $a0, 0x78($s5) -/* C68828 802406F8 24020002 */ addiu $v0, $zero, 2 -.L802406FC: -/* C6882C 802406FC 8FBF003C */ lw $ra, 0x3c($sp) -/* C68830 80240700 8FBE0038 */ lw $fp, 0x38($sp) -/* C68834 80240704 8FB70034 */ lw $s7, 0x34($sp) -/* C68838 80240708 8FB60030 */ lw $s6, 0x30($sp) -/* C6883C 8024070C 8FB5002C */ lw $s5, 0x2c($sp) -/* C68840 80240710 8FB40028 */ lw $s4, 0x28($sp) -/* C68844 80240714 8FB30024 */ lw $s3, 0x24($sp) -/* C68848 80240718 8FB20020 */ lw $s2, 0x20($sp) -/* C6884C 8024071C 8FB1001C */ lw $s1, 0x1c($sp) -/* C68850 80240720 8FB00018 */ lw $s0, 0x18($sp) -/* C68854 80240724 03E00008 */ jr $ra -/* C68858 80240728 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_8024003C_C76D1C.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_8024003C_C76D1C.s deleted file mode 100644 index f001fccd5c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_8024003C_C76D1C.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024003C_C76D1C -/* C76D1C 8024003C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C76D20 80240040 AFBF0010 */ sw $ra, 0x10($sp) -/* C76D24 80240044 8C82000C */ lw $v0, 0xc($a0) -/* C76D28 80240048 0C0B1EAF */ jal evt_get_variable -/* C76D2C 8024004C 8C450000 */ lw $a1, ($v0) -/* C76D30 80240050 0C0B95A4 */ jal entity_upgrade_block_hide_content -/* C76D34 80240054 0040202D */ daddu $a0, $v0, $zero -/* C76D38 80240058 8FBF0010 */ lw $ra, 0x10($sp) -/* C76D3C 8024005C 24020002 */ addiu $v0, $zero, 2 -/* C76D40 80240060 03E00008 */ jr $ra -/* C76D44 80240064 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_802401CC_C76EAC.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_802401CC_C76EAC.s deleted file mode 100644 index 4b6159852e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_802401CC_C76EAC.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401CC_C76EAC -/* C76EAC 802401CC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* C76EB0 802401D0 AFB5002C */ sw $s5, 0x2c($sp) -/* C76EB4 802401D4 0080A82D */ daddu $s5, $a0, $zero -/* C76EB8 802401D8 AFBE0038 */ sw $fp, 0x38($sp) -/* C76EBC 802401DC 3C1E8011 */ lui $fp, %hi(gPlayerData) -/* C76EC0 802401E0 27DEF290 */ addiu $fp, $fp, %lo(gPlayerData) -/* C76EC4 802401E4 AFBF003C */ sw $ra, 0x3c($sp) -/* C76EC8 802401E8 AFB70034 */ sw $s7, 0x34($sp) -/* C76ECC 802401EC AFB60030 */ sw $s6, 0x30($sp) -/* C76ED0 802401F0 AFB40028 */ sw $s4, 0x28($sp) -/* C76ED4 802401F4 AFB30024 */ sw $s3, 0x24($sp) -/* C76ED8 802401F8 AFB20020 */ sw $s2, 0x20($sp) -/* C76EDC 802401FC AFB1001C */ sw $s1, 0x1c($sp) -/* C76EE0 80240200 10A0004F */ beqz $a1, .L80240340 -/* C76EE4 80240204 AFB00018 */ sw $s0, 0x18($sp) -/* C76EE8 80240208 0C00AB39 */ jal heap_malloc -/* C76EEC 8024020C 24040330 */ addiu $a0, $zero, 0x330 -/* C76EF0 80240210 0040982D */ daddu $s3, $v0, $zero -/* C76EF4 80240214 0000B02D */ daddu $s6, $zero, $zero -/* C76EF8 80240218 02C0902D */ daddu $s2, $s6, $zero -/* C76EFC 8024021C 3C148024 */ lui $s4, %hi(D_80243D08_C7A9E8) -/* C76F00 80240220 26943D08 */ addiu $s4, $s4, %lo(D_80243D08_C7A9E8) -/* C76F04 80240224 0260882D */ daddu $s1, $s3, $zero -/* C76F08 80240228 8EA200B4 */ lw $v0, 0xb4($s5) -/* C76F0C 8024022C 3C038024 */ lui $v1, %hi(D_80243D00_C7A9E0) -/* C76F10 80240230 24633D00 */ addiu $v1, $v1, %lo(D_80243D00_C7A9E0) -/* C76F14 80240234 AEB30078 */ sw $s3, 0x78($s5) -/* C76F18 80240238 00021027 */ nor $v0, $zero, $v0 -/* C76F1C 8024023C 0002BFC2 */ srl $s7, $v0, 0x1f -/* C76F20 80240240 00171080 */ sll $v0, $s7, 2 -/* C76F24 80240244 00431021 */ addu $v0, $v0, $v1 -/* C76F28 80240248 AFA20010 */ sw $v0, 0x10($sp) -.L8024024C: -/* C76F2C 8024024C 86900000 */ lh $s0, ($s4) -/* C76F30 80240250 001010C0 */ sll $v0, $s0, 3 -/* C76F34 80240254 03C21021 */ addu $v0, $fp, $v0 -/* C76F38 80240258 90420014 */ lbu $v0, 0x14($v0) -/* C76F3C 8024025C 5040002E */ beql $v0, $zero, .L80240318 -/* C76F40 80240260 26520001 */ addiu $s2, $s2, 1 -/* C76F44 80240264 00101100 */ sll $v0, $s0, 4 -/* C76F48 80240268 3C068009 */ lui $a2, %hi(gPartnerPopupProperties) -/* C76F4C 8024026C 24C6EF20 */ addiu $a2, $a2, %lo(gPartnerPopupProperties) -/* C76F50 80240270 00461021 */ addu $v0, $v0, $a2 -/* C76F54 80240274 0200202D */ daddu $a0, $s0, $zero -/* C76F58 80240278 AE300108 */ sw $s0, 0x108($s1) -/* C76F5C 8024027C 8C420000 */ lw $v0, ($v0) -/* C76F60 80240280 02E0282D */ daddu $a1, $s7, $zero -/* C76F64 80240284 0C090035 */ jal kzn_09_UnkFunc37 -/* C76F68 80240288 AE220084 */ sw $v0, 0x84($s1) -/* C76F6C 8024028C 0040202D */ daddu $a0, $v0, $zero -/* C76F70 80240290 04800011 */ bltz $a0, .L802402D8 -/* C76F74 80240294 00101080 */ sll $v0, $s0, 2 -/* C76F78 80240298 3C06800F */ lui $a2, %hi(wPartnerHudScripts) -/* C76F7C 8024029C 24C67F00 */ addiu $a2, $a2, %lo(wPartnerHudScripts) -/* C76F80 802402A0 00461021 */ addu $v0, $v0, $a2 -/* C76F84 802402A4 8C430000 */ lw $v1, ($v0) -/* C76F88 802402A8 24020001 */ addiu $v0, $zero, 1 -/* C76F8C 802402AC AE22018C */ sw $v0, 0x18c($s1) -/* C76F90 802402B0 00041080 */ sll $v0, $a0, 2 -/* C76F94 802402B4 3C068024 */ lui $a2, %hi(D_80243D18_C7A9F8) -/* C76F98 802402B8 24C63D18 */ addiu $a2, $a2, %lo(D_80243D18_C7A9F8) -/* C76F9C 802402BC AE230000 */ sw $v1, ($s1) -/* C76FA0 802402C0 001218C0 */ sll $v1, $s2, 3 -/* C76FA4 802402C4 00431021 */ addu $v0, $v0, $v1 -/* C76FA8 802402C8 00461021 */ addu $v0, $v0, $a2 -/* C76FAC 802402CC 8C420000 */ lw $v0, ($v0) -/* C76FB0 802402D0 080900BF */ j .L802402FC -/* C76FB4 802402D4 AE220294 */ sw $v0, 0x294($s1) -.L802402D8: -/* C76FB8 802402D8 3C06800F */ lui $a2, %hi(wDisabledPartnerHudScripts) -/* C76FBC 802402DC 24C67F40 */ addiu $a2, $a2, %lo(wDisabledPartnerHudScripts) -/* C76FC0 802402E0 00461021 */ addu $v0, $v0, $a2 -/* C76FC4 802402E4 8C420000 */ lw $v0, ($v0) -/* C76FC8 802402E8 AE20018C */ sw $zero, 0x18c($s1) -/* C76FCC 802402EC AE220000 */ sw $v0, ($s1) -/* C76FD0 802402F0 8FA60010 */ lw $a2, 0x10($sp) -/* C76FD4 802402F4 8CC20000 */ lw $v0, ($a2) -/* C76FD8 802402F8 AE220294 */ sw $v0, 0x294($s1) -.L802402FC: -/* C76FDC 802402FC 001010C0 */ sll $v0, $s0, 3 -/* C76FE0 80240300 03C21021 */ addu $v0, $fp, $v0 -/* C76FE4 80240304 80420015 */ lb $v0, 0x15($v0) -/* C76FE8 80240308 26D60001 */ addiu $s6, $s6, 1 -/* C76FEC 8024030C AE220210 */ sw $v0, 0x210($s1) -/* C76FF0 80240310 26310004 */ addiu $s1, $s1, 4 -/* C76FF4 80240314 26520001 */ addiu $s2, $s2, 1 -.L80240318: -/* C76FF8 80240318 2A420008 */ slti $v0, $s2, 8 -/* C76FFC 8024031C 1440FFCB */ bnez $v0, .L8024024C -/* C77000 80240320 26940002 */ addiu $s4, $s4, 2 -/* C77004 80240324 0260202D */ daddu $a0, $s3, $zero -/* C77008 80240328 24020004 */ addiu $v0, $zero, 4 -/* C7700C 8024032C AC820318 */ sw $v0, 0x318($a0) -/* C77010 80240330 AC960324 */ sw $s6, 0x324($a0) -/* C77014 80240334 0C03D390 */ jal create_popup_menu -/* C77018 80240338 AC800328 */ sw $zero, 0x328($a0) -/* C7701C 8024033C AEA00070 */ sw $zero, 0x70($s5) -.L80240340: -/* C77020 80240340 8EA20070 */ lw $v0, 0x70($s5) -/* C77024 80240344 8EB30078 */ lw $s3, 0x78($s5) -/* C77028 80240348 14400008 */ bnez $v0, .L8024036C -/* C7702C 8024034C 24420001 */ addiu $v0, $v0, 1 -/* C77030 80240350 8662032C */ lh $v0, 0x32c($s3) -/* C77034 80240354 10400009 */ beqz $v0, .L8024037C -/* C77038 80240358 AEA20074 */ sw $v0, 0x74($s5) -/* C7703C 8024035C 0C03C4EC */ jal hide_popup_menu -/* C77040 80240360 00000000 */ nop -/* C77044 80240364 8EA20070 */ lw $v0, 0x70($s5) -/* C77048 80240368 24420001 */ addiu $v0, $v0, 1 -.L8024036C: -/* C7704C 8024036C AEA20070 */ sw $v0, 0x70($s5) -/* C77050 80240370 2842000F */ slti $v0, $v0, 0xf -/* C77054 80240374 10400003 */ beqz $v0, .L80240384 -/* C77058 80240378 00000000 */ nop -.L8024037C: -/* C7705C 8024037C 080900FB */ j .L802403EC -/* C77060 80240380 0000102D */ daddu $v0, $zero, $zero -.L80240384: -/* C77064 80240384 0C03C54E */ jal destroy_popup_menu -/* C77068 80240388 00000000 */ nop -/* C7706C 8024038C 8EA30074 */ lw $v1, 0x74($s5) -/* C77070 80240390 240200FF */ addiu $v0, $zero, 0xff -/* C77074 80240394 10620010 */ beq $v1, $v0, .L802403D8 -/* C77078 80240398 2462FFFF */ addiu $v0, $v1, -1 -/* C7707C 8024039C 00021080 */ sll $v0, $v0, 2 -/* C77080 802403A0 02621021 */ addu $v0, $s3, $v0 -/* C77084 802403A4 8C420108 */ lw $v0, 0x108($v0) -/* C77088 802403A8 00021100 */ sll $v0, $v0, 4 -/* C7708C 802403AC 3C038009 */ lui $v1, %hi(gPartnerPopupProperties) -/* C77090 802403B0 00621821 */ addu $v1, $v1, $v0 -/* C77094 802403B4 8C63EF20 */ lw $v1, %lo(gPartnerPopupProperties)($v1) -/* C77098 802403B8 8EA20074 */ lw $v0, 0x74($s5) -/* C7709C 802403BC 2442FFFF */ addiu $v0, $v0, -1 -/* C770A0 802403C0 00021080 */ sll $v0, $v0, 2 -/* C770A4 802403C4 02621021 */ addu $v0, $s3, $v0 -/* C770A8 802403C8 AEA30084 */ sw $v1, 0x84($s5) -/* C770AC 802403CC 8C420108 */ lw $v0, 0x108($v0) -/* C770B0 802403D0 080900F8 */ j .L802403E0 -/* C770B4 802403D4 AEA20088 */ sw $v0, 0x88($s5) -.L802403D8: -/* C770B8 802403D8 2402FFFF */ addiu $v0, $zero, -1 -/* C770BC 802403DC AEA20084 */ sw $v0, 0x84($s5) -.L802403E0: -/* C770C0 802403E0 0C00AB4B */ jal heap_free -/* C770C4 802403E4 8EA40078 */ lw $a0, 0x78($s5) -/* C770C8 802403E8 24020002 */ addiu $v0, $zero, 2 -.L802403EC: -/* C770CC 802403EC 8FBF003C */ lw $ra, 0x3c($sp) -/* C770D0 802403F0 8FBE0038 */ lw $fp, 0x38($sp) -/* C770D4 802403F4 8FB70034 */ lw $s7, 0x34($sp) -/* C770D8 802403F8 8FB60030 */ lw $s6, 0x30($sp) -/* C770DC 802403FC 8FB5002C */ lw $s5, 0x2c($sp) -/* C770E0 80240400 8FB40028 */ lw $s4, 0x28($sp) -/* C770E4 80240404 8FB30024 */ lw $s3, 0x24($sp) -/* C770E8 80240408 8FB20020 */ lw $s2, 0x20($sp) -/* C770EC 8024040C 8FB1001C */ lw $s1, 0x1c($sp) -/* C770F0 80240410 8FB00018 */ lw $s0, 0x18($sp) -/* C770F4 80240414 03E00008 */ jr $ra -/* C770F8 80240418 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_802407CC_DDCFFC.s b/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_802407CC_DDCFFC.s deleted file mode 100644 index fcc7ceba32..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_802407CC_DDCFFC.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407CC_DDCFFC -/* DDCFFC 802407CC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DDD000 802407D0 AFBF0010 */ sw $ra, 0x10($sp) -/* DDD004 802407D4 8C82000C */ lw $v0, 0xc($a0) -/* DDD008 802407D8 0C0B1EAF */ jal evt_get_variable -/* DDD00C 802407DC 8C450000 */ lw $a1, ($v0) -/* DDD010 802407E0 0C0B95A4 */ jal entity_upgrade_block_hide_content -/* DDD014 802407E4 0040202D */ daddu $a0, $v0, $zero -/* DDD018 802407E8 8FBF0010 */ lw $ra, 0x10($sp) -/* DDD01C 802407EC 24020002 */ addiu $v0, $zero, 2 -/* DDD020 802407F0 03E00008 */ jr $ra -/* DDD024 802407F4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_8024095C_DDD18C.s b/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_8024095C_DDD18C.s deleted file mode 100644 index c3ec4a135d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_8024095C_DDD18C.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024095C_DDD18C -/* DDD18C 8024095C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* DDD190 80240960 AFB5002C */ sw $s5, 0x2c($sp) -/* DDD194 80240964 0080A82D */ daddu $s5, $a0, $zero -/* DDD198 80240968 AFBE0038 */ sw $fp, 0x38($sp) -/* DDD19C 8024096C 3C1E8011 */ lui $fp, %hi(gPlayerData) -/* DDD1A0 80240970 27DEF290 */ addiu $fp, $fp, %lo(gPlayerData) -/* DDD1A4 80240974 AFBF003C */ sw $ra, 0x3c($sp) -/* DDD1A8 80240978 AFB70034 */ sw $s7, 0x34($sp) -/* DDD1AC 8024097C AFB60030 */ sw $s6, 0x30($sp) -/* DDD1B0 80240980 AFB40028 */ sw $s4, 0x28($sp) -/* DDD1B4 80240984 AFB30024 */ sw $s3, 0x24($sp) -/* DDD1B8 80240988 AFB20020 */ sw $s2, 0x20($sp) -/* DDD1BC 8024098C AFB1001C */ sw $s1, 0x1c($sp) -/* DDD1C0 80240990 10A0004F */ beqz $a1, .L80240AD0 -/* DDD1C4 80240994 AFB00018 */ sw $s0, 0x18($sp) -/* DDD1C8 80240998 0C00AB39 */ jal heap_malloc -/* DDD1CC 8024099C 24040330 */ addiu $a0, $zero, 0x330 -/* DDD1D0 802409A0 0040982D */ daddu $s3, $v0, $zero -/* DDD1D4 802409A4 0000B02D */ daddu $s6, $zero, $zero -/* DDD1D8 802409A8 02C0902D */ daddu $s2, $s6, $zero -/* DDD1DC 802409AC 3C148024 */ lui $s4, %hi(D_80241E48_DDE678) -/* DDD1E0 802409B0 26941E48 */ addiu $s4, $s4, %lo(D_80241E48_DDE678) -/* DDD1E4 802409B4 0260882D */ daddu $s1, $s3, $zero -/* DDD1E8 802409B8 8EA200B4 */ lw $v0, 0xb4($s5) -/* DDD1EC 802409BC 3C038024 */ lui $v1, %hi(D_80241E40_DDE670) -/* DDD1F0 802409C0 24631E40 */ addiu $v1, $v1, %lo(D_80241E40_DDE670) -/* DDD1F4 802409C4 AEB30078 */ sw $s3, 0x78($s5) -/* DDD1F8 802409C8 00021027 */ nor $v0, $zero, $v0 -/* DDD1FC 802409CC 0002BFC2 */ srl $s7, $v0, 0x1f -/* DDD200 802409D0 00171080 */ sll $v0, $s7, 2 -/* DDD204 802409D4 00431021 */ addu $v0, $v0, $v1 -/* DDD208 802409D8 AFA20010 */ sw $v0, 0x10($sp) -.L802409DC: -/* DDD20C 802409DC 86900000 */ lh $s0, ($s4) -/* DDD210 802409E0 001010C0 */ sll $v0, $s0, 3 -/* DDD214 802409E4 03C21021 */ addu $v0, $fp, $v0 -/* DDD218 802409E8 90420014 */ lbu $v0, 0x14($v0) -/* DDD21C 802409EC 5040002E */ beql $v0, $zero, .L80240AA8 -/* DDD220 802409F0 26520001 */ addiu $s2, $s2, 1 -/* DDD224 802409F4 00101100 */ sll $v0, $s0, 4 -/* DDD228 802409F8 3C068009 */ lui $a2, %hi(gPartnerPopupProperties) -/* DDD22C 802409FC 24C6EF20 */ addiu $a2, $a2, %lo(gPartnerPopupProperties) -/* DDD230 80240A00 00461021 */ addu $v0, $v0, $a2 -/* DDD234 80240A04 0200202D */ daddu $a0, $s0, $zero -/* DDD238 80240A08 AE300108 */ sw $s0, 0x108($s1) -/* DDD23C 80240A0C 8C420000 */ lw $v0, ($v0) -/* DDD240 80240A10 02E0282D */ daddu $a1, $s7, $zero -/* DDD244 80240A14 0C090219 */ jal omo_11_UnkFunc37 -/* DDD248 80240A18 AE220084 */ sw $v0, 0x84($s1) -/* DDD24C 80240A1C 0040202D */ daddu $a0, $v0, $zero -/* DDD250 80240A20 04800011 */ bltz $a0, .L80240A68 -/* DDD254 80240A24 00101080 */ sll $v0, $s0, 2 -/* DDD258 80240A28 3C06800F */ lui $a2, %hi(wPartnerHudScripts) -/* DDD25C 80240A2C 24C67F00 */ addiu $a2, $a2, %lo(wPartnerHudScripts) -/* DDD260 80240A30 00461021 */ addu $v0, $v0, $a2 -/* DDD264 80240A34 8C430000 */ lw $v1, ($v0) -/* DDD268 80240A38 24020001 */ addiu $v0, $zero, 1 -/* DDD26C 80240A3C AE22018C */ sw $v0, 0x18c($s1) -/* DDD270 80240A40 00041080 */ sll $v0, $a0, 2 -/* DDD274 80240A44 3C068024 */ lui $a2, %hi(D_80241E58_DDE688) -/* DDD278 80240A48 24C61E58 */ addiu $a2, $a2, %lo(D_80241E58_DDE688) -/* DDD27C 80240A4C AE230000 */ sw $v1, ($s1) -/* DDD280 80240A50 001218C0 */ sll $v1, $s2, 3 -/* DDD284 80240A54 00431021 */ addu $v0, $v0, $v1 -/* DDD288 80240A58 00461021 */ addu $v0, $v0, $a2 -/* DDD28C 80240A5C 8C420000 */ lw $v0, ($v0) -/* DDD290 80240A60 080902A3 */ j .L80240A8C -/* DDD294 80240A64 AE220294 */ sw $v0, 0x294($s1) -.L80240A68: -/* DDD298 80240A68 3C06800F */ lui $a2, %hi(wDisabledPartnerHudScripts) -/* DDD29C 80240A6C 24C67F40 */ addiu $a2, $a2, %lo(wDisabledPartnerHudScripts) -/* DDD2A0 80240A70 00461021 */ addu $v0, $v0, $a2 -/* DDD2A4 80240A74 8C420000 */ lw $v0, ($v0) -/* DDD2A8 80240A78 AE20018C */ sw $zero, 0x18c($s1) -/* DDD2AC 80240A7C AE220000 */ sw $v0, ($s1) -/* DDD2B0 80240A80 8FA60010 */ lw $a2, 0x10($sp) -/* DDD2B4 80240A84 8CC20000 */ lw $v0, ($a2) -/* DDD2B8 80240A88 AE220294 */ sw $v0, 0x294($s1) -.L80240A8C: -/* DDD2BC 80240A8C 001010C0 */ sll $v0, $s0, 3 -/* DDD2C0 80240A90 03C21021 */ addu $v0, $fp, $v0 -/* DDD2C4 80240A94 80420015 */ lb $v0, 0x15($v0) -/* DDD2C8 80240A98 26D60001 */ addiu $s6, $s6, 1 -/* DDD2CC 80240A9C AE220210 */ sw $v0, 0x210($s1) -/* DDD2D0 80240AA0 26310004 */ addiu $s1, $s1, 4 -/* DDD2D4 80240AA4 26520001 */ addiu $s2, $s2, 1 -.L80240AA8: -/* DDD2D8 80240AA8 2A420008 */ slti $v0, $s2, 8 -/* DDD2DC 80240AAC 1440FFCB */ bnez $v0, .L802409DC -/* DDD2E0 80240AB0 26940002 */ addiu $s4, $s4, 2 -/* DDD2E4 80240AB4 0260202D */ daddu $a0, $s3, $zero -/* DDD2E8 80240AB8 24020004 */ addiu $v0, $zero, 4 -/* DDD2EC 80240ABC AC820318 */ sw $v0, 0x318($a0) -/* DDD2F0 80240AC0 AC960324 */ sw $s6, 0x324($a0) -/* DDD2F4 80240AC4 0C03D390 */ jal create_popup_menu -/* DDD2F8 80240AC8 AC800328 */ sw $zero, 0x328($a0) -/* DDD2FC 80240ACC AEA00070 */ sw $zero, 0x70($s5) -.L80240AD0: -/* DDD300 80240AD0 8EA20070 */ lw $v0, 0x70($s5) -/* DDD304 80240AD4 8EB30078 */ lw $s3, 0x78($s5) -/* DDD308 80240AD8 14400008 */ bnez $v0, .L80240AFC -/* DDD30C 80240ADC 24420001 */ addiu $v0, $v0, 1 -/* DDD310 80240AE0 8662032C */ lh $v0, 0x32c($s3) -/* DDD314 80240AE4 10400009 */ beqz $v0, .L80240B0C -/* DDD318 80240AE8 AEA20074 */ sw $v0, 0x74($s5) -/* DDD31C 80240AEC 0C03C4EC */ jal hide_popup_menu -/* DDD320 80240AF0 00000000 */ nop -/* DDD324 80240AF4 8EA20070 */ lw $v0, 0x70($s5) -/* DDD328 80240AF8 24420001 */ addiu $v0, $v0, 1 -.L80240AFC: -/* DDD32C 80240AFC AEA20070 */ sw $v0, 0x70($s5) -/* DDD330 80240B00 2842000F */ slti $v0, $v0, 0xf -/* DDD334 80240B04 10400003 */ beqz $v0, .L80240B14 -/* DDD338 80240B08 00000000 */ nop -.L80240B0C: -/* DDD33C 80240B0C 080902DF */ j .L80240B7C -/* DDD340 80240B10 0000102D */ daddu $v0, $zero, $zero -.L80240B14: -/* DDD344 80240B14 0C03C54E */ jal destroy_popup_menu -/* DDD348 80240B18 00000000 */ nop -/* DDD34C 80240B1C 8EA30074 */ lw $v1, 0x74($s5) -/* DDD350 80240B20 240200FF */ addiu $v0, $zero, 0xff -/* DDD354 80240B24 10620010 */ beq $v1, $v0, .L80240B68 -/* DDD358 80240B28 2462FFFF */ addiu $v0, $v1, -1 -/* DDD35C 80240B2C 00021080 */ sll $v0, $v0, 2 -/* DDD360 80240B30 02621021 */ addu $v0, $s3, $v0 -/* DDD364 80240B34 8C420108 */ lw $v0, 0x108($v0) -/* DDD368 80240B38 00021100 */ sll $v0, $v0, 4 -/* DDD36C 80240B3C 3C038009 */ lui $v1, %hi(gPartnerPopupProperties) -/* DDD370 80240B40 00621821 */ addu $v1, $v1, $v0 -/* DDD374 80240B44 8C63EF20 */ lw $v1, %lo(gPartnerPopupProperties)($v1) -/* DDD378 80240B48 8EA20074 */ lw $v0, 0x74($s5) -/* DDD37C 80240B4C 2442FFFF */ addiu $v0, $v0, -1 -/* DDD380 80240B50 00021080 */ sll $v0, $v0, 2 -/* DDD384 80240B54 02621021 */ addu $v0, $s3, $v0 -/* DDD388 80240B58 AEA30084 */ sw $v1, 0x84($s5) -/* DDD38C 80240B5C 8C420108 */ lw $v0, 0x108($v0) -/* DDD390 80240B60 080902DC */ j .L80240B70 -/* DDD394 80240B64 AEA20088 */ sw $v0, 0x88($s5) -.L80240B68: -/* DDD398 80240B68 2402FFFF */ addiu $v0, $zero, -1 -/* DDD39C 80240B6C AEA20084 */ sw $v0, 0x84($s5) -.L80240B70: -/* DDD3A0 80240B70 0C00AB4B */ jal heap_free -/* DDD3A4 80240B74 8EA40078 */ lw $a0, 0x78($s5) -/* DDD3A8 80240B78 24020002 */ addiu $v0, $zero, 2 -.L80240B7C: -/* DDD3AC 80240B7C 8FBF003C */ lw $ra, 0x3c($sp) -/* DDD3B0 80240B80 8FBE0038 */ lw $fp, 0x38($sp) -/* DDD3B4 80240B84 8FB70034 */ lw $s7, 0x34($sp) -/* DDD3B8 80240B88 8FB60030 */ lw $s6, 0x30($sp) -/* DDD3BC 80240B8C 8FB5002C */ lw $s5, 0x2c($sp) -/* DDD3C0 80240B90 8FB40028 */ lw $s4, 0x28($sp) -/* DDD3C4 80240B94 8FB30024 */ lw $s3, 0x24($sp) -/* DDD3C8 80240B98 8FB20020 */ lw $s2, 0x20($sp) -/* DDD3CC 80240B9C 8FB1001C */ lw $s1, 0x1c($sp) -/* DDD3D0 80240BA0 8FB00018 */ lw $s0, 0x18($sp) -/* DDD3D4 80240BA4 03E00008 */ jr $ra -/* DDD3D8 80240BA8 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_8024003C_D2FCBC.s b/ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_8024003C_D2FCBC.s deleted file mode 100644 index 6b12f27160..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_8024003C_D2FCBC.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024003C_D2FCBC -/* D2FCBC 8024003C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D2FCC0 80240040 AFBF0010 */ sw $ra, 0x10($sp) -/* D2FCC4 80240044 8C82000C */ lw $v0, 0xc($a0) -/* D2FCC8 80240048 0C0B1EAF */ jal evt_get_variable -/* D2FCCC 8024004C 8C450000 */ lw $a1, ($v0) -/* D2FCD0 80240050 0C0B95A4 */ jal entity_upgrade_block_hide_content -/* D2FCD4 80240054 0040202D */ daddu $a0, $v0, $zero -/* D2FCD8 80240058 8FBF0010 */ lw $ra, 0x10($sp) -/* D2FCDC 8024005C 24020002 */ addiu $v0, $zero, 2 -/* D2FCE0 80240060 03E00008 */ jr $ra -/* D2FCE4 80240064 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_802401CC_D2FE4C.s b/ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_802401CC_D2FE4C.s deleted file mode 100644 index 3532e86d63..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_802401CC_D2FE4C.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401CC_D2FE4C -/* D2FE4C 802401CC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* D2FE50 802401D0 AFB5002C */ sw $s5, 0x2c($sp) -/* D2FE54 802401D4 0080A82D */ daddu $s5, $a0, $zero -/* D2FE58 802401D8 AFBE0038 */ sw $fp, 0x38($sp) -/* D2FE5C 802401DC 3C1E8011 */ lui $fp, %hi(gPlayerData) -/* D2FE60 802401E0 27DEF290 */ addiu $fp, $fp, %lo(gPlayerData) -/* D2FE64 802401E4 AFBF003C */ sw $ra, 0x3c($sp) -/* D2FE68 802401E8 AFB70034 */ sw $s7, 0x34($sp) -/* D2FE6C 802401EC AFB60030 */ sw $s6, 0x30($sp) -/* D2FE70 802401F0 AFB40028 */ sw $s4, 0x28($sp) -/* D2FE74 802401F4 AFB30024 */ sw $s3, 0x24($sp) -/* D2FE78 802401F8 AFB20020 */ sw $s2, 0x20($sp) -/* D2FE7C 802401FC AFB1001C */ sw $s1, 0x1c($sp) -/* D2FE80 80240200 10A0004F */ beqz $a1, .L80240340 -/* D2FE84 80240204 AFB00018 */ sw $s0, 0x18($sp) -/* D2FE88 80240208 0C00AB39 */ jal heap_malloc -/* D2FE8C 8024020C 24040330 */ addiu $a0, $zero, 0x330 -/* D2FE90 80240210 0040982D */ daddu $s3, $v0, $zero -/* D2FE94 80240214 0000B02D */ daddu $s6, $zero, $zero -/* D2FE98 80240218 02C0902D */ daddu $s2, $s6, $zero -/* D2FE9C 8024021C 3C148024 */ lui $s4, %hi(D_80241AE8_D31768) -/* D2FEA0 80240220 26941AE8 */ addiu $s4, $s4, %lo(D_80241AE8_D31768) -/* D2FEA4 80240224 0260882D */ daddu $s1, $s3, $zero -/* D2FEA8 80240228 8EA200B4 */ lw $v0, 0xb4($s5) -/* D2FEAC 8024022C 3C038024 */ lui $v1, %hi(D_80241AE0_D31760) -/* D2FEB0 80240230 24631AE0 */ addiu $v1, $v1, %lo(D_80241AE0_D31760) -/* D2FEB4 80240234 AEB30078 */ sw $s3, 0x78($s5) -/* D2FEB8 80240238 00021027 */ nor $v0, $zero, $v0 -/* D2FEBC 8024023C 0002BFC2 */ srl $s7, $v0, 0x1f -/* D2FEC0 80240240 00171080 */ sll $v0, $s7, 2 -/* D2FEC4 80240244 00431021 */ addu $v0, $v0, $v1 -/* D2FEC8 80240248 AFA20010 */ sw $v0, 0x10($sp) -.L8024024C: -/* D2FECC 8024024C 86900000 */ lh $s0, ($s4) -/* D2FED0 80240250 001010C0 */ sll $v0, $s0, 3 -/* D2FED4 80240254 03C21021 */ addu $v0, $fp, $v0 -/* D2FED8 80240258 90420014 */ lbu $v0, 0x14($v0) -/* D2FEDC 8024025C 5040002E */ beql $v0, $zero, .L80240318 -/* D2FEE0 80240260 26520001 */ addiu $s2, $s2, 1 -/* D2FEE4 80240264 00101100 */ sll $v0, $s0, 4 -/* D2FEE8 80240268 3C068009 */ lui $a2, %hi(gPartnerPopupProperties) -/* D2FEEC 8024026C 24C6EF20 */ addiu $a2, $a2, %lo(gPartnerPopupProperties) -/* D2FEF0 80240270 00461021 */ addu $v0, $v0, $a2 -/* D2FEF4 80240274 0200202D */ daddu $a0, $s0, $zero -/* D2FEF8 80240278 AE300108 */ sw $s0, 0x108($s1) -/* D2FEFC 8024027C 8C420000 */ lw $v0, ($v0) -/* D2FF00 80240280 02E0282D */ daddu $a1, $s7, $zero -/* D2FF04 80240284 0C090035 */ jal sam_08_UnkFunc37 -/* D2FF08 80240288 AE220084 */ sw $v0, 0x84($s1) -/* D2FF0C 8024028C 0040202D */ daddu $a0, $v0, $zero -/* D2FF10 80240290 04800011 */ bltz $a0, .L802402D8 -/* D2FF14 80240294 00101080 */ sll $v0, $s0, 2 -/* D2FF18 80240298 3C06800F */ lui $a2, %hi(wPartnerHudScripts) -/* D2FF1C 8024029C 24C67F00 */ addiu $a2, $a2, %lo(wPartnerHudScripts) -/* D2FF20 802402A0 00461021 */ addu $v0, $v0, $a2 -/* D2FF24 802402A4 8C430000 */ lw $v1, ($v0) -/* D2FF28 802402A8 24020001 */ addiu $v0, $zero, 1 -/* D2FF2C 802402AC AE22018C */ sw $v0, 0x18c($s1) -/* D2FF30 802402B0 00041080 */ sll $v0, $a0, 2 -/* D2FF34 802402B4 3C068024 */ lui $a2, %hi(D_80241AF8_D31778) -/* D2FF38 802402B8 24C61AF8 */ addiu $a2, $a2, %lo(D_80241AF8_D31778) -/* D2FF3C 802402BC AE230000 */ sw $v1, ($s1) -/* D2FF40 802402C0 001218C0 */ sll $v1, $s2, 3 -/* D2FF44 802402C4 00431021 */ addu $v0, $v0, $v1 -/* D2FF48 802402C8 00461021 */ addu $v0, $v0, $a2 -/* D2FF4C 802402CC 8C420000 */ lw $v0, ($v0) -/* D2FF50 802402D0 080900BF */ j .L802402FC -/* D2FF54 802402D4 AE220294 */ sw $v0, 0x294($s1) -.L802402D8: -/* D2FF58 802402D8 3C06800F */ lui $a2, %hi(wDisabledPartnerHudScripts) -/* D2FF5C 802402DC 24C67F40 */ addiu $a2, $a2, %lo(wDisabledPartnerHudScripts) -/* D2FF60 802402E0 00461021 */ addu $v0, $v0, $a2 -/* D2FF64 802402E4 8C420000 */ lw $v0, ($v0) -/* D2FF68 802402E8 AE20018C */ sw $zero, 0x18c($s1) -/* D2FF6C 802402EC AE220000 */ sw $v0, ($s1) -/* D2FF70 802402F0 8FA60010 */ lw $a2, 0x10($sp) -/* D2FF74 802402F4 8CC20000 */ lw $v0, ($a2) -/* D2FF78 802402F8 AE220294 */ sw $v0, 0x294($s1) -.L802402FC: -/* D2FF7C 802402FC 001010C0 */ sll $v0, $s0, 3 -/* D2FF80 80240300 03C21021 */ addu $v0, $fp, $v0 -/* D2FF84 80240304 80420015 */ lb $v0, 0x15($v0) -/* D2FF88 80240308 26D60001 */ addiu $s6, $s6, 1 -/* D2FF8C 8024030C AE220210 */ sw $v0, 0x210($s1) -/* D2FF90 80240310 26310004 */ addiu $s1, $s1, 4 -/* D2FF94 80240314 26520001 */ addiu $s2, $s2, 1 -.L80240318: -/* D2FF98 80240318 2A420008 */ slti $v0, $s2, 8 -/* D2FF9C 8024031C 1440FFCB */ bnez $v0, .L8024024C -/* D2FFA0 80240320 26940002 */ addiu $s4, $s4, 2 -/* D2FFA4 80240324 0260202D */ daddu $a0, $s3, $zero -/* D2FFA8 80240328 24020004 */ addiu $v0, $zero, 4 -/* D2FFAC 8024032C AC820318 */ sw $v0, 0x318($a0) -/* D2FFB0 80240330 AC960324 */ sw $s6, 0x324($a0) -/* D2FFB4 80240334 0C03D390 */ jal create_popup_menu -/* D2FFB8 80240338 AC800328 */ sw $zero, 0x328($a0) -/* D2FFBC 8024033C AEA00070 */ sw $zero, 0x70($s5) -.L80240340: -/* D2FFC0 80240340 8EA20070 */ lw $v0, 0x70($s5) -/* D2FFC4 80240344 8EB30078 */ lw $s3, 0x78($s5) -/* D2FFC8 80240348 14400008 */ bnez $v0, .L8024036C -/* D2FFCC 8024034C 24420001 */ addiu $v0, $v0, 1 -/* D2FFD0 80240350 8662032C */ lh $v0, 0x32c($s3) -/* D2FFD4 80240354 10400009 */ beqz $v0, .L8024037C -/* D2FFD8 80240358 AEA20074 */ sw $v0, 0x74($s5) -/* D2FFDC 8024035C 0C03C4EC */ jal hide_popup_menu -/* D2FFE0 80240360 00000000 */ nop -/* D2FFE4 80240364 8EA20070 */ lw $v0, 0x70($s5) -/* D2FFE8 80240368 24420001 */ addiu $v0, $v0, 1 -.L8024036C: -/* D2FFEC 8024036C AEA20070 */ sw $v0, 0x70($s5) -/* D2FFF0 80240370 2842000F */ slti $v0, $v0, 0xf -/* D2FFF4 80240374 10400003 */ beqz $v0, .L80240384 -/* D2FFF8 80240378 00000000 */ nop -.L8024037C: -/* D2FFFC 8024037C 080900FB */ j .L802403EC -/* D30000 80240380 0000102D */ daddu $v0, $zero, $zero -.L80240384: -/* D30004 80240384 0C03C54E */ jal destroy_popup_menu -/* D30008 80240388 00000000 */ nop -/* D3000C 8024038C 8EA30074 */ lw $v1, 0x74($s5) -/* D30010 80240390 240200FF */ addiu $v0, $zero, 0xff -/* D30014 80240394 10620010 */ beq $v1, $v0, .L802403D8 -/* D30018 80240398 2462FFFF */ addiu $v0, $v1, -1 -/* D3001C 8024039C 00021080 */ sll $v0, $v0, 2 -/* D30020 802403A0 02621021 */ addu $v0, $s3, $v0 -/* D30024 802403A4 8C420108 */ lw $v0, 0x108($v0) -/* D30028 802403A8 00021100 */ sll $v0, $v0, 4 -/* D3002C 802403AC 3C038009 */ lui $v1, %hi(gPartnerPopupProperties) -/* D30030 802403B0 00621821 */ addu $v1, $v1, $v0 -/* D30034 802403B4 8C63EF20 */ lw $v1, %lo(gPartnerPopupProperties)($v1) -/* D30038 802403B8 8EA20074 */ lw $v0, 0x74($s5) -/* D3003C 802403BC 2442FFFF */ addiu $v0, $v0, -1 -/* D30040 802403C0 00021080 */ sll $v0, $v0, 2 -/* D30044 802403C4 02621021 */ addu $v0, $s3, $v0 -/* D30048 802403C8 AEA30084 */ sw $v1, 0x84($s5) -/* D3004C 802403CC 8C420108 */ lw $v0, 0x108($v0) -/* D30050 802403D0 080900F8 */ j .L802403E0 -/* D30054 802403D4 AEA20088 */ sw $v0, 0x88($s5) -.L802403D8: -/* D30058 802403D8 2402FFFF */ addiu $v0, $zero, -1 -/* D3005C 802403DC AEA20084 */ sw $v0, 0x84($s5) -.L802403E0: -/* D30060 802403E0 0C00AB4B */ jal heap_free -/* D30064 802403E4 8EA40078 */ lw $a0, 0x78($s5) -/* D30068 802403E8 24020002 */ addiu $v0, $zero, 2 -.L802403EC: -/* D3006C 802403EC 8FBF003C */ lw $ra, 0x3c($sp) -/* D30070 802403F0 8FBE0038 */ lw $fp, 0x38($sp) -/* D30074 802403F4 8FB70034 */ lw $s7, 0x34($sp) -/* D30078 802403F8 8FB60030 */ lw $s6, 0x30($sp) -/* D3007C 802403FC 8FB5002C */ lw $s5, 0x2c($sp) -/* D30080 80240400 8FB40028 */ lw $s4, 0x28($sp) -/* D30084 80240404 8FB30024 */ lw $s3, 0x24($sp) -/* D30088 80240408 8FB20020 */ lw $s2, 0x20($sp) -/* D3008C 8024040C 8FB1001C */ lw $s1, 0x1c($sp) -/* D30090 80240410 8FB00018 */ lw $s0, 0x18($sp) -/* D30094 80240414 03E00008 */ jr $ra -/* D30098 80240418 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802400BC_95407C.s b/ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802400BC_95407C.s deleted file mode 100644 index 31d4f01096..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802400BC_95407C.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400BC_95407C -/* 95407C 802400BC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 954080 802400C0 AFBF0010 */ sw $ra, 0x10($sp) -/* 954084 802400C4 8C82000C */ lw $v0, 0xc($a0) -/* 954088 802400C8 0C0B1EAF */ jal evt_get_variable -/* 95408C 802400CC 8C450000 */ lw $a1, ($v0) -/* 954090 802400D0 0C0B95A4 */ jal entity_upgrade_block_hide_content -/* 954094 802400D4 0040202D */ daddu $a0, $v0, $zero -/* 954098 802400D8 8FBF0010 */ lw $ra, 0x10($sp) -/* 95409C 802400DC 24020002 */ addiu $v0, $zero, 2 -/* 9540A0 802400E0 03E00008 */ jr $ra -/* 9540A4 802400E4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_8024024C_95420C.s b/ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_8024024C_95420C.s deleted file mode 100644 index add50b27ab..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_8024024C_95420C.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024024C_95420C -/* 95420C 8024024C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 954210 80240250 AFB5002C */ sw $s5, 0x2c($sp) -/* 954214 80240254 0080A82D */ daddu $s5, $a0, $zero -/* 954218 80240258 AFBE0038 */ sw $fp, 0x38($sp) -/* 95421C 8024025C 3C1E8011 */ lui $fp, %hi(gPlayerData) -/* 954220 80240260 27DEF290 */ addiu $fp, $fp, %lo(gPlayerData) -/* 954224 80240264 AFBF003C */ sw $ra, 0x3c($sp) -/* 954228 80240268 AFB70034 */ sw $s7, 0x34($sp) -/* 95422C 8024026C AFB60030 */ sw $s6, 0x30($sp) -/* 954230 80240270 AFB40028 */ sw $s4, 0x28($sp) -/* 954234 80240274 AFB30024 */ sw $s3, 0x24($sp) -/* 954238 80240278 AFB20020 */ sw $s2, 0x20($sp) -/* 95423C 8024027C AFB1001C */ sw $s1, 0x1c($sp) -/* 954240 80240280 10A0004F */ beqz $a1, .L802403C0 -/* 954244 80240284 AFB00018 */ sw $s0, 0x18($sp) -/* 954248 80240288 0C00AB39 */ jal heap_malloc -/* 95424C 8024028C 24040330 */ addiu $a0, $zero, 0x330 -/* 954250 80240290 0040982D */ daddu $s3, $v0, $zero -/* 954254 80240294 0000B02D */ daddu $s6, $zero, $zero -/* 954258 80240298 02C0902D */ daddu $s2, $s6, $zero -/* 95425C 8024029C 3C148024 */ lui $s4, %hi(D_80241438_9553F8) -/* 954260 802402A0 26941438 */ addiu $s4, $s4, %lo(D_80241438_9553F8) -/* 954264 802402A4 0260882D */ daddu $s1, $s3, $zero -/* 954268 802402A8 8EA200B4 */ lw $v0, 0xb4($s5) -/* 95426C 802402AC 3C038024 */ lui $v1, %hi(D_80241430_9553F0) -/* 954270 802402B0 24631430 */ addiu $v1, $v1, %lo(D_80241430_9553F0) -/* 954274 802402B4 AEB30078 */ sw $s3, 0x78($s5) -/* 954278 802402B8 00021027 */ nor $v0, $zero, $v0 -/* 95427C 802402BC 0002BFC2 */ srl $s7, $v0, 0x1f -/* 954280 802402C0 00171080 */ sll $v0, $s7, 2 -/* 954284 802402C4 00431021 */ addu $v0, $v0, $v1 -/* 954288 802402C8 AFA20010 */ sw $v0, 0x10($sp) -.L802402CC: -/* 95428C 802402CC 86900000 */ lh $s0, ($s4) -/* 954290 802402D0 001010C0 */ sll $v0, $s0, 3 -/* 954294 802402D4 03C21021 */ addu $v0, $fp, $v0 -/* 954298 802402D8 90420014 */ lbu $v0, 0x14($v0) -/* 95429C 802402DC 5040002E */ beql $v0, $zero, .L80240398 -/* 9542A0 802402E0 26520001 */ addiu $s2, $s2, 1 -/* 9542A4 802402E4 00101100 */ sll $v0, $s0, 4 -/* 9542A8 802402E8 3C068009 */ lui $a2, %hi(gPartnerPopupProperties) -/* 9542AC 802402EC 24C6EF20 */ addiu $a2, $a2, %lo(gPartnerPopupProperties) -/* 9542B0 802402F0 00461021 */ addu $v0, $v0, $a2 -/* 9542B4 802402F4 0200202D */ daddu $a0, $s0, $zero -/* 9542B8 802402F8 AE300108 */ sw $s0, 0x108($s1) -/* 9542BC 802402FC 8C420000 */ lw $v0, ($v0) -/* 9542C0 80240300 02E0282D */ daddu $a1, $s7, $zero -/* 9542C4 80240304 0C090055 */ jal sbk_56_UnkFunc37 -/* 9542C8 80240308 AE220084 */ sw $v0, 0x84($s1) -/* 9542CC 8024030C 0040202D */ daddu $a0, $v0, $zero -/* 9542D0 80240310 04800011 */ bltz $a0, .L80240358 -/* 9542D4 80240314 00101080 */ sll $v0, $s0, 2 -/* 9542D8 80240318 3C06800F */ lui $a2, %hi(wPartnerHudScripts) -/* 9542DC 8024031C 24C67F00 */ addiu $a2, $a2, %lo(wPartnerHudScripts) -/* 9542E0 80240320 00461021 */ addu $v0, $v0, $a2 -/* 9542E4 80240324 8C430000 */ lw $v1, ($v0) -/* 9542E8 80240328 24020001 */ addiu $v0, $zero, 1 -/* 9542EC 8024032C AE22018C */ sw $v0, 0x18c($s1) -/* 9542F0 80240330 00041080 */ sll $v0, $a0, 2 -/* 9542F4 80240334 3C068024 */ lui $a2, %hi(D_80241448_955408) -/* 9542F8 80240338 24C61448 */ addiu $a2, $a2, %lo(D_80241448_955408) -/* 9542FC 8024033C AE230000 */ sw $v1, ($s1) -/* 954300 80240340 001218C0 */ sll $v1, $s2, 3 -/* 954304 80240344 00431021 */ addu $v0, $v0, $v1 -/* 954308 80240348 00461021 */ addu $v0, $v0, $a2 -/* 95430C 8024034C 8C420000 */ lw $v0, ($v0) -/* 954310 80240350 080900DF */ j .L8024037C -/* 954314 80240354 AE220294 */ sw $v0, 0x294($s1) -.L80240358: -/* 954318 80240358 3C06800F */ lui $a2, %hi(wDisabledPartnerHudScripts) -/* 95431C 8024035C 24C67F40 */ addiu $a2, $a2, %lo(wDisabledPartnerHudScripts) -/* 954320 80240360 00461021 */ addu $v0, $v0, $a2 -/* 954324 80240364 8C420000 */ lw $v0, ($v0) -/* 954328 80240368 AE20018C */ sw $zero, 0x18c($s1) -/* 95432C 8024036C AE220000 */ sw $v0, ($s1) -/* 954330 80240370 8FA60010 */ lw $a2, 0x10($sp) -/* 954334 80240374 8CC20000 */ lw $v0, ($a2) -/* 954338 80240378 AE220294 */ sw $v0, 0x294($s1) -.L8024037C: -/* 95433C 8024037C 001010C0 */ sll $v0, $s0, 3 -/* 954340 80240380 03C21021 */ addu $v0, $fp, $v0 -/* 954344 80240384 80420015 */ lb $v0, 0x15($v0) -/* 954348 80240388 26D60001 */ addiu $s6, $s6, 1 -/* 95434C 8024038C AE220210 */ sw $v0, 0x210($s1) -/* 954350 80240390 26310004 */ addiu $s1, $s1, 4 -/* 954354 80240394 26520001 */ addiu $s2, $s2, 1 -.L80240398: -/* 954358 80240398 2A420008 */ slti $v0, $s2, 8 -/* 95435C 8024039C 1440FFCB */ bnez $v0, .L802402CC -/* 954360 802403A0 26940002 */ addiu $s4, $s4, 2 -/* 954364 802403A4 0260202D */ daddu $a0, $s3, $zero -/* 954368 802403A8 24020004 */ addiu $v0, $zero, 4 -/* 95436C 802403AC AC820318 */ sw $v0, 0x318($a0) -/* 954370 802403B0 AC960324 */ sw $s6, 0x324($a0) -/* 954374 802403B4 0C03D390 */ jal create_popup_menu -/* 954378 802403B8 AC800328 */ sw $zero, 0x328($a0) -/* 95437C 802403BC AEA00070 */ sw $zero, 0x70($s5) -.L802403C0: -/* 954380 802403C0 8EA20070 */ lw $v0, 0x70($s5) -/* 954384 802403C4 8EB30078 */ lw $s3, 0x78($s5) -/* 954388 802403C8 14400008 */ bnez $v0, .L802403EC -/* 95438C 802403CC 24420001 */ addiu $v0, $v0, 1 -/* 954390 802403D0 8662032C */ lh $v0, 0x32c($s3) -/* 954394 802403D4 10400009 */ beqz $v0, .L802403FC -/* 954398 802403D8 AEA20074 */ sw $v0, 0x74($s5) -/* 95439C 802403DC 0C03C4EC */ jal hide_popup_menu -/* 9543A0 802403E0 00000000 */ nop -/* 9543A4 802403E4 8EA20070 */ lw $v0, 0x70($s5) -/* 9543A8 802403E8 24420001 */ addiu $v0, $v0, 1 -.L802403EC: -/* 9543AC 802403EC AEA20070 */ sw $v0, 0x70($s5) -/* 9543B0 802403F0 2842000F */ slti $v0, $v0, 0xf -/* 9543B4 802403F4 10400003 */ beqz $v0, .L80240404 -/* 9543B8 802403F8 00000000 */ nop -.L802403FC: -/* 9543BC 802403FC 0809011B */ j .L8024046C -/* 9543C0 80240400 0000102D */ daddu $v0, $zero, $zero -.L80240404: -/* 9543C4 80240404 0C03C54E */ jal destroy_popup_menu -/* 9543C8 80240408 00000000 */ nop -/* 9543CC 8024040C 8EA30074 */ lw $v1, 0x74($s5) -/* 9543D0 80240410 240200FF */ addiu $v0, $zero, 0xff -/* 9543D4 80240414 10620010 */ beq $v1, $v0, .L80240458 -/* 9543D8 80240418 2462FFFF */ addiu $v0, $v1, -1 -/* 9543DC 8024041C 00021080 */ sll $v0, $v0, 2 -/* 9543E0 80240420 02621021 */ addu $v0, $s3, $v0 -/* 9543E4 80240424 8C420108 */ lw $v0, 0x108($v0) -/* 9543E8 80240428 00021100 */ sll $v0, $v0, 4 -/* 9543EC 8024042C 3C038009 */ lui $v1, %hi(gPartnerPopupProperties) -/* 9543F0 80240430 00621821 */ addu $v1, $v1, $v0 -/* 9543F4 80240434 8C63EF20 */ lw $v1, %lo(gPartnerPopupProperties)($v1) -/* 9543F8 80240438 8EA20074 */ lw $v0, 0x74($s5) -/* 9543FC 8024043C 2442FFFF */ addiu $v0, $v0, -1 -/* 954400 80240440 00021080 */ sll $v0, $v0, 2 -/* 954404 80240444 02621021 */ addu $v0, $s3, $v0 -/* 954408 80240448 AEA30084 */ sw $v1, 0x84($s5) -/* 95440C 8024044C 8C420108 */ lw $v0, 0x108($v0) -/* 954410 80240450 08090118 */ j .L80240460 -/* 954414 80240454 AEA20088 */ sw $v0, 0x88($s5) -.L80240458: -/* 954418 80240458 2402FFFF */ addiu $v0, $zero, -1 -/* 95441C 8024045C AEA20084 */ sw $v0, 0x84($s5) -.L80240460: -/* 954420 80240460 0C00AB4B */ jal heap_free -/* 954424 80240464 8EA40078 */ lw $a0, 0x78($s5) -/* 954428 80240468 24020002 */ addiu $v0, $zero, 2 -.L8024046C: -/* 95442C 8024046C 8FBF003C */ lw $ra, 0x3c($sp) -/* 954430 80240470 8FBE0038 */ lw $fp, 0x38($sp) -/* 954434 80240474 8FB70034 */ lw $s7, 0x34($sp) -/* 954438 80240478 8FB60030 */ lw $s6, 0x30($sp) -/* 95443C 8024047C 8FB5002C */ lw $s5, 0x2c($sp) -/* 954440 80240480 8FB40028 */ lw $s4, 0x28($sp) -/* 954444 80240484 8FB30024 */ lw $s3, 0x24($sp) -/* 954448 80240488 8FB20020 */ lw $s2, 0x20($sp) -/* 95444C 8024048C 8FB1001C */ lw $s1, 0x1c($sp) -/* 954450 80240490 8FB00018 */ lw $s0, 0x18($sp) -/* 954454 80240494 03E00008 */ jr $ra -/* 954458 80240498 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_8024031C_879EFC.s b/ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_8024031C_879EFC.s deleted file mode 100644 index 3ef902e439..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_8024031C_879EFC.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024031C_879EFC -/* 879EFC 8024031C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 879F00 80240320 AFBF0010 */ sw $ra, 0x10($sp) -/* 879F04 80240324 8C82000C */ lw $v0, 0xc($a0) -/* 879F08 80240328 0C0B1EAF */ jal evt_get_variable -/* 879F0C 8024032C 8C450000 */ lw $a1, ($v0) -/* 879F10 80240330 0C0B95A4 */ jal entity_upgrade_block_hide_content -/* 879F14 80240334 0040202D */ daddu $a0, $v0, $zero -/* 879F18 80240338 8FBF0010 */ lw $ra, 0x10($sp) -/* 879F1C 8024033C 24020002 */ addiu $v0, $zero, 2 -/* 879F20 80240340 03E00008 */ jr $ra -/* 879F24 80240344 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802404AC_87A08C.s b/ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802404AC_87A08C.s deleted file mode 100644 index dbe7863fe8..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802404AC_87A08C.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404AC_87A08C -/* 87A08C 802404AC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 87A090 802404B0 AFB5002C */ sw $s5, 0x2c($sp) -/* 87A094 802404B4 0080A82D */ daddu $s5, $a0, $zero -/* 87A098 802404B8 AFBE0038 */ sw $fp, 0x38($sp) -/* 87A09C 802404BC 3C1E8011 */ lui $fp, %hi(gPlayerData) -/* 87A0A0 802404C0 27DEF290 */ addiu $fp, $fp, %lo(gPlayerData) -/* 87A0A4 802404C4 AFBF003C */ sw $ra, 0x3c($sp) -/* 87A0A8 802404C8 AFB70034 */ sw $s7, 0x34($sp) -/* 87A0AC 802404CC AFB60030 */ sw $s6, 0x30($sp) -/* 87A0B0 802404D0 AFB40028 */ sw $s4, 0x28($sp) -/* 87A0B4 802404D4 AFB30024 */ sw $s3, 0x24($sp) -/* 87A0B8 802404D8 AFB20020 */ sw $s2, 0x20($sp) -/* 87A0BC 802404DC AFB1001C */ sw $s1, 0x1c($sp) -/* 87A0C0 802404E0 10A0004F */ beqz $a1, .L80240620 -/* 87A0C4 802404E4 AFB00018 */ sw $s0, 0x18($sp) -/* 87A0C8 802404E8 0C00AB39 */ jal heap_malloc -/* 87A0CC 802404EC 24040330 */ addiu $a0, $zero, 0x330 -/* 87A0D0 802404F0 0040982D */ daddu $s3, $v0, $zero -/* 87A0D4 802404F4 0000B02D */ daddu $s6, $zero, $zero -/* 87A0D8 802404F8 02C0902D */ daddu $s2, $s6, $zero -/* 87A0DC 802404FC 3C148024 */ lui $s4, %hi(D_802439F8_87D5D8) -/* 87A0E0 80240500 269439F8 */ addiu $s4, $s4, %lo(D_802439F8_87D5D8) -/* 87A0E4 80240504 0260882D */ daddu $s1, $s3, $zero -/* 87A0E8 80240508 8EA200B4 */ lw $v0, 0xb4($s5) -/* 87A0EC 8024050C 3C038024 */ lui $v1, %hi(D_802439F0_87D5D0) -/* 87A0F0 80240510 246339F0 */ addiu $v1, $v1, %lo(D_802439F0_87D5D0) -/* 87A0F4 80240514 AEB30078 */ sw $s3, 0x78($s5) -/* 87A0F8 80240518 00021027 */ nor $v0, $zero, $v0 -/* 87A0FC 8024051C 0002BFC2 */ srl $s7, $v0, 0x1f -/* 87A100 80240520 00171080 */ sll $v0, $s7, 2 -/* 87A104 80240524 00431021 */ addu $v0, $v0, $v1 -/* 87A108 80240528 AFA20010 */ sw $v0, 0x10($sp) -.L8024052C: -/* 87A10C 8024052C 86900000 */ lh $s0, ($s4) -/* 87A110 80240530 001010C0 */ sll $v0, $s0, 3 -/* 87A114 80240534 03C21021 */ addu $v0, $fp, $v0 -/* 87A118 80240538 90420014 */ lbu $v0, 0x14($v0) -/* 87A11C 8024053C 5040002E */ beql $v0, $zero, .L802405F8 -/* 87A120 80240540 26520001 */ addiu $s2, $s2, 1 -/* 87A124 80240544 00101100 */ sll $v0, $s0, 4 -/* 87A128 80240548 3C068009 */ lui $a2, %hi(gPartnerPopupProperties) -/* 87A12C 8024054C 24C6EF20 */ addiu $a2, $a2, %lo(gPartnerPopupProperties) -/* 87A130 80240550 00461021 */ addu $v0, $v0, $a2 -/* 87A134 80240554 0200202D */ daddu $a0, $s0, $zero -/* 87A138 80240558 AE300108 */ sw $s0, 0x108($s1) -/* 87A13C 8024055C 8C420000 */ lw $v0, ($v0) -/* 87A140 80240560 02E0282D */ daddu $a1, $s7, $zero -/* 87A144 80240564 0C0900ED */ jal tik_07_UnkFunc37 -/* 87A148 80240568 AE220084 */ sw $v0, 0x84($s1) -/* 87A14C 8024056C 0040202D */ daddu $a0, $v0, $zero -/* 87A150 80240570 04800011 */ bltz $a0, .L802405B8 -/* 87A154 80240574 00101080 */ sll $v0, $s0, 2 -/* 87A158 80240578 3C06800F */ lui $a2, %hi(wPartnerHudScripts) -/* 87A15C 8024057C 24C67F00 */ addiu $a2, $a2, %lo(wPartnerHudScripts) -/* 87A160 80240580 00461021 */ addu $v0, $v0, $a2 -/* 87A164 80240584 8C430000 */ lw $v1, ($v0) -/* 87A168 80240588 24020001 */ addiu $v0, $zero, 1 -/* 87A16C 8024058C AE22018C */ sw $v0, 0x18c($s1) -/* 87A170 80240590 00041080 */ sll $v0, $a0, 2 -/* 87A174 80240594 3C068024 */ lui $a2, %hi(D_80243A08_87D5E8) -/* 87A178 80240598 24C63A08 */ addiu $a2, $a2, %lo(D_80243A08_87D5E8) -/* 87A17C 8024059C AE230000 */ sw $v1, ($s1) -/* 87A180 802405A0 001218C0 */ sll $v1, $s2, 3 -/* 87A184 802405A4 00431021 */ addu $v0, $v0, $v1 -/* 87A188 802405A8 00461021 */ addu $v0, $v0, $a2 -/* 87A18C 802405AC 8C420000 */ lw $v0, ($v0) -/* 87A190 802405B0 08090177 */ j .L802405DC -/* 87A194 802405B4 AE220294 */ sw $v0, 0x294($s1) -.L802405B8: -/* 87A198 802405B8 3C06800F */ lui $a2, %hi(wDisabledPartnerHudScripts) -/* 87A19C 802405BC 24C67F40 */ addiu $a2, $a2, %lo(wDisabledPartnerHudScripts) -/* 87A1A0 802405C0 00461021 */ addu $v0, $v0, $a2 -/* 87A1A4 802405C4 8C420000 */ lw $v0, ($v0) -/* 87A1A8 802405C8 AE20018C */ sw $zero, 0x18c($s1) -/* 87A1AC 802405CC AE220000 */ sw $v0, ($s1) -/* 87A1B0 802405D0 8FA60010 */ lw $a2, 0x10($sp) -/* 87A1B4 802405D4 8CC20000 */ lw $v0, ($a2) -/* 87A1B8 802405D8 AE220294 */ sw $v0, 0x294($s1) -.L802405DC: -/* 87A1BC 802405DC 001010C0 */ sll $v0, $s0, 3 -/* 87A1C0 802405E0 03C21021 */ addu $v0, $fp, $v0 -/* 87A1C4 802405E4 80420015 */ lb $v0, 0x15($v0) -/* 87A1C8 802405E8 26D60001 */ addiu $s6, $s6, 1 -/* 87A1CC 802405EC AE220210 */ sw $v0, 0x210($s1) -/* 87A1D0 802405F0 26310004 */ addiu $s1, $s1, 4 -/* 87A1D4 802405F4 26520001 */ addiu $s2, $s2, 1 -.L802405F8: -/* 87A1D8 802405F8 2A420008 */ slti $v0, $s2, 8 -/* 87A1DC 802405FC 1440FFCB */ bnez $v0, .L8024052C -/* 87A1E0 80240600 26940002 */ addiu $s4, $s4, 2 -/* 87A1E4 80240604 0260202D */ daddu $a0, $s3, $zero -/* 87A1E8 80240608 24020004 */ addiu $v0, $zero, 4 -/* 87A1EC 8024060C AC820318 */ sw $v0, 0x318($a0) -/* 87A1F0 80240610 AC960324 */ sw $s6, 0x324($a0) -/* 87A1F4 80240614 0C03D390 */ jal create_popup_menu -/* 87A1F8 80240618 AC800328 */ sw $zero, 0x328($a0) -/* 87A1FC 8024061C AEA00070 */ sw $zero, 0x70($s5) -.L80240620: -/* 87A200 80240620 8EA20070 */ lw $v0, 0x70($s5) -/* 87A204 80240624 8EB30078 */ lw $s3, 0x78($s5) -/* 87A208 80240628 14400008 */ bnez $v0, .L8024064C -/* 87A20C 8024062C 24420001 */ addiu $v0, $v0, 1 -/* 87A210 80240630 8662032C */ lh $v0, 0x32c($s3) -/* 87A214 80240634 10400009 */ beqz $v0, .L8024065C -/* 87A218 80240638 AEA20074 */ sw $v0, 0x74($s5) -/* 87A21C 8024063C 0C03C4EC */ jal hide_popup_menu -/* 87A220 80240640 00000000 */ nop -/* 87A224 80240644 8EA20070 */ lw $v0, 0x70($s5) -/* 87A228 80240648 24420001 */ addiu $v0, $v0, 1 -.L8024064C: -/* 87A22C 8024064C AEA20070 */ sw $v0, 0x70($s5) -/* 87A230 80240650 2842000F */ slti $v0, $v0, 0xf -/* 87A234 80240654 10400003 */ beqz $v0, .L80240664 -/* 87A238 80240658 00000000 */ nop -.L8024065C: -/* 87A23C 8024065C 080901B3 */ j .L802406CC -/* 87A240 80240660 0000102D */ daddu $v0, $zero, $zero -.L80240664: -/* 87A244 80240664 0C03C54E */ jal destroy_popup_menu -/* 87A248 80240668 00000000 */ nop -/* 87A24C 8024066C 8EA30074 */ lw $v1, 0x74($s5) -/* 87A250 80240670 240200FF */ addiu $v0, $zero, 0xff -/* 87A254 80240674 10620010 */ beq $v1, $v0, .L802406B8 -/* 87A258 80240678 2462FFFF */ addiu $v0, $v1, -1 -/* 87A25C 8024067C 00021080 */ sll $v0, $v0, 2 -/* 87A260 80240680 02621021 */ addu $v0, $s3, $v0 -/* 87A264 80240684 8C420108 */ lw $v0, 0x108($v0) -/* 87A268 80240688 00021100 */ sll $v0, $v0, 4 -/* 87A26C 8024068C 3C038009 */ lui $v1, %hi(gPartnerPopupProperties) -/* 87A270 80240690 00621821 */ addu $v1, $v1, $v0 -/* 87A274 80240694 8C63EF20 */ lw $v1, %lo(gPartnerPopupProperties)($v1) -/* 87A278 80240698 8EA20074 */ lw $v0, 0x74($s5) -/* 87A27C 8024069C 2442FFFF */ addiu $v0, $v0, -1 -/* 87A280 802406A0 00021080 */ sll $v0, $v0, 2 -/* 87A284 802406A4 02621021 */ addu $v0, $s3, $v0 -/* 87A288 802406A8 AEA30084 */ sw $v1, 0x84($s5) -/* 87A28C 802406AC 8C420108 */ lw $v0, 0x108($v0) -/* 87A290 802406B0 080901B0 */ j .L802406C0 -/* 87A294 802406B4 AEA20088 */ sw $v0, 0x88($s5) -.L802406B8: -/* 87A298 802406B8 2402FFFF */ addiu $v0, $zero, -1 -/* 87A29C 802406BC AEA20084 */ sw $v0, 0x84($s5) -.L802406C0: -/* 87A2A0 802406C0 0C00AB4B */ jal heap_free -/* 87A2A4 802406C4 8EA40078 */ lw $a0, 0x78($s5) -/* 87A2A8 802406C8 24020002 */ addiu $v0, $zero, 2 -.L802406CC: -/* 87A2AC 802406CC 8FBF003C */ lw $ra, 0x3c($sp) -/* 87A2B0 802406D0 8FBE0038 */ lw $fp, 0x38($sp) -/* 87A2B4 802406D4 8FB70034 */ lw $s7, 0x34($sp) -/* 87A2B8 802406D8 8FB60030 */ lw $s6, 0x30($sp) -/* 87A2BC 802406DC 8FB5002C */ lw $s5, 0x2c($sp) -/* 87A2C0 802406E0 8FB40028 */ lw $s4, 0x28($sp) -/* 87A2C4 802406E4 8FB30024 */ lw $s3, 0x24($sp) -/* 87A2C8 802406E8 8FB20020 */ lw $s2, 0x20($sp) -/* 87A2CC 802406EC 8FB1001C */ lw $s1, 0x1c($sp) -/* 87A2D0 802406F0 8FB00018 */ lw $s0, 0x18($sp) -/* 87A2D4 802406F4 03E00008 */ jr $ra -/* 87A2D8 802406F8 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802406BC_886A7C.s b/ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802406BC_886A7C.s deleted file mode 100644 index 2f8666614d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802406BC_886A7C.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406BC_886A7C -/* 886A7C 802406BC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 886A80 802406C0 AFBF0010 */ sw $ra, 0x10($sp) -/* 886A84 802406C4 8C82000C */ lw $v0, 0xc($a0) -/* 886A88 802406C8 0C0B1EAF */ jal evt_get_variable -/* 886A8C 802406CC 8C450000 */ lw $a1, ($v0) -/* 886A90 802406D0 0C0B95A4 */ jal entity_upgrade_block_hide_content -/* 886A94 802406D4 0040202D */ daddu $a0, $v0, $zero -/* 886A98 802406D8 8FBF0010 */ lw $ra, 0x10($sp) -/* 886A9C 802406DC 24020002 */ addiu $v0, $zero, 2 -/* 886AA0 802406E0 03E00008 */ jr $ra -/* 886AA4 802406E4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_8024084C_886C0C.s b/ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_8024084C_886C0C.s deleted file mode 100644 index af157c2470..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_8024084C_886C0C.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024084C_886C0C -/* 886C0C 8024084C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 886C10 80240850 AFB5002C */ sw $s5, 0x2c($sp) -/* 886C14 80240854 0080A82D */ daddu $s5, $a0, $zero -/* 886C18 80240858 AFBE0038 */ sw $fp, 0x38($sp) -/* 886C1C 8024085C 3C1E8011 */ lui $fp, %hi(gPlayerData) -/* 886C20 80240860 27DEF290 */ addiu $fp, $fp, %lo(gPlayerData) -/* 886C24 80240864 AFBF003C */ sw $ra, 0x3c($sp) -/* 886C28 80240868 AFB70034 */ sw $s7, 0x34($sp) -/* 886C2C 8024086C AFB60030 */ sw $s6, 0x30($sp) -/* 886C30 80240870 AFB40028 */ sw $s4, 0x28($sp) -/* 886C34 80240874 AFB30024 */ sw $s3, 0x24($sp) -/* 886C38 80240878 AFB20020 */ sw $s2, 0x20($sp) -/* 886C3C 8024087C AFB1001C */ sw $s1, 0x1c($sp) -/* 886C40 80240880 10A0004F */ beqz $a1, .L802409C0 -/* 886C44 80240884 AFB00018 */ sw $s0, 0x18($sp) -/* 886C48 80240888 0C00AB39 */ jal heap_malloc -/* 886C4C 8024088C 24040330 */ addiu $a0, $zero, 0x330 -/* 886C50 80240890 0040982D */ daddu $s3, $v0, $zero -/* 886C54 80240894 0000B02D */ daddu $s6, $zero, $zero -/* 886C58 80240898 02C0902D */ daddu $s2, $s6, $zero -/* 886C5C 8024089C 3C148024 */ lui $s4, %hi(D_80242038_8883F8) -/* 886C60 802408A0 26942038 */ addiu $s4, $s4, %lo(D_80242038_8883F8) -/* 886C64 802408A4 0260882D */ daddu $s1, $s3, $zero -/* 886C68 802408A8 8EA200B4 */ lw $v0, 0xb4($s5) -/* 886C6C 802408AC 3C038024 */ lui $v1, %hi(D_80242030_8883F0) -/* 886C70 802408B0 24632030 */ addiu $v1, $v1, %lo(D_80242030_8883F0) -/* 886C74 802408B4 AEB30078 */ sw $s3, 0x78($s5) -/* 886C78 802408B8 00021027 */ nor $v0, $zero, $v0 -/* 886C7C 802408BC 0002BFC2 */ srl $s7, $v0, 0x1f -/* 886C80 802408C0 00171080 */ sll $v0, $s7, 2 -/* 886C84 802408C4 00431021 */ addu $v0, $v0, $v1 -/* 886C88 802408C8 AFA20010 */ sw $v0, 0x10($sp) -.L802408CC: -/* 886C8C 802408CC 86900000 */ lh $s0, ($s4) -/* 886C90 802408D0 001010C0 */ sll $v0, $s0, 3 -/* 886C94 802408D4 03C21021 */ addu $v0, $fp, $v0 -/* 886C98 802408D8 90420014 */ lbu $v0, 0x14($v0) -/* 886C9C 802408DC 5040002E */ beql $v0, $zero, .L80240998 -/* 886CA0 802408E0 26520001 */ addiu $s2, $s2, 1 -/* 886CA4 802408E4 00101100 */ sll $v0, $s0, 4 -/* 886CA8 802408E8 3C068009 */ lui $a2, %hi(gPartnerPopupProperties) -/* 886CAC 802408EC 24C6EF20 */ addiu $a2, $a2, %lo(gPartnerPopupProperties) -/* 886CB0 802408F0 00461021 */ addu $v0, $v0, $a2 -/* 886CB4 802408F4 0200202D */ daddu $a0, $s0, $zero -/* 886CB8 802408F8 AE300108 */ sw $s0, 0x108($s1) -/* 886CBC 802408FC 8C420000 */ lw $v0, ($v0) -/* 886CC0 80240900 02E0282D */ daddu $a1, $s7, $zero -/* 886CC4 80240904 0C0901D5 */ jal tik_10_UnkFunc37 -/* 886CC8 80240908 AE220084 */ sw $v0, 0x84($s1) -/* 886CCC 8024090C 0040202D */ daddu $a0, $v0, $zero -/* 886CD0 80240910 04800011 */ bltz $a0, .L80240958 -/* 886CD4 80240914 00101080 */ sll $v0, $s0, 2 -/* 886CD8 80240918 3C06800F */ lui $a2, %hi(wPartnerHudScripts) -/* 886CDC 8024091C 24C67F00 */ addiu $a2, $a2, %lo(wPartnerHudScripts) -/* 886CE0 80240920 00461021 */ addu $v0, $v0, $a2 -/* 886CE4 80240924 8C430000 */ lw $v1, ($v0) -/* 886CE8 80240928 24020001 */ addiu $v0, $zero, 1 -/* 886CEC 8024092C AE22018C */ sw $v0, 0x18c($s1) -/* 886CF0 80240930 00041080 */ sll $v0, $a0, 2 -/* 886CF4 80240934 3C068024 */ lui $a2, %hi(D_80242048_888408) -/* 886CF8 80240938 24C62048 */ addiu $a2, $a2, %lo(D_80242048_888408) -/* 886CFC 8024093C AE230000 */ sw $v1, ($s1) -/* 886D00 80240940 001218C0 */ sll $v1, $s2, 3 -/* 886D04 80240944 00431021 */ addu $v0, $v0, $v1 -/* 886D08 80240948 00461021 */ addu $v0, $v0, $a2 -/* 886D0C 8024094C 8C420000 */ lw $v0, ($v0) -/* 886D10 80240950 0809025F */ j .L8024097C -/* 886D14 80240954 AE220294 */ sw $v0, 0x294($s1) -.L80240958: -/* 886D18 80240958 3C06800F */ lui $a2, %hi(wDisabledPartnerHudScripts) -/* 886D1C 8024095C 24C67F40 */ addiu $a2, $a2, %lo(wDisabledPartnerHudScripts) -/* 886D20 80240960 00461021 */ addu $v0, $v0, $a2 -/* 886D24 80240964 8C420000 */ lw $v0, ($v0) -/* 886D28 80240968 AE20018C */ sw $zero, 0x18c($s1) -/* 886D2C 8024096C AE220000 */ sw $v0, ($s1) -/* 886D30 80240970 8FA60010 */ lw $a2, 0x10($sp) -/* 886D34 80240974 8CC20000 */ lw $v0, ($a2) -/* 886D38 80240978 AE220294 */ sw $v0, 0x294($s1) -.L8024097C: -/* 886D3C 8024097C 001010C0 */ sll $v0, $s0, 3 -/* 886D40 80240980 03C21021 */ addu $v0, $fp, $v0 -/* 886D44 80240984 80420015 */ lb $v0, 0x15($v0) -/* 886D48 80240988 26D60001 */ addiu $s6, $s6, 1 -/* 886D4C 8024098C AE220210 */ sw $v0, 0x210($s1) -/* 886D50 80240990 26310004 */ addiu $s1, $s1, 4 -/* 886D54 80240994 26520001 */ addiu $s2, $s2, 1 -.L80240998: -/* 886D58 80240998 2A420008 */ slti $v0, $s2, 8 -/* 886D5C 8024099C 1440FFCB */ bnez $v0, .L802408CC -/* 886D60 802409A0 26940002 */ addiu $s4, $s4, 2 -/* 886D64 802409A4 0260202D */ daddu $a0, $s3, $zero -/* 886D68 802409A8 24020004 */ addiu $v0, $zero, 4 -/* 886D6C 802409AC AC820318 */ sw $v0, 0x318($a0) -/* 886D70 802409B0 AC960324 */ sw $s6, 0x324($a0) -/* 886D74 802409B4 0C03D390 */ jal create_popup_menu -/* 886D78 802409B8 AC800328 */ sw $zero, 0x328($a0) -/* 886D7C 802409BC AEA00070 */ sw $zero, 0x70($s5) -.L802409C0: -/* 886D80 802409C0 8EA20070 */ lw $v0, 0x70($s5) -/* 886D84 802409C4 8EB30078 */ lw $s3, 0x78($s5) -/* 886D88 802409C8 14400008 */ bnez $v0, .L802409EC -/* 886D8C 802409CC 24420001 */ addiu $v0, $v0, 1 -/* 886D90 802409D0 8662032C */ lh $v0, 0x32c($s3) -/* 886D94 802409D4 10400009 */ beqz $v0, .L802409FC -/* 886D98 802409D8 AEA20074 */ sw $v0, 0x74($s5) -/* 886D9C 802409DC 0C03C4EC */ jal hide_popup_menu -/* 886DA0 802409E0 00000000 */ nop -/* 886DA4 802409E4 8EA20070 */ lw $v0, 0x70($s5) -/* 886DA8 802409E8 24420001 */ addiu $v0, $v0, 1 -.L802409EC: -/* 886DAC 802409EC AEA20070 */ sw $v0, 0x70($s5) -/* 886DB0 802409F0 2842000F */ slti $v0, $v0, 0xf -/* 886DB4 802409F4 10400003 */ beqz $v0, .L80240A04 -/* 886DB8 802409F8 00000000 */ nop -.L802409FC: -/* 886DBC 802409FC 0809029B */ j .L80240A6C -/* 886DC0 80240A00 0000102D */ daddu $v0, $zero, $zero -.L80240A04: -/* 886DC4 80240A04 0C03C54E */ jal destroy_popup_menu -/* 886DC8 80240A08 00000000 */ nop -/* 886DCC 80240A0C 8EA30074 */ lw $v1, 0x74($s5) -/* 886DD0 80240A10 240200FF */ addiu $v0, $zero, 0xff -/* 886DD4 80240A14 10620010 */ beq $v1, $v0, .L80240A58 -/* 886DD8 80240A18 2462FFFF */ addiu $v0, $v1, -1 -/* 886DDC 80240A1C 00021080 */ sll $v0, $v0, 2 -/* 886DE0 80240A20 02621021 */ addu $v0, $s3, $v0 -/* 886DE4 80240A24 8C420108 */ lw $v0, 0x108($v0) -/* 886DE8 80240A28 00021100 */ sll $v0, $v0, 4 -/* 886DEC 80240A2C 3C038009 */ lui $v1, %hi(gPartnerPopupProperties) -/* 886DF0 80240A30 00621821 */ addu $v1, $v1, $v0 -/* 886DF4 80240A34 8C63EF20 */ lw $v1, %lo(gPartnerPopupProperties)($v1) -/* 886DF8 80240A38 8EA20074 */ lw $v0, 0x74($s5) -/* 886DFC 80240A3C 2442FFFF */ addiu $v0, $v0, -1 -/* 886E00 80240A40 00021080 */ sll $v0, $v0, 2 -/* 886E04 80240A44 02621021 */ addu $v0, $s3, $v0 -/* 886E08 80240A48 AEA30084 */ sw $v1, 0x84($s5) -/* 886E0C 80240A4C 8C420108 */ lw $v0, 0x108($v0) -/* 886E10 80240A50 08090298 */ j .L80240A60 -/* 886E14 80240A54 AEA20088 */ sw $v0, 0x88($s5) -.L80240A58: -/* 886E18 80240A58 2402FFFF */ addiu $v0, $zero, -1 -/* 886E1C 80240A5C AEA20084 */ sw $v0, 0x84($s5) -.L80240A60: -/* 886E20 80240A60 0C00AB4B */ jal heap_free -/* 886E24 80240A64 8EA40078 */ lw $a0, 0x78($s5) -/* 886E28 80240A68 24020002 */ addiu $v0, $zero, 2 -.L80240A6C: -/* 886E2C 80240A6C 8FBF003C */ lw $ra, 0x3c($sp) -/* 886E30 80240A70 8FBE0038 */ lw $fp, 0x38($sp) -/* 886E34 80240A74 8FB70034 */ lw $s7, 0x34($sp) -/* 886E38 80240A78 8FB60030 */ lw $s6, 0x30($sp) -/* 886E3C 80240A7C 8FB5002C */ lw $s5, 0x2c($sp) -/* 886E40 80240A80 8FB40028 */ lw $s4, 0x28($sp) -/* 886E44 80240A84 8FB30024 */ lw $s3, 0x24($sp) -/* 886E48 80240A88 8FB20020 */ lw $s2, 0x20($sp) -/* 886E4C 80240A8C 8FB1001C */ lw $s1, 0x1c($sp) -/* 886E50 80240A90 8FB00018 */ lw $s0, 0x18($sp) -/* 886E54 80240A94 03E00008 */ jr $ra -/* 886E58 80240A98 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240C58_889828.s b/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240C58_889828.s deleted file mode 100644 index 7582403542..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240C58_889828.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C58_889828 -/* 889828 80240C58 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 88982C 80240C5C AFBF0010 */ sw $ra, 0x10($sp) -/* 889830 80240C60 8C82000C */ lw $v0, 0xc($a0) -/* 889834 80240C64 0C0B1EAF */ jal evt_get_variable -/* 889838 80240C68 8C450000 */ lw $a1, ($v0) -/* 88983C 80240C6C 0C0B95A4 */ jal entity_upgrade_block_hide_content -/* 889840 80240C70 0040202D */ daddu $a0, $v0, $zero -/* 889844 80240C74 8FBF0010 */ lw $ra, 0x10($sp) -/* 889848 80240C78 24020002 */ addiu $v0, $zero, 2 -/* 88984C 80240C7C 03E00008 */ jr $ra -/* 889850 80240C80 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240DE8_8899B8.s b/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240DE8_8899B8.s deleted file mode 100644 index a211652165..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240DE8_8899B8.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DE8_8899B8 -/* 8899B8 80240DE8 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 8899BC 80240DEC AFB5002C */ sw $s5, 0x2c($sp) -/* 8899C0 80240DF0 0080A82D */ daddu $s5, $a0, $zero -/* 8899C4 80240DF4 AFBE0038 */ sw $fp, 0x38($sp) -/* 8899C8 80240DF8 3C1E8011 */ lui $fp, %hi(gPlayerData) -/* 8899CC 80240DFC 27DEF290 */ addiu $fp, $fp, %lo(gPlayerData) -/* 8899D0 80240E00 AFBF003C */ sw $ra, 0x3c($sp) -/* 8899D4 80240E04 AFB70034 */ sw $s7, 0x34($sp) -/* 8899D8 80240E08 AFB60030 */ sw $s6, 0x30($sp) -/* 8899DC 80240E0C AFB40028 */ sw $s4, 0x28($sp) -/* 8899E0 80240E10 AFB30024 */ sw $s3, 0x24($sp) -/* 8899E4 80240E14 AFB20020 */ sw $s2, 0x20($sp) -/* 8899E8 80240E18 AFB1001C */ sw $s1, 0x1c($sp) -/* 8899EC 80240E1C 10A0004F */ beqz $a1, .L80240F5C -/* 8899F0 80240E20 AFB00018 */ sw $s0, 0x18($sp) -/* 8899F4 80240E24 0C00AB39 */ jal heap_malloc -/* 8899F8 80240E28 24040330 */ addiu $a0, $zero, 0x330 -/* 8899FC 80240E2C 0040982D */ daddu $s3, $v0, $zero -/* 889A00 80240E30 0000B02D */ daddu $s6, $zero, $zero -/* 889A04 80240E34 02C0902D */ daddu $s2, $s6, $zero -/* 889A08 80240E38 3C148024 */ lui $s4, %hi(D_80243CB4_88C884) -/* 889A0C 80240E3C 26943CB4 */ addiu $s4, $s4, %lo(D_80243CB4_88C884) -/* 889A10 80240E40 0260882D */ daddu $s1, $s3, $zero -/* 889A14 80240E44 8EA200B4 */ lw $v0, 0xb4($s5) -/* 889A18 80240E48 3C038024 */ lui $v1, %hi(D_80243CAC_88C87C) -/* 889A1C 80240E4C 24633CAC */ addiu $v1, $v1, %lo(D_80243CAC_88C87C) -/* 889A20 80240E50 AEB30078 */ sw $s3, 0x78($s5) -/* 889A24 80240E54 00021027 */ nor $v0, $zero, $v0 -/* 889A28 80240E58 0002BFC2 */ srl $s7, $v0, 0x1f -/* 889A2C 80240E5C 00171080 */ sll $v0, $s7, 2 -/* 889A30 80240E60 00431021 */ addu $v0, $v0, $v1 -/* 889A34 80240E64 AFA20010 */ sw $v0, 0x10($sp) -.L80240E68: -/* 889A38 80240E68 86900000 */ lh $s0, ($s4) -/* 889A3C 80240E6C 001010C0 */ sll $v0, $s0, 3 -/* 889A40 80240E70 03C21021 */ addu $v0, $fp, $v0 -/* 889A44 80240E74 90420014 */ lbu $v0, 0x14($v0) -/* 889A48 80240E78 5040002E */ beql $v0, $zero, .L80240F34 -/* 889A4C 80240E7C 26520001 */ addiu $s2, $s2, 1 -/* 889A50 80240E80 00101100 */ sll $v0, $s0, 4 -/* 889A54 80240E84 3C068009 */ lui $a2, %hi(gPartnerPopupProperties) -/* 889A58 80240E88 24C6EF20 */ addiu $a2, $a2, %lo(gPartnerPopupProperties) -/* 889A5C 80240E8C 00461021 */ addu $v0, $v0, $a2 -/* 889A60 80240E90 0200202D */ daddu $a0, $s0, $zero -/* 889A64 80240E94 AE300108 */ sw $s0, 0x108($s1) -/* 889A68 80240E98 8C420000 */ lw $v0, ($v0) -/* 889A6C 80240E9C 02E0282D */ daddu $a1, $s7, $zero -/* 889A70 80240EA0 0C09033C */ jal tik_12_UnkFunc37 -/* 889A74 80240EA4 AE220084 */ sw $v0, 0x84($s1) -/* 889A78 80240EA8 0040202D */ daddu $a0, $v0, $zero -/* 889A7C 80240EAC 04800011 */ bltz $a0, .L80240EF4 -/* 889A80 80240EB0 00101080 */ sll $v0, $s0, 2 -/* 889A84 80240EB4 3C06800F */ lui $a2, %hi(wPartnerHudScripts) -/* 889A88 80240EB8 24C67F00 */ addiu $a2, $a2, %lo(wPartnerHudScripts) -/* 889A8C 80240EBC 00461021 */ addu $v0, $v0, $a2 -/* 889A90 80240EC0 8C430000 */ lw $v1, ($v0) -/* 889A94 80240EC4 24020001 */ addiu $v0, $zero, 1 -/* 889A98 80240EC8 AE22018C */ sw $v0, 0x18c($s1) -/* 889A9C 80240ECC 00041080 */ sll $v0, $a0, 2 -/* 889AA0 80240ED0 3C068024 */ lui $a2, %hi(D_80243CC4_88C894) -/* 889AA4 80240ED4 24C63CC4 */ addiu $a2, $a2, %lo(D_80243CC4_88C894) -/* 889AA8 80240ED8 AE230000 */ sw $v1, ($s1) -/* 889AAC 80240EDC 001218C0 */ sll $v1, $s2, 3 -/* 889AB0 80240EE0 00431021 */ addu $v0, $v0, $v1 -/* 889AB4 80240EE4 00461021 */ addu $v0, $v0, $a2 -/* 889AB8 80240EE8 8C420000 */ lw $v0, ($v0) -/* 889ABC 80240EEC 080903C6 */ j .L80240F18 -/* 889AC0 80240EF0 AE220294 */ sw $v0, 0x294($s1) -.L80240EF4: -/* 889AC4 80240EF4 3C06800F */ lui $a2, %hi(wDisabledPartnerHudScripts) -/* 889AC8 80240EF8 24C67F40 */ addiu $a2, $a2, %lo(wDisabledPartnerHudScripts) -/* 889ACC 80240EFC 00461021 */ addu $v0, $v0, $a2 -/* 889AD0 80240F00 8C420000 */ lw $v0, ($v0) -/* 889AD4 80240F04 AE20018C */ sw $zero, 0x18c($s1) -/* 889AD8 80240F08 AE220000 */ sw $v0, ($s1) -/* 889ADC 80240F0C 8FA60010 */ lw $a2, 0x10($sp) -/* 889AE0 80240F10 8CC20000 */ lw $v0, ($a2) -/* 889AE4 80240F14 AE220294 */ sw $v0, 0x294($s1) -.L80240F18: -/* 889AE8 80240F18 001010C0 */ sll $v0, $s0, 3 -/* 889AEC 80240F1C 03C21021 */ addu $v0, $fp, $v0 -/* 889AF0 80240F20 80420015 */ lb $v0, 0x15($v0) -/* 889AF4 80240F24 26D60001 */ addiu $s6, $s6, 1 -/* 889AF8 80240F28 AE220210 */ sw $v0, 0x210($s1) -/* 889AFC 80240F2C 26310004 */ addiu $s1, $s1, 4 -/* 889B00 80240F30 26520001 */ addiu $s2, $s2, 1 -.L80240F34: -/* 889B04 80240F34 2A420008 */ slti $v0, $s2, 8 -/* 889B08 80240F38 1440FFCB */ bnez $v0, .L80240E68 -/* 889B0C 80240F3C 26940002 */ addiu $s4, $s4, 2 -/* 889B10 80240F40 0260202D */ daddu $a0, $s3, $zero -/* 889B14 80240F44 24020004 */ addiu $v0, $zero, 4 -/* 889B18 80240F48 AC820318 */ sw $v0, 0x318($a0) -/* 889B1C 80240F4C AC960324 */ sw $s6, 0x324($a0) -/* 889B20 80240F50 0C03D390 */ jal create_popup_menu -/* 889B24 80240F54 AC800328 */ sw $zero, 0x328($a0) -/* 889B28 80240F58 AEA00070 */ sw $zero, 0x70($s5) -.L80240F5C: -/* 889B2C 80240F5C 8EA20070 */ lw $v0, 0x70($s5) -/* 889B30 80240F60 8EB30078 */ lw $s3, 0x78($s5) -/* 889B34 80240F64 14400008 */ bnez $v0, .L80240F88 -/* 889B38 80240F68 24420001 */ addiu $v0, $v0, 1 -/* 889B3C 80240F6C 8662032C */ lh $v0, 0x32c($s3) -/* 889B40 80240F70 10400009 */ beqz $v0, .L80240F98 -/* 889B44 80240F74 AEA20074 */ sw $v0, 0x74($s5) -/* 889B48 80240F78 0C03C4EC */ jal hide_popup_menu -/* 889B4C 80240F7C 00000000 */ nop -/* 889B50 80240F80 8EA20070 */ lw $v0, 0x70($s5) -/* 889B54 80240F84 24420001 */ addiu $v0, $v0, 1 -.L80240F88: -/* 889B58 80240F88 AEA20070 */ sw $v0, 0x70($s5) -/* 889B5C 80240F8C 2842000F */ slti $v0, $v0, 0xf -/* 889B60 80240F90 10400003 */ beqz $v0, .L80240FA0 -/* 889B64 80240F94 00000000 */ nop -.L80240F98: -/* 889B68 80240F98 08090402 */ j .L80241008 -/* 889B6C 80240F9C 0000102D */ daddu $v0, $zero, $zero -.L80240FA0: -/* 889B70 80240FA0 0C03C54E */ jal destroy_popup_menu -/* 889B74 80240FA4 00000000 */ nop -/* 889B78 80240FA8 8EA30074 */ lw $v1, 0x74($s5) -/* 889B7C 80240FAC 240200FF */ addiu $v0, $zero, 0xff -/* 889B80 80240FB0 10620010 */ beq $v1, $v0, .L80240FF4 -/* 889B84 80240FB4 2462FFFF */ addiu $v0, $v1, -1 -/* 889B88 80240FB8 00021080 */ sll $v0, $v0, 2 -/* 889B8C 80240FBC 02621021 */ addu $v0, $s3, $v0 -/* 889B90 80240FC0 8C420108 */ lw $v0, 0x108($v0) -/* 889B94 80240FC4 00021100 */ sll $v0, $v0, 4 -/* 889B98 80240FC8 3C038009 */ lui $v1, %hi(gPartnerPopupProperties) -/* 889B9C 80240FCC 00621821 */ addu $v1, $v1, $v0 -/* 889BA0 80240FD0 8C63EF20 */ lw $v1, %lo(gPartnerPopupProperties)($v1) -/* 889BA4 80240FD4 8EA20074 */ lw $v0, 0x74($s5) -/* 889BA8 80240FD8 2442FFFF */ addiu $v0, $v0, -1 -/* 889BAC 80240FDC 00021080 */ sll $v0, $v0, 2 -/* 889BB0 80240FE0 02621021 */ addu $v0, $s3, $v0 -/* 889BB4 80240FE4 AEA30084 */ sw $v1, 0x84($s5) -/* 889BB8 80240FE8 8C420108 */ lw $v0, 0x108($v0) -/* 889BBC 80240FEC 080903FF */ j .L80240FFC -/* 889BC0 80240FF0 AEA20088 */ sw $v0, 0x88($s5) -.L80240FF4: -/* 889BC4 80240FF4 2402FFFF */ addiu $v0, $zero, -1 -/* 889BC8 80240FF8 AEA20084 */ sw $v0, 0x84($s5) -.L80240FFC: -/* 889BCC 80240FFC 0C00AB4B */ jal heap_free -/* 889BD0 80241000 8EA40078 */ lw $a0, 0x78($s5) -/* 889BD4 80241004 24020002 */ addiu $v0, $zero, 2 -.L80241008: -/* 889BD8 80241008 8FBF003C */ lw $ra, 0x3c($sp) -/* 889BDC 8024100C 8FBE0038 */ lw $fp, 0x38($sp) -/* 889BE0 80241010 8FB70034 */ lw $s7, 0x34($sp) -/* 889BE4 80241014 8FB60030 */ lw $s6, 0x30($sp) -/* 889BE8 80241018 8FB5002C */ lw $s5, 0x2c($sp) -/* 889BEC 8024101C 8FB40028 */ lw $s4, 0x28($sp) -/* 889BF0 80241020 8FB30024 */ lw $s3, 0x24($sp) -/* 889BF4 80241024 8FB20020 */ lw $s2, 0x20($sp) -/* 889BF8 80241028 8FB1001C */ lw $s1, 0x1c($sp) -/* 889BFC 8024102C 8FB00018 */ lw $s0, 0x18($sp) -/* 889C00 80241030 03E00008 */ jr $ra -/* 889C04 80241034 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_8024006C_892A8C.s b/ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_8024006C_892A8C.s deleted file mode 100644 index e0a191a40a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_8024006C_892A8C.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024006C_892A8C -/* 892A8C 8024006C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 892A90 80240070 AFBF0010 */ sw $ra, 0x10($sp) -/* 892A94 80240074 8C82000C */ lw $v0, 0xc($a0) -/* 892A98 80240078 0C0B1EAF */ jal evt_get_variable -/* 892A9C 8024007C 8C450000 */ lw $a1, ($v0) -/* 892AA0 80240080 0C0B95A4 */ jal entity_upgrade_block_hide_content -/* 892AA4 80240084 0040202D */ daddu $a0, $v0, $zero -/* 892AA8 80240088 8FBF0010 */ lw $ra, 0x10($sp) -/* 892AAC 8024008C 24020002 */ addiu $v0, $zero, 2 -/* 892AB0 80240090 03E00008 */ jr $ra -/* 892AB4 80240094 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_802401FC_892C1C.s b/ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_802401FC_892C1C.s deleted file mode 100644 index 282725a5ce..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_802401FC_892C1C.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401FC_892C1C -/* 892C1C 802401FC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 892C20 80240200 AFB5002C */ sw $s5, 0x2c($sp) -/* 892C24 80240204 0080A82D */ daddu $s5, $a0, $zero -/* 892C28 80240208 AFBE0038 */ sw $fp, 0x38($sp) -/* 892C2C 8024020C 3C1E8011 */ lui $fp, %hi(gPlayerData) -/* 892C30 80240210 27DEF290 */ addiu $fp, $fp, %lo(gPlayerData) -/* 892C34 80240214 AFBF003C */ sw $ra, 0x3c($sp) -/* 892C38 80240218 AFB70034 */ sw $s7, 0x34($sp) -/* 892C3C 8024021C AFB60030 */ sw $s6, 0x30($sp) -/* 892C40 80240220 AFB40028 */ sw $s4, 0x28($sp) -/* 892C44 80240224 AFB30024 */ sw $s3, 0x24($sp) -/* 892C48 80240228 AFB20020 */ sw $s2, 0x20($sp) -/* 892C4C 8024022C AFB1001C */ sw $s1, 0x1c($sp) -/* 892C50 80240230 10A0004F */ beqz $a1, .L80240370 -/* 892C54 80240234 AFB00018 */ sw $s0, 0x18($sp) -/* 892C58 80240238 0C00AB39 */ jal heap_malloc -/* 892C5C 8024023C 24040330 */ addiu $a0, $zero, 0x330 -/* 892C60 80240240 0040982D */ daddu $s3, $v0, $zero -/* 892C64 80240244 0000B02D */ daddu $s6, $zero, $zero -/* 892C68 80240248 02C0902D */ daddu $s2, $s6, $zero -/* 892C6C 8024024C 3C148024 */ lui $s4, %hi(D_80241428_893E48) -/* 892C70 80240250 26941428 */ addiu $s4, $s4, %lo(D_80241428_893E48) -/* 892C74 80240254 0260882D */ daddu $s1, $s3, $zero -/* 892C78 80240258 8EA200B4 */ lw $v0, 0xb4($s5) -/* 892C7C 8024025C 3C038024 */ lui $v1, %hi(D_80241420_893E40) -/* 892C80 80240260 24631420 */ addiu $v1, $v1, %lo(D_80241420_893E40) -/* 892C84 80240264 AEB30078 */ sw $s3, 0x78($s5) -/* 892C88 80240268 00021027 */ nor $v0, $zero, $v0 -/* 892C8C 8024026C 0002BFC2 */ srl $s7, $v0, 0x1f -/* 892C90 80240270 00171080 */ sll $v0, $s7, 2 -/* 892C94 80240274 00431021 */ addu $v0, $v0, $v1 -/* 892C98 80240278 AFA20010 */ sw $v0, 0x10($sp) -.L8024027C: -/* 892C9C 8024027C 86900000 */ lh $s0, ($s4) -/* 892CA0 80240280 001010C0 */ sll $v0, $s0, 3 -/* 892CA4 80240284 03C21021 */ addu $v0, $fp, $v0 -/* 892CA8 80240288 90420014 */ lbu $v0, 0x14($v0) -/* 892CAC 8024028C 5040002E */ beql $v0, $zero, .L80240348 -/* 892CB0 80240290 26520001 */ addiu $s2, $s2, 1 -/* 892CB4 80240294 00101100 */ sll $v0, $s0, 4 -/* 892CB8 80240298 3C068009 */ lui $a2, %hi(gPartnerPopupProperties) -/* 892CBC 8024029C 24C6EF20 */ addiu $a2, $a2, %lo(gPartnerPopupProperties) -/* 892CC0 802402A0 00461021 */ addu $v0, $v0, $a2 -/* 892CC4 802402A4 0200202D */ daddu $a0, $s0, $zero -/* 892CC8 802402A8 AE300108 */ sw $s0, 0x108($s1) -/* 892CCC 802402AC 8C420000 */ lw $v0, ($v0) -/* 892CD0 802402B0 02E0282D */ daddu $a1, $s7, $zero -/* 892CD4 802402B4 0C090041 */ jal tik_17_UnkFunc37 -/* 892CD8 802402B8 AE220084 */ sw $v0, 0x84($s1) -/* 892CDC 802402BC 0040202D */ daddu $a0, $v0, $zero -/* 892CE0 802402C0 04800011 */ bltz $a0, .L80240308 -/* 892CE4 802402C4 00101080 */ sll $v0, $s0, 2 -/* 892CE8 802402C8 3C06800F */ lui $a2, %hi(wPartnerHudScripts) -/* 892CEC 802402CC 24C67F00 */ addiu $a2, $a2, %lo(wPartnerHudScripts) -/* 892CF0 802402D0 00461021 */ addu $v0, $v0, $a2 -/* 892CF4 802402D4 8C430000 */ lw $v1, ($v0) -/* 892CF8 802402D8 24020001 */ addiu $v0, $zero, 1 -/* 892CFC 802402DC AE22018C */ sw $v0, 0x18c($s1) -/* 892D00 802402E0 00041080 */ sll $v0, $a0, 2 -/* 892D04 802402E4 3C068024 */ lui $a2, %hi(D_80241438_893E58) -/* 892D08 802402E8 24C61438 */ addiu $a2, $a2, %lo(D_80241438_893E58) -/* 892D0C 802402EC AE230000 */ sw $v1, ($s1) -/* 892D10 802402F0 001218C0 */ sll $v1, $s2, 3 -/* 892D14 802402F4 00431021 */ addu $v0, $v0, $v1 -/* 892D18 802402F8 00461021 */ addu $v0, $v0, $a2 -/* 892D1C 802402FC 8C420000 */ lw $v0, ($v0) -/* 892D20 80240300 080900CB */ j .L8024032C -/* 892D24 80240304 AE220294 */ sw $v0, 0x294($s1) -.L80240308: -/* 892D28 80240308 3C06800F */ lui $a2, %hi(wDisabledPartnerHudScripts) -/* 892D2C 8024030C 24C67F40 */ addiu $a2, $a2, %lo(wDisabledPartnerHudScripts) -/* 892D30 80240310 00461021 */ addu $v0, $v0, $a2 -/* 892D34 80240314 8C420000 */ lw $v0, ($v0) -/* 892D38 80240318 AE20018C */ sw $zero, 0x18c($s1) -/* 892D3C 8024031C AE220000 */ sw $v0, ($s1) -/* 892D40 80240320 8FA60010 */ lw $a2, 0x10($sp) -/* 892D44 80240324 8CC20000 */ lw $v0, ($a2) -/* 892D48 80240328 AE220294 */ sw $v0, 0x294($s1) -.L8024032C: -/* 892D4C 8024032C 001010C0 */ sll $v0, $s0, 3 -/* 892D50 80240330 03C21021 */ addu $v0, $fp, $v0 -/* 892D54 80240334 80420015 */ lb $v0, 0x15($v0) -/* 892D58 80240338 26D60001 */ addiu $s6, $s6, 1 -/* 892D5C 8024033C AE220210 */ sw $v0, 0x210($s1) -/* 892D60 80240340 26310004 */ addiu $s1, $s1, 4 -/* 892D64 80240344 26520001 */ addiu $s2, $s2, 1 -.L80240348: -/* 892D68 80240348 2A420008 */ slti $v0, $s2, 8 -/* 892D6C 8024034C 1440FFCB */ bnez $v0, .L8024027C -/* 892D70 80240350 26940002 */ addiu $s4, $s4, 2 -/* 892D74 80240354 0260202D */ daddu $a0, $s3, $zero -/* 892D78 80240358 24020004 */ addiu $v0, $zero, 4 -/* 892D7C 8024035C AC820318 */ sw $v0, 0x318($a0) -/* 892D80 80240360 AC960324 */ sw $s6, 0x324($a0) -/* 892D84 80240364 0C03D390 */ jal create_popup_menu -/* 892D88 80240368 AC800328 */ sw $zero, 0x328($a0) -/* 892D8C 8024036C AEA00070 */ sw $zero, 0x70($s5) -.L80240370: -/* 892D90 80240370 8EA20070 */ lw $v0, 0x70($s5) -/* 892D94 80240374 8EB30078 */ lw $s3, 0x78($s5) -/* 892D98 80240378 14400008 */ bnez $v0, .L8024039C -/* 892D9C 8024037C 24420001 */ addiu $v0, $v0, 1 -/* 892DA0 80240380 8662032C */ lh $v0, 0x32c($s3) -/* 892DA4 80240384 10400009 */ beqz $v0, .L802403AC -/* 892DA8 80240388 AEA20074 */ sw $v0, 0x74($s5) -/* 892DAC 8024038C 0C03C4EC */ jal hide_popup_menu -/* 892DB0 80240390 00000000 */ nop -/* 892DB4 80240394 8EA20070 */ lw $v0, 0x70($s5) -/* 892DB8 80240398 24420001 */ addiu $v0, $v0, 1 -.L8024039C: -/* 892DBC 8024039C AEA20070 */ sw $v0, 0x70($s5) -/* 892DC0 802403A0 2842000F */ slti $v0, $v0, 0xf -/* 892DC4 802403A4 10400003 */ beqz $v0, .L802403B4 -/* 892DC8 802403A8 00000000 */ nop -.L802403AC: -/* 892DCC 802403AC 08090107 */ j .L8024041C -/* 892DD0 802403B0 0000102D */ daddu $v0, $zero, $zero -.L802403B4: -/* 892DD4 802403B4 0C03C54E */ jal destroy_popup_menu -/* 892DD8 802403B8 00000000 */ nop -/* 892DDC 802403BC 8EA30074 */ lw $v1, 0x74($s5) -/* 892DE0 802403C0 240200FF */ addiu $v0, $zero, 0xff -/* 892DE4 802403C4 10620010 */ beq $v1, $v0, .L80240408 -/* 892DE8 802403C8 2462FFFF */ addiu $v0, $v1, -1 -/* 892DEC 802403CC 00021080 */ sll $v0, $v0, 2 -/* 892DF0 802403D0 02621021 */ addu $v0, $s3, $v0 -/* 892DF4 802403D4 8C420108 */ lw $v0, 0x108($v0) -/* 892DF8 802403D8 00021100 */ sll $v0, $v0, 4 -/* 892DFC 802403DC 3C038009 */ lui $v1, %hi(gPartnerPopupProperties) -/* 892E00 802403E0 00621821 */ addu $v1, $v1, $v0 -/* 892E04 802403E4 8C63EF20 */ lw $v1, %lo(gPartnerPopupProperties)($v1) -/* 892E08 802403E8 8EA20074 */ lw $v0, 0x74($s5) -/* 892E0C 802403EC 2442FFFF */ addiu $v0, $v0, -1 -/* 892E10 802403F0 00021080 */ sll $v0, $v0, 2 -/* 892E14 802403F4 02621021 */ addu $v0, $s3, $v0 -/* 892E18 802403F8 AEA30084 */ sw $v1, 0x84($s5) -/* 892E1C 802403FC 8C420108 */ lw $v0, 0x108($v0) -/* 892E20 80240400 08090104 */ j .L80240410 -/* 892E24 80240404 AEA20088 */ sw $v0, 0x88($s5) -.L80240408: -/* 892E28 80240408 2402FFFF */ addiu $v0, $zero, -1 -/* 892E2C 8024040C AEA20084 */ sw $v0, 0x84($s5) -.L80240410: -/* 892E30 80240410 0C00AB4B */ jal heap_free -/* 892E34 80240414 8EA40078 */ lw $a0, 0x78($s5) -/* 892E38 80240418 24020002 */ addiu $v0, $zero, 2 -.L8024041C: -/* 892E3C 8024041C 8FBF003C */ lw $ra, 0x3c($sp) -/* 892E40 80240420 8FBE0038 */ lw $fp, 0x38($sp) -/* 892E44 80240424 8FB70034 */ lw $s7, 0x34($sp) -/* 892E48 80240428 8FB60030 */ lw $s6, 0x30($sp) -/* 892E4C 8024042C 8FB5002C */ lw $s5, 0x2c($sp) -/* 892E50 80240430 8FB40028 */ lw $s4, 0x28($sp) -/* 892E54 80240434 8FB30024 */ lw $s3, 0x24($sp) -/* 892E58 80240438 8FB20020 */ lw $s2, 0x20($sp) -/* 892E5C 8024043C 8FB1001C */ lw $s1, 0x1c($sp) -/* 892E60 80240440 8FB00018 */ lw $s0, 0x18($sp) -/* 892E64 80240444 03E00008 */ jr $ra -/* 892E68 80240448 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_8024062C_897C0C.s b/ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_8024062C_897C0C.s deleted file mode 100644 index 1f2efa37c9..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_8024062C_897C0C.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024062C_897C0C -/* 897C0C 8024062C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 897C10 80240630 AFBF0010 */ sw $ra, 0x10($sp) -/* 897C14 80240634 8C82000C */ lw $v0, 0xc($a0) -/* 897C18 80240638 0C0B1EAF */ jal evt_get_variable -/* 897C1C 8024063C 8C450000 */ lw $a1, ($v0) -/* 897C20 80240640 0C0B95A4 */ jal entity_upgrade_block_hide_content -/* 897C24 80240644 0040202D */ daddu $a0, $v0, $zero -/* 897C28 80240648 8FBF0010 */ lw $ra, 0x10($sp) -/* 897C2C 8024064C 24020002 */ addiu $v0, $zero, 2 -/* 897C30 80240650 03E00008 */ jr $ra -/* 897C34 80240654 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_802407BC_897D9C.s b/ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_802407BC_897D9C.s deleted file mode 100644 index d97a273068..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_802407BC_897D9C.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407BC_897D9C -/* 897D9C 802407BC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 897DA0 802407C0 AFB5002C */ sw $s5, 0x2c($sp) -/* 897DA4 802407C4 0080A82D */ daddu $s5, $a0, $zero -/* 897DA8 802407C8 AFBE0038 */ sw $fp, 0x38($sp) -/* 897DAC 802407CC 3C1E8011 */ lui $fp, %hi(gPlayerData) -/* 897DB0 802407D0 27DEF290 */ addiu $fp, $fp, %lo(gPlayerData) -/* 897DB4 802407D4 AFBF003C */ sw $ra, 0x3c($sp) -/* 897DB8 802407D8 AFB70034 */ sw $s7, 0x34($sp) -/* 897DBC 802407DC AFB60030 */ sw $s6, 0x30($sp) -/* 897DC0 802407E0 AFB40028 */ sw $s4, 0x28($sp) -/* 897DC4 802407E4 AFB30024 */ sw $s3, 0x24($sp) -/* 897DC8 802407E8 AFB20020 */ sw $s2, 0x20($sp) -/* 897DCC 802407EC AFB1001C */ sw $s1, 0x1c($sp) -/* 897DD0 802407F0 10A0004F */ beqz $a1, .L80240930 -/* 897DD4 802407F4 AFB00018 */ sw $s0, 0x18($sp) -/* 897DD8 802407F8 0C00AB39 */ jal heap_malloc -/* 897DDC 802407FC 24040330 */ addiu $a0, $zero, 0x330 -/* 897DE0 80240800 0040982D */ daddu $s3, $v0, $zero -/* 897DE4 80240804 0000B02D */ daddu $s6, $zero, $zero -/* 897DE8 80240808 02C0902D */ daddu $s2, $s6, $zero -/* 897DEC 8024080C 3C148024 */ lui $s4, %hi(D_802426B8_899C98) -/* 897DF0 80240810 269426B8 */ addiu $s4, $s4, %lo(D_802426B8_899C98) -/* 897DF4 80240814 0260882D */ daddu $s1, $s3, $zero -/* 897DF8 80240818 8EA200B4 */ lw $v0, 0xb4($s5) -/* 897DFC 8024081C 3C038024 */ lui $v1, %hi(D_802426B0_899C90) -/* 897E00 80240820 246326B0 */ addiu $v1, $v1, %lo(D_802426B0_899C90) -/* 897E04 80240824 AEB30078 */ sw $s3, 0x78($s5) -/* 897E08 80240828 00021027 */ nor $v0, $zero, $v0 -/* 897E0C 8024082C 0002BFC2 */ srl $s7, $v0, 0x1f -/* 897E10 80240830 00171080 */ sll $v0, $s7, 2 -/* 897E14 80240834 00431021 */ addu $v0, $v0, $v1 -/* 897E18 80240838 AFA20010 */ sw $v0, 0x10($sp) -.L8024083C: -/* 897E1C 8024083C 86900000 */ lh $s0, ($s4) -/* 897E20 80240840 001010C0 */ sll $v0, $s0, 3 -/* 897E24 80240844 03C21021 */ addu $v0, $fp, $v0 -/* 897E28 80240848 90420014 */ lbu $v0, 0x14($v0) -/* 897E2C 8024084C 5040002E */ beql $v0, $zero, .L80240908 -/* 897E30 80240850 26520001 */ addiu $s2, $s2, 1 -/* 897E34 80240854 00101100 */ sll $v0, $s0, 4 -/* 897E38 80240858 3C068009 */ lui $a2, %hi(gPartnerPopupProperties) -/* 897E3C 8024085C 24C6EF20 */ addiu $a2, $a2, %lo(gPartnerPopupProperties) -/* 897E40 80240860 00461021 */ addu $v0, $v0, $a2 -/* 897E44 80240864 0200202D */ daddu $a0, $s0, $zero -/* 897E48 80240868 AE300108 */ sw $s0, 0x108($s1) -/* 897E4C 8024086C 8C420000 */ lw $v0, ($v0) -/* 897E50 80240870 02E0282D */ daddu $a1, $s7, $zero -/* 897E54 80240874 0C0901B1 */ jal tik_19_UnkFunc37 -/* 897E58 80240878 AE220084 */ sw $v0, 0x84($s1) -/* 897E5C 8024087C 0040202D */ daddu $a0, $v0, $zero -/* 897E60 80240880 04800011 */ bltz $a0, .L802408C8 -/* 897E64 80240884 00101080 */ sll $v0, $s0, 2 -/* 897E68 80240888 3C06800F */ lui $a2, %hi(wPartnerHudScripts) -/* 897E6C 8024088C 24C67F00 */ addiu $a2, $a2, %lo(wPartnerHudScripts) -/* 897E70 80240890 00461021 */ addu $v0, $v0, $a2 -/* 897E74 80240894 8C430000 */ lw $v1, ($v0) -/* 897E78 80240898 24020001 */ addiu $v0, $zero, 1 -/* 897E7C 8024089C AE22018C */ sw $v0, 0x18c($s1) -/* 897E80 802408A0 00041080 */ sll $v0, $a0, 2 -/* 897E84 802408A4 3C068024 */ lui $a2, %hi(D_802426C8_899CA8) -/* 897E88 802408A8 24C626C8 */ addiu $a2, $a2, %lo(D_802426C8_899CA8) -/* 897E8C 802408AC AE230000 */ sw $v1, ($s1) -/* 897E90 802408B0 001218C0 */ sll $v1, $s2, 3 -/* 897E94 802408B4 00431021 */ addu $v0, $v0, $v1 -/* 897E98 802408B8 00461021 */ addu $v0, $v0, $a2 -/* 897E9C 802408BC 8C420000 */ lw $v0, ($v0) -/* 897EA0 802408C0 0809023B */ j .L802408EC -/* 897EA4 802408C4 AE220294 */ sw $v0, 0x294($s1) -.L802408C8: -/* 897EA8 802408C8 3C06800F */ lui $a2, %hi(wDisabledPartnerHudScripts) -/* 897EAC 802408CC 24C67F40 */ addiu $a2, $a2, %lo(wDisabledPartnerHudScripts) -/* 897EB0 802408D0 00461021 */ addu $v0, $v0, $a2 -/* 897EB4 802408D4 8C420000 */ lw $v0, ($v0) -/* 897EB8 802408D8 AE20018C */ sw $zero, 0x18c($s1) -/* 897EBC 802408DC AE220000 */ sw $v0, ($s1) -/* 897EC0 802408E0 8FA60010 */ lw $a2, 0x10($sp) -/* 897EC4 802408E4 8CC20000 */ lw $v0, ($a2) -/* 897EC8 802408E8 AE220294 */ sw $v0, 0x294($s1) -.L802408EC: -/* 897ECC 802408EC 001010C0 */ sll $v0, $s0, 3 -/* 897ED0 802408F0 03C21021 */ addu $v0, $fp, $v0 -/* 897ED4 802408F4 80420015 */ lb $v0, 0x15($v0) -/* 897ED8 802408F8 26D60001 */ addiu $s6, $s6, 1 -/* 897EDC 802408FC AE220210 */ sw $v0, 0x210($s1) -/* 897EE0 80240900 26310004 */ addiu $s1, $s1, 4 -/* 897EE4 80240904 26520001 */ addiu $s2, $s2, 1 -.L80240908: -/* 897EE8 80240908 2A420008 */ slti $v0, $s2, 8 -/* 897EEC 8024090C 1440FFCB */ bnez $v0, .L8024083C -/* 897EF0 80240910 26940002 */ addiu $s4, $s4, 2 -/* 897EF4 80240914 0260202D */ daddu $a0, $s3, $zero -/* 897EF8 80240918 24020004 */ addiu $v0, $zero, 4 -/* 897EFC 8024091C AC820318 */ sw $v0, 0x318($a0) -/* 897F00 80240920 AC960324 */ sw $s6, 0x324($a0) -/* 897F04 80240924 0C03D390 */ jal create_popup_menu -/* 897F08 80240928 AC800328 */ sw $zero, 0x328($a0) -/* 897F0C 8024092C AEA00070 */ sw $zero, 0x70($s5) -.L80240930: -/* 897F10 80240930 8EA20070 */ lw $v0, 0x70($s5) -/* 897F14 80240934 8EB30078 */ lw $s3, 0x78($s5) -/* 897F18 80240938 14400008 */ bnez $v0, .L8024095C -/* 897F1C 8024093C 24420001 */ addiu $v0, $v0, 1 -/* 897F20 80240940 8662032C */ lh $v0, 0x32c($s3) -/* 897F24 80240944 10400009 */ beqz $v0, .L8024096C -/* 897F28 80240948 AEA20074 */ sw $v0, 0x74($s5) -/* 897F2C 8024094C 0C03C4EC */ jal hide_popup_menu -/* 897F30 80240950 00000000 */ nop -/* 897F34 80240954 8EA20070 */ lw $v0, 0x70($s5) -/* 897F38 80240958 24420001 */ addiu $v0, $v0, 1 -.L8024095C: -/* 897F3C 8024095C AEA20070 */ sw $v0, 0x70($s5) -/* 897F40 80240960 2842000F */ slti $v0, $v0, 0xf -/* 897F44 80240964 10400003 */ beqz $v0, .L80240974 -/* 897F48 80240968 00000000 */ nop -.L8024096C: -/* 897F4C 8024096C 08090277 */ j .L802409DC -/* 897F50 80240970 0000102D */ daddu $v0, $zero, $zero -.L80240974: -/* 897F54 80240974 0C03C54E */ jal destroy_popup_menu -/* 897F58 80240978 00000000 */ nop -/* 897F5C 8024097C 8EA30074 */ lw $v1, 0x74($s5) -/* 897F60 80240980 240200FF */ addiu $v0, $zero, 0xff -/* 897F64 80240984 10620010 */ beq $v1, $v0, .L802409C8 -/* 897F68 80240988 2462FFFF */ addiu $v0, $v1, -1 -/* 897F6C 8024098C 00021080 */ sll $v0, $v0, 2 -/* 897F70 80240990 02621021 */ addu $v0, $s3, $v0 -/* 897F74 80240994 8C420108 */ lw $v0, 0x108($v0) -/* 897F78 80240998 00021100 */ sll $v0, $v0, 4 -/* 897F7C 8024099C 3C038009 */ lui $v1, %hi(gPartnerPopupProperties) -/* 897F80 802409A0 00621821 */ addu $v1, $v1, $v0 -/* 897F84 802409A4 8C63EF20 */ lw $v1, %lo(gPartnerPopupProperties)($v1) -/* 897F88 802409A8 8EA20074 */ lw $v0, 0x74($s5) -/* 897F8C 802409AC 2442FFFF */ addiu $v0, $v0, -1 -/* 897F90 802409B0 00021080 */ sll $v0, $v0, 2 -/* 897F94 802409B4 02621021 */ addu $v0, $s3, $v0 -/* 897F98 802409B8 AEA30084 */ sw $v1, 0x84($s5) -/* 897F9C 802409BC 8C420108 */ lw $v0, 0x108($v0) -/* 897FA0 802409C0 08090274 */ j .L802409D0 -/* 897FA4 802409C4 AEA20088 */ sw $v0, 0x88($s5) -.L802409C8: -/* 897FA8 802409C8 2402FFFF */ addiu $v0, $zero, -1 -/* 897FAC 802409CC AEA20084 */ sw $v0, 0x84($s5) -.L802409D0: -/* 897FB0 802409D0 0C00AB4B */ jal heap_free -/* 897FB4 802409D4 8EA40078 */ lw $a0, 0x78($s5) -/* 897FB8 802409D8 24020002 */ addiu $v0, $zero, 2 -.L802409DC: -/* 897FBC 802409DC 8FBF003C */ lw $ra, 0x3c($sp) -/* 897FC0 802409E0 8FBE0038 */ lw $fp, 0x38($sp) -/* 897FC4 802409E4 8FB70034 */ lw $s7, 0x34($sp) -/* 897FC8 802409E8 8FB60030 */ lw $s6, 0x30($sp) -/* 897FCC 802409EC 8FB5002C */ lw $s5, 0x2c($sp) -/* 897FD0 802409F0 8FB40028 */ lw $s4, 0x28($sp) -/* 897FD4 802409F4 8FB30024 */ lw $s3, 0x24($sp) -/* 897FD8 802409F8 8FB20020 */ lw $s2, 0x20($sp) -/* 897FDC 802409FC 8FB1001C */ lw $s1, 0x1c($sp) -/* 897FE0 80240A00 8FB00018 */ lw $s0, 0x18($sp) -/* 897FE4 80240A04 03E00008 */ jr $ra -/* 897FE8 80240A08 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index de12dcf2e0..ff1feea350 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -3883,7 +3883,7 @@ SwitchMessage = 0x802D0AFC; // type:func rom:0xF54AC ShowChoice = 0x802D0B6C; // type:func rom:0xF551C CloseChoice = 0x802D0BF8; // type:func rom:0xF55A8 CancelMessage = 0x802D0C20; // type:func rom:0xF55D0 -CancelMessageAndBlock = 0x802D0C48; // type:func rom:0xF55F8 +cancel_current_message = 0x802D0C48; // type:func rom:0xF55F8 SetMessageImages = 0x802D0C70; // type:func rom:0xF5620 func_802D0C94 = 0x802D0C94; // type:func rom:0xF5644 SetMessageMsg = 0x802D0CEC; // type:func rom:0xF569C @@ -11947,14 +11947,14 @@ D_802407E0_7E7B80 = 0x802407E0; // type:data rom:0x7E7B80 D_802409F0_7E7D90 = 0x802409F0; // type:data rom:0x7E7D90 D_80241180_7E8520 = 0x80241180; // type:data rom:0x7E8520 D_80243960_7EAD00 = 0x80243960; // type:data rom:0x7EAD00 -mac_00_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0x7EAD10 -mac_00_GetCurrentFloor = 0x80240020; // type:func rom:0x7EAD30 -mac_00_UnkFunc25 = 0x80240034; // type:func rom:0x7EAD44 -mac_00_GetEntryPos = 0x802400F0; // type:func rom:0x7EAE00 -mac_00_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0x7EAEE0 -mac_00_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x7EAF4C -mac_00_UpdateTexturePanSmooth = 0x802402E0; // type:func rom:0x7EAFF0 -mac_00_UpdateTexturePanStepped = 0x80240404; // type:func rom:0x7EB114 +mac_00_Pipe_SetAnimFlag = 0x80240000; // type:func rom:0x7EAD10 +mac_00_Pipe_GetCurrentFloor = 0x80240020; // type:func rom:0x7EAD30 +mac_00_Pipe_AwaitDownInput = 0x80240034; // type:func rom:0x7EAD44 +mac_00_Pipe_GetEntryPos = 0x802400F0; // type:func rom:0x7EAE00 +mac_00_Pipe_GetCameraYaw = 0x802401D0; // type:func rom:0x7EAEE0 +mac_00_Pipe_GetPointAheadOfPlayer = 0x8024023C; // type:func rom:0x7EAF4C +mac_00_UnkTexturePanFunc = 0x802402E0; // type:func rom:0x7EAFF0 +mac_00_UnkTexturePanFunc2 = 0x80240404; // type:func rom:0x7EB114 func_802405EC_7EB2FC = 0x802405EC; // type:func rom:0x7EB2FC func_80240624_7EB334 = 0x80240624; // type:func rom:0x7EB334 mac_00_StashVars = 0x80240630; // type:func rom:0x7EB340 @@ -12177,14 +12177,14 @@ D_802626E0_822F60 = 0x802626E0; // type:data rom:0x822F60 D_802626E8_822F68 = 0x802626E8; // type:data rom:0x822F68 D_80262890_823110 = 0x80262890; // type:data rom:0x823110 D_80262898_823118 = 0x80262898; // type:data rom:0x823118 -mac_02_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0x8232C0 -mac_02_GetCurrentFloor = 0x80240020; // type:func rom:0x8232E0 -mac_02_UnkFunc25 = 0x80240034; // type:func rom:0x8232F4 -mac_02_GetEntryPos = 0x802400F0; // type:func rom:0x8233B0 -mac_02_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0x823490 -mac_02_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x8234FC -mac_02_UpdateTexturePanSmooth = 0x802402E0; // type:func rom:0x8235A0 -mac_02_UpdateTexturePanStepped = 0x80240404; // type:func rom:0x8236C4 +mac_02_Pipe_SetAnimFlag = 0x80240000; // type:func rom:0x8232C0 +mac_02_Pipe_GetCurrentFloor = 0x80240020; // type:func rom:0x8232E0 +mac_02_Pipe_AwaitDownInput = 0x80240034; // type:func rom:0x8232F4 +mac_02_Pipe_GetEntryPos = 0x802400F0; // type:func rom:0x8233B0 +mac_02_Pipe_GetCameraYaw = 0x802401D0; // type:func rom:0x823490 +mac_02_Pipe_GetPointAheadOfPlayer = 0x8024023C; // type:func rom:0x8234FC +mac_02_UnkTexturePanFunc = 0x802402E0; // type:func rom:0x8235A0 +mac_02_UnkTexturePanFunc2 = 0x80240404; // type:func rom:0x8236C4 func_802405F0_8238B0 = 0x802405F0; // type:func rom:0x8238B0 mac_02_foliage_setup_shear_mtx = 0x802406B0; // type:func rom:0x823970 mac_02_TransformFoliage = 0x80240720; // type:func rom:0x8239E0 @@ -12261,12 +12261,12 @@ D_8024E200_8314C0 = 0x8024E200; // type:data rom:0x8314C0 D_8024E208_8314C8 = 0x8024E208; // type:data rom:0x8314C8 D_8024E3A0_831660 = 0x8024E3A0; // type:data rom:0x831660 D_8024E470_831730 = 0x8024E470; // type:data rom:0x831730 -mac_03_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0x831800 -mac_03_GetCurrentFloor = 0x80240020; // type:func rom:0x831820 -mac_03_UnkFunc25 = 0x80240034; // type:func rom:0x831834 -mac_03_GetEntryPos = 0x802400F0; // type:func rom:0x8318F0 -mac_03_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0x8319D0 -mac_03_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x831A3C +mac_03_Pipe_SetAnimFlag = 0x80240000; // type:func rom:0x831800 +mac_03_Pipe_GetCurrentFloor = 0x80240020; // type:func rom:0x831820 +mac_03_Pipe_AwaitDownInput = 0x80240034; // type:func rom:0x831834 +mac_03_Pipe_GetEntryPos = 0x802400F0; // type:func rom:0x8318F0 +mac_03_Pipe_GetCameraYaw = 0x802401D0; // type:func rom:0x8319D0 +mac_03_Pipe_GetPointAheadOfPlayer = 0x8024023C; // type:func rom:0x831A3C func_802402E0_831AE0 = 0x802402E0; // type:func rom:0x831AE0 mac_03_UnkFloatFunc = 0x80240320; // type:func rom:0x831B20 mac_03_StashVars = 0x802404B0; // type:func rom:0x831CB0 @@ -12506,14 +12506,14 @@ D_80243438_867F78 = 0x80243438; // type:data rom:0x867F78 D_8024343C_867F7C = 0x8024343C; // type:data rom:0x867F7C D_80243440_867F80 = 0x80243440; // type:data rom:0x867F80 D_80244968_8694A8 = 0x80244968; // type:data rom:0x8694A8 -tik_01_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0x8694B0 -tik_01_UpdateTexturePanStepped = 0x80240124; // type:func rom:0x8695D4 -tik_01_SetPlayerStatusAnimFlags100000 = 0x8024030C; // type:func rom:0x8697BC -tik_01_GetCurrentFloor = 0x8024032C; // type:func rom:0x8697DC -tik_01_UnkFunc25 = 0x80240340; // type:func rom:0x8697F0 -tik_01_GetEntryPos = 0x802403FC; // type:func rom:0x8698AC -tik_01_GetCurrentCameraYawClamped180 = 0x802404DC; // type:func rom:0x86998C -tik_01_SomeXYZFunc2 = 0x80240548; // type:func rom:0x8699F8 +tik_01_UnkTexturePanFunc = 0x80240000; // type:func rom:0x8694B0 +tik_01_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0x8695D4 +tik_01_Pipe_SetAnimFlag = 0x8024030C; // type:func rom:0x8697BC +tik_01_Pipe_GetCurrentFloor = 0x8024032C; // type:func rom:0x8697DC +tik_01_Pipe_AwaitDownInput = 0x80240340; // type:func rom:0x8697F0 +tik_01_Pipe_GetEntryPos = 0x802403FC; // type:func rom:0x8698AC +tik_01_Pipe_GetCameraYaw = 0x802404DC; // type:func rom:0x86998C +tik_01_Pipe_GetPointAheadOfPlayer = 0x80240548; // type:func rom:0x8699F8 tik_01_UnkPosFunc2 = 0x802405F0; // type:func rom:0x869AA0 tik_01_SetEntityPosition = 0x80240960; // type:func rom:0x869E10 func_80240A30_869EE0 = 0x80240A30; // type:func rom:0x869EE0 @@ -12528,28 +12528,28 @@ tik_02_UnkPosFunc2 = 0x802405D0; // type:func rom:0x86CD10 func_80240940_86D080 = 0x80240940; // type:func rom:0x86D080 tik_02_varTable = 0x802410C0; // type:data rom:0x86D800 D_80241BAE_86E2EE = 0x80241BAE; // type:data rom:0x86E2EE -tik_03_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0x86EB00 -tik_03_GetCurrentFloor = 0x80240020; // type:func rom:0x86EB20 -tik_03_UnkFunc25 = 0x80240034; // type:func rom:0x86EB34 -tik_03_GetEntryPos = 0x802400F0; // type:func rom:0x86EBF0 -tik_03_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0x86ECD0 -tik_03_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x86ED3C -tik_03_UpdateTexturePanSmooth = 0x802402E0; // type:func rom:0x86EDE0 -tik_03_UpdateTexturePanStepped = 0x80240404; // type:func rom:0x86EF04 +tik_03_Pipe_SetAnimFlag = 0x80240000; // type:func rom:0x86EB00 +tik_03_Pipe_GetCurrentFloor = 0x80240020; // type:func rom:0x86EB20 +tik_03_Pipe_AwaitDownInput = 0x80240034; // type:func rom:0x86EB34 +tik_03_Pipe_GetEntryPos = 0x802400F0; // type:func rom:0x86EBF0 +tik_03_Pipe_GetCameraYaw = 0x802401D0; // type:func rom:0x86ECD0 +tik_03_Pipe_GetPointAheadOfPlayer = 0x8024023C; // type:func rom:0x86ED3C +tik_03_UnkTexturePanFunc = 0x802402E0; // type:func rom:0x86EDE0 +tik_03_UnkTexturePanFunc2 = 0x80240404; // type:func rom:0x86EF04 tik_03_UnkPosFunc2 = 0x802405F0; // type:func rom:0x86F0F0 func_80240960_86F460 = 0x80240960; // type:func rom:0x86F460 func_802409C0_86F4C0 = 0x802409C0; // type:func rom:0x86F4C0 func_802409E0_86F4E0 = 0x802409E0; // type:func rom:0x86F4E0 D_80242930_871430 = 0x80242930; // type:data rom:0x871430 D_80242EBC_8719BC = 0x80242EBC; // type:data rom:0x8719BC -tik_04_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0x871A30 -tik_04_UpdateTexturePanStepped = 0x80240124; // type:func rom:0x871B54 -tik_04_SetPlayerStatusAnimFlags100000 = 0x8024030C; // type:func rom:0x871D3C -tik_04_GetCurrentFloor = 0x8024032C; // type:func rom:0x871D5C -tik_04_UnkFunc25 = 0x80240340; // type:func rom:0x871D70 -tik_04_GetEntryPos = 0x802403FC; // type:func rom:0x871E2C -tik_04_GetCurrentCameraYawClamped180 = 0x802404DC; // type:func rom:0x871F0C -tik_04_SomeXYZFunc2 = 0x80240548; // type:func rom:0x871F78 +tik_04_UnkTexturePanFunc = 0x80240000; // type:func rom:0x871A30 +tik_04_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0x871B54 +tik_04_Pipe_SetAnimFlag = 0x8024030C; // type:func rom:0x871D3C +tik_04_Pipe_GetCurrentFloor = 0x8024032C; // type:func rom:0x871D5C +tik_04_Pipe_AwaitDownInput = 0x80240340; // type:func rom:0x871D70 +tik_04_Pipe_GetEntryPos = 0x802403FC; // type:func rom:0x871E2C +tik_04_Pipe_GetCameraYaw = 0x802404DC; // type:func rom:0x871F0C +tik_04_Pipe_GetPointAheadOfPlayer = 0x80240548; // type:func rom:0x871F78 tik_04_UnkPosFunc2 = 0x802405F0; // type:func rom:0x872020 func_80240960_872390 = 0x80240960; // type:func rom:0x872390 func_80240A00_872430 = 0x80240A00; // type:func rom:0x872430 @@ -12564,40 +12564,40 @@ tik_05_SomeItemEntityFunc = 0x80240798; // type:func rom:0x875558 tik_05_CheckItemFlags40 = 0x802408E8; // type:func rom:0x8756A8 func_8024093C_8756FC = 0x8024093C; // type:func rom:0x8756FC tik_05_SetEntityPosition = 0x80240984; // type:func rom:0x875744 -tik_05_varTable = 0x80241800; // type:data rom:0x8765C0 -tik_06_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0x876EE0 -tik_06_GetCurrentFloor = 0x80240020; // type:func rom:0x876F00 -tik_06_UnkFunc25 = 0x80240034; // type:func rom:0x876F14 -tik_06_GetEntryPos = 0x802400F0; // type:func rom:0x876FD0 -tik_06_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0x8770B0 -tik_06_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x87711C -tik_06_UpdateTexturePanSmooth = 0x802402E0; // type:func rom:0x8771C0 -tik_06_UpdateTexturePanStepped = 0x80240404; // type:func rom:0x8772E4 +D_80241800_8765C0 = 0x80241800; // type:data rom:0x8765C0 +tik_06_Pipe_SetAnimFlag = 0x80240000; // type:func rom:0x876EE0 +tik_06_Pipe_GetCurrentFloor = 0x80240020; // type:func rom:0x876F00 +tik_06_Pipe_AwaitDownInput = 0x80240034; // type:func rom:0x876F14 +tik_06_Pipe_GetEntryPos = 0x802400F0; // type:func rom:0x876FD0 +tik_06_Pipe_GetCameraYaw = 0x802401D0; // type:func rom:0x8770B0 +tik_06_Pipe_GetPointAheadOfPlayer = 0x8024023C; // type:func rom:0x87711C +tik_06_UnkTexturePanFunc = 0x802402E0; // type:func rom:0x8771C0 +tik_06_UnkTexturePanFunc2 = 0x80240404; // type:func rom:0x8772E4 tik_06_UnkPosFunc2 = 0x802405F0; // type:func rom:0x8774D0 -tik_07_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0x879BE0 -tik_07_GetCurrentFloor = 0x80240020; // type:func rom:0x879C00 -tik_07_UnkFunc25 = 0x80240034; // type:func rom:0x879C14 -tik_07_GetEntryPos = 0x802400F0; // type:func rom:0x879CD0 -tik_07_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0x879DB0 -tik_07_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x879E1C -tik_07_SetOverrideFlags_40 = 0x802402E0; // type:func rom:0x879EC0 -tik_07_UnkFunc17 = 0x802402FC; // type:func rom:0x879EDC -func_8024031C_879EFC = 0x8024031C; // type:func rom:0x879EFC -tik_07_UnkFunc18 = 0x80240348; // type:func rom:0x879F28 -tik_07_UnkFunc37 = 0x802403B4; // type:func rom:0x879F94 -tik_07_UnkFunc38 = 0x80240400; // type:func rom:0x879FE0 -func_802404AC_87A08C = 0x802404AC; // type:func rom:0x87A08C -tik_07_SwitchToPartner = 0x802406FC; // type:func rom:0x87A2DC -tik_07_UnkFunc19 = 0x80240728; // type:func rom:0x87A308 -tik_07_UnkFunc20 = 0x80240760; // type:func rom:0x87A340 -tik_07_UnkFunc39 = 0x802407F0; // type:func rom:0x87A3D0 -tik_07_UnkFunc21 = 0x80240824; // type:func rom:0x87A404 -tik_07_UnkFunc22 = 0x80240888; // type:func rom:0x87A468 -tik_07_UnkFunc60 = 0x802408E0; // type:func rom:0x87A4C0 -tik_07_UnkFunc23 = 0x80240E18; // type:func rom:0x87A9F8 -tik_07_UnkPartnerPosFunc = 0x80240F58; // type:func rom:0x87AB38 -tik_07_UnkPartnerPosFunc2 = 0x80240FA0; // type:func rom:0x87AB80 -tik_07_UnkFunc40 = 0x80240FE8; // type:func rom:0x87ABC8 +tik_07_Pipe_SetAnimFlag = 0x80240000; // type:func rom:0x879BE0 +tik_07_Pipe_GetCurrentFloor = 0x80240020; // type:func rom:0x879C00 +tik_07_Pipe_AwaitDownInput = 0x80240034; // type:func rom:0x879C14 +tik_07_Pipe_GetEntryPos = 0x802400F0; // type:func rom:0x879CD0 +tik_07_Pipe_GetCameraYaw = 0x802401D0; // type:func rom:0x879DB0 +tik_07_Pipe_GetPointAheadOfPlayer = 0x8024023C; // type:func rom:0x879E1C +tik_07_SuperBlock_SetOverride40 = 0x802402E0; // type:func rom:0x879EC0 +tik_07_SuperBlock_ClearOverride40 = 0x802402FC; // type:func rom:0x879EDC +tik_07_SuperBlock_HideBlockContent = 0x8024031C; // type:func rom:0x879EFC +tik_07_SuperBlock_GetPartnerRank = 0x80240348; // type:func rom:0x879F28 +tik_07_SuperBlock_get_partner_rank = 0x802403B4; // type:func rom:0x879F94 +tik_07_SuperBlock_CountEligiblePartners = 0x80240400; // type:func rom:0x879FE0 +tik_07_SuperBlock_ShowSelectPartnerMenu = 0x802404AC; // type:func rom:0x87A08C +tik_07_SuperBlock_SwitchToPartner = 0x802406FC; // type:func rom:0x87A2DC +tik_07_SuperBlock_LoadCurrentPartnerName = 0x80240728; // type:func rom:0x87A308 +tik_07_SuperBlock_StartGlowEffect = 0x80240760; // type:func rom:0x87A340 +tik_07_SuperBlock_EndGlowEffect = 0x802407F0; // type:func rom:0x87A3D0 +tik_07_SuperBlock_GatherEnergyFX = 0x80240824; // type:func rom:0x87A404 +tik_07_SuperBlock_RadiateFaintEnergyFX = 0x80240888; // type:func rom:0x87A468 +tik_07_SuperBlock_AnimateEnergyOrbs = 0x802408E0; // type:func rom:0x87A4C0 +tik_07_SuperBlock_WhiteScreenFlash = 0x80240E18; // type:func rom:0x87A9F8 +tik_07_SuperBlock_PartnerSparkles2 = 0x80240F58; // type:func rom:0x87AB38 +tik_07_SuperBlock_PartnerSparkles4 = 0x80240FA0; // type:func rom:0x87AB80 +tik_07_SuperBlock_WaitForPlayerToLand = 0x80240FE8; // type:func rom:0x87ABC8 tik_07_UnkPosFunc2 = 0x80241020; // type:func rom:0x87AC00 func_80241390_87AF70 = 0x80241390; // type:func rom:0x87AF70 tik_07_UnkNpcAIFunc23 = 0x802413F0; // type:func rom:0x87AFD0 @@ -12611,36 +12611,36 @@ tik_07_UnkNpcAIFunc3 = 0x802421E4; // type:func rom:0x87BDC4 tik_07_UnkFunc6 = 0x80242248; // type:func rom:0x87BE28 tik_07_UnkFunc5 = 0x802425D8; // type:func rom:0x87C1B8 tik_07_UnkNpcAIMainFunc9 = 0x802426FC; // type:func rom:0x87C2DC -D_802439F0_87D5D0 = 0x802439F0; // type:data rom:0x87D5D0 -D_802439F8_87D5D8 = 0x802439F8; // type:data rom:0x87D5D8 -D_80243A08_87D5E8 = 0x80243A08; // type:data rom:0x87D5E8 -tik_07_bigFuncFloats = 0x80243A48; // type:data rom:0x87D628 +tik_07_SuperBlock_CantUpgradeMessages = 0x802439F0; // type:data rom:0x87D5D0 +tik_07_SuperBlock_PartnerIDs = 0x802439F8; // type:data rom:0x87D5D8 +tik_07_SuperBlock_UpgradeDescMessages = 0x80243A08; // type:data rom:0x87D5E8 +tik_07_SuperBlock_UpgradeOrbAngles = 0x80243A48; // type:data rom:0x87D628 D_802449B0_87E590 = 0x802449B0; // type:data rom:0x87E590 tik_07_sixFloats = 0x80244CB0; // type:data rom:0x87E890 D_802451B0_87ED90 = 0x802451B0; // type:data rom:0x87ED90 D_802451B8_87ED98 = 0x802451B8; // type:data rom:0x87ED98 D_802451C0_87EDA0 = 0x802451C0; // type:data rom:0x87EDA0 -tik_08_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0x87EDF0 -tik_08_GetCurrentFloor = 0x80240020; // type:func rom:0x87EE10 -tik_08_UnkFunc25 = 0x80240034; // type:func rom:0x87EE24 -tik_08_GetEntryPos = 0x802400F0; // type:func rom:0x87EEE0 -tik_08_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0x87EFC0 -tik_08_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x87F02C -tik_08_UpdateTexturePanSmooth = 0x802402E0; // type:func rom:0x87F0D0 -tik_08_UpdateTexturePanStepped = 0x80240404; // type:func rom:0x87F1F4 +tik_08_Pipe_SetAnimFlag = 0x80240000; // type:func rom:0x87EDF0 +tik_08_Pipe_GetCurrentFloor = 0x80240020; // type:func rom:0x87EE10 +tik_08_Pipe_AwaitDownInput = 0x80240034; // type:func rom:0x87EE24 +tik_08_Pipe_GetEntryPos = 0x802400F0; // type:func rom:0x87EEE0 +tik_08_Pipe_GetCameraYaw = 0x802401D0; // type:func rom:0x87EFC0 +tik_08_Pipe_GetPointAheadOfPlayer = 0x8024023C; // type:func rom:0x87F02C +tik_08_UnkTexturePanFunc = 0x802402E0; // type:func rom:0x87F0D0 +tik_08_UnkTexturePanFunc2 = 0x80240404; // type:func rom:0x87F1F4 tik_08_UnkPosFunc2 = 0x802405F0; // type:func rom:0x87F3E0 tik_08_SetEntityPosition = 0x80240960; // type:func rom:0x87F750 tik_08_GetFloorCollider = 0x80240A30; // type:func rom:0x87F820 func_80240A5C_87F84C = 0x80240A5C; // type:func rom:0x87F84C D_80242C0E_8819FE = 0x80242C0E; // type:data rom:0x8819FE -tik_09_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0x8821C0 -tik_09_GetCurrentFloor = 0x80240020; // type:func rom:0x8821E0 -tik_09_UnkFunc25 = 0x80240034; // type:func rom:0x8821F4 -tik_09_GetEntryPos = 0x802400F0; // type:func rom:0x8822B0 -tik_09_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0x882390 -tik_09_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x8823FC -tik_09_UpdateTexturePanSmooth = 0x802402E0; // type:func rom:0x8824A0 -tik_09_UpdateTexturePanStepped = 0x80240404; // type:func rom:0x8825C4 +tik_09_Pipe_SetAnimFlag = 0x80240000; // type:func rom:0x8821C0 +tik_09_Pipe_GetCurrentFloor = 0x80240020; // type:func rom:0x8821E0 +tik_09_Pipe_AwaitDownInput = 0x80240034; // type:func rom:0x8821F4 +tik_09_Pipe_GetEntryPos = 0x802400F0; // type:func rom:0x8822B0 +tik_09_Pipe_GetCameraYaw = 0x802401D0; // type:func rom:0x882390 +tik_09_Pipe_GetPointAheadOfPlayer = 0x8024023C; // type:func rom:0x8823FC +tik_09_UnkTexturePanFunc = 0x802402E0; // type:func rom:0x8824A0 +tik_09_UnkTexturePanFunc2 = 0x80240404; // type:func rom:0x8825C4 tik_09_UnkPosFunc2 = 0x802405F0; // type:func rom:0x8827B0 tik_09_SetEntityPosition = 0x80240960; // type:func rom:0x882B20 tik_09_set_script_owner_npc_anim = 0x80240A30; // type:func rom:0x882BF0 @@ -12653,59 +12653,59 @@ D_802441A0_886360 = 0x802441A0; // type:data rom:0x886360 tik_10_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0x8863C0 tik_10_UpdateTexturePanStepped = 0x80240124; // type:func rom:0x8864E4 tik_10_UnkPosFunc2 = 0x80240310; // type:func rom:0x8866D0 -tik_10_SetOverrideFlags_40 = 0x80240680; // type:func rom:0x886A40 -tik_10_UnkFunc17 = 0x8024069C; // type:func rom:0x886A5C -func_802406BC_886A7C = 0x802406BC; // type:func rom:0x886A7C -tik_10_UnkFunc18 = 0x802406E8; // type:func rom:0x886AA8 -tik_10_UnkFunc37 = 0x80240754; // type:func rom:0x886B14 -tik_10_UnkFunc38 = 0x802407A0; // type:func rom:0x886B60 -func_8024084C_886C0C = 0x8024084C; // type:func rom:0x886C0C -tik_10_SwitchToPartner = 0x80240A9C; // type:func rom:0x886E5C -tik_10_UnkFunc19 = 0x80240AC8; // type:func rom:0x886E88 -tik_10_UnkFunc20 = 0x80240B00; // type:func rom:0x886EC0 -tik_10_UnkFunc39 = 0x80240B90; // type:func rom:0x886F50 -tik_10_UnkFunc21 = 0x80240BC4; // type:func rom:0x886F84 -tik_10_UnkFunc22 = 0x80240C28; // type:func rom:0x886FE8 -tik_10_UnkFunc60 = 0x80240C80; // type:func rom:0x887040 -tik_10_UnkFunc23 = 0x802411B8; // type:func rom:0x887578 -tik_10_UnkPartnerPosFunc = 0x802412F8; // type:func rom:0x8876B8 -tik_10_UnkPartnerPosFunc2 = 0x80241340; // type:func rom:0x887700 -tik_10_UnkFunc40 = 0x80241388; // type:func rom:0x887748 -D_80242030_8883F0 = 0x80242030; // type:data rom:0x8883F0 -D_80242038_8883F8 = 0x80242038; // type:data rom:0x8883F8 -D_80242048_888408 = 0x80242048; // type:data rom:0x888408 -tik_10_bigFuncFloats = 0x80242088; // type:data rom:0x888448 -tik_12_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0x888BD0 -tik_12_GetCurrentFloor = 0x80240020; // type:func rom:0x888BF0 -tik_12_UnkFunc25 = 0x80240034; // type:func rom:0x888C04 -tik_12_GetEntryPos = 0x802400F0; // type:func rom:0x888CC0 -tik_12_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0x888DA0 -tik_12_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x888E0C -tik_12_UpdateTexturePanSmooth = 0x802402E0; // type:func rom:0x888EB0 -tik_12_UpdateTexturePanStepped = 0x80240404; // type:func rom:0x888FD4 +tik_10_SuperBlock_SetOverride40 = 0x80240680; // type:func rom:0x886A40 +tik_10_SuperBlock_ClearOverride40 = 0x8024069C; // type:func rom:0x886A5C +tik_10_SuperBlock_HideBlockContent = 0x802406BC; // type:func rom:0x886A7C +tik_10_SuperBlock_GetPartnerRank = 0x802406E8; // type:func rom:0x886AA8 +tik_10_SuperBlock_get_partner_rank = 0x80240754; // type:func rom:0x886B14 +tik_10_SuperBlock_CountEligiblePartners = 0x802407A0; // type:func rom:0x886B60 +tik_10_SuperBlock_ShowSelectPartnerMenu = 0x8024084C; // type:func rom:0x886C0C +tik_10_SuperBlock_SwitchToPartner = 0x80240A9C; // type:func rom:0x886E5C +tik_10_SuperBlock_LoadCurrentPartnerName = 0x80240AC8; // type:func rom:0x886E88 +tik_10_SuperBlock_StartGlowEffect = 0x80240B00; // type:func rom:0x886EC0 +tik_10_SuperBlock_EndGlowEffect = 0x80240B90; // type:func rom:0x886F50 +tik_10_SuperBlock_GatherEnergyFX = 0x80240BC4; // type:func rom:0x886F84 +tik_10_SuperBlock_RadiateFaintEnergyFX = 0x80240C28; // type:func rom:0x886FE8 +tik_10_SuperBlock_AnimateEnergyOrbs = 0x80240C80; // type:func rom:0x887040 +tik_10_SuperBlock_WhiteScreenFlash = 0x802411B8; // type:func rom:0x887578 +tik_10_SuperBlock_PartnerSparkles2 = 0x802412F8; // type:func rom:0x8876B8 +tik_10_SuperBlock_PartnerSparkles4 = 0x80241340; // type:func rom:0x887700 +tik_10_SuperBlock_WaitForPlayerToLand = 0x80241388; // type:func rom:0x887748 +tik_10_SuperBlock_CantUpgradeMessages = 0x80242030; // type:data rom:0x8883F0 +tik_10_SuperBlock_PartnerIDs = 0x80242038; // type:data rom:0x8883F8 +tik_10_SuperBlock_UpgradeDescMessages = 0x80242048; // type:data rom:0x888408 +tik_10_SuperBlock_UpgradeOrbAngles = 0x80242088; // type:data rom:0x888448 +tik_12_Pipe_SetAnimFlag = 0x80240000; // type:func rom:0x888BD0 +tik_12_Pipe_GetCurrentFloor = 0x80240020; // type:func rom:0x888BF0 +tik_12_Pipe_AwaitDownInput = 0x80240034; // type:func rom:0x888C04 +tik_12_Pipe_GetEntryPos = 0x802400F0; // type:func rom:0x888CC0 +tik_12_Pipe_GetCameraYaw = 0x802401D0; // type:func rom:0x888DA0 +tik_12_Pipe_GetPointAheadOfPlayer = 0x8024023C; // type:func rom:0x888E0C +tik_12_UnkTexturePanFunc = 0x802402E0; // type:func rom:0x888EB0 +tik_12_UnkTexturePanFunc2 = 0x80240404; // type:func rom:0x888FD4 tik_12_UnkPosFunc2 = 0x802405F0; // type:func rom:0x8891C0 tik_12_StashVars = 0x80240960; // type:func rom:0x889530 tik_12_GetItemName = 0x80240A14; // type:func rom:0x8895E4 tik_12_SomeItemEntityFunc = 0x80240A78; // type:func rom:0x889648 tik_12_CheckItemFlags40 = 0x80240BC8; // type:func rom:0x889798 -tik_12_SetOverrideFlags_40 = 0x80240C1C; // type:func rom:0x8897EC -tik_12_UnkFunc17 = 0x80240C38; // type:func rom:0x889808 -func_80240C58_889828 = 0x80240C58; // type:func rom:0x889828 -tik_12_UnkFunc18 = 0x80240C84; // type:func rom:0x889854 -tik_12_UnkFunc37 = 0x80240CF0; // type:func rom:0x8898C0 -tik_12_UnkFunc38 = 0x80240D3C; // type:func rom:0x88990C -func_80240DE8_8899B8 = 0x80240DE8; // type:func rom:0x8899B8 -tik_12_SwitchToPartner = 0x80241038; // type:func rom:0x889C08 -tik_12_UnkFunc19 = 0x80241064; // type:func rom:0x889C34 -tik_12_UnkFunc20 = 0x8024109C; // type:func rom:0x889C6C -tik_12_UnkFunc39 = 0x8024112C; // type:func rom:0x889CFC -tik_12_UnkFunc21 = 0x80241160; // type:func rom:0x889D30 -tik_12_UnkFunc22 = 0x802411C4; // type:func rom:0x889D94 -tik_12_UnkFunc60 = 0x8024121C; // type:func rom:0x889DEC -tik_12_UnkFunc23 = 0x80241754; // type:func rom:0x88A324 -tik_12_UnkPartnerPosFunc = 0x80241894; // type:func rom:0x88A464 -tik_12_UnkPartnerPosFunc2 = 0x802418DC; // type:func rom:0x88A4AC -tik_12_UnkFunc40 = 0x80241924; // type:func rom:0x88A4F4 +tik_12_SuperBlock_SetOverride40 = 0x80240C1C; // type:func rom:0x8897EC +tik_12_SuperBlock_ClearOverride40 = 0x80240C38; // type:func rom:0x889808 +tik_12_SuperBlock_HideBlockContent = 0x80240C58; // type:func rom:0x889828 +tik_12_SuperBlock_GetPartnerRank = 0x80240C84; // type:func rom:0x889854 +tik_12_SuperBlock_get_partner_rank = 0x80240CF0; // type:func rom:0x8898C0 +tik_12_SuperBlock_CountEligiblePartners = 0x80240D3C; // type:func rom:0x88990C +tik_12_SuperBlock_ShowSelectPartnerMenu = 0x80240DE8; // type:func rom:0x8899B8 +tik_12_SuperBlock_SwitchToPartner = 0x80241038; // type:func rom:0x889C08 +tik_12_SuperBlock_LoadCurrentPartnerName = 0x80241064; // type:func rom:0x889C34 +tik_12_SuperBlock_StartGlowEffect = 0x8024109C; // type:func rom:0x889C6C +tik_12_SuperBlock_EndGlowEffect = 0x8024112C; // type:func rom:0x889CFC +tik_12_SuperBlock_GatherEnergyFX = 0x80241160; // type:func rom:0x889D30 +tik_12_SuperBlock_RadiateFaintEnergyFX = 0x802411C4; // type:func rom:0x889D94 +tik_12_SuperBlock_AnimateEnergyOrbs = 0x8024121C; // type:func rom:0x889DEC +tik_12_SuperBlock_WhiteScreenFlash = 0x80241754; // type:func rom:0x88A324 +tik_12_SuperBlock_PartnerSparkles2 = 0x80241894; // type:func rom:0x88A464 +tik_12_SuperBlock_PartnerSparkles4 = 0x802418DC; // type:func rom:0x88A4AC +tik_12_SuperBlock_WaitForPlayerToLand = 0x80241924; // type:func rom:0x88A4F4 tik_12_set_script_owner_npc_anim = 0x80241960; // type:func rom:0x88A530 tik_12_UnkDistFunc = 0x802419DC; // type:func rom:0x88A5AC tik_12_UnkNpcAIFunc12 = 0x80241B10; // type:func rom:0x88A6E0 @@ -12714,29 +12714,29 @@ tik_12_UnkNpcAIMainFunc5 = 0x80241CF4; // type:func rom:0x88A8C4 tik_12_func_80240814_97BE44 = 0x80242134; // type:func rom:0x88AD04 tik_12_AwaitPlayerNearNpc = 0x8024217C; // type:func rom:0x88AD4C tik_12_func_802408B4_97BEE4 = 0x802421D4; // type:func rom:0x88ADA4 -tik_12_varTable = 0x80243C40; // type:data rom:0x88C810 -D_80243CAC_88C87C = 0x80243CAC; // type:data rom:0x88C87C -D_80243CB4_88C884 = 0x80243CB4; // type:data rom:0x88C884 -D_80243CC4_88C894 = 0x80243CC4; // type:data rom:0x88C894 -tik_12_bigFuncFloats = 0x80243D04; // type:data rom:0x88C8D4 +D_80243C40_88C810 = 0x80243C40; // type:data rom:0x88C810 +tik_12_SuperBlock_CantUpgradeMessages = 0x80243CAC; // type:data rom:0x88C87C +tik_12_SuperBlock_PartnerIDs = 0x80243CB4; // type:data rom:0x88C884 +tik_12_SuperBlock_UpgradeDescMessages = 0x80243CC4; // type:data rom:0x88C894 +tik_12_SuperBlock_UpgradeOrbAngles = 0x80243D04; // type:data rom:0x88C8D4 D_802449D0_88D5A0 = 0x802449D0; // type:data rom:0x88D5A0 -tik_14_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0x88D600 -tik_14_GetCurrentFloor = 0x80240020; // type:func rom:0x88D620 -tik_14_UnkFunc25 = 0x80240034; // type:func rom:0x88D634 -tik_14_GetEntryPos = 0x802400F0; // type:func rom:0x88D6F0 -tik_14_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0x88D7D0 -tik_14_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x88D83C -tik_14_UpdateTexturePanSmooth = 0x802402E0; // type:func rom:0x88D8E0 -tik_14_UpdateTexturePanStepped = 0x80240404; // type:func rom:0x88DA04 +tik_14_Pipe_SetAnimFlag = 0x80240000; // type:func rom:0x88D600 +tik_14_Pipe_GetCurrentFloor = 0x80240020; // type:func rom:0x88D620 +tik_14_Pipe_AwaitDownInput = 0x80240034; // type:func rom:0x88D634 +tik_14_Pipe_GetEntryPos = 0x802400F0; // type:func rom:0x88D6F0 +tik_14_Pipe_GetCameraYaw = 0x802401D0; // type:func rom:0x88D7D0 +tik_14_Pipe_GetPointAheadOfPlayer = 0x8024023C; // type:func rom:0x88D83C +tik_14_UnkTexturePanFunc = 0x802402E0; // type:func rom:0x88D8E0 +tik_14_UnkTexturePanFunc2 = 0x80240404; // type:func rom:0x88DA04 tik_14_UnkPosFunc2 = 0x802405F0; // type:func rom:0x88DBF0 -tik_15_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0x88FBA0 -tik_15_GetCurrentFloor = 0x80240020; // type:func rom:0x88FBC0 -tik_15_UnkFunc25 = 0x80240034; // type:func rom:0x88FBD4 -tik_15_GetEntryPos = 0x802400F0; // type:func rom:0x88FC90 -tik_15_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0x88FD70 -tik_15_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x88FDDC -tik_15_UpdateTexturePanSmooth = 0x802402E0; // type:func rom:0x88FE80 -tik_15_UpdateTexturePanStepped = 0x80240404; // type:func rom:0x88FFA4 +tik_15_Pipe_SetAnimFlag = 0x80240000; // type:func rom:0x88FBA0 +tik_15_Pipe_GetCurrentFloor = 0x80240020; // type:func rom:0x88FBC0 +tik_15_Pipe_AwaitDownInput = 0x80240034; // type:func rom:0x88FBD4 +tik_15_Pipe_GetEntryPos = 0x802400F0; // type:func rom:0x88FC90 +tik_15_Pipe_GetCameraYaw = 0x802401D0; // type:func rom:0x88FD70 +tik_15_Pipe_GetPointAheadOfPlayer = 0x8024023C; // type:func rom:0x88FDDC +tik_15_UnkTexturePanFunc = 0x802402E0; // type:func rom:0x88FE80 +tik_15_UnkTexturePanFunc2 = 0x80240404; // type:func rom:0x88FFA4 tik_15_UnkPosFunc2 = 0x802405F0; // type:func rom:0x890190 tik_15_StashVars = 0x80240960; // type:func rom:0x890500 tik_15_GetItemName = 0x80240A14; // type:func rom:0x8905B4 @@ -12746,78 +12746,78 @@ func_80240AD0_890670 = 0x80240AD0; // type:func rom:0x890670 tik_15_varTable = 0x80242758; // type:data rom:0x8922F8 D_802427BC_89235C = 0x802427BC; // type:data rom:0x89235C func_80240000_892A20 = 0x80240000; // type:func rom:0x892A20 -tik_17_SetOverrideFlags_40 = 0x80240030; // type:func rom:0x892A50 -tik_17_UnkFunc17 = 0x8024004C; // type:func rom:0x892A6C -func_8024006C_892A8C = 0x8024006C; // type:func rom:0x892A8C -tik_17_UnkFunc18 = 0x80240098; // type:func rom:0x892AB8 -tik_17_UnkFunc37 = 0x80240104; // type:func rom:0x892B24 -tik_17_UnkFunc38 = 0x80240150; // type:func rom:0x892B70 -func_802401FC_892C1C = 0x802401FC; // type:func rom:0x892C1C -tik_17_SwitchToPartner = 0x8024044C; // type:func rom:0x892E6C -tik_17_UnkFunc19 = 0x80240478; // type:func rom:0x892E98 -tik_17_UnkFunc20 = 0x802404B0; // type:func rom:0x892ED0 -tik_17_UnkFunc39 = 0x80240540; // type:func rom:0x892F60 -tik_17_UnkFunc21 = 0x80240574; // type:func rom:0x892F94 -tik_17_UnkFunc22 = 0x802405D8; // type:func rom:0x892FF8 -tik_17_UnkFunc60 = 0x80240630; // type:func rom:0x893050 -tik_17_UnkFunc23 = 0x80240B68; // type:func rom:0x893588 -tik_17_UnkPartnerPosFunc = 0x80240CA8; // type:func rom:0x8936C8 -tik_17_UnkPartnerPosFunc2 = 0x80240CF0; // type:func rom:0x893710 -tik_17_UnkFunc40 = 0x80240D38; // type:func rom:0x893758 -tik_17_SetPlayerStatusAnimFlags100000 = 0x80240D70; // type:func rom:0x893790 -tik_17_GetCurrentFloor = 0x80240D90; // type:func rom:0x8937B0 -tik_17_UnkFunc25 = 0x80240DA4; // type:func rom:0x8937C4 -tik_17_GetEntryPos = 0x80240E60; // type:func rom:0x893880 -tik_17_GetCurrentCameraYawClamped180 = 0x80240F40; // type:func rom:0x893960 -tik_17_SomeXYZFunc2 = 0x80240FAC; // type:func rom:0x8939CC -tik_17_UpdateTexturePanSmooth = 0x80241050; // type:func rom:0x893A70 -tik_17_UpdateTexturePanStepped = 0x80241174; // type:func rom:0x893B94 -D_80241420_893E40 = 0x80241420; // type:data rom:0x893E40 -D_80241428_893E48 = 0x80241428; // type:data rom:0x893E48 -D_80241438_893E58 = 0x80241438; // type:data rom:0x893E58 -tik_17_bigFuncFloats = 0x80241478; // type:data rom:0x893E98 -tik_18_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0x8956E0 -tik_18_UpdateTexturePanStepped = 0x80240124; // type:func rom:0x895804 +tik_17_SuperBlock_SetOverride40 = 0x80240030; // type:func rom:0x892A50 +tik_17_SuperBlock_ClearOverride40 = 0x8024004C; // type:func rom:0x892A6C +tik_17_SuperBlock_HideBlockContent = 0x8024006C; // type:func rom:0x892A8C +tik_17_SuperBlock_GetPartnerRank = 0x80240098; // type:func rom:0x892AB8 +tik_17_SuperBlock_get_partner_rank = 0x80240104; // type:func rom:0x892B24 +tik_17_SuperBlock_CountEligiblePartners = 0x80240150; // type:func rom:0x892B70 +tik_17_SuperBlock_ShowSelectPartnerMenu = 0x802401FC; // type:func rom:0x892C1C +tik_17_SuperBlock_SwitchToPartner = 0x8024044C; // type:func rom:0x892E6C +tik_17_SuperBlock_LoadCurrentPartnerName = 0x80240478; // type:func rom:0x892E98 +tik_17_SuperBlock_StartGlowEffect = 0x802404B0; // type:func rom:0x892ED0 +tik_17_SuperBlock_EndGlowEffect = 0x80240540; // type:func rom:0x892F60 +tik_17_SuperBlock_GatherEnergyFX = 0x80240574; // type:func rom:0x892F94 +tik_17_SuperBlock_RadiateFaintEnergyFX = 0x802405D8; // type:func rom:0x892FF8 +tik_17_SuperBlock_AnimateEnergyOrbs = 0x80240630; // type:func rom:0x893050 +tik_17_SuperBlock_WhiteScreenFlash = 0x80240B68; // type:func rom:0x893588 +tik_17_SuperBlock_PartnerSparkles2 = 0x80240CA8; // type:func rom:0x8936C8 +tik_17_SuperBlock_PartnerSparkles4 = 0x80240CF0; // type:func rom:0x893710 +tik_17_SuperBlock_WaitForPlayerToLand = 0x80240D38; // type:func rom:0x893758 +tik_17_Pipe_SetAnimFlag = 0x80240D70; // type:func rom:0x893790 +tik_17_Pipe_GetCurrentFloor = 0x80240D90; // type:func rom:0x8937B0 +tik_17_Pipe_AwaitDownInput = 0x80240DA4; // type:func rom:0x8937C4 +tik_17_Pipe_GetEntryPos = 0x80240E60; // type:func rom:0x893880 +tik_17_Pipe_GetCameraYaw = 0x80240F40; // type:func rom:0x893960 +tik_17_Pipe_GetPointAheadOfPlayer = 0x80240FAC; // type:func rom:0x8939CC +tik_17_UnkTexturePanFunc = 0x80241050; // type:func rom:0x893A70 +tik_17_UnkTexturePanFunc2 = 0x80241174; // type:func rom:0x893B94 +tik_17_SuperBlock_CantUpgradeMessages = 0x80241420; // type:data rom:0x893E40 +tik_17_SuperBlock_PartnerIDs = 0x80241428; // type:data rom:0x893E48 +tik_17_SuperBlock_UpgradeDescMessages = 0x80241438; // type:data rom:0x893E58 +tik_17_SuperBlock_UpgradeOrbAngles = 0x80241478; // type:data rom:0x893E98 +tik_18_UnkTexturePanFunc = 0x80240000; // type:func rom:0x8956E0 +tik_18_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0x895804 tik_18_UnkPosFunc2 = 0x80240310; // type:func rom:0x8959F0 func_80240680_895D60 = 0x80240680; // type:func rom:0x895D60 -tik_19_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0x8975E0 -tik_19_GetCurrentFloor = 0x80240020; // type:func rom:0x897600 -tik_19_UnkFunc25 = 0x80240034; // type:func rom:0x897614 -tik_19_GetEntryPos = 0x802400F0; // type:func rom:0x8976D0 -tik_19_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0x8977B0 -tik_19_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x89781C -tik_19_UpdateTexturePanSmooth = 0x802402E0; // type:func rom:0x8978C0 -tik_19_UpdateTexturePanStepped = 0x80240404; // type:func rom:0x8979E4 -tik_19_SetOverrideFlags_40 = 0x802405F0; // type:func rom:0x897BD0 -tik_19_UnkFunc17 = 0x8024060C; // type:func rom:0x897BEC -func_8024062C_897C0C = 0x8024062C; // type:func rom:0x897C0C -tik_19_UnkFunc18 = 0x80240658; // type:func rom:0x897C38 -tik_19_UnkFunc37 = 0x802406C4; // type:func rom:0x897CA4 -tik_19_UnkFunc38 = 0x80240710; // type:func rom:0x897CF0 -func_802407BC_897D9C = 0x802407BC; // type:func rom:0x897D9C -tik_19_SwitchToPartner = 0x80240A0C; // type:func rom:0x897FEC -tik_19_UnkFunc19 = 0x80240A38; // type:func rom:0x898018 -tik_19_UnkFunc20 = 0x80240A70; // type:func rom:0x898050 -tik_19_UnkFunc39 = 0x80240B00; // type:func rom:0x8980E0 -tik_19_UnkFunc21 = 0x80240B34; // type:func rom:0x898114 -tik_19_UnkFunc22 = 0x80240B98; // type:func rom:0x898178 -tik_19_UnkFunc60 = 0x80240BF0; // type:func rom:0x8981D0 -tik_19_UnkFunc23 = 0x80241128; // type:func rom:0x898708 -tik_19_UnkPartnerPosFunc = 0x80241268; // type:func rom:0x898848 -tik_19_UnkPartnerPosFunc2 = 0x802412B0; // type:func rom:0x898890 -tik_19_UnkFunc40 = 0x802412F8; // type:func rom:0x8988D8 -D_802426B0_899C90 = 0x802426B0; // type:data rom:0x899C90 -D_802426B8_899C98 = 0x802426B8; // type:data rom:0x899C98 -D_802426C8_899CA8 = 0x802426C8; // type:data rom:0x899CA8 -tik_19_bigFuncFloats = 0x80242708; // type:data rom:0x899CE8 -tik_20_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0x89A350 -tik_20_UpdateTexturePanStepped = 0x80240124; // type:func rom:0x89A474 -tik_20_SetPlayerStatusAnimFlags100000 = 0x8024030C; // type:func rom:0x89A65C -tik_20_GetCurrentFloor = 0x8024032C; // type:func rom:0x89A67C -tik_20_UnkFunc25 = 0x80240340; // type:func rom:0x89A690 -tik_20_GetEntryPos = 0x802403FC; // type:func rom:0x89A74C -tik_20_GetCurrentCameraYawClamped180 = 0x802404DC; // type:func rom:0x89A82C -tik_20_SomeXYZFunc2 = 0x80240548; // type:func rom:0x89A898 +tik_19_Pipe_SetAnimFlag = 0x80240000; // type:func rom:0x8975E0 +tik_19_Pipe_GetCurrentFloor = 0x80240020; // type:func rom:0x897600 +tik_19_Pipe_AwaitDownInput = 0x80240034; // type:func rom:0x897614 +tik_19_Pipe_GetEntryPos = 0x802400F0; // type:func rom:0x8976D0 +tik_19_Pipe_GetCameraYaw = 0x802401D0; // type:func rom:0x8977B0 +tik_19_Pipe_GetPointAheadOfPlayer = 0x8024023C; // type:func rom:0x89781C +tik_19_UnkTexturePanFunc = 0x802402E0; // type:func rom:0x8978C0 +tik_19_UnkTexturePanFunc2 = 0x80240404; // type:func rom:0x8979E4 +tik_19_SuperBlock_SetOverride40 = 0x802405F0; // type:func rom:0x897BD0 +tik_19_SuperBlock_ClearOverride40 = 0x8024060C; // type:func rom:0x897BEC +tik_19_SuperBlock_HideBlockContent = 0x8024062C; // type:func rom:0x897C0C +tik_19_SuperBlock_GetPartnerRank = 0x80240658; // type:func rom:0x897C38 +tik_19_SuperBlock_get_partner_rank = 0x802406C4; // type:func rom:0x897CA4 +tik_19_SuperBlock_CountEligiblePartners = 0x80240710; // type:func rom:0x897CF0 +tik_19_SuperBlock_ShowSelectPartnerMenu = 0x802407BC; // type:func rom:0x897D9C +tik_19_SuperBlock_SwitchToPartner = 0x80240A0C; // type:func rom:0x897FEC +tik_19_SuperBlock_LoadCurrentPartnerName = 0x80240A38; // type:func rom:0x898018 +tik_19_SuperBlock_StartGlowEffect = 0x80240A70; // type:func rom:0x898050 +tik_19_SuperBlock_EndGlowEffect = 0x80240B00; // type:func rom:0x8980E0 +tik_19_SuperBlock_GatherEnergyFX = 0x80240B34; // type:func rom:0x898114 +tik_19_SuperBlock_RadiateFaintEnergyFX = 0x80240B98; // type:func rom:0x898178 +tik_19_SuperBlock_AnimateEnergyOrbs = 0x80240BF0; // type:func rom:0x8981D0 +tik_19_SuperBlock_WhiteScreenFlash = 0x80241128; // type:func rom:0x898708 +tik_19_SuperBlock_PartnerSparkles2 = 0x80241268; // type:func rom:0x898848 +tik_19_SuperBlock_PartnerSparkles4 = 0x802412B0; // type:func rom:0x898890 +tik_19_SuperBlock_WaitForPlayerToLand = 0x802412F8; // type:func rom:0x8988D8 +tik_19_SuperBlock_CantUpgradeMessages = 0x802426B0; // type:data rom:0x899C90 +tik_19_SuperBlock_PartnerIDs = 0x802426B8; // type:data rom:0x899C98 +tik_19_SuperBlock_UpgradeDescMessages = 0x802426C8; // type:data rom:0x899CA8 +tik_19_SuperBlock_UpgradeOrbAngles = 0x80242708; // type:data rom:0x899CE8 +tik_20_UnkTexturePanFunc = 0x80240000; // type:func rom:0x89A350 +tik_20_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0x89A474 +tik_20_Pipe_SetAnimFlag = 0x8024030C; // type:func rom:0x89A65C +tik_20_Pipe_GetCurrentFloor = 0x8024032C; // type:func rom:0x89A67C +tik_20_Pipe_AwaitDownInput = 0x80240340; // type:func rom:0x89A690 +tik_20_Pipe_GetEntryPos = 0x802403FC; // type:func rom:0x89A74C +tik_20_Pipe_GetCameraYaw = 0x802404DC; // type:func rom:0x89A82C +tik_20_Pipe_GetPointAheadOfPlayer = 0x80240548; // type:func rom:0x89A898 tik_20_UnkPosFunc2 = 0x802405EC; // type:func rom:0x89A93C tik_20_set_script_owner_npc_anim = 0x80240960; // type:func rom:0x89ACB0 tik_20_UnkDistFunc = 0x802409DC; // type:func rom:0x89AD2C @@ -12825,34 +12825,34 @@ tik_20_UnkNpcAIFunc12 = 0x80240B10; // type:func rom:0x89AE60 tik_20_set_script_owner_npc_col_height = 0x80240C74; // type:func rom:0x89AFC4 tik_20_UnkNpcAIMainFunc5 = 0x80240CF4; // type:func rom:0x89B044 D_802433F0_89D740 = 0x802433F0; // type:data rom:0x89D740 -tik_21_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0x89D7A0 -tik_21_UpdateTexturePanStepped = 0x80240124; // type:func rom:0x89D8C4 -tik_21_SetPlayerStatusAnimFlags100000 = 0x8024030C; // type:func rom:0x89DAAC -tik_21_GetCurrentFloor = 0x8024032C; // type:func rom:0x89DACC -tik_21_UnkFunc25 = 0x80240340; // type:func rom:0x89DAE0 -tik_21_GetEntryPos = 0x802403FC; // type:func rom:0x89DB9C -tik_21_GetCurrentCameraYawClamped180 = 0x802404DC; // type:func rom:0x89DC7C -tik_21_SomeXYZFunc2 = 0x80240548; // type:func rom:0x89DCE8 +tik_21_UnkTexturePanFunc = 0x80240000; // type:func rom:0x89D7A0 +tik_21_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0x89D8C4 +tik_21_Pipe_SetAnimFlag = 0x8024030C; // type:func rom:0x89DAAC +tik_21_Pipe_GetCurrentFloor = 0x8024032C; // type:func rom:0x89DACC +tik_21_Pipe_AwaitDownInput = 0x80240340; // type:func rom:0x89DAE0 +tik_21_Pipe_GetEntryPos = 0x802403FC; // type:func rom:0x89DB9C +tik_21_Pipe_GetCameraYaw = 0x802404DC; // type:func rom:0x89DC7C +tik_21_Pipe_GetPointAheadOfPlayer = 0x80240548; // type:func rom:0x89DCE8 tik_21_UnkPosFunc2 = 0x802405EC; // type:func rom:0x89DD8C func_80240000_89FEC0 = 0x80240000; // type:func rom:0x89FEC0 -tik_22_UpdateTexturePanSmooth = 0x80240030; // type:func rom:0x89FEF0 -tik_22_UpdateTexturePanStepped = 0x80240154; // type:func rom:0x8A0014 -tik_22_SetPlayerStatusAnimFlags100000 = 0x8024033C; // type:func rom:0x8A01FC -tik_22_GetCurrentFloor = 0x8024035C; // type:func rom:0x8A021C -tik_22_UnkFunc25 = 0x80240370; // type:func rom:0x8A0230 -tik_22_GetEntryPos = 0x8024042C; // type:func rom:0x8A02EC -tik_22_GetCurrentCameraYawClamped180 = 0x8024050C; // type:func rom:0x8A03CC -tik_22_SomeXYZFunc2 = 0x80240578; // type:func rom:0x8A0438 +tik_22_UnkTexturePanFunc = 0x80240030; // type:func rom:0x89FEF0 +tik_22_UnkTexturePanFunc2 = 0x80240154; // type:func rom:0x8A0014 +tik_22_Pipe_SetAnimFlag = 0x8024033C; // type:func rom:0x8A01FC +tik_22_Pipe_GetCurrentFloor = 0x8024035C; // type:func rom:0x8A021C +tik_22_Pipe_AwaitDownInput = 0x80240370; // type:func rom:0x8A0230 +tik_22_Pipe_GetEntryPos = 0x8024042C; // type:func rom:0x8A02EC +tik_22_Pipe_GetCameraYaw = 0x8024050C; // type:func rom:0x8A03CC +tik_22_Pipe_GetPointAheadOfPlayer = 0x80240578; // type:func rom:0x8A0438 func_8024061C_8A04DC = 0x8024061C; // type:func rom:0x8A04DC tik_22_UnkPosFunc2 = 0x80240640; // type:func rom:0x8A0500 -tik_23_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0x8A23D0 -tik_23_GetCurrentFloor = 0x80240020; // type:func rom:0x8A23F0 -tik_23_UnkFunc25 = 0x80240034; // type:func rom:0x8A2404 -tik_23_GetEntryPos = 0x802400F0; // type:func rom:0x8A24C0 -tik_23_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0x8A25A0 -tik_23_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x8A260C -tik_23_UpdateTexturePanSmooth = 0x802402E0; // type:func rom:0x8A26B0 -tik_23_UpdateTexturePanStepped = 0x80240404; // type:func rom:0x8A27D4 +tik_23_Pipe_SetAnimFlag = 0x80240000; // type:func rom:0x8A23D0 +tik_23_Pipe_GetCurrentFloor = 0x80240020; // type:func rom:0x8A23F0 +tik_23_Pipe_AwaitDownInput = 0x80240034; // type:func rom:0x8A2404 +tik_23_Pipe_GetEntryPos = 0x802400F0; // type:func rom:0x8A24C0 +tik_23_Pipe_GetCameraYaw = 0x802401D0; // type:func rom:0x8A25A0 +tik_23_Pipe_GetPointAheadOfPlayer = 0x8024023C; // type:func rom:0x8A260C +tik_23_UnkTexturePanFunc = 0x802402E0; // type:func rom:0x8A26B0 +tik_23_UnkTexturePanFunc2 = 0x80240404; // type:func rom:0x8A27D4 tik_23_UnkPosFunc2 = 0x802405EC; // type:func rom:0x8A29BC tik_23_set_script_owner_npc_anim = 0x80240960; // type:func rom:0x8A2D30 tik_23_UnkDistFunc = 0x802409DC; // type:func rom:0x8A2DAC @@ -12905,12 +12905,12 @@ func_802405F0_8AC580 = 0x802405F0; // type:func rom:0x8AC580 func_80240BD8_8ACB68 = 0x80240BD8; // type:func rom:0x8ACB68 func_80240CB0_8ACC40 = 0x80240CB0; // type:func rom:0x8ACC40 D_80242D60_8AECF0 = 0x80242D60; // type:data rom:0x8AECF0 -kmr_02_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0x8B0070 -kmr_02_GetCurrentFloor = 0x80240020; // type:func rom:0x8B0090 -kmr_02_UnkFunc25 = 0x80240034; // type:func rom:0x8B00A4 -kmr_02_GetEntryPos = 0x802400F0; // type:func rom:0x8B0160 -kmr_02_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0x8B0240 -kmr_02_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x8B02AC +kmr_02_Pipe_SetAnimFlag = 0x80240000; // type:func rom:0x8B0070 +kmr_02_Pipe_GetCurrentFloor = 0x80240020; // type:func rom:0x8B0090 +kmr_02_Pipe_AwaitDownInput = 0x80240034; // type:func rom:0x8B00A4 +kmr_02_Pipe_GetEntryPos = 0x802400F0; // type:func rom:0x8B0160 +kmr_02_Pipe_GetCameraYaw = 0x802401D0; // type:func rom:0x8B0240 +kmr_02_Pipe_GetPointAheadOfPlayer = 0x8024023C; // type:func rom:0x8B02AC func_802402E0_8B0350 = 0x802402E0; // type:func rom:0x8B0350 func_80240370_8B03E0 = 0x80240370; // type:func rom:0x8B03E0 kmr_02_StashVars = 0x80240390; // type:func rom:0x8B0400 @@ -13193,12 +13193,12 @@ kmr_12_npcGroupList = 0x802409A8; // type:data rom:0x8EBD08 kmr_12_ReadEastSign = 0x802409C0; // type:data rom:0x8EBD20 kmr_12_MakeEntities = 0x80240A64; // type:data rom:0x8EBDC4 func_80240000_8EBE20 = 0x80240000; // type:func rom:0x8EBE20 -kmr_20_SetPlayerStatusAnimFlags100000 = 0x80240030; // type:func rom:0x8EBE50 -kmr_20_GetCurrentFloor = 0x80240050; // type:func rom:0x8EBE70 -kmr_20_UnkFunc25 = 0x80240064; // type:func rom:0x8EBE84 -kmr_20_GetEntryPos = 0x80240120; // type:func rom:0x8EBF40 -kmr_20_GetCurrentCameraYawClamped180 = 0x80240200; // type:func rom:0x8EC020 -kmr_20_SomeXYZFunc2 = 0x8024026C; // type:func rom:0x8EC08C +kmr_20_Pipe_SetAnimFlag = 0x80240030; // type:func rom:0x8EBE50 +kmr_20_Pipe_GetCurrentFloor = 0x80240050; // type:func rom:0x8EBE70 +kmr_20_Pipe_AwaitDownInput = 0x80240064; // type:func rom:0x8EBE84 +kmr_20_Pipe_GetEntryPos = 0x80240120; // type:func rom:0x8EBF40 +kmr_20_Pipe_GetCameraYaw = 0x80240200; // type:func rom:0x8EC020 +kmr_20_Pipe_GetPointAheadOfPlayer = 0x8024026C; // type:func rom:0x8EC08C func_80240310_8EC130 = 0x80240310; // type:func rom:0x8EC130 func_80240330_8EC150 = 0x80240330; // type:func rom:0x8EC150 func_80240358_8EC178 = 0x80240358; // type:func rom:0x8EC178 @@ -13231,27 +13231,27 @@ kmr_20_Call800EB168 = 0x80241564; // type:func rom:0x8ED384 kmr_20_UnkFunc36 = 0x80241594; // type:func rom:0x8ED3B4 func_8024159C_8ED3BC = 0x8024159C; // type:func rom:0x8ED3BC func_802415C4_8ED3E4 = 0x802415C4; // type:func rom:0x8ED3E4 -kmr_20_UnkFunc40 = 0x802415EC; // type:func rom:0x8ED40C -kmr_20_StashVars = 0x80241620; // type:func rom:0x8ED440 +kmr_20_WaitForPlayerToLand = 0x802415EC; // type:func rom:0x8ED40C +func_80241620_8ED440 = 0x80241620; // type:func rom:0x8ED440 kmr_20_GetItemName = 0x802416D4; // type:func rom:0x8ED4F4 func_80241738_8ED558 = 0x80241738; // type:func rom:0x8ED558 -dup_kmr_20_SetPlayerStatusAnimFlags100000 = 0x80241780; // type:func rom:0x8ED5A0 -dup_kmr_20_GetCurrentFloor = 0x802417A0; // type:func rom:0x8ED5C0 -dup_kmr_20_UnkFunc25 = 0x802417B4; // type:func rom:0x8ED5D4 -dup_kmr_20_GetEntryPos = 0x80241870; // type:func rom:0x8ED690 -dup_kmr_20_GetCurrentCameraYawClamped180 = 0x80241950; // type:func rom:0x8ED770 -dup_kmr_20_SomeXYZFunc2 = 0x802419BC; // type:func rom:0x8ED7DC +dup_kmr_20_Pipe_SetAnimFlag = 0x80241780; // type:func rom:0x8ED5A0 +dup_kmr_20_Pipe_GetCurrentFloor = 0x802417A0; // type:func rom:0x8ED5C0 +dup_kmr_20_Pipe_AwaitDownInput = 0x802417B4; // type:func rom:0x8ED5D4 +dup_kmr_20_Pipe_GetEntryPos = 0x80241870; // type:func rom:0x8ED690 +dup_kmr_20_Pipe_GetCameraYaw = 0x80241950; // type:func rom:0x8ED770 +dup_kmr_20_Pipe_GetPointAheadOfPlayer = 0x802419BC; // type:func rom:0x8ED7DC dup3_kmr_20_foliage_setup_shear_mtx = 0x80241A60; // type:func rom:0x8ED880 dup3_kmr_20_TransformFoliage = 0x80241AD0; // type:func rom:0x8ED8F0 func_80241C9C_8EDABC = 0x80241C9C; // type:func rom:0x8EDABC func_80241CF0_8EDB10 = 0x80241CF0; // type:func rom:0x8EDB10 func_80241D1C_8EDB3C = 0x80241D1C; // type:func rom:0x8EDB3C -dup2_kmr_20_SetPlayerStatusAnimFlags100000 = 0x80241D50; // type:func rom:0x8EDB70 -dup2_kmr_20_GetCurrentFloor = 0x80241D70; // type:func rom:0x8EDB90 -dup2_kmr_20_UnkFunc25 = 0x80241D84; // type:func rom:0x8EDBA4 -dup2_kmr_20_GetEntryPos = 0x80241E40; // type:func rom:0x8EDC60 -dup2_kmr_20_GetCurrentCameraYawClamped180 = 0x80241F20; // type:func rom:0x8EDD40 -dup2_kmr_20_SomeXYZFunc2 = 0x80241F8C; // type:func rom:0x8EDDAC +dup2_kmr_20_Pipe_SetAnimFlag = 0x80241D50; // type:func rom:0x8EDB70 +dup2_kmr_20_Pipe_GetCurrentFloor = 0x80241D70; // type:func rom:0x8EDB90 +dup2_kmr_20_Pipe_AwaitDownInput = 0x80241D84; // type:func rom:0x8EDBA4 +dup2_kmr_20_Pipe_GetEntryPos = 0x80241E40; // type:func rom:0x8EDC60 +dup2_kmr_20_Pipe_GetCameraYaw = 0x80241F20; // type:func rom:0x8EDD40 +dup2_kmr_20_Pipe_GetPointAheadOfPlayer = 0x80241F8C; // type:func rom:0x8EDDAC func_80242030_8EDE50 = 0x80242030; // type:func rom:0x8EDE50 func_80242084_8EDEA4 = 0x80242084; // type:func rom:0x8EDEA4 func_802420EC_8EDF0C = 0x802420EC; // type:func rom:0x8EDF0C @@ -13477,24 +13477,24 @@ func_80240000_91E570 = 0x80240000; // type:func rom:0x91E570 iwa_10_StashVars = 0x80240040; // type:func rom:0x91E5B0 iwa_10_GetItemName = 0x802400F4; // type:func rom:0x91E664 iwa_10_UnkFloatFunc = 0x80240160; // type:func rom:0x91E6D0 -iwa_10_SetOverrideFlags_40 = 0x802402F0; // type:func rom:0x91E860 -iwa_10_UnkFunc17 = 0x8024030C; // type:func rom:0x91E87C -func_8024032C_91E89C = 0x8024032C; // type:func rom:0x91E89C -iwa_10_UnkFunc18 = 0x80240358; // type:func rom:0x91E8C8 -iwa_10_UnkFunc37 = 0x802403C4; // type:func rom:0x91E934 -iwa_10_UnkFunc38 = 0x80240410; // type:func rom:0x91E980 -func_802404BC_91EA2C = 0x802404BC; // type:func rom:0x91EA2C -iwa_10_SwitchToPartner = 0x8024070C; // type:func rom:0x91EC7C -iwa_10_UnkFunc19 = 0x80240738; // type:func rom:0x91ECA8 -iwa_10_UnkFunc20 = 0x80240770; // type:func rom:0x91ECE0 -iwa_10_UnkFunc39 = 0x80240800; // type:func rom:0x91ED70 -iwa_10_UnkFunc21 = 0x80240834; // type:func rom:0x91EDA4 -iwa_10_UnkFunc22 = 0x80240898; // type:func rom:0x91EE08 -iwa_10_UnkFunc60 = 0x802408F0; // type:func rom:0x91EE60 -iwa_10_UnkFunc23 = 0x80240E28; // type:func rom:0x91F398 -iwa_10_UnkPartnerPosFunc = 0x80240F68; // type:func rom:0x91F4D8 -iwa_10_UnkPartnerPosFunc2 = 0x80240FB0; // type:func rom:0x91F520 -iwa_10_UnkFunc40 = 0x80240FF8; // type:func rom:0x91F568 +iwa_10_SuperBlock_SetOverride40 = 0x802402F0; // type:func rom:0x91E860 +iwa_10_SuperBlock_ClearOverride40 = 0x8024030C; // type:func rom:0x91E87C +iwa_10_SuperBlock_HideBlockContent = 0x8024032C; // type:func rom:0x91E89C +iwa_10_SuperBlock_GetPartnerRank = 0x80240358; // type:func rom:0x91E8C8 +iwa_10_SuperBlock_get_partner_rank = 0x802403C4; // type:func rom:0x91E934 +iwa_10_SuperBlock_CountEligiblePartners = 0x80240410; // type:func rom:0x91E980 +iwa_10_SuperBlock_ShowSelectPartnerMenu = 0x802404BC; // type:func rom:0x91EA2C +iwa_10_SuperBlock_SwitchToPartner = 0x8024070C; // type:func rom:0x91EC7C +iwa_10_SuperBlock_LoadCurrentPartnerName = 0x80240738; // type:func rom:0x91ECA8 +iwa_10_SuperBlock_StartGlowEffect = 0x80240770; // type:func rom:0x91ECE0 +iwa_10_SuperBlock_EndGlowEffect = 0x80240800; // type:func rom:0x91ED70 +iwa_10_SuperBlock_GatherEnergyFX = 0x80240834; // type:func rom:0x91EDA4 +iwa_10_SuperBlock_RadiateFaintEnergyFX = 0x80240898; // type:func rom:0x91EE08 +iwa_10_SuperBlock_AnimateEnergyOrbs = 0x802408F0; // type:func rom:0x91EE60 +iwa_10_SuperBlock_WhiteScreenFlash = 0x80240E28; // type:func rom:0x91F398 +iwa_10_SuperBlock_PartnerSparkles2 = 0x80240F68; // type:func rom:0x91F4D8 +iwa_10_SuperBlock_PartnerSparkles4 = 0x80240FB0; // type:func rom:0x91F520 +iwa_10_SuperBlock_WaitForPlayerToLand = 0x80240FF8; // type:func rom:0x91F568 iwa_10_UnkFunc41 = 0x80241030; // type:func rom:0x91F5A0 iwa_10_GetNpcCollisionHeight = 0x802411B4; // type:func rom:0x91F724 iwa_10_AddPlayerHandsOffset = 0x80241210; // type:func rom:0x91F780 @@ -13504,11 +13504,11 @@ func_8024146C_91F9DC = 0x8024146C; // type:func rom:0x91F9DC func_80241510_91FA80 = 0x80241510; // type:func rom:0x91FA80 iwa_10_foliage_setup_shear_mtx = 0x802415B0; // type:func rom:0x91FB20 iwa_10_TransformFoliage = 0x80241620; // type:func rom:0x91FB90 -iwa_10_varTable = 0x80241DD0; // type:data rom:0x920340 -D_80245A60_923FD0 = 0x80245A60; // type:data rom:0x923FD0 -D_80245A68_923FD8 = 0x80245A68; // type:data rom:0x923FD8 -D_80245A78_923FE8 = 0x80245A78; // type:data rom:0x923FE8 -iwa_10_bigFuncFloats = 0x80245AB8; // type:data rom:0x924028 +D_80241DD0_920340 = 0x80241DD0; // type:data rom:0x920340 +iwa_10_SuperBlock_CantUpgradeMessages = 0x80245A60; // type:data rom:0x923FD0 +iwa_10_SuperBlock_PartnerIDs = 0x80245A68; // type:data rom:0x923FD8 +iwa_10_SuperBlock_UpgradeDescMessages = 0x80245A78; // type:data rom:0x923FE8 +iwa_10_SuperBlock_UpgradeOrbAngles = 0x80245AB8; // type:data rom:0x924028 D_8024626C_9247DC = 0x8024626C; // type:data rom:0x9247DC D_80246270_9247E0 = 0x80246270; // type:data rom:0x9247E0 D_80248470_9269E0 = 0x80248470; // type:data rom:0x9269E0 @@ -13705,30 +13705,30 @@ sbk_55_TransformFoliage = 0x802400D0; // type:func rom:0x952B20 sbk_56_SpawnSunEffect = 0x80240000; // type:func rom:0x953FC0 func_80240038_953FF8 = 0x80240038; // type:func rom:0x953FF8 func_8024005C_95401C = 0x8024005C; // type:func rom:0x95401C -sbk_56_SetOverrideFlags_40 = 0x80240080; // type:func rom:0x954040 -sbk_56_UnkFunc17 = 0x8024009C; // type:func rom:0x95405C -func_802400BC_95407C = 0x802400BC; // type:func rom:0x95407C -sbk_56_UnkFunc18 = 0x802400E8; // type:func rom:0x9540A8 -sbk_56_UnkFunc37 = 0x80240154; // type:func rom:0x954114 -sbk_56_UnkFunc38 = 0x802401A0; // type:func rom:0x954160 -func_8024024C_95420C = 0x8024024C; // type:func rom:0x95420C -sbk_56_SwitchToPartner = 0x8024049C; // type:func rom:0x95445C -sbk_56_UnkFunc19 = 0x802404C8; // type:func rom:0x954488 -sbk_56_UnkFunc20 = 0x80240500; // type:func rom:0x9544C0 -sbk_56_UnkFunc39 = 0x80240590; // type:func rom:0x954550 -sbk_56_UnkFunc21 = 0x802405C4; // type:func rom:0x954584 -sbk_56_UnkFunc22 = 0x80240628; // type:func rom:0x9545E8 -sbk_56_UnkFunc60 = 0x80240680; // type:func rom:0x954640 -sbk_56_UnkFunc23 = 0x80240BB8; // type:func rom:0x954B78 -sbk_56_UnkPartnerPosFunc = 0x80240CF8; // type:func rom:0x954CB8 -sbk_56_UnkPartnerPosFunc2 = 0x80240D40; // type:func rom:0x954D00 -sbk_56_UnkFunc40 = 0x80240D88; // type:func rom:0x954D48 +sbk_56_SuperBlock_SetOverride40 = 0x80240080; // type:func rom:0x954040 +sbk_56_SuperBlock_ClearOverride40 = 0x8024009C; // type:func rom:0x95405C +sbk_56_SuperBlock_HideBlockContent = 0x802400BC; // type:func rom:0x95407C +sbk_56_SuperBlock_GetPartnerRank = 0x802400E8; // type:func rom:0x9540A8 +sbk_56_SuperBlock_get_partner_rank = 0x80240154; // type:func rom:0x954114 +sbk_56_SuperBlock_CountEligiblePartners = 0x802401A0; // type:func rom:0x954160 +sbk_56_SuperBlock_ShowSelectPartnerMenu = 0x8024024C; // type:func rom:0x95420C +sbk_56_SuperBlock_SwitchToPartner = 0x8024049C; // type:func rom:0x95445C +sbk_56_SuperBlock_LoadCurrentPartnerName = 0x802404C8; // type:func rom:0x954488 +sbk_56_SuperBlock_StartGlowEffect = 0x80240500; // type:func rom:0x9544C0 +sbk_56_SuperBlock_EndGlowEffect = 0x80240590; // type:func rom:0x954550 +sbk_56_SuperBlock_GatherEnergyFX = 0x802405C4; // type:func rom:0x954584 +sbk_56_SuperBlock_RadiateFaintEnergyFX = 0x80240628; // type:func rom:0x9545E8 +sbk_56_SuperBlock_AnimateEnergyOrbs = 0x80240680; // type:func rom:0x954640 +sbk_56_SuperBlock_WhiteScreenFlash = 0x80240BB8; // type:func rom:0x954B78 +sbk_56_SuperBlock_PartnerSparkles2 = 0x80240CF8; // type:func rom:0x954CB8 +sbk_56_SuperBlock_PartnerSparkles4 = 0x80240D40; // type:func rom:0x954D00 +sbk_56_SuperBlock_WaitForPlayerToLand = 0x80240D88; // type:func rom:0x954D48 sbk_56_foliage_setup_shear_mtx = 0x80240DC0; // type:func rom:0x954D80 sbk_56_TransformFoliage = 0x80240E30; // type:func rom:0x954DF0 -D_80241430_9553F0 = 0x80241430; // type:data rom:0x9553F0 -D_80241438_9553F8 = 0x80241438; // type:data rom:0x9553F8 -D_80241448_955408 = 0x80241448; // type:data rom:0x955408 -sbk_56_bigFuncFloats = 0x80241488; // type:data rom:0x955448 +sbk_56_SuperBlock_CantUpgradeMessages = 0x80241430; // type:data rom:0x9553F0 +sbk_56_SuperBlock_PartnerIDs = 0x80241438; // type:data rom:0x9553F8 +sbk_56_SuperBlock_UpgradeDescMessages = 0x80241448; // type:data rom:0x955408 +sbk_56_SuperBlock_UpgradeOrbAngles = 0x80241488; // type:data rom:0x955448 sbk_60_SpawnSunEffect = 0x80240000; // type:func rom:0x9569F0 sbk_60_SetNpcB5_3 = 0x80240040; // type:func rom:0x956A30 sbk_61_SpawnSunEffect = 0x80240000; // type:func rom:0x956F90 @@ -13742,12 +13742,12 @@ sbk_66_SpawnSunEffect = 0x80240000; // type:func rom:0x958CB0 sbk_66_Bandit_DropCoin = 0x80240040; // type:func rom:0x958CF0 sbk_66_foliage_setup_shear_mtx = 0x80240140; // type:func rom:0x958DF0 sbk_66_TransformFoliage = 0x802401B0; // type:func rom:0x958E60 -dro_01_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0x95B200 -dro_01_GetCurrentFloor = 0x80240020; // type:func rom:0x95B220 -dro_01_UnkFunc25 = 0x80240034; // type:func rom:0x95B234 -dro_01_GetEntryPos = 0x802400F0; // type:func rom:0x95B2F0 -dro_01_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0x95B3D0 -dro_01_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x95B43C +dro_01_Pipe_SetAnimFlag = 0x80240000; // type:func rom:0x95B200 +dro_01_Pipe_GetCurrentFloor = 0x80240020; // type:func rom:0x95B220 +dro_01_Pipe_AwaitDownInput = 0x80240034; // type:func rom:0x95B234 +dro_01_Pipe_GetEntryPos = 0x802400F0; // type:func rom:0x95B2F0 +dro_01_Pipe_GetCameraYaw = 0x802401D0; // type:func rom:0x95B3D0 +dro_01_Pipe_GetPointAheadOfPlayer = 0x8024023C; // type:func rom:0x95B43C dro_01_UnkFunc27 = 0x802402E0; // type:func rom:0x95B4E0 dro_01_UnkFunc26 = 0x80240404; // type:func rom:0x95B604 dro_01_UnkNpcAIFunc24 = 0x802405E0; // type:func rom:0x95B7E0 @@ -13808,22 +13808,22 @@ dro_01_func_80243350_95E550 = 0x80243350; // type:func rom:0x95E550 dro_01_dup_StashVars = 0x80243460; // type:func rom:0x95E660 dro_01_dup_GetItemName = 0x80243514; // type:func rom:0x95E714 dro_01_func_80243578_95E778 = 0x80243578; // type:func rom:0x95E778 -dro_01_dup_SetPlayerStatusAnimFlags100000 = 0x802435A0; // type:func rom:0x95E7A0 -dro_01_dup_GetCurrentFloor = 0x802435C0; // type:func rom:0x95E7C0 -dro_01_dup_UnkFunc25 = 0x802435D4; // type:func rom:0x95E7D4 -dro_01_dup_GetEntryPos = 0x80243690; // type:func rom:0x95E890 -dro_01_dup_GetCurrentCameraYawClamped180 = 0x80243770; // type:func rom:0x95E970 -dro_01_dup_SomeXYZFunc2 = 0x802437DC; // type:func rom:0x95E9DC +dro_01_dup_Pipe_SetAnimFlag = 0x802435A0; // type:func rom:0x95E7A0 +dro_01_dup_Pipe_GetCurrentFloor = 0x802435C0; // type:func rom:0x95E7C0 +dro_01_dup_Pipe_AwaitDownInput = 0x802435D4; // type:func rom:0x95E7D4 +dro_01_dup_Pipe_GetEntryPos = 0x80243690; // type:func rom:0x95E890 +dro_01_dup_Pipe_GetCameraYaw = 0x80243770; // type:func rom:0x95E970 +dro_01_dup_Pipe_GetPointAheadOfPlayer = 0x802437DC; // type:func rom:0x95E9DC dro_01_foliage_setup_shear_mtx = 0x80243880; // type:func rom:0x95EA80 dro_01_TransformFoliage = 0x802438F0; // type:func rom:0x95EAF0 dro_01_entryList = 0x80243AC0; // type:data rom:0x95ECC0 dro_01_config = 0x80243B70; // type:data rom:0x95ED70 dro_01_80243BB0 = 0x80243BB0; // type:data rom:0x95EDB0 -dro_01_80243C30 = 0x80243C30; // type:data rom:0x95EE30 -dro_01_80243F84 = 0x80243F84; // type:data rom:0x95F184 -dro_01_80244374 = 0x80244374; // type:data rom:0x95F574 -dro_01_80244450 = 0x80244450; // type:data rom:0x95F650 -dro_01_8024462C = 0x8024462C; // type:data rom:0x95F82C +dro_01_Pipe_EnterVertical = 0x80243C30; // type:data rom:0x95EE30 +Pipe_EnterHorizontal = 0x80243F84; // type:data rom:0x95F184 +Pipe_ExitVertical = 0x80244374; // type:data rom:0x95F574 +Pipe_ScriptD = 0x80244450; // type:data rom:0x95F650 +Pipe_ExitHorizontal = 0x8024462C; // type:data rom:0x95F82C dro_01_exitWalk_80244960 = 0x80244960; // type:data rom:0x95FB60 dro_01_exitWalk_802449CC = 0x802449CC; // type:data rom:0x95FBCC dro_01_80244A28 = 0x80244A28; // type:data rom:0x95FC28 @@ -14236,30 +14236,30 @@ isk_09_SomeItemEntityFunc = 0x80240118; // type:func rom:0x9865F8 isk_09_CheckItemFlags40 = 0x80240268; // type:func rom:0x986748 func_802402BC_98679C = 0x802402BC; // type:func rom:0x98679C func_802402F0_9867D0 = 0x802402F0; // type:func rom:0x9867D0 -isk_09_varTable = 0x802406F0; // type:data rom:0x986BD0 -isk_10_SetOverrideFlags_40 = 0x80240000; // type:func rom:0x988B60 -isk_10_UnkFunc17 = 0x8024001C; // type:func rom:0x988B7C -func_8024003C_988B9C = 0x8024003C; // type:func rom:0x988B9C -isk_10_UnkFunc18 = 0x80240068; // type:func rom:0x988BC8 -isk_10_UnkFunc37 = 0x802400D4; // type:func rom:0x988C34 -isk_10_UnkFunc38 = 0x80240120; // type:func rom:0x988C80 -func_802401CC_988D2C = 0x802401CC; // type:func rom:0x988D2C -isk_10_SwitchToPartner = 0x8024041C; // type:func rom:0x988F7C -isk_10_UnkFunc19 = 0x80240448; // type:func rom:0x988FA8 -isk_10_UnkFunc20 = 0x80240480; // type:func rom:0x988FE0 -isk_10_UnkFunc39 = 0x80240510; // type:func rom:0x989070 -isk_10_UnkFunc21 = 0x80240544; // type:func rom:0x9890A4 -isk_10_UnkFunc22 = 0x802405A8; // type:func rom:0x989108 -isk_10_UnkFunc60 = 0x80240600; // type:func rom:0x989160 -isk_10_UnkFunc23 = 0x80240B38; // type:func rom:0x989698 -isk_10_UnkPartnerPosFunc = 0x80240C78; // type:func rom:0x9897D8 -isk_10_UnkPartnerPosFunc2 = 0x80240CC0; // type:func rom:0x989820 -isk_10_UnkFunc24 = 0x80240D08; // type:func rom:0x989868 +D_802406F0_986BD0 = 0x802406F0; // type:data rom:0x986BD0 +isk_10_SuperBlock_SetOverride40 = 0x80240000; // type:func rom:0x988B60 +isk_10_SuperBlock_ClearOverride40 = 0x8024001C; // type:func rom:0x988B7C +isk_10_SuperBlock_HideBlockContent = 0x8024003C; // type:func rom:0x988B9C +isk_10_SuperBlock_GetPartnerRank = 0x80240068; // type:func rom:0x988BC8 +isk_10_SuperBlock_get_partner_rank = 0x802400D4; // type:func rom:0x988C34 +isk_10_SuperBlock_CountEligiblePartners = 0x80240120; // type:func rom:0x988C80 +isk_10_SuperBlock_ShowSelectPartnerMenu = 0x802401CC; // type:func rom:0x988D2C +isk_10_SuperBlock_SwitchToPartner = 0x8024041C; // type:func rom:0x988F7C +isk_10_SuperBlock_LoadCurrentPartnerName = 0x80240448; // type:func rom:0x988FA8 +isk_10_SuperBlock_StartGlowEffect = 0x80240480; // type:func rom:0x988FE0 +isk_10_SuperBlock_EndGlowEffect = 0x80240510; // type:func rom:0x989070 +isk_10_SuperBlock_GatherEnergyFX = 0x80240544; // type:func rom:0x9890A4 +isk_10_SuperBlock_RadiateFaintEnergyFX = 0x802405A8; // type:func rom:0x989108 +isk_10_SuperBlock_AnimateEnergyOrbs = 0x80240600; // type:func rom:0x989160 +isk_10_SuperBlock_WhiteScreenFlash = 0x80240B38; // type:func rom:0x989698 +isk_10_SuperBlock_PartnerSparkles2 = 0x80240C78; // type:func rom:0x9897D8 +isk_10_SuperBlock_PartnerSparkles4 = 0x80240CC0; // type:func rom:0x989820 +isk_10_SuperBlock_WaitForPlayerToLand = 0x80240D08; // type:func rom:0x989868 func_80240D38_989898 = 0x80240D38; // type:func rom:0x989898 -D_80241100_989C60 = 0x80241100; // type:data rom:0x989C60 -D_80241108_989C68 = 0x80241108; // type:data rom:0x989C68 -D_80241118_989C78 = 0x80241118; // type:data rom:0x989C78 -isk_10_bigFuncFloats = 0x80241158; // type:data rom:0x989CB8 +isk_10_SuperBlock_CantUpgradeMessages = 0x80241100; // type:data rom:0x989C60 +isk_10_SuperBlock_PartnerIDs = 0x80241108; // type:data rom:0x989C68 +isk_10_SuperBlock_UpgradeDescMessages = 0x80241118; // type:data rom:0x989C78 +isk_10_SuperBlock_UpgradeOrbAngles = 0x80241158; // type:data rom:0x989CB8 D_80241EA0_98AA00 = 0x80241EA0; // type:data rom:0x98AA00 D_80241EA8_98AA08 = 0x80241EA8; // type:data rom:0x98AA08 func_80240000_98AA10 = 0x80240000; // type:func rom:0x98AA10 @@ -14590,13 +14590,13 @@ D_80250810_9D5BF0 = 0x80250810; // type:data rom:0x9D5BF0 D_80251A90_9D6E70 = 0x80251A90; // type:data rom:0x9D6E70 D_80251A98_9D6E78 = 0x80251A98; // type:data rom:0x9D6E78 D_80251AA0_9D6E80 = 0x80251AA0; // type:data rom:0x9D6E80 -nok_02_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0x9D7020 -nok_02_GetCurrentFloor = 0x80240020; // type:func rom:0x9D7040 -nok_02_UnkFunc25 = 0x80240034; // type:func rom:0x9D7054 -nok_02_GetEntryPos = 0x802400F0; // type:func rom:0x9D7110 -nok_02_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0x9D71F0 -nok_02_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x9D725C -nok_02_StashVars = 0x802402E0; // type:func rom:0x9D7300 +nok_02_Pipe_SetAnimFlag = 0x80240000; // type:func rom:0x9D7020 +nok_02_Pipe_GetCurrentFloor = 0x80240020; // type:func rom:0x9D7040 +nok_02_Pipe_AwaitDownInput = 0x80240034; // type:func rom:0x9D7054 +nok_02_Pipe_GetEntryPos = 0x802400F0; // type:func rom:0x9D7110 +nok_02_Pipe_GetCameraYaw = 0x802401D0; // type:func rom:0x9D71F0 +nok_02_Pipe_GetPointAheadOfPlayer = 0x8024023C; // type:func rom:0x9D725C +func_802402E0_9D7300 = 0x802402E0; // type:func rom:0x9D7300 dup_nok_02_GetItemName = 0x80240394; // type:func rom:0x9D73B4 dup_nok_02_GetNpcCollisionHeight = 0x802403F8; // type:func rom:0x9D7418 dup_nok_02_AddPlayerHandsOffset = 0x80240454; // type:func rom:0x9D7474 @@ -14831,12 +14831,12 @@ D_802445C0_A06E00 = 0x802445C0; // type:data rom:0xA06E00 D_80244620_A06E60 = 0x80244620; // type:data rom:0xA06E60 D_80244628_A06E68 = 0x80244628; // type:data rom:0xA06E68 D_80244630_A06E70 = 0x80244630; // type:data rom:0xA06E70 -nok_15_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0xA06F00 -nok_15_GetCurrentFloor = 0x80240020; // type:func rom:0xA06F20 -nok_15_UnkFunc25 = 0x80240034; // type:func rom:0xA06F34 -nok_15_GetEntryPos = 0x802400F0; // type:func rom:0xA06FF0 -nok_15_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0xA070D0 -nok_15_SomeXYZFunc2 = 0x8024023C; // type:func rom:0xA0713C +nok_15_Pipe_SetAnimFlag = 0x80240000; // type:func rom:0xA06F00 +nok_15_Pipe_GetCurrentFloor = 0x80240020; // type:func rom:0xA06F20 +nok_15_Pipe_AwaitDownInput = 0x80240034; // type:func rom:0xA06F34 +nok_15_Pipe_GetEntryPos = 0x802400F0; // type:func rom:0xA06FF0 +nok_15_Pipe_GetCameraYaw = 0x802401D0; // type:func rom:0xA070D0 +nok_15_Pipe_GetPointAheadOfPlayer = 0x8024023C; // type:func rom:0xA0713C nok_15_set_script_owner_npc_anim = 0x802402E0; // type:func rom:0xA071E0 nok_15_UnkDistFunc = 0x8024035C; // type:func rom:0xA0725C nok_15_UnkNpcAIFunc12 = 0x80240490; // type:func rom:0xA07390 @@ -16226,14 +16226,14 @@ D_80243248_B2F6B8 = 0x80243248; // type:data rom:0xB2F6B8 D_80243288_B2F6F8 = 0x80243288; // type:data rom:0xB2F6F8 D_802485C0_B34A30 = 0x802485C0; // type:data rom:0xB34A30 D_802485C8_B34A38 = 0x802485C8; // type:data rom:0xB34A38 -jan_03_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0xB34BD0 -jan_03_GetCurrentFloor = 0x80240020; // type:func rom:0xB34BF0 -jan_03_UnkFunc25 = 0x80240034; // type:func rom:0xB34C04 -jan_03_GetEntryPos = 0x802400F0; // type:func rom:0xB34CC0 -jan_03_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0xB34DA0 -jan_03_SomeXYZFunc2 = 0x8024023C; // type:func rom:0xB34E0C -jan_03_UpdateTexturePanSmooth = 0x802402E0; // type:func rom:0xB34EB0 -jan_03_UpdateTexturePanStepped = 0x80240404; // type:func rom:0xB34FD4 +jan_03_Pipe_SetAnimFlag = 0x80240000; // type:func rom:0xB34BD0 +jan_03_Pipe_GetCurrentFloor = 0x80240020; // type:func rom:0xB34BF0 +jan_03_Pipe_AwaitDownInput = 0x80240034; // type:func rom:0xB34C04 +jan_03_Pipe_GetEntryPos = 0x802400F0; // type:func rom:0xB34CC0 +jan_03_Pipe_GetCameraYaw = 0x802401D0; // type:func rom:0xB34DA0 +jan_03_Pipe_GetPointAheadOfPlayer = 0x8024023C; // type:func rom:0xB34E0C +jan_03_UnkTexturePanFunc = 0x802402E0; // type:func rom:0xB34EB0 +jan_03_UnkTexturePanFunc2 = 0x80240404; // type:func rom:0xB34FD4 func_802405EC_B351BC = 0x802405EC; // type:func rom:0xB351BC jan_03_UnkNpcAIFunc24 = 0x80240620; // type:func rom:0xB351F0 jan_03_UnkFunc13 = 0x80240778; // type:func rom:0xB35348 @@ -16413,24 +16413,24 @@ jan_08_foliage_setup_shear_mtx = 0x80240310; // type:func rom:0xB5E5C0 jan_08_TransformFoliage = 0x80240380; // type:func rom:0xB5E630 func_8024054C_B5E7FC = 0x8024054C; // type:func rom:0xB5E7FC func_802405A8_B5E858 = 0x802405A8; // type:func rom:0xB5E858 -jan_08_SetOverrideFlags_40 = 0x80240660; // type:func rom:0xB5E910 -jan_08_UnkFunc17 = 0x8024067C; // type:func rom:0xB5E92C -func_8024069C_B5E94C = 0x8024069C; // type:func rom:0xB5E94C -jan_08_UnkFunc18 = 0x802406C8; // type:func rom:0xB5E978 -jan_08_UnkFunc37 = 0x80240734; // type:func rom:0xB5E9E4 -jan_08_UnkFunc38 = 0x80240780; // type:func rom:0xB5EA30 -func_8024082C_B5EADC = 0x8024082C; // type:func rom:0xB5EADC -jan_08_SwitchToPartner = 0x80240A7C; // type:func rom:0xB5ED2C -jan_08_UnkFunc19 = 0x80240AA8; // type:func rom:0xB5ED58 -jan_08_UnkFunc20 = 0x80240AE0; // type:func rom:0xB5ED90 -jan_08_UnkFunc39 = 0x80240B70; // type:func rom:0xB5EE20 -jan_08_UnkFunc21 = 0x80240BA4; // type:func rom:0xB5EE54 -jan_08_UnkFunc22 = 0x80240C08; // type:func rom:0xB5EEB8 -jan_08_UnkFunc60 = 0x80240C60; // type:func rom:0xB5EF10 -jan_08_UnkFunc23 = 0x80241198; // type:func rom:0xB5F448 -jan_08_UnkPartnerPosFunc = 0x802412D8; // type:func rom:0xB5F588 -jan_08_UnkPartnerPosFunc2 = 0x80241320; // type:func rom:0xB5F5D0 -jan_08_UnkFunc40 = 0x80241368; // type:func rom:0xB5F618 +jan_08_SuperBlock_SetOverride40 = 0x80240660; // type:func rom:0xB5E910 +jan_08_SuperBlock_ClearOverride40 = 0x8024067C; // type:func rom:0xB5E92C +jan_08_SuperBlock_HideBlockContent = 0x8024069C; // type:func rom:0xB5E94C +jan_08_SuperBlock_GetPartnerRank = 0x802406C8; // type:func rom:0xB5E978 +jan_08_SuperBlock_get_partner_rank = 0x80240734; // type:func rom:0xB5E9E4 +jan_08_SuperBlock_CountEligiblePartners = 0x80240780; // type:func rom:0xB5EA30 +jan_08_SuperBlock_ShowSelectPartnerMenu = 0x8024082C; // type:func rom:0xB5EADC +jan_08_SuperBlock_SwitchToPartner = 0x80240A7C; // type:func rom:0xB5ED2C +jan_08_SuperBlock_LoadCurrentPartnerName = 0x80240AA8; // type:func rom:0xB5ED58 +jan_08_SuperBlock_StartGlowEffect = 0x80240AE0; // type:func rom:0xB5ED90 +jan_08_SuperBlock_EndGlowEffect = 0x80240B70; // type:func rom:0xB5EE20 +jan_08_SuperBlock_GatherEnergyFX = 0x80240BA4; // type:func rom:0xB5EE54 +jan_08_SuperBlock_RadiateFaintEnergyFX = 0x80240C08; // type:func rom:0xB5EEB8 +jan_08_SuperBlock_AnimateEnergyOrbs = 0x80240C60; // type:func rom:0xB5EF10 +jan_08_SuperBlock_WhiteScreenFlash = 0x80241198; // type:func rom:0xB5F448 +jan_08_SuperBlock_PartnerSparkles2 = 0x802412D8; // type:func rom:0xB5F588 +jan_08_SuperBlock_PartnerSparkles4 = 0x80241320; // type:func rom:0xB5F5D0 +jan_08_SuperBlock_WaitForPlayerToLand = 0x80241368; // type:func rom:0xB5F618 func_802413A0_B5F650 = 0x802413A0; // type:func rom:0xB5F650 jan_08_UnkNpcAIFunc4 = 0x80241454; // type:func rom:0xB5F704 jan_08_UnkNpcAIFunc29 = 0x802414A4; // type:func rom:0xB5F754 @@ -16444,20 +16444,20 @@ jan_08_UnkNpcAIFunc27 = 0x80241C84; // type:func rom:0xB5FF34 jan_08_UnkNpcAIFunc28 = 0x80241F38; // type:func rom:0xB601E8 dup_jan_08_foliage_setup_shear_mtx = 0x802421F0; // type:func rom:0xB604A0 dup_jan_08_TransformFoliage = 0x80242260; // type:func rom:0xB60510 -D_80243E00_B620B0 = 0x80243E00; // type:data rom:0xB620B0 -D_80243E08_B620B8 = 0x80243E08; // type:data rom:0xB620B8 -D_80243E18_B620C8 = 0x80243E18; // type:data rom:0xB620C8 -jan_08_bigFuncFloats = 0x80243E58; // type:data rom:0xB62108 +jan_08_SuperBlock_CantUpgradeMessages = 0x80243E00; // type:data rom:0xB620B0 +jan_08_SuperBlock_PartnerIDs = 0x80243E08; // type:data rom:0xB620B8 +jan_08_SuperBlock_UpgradeDescMessages = 0x80243E18; // type:data rom:0xB620C8 +jan_08_SuperBlock_UpgradeOrbAngles = 0x80243E58; // type:data rom:0xB62108 D_802474B0_B65760 = 0x802474B0; // type:data rom:0xB65760 D_802474D8_B65788 = 0x802474D8; // type:data rom:0xB65788 -jan_09_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0xB65AB0 -jan_09_GetCurrentFloor = 0x80240020; // type:func rom:0xB65AD0 -jan_09_UnkFunc25 = 0x80240034; // type:func rom:0xB65AE4 -jan_09_GetEntryPos = 0x802400F0; // type:func rom:0xB65BA0 -jan_09_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0xB65C80 -jan_09_SomeXYZFunc2 = 0x8024023C; // type:func rom:0xB65CEC -jan_09_UpdateTexturePanSmooth = 0x802402E0; // type:func rom:0xB65D90 -jan_09_UpdateTexturePanStepped = 0x80240404; // type:func rom:0xB65EB4 +jan_09_Pipe_SetAnimFlag = 0x80240000; // type:func rom:0xB65AB0 +jan_09_Pipe_GetCurrentFloor = 0x80240020; // type:func rom:0xB65AD0 +jan_09_Pipe_AwaitDownInput = 0x80240034; // type:func rom:0xB65AE4 +jan_09_Pipe_GetEntryPos = 0x802400F0; // type:func rom:0xB65BA0 +jan_09_Pipe_GetCameraYaw = 0x802401D0; // type:func rom:0xB65C80 +jan_09_Pipe_GetPointAheadOfPlayer = 0x8024023C; // type:func rom:0xB65CEC +jan_09_UnkTexturePanFunc = 0x802402E0; // type:func rom:0xB65D90 +jan_09_UnkTexturePanFunc2 = 0x80240404; // type:func rom:0xB65EB4 jan_09_foliage_setup_shear_mtx = 0x802405F0; // type:func rom:0xB660A0 jan_09_TransformFoliage = 0x80240660; // type:func rom:0xB66110 func_8024082C_B662DC = 0x8024082C; // type:func rom:0xB662DC @@ -16494,12 +16494,12 @@ dup_jan_10_foliage_setup_shear_mtx = 0x80241500; // type:func rom:0xB6D890 dup_jan_10_TransformFoliage = 0x80241570; // type:func rom:0xB6D900 D_80244480_B70810 = 0x80244480; // type:data rom:0xB70810 jan_11_DarkRoomUpdate = 0x80240000; // type:func rom:0xB70860 -jan_11_SetPlayerStatusAnimFlags100000 = 0x80240158; // type:func rom:0xB709B8 -jan_11_GetCurrentFloor = 0x80240178; // type:func rom:0xB709D8 -jan_11_UnkFunc25 = 0x8024018C; // type:func rom:0xB709EC -jan_11_GetEntryPos = 0x80240248; // type:func rom:0xB70AA8 -jan_11_GetCurrentCameraYawClamped180 = 0x80240328; // type:func rom:0xB70B88 -jan_11_SomeXYZFunc2 = 0x80240394; // type:func rom:0xB70BF4 +jan_11_Pipe_SetAnimFlag = 0x80240158; // type:func rom:0xB709B8 +jan_11_Pipe_GetCurrentFloor = 0x80240178; // type:func rom:0xB709D8 +jan_11_Pipe_AwaitDownInput = 0x8024018C; // type:func rom:0xB709EC +jan_11_Pipe_GetEntryPos = 0x80240248; // type:func rom:0xB70AA8 +jan_11_Pipe_GetCameraYaw = 0x80240328; // type:func rom:0xB70B88 +jan_11_Pipe_GetPointAheadOfPlayer = 0x80240394; // type:func rom:0xB70BF4 jan_11_UnkPosFunc2 = 0x80240438; // type:func rom:0xB70C98 jan_11_GetFloorCollider = 0x802407B0; // type:func rom:0xB71010 func_802407DC_B7103C = 0x802407DC; // type:func rom:0xB7103C @@ -16783,14 +16783,14 @@ func_80240030_BB5A10 = 0x80240030; // type:func rom:0xBB5A10 func_80240080_BB5A60 = 0x80240080; // type:func rom:0xBB5A60 func_802400EC_BB5ACC = 0x802400EC; // type:func rom:0xBB5ACC func_80240148_BB5B28 = 0x80240148; // type:func rom:0xBB5B28 -mim_11_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0xBB7070 -mim_11_GetCurrentFloor = 0x80240020; // type:func rom:0xBB7090 -mim_11_UnkFunc25 = 0x80240034; // type:func rom:0xBB70A4 -mim_11_GetEntryPos = 0x802400F0; // type:func rom:0xBB7160 -mim_11_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0xBB7240 -mim_11_SomeXYZFunc2 = 0x8024023C; // type:func rom:0xBB72AC -mim_11_UpdateTexturePanSmooth = 0x802402E0; // type:func rom:0xBB7350 -mim_11_UpdateTexturePanStepped = 0x80240404; // type:func rom:0xBB7474 +mim_11_Pipe_SetAnimFlag = 0x80240000; // type:func rom:0xBB7070 +mim_11_Pipe_GetCurrentFloor = 0x80240020; // type:func rom:0xBB7090 +mim_11_Pipe_AwaitDownInput = 0x80240034; // type:func rom:0xBB70A4 +mim_11_Pipe_GetEntryPos = 0x802400F0; // type:func rom:0xBB7160 +mim_11_Pipe_GetCameraYaw = 0x802401D0; // type:func rom:0xBB7240 +mim_11_Pipe_GetPointAheadOfPlayer = 0x8024023C; // type:func rom:0xBB72AC +mim_11_UnkTexturePanFunc = 0x802402E0; // type:func rom:0xBB7350 +mim_11_UnkTexturePanFunc2 = 0x80240404; // type:func rom:0xBB7474 func_802405EC_BB765C = 0x802405EC; // type:func rom:0xBB765C func_8024066C_BB76DC = 0x8024066C; // type:func rom:0xBB76DC func_80240790_BB7800 = 0x80240790; // type:func rom:0xBB7800 @@ -18345,24 +18345,24 @@ dgb_04_func_80241D14_C38244 = 0x80241D14; // type:func rom:0xC38244 dgb_04_func_80241D94_C382C4 = 0x80241D94; // type:func rom:0xC382C4 dgb_04_func_80241E3C_C3836C = 0x80241E3C; // type:func rom:0xC3836C dgb_04_func_80242154_C38684 = 0x80242154; // type:func rom:0xC38684 -dgb_04_SetOverrideFlags_40 = 0x802423D0; // type:func rom:0xC38900 -dgb_04_UnkFunc17 = 0x802423EC; // type:func rom:0xC3891C -dgb_04_func_8024240C_C3893C = 0x8024240C; // type:func rom:0xC3893C -dgb_04_UnkFunc18 = 0x80242438; // type:func rom:0xC38968 -dgb_04_UnkFunc37 = 0x802424A4; // type:func rom:0xC389D4 -dgb_04_UnkFunc38 = 0x802424F0; // type:func rom:0xC38A20 +dgb_04_SuperBlock_SetOverride40 = 0x802423D0; // type:func rom:0xC38900 +dgb_04_SuperBlock_ClearOverride40 = 0x802423EC; // type:func rom:0xC3891C +dgb_04_SuperBlock_HideBlockContent = 0x8024240C; // type:func rom:0xC3893C +dgb_04_SuperBlock_GetPartnerRank = 0x80242438; // type:func rom:0xC38968 +dgb_04_SuperBlock_get_partner_rank = 0x802424A4; // type:func rom:0xC389D4 +dgb_04_SuperBlock_CountEligiblePartners = 0x802424F0; // type:func rom:0xC38A20 dgb_04_func_8024259C_C38ACC = 0x8024259C; // type:func rom:0xC38ACC -dgb_04_SwitchToPartner = 0x802427EC; // type:func rom:0xC38D1C -dgb_04_UnkFunc19 = 0x80242818; // type:func rom:0xC38D48 -dgb_04_UnkFunc20 = 0x80242850; // type:func rom:0xC38D80 -dgb_04_UnkFunc39 = 0x802428E0; // type:func rom:0xC38E10 -dgb_04_UnkFunc21 = 0x80242914; // type:func rom:0xC38E44 -dgb_04_UnkFunc22 = 0x80242978; // type:func rom:0xC38EA8 -dgb_04_UnkFunc60 = 0x802429D0; // type:func rom:0xC38F00 -dgb_04_func_80242F08_C39438 = 0x80242F08; // type:func rom:0xC39438 -dgb_04_UnkPartnerPosFunc = 0x80243048; // type:func rom:0xC39578 -dgb_04_UnkPartnerPosFunc2 = 0x80243090; // type:func rom:0xC395C0 -dgb_04_UnkFunc24 = 0x802430D8; // type:func rom:0xC39608 +dgb_04_SuperBlock_SwitchToPartner = 0x802427EC; // type:func rom:0xC38D1C +dgb_04_SuperBlock_LoadCurrentPartnerName = 0x80242818; // type:func rom:0xC38D48 +dgb_04_SuperBlock_StartGlowEffect = 0x80242850; // type:func rom:0xC38D80 +dgb_04_SuperBlock_EndGlowEffect = 0x802428E0; // type:func rom:0xC38E10 +dgb_04_SuperBlock_GatherEnergyFX = 0x80242914; // type:func rom:0xC38E44 +dgb_04_SuperBlock_RadiateFaintEnergyFX = 0x80242978; // type:func rom:0xC38EA8 +dgb_04_SuperBlock_AnimateEnergyOrbs = 0x802429D0; // type:func rom:0xC38F00 +dgb_04_SuperBlock_WhiteScreenFlash = 0x80242F08; // type:func rom:0xC39438 +dgb_04_SuperBlock_PartnerSparkles2 = 0x80243048; // type:func rom:0xC39578 +dgb_04_SuperBlock_PartnerSparkles4 = 0x80243090; // type:func rom:0xC395C0 +dgb_04_SuperBlock_WaitForPlayerToLand = 0x802430D8; // type:func rom:0xC39608 dgb_04_entryList = 0x80243110; // type:data rom:0xC39640 dgb_04_config = 0x80243130; // type:data rom:0xC39660 dgb_04_80243170 = 0x80243170; // type:data rom:0xC396A0 @@ -18379,10 +18379,10 @@ dgb_04_80243A98 = 0x80243A98; // type:data rom:0xC39FC8 dgb_04_npcSettings_80243AFC = 0x80243AFC; // type:data rom:0xC3A02C dgb_04_npcGroup_80243B28 = 0x80243B28; // type:data rom:0xC3A058 dgb_04_npcGroupList_80243D18 = 0x80243D18; // type:data rom:0xC3A248 -dgb_04_D_80243D30_C3A260 = 0x80243D30; // type:data rom:0xC3A260 -dgb_04_D_80243D38_C3A268 = 0x80243D38; // type:data rom:0xC3A268 -dgb_04_D_80243D48_C3A278 = 0x80243D48; // type:data rom:0xC3A278 -dgb_04_bigFuncFloats = 0x80243D88; // type:data rom:0xC3A2B8 +dgb_04_SuperBlock_CantUpgradeMessages = 0x80243D30; // type:data rom:0xC3A260 +dgb_04_SuperBlock_PartnerIDs = 0x80243D38; // type:data rom:0xC3A268 +dgb_04_SuperBlock_UpgradeDescMessages = 0x80243D48; // type:data rom:0xC3A278 +dgb_04_SuperBlock_UpgradeOrbAngles = 0x80243D88; // type:data rom:0xC3A2B8 dgb_04_80243D94 = 0x80243D94; // type:data rom:0xC3A2C4 dgb_04_80243EF8 = 0x80243EF8; // type:data rom:0xC3A428 dgb_04_makeEntities = 0x80244378; // type:data rom:0xC3A8A8 @@ -19001,32 +19001,32 @@ D_802473F0_C68100 = 0x802473F0; // type:data rom:0xC68100 D_802473F8_C68108 = 0x802473F8; // type:data rom:0xC68108 D_80247400_C68110 = 0x80247400; // type:data rom:0xC68110 D_80247410_C68120 = 0x80247410; // type:data rom:0xC68120 -kzn_04_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xC68130 -kzn_04_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xC68254 -kzn_04_SetOverrideFlags_40 = 0x80240310; // type:func rom:0xC68440 -kzn_04_UnkFunc17 = 0x8024032C; // type:func rom:0xC6845C -func_8024034C_C6847C = 0x8024034C; // type:func rom:0xC6847C -kzn_04_UnkFunc18 = 0x80240378; // type:func rom:0xC684A8 -kzn_04_UnkFunc37 = 0x802403E4; // type:func rom:0xC68514 -kzn_04_UnkFunc38 = 0x80240430; // type:func rom:0xC68560 -func_802404DC_C6860C = 0x802404DC; // type:func rom:0xC6860C -kzn_04_SwitchToPartner = 0x8024072C; // type:func rom:0xC6885C -kzn_04_UnkFunc19 = 0x80240758; // type:func rom:0xC68888 -kzn_04_UnkFunc20 = 0x80240790; // type:func rom:0xC688C0 -kzn_04_UnkFunc39 = 0x80240820; // type:func rom:0xC68950 -kzn_04_UnkFunc21 = 0x80240854; // type:func rom:0xC68984 -kzn_04_UnkFunc22 = 0x802408B8; // type:func rom:0xC689E8 -kzn_04_UnkFunc60 = 0x80240910; // type:func rom:0xC68A40 -kzn_04_UnkFunc23 = 0x80240E48; // type:func rom:0xC68F78 -kzn_04_UnkPartnerPosFunc = 0x80240F88; // type:func rom:0xC690B8 -kzn_04_UnkPartnerPosFunc2 = 0x80240FD0; // type:func rom:0xC69100 -kzn_04_UnkFunc40 = 0x80241018; // type:func rom:0xC69148 +kzn_04_UnkTexturePanFunc = 0x80240000; // type:func rom:0xC68130 +kzn_04_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xC68254 +kzn_04_SuperBlock_SetOverride40 = 0x80240310; // type:func rom:0xC68440 +kzn_04_SuperBlock_ClearOverride40 = 0x8024032C; // type:func rom:0xC6845C +kzn_04_SuperBlock_HideBlockContent = 0x8024034C; // type:func rom:0xC6847C +kzn_04_SuperBlock_GetPartnerRank = 0x80240378; // type:func rom:0xC684A8 +kzn_04_SuperBlock_get_partner_rank = 0x802403E4; // type:func rom:0xC68514 +kzn_04_SuperBlock_CountEligiblePartners = 0x80240430; // type:func rom:0xC68560 +kzn_04_SuperBlock_ShowSelectPartnerMenu = 0x802404DC; // type:func rom:0xC6860C +kzn_04_SuperBlock_SwitchToPartner = 0x8024072C; // type:func rom:0xC6885C +kzn_04_SuperBlock_LoadCurrentPartnerName = 0x80240758; // type:func rom:0xC68888 +kzn_04_SuperBlock_StartGlowEffect = 0x80240790; // type:func rom:0xC688C0 +kzn_04_SuperBlock_EndGlowEffect = 0x80240820; // type:func rom:0xC68950 +kzn_04_SuperBlock_GatherEnergyFX = 0x80240854; // type:func rom:0xC68984 +kzn_04_SuperBlock_RadiateFaintEnergyFX = 0x802408B8; // type:func rom:0xC689E8 +kzn_04_SuperBlock_AnimateEnergyOrbs = 0x80240910; // type:func rom:0xC68A40 +kzn_04_SuperBlock_WhiteScreenFlash = 0x80240E48; // type:func rom:0xC68F78 +kzn_04_SuperBlock_PartnerSparkles2 = 0x80240F88; // type:func rom:0xC690B8 +kzn_04_SuperBlock_PartnerSparkles4 = 0x80240FD0; // type:func rom:0xC69100 +kzn_04_SuperBlock_WaitForPlayerToLand = 0x80241018; // type:func rom:0xC69148 func_80241050_C69180 = 0x80241050; // type:func rom:0xC69180 func_80241644_C69774 = 0x80241644; // type:func rom:0xC69774 -D_80241C40_C69D70 = 0x80241C40; // type:data rom:0xC69D70 -D_80241C48_C69D78 = 0x80241C48; // type:data rom:0xC69D78 -D_80241C58_C69D88 = 0x80241C58; // type:data rom:0xC69D88 -kzn_04_bigFuncFloats = 0x80241C98; // type:data rom:0xC69DC8 +kzn_04_SuperBlock_CantUpgradeMessages = 0x80241C40; // type:data rom:0xC69D70 +kzn_04_SuperBlock_PartnerIDs = 0x80241C48; // type:data rom:0xC69D78 +kzn_04_SuperBlock_UpgradeDescMessages = 0x80241C58; // type:data rom:0xC69D88 +kzn_04_SuperBlock_UpgradeOrbAngles = 0x80241C98; // type:data rom:0xC69DC8 D_802422F0_C6A420 = 0x802422F0; // type:data rom:0xC6A420 D_8024231C_C6A44C = 0x8024231C; // type:data rom:0xC6A44C kzn_05_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xC6C0D0 @@ -19125,24 +19125,24 @@ D_80245840_C76CC0 = 0x80245840; // type:data rom:0xC76CC0 D_80245848_C76CC8 = 0x80245848; // type:data rom:0xC76CC8 D_80245850_C76CD0 = 0x80245850; // type:data rom:0xC76CD0 D_80245858_C76CD8 = 0x80245858; // type:data rom:0xC76CD8 -kzn_09_SetOverrideFlags_40 = 0x80240000; // type:func rom:0xC76CE0 -kzn_09_UnkFunc17 = 0x8024001C; // type:func rom:0xC76CFC -func_8024003C_C76D1C = 0x8024003C; // type:func rom:0xC76D1C -kzn_09_UnkFunc18 = 0x80240068; // type:func rom:0xC76D48 -kzn_09_UnkFunc37 = 0x802400D4; // type:func rom:0xC76DB4 -kzn_09_UnkFunc38 = 0x80240120; // type:func rom:0xC76E00 -func_802401CC_C76EAC = 0x802401CC; // type:func rom:0xC76EAC -kzn_09_SwitchToPartner = 0x8024041C; // type:func rom:0xC770FC -kzn_09_UnkFunc19 = 0x80240448; // type:func rom:0xC77128 -kzn_09_UnkFunc20 = 0x80240480; // type:func rom:0xC77160 -kzn_09_UnkFunc39 = 0x80240510; // type:func rom:0xC771F0 -kzn_09_UnkFunc21 = 0x80240544; // type:func rom:0xC77224 -kzn_09_UnkFunc22 = 0x802405A8; // type:func rom:0xC77288 -kzn_09_UnkFunc60 = 0x80240600; // type:func rom:0xC772E0 -kzn_09_UnkFunc23 = 0x80240B38; // type:func rom:0xC77818 -kzn_09_UnkPartnerPosFunc = 0x80240C78; // type:func rom:0xC77958 -kzn_09_UnkPartnerPosFunc2 = 0x80240CC0; // type:func rom:0xC779A0 -kzn_09_UnkFunc40 = 0x80240D08; // type:func rom:0xC779E8 +kzn_09_SuperBlock_SetOverride40 = 0x80240000; // type:func rom:0xC76CE0 +kzn_09_SuperBlock_ClearOverride40 = 0x8024001C; // type:func rom:0xC76CFC +kzn_09_SuperBlock_HideBlockContent = 0x8024003C; // type:func rom:0xC76D1C +kzn_09_SuperBlock_GetPartnerRank = 0x80240068; // type:func rom:0xC76D48 +kzn_09_SuperBlock_get_partner_rank = 0x802400D4; // type:func rom:0xC76DB4 +kzn_09_SuperBlock_CountEligiblePartners = 0x80240120; // type:func rom:0xC76E00 +kzn_09_SuperBlock_ShowSelectPartnerMenu = 0x802401CC; // type:func rom:0xC76EAC +kzn_09_SuperBlock_SwitchToPartner = 0x8024041C; // type:func rom:0xC770FC +kzn_09_SuperBlock_LoadCurrentPartnerName = 0x80240448; // type:func rom:0xC77128 +kzn_09_SuperBlock_StartGlowEffect = 0x80240480; // type:func rom:0xC77160 +kzn_09_SuperBlock_EndGlowEffect = 0x80240510; // type:func rom:0xC771F0 +kzn_09_SuperBlock_GatherEnergyFX = 0x80240544; // type:func rom:0xC77224 +kzn_09_SuperBlock_RadiateFaintEnergyFX = 0x802405A8; // type:func rom:0xC77288 +kzn_09_SuperBlock_AnimateEnergyOrbs = 0x80240600; // type:func rom:0xC772E0 +kzn_09_SuperBlock_WhiteScreenFlash = 0x80240B38; // type:func rom:0xC77818 +kzn_09_SuperBlock_PartnerSparkles2 = 0x80240C78; // type:func rom:0xC77958 +kzn_09_SuperBlock_PartnerSparkles4 = 0x80240CC0; // type:func rom:0xC779A0 +kzn_09_SuperBlock_WaitForPlayerToLand = 0x80240D08; // type:func rom:0xC779E8 func_80240D40_C77A20 = 0x80240D40; // type:func rom:0xC77A20 func_80240DE4_C77AC4 = 0x80240DE4; // type:func rom:0xC77AC4 func_80240E88_C77B68 = 0x80240E88; // type:func rom:0xC77B68 @@ -19181,11 +19181,11 @@ kzn_09_SetManyVars = 0x80243718; // type:func rom:0xC7A3F8 kzn_09_UnkYawFunc = 0x80243808; // type:func rom:0xC7A4E8 func_80243994_C7A674 = 0x80243994; // type:func rom:0xC7A674 func_802439D8_C7A6B8 = 0x802439D8; // type:func rom:0xC7A6B8 -D_80243D00_C7A9E0 = 0x80243D00; // type:data rom:0xC7A9E0 -D_80243D08_C7A9E8 = 0x80243D08; // type:data rom:0xC7A9E8 -D_80243D18_C7A9F8 = 0x80243D18; // type:data rom:0xC7A9F8 -kzn_09_bigFuncFloats = 0x80243D58; // type:data rom:0xC7AA38 -kzn_09_varTable = 0x80245250; // type:data rom:0xC7BF30 +kzn_09_SuperBlock_CantUpgradeMessages = 0x80243D00; // type:data rom:0xC7A9E0 +kzn_09_SuperBlock_PartnerIDs = 0x80243D08; // type:data rom:0xC7A9E8 +kzn_09_SuperBlock_UpgradeDescMessages = 0x80243D18; // type:data rom:0xC7A9F8 +kzn_09_SuperBlock_UpgradeOrbAngles = 0x80243D58; // type:data rom:0xC7AA38 +D_80245250_C7BF30 = 0x80245250; // type:data rom:0xC7BF30 D_802452B4_C7BF94 = 0x802452B4; // type:data rom:0xC7BF94 D_802452B8_C7BF98 = 0x802452B8; // type:data rom:0xC7BF98 D_80247270_C7DF50 = 0x80247270; // type:data rom:0xC7DF50 @@ -19570,24 +19570,24 @@ flo_07_802428C4 = 0x802428C4; // type:data rom:0xCAEAB4 flo_07_npcGroup_8024291C = 0x8024291C; // type:data rom:0xCAEB0C flo_07_npcGroupList_80242B0C = 0x80242B0C; // type:data rom:0xCAECFC flo_07_flo_25_name_hack = 0x80242B40; // type:data rom:0xCAED30 -flo_08_SetOverrideFlags_40 = 0x80240000; // type:func rom:0xCAED40 -flo_08_UnkFunc17 = 0x8024001C; // type:func rom:0xCAED5C -flo_08_func_8024003C_CAED7C = 0x8024003C; // type:func rom:0xCAED7C -flo_08_UnkFunc18 = 0x80240068; // type:func rom:0xCAEDA8 -flo_08_UnkFunc37 = 0x802400D4; // type:func rom:0xCAEE14 -flo_08_UnkFunc38 = 0x80240120; // type:func rom:0xCAEE60 -flo_08_func_802401CC_CAEF0C = 0x802401CC; // type:func rom:0xCAEF0C -flo_08_SwitchToPartner = 0x8024041C; // type:func rom:0xCAF15C -flo_08_UnkFunc19 = 0x80240448; // type:func rom:0xCAF188 -flo_08_UnkFunc20 = 0x80240480; // type:func rom:0xCAF1C0 -flo_08_UnkFunc39 = 0x80240510; // type:func rom:0xCAF250 -flo_08_UnkFunc21 = 0x80240544; // type:func rom:0xCAF284 -flo_08_UnkFunc22 = 0x802405A8; // type:func rom:0xCAF2E8 -flo_08_UnkFunc60 = 0x80240600; // type:func rom:0xCAF340 -flo_08_UnkFunc23 = 0x80240B38; // type:func rom:0xCAF878 -flo_08_UnkPartnerPosFunc = 0x80240C78; // type:func rom:0xCAF9B8 -flo_08_UnkPartnerPosFunc2 = 0x80240CC0; // type:func rom:0xCAFA00 -flo_08_UnkFunc40 = 0x80240D08; // type:func rom:0xCAFA48 +flo_08_SuperBlock_SetOverride40 = 0x80240000; // type:func rom:0xCAED40 +flo_08_SuperBlock_ClearOverride40 = 0x8024001C; // type:func rom:0xCAED5C +flo_08_flo_08_SuperBlock_HideBlockContent = 0x8024003C; // type:func rom:0xCAED7C +flo_08_SuperBlock_GetPartnerRank = 0x80240068; // type:func rom:0xCAEDA8 +flo_08_SuperBlock_get_partner_rank = 0x802400D4; // type:func rom:0xCAEE14 +flo_08_SuperBlock_CountEligiblePartners = 0x80240120; // type:func rom:0xCAEE60 +flo_08_SuperBlock_ShowSelectPartnerMenu = 0x802401CC; // type:func rom:0xCAEF0C +flo_08_SuperBlock_SwitchToPartner = 0x8024041C; // type:func rom:0xCAF15C +flo_08_SuperBlock_LoadCurrentPartnerName = 0x80240448; // type:func rom:0xCAF188 +flo_08_SuperBlock_StartGlowEffect = 0x80240480; // type:func rom:0xCAF1C0 +flo_08_SuperBlock_EndGlowEffect = 0x80240510; // type:func rom:0xCAF250 +flo_08_SuperBlock_GatherEnergyFX = 0x80240544; // type:func rom:0xCAF284 +flo_08_SuperBlock_RadiateFaintEnergyFX = 0x802405A8; // type:func rom:0xCAF2E8 +flo_08_SuperBlock_AnimateEnergyOrbs = 0x80240600; // type:func rom:0xCAF340 +flo_08_SuperBlock_WhiteScreenFlash = 0x80240B38; // type:func rom:0xCAF878 +flo_08_SuperBlock_PartnerSparkles2 = 0x80240C78; // type:func rom:0xCAF9B8 +flo_08_SuperBlock_PartnerSparkles4 = 0x80240CC0; // type:func rom:0xCAFA00 +flo_08_SuperBlock_WaitForPlayerToLand = 0x80240D08; // type:func rom:0xCAFA48 flo_08_func_80240D40_CAFA80 = 0x80240D40; // type:func rom:0xCAFA80 flo_08_func_80240D80_CAFAC0 = 0x80240D80; // type:func rom:0xCAFAC0 flo_08_func_80241364_CB00A4 = 0x80241364; // type:func rom:0xCB00A4 @@ -19607,10 +19607,10 @@ flo_08_UnkFunc43 = 0x80241E40; // type:func rom:0xCB0B80 flo_08_entryList = 0x80241EE0; // type:data rom:0xCB0C20 flo_08_config = 0x80241F00; // type:data rom:0xCB0C40 flo_08_80241F40 = 0x80241F40; // type:data rom:0xCB0C80 -flo_08_D_80241FB0_CB0CF0 = 0x80241FB0; // type:data rom:0xCB0CF0 -flo_08_D_80241FB8_CB0CF8 = 0x80241FB8; // type:data rom:0xCB0CF8 -flo_08_D_80241FC8_CB0D08 = 0x80241FC8; // type:data rom:0xCB0D08 -flo_08_bigFuncFloats = 0x80242008; // type:data rom:0xCB0D48 +flo_08_SuperBlock_CantUpgradeMessages = 0x80241FB0; // type:data rom:0xCB0CF0 +flo_08_SuperBlock_PartnerIDs = 0x80241FB8; // type:data rom:0xCB0CF8 +flo_08_SuperBlock_UpgradeDescMessages = 0x80241FC8; // type:data rom:0xCB0D08 +flo_08_SuperBlock_UpgradeOrbAngles = 0x80242008; // type:data rom:0xCB0D48 flo_08_80242014 = 0x80242014; // type:data rom:0xCB0D54 flo_08_80242178 = 0x80242178; // type:data rom:0xCB0EB8 flo_08_makeEntities = 0x802425F8; // type:data rom:0xCB1338 @@ -19779,12 +19779,12 @@ flo_10_tree1 = 0x80244A2C; // type:data rom:0xCBDC2C flo_10_triggerCoord_80244A40 = 0x80244A40; // type:data rom:0xCBDC40 flo_10_80244A50 = 0x80244A50; // type:data rom:0xCBDC50 flo_10_flo_24_name_hack = 0x80244AB8; // type:data rom:0xCBDCB8 -flo_11_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0xCBDCD0 -flo_11_GetCurrentFloor = 0x80240020; // type:func rom:0xCBDCF0 -flo_11_UnkFunc25 = 0x80240034; // type:func rom:0xCBDD04 -flo_11_GetEntryPos = 0x802400F0; // type:func rom:0xCBDDC0 -flo_11_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0xCBDEA0 -flo_11_SomeXYZFunc2 = 0x8024023C; // type:func rom:0xCBDF0C +flo_11_Pipe_SetAnimFlag = 0x80240000; // type:func rom:0xCBDCD0 +flo_11_Pipe_GetCurrentFloor = 0x80240020; // type:func rom:0xCBDCF0 +flo_11_Pipe_AwaitDownInput = 0x80240034; // type:func rom:0xCBDD04 +flo_11_Pipe_GetEntryPos = 0x802400F0; // type:func rom:0xCBDDC0 +flo_11_Pipe_GetCameraYaw = 0x802401D0; // type:func rom:0xCBDEA0 +flo_11_Pipe_GetPointAheadOfPlayer = 0x8024023C; // type:func rom:0xCBDF0C flo_11_func_802402E0_CBDFB0 = 0x802402E0; // type:func rom:0xCBDFB0 flo_11_entryList = 0x80240320; // type:data rom:0xCBDFF0 flo_11_config = 0x802403A0; // type:data rom:0xCBE070 @@ -20049,24 +20049,24 @@ flo_15_intTable_80241360 = 0x80241360; // type:data rom:0xCD1A20 flo_15_802413B0 = 0x802413B0; // type:data rom:0xCD1A70 flo_16_func_80240000_CD1E30 = 0x80240000; // type:func rom:0xCD1E30 flo_16_UnkFunc43 = 0x80240040; // type:func rom:0xCD1E70 -flo_16_SetOverrideFlags_40 = 0x802400E0; // type:func rom:0xCD1F10 -flo_16_UnkFunc17 = 0x802400FC; // type:func rom:0xCD1F2C -flo_16_func_8024011C_CD1F4C = 0x8024011C; // type:func rom:0xCD1F4C -flo_16_UnkFunc18 = 0x80240148; // type:func rom:0xCD1F78 -flo_16_UnkFunc37 = 0x802401B4; // type:func rom:0xCD1FE4 -flo_16_UnkFunc38 = 0x80240200; // type:func rom:0xCD2030 -func_802402AC_CD20DC = 0x802402AC; // type:func rom:0xCD20DC -flo_16_SwitchToPartner = 0x802404FC; // type:func rom:0xCD232C -flo_16_UnkFunc19 = 0x80240528; // type:func rom:0xCD2358 -flo_16_UnkFunc20 = 0x80240560; // type:func rom:0xCD2390 -flo_16_UnkFunc39 = 0x802405F0; // type:func rom:0xCD2420 -flo_16_UnkFunc21 = 0x80240624; // type:func rom:0xCD2454 -flo_16_UnkFunc22 = 0x80240688; // type:func rom:0xCD24B8 -flo_16_UnkFunc60 = 0x802406E0; // type:func rom:0xCD2510 -flo_16_UnkFunc23 = 0x80240C18; // type:func rom:0xCD2A48 -flo_16_UnkPartnerPosFunc = 0x80240D58; // type:func rom:0xCD2B88 -flo_16_UnkPartnerPosFunc2 = 0x80240DA0; // type:func rom:0xCD2BD0 -flo_16_UnkFunc24 = 0x80240DE8; // type:func rom:0xCD2C18 +flo_16_SuperBlock_SetOverride40 = 0x802400E0; // type:func rom:0xCD1F10 +flo_16_SuperBlock_ClearOverride40 = 0x802400FC; // type:func rom:0xCD1F2C +flo_16_SuperBlock_HideBlockContent = 0x8024011C; // type:func rom:0xCD1F4C +flo_16_SuperBlock_GetPartnerRank = 0x80240148; // type:func rom:0xCD1F78 +flo_16_SuperBlock_get_partner_rank = 0x802401B4; // type:func rom:0xCD1FE4 +flo_16_SuperBlock_CountEligiblePartners = 0x80240200; // type:func rom:0xCD2030 +flo_16_SuperBlock_ShowSelectPartnerMenu = 0x802402AC; // type:func rom:0xCD20DC +flo_16_SuperBlock_SwitchToPartner = 0x802404FC; // type:func rom:0xCD232C +flo_16_SuperBlock_LoadCurrentPartnerName = 0x80240528; // type:func rom:0xCD2358 +flo_16_SuperBlock_StartGlowEffect = 0x80240560; // type:func rom:0xCD2390 +flo_16_SuperBlock_EndGlowEffect = 0x802405F0; // type:func rom:0xCD2420 +flo_16_SuperBlock_GatherEnergyFX = 0x80240624; // type:func rom:0xCD2454 +flo_16_SuperBlock_RadiateFaintEnergyFX = 0x80240688; // type:func rom:0xCD24B8 +flo_16_SuperBlock_AnimateEnergyOrbs = 0x802406E0; // type:func rom:0xCD2510 +flo_16_SuperBlock_WhiteScreenFlash = 0x80240C18; // type:func rom:0xCD2A48 +flo_16_SuperBlock_PartnerSparkles2 = 0x80240D58; // type:func rom:0xCD2B88 +flo_16_SuperBlock_PartnerSparkles4 = 0x80240DA0; // type:func rom:0xCD2BD0 +flo_16_SuperBlock_WaitForPlayerToLand = 0x80240DE8; // type:func rom:0xCD2C18 flo_16_UnkFunc44 = 0x80240E18; // type:func rom:0xCD2C48 flo_16_UnkNpcAIFunc23 = 0x80240E50; // type:func rom:0xCD2C80 flo_16_UnkNpcAIFunc35 = 0x80241000; // type:func rom:0xCD2E30 @@ -20095,10 +20095,10 @@ flo_16_main = 0x80242B70; // type:data rom:0xCD49A0 flo_16_80242EA0 = 0x80242EA0; // type:data rom:0xCD4CD0 flo_16_8024314C = 0x8024314C; // type:data rom:0xCD4F7C flo_16_8024346C = 0x8024346C; // type:data rom:0xCD529C -flo_16_D_80243700_CD5530 = 0x80243700; // type:data rom:0xCD5530 -flo_16_D_80243708_CD5538 = 0x80243708; // type:data rom:0xCD5538 -flo_16_D_80243718_CD5548 = 0x80243718; // type:data rom:0xCD5548 -flo_16_bigFuncFloats = 0x80243758; // type:data rom:0xCD5588 +flo_16_SuperBlock_CantUpgradeMessages = 0x80243700; // type:data rom:0xCD5530 +flo_16_SuperBlock_PartnerIDs = 0x80243708; // type:data rom:0xCD5538 +flo_16_SuperBlock_UpgradeDescMessages = 0x80243718; // type:data rom:0xCD5548 +flo_16_SuperBlock_UpgradeOrbAngles = 0x80243758; // type:data rom:0xCD5588 flo_16_80243764 = 0x80243764; // type:data rom:0xCD5594 flo_16_802438C8 = 0x802438C8; // type:data rom:0xCD56F8 flo_16_80243D48 = 0x80243D48; // type:data rom:0xCD5B78 @@ -20555,15 +20555,15 @@ D_802432D4_CFAE44 = 0x802432D4; // type:data rom:0xCFAE44 sam_01_varTable = 0x802435F0; // type:data rom:0xCFB160 D_802436FC_CFB26C = 0x802436FC; // type:data rom:0xCFB26C D_8024373C_CFB2AC = 0x8024373C; // type:data rom:0xCFB2AC -sam_01_varTable = 0x8024D8F0; // type:data rom:0xD05460 -sam_02_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0xD05730 -sam_02_GetCurrentFloor = 0x80240020; // type:func rom:0xD05750 -sam_02_UnkFunc25 = 0x80240034; // type:func rom:0xD05764 -sam_02_GetEntryPos = 0x802400F0; // type:func rom:0xD05820 -sam_02_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0xD05900 -sam_02_SomeXYZFunc2 = 0x8024023C; // type:func rom:0xD0596C -sam_02_UpdateTexturePanSmooth = 0x802402E0; // type:func rom:0xD05A10 -sam_02_UpdateTexturePanStepped = 0x80240404; // type:func rom:0xD05B34 +D_8024D8F0_D05460 = 0x8024D8F0; // type:data rom:0xD05460 +sam_02_Pipe_SetAnimFlag = 0x80240000; // type:func rom:0xD05730 +sam_02_Pipe_GetCurrentFloor = 0x80240020; // type:func rom:0xD05750 +sam_02_Pipe_AwaitDownInput = 0x80240034; // type:func rom:0xD05764 +sam_02_Pipe_GetEntryPos = 0x802400F0; // type:func rom:0xD05820 +sam_02_Pipe_GetCameraYaw = 0x802401D0; // type:func rom:0xD05900 +sam_02_Pipe_GetPointAheadOfPlayer = 0x8024023C; // type:func rom:0xD0596C +sam_02_UnkTexturePanFunc = 0x802402E0; // type:func rom:0xD05A10 +sam_02_UnkTexturePanFunc2 = 0x80240404; // type:func rom:0xD05B34 sam_02_foliage_setup_shear_mtx = 0x802405EC; // type:func rom:0xD05D1C sam_02_TransformFoliage = 0x8024065C; // type:func rom:0xD05D8C sam_02_Call800E9894 = 0x80240830; // type:func rom:0xD05F60 @@ -20728,24 +20728,24 @@ D_80243F28_D2FC58 = 0x80243F28; // type:data rom:0xD2FC58 D_80243F30_D2FC60 = 0x80243F30; // type:data rom:0xD2FC60 D_80243F38_D2FC68 = 0x80243F38; // type:data rom:0xD2FC68 D_80243F40_D2FC70 = 0x80243F40; // type:data rom:0xD2FC70 -sam_08_SetOverrideFlags_40 = 0x80240000; // type:func rom:0xD2FC80 -sam_08_UnkFunc17 = 0x8024001C; // type:func rom:0xD2FC9C -func_8024003C_D2FCBC = 0x8024003C; // type:func rom:0xD2FCBC -sam_08_UnkFunc18 = 0x80240068; // type:func rom:0xD2FCE8 -sam_08_UnkFunc37 = 0x802400D4; // type:func rom:0xD2FD54 -sam_08_UnkFunc38 = 0x80240120; // type:func rom:0xD2FDA0 -func_802401CC_D2FE4C = 0x802401CC; // type:func rom:0xD2FE4C -sam_08_SwitchToPartner = 0x8024041C; // type:func rom:0xD3009C -sam_08_UnkFunc19 = 0x80240448; // type:func rom:0xD300C8 -sam_08_UnkFunc20 = 0x80240480; // type:func rom:0xD30100 -sam_08_UnkFunc39 = 0x80240510; // type:func rom:0xD30190 -sam_08_UnkFunc21 = 0x80240544; // type:func rom:0xD301C4 -sam_08_UnkFunc22 = 0x802405A8; // type:func rom:0xD30228 -sam_08_UnkFunc60 = 0x80240600; // type:func rom:0xD30280 -sam_08_UnkFunc23 = 0x80240B38; // type:func rom:0xD307B8 -sam_08_UnkPartnerPosFunc = 0x80240C78; // type:func rom:0xD308F8 -sam_08_UnkPartnerPosFunc2 = 0x80240CC0; // type:func rom:0xD30940 -sam_08_UnkFunc40 = 0x80240D08; // type:func rom:0xD30988 +sam_08_SuperBlock_SetOverride40 = 0x80240000; // type:func rom:0xD2FC80 +sam_08_SuperBlock_ClearOverride40 = 0x8024001C; // type:func rom:0xD2FC9C +sam_08_SuperBlock_HideBlockContent = 0x8024003C; // type:func rom:0xD2FCBC +sam_08_SuperBlock_GetPartnerRank = 0x80240068; // type:func rom:0xD2FCE8 +sam_08_SuperBlock_get_partner_rank = 0x802400D4; // type:func rom:0xD2FD54 +sam_08_SuperBlock_CountEligiblePartners = 0x80240120; // type:func rom:0xD2FDA0 +sam_08_SuperBlock_ShowSelectPartnerMenu = 0x802401CC; // type:func rom:0xD2FE4C +sam_08_SuperBlock_SwitchToPartner = 0x8024041C; // type:func rom:0xD3009C +sam_08_SuperBlock_LoadCurrentPartnerName = 0x80240448; // type:func rom:0xD300C8 +sam_08_SuperBlock_StartGlowEffect = 0x80240480; // type:func rom:0xD30100 +sam_08_SuperBlock_EndGlowEffect = 0x80240510; // type:func rom:0xD30190 +sam_08_SuperBlock_GatherEnergyFX = 0x80240544; // type:func rom:0xD301C4 +sam_08_SuperBlock_RadiateFaintEnergyFX = 0x802405A8; // type:func rom:0xD30228 +sam_08_SuperBlock_AnimateEnergyOrbs = 0x80240600; // type:func rom:0xD30280 +sam_08_SuperBlock_WhiteScreenFlash = 0x80240B38; // type:func rom:0xD307B8 +sam_08_SuperBlock_PartnerSparkles2 = 0x80240C78; // type:func rom:0xD308F8 +sam_08_SuperBlock_PartnerSparkles4 = 0x80240CC0; // type:func rom:0xD30940 +sam_08_SuperBlock_WaitForPlayerToLand = 0x80240D08; // type:func rom:0xD30988 sam_08_UnkNpcAIFunc6 = 0x80240D40; // type:func rom:0xD309C0 sam_08_UnkNpcAIFunc7 = 0x80240DAC; // type:func rom:0xD30A2C sam_08_UnkNpcAIFunc8 = 0x80240E1C; // type:func rom:0xD30A9C @@ -20756,10 +20756,10 @@ sam_08_UnkNpcAIFunc27 = 0x8024135C; // type:func rom:0xD30FDC func_80241610_D31290 = 0x80241610; // type:func rom:0xD31290 func_802416A4_D31324 = 0x802416A4; // type:func rom:0xD31324 func_8024174C_D313CC = 0x8024174C; // type:func rom:0xD313CC -D_80241AE0_D31760 = 0x80241AE0; // type:data rom:0xD31760 -D_80241AE8_D31768 = 0x80241AE8; // type:data rom:0xD31768 -D_80241AF8_D31778 = 0x80241AF8; // type:data rom:0xD31778 -sam_08_bigFuncFloats = 0x80241B38; // type:data rom:0xD317B8 +sam_08_SuperBlock_CantUpgradeMessages = 0x80241AE0; // type:data rom:0xD31760 +sam_08_SuperBlock_PartnerIDs = 0x80241AE8; // type:data rom:0xD31768 +sam_08_SuperBlock_UpgradeDescMessages = 0x80241AF8; // type:data rom:0xD31778 +sam_08_SuperBlock_UpgradeOrbAngles = 0x80241B38; // type:data rom:0xD317B8 D_802464D0_D36150 = 0x802464D0; // type:data rom:0xD36150 sam_09_StashVars = 0x80240000; // type:func rom:0xD362F0 sam_09_GetItemName = 0x802400B4; // type:func rom:0xD363A4 @@ -21710,31 +21710,31 @@ omo_10_UpdateTexturePanSmooth = 0x8024055C; // type:func rom:0xDD7F0C omo_10_UpdateTexturePanStepped = 0x80240680; // type:func rom:0xDD8030 func_80240000_DDC830 = 0x80240000; // type:func rom:0xDDC830 func_802401A0_DDC9D0 = 0x802401A0; // type:func rom:0xDDC9D0 -omo_11_SetOverrideFlags_40 = 0x80240790; // type:func rom:0xDDCFC0 -omo_11_UnkFunc17 = 0x802407AC; // type:func rom:0xDDCFDC -func_802407CC_DDCFFC = 0x802407CC; // type:func rom:0xDDCFFC -omo_11_UnkFunc18 = 0x802407F8; // type:func rom:0xDDD028 -omo_11_UnkFunc37 = 0x80240864; // type:func rom:0xDDD094 -omo_11_UnkFunc38 = 0x802408B0; // type:func rom:0xDDD0E0 -func_8024095C_DDD18C = 0x8024095C; // type:func rom:0xDDD18C -omo_11_SwitchToPartner = 0x80240BAC; // type:func rom:0xDDD3DC -omo_11_UnkFunc19 = 0x80240BD8; // type:func rom:0xDDD408 -omo_11_UnkFunc20 = 0x80240C10; // type:func rom:0xDDD440 -omo_11_UnkFunc39 = 0x80240CA0; // type:func rom:0xDDD4D0 -omo_11_UnkFunc21 = 0x80240CD4; // type:func rom:0xDDD504 -omo_11_UnkFunc22 = 0x80240D38; // type:func rom:0xDDD568 -omo_11_UnkFunc60 = 0x80240D90; // type:func rom:0xDDD5C0 -omo_11_UnkFunc23 = 0x802412C8; // type:func rom:0xDDDAF8 -omo_11_UnkPartnerPosFunc = 0x80241408; // type:func rom:0xDDDC38 -omo_11_UnkPartnerPosFunc2 = 0x80241450; // type:func rom:0xDDDC80 -omo_11_UnkFunc40 = 0x80241498; // type:func rom:0xDDDCC8 +omo_11_SuperBlock_SetOverride40 = 0x80240790; // type:func rom:0xDDCFC0 +omo_11_SuperBlock_ClearOverride40 = 0x802407AC; // type:func rom:0xDDCFDC +omo_11_SuperBlock_HideBlockContent = 0x802407CC; // type:func rom:0xDDCFFC +omo_11_SuperBlock_GetPartnerRank = 0x802407F8; // type:func rom:0xDDD028 +omo_11_SuperBlock_get_partner_rank = 0x80240864; // type:func rom:0xDDD094 +omo_11_SuperBlock_CountEligiblePartners = 0x802408B0; // type:func rom:0xDDD0E0 +omo_11_SuperBlock_ShowSelectPartnerMenu = 0x8024095C; // type:func rom:0xDDD18C +omo_11_SuperBlock_SwitchToPartner = 0x80240BAC; // type:func rom:0xDDD3DC +omo_11_SuperBlock_LoadCurrentPartnerName = 0x80240BD8; // type:func rom:0xDDD408 +omo_11_SuperBlock_StartGlowEffect = 0x80240C10; // type:func rom:0xDDD440 +omo_11_SuperBlock_EndGlowEffect = 0x80240CA0; // type:func rom:0xDDD4D0 +omo_11_SuperBlock_GatherEnergyFX = 0x80240CD4; // type:func rom:0xDDD504 +omo_11_SuperBlock_RadiateFaintEnergyFX = 0x80240D38; // type:func rom:0xDDD568 +omo_11_SuperBlock_AnimateEnergyOrbs = 0x80240D90; // type:func rom:0xDDD5C0 +omo_11_SuperBlock_WhiteScreenFlash = 0x802412C8; // type:func rom:0xDDDAF8 +omo_11_SuperBlock_PartnerSparkles2 = 0x80241408; // type:func rom:0xDDDC38 +omo_11_SuperBlock_PartnerSparkles4 = 0x80241450; // type:func rom:0xDDDC80 +omo_11_SuperBlock_WaitForPlayerToLand = 0x80241498; // type:func rom:0xDDDCC8 D_80241740_DDDF70 = 0x80241740; // type:data rom:0xDDDF70 D_80241760_DDDF90 = 0x80241760; // type:data rom:0xDDDF90 D_80241778_DDDFA8 = 0x80241778; // type:data rom:0xDDDFA8 -D_80241E40_DDE670 = 0x80241E40; // type:data rom:0xDDE670 -D_80241E48_DDE678 = 0x80241E48; // type:data rom:0xDDE678 -D_80241E58_DDE688 = 0x80241E58; // type:data rom:0xDDE688 -omo_11_bigFuncFloats = 0x80241E98; // type:data rom:0xDDE6C8 +omo_11_SuperBlock_CantUpgradeMessages = 0x80241E40; // type:data rom:0xDDE670 +omo_11_SuperBlock_PartnerIDs = 0x80241E48; // type:data rom:0xDDE678 +omo_11_SuperBlock_UpgradeDescMessages = 0x80241E58; // type:data rom:0xDDE688 +omo_11_SuperBlock_UpgradeOrbAngles = 0x80241E98; // type:data rom:0xDDE6C8 omo_12_UnkFunc41 = 0x80240000; // type:func rom:0xDDF310 omo_12_DarkRoomUpdate = 0x80240184; // type:func rom:0xDDF494 omo_12_SetCamera0Flag1000 = 0x802402DC; // type:func rom:0xDDF5EC @@ -21919,12 +21919,12 @@ D_802441F0_E09550 = 0x802441F0; // type:data rom:0xE09550 D_80245D34_E0B094 = 0x80245D34; // type:data rom:0xE0B094 D_80245D37_E0B097 = 0x80245D37; // type:data rom:0xE0B097 D_802493A0_E0E700 = 0x802493A0; // type:data rom:0xE0E700 -mgm_00_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0xE0E7A0 -mgm_00_GetCurrentFloor = 0x80240020; // type:func rom:0xE0E7C0 -mgm_00_UnkFunc25 = 0x80240034; // type:func rom:0xE0E7D4 -mgm_00_GetEntryPos = 0x802400F0; // type:func rom:0xE0E890 -mgm_00_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0xE0E970 -mgm_00_SomeXYZFunc2 = 0x8024023C; // type:func rom:0xE0E9DC +mgm_00_Pipe_SetAnimFlag = 0x80240000; // type:func rom:0xE0E7A0 +mgm_00_Pipe_GetCurrentFloor = 0x80240020; // type:func rom:0xE0E7C0 +mgm_00_Pipe_AwaitDownInput = 0x80240034; // type:func rom:0xE0E7D4 +mgm_00_Pipe_GetEntryPos = 0x802400F0; // type:func rom:0xE0E890 +mgm_00_Pipe_GetCameraYaw = 0x802401D0; // type:func rom:0xE0E970 +mgm_00_Pipe_GetPointAheadOfPlayer = 0x8024023C; // type:func rom:0xE0E9DC mgm_00_UnkNpcAIFunc24 = 0x802402E0; // type:func rom:0xE0EA80 mgm_00_UnkFunc13 = 0x80240438; // type:func rom:0xE0EBD8 mgm_00_UnkNpcAIFunc1 = 0x802406E0; // type:func rom:0xE0EE80 @@ -22022,14 +22022,14 @@ mgm_02_PeachPanelImg = 0x802482A0; // type:data rom:0xE1E020 mgm_02_PeachPanelPal = 0x802484A0; // type:data rom:0xE1E220 mgm_02_MsgImg_PeachPanel = 0x802484C0; // type:data rom:0xE1E240 D_802484E0_E1E260 = 0x802484E0; // type:data rom:0xE1E260 -gv_01_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0xE1E460 -gv_01_GetCurrentFloor = 0x80240020; // type:func rom:0xE1E480 -gv_01_UnkFunc25 = 0x80240034; // type:func rom:0xE1E494 -gv_01_GetEntryPos = 0x802400F0; // type:func rom:0xE1E550 -gv_01_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0xE1E630 -gv_01_SomeXYZFunc2 = 0x8024023C; // type:func rom:0xE1E69C -gv_01_UpdateTexturePanSmooth = 0x802402E0; // type:func rom:0xE1E740 -gv_01_UpdateTexturePanStepped = 0x80240404; // type:func rom:0xE1E864 +gv_01_Pipe_SetAnimFlag = 0x80240000; // type:func rom:0xE1E460 +gv_01_Pipe_GetCurrentFloor = 0x80240020; // type:func rom:0xE1E480 +gv_01_Pipe_AwaitDownInput = 0x80240034; // type:func rom:0xE1E494 +gv_01_Pipe_GetEntryPos = 0x802400F0; // type:func rom:0xE1E550 +gv_01_Pipe_GetCameraYaw = 0x802401D0; // type:func rom:0xE1E630 +gv_01_Pipe_GetPointAheadOfPlayer = 0x8024023C; // type:func rom:0xE1E69C +gv_01_UnkTexturePanFunc = 0x802402E0; // type:func rom:0xE1E740 +gv_01_UnkTexturePanFunc2 = 0x80240404; // type:func rom:0xE1E864 func_802405EC_E1EA4C = 0x802405EC; // type:func rom:0xE1EA4C func_80240688_E1EAE8 = 0x80240688; // type:func rom:0xE1EAE8 E20110_UnkAngleFunc1 = 0x802B7000; // type:func rom:0xE20110 @@ -22445,25 +22445,25 @@ EC7590_foliage_setup_shear_mtx = 0x802403E0; // type:func rom:0xEC7590 EC7590_TransformFoliage = 0x80240450; // type:func rom:0xEC7600 EC7590_StashVars = 0x8024061C; // type:func rom:0xEC77CC EC7590_GetItemName = 0x802406D0; // type:func rom:0xEC7880 -EC7590_varTable = 0x80241BB0; // type:data rom:0xEC8D60 -EC9D00_SetOverrideFlags_40 = 0x80240000; // type:func rom:0xEC9D00 -EC9D00_UnkFunc17 = 0x8024001C; // type:func rom:0xEC9D1C -func_8024003C_EC9D3C = 0x8024003C; // type:func rom:0xEC9D3C -EC9D00_UnkFunc18 = 0x80240068; // type:func rom:0xEC9D68 -EC9D00_UnkFunc37 = 0x802400D4; // type:func rom:0xEC9DD4 -EC9D00_UnkFunc38 = 0x80240120; // type:func rom:0xEC9E20 -func_802401CC_EC9ECC = 0x802401CC; // type:func rom:0xEC9ECC -EC9D00_SwitchToPartner = 0x8024041C; // type:func rom:0xECA11C -EC9D00_UnkFunc19 = 0x80240448; // type:func rom:0xECA148 -EC9D00_UnkFunc20 = 0x80240480; // type:func rom:0xECA180 -EC9D00_UnkFunc39 = 0x80240510; // type:func rom:0xECA210 -EC9D00_UnkFunc21 = 0x80240544; // type:func rom:0xECA244 -EC9D00_UnkFunc22 = 0x802405A8; // type:func rom:0xECA2A8 -EC9D00_UnkFunc60 = 0x80240600; // type:func rom:0xECA300 -EC9D00_UnkFunc23 = 0x80240B38; // type:func rom:0xECA838 -EC9D00_UnkPartnerPosFunc = 0x80240C78; // type:func rom:0xECA978 -EC9D00_UnkPartnerPosFunc2 = 0x80240CC0; // type:func rom:0xECA9C0 -EC9D00_UnkFunc40 = 0x80240D08; // type:func rom:0xECAA08 +D_80241BB0_EC8D60 = 0x80241BB0; // type:data rom:0xEC8D60 +EC9D00_SuperBlock_SetOverride40 = 0x80240000; // type:func rom:0xEC9D00 +EC9D00_SuperBlock_ClearOverride40 = 0x8024001C; // type:func rom:0xEC9D1C +EC9D00_SuperBlock_HideBlockContent = 0x8024003C; // type:func rom:0xEC9D3C +EC9D00_SuperBlock_GetPartnerRank = 0x80240068; // type:func rom:0xEC9D68 +EC9D00_SuperBlock_get_partner_rank = 0x802400D4; // type:func rom:0xEC9DD4 +EC9D00_SuperBlock_CountEligiblePartners = 0x80240120; // type:func rom:0xEC9E20 +EC9D00_SuperBlock_ShowSelectPartnerMenu = 0x802401CC; // type:func rom:0xEC9ECC +EC9D00_SuperBlock_SwitchToPartner = 0x8024041C; // type:func rom:0xECA11C +EC9D00_SuperBlock_LoadCurrentPartnerName = 0x80240448; // type:func rom:0xECA148 +EC9D00_SuperBlock_StartGlowEffect = 0x80240480; // type:func rom:0xECA180 +EC9D00_SuperBlock_EndGlowEffect = 0x80240510; // type:func rom:0xECA210 +EC9D00_SuperBlock_GatherEnergyFX = 0x80240544; // type:func rom:0xECA244 +EC9D00_SuperBlock_RadiateFaintEnergyFX = 0x802405A8; // type:func rom:0xECA2A8 +EC9D00_SuperBlock_AnimateEnergyOrbs = 0x80240600; // type:func rom:0xECA300 +EC9D00_SuperBlock_WhiteScreenFlash = 0x80240B38; // type:func rom:0xECA838 +EC9D00_SuperBlock_PartnerSparkles2 = 0x80240C78; // type:func rom:0xECA978 +EC9D00_SuperBlock_PartnerSparkles4 = 0x80240CC0; // type:func rom:0xECA9C0 +EC9D00_SuperBlock_WaitForPlayerToLand = 0x80240D08; // type:func rom:0xECAA08 ECAA40_DeadUnkFunc1 = 0x80240D40; // type:func rom:0xECAA40 func_80240D80_ECAA80 = 0x80240D80; // type:func rom:0xECAA80 func_80241364_ECB064 = 0x80241364; // type:func rom:0xECB064 @@ -22480,10 +22480,10 @@ func_80241BF8_ECB8F8 = 0x80241BF8; // type:func rom:0xECB8F8 ECB930_foliage_setup_shear_mtx = 0x80241C30; // type:func rom:0xECB930 ECB930_TransformFoliage = 0x80241CA0; // type:func rom:0xECB9A0 ECBB70_UnkFunc43 = 0x80241E70; // type:func rom:0xECBB70 -D_80241FE0_ECBCE0 = 0x80241FE0; // type:data rom:0xECBCE0 -D_80241FE8_ECBCE8 = 0x80241FE8; // type:data rom:0xECBCE8 -D_80241FF8_ECBCF8 = 0x80241FF8; // type:data rom:0xECBCF8 -EC9D00_bigFuncFloats = 0x80242038; // type:data rom:0xECBD38 +EC9D00_SuperBlock_CantUpgradeMessages = 0x80241FE0; // type:data rom:0xECBCE0 +EC9D00_SuperBlock_PartnerIDs = 0x80241FE8; // type:data rom:0xECBCE8 +EC9D00_SuperBlock_UpgradeDescMessages = 0x80241FF8; // type:data rom:0xECBCF8 +EC9D00_SuperBlock_UpgradeOrbAngles = 0x80242038; // type:data rom:0xECBD38 D_802430B8_ECCDB8 = 0x802430B8; // type:data rom:0xECCDB8 D_802430BC_ECCDBC = 0x802430BC; // type:data rom:0xECCDBC ECFFF0_DeadUnkFunc1 = 0x80240000; // type:func rom:0xECFFF0 @@ -22519,12 +22519,12 @@ ED42A0_varTable = 0x80241DA0; // type:data rom:0xED5FC0 D_80244160_ED8380 = 0x80244160; // type:data rom:0xED8380 D_80244BB8_ED8DD8 = 0x80244BB8; // type:data rom:0xED8DD8 D_80244BEC_ED8E0C = 0x80244BEC; // type:data rom:0xED8E0C -ED8E20_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0xED8E20 -ED8E20_DeadGetCurrentFloor = 0x80240020; // type:func rom:0xED8E40 -ED8E20_DeadUnkFunc25 = 0x80240034; // type:func rom:0xED8E54 -ED8E20_DeadGetEntryPos = 0x802400F0; // type:func rom:0xED8F10 -ED8E20_GetCurrentCameraYawClamped180 = 0x80240208; // type:func rom:0xED9028 -ED8E20_SomeXYZFunc2 = 0x80240274; // type:func rom:0xED9094 +ED8E20_DeadPipe_SetAnimFlag = 0x80240000; // type:func rom:0xED8E20 +ED8E20_DeadPipe_GetCurrentFloor = 0x80240020; // type:func rom:0xED8E40 +ED8E20_DeadPipe_AwaitDownInput = 0x80240034; // type:func rom:0xED8E54 +ED8E20_DeadPipe_GetEntryPos = 0x802400F0; // type:func rom:0xED8F10 +ED8E20_DeadPipe_GetCameraYaw = 0x80240208; // type:func rom:0xED9028 +ED8E20_DeadPipe_GetPointAheadOfPlayer = 0x80240274; // type:func rom:0xED9094 func_80240318_ED9138 = 0x80240318; // type:func rom:0xED9138 D_80243170_EDBF90 = 0x80243170; // type:data rom:0xEDBF90 func_80240000_EDBFE0 = 0x80240000; // type:func rom:0xEDBFE0 @@ -22619,24 +22619,24 @@ D_80245390_EEB940 = 0x80245390; // type:data rom:0xEEB940 D_802453E0_EEB990 = 0x802453E0; // type:data rom:0xEEB990 EED100_DeadUnkFunc1 = 0x80240000; // type:func rom:0xEED100 EED140_UnkFunc43 = 0x80240040; // type:func rom:0xEED140 -EED1E0_SetOverrideFlags_40 = 0x802400E0; // type:func rom:0xEED1E0 -EED1E0_UnkFunc17 = 0x802400FC; // type:func rom:0xEED1FC -func_8024011C_EED21C = 0x8024011C; // type:func rom:0xEED21C -EED1E0_UnkFunc18 = 0x80240148; // type:func rom:0xEED248 -EED1E0_UnkFunc37 = 0x802401B4; // type:func rom:0xEED2B4 -EED1E0_UnkFunc38 = 0x80240200; // type:func rom:0xEED300 -func_802402AC_EED3AC = 0x802402AC; // type:func rom:0xEED3AC -EED1E0_SwitchToPartner = 0x802404FC; // type:func rom:0xEED5FC -EED1E0_UnkFunc19 = 0x80240528; // type:func rom:0xEED628 -EED1E0_UnkFunc20 = 0x80240560; // type:func rom:0xEED660 -EED1E0_UnkFunc39 = 0x802405F0; // type:func rom:0xEED6F0 -EED1E0_UnkFunc21 = 0x80240624; // type:func rom:0xEED724 -EED1E0_UnkFunc22 = 0x80240688; // type:func rom:0xEED788 -EED1E0_UnkFunc60 = 0x802406E0; // type:func rom:0xEED7E0 -EED1E0_UnkFunc23 = 0x80240C18; // type:func rom:0xEEDD18 -EED1E0_UnkPartnerPosFunc = 0x80240D58; // type:func rom:0xEEDE58 -EED1E0_UnkPartnerPosFunc2 = 0x80240DA0; // type:func rom:0xEEDEA0 -EED1E0_UnkFunc40 = 0x80240DE8; // type:func rom:0xEEDEE8 +EED1E0_SuperBlock_SetOverride40 = 0x802400E0; // type:func rom:0xEED1E0 +EED1E0_SuperBlock_ClearOverride40 = 0x802400FC; // type:func rom:0xEED1FC +EED1E0_SuperBlock_HideBlockContent = 0x8024011C; // type:func rom:0xEED21C +EED1E0_SuperBlock_GetPartnerRank = 0x80240148; // type:func rom:0xEED248 +EED1E0_SuperBlock_get_partner_rank = 0x802401B4; // type:func rom:0xEED2B4 +EED1E0_SuperBlock_CountEligiblePartners = 0x80240200; // type:func rom:0xEED300 +EED1E0_SuperBlock_ShowSelectPartnerMenu = 0x802402AC; // type:func rom:0xEED3AC +EED1E0_SuperBlock_SwitchToPartner = 0x802404FC; // type:func rom:0xEED5FC +EED1E0_SuperBlock_LoadCurrentPartnerName = 0x80240528; // type:func rom:0xEED628 +EED1E0_SuperBlock_StartGlowEffect = 0x80240560; // type:func rom:0xEED660 +EED1E0_SuperBlock_EndGlowEffect = 0x802405F0; // type:func rom:0xEED6F0 +EED1E0_SuperBlock_GatherEnergyFX = 0x80240624; // type:func rom:0xEED724 +EED1E0_SuperBlock_RadiateFaintEnergyFX = 0x80240688; // type:func rom:0xEED788 +EED1E0_SuperBlock_AnimateEnergyOrbs = 0x802406E0; // type:func rom:0xEED7E0 +EED1E0_SuperBlock_WhiteScreenFlash = 0x80240C18; // type:func rom:0xEEDD18 +EED1E0_SuperBlock_PartnerSparkles2 = 0x80240D58; // type:func rom:0xEEDE58 +EED1E0_SuperBlock_PartnerSparkles4 = 0x80240DA0; // type:func rom:0xEEDEA0 +EED1E0_SuperBlock_WaitForPlayerToLand = 0x80240DE8; // type:func rom:0xEEDEE8 EED1E0_UnkFunc44 = 0x80240E18; // type:func rom:0xEEDF18 EEDF50_UnkNpcAIFunc23 = 0x80240E50; // type:func rom:0xEEDF50 EEDF50_UnkNpcAIFunc35 = 0x80241000; // type:func rom:0xEEE100 @@ -22654,10 +22654,10 @@ EEDF50_UnkNpcAIFunc34 = 0x802424A4; // type:func rom:0xEEF5A4 EEDF50_UnkFunc45 = 0x80242724; // type:func rom:0xEEF824 func_80242780_EEF880 = 0x80242780; // type:func rom:0xEEF880 func_802429A0_EEFAA0 = 0x802429A0; // type:func rom:0xEEFAA0 -D_80243760_EF0860 = 0x80243760; // type:data rom:0xEF0860 -D_80243768_EF0868 = 0x80243768; // type:data rom:0xEF0868 -D_80243778_EF0878 = 0x80243778; // type:data rom:0xEF0878 -EED1E0_bigFuncFloats = 0x802437B8; // type:data rom:0xEF08B8 +EED1E0_SuperBlock_CantUpgradeMessages = 0x80243760; // type:data rom:0xEF0860 +EED1E0_SuperBlock_PartnerIDs = 0x80243768; // type:data rom:0xEF0868 +EED1E0_SuperBlock_UpgradeDescMessages = 0x80243778; // type:data rom:0xEF0878 +EED1E0_SuperBlock_UpgradeOrbAngles = 0x802437B8; // type:data rom:0xEF08B8 N(sixFloats) = 0x80244070; // type:data rom:0xEF1170 D_80245450_EF2550 = 0x80245450; // type:data rom:0xEF2550 D_80245458_EF2558 = 0x80245458; // type:data rom:0xEF2558 @@ -22979,9 +22979,10 @@ D_800B8DEC = 0x800B8DEC; // type:data _use_partner_ability = 0x800EA6CC; // type:func D_800FBB60 = 0x800FBB60; // type:data D_800FBBE0 = 0x800FBBE0; // type:data +D_801000A0 = D_801000A0; // type:data dead_gPlayerStatusPtr = 0x800FFC90; // type:data -D_80100060 = 0x80100060; // type:data -D_801000A0 = 0x801000A0; // type:data +dead_wPartnerHudScripts = 0x80100060; // type:data +dead_wDisabledPartnerHudScripts = 0x801000A0; // type:data HudScript_ArrowLeft = 0x801049B0; // type:data HudScript_ArrowRight = 0x801049D8; // type:data HudScript_HandPointer = 0x80104A00; // type:data diff --git a/ver/us/undefined_syms.txt b/ver/us/undefined_syms.txt index 589ae3dc43..3c6738f67c 100644 --- a/ver/us/undefined_syms.txt +++ b/ver/us/undefined_syms.txt @@ -226,8 +226,8 @@ D_09000C20 = 0x09000C20; dead_atan2 = 0x8002AF70; dead_gCurrentCamID = 0x800A158C; dead_gCameras = 0x800B8D80; -D_80100060 = 0x80100060; -D_801000A0 = 0x801000A0; +dead_wPartnerHudScripts = 0x80100060; +dead_wDisabledPartnerHudScripts = 0x801000A0; dead_evt_get_variable = 0x802D4E8C; dead_evt_set_variable = 0x802D5468; dead_evt_get_float_variable = 0x802D57FC; @@ -269,7 +269,7 @@ dead_get_npc_safe = 0x8003E534; dead_heap_malloc = 0x8002BFD4; dead_heap_free = 0x8002C01C; dead_general_heap_malloc = 0x8002BF18; -func_8002C01C = 0x8002C01C; +dead_heap_free = 0x8002C01C; dead_sin_deg = 0x8002B5DC; dead_cos_deg = 0x8002B640; dead_sin_cos_deg = 0x8002B524; @@ -298,10 +298,10 @@ dead_get_model_list_index_from_tree_index = 0x80125270; dead_get_model_from_list_index = 0x80124F44; dead_guTranslateF = 0x8006CAC0; func_800775D0 = 0x800775D0; -func_802F3B00 = 0x802F3B00; -func_800FCD0C = 0x800FCD0C; -func_800F9260 = 0x800F9260; -func_800F93E8 = 0x800F93E8; +dead_entity_upgrade_block_hide_content = 0x802F3B00; +dead_create_popup_menu = 0x800FCD0C; +dead_hide_popup_menu = 0x800F9260; +dead_destroy_popup_menu = 0x800F93E8; dead_switch_to_partner = 0x800F2D5C; dead_set_message_msg = 0x80130C74; dead_fx_energy_orb_wave = 0x800769D0;