diff --git a/include/dead.h b/include/dead.h index fc41aafed6..42d4001dd1 100644 --- a/include/dead.h +++ b/include/dead.h @@ -40,5 +40,10 @@ #define func_8004D9C0 func_800496B8 #define func_8004E024 func_80049C04 #define func_8004A73C func_8004EB8C +#define gCurrentCameraID dead_gCurrentCameraID +#define add_vec2D_polar dead_add_vec2D_polar +#define gCurrentCamID dead_gCurrentCamID +#define gPartnerActionStatus dead_gPartnerActionStatus +#define get_npc_safe dead_get_npc_safe #endif diff --git a/include/functions.h b/include/functions.h index ae1fd3cdf9..169aa39e0b 100644 --- a/include/functions.h +++ b/include/functions.h @@ -453,7 +453,7 @@ void set_curtain_fade_goal(f32 fade); void set_curtain_fade(f32 fade); // Dead functions: -Npc* func_8003E534(NpcID npcId); // get_npc_safe +//Npc* dead_get_npc_safe(NpcID npcId); // get_npc_safe void func_80077BD0(s32, s32, s32, s32, s32, s32); void func_8006CAC0(float mf[4][4], float x, float y, float z); diff --git a/src/EA0C10.c b/src/EA0C10.c index 60c024dc5c..02b2de0f95 100644 --- a/src/EA0C10.c +++ b/src/EA0C10.c @@ -5,50 +5,97 @@ const char ascii_EA6D70[] = "kzn_11"; const char ascii_EA6D78[] = "kzn_18"; +extern s32 D_802466D0[]; -INCLUDE_ASM(s32, "EA0C10", func_80240310_EA0C10); +#include "world/common/UnkNpcAIFunc6.inc.c" -INCLUDE_ASM(s32, "EA0C10", func_8024037C_EA0C7C); +#include "world/common/UnkNpcAIFunc7.inc.c" -INCLUDE_ASM(s32, "EA0C10", func_802403EC_EA0CEC); +#include "world/common/UnkNpcAIFunc8.inc.c" -INCLUDE_ASM(s32, "EA0C10", func_802404C4_EA0DC4); +#include "world/common/UnkNpcAIFunc5.inc.c" -INCLUDE_ASM(s32, "EA0C10", func_80240518_EA0E18); +//Basically UnkNpcAIFunc26.inc.c, but gPartnerActionStatus.actionState.b[0] access 0, instead of 3 +s32 N(UnkNpcAIFunc26)(Evt* script) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + Camera* camera = &gCameras[gCurrentCamID]; + Enemy* enemy2 = get_enemy(enemy->npcID + 1); + f32 phi_f20; + s32 ret = TRUE; -INCLUDE_ASM(s32, "EA0C10", func_802406CC_EA0FCC); + if (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) > enemy2->varTable[2]) { + ret = FALSE; + } + + if (clamp_angle(get_clamped_angle_diff(camera->currentYaw, npc->yaw)) < 180.0) { + phi_f20 = 90.0f; + } else { + phi_f20 = 270.0f; + } + + if (fabsf(get_clamped_angle_diff(phi_f20, atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, + gPlayerStatusPtr->position.z))) > enemy2->varTable[3]) { + ret = FALSE; + } + + if ((2.0 * npc->collisionHeight) <= fabsf(npc->pos.y - gPlayerStatusPtr->position.y)) { + ret = FALSE; + } + + if (gPartnerActionStatus.actionState.b[0] == 9) { + ret = FALSE; + } + + if (gPartnerActionStatus.actionState.b[0] == 7) { + ret = FALSE; + } + + return ret; +} + +INCLUDE_ASM(s32, "EA0C10", func_802406CC_EA0FCC); // Should be relatively similar UnkFunc7 INCLUDE_ASM(s32, "EA0C10", func_8024097C_EA127C); -INCLUDE_ASM(s32, "EA0C10", func_80240C5C_EA155C); +#include "world/common/UnkNpcAIFunc31.inc.c" -INCLUDE_ASM(s32, "EA0C10", func_80240CC8_EA15C8); +#include "world/common/UnkNpcAIFunc32.inc.c" INCLUDE_ASM(s32, "EA0C10", func_80240DC4_EA16C4); -INCLUDE_ASM(s32, "EA0C10", func_80241804_EA2104); +#include "world/common/UnkNpcDurationFlagFunc3.inc.c" -INCLUDE_ASM(s32, "EA0C10", func_80241894_EA2194); +#include "world/common/UnkNpcAIFunc33.inc.c" -INCLUDE_ASM(s32, "EA0C10", func_80241994_EA2294); +#include "world/common/UnkNpcDurationFlagFunc2.inc.c" -INCLUDE_ASM(s32, "EA0C10", func_802419F4_EA22F4); +#include "world/common/UnkNpcAIFunc30.inc.c" INCLUDE_ASM(s32, "EA0C10", func_80241AE0_EA23E0); -INCLUDE_ASM(s32, "EA0C10", func_80241D68_EA2668); +#include "world/common/set_script_owner_npc_anim.inc.c" -INCLUDE_ASM(s32, "EA0C10", func_80241DE4_EA26E4); +#include "world/common/UnkDistFunc.inc.c" -INCLUDE_ASM(s32, "EA0C10", func_80241F18_EA2818); +#include "world/common/UnkNpcAIFunc12.inc.c" -INCLUDE_ASM(s32, "EA0C10", func_8024207C_EA297C); +#include "world/common/set_script_owner_npc_col_height.inc.c" INCLUDE_ASM(s32, "EA0C10", func_802420FC_EA29FC); INCLUDE_ASM(s32, "EA0C10", func_80242568_EA2E68); -INCLUDE_ASM(s32, "EA0C10", func_802425B0_EA2EB0); +ApiStatus func_802425B0_EA2EB0(Evt* script, s32 isInitialCall) { + PlayerStatus* playerStatus = &gPlayerStatus; + Npc* npc = get_npc_safe(script->owner2.npcID); + + if (dist2D(npc->pos.x, npc->pos.z, playerStatus->position.x, playerStatus->position.z) < 50.0f) { + return ApiStatus_DONE2; + } + + return ApiStatus_BLOCK; +} INCLUDE_ASM(s32, "EA0C10", func_80242608_EA2F08); @@ -56,7 +103,7 @@ INCLUDE_ASM(s32, "EA0C10", func_8024267C_EA2F7C); #include "world/common/DeadGetItemName.inc.c" -INCLUDE_ASM(s32, "EA0C10", func_80242794_EA3094); +#include "world/common/GetNpcCollisionHeight.inc.c" INCLUDE_ASM(s32, "EA0C10", func_802427F0_EA30F0); @@ -64,11 +111,28 @@ INCLUDE_ASM(s32, "EA0C10", func_802429C0_EA32C0); INCLUDE_ASM(s32, "EA0C10", func_80242A14_EA3314); -INCLUDE_ASM(s32, "EA0C10", func_80242A4C_EA334C); +ApiStatus func_80242A4C_EA334C(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32* ptr = evt_get_variable(script, *args); + s32 i; + + if (ptr != NULL) { + for (i = 0; ptr[i] != 0; i++) { + D_802466D0[i] = ptr[i]; + } + D_802466D0[i] = 0; + } else { + for (i = 0; i < 112; i++) { + D_802466D0[i] = i + 16; + D_802466D0[112] = 0; + } + } + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "EA0C10", func_80242AE8_EA33E8); -INCLUDE_ASM(s32, "EA0C10", func_80242BD8_EA34D8); +#include "world/common/UnkYawFunc.inc.c" INCLUDE_ASM(s32, "EA0C10", func_80242D64_EA3664); diff --git a/src/EA8AE0.c b/src/EA8AE0.c index 3743a19bc1..caf5ed5196 100644 --- a/src/EA8AE0.c +++ b/src/EA8AE0.c @@ -3,6 +3,8 @@ #define NAMESPACE EA8AE0 +extern s32 D_80248388[]; + #include "world/common/DeadUnkTexturePanFunc.inc.c" #include "world/common/DeadUnkTexturePanFunc2.inc.c" @@ -43,7 +45,7 @@ INCLUDE_ASM(s32, "EA8AE0", func_80241468_EA9F48); #include "world/common/DeadGetItemName.inc.c" -INCLUDE_ASM(s32, "EA8AE0", func_80241580_EAA060); +#include "world/common/GetNpcCollisionHeight.inc.c" INCLUDE_ASM(s32, "EA8AE0", func_802415DC_EAA0BC); @@ -51,11 +53,29 @@ INCLUDE_ASM(s32, "EA8AE0", func_802417AC_EAA28C); INCLUDE_ASM(s32, "EA8AE0", func_80241800_EAA2E0); -INCLUDE_ASM(s32, "EA8AE0", func_80241838_EAA318); +ApiStatus func_80241838_EAA318(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32* ptr = evt_get_variable(script, *args); + s32 i; + + if (ptr != NULL) { + for (i = 0; ptr[i] != 0; i++) { + D_80248388[i] = ptr[i]; + } + D_80248388[i] = 0; + } else { + for (i = 0; i < 112; i++) { + D_80248388[i] = i + 16; + D_80248388[112] = 0; + } + } + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "EA8AE0", func_802418D4_EAA3B4); -INCLUDE_ASM(s32, "EA8AE0", func_802419C4_EAA4A4); +//INCLUDE_ASM(s32, "EA8AE0", func_802419C4_EAA4A4); +#include "world/common/UnkYawFunc.inc.c" INCLUDE_ASM(s32, "EA8AE0", func_80241B50_EAA630); diff --git a/src/EB1170.c b/src/EB1170.c index b5bb066ae7..4250ce0fe7 100644 --- a/src/EB1170.c +++ b/src/EB1170.c @@ -3,11 +3,13 @@ #define NAMESPACE EB1170 +extern s32 D_802442D0[]; + INCLUDE_ASM(s32, "EB1170", func_80240310_EB1170); #include "world/common/DeadGetItemName.inc.c" -INCLUDE_ASM(s32, "EB1170", func_80240428_EB1288); +#include "world/common/GetNpcCollisionHeight.inc.c" INCLUDE_ASM(s32, "EB1170", func_80240484_EB12E4); @@ -15,11 +17,29 @@ INCLUDE_ASM(s32, "EB1170", func_80240654_EB14B4); INCLUDE_ASM(s32, "EB1170", func_802406A8_EB1508); -INCLUDE_ASM(s32, "EB1170", func_802406E0_EB1540); +ApiStatus func_802406E0_EB1540(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32* ptr = evt_get_variable(script, *args); + s32 i; + + if (ptr != NULL) { + for (i = 0; ptr[i] != 0; i++) { + D_802442D0[i] = ptr[i]; + } + D_802442D0[i] = 0; + } else { + for (i = 0; i < 112; i++) { + D_802442D0[i] = i + 16; + D_802442D0[112] = 0; + } + } + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "EB1170", func_8024077C_EB15DC); -INCLUDE_ASM(s32, "EB1170", func_8024086C_EB16CC); +//INCLUDE_ASM(s32, "EB1170", func_8024086C_EB16CC); +#include "world/common/UnkYawFunc.inc.c" INCLUDE_ASM(s32, "EB1170", func_802409F8_EB1858); diff --git a/src/ECAA80.c b/src/ECAA80.c index b70c58ff8a..656d5371e4 100644 --- a/src/ECAA80.c +++ b/src/ECAA80.c @@ -1,6 +1,10 @@ #include "dead.h" #include "common.h" +#define NAMESPACE ECAA80 + +extern s32 D_802462F0[]; + INCLUDE_ASM(s32, "ECAA80", func_80240D80_ECAA80); INCLUDE_ASM(s32, "ECAA80", func_80241364_ECB064); @@ -9,7 +13,7 @@ INCLUDE_ASM(s32, "ECAA80", func_802414C8_ECB1C8); INCLUDE_ASM(s32, "ECAA80", func_8024150C_ECB20C); -INCLUDE_ASM(s32, "ECAA80", func_80241770_ECB470); +#include "world/common/GetNpcCollisionHeight.inc.c" INCLUDE_ASM(s32, "ECAA80", func_802417CC_ECB4CC); @@ -17,7 +21,24 @@ INCLUDE_ASM(s32, "ECAA80", func_8024199C_ECB69C); INCLUDE_ASM(s32, "ECAA80", func_802419F0_ECB6F0); -INCLUDE_ASM(s32, "ECAA80", func_80241A28_ECB728); +ApiStatus func_80241A28_ECB728(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32* ptr = evt_get_variable(script, *args); + s32 i; + + if (ptr != NULL) { + for (i = 0; ptr[i] != 0; i++) { + D_802462F0[i] = ptr[i]; + } + D_802462F0[i] = 0; + } else { + for (i = 0; i < 91; i++) { + D_802462F0[i] = i + 128; + D_802462F0[91] = 0; + } + } + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "ECAA80", func_80241AC4_ECB7C4); diff --git a/src/EDC020.c b/src/EDC020.c index c9405c2b8d..68b98d1c34 100644 --- a/src/EDC020.c +++ b/src/EDC020.c @@ -3,13 +3,15 @@ #define NAMESPACE EDC020 +extern s32 D_802429E0[]; + #import "world/common/DeadFoliage.inc.c" INCLUDE_ASM(s32, "EDC020", func_8024027C_EDC25C); #include "world/common/DeadGetItemName.inc.c" -INCLUDE_ASM(s32, "EDC020", func_80240394_EDC374); +#include "world/common/GetNpcCollisionHeight.inc.c" INCLUDE_ASM(s32, "EDC020", func_802403F0_EDC3D0); @@ -17,4 +19,21 @@ INCLUDE_ASM(s32, "EDC020", func_802405C0_EDC5A0); INCLUDE_ASM(s32, "EDC020", func_80240614_EDC5F4); -INCLUDE_ASM(s32, "EDC020", func_8024064C_EDC62C); +ApiStatus func_8024064C_EDC62C(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32* ptr = evt_get_variable(script, *args); + s32 i; + + if (ptr != NULL) { + for (i = 0; ptr[i] != 0; i++) { + D_802429E0[i] = ptr[i]; + } + D_802429E0[i] = 0; + } else { + for (i = 0; i < 112; i++) { + D_802429E0[i] = i + 16; + D_802429E0[112] = 0; + } + } + return ApiStatus_DONE2; +} diff --git a/src/EDEA00.c b/src/EDEA00.c index 9cbdd3c05d..71cfde335f 100644 --- a/src/EDEA00.c +++ b/src/EDEA00.c @@ -45,13 +45,13 @@ INCLUDE_ASM(s32, "EDEA00", func_80241B94_EE0554); INCLUDE_ASM(s32, "EDEA00", func_80241DE4_EE07A4); -INCLUDE_ASM(s32, "EDEA00", func_802422F0_EE0CB0); +#include "world/common/set_script_owner_npc_anim.inc.c" -INCLUDE_ASM(s32, "EDEA00", func_8024236C_EE0D2C); +#include "world/common/UnkDistFunc.inc.c" -INCLUDE_ASM(s32, "EDEA00", func_802424A0_EE0E60); +#include "world/common/UnkNpcAIFunc12.inc.c" -INCLUDE_ASM(s32, "EDEA00", func_80242604_EE0FC4); +#include "world/common/set_script_owner_npc_col_height.inc.c" INCLUDE_ASM(s32, "EDEA00", func_80242684_EE1044); diff --git a/src/EE70C0.c b/src/EE70C0.c index 1527bf3333..8439fc41cb 100644 --- a/src/EE70C0.c +++ b/src/EE70C0.c @@ -3,6 +3,7 @@ #define NAMESPACE EE70C0 +extern s32 D_802453E0_EEB990[]; extern f32 D_802444F0_EEAAA0[]; INCLUDE_ASM(s32, "EE70C0", func_80240B10_EE70C0); @@ -35,7 +36,7 @@ void func_80241764_EE7D14(Evt* script, NpcAISettings* aiSettings, EnemyTerritory INCLUDE_ASM(s32, "EE70C0", func_80241E1C_EE83CC); -INCLUDE_ASM(s32, "EE70C0", func_80242034_EE85E4); +#include "world/common/GetNpcCollisionHeight.inc.c" INCLUDE_ASM(s32, "EE70C0", func_80242090_EE8640); @@ -43,4 +44,21 @@ INCLUDE_ASM(s32, "EE70C0", func_80242260_EE8810); INCLUDE_ASM(s32, "EE70C0", func_802422B4_EE8864); -INCLUDE_ASM(s32, "EE70C0", func_802422EC_EE889C); +ApiStatus func_802422EC_EE889C(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32* ptr = evt_get_variable(script, *args); + s32 i; + + if (ptr != NULL) { + for (i = 0; ptr[i] != 0; i++) { + D_802453E0_EEB990[i] = ptr[i]; + } + D_802453E0_EEB990[i] = 0; + } else { + for (i = 0; i < 91; i++) { + D_802453E0_EEB990[i] = i + 128; + D_802453E0_EEB990[91] = 0; + } + } + return ApiStatus_DONE2; +} diff --git a/src/world/area_kzn/kzn_03/C61020.c b/src/world/area_kzn/kzn_03/C61020.c index 849ad05a37..de1db402c4 100644 --- a/src/world/area_kzn/kzn_03/C61020.c +++ b/src/world/area_kzn/kzn_03/C61020.c @@ -26,15 +26,15 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_802406A4_C613B4); #include "world/common/UnkNpcAIFunc27.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_802414C8_C621D8); +#include "world/common/UnkNpcAIFunc31.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80241534_C62244); +#include "world/common/UnkNpcAIFunc32.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80241630_C62340); #include "world/common/UnkNpcDurationFlagFunc3.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80242100_C62E10); +#include "world/common/UnkNpcAIFunc33.inc.c" #include "world/common/UnkNpcDurationFlagFunc2.inc.c" diff --git a/src/world/area_kzn/kzn_08/C71ED0.c b/src/world/area_kzn/kzn_08/C71ED0.c index 77032ee998..e2258adc58 100644 --- a/src/world/area_kzn/kzn_08/C71ED0.c +++ b/src/world/area_kzn/kzn_08/C71ED0.c @@ -223,15 +223,15 @@ ApiStatus N(func_80242354_C737D4)(Evt* script, s32 isInitialCall) { #include "world/common/UnkNpcAIFunc27.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80242E0C_C7428C); +#include "world/common/UnkNpcAIFunc31.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80242E78_C742F8); +#include "world/common/UnkNpcAIFunc32.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80242F74_C743F4); #include "world/common/UnkNpcDurationFlagFunc3.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80243A44_C74EC4); +#include "world/common/UnkNpcAIFunc33.inc.c" #include "world/common/UnkNpcDurationFlagFunc2.inc.c" diff --git a/src/world/area_kzn/kzn_09/C77D00.c b/src/world/area_kzn/kzn_09/C77D00.c index ed77dbee61..478c44de14 100644 --- a/src/world/area_kzn/kzn_09/C77D00.c +++ b/src/world/area_kzn/kzn_09/C77D00.c @@ -14,15 +14,15 @@ #include "world/common/UnkNpcAIFunc27.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_802418F0_C785D0); +#include "world/common/UnkNpcAIFunc31.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_8024195C_C7863C); +#include "world/common/UnkNpcAIFunc32.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80241A58_C78738); #include "world/common/UnkNpcDurationFlagFunc3.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80242528_C79208); +#include "world/common/UnkNpcAIFunc33.inc.c" #include "world/common/UnkNpcDurationFlagFunc2.inc.c" diff --git a/src/world/area_kzn/kzn_17/C85DC0.c b/src/world/area_kzn/kzn_17/C85DC0.c index ffd09e94de..6fb44cc94a 100644 --- a/src/world/area_kzn/kzn_17/C85DC0.c +++ b/src/world/area_kzn/kzn_17/C85DC0.c @@ -14,15 +14,15 @@ #include "world/common/UnkNpcAIFunc27.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80240BE0_C86690); +#include "world/common/UnkNpcAIFunc31.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80240C4C_C866FC); +#include "world/common/UnkNpcAIFunc32.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80240D48_C867F8); #include "world/common/UnkNpcDurationFlagFunc3.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80241818_C872C8); +#include "world/common/UnkNpcAIFunc33.inc.c" #include "world/common/UnkNpcDurationFlagFunc2.inc.c" diff --git a/src/world/area_mim/mim_01/B93940.c b/src/world/area_mim/mim_01/B93940.c index 2cfe534ec0..1f1b16658e 100644 --- a/src/world/area_mim/mim_01/B93940.c +++ b/src/world/area_mim/mim_01/B93940.c @@ -14,15 +14,15 @@ #include "world/common/UnkNpcAIFunc27.inc.c" -INCLUDE_ASM(s32, "world/area_mim/mim_01/B93940", func_80240DD0_B94210); +#include "world/common/UnkNpcAIFunc31.inc.c" -INCLUDE_ASM(s32, "world/area_mim/mim_01/B93940", func_80240E3C_B9427C); +#include "world/common/UnkNpcAIFunc32.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_01/B93940", func_80240F38_B94378); #include "world/common/UnkNpcDurationFlagFunc3.inc.c" -INCLUDE_ASM(s32, "world/area_mim/mim_01/B93940", func_80241A08_B94E48); +#include "world/common/UnkNpcAIFunc33.inc.c" #include "world/common/UnkNpcDurationFlagFunc2.inc.c" diff --git a/src/world/area_mim/mim_05/BA07A0.c b/src/world/area_mim/mim_05/BA07A0.c index c7ca0169cc..acfd45ede1 100644 --- a/src/world/area_mim/mim_05/BA07A0.c +++ b/src/world/area_mim/mim_05/BA07A0.c @@ -14,15 +14,15 @@ #include "world/common/UnkNpcAIFunc27.inc.c" -INCLUDE_ASM(s32, "world/area_mim/mim_05/BA07A0", func_80240940_BA1070); +#include "world/common/UnkNpcAIFunc31.inc.c" -INCLUDE_ASM(s32, "world/area_mim/mim_05/BA07A0", func_802409AC_BA10DC); +#include "world/common/UnkNpcAIFunc32.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_05/BA07A0", func_80240AA8_BA11D8); #include "world/common/UnkNpcDurationFlagFunc3.inc.c" -INCLUDE_ASM(s32, "world/area_mim/mim_05/BA07A0", func_80241578_BA1CA8); +#include "world/common/UnkNpcAIFunc33.inc.c" #include "world/common/UnkNpcDurationFlagFunc2.inc.c" diff --git a/src/world/area_mim/mim_06/BA4CF0.c b/src/world/area_mim/mim_06/BA4CF0.c index 3ba4809b36..61b95e6cdc 100644 --- a/src/world/area_mim/mim_06/BA4CF0.c +++ b/src/world/area_mim/mim_06/BA4CF0.c @@ -14,15 +14,15 @@ #include "world/common/UnkNpcAIFunc27.inc.c" -INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_80240E40_BA55C0); +#include "world/common/UnkNpcAIFunc31.inc.c" -INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_80240EAC_BA562C); +#include "world/common/UnkNpcAIFunc32.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_80240FA8_BA5728); #include "world/common/UnkNpcDurationFlagFunc3.inc.c" -INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_80241A78_BA61F8); +#include "world/common/UnkNpcAIFunc33.inc.c" #include "world/common/UnkNpcDurationFlagFunc2.inc.c" diff --git a/src/world/area_mim/mim_08/BAD940.c b/src/world/area_mim/mim_08/BAD940.c index ffd1616de1..e067ca02bd 100644 --- a/src/world/area_mim/mim_08/BAD940.c +++ b/src/world/area_mim/mim_08/BAD940.c @@ -115,15 +115,15 @@ ApiStatus N(func_802413AC_BAECEC)(Evt* script, s32 isInitialCall) { #include "world/common/UnkNpcAIFunc27.inc.c" -INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80241E68_BAF7A8); +#include "world/common/UnkNpcAIFunc31.inc.c" -INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80241ED4_BAF814); +#include "world/common/UnkNpcAIFunc32.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80241FD0_BAF910); #include "world/common/UnkNpcDurationFlagFunc3.inc.c" -INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80242AA0_BB03E0); +#include "world/common/UnkNpcAIFunc33.inc.c" #include "world/common/UnkNpcDurationFlagFunc2.inc.c" diff --git a/src/world/area_sam/sam_05/D187E0.c b/src/world/area_sam/sam_05/D187E0.c index 708a7a28b4..e3a95a1471 100644 --- a/src/world/area_sam/sam_05/D187E0.c +++ b/src/world/area_sam/sam_05/D187E0.c @@ -17,15 +17,15 @@ static char* N(exit_str_1) = "sam_06"; #include "world/common/UnkNpcAIFunc27.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_05/D187E0", func_802408D0_D190B0); +#include "world/common/UnkNpcAIFunc31.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_05/D187E0", func_8024093C_D1911C); +#include "world/common/UnkNpcAIFunc32.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_05/D187E0", func_80240A38_D19218); #include "world/common/UnkNpcDurationFlagFunc3.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_05/D187E0", func_80241508_D19CE8); +#include "world/common/UnkNpcAIFunc33.inc.c" #include "world/common/UnkNpcDurationFlagFunc2.inc.c" diff --git a/src/world/area_sam/sam_07/D2BD30.c b/src/world/area_sam/sam_07/D2BD30.c index 14fc029fd2..826e9f032d 100644 --- a/src/world/area_sam/sam_07/D2BD30.c +++ b/src/world/area_sam/sam_07/D2BD30.c @@ -27,15 +27,15 @@ INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_802405B0_D2C2E0); #include "world/common/UnkNpcAIFunc27.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80240F20_D2CC50); +#include "world/common/UnkNpcAIFunc31.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80240F8C_D2CCBC); +#include "world/common/UnkNpcAIFunc32.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80241088_D2CDB8); #include "world/common/UnkNpcDurationFlagFunc3.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80241B58_D2D888); +#include "world/common/UnkNpcAIFunc33.inc.c" #include "world/common/UnkNpcDurationFlagFunc2.inc.c" diff --git a/src/world/common/DeadUnkPartnerPosFuncs.inc.c b/src/world/common/DeadUnkPartnerPosFuncs.inc.c index ecf57997fd..cf3d057b3a 100644 --- a/src/world/common/DeadUnkPartnerPosFuncs.inc.c +++ b/src/world/common/DeadUnkPartnerPosFuncs.inc.c @@ -2,14 +2,14 @@ #include "effects.h" ApiStatus N(DeadUnkPartnerPosFunc)(Evt* script, s32 isInitialCall) { - Npc* partner = func_8003E534(NPC_PARTNER); + Npc* partner = dead_get_npc_safe(NPC_PARTNER); playFX_11(2, partner->pos.x, partner->pos.y + 30.0f, partner->pos.z, 30.0f); return ApiStatus_DONE2; } ApiStatus N(DeadUnkPartnerPosFunc2)(Evt* script, s32 isInitialCall) { - Npc* partner = func_8003E534(NPC_PARTNER); + Npc* partner = dead_get_npc_safe(NPC_PARTNER); playFX_11(4, partner->pos.x, partner->pos.y + 30.0f, partner->pos.z, 30.0f); return ApiStatus_DONE2; diff --git a/src/world/common/UnkNpcAIFunc31.inc.c b/src/world/common/UnkNpcAIFunc31.inc.c new file mode 100644 index 0000000000..cbfbcf8b7a --- /dev/null +++ b/src/world/common/UnkNpcAIFunc31.inc.c @@ -0,0 +1,17 @@ +#include "common.h" +#include "map.h" +#include "effects.h" + +void N(UnkNpcAIFunc31)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + if (npc->duration > 0) { + npc->duration--; + } else { + enemy->varTable[0] = 0; + npc->currentAnim.w = enemy->animList[0]; + script->functionTemp[1] = 0; + script->functionTemp[0] = 1; + } +} diff --git a/src/world/common/UnkNpcAIFunc32.inc.c b/src/world/common/UnkNpcAIFunc32.inc.c new file mode 100644 index 0000000000..20482bbdca --- /dev/null +++ b/src/world/common/UnkNpcAIFunc32.inc.c @@ -0,0 +1,18 @@ +#include "common.h" +#include "map.h" +#include "effects.h" + +void N(UnkNpcAIFunc32)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + s32 temp; + + if (func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) { + ai_enemy_play_sound(npc, 802, 0); + fx_emote(0, npc, 0, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 10, &temp); + ai_enemy_play_sound(npc, 756, 0x200000); + npc->currentAnim.w = enemy->animList[8]; + npc->duration = enemy->varTable[8]; + script->functionTemp[0] = 10; + } +} diff --git a/src/world/common/UnkNpcAIFunc33.inc.c b/src/world/common/UnkNpcAIFunc33.inc.c new file mode 100644 index 0000000000..96c8388b36 --- /dev/null +++ b/src/world/common/UnkNpcAIFunc33.inc.c @@ -0,0 +1,24 @@ +#include "common.h" +#include "map.h" +#include "effects.h" + +void N(UnkNpcAIFunc33)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + s32 temp; + + npc->duration++; + if (npc->duration == enemy->varTable[13]) { + npc->currentAnim.w = enemy->animList[11]; + } + if (npc->duration == enemy->varTable[14]) { + enemy->varTable[0] = 3; + } + if (npc->duration >= enemy->varTable[12]) { + enemy->varTable[0] = 4; + npc->duration = 8; + npc->currentAnim.w = enemy->animList[0]; + fx_emote(3, npc, 0, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 10, &temp); + script->functionTemp[0] = 13; + } +} diff --git a/tools/ignored_funcs.txt b/tools/ignored_funcs.txt index a425bd8772..daf0d56af1 100644 --- a/tools/ignored_funcs.txt +++ b/tools/ignored_funcs.txt @@ -10,7 +10,7 @@ dead_dist2D = 0x8002B1C4; dead_get_clamped_angle_diff = 0x8002AF18; dead_clamp_angle = 0x8002AE14; dead_ai_enemy_play_sound = 0x8004D800; -func_8002B28C = 0x8002B28C; +dead_add_vec2D_polar = 0x8002B28C; dead_evt_get_variable = 0x802D4E8C; func_8004D9C0 = 0x8004D9C0; func_8004DAD8 = 0x8004DAD8; @@ -30,7 +30,7 @@ dead_npc_raycast_down_sides = 0x800E423C; dead_is_point_within_region = 0x8004D0C4; func_8004D8E0 = 0x8004D8E0; dead_rand_int = 0x8002ACEC; -func_8003E534 = 0x8003E534; // get_npc_safe +dead_get_npc_safe = 0x8003E534; // get_npc_safe func_8002BFD4 = 0x8002BFD4; func_8002C01C = 0x8002C01C; dead_evt_set_variable = 0x802D5468; diff --git a/tools/symz.txt b/tools/symz.txt index 96247022a2..e479220363 100644 --- a/tools/symz.txt +++ b/tools/symz.txt @@ -65,7 +65,7 @@ D_8000031C = 0x8000031C; D_80026AC7 = 0x80026AC7; D_8004AA85 = 0x8004AA85; D_80117160 = 0x80117160; -D_80117163 = 0x80117163; +dead_gPartnerActionStatus = 0x80117163; D_80117578 = 0x80117578; D_80117604 = 0x80117604; D_8011762C = 0x8011762C; diff --git a/ver/us/asm/data/542E0.data.s b/ver/us/asm/data/542E0.data.s index cf2135a73c..d6cf131d08 100644 --- a/ver/us/asm/data/542E0.data.s +++ b/ver/us/asm/data/542E0.data.s @@ -11,5 +11,5 @@ glabel D_80079430 glabel D_80079540 .word 0x380A257B, 0x380A3551, 0x380A451D, 0x380A54E0, 0x380A6498, 0x380A7445, 0x380A83E8, 0x380A937F, 0x380AA30B, 0x380AB28F, 0x380AC208, 0x380AD176, 0x380AE0D9, 0x380AF034, 0x380AFF84, 0x380B0ECB, 0x380B1E08, 0x380B2D39, 0x380B3C60, 0x380B4B7E, 0x380B5A94, 0x380B699F, 0x380B789F, 0x380B8797, 0x380B9686, 0x380BA56B, 0x380BB445, 0x380BC316, 0x380BD1DF, 0x380BE09D, 0x380BEF53, 0x380BFDFE, 0x380C0CA0, 0x380C1B3B, 0x380C29CD, 0x380C3854, 0x380C46D3, 0x380C5547, 0x380C63B5, 0x380C7218, 0x380C8073, 0x380C8EC3, 0x380C9D0E, 0x380CAB4E, 0x380CB985, 0x380CC7B4, 0x380CD5DB, 0x380CE3FA, 0x380CF20D, 0x380D001C, 0x380D0E1F, 0x380D1C1C, 0x380D2A0F, 0x380D37F9, 0x380D45DE, 0x380D53B8, 0x380D618A, 0x380D6F56, 0x380D7D17, 0x380D8AD3, 0x380D9884, 0x380DA62F, 0x380DB3CF, 0x380DC16A, 0x380DCEFC, 0x380DDC87, 0x380DEA08, 0x380DF782, 0x380E04F6, 0x380E1260, 0x380E1FC3, 0x380E2D1F, 0x380E3A75, 0x380E47C0, 0x380E5505, 0x380E6243, 0x380E6F78, 0x380E7CA7, 0x380E89CE, 0x380E96ED, 0x380EA404, 0x380EB115, 0x380EBE1E, 0x380ECB22, 0x380ED81D, 0x380EE510, 0x380EF1FB, 0x380EFEE0, 0x380F0BC0, 0x380F1898, 0x380F2567, 0x380F3231, 0x380F3EF2, 0x380F4BAE, 0x380F5862, 0x380F650E, 0x380F71B4, 0x380F7E54, 0x380F8AED, 0x380F977F, 0x380FA40A, 0x380FB08F, 0x380FBD0C, 0x380FC983, 0x380FD5F2, 0x380FE25C, 0x380FEEC0, 0x380FFB1C, 0x38100772, 0x381013C3, 0x3810200C, 0x38102C4C, 0x3810388A, 0x381044BF, 0x381050EF, 0x38105D16, 0x38106939, 0x38107555, 0x3810816C, 0x38108D7B, 0x38109985, 0x3810A588, 0x3810B184, 0x3810BD7D, 0x3810C96E, 0x3810D559, 0x3810E13C, 0x3810ED1C, 0x3810F8F4, 0x381104C6, 0x38111093, 0x38111C58, 0x3811281A, 0x381133D3, 0x38113F8A, 0x38114B39, 0xBF800000, 0x00000000, 0x36915629, 0x36E65A71, 0x3711563E, 0x3728BB21, 0x373BD86E, 0x374C01A5, 0x375A017E, 0x37665AA2, 0x37716665, 0x377B646F, 0x378241DE, 0x378673FF, 0x378A567A, 0x378DF452, 0x37915666, 0x379483F4, 0x379782FE, 0x379A588A, 0x379D08DF, 0x379F979E, 0x37A207E4, 0x37A45C6C, 0x37A6978B, 0x37A8BB58, 0x37AAC9AC, 0x37ACC422, 0x37AEAC2C, 0x37B08318, 0x37B24A04, 0x37B4020F, 0x37B5AC19, 0x37B74909, 0x37B8D9A6, 0x37BA5EAA, 0x37BBD8B5, 0x37BD4861, 0x37BEAE42, 0x37C00AD6, 0x37C15E97, 0x37C2A9F2, 0x37C3ED56, 0x37C5291A, 0x37C65D9C, 0x37C78B2E, 0x37C8B223, 0x37C9D2BD, 0x37CAED43, 0x37CC01F7, 0x37CD1116, 0x37CE1AD6, 0x37CF1F69, 0x37D01F07, 0x37D119E0, 0x37D2101B, 0x37D301E9, 0x37D3EF6C, 0x37D4D8D0, 0x37D5BE3A, 0x37D69FC1, 0x37D77D97, 0x37D857CC, 0x37D92E81, 0x37DA01D6, 0x37DAD1E8, 0x37DB9ECC, 0x37DC6899, 0x37DD2F69, 0x37DDF34E, 0x37DEB468, 0x37DF72C2, 0x37E02E73, 0x37E0E78A, 0x37E19E24, 0x37E25245, 0x37E30405, 0x37E3B36D, 0x37E46099, 0x37E50B8A, 0x37E5B45A, 0x37E65B10, 0x37E6FFB5, 0x37E7A261, 0x37E84319, 0x37E8E1E7, 0x37E97EDD, 0x37EA19FF, 0x37EAB35F, 0x37EB4B01, 0x37EBE0F1, 0x37EC753A, 0x37ED07E6, 0x37ED98FC, 0x37EE2880, 0x37EEB683, 0x37EF430B, 0x37EFCE18, 0x37F057BF, 0x37F0DFFC, 0x37F166D8, 0x37F1EC60, 0x37F27099, 0x37F2F387, 0x37F3752C, 0x37F3F598, 0x37F474CA, 0x37F4F2CD, 0x37F56FA3, 0x37F5EB54, 0x37F665E3, 0x37F6DF54, 0x37F757AC, 0x37F7CEF7, 0x37F84535, 0x37F8BA6A, 0x37F92E98, 0x37F9A1C9, 0x37FA13FD, 0x37FA853F, 0x37FAF58A, 0x37FB64E8, 0x37FBD35A, 0x37FC40EB, 0x37FCAD94, 0x37FD195C, 0x37FD8449, 0x37FDEE5F, 0x37FE579E, 0x37FEC00D, 0x37FF27B0, 0x37FF8E88, 0x37FFF494, 0x38002CED, 0x38005F30, 0x38009113, 0x3800C299, 0x3800F3C1, 0x3801248E, 0x38015500, 0x38018518, 0x3801B4DB, 0x3801E445, 0x3802135D, 0x3802421E, 0x3802708E, 0x38029EAC, 0x3802CC78, 0x3802F9F6, 0x38032725, 0x38035407, 0x3803809C, 0x3803ACE7, 0x3803D8E7, 0x3804049D, 0x38043009, 0x38045B31, 0x38048611, 0x3804B0AC, 0x3804DAFF, 0x38050511, 0x38052EE1, 0x3805586C, 0x380581B8, 0x3805AAC2, 0x3805D38C, 0x3805FC15, 0x38062464, 0x38064C71, 0x38067444, 0x38069BDB, 0x3806C335, 0x3806EA55, 0x3807113A, 0x380737E7, 0x38075E5A, 0x38078496, 0x3807AA99, 0x3807D068, 0x3807F5FF, 0x38081B60, 0x3808408C, 0x38086584, 0x38088A48, 0x3808AEDA, 0x3808D338, 0x3808F765, 0x38091B5D, 0x38093F27, 0x380962BF, 0x38098629, 0x3809A961, 0x3809CC6D, 0x3809EF47, 0x380A11F3, 0x380A3473, 0x380A56C7, 0x380A78EC, 0x380A9AE5, 0x380ABCB2, 0x380ADE53, 0x380AFFCB, 0x380B2117, 0x380B423A, 0x380B6333, 0x380B8404, 0x380BA4AB, 0x380BC528, 0x380BE580, 0x380C05AE, 0x380C25B5, 0x380C4594, 0x380C654E, 0x380C84E3, 0x380CA450, 0x380CC397, 0x380CE2BB, 0x380D01B8, 0x380D2091, 0x380D3F47, 0x380D5DD8, 0x380D7C46, 0x380D9A91, 0x380DB8BA, 0x380DD6C0, 0x380DF4A2, 0x380E1265, 0x380E3005, 0x380E4D81, 0x380E6ADF, 0x380E881C, 0x380EA538, 0x380EC236, 0x380EDF10, 0x380EFBCE, 0x380F1869, 0x380F34E8, 0x380F5146, 0x380F6D86, 0x380F89AB, 0x380FA5AF, 0x380FC194, 0x380FDD5E, 0x380FF909, 0x38101497, 0x38103009, 0x38104B5C, 0x38106694, 0x381081B1, 0x38109CB2, 0x3810B798, 0x3810D25F, 0x3810ED0E, 0x381107A1, 0x38112219, 0x38113C75, 0x381156B9, 0x381170E4, 0x38118AF0, 0x3811A4E7, 0x3811BEC2, 0x3811D884, 0x3811F22B, 0x38120BBC, 0x38122534, 0x38123E90, 0x381257D7, 0x38127105, 0x38128A1A, 0x3812A317, 0x3812BBFD, 0x3812D4CB, 0x3812ED82, 0x38130621, 0x38131EAA, 0x3813371A, 0x38134F77, 0x381367BC, 0x38137FEA, 0x381397FF, 0x3813B002, 0x3813C7EE, 0x3813DFC4, 0x3813F785, 0x38140F2F, 0x381426C6, 0x38143E47, 0x381455B2, 0x38146D07, 0x38148449, 0x38149B78, 0x3814B290, 0x3814C996, 0x3814E085, 0x3814F764, 0x38150E2A, 0x381524E0, 0x38153B82, 0x3815520F, 0x3815688B, 0x38157EF1, 0x38159546, 0x3815AB85, 0x3815C1B4, 0x3815D7D0, 0x3815EDDB, 0x381603D1, 0x381619B5, 0x38162F87, 0x38164548, 0x38165AF6, 0x38167090, 0x3816861D, 0x38169B94, 0x3816B0FD, 0x3816C653, 0x3816DB95, 0x3816F0CA, 0x381705EC, 0x38171AFD, 0x38172FFE, 0x381744EE, 0x381759CB, 0x38176E9A, 0x38178358, 0x38179804, 0x3817ACA1, 0x3817C12F, 0x3817D5AB, 0x3817EA1A, 0x3817FE76, 0x381812C4, 0x38182701, 0x38183B2E, 0x38184F4D, 0x3818635C, 0x3818775D, 0x38188B4E, 0x38189F30, 0x3818B303, 0x3818C6C4, 0x3818DA7B, 0x3818EE21, 0x381901B7, 0x3819153F, 0x381928B9, 0x38193C26, 0x38194F82, 0x381962D3, 0x38197614, 0x38198946, 0x38199C6B, 0x3819AF83, 0x3819C28A, 0x3819D586, 0x3819E874, 0x3819FB54, 0x381A0E27, 0x381A20EB, 0x381A33A3, 0x381A464C, 0x381A58E8, 0x381A6B78, 0x381A7DFB, 0x381A9070, 0x381AA2DA, 0x381AB534, 0x381AC783, 0x381AD9C6, 0x381AEBFC, 0x381AFE25, 0x381B103F, 0x381B2251, 0x381B3453, 0x381B464A, 0x381B5835, 0x381B6A13, 0x381B7BE6, 0x381B8DAB, 0x381B9F66, 0x381BB115, 0x381BC2B6, 0x381BD44D, 0x381BE5D8, 0x381BF759, 0x381C08CC, 0x381C1A33, 0x381C2B90, 0x381C3CDF, 0x381C4E26, 0x381C5F5F, 0x381C708D, 0x381C81B3, 0x381C92CB, 0x381CA3D8, 0x381CB4DA, 0x381CC5D1, 0x381CD6BD, 0x381CE79E, 0x381CF874, 0x381D0940, 0x381D1A02, 0x381D2AB7, 0x381D3B64, 0x381D4C03, 0x381D5C9A, 0x381D6D26, 0x381D7DAA, 0x381D8E20, 0x381D9E8D, 0x381DAEF0, 0x381DBF48, 0x381DCF97, 0x381DDFDB, 0x381DF015, 0x381E0046, 0x381E106C, 0x381E2087, 0x381E309A, 0x381E40A2, 0x381E50A2, 0x381E6097, 0x381E7080, 0x381E8062, 0x381E903B, 0x381EA009, 0x381EAFCF, 0x381EBF8A, 0x381ECF3D, 0x381EDEE4, 0x381EEE84, 0x381EFE1B, 0x381F0DA7, 0x381F1D2B, 0x381F2CA4, 0x381F3C18, 0x381F4B7E, 0x381F5ADE, 0x381F6A33, 0x381F7983, 0x381F88C5, 0x381F9801, 0x381FA733, 0x381FB65F, 0x381FC580, 0x381FD499, 0x381FE3A6, 0x381FF2AF, 0x382001AC, 0x382010A4, 0x38201F91, 0x38202E75, 0x38203D52, 0x38204C26, 0x38205AF1, 0x382069B5, 0x38207870, 0x38208723, 0x382095CE, 0x3820A471, 0x3820B30B, 0x3820C19D, 0x3820D027, 0x3820DEA9, 0x3820ED22, 0x3820FB93, 0x382109FF, 0x3821185F, 0x382126BB, 0x3821350D, 0x38214358, 0x3821519A, 0x38215FD5, 0x38216E09, 0x38217C36, 0x38218A5A, 0x38219876, 0x3821A689, 0x3821B497, 0x3821C29D, 0x3821D09B, 0x3821DE93, 0x3821EC83, 0x3821FA6B, 0x3822084A, 0x38221624, 0x382223F6, 0x382231C2, 0x38223F86, 0x38224D42, 0x38225AF8, 0x382268A6, 0x3822764B, 0x382283EC, 0x38229184, 0x38229F16, 0x3822ACA0, 0x3822BA25, 0x3822C7A1, 0x3822D516, 0x3822E284, 0x3822EFEE, 0x3822FD4E, 0x38230AAA, 0x382317FD, 0x38232548, 0x38233290, 0x38233FCE, 0x38234D08, 0x38235A3A, 0x38236764, 0x38237489, 0xBF800000, 0x00000000, 0x36A6196A, 0x3703A179, 0x37261985, 0x3740D603, 0x3756AE5C, 0x3769269A, 0x37792674, 0x3783A19B, 0x3789F17B, 0x378FA735, 0x3794DDA7, 0x3799A93E, 0x379E19D1, 0x37A23BED, 0x37A619B9, 0x37A9BB85, 0x37AD281F, 0x37B06554, 0x37B377FF, 0x37B66449, 0x37B92DBF, 0x37BBD77C, 0x37BE6436, 0x37C0D64A, 0x37C32FCD, 0x37C5729C, 0x37C7A05B, 0x37C9BA8F, 0x37CBC27C, 0x37CDB962, 0x37CFA04E, 0x37D1783C, 0x37D34214, 0x37D4FEA6, 0x37D6AEB4, 0x37D852E6, 0x37D9EBE9, 0x37DB7A4A, 0x37DCFE94, 0x37DE7949, 0x37DFEADE, 0x37E153C0, 0x37E2B453, 0x37E40CFF, 0x37E55E11, 0x37E6A7EB, 0x37E7EACB, 0x37E92708, 0x37EA5CDF, 0x37EB8C97, 0x37ECB667, 0x37EDDA86, 0x37EEF937, 0x37F0129F, 0x37F126FB, 0x37F2366C, 0x37F34129, 0x37F44753, 0x37F5491C, 0x37F64699, 0x37F73FFC, 0x37F83561, 0x37F926E8, 0x37FA14B2, 0x37FAFEDC, 0x37FBE57A, 0x37FCC8B4, 0x37FDA899, 0x37FE8546, 0x37FF5ED0, 0x38001AAA, 0x38008470, 0x3800ECC6, 0x380153B4, 0x3801B944, 0x38021D83, 0x38028075, 0x3802E225, 0x3803429C, 0x3803A1E0, 0x3803FFF7, 0x38045CE9, 0x3804B8C2, 0x38051380, 0x38056D30, 0x3805C5D9, 0x38061D7C, 0x38067423, 0x3806C9D2, 0x38071E8D, 0x3807725B, 0x3807C542, 0x38081748, 0x3808686D, 0x3808B8B8, 0x38090830, 0x380956D7, 0x3809A4B2, 0x3809F1C5, 0x380A3E12, 0x380A899E, 0x380AD470, 0x380B1E86, 0x380B67E7, 0x380BB098, 0x380BF89A, 0x380C3FEE, 0x380C869D, 0x380CCCA5, 0x380D120A, 0x380D56D0, 0x380D9AFC, 0x380DDE8B, 0x380E2183, 0x380E63EA, 0x380EA5BC, 0x380EE6FF, 0x380F27B6, 0x380F67E1, 0x380FA785, 0x380FE6A2, 0x3810253B, 0x38106353, 0x3810A0ED, 0x3810DE06, 0x38111AA5, 0x381156C9, 0x38119277, 0x3811CDAF, 0x38120873, 0x381242C3, 0x38127CA3, 0x3812B615, 0x3812EF16, 0x381327AF, 0x38135FDD, 0x381397A2, 0x3813CF01, 0x381405F8, 0x38143C8F, 0x381472C0, 0x3814A891, 0x3814DDFF, 0x38151312, 0x381547C5, 0x38157C1E, 0x3815B01B, 0x3815E3C1, 0x3816170C, 0x381649FF, 0x38167C9C, 0x3816AEE5, 0x3816E0DB, 0x3817127C, 0x381743CD, 0x381774CE, 0x3817A57D, 0x3817D5DF, 0x381805F4, 0x381835BA, 0x38186538, 0x38189469, 0x3818C34F, 0x3818F1EC, 0x38192041, 0x38194E51, 0x38197C1A, 0x3819A99B, 0x3819D6DA, 0x381A03D2, 0x381A308B, 0x381A5CFF, 0x381A8931, 0x381AB524, 0x381AE0D4, 0x381B0C49, 0x381B377B, 0x381B6271, 0x381B8D2A, 0x381BB7A7, 0x381BE1E5, 0x381C0BEC, 0x381C35B6, 0x381C5F46, 0x381C889D, 0x381CB1BA, 0x381CDAA0, 0x381D034F, 0x381D2BC8, 0x381D5409, 0x381D7C13, 0x381DA3E9, 0x381DCB8B, 0x381DF2F8, 0x381E1A32, 0x381E4137, 0x381E680D, 0x381E8EAC, 0x381EB51D, 0x381EDB5C, 0x381F016C, 0x381F2749, 0x381F4CF9, 0x381F7278, 0x381F97CA, 0x381FBCEC, 0x381FE1E1, 0x382006A8, 0x38202B42, 0x38204FB1, 0x382073F3, 0x3820980A, 0x3820BBF5, 0x3820DFB3, 0x38210349, 0x382126B5, 0x382149F8, 0x38216D0F, 0x38219000, 0x3821B2C7, 0x3821D565, 0x3821F7DC, 0x38221A2B, 0x38223C55, 0x38225E57, 0x38228032, 0x3822A1E6, 0x3822C377, 0x3822E4E1, 0x38230625, 0x38232745, 0x38234841, 0x38236917, 0x382389CC, 0x3823AA5A, 0x3823CAC7, 0x3823EB11, 0x38240B39, 0x38242B3E, 0x38244B1F, 0x38246AE2, 0x38248A81, 0x3824AA00, 0x3824C95D, 0x3824E899, 0x382507B4, 0x382526B1, 0x3825458D, 0x38256448, 0x382582E5, 0x3825A163, 0x3825BFC1, 0x3825DE03, 0x3825FC24, 0x38261A27, 0x3826380B, 0x382655D5, 0x3826737F, 0x3826910C, 0x3826AE7B, 0x3826CBCD, 0x3826E905, 0x38270621, 0x3827231F, 0x38274001, 0x38275CC5, 0x38277970, 0x38279600, 0x3827B274, 0x3827CECD, 0x3827EB0D, 0x38280731, 0x3828233A, 0x38283F2B, 0x38285B00, 0x382876BC, 0x3828925F, 0x3828ADE7, 0x3828C956, 0x3828E4AC, 0x3828FFED, 0x38291B12, 0x3829361E, 0x38295111, 0x38296BEF, 0x382986B1, 0x3829A15D, 0x3829BBF3, 0x3829D670, 0x3829F0D4, 0x382A0B23, 0x382A255B, 0x382A3F7B, 0x382A5985, 0x382A7379, 0x382A8D57, 0x382AA71E, 0x382AC0CE, 0x382ADA69, 0x382AF3EC, 0x382B0D5C, 0x382B26B6, 0x382B3FFA, 0x382B592B, 0x382B7245, 0x382B8B4A, 0x382BA439, 0x382BBD14, 0x382BD5DC, 0x382BEE8E, 0x382C072D, 0x382C1FB6, 0x382C382C, 0x382C508F, 0x382C68DE, 0x382C8117, 0x382C993D, 0x382CB153, 0x382CC952, 0x382CE13E, 0x382CF91A, 0x382D10E0, 0x382D2895, 0x382D4037, 0x382D57C6, 0x382D6F42, 0x382D86AD, 0x382D9E05, 0x382DB54C, 0x382DCC80, 0x382DE3A1, 0x382DFAB1, 0x382E11AE, 0x382E289B, 0x382E3F77, 0x382E5643, 0x382E6CFB, 0x382E83A3, 0x382E9A38, 0x382EB0BF, 0x382EC733, 0x382EDD96, 0x382EF3E9, 0x382F0A2B, 0x382F205C, 0x382F3680, 0x382F4C91, 0x382F6291, 0x382F7884, 0x382F8E63, 0x382FA435, 0x382FB9F6, 0x382FCFA6, 0x382FE549, 0x382FFADB, 0x3830105D, 0x383025D1, 0x38303B35, 0x3830508B, 0x383065D0, 0x38307B05, 0x3830902F, 0x3830A545, 0x3830BA51, 0x3830CF4C, 0x3830E437, 0x3830F916, 0x38310DE5, 0x383122A7, 0x38313758, 0x38314BFE, 0x38316093, 0x3831751B, 0x38318995, 0x38319E01, 0x3831B25F, 0x3831C6B0, 0x3831DAF3, 0x3831EF28, 0x3832034F, 0x38321769, 0x38322B75, 0x38323F73, 0x38325364, 0x38326749, 0x38327B21, 0x38328EEB, 0x3832A2A7, 0x3832B659, 0x3832C9FC, 0x3832DD92, 0x3832F11D, 0x3833049A, 0x38331809, 0x38332B6D, 0x38333EC4, 0x3833520F, 0x3833654D, 0x3833787D, 0x38338BA5, 0x38339EBC, 0x3833B1CB, 0x3833C4CD, 0x3833D7C0, 0x3833EAAC, 0x3833FD89, 0x38341059, 0x3834231E, 0x383435D8, 0x38344887, 0x38345B2B, 0x38346DC1, 0x3834804C, 0x383492CC, 0x3834A541, 0x3834B7AB, 0x3834CA0B, 0x3834DC5C, 0x3834EEA5, 0x383500E1, 0x38351311, 0x38352539, 0x38353754, 0x38354966, 0x38355B6A, 0x38356D67, 0x38357F55, 0x3835913B, 0x3835A316, 0x3835B4E7, 0x3835C6AC, 0x3835D866, 0x3835EA18, 0x3835FBBC, 0x38360D58, 0x38361EE9, 0x38363072, 0x383641ED, 0x38365360, 0x383664CA, 0x38367627, 0x3836877C, 0x383698C8, 0x3836AA07, 0x3836BB40, 0x3836CC6B, 0x3836DD8E, 0x3836EEA6, 0x3836FFB6, 0x383710BD, 0x383721B7, 0x383732AB, 0x38374392, 0x38375473, 0x38376549, 0x38377614, 0x383786D7, 0x38379792, 0x3837A841, 0x3837B8E9, 0x3837C988, 0x3837DA1C, 0x3837EAA8, 0x3837FB29, 0x38380BA1, 0x38381C12, 0x38382C7A, 0x38383CD7, 0x38384D2F, 0x38385D7B, 0x38386DBD, 0x38387DF9, 0x38388E2A, 0x38389E53, 0x3838AE74, 0x3838BE8C, 0x3838CE9C, 0x3838DEA2, 0x3838EEA1, 0x3838FE96, 0x38390E82, 0x38391E67, 0x38392E43, 0x38393E19, 0x38394DE4, 0x38395DA8, 0x38396D63, 0x38397D15, 0x38398CC0, 0x38399C62, 0x3839ABFC, 0x3839BB8E, 0x3839CB17, 0x3839DA98, 0x3839EA14, 0x3839F985, 0x383A08F0, 0x383A1850, 0x383A27AB, 0x383A36FE, 0x383A4648, 0x383A558A, 0x383A64C6, 0x383A73F8, 0x383A8324, 0x383A9248, 0x383AA166, 0x383AB079, 0x383ABF87, 0x383ACE8D, 0xBF800000, 0x00000000, 0x36C1C874, 0x371991D6, 0x3741C897, 0x3760F9D6, 0x377A7647, 0x37880153, 0x3791568D, 0x37999207, 0x37A0EF37, 0x37A79893, 0x37ADAD70, 0x37B345A3, 0x37B8739F, 0x37BD461A, 0x37C1C8E4, 0x37C605A1, 0x37CA045E, 0x37CDCBC4, 0x37D1618F, 0x37D4CA8D, 0x37D80AF0, 0x37DB264D, 0x37DE1FD2, 0x37E0FA3F, 0x37E3B805, 0x37E65B4C, 0x37E8E607, 0x37EB59E9, 0x37EDB882, 0x37F00333, 0x37F23B4C, 0x37F461E4, 0x37F67808, 0x37F87EB7, 0x37FA76C6, 0x37FC6105, 0x37FE3E31, 0x3800077C, 0x3800E9FE, 0x3801C6E7, 0x38029E7D, 0x38037102, 0x38043EAF, 0x380507BE, 0x3805CC60, 0x38068CC7, 0x38074922, 0x3808019A, 0x3808B659, 0x38096781, 0x380A153C, 0x380ABFA6, 0x380B66DF, 0x380C0B09, 0x380CAC3D, 0x380D4A98, 0x380DE630, 0x380E7F1F, 0x380F157D, 0x380FA95D, 0x38103AD6, 0x3810C9FD, 0x381156E2, 0x3811E197, 0x38126A2E, 0x3812F0B8, 0x38137543, 0x3813F7DF, 0x38147898, 0x3814F77F, 0x381574A2, 0x3815F007, 0x381669C2, 0x3816E1D8, 0x38175857, 0x3817CD4B, 0x381840BB, 0x3818B2B3, 0x3819233D, 0x38199261, 0x381A0026, 0x381A6C99, 0x381AD7BF, 0x381B419E, 0x381BAA43, 0x381C11B0, 0x381C77F0, 0x381CDD08, 0x381D40FC, 0x381DA3D8, 0x381E059F, 0x381E6658, 0x381EC609, 0x381F24B5, 0x381F8264, 0x381FDF19, 0x38203ADC, 0x382095B0, 0x3820EF9A, 0x382148A0, 0x3821A0C5, 0x3821F80E, 0x38224E7E, 0x3822A41C, 0x3822F8E7, 0x38234CEA, 0x3823A024, 0x3823F298, 0x3824444E, 0x38249544, 0x3824E581, 0x38253507, 0x382583D9, 0x3825D1FC, 0x38261F72, 0x38266C40, 0x3826B864, 0x382703E2, 0x38274EC2, 0x382798FF, 0x3827E2A2, 0x38282BAB, 0x3828741D, 0x3828BBF8, 0x38290341, 0x382949FB, 0x38299026, 0x3829D5C5, 0x382A1ADB, 0x382A5F6A, 0x382AA375, 0x382AE6F9, 0x382B29FD, 0x382B6C81, 0x382BAE87, 0x382BF015, 0x382C3124, 0x382C71BC, 0x382CB1DF, 0x382CF18E, 0x382D30C7, 0x382D6F8F, 0x382DADE9, 0x382DEBD2, 0x382E294E, 0x382E6661, 0x382EA309, 0x382EDF48, 0x382F1B1F, 0x382F5693, 0x382F919F, 0x382FCC4A, 0x38300692, 0x3830407A, 0x38307A02, 0x3830B330, 0x3830EBFD, 0x3831246F, 0x38315C87, 0x38319444, 0x3831CBA9, 0x383202B8, 0x38323970, 0x38326FD3, 0x3832A5E3, 0x3832DB9E, 0x38331106, 0x3833461F, 0x38337AE8, 0x3833AF61, 0x3833E38B, 0x3834176A, 0x38344AFA, 0x38347E3F, 0x3834B13A, 0x3834E3E8, 0x38351652, 0x38354871, 0x38357A46, 0x3835ABD9, 0x3835DD22, 0x38360E29, 0x38363EEB, 0x38366F69, 0x38369FA2, 0x3836CF9B, 0x3836FF53, 0x38372EC8, 0x38375DFF, 0x38378CF6, 0x3837BBAE, 0x3837EA27, 0x38381863, 0x38384663, 0x38387426, 0x3838A1B0, 0x3838CEFA, 0x3838FC0D, 0x383928E7, 0x38395584, 0x383981EA, 0x3839AE19, 0x3839DA0F, 0x383A05D0, 0x383A315B, 0x383A5CAB, 0x383A87CA, 0x383AB2B2, 0x383ADD66, 0x383B07E9, 0x383B3234, 0x383B5C4E, 0x383B8637, 0x383BAFEB, 0x383BD970, 0x383C02C2, 0x383C2BE4, 0x383C54D8, 0x383C7D9A, 0x383CA62B, 0x383CCE90, 0x383CF6C6, 0x383D1ECE, 0x383D46A9, 0x383D6E53, 0x383D95D4, 0x383DBD29, 0x383DE44F, 0x383E0B4C, 0x383E321D, 0x383E58C1, 0x383E7F3D, 0x383EA58D, 0x383ECBB3, 0x383EF1B0, 0x383F1784, 0x383F3D32, 0x383F62B3, 0x383F880E, 0x383FAD43, 0x383FD24E, 0x383FF733, 0x38401BF1, 0x38404089, 0x384064FA, 0x38408945, 0x3840AD6A, 0x3840D16A, 0x3840F547, 0x384118FE, 0x38413C90, 0x38415FFF, 0x3841834A, 0x3841A672, 0x3841C976, 0x3841EC56, 0x38420F15, 0x384231B0, 0x3842542A, 0x38427684, 0x384298B9, 0x3842BACE, 0x3842DCC2, 0x3842FE97, 0x38432049, 0x384341D9, 0x3843634C, 0x384384A0, 0x3843A5D1, 0x3843C6E6, 0x3843E7DA, 0x384408AD, 0x38442964, 0x384449FB, 0x38446A76, 0x38448AD0, 0x3844AB0E, 0x3844CB2C, 0x3844EB2E, 0x38450B15, 0x38452ADD, 0x38454A87, 0x38456A16, 0x38458989, 0x3845A8E1, 0x3845C81A, 0x3845E738, 0x3846063B, 0x38462522, 0x384643F0, 0x384662A0, 0x38468137, 0x38469FB0, 0x3846BE13, 0x3846DC58, 0x3846FA87, 0x38471897, 0x38473692, 0x38475471, 0x38477238, 0x38478FE2, 0x3847AD77, 0x3847CAF1, 0x3847E851, 0x3848059C, 0x384822CB, 0x38483FE4, 0x38485CE5, 0x384879CD, 0x3848969C, 0x3848B355, 0x3848CFF8, 0x3848EC7F, 0x384908F3, 0x3849254F, 0x38494192, 0x38495DC1, 0x384979D8, 0x384995D9, 0x3849B1C1, 0x3849CD96, 0x3849E955, 0x384A04FB, 0x384A208D, 0x384A3C0A, 0x384A5771, 0x384A72C2, 0x384A8DFD, 0x384AA925, 0x384AC436, 0x384ADF35, 0x384AFA1D, 0x384B14F0, 0x384B2FAF, 0x384B4A5B, 0x384B64F1, 0x384B7F71, 0x384B99E0, 0x384BB43A, 0x384BCE80, 0x384BE8B3, 0x384C02D3, 0x384C1CDF, 0x384C36D6, 0x384C50BC, 0x384C6A8F, 0x384C844C, 0x384C9DF8, 0x384CB791, 0x384CD11A, 0x384CEA8C, 0x384D03EE, 0x384D1D3D, 0x384D3679, 0x384D4FA4, 0x384D68BC, 0x384D81C3, 0x384D9AB8, 0x384DB39B, 0x384DCC6C, 0x384DE52C, 0x384DFDDB, 0x384E1677, 0x384E2F03, 0x384E477B, 0x384E5FE6, 0x384E783E, 0x384E9085, 0x384EA8BB, 0x384EC0E1, 0x384ED8F7, 0x384EF0FC, 0x384F08F0, 0x384F20D4, 0x384F38A8, 0x384F506B, 0x384F681D, 0x384F7FBF, 0x384F9754, 0x384FAED8, 0x384FC64B, 0x384FDDAE, 0x384FF503, 0x38500C47, 0x3850237B, 0x38503AA2, 0x385051B8, 0x385068C0, 0x38507FB8, 0x385096A1, 0x3850AD7B, 0x3850C446, 0x3850DB04, 0x3850F1B2, 0x3851084F, 0x38511EE1, 0x38513562, 0x38514BD6, 0x3851623C, 0x38517891, 0x38518ED9, 0x3851A513, 0x3851BB3F, 0x3851D15E, 0x3851E76E, 0x3851FD71, 0x38521367, 0x3852294B, 0x38523F25, 0x385254F1, 0x38526AAF, 0x38528060, 0x38529603, 0x3852AB98, 0x3852C11F, 0x3852D69B, 0x3852EC07, 0x38530168, 0x385316BE, 0x38532C03, 0x3853413E, 0x3853566A, 0x38536B89, 0x3853809D, 0x385395A6, 0x3853AA9E, 0x3853BF8B, 0x3853D46E, 0x3853E942, 0x3853FE09, 0x385412C5, 0x38542776, 0x38543C19, 0x385450AF, 0x3854653C, 0x385479BB, 0x38548E2D, 0x3854A294, 0x3854B6EF, 0x3854CB40, 0x3854DF83, 0x3854F3BB, 0x385507E8, 0x38551C07, 0x3855301B, 0x38554427, 0x38555825, 0x38556C16, 0x38557FFE, 0x385593DB, 0x3855A7AB, 0x3855BB6F, 0x3855CF2C, 0x3855E2DA, 0x3855F67E, 0x38560A16, 0x38561DA6, 0x38563129, 0x385644A1, 0x38565810, 0x38566B71, 0x38567ECB, 0x38569216, 0x3856A55A, 0x3856B892, 0x3856CBBF, 0x3856DEE4, 0x3856F1FC, 0x3857050B, 0x3857180F, 0x38572B08, 0x38573DF6, 0x385750DC, 0x385763B7, 0x38577687, 0x3857894E, 0x38579C0B, 0x3857AEBC, 0x3857C166, 0x3857D404, 0x3857E69A, 0x3857F923, 0x38580BA6, 0x38581E1D, 0x3858308A, 0x385842EC, 0x38585549, 0x38586797, 0x385879DE, 0x38588C1C, 0x38589E4F, 0x3858B07A, 0x3858C29D, 0x3858D4B4, 0x3858E6C1, 0x3858F8C6, 0x38590AC2, 0x38591CB6, 0x38592E9F, 0x3859407F, 0x38595255, 0x38596423, 0x385975E8, 0x385987A5, 0x38599957, 0x3859AB01, 0x3859BCA2, 0x3859CE3B, 0x3859DFCA, 0x3859F150, 0xBF800000, 0x00000000, 0x36E88A61, 0x373848D3, 0x37688A91, 0x3786FC78, 0x37964729, 0x37A334FE, 0x37AE6819, 0x37B8490F, 0x37C11F4E, 0x37C91DC0, 0x37D06A04, 0x37D720AB, 0x37DD57DE, 0x37E3213F, 0x37E88AFF, 0x37EDA0B7, 0x37F26BFB, 0x37F6F4E3, 0x37FB423F, 0x37FF59DA, 0x3801A05B, 0x38037D95, 0x3805467D, 0x3806FCC0, 0x3808A1D1, 0x380A36FE, 0x380BBD6D, 0x380D3629, 0x380EA220, 0x38100227, 0x38115700, 0x3812A15C, 0x3813E1DC, 0x38151910, 0x38164781, 0x38176DA8, 0x38188BF8, 0x3819A2D5, 0x381AB2A6, 0x381BBBBE, 0x381CBE74, 0x381DBB12, 0x381EB1E2, 0x381FA327, 0x38208F1E, 0x38217601, 0x38225807, 0x38233566, 0x38240E49, 0x3824E2E3, 0x3825B35D, 0x38267FDB, 0x3827488A, 0x38280D87, 0x3828CEF9, 0x38298CFE, 0x382A47B8, 0x382AFF3E, 0x382BB3AF, 0x382C6524, 0x382D13B6, 0x382DBF7D, 0x382E688F, 0x382F0F02, 0x382FB2EB, 0x3830545D, 0x3830F36B, 0x38319027, 0x38322AA1, 0x3832C2EB, 0x38335912, 0x3833ED27, 0x38347F39, 0x38350F54, 0x38359D89, 0x383629E0, 0x3836B469, 0x38373D2C, 0x3837C437, 0x38384996, 0x3838CD50, 0x38394F73, 0x3839D008, 0x383A4F13, 0x383ACCA6, 0x383B48C3, 0x383BC376, 0x383C3CC5, 0x383CB4BB, 0x383D2B5B, 0x383DA0B2, 0x383E14C1, 0x383E8795, 0x383EF932, 0x383F699D, 0x383FD8DD, 0x384046FA, 0x3840B3F9, 0x38411FE0, 0x38418AB3, 0x3841F479, 0x38425D38, 0x3842C4F4, 0x38432BB0, 0x38439175, 0x3843F642, 0x38445A21, 0x3844BD16, 0x38451F21, 0x38458048, 0x3845E093, 0x38464002, 0x38469E98, 0x3846FC5D, 0x38475951, 0x3847B577, 0x384810D7, 0x38486B71, 0x3848C548, 0x38491E5F, 0x384976BE, 0x3849CE61, 0x384A254F, 0x384A7B8B, 0x384AD116, 0x384B25F7, 0x384B7A2B, 0x384BCDB7, 0x384C209F, 0x384C72E4, 0x384CC487, 0x384D1590, 0x384D65FA, 0x384DB5CC, 0x384E0507, 0x384E53AE, 0x384EA1C3, 0x384EEF49, 0x384F3C3E, 0x384F88A9, 0x384FD488, 0x38501FE0, 0x38506AAF, 0x3850B4FC, 0x3850FEC6, 0x3851480E, 0x385190D8, 0x3851D924, 0x385220F4, 0x3852684A, 0x3852AF28, 0x3852F58D, 0x38533B7F, 0x385380FD, 0x3853C608, 0x38540AA2, 0x38544ECB, 0x38549286, 0x3854D5D6, 0x385518BB, 0x38555B35, 0x38559D46, 0x3855DEF2, 0x38562035, 0x38566112, 0x3856A18F, 0x3856E1A7, 0x3857215E, 0x385760B5, 0x38579FAC, 0x3857DE48, 0x38581C84, 0x38585A65, 0x385897EC, 0x3858D517, 0x385911EB, 0x38594E67, 0x38598A8E, 0x3859C65C, 0x385A01D9, 0x385A3CFD, 0x385A77D2, 0x385AB254, 0x385AEC86, 0x385B2666, 0x385B5FF6, 0x385B9939, 0x385BD22D, 0x385C0AD3, 0x385C4330, 0x385C7B3F, 0x385CB307, 0x385CEA82, 0x385D21B6, 0x385D589F, 0x385D8F41, 0x385DC59E, 0x385DFBB3, 0x385E3184, 0x385E6710, 0x385E9C58, 0x385ED15D, 0x385F061E, 0x385F3A9F, 0x385F6EDC, 0x385FA2DA, 0x385FD698, 0x38600A15, 0x38603D55, 0x38607055, 0x3860A319, 0x3860D59E, 0x386107E7, 0x386139F6, 0x38616BC5, 0x38619D5E, 0x3861CEBA, 0x3861FFDD, 0x386230C5, 0x38626177, 0x386291EF, 0x3862C230, 0x3862F23A, 0x3863220A, 0x386351A6, 0x3863810E, 0x3863B03F, 0x3863DF3C, 0x38640E01, 0x38643C96, 0x38646AF6, 0x38649924, 0x3864C71E, 0x3864F4E7, 0x3865227F, 0x38654FE4, 0x38657D19, 0x3865AA1C, 0x3865D6F0, 0x38660392, 0x38663006, 0x38665C4E, 0x38668865, 0x3866B44D, 0x3866E008, 0x38670B98, 0x386736F7, 0x3867622C, 0x38678D35, 0x3867B80F, 0x3867E2C0, 0x38680D45, 0x3868379F, 0x386861CF, 0x38688BD3, 0x3868B5AD, 0x3868DF5F, 0x386908E7, 0x38693246, 0x38695B7F, 0x3869848B, 0x3869AD71, 0x3869D631, 0x3869FEC7, 0x386A2737, 0x386A4F81, 0x386A77A4, 0x386A9FA0, 0x386AC776, 0x386AEF25, 0x386B16B1, 0x386B3E19, 0x386B6558, 0x386B8C76, 0x386BB36D, 0x386BDA41, 0x386C00F3, 0x386C277F, 0x386C4DE8, 0x386C742F, 0x386C9A53, 0x386CC053, 0x386CE632, 0x386D0BF0, 0x386D318A, 0x386D5703, 0x386D7C5B, 0x386DA190, 0x386DC6A6, 0x386DEB9C, 0x386E1070, 0x386E3526, 0x386E59B8, 0x386E7E2F, 0x386EA282, 0x386EC6B7, 0x386EEACE, 0x386F0EC6, 0x386F32A0, 0x386F565A, 0x386F79F5, 0x386F9D74, 0x386FC0D2, 0x386FE415, 0x3870073A, 0x38702A41, 0x38704D2C, 0x38706FF9, 0x387092A7, 0x3870B53D, 0x3870D7B2, 0x3870FA0E, 0x38711C4E, 0x38713E71, 0x38716078, 0x38718263, 0x3871A433, 0x3871C5EA, 0x3871E783, 0x38720903, 0x38722A68, 0x38724BB1, 0x38726CE2, 0x38728DF7, 0x3872AEF3, 0x3872CFD6, 0x3872F09E, 0x3873114E, 0x387331E2, 0x3873525D, 0x387372C2, 0x3873930B, 0x3873B33C, 0x3873D354, 0x3873F354, 0x3874133D, 0x3874330B, 0x387452C3, 0x38747262, 0x387491EB, 0x3874B15B, 0x3874D0B3, 0x3874EFF5, 0x38750F1E, 0x38752E31, 0x38754D2E, 0x38756C12, 0x38758AE3, 0x3875A998, 0x3875C83B, 0x3875E6C7, 0x3876053B, 0x3876239B, 0x387641E2, 0x38766017, 0x38767E35, 0x38769C3D, 0x3876BA30, 0x3876D80C, 0x3876F5D2, 0x38771386, 0x38773125, 0x38774EAD, 0x38776C23, 0x38778981, 0x3877A6CC, 0x3877C403, 0x3877E127, 0x3877FE36, 0x38781B2E, 0x38783816, 0x387854E7, 0x387871A6, 0x38788E51, 0x3878AAE9, 0x3878C76B, 0x3878E3DC, 0x3879003B, 0x38791C86, 0x387938BB, 0x387954DF, 0x387970F1, 0x38798CF2, 0x3879A8DC, 0x3879C4B7, 0x3879E07E, 0x3879FC32, 0x387A17D5, 0x387A3365, 0x387A4EE2, 0x387A6A4E, 0x387A85AA, 0x387AA0F3, 0x387ABC28, 0x387AD750, 0x387AF262, 0x387B0D66, 0x387B2856, 0x387B4336, 0x387B5E03, 0x387B78C3, 0x387B936F, 0x387BAE0A, 0x387BC895, 0x387BE310, 0x387BFD77, 0x387C17D0, 0x387C3219, 0x387C4C4F, 0x387C6677, 0x387C808F, 0x387C9A96, 0x387CB48C, 0x387CCE72, 0x387CE84B, 0x387D0210, 0x387D1BC7, 0x387D3571, 0x387D4F07, 0x387D688F, 0x387D8208, 0x387D9B72, 0x387DB4CC, 0x387DCE15, 0x387DE751, 0x387E007C, 0x387E1999, 0x387E32A9, 0x387E4BA8, 0x387E6497, 0x387E7D7A, 0x387E964B, 0x387EAF10, 0x387EC7C5, 0x387EE06C, 0x387EF906, 0x387F118F, 0x387F2A0A, 0x387F4278, 0x387F5AD7, 0x387F7329, 0x387F8B6E, 0x387FA3A1, 0x387FBBCA, 0x387FD3E2, 0x387FEBED, 0x388001F6, 0x38800DEE, 0x388019E0, 0x388025C9, 0x388031AE, 0x38803D8A, 0x38804960, 0x38805530, 0x388060F9, 0x38806CBC, 0x38807877, 0x3880842D, 0x38808FDB, 0x38809B83, 0x3880A725, 0x3880B2C1, 0x3880BE55, 0x3880C9E4, 0x3880D56D, 0x3880E0EE, 0x3880EC6A, 0x3880F7DF, 0x3881034E, 0x38810EB7, 0x38811A18, 0x38812576, 0x388130CB, 0x38813C1B, 0x38814766, 0x388152AA, 0x38815DE8, 0x3881691F, 0x38817452, 0x38817F7D, 0x38818AA4, 0x388195C4, 0x3881A0DE, 0x3881ABF2, 0x3881B702, 0x3881C20A, 0x3881CD0D, 0x3881D80A, 0x3881E301, 0x3881EDF3, 0x3881F8DF, 0x388203C5, 0x38820EA7, 0x38821982, 0x38822456, 0x38822F26, 0x388239F0, 0x388244B5, 0x38824F75, 0x38825A2E, 0x388264E2, 0x38826F91, 0x38827A3B, 0x388284DF, 0x38828F7D, 0x38829A16, 0x3882A4AA, 0x3882AF39, 0x3882B9C2, 0x3882C446, 0xBF800000, 0x00000000, 0x3904CF18, 0x3952814E, 0x3984D142, 0x399A3308, 0x39ABAB9C, 0x39BA713C, 0x39C73D1D, 0x39D286B3, 0x39DC9F96, 0x39E5C1F1, 0x39EE18BA, 0x39F5C48F, 0x39FCDED2, 0x3A01BDCD, 0x3A04D58F, 0x3A07BD4E, 0x3A0A7A8A, 0x3A0D11DA, 0x3A0F8725, 0x3A11DDBA, 0x3A141878, 0x3A1639D6, 0x3A1843FF, 0x3A1A38D8, 0x3A1C1A0A, 0x3A1DE916, 0x3A1FA749, 0x3A2155D6, 0x3A22F5C8, 0x3A24881A, 0x3A260DA4, 0x3A278732, 0x3A28F57B, 0x3A2A5927, 0x3A2BB2CD, 0x3A2D02FC, 0x3A2E4A33, 0x3A2F88EC, 0x3A30BF93, 0x3A31EE8D, 0x3A33163C, 0x3A3436F4, 0x3A35510C, 0x3A3664CA, 0x3A37727B, 0x3A387A60, 0x3A397CB5, 0x3A3A79B7, 0x3A3B719E, 0x3A3C649B, 0x3A3D52E0, 0x3A3E3C9D, 0x3A3F21FB, 0x3A400323, 0x3A40E03D, 0x3A41B96C, 0x3A428ED6, 0x3A43609B, 0x3A442ED8, 0x3A44F9AD, 0x3A45C136, 0x3A46858D, 0x3A4746CC, 0x3A48050D, 0x3A48C067, 0x3A4978EF, 0x3A4A2EBB, 0x3A4AE1E1, 0x3A4B9273, 0x3A4C4084, 0x3A4CEC26, 0x3A4D9569, 0x3A4E3C5E, 0x3A4EE116, 0x3A4F83A0, 0x3A50240B, 0x3A50C263, 0x3A515EB7, 0x3A51F914, 0x3A529186, 0x3A532819, 0x3A53BCD8, 0x3A544FD0, 0x3A54E10B, 0x3A557093, 0x3A55FE73, 0x3A568AB3, 0x3A57155E, 0x3A579E7C, 0x3A582615, 0x3A58AC35, 0x3A5930E0, 0x3A59B420, 0x3A5A35FD, 0x3A5AB67F, 0x3A5B35AB, 0x3A5BB389, 0x3A5C3021, 0x3A5CAB78, 0x3A5D2595, 0x3A5D9E7C, 0x3A5E1638, 0x3A5E8CCA, 0x3A5F023B, 0x3A5F768E, 0x3A5FE9CA, 0x3A605BF2, 0x3A60CD0F, 0x3A613D23, 0x3A61AC32, 0x3A621A45, 0x3A62875A, 0x3A62F37B, 0x3A635EAA, 0x3A63C8EB, 0x3A643244, 0x3A649AB7, 0x3A650247, 0x3A6568FB, 0x3A65CED3, 0x3A6633D6, 0x3A669804, 0x3A66FB64, 0x3A675DF8, 0x3A67BFC2, 0x3A6820C7, 0x3A688108, 0x3A68E08B, 0x3A693F50, 0x3A699D5C, 0x3A69FAB0, 0x3A6A5750, 0x3A6AB33E, 0x3A6B0E7E, 0x3A6B6910, 0x3A6BC2F9, 0x3A6C1C3C, 0x3A6C74D9, 0x3A6CCCD3, 0x3A6D242D, 0x3A6D7AEA, 0x3A6DD109, 0x3A6E2690, 0x3A6E7B7F, 0x3A6ECFD9, 0x3A6F23A0, 0x3A6F76D4, 0x3A6FC97A, 0x3A701B92, 0x3A706D1F, 0x3A70BE21, 0x3A710E9B, 0x3A715E91, 0x3A71AE01, 0x3A71FCEE, 0x3A724B5B, 0x3A729948, 0x3A72E6B6, 0x3A7333A8, 0x3A738021, 0x3A73CC1F, 0x3A7417A7, 0x3A7462B7, 0x3A74AD54, 0x3A74F77B, 0x3A754133, 0x3A758A78, 0x3A75D34F, 0x3A761BB9, 0x3A7663B4, 0x3A76AB44, 0x3A76F26C, 0x3A773929, 0x3A777F7E, 0x3A77C56D, 0x3A780AF7, 0x3A78501D, 0x3A7894DF, 0x3A78D940, 0x3A791D3F, 0x3A7960DD, 0x3A79A41F, 0x3A79E702, 0x3A7A2987, 0x3A7A6BB2, 0x3A7AAD81, 0x3A7AEEF6, 0x3A7B3013, 0x3A7B70D8, 0x3A7BB144, 0x3A7BF15D, 0x3A7C311F, 0x3A7C708C, 0x3A7CAFA8, 0x3A7CEE70, 0x3A7D2CE5, 0x3A7D6B0B, 0x3A7DA8DF, 0x3A7DE666, 0x3A7E239D, 0x3A7E6086, 0x3A7E9D23, 0x3A7ED972, 0x3A7F1578, 0x3A7F5132, 0x3A7F8CA0, 0x3A7FC7C8, 0x3A800153, 0x3A801E9E, 0x3A803BC5, 0x3A8058CA, 0x3A8075AA, 0x3A809269, 0x3A80AF05, 0x3A80CB7F, 0x3A80E7D8, 0x3A81040F, 0x3A812026, 0x3A813C1B, 0x3A8157F1, 0x3A8173A5, 0x3A818F3A, 0x3A81AAAF, 0x3A81C606, 0x3A81E13D, 0x3A81FC55, 0x3A82174F, 0x3A82322A, 0x3A824CE8, 0x3A826787, 0x3A82820A, 0x3A829C70, 0x3A82B6B8, 0x3A82D0E4, 0x3A82EAF3, 0x3A8304E6, 0x3A831EBF, 0x3A83387C, 0x3A835216, 0x3A836B9F, 0x3A838505, 0x3A839E52, 0x3A83B785, 0x3A83D0A7, 0x3A83E9A6, 0x3A84028C, 0x3A841B58, 0x3A84340A, 0x3A844CA3, 0x3A846521, 0x3A847D86, 0x3A8495D1, 0x3A84AE0B, 0x3A84C62B, 0x3A84DE29, 0x3A84F616, 0x3A850DF1, 0x3A8525AA, 0x3A853D52, 0x3A8554E0, 0x3A856C5D, 0x3A8583B8, 0x3A859B0A, 0x3A85B23A, 0x3A85C958, 0x3A85E05D, 0x3A85F750, 0x3A860E2A, 0x3A8624F3, 0x3A863BA1, 0x3A86523F, 0x3A8668C3, 0x3A867F36, 0x3A86958E, 0x3A86ABD6, 0x3A86C204, 0x3A86D821, 0x3A86EE2C, 0x3A870427, 0x3A871A08, 0x3A872FCE, 0x3A87458D, 0x3A875B31, 0x3A8770C5, 0x3A878647, 0x3A879BAF, 0x3A87B106, 0x3A87C64C, 0x3A87DB81, 0x3A87F0A5, 0x3A8805AF, 0x3A881AA7, 0x3A882F97, 0x3A88446E, 0x3A885933, 0x3A886DDE, 0x3A888281, 0x3A889713, 0x3A88AB93, 0x3A88BFFA, 0x3A88D458, 0x3A88E8A5, 0x3A88FCD8, 0x3A891103, 0x3A89251C, 0x3A89391C, 0x3A894D13, 0x3A8960F8, 0x3A8974CD, 0x3A898891, 0x3A899C43, 0x3A89AFED, 0x3A89C37D, 0x3A89D704, 0x3A89EA71, 0x3A89FDD6, 0x3A8A112A, 0x3A8A2475, 0x3A8A37A7, 0x3A8A4AD0, 0x3A8A5DE7, 0x3A8A70EE, 0x3A8A83E3, 0x3A8A96D0, 0x3A8AA9AB, 0x3A8ABC76, 0x3A8ACF38, 0x3A8AE1E8, 0x3A8AF488, 0x3A8B0716, 0x3A8B199B, 0x3A8B2C10, 0x3A8B3E73, 0x3A8B50CE, 0x3A8B6317, 0x3A8B7558, 0x3A8B8788, 0x3A8B99A7, 0x3A8BABBD, 0x3A8BBDC1, 0x3A8BCFBE, 0x3A8BE1A9, 0x3A8BF383, 0x3A8C0554, 0x3A8C171C, 0x3A8C28D4, 0x3A8C3A7A, 0x3A8C4C18, 0x3A8C5DA4, 0x3A8C6F28, 0x3A8C809B, 0x3A8C9205, 0x3A8CA367, 0x3A8CB4B7, 0x3A8CC5F7, 0x3A8CD72D, 0x3A8CE85B, 0x3A8CF978, 0x3A8D0A8C, 0x3A8D1B90, 0x3A8D2C8A, 0x3A8D3D7C, 0x3A8D4E5D, 0x3A8D5F35, 0x3A8D6FFC, 0x3A8D80BA, 0x3A8D9170, 0x3A8DA215, 0x3A8DB2B9, 0x3A8DC344, 0x3A8DD3CF, 0x3A8DE449, 0x3A8DF4B1, 0x3A8E0519, 0x3A8E1571, 0x3A8E25BF, 0x3A8E35FD, 0x3A8E4632, 0x3A8E565E, 0x3A8E6682, 0x3A8E769D, 0x3A8E86A7, 0x3A8E96A9, 0x3A8EA6A1, 0x3A8EB689, 0x3A8EC668, 0x3A8ED63F, 0x3A8EE60C, 0x3A8EF5D2, 0x3A8F0586, 0x3A8F1531, 0x3A8F24D4, 0x3A8F346E, 0x3A8F4400, 0x3A8F5381, 0x3A8F6301, 0x3A8F7271, 0x3A8F81D7, 0x3A8F9136, 0x3A8FA083, 0x3A8FAFD0, 0x3A8FBF14, 0x3A8FCE47, 0x3A8FDD72, 0x3A8FEC94, 0x3A8FFBAE, 0x3A900ABE, 0x3A9019C7, 0x3A9028BE, 0x3A9037B5, 0x3A9046A3, 0x3A905581, 0x3A906456, 0x3A90732A, 0x3A9081EE, 0x3A9090A9, 0x3A909F5B, 0x3A90AE05, 0x3A90BCA6, 0x3A90CB3F, 0x3A90D9CF, 0x3A90E856, 0x3A90F6D5, 0x3A91054B, 0x3A9113B9, 0x3A91221E, 0x3A91307B, 0x3A913ECF, 0x3A914D11, 0x3A915B54, 0x3A91698E, 0x3A9177C0, 0x3A9185E9, 0x3A919409, 0x3A91A221, 0x3A91B030, 0x3A91BE37, 0x3A91CC35, 0x3A91DA33, 0x3A91E81F, 0x3A91F604, 0x3A9203E8, 0x3A9211BB, 0x3A921F8E, 0x3A922D50, 0x3A923B12, 0x3A9248CB, 0x3A925673, 0x3A92641B, 0x3A9271BB, 0x3A927F52, 0x3A928CE9, 0x3A929A6E, 0x3A92A7F4, 0x3A92B569, 0x3A92C2DD, 0x3A92D049, 0x3A92DDAD, 0x3A92EB07, 0x3A92F85A, 0x3A9305A3, 0x3A9312ED, 0x3A932025, 0x3A932D5E, 0x3A933A8D, 0x3A9347B5, 0x3A9354DC, 0x3A9361F2, 0x3A936F08, 0x3A937C0D, 0x3A938912, 0x3A93960E, 0x3A93A30B, 0x3A93AFF6, 0x3A93BCE1, 0x3A93C9C3, 0x3A93D69D, 0x3A93E36F, 0x3A93F040, 0x3A93FD00, 0x3A9409C0, 0x3A941678, 0x3A94232F, 0x3A942FD6, 0x3A943C7C, 0x3A94491A, 0x3A9455AF, 0x3A946245, 0x3A946EC9, 0x3A947B4D, 0x3A9487D1, 0x3A949444, 0x3A94A0B6, 0x3A94AD21, 0x3A94B982, 0x3A94C5DB, 0x3A94D235, 0x3A94DE85, 0x3A94EACD, 0x3A94F70C, 0x3A95034C, 0x3A950F82, 0x3A951BB9, 0x3A9527DF, 0x3A953404, 0x3A954021, 0x3A954C3E, 0x3A95584A, 0x3A956456, 0x3A957062, 0xBF800000, 0x00000000, 0x391AC8FE, 0x397556DD, 0x399ACBEF, 0x39B3B7B1, 0x39C8148F, 0x39D94C26, 0x39E83648, 0x39F55E35, 0x3A00917F, 0x3A05E437, 0x3A0AC050, 0x3A0F38C9, 0x3A135C6E, 0x3A1736F1, 0x3A1AD1C7, 0x3A1E34AA, 0x3A2165FD, 0x3A246B1F, 0x3A27489A, 0x3A2A024B, 0x3A2C9B88, 0x3A2F1731, 0x3A3177CF, 0x3A33BF93, 0x3A35F073, 0x3A380C29, 0x3A3A143F, 0x3A3C0A15, 0x3A3DEEE9, 0x3A3FC3D7, 0x3A4189E1, 0x3A4341F3, 0x3A44ECE4, 0x3A468B73, 0x3A481E56, 0x3A49A62F, 0x3A4B2396, 0x3A4C9714, 0x3A4E012C, 0x3A4F6253, 0x3A50BAF8, 0x3A520B80, 0x3A53544D, 0x3A5495B6, 0x3A55D010, 0x3A5703A6, 0x3A5830C4, 0x3A5957AC, 0x3A5A789F, 0x3A5B93D9, 0x3A5CA994, 0x3A5DBA05, 0x3A5EC55E, 0x3A5FCBCF, 0x3A60CD87, 0x3A61CAAF, 0x3A62C371, 0x3A63B7F1, 0x3A64A856, 0x3A6594C1, 0x3A667D56, 0x3A676230, 0x3A684371, 0x3A692134, 0x3A69FB95, 0x3A6AD2AC, 0x3A6BA695, 0x3A6C7765, 0x3A6D4535, 0x3A6E1019, 0x3A6ED826, 0x3A6F9D73, 0x3A70600F, 0x3A71200E, 0x3A71DD84, 0x3A72987F, 0x3A735111, 0x3A740749, 0x3A74BB36, 0x3A756CE7, 0x3A761C69, 0x3A76C9CB, 0x3A77751A, 0x3A781E63, 0x3A78C5B0, 0x3A796B0F, 0x3A7A0E8B, 0x3A7AB02C, 0x3A7B5000, 0x3A7BEE10, 0x3A7C8A64, 0x3A7D2509, 0x3A7DBE06, 0x3A7E5565, 0x3A7EEB2F, 0x3A7F7F6B, 0x3A800911, 0x3A8051AE, 0x3A809990, 0x3A80E0BB, 0x3A812733, 0x3A816CFA, 0x3A81B215, 0x3A81F687, 0x3A823A53, 0x3A827D7C, 0x3A82C005, 0x3A8301F1, 0x3A834341, 0x3A8383FB, 0x3A83C423, 0x3A8403B9, 0x3A8442BD, 0x3A848137, 0x3A84BF20, 0x3A84FC87, 0x3A853965, 0x3A8575C3, 0x3A85B19F, 0x3A85ECFB, 0x3A8627D5, 0x3A866238, 0x3A869C22, 0x3A86D59D, 0x3A870E96, 0x3A874720, 0x3A877F3B, 0x3A87B6E5, 0x3A87EE21, 0x3A8824F4, 0x3A885B59, 0x3A889156, 0x3A88C6E3, 0x3A88FC13, 0x3A8930DB, 0x3A896544, 0x3A899946, 0x3A89CCF3, 0x3A8A0038, 0x3A8A331F, 0x3A8A65A8, 0x3A8A97DA, 0x3A8AC9B7, 0x3A8AFB35, 0x3A8B2C5D, 0x3A8B5D30, 0x3A8B8DB5, 0x3A8BBDDB, 0x3A8BEDB4, 0x3A8C1D40, 0x3A8C4C76, 0x3A8C7B5F, 0x3A8CA9F2, 0x3A8CD840, 0x3A8D0641, 0x3A8D33F4, 0x3A8D6163, 0x3A8D8E85, 0x3A8DBB59, 0x3A8DE7E8, 0x3A8E1433, 0x3A8E4039, 0x3A8E6BFA, 0x3A8E9777, 0x3A8EC2AF, 0x3A8EEDAA, 0x3A8F1859, 0x3A8F42CB, 0x3A8F6D01, 0x3A8F96F3, 0x3A8FC0A8, 0x3A8FEA21, 0x3A90135E, 0x3A903C5F, 0x3A90651B, 0x3A908DA4, 0x3A90B5F0, 0x3A90DE09, 0x3A9105DD, 0x3A912D7E, 0x3A9154EB, 0x3A917C1C, 0x3A91A31A, 0x3A91C9DB, 0x3A91F069, 0x3A9216CC, 0x3A923CF3, 0x3A9262DD, 0x3A92889D, 0x3A92AE32, 0x3A92D38A, 0x3A92F8AF, 0x3A931DAA, 0x3A934270, 0x3A93670C, 0x3A938B6B, 0x3A93AFA8, 0x3A93D3B2, 0x3A93F791, 0x3A941B3C, 0x3A943EBC, 0x3A946211, 0x3A948533, 0x3A94A832, 0x3A94CAFE, 0x3A94EDA7, 0x3A95101D, 0x3A953268, 0x3A955490, 0x3A95768E, 0x3A959861, 0x3A95BA08, 0x3A95DB8E, 0x3A95FCE8, 0x3A961E18, 0x3A963F25, 0x3A966007, 0x3A9680BE, 0x3A96A15B, 0x3A96C1CE, 0x3A96E215, 0x3A97023B, 0x3A97223D, 0x3A97421E, 0x3A9761D3, 0x3A978166, 0x3A97A0E0, 0x3A97C02E, 0x3A97DF52, 0x3A97FE5B, 0x3A981D43, 0x3A983C08, 0x3A985AAA, 0x3A98792B, 0x3A989791, 0x3A98B5CD, 0x3A98D3EE, 0x3A98F1EE, 0x3A990FCB, 0x3A992D85, 0x3A994B26, 0x3A9968A5, 0x3A99860A, 0x3A99A34C, 0x3A99C06C, 0x3A99DD72, 0x3A99FA5F, 0x3A9A1729, 0x3A9A33D1, 0x3A9A505F, 0x3A9A6CD3, 0x3A9A8925, 0x3A9AA55D, 0x3A9AC17C, 0x3A9ADD78, 0x3A9AF962, 0x3A9B152B, 0x3A9B30D1, 0x3A9B4C66, 0x3A9B67D9, 0x3A9B833A, 0x3A9B9E79, 0x3A9BB99E, 0x3A9BD4AA, 0x3A9BEF9B, 0x3A9C0A73, 0x3A9C2532, 0x3A9C3FD6, 0x3A9C5A61, 0x3A9C74D1, 0x3A9C8F31, 0x3A9CA96E, 0x3A9CC39B, 0x3A9CDDA4, 0x3A9CF79D, 0x3A9D117C, 0x3A9D2B41, 0x3A9D44F5, 0x3A9D5E8F, 0x3A9D780F, 0x3A9D9176, 0x3A9DAACB, 0x3A9DC407, 0x3A9DDD29, 0x3A9DF639, 0x3A9E0F30, 0x3A9E2816, 0x3A9E40E2, 0x3A9E5994, 0x3A9E7235, 0x3A9E8AC5, 0x3A9EA33B, 0x3A9EBB97, 0x3A9ED3E3, 0x3A9EEC1C, 0x3A9F043D, 0x3A9F1C43, 0x3A9F3441, 0x3A9F4C1C, 0x3A9F63EF, 0x3A9F7BA8, 0x3A9F9350, 0x3A9FAADE, 0x3A9FC264, 0x3A9FD9C7, 0x3A9FF122, 0x3AA00862, 0x3AA01F9B, 0x3AA036B1, 0x3AA04DBE, 0x3AA064BA, 0x3AA07B9C, 0x3AA0926D, 0x3AA0A92D, 0x3AA0BFDC, 0x3AA0D671, 0x3AA0ECFE, 0x3AA10370, 0x3AA119D2, 0x3AA1302B, 0x3AA1466A, 0x3AA15C98, 0x3AA172B5, 0x3AA188C0, 0x3AA19EBB, 0x3AA1B4A4, 0x3AA1CA7C, 0x3AA1E043, 0x3AA1F5F8, 0x3AA20B9D, 0x3AA22139, 0x3AA236BB, 0x3AA24C2C, 0x3AA26194, 0x3AA276E3, 0x3AA28C29, 0x3AA2A155, 0x3AA2B679, 0x3AA2CB8B, 0x3AA2E08D, 0x3AA2F585, 0x3AA30A64, 0x3AA31F3B, 0x3AA33400, 0x3AA348B4, 0x3AA35D57, 0x3AA371F1, 0x3AA3867A, 0x3AA39AF2, 0x3AA3AF58, 0x3AA3C3B6, 0x3AA3D803, 0x3AA3EC3F, 0x3AA4006A, 0x3AA4148C, 0x3AA4289C, 0x3AA43C9C, 0x3AA45093, 0x3AA46479, 0x3AA47856, 0x3AA48C1A, 0x3AA49FDD, 0x3AA4B387, 0x3AA4C728, 0x3AA4DAB8, 0x3AA4EE3F, 0x3AA501B5, 0x3AA51523, 0x3AA5287F, 0x3AA53BD3, 0x3AA54F0D, 0x3AA56247, 0x3AA57570, 0x3AA58888, 0x3AA59B97, 0x3AA5AE95, 0x3AA5C18A, 0x3AA5D46E, 0x3AA5E74A, 0x3AA5FA1D, 0x3AA60CD6, 0x3AA61F8F, 0x3AA63237, 0x3AA644CE, 0x3AA6575C, 0x3AA669E2, 0x3AA67C56, 0x3AA68EC2, 0x3AA6A125, 0x3AA6B377, 0x3AA6C5B8, 0x3AA6D7F1, 0x3AA6EA20, 0x3AA6FC47, 0x3AA70E5D, 0x3AA7206B, 0x3AA73267, 0x3AA7445B, 0x3AA75646, 0x3AA76820, 0x3AA779F1, 0x3AA78BB9, 0x3AA79D71, 0x3AA7AF28, 0x3AA7C0C6, 0x3AA7D264, 0x3AA7E3F0, 0x3AA7F574, 0x3AA806F0, 0x3AA8185A, 0x3AA829BB, 0x3AA83B14, 0x3AA84C65, 0x3AA85DA4, 0x3AA86EDB, 0x3AA88009, 0x3AA8912E, 0x3AA8A24B, 0x3AA8B357, 0x3AA8C45A, 0x3AA8D554, 0x3AA8E63E, 0x3AA8F727, 0x3AA907FF, 0x3AA918CF, 0x3AA92996, 0x3AA93A54, 0x3AA94B0A, 0x3AA95BAE, 0x3AA96C4B, 0x3AA97CDE, 0x3AA98D69, 0x3AA99DEB, 0x3AA9AE65, 0x3AA9BED6, 0x3AA9CF36, 0x3AA9DF96, 0x3AA9EFE4, 0x3AAA002A, 0x3AAA1068, 0x3AAA209D, 0x3AAA30C9, 0x3AAA40ED, 0x3AAA50FF, 0x3AAA6112, 0x3AAA7113, 0x3AAA8115, 0x3AAA9105, 0x3AAAA0F5, 0x3AAAB0D4, 0x3AAAC0AB, 0x3AAAD079, 0x3AAAE047, 0x3AAAF003, 0x3AAAFFB7, 0x3AAB0F63, 0x3AAB1F06, 0x3AAB2EA0, 0x3AAB3E32, 0x3AAB4DBB, 0x3AAB5D3B, 0x3AAB6CB3, 0x3AAB7C23, 0x3AAB8B8A, 0x3AAB9AE8, 0x3AABAA3D, 0x3AABB993, 0x3AABC8D7, 0x3AABD813, 0x3AABE746, 0x3AABF671, 0x3AAC059C, 0x3AAC14B5, 0x3AAC23C6, 0x3AAC32D7, 0x3AAC41D7, 0x3AAC50D6, 0x3AAC5FC5, 0x3AAC6EB3, 0x3AAC7D99, 0x3AAC8C77, 0x3AAC9B4B, 0x3AACAA18, 0x3AACB8DB, 0x3AACC796, 0x3AACD649, 0x3AACE4F2, 0x3AACF39C, 0x3AAD023D, 0x3AAD10CD, 0x3AAD1F5D, 0x3AAD2DE5, 0x3AAD3C64, 0x3AAD4ADA, 0x3AAD5950, 0x3AAD67B5, 0x3AAD761A, 0x3AAD846E, 0x3AAD92C2, 0x3AADA10E, 0x3AADAF59, 0x3AADBD93, 0x3AADCBC4, 0x3AADD9F6, 0x3AADE81F, 0x3AADF63F, 0x3AAE0457, 0x3AAE1266, 0x3AAE2075, 0x3AAE2E7C -glabel D_8007C760 +glabel dead_gCurrentCameraID .word 0xBF800000, 0x00000000, 0x39396DD5, 0x3992F4E5, 0x39B97208, 0x39D74D35, 0x39EFB277, 0x3A02297E, 0x3A0B18AB, 0x3A12FA2B, 0x3A1A06EF, 0x3A206796, 0x3A263A1D, 0x3A2B954B, 0x3A308AD7, 0x3A3528C6, 0x3A397A6C, 0x3A3D890A, 0x3A415C47, 0x3A44FA95, 0x3A48695D, 0x3A4BAD47, 0x3A4ECA4E, 0x3A51C3E9, 0x3A549D18, 0x3A575886, 0x3A59F886, 0x3A5C7F2A, 0x3A5EEE4A, 0x3A61478D, 0x3A638C6F, 0x3A65BE47, 0x3A67DE46, 0x3A69ED8B, 0x3A6BED12, 0x3A6DDDC7, 0x3A6FC07E, 0x3A7195FB, 0x3A735EF3, 0x3A751C0E, 0x3A76CDE5, 0x3A787506, 0x3A7A11F5, 0x3A7BA52D, 0x3A7D2F20, 0x3A7EB039, 0x3A80146E, 0x3A80CCB3, 0x3A818117, 0x3A8231C3, 0x3A82DEDE, 0x3A83888B, 0x3A842EF1, 0x3A84D226, 0x3A85724E, 0x3A860F8A, 0x3A86A9ED, 0x3A874197, 0x3A87D69B, 0x3A886912, 0x3A88F916, 0x3A8986B8, 0x3A8A1212, 0x3A8A9B2D, 0x3A8B2221, 0x3A8BA6F9, 0x3A8C29CD, 0x3A8CAAA6, 0x3A8D299F, 0x3A8DA6B6, 0x3A8E21FD, 0x3A8E9B8F, 0x3A8F136A, 0x3A8F8998, 0x3A8FFE32, 0x3A907138, 0x3A90E2B3, 0x3A9152BD, 0x3A91C14D, 0x3A922E7C, 0x3A929A43, 0x3A9304BB, 0x3A936DDB, 0x3A93D5BE, 0x3A943C5A, 0x3A94A1C9, 0x3A950603, 0x3A956911, 0x3A95CB03, 0x3A962BDA, 0x3A968B9D, 0x3A96EA4E, 0x3A9747F4, 0x3A97A499, 0x3A980045, 0x3A985AEF, 0x3A98B4B1, 0x3A990D7A, 0x3A996564, 0x3A99BC65, 0x3A9A1288, 0x3A9A67CB, 0x3A9ABC37, 0x3A9B0FD5, 0x3A9B62A5, 0x3A9BB4A7, 0x3A9C05E3, 0x3A9C565A, 0x3A9CA613, 0x3A9CF510, 0x3A9D4350, 0x3A9D90E4, 0x3A9DDDBB, 0x3A9E29EF, 0x3A9E756E, 0x3A9EC04A, 0x3A9F0A7A, 0x3A9F5410, 0x3A9F9CFA, 0x3A9FE552, 0x3AA02D07, 0x3AA07429, 0x3AA0BAB1, 0x3AA100A7, 0x3AA1460B, 0x3AA18AE6, 0x3AA1CF2E, 0x3AA212ED, 0x3AA25623, 0x3AA298D8, 0x3AA2DB03, 0x3AA31CAE, 0x3AA35DE0, 0x3AA39E91, 0x3AA3DEC2, 0x3AA41E7A, 0x3AA45DBA, 0x3AA49C82, 0x3AA4DADA, 0x3AA518BA, 0x3AA5562A, 0x3AA5932B, 0x3AA5CFBB, 0x3AA60BE5, 0x3AA6479F, 0x3AA682EA, 0x3AA6BDD6, 0x3AA6F852, 0x3AA73270, 0x3AA76C26, 0x3AA7A57F, 0x3AA7DE70, 0x3AA81702, 0x3AA84F36, 0x3AA8870C, 0x3AA8BE83, 0x3AA8F5A4, 0x3AA92C67, 0x3AA962D4, 0x3AA998E3, 0x3AA9CEA4, 0x3AAA0406, 0x3AAA391B, 0x3AAA6DDB, 0x3AAAA244, 0x3AAAD660, 0x3AAB0A27, 0x3AAB3DA0, 0x3AAB70CB, 0x3AABA3AA, 0x3AABD63B, 0x3AAC087E, 0x3AAC3A7D, 0x3AAC6C2F, 0x3AAC9D94, 0x3AACCEB3, 0x3AACFF86, 0x3AAD301C, 0x3AAD6065, 0x3AAD9069, 0x3AADC028, 0x3AADEFA3, 0x3AAE1ED9, 0x3AAE4DD3, 0x3AAE7C88, 0x3AAEAB01, 0x3AAED936, 0x3AAF0725, 0x3AAF34E1, 0x3AAF6259, 0x3AAF8F94, 0x3AAFBC93, 0x3AAFE956, 0x3AB015DD, 0x3AB04228, 0x3AB06E36, 0x3AB09A11, 0x3AB0C5B0, 0x3AB0F113, 0x3AB11C42, 0x3AB14735, 0x3AB171F5, 0x3AB19C81, 0x3AB1C6D9, 0x3AB1F0F6, 0x3AB21ADF, 0x3AB24494, 0x3AB26E16, 0x3AB29764, 0x3AB2C07F, 0x3AB2E96E, 0x3AB31222, 0x3AB33AAA, 0x3AB36300, 0x3AB38B2A, 0x3AB3B320, 0x3AB3DAE3, 0x3AB4027C, 0x3AB429E0, 0x3AB45122, 0x3AB47828, 0x3AB49F0C, 0x3AB4C5BC, 0x3AB4EC42, 0x3AB5129C, 0x3AB538CB, 0x3AB55ED0, 0x3AB584A9, 0x3AB5AA58, 0x3AB5CFDB, 0x3AB5F534, 0x3AB61A61, 0x3AB63F6D, 0x3AB66444, 0x3AB688FA, 0x3AB6AD8D, 0x3AB6D1EC, 0x3AB6F632, 0x3AB71A44, 0x3AB73E34, 0x3AB76201, 0x3AB785A4, 0x3AB7A924, 0x3AB7CC79, 0x3AB7EFB5, 0x3AB812BD, 0x3AB835AB, 0x3AB8586E, 0x3AB87B0F, 0x3AB89D96, 0x3AB8BFE9, 0x3AB8E223, 0x3AB9043A, 0x3AB9262F, 0x3AB947FA, 0x3AB969AA, 0x3AB98B38, 0x3AB9ACA3, 0x3AB9CDED, 0x3AB9EF13, 0x3ABA1020, 0x3ABA310B, 0x3ABA51CB, 0x3ABA727A, 0x3ABA92FD, 0x3ABAB367, 0x3ABAD3AF, 0x3ABAF3DC, 0x3ABB13E8, 0x3ABB33D1, 0x3ABB53A0, 0x3ABB7356, 0x3ABB92E9, 0x3ABBB259, 0x3ABBD1B0, 0x3ABBF0EE, 0x3ABC1009, 0x3ABC2F0A, 0x3ABC4DF1, 0x3ABC6CB6, 0x3ABC8B61, 0x3ABCA9F3, 0x3ABCC862, 0x3ABCE6C0, 0x3ABD04FB, 0x3ABD231D, 0x3ABD411C, 0x3ABD5F0A, 0x3ABD7CDF, 0x3ABD9A91, 0x3ABDB832, 0x3ABDD5B0, 0x3ABDF31E, 0x3ABE1069, 0x3ABE2D9A, 0x3ABE4ABA, 0x3ABE67B8, 0x3ABE84A4, 0x3ABEA177, 0x3ABEBE30, 0x3ABEDACF, 0x3ABEF755, 0x3ABF13C0, 0x3ABF301B, 0x3ABF4C53, 0x3ABF687A, 0x3ABF8490, 0x3ABFA083, 0x3ABFBC65, 0x3ABFD82E, 0x3ABFF3E5, 0x3AC00F7A, 0x3AC02B06, 0x3AC04670, 0x3AC061C9, 0x3AC07D08, 0x3AC09836, 0x3AC0B34A, 0x3AC0CE4D, 0x3AC0E936, 0x3AC1040E, 0x3AC11ECC, 0x3AC13971, 0x3AC1540D, 0x3AC16E86, 0x3AC188F7, 0x3AC1A34E, 0x3AC1BD8B, 0x3AC1D7B7, 0x3AC1F1D2, 0x3AC20BD4, 0x3AC225C4, 0x3AC23FA2, 0x3AC25968, 0x3AC2731B, 0x3AC28CBE, 0x3AC2A650, 0x3AC2BFC7, 0x3AC2D92E, 0x3AC2F27B, 0x3AC30BBF, 0x3AC324E9, 0x3AC33E03, 0x3AC3570B, 0x3AC37002, 0x3AC388E8, 0x3AC3A1B3, 0x3AC3BA77, 0x3AC3D320, 0x3AC3EBB9, 0x3AC40440, 0x3AC41CB6, 0x3AC4351B, 0x3AC44D66, 0x3AC465A9, 0x3AC47DDA, 0x3AC495F2, 0x3AC4AE01, 0x3AC4C5FE, 0x3AC4DDE2, 0x3AC4F5BE, 0x3AC50D88, 0x3AC52539, 0x3AC53CE1, 0x3AC55477, 0x3AC56BFD, 0x3AC58371, 0x3AC59AD4, 0x3AC5B226, 0x3AC5C970, 0x3AC5E09F, 0x3AC5F7C6, 0x3AC60ED4, 0x3AC625D8, 0x3AC63CCC, 0x3AC653B7, 0x3AC66A88, 0x3AC68151, 0x3AC697FF, 0x3AC6AEA6, 0x3AC6C543, 0x3AC6DBC7, 0x3AC6F242, 0x3AC708AC, 0x3AC71F05, 0x3AC7354D, 0x3AC74B8C, 0x3AC761BA, 0x3AC777D7, 0x3AC78DEB, 0x3AC7A3EE, 0x3AC7B9E0, 0x3AC7CFC9, 0x3AC7E5A1, 0x3AC7FB68, 0x3AC81126, 0x3AC826D3, 0x3AC83C6F, 0x3AC85203, 0x3AC86785, 0x3AC87CF6, 0x3AC8925E, 0x3AC8A7BE, 0x3AC8BD0C, 0x3AC8D24A, 0x3AC8E776, 0x3AC8FC9A, 0x3AC911B5, 0x3AC926BF, 0x3AC93BB7, 0x3AC950A8, 0x3AC9658F, 0x3AC97A65, 0x3AC98F2B, 0x3AC9A3E7, 0x3AC9B893, 0x3AC9CD35, 0x3AC9E1D0, 0x3AC9F659, 0x3ACA0AD1, 0x3ACA1F40, 0x3ACA33A7, 0x3ACA47FC, 0x3ACA5C49, 0x3ACA7085, 0x3ACA84B8, 0x3ACA98DA, 0x3ACAACF3, 0x3ACAC104, 0x3ACAD504, 0x3ACAE8FB, 0x3ACAFCE9, 0x3ACB10C6, 0x3ACB2492, 0x3ACB385E, 0x3ACB4C19, 0x3ACB5FC3, 0x3ACB736D, 0x3ACB8705, 0x3ACB9A8C, 0x3ACBAE14, 0x3ACBC18A, 0x3ACBD4F8, 0x3ACBE854, 0x3ACBFBA8, 0x3ACC0EF3, 0x3ACC222D, 0x3ACC3567, 0x3ACC4890, 0x3ACC5BA8, 0x3ACC6EBF, 0x3ACC81C6, 0x3ACC94C4, 0x3ACCA7B0, 0x3ACCBA9D, 0x3ACCCD79, 0x3ACCE04C, 0x3ACCF30D, 0x3ACD05CF, 0x3ACD1880, 0x3ACD2B28, 0x3ACD3DC7, 0x3ACD505E, 0x3ACD62E4, 0x3ACD7561, 0x3ACD87D5, 0x3ACD9A41, 0x3ACDACA4, 0x3ACDBEFF, 0x3ACDD148, 0x3ACDE389, 0x3ACDF5C2, 0x3ACE07F1, 0x3ACE1A19, 0x3ACE2C2F, 0x3ACE3E45, 0x3ACE5049, 0x3ACE6246, 0x3ACE7439, 0x3ACE8624, 0x3ACE9807, 0x3ACEA9E0, 0x3ACEBBB2, 0x3ACECD72, 0x3ACEDF32, 0x3ACEF0E1, 0x3ACF0287, 0x3ACF142D, 0x3ACF25C3, 0x3ACF374F, 0x3ACF48D3, 0x3ACF5A4E, 0x3ACF6BB9, 0x3ACF7D23, 0x3ACF8E84, 0x3ACF9FDD, 0x3ACFB125, 0x3ACFC26D, 0x3ACFD3A4, 0x3ACFE4DA, 0x3ACFF608, 0x3AD00725, 0x3AD01842, 0x3AD0294E, 0x3AD03A51, 0x3AD04B54, 0x3AD05C46, 0x3AD06D38, 0x3AD07E18, 0x3AD08EF9, 0x3AD09FC9, 0x3AD0B098, 0xBF800000, 0x00000000, 0x3967339A, 0x39B73C13, 0x39E73A1D, 0x3A063A58, 0x3A15701D, 0x3A224C6B, 0x3A2D707C, 0x3A374447, 0x3A400ED0, 0x3A4802BE, 0x3A4F4571, 0x3A55F356, 0x3A5C227B, 0x3A61E465, 0x3A67472C, 0x3A6C565C, 0x3A711B86, 0x3A759EAA, 0x3A79E68F, 0x3A7DF8FD, 0x3A80ED77, 0x3A82C859, 0x3A848F02, 0x3A864326, 0x3A87E624, 0x3A89795D, 0x3A8AFDE4, 0x3A8C74D4, 0x3A8DDF04, 0x3A8F3D5B, 0x3A90908F, 0x3A91D953, 0x3A93184B, 0x3A944E09, 0x3A957B05, 0x3A969FC8, 0x3A97BCB9, 0x3A98D241, 0x3A99E0C5, 0x3A9AE89C, 0x3A9BEA1B, 0x3A9CE587, 0x3A9DDB2E, 0x3A9ECB54, 0x3A9FB62D, 0x3AA09BFE, 0x3AA17CF0, 0x3AA2594B, 0x3AA3312E, 0x3AA404C6, 0x3AA4D446, 0x3AA59FD1, 0x3AA66791, 0x3AA72BA8, 0x3AA7EC32, 0x3AA8A957, 0x3AA96333, 0x3AAA19DE, 0x3AAACD7C, 0x3AAB7E1E, 0x3AAC2BE5, 0x3AACD6E3, 0x3AAD7F2A, 0x3AAE24DB, 0x3AAEC808, 0x3AAF68B9, 0x3AB00711, 0x3AB0A30F, 0x3AB13CD7, 0x3AB1D470, 0x3AB269E4, 0x3AB2FD54, 0x3AB38EB8, 0x3AB41E2A, 0x3AB4ABBB, 0x3AB5376B, 0x3AB5C154, 0x3AB6497E, 0x3AB6CFE9, 0x3AB754AF, 0x3AB7D7D1, 0x3AB8595E, 0x3AB8D958, 0x3AB957D9, 0x3AB9D4D6, 0x3ABA506B, 0x3ABACA8E, 0x3ABB4351, 0x3ABBBABD, 0x3ABC30D9, 0x3ABCA5A7, 0x3ABD192E, 0x3ABD8B80, 0x3ABDFC9D, 0x3ABE6C84, 0x3ABEDB48, 0x3ABF48E7, 0x3ABFB56B, 0x3AC020D3, 0x3AC08B31, 0x3AC0F47C, 0x3AC15CC6, 0x3AC1C405, 0x3AC22A4B, 0x3AC28FA1, 0x3AC2F3FD, 0x3AC35769, 0x3AC3B9ED, 0x3AC41B8A, 0x3AC47C46, 0x3AC4DC24, 0x3AC53B22, 0x3AC59952, 0x3AC5F6AB, 0x3AC65336, 0x3AC6AEF3, 0x3AC709EA, 0x3AC7641C, 0x3AC7BD91, 0x3AC81649, 0x3AC86E3B, 0x3AC8C581, 0x3AC91C0B, 0x3AC971E8, 0x3AC9C711, 0x3ACA1B98, 0x3ACA6F69, 0x3ACAC298, 0x3ACB1523, 0x3ACB670B, 0x3ACBB858, 0x3ACC0903, 0x3ACC5912, 0x3ACCA890, 0x3ACCF773, 0x3ACD45BB, 0x3ACD937A, 0x3ACDE0A7, 0x3ACE2D4A, 0x3ACE795B, 0x3ACEC4EC, 0x3ACF0FEA, 0x3ACF5A68, 0x3ACFA465, 0x3ACFEDE1, 0x3AD036D3, 0x3AD07F4E, 0x3AD0C747, 0x3AD10EC8, 0x3AD155D1, 0x3AD19C62, 0x3AD1E27A, 0x3AD2281A, 0x3AD26D4B, 0x3AD2B20B, 0x3AD2F65D, 0x3AD33A35, 0x3AD37DA7, 0x3AD3C0B2, 0x3AD4034D, 0x3AD44578, 0x3AD48745, 0x3AD4C8A2, 0x3AD509A1, 0x3AD54A39, 0x3AD58A69, 0x3AD5CA3B, 0x3AD609AF, 0x3AD648C4, 0x3AD68772, 0x3AD6C5CA, 0x3AD703C4, 0x3AD7415F, 0x3AD77EA4, 0x3AD7BB8B, 0x3AD7F81B, 0x3AD83456, 0x3AD8703B, 0x3AD8ABCB, 0x3AD8E704, 0x3AD921E7, 0x3AD95C7D, 0x3AD996BD, 0x3AD9D0B0, 0x3ADA0A4D, 0x3ADA43A5, 0x3ADA7CA8, 0x3ADAB55D, 0x3ADAEDC4, 0x3ADB25E7, 0x3ADB5DB4, 0x3ADB953D, 0x3ADBCC80, 0x3ADC0377, 0x3ADC3A28, 0x3ADC708C, 0x3ADCA6AC, 0x3ADCDC87, 0x3ADD121D, 0x3ADD476E, 0x3ADD7C7B, 0x3ADDB14C, 0x3ADDE5CF, 0x3ADE1A16, 0x3ADE4E21, 0x3ADE81E7, 0x3ADEB569, 0x3ADEE8AE, 0x3ADF1BB7, 0x3ADF4E85, 0x3ADF810D, 0x3ADFB359, 0x3ADFE572, 0x3AE01746, 0x3AE048E7, 0x3AE07A43, 0x3AE0AB6B, 0x3AE0DC57, 0x3AE10D0F, 0x3AE13D8C, 0x3AE16DCC, 0x3AE19DD9, 0x3AE1CDB2, 0x3AE1FD4F, 0x3AE22CB9, 0x3AE25BEF, 0x3AE28AE9, 0x3AE2B9AF, 0x3AE2E84B, 0x3AE316AA, 0x3AE344D6, 0x3AE372D7, 0x3AE3A09B, 0x3AE3CE35, 0x3AE3FB9B, 0x3AE428CE, 0x3AE455D5, 0x3AE482AA, 0x3AE4AF4A, 0x3AE4DBC0, 0x3AE50802, 0x3AE53419, 0x3AE56005, 0x3AE58BBE, 0x3AE5B74C, 0x3AE5E2A6, 0x3AE60DDE, 0x3AE638E2, 0x3AE663BC, 0x3AE68E6A, 0x3AE6B8ED, 0x3AE6E346, 0x3AE70D73, 0x3AE73776, 0x3AE7614E, 0x3AE78AFA, 0x3AE7B47C, 0x3AE7DDDB, 0x3AE80710, 0x3AE83019, 0x3AE858F8, 0x3AE881B4, 0x3AE8AA45, 0x3AE8D2B4, 0x3AE8FAF8, 0x3AE9231A, 0x3AE94B10, 0x3AE972E5, 0x3AE99A8E, 0x3AE9C215, 0x3AE9E971, 0x3AEA10B3, 0x3AEA37CA, 0x3AEA5EBF, 0x3AEA8589, 0x3AEAAC39, 0x3AEAD2BF, 0x3AEAF922, 0x3AEB1F62, 0x3AEB4580, 0x3AEB6B7C, 0x3AEB9155, 0x3AEBB70D, 0x3AEBDCA1, 0x3AEC0214, 0x3AEC2764, 0x3AEC4C91, 0x3AEC71A5, 0x3AEC968E, 0x3AECBB5D, 0x3AECE00A, 0x3AED049D, 0x3AED2905, 0x3AED4D53, 0x3AED7188, 0x3AED9592, 0x3AEDB981, 0x3AEDDD57, 0x3AEE010B, 0x3AEE249C, 0x3AEE4814, 0x3AEE6B69, 0x3AEE8EA5, 0x3AEEB1C6, 0x3AEED4C6, 0x3AEEF7A3, 0x3AEF1A6E, 0x3AEF3D18, 0x3AEF5F9F, 0x3AEF820C, 0x3AEFA460, 0x3AEFC699, 0x3AEFE8B1, 0x3AF00AB7, 0x3AF02C9B, 0x3AF04E5C, 0x3AF0700C, 0x3AF0919A, 0x3AF0B317, 0x3AF0D472, 0x3AF0F5B2, 0x3AF116D9, 0x3AF137E6, 0x3AF158D9, 0x3AF179B3, 0x3AF19A73, 0x3AF1BB19, 0x3AF1DBA5, 0x3AF1FC17, 0x3AF21C70, 0x3AF23CB8, 0x3AF25CDD, 0x3AF27CE8, 0x3AF29CE2, 0x3AF2BCC3, 0x3AF2DC8A, 0x3AF2FC36, 0x3AF31BCA, 0x3AF33B4C, 0x3AF35AB4, 0x3AF37A02, 0x3AF39937, 0x3AF3B85A, 0x3AF3D764, 0x3AF3F654, 0x3AF41533, 0x3AF433F8, 0x3AF452A3, 0x3AF4713D, 0x3AF48FBD, 0x3AF4AE2C, 0x3AF4CC81, 0x3AF4EABD, 0x3AF508E7, 0x3AF52700, 0x3AF544F7, 0x3AF562E5, 0x3AF580BA, 0x3AF59E75, 0x3AF5BC1E, 0x3AF5D9B6, 0x3AF5F735, 0x3AF6149A, 0x3AF631F6, 0x3AF64F30, 0x3AF66C61, 0x3AF68978, 0x3AF6A67F, 0x3AF6C36B, 0x3AF6E047, 0x3AF6FD11, 0x3AF719CA, 0x3AF73669, 0x3AF752F7, 0x3AF76F6B, 0x3AF78BD7, 0x3AF7A829, 0x3AF7C46A, 0x3AF7E091, 0x3AF7FCAF, 0x3AF818B4, 0x3AF834A7, 0x3AF85089, 0x3AF86C5A, 0x3AF8881A, 0x3AF8A3C0, 0x3AF8BF5E, 0x3AF8DAE1, 0x3AF8F654, 0x3AF911B5, 0x3AF92D06, 0x3AF94845, 0x3AF96373, 0x3AF97E8F, 0x3AF99992, 0x3AF9B48C, 0x3AF9CF76, 0x3AF9EA45, 0x3AFA050C, 0x3AFA1FC1, 0x3AFA3A5D, 0x3AFA54F0, 0x3AFA6F72, 0x3AFA89E3, 0x3AFAA443, 0x3AFABE91, 0x3AFAD8CF, 0x3AFAF2FB, 0x3AFB0D16, 0x3AFB2720, 0x3AFB4121, 0x3AFB5B08, 0x3AFB74E7, 0x3AFB8EB5, 0x3AFBA871, 0x3AFBC21D, 0x3AFBDBB7, 0x3AFBF548, 0x3AFC0EC0, 0x3AFC282F, 0x3AFC418D, 0x3AFC5ADA, 0x3AFC741E, 0x3AFC8D51, 0x3AFCA673, 0x3AFCBF84, 0x3AFCD883, 0x3AFCF17A, 0x3AFD0A60, 0x3AFD2334, 0x3AFD3C00, 0x3AFD54BB, 0x3AFD6D65, 0x3AFD85FD, 0x3AFD9E8D, 0x3AFDB70C, 0x3AFDCF79, 0x3AFDE7DE, 0x3AFE0032, 0x3AFE187D, 0x3AFE30B7, 0x3AFE48E0, 0x3AFE60F7, 0x3AFE7906, 0x3AFE910C, 0x3AFEA8F9, 0x3AFEC0E6, 0x3AFED8B9, 0x3AFEF083, 0x3AFF083C, 0x3AFF1FEC, 0x3AFF3794, 0x3AFF4F22, 0x3AFF66A8, 0x3AFF7E25, 0x3AFF9591, 0x3AFFACF4, 0x3AFFC446, 0x3AFFDB87, 0x3AFFF2BF, 0x3B0004F7, 0x3B001087, 0x3B001C11, 0x3B002794, 0x3B00330E, 0x3B003E83, 0x3B0049F4, 0x3B00555D, 0x3B0060C1, 0x3B006C21, 0x3B007774, 0x3B0082C7, 0x3B008E12, 0x3B009958, 0x3B00A496, 0x3B00AFCF, 0x3B00BB00, 0x3B00C62C, 0x3B00D154, 0x3B00DC74, 0x3B00E78F, 0x3B00F2A2, 0x3B00FDB0, 0x3B0108BA, 0x3B0113C0, 0x3B011EBD, 0x3B0129B2, 0x3B0134A7, 0x3B013F93, 0x3B014A7A, 0x3B015559, 0x3B016034, 0x3B016B0B, 0x3B0175D9, 0x3B0180A7, 0x3B018B68, 0x3B019629, 0x3B01A0E1, 0x3B01AB96, 0x3B01B645, 0x3B01C0F1, 0x3B01CB94, 0x3B01D633, 0x3B01E0CD, 0x3B01EB5F, 0x3B01F5ED, 0x3B020076, 0x3B020AFB, 0x3B021577, 0x3B021FF3, 0xBF800000, 0x00000000, 0x3B8E43B4, 0x3BE1C520, 0x3C0E92C4, 0x3C25A35D, 0x3C3881DC, 0x3C487A58, 0x3C565313, 0x3C628C3C, 0x3C6D7D51, 0x3C7764C6, 0x3C803864, 0x3C84623A, 0x3C883D81, 0x3C8BD50B, 0x3C8F3191, 0x3C925A3B, 0x3C9554F1, 0x3C9826A8, 0x3C9AD391, 0x3C9D5F41, 0x3C9FCCCF, 0x3CA21EE4, 0x3CA457D9, 0x3CA679B2, 0x3CA8864C, 0x3CAA7F30, 0x3CAC65DA, 0x3CAE3B87, 0x3CB00160, 0x3CB1B86F, 0x3CB361A7, 0x3CB4FDD9, 0x3CB68DD1, 0x3CB81245, 0x3CB98BD8, 0x3CBAFB23, 0x3CBC60AE, 0x3CBDBCFF, 0x3CBF1091, 0x3CC05BCB, 0x3CC19F17, 0x3CC2DAD1, 0x3CC40F54, 0x3CC53CF6, 0x3CC663FD, 0x3CC784B9, 0x3CC89F6C, 0x3CC9B454, 0x3CCAC3A8, 0x3CCBCDA9, 0x3CCCD286, 0x3CCDD271, 0x3CCECD9E, 0x3CCFC433, 0x3CD0B661, 0x3CD1A44D, 0x3CD28E1D, 0x3CD373F0, 0x3CD455EE, 0x3CD53435, 0x3CD60EE5, 0x3CD6E61B, 0x3CD7B9F0, 0x3CD88A86, 0x3CD957F0, 0x3CDA224B, 0x3CDAE9A6, 0x3CDBAE1C, 0x3CDC6FC8, 0x3CDD2EB5, 0x3CDDEAFD, 0x3CDEA4B1, 0x3CDF5BE0, 0x3CE0109C, 0x3CE0C2F9, 0x3CE17307, 0x3CE220D2, 0x3CE2CC68, 0x3CE375DC, 0x3CE41D36, 0x3CE4C282, 0x3CE565D6, 0x3CE60736, 0x3CE6A6AD, 0x3CE74452, 0x3CE7E01E, 0x3CE87A2D, 0x3CE9127E, 0x3CE9A91C, 0x3CEA3E12, 0x3CEAD16A, 0x3CEB6330, 0x3CEBF369, 0x3CEC821F, 0x3CED0F52, 0x3CED9B19, 0x3CEE256D, 0x3CEEAE5E, 0x3CEF35F3, 0x3CEFBC2B, 0x3CF0411B, 0x3CF0C4B9, 0x3CF1471A, 0x3CF1C83A, 0x3CF24821, 0x3CF2C6D7, 0x3CF34466, 0x3CF3C0C7, 0x3CF43C0D, 0x3CF4B635, 0x3CF52F47, 0x3CF5A747, 0x3CF61E3A, 0x3CF69426, 0x3CF7090B, 0x3CF77CF4, 0x3CF7EFE1, 0x3CF861D6, 0x3CF8D2DA, 0x3CF942ED, 0x3CF9B218, 0x3CFA205D, 0x3CFA8DBB, 0x3CFAFA3C, 0x3CFB65E2, 0x3CFBD0AB, 0x3CFC3AA4, 0x3CFCA3CA, 0x3CFD0C20, 0x3CFD73A9, 0x3CFDDA6C, 0x3CFE406D, 0x3CFEA5A8, 0x3CFF0A21, 0x3CFF6DE4, 0x3CFFD0E6, 0x3D00199B, 0x3D004A68, 0x3D007ADA, 0x3D00AAF6, 0x3D00DABC, 0x3D010A2C, 0x3D013948, 0x3D016812, 0x3D019688, 0x3D01C4AE, 0x3D01F286, 0x3D022010, 0x3D024D4A, 0x3D027A39, 0x3D02A6DC, 0x3D02D334, 0x3D02FF44, 0x3D032B0B, 0x3D035689, 0x3D0381C2, 0x3D03ACB3, 0x3D03D760, 0x3D0401CA, 0x3D042BF1, 0x3D0455D5, 0x3D047F76, 0x3D04A8D9, 0x3D04D1FA, 0x3D04FADC, 0x3D052380, 0x3D054BE7, 0x3D057410, 0x3D059BFC, 0x3D05C3AC, 0x3D05EB24, 0x3D061261, 0x3D063962, 0x3D06602C, 0x3D0686BD, 0x3D06AD18, 0x3D06D33B, 0x3D06F926, 0x3D071EDE, 0x3D074460, 0x3D0769AC, 0x3D078EC5, 0x3D07B3AB, 0x3D07D85E, 0x3D07FCDF, 0x3D08212C, 0x3D08454C, 0x3D086938, 0x3D088CF4, 0x3D08B080, 0x3D08D3DF, 0x3D08F70D, 0x3D091A0D, 0x3D093CE0, 0x3D095F85, 0x3D0981FC, 0x3D09A449, 0x3D09C66B, 0x3D09E85E, 0x3D0A0A27, 0x3D0A2BC8, 0x3D0A4D3B, 0x3D0A6E86, 0x3D0A8FA9, 0x3D0AB0A0, 0x3D0AD170, 0x3D0AF217, 0x3D0B1298, 0x3D0B32EF, 0x3D0B5320, 0x3D0B732B, 0x3D0B930E, 0x3D0BB2CE, 0x3D0BD266, 0x3D0BF1D9, 0x3D0C1128, 0x3D0C3052, 0x3D0C4F56, 0x3D0C6E38, 0x3D0C8CF6, 0x3D0CAB8F, 0x3D0CCA08, 0x3D0CE85B, 0x3D0D068E, 0x3D0D249E, 0x3D0D428E, 0x3D0D605B, 0x3D0D7E05, 0x3D0D9B92, 0x3D0DB8FB, 0x3D0DD645, 0x3D0DF370, 0x3D0E1079, 0x3D0E2D65, 0x3D0E4A30, 0x3D0E66DB, 0x3D0E8369, 0x3D0E9FD9, 0x3D0EBC2B, 0x3D0ED85D, 0x3D0EF472, 0x3D0F106C, 0x3D0F2C46, 0x3D0F4804, 0x3D0F63A6, 0x3D0F7F29, 0x3D0F9A92, 0x3D0FB5DE, 0x3D0FD10E, 0x3D0FEC24, 0x3D10071C, 0x3D1021F9, 0x3D103CBE, 0x3D105766, 0x3D1071F3, 0x3D108C68, 0x3D10A6C1, 0x3D10C100, 0x3D10DB27, 0x3D10F533, 0x3D110F24, 0x3D112900, 0x3D1142C0, 0x3D115C69, 0x3D1175F7, 0x3D118F6F, 0x3D11A8CD, 0x3D11C215, 0x3D11DB42, 0x3D11F459, 0x3D120D59, 0x3D122643, 0x3D123F15, 0x3D1257CE, 0x3D127070, 0x3D1288FF, 0x3D12A175, 0x3D12B9D4, 0x3D12D21D, 0x3D12EA50, 0x3D13026E, 0x3D131A77, 0x3D13326A, 0x3D134A47, 0x3D136210, 0x3D1379C2, 0x3D13915F, 0x3D13A8E7, 0x3D13C05C, 0x3D13D7BB, 0x3D13EF08, 0x3D14063F, 0x3D141D61, 0x3D143470, 0x3D144B6C, 0x3D146253, 0x3D147926, 0x3D148FE7, 0x3D14A693, 0x3D14BD2E, 0x3D14D3B4, 0x3D14EA28, 0x3D150088, 0x3D1516D6, 0x3D152D13, 0x3D15433B, 0x3D155953, 0x3D156F58, 0x3D15854B, 0x3D159B2A, 0x3D15B0FA, 0x3D15C6B6, 0x3D15DC60, 0x3D15F1FA, 0x3D160784, 0x3D161CFB, 0x3D163261, 0x3D1647B5, 0x3D165CF9, 0x3D16722D, 0x3D16874E, 0x3D169C5F, 0x3D16B160, 0x3D16C650, 0x3D16DB31, 0x3D16F001, 0x3D1704C2, 0x3D17196F, 0x3D172E0F, 0x3D17429F, 0x3D17571F, 0x3D176B8F, 0x3D177FF1, 0x3D179441, 0x3D17A883, 0x3D17BCB5, 0x3D17D0DA, 0x3D17E4EE, 0x3D17F8F3, 0x3D180CE7, 0x3D1820D1, 0x3D1834A7, 0x3D184871, 0x3D185C2D, 0x3D186FD9, 0x3D188377, 0x3D189708, 0x3D18AA89, 0x3D18BDFC, 0x3D18D163, 0x3D18E4B8, 0x3D18F801, 0x3D190B3C, 0x3D191E6A, 0x3D19318A, 0x3D19449D, 0x3D1957A2, 0x3D196A98, 0x3D197D82, 0x3D19905F, 0x3D19A32C, 0x3D19B5EF, 0x3D19C8A4, 0x3D19DB4B, 0x3D19EDE5, 0x3D1A0074, 0x3D1A12F4, 0x3D1A2568, 0x3D1A37CF, 0x3D1A4A2B, 0x3D1A5C7A, 0x3D1A6EBC, 0x3D1A80F0, 0x3D1A9319, 0x3D1AA535, 0x3D1AB746, 0x3D1AC94A, 0x3D1ADB43, 0x3D1AED2E, 0x3D1AFF0F, 0x3D1B10E3, 0x3D1B22AB, 0x3D1B3467, 0x3D1B461A, 0x3D1B57BD, 0x3D1B6958, 0x3D1B7AE5, 0x3D1B8C68, 0x3D1B9DDE, 0x3D1BAF4B, 0x3D1BC0AB, 0x3D1BD200, 0x3D1BE348, 0x3D1BF488, 0x3D1C05BA, 0x3D1C16E5, 0x3D1C2801, 0x3D1C3914, 0x3D1C4A1B, 0x3D1C5B18, 0x3D1C6C0C, 0x3D1C7CF3, 0x3D1C8DD0, 0x3D1C9EA2, 0x3D1CAF69, 0x3D1CC027, 0x3D1CD0D9, 0x3D1CE182, 0x3D1CF21E, 0x3D1D02B2, 0x3D1D133C, 0x3D1D23BD, 0x3D1D3431, 0x3D1D449C, 0x3D1D54FD, 0x3D1D6553, 0x3D1D75A2, 0x3D1D85E2, 0x3D1D961E, 0x3D1DA64C, 0x3D1DB672, 0x3D1DC68D, 0x3D1DD6A0, 0x3D1DE6A8, 0x3D1DF6A6, 0x3D1E069B, 0x3D1E1689, 0x3D1E266C, 0x3D1E3644, 0x3D1E4614, 0x3D1E55D9, 0x3D1E6596, 0x3D1E754C, 0x3D1E84F6, 0x3D1E9498, 0x3D1EA430, 0x3D1EB3C0, 0x3D1EC344, 0x3D1ED2C4, 0x3D1EE236, 0x3D1EF1A3, 0x3D1F0105, 0x3D1F105E, 0x3D1F1FB0, 0x3D1F2EF7, 0x3D1F3E39, 0x3D1F4D6D, 0x3D1F5C9C, 0x3D1F6BC3, 0x3D1F7ADF, 0x3D1F89F4, 0x3D1F9900, 0x3D1FA804, 0x3D1FB700, 0x3D1FC5F3, 0x3D1FD4DD, 0x3D1FE3C0, 0x3D1FF299, 0x3D20016A, 0x3D201033, 0x3D201EF7, 0x3D202DB0, 0x3D203C61, 0x3D204B09, 0x3D2059AA, 0x3D206845, 0x3D2076D6, 0x3D20855E, 0x3D2093E1, 0x3D20A25A, 0x3D20B0CD, 0x3D20BF35, 0x3D20CD98, 0x3D20DBF3, 0x3D20EA46, 0x3D20F891, 0x3D2106D3, 0x3D211511, 0x3D212346, 0x3D213173, 0x3D213F98, 0x3D214DB6, 0x3D215BCD, 0x3D2169DA, 0x3D2177E5, 0x3D2185E4, 0x3D2193DF, 0x3D21A1CE, 0x3D21AFBB, 0x3D21BD9D, 0x3D21CB7A, 0x3D21D94E, 0x3D21E71E, 0x3D21F4E5, 0x3D2202A4, 0x3D22105B, 0x3D221E0D, 0x3D222BB9, 0x3D22395E, 0x3D2246FA, 0x3D22548E, 0x3D226220, 0x3D226FA7, 0x3D227D28, 0x3D228AA2, 0x3D229816, 0x3D22A584, 0x3D22B2EB, 0x3D22C049, 0x3D22CDA3, 0xBF800000, 0x00000000, 0x3BB1ED50, 0x3C0D3A42, 0x3C3268FE, 0x3C4F4F08, 0x3C66F537, 0x3C7AFABD, 0x3C862BCE, 0x3C8DD617, 0x3C94B2EA, 0x3C9AE96B, 0x3CA09678, 0x3CA5D003, 0x3CAAA723, 0x3CAF295E, 0x3CB361A7, 0x3CB758E7, 0x3CBB1692, 0x3CBEA0D5, 0x3CC1FCF0, 0x3CC52F6A, 0x3CC83C14, 0x3CCB264F, 0x3CCDF104, 0x3CD09EC4, 0x3CD331D6, 0x3CD5AC34, 0x3CD80FAC, 0x3CDA5DDA, 0x3CDC982C, 0x3CDEBFF4, 0x3CE0D654, 0x3CE2DC63, 0x3CE4D319, 0x3CE6BB5B, 0x3CE895F6, 0x3CEA63A6, 0x3CEC2522, 0x3CEDDB0A, 0x3CEF85EF, 0x3CF1265E, 0x3CF2BCD6, 0x3CF449D4, 0x3CF5CDBD, 0x3CF74907, 0x3CF8BC09, 0x3CFA271E, 0x3CFB8AA0, 0x3CFCE6D6, 0x3CFE3C16, 0x3CFF8A9F, 0x3D00695C, 0x3D010A4F, 0x3D01A846, 0x3D02435C, 0x3D02DBAA, 0x3D03714F, 0x3D04045C, 0x3D0494ED, 0x3D052312, 0x3D05AEE4, 0x3D063874, 0x3D06BFD5, 0x3D074519, 0x3D07C84E, 0x3D084988, 0x3D08C8D4, 0x3D094642, 0x3D09C1DE, 0x3D0A3BB6, 0x3D0AB3D6, 0x3D0B2A4E, 0x3D0B9F23, 0x3D0C1268, 0x3D0C8422, 0x3D0CF45D, 0x3D0D6322, 0x3D0DD080, 0x3D0E3C79, 0x3D0EA71A, 0x3D0F106C, 0x3D0F7873, 0x3D0FDF3B, 0x3D1044C9, 0x3D10A928, 0x3D110C5D, 0x3D116E6D, 0x3D11CF60, 0x3D122F3F, 0x3D128E0D, 0x3D12EBD0, 0x3D13488F, 0x3D13A44F, 0x3D13FF16, 0x3D1458E8, 0x3D14B1CE, 0x3D1509C8, 0x3D1560DD, 0x3D15B711, 0x3D160C69, 0x3D1660EA, 0x3D16B498, 0x3D170773, 0x3D175986, 0x3D17AAD2, 0x3D17FB59, 0x3D184B20, 0x3D189A2B, 0x3D18E87C, 0x3D193617, 0x3D198301, 0x3D19CF3C, 0x3D1A1AC9, 0x3D1A65AF, 0x3D1AAFEF, 0x3D1AF989, 0x3D1B4284, 0x3D1B8AE3, 0x3D1BD2A4, 0x3D1C19CF, 0x3D1C6061, 0x3D1CA661, 0x3D1CEBD1, 0x3D1D30B0, 0x3D1D7506, 0x3D1DB8CE, 0x3D1DFC0F, 0x3D1E3ECA, 0x3D1E8102, 0x3D1EC2B9, 0x3D1F03EC, 0x3D1F44A4, 0x3D1F84E0, 0x3D1FC4A1, 0x3D2003EC, 0x3D2042BE, 0x3D20811A, 0x3D20BF05, 0x3D20FC7D, 0x3D213986, 0x3D21761F, 0x3D21B24D, 0x3D21EE11, 0x3D222968, 0x3D226459, 0x3D229EE1, 0x3D22D906, 0x3D2312C4, 0x3D234C23, 0x3D23851D, 0x3D23BDBA, 0x3D23F5F6, 0x3D242DD5, 0x3D246558, 0x3D249C7D, 0x3D24D34C, 0x3D2509C0, 0x3D253FDB, 0x3D2575A0, 0x3D25AB10, 0x3D25E02C, 0x3D2614F2, 0x3D264968, 0x3D267D8B, 0x3D26B160, 0x3D26E4E4, 0x3D271817, 0x3D274B00, 0x3D277D9B, 0x3D27AFE8, 0x3D27E1EC, 0x3D2813A5, 0x3D284516, 0x3D28763E, 0x3D28A721, 0x3D28D7BB, 0x3D29080F, 0x3D29381D, 0x3D2967E6, 0x3D29976E, 0x3D29C6B3, 0x3D29F5B2, 0x3D2A2474, 0x3D2A52F2, 0x3D2A8133, 0x3D2AAF33, 0x3D2ADCF6, 0x3D2B0A78, 0x3D2B37BF, 0x3D2B64C8, 0x3D2B9196, 0x3D2BBE2A, 0x3D2BEA7F, 0x3D2C169C, 0x3D2C4281, 0x3D2C6E2B, 0x3D2C999C, 0x3D2CC4D7, 0x3D2CEFDB, 0x3D2D1AA5, 0x3D2D453D, 0x3D2D6F9D, 0x3D2D99C7, 0x3D2DC3BD, 0x3D2DED81, 0x3D2E170F, 0x3D2E406A, 0x3D2E6992, 0x3D2E928A, 0x3D2EBB4F, 0x3D2EE3E3, 0x3D2F0C48, 0x3D2F3479, 0x3D2F5C7C, 0x3D2F844F, 0x3D2FABF5, 0x3D2FD36A, 0x3D2FFAB4, 0x3D3021CE, 0x3D3048BB, 0x3D306F7C, 0x3D309610, 0x3D30BC79, 0x3D30E2B4, 0x3D3108C4, 0x3D312EAC, 0x3D315466, 0x3D3179F8, 0x3D319F5F, 0x3D31C49E, 0x3D31E9B2, 0x3D320EA0, 0x3D323364, 0x3D325801, 0x3D327C74, 0x3D32A0C2, 0x3D32C4E9, 0x3D32E8E9, 0x3D330CC2, 0x3D333074, 0x3D335403, 0x3D33776C, 0x3D339AAF, 0x3D33BDCD, 0x3D33E0C5, 0x3D34039B, 0x3D34264D, 0x3D3448DD, 0x3D346B47, 0x3D348D8E, 0x3D34AFB2, 0x3D34D1B6, 0x3D34F398, 0x3D351556, 0x3D3536F1, 0x3D35586C, 0x3D3579C7, 0x3D359AFF, 0x3D35BC1A, 0x3D35DD11, 0x3D35FDE9, 0x3D361EA3, 0x3D363F3A, 0x3D365FB3, 0x3D36800C, 0x3D36A048, 0x3D36C064, 0x3D36E061, 0x3D370042, 0x3D372002, 0x3D373FA8, 0x3D375F2D, 0x3D377E94, 0x3D379DE1, 0x3D37BD0E, 0x3D37DC1F, 0x3D37FB16, 0x3D3819F0, 0x3D3838AC, 0x3D38574D, 0x3D3875D3, 0x3D38943B, 0x3D38B289, 0x3D38D0BC, 0x3D38EED4, 0x3D390CD1, 0x3D392AB4, 0x3D39487B, 0x3D39662B, 0x3D3983BF, 0x3D39A139, 0x3D39BE9B, 0x3D39DBE1, 0x3D39F90D, 0x3D3A1624, 0x3D3A331F, 0x3D3A5000, 0x3D3A6CCB, 0x3D3A897C, 0x3D3AA616, 0x3D3AC297, 0x3D3ADEFE, 0x3D3AFB51, 0x3D3B178B, 0x3D3B33AB, 0x3D3B4FB7, 0x3D3B6BA9, 0x3D3B8785, 0x3D3BA34C, 0x3D3BBEF8, 0x3D3BDA92, 0x3D3BF613, 0x3D3C117E, 0x3D3C2CD2, 0x3D3C4810, 0x3D3C633B, 0x3D3C7E4E, 0x3D3C9949, 0x3D3CB431, 0x3D3CCF03, 0x3D3CE9C0, 0x3D3D0468, 0x3D3D1EFD, 0x3D3D3979, 0x3D3D53E3, 0x3D3D6E38, 0x3D3D8879, 0x3D3DA2A3, 0x3D3DBCBC, 0x3D3DD6C0, 0x3D3DF0AE, 0x3D3E0A8A, 0x3D3E2453, 0x3D3E3E06, 0x3D3E57A7, 0x3D3E7135, 0x3D3E8AB0, 0x3D3EA415, 0x3D3EBD6B, 0x3D3ED6AA, 0x3D3EEFDA, 0x3D3F08F5, 0x3D3F21FC, 0x3D3F3AF4, 0x3D3F53D8, 0x3D3F6CA7, 0x3D3F8569, 0x3D3F9E15, 0x3D3FB6B2, 0x3D3FCF38, 0x3D3FE7B2, 0x3D400018, 0x3D40186C, 0x3D4030AF, 0x3D4048E0, 0x3D406101, 0x3D40790F, 0x3D40910D, 0x3D40A8FA, 0x3D40C0D5, 0x3D40D8A0, 0x3D40F05B, 0x3D410805, 0x3D411F9D, 0x3D413728, 0x3D414E9F, 0x3D416609, 0x3D417D61, 0x3D4194A8, 0x3D41ABDF, 0x3D41C309, 0x3D41DA20, 0x3D41F129, 0x3D420823, 0x3D421F09, 0x3D4235E5, 0x3D424CAE, 0x3D42636A, 0x3D427A16, 0x3D4290B1, 0x3D42A73F, 0x3D42BDBD, 0x3D42D42E, 0x3D42EA8E, 0x3D4300E1, 0x3D431724, 0x3D432D57, 0x3D43437C, 0x3D435994, 0x3D436F9E, 0x3D438599, 0x3D439B86, 0x3D43B163, 0x3D43C732, 0x3D43DCF4, 0x3D43F2A9, 0x3D440850, 0x3D441DE7, 0x3D443373, 0x3D4448F0, 0x3D445E5F, 0x3D4473C0, 0x3D448917, 0x3D449E5D, 0x3D44B396, 0x3D44C8C2, 0x3D44DDE0, 0x3D44F2F4, 0x3D4507F7, 0x3D451CF0, 0x3D4531D9, 0x3D4546B6, 0x3D455B8A, 0x3D45704D, 0x3D458505, 0x3D4599B0, 0x3D45AE4D, 0x3D45C2DD, 0x3D45D762, 0x3D45EBDD, 0x3D460047, 0x3D4614A7, 0x3D4628FC, 0x3D463D44, 0x3D465180, 0x3D4665B0, 0x3D4679D2, 0x3D468DE9, 0x3D46A1F6, 0x3D46B5F5, 0x3D46C9E9, 0x3D46DDD0, 0x3D46F1AC, 0x3D47057D, 0x3D471941, 0x3D472CFD, 0x3D4740A9, 0x3D47544D, 0x3D4767E3, 0x3D477B6F, 0x3D478EF0, 0x3D47A266, 0x3D47B5D2, 0x3D47C930, 0x3D47DC85, 0x3D47EFCE, 0x3D48030C, 0x3D48163F, 0x3D482967, 0x3D483C85, 0x3D484F98, 0x3D4862A0, 0x3D48759D, 0x3D488890, 0x3D489B78, 0x3D48AE55, 0x3D48C12A, 0x3D48D3F2, 0x3D48E6AE, 0x3D48F963, 0x3D490C0D, 0x3D491EAD, 0x3D493142, 0x3D4943CC, 0x3D49564D, 0x3D4968C5, 0x3D497B31, 0x3D498D93, 0x3D499FEC, 0x3D49B23B, 0x3D49C47F, 0x3D49D6B9, 0x3D49E8EA, 0x3D49FB13, 0x3D4A0D2F, 0x3D4A1F43, 0x3D4A314F, 0x3D4A4350, 0x3D4A5546, 0x3D4A6734, 0x3D4A7918, 0x3D4A8AF3, 0x3D4A9CC4, 0x3D4AAE8D, 0x3D4AC04B, 0x3D4AD201, 0x3D4AE3AE, 0x3D4AF54F, 0x3D4B06EA, 0x3D4B187A, 0x3D4B2A02, 0x3D4B3B80, 0x3D4B4CF5, 0x3D4B5E63, 0x3D4B6FC5, 0x3D4B8120, 0x3D4B9273, 0x3D4BA3BA, 0x3D4BB4FD, 0x3D4BC632, 0x3D4BD761, 0x3D4BE886, 0x3D4BF9A6, 0x3D4C0AB8, 0x3D4C1BC5, 0x3D4C2CCA, 0x3D4C3DC4, 0x3D4C4EB5, 0x3D4C5F9F, 0x3D4C7081, 0x3D4C815B, 0xBF800000, 0x00000000, 0x3BED734F, 0x3C3C92CE, 0x3C6E4F89, 0x3C8A7F15, 0x3C9A5526, 0x3CA7BED1, 0x3CB361A7, 0x3CBDA89D, 0x3CC6DCD4, 0x3CCF3283, 0x3CD6D046, 0x3CDDD36A, 0x3CE452D0, 0x3CEA608C, 0x3CF00B40, 0x3CF55ED7, 0x3CFA6547, 0x3CFF26D7, 0x3D01D548, 0x3D03FB3D, 0x3D0607DA, 0x3D07FD65, 0x3D09DDCD, 0x3D0BAAC9, 0x3D0D65E2, 0x3D0F106C, 0x3D10AB99, 0x3D123882, 0x3D13B816, 0x3D152B38, 0x3D1692AE, 0x3D17EF35, 0x3D19416D, 0x3D1A89F2, 0x3D1BC94C, 0x3D1D0001, 0x3D1E2E7F, 0x3D1F5538, 0x3D20748D, 0x3D218CDB, 0x3D229E7B, 0x3D23A9BB, 0x3D24AEE9, 0x3D25AE45, 0x3D26A813, 0x3D279C92, 0x3D288BF5, 0x3D297679, 0x3D2A5C4A, 0x3D2B3D9B, 0x3D2C1A98, 0x3D2CF36B, 0x3D2DC83A, 0x3D2E992D, 0x3D2F6665, 0x3D303004, 0x3D30F62A, 0x3D31B8F8, 0x3D327888, 0x3D3334F6, 0x3D33EE5A, 0x3D34A4D0, 0x3D35586C, 0x3D360949, 0x3D36B77A, 0x3D376311, 0x3D380C26, 0x3D38B2C7, 0x3D39570C, 0x3D39F900, 0x3D3A98B8, 0x3D3B363F, 0x3D3BD1AB, 0x3D3C6B03, 0x3D3D025A, 0x3D3D97BB, 0x3D3E2B34, 0x3D3EBCD2, 0x3D3F4C9F, 0x3D3FDAA6, 0x3D4066F6, 0x3D40F195, 0x3D417A91, 0x3D4201F3, 0x3D4287C2, 0x3D430C09, 0x3D438ED3, 0x3D441025, 0x3D449008, 0x3D450E88, 0x3D458BA8, 0x3D460771, 0x3D4681EA, 0x3D46FB1C, 0x3D47730C, 0x3D47E9C1, 0x3D485F42, 0x3D48D394, 0x3D4946BE, 0x3D49B8C6, 0x3D4A29B2, 0x3D4A9984, 0x3D4B0847, 0x3D4B75FD, 0x3D4BE2AD, 0x3D4C4E57, 0x3D4CB906, 0x3D4D22BB, 0x3D4D8B7C, 0x3D4DF34B, 0x3D4E5A30, 0x3D4EC02D, 0x3D4F2544, 0x3D4F8980, 0x3D4FECDD, 0x3D504F61, 0x3D50B113, 0x3D5111F3, 0x3D517206, 0x3D51D14E, 0x3D522FD0, 0x3D528D8E, 0x3D52EA8E, 0x3D5346CF, 0x3D53A257, 0x3D53FD25, 0x3D545740, 0x3D54B0A9, 0x3D550964, 0x3D556174, 0x3D55B8D7, 0x3D560F94, 0x3D5665AD, 0x3D56BB25, 0x3D570FFA, 0x3D576435, 0x3D57B7D2, 0x3D580AD9, 0x3D585D47, 0x3D58AF21, 0x3D590067, 0x3D59511F, 0x3D59A147, 0x3D59F0E2, 0x3D5A3FF5, 0x3D5A8E7C, 0x3D5ADC80, 0x3D5B29FA, 0x3D5B76F4, 0x3D5BC36D, 0x3D5C0F63, 0x3D5C5ADD, 0x3D5CA5DB, 0x3D5CF05B, 0x3D5D3A66, 0x3D5D83F7, 0x3D5DCD10, 0x3D5E15B5, 0x3D5E5DE9, 0x3D5EA5A8, 0x3D5EECF8, 0x3D5F33DA, 0x3D5F7A4C, 0x3D5FC052, 0x3D6005ED, 0x3D604B1F, 0x3D608FE5, 0x3D60D449, 0x3D611843, 0x3D615BD8, 0x3D619F09, 0x3D61E1DA, 0x3D622448, 0x3D626654, 0x3D62A803, 0x3D62E951, 0x3D632A44, 0x3D636ADC, 0x3D63AB15, 0x3D63EAF7, 0x3D642A7F, 0x3D6469AF, 0x3D64A886, 0x3D64E70A, 0x3D652536, 0x3D65630E, 0x3D65A093, 0x3D65DDC5, 0x3D661AA7, 0x3D665735, 0x3D669375, 0x3D66CF65, 0x3D670B04, 0x3D674658, 0x3D678161, 0x3D67BC19, 0x3D67F689, 0x3D6830AE, 0x3D686A8A, 0x3D68A41B, 0x3D68DD64, 0x3D691667, 0x3D694F21, 0x3D698796, 0x3D69BFC5, 0x3D69F7B0, 0x3D6A2F56, 0x3D6A66B9, 0x3D6A9DD6, 0x3D6AD4B2, 0x3D6B0B4F, 0x3D6B41AA, 0x3D6B77C3, 0x3D6BAD9B, 0x3D6BE335, 0x3D6C1892, 0x3D6C4DAE, 0x3D6C8290, 0x3D6CB733, 0x3D6CEB99, 0x3D6D1FC3, 0x3D6D53B3, 0x3D6D8768, 0x3D6DBAE1, 0x3D6DEE20, 0x3D6E2128, 0x3D6E53F6, 0x3D6E868B, 0x3D6EB8E8, 0x3D6EEB10, 0x3D6F1CFE, 0x3D6F4EB8, 0x3D6F803B, 0x3D6FB189, 0x3D6FE2A1, 0x3D701384, 0x3D704436, 0x3D7074AF, 0x3D70A4F9, 0x3D70D50F, 0x3D7104F3, 0x3D7134A3, 0x3D716423, 0x3D719373, 0x3D71C290, 0x3D71F17F, 0x3D72203B, 0x3D724ECA, 0x3D727D28, 0x3D72AB59, 0x3D72D959, 0x3D73072C, 0x3D7334D1, 0x3D736248, 0x3D738F92, 0x3D73BCB0, 0x3D73E9A2, 0x3D741668, 0x3D744300, 0x3D746F71, 0x3D749BB3, 0x3D74C7CB, 0x3D74F3BA, 0x3D751F7F, 0x3D754B19, 0x3D75768A, 0x3D75A1D0, 0x3D75CCF1, 0x3D75F7E7, 0x3D7622B4, 0x3D764D59, 0x3D7677D9, 0x3D76A231, 0x3D76CC60, 0x3D76F669, 0x3D77204D, 0x3D774A09, 0x3D77739F, 0x3D779D10, 0x3D77C65B, 0x3D77EF83, 0x3D781883, 0x3D784160, 0x3D786A1A, 0x3D7892AE, 0x3D78BB1D, 0x3D78E369, 0x3D790B95, 0x3D79339B, 0x3D795B7E, 0x3D79833F, 0x3D79AADC, 0x3D79D257, 0x3D79F9B1, 0x3D7A20EB, 0x3D7A4800, 0x3D7A6EF7, 0x3D7A95CB, 0x3D7ABC7F, 0x3D7AE313, 0x3D7B0984, 0x3D7B2FD7, 0x3D7B560A, 0x3D7B7C1A, 0x3D7BA210, 0x3D7BC7E2, 0x3D7BED97, 0x3D7C132C, 0x3D7C38A3, 0x3D7C5DFA, 0x3D7C8333, 0x3D7CA84F, 0x3D7CCD4E, 0x3D7CF22F, 0x3D7D16EF, 0x3D7D3B95, 0x3D7D601D, 0x3D7D8488, 0x3D7DA8D5, 0x3D7DCD05, 0x3D7DF11A, 0x3D7E1511, 0x3D7E38EE, 0x3D7E5CAD, 0x3D7E8051, 0x3D7EA3DA, 0x3D7EC748, 0x3D7EEA99, 0x3D7F0DCF, 0x3D7F30EB, 0x3D7F53EB, 0x3D7F76D1, 0x3D7F999E, 0x3D7FBC4E, 0x3D7FDEE5, 0x3D8000B1, 0x3D8011E2, 0x3D802307, 0x3D80341F, 0x3D80452A, 0x3D805629, 0x3D80671B, 0x3D807800, 0x3D8088DA, 0x3D8099A6, 0x3D80AA66, 0x3D80BB1A, 0x3D80CBC2, 0x3D80DC5E, 0x3D80ECEE, 0x3D80FD72, 0x3D810DEA, 0x3D811E57, 0x3D812EB7, 0x3D813F0C, 0x3D814F56, 0x3D815F92, 0x3D816FC6, 0x3D817FEC, 0x3D819008, 0x3D81A019, 0x3D81B01D, 0x3D81C017, 0x3D81D005, 0x3D81DFEA, 0x3D81EFC2, 0x3D81FF90, 0x3D820F53, 0x3D821F0B, 0x3D822EB8, 0x3D823E5A, 0x3D824DF3, 0x3D825D80, 0x3D826D04, 0x3D827C7C, 0x3D828BEA, 0x3D829B4E, 0x3D82AAA8, 0x3D82B9F7, 0x3D82C93B, 0x3D82D876, 0x3D82E7A6, 0x3D82F6CD, 0x3D8305E9, 0x3D8314FC, 0x3D832406, 0x3D833306, 0x3D8341FB, 0x3D8350E5, 0x3D835FC8, 0x3D836E9F, 0x3D837D6F, 0x3D838C34, 0x3D839AF0, 0x3D83A9A2, 0x3D83B84A, 0x3D83C6EA, 0x3D83D580, 0x3D83E40E, 0x3D83F291, 0x3D84010C, 0x3D840F7D, 0x3D841DE6, 0x3D842C45, 0x3D843A9C, 0x3D8448E9, 0x3D84572D, 0x3D846569, 0x3D84739C, 0x3D8481C6, 0x3D848FE7, 0x3D849E01, 0x3D84AC10, 0x3D84BA18, 0x3D84C818, 0x3D84D60E, 0x3D84E3FC, 0x3D84F1E1, 0x3D84FFBF, 0x3D850D93, 0x3D851B60, 0x3D852923, 0x3D8536E0, 0x3D854494, 0x3D85523F, 0x3D855FE2, 0x3D856D7F, 0x3D857B11, 0x3D85889E, 0x3D859620, 0x3D85A39C, 0x3D85B10F, 0x3D85BE7B, 0x3D85CBDF, 0x3D85D93B, 0x3D85E690, 0x3D85F3DC, 0x3D860121, 0x3D860E5E, 0x3D861B94, 0x3D8628C2, 0x3D8635E9, 0x3D864308, 0x3D86501F, 0x3D865D30, 0x3D866A39, 0x3D867739, 0x3D868433, 0x3D869127, 0x3D869E12, 0x3D86AAF6, 0x3D86B7D2, 0x3D86C4A8, 0x3D86D177, 0x3D86DE3F, 0x3D86EAFF, 0x3D86F7B9, 0x3D87046A, 0x3D871116, 0x3D871DBA, 0x3D872A58, 0x3D8736EE, 0x3D87437E, 0x3D875006, 0x3D875C88, 0x3D876904, 0x3D877578, 0x3D8781E6, 0x3D878E4C, 0x3D879AAD, 0x3D87A706, 0x3D87B359, 0x3D87BFA6, 0x3D87CBEB, 0x3D87D82A, 0x3D87E463, 0x3D87F096, 0x3D87FCC1, 0x3D8808E7, 0x3D881506, 0x3D88211F, 0x3D882D30, 0x3D88393D, 0x3D884542, 0x3D885141, 0x3D885D3B, 0x3D88692D, 0x3D88751B, 0x3D888100, 0x3D888CE2, 0x3D8898BB, 0x3D88A490, 0x3D88B05E, 0x3D88BC25, 0x3D88C7E8, 0x3D88D3A4, 0x3D88DF5A, 0x3D88EB0A, 0x3D88F6B4, 0x3D890258, 0x3D890DF6, 0x3D89198F, 0x3D892522, 0x3D8930AF, 0x3D893C35, 0x3D8947B7, 0x3D895333, 0x3D895EA9, 0x3D896A18, 0x3D897583, 0x00010203, 0x04000102, 0x03040001, 0x02030400, 0x01020304, 0x00010203, 0x04050607, 0x08050607, 0x08050607, 0x08050607, 0x08050607, 0x08090A0B, 0x090A0B09, 0x0A0B090A, 0x0B090A0B, 0x00000000, 0x00010101, 0x01010202, 0x02020203, 0x03030303, 0x04040404, 0x04000000, 0x00010101, 0x01020202, 0x02030303, 0x03040404, 0x04000000, 0x01010102, 0x02020303, 0x03040404, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/EA3A80.data.s b/ver/us/asm/data/EA3A80.data.s index fc84121e81..5142b5ff3a 100644 --- a/ver/us/asm/data/EA3A80.data.s +++ b/ver/us/asm/data/EA3A80.data.s @@ -111,10 +111,10 @@ glabel D_802441C0_EA4AC0 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, func_802427F0_EA30F0, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80242A14_EA3314, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80242A4C_EA334C, 0xFE363C80, 0x0000004E, 0x00000006, D_802441C0_EA4AC0, 0x00000010, 0x00000000, D_802466D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802429C0_EA32C0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80244354_EA4C54 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, func_80242BD8_EA34D8, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802E4720, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EA0C10_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802E4720, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_802443D4_EA4CD4 -.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, func_80242BD8_EA34D8, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80244354_EA4C54, 0xFE363C8A, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, 0x802E1D58, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802DC654, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, 0x802DBF70, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, 0x802DC3E0, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80242A14_EA3314, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EA0C10_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80244354_EA4C54, 0xFE363C8A, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, 0x802E1D58, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802DC654, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, 0x802DBF70, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, 0x802DC3E0, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80242A14_EA3314, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_802446F8_EA4FF8 .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80242A4C_EA334C, 0xFE363C80, 0x0000004E, 0x00000006, D_802443D4_EA4CD4, 0x00000010, 0x00000000, D_802466D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802429C0_EA32C0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/EAA810.data.s b/ver/us/asm/data/EAA810.data.s index 260187e9f0..5cb59d043c 100644 --- a/ver/us/asm/data/EAA810.data.s +++ b/ver/us/asm/data/EAA810.data.s @@ -159,10 +159,10 @@ glabel D_80243DE0_EAC8C0 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, func_802415DC_EAA0BC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80241800_EAA2E0, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241838_EAA318, 0xFE363C80, 0x0000004E, 0x00000006, D_80243DE0_EAC8C0, 0x00000010, 0x00000000, D_80248388, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802417AC_EAA28C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80243F74_EACA54 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, func_802419C4_EAA4A4, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802E4720, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EA8AE0_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802E4720, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80243FF4_EACAD4 -.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, func_802419C4_EAA4A4, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80243F74_EACA54, 0xFE363C8A, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, 0x802E1D58, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802DC654, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, 0x802DBF70, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, 0x802DC3E0, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80241800_EAA2E0, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EA8AE0_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80243F74_EACA54, 0xFE363C8A, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, 0x802E1D58, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802DC654, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, 0x802DBF70, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, 0x802DC3E0, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80241800_EAA2E0, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80244318_EACDF8 .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80241838_EAA318, 0xFE363C80, 0x0000004E, 0x00000006, D_80243FF4_EACAD4, 0x00000010, 0x00000000, D_80248388, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802417AC_EAA28C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/EB1920.data.s b/ver/us/asm/data/EB1920.data.s index 5b0f4643bf..7fe17950a3 100644 --- a/ver/us/asm/data/EB1920.data.s +++ b/ver/us/asm/data/EB1920.data.s @@ -66,10 +66,10 @@ glabel D_802417EC_EB264C .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, func_80240484_EB12E4, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802406A8_EB1508, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802406E0_EB1540, 0xFE363C80, 0x0000004E, 0x00000006, D_802417EC_EB264C, 0x00000010, 0x00000000, D_802442D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240654_EB14B4, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80241980_EB27E0 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, func_8024086C_EB16CC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802E4720, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EB1170_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802E4720, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80241A00_EB2860 -.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, func_8024086C_EB16CC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80241980_EB27E0, 0xFE363C8A, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, 0x802E1D58, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802DC654, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, 0x802DBF70, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, 0x802DC3E0, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802406A8_EB1508, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EB1170_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80241980_EB27E0, 0xFE363C8A, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, 0x802E1D58, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802DC654, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, 0x802DBF70, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, 0x802DC3E0, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802406A8_EB1508, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80241D24_EB2B84 .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_802406E0_EB1540, 0xFE363C80, 0x0000004E, 0x00000006, D_80241A00_EB2860, 0x00000010, 0x00000000, D_802442D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240654_EB14B4, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/nonmatchings/EA0C10/func_80240310_EA0C10.s b/ver/us/asm/nonmatchings/EA0C10/func_80240310_EA0C10.s deleted file mode 100644 index 1c03fabf2f..0000000000 --- a/ver/us/asm/nonmatchings/EA0C10/func_80240310_EA0C10.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240310_EA0C10 -/* EA0C10 80240310 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* EA0C14 80240314 AFB10014 */ sw $s1, 0x14($sp) -/* EA0C18 80240318 0080882D */ daddu $s1, $a0, $zero -/* EA0C1C 8024031C AFBF0018 */ sw $ra, 0x18($sp) -/* EA0C20 80240320 AFB00010 */ sw $s0, 0x10($sp) -/* EA0C24 80240324 8E300148 */ lw $s0, 0x148($s1) -/* EA0C28 80240328 0C00F92F */ jal dead_get_npc_unsafe -/* EA0C2C 8024032C 86040008 */ lh $a0, 8($s0) -/* EA0C30 80240330 24030001 */ addiu $v1, $zero, 1 -/* EA0C34 80240334 0040202D */ daddu $a0, $v0, $zero -/* EA0C38 80240338 AE03006C */ sw $v1, 0x6c($s0) -/* EA0C3C 8024033C 8482008C */ lh $v0, 0x8c($a0) -/* EA0C40 80240340 14400009 */ bnez $v0, .L80240368 -/* EA0C44 80240344 24020002 */ addiu $v0, $zero, 2 -/* EA0C48 80240348 96030072 */ lhu $v1, 0x72($s0) -/* EA0C4C 8024034C AE02006C */ sw $v0, 0x6c($s0) -/* EA0C50 80240350 A483008E */ sh $v1, 0x8e($a0) -/* EA0C54 80240354 8E0200CC */ lw $v0, 0xcc($s0) -/* EA0C58 80240358 8C420020 */ lw $v0, 0x20($v0) -/* EA0C5C 8024035C AC820028 */ sw $v0, 0x28($a0) -/* EA0C60 80240360 2402001F */ addiu $v0, $zero, 0x1f -/* EA0C64 80240364 AE220070 */ sw $v0, 0x70($s1) -.L80240368: -/* EA0C68 80240368 8FBF0018 */ lw $ra, 0x18($sp) -/* EA0C6C 8024036C 8FB10014 */ lw $s1, 0x14($sp) -/* EA0C70 80240370 8FB00010 */ lw $s0, 0x10($sp) -/* EA0C74 80240374 03E00008 */ jr $ra -/* EA0C78 80240378 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/EA0C10/func_8024037C_EA0C7C.s b/ver/us/asm/nonmatchings/EA0C10/func_8024037C_EA0C7C.s deleted file mode 100644 index 6f5b11ce09..0000000000 --- a/ver/us/asm/nonmatchings/EA0C10/func_8024037C_EA0C7C.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024037C_EA0C7C -/* EA0C7C 8024037C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* EA0C80 80240380 AFB10014 */ sw $s1, 0x14($sp) -/* EA0C84 80240384 0080882D */ daddu $s1, $a0, $zero -/* EA0C88 80240388 AFBF0018 */ sw $ra, 0x18($sp) -/* EA0C8C 8024038C AFB00010 */ sw $s0, 0x10($sp) -/* EA0C90 80240390 8E300148 */ lw $s0, 0x148($s1) -/* EA0C94 80240394 0C00F92F */ jal dead_get_npc_unsafe -/* EA0C98 80240398 86040008 */ lh $a0, 8($s0) -/* EA0C9C 8024039C 0040202D */ daddu $a0, $v0, $zero -/* EA0CA0 802403A0 9482008E */ lhu $v0, 0x8e($a0) -/* EA0CA4 802403A4 2442FFFF */ addiu $v0, $v0, -1 -/* EA0CA8 802403A8 A482008E */ sh $v0, 0x8e($a0) -/* EA0CAC 802403AC 00021400 */ sll $v0, $v0, 0x10 -/* EA0CB0 802403B0 1C400009 */ bgtz $v0, .L802403D8 -/* EA0CB4 802403B4 24020003 */ addiu $v0, $zero, 3 -/* EA0CB8 802403B8 96030076 */ lhu $v1, 0x76($s0) -/* EA0CBC 802403BC AE02006C */ sw $v0, 0x6c($s0) -/* EA0CC0 802403C0 A483008E */ sh $v1, 0x8e($a0) -/* EA0CC4 802403C4 8E0200CC */ lw $v0, 0xcc($s0) -/* EA0CC8 802403C8 8C420024 */ lw $v0, 0x24($v0) -/* EA0CCC 802403CC AC820028 */ sw $v0, 0x28($a0) -/* EA0CD0 802403D0 24020020 */ addiu $v0, $zero, 0x20 -/* EA0CD4 802403D4 AE220070 */ sw $v0, 0x70($s1) -.L802403D8: -/* EA0CD8 802403D8 8FBF0018 */ lw $ra, 0x18($sp) -/* EA0CDC 802403DC 8FB10014 */ lw $s1, 0x14($sp) -/* EA0CE0 802403E0 8FB00010 */ lw $s0, 0x10($sp) -/* EA0CE4 802403E4 03E00008 */ jr $ra -/* EA0CE8 802403E8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/EA0C10/func_802403EC_EA0CEC.s b/ver/us/asm/nonmatchings/EA0C10/func_802403EC_EA0CEC.s deleted file mode 100644 index 3a5b3fd436..0000000000 --- a/ver/us/asm/nonmatchings/EA0C10/func_802403EC_EA0CEC.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403EC_EA0CEC -/* EA0CEC 802403EC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* EA0CF0 802403F0 AFB10034 */ sw $s1, 0x34($sp) -/* EA0CF4 802403F4 0080882D */ daddu $s1, $a0, $zero -/* EA0CF8 802403F8 AFBF0038 */ sw $ra, 0x38($sp) -/* EA0CFC 802403FC AFB00030 */ sw $s0, 0x30($sp) -/* EA0D00 80240400 8E300148 */ lw $s0, 0x148($s1) -/* EA0D04 80240404 0C00F92F */ jal dead_get_npc_unsafe -/* EA0D08 80240408 86040008 */ lh $a0, 8($s0) -/* EA0D0C 8024040C 0040282D */ daddu $a1, $v0, $zero -/* EA0D10 80240410 94A2008E */ lhu $v0, 0x8e($a1) -/* EA0D14 80240414 2442FFFF */ addiu $v0, $v0, -1 -/* EA0D18 80240418 A4A2008E */ sh $v0, 0x8e($a1) -/* EA0D1C 8024041C 00021400 */ sll $v0, $v0, 0x10 -/* EA0D20 80240420 1C400023 */ bgtz $v0, .L802404B0 -/* EA0D24 80240424 24020004 */ addiu $v0, $zero, 4 -/* EA0D28 80240428 8E0300CC */ lw $v1, 0xcc($s0) -/* EA0D2C 8024042C AE02006C */ sw $v0, 0x6c($s0) -/* EA0D30 80240430 8C620000 */ lw $v0, ($v1) -/* EA0D34 80240434 ACA20028 */ sw $v0, 0x28($a1) -/* EA0D38 80240438 9602007A */ lhu $v0, 0x7a($s0) -/* EA0D3C 8024043C A4A2008E */ sh $v0, 0x8e($a1) -/* EA0D40 80240440 8E020078 */ lw $v0, 0x78($s0) -/* EA0D44 80240444 28420008 */ slti $v0, $v0, 8 -/* EA0D48 80240448 14400018 */ bnez $v0, .L802404AC -/* EA0D4C 8024044C 24020021 */ addiu $v0, $zero, 0x21 -/* EA0D50 80240450 24040003 */ addiu $a0, $zero, 3 -/* EA0D54 80240454 27A30028 */ addiu $v1, $sp, 0x28 -/* EA0D58 80240458 84A700A8 */ lh $a3, 0xa8($a1) -/* EA0D5C 8024045C 3C013F80 */ lui $at, 0x3f80 -/* EA0D60 80240460 44810000 */ mtc1 $at, $f0 -/* EA0D64 80240464 3C014000 */ lui $at, 0x4000 -/* EA0D68 80240468 44811000 */ mtc1 $at, $f2 -/* EA0D6C 8024046C 3C01C1A0 */ lui $at, 0xc1a0 -/* EA0D70 80240470 44812000 */ mtc1 $at, $f4 -/* EA0D74 80240474 44873000 */ mtc1 $a3, $f6 -/* EA0D78 80240478 00000000 */ nop -/* EA0D7C 8024047C 468031A0 */ cvt.s.w $f6, $f6 -/* EA0D80 80240480 E7A00010 */ swc1 $f0, 0x10($sp) -/* EA0D84 80240484 E7A20014 */ swc1 $f2, 0x14($sp) -/* EA0D88 80240488 E7A40018 */ swc1 $f4, 0x18($sp) -/* EA0D8C 8024048C 8E020078 */ lw $v0, 0x78($s0) -/* EA0D90 80240490 44073000 */ mfc1 $a3, $f6 -/* EA0D94 80240494 0000302D */ daddu $a2, $zero, $zero -/* EA0D98 80240498 AFA30020 */ sw $v1, 0x20($sp) -/* EA0D9C 8024049C 2442FFFF */ addiu $v0, $v0, -1 -/* EA0DA0 802404A0 0C01D444 */ jal dead_fx_emote -/* EA0DA4 802404A4 AFA2001C */ sw $v0, 0x1c($sp) -/* EA0DA8 802404A8 24020021 */ addiu $v0, $zero, 0x21 -.L802404AC: -/* EA0DAC 802404AC AE220070 */ sw $v0, 0x70($s1) -.L802404B0: -/* EA0DB0 802404B0 8FBF0038 */ lw $ra, 0x38($sp) -/* EA0DB4 802404B4 8FB10034 */ lw $s1, 0x34($sp) -/* EA0DB8 802404B8 8FB00030 */ lw $s0, 0x30($sp) -/* EA0DBC 802404BC 03E00008 */ jr $ra -/* EA0DC0 802404C0 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/EA0C10/func_802404C4_EA0DC4.s b/ver/us/asm/nonmatchings/EA0C10/func_802404C4_EA0DC4.s deleted file mode 100644 index 45ffda9c49..0000000000 --- a/ver/us/asm/nonmatchings/EA0C10/func_802404C4_EA0DC4.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404C4_EA0DC4 -/* EA0DC4 802404C4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* EA0DC8 802404C8 AFB10014 */ sw $s1, 0x14($sp) -/* EA0DCC 802404CC 0080882D */ daddu $s1, $a0, $zero -/* EA0DD0 802404D0 AFBF0018 */ sw $ra, 0x18($sp) -/* EA0DD4 802404D4 AFB00010 */ sw $s0, 0x10($sp) -/* EA0DD8 802404D8 8E300148 */ lw $s0, 0x148($s1) -/* EA0DDC 802404DC 0C00F92F */ jal dead_get_npc_unsafe -/* EA0DE0 802404E0 86040008 */ lh $a0, 8($s0) -/* EA0DE4 802404E4 9443008E */ lhu $v1, 0x8e($v0) -/* EA0DE8 802404E8 2463FFFF */ addiu $v1, $v1, -1 -/* EA0DEC 802404EC A443008E */ sh $v1, 0x8e($v0) -/* EA0DF0 802404F0 00031C00 */ sll $v1, $v1, 0x10 -/* EA0DF4 802404F4 1C600003 */ bgtz $v1, .L80240504 -/* EA0DF8 802404F8 2402000C */ addiu $v0, $zero, 0xc -/* EA0DFC 802404FC AE00006C */ sw $zero, 0x6c($s0) -/* EA0E00 80240500 AE220070 */ sw $v0, 0x70($s1) -.L80240504: -/* EA0E04 80240504 8FBF0018 */ lw $ra, 0x18($sp) -/* EA0E08 80240508 8FB10014 */ lw $s1, 0x14($sp) -/* EA0E0C 8024050C 8FB00010 */ lw $s0, 0x10($sp) -/* EA0E10 80240510 03E00008 */ jr $ra -/* EA0E14 80240514 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/EA0C10/func_80240518_EA0E18.s b/ver/us/asm/nonmatchings/EA0C10/func_80240518_EA0E18.s deleted file mode 100644 index 5fbd82accc..0000000000 --- a/ver/us/asm/nonmatchings/EA0C10/func_80240518_EA0E18.s +++ /dev/null @@ -1,126 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80246480_EA6D80 -.double 180.0 - -.section .text - -glabel func_80240518_EA0E18 -/* EA0E18 80240518 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* EA0E1C 8024051C AFBF0024 */ sw $ra, 0x24($sp) -/* EA0E20 80240520 AFB40020 */ sw $s4, 0x20($sp) -/* EA0E24 80240524 AFB3001C */ sw $s3, 0x1c($sp) -/* EA0E28 80240528 AFB20018 */ sw $s2, 0x18($sp) -/* EA0E2C 8024052C AFB10014 */ sw $s1, 0x14($sp) -/* EA0E30 80240530 AFB00010 */ sw $s0, 0x10($sp) -/* EA0E34 80240534 F7B40028 */ sdc1 $f20, 0x28($sp) -/* EA0E38 80240538 8C900148 */ lw $s0, 0x148($a0) -/* EA0E3C 8024053C 86040008 */ lh $a0, 8($s0) -/* EA0E40 80240540 0C00F92F */ jal dead_get_npc_unsafe -/* EA0E44 80240544 24110001 */ addiu $s1, $zero, 1 -/* EA0E48 80240548 86040008 */ lh $a0, 8($s0) -/* EA0E4C 8024054C 0040802D */ daddu $s0, $v0, $zero -/* EA0E50 80240550 3C05800C */ lui $a1, %hi(dead_gCameras) -/* EA0E54 80240554 24A58D80 */ addiu $a1, $a1, %lo(dead_gCameras) -/* EA0E58 80240558 3C03800A */ lui $v1, %hi(D_800A158C) -/* EA0E5C 8024055C 8463158C */ lh $v1, %lo(D_800A158C)($v1) -/* EA0E60 80240560 00912021 */ addu $a0, $a0, $s1 -/* EA0E64 80240564 00031080 */ sll $v0, $v1, 2 -/* EA0E68 80240568 00431021 */ addu $v0, $v0, $v1 -/* EA0E6C 8024056C 00021080 */ sll $v0, $v0, 2 -/* EA0E70 80240570 00431023 */ subu $v0, $v0, $v1 -/* EA0E74 80240574 000218C0 */ sll $v1, $v0, 3 -/* EA0E78 80240578 00431021 */ addu $v0, $v0, $v1 -/* EA0E7C 8024057C 000210C0 */ sll $v0, $v0, 3 -/* EA0E80 80240580 0C010ABD */ jal dead_get_enemy -/* EA0E84 80240584 00459021 */ addu $s2, $v0, $a1 -/* EA0E88 80240588 3C148010 */ lui $s4, %hi(dead_gPlayerStatusPtr) -/* EA0E8C 8024058C 2694FC90 */ addiu $s4, $s4, %lo(dead_gPlayerStatusPtr) -/* EA0E90 80240590 C60C0038 */ lwc1 $f12, 0x38($s0) -/* EA0E94 80240594 8E830000 */ lw $v1, ($s4) -/* EA0E98 80240598 C60E0040 */ lwc1 $f14, 0x40($s0) -/* EA0E9C 8024059C 8C660028 */ lw $a2, 0x28($v1) -/* EA0EA0 802405A0 8C670030 */ lw $a3, 0x30($v1) -/* EA0EA4 802405A4 0C00AC71 */ jal dead_dist2D -/* EA0EA8 802405A8 0040982D */ daddu $s3, $v0, $zero -/* EA0EAC 802405AC C6620074 */ lwc1 $f2, 0x74($s3) -/* EA0EB0 802405B0 468010A0 */ cvt.s.w $f2, $f2 -/* EA0EB4 802405B4 4600103C */ c.lt.s $f2, $f0 -/* EA0EB8 802405B8 00000000 */ nop -/* EA0EBC 802405BC 45030001 */ bc1tl .L802405C4 -/* EA0EC0 802405C0 0000882D */ daddu $s1, $zero, $zero -.L802405C4: -/* EA0EC4 802405C4 C64C006C */ lwc1 $f12, 0x6c($s2) -/* EA0EC8 802405C8 C60E000C */ lwc1 $f14, 0xc($s0) -/* EA0ECC 802405CC 3C014387 */ lui $at, 0x4387 -/* EA0ED0 802405D0 4481A000 */ mtc1 $at, $f20 -/* EA0ED4 802405D4 0C00ABC6 */ jal dead_get_clamped_angle_diff -/* EA0ED8 802405D8 00000000 */ nop -/* EA0EDC 802405DC 0C00AB85 */ jal dead_clamp_angle -/* EA0EE0 802405E0 46000306 */ mov.s $f12, $f0 -/* EA0EE4 802405E4 3C018024 */ lui $at, %hi(D_80246480_EA6D80) -/* EA0EE8 802405E8 D4226480 */ ldc1 $f2, %lo(D_80246480_EA6D80)($at) -/* EA0EEC 802405EC 46000021 */ cvt.d.s $f0, $f0 -/* EA0EF0 802405F0 4622003C */ c.lt.d $f0, $f2 -/* EA0EF4 802405F4 00000000 */ nop -/* EA0EF8 802405F8 45000003 */ bc1f .L80240608 -/* EA0EFC 802405FC 00000000 */ nop -/* EA0F00 80240600 3C0142B4 */ lui $at, 0x42b4 -/* EA0F04 80240604 4481A000 */ mtc1 $at, $f20 -.L80240608: -/* EA0F08 80240608 C60C0038 */ lwc1 $f12, 0x38($s0) -/* EA0F0C 8024060C 8E820000 */ lw $v0, ($s4) -/* EA0F10 80240610 C60E0040 */ lwc1 $f14, 0x40($s0) -/* EA0F14 80240614 8C460028 */ lw $a2, 0x28($v0) -/* EA0F18 80240618 0C00ABDC */ jal fio_validate_header_checksums -/* EA0F1C 8024061C 8C470030 */ lw $a3, 0x30($v0) -/* EA0F20 80240620 4600A306 */ mov.s $f12, $f20 -/* EA0F24 80240624 0C00ABC6 */ jal dead_get_clamped_angle_diff -/* EA0F28 80240628 46000386 */ mov.s $f14, $f0 -/* EA0F2C 8024062C C6620078 */ lwc1 $f2, 0x78($s3) -/* EA0F30 80240630 468010A0 */ cvt.s.w $f2, $f2 -/* EA0F34 80240634 46000005 */ abs.s $f0, $f0 -/* EA0F38 80240638 4600103C */ c.lt.s $f2, $f0 -/* EA0F3C 8024063C 00000000 */ nop -/* EA0F40 80240640 45030001 */ bc1tl .L80240648 -/* EA0F44 80240644 0000882D */ daddu $s1, $zero, $zero -.L80240648: -/* EA0F48 80240648 8E820000 */ lw $v0, ($s4) -/* EA0F4C 8024064C C600003C */ lwc1 $f0, 0x3c($s0) -/* EA0F50 80240650 C442002C */ lwc1 $f2, 0x2c($v0) -/* EA0F54 80240654 860200A8 */ lh $v0, 0xa8($s0) -/* EA0F58 80240658 46020001 */ sub.s $f0, $f0, $f2 -/* EA0F5C 8024065C 44821000 */ mtc1 $v0, $f2 -/* EA0F60 80240660 00000000 */ nop -/* EA0F64 80240664 468010A1 */ cvt.d.w $f2, $f2 -/* EA0F68 80240668 46221080 */ add.d $f2, $f2, $f2 -/* EA0F6C 8024066C 46000005 */ abs.s $f0, $f0 -/* EA0F70 80240670 46000021 */ cvt.d.s $f0, $f0 -/* EA0F74 80240674 4620103E */ c.le.d $f2, $f0 -/* EA0F78 80240678 00000000 */ nop -/* EA0F7C 8024067C 45030001 */ bc1tl .L80240684 -/* EA0F80 80240680 0000882D */ daddu $s1, $zero, $zero -.L80240684: -/* EA0F84 80240684 3C038011 */ lui $v1, %hi(D_80117163) -/* EA0F88 80240688 80637163 */ lb $v1, %lo(D_80117163)($v1) -/* EA0F8C 8024068C 24020009 */ addiu $v0, $zero, 9 -/* EA0F90 80240690 50620001 */ beql $v1, $v0, .L80240698 -/* EA0F94 80240694 0000882D */ daddu $s1, $zero, $zero -.L80240698: -/* EA0F98 80240698 24020007 */ addiu $v0, $zero, 7 -/* EA0F9C 8024069C 50620001 */ beql $v1, $v0, .L802406A4 -/* EA0FA0 802406A0 0000882D */ daddu $s1, $zero, $zero -.L802406A4: -/* EA0FA4 802406A4 0220102D */ daddu $v0, $s1, $zero -/* EA0FA8 802406A8 8FBF0024 */ lw $ra, 0x24($sp) -/* EA0FAC 802406AC 8FB40020 */ lw $s4, 0x20($sp) -/* EA0FB0 802406B0 8FB3001C */ lw $s3, 0x1c($sp) -/* EA0FB4 802406B4 8FB20018 */ lw $s2, 0x18($sp) -/* EA0FB8 802406B8 8FB10014 */ lw $s1, 0x14($sp) -/* EA0FBC 802406BC 8FB00010 */ lw $s0, 0x10($sp) -/* EA0FC0 802406C0 D7B40028 */ ldc1 $f20, 0x28($sp) -/* EA0FC4 802406C4 03E00008 */ jr $ra -/* EA0FC8 802406C8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/EA0C10/func_802406CC_EA0FCC.s b/ver/us/asm/nonmatchings/EA0C10/func_802406CC_EA0FCC.s index 2d97c44994..959d1fc211 100644 --- a/ver/us/asm/nonmatchings/EA0C10/func_802406CC_EA0FCC.s +++ b/ver/us/asm/nonmatchings/EA0C10/func_802406CC_EA0FCC.s @@ -93,7 +93,7 @@ glabel func_802406CC_EA0FCC /* EA111C 8024081C 44070000 */ mfc1 $a3, $f0 /* EA1120 80240820 27A50014 */ addiu $a1, $sp, 0x14 /* EA1124 80240824 E7A60010 */ swc1 $f6, 0x10($sp) -/* EA1128 80240828 0C00ACA3 */ jal func_8002B28C +/* EA1128 80240828 0C00ACA3 */ jal dead_add_vec2D_polar /* EA112C 8024082C E7A40014 */ swc1 $f4, 0x14($sp) /* EA1130 80240830 C7A00010 */ lwc1 $f0, 0x10($sp) /* EA1134 80240834 4600020D */ trunc.w.s $f8, $f0 diff --git a/ver/us/asm/nonmatchings/EA0C10/func_8024097C_EA127C.s b/ver/us/asm/nonmatchings/EA0C10/func_8024097C_EA127C.s index 0db6fa7063..6c4fc5097b 100644 --- a/ver/us/asm/nonmatchings/EA0C10/func_8024097C_EA127C.s +++ b/ver/us/asm/nonmatchings/EA0C10/func_8024097C_EA127C.s @@ -108,7 +108,7 @@ glabel func_8024097C_EA127C /* EA13E8 80240AE8 8E22006C */ lw $v0, 0x6c($s1) /* EA13EC 80240AEC 14400006 */ bnez $v0, .L80240B08 /* EA13F0 80240AF0 00000000 */ nop -/* EA13F4 80240AF4 0C090146 */ jal func_80240518_EA0E18 +/* EA13F4 80240AF4 0C090146 */ jal EA0C10_UnkNpcAIFunc26 /* EA13F8 80240AF8 0260202D */ daddu $a0, $s3, $zero /* EA13FC 80240AFC 10400002 */ beqz $v0, .L80240B08 /* EA1400 80240B00 2402001E */ addiu $v0, $zero, 0x1e @@ -179,24 +179,24 @@ glabel L80240BCC_EA14CC /* EA14DC 80240BDC 0809030D */ j L80240C34_EA1534 /* EA14E0 80240BE0 00000000 */ nop glabel L80240BE4_EA14E4 -/* EA14E4 80240BE4 0C0900C4 */ jal func_80240310_EA0C10 +/* EA14E4 80240BE4 0C0900C4 */ jal EA0C10_UnkNpcAIFunc6 /* EA14E8 80240BE8 0260202D */ daddu $a0, $s3, $zero glabel L80240BEC_EA14EC -/* EA14EC 80240BEC 0C0900DF */ jal func_8024037C_EA0C7C +/* EA14EC 80240BEC 0C0900DF */ jal EA0C10_UnkNpcAIFunc7 /* EA14F0 80240BF0 0260202D */ daddu $a0, $s3, $zero /* EA14F4 80240BF4 8E630070 */ lw $v1, 0x70($s3) /* EA14F8 80240BF8 24020020 */ addiu $v0, $zero, 0x20 /* EA14FC 80240BFC 1462000D */ bne $v1, $v0, L80240C34_EA1534 /* EA1500 80240C00 00000000 */ nop glabel L80240C04_EA1504 -/* EA1504 80240C04 0C0900FB */ jal func_802403EC_EA0CEC +/* EA1504 80240C04 0C0900FB */ jal EA0C10_UnkNpcAIFunc8 /* EA1508 80240C08 0260202D */ daddu $a0, $s3, $zero /* EA150C 80240C0C 8E630070 */ lw $v1, 0x70($s3) /* EA1510 80240C10 24020021 */ addiu $v0, $zero, 0x21 /* EA1514 80240C14 14620007 */ bne $v1, $v0, L80240C34_EA1534 /* EA1518 80240C18 00000000 */ nop glabel L80240C1C_EA151C -/* EA151C 80240C1C 0C090131 */ jal func_802404C4_EA0DC4 +/* EA151C 80240C1C 0C090131 */ jal EA0C10_UnkNpcAIFunc5 /* EA1520 80240C20 0260202D */ daddu $a0, $s3, $zero /* EA1524 80240C24 0809030D */ j L80240C34_EA1534 /* EA1528 80240C28 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/EA0C10/func_80240C5C_EA155C.s b/ver/us/asm/nonmatchings/EA0C10/func_80240C5C_EA155C.s deleted file mode 100644 index 67fa6ebb27..0000000000 --- a/ver/us/asm/nonmatchings/EA0C10/func_80240C5C_EA155C.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C5C_EA155C -/* EA155C 80240C5C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* EA1560 80240C60 AFB10014 */ sw $s1, 0x14($sp) -/* EA1564 80240C64 0080882D */ daddu $s1, $a0, $zero -/* EA1568 80240C68 AFBF0018 */ sw $ra, 0x18($sp) -/* EA156C 80240C6C AFB00010 */ sw $s0, 0x10($sp) -/* EA1570 80240C70 8E300148 */ lw $s0, 0x148($s1) -/* EA1574 80240C74 0C00F92F */ jal dead_get_npc_unsafe -/* EA1578 80240C78 86040008 */ lh $a0, 8($s0) -/* EA157C 80240C7C 0040202D */ daddu $a0, $v0, $zero -/* EA1580 80240C80 8482008E */ lh $v0, 0x8e($a0) -/* EA1584 80240C84 9483008E */ lhu $v1, 0x8e($a0) -/* EA1588 80240C88 18400003 */ blez $v0, .L80240C98 -/* EA158C 80240C8C 2462FFFF */ addiu $v0, $v1, -1 -/* EA1590 80240C90 0809032D */ j .L80240CB4 -/* EA1594 80240C94 A482008E */ sh $v0, 0x8e($a0) -.L80240C98: -/* EA1598 80240C98 8E0200CC */ lw $v0, 0xcc($s0) -/* EA159C 80240C9C AE00006C */ sw $zero, 0x6c($s0) -/* EA15A0 80240CA0 8C420000 */ lw $v0, ($v0) -/* EA15A4 80240CA4 AC820028 */ sw $v0, 0x28($a0) -/* EA15A8 80240CA8 24020001 */ addiu $v0, $zero, 1 -/* EA15AC 80240CAC AE200074 */ sw $zero, 0x74($s1) -/* EA15B0 80240CB0 AE220070 */ sw $v0, 0x70($s1) -.L80240CB4: -/* EA15B4 80240CB4 8FBF0018 */ lw $ra, 0x18($sp) -/* EA15B8 80240CB8 8FB10014 */ lw $s1, 0x14($sp) -/* EA15BC 80240CBC 8FB00010 */ lw $s0, 0x10($sp) -/* EA15C0 80240CC0 03E00008 */ jr $ra -/* EA15C4 80240CC4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/EA0C10/func_80240CC8_EA15C8.s b/ver/us/asm/nonmatchings/EA0C10/func_80240CC8_EA15C8.s deleted file mode 100644 index 2a6981184d..0000000000 --- a/ver/us/asm/nonmatchings/EA0C10/func_80240CC8_EA15C8.s +++ /dev/null @@ -1,68 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CC8_EA15C8 -/* EA15C8 80240CC8 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* EA15CC 80240CCC AFB3003C */ sw $s3, 0x3c($sp) -/* EA15D0 80240CD0 0080982D */ daddu $s3, $a0, $zero -/* EA15D4 80240CD4 AFBF0040 */ sw $ra, 0x40($sp) -/* EA15D8 80240CD8 AFB20038 */ sw $s2, 0x38($sp) -/* EA15DC 80240CDC AFB10034 */ sw $s1, 0x34($sp) -/* EA15E0 80240CE0 AFB00030 */ sw $s0, 0x30($sp) -/* EA15E4 80240CE4 8E720148 */ lw $s2, 0x148($s3) -/* EA15E8 80240CE8 00A0882D */ daddu $s1, $a1, $zero -/* EA15EC 80240CEC 86440008 */ lh $a0, 8($s2) -/* EA15F0 80240CF0 0C00F92F */ jal dead_get_npc_unsafe -/* EA15F4 80240CF4 00C0802D */ daddu $s0, $a2, $zero -/* EA15F8 80240CF8 0200202D */ daddu $a0, $s0, $zero -/* EA15FC 80240CFC 0240282D */ daddu $a1, $s2, $zero -/* EA1600 80240D00 AFA00010 */ sw $zero, 0x10($sp) -/* EA1604 80240D04 8E26000C */ lw $a2, 0xc($s1) -/* EA1608 80240D08 8E270010 */ lw $a3, 0x10($s1) -/* EA160C 80240D0C 0C013469 */ jal func_8004D1A4 -/* EA1610 80240D10 0040882D */ daddu $s1, $v0, $zero -/* EA1614 80240D14 10400024 */ beqz $v0, .L80240DA8 -/* EA1618 80240D18 0220202D */ daddu $a0, $s1, $zero -/* EA161C 80240D1C 24050322 */ addiu $a1, $zero, 0x322 -/* EA1620 80240D20 0C013600 */ jal dead_ai_enemy_play_sound -/* EA1624 80240D24 0000302D */ daddu $a2, $zero, $zero -/* EA1628 80240D28 0000202D */ daddu $a0, $zero, $zero -/* EA162C 80240D2C 0220282D */ daddu $a1, $s1, $zero -/* EA1630 80240D30 0000302D */ daddu $a2, $zero, $zero -/* EA1634 80240D34 2410000A */ addiu $s0, $zero, 0xa -/* EA1638 80240D38 862300A8 */ lh $v1, 0xa8($s1) -/* EA163C 80240D3C 3C013F80 */ lui $at, 0x3f80 -/* EA1640 80240D40 44810000 */ mtc1 $at, $f0 -/* EA1644 80240D44 3C014000 */ lui $at, 0x4000 -/* EA1648 80240D48 44811000 */ mtc1 $at, $f2 -/* EA164C 80240D4C 3C01C1A0 */ lui $at, 0xc1a0 -/* EA1650 80240D50 44812000 */ mtc1 $at, $f4 -/* EA1654 80240D54 44833000 */ mtc1 $v1, $f6 -/* EA1658 80240D58 00000000 */ nop -/* EA165C 80240D5C 468031A0 */ cvt.s.w $f6, $f6 -/* EA1660 80240D60 44073000 */ mfc1 $a3, $f6 -/* EA1664 80240D64 27A20028 */ addiu $v0, $sp, 0x28 -/* EA1668 80240D68 AFB0001C */ sw $s0, 0x1c($sp) -/* EA166C 80240D6C AFA20020 */ sw $v0, 0x20($sp) -/* EA1670 80240D70 E7A00010 */ swc1 $f0, 0x10($sp) -/* EA1674 80240D74 E7A20014 */ swc1 $f2, 0x14($sp) -/* EA1678 80240D78 0C01D444 */ jal dead_fx_emote -/* EA167C 80240D7C E7A40018 */ swc1 $f4, 0x18($sp) -/* EA1680 80240D80 0220202D */ daddu $a0, $s1, $zero -/* EA1684 80240D84 240502F4 */ addiu $a1, $zero, 0x2f4 -/* EA1688 80240D88 0C013600 */ jal dead_ai_enemy_play_sound -/* EA168C 80240D8C 3C060020 */ lui $a2, 0x20 -/* EA1690 80240D90 8E4200CC */ lw $v0, 0xcc($s2) -/* EA1694 80240D94 8C420020 */ lw $v0, 0x20($v0) -/* EA1698 80240D98 AE220028 */ sw $v0, 0x28($s1) -/* EA169C 80240D9C 9642008E */ lhu $v0, 0x8e($s2) -/* EA16A0 80240DA0 A622008E */ sh $v0, 0x8e($s1) -/* EA16A4 80240DA4 AE700070 */ sw $s0, 0x70($s3) -.L80240DA8: -/* EA16A8 80240DA8 8FBF0040 */ lw $ra, 0x40($sp) -/* EA16AC 80240DAC 8FB3003C */ lw $s3, 0x3c($sp) -/* EA16B0 80240DB0 8FB20038 */ lw $s2, 0x38($sp) -/* EA16B4 80240DB4 8FB10034 */ lw $s1, 0x34($sp) -/* EA16B8 80240DB8 8FB00030 */ lw $s0, 0x30($sp) -/* EA16BC 80240DBC 03E00008 */ jr $ra -/* EA16C0 80240DC0 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/EA0C10/func_80240DC4_EA16C4.s b/ver/us/asm/nonmatchings/EA0C10/func_80240DC4_EA16C4.s index 7075c3c5e1..77587dda20 100644 --- a/ver/us/asm/nonmatchings/EA0C10/func_80240DC4_EA16C4.s +++ b/ver/us/asm/nonmatchings/EA0C10/func_80240DC4_EA16C4.s @@ -73,8 +73,8 @@ glabel func_80240DC4_EA16C4 /* EA1778 80240E78 00000000 */ nop /* EA177C 80240E7C 45000011 */ bc1f .L80240EC4 /* EA1780 80240E80 00000000 */ nop -/* EA1784 80240E84 3C038008 */ lui $v1, %hi(D_8007C760) -/* EA1788 80240E88 8C63C760 */ lw $v1, %lo(D_8007C760)($v1) +/* EA1784 80240E84 3C038008 */ lui $v1, %hi(dead_gCurrentCameraID) +/* EA1788 80240E88 8C63C760 */ lw $v1, %lo(dead_gCurrentCameraID)($v1) /* EA178C 80240E8C 3C0142B4 */ lui $at, 0x42b4 /* EA1790 80240E90 44816000 */ mtc1 $at, $f12 /* EA1794 80240E94 00031080 */ sll $v0, $v1, 2 @@ -90,8 +90,8 @@ glabel func_80240DC4_EA16C4 /* EA17BC 80240EBC 080903C0 */ j .L80240F00 /* EA17C0 80240EC0 460C0301 */ sub.s $f12, $f0, $f12 .L80240EC4: -/* EA17C4 80240EC4 3C038008 */ lui $v1, %hi(D_8007C760) -/* EA17C8 80240EC8 8C63C760 */ lw $v1, %lo(D_8007C760)($v1) +/* EA17C4 80240EC4 3C038008 */ lui $v1, %hi(dead_gCurrentCameraID) +/* EA17C8 80240EC8 8C63C760 */ lw $v1, %lo(dead_gCurrentCameraID)($v1) /* EA17CC 80240ECC 3C0142B4 */ lui $at, 0x42b4 /* EA17D0 80240ED0 44816000 */ mtc1 $at, $f12 /* EA17D4 80240ED4 00031080 */ sll $v0, $v1, 2 @@ -164,7 +164,7 @@ glabel func_80240DC4_EA16C4 /* EA18CC 80240FCC E6200038 */ swc1 $f0, 0x38($s1) /* EA18D0 80240FD0 C4600030 */ lwc1 $f0, 0x30($v1) /* EA18D4 80240FD4 0260282D */ daddu $a1, $s3, $zero -/* EA18D8 80240FD8 0C00ACA3 */ jal func_8002B28C +/* EA18D8 80240FD8 0C00ACA3 */ jal dead_add_vec2D_polar /* EA18DC 80240FDC E6200040 */ swc1 $f0, 0x40($s1) /* EA18E0 80240FE0 862200A6 */ lh $v0, 0xa6($s1) /* EA18E4 80240FE4 44820000 */ mtc1 $v0, $f0 @@ -273,7 +273,7 @@ glabel func_80240DC4_EA16C4 /* EA1A64 80241164 4407B000 */ mfc1 $a3, $f22 /* EA1A68 80241168 0260282D */ daddu $a1, $s3, $zero /* EA1A6C 8024116C E6340038 */ swc1 $f20, 0x38($s1) -/* EA1A70 80241170 0C00ACA3 */ jal func_8002B28C +/* EA1A70 80241170 0C00ACA3 */ jal dead_add_vec2D_polar /* EA1A74 80241174 E6340040 */ swc1 $f20, 0x40($s1) /* EA1A78 80241178 08090550 */ j .L80241540 /* EA1A7C 8024117C 00000000 */ nop @@ -450,7 +450,7 @@ glabel func_80240DC4_EA16C4 /* EA1D20 80241420 E6200038 */ swc1 $f0, 0x38($s1) /* EA1D24 80241424 C4600030 */ lwc1 $f0, 0x30($v1) /* EA1D28 80241428 26250040 */ addiu $a1, $s1, 0x40 -/* EA1D2C 8024142C 0C00ACA3 */ jal func_8002B28C +/* EA1D2C 8024142C 0C00ACA3 */ jal dead_add_vec2D_polar /* EA1D30 80241430 E6200040 */ swc1 $f0, 0x40($s1) /* EA1D34 80241434 862200A6 */ lh $v0, 0xa6($s1) /* EA1D38 80241438 44820000 */ mtc1 $v0, $f0 @@ -509,7 +509,7 @@ glabel func_80240DC4_EA16C4 /* EA1E08 80241508 E6200038 */ swc1 $f0, 0x38($s1) /* EA1E0C 8024150C C4600030 */ lwc1 $f0, 0x30($v1) /* EA1E10 80241510 0260282D */ daddu $a1, $s3, $zero -/* EA1E14 80241514 0C00ACA3 */ jal func_8002B28C +/* EA1E14 80241514 0C00ACA3 */ jal dead_add_vec2D_polar /* EA1E18 80241518 E6200040 */ swc1 $f0, 0x40($s1) /* EA1E1C 8024151C 862200A6 */ lh $v0, 0xa6($s1) /* EA1E20 80241520 44820000 */ mtc1 $v0, $f0 @@ -585,7 +585,7 @@ glabel func_80240DC4_EA16C4 /* EA1F2C 8024162C C6480010 */ lwc1 $f8, 0x10($s2) /* EA1F30 80241630 46804220 */ cvt.s.w $f8, $f8 /* EA1F34 80241634 44064000 */ mfc1 $a2, $f8 -/* EA1F38 80241638 0C00ACA3 */ jal func_8002B28C +/* EA1F38 80241638 0C00ACA3 */ jal dead_add_vec2D_polar /* EA1F3C 8024163C 0260282D */ daddu $a1, $s3, $zero /* EA1F40 80241640 080905BE */ j .L802416F8 /* EA1F44 80241644 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/EA0C10/func_80241804_EA2104.s b/ver/us/asm/nonmatchings/EA0C10/func_80241804_EA2104.s deleted file mode 100644 index af5b7ce740..0000000000 --- a/ver/us/asm/nonmatchings/EA0C10/func_80241804_EA2104.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241804_EA2104 -/* EA2104 80241804 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* EA2108 80241808 AFB10014 */ sw $s1, 0x14($sp) -/* EA210C 8024180C 0080882D */ daddu $s1, $a0, $zero -/* EA2110 80241810 AFBF0018 */ sw $ra, 0x18($sp) -/* EA2114 80241814 AFB00010 */ sw $s0, 0x10($sp) -/* EA2118 80241818 8E300148 */ lw $s0, 0x148($s1) -/* EA211C 8024181C 0C00F92F */ jal dead_get_npc_unsafe -/* EA2120 80241820 86040008 */ lh $a0, 8($s0) -/* EA2124 80241824 0040202D */ daddu $a0, $v0, $zero -/* EA2128 80241828 9482008E */ lhu $v0, 0x8e($a0) -/* EA212C 8024182C 2442FFFF */ addiu $v0, $v0, -1 -/* EA2130 80241830 A482008E */ sh $v0, 0x8e($a0) -/* EA2134 80241834 00021400 */ sll $v0, $v0, 0x10 -/* EA2138 80241838 8E030098 */ lw $v1, 0x98($s0) -/* EA213C 8024183C 00021403 */ sra $v0, $v0, 0x10 -/* EA2140 80241840 0062182A */ slt $v1, $v1, $v0 -/* EA2144 80241844 14600005 */ bnez $v1, .L8024185C -/* EA2148 80241848 3C03E0EF */ lui $v1, 0xe0ef -/* EA214C 8024184C 8E020000 */ lw $v0, ($s0) -/* EA2150 80241850 3463FFFF */ ori $v1, $v1, 0xffff -/* EA2154 80241854 00431024 */ and $v0, $v0, $v1 -/* EA2158 80241858 AE020000 */ sw $v0, ($s0) -.L8024185C: -/* EA215C 8024185C 8482008E */ lh $v0, 0x8e($a0) -/* EA2160 80241860 14400007 */ bnez $v0, .L80241880 -/* EA2164 80241864 00000000 */ nop -/* EA2168 80241868 8E0200CC */ lw $v0, 0xcc($s0) -/* EA216C 8024186C 8C420028 */ lw $v0, 0x28($v0) -/* EA2170 80241870 A480008E */ sh $zero, 0x8e($a0) -/* EA2174 80241874 AC820028 */ sw $v0, 0x28($a0) -/* EA2178 80241878 2402000C */ addiu $v0, $zero, 0xc -/* EA217C 8024187C AE220070 */ sw $v0, 0x70($s1) -.L80241880: -/* EA2180 80241880 8FBF0018 */ lw $ra, 0x18($sp) -/* EA2184 80241884 8FB10014 */ lw $s1, 0x14($sp) -/* EA2188 80241888 8FB00010 */ lw $s0, 0x10($sp) -/* EA218C 8024188C 03E00008 */ jr $ra -/* EA2190 80241890 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/EA0C10/func_80241894_EA2194.s b/ver/us/asm/nonmatchings/EA0C10/func_80241894_EA2194.s deleted file mode 100644 index fb19487bcc..0000000000 --- a/ver/us/asm/nonmatchings/EA0C10/func_80241894_EA2194.s +++ /dev/null @@ -1,71 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241894_EA2194 -/* EA2194 80241894 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* EA2198 80241898 AFB10034 */ sw $s1, 0x34($sp) -/* EA219C 8024189C 0080882D */ daddu $s1, $a0, $zero -/* EA21A0 802418A0 AFBF0038 */ sw $ra, 0x38($sp) -/* EA21A4 802418A4 AFB00030 */ sw $s0, 0x30($sp) -/* EA21A8 802418A8 8E300148 */ lw $s0, 0x148($s1) -/* EA21AC 802418AC 0C00F92F */ jal dead_get_npc_unsafe -/* EA21B0 802418B0 86040008 */ lh $a0, 8($s0) -/* EA21B4 802418B4 0040282D */ daddu $a1, $v0, $zero -/* EA21B8 802418B8 94A2008E */ lhu $v0, 0x8e($a1) -/* EA21BC 802418BC 24420001 */ addiu $v0, $v0, 1 -/* EA21C0 802418C0 A4A2008E */ sh $v0, 0x8e($a1) -/* EA21C4 802418C4 00021400 */ sll $v0, $v0, 0x10 -/* EA21C8 802418C8 8E0300A0 */ lw $v1, 0xa0($s0) -/* EA21CC 802418CC 00021403 */ sra $v0, $v0, 0x10 -/* EA21D0 802418D0 14430004 */ bne $v0, $v1, .L802418E4 -/* EA21D4 802418D4 00000000 */ nop -/* EA21D8 802418D8 8E0200CC */ lw $v0, 0xcc($s0) -/* EA21DC 802418DC 8C42002C */ lw $v0, 0x2c($v0) -/* EA21E0 802418E0 ACA20028 */ sw $v0, 0x28($a1) -.L802418E4: -/* EA21E4 802418E4 84A3008E */ lh $v1, 0x8e($a1) -/* EA21E8 802418E8 8E0200A4 */ lw $v0, 0xa4($s0) -/* EA21EC 802418EC 14620002 */ bne $v1, $v0, .L802418F8 -/* EA21F0 802418F0 24020003 */ addiu $v0, $zero, 3 -/* EA21F4 802418F4 AE02006C */ sw $v0, 0x6c($s0) -.L802418F8: -/* EA21F8 802418F8 84A2008E */ lh $v0, 0x8e($a1) -/* EA21FC 802418FC 8E03009C */ lw $v1, 0x9c($s0) -/* EA2200 80241900 0043102A */ slt $v0, $v0, $v1 -/* EA2204 80241904 1440001E */ bnez $v0, .L80241980 -/* EA2208 80241908 24020004 */ addiu $v0, $zero, 4 -/* EA220C 8024190C AE02006C */ sw $v0, 0x6c($s0) -/* EA2210 80241910 24020008 */ addiu $v0, $zero, 8 -/* EA2214 80241914 24040003 */ addiu $a0, $zero, 3 -/* EA2218 80241918 A4A2008E */ sh $v0, 0x8e($a1) -/* EA221C 8024191C 8E0200CC */ lw $v0, 0xcc($s0) -/* EA2220 80241920 84A300A8 */ lh $v1, 0xa8($a1) -/* EA2224 80241924 3C013F80 */ lui $at, 0x3f80 -/* EA2228 80241928 44810000 */ mtc1 $at, $f0 -/* EA222C 8024192C 3C014000 */ lui $at, 0x4000 -/* EA2230 80241930 44811000 */ mtc1 $at, $f2 -/* EA2234 80241934 3C01C1A0 */ lui $at, 0xc1a0 -/* EA2238 80241938 44812000 */ mtc1 $at, $f4 -/* EA223C 8024193C 44833000 */ mtc1 $v1, $f6 -/* EA2240 80241940 00000000 */ nop -/* EA2244 80241944 468031A0 */ cvt.s.w $f6, $f6 -/* EA2248 80241948 8C420000 */ lw $v0, ($v0) -/* EA224C 8024194C 44073000 */ mfc1 $a3, $f6 -/* EA2250 80241950 0000302D */ daddu $a2, $zero, $zero -/* EA2254 80241954 ACA20028 */ sw $v0, 0x28($a1) -/* EA2258 80241958 2402000A */ addiu $v0, $zero, 0xa -/* EA225C 8024195C AFA2001C */ sw $v0, 0x1c($sp) -/* EA2260 80241960 27A20028 */ addiu $v0, $sp, 0x28 -/* EA2264 80241964 E7A00010 */ swc1 $f0, 0x10($sp) -/* EA2268 80241968 E7A20014 */ swc1 $f2, 0x14($sp) -/* EA226C 8024196C E7A40018 */ swc1 $f4, 0x18($sp) -/* EA2270 80241970 0C01D444 */ jal dead_fx_emote -/* EA2274 80241974 AFA20020 */ sw $v0, 0x20($sp) -/* EA2278 80241978 2402000D */ addiu $v0, $zero, 0xd -/* EA227C 8024197C AE220070 */ sw $v0, 0x70($s1) -.L80241980: -/* EA2280 80241980 8FBF0038 */ lw $ra, 0x38($sp) -/* EA2284 80241984 8FB10034 */ lw $s1, 0x34($sp) -/* EA2288 80241988 8FB00030 */ lw $s0, 0x30($sp) -/* EA228C 8024198C 03E00008 */ jr $ra -/* EA2290 80241990 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/EA0C10/func_80241994_EA2294.s b/ver/us/asm/nonmatchings/EA0C10/func_80241994_EA2294.s deleted file mode 100644 index f4630b66ba..0000000000 --- a/ver/us/asm/nonmatchings/EA0C10/func_80241994_EA2294.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241994_EA2294 -/* EA2294 80241994 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* EA2298 80241998 AFB10014 */ sw $s1, 0x14($sp) -/* EA229C 8024199C 0080882D */ daddu $s1, $a0, $zero -/* EA22A0 802419A0 AFBF0018 */ sw $ra, 0x18($sp) -/* EA22A4 802419A4 AFB00010 */ sw $s0, 0x10($sp) -/* EA22A8 802419A8 8E300148 */ lw $s0, 0x148($s1) -/* EA22AC 802419AC 0C00F92F */ jal dead_get_npc_unsafe -/* EA22B0 802419B0 86040008 */ lh $a0, 8($s0) -/* EA22B4 802419B4 0040182D */ daddu $v1, $v0, $zero -/* EA22B8 802419B8 9462008E */ lhu $v0, 0x8e($v1) -/* EA22BC 802419BC 2442FFFF */ addiu $v0, $v0, -1 -/* EA22C0 802419C0 A462008E */ sh $v0, 0x8e($v1) -/* EA22C4 802419C4 00021400 */ sll $v0, $v0, 0x10 -/* EA22C8 802419C8 14400005 */ bnez $v0, .L802419E0 -/* EA22CC 802419CC 00000000 */ nop -/* EA22D0 802419D0 960200AA */ lhu $v0, 0xaa($s0) -/* EA22D4 802419D4 A462008E */ sh $v0, 0x8e($v1) -/* EA22D8 802419D8 2402000E */ addiu $v0, $zero, 0xe -/* EA22DC 802419DC AE220070 */ sw $v0, 0x70($s1) -.L802419E0: -/* EA22E0 802419E0 8FBF0018 */ lw $ra, 0x18($sp) -/* EA22E4 802419E4 8FB10014 */ lw $s1, 0x14($sp) -/* EA22E8 802419E8 8FB00010 */ lw $s0, 0x10($sp) -/* EA22EC 802419EC 03E00008 */ jr $ra -/* EA22F0 802419F0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/EA0C10/func_802419F4_EA22F4.s b/ver/us/asm/nonmatchings/EA0C10/func_802419F4_EA22F4.s deleted file mode 100644 index bb5ea8309a..0000000000 --- a/ver/us/asm/nonmatchings/EA0C10/func_802419F4_EA22F4.s +++ /dev/null @@ -1,65 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802419F4_EA22F4 -/* EA22F4 802419F4 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* EA22F8 802419F8 AFB40040 */ sw $s4, 0x40($sp) -/* EA22FC 802419FC 0080A02D */ daddu $s4, $a0, $zero -/* EA2300 80241A00 AFBF0044 */ sw $ra, 0x44($sp) -/* EA2304 80241A04 AFB3003C */ sw $s3, 0x3c($sp) -/* EA2308 80241A08 AFB20038 */ sw $s2, 0x38($sp) -/* EA230C 80241A0C AFB10034 */ sw $s1, 0x34($sp) -/* EA2310 80241A10 AFB00030 */ sw $s0, 0x30($sp) -/* EA2314 80241A14 8E910148 */ lw $s1, 0x148($s4) -/* EA2318 80241A18 00A0902D */ daddu $s2, $a1, $zero -/* EA231C 80241A1C 86240008 */ lh $a0, 8($s1) -/* EA2320 80241A20 0C00F92F */ jal dead_get_npc_unsafe -/* EA2324 80241A24 00C0982D */ daddu $s3, $a2, $zero -/* EA2328 80241A28 0040802D */ daddu $s0, $v0, $zero -/* EA232C 80241A2C 9602008E */ lhu $v0, 0x8e($s0) -/* EA2330 80241A30 2442FFFF */ addiu $v0, $v0, -1 -/* EA2334 80241A34 A602008E */ sh $v0, 0x8e($s0) -/* EA2338 80241A38 00021400 */ sll $v0, $v0, 0x10 -/* EA233C 80241A3C 14400020 */ bnez $v0, .L80241AC0 -/* EA2340 80241A40 0260202D */ daddu $a0, $s3, $zero -/* EA2344 80241A44 AFA00010 */ sw $zero, 0x10($sp) -/* EA2348 80241A48 8E46000C */ lw $a2, 0xc($s2) -/* EA234C 80241A4C 8E470010 */ lw $a3, 0x10($s2) -/* EA2350 80241A50 0C013469 */ jal func_8004D1A4 -/* EA2354 80241A54 0220282D */ daddu $a1, $s1, $zero -/* EA2358 80241A58 54400018 */ bnel $v0, $zero, .L80241ABC -/* EA235C 80241A5C A600008E */ sh $zero, 0x8e($s0) -/* EA2360 80241A60 24040002 */ addiu $a0, $zero, 2 -/* EA2364 80241A64 0200282D */ daddu $a1, $s0, $zero -/* EA2368 80241A68 0000302D */ daddu $a2, $zero, $zero -/* EA236C 80241A6C 860300A8 */ lh $v1, 0xa8($s0) -/* EA2370 80241A70 3C013F80 */ lui $at, 0x3f80 -/* EA2374 80241A74 44810000 */ mtc1 $at, $f0 -/* EA2378 80241A78 3C014000 */ lui $at, 0x4000 -/* EA237C 80241A7C 44811000 */ mtc1 $at, $f2 -/* EA2380 80241A80 3C01C1A0 */ lui $at, 0xc1a0 -/* EA2384 80241A84 44812000 */ mtc1 $at, $f4 -/* EA2388 80241A88 2402000F */ addiu $v0, $zero, 0xf -/* EA238C 80241A8C AFA2001C */ sw $v0, 0x1c($sp) -/* EA2390 80241A90 44833000 */ mtc1 $v1, $f6 -/* EA2394 80241A94 00000000 */ nop -/* EA2398 80241A98 468031A0 */ cvt.s.w $f6, $f6 -/* EA239C 80241A9C 44073000 */ mfc1 $a3, $f6 -/* EA23A0 80241AA0 27A20028 */ addiu $v0, $sp, 0x28 -/* EA23A4 80241AA4 AFA20020 */ sw $v0, 0x20($sp) -/* EA23A8 80241AA8 E7A00010 */ swc1 $f0, 0x10($sp) -/* EA23AC 80241AAC E7A20014 */ swc1 $f2, 0x14($sp) -/* EA23B0 80241AB0 0C01D444 */ jal dead_fx_emote -/* EA23B4 80241AB4 E7A40018 */ swc1 $f4, 0x18($sp) -/* EA23B8 80241AB8 A600008E */ sh $zero, 0x8e($s0) -.L80241ABC: -/* EA23BC 80241ABC AE800070 */ sw $zero, 0x70($s4) -.L80241AC0: -/* EA23C0 80241AC0 8FBF0044 */ lw $ra, 0x44($sp) -/* EA23C4 80241AC4 8FB40040 */ lw $s4, 0x40($sp) -/* EA23C8 80241AC8 8FB3003C */ lw $s3, 0x3c($sp) -/* EA23CC 80241ACC 8FB20038 */ lw $s2, 0x38($sp) -/* EA23D0 80241AD0 8FB10034 */ lw $s1, 0x34($sp) -/* EA23D4 80241AD4 8FB00030 */ lw $s0, 0x30($sp) -/* EA23D8 80241AD8 03E00008 */ jr $ra -/* EA23DC 80241ADC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/EA0C10/func_80241AE0_EA23E0.s b/ver/us/asm/nonmatchings/EA0C10/func_80241AE0_EA23E0.s index c18f9a1d82..1084dbf81d 100644 --- a/ver/us/asm/nonmatchings/EA0C10/func_80241AE0_EA23E0.s +++ b/ver/us/asm/nonmatchings/EA0C10/func_80241AE0_EA23E0.s @@ -114,12 +114,12 @@ glabel func_80241AE0_EA23E0 /* EA2580 80241C80 00000000 */ nop .L80241C84: /* EA2584 80241C84 0240282D */ daddu $a1, $s2, $zero -/* EA2588 80241C88 0C090317 */ jal func_80240C5C_EA155C +/* EA2588 80241C88 0C090317 */ jal EA0C10_UnkNpcAIFunc31 /* EA258C 80241C8C 0260302D */ daddu $a2, $s3, $zero .L80241C90: /* EA2590 80241C90 0220202D */ daddu $a0, $s1, $zero /* EA2594 80241C94 0240282D */ daddu $a1, $s2, $zero -/* EA2598 80241C98 0C090332 */ jal func_80240CC8_EA15C8 +/* EA2598 80241C98 0C090332 */ jal EA0C10_UnkNpcAIFunc32 /* EA259C 80241C9C 0260302D */ daddu $a2, $s3, $zero /* EA25A0 80241CA0 08090750 */ j .L80241D40 /* EA25A4 80241CA4 00000000 */ nop @@ -133,7 +133,7 @@ glabel func_80241AE0_EA23E0 .L80241CC0: /* EA25C0 80241CC0 0220202D */ daddu $a0, $s1, $zero /* EA25C4 80241CC4 0240282D */ daddu $a1, $s2, $zero -/* EA25C8 80241CC8 0C090601 */ jal func_80241804_EA2104 +/* EA25C8 80241CC8 0C090601 */ jal EA0C10_UnkNpcDurationFlagFunc3 /* EA25CC 80241CCC 0260302D */ daddu $a2, $s3, $zero /* EA25D0 80241CD0 8E230070 */ lw $v1, 0x70($s1) /* EA25D4 80241CD4 2402000C */ addiu $v0, $zero, 0xc @@ -142,7 +142,7 @@ glabel func_80241AE0_EA23E0 /* EA25E0 80241CE0 0220202D */ daddu $a0, $s1, $zero .L80241CE4: /* EA25E4 80241CE4 0240282D */ daddu $a1, $s2, $zero -/* EA25E8 80241CE8 0C090625 */ jal func_80241894_EA2194 +/* EA25E8 80241CE8 0C090625 */ jal EA0C10_UnkNpcAIFunc33 /* EA25EC 80241CEC 0260302D */ daddu $a2, $s3, $zero /* EA25F0 80241CF0 8E230070 */ lw $v1, 0x70($s1) /* EA25F4 80241CF4 2402000D */ addiu $v0, $zero, 0xd @@ -151,7 +151,7 @@ glabel func_80241AE0_EA23E0 .L80241D00: /* EA2600 80241D00 0220202D */ daddu $a0, $s1, $zero /* EA2604 80241D04 0240282D */ daddu $a1, $s2, $zero -/* EA2608 80241D08 0C090665 */ jal func_80241994_EA2294 +/* EA2608 80241D08 0C090665 */ jal EA0C10_UnkNpcDurationFlagFunc2 /* EA260C 80241D0C 0260302D */ daddu $a2, $s3, $zero /* EA2610 80241D10 8E230070 */ lw $v1, 0x70($s1) /* EA2614 80241D14 2402000E */ addiu $v0, $zero, 0xe @@ -160,7 +160,7 @@ glabel func_80241AE0_EA23E0 /* EA2620 80241D20 0220202D */ daddu $a0, $s1, $zero .L80241D24: /* EA2624 80241D24 0240282D */ daddu $a1, $s2, $zero -/* EA2628 80241D28 0C09067D */ jal func_802419F4_EA22F4 +/* EA2628 80241D28 0C09067D */ jal EA0C10_UnkNpcAIFunc30 /* EA262C 80241D2C 0260302D */ daddu $a2, $s3, $zero /* EA2630 80241D30 08090750 */ j .L80241D40 /* EA2634 80241D34 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/EA0C10/func_80241D68_EA2668.s b/ver/us/asm/nonmatchings/EA0C10/func_80241D68_EA2668.s deleted file mode 100644 index a35db03f41..0000000000 --- a/ver/us/asm/nonmatchings/EA0C10/func_80241D68_EA2668.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241D68_EA2668 -/* EA2668 80241D68 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* EA266C 80241D6C AFB20018 */ sw $s2, 0x18($sp) -/* EA2670 80241D70 0080902D */ daddu $s2, $a0, $zero -/* EA2674 80241D74 AFBF001C */ sw $ra, 0x1c($sp) -/* EA2678 80241D78 AFB10014 */ sw $s1, 0x14($sp) -/* EA267C 80241D7C AFB00010 */ sw $s0, 0x10($sp) -/* EA2680 80241D80 8E510148 */ lw $s1, 0x148($s2) -/* EA2684 80241D84 0C00F92F */ jal dead_get_npc_unsafe -/* EA2688 80241D88 86240008 */ lh $a0, 8($s1) -/* EA268C 80241D8C 0040802D */ daddu $s0, $v0, $zero -/* EA2690 80241D90 8E2300CC */ lw $v1, 0xcc($s1) -/* EA2694 80241D94 C60C0038 */ lwc1 $f12, 0x38($s0) -/* EA2698 80241D98 8C630020 */ lw $v1, 0x20($v1) -/* EA269C 80241D9C AE030028 */ sw $v1, 0x28($s0) -/* EA26A0 80241DA0 96220076 */ lhu $v0, 0x76($s1) -/* EA26A4 80241DA4 A602008E */ sh $v0, 0x8e($s0) -/* EA26A8 80241DA8 3C028010 */ lui $v0, %hi(dead_gPlayerStatusPtr) -/* EA26AC 80241DAC 8C42FC90 */ lw $v0, %lo(dead_gPlayerStatusPtr)($v0) -/* EA26B0 80241DB0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* EA26B4 80241DB4 8C460028 */ lw $a2, 0x28($v0) -/* EA26B8 80241DB8 0C00ABDC */ jal fio_validate_header_checksums -/* EA26BC 80241DBC 8C470030 */ lw $a3, 0x30($v0) -/* EA26C0 80241DC0 2402000D */ addiu $v0, $zero, 0xd -/* EA26C4 80241DC4 E600000C */ swc1 $f0, 0xc($s0) -/* EA26C8 80241DC8 AE420070 */ sw $v0, 0x70($s2) -/* EA26CC 80241DCC 8FBF001C */ lw $ra, 0x1c($sp) -/* EA26D0 80241DD0 8FB20018 */ lw $s2, 0x18($sp) -/* EA26D4 80241DD4 8FB10014 */ lw $s1, 0x14($sp) -/* EA26D8 80241DD8 8FB00010 */ lw $s0, 0x10($sp) -/* EA26DC 80241DDC 03E00008 */ jr $ra -/* EA26E0 80241DE0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/EA0C10/func_80241DE4_EA26E4.s b/ver/us/asm/nonmatchings/EA0C10/func_80241DE4_EA26E4.s deleted file mode 100644 index 96803df29f..0000000000 --- a/ver/us/asm/nonmatchings/EA0C10/func_80241DE4_EA26E4.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80246648_EA6F48 -.double 0.8 - -.section .text - -glabel func_80241DE4_EA26E4 -/* EA26E4 80241DE4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* EA26E8 80241DE8 AFB3001C */ sw $s3, 0x1c($sp) -/* EA26EC 80241DEC 0080982D */ daddu $s3, $a0, $zero -/* EA26F0 80241DF0 AFBF0020 */ sw $ra, 0x20($sp) -/* EA26F4 80241DF4 AFB20018 */ sw $s2, 0x18($sp) -/* EA26F8 80241DF8 AFB10014 */ sw $s1, 0x14($sp) -/* EA26FC 80241DFC AFB00010 */ sw $s0, 0x10($sp) -/* EA2700 80241E00 8E710148 */ lw $s1, 0x148($s3) -/* EA2704 80241E04 86240008 */ lh $a0, 8($s1) -/* EA2708 80241E08 0C00F92F */ jal dead_get_npc_unsafe -/* EA270C 80241E0C 00A0902D */ daddu $s2, $a1, $zero -/* EA2710 80241E10 0040802D */ daddu $s0, $v0, $zero -/* EA2714 80241E14 8602008E */ lh $v0, 0x8e($s0) -/* EA2718 80241E18 9603008E */ lhu $v1, 0x8e($s0) -/* EA271C 80241E1C 18400005 */ blez $v0, .L80241E34 -/* EA2720 80241E20 2462FFFF */ addiu $v0, $v1, -1 -/* EA2724 80241E24 A602008E */ sh $v0, 0x8e($s0) -/* EA2728 80241E28 00021400 */ sll $v0, $v0, 0x10 -/* EA272C 80241E2C 1C400033 */ bgtz $v0, .L80241EFC -/* EA2730 80241E30 00000000 */ nop -.L80241E34: -/* EA2734 80241E34 8602008C */ lh $v0, 0x8c($s0) -/* EA2738 80241E38 14400030 */ bnez $v0, .L80241EFC -/* EA273C 80241E3C 00000000 */ nop -/* EA2740 80241E40 8E2200CC */ lw $v0, 0xcc($s1) -/* EA2744 80241E44 8C420024 */ lw $v0, 0x24($v0) -/* EA2748 80241E48 AE020028 */ sw $v0, 0x28($s0) -/* EA274C 80241E4C C6400018 */ lwc1 $f0, 0x18($s2) -/* EA2750 80241E50 E6000018 */ swc1 $f0, 0x18($s0) -/* EA2754 80241E54 8E230088 */ lw $v1, 0x88($s1) -/* EA2758 80241E58 24020005 */ addiu $v0, $zero, 5 -/* EA275C 80241E5C 10620005 */ beq $v1, $v0, .L80241E74 -/* EA2760 80241E60 00000000 */ nop -/* EA2764 80241E64 10600003 */ beqz $v1, .L80241E74 -/* EA2768 80241E68 24020001 */ addiu $v0, $zero, 1 -/* EA276C 80241E6C 14620006 */ bne $v1, $v0, .L80241E88 -/* EA2770 80241E70 00000000 */ nop -.L80241E74: -/* EA2774 80241E74 8E220084 */ lw $v0, 0x84($s1) -/* EA2778 80241E78 00021FC2 */ srl $v1, $v0, 0x1f -/* EA277C 80241E7C 00431021 */ addu $v0, $v0, $v1 -/* EA2780 80241E80 00021043 */ sra $v0, $v0, 1 -/* EA2784 80241E84 A60200A8 */ sh $v0, 0xa8($s0) -.L80241E88: -/* EA2788 80241E88 3C028010 */ lui $v0, %hi(dead_gPlayerStatusPtr) -/* EA278C 80241E8C 8C42FC90 */ lw $v0, %lo(dead_gPlayerStatusPtr)($v0) -/* EA2790 80241E90 C60C0038 */ lwc1 $f12, 0x38($s0) -/* EA2794 80241E94 C60E0040 */ lwc1 $f14, 0x40($s0) -/* EA2798 80241E98 8C460028 */ lw $a2, 0x28($v0) -/* EA279C 80241E9C 0C00AC71 */ jal dead_dist2D -/* EA27A0 80241EA0 8C470030 */ lw $a3, 0x30($v0) -/* EA27A4 80241EA4 C6020018 */ lwc1 $f2, 0x18($s0) -/* EA27A8 80241EA8 46020003 */ div.s $f0, $f0, $f2 -/* EA27AC 80241EAC 3C018024 */ lui $at, %hi(D_80246648_EA6F48) -/* EA27B0 80241EB0 D4226648 */ ldc1 $f2, %lo(D_80246648_EA6F48)($at) -/* EA27B4 80241EB4 46000021 */ cvt.d.s $f0, $f0 -/* EA27B8 80241EB8 46220000 */ add.d $f0, $f0, $f2 -/* EA27BC 80241EBC 4620010D */ trunc.w.d $f4, $f0 -/* EA27C0 80241EC0 44022000 */ mfc1 $v0, $f4 -/* EA27C4 80241EC4 00000000 */ nop -/* EA27C8 80241EC8 A602008E */ sh $v0, 0x8e($s0) -/* EA27CC 80241ECC 00021400 */ sll $v0, $v0, 0x10 -/* EA27D0 80241ED0 8E230078 */ lw $v1, 0x78($s1) -/* EA27D4 80241ED4 00021403 */ sra $v0, $v0, 0x10 -/* EA27D8 80241ED8 0043102A */ slt $v0, $v0, $v1 -/* EA27DC 80241EDC 10400003 */ beqz $v0, .L80241EEC -/* EA27E0 80241EE0 00000000 */ nop -/* EA27E4 80241EE4 9622007A */ lhu $v0, 0x7a($s1) -/* EA27E8 80241EE8 A602008E */ sh $v0, 0x8e($s0) -.L80241EEC: -/* EA27EC 80241EEC 8602008E */ lh $v0, 0x8e($s0) -/* EA27F0 80241EF0 AE22007C */ sw $v0, 0x7c($s1) -/* EA27F4 80241EF4 2402000E */ addiu $v0, $zero, 0xe -/* EA27F8 80241EF8 AE620070 */ sw $v0, 0x70($s3) -.L80241EFC: -/* EA27FC 80241EFC 8FBF0020 */ lw $ra, 0x20($sp) -/* EA2800 80241F00 8FB3001C */ lw $s3, 0x1c($sp) -/* EA2804 80241F04 8FB20018 */ lw $s2, 0x18($sp) -/* EA2808 80241F08 8FB10014 */ lw $s1, 0x14($sp) -/* EA280C 80241F0C 8FB00010 */ lw $s0, 0x10($sp) -/* EA2810 80241F10 03E00008 */ jr $ra -/* EA2814 80241F14 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/EA0C10/func_80241F18_EA2818.s b/ver/us/asm/nonmatchings/EA0C10/func_80241F18_EA2818.s deleted file mode 100644 index c9bba212f6..0000000000 --- a/ver/us/asm/nonmatchings/EA0C10/func_80241F18_EA2818.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241F18_EA2818 -/* EA2818 80241F18 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* EA281C 80241F1C AFB3003C */ sw $s3, 0x3c($sp) -/* EA2820 80241F20 0080982D */ daddu $s3, $a0, $zero -/* EA2824 80241F24 AFBF0040 */ sw $ra, 0x40($sp) -/* EA2828 80241F28 AFB20038 */ sw $s2, 0x38($sp) -/* EA282C 80241F2C AFB10034 */ sw $s1, 0x34($sp) -/* EA2830 80241F30 AFB00030 */ sw $s0, 0x30($sp) -/* EA2834 80241F34 8E710148 */ lw $s1, 0x148($s3) -/* EA2838 80241F38 0C00F92F */ jal dead_get_npc_unsafe -/* EA283C 80241F3C 86240008 */ lh $a0, 8($s1) -/* EA2840 80241F40 0040802D */ daddu $s0, $v0, $zero -/* EA2844 80241F44 8E22007C */ lw $v0, 0x7c($s1) -/* EA2848 80241F48 8603008E */ lh $v1, 0x8e($s0) -/* EA284C 80241F4C 2442FFFF */ addiu $v0, $v0, -1 -/* EA2850 80241F50 14620012 */ bne $v1, $v0, .L80241F9C -/* EA2854 80241F54 00000000 */ nop -/* EA2858 80241F58 C6000038 */ lwc1 $f0, 0x38($s0) -/* EA285C 80241F5C 4600020D */ trunc.w.s $f8, $f0 -/* EA2860 80241F60 44024000 */ mfc1 $v0, $f8 -/* EA2864 80241F64 00000000 */ nop -/* EA2868 80241F68 A6220010 */ sh $v0, 0x10($s1) -/* EA286C 80241F6C C600003C */ lwc1 $f0, 0x3c($s0) -/* EA2870 80241F70 4600020D */ trunc.w.s $f8, $f0 -/* EA2874 80241F74 44024000 */ mfc1 $v0, $f8 -/* EA2878 80241F78 00000000 */ nop -/* EA287C 80241F7C A6220012 */ sh $v0, 0x12($s1) -/* EA2880 80241F80 C6000040 */ lwc1 $f0, 0x40($s0) -/* EA2884 80241F84 24020001 */ addiu $v0, $zero, 1 -/* EA2888 80241F88 A2220007 */ sb $v0, 7($s1) -/* EA288C 80241F8C 4600020D */ trunc.w.s $f8, $f0 -/* EA2890 80241F90 44024000 */ mfc1 $v0, $f8 -/* EA2894 80241F94 00000000 */ nop -/* EA2898 80241F98 A6220014 */ sh $v0, 0x14($s1) -.L80241F9C: -/* EA289C 80241F9C C6000038 */ lwc1 $f0, 0x38($s0) -/* EA28A0 80241FA0 C602003C */ lwc1 $f2, 0x3c($s0) -/* EA28A4 80241FA4 C6040040 */ lwc1 $f4, 0x40($s0) -/* EA28A8 80241FA8 C6060018 */ lwc1 $f6, 0x18($s0) -/* EA28AC 80241FAC E7A00020 */ swc1 $f0, 0x20($sp) -/* EA28B0 80241FB0 E7A20024 */ swc1 $f2, 0x24($sp) -/* EA28B4 80241FB4 E7A40028 */ swc1 $f4, 0x28($sp) -/* EA28B8 80241FB8 E7A60010 */ swc1 $f6, 0x10($sp) -/* EA28BC 80241FBC C600000C */ lwc1 $f0, 0xc($s0) -/* EA28C0 80241FC0 E7A00014 */ swc1 $f0, 0x14($sp) -/* EA28C4 80241FC4 860200A8 */ lh $v0, 0xa8($s0) -/* EA28C8 80241FC8 27A50020 */ addiu $a1, $sp, 0x20 -/* EA28CC 80241FCC 44820000 */ mtc1 $v0, $f0 -/* EA28D0 80241FD0 00000000 */ nop -/* EA28D4 80241FD4 46800020 */ cvt.s.w $f0, $f0 -/* EA28D8 80241FD8 E7A00018 */ swc1 $f0, 0x18($sp) -/* EA28DC 80241FDC 860200A6 */ lh $v0, 0xa6($s0) -/* EA28E0 80241FE0 27A60024 */ addiu $a2, $sp, 0x24 -/* EA28E4 80241FE4 44820000 */ mtc1 $v0, $f0 -/* EA28E8 80241FE8 00000000 */ nop -/* EA28EC 80241FEC 46800020 */ cvt.s.w $f0, $f0 -/* EA28F0 80241FF0 E7A0001C */ swc1 $f0, 0x1c($sp) -/* EA28F4 80241FF4 8E040080 */ lw $a0, 0x80($s0) -/* EA28F8 80241FF8 0C0394C1 */ jal dead_npc_test_move_simple_with_slipping -/* EA28FC 80241FFC 27A70028 */ addiu $a3, $sp, 0x28 -/* EA2900 80242000 0040902D */ daddu $s2, $v0, $zero -/* EA2904 80242004 16400005 */ bnez $s2, .L8024201C -/* EA2908 80242008 00000000 */ nop -/* EA290C 8024200C 8E050018 */ lw $a1, 0x18($s0) -/* EA2910 80242010 8E06000C */ lw $a2, 0xc($s0) -/* EA2914 80242014 0C00F909 */ jal dead_npc_move_heading -/* EA2918 80242018 0200202D */ daddu $a0, $s0, $zero -.L8024201C: -/* EA291C 8024201C 8602008E */ lh $v0, 0x8e($s0) -/* EA2920 80242020 9603008E */ lhu $v1, 0x8e($s0) -/* EA2924 80242024 18400007 */ blez $v0, .L80242044 -/* EA2928 80242028 2462FFFF */ addiu $v0, $v1, -1 -/* EA292C 8024202C A602008E */ sh $v0, 0x8e($s0) -/* EA2930 80242030 00021400 */ sll $v0, $v0, 0x10 -/* EA2934 80242034 18400003 */ blez $v0, .L80242044 -/* EA2938 80242038 00000000 */ nop -/* EA293C 8024203C 12400008 */ beqz $s2, .L80242060 -/* EA2940 80242040 00000000 */ nop -.L80242044: -/* EA2944 80242044 8E2200CC */ lw $v0, 0xcc($s1) -/* EA2948 80242048 A2200007 */ sb $zero, 7($s1) -/* EA294C 8024204C 8C420028 */ lw $v0, 0x28($v0) -/* EA2950 80242050 A600008E */ sh $zero, 0x8e($s0) -/* EA2954 80242054 AE020028 */ sw $v0, 0x28($s0) -/* EA2958 80242058 2402000F */ addiu $v0, $zero, 0xf -/* EA295C 8024205C AE620070 */ sw $v0, 0x70($s3) -.L80242060: -/* EA2960 80242060 8FBF0040 */ lw $ra, 0x40($sp) -/* EA2964 80242064 8FB3003C */ lw $s3, 0x3c($sp) -/* EA2968 80242068 8FB20038 */ lw $s2, 0x38($sp) -/* EA296C 8024206C 8FB10034 */ lw $s1, 0x34($sp) -/* EA2970 80242070 8FB00030 */ lw $s0, 0x30($sp) -/* EA2974 80242074 03E00008 */ jr $ra -/* EA2978 80242078 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/EA0C10/func_8024207C_EA297C.s b/ver/us/asm/nonmatchings/EA0C10/func_8024207C_EA297C.s deleted file mode 100644 index 46d4f1ca35..0000000000 --- a/ver/us/asm/nonmatchings/EA0C10/func_8024207C_EA297C.s +++ /dev/null @@ -1,38 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024207C_EA297C -/* EA297C 8024207C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* EA2980 80242080 AFB10014 */ sw $s1, 0x14($sp) -/* EA2984 80242084 0080882D */ daddu $s1, $a0, $zero -/* EA2988 80242088 AFBF0018 */ sw $ra, 0x18($sp) -/* EA298C 8024208C AFB00010 */ sw $s0, 0x10($sp) -/* EA2990 80242090 8E300148 */ lw $s0, 0x148($s1) -/* EA2994 80242094 0C00F92F */ jal dead_get_npc_unsafe -/* EA2998 80242098 86040008 */ lh $a0, 8($s0) -/* EA299C 8024209C 0040202D */ daddu $a0, $v0, $zero -/* EA29A0 802420A0 9482008E */ lhu $v0, 0x8e($a0) -/* EA29A4 802420A4 24030003 */ addiu $v1, $zero, 3 -/* EA29A8 802420A8 24420001 */ addiu $v0, $v0, 1 -/* EA29AC 802420AC A482008E */ sh $v0, 0x8e($a0) -/* EA29B0 802420B0 00021400 */ sll $v0, $v0, 0x10 -/* EA29B4 802420B4 00021403 */ sra $v0, $v0, 0x10 -/* EA29B8 802420B8 14430003 */ bne $v0, $v1, .L802420C8 -/* EA29BC 802420BC 00000000 */ nop -/* EA29C0 802420C0 96020086 */ lhu $v0, 0x86($s0) -/* EA29C4 802420C4 A48200A8 */ sh $v0, 0xa8($a0) -.L802420C8: -/* EA29C8 802420C8 8482008E */ lh $v0, 0x8e($a0) -/* EA29CC 802420CC 8E030080 */ lw $v1, 0x80($s0) -/* EA29D0 802420D0 0043102A */ slt $v0, $v0, $v1 -/* EA29D4 802420D4 14400004 */ bnez $v0, .L802420E8 -/* EA29D8 802420D8 00000000 */ nop -/* EA29DC 802420DC 96020086 */ lhu $v0, 0x86($s0) -/* EA29E0 802420E0 A48200A8 */ sh $v0, 0xa8($a0) -/* EA29E4 802420E4 AE200070 */ sw $zero, 0x70($s1) -.L802420E8: -/* EA29E8 802420E8 8FBF0018 */ lw $ra, 0x18($sp) -/* EA29EC 802420EC 8FB10014 */ lw $s1, 0x14($sp) -/* EA29F0 802420F0 8FB00010 */ lw $s0, 0x10($sp) -/* EA29F4 802420F4 03E00008 */ jr $ra -/* EA29F8 802420F8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/EA0C10/func_802420FC_EA29FC.s b/ver/us/asm/nonmatchings/EA0C10/func_802420FC_EA29FC.s index 5685888e48..39bd4faf0c 100644 --- a/ver/us/asm/nonmatchings/EA0C10/func_802420FC_EA29FC.s +++ b/ver/us/asm/nonmatchings/EA0C10/func_802420FC_EA29FC.s @@ -250,25 +250,25 @@ glabel func_802420FC_EA29FC .L80242478: /* EA2D78 80242478 0260202D */ daddu $a0, $s3, $zero /* EA2D7C 8024247C 0280282D */ daddu $a1, $s4, $zero -/* EA2D80 80242480 0C09075A */ jal func_80241D68_EA2668 +/* EA2D80 80242480 0C09075A */ jal EA0C10_set_script_owner_npc_anim /* EA2D84 80242484 02A0302D */ daddu $a2, $s5, $zero /* EA2D88 80242488 0260202D */ daddu $a0, $s3, $zero .L8024248C: /* EA2D8C 8024248C 0280282D */ daddu $a1, $s4, $zero -/* EA2D90 80242490 0C090779 */ jal func_80241DE4_EA26E4 +/* EA2D90 80242490 0C090779 */ jal EA0C10_UnkDistFunc /* EA2D94 80242494 02A0302D */ daddu $a2, $s5, $zero /* EA2D98 80242498 08090935 */ j .L802424D4 /* EA2D9C 8024249C 00000000 */ nop .L802424A0: /* EA2DA0 802424A0 0260202D */ daddu $a0, $s3, $zero /* EA2DA4 802424A4 0280282D */ daddu $a1, $s4, $zero -/* EA2DA8 802424A8 0C0907C6 */ jal func_80241F18_EA2818 +/* EA2DA8 802424A8 0C0907C6 */ jal EA0C10_UnkNpcAIFunc12 /* EA2DAC 802424AC 02A0302D */ daddu $a2, $s5, $zero /* EA2DB0 802424B0 08090935 */ j .L802424D4 /* EA2DB4 802424B4 00000000 */ nop .L802424B8: /* EA2DB8 802424B8 0280282D */ daddu $a1, $s4, $zero -/* EA2DBC 802424BC 0C09081F */ jal func_8024207C_EA297C +/* EA2DBC 802424BC 0C09081F */ jal EA0C10_set_script_owner_npc_col_height /* EA2DC0 802424C0 02A0302D */ daddu $a2, $s5, $zero /* EA2DC4 802424C4 08090935 */ j .L802424D4 /* EA2DC8 802424C8 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/EA0C10/func_80242568_EA2E68.s b/ver/us/asm/nonmatchings/EA0C10/func_80242568_EA2E68.s index db18e06184..ffa0388c21 100644 --- a/ver/us/asm/nonmatchings/EA0C10/func_80242568_EA2E68.s +++ b/ver/us/asm/nonmatchings/EA0C10/func_80242568_EA2E68.s @@ -4,7 +4,7 @@ glabel func_80242568_EA2E68 /* EA2E68 80242568 27BDFFE8 */ addiu $sp, $sp, -0x18 /* EA2E6C 8024256C AFBF0010 */ sw $ra, 0x10($sp) -/* EA2E70 80242570 0C00F94D */ jal func_8003E534 +/* EA2E70 80242570 0C00F94D */ jal dead_get_npc_safe /* EA2E74 80242574 8C84014C */ lw $a0, 0x14c($a0) /* EA2E78 80242578 0040182D */ daddu $v1, $v0, $zero /* EA2E7C 8024257C 846200A8 */ lh $v0, 0xa8($v1) diff --git a/ver/us/asm/nonmatchings/EA0C10/func_802425B0_EA2EB0.s b/ver/us/asm/nonmatchings/EA0C10/func_802425B0_EA2EB0.s deleted file mode 100644 index f3edc49afa..0000000000 --- a/ver/us/asm/nonmatchings/EA0C10/func_802425B0_EA2EB0.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802425B0_EA2EB0 -/* EA2EB0 802425B0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* EA2EB4 802425B4 AFBF0010 */ sw $ra, 0x10($sp) -/* EA2EB8 802425B8 0C00F94D */ jal func_8003E534 -/* EA2EBC 802425BC 8C84014C */ lw $a0, 0x14c($a0) -/* EA2EC0 802425C0 3C038011 */ lui $v1, %hi(dead_gPlayerStatus) -/* EA2EC4 802425C4 24637578 */ addiu $v1, $v1, %lo(dead_gPlayerStatus) -/* EA2EC8 802425C8 C44C0038 */ lwc1 $f12, 0x38($v0) -/* EA2ECC 802425CC C44E0040 */ lwc1 $f14, 0x40($v0) -/* EA2ED0 802425D0 8C660028 */ lw $a2, 0x28($v1) -/* EA2ED4 802425D4 0C00AC71 */ jal dead_dist2D -/* EA2ED8 802425D8 8C670030 */ lw $a3, 0x30($v1) -/* EA2EDC 802425DC 3C014248 */ lui $at, 0x4248 -/* EA2EE0 802425E0 44811000 */ mtc1 $at, $f2 -/* EA2EE4 802425E4 00000000 */ nop -/* EA2EE8 802425E8 4602003C */ c.lt.s $f0, $f2 -/* EA2EEC 802425EC 00000000 */ nop -/* EA2EF0 802425F0 45010002 */ bc1t .L802425FC -/* EA2EF4 802425F4 24020002 */ addiu $v0, $zero, 2 -/* EA2EF8 802425F8 0000102D */ daddu $v0, $zero, $zero -.L802425FC: -/* EA2EFC 802425FC 8FBF0010 */ lw $ra, 0x10($sp) -/* EA2F00 80242600 03E00008 */ jr $ra -/* EA2F04 80242604 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/EA0C10/func_80242608_EA2F08.s b/ver/us/asm/nonmatchings/EA0C10/func_80242608_EA2F08.s index 155df154c7..c16c242cdd 100644 --- a/ver/us/asm/nonmatchings/EA0C10/func_80242608_EA2F08.s +++ b/ver/us/asm/nonmatchings/EA0C10/func_80242608_EA2F08.s @@ -9,7 +9,7 @@ glabel func_80242608_EA2F08 /* EA2F18 80242618 AFB10014 */ sw $s1, 0x14($sp) /* EA2F1C 8024261C 8C44014C */ lw $a0, 0x14c($v0) /* EA2F20 80242620 8C510148 */ lw $s1, 0x148($v0) -/* EA2F24 80242624 0C00F94D */ jal func_8003E534 +/* EA2F24 80242624 0C00F94D */ jal dead_get_npc_safe /* EA2F28 80242628 00A0802D */ daddu $s0, $a1, $zero /* EA2F2C 8024262C 56000001 */ bnel $s0, $zero, .L80242634 /* EA2F30 80242630 A04000AB */ sb $zero, 0xab($v0) diff --git a/ver/us/asm/nonmatchings/EA0C10/func_80242794_EA3094.s b/ver/us/asm/nonmatchings/EA0C10/func_80242794_EA3094.s deleted file mode 100644 index c88fbf11fb..0000000000 --- a/ver/us/asm/nonmatchings/EA0C10/func_80242794_EA3094.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242794_EA3094 -/* EA3094 80242794 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* EA3098 80242798 AFB10014 */ sw $s1, 0x14($sp) -/* EA309C 8024279C 0080882D */ daddu $s1, $a0, $zero -/* EA30A0 802427A0 AFBF0018 */ sw $ra, 0x18($sp) -/* EA30A4 802427A4 AFB00010 */ sw $s0, 0x10($sp) -/* EA30A8 802427A8 8E30000C */ lw $s0, 0xc($s1) -/* EA30AC 802427AC 8E050000 */ lw $a1, ($s0) -/* EA30B0 802427B0 0C0B53A3 */ jal dead_evt_get_variable -/* EA30B4 802427B4 26100004 */ addiu $s0, $s0, 4 -/* EA30B8 802427B8 0C00F94D */ jal func_8003E534 -/* EA30BC 802427BC 0040202D */ daddu $a0, $v0, $zero -/* EA30C0 802427C0 10400005 */ beqz $v0, .L802427D8 -/* EA30C4 802427C4 00000000 */ nop -/* EA30C8 802427C8 8E050000 */ lw $a1, ($s0) -/* EA30CC 802427CC 844600A8 */ lh $a2, 0xa8($v0) -/* EA30D0 802427D0 0C0B551A */ jal dead_evt_set_variable -/* EA30D4 802427D4 0220202D */ daddu $a0, $s1, $zero -.L802427D8: -/* EA30D8 802427D8 8FBF0018 */ lw $ra, 0x18($sp) -/* EA30DC 802427DC 8FB10014 */ lw $s1, 0x14($sp) -/* EA30E0 802427E0 8FB00010 */ lw $s0, 0x10($sp) -/* EA30E4 802427E4 24020002 */ addiu $v0, $zero, 2 -/* EA30E8 802427E8 03E00008 */ jr $ra -/* EA30EC 802427EC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/EA0C10/func_802427F0_EA30F0.s b/ver/us/asm/nonmatchings/EA0C10/func_802427F0_EA30F0.s index 499a2f0e21..98e17ab4e4 100644 --- a/ver/us/asm/nonmatchings/EA0C10/func_802427F0_EA30F0.s +++ b/ver/us/asm/nonmatchings/EA0C10/func_802427F0_EA30F0.s @@ -40,8 +40,8 @@ glabel func_802427F0_EA30F0 /* EA317C 8024287C 4680C620 */ cvt.s.w $f24, $f24 /* EA3180 80242880 3C128011 */ lui $s2, %hi(dead_gPlayerStatus) /* EA3184 80242884 26527578 */ addiu $s2, $s2, %lo(dead_gPlayerStatus) -/* EA3188 80242888 3C038008 */ lui $v1, %hi(D_8007C760) -/* EA318C 8024288C 8C63C760 */ lw $v1, %lo(D_8007C760)($v1) +/* EA3188 80242888 3C038008 */ lui $v1, %hi(dead_gCurrentCameraID) +/* EA318C 8024288C 8C63C760 */ lw $v1, %lo(dead_gCurrentCameraID)($v1) /* EA3190 80242890 C64200A8 */ lwc1 $f2, 0xa8($s2) /* EA3194 80242894 44800000 */ mtc1 $zero, $f0 /* EA3198 80242898 00031080 */ sll $v0, $v1, 2 diff --git a/ver/us/asm/nonmatchings/EA0C10/func_80242A4C_EA334C.s b/ver/us/asm/nonmatchings/EA0C10/func_80242A4C_EA334C.s deleted file mode 100644 index 49ffdd9871..0000000000 --- a/ver/us/asm/nonmatchings/EA0C10/func_80242A4C_EA334C.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242A4C_EA334C -/* EA334C 80242A4C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* EA3350 80242A50 AFBF0010 */ sw $ra, 0x10($sp) -/* EA3354 80242A54 8C82000C */ lw $v0, 0xc($a0) -/* EA3358 80242A58 0C0B53A3 */ jal dead_evt_get_variable -/* EA335C 80242A5C 8C450000 */ lw $a1, ($v0) -/* EA3360 80242A60 0040182D */ daddu $v1, $v0, $zero -/* EA3364 80242A64 10600012 */ beqz $v1, .L80242AB0 -/* EA3368 80242A68 0000202D */ daddu $a0, $zero, $zero -/* EA336C 80242A6C 8C620000 */ lw $v0, ($v1) -/* EA3370 80242A70 5040000A */ beql $v0, $zero, .L80242A9C -/* EA3374 80242A74 00041080 */ sll $v0, $a0, 2 -/* EA3378 80242A78 3C058024 */ lui $a1, %hi(D_802466D0) -/* EA337C 80242A7C 24A566D0 */ addiu $a1, $a1, %lo(D_802466D0) -.L80242A80: -/* EA3380 80242A80 24630004 */ addiu $v1, $v1, 4 -/* EA3384 80242A84 24840001 */ addiu $a0, $a0, 1 -/* EA3388 80242A88 ACA20000 */ sw $v0, ($a1) -/* EA338C 80242A8C 8C620000 */ lw $v0, ($v1) -/* EA3390 80242A90 1440FFFB */ bnez $v0, .L80242A80 -/* EA3394 80242A94 24A50004 */ addiu $a1, $a1, 4 -/* EA3398 80242A98 00041080 */ sll $v0, $a0, 2 -.L80242A9C: -/* EA339C 80242A9C 3C018024 */ lui $at, %hi(D_802466D0) -/* EA33A0 80242AA0 00220821 */ addu $at, $at, $v0 -/* EA33A4 80242AA4 AC2066D0 */ sw $zero, %lo(D_802466D0)($at) -/* EA33A8 80242AA8 08090AB6 */ j .L80242AD8 -/* EA33AC 80242AAC 00000000 */ nop -.L80242AB0: -/* EA33B0 80242AB0 3C038024 */ lui $v1, %hi(D_802466D0) -/* EA33B4 80242AB4 246366D0 */ addiu $v1, $v1, %lo(D_802466D0) -/* EA33B8 80242AB8 0060282D */ daddu $a1, $v1, $zero -.L80242ABC: -/* EA33BC 80242ABC 24820010 */ addiu $v0, $a0, 0x10 -/* EA33C0 80242AC0 AC620000 */ sw $v0, ($v1) -/* EA33C4 80242AC4 24630004 */ addiu $v1, $v1, 4 -/* EA33C8 80242AC8 24840001 */ addiu $a0, $a0, 1 -/* EA33CC 80242ACC 28820070 */ slti $v0, $a0, 0x70 -/* EA33D0 80242AD0 1440FFFA */ bnez $v0, .L80242ABC -/* EA33D4 80242AD4 ACA001C0 */ sw $zero, 0x1c0($a1) -.L80242AD8: -/* EA33D8 80242AD8 8FBF0010 */ lw $ra, 0x10($sp) -/* EA33DC 80242ADC 24020002 */ addiu $v0, $zero, 2 -/* EA33E0 80242AE0 03E00008 */ jr $ra -/* EA33E4 80242AE4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/EA0C10/func_80242BD8_EA34D8.s b/ver/us/asm/nonmatchings/EA0C10/func_80242BD8_EA34D8.s deleted file mode 100644 index b3ae7c56e5..0000000000 --- a/ver/us/asm/nonmatchings/EA0C10/func_80242BD8_EA34D8.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242BD8_EA34D8 -/* EA34D8 80242BD8 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* EA34DC 80242BDC AFB1001C */ sw $s1, 0x1c($sp) -/* EA34E0 80242BE0 0080882D */ daddu $s1, $a0, $zero -/* EA34E4 80242BE4 AFBF0034 */ sw $ra, 0x34($sp) -/* EA34E8 80242BE8 AFB60030 */ sw $s6, 0x30($sp) -/* EA34EC 80242BEC AFB5002C */ sw $s5, 0x2c($sp) -/* EA34F0 80242BF0 AFB40028 */ sw $s4, 0x28($sp) -/* EA34F4 80242BF4 AFB30024 */ sw $s3, 0x24($sp) -/* EA34F8 80242BF8 AFB20020 */ sw $s2, 0x20($sp) -/* EA34FC 80242BFC AFB00018 */ sw $s0, 0x18($sp) -/* EA3500 80242C00 F7B60040 */ sdc1 $f22, 0x40($sp) -/* EA3504 80242C04 F7B40038 */ sdc1 $f20, 0x38($sp) -/* EA3508 80242C08 8E30000C */ lw $s0, 0xc($s1) -/* EA350C 80242C0C 8E160000 */ lw $s6, ($s0) -/* EA3510 80242C10 26100004 */ addiu $s0, $s0, 4 -/* EA3514 80242C14 0C0B53A3 */ jal dead_evt_get_variable -/* EA3518 80242C18 02C0282D */ daddu $a1, $s6, $zero -/* EA351C 80242C1C 44820000 */ mtc1 $v0, $f0 -/* EA3520 80242C20 00000000 */ nop -/* EA3524 80242C24 46800020 */ cvt.s.w $f0, $f0 -/* EA3528 80242C28 E7A00010 */ swc1 $f0, 0x10($sp) -/* EA352C 80242C2C 8E140000 */ lw $s4, ($s0) -/* EA3530 80242C30 26100004 */ addiu $s0, $s0, 4 -/* EA3534 80242C34 0220202D */ daddu $a0, $s1, $zero -/* EA3538 80242C38 0C0B53A3 */ jal dead_evt_get_variable -/* EA353C 80242C3C 0280282D */ daddu $a1, $s4, $zero -/* EA3540 80242C40 0220202D */ daddu $a0, $s1, $zero -/* EA3544 80242C44 8E150000 */ lw $s5, ($s0) -/* EA3548 80242C48 4482B000 */ mtc1 $v0, $f22 -/* EA354C 80242C4C 00000000 */ nop -/* EA3550 80242C50 4680B5A0 */ cvt.s.w $f22, $f22 -/* EA3554 80242C54 0C0B53A3 */ jal dead_evt_get_variable -/* EA3558 80242C58 02A0282D */ daddu $a1, $s5, $zero -/* EA355C 80242C5C 2404FFFC */ addiu $a0, $zero, -4 -/* EA3560 80242C60 44820000 */ mtc1 $v0, $f0 -/* EA3564 80242C64 00000000 */ nop -/* EA3568 80242C68 46800020 */ cvt.s.w $f0, $f0 -/* EA356C 80242C6C 0C00F92F */ jal dead_get_npc_unsafe -/* EA3570 80242C70 E7A00014 */ swc1 $f0, 0x14($sp) -/* EA3574 80242C74 3C048008 */ lui $a0, %hi(D_8007C760) -/* EA3578 80242C78 8C84C760 */ lw $a0, %lo(D_8007C760)($a0) -/* EA357C 80242C7C 3C014334 */ lui $at, 0x4334 -/* EA3580 80242C80 44816000 */ mtc1 $at, $f12 -/* EA3584 80242C84 00041880 */ sll $v1, $a0, 2 -/* EA3588 80242C88 00641821 */ addu $v1, $v1, $a0 -/* EA358C 80242C8C 00031880 */ sll $v1, $v1, 2 -/* EA3590 80242C90 00641823 */ subu $v1, $v1, $a0 -/* EA3594 80242C94 000320C0 */ sll $a0, $v1, 3 -/* EA3598 80242C98 00641821 */ addu $v1, $v1, $a0 -/* EA359C 80242C9C 000318C0 */ sll $v1, $v1, 3 -/* EA35A0 80242CA0 3C01800C */ lui $at, %hi(D_800B8DEC) -/* EA35A4 80242CA4 00230821 */ addu $at, $at, $v1 -/* EA35A8 80242CA8 C4208DEC */ lwc1 $f0, %lo(D_800B8DEC)($at) -/* EA35AC 80242CAC 460C0300 */ add.s $f12, $f0, $f12 -/* EA35B0 80242CB0 0C00AB85 */ jal dead_clamp_angle -/* EA35B4 80242CB4 0040982D */ daddu $s3, $v0, $zero -/* EA35B8 80242CB8 27B00010 */ addiu $s0, $sp, 0x10 -/* EA35BC 80242CBC 0200202D */ daddu $a0, $s0, $zero -/* EA35C0 80242CC0 27B20014 */ addiu $s2, $sp, 0x14 -/* EA35C4 80242CC4 0240282D */ daddu $a1, $s2, $zero -/* EA35C8 80242CC8 3C064170 */ lui $a2, 0x4170 -/* EA35CC 80242CCC 8E67000C */ lw $a3, 0xc($s3) -/* EA35D0 80242CD0 0C00ACA3 */ jal func_8002B28C -/* EA35D4 80242CD4 46000506 */ mov.s $f20, $f0 -/* EA35D8 80242CD8 0200202D */ daddu $a0, $s0, $zero -/* EA35DC 80242CDC 3C064120 */ lui $a2, 0x4120 -/* EA35E0 80242CE0 4407A000 */ mfc1 $a3, $f20 -/* EA35E4 80242CE4 0C00ACA3 */ jal func_8002B28C -/* EA35E8 80242CE8 0240282D */ daddu $a1, $s2, $zero -/* EA35EC 80242CEC 0220202D */ daddu $a0, $s1, $zero -/* EA35F0 80242CF0 C7A00010 */ lwc1 $f0, 0x10($sp) -/* EA35F4 80242CF4 4600008D */ trunc.w.s $f2, $f0 -/* EA35F8 80242CF8 44061000 */ mfc1 $a2, $f2 -/* EA35FC 80242CFC 0C0B551A */ jal dead_evt_set_variable -/* EA3600 80242D00 02C0282D */ daddu $a1, $s6, $zero -/* EA3604 80242D04 0220202D */ daddu $a0, $s1, $zero -/* EA3608 80242D08 4600B08D */ trunc.w.s $f2, $f22 -/* EA360C 80242D0C 44061000 */ mfc1 $a2, $f2 -/* EA3610 80242D10 0C0B551A */ jal dead_evt_set_variable -/* EA3614 80242D14 0280282D */ daddu $a1, $s4, $zero -/* EA3618 80242D18 0220202D */ daddu $a0, $s1, $zero -/* EA361C 80242D1C C7A00014 */ lwc1 $f0, 0x14($sp) -/* EA3620 80242D20 4600008D */ trunc.w.s $f2, $f0 -/* EA3624 80242D24 44061000 */ mfc1 $a2, $f2 -/* EA3628 80242D28 0C0B551A */ jal dead_evt_set_variable -/* EA362C 80242D2C 02A0282D */ daddu $a1, $s5, $zero -/* EA3630 80242D30 8FBF0034 */ lw $ra, 0x34($sp) -/* EA3634 80242D34 8FB60030 */ lw $s6, 0x30($sp) -/* EA3638 80242D38 8FB5002C */ lw $s5, 0x2c($sp) -/* EA363C 80242D3C 8FB40028 */ lw $s4, 0x28($sp) -/* EA3640 80242D40 8FB30024 */ lw $s3, 0x24($sp) -/* EA3644 80242D44 8FB20020 */ lw $s2, 0x20($sp) -/* EA3648 80242D48 8FB1001C */ lw $s1, 0x1c($sp) -/* EA364C 80242D4C 8FB00018 */ lw $s0, 0x18($sp) -/* EA3650 80242D50 D7B60040 */ ldc1 $f22, 0x40($sp) -/* EA3654 80242D54 D7B40038 */ ldc1 $f20, 0x38($sp) -/* EA3658 80242D58 24020002 */ addiu $v0, $zero, 2 -/* EA365C 80242D5C 03E00008 */ jr $ra -/* EA3660 80242D60 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/EA8AE0/func_80241580_EAA060.s b/ver/us/asm/nonmatchings/EA8AE0/func_80241580_EAA060.s deleted file mode 100644 index 4ff1db0b86..0000000000 --- a/ver/us/asm/nonmatchings/EA8AE0/func_80241580_EAA060.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241580_EAA060 -/* EAA060 80241580 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* EAA064 80241584 AFB10014 */ sw $s1, 0x14($sp) -/* EAA068 80241588 0080882D */ daddu $s1, $a0, $zero -/* EAA06C 8024158C AFBF0018 */ sw $ra, 0x18($sp) -/* EAA070 80241590 AFB00010 */ sw $s0, 0x10($sp) -/* EAA074 80241594 8E30000C */ lw $s0, 0xc($s1) -/* EAA078 80241598 8E050000 */ lw $a1, ($s0) -/* EAA07C 8024159C 0C0B53A3 */ jal dead_evt_get_variable -/* EAA080 802415A0 26100004 */ addiu $s0, $s0, 4 -/* EAA084 802415A4 0C00F94D */ jal func_8003E534 -/* EAA088 802415A8 0040202D */ daddu $a0, $v0, $zero -/* EAA08C 802415AC 10400005 */ beqz $v0, .L802415C4 -/* EAA090 802415B0 00000000 */ nop -/* EAA094 802415B4 8E050000 */ lw $a1, ($s0) -/* EAA098 802415B8 844600A8 */ lh $a2, 0xa8($v0) -/* EAA09C 802415BC 0C0B551A */ jal dead_evt_set_variable -/* EAA0A0 802415C0 0220202D */ daddu $a0, $s1, $zero -.L802415C4: -/* EAA0A4 802415C4 8FBF0018 */ lw $ra, 0x18($sp) -/* EAA0A8 802415C8 8FB10014 */ lw $s1, 0x14($sp) -/* EAA0AC 802415CC 8FB00010 */ lw $s0, 0x10($sp) -/* EAA0B0 802415D0 24020002 */ addiu $v0, $zero, 2 -/* EAA0B4 802415D4 03E00008 */ jr $ra -/* EAA0B8 802415D8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/EA8AE0/func_802415DC_EAA0BC.s b/ver/us/asm/nonmatchings/EA8AE0/func_802415DC_EAA0BC.s index 7ff430bad7..019a0e62e5 100644 --- a/ver/us/asm/nonmatchings/EA8AE0/func_802415DC_EAA0BC.s +++ b/ver/us/asm/nonmatchings/EA8AE0/func_802415DC_EAA0BC.s @@ -40,8 +40,8 @@ glabel func_802415DC_EAA0BC /* EAA148 80241668 4680C620 */ cvt.s.w $f24, $f24 /* EAA14C 8024166C 3C128011 */ lui $s2, %hi(dead_gPlayerStatus) /* EAA150 80241670 26527578 */ addiu $s2, $s2, %lo(dead_gPlayerStatus) -/* EAA154 80241674 3C038008 */ lui $v1, %hi(D_8007C760) -/* EAA158 80241678 8C63C760 */ lw $v1, %lo(D_8007C760)($v1) +/* EAA154 80241674 3C038008 */ lui $v1, %hi(dead_gCurrentCameraID) +/* EAA158 80241678 8C63C760 */ lw $v1, %lo(dead_gCurrentCameraID)($v1) /* EAA15C 8024167C C64200A8 */ lwc1 $f2, 0xa8($s2) /* EAA160 80241680 44800000 */ mtc1 $zero, $f0 /* EAA164 80241684 00031080 */ sll $v0, $v1, 2 diff --git a/ver/us/asm/nonmatchings/EA8AE0/func_80241838_EAA318.s b/ver/us/asm/nonmatchings/EA8AE0/func_80241838_EAA318.s deleted file mode 100644 index e1bfd6e9e5..0000000000 --- a/ver/us/asm/nonmatchings/EA8AE0/func_80241838_EAA318.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241838_EAA318 -/* EAA318 80241838 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* EAA31C 8024183C AFBF0010 */ sw $ra, 0x10($sp) -/* EAA320 80241840 8C82000C */ lw $v0, 0xc($a0) -/* EAA324 80241844 0C0B53A3 */ jal dead_evt_get_variable -/* EAA328 80241848 8C450000 */ lw $a1, ($v0) -/* EAA32C 8024184C 0040182D */ daddu $v1, $v0, $zero -/* EAA330 80241850 10600012 */ beqz $v1, .L8024189C -/* EAA334 80241854 0000202D */ daddu $a0, $zero, $zero -/* EAA338 80241858 8C620000 */ lw $v0, ($v1) -/* EAA33C 8024185C 5040000A */ beql $v0, $zero, .L80241888 -/* EAA340 80241860 00041080 */ sll $v0, $a0, 2 -/* EAA344 80241864 3C058025 */ lui $a1, %hi(D_80248388) -/* EAA348 80241868 24A58388 */ addiu $a1, $a1, %lo(D_80248388) -.L8024186C: -/* EAA34C 8024186C 24630004 */ addiu $v1, $v1, 4 -/* EAA350 80241870 24840001 */ addiu $a0, $a0, 1 -/* EAA354 80241874 ACA20000 */ sw $v0, ($a1) -/* EAA358 80241878 8C620000 */ lw $v0, ($v1) -/* EAA35C 8024187C 1440FFFB */ bnez $v0, .L8024186C -/* EAA360 80241880 24A50004 */ addiu $a1, $a1, 4 -/* EAA364 80241884 00041080 */ sll $v0, $a0, 2 -.L80241888: -/* EAA368 80241888 3C018025 */ lui $at, %hi(D_80248388) -/* EAA36C 8024188C 00220821 */ addu $at, $at, $v0 -/* EAA370 80241890 AC208388 */ sw $zero, %lo(D_80248388)($at) -/* EAA374 80241894 08090631 */ j .L802418C4 -/* EAA378 80241898 00000000 */ nop -.L8024189C: -/* EAA37C 8024189C 3C038025 */ lui $v1, %hi(D_80248388) -/* EAA380 802418A0 24638388 */ addiu $v1, $v1, %lo(D_80248388) -/* EAA384 802418A4 0060282D */ daddu $a1, $v1, $zero -.L802418A8: -/* EAA388 802418A8 24820010 */ addiu $v0, $a0, 0x10 -/* EAA38C 802418AC AC620000 */ sw $v0, ($v1) -/* EAA390 802418B0 24630004 */ addiu $v1, $v1, 4 -/* EAA394 802418B4 24840001 */ addiu $a0, $a0, 1 -/* EAA398 802418B8 28820070 */ slti $v0, $a0, 0x70 -/* EAA39C 802418BC 1440FFFA */ bnez $v0, .L802418A8 -/* EAA3A0 802418C0 ACA001C0 */ sw $zero, 0x1c0($a1) -.L802418C4: -/* EAA3A4 802418C4 8FBF0010 */ lw $ra, 0x10($sp) -/* EAA3A8 802418C8 24020002 */ addiu $v0, $zero, 2 -/* EAA3AC 802418CC 03E00008 */ jr $ra -/* EAA3B0 802418D0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/EA8AE0/func_802419C4_EAA4A4.s b/ver/us/asm/nonmatchings/EA8AE0/func_802419C4_EAA4A4.s deleted file mode 100644 index c357e74611..0000000000 --- a/ver/us/asm/nonmatchings/EA8AE0/func_802419C4_EAA4A4.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802419C4_EAA4A4 -/* EAA4A4 802419C4 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* EAA4A8 802419C8 AFB1001C */ sw $s1, 0x1c($sp) -/* EAA4AC 802419CC 0080882D */ daddu $s1, $a0, $zero -/* EAA4B0 802419D0 AFBF0034 */ sw $ra, 0x34($sp) -/* EAA4B4 802419D4 AFB60030 */ sw $s6, 0x30($sp) -/* EAA4B8 802419D8 AFB5002C */ sw $s5, 0x2c($sp) -/* EAA4BC 802419DC AFB40028 */ sw $s4, 0x28($sp) -/* EAA4C0 802419E0 AFB30024 */ sw $s3, 0x24($sp) -/* EAA4C4 802419E4 AFB20020 */ sw $s2, 0x20($sp) -/* EAA4C8 802419E8 AFB00018 */ sw $s0, 0x18($sp) -/* EAA4CC 802419EC F7B60040 */ sdc1 $f22, 0x40($sp) -/* EAA4D0 802419F0 F7B40038 */ sdc1 $f20, 0x38($sp) -/* EAA4D4 802419F4 8E30000C */ lw $s0, 0xc($s1) -/* EAA4D8 802419F8 8E160000 */ lw $s6, ($s0) -/* EAA4DC 802419FC 26100004 */ addiu $s0, $s0, 4 -/* EAA4E0 80241A00 0C0B53A3 */ jal dead_evt_get_variable -/* EAA4E4 80241A04 02C0282D */ daddu $a1, $s6, $zero -/* EAA4E8 80241A08 44820000 */ mtc1 $v0, $f0 -/* EAA4EC 80241A0C 00000000 */ nop -/* EAA4F0 80241A10 46800020 */ cvt.s.w $f0, $f0 -/* EAA4F4 80241A14 E7A00010 */ swc1 $f0, 0x10($sp) -/* EAA4F8 80241A18 8E140000 */ lw $s4, ($s0) -/* EAA4FC 80241A1C 26100004 */ addiu $s0, $s0, 4 -/* EAA500 80241A20 0220202D */ daddu $a0, $s1, $zero -/* EAA504 80241A24 0C0B53A3 */ jal dead_evt_get_variable -/* EAA508 80241A28 0280282D */ daddu $a1, $s4, $zero -/* EAA50C 80241A2C 0220202D */ daddu $a0, $s1, $zero -/* EAA510 80241A30 8E150000 */ lw $s5, ($s0) -/* EAA514 80241A34 4482B000 */ mtc1 $v0, $f22 -/* EAA518 80241A38 00000000 */ nop -/* EAA51C 80241A3C 4680B5A0 */ cvt.s.w $f22, $f22 -/* EAA520 80241A40 0C0B53A3 */ jal dead_evt_get_variable -/* EAA524 80241A44 02A0282D */ daddu $a1, $s5, $zero -/* EAA528 80241A48 2404FFFC */ addiu $a0, $zero, -4 -/* EAA52C 80241A4C 44820000 */ mtc1 $v0, $f0 -/* EAA530 80241A50 00000000 */ nop -/* EAA534 80241A54 46800020 */ cvt.s.w $f0, $f0 -/* EAA538 80241A58 0C00F92F */ jal dead_get_npc_unsafe -/* EAA53C 80241A5C E7A00014 */ swc1 $f0, 0x14($sp) -/* EAA540 80241A60 3C048008 */ lui $a0, %hi(D_8007C760) -/* EAA544 80241A64 8C84C760 */ lw $a0, %lo(D_8007C760)($a0) -/* EAA548 80241A68 3C014334 */ lui $at, 0x4334 -/* EAA54C 80241A6C 44816000 */ mtc1 $at, $f12 -/* EAA550 80241A70 00041880 */ sll $v1, $a0, 2 -/* EAA554 80241A74 00641821 */ addu $v1, $v1, $a0 -/* EAA558 80241A78 00031880 */ sll $v1, $v1, 2 -/* EAA55C 80241A7C 00641823 */ subu $v1, $v1, $a0 -/* EAA560 80241A80 000320C0 */ sll $a0, $v1, 3 -/* EAA564 80241A84 00641821 */ addu $v1, $v1, $a0 -/* EAA568 80241A88 000318C0 */ sll $v1, $v1, 3 -/* EAA56C 80241A8C 3C01800C */ lui $at, %hi(D_800B8DEC) -/* EAA570 80241A90 00230821 */ addu $at, $at, $v1 -/* EAA574 80241A94 C4208DEC */ lwc1 $f0, %lo(D_800B8DEC)($at) -/* EAA578 80241A98 460C0300 */ add.s $f12, $f0, $f12 -/* EAA57C 80241A9C 0C00AB85 */ jal dead_clamp_angle -/* EAA580 80241AA0 0040982D */ daddu $s3, $v0, $zero -/* EAA584 80241AA4 27B00010 */ addiu $s0, $sp, 0x10 -/* EAA588 80241AA8 0200202D */ daddu $a0, $s0, $zero -/* EAA58C 80241AAC 27B20014 */ addiu $s2, $sp, 0x14 -/* EAA590 80241AB0 0240282D */ daddu $a1, $s2, $zero -/* EAA594 80241AB4 3C064170 */ lui $a2, 0x4170 -/* EAA598 80241AB8 8E67000C */ lw $a3, 0xc($s3) -/* EAA59C 80241ABC 0C00ACA3 */ jal func_8002B28C -/* EAA5A0 80241AC0 46000506 */ mov.s $f20, $f0 -/* EAA5A4 80241AC4 0200202D */ daddu $a0, $s0, $zero -/* EAA5A8 80241AC8 3C064120 */ lui $a2, 0x4120 -/* EAA5AC 80241ACC 4407A000 */ mfc1 $a3, $f20 -/* EAA5B0 80241AD0 0C00ACA3 */ jal func_8002B28C -/* EAA5B4 80241AD4 0240282D */ daddu $a1, $s2, $zero -/* EAA5B8 80241AD8 0220202D */ daddu $a0, $s1, $zero -/* EAA5BC 80241ADC C7A00010 */ lwc1 $f0, 0x10($sp) -/* EAA5C0 80241AE0 4600008D */ trunc.w.s $f2, $f0 -/* EAA5C4 80241AE4 44061000 */ mfc1 $a2, $f2 -/* EAA5C8 80241AE8 0C0B551A */ jal dead_evt_set_variable -/* EAA5CC 80241AEC 02C0282D */ daddu $a1, $s6, $zero -/* EAA5D0 80241AF0 0220202D */ daddu $a0, $s1, $zero -/* EAA5D4 80241AF4 4600B08D */ trunc.w.s $f2, $f22 -/* EAA5D8 80241AF8 44061000 */ mfc1 $a2, $f2 -/* EAA5DC 80241AFC 0C0B551A */ jal dead_evt_set_variable -/* EAA5E0 80241B00 0280282D */ daddu $a1, $s4, $zero -/* EAA5E4 80241B04 0220202D */ daddu $a0, $s1, $zero -/* EAA5E8 80241B08 C7A00014 */ lwc1 $f0, 0x14($sp) -/* EAA5EC 80241B0C 4600008D */ trunc.w.s $f2, $f0 -/* EAA5F0 80241B10 44061000 */ mfc1 $a2, $f2 -/* EAA5F4 80241B14 0C0B551A */ jal dead_evt_set_variable -/* EAA5F8 80241B18 02A0282D */ daddu $a1, $s5, $zero -/* EAA5FC 80241B1C 8FBF0034 */ lw $ra, 0x34($sp) -/* EAA600 80241B20 8FB60030 */ lw $s6, 0x30($sp) -/* EAA604 80241B24 8FB5002C */ lw $s5, 0x2c($sp) -/* EAA608 80241B28 8FB40028 */ lw $s4, 0x28($sp) -/* EAA60C 80241B2C 8FB30024 */ lw $s3, 0x24($sp) -/* EAA610 80241B30 8FB20020 */ lw $s2, 0x20($sp) -/* EAA614 80241B34 8FB1001C */ lw $s1, 0x1c($sp) -/* EAA618 80241B38 8FB00018 */ lw $s0, 0x18($sp) -/* EAA61C 80241B3C D7B60040 */ ldc1 $f22, 0x40($sp) -/* EAA620 80241B40 D7B40038 */ ldc1 $f20, 0x38($sp) -/* EAA624 80241B44 24020002 */ addiu $v0, $zero, 2 -/* EAA628 80241B48 03E00008 */ jr $ra -/* EAA62C 80241B4C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/EB1170/func_80240428_EB1288.s b/ver/us/asm/nonmatchings/EB1170/func_80240428_EB1288.s deleted file mode 100644 index a3e6f5fc6a..0000000000 --- a/ver/us/asm/nonmatchings/EB1170/func_80240428_EB1288.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240428_EB1288 -/* EB1288 80240428 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* EB128C 8024042C AFB10014 */ sw $s1, 0x14($sp) -/* EB1290 80240430 0080882D */ daddu $s1, $a0, $zero -/* EB1294 80240434 AFBF0018 */ sw $ra, 0x18($sp) -/* EB1298 80240438 AFB00010 */ sw $s0, 0x10($sp) -/* EB129C 8024043C 8E30000C */ lw $s0, 0xc($s1) -/* EB12A0 80240440 8E050000 */ lw $a1, ($s0) -/* EB12A4 80240444 0C0B53A3 */ jal dead_evt_get_variable -/* EB12A8 80240448 26100004 */ addiu $s0, $s0, 4 -/* EB12AC 8024044C 0C00F94D */ jal func_8003E534 -/* EB12B0 80240450 0040202D */ daddu $a0, $v0, $zero -/* EB12B4 80240454 10400005 */ beqz $v0, .L8024046C -/* EB12B8 80240458 00000000 */ nop -/* EB12BC 8024045C 8E050000 */ lw $a1, ($s0) -/* EB12C0 80240460 844600A8 */ lh $a2, 0xa8($v0) -/* EB12C4 80240464 0C0B551A */ jal dead_evt_set_variable -/* EB12C8 80240468 0220202D */ daddu $a0, $s1, $zero -.L8024046C: -/* EB12CC 8024046C 8FBF0018 */ lw $ra, 0x18($sp) -/* EB12D0 80240470 8FB10014 */ lw $s1, 0x14($sp) -/* EB12D4 80240474 8FB00010 */ lw $s0, 0x10($sp) -/* EB12D8 80240478 24020002 */ addiu $v0, $zero, 2 -/* EB12DC 8024047C 03E00008 */ jr $ra -/* EB12E0 80240480 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/EB1170/func_80240484_EB12E4.s b/ver/us/asm/nonmatchings/EB1170/func_80240484_EB12E4.s index 24dccaf780..21a423c639 100644 --- a/ver/us/asm/nonmatchings/EB1170/func_80240484_EB12E4.s +++ b/ver/us/asm/nonmatchings/EB1170/func_80240484_EB12E4.s @@ -40,8 +40,8 @@ glabel func_80240484_EB12E4 /* EB1370 80240510 4680C620 */ cvt.s.w $f24, $f24 /* EB1374 80240514 3C128011 */ lui $s2, %hi(dead_gPlayerStatus) /* EB1378 80240518 26527578 */ addiu $s2, $s2, %lo(dead_gPlayerStatus) -/* EB137C 8024051C 3C038008 */ lui $v1, %hi(D_8007C760) -/* EB1380 80240520 8C63C760 */ lw $v1, %lo(D_8007C760)($v1) +/* EB137C 8024051C 3C038008 */ lui $v1, %hi(dead_gCurrentCameraID) +/* EB1380 80240520 8C63C760 */ lw $v1, %lo(dead_gCurrentCameraID)($v1) /* EB1384 80240524 C64200A8 */ lwc1 $f2, 0xa8($s2) /* EB1388 80240528 44800000 */ mtc1 $zero, $f0 /* EB138C 8024052C 00031080 */ sll $v0, $v1, 2 diff --git a/ver/us/asm/nonmatchings/EB1170/func_802406E0_EB1540.s b/ver/us/asm/nonmatchings/EB1170/func_802406E0_EB1540.s deleted file mode 100644 index 9a526699f0..0000000000 --- a/ver/us/asm/nonmatchings/EB1170/func_802406E0_EB1540.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406E0_EB1540 -/* EB1540 802406E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* EB1544 802406E4 AFBF0010 */ sw $ra, 0x10($sp) -/* EB1548 802406E8 8C82000C */ lw $v0, 0xc($a0) -/* EB154C 802406EC 0C0B53A3 */ jal dead_evt_get_variable -/* EB1550 802406F0 8C450000 */ lw $a1, ($v0) -/* EB1554 802406F4 0040182D */ daddu $v1, $v0, $zero -/* EB1558 802406F8 10600012 */ beqz $v1, .L80240744 -/* EB155C 802406FC 0000202D */ daddu $a0, $zero, $zero -/* EB1560 80240700 8C620000 */ lw $v0, ($v1) -/* EB1564 80240704 5040000A */ beql $v0, $zero, .L80240730 -/* EB1568 80240708 00041080 */ sll $v0, $a0, 2 -/* EB156C 8024070C 3C058024 */ lui $a1, %hi(D_802442D0) -/* EB1570 80240710 24A542D0 */ addiu $a1, $a1, %lo(D_802442D0) -.L80240714: -/* EB1574 80240714 24630004 */ addiu $v1, $v1, 4 -/* EB1578 80240718 24840001 */ addiu $a0, $a0, 1 -/* EB157C 8024071C ACA20000 */ sw $v0, ($a1) -/* EB1580 80240720 8C620000 */ lw $v0, ($v1) -/* EB1584 80240724 1440FFFB */ bnez $v0, .L80240714 -/* EB1588 80240728 24A50004 */ addiu $a1, $a1, 4 -/* EB158C 8024072C 00041080 */ sll $v0, $a0, 2 -.L80240730: -/* EB1590 80240730 3C018024 */ lui $at, %hi(D_802442D0) -/* EB1594 80240734 00220821 */ addu $at, $at, $v0 -/* EB1598 80240738 AC2042D0 */ sw $zero, %lo(D_802442D0)($at) -/* EB159C 8024073C 080901DB */ j .L8024076C -/* EB15A0 80240740 00000000 */ nop -.L80240744: -/* EB15A4 80240744 3C038024 */ lui $v1, %hi(D_802442D0) -/* EB15A8 80240748 246342D0 */ addiu $v1, $v1, %lo(D_802442D0) -/* EB15AC 8024074C 0060282D */ daddu $a1, $v1, $zero -.L80240750: -/* EB15B0 80240750 24820010 */ addiu $v0, $a0, 0x10 -/* EB15B4 80240754 AC620000 */ sw $v0, ($v1) -/* EB15B8 80240758 24630004 */ addiu $v1, $v1, 4 -/* EB15BC 8024075C 24840001 */ addiu $a0, $a0, 1 -/* EB15C0 80240760 28820070 */ slti $v0, $a0, 0x70 -/* EB15C4 80240764 1440FFFA */ bnez $v0, .L80240750 -/* EB15C8 80240768 ACA001C0 */ sw $zero, 0x1c0($a1) -.L8024076C: -/* EB15CC 8024076C 8FBF0010 */ lw $ra, 0x10($sp) -/* EB15D0 80240770 24020002 */ addiu $v0, $zero, 2 -/* EB15D4 80240774 03E00008 */ jr $ra -/* EB15D8 80240778 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/EB1170/func_8024086C_EB16CC.s b/ver/us/asm/nonmatchings/EB1170/func_8024086C_EB16CC.s deleted file mode 100644 index 3b0e1d8fdf..0000000000 --- a/ver/us/asm/nonmatchings/EB1170/func_8024086C_EB16CC.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024086C_EB16CC -/* EB16CC 8024086C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* EB16D0 80240870 AFB1001C */ sw $s1, 0x1c($sp) -/* EB16D4 80240874 0080882D */ daddu $s1, $a0, $zero -/* EB16D8 80240878 AFBF0034 */ sw $ra, 0x34($sp) -/* EB16DC 8024087C AFB60030 */ sw $s6, 0x30($sp) -/* EB16E0 80240880 AFB5002C */ sw $s5, 0x2c($sp) -/* EB16E4 80240884 AFB40028 */ sw $s4, 0x28($sp) -/* EB16E8 80240888 AFB30024 */ sw $s3, 0x24($sp) -/* EB16EC 8024088C AFB20020 */ sw $s2, 0x20($sp) -/* EB16F0 80240890 AFB00018 */ sw $s0, 0x18($sp) -/* EB16F4 80240894 F7B60040 */ sdc1 $f22, 0x40($sp) -/* EB16F8 80240898 F7B40038 */ sdc1 $f20, 0x38($sp) -/* EB16FC 8024089C 8E30000C */ lw $s0, 0xc($s1) -/* EB1700 802408A0 8E160000 */ lw $s6, ($s0) -/* EB1704 802408A4 26100004 */ addiu $s0, $s0, 4 -/* EB1708 802408A8 0C0B53A3 */ jal dead_evt_get_variable -/* EB170C 802408AC 02C0282D */ daddu $a1, $s6, $zero -/* EB1710 802408B0 44820000 */ mtc1 $v0, $f0 -/* EB1714 802408B4 00000000 */ nop -/* EB1718 802408B8 46800020 */ cvt.s.w $f0, $f0 -/* EB171C 802408BC E7A00010 */ swc1 $f0, 0x10($sp) -/* EB1720 802408C0 8E140000 */ lw $s4, ($s0) -/* EB1724 802408C4 26100004 */ addiu $s0, $s0, 4 -/* EB1728 802408C8 0220202D */ daddu $a0, $s1, $zero -/* EB172C 802408CC 0C0B53A3 */ jal dead_evt_get_variable -/* EB1730 802408D0 0280282D */ daddu $a1, $s4, $zero -/* EB1734 802408D4 0220202D */ daddu $a0, $s1, $zero -/* EB1738 802408D8 8E150000 */ lw $s5, ($s0) -/* EB173C 802408DC 4482B000 */ mtc1 $v0, $f22 -/* EB1740 802408E0 00000000 */ nop -/* EB1744 802408E4 4680B5A0 */ cvt.s.w $f22, $f22 -/* EB1748 802408E8 0C0B53A3 */ jal dead_evt_get_variable -/* EB174C 802408EC 02A0282D */ daddu $a1, $s5, $zero -/* EB1750 802408F0 2404FFFC */ addiu $a0, $zero, -4 -/* EB1754 802408F4 44820000 */ mtc1 $v0, $f0 -/* EB1758 802408F8 00000000 */ nop -/* EB175C 802408FC 46800020 */ cvt.s.w $f0, $f0 -/* EB1760 80240900 0C00F92F */ jal dead_get_npc_unsafe -/* EB1764 80240904 E7A00014 */ swc1 $f0, 0x14($sp) -/* EB1768 80240908 3C048008 */ lui $a0, %hi(D_8007C760) -/* EB176C 8024090C 8C84C760 */ lw $a0, %lo(D_8007C760)($a0) -/* EB1770 80240910 3C014334 */ lui $at, 0x4334 -/* EB1774 80240914 44816000 */ mtc1 $at, $f12 -/* EB1778 80240918 00041880 */ sll $v1, $a0, 2 -/* EB177C 8024091C 00641821 */ addu $v1, $v1, $a0 -/* EB1780 80240920 00031880 */ sll $v1, $v1, 2 -/* EB1784 80240924 00641823 */ subu $v1, $v1, $a0 -/* EB1788 80240928 000320C0 */ sll $a0, $v1, 3 -/* EB178C 8024092C 00641821 */ addu $v1, $v1, $a0 -/* EB1790 80240930 000318C0 */ sll $v1, $v1, 3 -/* EB1794 80240934 3C01800C */ lui $at, %hi(D_800B8DEC) -/* EB1798 80240938 00230821 */ addu $at, $at, $v1 -/* EB179C 8024093C C4208DEC */ lwc1 $f0, %lo(D_800B8DEC)($at) -/* EB17A0 80240940 460C0300 */ add.s $f12, $f0, $f12 -/* EB17A4 80240944 0C00AB85 */ jal dead_clamp_angle -/* EB17A8 80240948 0040982D */ daddu $s3, $v0, $zero -/* EB17AC 8024094C 27B00010 */ addiu $s0, $sp, 0x10 -/* EB17B0 80240950 0200202D */ daddu $a0, $s0, $zero -/* EB17B4 80240954 27B20014 */ addiu $s2, $sp, 0x14 -/* EB17B8 80240958 0240282D */ daddu $a1, $s2, $zero -/* EB17BC 8024095C 3C064170 */ lui $a2, 0x4170 -/* EB17C0 80240960 8E67000C */ lw $a3, 0xc($s3) -/* EB17C4 80240964 0C00ACA3 */ jal func_8002B28C -/* EB17C8 80240968 46000506 */ mov.s $f20, $f0 -/* EB17CC 8024096C 0200202D */ daddu $a0, $s0, $zero -/* EB17D0 80240970 3C064120 */ lui $a2, 0x4120 -/* EB17D4 80240974 4407A000 */ mfc1 $a3, $f20 -/* EB17D8 80240978 0C00ACA3 */ jal func_8002B28C -/* EB17DC 8024097C 0240282D */ daddu $a1, $s2, $zero -/* EB17E0 80240980 0220202D */ daddu $a0, $s1, $zero -/* EB17E4 80240984 C7A00010 */ lwc1 $f0, 0x10($sp) -/* EB17E8 80240988 4600008D */ trunc.w.s $f2, $f0 -/* EB17EC 8024098C 44061000 */ mfc1 $a2, $f2 -/* EB17F0 80240990 0C0B551A */ jal dead_evt_set_variable -/* EB17F4 80240994 02C0282D */ daddu $a1, $s6, $zero -/* EB17F8 80240998 0220202D */ daddu $a0, $s1, $zero -/* EB17FC 8024099C 4600B08D */ trunc.w.s $f2, $f22 -/* EB1800 802409A0 44061000 */ mfc1 $a2, $f2 -/* EB1804 802409A4 0C0B551A */ jal dead_evt_set_variable -/* EB1808 802409A8 0280282D */ daddu $a1, $s4, $zero -/* EB180C 802409AC 0220202D */ daddu $a0, $s1, $zero -/* EB1810 802409B0 C7A00014 */ lwc1 $f0, 0x14($sp) -/* EB1814 802409B4 4600008D */ trunc.w.s $f2, $f0 -/* EB1818 802409B8 44061000 */ mfc1 $a2, $f2 -/* EB181C 802409BC 0C0B551A */ jal dead_evt_set_variable -/* EB1820 802409C0 02A0282D */ daddu $a1, $s5, $zero -/* EB1824 802409C4 8FBF0034 */ lw $ra, 0x34($sp) -/* EB1828 802409C8 8FB60030 */ lw $s6, 0x30($sp) -/* EB182C 802409CC 8FB5002C */ lw $s5, 0x2c($sp) -/* EB1830 802409D0 8FB40028 */ lw $s4, 0x28($sp) -/* EB1834 802409D4 8FB30024 */ lw $s3, 0x24($sp) -/* EB1838 802409D8 8FB20020 */ lw $s2, 0x20($sp) -/* EB183C 802409DC 8FB1001C */ lw $s1, 0x1c($sp) -/* EB1840 802409E0 8FB00018 */ lw $s0, 0x18($sp) -/* EB1844 802409E4 D7B60040 */ ldc1 $f22, 0x40($sp) -/* EB1848 802409E8 D7B40038 */ ldc1 $f20, 0x38($sp) -/* EB184C 802409EC 24020002 */ addiu $v0, $zero, 2 -/* EB1850 802409F0 03E00008 */ jr $ra -/* EB1854 802409F4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/EC2240/func_80240158_EC2358.s b/ver/us/asm/nonmatchings/EC2240/func_80240158_EC2358.s index db8f921502..1c0c7a0c35 100644 --- a/ver/us/asm/nonmatchings/EC2240/func_80240158_EC2358.s +++ b/ver/us/asm/nonmatchings/EC2240/func_80240158_EC2358.s @@ -47,7 +47,7 @@ glabel func_80240158_EC2358 /* EC23CC 802401CC 44070000 */ mfc1 $a3, $f0 /* EC23D0 802401D0 27A50014 */ addiu $a1, $sp, 0x14 /* EC23D4 802401D4 E7B60010 */ swc1 $f22, 0x10($sp) -/* EC23D8 802401D8 0C00ACA3 */ jal func_8002B28C +/* EC23D8 802401D8 0C00ACA3 */ jal dead_add_vec2D_polar /* EC23DC 802401DC E7B80014 */ swc1 $f24, 0x14($sp) /* EC23E0 802401E0 C60C0038 */ lwc1 $f12, 0x38($s0) /* EC23E4 802401E4 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -132,7 +132,7 @@ glabel func_80240158_EC2358 /* EC250C 8024030C 27A40010 */ addiu $a0, $sp, 0x10 /* EC2510 80240310 3C064238 */ lui $a2, 0x4238 /* EC2514 80240314 44070000 */ mfc1 $a3, $f0 -/* EC2518 80240318 0C00ACA3 */ jal func_8002B28C +/* EC2518 80240318 0C00ACA3 */ jal dead_add_vec2D_polar /* EC251C 8024031C 27A50014 */ addiu $a1, $sp, 0x14 /* EC2520 80240320 080900CD */ j .L80240334 /* EC2524 80240324 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/EC9D00/func_802405A8_ECA2A8.s b/ver/us/asm/nonmatchings/EC9D00/func_802405A8_ECA2A8.s index ae28d41b98..821e875841 100644 --- a/ver/us/asm/nonmatchings/EC9D00/func_802405A8_ECA2A8.s +++ b/ver/us/asm/nonmatchings/EC9D00/func_802405A8_ECA2A8.s @@ -4,7 +4,7 @@ glabel func_802405A8_ECA2A8 /* ECA2A8 802405A8 27BDFFE0 */ addiu $sp, $sp, -0x20 /* ECA2AC 802405AC AFBF0018 */ sw $ra, 0x18($sp) -/* ECA2B0 802405B0 0C00F94D */ jal func_8003E534 +/* ECA2B0 802405B0 0C00F94D */ jal dead_get_npc_safe /* ECA2B4 802405B4 2404FFFC */ addiu $a0, $zero, -4 /* ECA2B8 802405B8 C444003C */ lwc1 $f4, 0x3c($v0) /* ECA2BC 802405BC 3C014148 */ lui $at, 0x4148 diff --git a/ver/us/asm/nonmatchings/EC9D00/func_80240600_ECA300.s b/ver/us/asm/nonmatchings/EC9D00/func_80240600_ECA300.s index 108475fabf..2ec86d2cfe 100644 --- a/ver/us/asm/nonmatchings/EC9D00/func_80240600_ECA300.s +++ b/ver/us/asm/nonmatchings/EC9D00/func_80240600_ECA300.s @@ -17,11 +17,11 @@ glabel func_80240600_ECA300 /* ECA330 80240630 F7B60050 */ sdc1 $f22, 0x50($sp) /* ECA334 80240634 F7B40048 */ sdc1 $f20, 0x48($sp) /* ECA338 80240638 8ED3000C */ lw $s3, 0xc($s6) -/* ECA33C 8024063C 0C00F94D */ jal func_8003E534 +/* ECA33C 8024063C 0C00F94D */ jal dead_get_npc_safe /* ECA340 80240640 2404FFFC */ addiu $a0, $zero, -4 /* ECA344 80240644 27A50018 */ addiu $a1, $sp, 0x18 -/* ECA348 80240648 3C048008 */ lui $a0, %hi(D_8007C760) -/* ECA34C 8024064C 8C84C760 */ lw $a0, %lo(D_8007C760)($a0) +/* ECA348 80240648 3C048008 */ lui $a0, %hi(dead_gCurrentCameraID) +/* ECA34C 8024064C 8C84C760 */ lw $a0, %lo(dead_gCurrentCameraID)($a0) /* ECA350 80240650 27A6001C */ addiu $a2, $sp, 0x1c /* ECA354 80240654 00041880 */ sll $v1, $a0, 2 /* ECA358 80240658 00641821 */ addu $v1, $v1, $a0 @@ -93,7 +93,7 @@ glabel func_80240600_ECA300 /* ECA458 80240758 4406A000 */ mfc1 $a2, $f20 /* ECA45C 8024075C 8E870000 */ lw $a3, ($s4) /* ECA460 80240760 02532821 */ addu $a1, $s2, $s3 -/* ECA464 80240764 0C00ACA3 */ jal func_8002B28C +/* ECA464 80240764 0C00ACA3 */ jal dead_add_vec2D_polar /* ECA468 80240768 AFA00020 */ sw $zero, 0x20($sp) /* ECA46C 8024076C C7A2001C */ lwc1 $f2, 0x1c($sp) /* ECA470 80240770 C7A40020 */ lwc1 $f4, 0x20($sp) @@ -169,7 +169,7 @@ glabel func_80240600_ECA300 /* ECA578 80240878 E6160020 */ swc1 $f22, 0x20($s0) /* ECA57C 8024087C 8E870000 */ lw $a3, ($s4) /* ECA580 80240880 02532821 */ addu $a1, $s2, $s3 -/* ECA584 80240884 0C00ACA3 */ jal func_8002B28C +/* ECA584 80240884 0C00ACA3 */ jal dead_add_vec2D_polar /* ECA588 80240888 E7B60020 */ swc1 $f22, 0x20($sp) /* ECA58C 8024088C C7A4001C */ lwc1 $f4, 0x1c($sp) /* ECA590 80240890 C7A00020 */ lwc1 $f0, 0x20($sp) @@ -210,7 +210,7 @@ glabel func_80240600_ECA300 /* ECA614 80240914 E6160020 */ swc1 $f22, 0x20($s0) /* ECA618 80240918 8E870000 */ lw $a3, ($s4) /* ECA61C 8024091C 02532821 */ addu $a1, $s2, $s3 -/* ECA620 80240920 0C00ACA3 */ jal func_8002B28C +/* ECA620 80240920 0C00ACA3 */ jal dead_add_vec2D_polar /* ECA624 80240924 E7B60020 */ swc1 $f22, 0x20($sp) /* ECA628 80240928 C7A4001C */ lwc1 $f4, 0x1c($sp) /* ECA62C 8024092C C7A00020 */ lwc1 $f0, 0x20($sp) diff --git a/ver/us/asm/nonmatchings/ECAA80/func_80241770_ECB470.s b/ver/us/asm/nonmatchings/ECAA80/func_80241770_ECB470.s deleted file mode 100644 index 49b697b56d..0000000000 --- a/ver/us/asm/nonmatchings/ECAA80/func_80241770_ECB470.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241770_ECB470 -/* ECB470 80241770 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* ECB474 80241774 AFB10014 */ sw $s1, 0x14($sp) -/* ECB478 80241778 0080882D */ daddu $s1, $a0, $zero -/* ECB47C 8024177C AFBF0018 */ sw $ra, 0x18($sp) -/* ECB480 80241780 AFB00010 */ sw $s0, 0x10($sp) -/* ECB484 80241784 8E30000C */ lw $s0, 0xc($s1) -/* ECB488 80241788 8E050000 */ lw $a1, ($s0) -/* ECB48C 8024178C 0C0B53A3 */ jal dead_evt_get_variable -/* ECB490 80241790 26100004 */ addiu $s0, $s0, 4 -/* ECB494 80241794 0C00F94D */ jal func_8003E534 -/* ECB498 80241798 0040202D */ daddu $a0, $v0, $zero -/* ECB49C 8024179C 10400005 */ beqz $v0, .L802417B4 -/* ECB4A0 802417A0 00000000 */ nop -/* ECB4A4 802417A4 8E050000 */ lw $a1, ($s0) -/* ECB4A8 802417A8 844600A8 */ lh $a2, 0xa8($v0) -/* ECB4AC 802417AC 0C0B551A */ jal dead_evt_set_variable -/* ECB4B0 802417B0 0220202D */ daddu $a0, $s1, $zero -.L802417B4: -/* ECB4B4 802417B4 8FBF0018 */ lw $ra, 0x18($sp) -/* ECB4B8 802417B8 8FB10014 */ lw $s1, 0x14($sp) -/* ECB4BC 802417BC 8FB00010 */ lw $s0, 0x10($sp) -/* ECB4C0 802417C0 24020002 */ addiu $v0, $zero, 2 -/* ECB4C4 802417C4 03E00008 */ jr $ra -/* ECB4C8 802417C8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/ECAA80/func_802417CC_ECB4CC.s b/ver/us/asm/nonmatchings/ECAA80/func_802417CC_ECB4CC.s index 91f2896db1..873c4c8702 100644 --- a/ver/us/asm/nonmatchings/ECAA80/func_802417CC_ECB4CC.s +++ b/ver/us/asm/nonmatchings/ECAA80/func_802417CC_ECB4CC.s @@ -40,8 +40,8 @@ glabel func_802417CC_ECB4CC /* ECB558 80241858 4680C620 */ cvt.s.w $f24, $f24 /* ECB55C 8024185C 3C128011 */ lui $s2, %hi(dead_gPlayerStatus) /* ECB560 80241860 26527578 */ addiu $s2, $s2, %lo(dead_gPlayerStatus) -/* ECB564 80241864 3C038008 */ lui $v1, %hi(D_8007C760) -/* ECB568 80241868 8C63C760 */ lw $v1, %lo(D_8007C760)($v1) +/* ECB564 80241864 3C038008 */ lui $v1, %hi(dead_gCurrentCameraID) +/* ECB568 80241868 8C63C760 */ lw $v1, %lo(dead_gCurrentCameraID)($v1) /* ECB56C 8024186C C64200A8 */ lwc1 $f2, 0xa8($s2) /* ECB570 80241870 44800000 */ mtc1 $zero, $f0 /* ECB574 80241874 00031080 */ sll $v0, $v1, 2 diff --git a/ver/us/asm/nonmatchings/ECAA80/func_80241A28_ECB728.s b/ver/us/asm/nonmatchings/ECAA80/func_80241A28_ECB728.s deleted file mode 100644 index 53575833b6..0000000000 --- a/ver/us/asm/nonmatchings/ECAA80/func_80241A28_ECB728.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A28_ECB728 -/* ECB728 80241A28 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* ECB72C 80241A2C AFBF0010 */ sw $ra, 0x10($sp) -/* ECB730 80241A30 8C82000C */ lw $v0, 0xc($a0) -/* ECB734 80241A34 0C0B53A3 */ jal dead_evt_get_variable -/* ECB738 80241A38 8C450000 */ lw $a1, ($v0) -/* ECB73C 80241A3C 0040182D */ daddu $v1, $v0, $zero -/* ECB740 80241A40 10600012 */ beqz $v1, .L80241A8C -/* ECB744 80241A44 0000202D */ daddu $a0, $zero, $zero -/* ECB748 80241A48 8C620000 */ lw $v0, ($v1) -/* ECB74C 80241A4C 5040000A */ beql $v0, $zero, .L80241A78 -/* ECB750 80241A50 00041080 */ sll $v0, $a0, 2 -/* ECB754 80241A54 3C058024 */ lui $a1, %hi(D_802462F0) -/* ECB758 80241A58 24A562F0 */ addiu $a1, $a1, %lo(D_802462F0) -.L80241A5C: -/* ECB75C 80241A5C 24630004 */ addiu $v1, $v1, 4 -/* ECB760 80241A60 24840001 */ addiu $a0, $a0, 1 -/* ECB764 80241A64 ACA20000 */ sw $v0, ($a1) -/* ECB768 80241A68 8C620000 */ lw $v0, ($v1) -/* ECB76C 80241A6C 1440FFFB */ bnez $v0, .L80241A5C -/* ECB770 80241A70 24A50004 */ addiu $a1, $a1, 4 -/* ECB774 80241A74 00041080 */ sll $v0, $a0, 2 -.L80241A78: -/* ECB778 80241A78 3C018024 */ lui $at, %hi(D_802462F0) -/* ECB77C 80241A7C 00220821 */ addu $at, $at, $v0 -/* ECB780 80241A80 AC2062F0 */ sw $zero, %lo(D_802462F0)($at) -/* ECB784 80241A84 080906AD */ j .L80241AB4 -/* ECB788 80241A88 00000000 */ nop -.L80241A8C: -/* ECB78C 80241A8C 3C038024 */ lui $v1, %hi(D_802462F0) -/* ECB790 80241A90 246362F0 */ addiu $v1, $v1, %lo(D_802462F0) -/* ECB794 80241A94 0060282D */ daddu $a1, $v1, $zero -.L80241A98: -/* ECB798 80241A98 24820080 */ addiu $v0, $a0, 0x80 -/* ECB79C 80241A9C AC620000 */ sw $v0, ($v1) -/* ECB7A0 80241AA0 24630004 */ addiu $v1, $v1, 4 -/* ECB7A4 80241AA4 24840001 */ addiu $a0, $a0, 1 -/* ECB7A8 80241AA8 2882005B */ slti $v0, $a0, 0x5b -/* ECB7AC 80241AAC 1440FFFA */ bnez $v0, .L80241A98 -/* ECB7B0 80241AB0 ACA0016C */ sw $zero, 0x16c($a1) -.L80241AB4: -/* ECB7B4 80241AB4 8FBF0010 */ lw $ra, 0x10($sp) -/* ECB7B8 80241AB8 24020002 */ addiu $v0, $zero, 2 -/* ECB7BC 80241ABC 03E00008 */ jr $ra -/* ECB7C0 80241AC0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/ED46D0/func_80240B10_ED4D30.s b/ver/us/asm/nonmatchings/ED46D0/func_80240B10_ED4D30.s index 8dfa25541f..9a5627aacc 100644 --- a/ver/us/asm/nonmatchings/ED46D0/func_80240B10_ED4D30.s +++ b/ver/us/asm/nonmatchings/ED46D0/func_80240B10_ED4D30.s @@ -4,8 +4,8 @@ glabel func_80240B10_ED4D30 /* ED4D30 80240B10 27BDFF68 */ addiu $sp, $sp, -0x98 /* ED4D34 80240B14 24040030 */ addiu $a0, $zero, 0x30 -/* ED4D38 80240B18 3C038008 */ lui $v1, %hi(D_8007C760) -/* ED4D3C 80240B1C 8C63C760 */ lw $v1, %lo(D_8007C760)($v1) +/* ED4D38 80240B18 3C038008 */ lui $v1, %hi(dead_gCurrentCameraID) +/* ED4D3C 80240B1C 8C63C760 */ lw $v1, %lo(dead_gCurrentCameraID)($v1) /* ED4D40 80240B20 3C05800C */ lui $a1, %hi(dead_gCameras) /* ED4D44 80240B24 24A58D80 */ addiu $a1, $a1, %lo(dead_gCameras) /* ED4D48 80240B28 AFBF0064 */ sw $ra, 0x64($sp) diff --git a/ver/us/asm/nonmatchings/ED8E20/func_80240208_ED9028.s b/ver/us/asm/nonmatchings/ED8E20/func_80240208_ED9028.s index 8a4c51c4fe..e007c75695 100644 --- a/ver/us/asm/nonmatchings/ED8E20/func_80240208_ED9028.s +++ b/ver/us/asm/nonmatchings/ED8E20/func_80240208_ED9028.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240208_ED9028 -/* ED9028 80240208 3C038008 */ lui $v1, %hi(D_8007C760) -/* ED902C 8024020C 8C63C760 */ lw $v1, %lo(D_8007C760)($v1) +/* ED9028 80240208 3C038008 */ lui $v1, %hi(dead_gCurrentCameraID) +/* ED902C 8024020C 8C63C760 */ lw $v1, %lo(dead_gCurrentCameraID)($v1) /* ED9030 80240210 3C014334 */ lui $at, 0x4334 /* ED9034 80240214 44816000 */ mtc1 $at, $f12 /* ED9038 80240218 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/ver/us/asm/nonmatchings/ED8E20/func_80240274_ED9094.s b/ver/us/asm/nonmatchings/ED8E20/func_80240274_ED9094.s index ee649559b9..7c540bf9d4 100644 --- a/ver/us/asm/nonmatchings/ED8E20/func_80240274_ED9094.s +++ b/ver/us/asm/nonmatchings/ED8E20/func_80240274_ED9094.s @@ -20,7 +20,7 @@ glabel func_80240274_ED9094 /* ED90D0 802402B0 E7A20014 */ swc1 $f2, 0x14($sp) /* ED90D4 802402B4 8C470080 */ lw $a3, 0x80($v0) /* ED90D8 802402B8 C454002C */ lwc1 $f20, 0x2c($v0) -/* ED90DC 802402BC 0C00ACA3 */ jal func_8002B28C +/* ED90DC 802402BC 0C00ACA3 */ jal dead_add_vec2D_polar /* ED90E0 802402C0 27A50014 */ addiu $a1, $sp, 0x14 /* ED90E4 802402C4 0200202D */ daddu $a0, $s0, $zero /* ED90E8 802402C8 3C05FE36 */ lui $a1, 0xfe36 diff --git a/ver/us/asm/nonmatchings/EDC020/func_80240394_EDC374.s b/ver/us/asm/nonmatchings/EDC020/func_80240394_EDC374.s deleted file mode 100644 index b8b760489f..0000000000 --- a/ver/us/asm/nonmatchings/EDC020/func_80240394_EDC374.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240394_EDC374 -/* EDC374 80240394 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* EDC378 80240398 AFB10014 */ sw $s1, 0x14($sp) -/* EDC37C 8024039C 0080882D */ daddu $s1, $a0, $zero -/* EDC380 802403A0 AFBF0018 */ sw $ra, 0x18($sp) -/* EDC384 802403A4 AFB00010 */ sw $s0, 0x10($sp) -/* EDC388 802403A8 8E30000C */ lw $s0, 0xc($s1) -/* EDC38C 802403AC 8E050000 */ lw $a1, ($s0) -/* EDC390 802403B0 0C0B53A3 */ jal dead_evt_get_variable -/* EDC394 802403B4 26100004 */ addiu $s0, $s0, 4 -/* EDC398 802403B8 0C00F94D */ jal func_8003E534 -/* EDC39C 802403BC 0040202D */ daddu $a0, $v0, $zero -/* EDC3A0 802403C0 10400005 */ beqz $v0, .L802403D8 -/* EDC3A4 802403C4 00000000 */ nop -/* EDC3A8 802403C8 8E050000 */ lw $a1, ($s0) -/* EDC3AC 802403CC 844600A8 */ lh $a2, 0xa8($v0) -/* EDC3B0 802403D0 0C0B551A */ jal dead_evt_set_variable -/* EDC3B4 802403D4 0220202D */ daddu $a0, $s1, $zero -.L802403D8: -/* EDC3B8 802403D8 8FBF0018 */ lw $ra, 0x18($sp) -/* EDC3BC 802403DC 8FB10014 */ lw $s1, 0x14($sp) -/* EDC3C0 802403E0 8FB00010 */ lw $s0, 0x10($sp) -/* EDC3C4 802403E4 24020002 */ addiu $v0, $zero, 2 -/* EDC3C8 802403E8 03E00008 */ jr $ra -/* EDC3CC 802403EC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/EDC020/func_802403F0_EDC3D0.s b/ver/us/asm/nonmatchings/EDC020/func_802403F0_EDC3D0.s index bcd976b329..3785c07f3f 100644 --- a/ver/us/asm/nonmatchings/EDC020/func_802403F0_EDC3D0.s +++ b/ver/us/asm/nonmatchings/EDC020/func_802403F0_EDC3D0.s @@ -40,8 +40,8 @@ glabel func_802403F0_EDC3D0 /* EDC45C 8024047C 4680C620 */ cvt.s.w $f24, $f24 /* EDC460 80240480 3C128011 */ lui $s2, %hi(dead_gPlayerStatus) /* EDC464 80240484 26527578 */ addiu $s2, $s2, %lo(dead_gPlayerStatus) -/* EDC468 80240488 3C038008 */ lui $v1, %hi(D_8007C760) -/* EDC46C 8024048C 8C63C760 */ lw $v1, %lo(D_8007C760)($v1) +/* EDC468 80240488 3C038008 */ lui $v1, %hi(dead_gCurrentCameraID) +/* EDC46C 8024048C 8C63C760 */ lw $v1, %lo(dead_gCurrentCameraID)($v1) /* EDC470 80240490 C64200A8 */ lwc1 $f2, 0xa8($s2) /* EDC474 80240494 44800000 */ mtc1 $zero, $f0 /* EDC478 80240498 00031080 */ sll $v0, $v1, 2 diff --git a/ver/us/asm/nonmatchings/EDC020/func_8024064C_EDC62C.s b/ver/us/asm/nonmatchings/EDC020/func_8024064C_EDC62C.s deleted file mode 100644 index f05b161cd0..0000000000 --- a/ver/us/asm/nonmatchings/EDC020/func_8024064C_EDC62C.s +++ /dev/null @@ -1,50 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024064C_EDC62C -/* EDC62C 8024064C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* EDC630 80240650 AFBF0010 */ sw $ra, 0x10($sp) -/* EDC634 80240654 8C82000C */ lw $v0, 0xc($a0) -/* EDC638 80240658 0C0B53A3 */ jal dead_evt_get_variable -/* EDC63C 8024065C 8C450000 */ lw $a1, ($v0) -/* EDC640 80240660 0040182D */ daddu $v1, $v0, $zero -/* EDC644 80240664 10600012 */ beqz $v1, .L802406B0 -/* EDC648 80240668 0000202D */ daddu $a0, $zero, $zero -/* EDC64C 8024066C 8C620000 */ lw $v0, ($v1) -/* EDC650 80240670 5040000A */ beql $v0, $zero, .L8024069C -/* EDC654 80240674 00041080 */ sll $v0, $a0, 2 -/* EDC658 80240678 3C058024 */ lui $a1, %hi(D_802429E0) -/* EDC65C 8024067C 24A529E0 */ addiu $a1, $a1, %lo(D_802429E0) -.L80240680: -/* EDC660 80240680 24630004 */ addiu $v1, $v1, 4 -/* EDC664 80240684 24840001 */ addiu $a0, $a0, 1 -/* EDC668 80240688 ACA20000 */ sw $v0, ($a1) -/* EDC66C 8024068C 8C620000 */ lw $v0, ($v1) -/* EDC670 80240690 1440FFFB */ bnez $v0, .L80240680 -/* EDC674 80240694 24A50004 */ addiu $a1, $a1, 4 -/* EDC678 80240698 00041080 */ sll $v0, $a0, 2 -.L8024069C: -/* EDC67C 8024069C 3C018024 */ lui $at, %hi(D_802429E0) -/* EDC680 802406A0 00220821 */ addu $at, $at, $v0 -/* EDC684 802406A4 AC2029E0 */ sw $zero, %lo(D_802429E0)($at) -/* EDC688 802406A8 080901B6 */ j .L802406D8 -/* EDC68C 802406AC 00000000 */ nop -.L802406B0: -/* EDC690 802406B0 3C038024 */ lui $v1, %hi(D_802429E0) -/* EDC694 802406B4 246329E0 */ addiu $v1, $v1, %lo(D_802429E0) -/* EDC698 802406B8 0060282D */ daddu $a1, $v1, $zero -.L802406BC: -/* EDC69C 802406BC 24820010 */ addiu $v0, $a0, 0x10 -/* EDC6A0 802406C0 AC620000 */ sw $v0, ($v1) -/* EDC6A4 802406C4 24630004 */ addiu $v1, $v1, 4 -/* EDC6A8 802406C8 24840001 */ addiu $a0, $a0, 1 -/* EDC6AC 802406CC 28820070 */ slti $v0, $a0, 0x70 -/* EDC6B0 802406D0 1440FFFA */ bnez $v0, .L802406BC -/* EDC6B4 802406D4 ACA001C0 */ sw $zero, 0x1c0($a1) -.L802406D8: -/* EDC6B8 802406D8 8FBF0010 */ lw $ra, 0x10($sp) -/* EDC6BC 802406DC 24020002 */ addiu $v0, $zero, 2 -/* EDC6C0 802406E0 03E00008 */ jr $ra -/* EDC6C4 802406E4 27BD0018 */ addiu $sp, $sp, 0x18 -/* EDC6C8 802406E8 00000000 */ nop -/* EDC6CC 802406EC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/EDEA00/func_80240040_EDEA00.s b/ver/us/asm/nonmatchings/EDEA00/func_80240040_EDEA00.s index b557d9eb58..0deae8d7b2 100644 --- a/ver/us/asm/nonmatchings/EDEA00/func_80240040_EDEA00.s +++ b/ver/us/asm/nonmatchings/EDEA00/func_80240040_EDEA00.s @@ -20,7 +20,7 @@ glabel func_80240040_EDEA00 /* EDEA3C 8024007C 0C0B53A3 */ jal dead_evt_get_variable /* EDEA40 80240080 0040802D */ daddu $s0, $v0, $zero /* EDEA44 80240084 0200202D */ daddu $a0, $s0, $zero -/* EDEA48 80240088 0C00F94D */ jal func_8003E534 +/* EDEA48 80240088 0C00F94D */ jal dead_get_npc_safe /* EDEA4C 8024008C 0040A02D */ daddu $s4, $v0, $zero /* EDEA50 80240090 3C138011 */ lui $s3, %hi(D_80117840) /* EDEA54 80240094 26737840 */ addiu $s3, $s3, %lo(D_80117840) @@ -80,7 +80,7 @@ glabel func_80240040_EDEA00 /* EDEB18 80240158 08090068 */ j .L802401A0 /* EDEB1C 8024015C AE420070 */ sw $v0, 0x70($s2) .L80240160: -/* EDEB20 80240160 0C00F94D */ jal func_8003E534 +/* EDEB20 80240160 0C00F94D */ jal dead_get_npc_safe /* EDEB24 80240164 2404FFFC */ addiu $a0, $zero, -4 /* EDEB28 80240168 8E05000C */ lw $a1, 0xc($s0) /* EDEB2C 8024016C 0C00FB54 */ jal func_8003ED50 diff --git a/ver/us/asm/nonmatchings/EDEA00/func_802422F0_EE0CB0.s b/ver/us/asm/nonmatchings/EDEA00/func_802422F0_EE0CB0.s deleted file mode 100644 index 217a40e799..0000000000 --- a/ver/us/asm/nonmatchings/EDEA00/func_802422F0_EE0CB0.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802422F0_EE0CB0 -/* EE0CB0 802422F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* EE0CB4 802422F4 AFB20018 */ sw $s2, 0x18($sp) -/* EE0CB8 802422F8 0080902D */ daddu $s2, $a0, $zero -/* EE0CBC 802422FC AFBF001C */ sw $ra, 0x1c($sp) -/* EE0CC0 80242300 AFB10014 */ sw $s1, 0x14($sp) -/* EE0CC4 80242304 AFB00010 */ sw $s0, 0x10($sp) -/* EE0CC8 80242308 8E510148 */ lw $s1, 0x148($s2) -/* EE0CCC 8024230C 0C00F92F */ jal dead_get_npc_unsafe -/* EE0CD0 80242310 86240008 */ lh $a0, 8($s1) -/* EE0CD4 80242314 0040802D */ daddu $s0, $v0, $zero -/* EE0CD8 80242318 8E2300CC */ lw $v1, 0xcc($s1) -/* EE0CDC 8024231C C60C0038 */ lwc1 $f12, 0x38($s0) -/* EE0CE0 80242320 8C630020 */ lw $v1, 0x20($v1) -/* EE0CE4 80242324 AE030028 */ sw $v1, 0x28($s0) -/* EE0CE8 80242328 96220076 */ lhu $v0, 0x76($s1) -/* EE0CEC 8024232C A602008E */ sh $v0, 0x8e($s0) -/* EE0CF0 80242330 3C028010 */ lui $v0, %hi(dead_gPlayerStatusPtr) -/* EE0CF4 80242334 8C42FC90 */ lw $v0, %lo(dead_gPlayerStatusPtr)($v0) -/* EE0CF8 80242338 C60E0040 */ lwc1 $f14, 0x40($s0) -/* EE0CFC 8024233C 8C460028 */ lw $a2, 0x28($v0) -/* EE0D00 80242340 0C00ABDC */ jal fio_validate_header_checksums -/* EE0D04 80242344 8C470030 */ lw $a3, 0x30($v0) -/* EE0D08 80242348 2402000D */ addiu $v0, $zero, 0xd -/* EE0D0C 8024234C E600000C */ swc1 $f0, 0xc($s0) -/* EE0D10 80242350 AE420070 */ sw $v0, 0x70($s2) -/* EE0D14 80242354 8FBF001C */ lw $ra, 0x1c($sp) -/* EE0D18 80242358 8FB20018 */ lw $s2, 0x18($sp) -/* EE0D1C 8024235C 8FB10014 */ lw $s1, 0x14($sp) -/* EE0D20 80242360 8FB00010 */ lw $s0, 0x10($sp) -/* EE0D24 80242364 03E00008 */ jr $ra -/* EE0D28 80242368 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/EDEA00/func_8024236C_EE0D2C.s b/ver/us/asm/nonmatchings/EDEA00/func_8024236C_EE0D2C.s deleted file mode 100644 index 60cd1db8d3..0000000000 --- a/ver/us/asm/nonmatchings/EDEA00/func_8024236C_EE0D2C.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80247B50_EE6510 -.double 0.8 - -.section .text - -glabel func_8024236C_EE0D2C -/* EE0D2C 8024236C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* EE0D30 80242370 AFB3001C */ sw $s3, 0x1c($sp) -/* EE0D34 80242374 0080982D */ daddu $s3, $a0, $zero -/* EE0D38 80242378 AFBF0020 */ sw $ra, 0x20($sp) -/* EE0D3C 8024237C AFB20018 */ sw $s2, 0x18($sp) -/* EE0D40 80242380 AFB10014 */ sw $s1, 0x14($sp) -/* EE0D44 80242384 AFB00010 */ sw $s0, 0x10($sp) -/* EE0D48 80242388 8E710148 */ lw $s1, 0x148($s3) -/* EE0D4C 8024238C 86240008 */ lh $a0, 8($s1) -/* EE0D50 80242390 0C00F92F */ jal dead_get_npc_unsafe -/* EE0D54 80242394 00A0902D */ daddu $s2, $a1, $zero -/* EE0D58 80242398 0040802D */ daddu $s0, $v0, $zero -/* EE0D5C 8024239C 8602008E */ lh $v0, 0x8e($s0) -/* EE0D60 802423A0 9603008E */ lhu $v1, 0x8e($s0) -/* EE0D64 802423A4 18400005 */ blez $v0, .L802423BC -/* EE0D68 802423A8 2462FFFF */ addiu $v0, $v1, -1 -/* EE0D6C 802423AC A602008E */ sh $v0, 0x8e($s0) -/* EE0D70 802423B0 00021400 */ sll $v0, $v0, 0x10 -/* EE0D74 802423B4 1C400033 */ bgtz $v0, .L80242484 -/* EE0D78 802423B8 00000000 */ nop -.L802423BC: -/* EE0D7C 802423BC 8602008C */ lh $v0, 0x8c($s0) -/* EE0D80 802423C0 14400030 */ bnez $v0, .L80242484 -/* EE0D84 802423C4 00000000 */ nop -/* EE0D88 802423C8 8E2200CC */ lw $v0, 0xcc($s1) -/* EE0D8C 802423CC 8C420024 */ lw $v0, 0x24($v0) -/* EE0D90 802423D0 AE020028 */ sw $v0, 0x28($s0) -/* EE0D94 802423D4 C6400018 */ lwc1 $f0, 0x18($s2) -/* EE0D98 802423D8 E6000018 */ swc1 $f0, 0x18($s0) -/* EE0D9C 802423DC 8E230088 */ lw $v1, 0x88($s1) -/* EE0DA0 802423E0 24020005 */ addiu $v0, $zero, 5 -/* EE0DA4 802423E4 10620005 */ beq $v1, $v0, .L802423FC -/* EE0DA8 802423E8 00000000 */ nop -/* EE0DAC 802423EC 10600003 */ beqz $v1, .L802423FC -/* EE0DB0 802423F0 24020001 */ addiu $v0, $zero, 1 -/* EE0DB4 802423F4 14620006 */ bne $v1, $v0, .L80242410 -/* EE0DB8 802423F8 00000000 */ nop -.L802423FC: -/* EE0DBC 802423FC 8E220084 */ lw $v0, 0x84($s1) -/* EE0DC0 80242400 00021FC2 */ srl $v1, $v0, 0x1f -/* EE0DC4 80242404 00431021 */ addu $v0, $v0, $v1 -/* EE0DC8 80242408 00021043 */ sra $v0, $v0, 1 -/* EE0DCC 8024240C A60200A8 */ sh $v0, 0xa8($s0) -.L80242410: -/* EE0DD0 80242410 3C028010 */ lui $v0, %hi(dead_gPlayerStatusPtr) -/* EE0DD4 80242414 8C42FC90 */ lw $v0, %lo(dead_gPlayerStatusPtr)($v0) -/* EE0DD8 80242418 C60C0038 */ lwc1 $f12, 0x38($s0) -/* EE0DDC 8024241C C60E0040 */ lwc1 $f14, 0x40($s0) -/* EE0DE0 80242420 8C460028 */ lw $a2, 0x28($v0) -/* EE0DE4 80242424 0C00AC71 */ jal dead_dist2D -/* EE0DE8 80242428 8C470030 */ lw $a3, 0x30($v0) -/* EE0DEC 8024242C C6020018 */ lwc1 $f2, 0x18($s0) -/* EE0DF0 80242430 46020003 */ div.s $f0, $f0, $f2 -/* EE0DF4 80242434 3C018024 */ lui $at, %hi(D_80247B50_EE6510) -/* EE0DF8 80242438 D4227B50 */ ldc1 $f2, %lo(D_80247B50_EE6510)($at) -/* EE0DFC 8024243C 46000021 */ cvt.d.s $f0, $f0 -/* EE0E00 80242440 46220000 */ add.d $f0, $f0, $f2 -/* EE0E04 80242444 4620010D */ trunc.w.d $f4, $f0 -/* EE0E08 80242448 44022000 */ mfc1 $v0, $f4 -/* EE0E0C 8024244C 00000000 */ nop -/* EE0E10 80242450 A602008E */ sh $v0, 0x8e($s0) -/* EE0E14 80242454 00021400 */ sll $v0, $v0, 0x10 -/* EE0E18 80242458 8E230078 */ lw $v1, 0x78($s1) -/* EE0E1C 8024245C 00021403 */ sra $v0, $v0, 0x10 -/* EE0E20 80242460 0043102A */ slt $v0, $v0, $v1 -/* EE0E24 80242464 10400003 */ beqz $v0, .L80242474 -/* EE0E28 80242468 00000000 */ nop -/* EE0E2C 8024246C 9622007A */ lhu $v0, 0x7a($s1) -/* EE0E30 80242470 A602008E */ sh $v0, 0x8e($s0) -.L80242474: -/* EE0E34 80242474 8602008E */ lh $v0, 0x8e($s0) -/* EE0E38 80242478 AE22007C */ sw $v0, 0x7c($s1) -/* EE0E3C 8024247C 2402000E */ addiu $v0, $zero, 0xe -/* EE0E40 80242480 AE620070 */ sw $v0, 0x70($s3) -.L80242484: -/* EE0E44 80242484 8FBF0020 */ lw $ra, 0x20($sp) -/* EE0E48 80242488 8FB3001C */ lw $s3, 0x1c($sp) -/* EE0E4C 8024248C 8FB20018 */ lw $s2, 0x18($sp) -/* EE0E50 80242490 8FB10014 */ lw $s1, 0x14($sp) -/* EE0E54 80242494 8FB00010 */ lw $s0, 0x10($sp) -/* EE0E58 80242498 03E00008 */ jr $ra -/* EE0E5C 8024249C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/EDEA00/func_802424A0_EE0E60.s b/ver/us/asm/nonmatchings/EDEA00/func_802424A0_EE0E60.s deleted file mode 100644 index 7ff3c3f222..0000000000 --- a/ver/us/asm/nonmatchings/EDEA00/func_802424A0_EE0E60.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802424A0_EE0E60 -/* EE0E60 802424A0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* EE0E64 802424A4 AFB3003C */ sw $s3, 0x3c($sp) -/* EE0E68 802424A8 0080982D */ daddu $s3, $a0, $zero -/* EE0E6C 802424AC AFBF0040 */ sw $ra, 0x40($sp) -/* EE0E70 802424B0 AFB20038 */ sw $s2, 0x38($sp) -/* EE0E74 802424B4 AFB10034 */ sw $s1, 0x34($sp) -/* EE0E78 802424B8 AFB00030 */ sw $s0, 0x30($sp) -/* EE0E7C 802424BC 8E710148 */ lw $s1, 0x148($s3) -/* EE0E80 802424C0 0C00F92F */ jal dead_get_npc_unsafe -/* EE0E84 802424C4 86240008 */ lh $a0, 8($s1) -/* EE0E88 802424C8 0040802D */ daddu $s0, $v0, $zero -/* EE0E8C 802424CC 8E22007C */ lw $v0, 0x7c($s1) -/* EE0E90 802424D0 8603008E */ lh $v1, 0x8e($s0) -/* EE0E94 802424D4 2442FFFF */ addiu $v0, $v0, -1 -/* EE0E98 802424D8 14620012 */ bne $v1, $v0, .L80242524 -/* EE0E9C 802424DC 00000000 */ nop -/* EE0EA0 802424E0 C6000038 */ lwc1 $f0, 0x38($s0) -/* EE0EA4 802424E4 4600020D */ trunc.w.s $f8, $f0 -/* EE0EA8 802424E8 44024000 */ mfc1 $v0, $f8 -/* EE0EAC 802424EC 00000000 */ nop -/* EE0EB0 802424F0 A6220010 */ sh $v0, 0x10($s1) -/* EE0EB4 802424F4 C600003C */ lwc1 $f0, 0x3c($s0) -/* EE0EB8 802424F8 4600020D */ trunc.w.s $f8, $f0 -/* EE0EBC 802424FC 44024000 */ mfc1 $v0, $f8 -/* EE0EC0 80242500 00000000 */ nop -/* EE0EC4 80242504 A6220012 */ sh $v0, 0x12($s1) -/* EE0EC8 80242508 C6000040 */ lwc1 $f0, 0x40($s0) -/* EE0ECC 8024250C 24020001 */ addiu $v0, $zero, 1 -/* EE0ED0 80242510 A2220007 */ sb $v0, 7($s1) -/* EE0ED4 80242514 4600020D */ trunc.w.s $f8, $f0 -/* EE0ED8 80242518 44024000 */ mfc1 $v0, $f8 -/* EE0EDC 8024251C 00000000 */ nop -/* EE0EE0 80242520 A6220014 */ sh $v0, 0x14($s1) -.L80242524: -/* EE0EE4 80242524 C6000038 */ lwc1 $f0, 0x38($s0) -/* EE0EE8 80242528 C602003C */ lwc1 $f2, 0x3c($s0) -/* EE0EEC 8024252C C6040040 */ lwc1 $f4, 0x40($s0) -/* EE0EF0 80242530 C6060018 */ lwc1 $f6, 0x18($s0) -/* EE0EF4 80242534 E7A00020 */ swc1 $f0, 0x20($sp) -/* EE0EF8 80242538 E7A20024 */ swc1 $f2, 0x24($sp) -/* EE0EFC 8024253C E7A40028 */ swc1 $f4, 0x28($sp) -/* EE0F00 80242540 E7A60010 */ swc1 $f6, 0x10($sp) -/* EE0F04 80242544 C600000C */ lwc1 $f0, 0xc($s0) -/* EE0F08 80242548 E7A00014 */ swc1 $f0, 0x14($sp) -/* EE0F0C 8024254C 860200A8 */ lh $v0, 0xa8($s0) -/* EE0F10 80242550 27A50020 */ addiu $a1, $sp, 0x20 -/* EE0F14 80242554 44820000 */ mtc1 $v0, $f0 -/* EE0F18 80242558 00000000 */ nop -/* EE0F1C 8024255C 46800020 */ cvt.s.w $f0, $f0 -/* EE0F20 80242560 E7A00018 */ swc1 $f0, 0x18($sp) -/* EE0F24 80242564 860200A6 */ lh $v0, 0xa6($s0) -/* EE0F28 80242568 27A60024 */ addiu $a2, $sp, 0x24 -/* EE0F2C 8024256C 44820000 */ mtc1 $v0, $f0 -/* EE0F30 80242570 00000000 */ nop -/* EE0F34 80242574 46800020 */ cvt.s.w $f0, $f0 -/* EE0F38 80242578 E7A0001C */ swc1 $f0, 0x1c($sp) -/* EE0F3C 8024257C 8E040080 */ lw $a0, 0x80($s0) -/* EE0F40 80242580 0C0394C1 */ jal dead_npc_test_move_simple_with_slipping -/* EE0F44 80242584 27A70028 */ addiu $a3, $sp, 0x28 -/* EE0F48 80242588 0040902D */ daddu $s2, $v0, $zero -/* EE0F4C 8024258C 16400005 */ bnez $s2, .L802425A4 -/* EE0F50 80242590 00000000 */ nop -/* EE0F54 80242594 8E050018 */ lw $a1, 0x18($s0) -/* EE0F58 80242598 8E06000C */ lw $a2, 0xc($s0) -/* EE0F5C 8024259C 0C00F909 */ jal dead_npc_move_heading -/* EE0F60 802425A0 0200202D */ daddu $a0, $s0, $zero -.L802425A4: -/* EE0F64 802425A4 8602008E */ lh $v0, 0x8e($s0) -/* EE0F68 802425A8 9603008E */ lhu $v1, 0x8e($s0) -/* EE0F6C 802425AC 18400007 */ blez $v0, .L802425CC -/* EE0F70 802425B0 2462FFFF */ addiu $v0, $v1, -1 -/* EE0F74 802425B4 A602008E */ sh $v0, 0x8e($s0) -/* EE0F78 802425B8 00021400 */ sll $v0, $v0, 0x10 -/* EE0F7C 802425BC 18400003 */ blez $v0, .L802425CC -/* EE0F80 802425C0 00000000 */ nop -/* EE0F84 802425C4 12400008 */ beqz $s2, .L802425E8 -/* EE0F88 802425C8 00000000 */ nop -.L802425CC: -/* EE0F8C 802425CC 8E2200CC */ lw $v0, 0xcc($s1) -/* EE0F90 802425D0 A2200007 */ sb $zero, 7($s1) -/* EE0F94 802425D4 8C420028 */ lw $v0, 0x28($v0) -/* EE0F98 802425D8 A600008E */ sh $zero, 0x8e($s0) -/* EE0F9C 802425DC AE020028 */ sw $v0, 0x28($s0) -/* EE0FA0 802425E0 2402000F */ addiu $v0, $zero, 0xf -/* EE0FA4 802425E4 AE620070 */ sw $v0, 0x70($s3) -.L802425E8: -/* EE0FA8 802425E8 8FBF0040 */ lw $ra, 0x40($sp) -/* EE0FAC 802425EC 8FB3003C */ lw $s3, 0x3c($sp) -/* EE0FB0 802425F0 8FB20038 */ lw $s2, 0x38($sp) -/* EE0FB4 802425F4 8FB10034 */ lw $s1, 0x34($sp) -/* EE0FB8 802425F8 8FB00030 */ lw $s0, 0x30($sp) -/* EE0FBC 802425FC 03E00008 */ jr $ra -/* EE0FC0 80242600 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/EDEA00/func_80242604_EE0FC4.s b/ver/us/asm/nonmatchings/EDEA00/func_80242604_EE0FC4.s deleted file mode 100644 index 06f14685ca..0000000000 --- a/ver/us/asm/nonmatchings/EDEA00/func_80242604_EE0FC4.s +++ /dev/null @@ -1,38 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242604_EE0FC4 -/* EE0FC4 80242604 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* EE0FC8 80242608 AFB10014 */ sw $s1, 0x14($sp) -/* EE0FCC 8024260C 0080882D */ daddu $s1, $a0, $zero -/* EE0FD0 80242610 AFBF0018 */ sw $ra, 0x18($sp) -/* EE0FD4 80242614 AFB00010 */ sw $s0, 0x10($sp) -/* EE0FD8 80242618 8E300148 */ lw $s0, 0x148($s1) -/* EE0FDC 8024261C 0C00F92F */ jal dead_get_npc_unsafe -/* EE0FE0 80242620 86040008 */ lh $a0, 8($s0) -/* EE0FE4 80242624 0040202D */ daddu $a0, $v0, $zero -/* EE0FE8 80242628 9482008E */ lhu $v0, 0x8e($a0) -/* EE0FEC 8024262C 24030003 */ addiu $v1, $zero, 3 -/* EE0FF0 80242630 24420001 */ addiu $v0, $v0, 1 -/* EE0FF4 80242634 A482008E */ sh $v0, 0x8e($a0) -/* EE0FF8 80242638 00021400 */ sll $v0, $v0, 0x10 -/* EE0FFC 8024263C 00021403 */ sra $v0, $v0, 0x10 -/* EE1000 80242640 14430003 */ bne $v0, $v1, .L80242650 -/* EE1004 80242644 00000000 */ nop -/* EE1008 80242648 96020086 */ lhu $v0, 0x86($s0) -/* EE100C 8024264C A48200A8 */ sh $v0, 0xa8($a0) -.L80242650: -/* EE1010 80242650 8482008E */ lh $v0, 0x8e($a0) -/* EE1014 80242654 8E030080 */ lw $v1, 0x80($s0) -/* EE1018 80242658 0043102A */ slt $v0, $v0, $v1 -/* EE101C 8024265C 14400004 */ bnez $v0, .L80242670 -/* EE1020 80242660 00000000 */ nop -/* EE1024 80242664 96020086 */ lhu $v0, 0x86($s0) -/* EE1028 80242668 A48200A8 */ sh $v0, 0xa8($a0) -/* EE102C 8024266C AE200070 */ sw $zero, 0x70($s1) -.L80242670: -/* EE1030 80242670 8FBF0018 */ lw $ra, 0x18($sp) -/* EE1034 80242674 8FB10014 */ lw $s1, 0x14($sp) -/* EE1038 80242678 8FB00010 */ lw $s0, 0x10($sp) -/* EE103C 8024267C 03E00008 */ jr $ra -/* EE1040 80242680 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/EDEA00/func_80242684_EE1044.s b/ver/us/asm/nonmatchings/EDEA00/func_80242684_EE1044.s index 9691564751..c2881825a4 100644 --- a/ver/us/asm/nonmatchings/EDEA00/func_80242684_EE1044.s +++ b/ver/us/asm/nonmatchings/EDEA00/func_80242684_EE1044.s @@ -250,25 +250,25 @@ glabel func_80242684_EE1044 .L80242A00: /* EE13C0 80242A00 0260202D */ daddu $a0, $s3, $zero /* EE13C4 80242A04 0280282D */ daddu $a1, $s4, $zero -/* EE13C8 80242A08 0C0908BC */ jal func_802422F0_EE0CB0 +/* EE13C8 80242A08 0C0908BC */ jal EDEA00_set_script_owner_npc_anim /* EE13CC 80242A0C 02A0302D */ daddu $a2, $s5, $zero /* EE13D0 80242A10 0260202D */ daddu $a0, $s3, $zero .L80242A14: /* EE13D4 80242A14 0280282D */ daddu $a1, $s4, $zero -/* EE13D8 80242A18 0C0908DB */ jal func_8024236C_EE0D2C +/* EE13D8 80242A18 0C0908DB */ jal EDEA00_UnkDistFunc /* EE13DC 80242A1C 02A0302D */ daddu $a2, $s5, $zero /* EE13E0 80242A20 08090A97 */ j .L80242A5C /* EE13E4 80242A24 00000000 */ nop .L80242A28: /* EE13E8 80242A28 0260202D */ daddu $a0, $s3, $zero /* EE13EC 80242A2C 0280282D */ daddu $a1, $s4, $zero -/* EE13F0 80242A30 0C090928 */ jal func_802424A0_EE0E60 +/* EE13F0 80242A30 0C090928 */ jal EDEA00_UnkNpcAIFunc12 /* EE13F4 80242A34 02A0302D */ daddu $a2, $s5, $zero /* EE13F8 80242A38 08090A97 */ j .L80242A5C /* EE13FC 80242A3C 00000000 */ nop .L80242A40: /* EE1400 80242A40 0280282D */ daddu $a1, $s4, $zero -/* EE1404 80242A44 0C090981 */ jal func_80242604_EE0FC4 +/* EE1404 80242A44 0C090981 */ jal EDEA00_set_script_owner_npc_col_height /* EE1408 80242A48 02A0302D */ daddu $a2, $s5, $zero /* EE140C 80242A4C 08090A97 */ j .L80242A5C /* EE1410 80242A50 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/EDEA00/func_80242AF0_EE14B0.s b/ver/us/asm/nonmatchings/EDEA00/func_80242AF0_EE14B0.s index d3eb98d51e..81a1d45485 100644 --- a/ver/us/asm/nonmatchings/EDEA00/func_80242AF0_EE14B0.s +++ b/ver/us/asm/nonmatchings/EDEA00/func_80242AF0_EE14B0.s @@ -286,12 +286,12 @@ glabel func_80242AF0_EE14B0 /* EE18B0 80242EF0 00000000 */ nop .L80242EF4: /* EE18B4 80242EF4 0260282D */ daddu $a1, $s3, $zero -/* EE18B8 80242EF8 0C0908BC */ jal func_802422F0_EE0CB0 +/* EE18B8 80242EF8 0C0908BC */ jal EDEA00_set_script_owner_npc_anim /* EE18BC 80242EFC 0280302D */ daddu $a2, $s4, $zero .L80242F00: /* EE18C0 80242F00 02A0202D */ daddu $a0, $s5, $zero /* EE18C4 80242F04 0260282D */ daddu $a1, $s3, $zero -/* EE18C8 80242F08 0C0908DB */ jal func_8024236C_EE0D2C +/* EE18C8 80242F08 0C0908DB */ jal EDEA00_UnkDistFunc /* EE18CC 80242F0C 0280302D */ daddu $a2, $s4, $zero /* EE18D0 80242F10 96420086 */ lhu $v0, 0x86($s2) /* EE18D4 80242F14 08090CFA */ j .L802433E8 @@ -299,14 +299,14 @@ glabel func_80242AF0_EE14B0 .L80242F1C: /* EE18DC 80242F1C 02A0202D */ daddu $a0, $s5, $zero /* EE18E0 80242F20 0260282D */ daddu $a1, $s3, $zero -/* EE18E4 80242F24 0C090928 */ jal func_802424A0_EE0E60 +/* EE18E4 80242F24 0C090928 */ jal EDEA00_UnkNpcAIFunc12 /* EE18E8 80242F28 0280302D */ daddu $a2, $s4, $zero /* EE18EC 80242F2C 08090CFA */ j .L802433E8 /* EE18F0 80242F30 00000000 */ nop .L80242F34: /* EE18F4 80242F34 02A0202D */ daddu $a0, $s5, $zero /* EE18F8 80242F38 0260282D */ daddu $a1, $s3, $zero -/* EE18FC 80242F3C 0C090981 */ jal func_80242604_EE0FC4 +/* EE18FC 80242F3C 0C090981 */ jal EDEA00_set_script_owner_npc_col_height /* EE1900 80242F40 0280302D */ daddu $a2, $s4, $zero /* EE1904 80242F44 08090CFA */ j .L802433E8 /* EE1908 80242F48 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/EE70C0/func_80242034_EE85E4.s b/ver/us/asm/nonmatchings/EE70C0/func_80242034_EE85E4.s deleted file mode 100644 index 8826358d6b..0000000000 --- a/ver/us/asm/nonmatchings/EE70C0/func_80242034_EE85E4.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242034_EE85E4 -/* EE85E4 80242034 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* EE85E8 80242038 AFB10014 */ sw $s1, 0x14($sp) -/* EE85EC 8024203C 0080882D */ daddu $s1, $a0, $zero -/* EE85F0 80242040 AFBF0018 */ sw $ra, 0x18($sp) -/* EE85F4 80242044 AFB00010 */ sw $s0, 0x10($sp) -/* EE85F8 80242048 8E30000C */ lw $s0, 0xc($s1) -/* EE85FC 8024204C 8E050000 */ lw $a1, ($s0) -/* EE8600 80242050 0C0B53A3 */ jal dead_evt_get_variable -/* EE8604 80242054 26100004 */ addiu $s0, $s0, 4 -/* EE8608 80242058 0C00F94D */ jal func_8003E534 -/* EE860C 8024205C 0040202D */ daddu $a0, $v0, $zero -/* EE8610 80242060 10400005 */ beqz $v0, .L80242078 -/* EE8614 80242064 00000000 */ nop -/* EE8618 80242068 8E050000 */ lw $a1, ($s0) -/* EE861C 8024206C 844600A8 */ lh $a2, 0xa8($v0) -/* EE8620 80242070 0C0B551A */ jal dead_evt_set_variable -/* EE8624 80242074 0220202D */ daddu $a0, $s1, $zero -.L80242078: -/* EE8628 80242078 8FBF0018 */ lw $ra, 0x18($sp) -/* EE862C 8024207C 8FB10014 */ lw $s1, 0x14($sp) -/* EE8630 80242080 8FB00010 */ lw $s0, 0x10($sp) -/* EE8634 80242084 24020002 */ addiu $v0, $zero, 2 -/* EE8638 80242088 03E00008 */ jr $ra -/* EE863C 8024208C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/EE70C0/func_80242090_EE8640.s b/ver/us/asm/nonmatchings/EE70C0/func_80242090_EE8640.s index 66b22b9bb3..b1078e09bd 100644 --- a/ver/us/asm/nonmatchings/EE70C0/func_80242090_EE8640.s +++ b/ver/us/asm/nonmatchings/EE70C0/func_80242090_EE8640.s @@ -40,8 +40,8 @@ glabel func_80242090_EE8640 /* EE86CC 8024211C 4680C620 */ cvt.s.w $f24, $f24 /* EE86D0 80242120 3C128011 */ lui $s2, %hi(dead_gPlayerStatus) /* EE86D4 80242124 26527578 */ addiu $s2, $s2, %lo(dead_gPlayerStatus) -/* EE86D8 80242128 3C038008 */ lui $v1, %hi(D_8007C760) -/* EE86DC 8024212C 8C63C760 */ lw $v1, %lo(D_8007C760)($v1) +/* EE86D8 80242128 3C038008 */ lui $v1, %hi(dead_gCurrentCameraID) +/* EE86DC 8024212C 8C63C760 */ lw $v1, %lo(dead_gCurrentCameraID)($v1) /* EE86E0 80242130 C64200A8 */ lwc1 $f2, 0xa8($s2) /* EE86E4 80242134 44800000 */ mtc1 $zero, $f0 /* EE86E8 80242138 00031080 */ sll $v0, $v1, 2 diff --git a/ver/us/asm/nonmatchings/EE70C0/func_802422EC_EE889C.s b/ver/us/asm/nonmatchings/EE70C0/func_802422EC_EE889C.s deleted file mode 100644 index 91391370de..0000000000 --- a/ver/us/asm/nonmatchings/EE70C0/func_802422EC_EE889C.s +++ /dev/null @@ -1,50 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802422EC_EE889C -/* EE889C 802422EC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* EE88A0 802422F0 AFBF0010 */ sw $ra, 0x10($sp) -/* EE88A4 802422F4 8C82000C */ lw $v0, 0xc($a0) -/* EE88A8 802422F8 0C0B53A3 */ jal dead_evt_get_variable -/* EE88AC 802422FC 8C450000 */ lw $a1, ($v0) -/* EE88B0 80242300 0040182D */ daddu $v1, $v0, $zero -/* EE88B4 80242304 10600012 */ beqz $v1, .L80242350 -/* EE88B8 80242308 0000202D */ daddu $a0, $zero, $zero -/* EE88BC 8024230C 8C620000 */ lw $v0, ($v1) -/* EE88C0 80242310 5040000A */ beql $v0, $zero, .L8024233C -/* EE88C4 80242314 00041080 */ sll $v0, $a0, 2 -/* EE88C8 80242318 3C058024 */ lui $a1, %hi(D_802453E0_EEB990) -/* EE88CC 8024231C 24A553E0 */ addiu $a1, $a1, %lo(D_802453E0_EEB990) -.L80242320: -/* EE88D0 80242320 24630004 */ addiu $v1, $v1, 4 -/* EE88D4 80242324 24840001 */ addiu $a0, $a0, 1 -/* EE88D8 80242328 ACA20000 */ sw $v0, ($a1) -/* EE88DC 8024232C 8C620000 */ lw $v0, ($v1) -/* EE88E0 80242330 1440FFFB */ bnez $v0, .L80242320 -/* EE88E4 80242334 24A50004 */ addiu $a1, $a1, 4 -/* EE88E8 80242338 00041080 */ sll $v0, $a0, 2 -.L8024233C: -/* EE88EC 8024233C 3C018024 */ lui $at, %hi(D_802453E0_EEB990) -/* EE88F0 80242340 00220821 */ addu $at, $at, $v0 -/* EE88F4 80242344 AC2053E0 */ sw $zero, %lo(D_802453E0_EEB990)($at) -/* EE88F8 80242348 080908DE */ j .L80242378 -/* EE88FC 8024234C 00000000 */ nop -.L80242350: -/* EE8900 80242350 3C038024 */ lui $v1, %hi(D_802453E0_EEB990) -/* EE8904 80242354 246353E0 */ addiu $v1, $v1, %lo(D_802453E0_EEB990) -/* EE8908 80242358 0060282D */ daddu $a1, $v1, $zero -.L8024235C: -/* EE890C 8024235C 24820080 */ addiu $v0, $a0, 0x80 -/* EE8910 80242360 AC620000 */ sw $v0, ($v1) -/* EE8914 80242364 24630004 */ addiu $v1, $v1, 4 -/* EE8918 80242368 24840001 */ addiu $a0, $a0, 1 -/* EE891C 8024236C 2882005B */ slti $v0, $a0, 0x5b -/* EE8920 80242370 1440FFFA */ bnez $v0, .L8024235C -/* EE8924 80242374 ACA0016C */ sw $zero, 0x16c($a1) -.L80242378: -/* EE8928 80242378 8FBF0010 */ lw $ra, 0x10($sp) -/* EE892C 8024237C 24020002 */ addiu $v0, $zero, 2 -/* EE8930 80242380 03E00008 */ jr $ra -/* EE8934 80242384 27BD0018 */ addiu $sp, $sp, 0x18 -/* EE8938 80242388 00000000 */ nop -/* EE893C 8024238C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/EED1E0/func_80240688_EED788.s b/ver/us/asm/nonmatchings/EED1E0/func_80240688_EED788.s index b522315bf7..fcd0c74771 100644 --- a/ver/us/asm/nonmatchings/EED1E0/func_80240688_EED788.s +++ b/ver/us/asm/nonmatchings/EED1E0/func_80240688_EED788.s @@ -4,7 +4,7 @@ glabel func_80240688_EED788 /* EED788 80240688 27BDFFE0 */ addiu $sp, $sp, -0x20 /* EED78C 8024068C AFBF0018 */ sw $ra, 0x18($sp) -/* EED790 80240690 0C00F94D */ jal func_8003E534 +/* EED790 80240690 0C00F94D */ jal dead_get_npc_safe /* EED794 80240694 2404FFFC */ addiu $a0, $zero, -4 /* EED798 80240698 C444003C */ lwc1 $f4, 0x3c($v0) /* EED79C 8024069C 3C014148 */ lui $at, 0x4148 diff --git a/ver/us/asm/nonmatchings/EED1E0/func_802406E0_EED7E0.s b/ver/us/asm/nonmatchings/EED1E0/func_802406E0_EED7E0.s index ecb3190f78..d09602a387 100644 --- a/ver/us/asm/nonmatchings/EED1E0/func_802406E0_EED7E0.s +++ b/ver/us/asm/nonmatchings/EED1E0/func_802406E0_EED7E0.s @@ -17,11 +17,11 @@ glabel func_802406E0_EED7E0 /* EED810 80240710 F7B60050 */ sdc1 $f22, 0x50($sp) /* EED814 80240714 F7B40048 */ sdc1 $f20, 0x48($sp) /* EED818 80240718 8ED3000C */ lw $s3, 0xc($s6) -/* EED81C 8024071C 0C00F94D */ jal func_8003E534 +/* EED81C 8024071C 0C00F94D */ jal dead_get_npc_safe /* EED820 80240720 2404FFFC */ addiu $a0, $zero, -4 /* EED824 80240724 27A50018 */ addiu $a1, $sp, 0x18 -/* EED828 80240728 3C048008 */ lui $a0, %hi(D_8007C760) -/* EED82C 8024072C 8C84C760 */ lw $a0, %lo(D_8007C760)($a0) +/* EED828 80240728 3C048008 */ lui $a0, %hi(dead_gCurrentCameraID) +/* EED82C 8024072C 8C84C760 */ lw $a0, %lo(dead_gCurrentCameraID)($a0) /* EED830 80240730 27A6001C */ addiu $a2, $sp, 0x1c /* EED834 80240734 00041880 */ sll $v1, $a0, 2 /* EED838 80240738 00641821 */ addu $v1, $v1, $a0 @@ -93,7 +93,7 @@ glabel func_802406E0_EED7E0 /* EED938 80240838 4406A000 */ mfc1 $a2, $f20 /* EED93C 8024083C 8E870000 */ lw $a3, ($s4) /* EED940 80240840 02532821 */ addu $a1, $s2, $s3 -/* EED944 80240844 0C00ACA3 */ jal func_8002B28C +/* EED944 80240844 0C00ACA3 */ jal dead_add_vec2D_polar /* EED948 80240848 AFA00020 */ sw $zero, 0x20($sp) /* EED94C 8024084C C7A2001C */ lwc1 $f2, 0x1c($sp) /* EED950 80240850 C7A40020 */ lwc1 $f4, 0x20($sp) @@ -169,7 +169,7 @@ glabel func_802406E0_EED7E0 /* EEDA58 80240958 E6160020 */ swc1 $f22, 0x20($s0) /* EEDA5C 8024095C 8E870000 */ lw $a3, ($s4) /* EEDA60 80240960 02532821 */ addu $a1, $s2, $s3 -/* EEDA64 80240964 0C00ACA3 */ jal func_8002B28C +/* EEDA64 80240964 0C00ACA3 */ jal dead_add_vec2D_polar /* EEDA68 80240968 E7B60020 */ swc1 $f22, 0x20($sp) /* EEDA6C 8024096C C7A4001C */ lwc1 $f4, 0x1c($sp) /* EEDA70 80240970 C7A00020 */ lwc1 $f0, 0x20($sp) @@ -210,7 +210,7 @@ glabel func_802406E0_EED7E0 /* EEDAF4 802409F4 E6160020 */ swc1 $f22, 0x20($s0) /* EEDAF8 802409F8 8E870000 */ lw $a3, ($s4) /* EEDAFC 802409FC 02532821 */ addu $a1, $s2, $s3 -/* EEDB00 80240A00 0C00ACA3 */ jal func_8002B28C +/* EEDB00 80240A00 0C00ACA3 */ jal dead_add_vec2D_polar /* EEDB04 80240A04 E7B60020 */ swc1 $f22, 0x20($sp) /* EEDB08 80240A08 C7A4001C */ lwc1 $f4, 0x1c($sp) /* EEDB0C 80240A0C C7A00020 */ lwc1 $f0, 0x20($sp) diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_802414C8_C621D8.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_802414C8_C621D8.s deleted file mode 100644 index 90f12f8691..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_802414C8_C621D8.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802414C8_C621D8 -/* C621D8 802414C8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C621DC 802414CC AFB10014 */ sw $s1, 0x14($sp) -/* C621E0 802414D0 0080882D */ daddu $s1, $a0, $zero -/* C621E4 802414D4 AFBF0018 */ sw $ra, 0x18($sp) -/* C621E8 802414D8 AFB00010 */ sw $s0, 0x10($sp) -/* C621EC 802414DC 8E300148 */ lw $s0, 0x148($s1) -/* C621F0 802414E0 0C00EABB */ jal get_npc_unsafe -/* C621F4 802414E4 86040008 */ lh $a0, 8($s0) -/* C621F8 802414E8 0040202D */ daddu $a0, $v0, $zero -/* C621FC 802414EC 8482008E */ lh $v0, 0x8e($a0) -/* C62200 802414F0 9483008E */ lhu $v1, 0x8e($a0) -/* C62204 802414F4 18400003 */ blez $v0, .L80241504 -/* C62208 802414F8 2462FFFF */ addiu $v0, $v1, -1 -/* C6220C 802414FC 08090548 */ j .L80241520 -/* C62210 80241500 A482008E */ sh $v0, 0x8e($a0) -.L80241504: -/* C62214 80241504 8E0200CC */ lw $v0, 0xcc($s0) -/* C62218 80241508 AE00006C */ sw $zero, 0x6c($s0) -/* C6221C 8024150C 8C420000 */ lw $v0, ($v0) -/* C62220 80241510 AC820028 */ sw $v0, 0x28($a0) -/* C62224 80241514 24020001 */ addiu $v0, $zero, 1 -/* C62228 80241518 AE200074 */ sw $zero, 0x74($s1) -/* C6222C 8024151C AE220070 */ sw $v0, 0x70($s1) -.L80241520: -/* C62230 80241520 8FBF0018 */ lw $ra, 0x18($sp) -/* C62234 80241524 8FB10014 */ lw $s1, 0x14($sp) -/* C62238 80241528 8FB00010 */ lw $s0, 0x10($sp) -/* C6223C 8024152C 03E00008 */ jr $ra -/* C62240 80241530 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241534_C62244.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241534_C62244.s deleted file mode 100644 index eb0a669efc..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241534_C62244.s +++ /dev/null @@ -1,68 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241534_C62244 -/* C62244 80241534 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C62248 80241538 AFB3003C */ sw $s3, 0x3c($sp) -/* C6224C 8024153C 0080982D */ daddu $s3, $a0, $zero -/* C62250 80241540 AFBF0040 */ sw $ra, 0x40($sp) -/* C62254 80241544 AFB20038 */ sw $s2, 0x38($sp) -/* C62258 80241548 AFB10034 */ sw $s1, 0x34($sp) -/* C6225C 8024154C AFB00030 */ sw $s0, 0x30($sp) -/* C62260 80241550 8E720148 */ lw $s2, 0x148($s3) -/* C62264 80241554 00A0882D */ daddu $s1, $a1, $zero -/* C62268 80241558 86440008 */ lh $a0, 8($s2) -/* C6226C 8024155C 0C00EABB */ jal get_npc_unsafe -/* C62270 80241560 00C0802D */ daddu $s0, $a2, $zero -/* C62274 80241564 0200202D */ daddu $a0, $s0, $zero -/* C62278 80241568 0240282D */ daddu $a1, $s2, $zero -/* C6227C 8024156C AFA00010 */ sw $zero, 0x10($sp) -/* C62280 80241570 8E26000C */ lw $a2, 0xc($s1) -/* C62284 80241574 8E270010 */ lw $a3, 0x10($s1) -/* C62288 80241578 0C01242D */ jal func_800490B4 -/* C6228C 8024157C 0040882D */ daddu $s1, $v0, $zero -/* C62290 80241580 10400024 */ beqz $v0, .L80241614 -/* C62294 80241584 0220202D */ daddu $a0, $s1, $zero -/* C62298 80241588 24050322 */ addiu $a1, $zero, 0x322 -/* C6229C 8024158C 0C012530 */ jal ai_enemy_play_sound -/* C622A0 80241590 0000302D */ daddu $a2, $zero, $zero -/* C622A4 80241594 0000202D */ daddu $a0, $zero, $zero -/* C622A8 80241598 0220282D */ daddu $a1, $s1, $zero -/* C622AC 8024159C 0000302D */ daddu $a2, $zero, $zero -/* C622B0 802415A0 2410000A */ addiu $s0, $zero, 0xa -/* C622B4 802415A4 862300A8 */ lh $v1, 0xa8($s1) -/* C622B8 802415A8 3C013F80 */ lui $at, 0x3f80 -/* C622BC 802415AC 44810000 */ mtc1 $at, $f0 -/* C622C0 802415B0 3C014000 */ lui $at, 0x4000 -/* C622C4 802415B4 44811000 */ mtc1 $at, $f2 -/* C622C8 802415B8 3C01C1A0 */ lui $at, 0xc1a0 -/* C622CC 802415BC 44812000 */ mtc1 $at, $f4 -/* C622D0 802415C0 44833000 */ mtc1 $v1, $f6 -/* C622D4 802415C4 00000000 */ nop -/* C622D8 802415C8 468031A0 */ cvt.s.w $f6, $f6 -/* C622DC 802415CC 44073000 */ mfc1 $a3, $f6 -/* C622E0 802415D0 27A20028 */ addiu $v0, $sp, 0x28 -/* C622E4 802415D4 AFB0001C */ sw $s0, 0x1c($sp) -/* C622E8 802415D8 AFA20020 */ sw $v0, 0x20($sp) -/* C622EC 802415DC E7A00010 */ swc1 $f0, 0x10($sp) -/* C622F0 802415E0 E7A20014 */ swc1 $f2, 0x14($sp) -/* C622F4 802415E4 0C01BFA4 */ jal fx_emote -/* C622F8 802415E8 E7A40018 */ swc1 $f4, 0x18($sp) -/* C622FC 802415EC 0220202D */ daddu $a0, $s1, $zero -/* C62300 802415F0 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C62304 802415F4 0C012530 */ jal ai_enemy_play_sound -/* C62308 802415F8 3C060020 */ lui $a2, 0x20 -/* C6230C 802415FC 8E4200CC */ lw $v0, 0xcc($s2) -/* C62310 80241600 8C420020 */ lw $v0, 0x20($v0) -/* C62314 80241604 AE220028 */ sw $v0, 0x28($s1) -/* C62318 80241608 9642008E */ lhu $v0, 0x8e($s2) -/* C6231C 8024160C A622008E */ sh $v0, 0x8e($s1) -/* C62320 80241610 AE700070 */ sw $s0, 0x70($s3) -.L80241614: -/* C62324 80241614 8FBF0040 */ lw $ra, 0x40($sp) -/* C62328 80241618 8FB3003C */ lw $s3, 0x3c($sp) -/* C6232C 8024161C 8FB20038 */ lw $s2, 0x38($sp) -/* C62330 80241620 8FB10034 */ lw $s1, 0x34($sp) -/* C62334 80241624 8FB00030 */ lw $s0, 0x30($sp) -/* C62338 80241628 03E00008 */ jr $ra -/* C6233C 8024162C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242100_C62E10.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242100_C62E10.s deleted file mode 100644 index 1c9d714797..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242100_C62E10.s +++ /dev/null @@ -1,71 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242100_C62E10 -/* C62E10 80242100 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* C62E14 80242104 AFB10034 */ sw $s1, 0x34($sp) -/* C62E18 80242108 0080882D */ daddu $s1, $a0, $zero -/* C62E1C 8024210C AFBF0038 */ sw $ra, 0x38($sp) -/* C62E20 80242110 AFB00030 */ sw $s0, 0x30($sp) -/* C62E24 80242114 8E300148 */ lw $s0, 0x148($s1) -/* C62E28 80242118 0C00EABB */ jal get_npc_unsafe -/* C62E2C 8024211C 86040008 */ lh $a0, 8($s0) -/* C62E30 80242120 0040282D */ daddu $a1, $v0, $zero -/* C62E34 80242124 94A2008E */ lhu $v0, 0x8e($a1) -/* C62E38 80242128 24420001 */ addiu $v0, $v0, 1 -/* C62E3C 8024212C A4A2008E */ sh $v0, 0x8e($a1) -/* C62E40 80242130 00021400 */ sll $v0, $v0, 0x10 -/* C62E44 80242134 8E0300A0 */ lw $v1, 0xa0($s0) -/* C62E48 80242138 00021403 */ sra $v0, $v0, 0x10 -/* C62E4C 8024213C 14430004 */ bne $v0, $v1, .L80242150 -/* C62E50 80242140 00000000 */ nop -/* C62E54 80242144 8E0200CC */ lw $v0, 0xcc($s0) -/* C62E58 80242148 8C42002C */ lw $v0, 0x2c($v0) -/* C62E5C 8024214C ACA20028 */ sw $v0, 0x28($a1) -.L80242150: -/* C62E60 80242150 84A3008E */ lh $v1, 0x8e($a1) -/* C62E64 80242154 8E0200A4 */ lw $v0, 0xa4($s0) -/* C62E68 80242158 14620002 */ bne $v1, $v0, .L80242164 -/* C62E6C 8024215C 24020003 */ addiu $v0, $zero, 3 -/* C62E70 80242160 AE02006C */ sw $v0, 0x6c($s0) -.L80242164: -/* C62E74 80242164 84A2008E */ lh $v0, 0x8e($a1) -/* C62E78 80242168 8E03009C */ lw $v1, 0x9c($s0) -/* C62E7C 8024216C 0043102A */ slt $v0, $v0, $v1 -/* C62E80 80242170 1440001E */ bnez $v0, .L802421EC -/* C62E84 80242174 24020004 */ addiu $v0, $zero, 4 -/* C62E88 80242178 AE02006C */ sw $v0, 0x6c($s0) -/* C62E8C 8024217C 24020008 */ addiu $v0, $zero, 8 -/* C62E90 80242180 24040003 */ addiu $a0, $zero, 3 -/* C62E94 80242184 A4A2008E */ sh $v0, 0x8e($a1) -/* C62E98 80242188 8E0200CC */ lw $v0, 0xcc($s0) -/* C62E9C 8024218C 84A300A8 */ lh $v1, 0xa8($a1) -/* C62EA0 80242190 3C013F80 */ lui $at, 0x3f80 -/* C62EA4 80242194 44810000 */ mtc1 $at, $f0 -/* C62EA8 80242198 3C014000 */ lui $at, 0x4000 -/* C62EAC 8024219C 44811000 */ mtc1 $at, $f2 -/* C62EB0 802421A0 3C01C1A0 */ lui $at, 0xc1a0 -/* C62EB4 802421A4 44812000 */ mtc1 $at, $f4 -/* C62EB8 802421A8 44833000 */ mtc1 $v1, $f6 -/* C62EBC 802421AC 00000000 */ nop -/* C62EC0 802421B0 468031A0 */ cvt.s.w $f6, $f6 -/* C62EC4 802421B4 8C420000 */ lw $v0, ($v0) -/* C62EC8 802421B8 44073000 */ mfc1 $a3, $f6 -/* C62ECC 802421BC 0000302D */ daddu $a2, $zero, $zero -/* C62ED0 802421C0 ACA20028 */ sw $v0, 0x28($a1) -/* C62ED4 802421C4 2402000A */ addiu $v0, $zero, 0xa -/* C62ED8 802421C8 AFA2001C */ sw $v0, 0x1c($sp) -/* C62EDC 802421CC 27A20028 */ addiu $v0, $sp, 0x28 -/* C62EE0 802421D0 E7A00010 */ swc1 $f0, 0x10($sp) -/* C62EE4 802421D4 E7A20014 */ swc1 $f2, 0x14($sp) -/* C62EE8 802421D8 E7A40018 */ swc1 $f4, 0x18($sp) -/* C62EEC 802421DC 0C01BFA4 */ jal fx_emote -/* C62EF0 802421E0 AFA20020 */ sw $v0, 0x20($sp) -/* C62EF4 802421E4 2402000D */ addiu $v0, $zero, 0xd -/* C62EF8 802421E8 AE220070 */ sw $v0, 0x70($s1) -.L802421EC: -/* C62EFC 802421EC 8FBF0038 */ lw $ra, 0x38($sp) -/* C62F00 802421F0 8FB10034 */ lw $s1, 0x34($sp) -/* C62F04 802421F4 8FB00030 */ lw $s0, 0x30($sp) -/* C62F08 802421F8 03E00008 */ jr $ra -/* C62F0C 802421FC 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_8024234C_C6305C.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_8024234C_C6305C.s index a6f68d6cf6..47d6f0db56 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_8024234C_C6305C.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_8024234C_C6305C.s @@ -99,12 +99,12 @@ glabel func_8024234C_C6305C /* C631C4 802424B4 00000000 */ nop .L802424B8: /* C631C8 802424B8 0260282D */ daddu $a1, $s3, $zero -/* C631CC 802424BC 0C090532 */ jal func_802414C8_C621D8 +/* C631CC 802424BC 0C090532 */ jal kzn_03_UnkNpcAIFunc31 /* C631D0 802424C0 0280302D */ daddu $a2, $s4, $zero .L802424C4: /* C631D4 802424C4 0240202D */ daddu $a0, $s2, $zero /* C631D8 802424C8 0260282D */ daddu $a1, $s3, $zero -/* C631DC 802424CC 0C09054D */ jal func_80241534_C62244 +/* C631DC 802424CC 0C09054D */ jal kzn_03_UnkNpcAIFunc32 /* C631E0 802424D0 0280302D */ daddu $a2, $s4, $zero /* C631E4 802424D4 0809095D */ j .L80242574 /* C631E8 802424D8 00000000 */ nop @@ -127,7 +127,7 @@ glabel func_8024234C_C6305C /* C63224 80242514 0240202D */ daddu $a0, $s2, $zero .L80242518: /* C63228 80242518 0260282D */ daddu $a1, $s3, $zero -/* C6322C 8024251C 0C090840 */ jal func_80242100_C62E10 +/* C6322C 8024251C 0C090840 */ jal kzn_03_UnkNpcAIFunc33 /* C63230 80242520 0280302D */ daddu $a2, $s4, $zero /* C63234 80242524 8E430070 */ lw $v1, 0x70($s2) /* C63238 80242528 2402000D */ addiu $v0, $zero, 0xd diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242E0C_C7428C.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242E0C_C7428C.s deleted file mode 100644 index ec8b82350c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242E0C_C7428C.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242E0C_C7428C -/* C7428C 80242E0C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C74290 80242E10 AFB10014 */ sw $s1, 0x14($sp) -/* C74294 80242E14 0080882D */ daddu $s1, $a0, $zero -/* C74298 80242E18 AFBF0018 */ sw $ra, 0x18($sp) -/* C7429C 80242E1C AFB00010 */ sw $s0, 0x10($sp) -/* C742A0 80242E20 8E300148 */ lw $s0, 0x148($s1) -/* C742A4 80242E24 0C00EABB */ jal get_npc_unsafe -/* C742A8 80242E28 86040008 */ lh $a0, 8($s0) -/* C742AC 80242E2C 0040202D */ daddu $a0, $v0, $zero -/* C742B0 80242E30 8482008E */ lh $v0, 0x8e($a0) -/* C742B4 80242E34 9483008E */ lhu $v1, 0x8e($a0) -/* C742B8 80242E38 18400003 */ blez $v0, .L80242E48 -/* C742BC 80242E3C 2462FFFF */ addiu $v0, $v1, -1 -/* C742C0 80242E40 08090B99 */ j .L80242E64 -/* C742C4 80242E44 A482008E */ sh $v0, 0x8e($a0) -.L80242E48: -/* C742C8 80242E48 8E0200CC */ lw $v0, 0xcc($s0) -/* C742CC 80242E4C AE00006C */ sw $zero, 0x6c($s0) -/* C742D0 80242E50 8C420000 */ lw $v0, ($v0) -/* C742D4 80242E54 AC820028 */ sw $v0, 0x28($a0) -/* C742D8 80242E58 24020001 */ addiu $v0, $zero, 1 -/* C742DC 80242E5C AE200074 */ sw $zero, 0x74($s1) -/* C742E0 80242E60 AE220070 */ sw $v0, 0x70($s1) -.L80242E64: -/* C742E4 80242E64 8FBF0018 */ lw $ra, 0x18($sp) -/* C742E8 80242E68 8FB10014 */ lw $s1, 0x14($sp) -/* C742EC 80242E6C 8FB00010 */ lw $s0, 0x10($sp) -/* C742F0 80242E70 03E00008 */ jr $ra -/* C742F4 80242E74 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242E78_C742F8.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242E78_C742F8.s deleted file mode 100644 index dd5abb7a4c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242E78_C742F8.s +++ /dev/null @@ -1,68 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242E78_C742F8 -/* C742F8 80242E78 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C742FC 80242E7C AFB3003C */ sw $s3, 0x3c($sp) -/* C74300 80242E80 0080982D */ daddu $s3, $a0, $zero -/* C74304 80242E84 AFBF0040 */ sw $ra, 0x40($sp) -/* C74308 80242E88 AFB20038 */ sw $s2, 0x38($sp) -/* C7430C 80242E8C AFB10034 */ sw $s1, 0x34($sp) -/* C74310 80242E90 AFB00030 */ sw $s0, 0x30($sp) -/* C74314 80242E94 8E720148 */ lw $s2, 0x148($s3) -/* C74318 80242E98 00A0882D */ daddu $s1, $a1, $zero -/* C7431C 80242E9C 86440008 */ lh $a0, 8($s2) -/* C74320 80242EA0 0C00EABB */ jal get_npc_unsafe -/* C74324 80242EA4 00C0802D */ daddu $s0, $a2, $zero -/* C74328 80242EA8 0200202D */ daddu $a0, $s0, $zero -/* C7432C 80242EAC 0240282D */ daddu $a1, $s2, $zero -/* C74330 80242EB0 AFA00010 */ sw $zero, 0x10($sp) -/* C74334 80242EB4 8E26000C */ lw $a2, 0xc($s1) -/* C74338 80242EB8 8E270010 */ lw $a3, 0x10($s1) -/* C7433C 80242EBC 0C01242D */ jal func_800490B4 -/* C74340 80242EC0 0040882D */ daddu $s1, $v0, $zero -/* C74344 80242EC4 10400024 */ beqz $v0, .L80242F58 -/* C74348 80242EC8 0220202D */ daddu $a0, $s1, $zero -/* C7434C 80242ECC 24050322 */ addiu $a1, $zero, 0x322 -/* C74350 80242ED0 0C012530 */ jal ai_enemy_play_sound -/* C74354 80242ED4 0000302D */ daddu $a2, $zero, $zero -/* C74358 80242ED8 0000202D */ daddu $a0, $zero, $zero -/* C7435C 80242EDC 0220282D */ daddu $a1, $s1, $zero -/* C74360 80242EE0 0000302D */ daddu $a2, $zero, $zero -/* C74364 80242EE4 2410000A */ addiu $s0, $zero, 0xa -/* C74368 80242EE8 862300A8 */ lh $v1, 0xa8($s1) -/* C7436C 80242EEC 3C013F80 */ lui $at, 0x3f80 -/* C74370 80242EF0 44810000 */ mtc1 $at, $f0 -/* C74374 80242EF4 3C014000 */ lui $at, 0x4000 -/* C74378 80242EF8 44811000 */ mtc1 $at, $f2 -/* C7437C 80242EFC 3C01C1A0 */ lui $at, 0xc1a0 -/* C74380 80242F00 44812000 */ mtc1 $at, $f4 -/* C74384 80242F04 44833000 */ mtc1 $v1, $f6 -/* C74388 80242F08 00000000 */ nop -/* C7438C 80242F0C 468031A0 */ cvt.s.w $f6, $f6 -/* C74390 80242F10 44073000 */ mfc1 $a3, $f6 -/* C74394 80242F14 27A20028 */ addiu $v0, $sp, 0x28 -/* C74398 80242F18 AFB0001C */ sw $s0, 0x1c($sp) -/* C7439C 80242F1C AFA20020 */ sw $v0, 0x20($sp) -/* C743A0 80242F20 E7A00010 */ swc1 $f0, 0x10($sp) -/* C743A4 80242F24 E7A20014 */ swc1 $f2, 0x14($sp) -/* C743A8 80242F28 0C01BFA4 */ jal fx_emote -/* C743AC 80242F2C E7A40018 */ swc1 $f4, 0x18($sp) -/* C743B0 80242F30 0220202D */ daddu $a0, $s1, $zero -/* C743B4 80242F34 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C743B8 80242F38 0C012530 */ jal ai_enemy_play_sound -/* C743BC 80242F3C 3C060020 */ lui $a2, 0x20 -/* C743C0 80242F40 8E4200CC */ lw $v0, 0xcc($s2) -/* C743C4 80242F44 8C420020 */ lw $v0, 0x20($v0) -/* C743C8 80242F48 AE220028 */ sw $v0, 0x28($s1) -/* C743CC 80242F4C 9642008E */ lhu $v0, 0x8e($s2) -/* C743D0 80242F50 A622008E */ sh $v0, 0x8e($s1) -/* C743D4 80242F54 AE700070 */ sw $s0, 0x70($s3) -.L80242F58: -/* C743D8 80242F58 8FBF0040 */ lw $ra, 0x40($sp) -/* C743DC 80242F5C 8FB3003C */ lw $s3, 0x3c($sp) -/* C743E0 80242F60 8FB20038 */ lw $s2, 0x38($sp) -/* C743E4 80242F64 8FB10034 */ lw $s1, 0x34($sp) -/* C743E8 80242F68 8FB00030 */ lw $s0, 0x30($sp) -/* C743EC 80242F6C 03E00008 */ jr $ra -/* C743F0 80242F70 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243A44_C74EC4.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243A44_C74EC4.s deleted file mode 100644 index bf74ee6c71..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243A44_C74EC4.s +++ /dev/null @@ -1,71 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243A44_C74EC4 -/* C74EC4 80243A44 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* C74EC8 80243A48 AFB10034 */ sw $s1, 0x34($sp) -/* C74ECC 80243A4C 0080882D */ daddu $s1, $a0, $zero -/* C74ED0 80243A50 AFBF0038 */ sw $ra, 0x38($sp) -/* C74ED4 80243A54 AFB00030 */ sw $s0, 0x30($sp) -/* C74ED8 80243A58 8E300148 */ lw $s0, 0x148($s1) -/* C74EDC 80243A5C 0C00EABB */ jal get_npc_unsafe -/* C74EE0 80243A60 86040008 */ lh $a0, 8($s0) -/* C74EE4 80243A64 0040282D */ daddu $a1, $v0, $zero -/* C74EE8 80243A68 94A2008E */ lhu $v0, 0x8e($a1) -/* C74EEC 80243A6C 24420001 */ addiu $v0, $v0, 1 -/* C74EF0 80243A70 A4A2008E */ sh $v0, 0x8e($a1) -/* C74EF4 80243A74 00021400 */ sll $v0, $v0, 0x10 -/* C74EF8 80243A78 8E0300A0 */ lw $v1, 0xa0($s0) -/* C74EFC 80243A7C 00021403 */ sra $v0, $v0, 0x10 -/* C74F00 80243A80 14430004 */ bne $v0, $v1, .L80243A94 -/* C74F04 80243A84 00000000 */ nop -/* C74F08 80243A88 8E0200CC */ lw $v0, 0xcc($s0) -/* C74F0C 80243A8C 8C42002C */ lw $v0, 0x2c($v0) -/* C74F10 80243A90 ACA20028 */ sw $v0, 0x28($a1) -.L80243A94: -/* C74F14 80243A94 84A3008E */ lh $v1, 0x8e($a1) -/* C74F18 80243A98 8E0200A4 */ lw $v0, 0xa4($s0) -/* C74F1C 80243A9C 14620002 */ bne $v1, $v0, .L80243AA8 -/* C74F20 80243AA0 24020003 */ addiu $v0, $zero, 3 -/* C74F24 80243AA4 AE02006C */ sw $v0, 0x6c($s0) -.L80243AA8: -/* C74F28 80243AA8 84A2008E */ lh $v0, 0x8e($a1) -/* C74F2C 80243AAC 8E03009C */ lw $v1, 0x9c($s0) -/* C74F30 80243AB0 0043102A */ slt $v0, $v0, $v1 -/* C74F34 80243AB4 1440001E */ bnez $v0, .L80243B30 -/* C74F38 80243AB8 24020004 */ addiu $v0, $zero, 4 -/* C74F3C 80243ABC AE02006C */ sw $v0, 0x6c($s0) -/* C74F40 80243AC0 24020008 */ addiu $v0, $zero, 8 -/* C74F44 80243AC4 24040003 */ addiu $a0, $zero, 3 -/* C74F48 80243AC8 A4A2008E */ sh $v0, 0x8e($a1) -/* C74F4C 80243ACC 8E0200CC */ lw $v0, 0xcc($s0) -/* C74F50 80243AD0 84A300A8 */ lh $v1, 0xa8($a1) -/* C74F54 80243AD4 3C013F80 */ lui $at, 0x3f80 -/* C74F58 80243AD8 44810000 */ mtc1 $at, $f0 -/* C74F5C 80243ADC 3C014000 */ lui $at, 0x4000 -/* C74F60 80243AE0 44811000 */ mtc1 $at, $f2 -/* C74F64 80243AE4 3C01C1A0 */ lui $at, 0xc1a0 -/* C74F68 80243AE8 44812000 */ mtc1 $at, $f4 -/* C74F6C 80243AEC 44833000 */ mtc1 $v1, $f6 -/* C74F70 80243AF0 00000000 */ nop -/* C74F74 80243AF4 468031A0 */ cvt.s.w $f6, $f6 -/* C74F78 80243AF8 8C420000 */ lw $v0, ($v0) -/* C74F7C 80243AFC 44073000 */ mfc1 $a3, $f6 -/* C74F80 80243B00 0000302D */ daddu $a2, $zero, $zero -/* C74F84 80243B04 ACA20028 */ sw $v0, 0x28($a1) -/* C74F88 80243B08 2402000A */ addiu $v0, $zero, 0xa -/* C74F8C 80243B0C AFA2001C */ sw $v0, 0x1c($sp) -/* C74F90 80243B10 27A20028 */ addiu $v0, $sp, 0x28 -/* C74F94 80243B14 E7A00010 */ swc1 $f0, 0x10($sp) -/* C74F98 80243B18 E7A20014 */ swc1 $f2, 0x14($sp) -/* C74F9C 80243B1C E7A40018 */ swc1 $f4, 0x18($sp) -/* C74FA0 80243B20 0C01BFA4 */ jal fx_emote -/* C74FA4 80243B24 AFA20020 */ sw $v0, 0x20($sp) -/* C74FA8 80243B28 2402000D */ addiu $v0, $zero, 0xd -/* C74FAC 80243B2C AE220070 */ sw $v0, 0x70($s1) -.L80243B30: -/* C74FB0 80243B30 8FBF0038 */ lw $ra, 0x38($sp) -/* C74FB4 80243B34 8FB10034 */ lw $s1, 0x34($sp) -/* C74FB8 80243B38 8FB00030 */ lw $s0, 0x30($sp) -/* C74FBC 80243B3C 03E00008 */ jr $ra -/* C74FC0 80243B40 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243C90_C75110.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243C90_C75110.s index 4071106747..3e270875b7 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243C90_C75110.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243C90_C75110.s @@ -99,12 +99,12 @@ glabel func_80243C90_C75110 /* C75278 80243DF8 00000000 */ nop .L80243DFC: /* C7527C 80243DFC 0260282D */ daddu $a1, $s3, $zero -/* C75280 80243E00 0C090B83 */ jal func_80242E0C_C7428C +/* C75280 80243E00 0C090B83 */ jal kzn_08_UnkNpcAIFunc31 /* C75284 80243E04 0280302D */ daddu $a2, $s4, $zero .L80243E08: /* C75288 80243E08 0240202D */ daddu $a0, $s2, $zero /* C7528C 80243E0C 0260282D */ daddu $a1, $s3, $zero -/* C75290 80243E10 0C090B9E */ jal func_80242E78_C742F8 +/* C75290 80243E10 0C090B9E */ jal kzn_08_UnkNpcAIFunc32 /* C75294 80243E14 0280302D */ daddu $a2, $s4, $zero /* C75298 80243E18 08090FAE */ j .L80243EB8 /* C7529C 80243E1C 00000000 */ nop @@ -127,7 +127,7 @@ glabel func_80243C90_C75110 /* C752D8 80243E58 0240202D */ daddu $a0, $s2, $zero .L80243E5C: /* C752DC 80243E5C 0260282D */ daddu $a1, $s3, $zero -/* C752E0 80243E60 0C090E91 */ jal func_80243A44_C74EC4 +/* C752E0 80243E60 0C090E91 */ jal kzn_08_UnkNpcAIFunc33 /* C752E4 80243E64 0280302D */ daddu $a2, $s4, $zero /* C752E8 80243E68 8E430070 */ lw $v1, 0x70($s2) /* C752EC 80243E6C 2402000D */ addiu $v0, $zero, 0xd diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802418F0_C785D0.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802418F0_C785D0.s deleted file mode 100644 index d36b0144ef..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802418F0_C785D0.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802418F0_C785D0 -/* C785D0 802418F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C785D4 802418F4 AFB10014 */ sw $s1, 0x14($sp) -/* C785D8 802418F8 0080882D */ daddu $s1, $a0, $zero -/* C785DC 802418FC AFBF0018 */ sw $ra, 0x18($sp) -/* C785E0 80241900 AFB00010 */ sw $s0, 0x10($sp) -/* C785E4 80241904 8E300148 */ lw $s0, 0x148($s1) -/* C785E8 80241908 0C00EABB */ jal get_npc_unsafe -/* C785EC 8024190C 86040008 */ lh $a0, 8($s0) -/* C785F0 80241910 0040202D */ daddu $a0, $v0, $zero -/* C785F4 80241914 8482008E */ lh $v0, 0x8e($a0) -/* C785F8 80241918 9483008E */ lhu $v1, 0x8e($a0) -/* C785FC 8024191C 18400003 */ blez $v0, .L8024192C -/* C78600 80241920 2462FFFF */ addiu $v0, $v1, -1 -/* C78604 80241924 08090652 */ j .L80241948 -/* C78608 80241928 A482008E */ sh $v0, 0x8e($a0) -.L8024192C: -/* C7860C 8024192C 8E0200CC */ lw $v0, 0xcc($s0) -/* C78610 80241930 AE00006C */ sw $zero, 0x6c($s0) -/* C78614 80241934 8C420000 */ lw $v0, ($v0) -/* C78618 80241938 AC820028 */ sw $v0, 0x28($a0) -/* C7861C 8024193C 24020001 */ addiu $v0, $zero, 1 -/* C78620 80241940 AE200074 */ sw $zero, 0x74($s1) -/* C78624 80241944 AE220070 */ sw $v0, 0x70($s1) -.L80241948: -/* C78628 80241948 8FBF0018 */ lw $ra, 0x18($sp) -/* C7862C 8024194C 8FB10014 */ lw $s1, 0x14($sp) -/* C78630 80241950 8FB00010 */ lw $s0, 0x10($sp) -/* C78634 80241954 03E00008 */ jr $ra -/* C78638 80241958 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024195C_C7863C.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024195C_C7863C.s deleted file mode 100644 index a89d4a18ee..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024195C_C7863C.s +++ /dev/null @@ -1,68 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024195C_C7863C -/* C7863C 8024195C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C78640 80241960 AFB3003C */ sw $s3, 0x3c($sp) -/* C78644 80241964 0080982D */ daddu $s3, $a0, $zero -/* C78648 80241968 AFBF0040 */ sw $ra, 0x40($sp) -/* C7864C 8024196C AFB20038 */ sw $s2, 0x38($sp) -/* C78650 80241970 AFB10034 */ sw $s1, 0x34($sp) -/* C78654 80241974 AFB00030 */ sw $s0, 0x30($sp) -/* C78658 80241978 8E720148 */ lw $s2, 0x148($s3) -/* C7865C 8024197C 00A0882D */ daddu $s1, $a1, $zero -/* C78660 80241980 86440008 */ lh $a0, 8($s2) -/* C78664 80241984 0C00EABB */ jal get_npc_unsafe -/* C78668 80241988 00C0802D */ daddu $s0, $a2, $zero -/* C7866C 8024198C 0200202D */ daddu $a0, $s0, $zero -/* C78670 80241990 0240282D */ daddu $a1, $s2, $zero -/* C78674 80241994 AFA00010 */ sw $zero, 0x10($sp) -/* C78678 80241998 8E26000C */ lw $a2, 0xc($s1) -/* C7867C 8024199C 8E270010 */ lw $a3, 0x10($s1) -/* C78680 802419A0 0C01242D */ jal func_800490B4 -/* C78684 802419A4 0040882D */ daddu $s1, $v0, $zero -/* C78688 802419A8 10400024 */ beqz $v0, .L80241A3C -/* C7868C 802419AC 0220202D */ daddu $a0, $s1, $zero -/* C78690 802419B0 24050322 */ addiu $a1, $zero, 0x322 -/* C78694 802419B4 0C012530 */ jal ai_enemy_play_sound -/* C78698 802419B8 0000302D */ daddu $a2, $zero, $zero -/* C7869C 802419BC 0000202D */ daddu $a0, $zero, $zero -/* C786A0 802419C0 0220282D */ daddu $a1, $s1, $zero -/* C786A4 802419C4 0000302D */ daddu $a2, $zero, $zero -/* C786A8 802419C8 2410000A */ addiu $s0, $zero, 0xa -/* C786AC 802419CC 862300A8 */ lh $v1, 0xa8($s1) -/* C786B0 802419D0 3C013F80 */ lui $at, 0x3f80 -/* C786B4 802419D4 44810000 */ mtc1 $at, $f0 -/* C786B8 802419D8 3C014000 */ lui $at, 0x4000 -/* C786BC 802419DC 44811000 */ mtc1 $at, $f2 -/* C786C0 802419E0 3C01C1A0 */ lui $at, 0xc1a0 -/* C786C4 802419E4 44812000 */ mtc1 $at, $f4 -/* C786C8 802419E8 44833000 */ mtc1 $v1, $f6 -/* C786CC 802419EC 00000000 */ nop -/* C786D0 802419F0 468031A0 */ cvt.s.w $f6, $f6 -/* C786D4 802419F4 44073000 */ mfc1 $a3, $f6 -/* C786D8 802419F8 27A20028 */ addiu $v0, $sp, 0x28 -/* C786DC 802419FC AFB0001C */ sw $s0, 0x1c($sp) -/* C786E0 80241A00 AFA20020 */ sw $v0, 0x20($sp) -/* C786E4 80241A04 E7A00010 */ swc1 $f0, 0x10($sp) -/* C786E8 80241A08 E7A20014 */ swc1 $f2, 0x14($sp) -/* C786EC 80241A0C 0C01BFA4 */ jal fx_emote -/* C786F0 80241A10 E7A40018 */ swc1 $f4, 0x18($sp) -/* C786F4 80241A14 0220202D */ daddu $a0, $s1, $zero -/* C786F8 80241A18 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C786FC 80241A1C 0C012530 */ jal ai_enemy_play_sound -/* C78700 80241A20 3C060020 */ lui $a2, 0x20 -/* C78704 80241A24 8E4200CC */ lw $v0, 0xcc($s2) -/* C78708 80241A28 8C420020 */ lw $v0, 0x20($v0) -/* C7870C 80241A2C AE220028 */ sw $v0, 0x28($s1) -/* C78710 80241A30 9642008E */ lhu $v0, 0x8e($s2) -/* C78714 80241A34 A622008E */ sh $v0, 0x8e($s1) -/* C78718 80241A38 AE700070 */ sw $s0, 0x70($s3) -.L80241A3C: -/* C7871C 80241A3C 8FBF0040 */ lw $ra, 0x40($sp) -/* C78720 80241A40 8FB3003C */ lw $s3, 0x3c($sp) -/* C78724 80241A44 8FB20038 */ lw $s2, 0x38($sp) -/* C78728 80241A48 8FB10034 */ lw $s1, 0x34($sp) -/* C7872C 80241A4C 8FB00030 */ lw $s0, 0x30($sp) -/* C78730 80241A50 03E00008 */ jr $ra -/* C78734 80241A54 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242528_C79208.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242528_C79208.s deleted file mode 100644 index 0cd6c0f268..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242528_C79208.s +++ /dev/null @@ -1,71 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242528_C79208 -/* C79208 80242528 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* C7920C 8024252C AFB10034 */ sw $s1, 0x34($sp) -/* C79210 80242530 0080882D */ daddu $s1, $a0, $zero -/* C79214 80242534 AFBF0038 */ sw $ra, 0x38($sp) -/* C79218 80242538 AFB00030 */ sw $s0, 0x30($sp) -/* C7921C 8024253C 8E300148 */ lw $s0, 0x148($s1) -/* C79220 80242540 0C00EABB */ jal get_npc_unsafe -/* C79224 80242544 86040008 */ lh $a0, 8($s0) -/* C79228 80242548 0040282D */ daddu $a1, $v0, $zero -/* C7922C 8024254C 94A2008E */ lhu $v0, 0x8e($a1) -/* C79230 80242550 24420001 */ addiu $v0, $v0, 1 -/* C79234 80242554 A4A2008E */ sh $v0, 0x8e($a1) -/* C79238 80242558 00021400 */ sll $v0, $v0, 0x10 -/* C7923C 8024255C 8E0300A0 */ lw $v1, 0xa0($s0) -/* C79240 80242560 00021403 */ sra $v0, $v0, 0x10 -/* C79244 80242564 14430004 */ bne $v0, $v1, .L80242578 -/* C79248 80242568 00000000 */ nop -/* C7924C 8024256C 8E0200CC */ lw $v0, 0xcc($s0) -/* C79250 80242570 8C42002C */ lw $v0, 0x2c($v0) -/* C79254 80242574 ACA20028 */ sw $v0, 0x28($a1) -.L80242578: -/* C79258 80242578 84A3008E */ lh $v1, 0x8e($a1) -/* C7925C 8024257C 8E0200A4 */ lw $v0, 0xa4($s0) -/* C79260 80242580 14620002 */ bne $v1, $v0, .L8024258C -/* C79264 80242584 24020003 */ addiu $v0, $zero, 3 -/* C79268 80242588 AE02006C */ sw $v0, 0x6c($s0) -.L8024258C: -/* C7926C 8024258C 84A2008E */ lh $v0, 0x8e($a1) -/* C79270 80242590 8E03009C */ lw $v1, 0x9c($s0) -/* C79274 80242594 0043102A */ slt $v0, $v0, $v1 -/* C79278 80242598 1440001E */ bnez $v0, .L80242614 -/* C7927C 8024259C 24020004 */ addiu $v0, $zero, 4 -/* C79280 802425A0 AE02006C */ sw $v0, 0x6c($s0) -/* C79284 802425A4 24020008 */ addiu $v0, $zero, 8 -/* C79288 802425A8 24040003 */ addiu $a0, $zero, 3 -/* C7928C 802425AC A4A2008E */ sh $v0, 0x8e($a1) -/* C79290 802425B0 8E0200CC */ lw $v0, 0xcc($s0) -/* C79294 802425B4 84A300A8 */ lh $v1, 0xa8($a1) -/* C79298 802425B8 3C013F80 */ lui $at, 0x3f80 -/* C7929C 802425BC 44810000 */ mtc1 $at, $f0 -/* C792A0 802425C0 3C014000 */ lui $at, 0x4000 -/* C792A4 802425C4 44811000 */ mtc1 $at, $f2 -/* C792A8 802425C8 3C01C1A0 */ lui $at, 0xc1a0 -/* C792AC 802425CC 44812000 */ mtc1 $at, $f4 -/* C792B0 802425D0 44833000 */ mtc1 $v1, $f6 -/* C792B4 802425D4 00000000 */ nop -/* C792B8 802425D8 468031A0 */ cvt.s.w $f6, $f6 -/* C792BC 802425DC 8C420000 */ lw $v0, ($v0) -/* C792C0 802425E0 44073000 */ mfc1 $a3, $f6 -/* C792C4 802425E4 0000302D */ daddu $a2, $zero, $zero -/* C792C8 802425E8 ACA20028 */ sw $v0, 0x28($a1) -/* C792CC 802425EC 2402000A */ addiu $v0, $zero, 0xa -/* C792D0 802425F0 AFA2001C */ sw $v0, 0x1c($sp) -/* C792D4 802425F4 27A20028 */ addiu $v0, $sp, 0x28 -/* C792D8 802425F8 E7A00010 */ swc1 $f0, 0x10($sp) -/* C792DC 802425FC E7A20014 */ swc1 $f2, 0x14($sp) -/* C792E0 80242600 E7A40018 */ swc1 $f4, 0x18($sp) -/* C792E4 80242604 0C01BFA4 */ jal fx_emote -/* C792E8 80242608 AFA20020 */ sw $v0, 0x20($sp) -/* C792EC 8024260C 2402000D */ addiu $v0, $zero, 0xd -/* C792F0 80242610 AE220070 */ sw $v0, 0x70($s1) -.L80242614: -/* C792F4 80242614 8FBF0038 */ lw $ra, 0x38($sp) -/* C792F8 80242618 8FB10034 */ lw $s1, 0x34($sp) -/* C792FC 8024261C 8FB00030 */ lw $s0, 0x30($sp) -/* C79300 80242620 03E00008 */ jr $ra -/* C79304 80242624 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242774_C79454.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242774_C79454.s index 2c37d56c46..8ddd5f9289 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242774_C79454.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242774_C79454.s @@ -99,12 +99,12 @@ glabel func_80242774_C79454 /* C795BC 802428DC 00000000 */ nop .L802428E0: /* C795C0 802428E0 0260282D */ daddu $a1, $s3, $zero -/* C795C4 802428E4 0C09063C */ jal func_802418F0_C785D0 +/* C795C4 802428E4 0C09063C */ jal kzn_09_UnkNpcAIFunc31 /* C795C8 802428E8 0280302D */ daddu $a2, $s4, $zero .L802428EC: /* C795CC 802428EC 0240202D */ daddu $a0, $s2, $zero /* C795D0 802428F0 0260282D */ daddu $a1, $s3, $zero -/* C795D4 802428F4 0C090657 */ jal func_8024195C_C7863C +/* C795D4 802428F4 0C090657 */ jal kzn_09_UnkNpcAIFunc32 /* C795D8 802428F8 0280302D */ daddu $a2, $s4, $zero /* C795DC 802428FC 08090A67 */ j .L8024299C /* C795E0 80242900 00000000 */ nop @@ -127,7 +127,7 @@ glabel func_80242774_C79454 /* C7961C 8024293C 0240202D */ daddu $a0, $s2, $zero .L80242940: /* C79620 80242940 0260282D */ daddu $a1, $s3, $zero -/* C79624 80242944 0C09094A */ jal func_80242528_C79208 +/* C79624 80242944 0C09094A */ jal kzn_09_UnkNpcAIFunc33 /* C79628 80242948 0280302D */ daddu $a2, $s4, $zero /* C7962C 8024294C 8E430070 */ lw $v1, 0x70($s2) /* C79630 80242950 2402000D */ addiu $v0, $zero, 0xd diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80240BE0_C86690.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80240BE0_C86690.s deleted file mode 100644 index 03e26e7d6d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80240BE0_C86690.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BE0_C86690 -/* C86690 80240BE0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C86694 80240BE4 AFB10014 */ sw $s1, 0x14($sp) -/* C86698 80240BE8 0080882D */ daddu $s1, $a0, $zero -/* C8669C 80240BEC AFBF0018 */ sw $ra, 0x18($sp) -/* C866A0 80240BF0 AFB00010 */ sw $s0, 0x10($sp) -/* C866A4 80240BF4 8E300148 */ lw $s0, 0x148($s1) -/* C866A8 80240BF8 0C00EABB */ jal get_npc_unsafe -/* C866AC 80240BFC 86040008 */ lh $a0, 8($s0) -/* C866B0 80240C00 0040202D */ daddu $a0, $v0, $zero -/* C866B4 80240C04 8482008E */ lh $v0, 0x8e($a0) -/* C866B8 80240C08 9483008E */ lhu $v1, 0x8e($a0) -/* C866BC 80240C0C 18400003 */ blez $v0, .L80240C1C -/* C866C0 80240C10 2462FFFF */ addiu $v0, $v1, -1 -/* C866C4 80240C14 0809030E */ j .L80240C38 -/* C866C8 80240C18 A482008E */ sh $v0, 0x8e($a0) -.L80240C1C: -/* C866CC 80240C1C 8E0200CC */ lw $v0, 0xcc($s0) -/* C866D0 80240C20 AE00006C */ sw $zero, 0x6c($s0) -/* C866D4 80240C24 8C420000 */ lw $v0, ($v0) -/* C866D8 80240C28 AC820028 */ sw $v0, 0x28($a0) -/* C866DC 80240C2C 24020001 */ addiu $v0, $zero, 1 -/* C866E0 80240C30 AE200074 */ sw $zero, 0x74($s1) -/* C866E4 80240C34 AE220070 */ sw $v0, 0x70($s1) -.L80240C38: -/* C866E8 80240C38 8FBF0018 */ lw $ra, 0x18($sp) -/* C866EC 80240C3C 8FB10014 */ lw $s1, 0x14($sp) -/* C866F0 80240C40 8FB00010 */ lw $s0, 0x10($sp) -/* C866F4 80240C44 03E00008 */ jr $ra -/* C866F8 80240C48 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80240C4C_C866FC.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80240C4C_C866FC.s deleted file mode 100644 index 6ba36b3657..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80240C4C_C866FC.s +++ /dev/null @@ -1,68 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C4C_C866FC -/* C866FC 80240C4C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C86700 80240C50 AFB3003C */ sw $s3, 0x3c($sp) -/* C86704 80240C54 0080982D */ daddu $s3, $a0, $zero -/* C86708 80240C58 AFBF0040 */ sw $ra, 0x40($sp) -/* C8670C 80240C5C AFB20038 */ sw $s2, 0x38($sp) -/* C86710 80240C60 AFB10034 */ sw $s1, 0x34($sp) -/* C86714 80240C64 AFB00030 */ sw $s0, 0x30($sp) -/* C86718 80240C68 8E720148 */ lw $s2, 0x148($s3) -/* C8671C 80240C6C 00A0882D */ daddu $s1, $a1, $zero -/* C86720 80240C70 86440008 */ lh $a0, 8($s2) -/* C86724 80240C74 0C00EABB */ jal get_npc_unsafe -/* C86728 80240C78 00C0802D */ daddu $s0, $a2, $zero -/* C8672C 80240C7C 0200202D */ daddu $a0, $s0, $zero -/* C86730 80240C80 0240282D */ daddu $a1, $s2, $zero -/* C86734 80240C84 AFA00010 */ sw $zero, 0x10($sp) -/* C86738 80240C88 8E26000C */ lw $a2, 0xc($s1) -/* C8673C 80240C8C 8E270010 */ lw $a3, 0x10($s1) -/* C86740 80240C90 0C01242D */ jal func_800490B4 -/* C86744 80240C94 0040882D */ daddu $s1, $v0, $zero -/* C86748 80240C98 10400024 */ beqz $v0, .L80240D2C -/* C8674C 80240C9C 0220202D */ daddu $a0, $s1, $zero -/* C86750 80240CA0 24050322 */ addiu $a1, $zero, 0x322 -/* C86754 80240CA4 0C012530 */ jal ai_enemy_play_sound -/* C86758 80240CA8 0000302D */ daddu $a2, $zero, $zero -/* C8675C 80240CAC 0000202D */ daddu $a0, $zero, $zero -/* C86760 80240CB0 0220282D */ daddu $a1, $s1, $zero -/* C86764 80240CB4 0000302D */ daddu $a2, $zero, $zero -/* C86768 80240CB8 2410000A */ addiu $s0, $zero, 0xa -/* C8676C 80240CBC 862300A8 */ lh $v1, 0xa8($s1) -/* C86770 80240CC0 3C013F80 */ lui $at, 0x3f80 -/* C86774 80240CC4 44810000 */ mtc1 $at, $f0 -/* C86778 80240CC8 3C014000 */ lui $at, 0x4000 -/* C8677C 80240CCC 44811000 */ mtc1 $at, $f2 -/* C86780 80240CD0 3C01C1A0 */ lui $at, 0xc1a0 -/* C86784 80240CD4 44812000 */ mtc1 $at, $f4 -/* C86788 80240CD8 44833000 */ mtc1 $v1, $f6 -/* C8678C 80240CDC 00000000 */ nop -/* C86790 80240CE0 468031A0 */ cvt.s.w $f6, $f6 -/* C86794 80240CE4 44073000 */ mfc1 $a3, $f6 -/* C86798 80240CE8 27A20028 */ addiu $v0, $sp, 0x28 -/* C8679C 80240CEC AFB0001C */ sw $s0, 0x1c($sp) -/* C867A0 80240CF0 AFA20020 */ sw $v0, 0x20($sp) -/* C867A4 80240CF4 E7A00010 */ swc1 $f0, 0x10($sp) -/* C867A8 80240CF8 E7A20014 */ swc1 $f2, 0x14($sp) -/* C867AC 80240CFC 0C01BFA4 */ jal fx_emote -/* C867B0 80240D00 E7A40018 */ swc1 $f4, 0x18($sp) -/* C867B4 80240D04 0220202D */ daddu $a0, $s1, $zero -/* C867B8 80240D08 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C867BC 80240D0C 0C012530 */ jal ai_enemy_play_sound -/* C867C0 80240D10 3C060020 */ lui $a2, 0x20 -/* C867C4 80240D14 8E4200CC */ lw $v0, 0xcc($s2) -/* C867C8 80240D18 8C420020 */ lw $v0, 0x20($v0) -/* C867CC 80240D1C AE220028 */ sw $v0, 0x28($s1) -/* C867D0 80240D20 9642008E */ lhu $v0, 0x8e($s2) -/* C867D4 80240D24 A622008E */ sh $v0, 0x8e($s1) -/* C867D8 80240D28 AE700070 */ sw $s0, 0x70($s3) -.L80240D2C: -/* C867DC 80240D2C 8FBF0040 */ lw $ra, 0x40($sp) -/* C867E0 80240D30 8FB3003C */ lw $s3, 0x3c($sp) -/* C867E4 80240D34 8FB20038 */ lw $s2, 0x38($sp) -/* C867E8 80240D38 8FB10034 */ lw $s1, 0x34($sp) -/* C867EC 80240D3C 8FB00030 */ lw $s0, 0x30($sp) -/* C867F0 80240D40 03E00008 */ jr $ra -/* C867F4 80240D44 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241818_C872C8.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241818_C872C8.s deleted file mode 100644 index 5c207ef66b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241818_C872C8.s +++ /dev/null @@ -1,71 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241818_C872C8 -/* C872C8 80241818 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* C872CC 8024181C AFB10034 */ sw $s1, 0x34($sp) -/* C872D0 80241820 0080882D */ daddu $s1, $a0, $zero -/* C872D4 80241824 AFBF0038 */ sw $ra, 0x38($sp) -/* C872D8 80241828 AFB00030 */ sw $s0, 0x30($sp) -/* C872DC 8024182C 8E300148 */ lw $s0, 0x148($s1) -/* C872E0 80241830 0C00EABB */ jal get_npc_unsafe -/* C872E4 80241834 86040008 */ lh $a0, 8($s0) -/* C872E8 80241838 0040282D */ daddu $a1, $v0, $zero -/* C872EC 8024183C 94A2008E */ lhu $v0, 0x8e($a1) -/* C872F0 80241840 24420001 */ addiu $v0, $v0, 1 -/* C872F4 80241844 A4A2008E */ sh $v0, 0x8e($a1) -/* C872F8 80241848 00021400 */ sll $v0, $v0, 0x10 -/* C872FC 8024184C 8E0300A0 */ lw $v1, 0xa0($s0) -/* C87300 80241850 00021403 */ sra $v0, $v0, 0x10 -/* C87304 80241854 14430004 */ bne $v0, $v1, .L80241868 -/* C87308 80241858 00000000 */ nop -/* C8730C 8024185C 8E0200CC */ lw $v0, 0xcc($s0) -/* C87310 80241860 8C42002C */ lw $v0, 0x2c($v0) -/* C87314 80241864 ACA20028 */ sw $v0, 0x28($a1) -.L80241868: -/* C87318 80241868 84A3008E */ lh $v1, 0x8e($a1) -/* C8731C 8024186C 8E0200A4 */ lw $v0, 0xa4($s0) -/* C87320 80241870 14620002 */ bne $v1, $v0, .L8024187C -/* C87324 80241874 24020003 */ addiu $v0, $zero, 3 -/* C87328 80241878 AE02006C */ sw $v0, 0x6c($s0) -.L8024187C: -/* C8732C 8024187C 84A2008E */ lh $v0, 0x8e($a1) -/* C87330 80241880 8E03009C */ lw $v1, 0x9c($s0) -/* C87334 80241884 0043102A */ slt $v0, $v0, $v1 -/* C87338 80241888 1440001E */ bnez $v0, .L80241904 -/* C8733C 8024188C 24020004 */ addiu $v0, $zero, 4 -/* C87340 80241890 AE02006C */ sw $v0, 0x6c($s0) -/* C87344 80241894 24020008 */ addiu $v0, $zero, 8 -/* C87348 80241898 24040003 */ addiu $a0, $zero, 3 -/* C8734C 8024189C A4A2008E */ sh $v0, 0x8e($a1) -/* C87350 802418A0 8E0200CC */ lw $v0, 0xcc($s0) -/* C87354 802418A4 84A300A8 */ lh $v1, 0xa8($a1) -/* C87358 802418A8 3C013F80 */ lui $at, 0x3f80 -/* C8735C 802418AC 44810000 */ mtc1 $at, $f0 -/* C87360 802418B0 3C014000 */ lui $at, 0x4000 -/* C87364 802418B4 44811000 */ mtc1 $at, $f2 -/* C87368 802418B8 3C01C1A0 */ lui $at, 0xc1a0 -/* C8736C 802418BC 44812000 */ mtc1 $at, $f4 -/* C87370 802418C0 44833000 */ mtc1 $v1, $f6 -/* C87374 802418C4 00000000 */ nop -/* C87378 802418C8 468031A0 */ cvt.s.w $f6, $f6 -/* C8737C 802418CC 8C420000 */ lw $v0, ($v0) -/* C87380 802418D0 44073000 */ mfc1 $a3, $f6 -/* C87384 802418D4 0000302D */ daddu $a2, $zero, $zero -/* C87388 802418D8 ACA20028 */ sw $v0, 0x28($a1) -/* C8738C 802418DC 2402000A */ addiu $v0, $zero, 0xa -/* C87390 802418E0 AFA2001C */ sw $v0, 0x1c($sp) -/* C87394 802418E4 27A20028 */ addiu $v0, $sp, 0x28 -/* C87398 802418E8 E7A00010 */ swc1 $f0, 0x10($sp) -/* C8739C 802418EC E7A20014 */ swc1 $f2, 0x14($sp) -/* C873A0 802418F0 E7A40018 */ swc1 $f4, 0x18($sp) -/* C873A4 802418F4 0C01BFA4 */ jal fx_emote -/* C873A8 802418F8 AFA20020 */ sw $v0, 0x20($sp) -/* C873AC 802418FC 2402000D */ addiu $v0, $zero, 0xd -/* C873B0 80241900 AE220070 */ sw $v0, 0x70($s1) -.L80241904: -/* C873B4 80241904 8FBF0038 */ lw $ra, 0x38($sp) -/* C873B8 80241908 8FB10034 */ lw $s1, 0x34($sp) -/* C873BC 8024190C 8FB00030 */ lw $s0, 0x30($sp) -/* C873C0 80241910 03E00008 */ jr $ra -/* C873C4 80241914 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241A64_C87514.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241A64_C87514.s index 6323f499d9..943c6db395 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241A64_C87514.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241A64_C87514.s @@ -99,12 +99,12 @@ glabel func_80241A64_C87514 /* C8767C 80241BCC 00000000 */ nop .L80241BD0: /* C87680 80241BD0 0260282D */ daddu $a1, $s3, $zero -/* C87684 80241BD4 0C0902F8 */ jal func_80240BE0_C86690 +/* C87684 80241BD4 0C0902F8 */ jal kzn_17_UnkNpcAIFunc31 /* C87688 80241BD8 0280302D */ daddu $a2, $s4, $zero .L80241BDC: /* C8768C 80241BDC 0240202D */ daddu $a0, $s2, $zero /* C87690 80241BE0 0260282D */ daddu $a1, $s3, $zero -/* C87694 80241BE4 0C090313 */ jal func_80240C4C_C866FC +/* C87694 80241BE4 0C090313 */ jal kzn_17_UnkNpcAIFunc32 /* C87698 80241BE8 0280302D */ daddu $a2, $s4, $zero /* C8769C 80241BEC 08090723 */ j .L80241C8C /* C876A0 80241BF0 00000000 */ nop @@ -127,7 +127,7 @@ glabel func_80241A64_C87514 /* C876DC 80241C2C 0240202D */ daddu $a0, $s2, $zero .L80241C30: /* C876E0 80241C30 0260282D */ daddu $a1, $s3, $zero -/* C876E4 80241C34 0C090606 */ jal func_80241818_C872C8 +/* C876E4 80241C34 0C090606 */ jal kzn_17_UnkNpcAIFunc33 /* C876E8 80241C38 0280302D */ daddu $a2, $s4, $zero /* C876EC 80241C3C 8E430070 */ lw $v1, 0x70($s2) /* C876F0 80241C40 2402000D */ addiu $v0, $zero, 0xd diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240DD0_B94210.s b/ver/us/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240DD0_B94210.s deleted file mode 100644 index 3de95990dd..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240DD0_B94210.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DD0_B94210 -/* B94210 80240DD0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B94214 80240DD4 AFB10014 */ sw $s1, 0x14($sp) -/* B94218 80240DD8 0080882D */ daddu $s1, $a0, $zero -/* B9421C 80240DDC AFBF0018 */ sw $ra, 0x18($sp) -/* B94220 80240DE0 AFB00010 */ sw $s0, 0x10($sp) -/* B94224 80240DE4 8E300148 */ lw $s0, 0x148($s1) -/* B94228 80240DE8 0C00EABB */ jal get_npc_unsafe -/* B9422C 80240DEC 86040008 */ lh $a0, 8($s0) -/* B94230 80240DF0 0040202D */ daddu $a0, $v0, $zero -/* B94234 80240DF4 8482008E */ lh $v0, 0x8e($a0) -/* B94238 80240DF8 9483008E */ lhu $v1, 0x8e($a0) -/* B9423C 80240DFC 18400003 */ blez $v0, .L80240E0C -/* B94240 80240E00 2462FFFF */ addiu $v0, $v1, -1 -/* B94244 80240E04 0809038A */ j .L80240E28 -/* B94248 80240E08 A482008E */ sh $v0, 0x8e($a0) -.L80240E0C: -/* B9424C 80240E0C 8E0200CC */ lw $v0, 0xcc($s0) -/* B94250 80240E10 AE00006C */ sw $zero, 0x6c($s0) -/* B94254 80240E14 8C420000 */ lw $v0, ($v0) -/* B94258 80240E18 AC820028 */ sw $v0, 0x28($a0) -/* B9425C 80240E1C 24020001 */ addiu $v0, $zero, 1 -/* B94260 80240E20 AE200074 */ sw $zero, 0x74($s1) -/* B94264 80240E24 AE220070 */ sw $v0, 0x70($s1) -.L80240E28: -/* B94268 80240E28 8FBF0018 */ lw $ra, 0x18($sp) -/* B9426C 80240E2C 8FB10014 */ lw $s1, 0x14($sp) -/* B94270 80240E30 8FB00010 */ lw $s0, 0x10($sp) -/* B94274 80240E34 03E00008 */ jr $ra -/* B94278 80240E38 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240E3C_B9427C.s b/ver/us/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240E3C_B9427C.s deleted file mode 100644 index 07502dcc98..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240E3C_B9427C.s +++ /dev/null @@ -1,68 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E3C_B9427C -/* B9427C 80240E3C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* B94280 80240E40 AFB3003C */ sw $s3, 0x3c($sp) -/* B94284 80240E44 0080982D */ daddu $s3, $a0, $zero -/* B94288 80240E48 AFBF0040 */ sw $ra, 0x40($sp) -/* B9428C 80240E4C AFB20038 */ sw $s2, 0x38($sp) -/* B94290 80240E50 AFB10034 */ sw $s1, 0x34($sp) -/* B94294 80240E54 AFB00030 */ sw $s0, 0x30($sp) -/* B94298 80240E58 8E720148 */ lw $s2, 0x148($s3) -/* B9429C 80240E5C 00A0882D */ daddu $s1, $a1, $zero -/* B942A0 80240E60 86440008 */ lh $a0, 8($s2) -/* B942A4 80240E64 0C00EABB */ jal get_npc_unsafe -/* B942A8 80240E68 00C0802D */ daddu $s0, $a2, $zero -/* B942AC 80240E6C 0200202D */ daddu $a0, $s0, $zero -/* B942B0 80240E70 0240282D */ daddu $a1, $s2, $zero -/* B942B4 80240E74 AFA00010 */ sw $zero, 0x10($sp) -/* B942B8 80240E78 8E26000C */ lw $a2, 0xc($s1) -/* B942BC 80240E7C 8E270010 */ lw $a3, 0x10($s1) -/* B942C0 80240E80 0C01242D */ jal func_800490B4 -/* B942C4 80240E84 0040882D */ daddu $s1, $v0, $zero -/* B942C8 80240E88 10400024 */ beqz $v0, .L80240F1C -/* B942CC 80240E8C 0220202D */ daddu $a0, $s1, $zero -/* B942D0 80240E90 24050322 */ addiu $a1, $zero, 0x322 -/* B942D4 80240E94 0C012530 */ jal ai_enemy_play_sound -/* B942D8 80240E98 0000302D */ daddu $a2, $zero, $zero -/* B942DC 80240E9C 0000202D */ daddu $a0, $zero, $zero -/* B942E0 80240EA0 0220282D */ daddu $a1, $s1, $zero -/* B942E4 80240EA4 0000302D */ daddu $a2, $zero, $zero -/* B942E8 80240EA8 2410000A */ addiu $s0, $zero, 0xa -/* B942EC 80240EAC 862300A8 */ lh $v1, 0xa8($s1) -/* B942F0 80240EB0 3C013F80 */ lui $at, 0x3f80 -/* B942F4 80240EB4 44810000 */ mtc1 $at, $f0 -/* B942F8 80240EB8 3C014000 */ lui $at, 0x4000 -/* B942FC 80240EBC 44811000 */ mtc1 $at, $f2 -/* B94300 80240EC0 3C01C1A0 */ lui $at, 0xc1a0 -/* B94304 80240EC4 44812000 */ mtc1 $at, $f4 -/* B94308 80240EC8 44833000 */ mtc1 $v1, $f6 -/* B9430C 80240ECC 00000000 */ nop -/* B94310 80240ED0 468031A0 */ cvt.s.w $f6, $f6 -/* B94314 80240ED4 44073000 */ mfc1 $a3, $f6 -/* B94318 80240ED8 27A20028 */ addiu $v0, $sp, 0x28 -/* B9431C 80240EDC AFB0001C */ sw $s0, 0x1c($sp) -/* B94320 80240EE0 AFA20020 */ sw $v0, 0x20($sp) -/* B94324 80240EE4 E7A00010 */ swc1 $f0, 0x10($sp) -/* B94328 80240EE8 E7A20014 */ swc1 $f2, 0x14($sp) -/* B9432C 80240EEC 0C01BFA4 */ jal fx_emote -/* B94330 80240EF0 E7A40018 */ swc1 $f4, 0x18($sp) -/* B94334 80240EF4 0220202D */ daddu $a0, $s1, $zero -/* B94338 80240EF8 240502F4 */ addiu $a1, $zero, 0x2f4 -/* B9433C 80240EFC 0C012530 */ jal ai_enemy_play_sound -/* B94340 80240F00 3C060020 */ lui $a2, 0x20 -/* B94344 80240F04 8E4200CC */ lw $v0, 0xcc($s2) -/* B94348 80240F08 8C420020 */ lw $v0, 0x20($v0) -/* B9434C 80240F0C AE220028 */ sw $v0, 0x28($s1) -/* B94350 80240F10 9642008E */ lhu $v0, 0x8e($s2) -/* B94354 80240F14 A622008E */ sh $v0, 0x8e($s1) -/* B94358 80240F18 AE700070 */ sw $s0, 0x70($s3) -.L80240F1C: -/* B9435C 80240F1C 8FBF0040 */ lw $ra, 0x40($sp) -/* B94360 80240F20 8FB3003C */ lw $s3, 0x3c($sp) -/* B94364 80240F24 8FB20038 */ lw $s2, 0x38($sp) -/* B94368 80240F28 8FB10034 */ lw $s1, 0x34($sp) -/* B9436C 80240F2C 8FB00030 */ lw $s0, 0x30($sp) -/* B94370 80240F30 03E00008 */ jr $ra -/* B94374 80240F34 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241A08_B94E48.s b/ver/us/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241A08_B94E48.s deleted file mode 100644 index 61c92b8a4a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241A08_B94E48.s +++ /dev/null @@ -1,71 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A08_B94E48 -/* B94E48 80241A08 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* B94E4C 80241A0C AFB10034 */ sw $s1, 0x34($sp) -/* B94E50 80241A10 0080882D */ daddu $s1, $a0, $zero -/* B94E54 80241A14 AFBF0038 */ sw $ra, 0x38($sp) -/* B94E58 80241A18 AFB00030 */ sw $s0, 0x30($sp) -/* B94E5C 80241A1C 8E300148 */ lw $s0, 0x148($s1) -/* B94E60 80241A20 0C00EABB */ jal get_npc_unsafe -/* B94E64 80241A24 86040008 */ lh $a0, 8($s0) -/* B94E68 80241A28 0040282D */ daddu $a1, $v0, $zero -/* B94E6C 80241A2C 94A2008E */ lhu $v0, 0x8e($a1) -/* B94E70 80241A30 24420001 */ addiu $v0, $v0, 1 -/* B94E74 80241A34 A4A2008E */ sh $v0, 0x8e($a1) -/* B94E78 80241A38 00021400 */ sll $v0, $v0, 0x10 -/* B94E7C 80241A3C 8E0300A0 */ lw $v1, 0xa0($s0) -/* B94E80 80241A40 00021403 */ sra $v0, $v0, 0x10 -/* B94E84 80241A44 14430004 */ bne $v0, $v1, .L80241A58 -/* B94E88 80241A48 00000000 */ nop -/* B94E8C 80241A4C 8E0200CC */ lw $v0, 0xcc($s0) -/* B94E90 80241A50 8C42002C */ lw $v0, 0x2c($v0) -/* B94E94 80241A54 ACA20028 */ sw $v0, 0x28($a1) -.L80241A58: -/* B94E98 80241A58 84A3008E */ lh $v1, 0x8e($a1) -/* B94E9C 80241A5C 8E0200A4 */ lw $v0, 0xa4($s0) -/* B94EA0 80241A60 14620002 */ bne $v1, $v0, .L80241A6C -/* B94EA4 80241A64 24020003 */ addiu $v0, $zero, 3 -/* B94EA8 80241A68 AE02006C */ sw $v0, 0x6c($s0) -.L80241A6C: -/* B94EAC 80241A6C 84A2008E */ lh $v0, 0x8e($a1) -/* B94EB0 80241A70 8E03009C */ lw $v1, 0x9c($s0) -/* B94EB4 80241A74 0043102A */ slt $v0, $v0, $v1 -/* B94EB8 80241A78 1440001E */ bnez $v0, .L80241AF4 -/* B94EBC 80241A7C 24020004 */ addiu $v0, $zero, 4 -/* B94EC0 80241A80 AE02006C */ sw $v0, 0x6c($s0) -/* B94EC4 80241A84 24020008 */ addiu $v0, $zero, 8 -/* B94EC8 80241A88 24040003 */ addiu $a0, $zero, 3 -/* B94ECC 80241A8C A4A2008E */ sh $v0, 0x8e($a1) -/* B94ED0 80241A90 8E0200CC */ lw $v0, 0xcc($s0) -/* B94ED4 80241A94 84A300A8 */ lh $v1, 0xa8($a1) -/* B94ED8 80241A98 3C013F80 */ lui $at, 0x3f80 -/* B94EDC 80241A9C 44810000 */ mtc1 $at, $f0 -/* B94EE0 80241AA0 3C014000 */ lui $at, 0x4000 -/* B94EE4 80241AA4 44811000 */ mtc1 $at, $f2 -/* B94EE8 80241AA8 3C01C1A0 */ lui $at, 0xc1a0 -/* B94EEC 80241AAC 44812000 */ mtc1 $at, $f4 -/* B94EF0 80241AB0 44833000 */ mtc1 $v1, $f6 -/* B94EF4 80241AB4 00000000 */ nop -/* B94EF8 80241AB8 468031A0 */ cvt.s.w $f6, $f6 -/* B94EFC 80241ABC 8C420000 */ lw $v0, ($v0) -/* B94F00 80241AC0 44073000 */ mfc1 $a3, $f6 -/* B94F04 80241AC4 0000302D */ daddu $a2, $zero, $zero -/* B94F08 80241AC8 ACA20028 */ sw $v0, 0x28($a1) -/* B94F0C 80241ACC 2402000A */ addiu $v0, $zero, 0xa -/* B94F10 80241AD0 AFA2001C */ sw $v0, 0x1c($sp) -/* B94F14 80241AD4 27A20028 */ addiu $v0, $sp, 0x28 -/* B94F18 80241AD8 E7A00010 */ swc1 $f0, 0x10($sp) -/* B94F1C 80241ADC E7A20014 */ swc1 $f2, 0x14($sp) -/* B94F20 80241AE0 E7A40018 */ swc1 $f4, 0x18($sp) -/* B94F24 80241AE4 0C01BFA4 */ jal fx_emote -/* B94F28 80241AE8 AFA20020 */ sw $v0, 0x20($sp) -/* B94F2C 80241AEC 2402000D */ addiu $v0, $zero, 0xd -/* B94F30 80241AF0 AE220070 */ sw $v0, 0x70($s1) -.L80241AF4: -/* B94F34 80241AF4 8FBF0038 */ lw $ra, 0x38($sp) -/* B94F38 80241AF8 8FB10034 */ lw $s1, 0x34($sp) -/* B94F3C 80241AFC 8FB00030 */ lw $s0, 0x30($sp) -/* B94F40 80241B00 03E00008 */ jr $ra -/* B94F44 80241B04 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241C54_B95094.s b/ver/us/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241C54_B95094.s index b970b03382..fa08a16fc8 100644 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241C54_B95094.s +++ b/ver/us/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241C54_B95094.s @@ -99,12 +99,12 @@ glabel func_80241C54_B95094 /* B951FC 80241DBC 00000000 */ nop .L80241DC0: /* B95200 80241DC0 0260282D */ daddu $a1, $s3, $zero -/* B95204 80241DC4 0C090374 */ jal func_80240DD0_B94210 +/* B95204 80241DC4 0C090374 */ jal mim_01_UnkNpcAIFunc31 /* B95208 80241DC8 0280302D */ daddu $a2, $s4, $zero .L80241DCC: /* B9520C 80241DCC 0240202D */ daddu $a0, $s2, $zero /* B95210 80241DD0 0260282D */ daddu $a1, $s3, $zero -/* B95214 80241DD4 0C09038F */ jal func_80240E3C_B9427C +/* B95214 80241DD4 0C09038F */ jal mim_01_UnkNpcAIFunc32 /* B95218 80241DD8 0280302D */ daddu $a2, $s4, $zero /* B9521C 80241DDC 0809079F */ j .L80241E7C /* B95220 80241DE0 00000000 */ nop @@ -127,7 +127,7 @@ glabel func_80241C54_B95094 /* B9525C 80241E1C 0240202D */ daddu $a0, $s2, $zero .L80241E20: /* B95260 80241E20 0260282D */ daddu $a1, $s3, $zero -/* B95264 80241E24 0C090682 */ jal func_80241A08_B94E48 +/* B95264 80241E24 0C090682 */ jal mim_01_UnkNpcAIFunc33 /* B95268 80241E28 0280302D */ daddu $a2, $s4, $zero /* B9526C 80241E2C 8E430070 */ lw $v1, 0x70($s2) /* B95270 80241E30 2402000D */ addiu $v0, $zero, 0xd diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80240940_BA1070.s b/ver/us/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80240940_BA1070.s deleted file mode 100644 index e080f983df..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80240940_BA1070.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240940_BA1070 -/* BA1070 80240940 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BA1074 80240944 AFB10014 */ sw $s1, 0x14($sp) -/* BA1078 80240948 0080882D */ daddu $s1, $a0, $zero -/* BA107C 8024094C AFBF0018 */ sw $ra, 0x18($sp) -/* BA1080 80240950 AFB00010 */ sw $s0, 0x10($sp) -/* BA1084 80240954 8E300148 */ lw $s0, 0x148($s1) -/* BA1088 80240958 0C00EABB */ jal get_npc_unsafe -/* BA108C 8024095C 86040008 */ lh $a0, 8($s0) -/* BA1090 80240960 0040202D */ daddu $a0, $v0, $zero -/* BA1094 80240964 8482008E */ lh $v0, 0x8e($a0) -/* BA1098 80240968 9483008E */ lhu $v1, 0x8e($a0) -/* BA109C 8024096C 18400003 */ blez $v0, .L8024097C -/* BA10A0 80240970 2462FFFF */ addiu $v0, $v1, -1 -/* BA10A4 80240974 08090266 */ j .L80240998 -/* BA10A8 80240978 A482008E */ sh $v0, 0x8e($a0) -.L8024097C: -/* BA10AC 8024097C 8E0200CC */ lw $v0, 0xcc($s0) -/* BA10B0 80240980 AE00006C */ sw $zero, 0x6c($s0) -/* BA10B4 80240984 8C420000 */ lw $v0, ($v0) -/* BA10B8 80240988 AC820028 */ sw $v0, 0x28($a0) -/* BA10BC 8024098C 24020001 */ addiu $v0, $zero, 1 -/* BA10C0 80240990 AE200074 */ sw $zero, 0x74($s1) -/* BA10C4 80240994 AE220070 */ sw $v0, 0x70($s1) -.L80240998: -/* BA10C8 80240998 8FBF0018 */ lw $ra, 0x18($sp) -/* BA10CC 8024099C 8FB10014 */ lw $s1, 0x14($sp) -/* BA10D0 802409A0 8FB00010 */ lw $s0, 0x10($sp) -/* BA10D4 802409A4 03E00008 */ jr $ra -/* BA10D8 802409A8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802409AC_BA10DC.s b/ver/us/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802409AC_BA10DC.s deleted file mode 100644 index ecd98bc641..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802409AC_BA10DC.s +++ /dev/null @@ -1,68 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409AC_BA10DC -/* BA10DC 802409AC 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* BA10E0 802409B0 AFB3003C */ sw $s3, 0x3c($sp) -/* BA10E4 802409B4 0080982D */ daddu $s3, $a0, $zero -/* BA10E8 802409B8 AFBF0040 */ sw $ra, 0x40($sp) -/* BA10EC 802409BC AFB20038 */ sw $s2, 0x38($sp) -/* BA10F0 802409C0 AFB10034 */ sw $s1, 0x34($sp) -/* BA10F4 802409C4 AFB00030 */ sw $s0, 0x30($sp) -/* BA10F8 802409C8 8E720148 */ lw $s2, 0x148($s3) -/* BA10FC 802409CC 00A0882D */ daddu $s1, $a1, $zero -/* BA1100 802409D0 86440008 */ lh $a0, 8($s2) -/* BA1104 802409D4 0C00EABB */ jal get_npc_unsafe -/* BA1108 802409D8 00C0802D */ daddu $s0, $a2, $zero -/* BA110C 802409DC 0200202D */ daddu $a0, $s0, $zero -/* BA1110 802409E0 0240282D */ daddu $a1, $s2, $zero -/* BA1114 802409E4 AFA00010 */ sw $zero, 0x10($sp) -/* BA1118 802409E8 8E26000C */ lw $a2, 0xc($s1) -/* BA111C 802409EC 8E270010 */ lw $a3, 0x10($s1) -/* BA1120 802409F0 0C01242D */ jal func_800490B4 -/* BA1124 802409F4 0040882D */ daddu $s1, $v0, $zero -/* BA1128 802409F8 10400024 */ beqz $v0, .L80240A8C -/* BA112C 802409FC 0220202D */ daddu $a0, $s1, $zero -/* BA1130 80240A00 24050322 */ addiu $a1, $zero, 0x322 -/* BA1134 80240A04 0C012530 */ jal ai_enemy_play_sound -/* BA1138 80240A08 0000302D */ daddu $a2, $zero, $zero -/* BA113C 80240A0C 0000202D */ daddu $a0, $zero, $zero -/* BA1140 80240A10 0220282D */ daddu $a1, $s1, $zero -/* BA1144 80240A14 0000302D */ daddu $a2, $zero, $zero -/* BA1148 80240A18 2410000A */ addiu $s0, $zero, 0xa -/* BA114C 80240A1C 862300A8 */ lh $v1, 0xa8($s1) -/* BA1150 80240A20 3C013F80 */ lui $at, 0x3f80 -/* BA1154 80240A24 44810000 */ mtc1 $at, $f0 -/* BA1158 80240A28 3C014000 */ lui $at, 0x4000 -/* BA115C 80240A2C 44811000 */ mtc1 $at, $f2 -/* BA1160 80240A30 3C01C1A0 */ lui $at, 0xc1a0 -/* BA1164 80240A34 44812000 */ mtc1 $at, $f4 -/* BA1168 80240A38 44833000 */ mtc1 $v1, $f6 -/* BA116C 80240A3C 00000000 */ nop -/* BA1170 80240A40 468031A0 */ cvt.s.w $f6, $f6 -/* BA1174 80240A44 44073000 */ mfc1 $a3, $f6 -/* BA1178 80240A48 27A20028 */ addiu $v0, $sp, 0x28 -/* BA117C 80240A4C AFB0001C */ sw $s0, 0x1c($sp) -/* BA1180 80240A50 AFA20020 */ sw $v0, 0x20($sp) -/* BA1184 80240A54 E7A00010 */ swc1 $f0, 0x10($sp) -/* BA1188 80240A58 E7A20014 */ swc1 $f2, 0x14($sp) -/* BA118C 80240A5C 0C01BFA4 */ jal fx_emote -/* BA1190 80240A60 E7A40018 */ swc1 $f4, 0x18($sp) -/* BA1194 80240A64 0220202D */ daddu $a0, $s1, $zero -/* BA1198 80240A68 240502F4 */ addiu $a1, $zero, 0x2f4 -/* BA119C 80240A6C 0C012530 */ jal ai_enemy_play_sound -/* BA11A0 80240A70 3C060020 */ lui $a2, 0x20 -/* BA11A4 80240A74 8E4200CC */ lw $v0, 0xcc($s2) -/* BA11A8 80240A78 8C420020 */ lw $v0, 0x20($v0) -/* BA11AC 80240A7C AE220028 */ sw $v0, 0x28($s1) -/* BA11B0 80240A80 9642008E */ lhu $v0, 0x8e($s2) -/* BA11B4 80240A84 A622008E */ sh $v0, 0x8e($s1) -/* BA11B8 80240A88 AE700070 */ sw $s0, 0x70($s3) -.L80240A8C: -/* BA11BC 80240A8C 8FBF0040 */ lw $ra, 0x40($sp) -/* BA11C0 80240A90 8FB3003C */ lw $s3, 0x3c($sp) -/* BA11C4 80240A94 8FB20038 */ lw $s2, 0x38($sp) -/* BA11C8 80240A98 8FB10034 */ lw $s1, 0x34($sp) -/* BA11CC 80240A9C 8FB00030 */ lw $s0, 0x30($sp) -/* BA11D0 80240AA0 03E00008 */ jr $ra -/* BA11D4 80240AA4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80241578_BA1CA8.s b/ver/us/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80241578_BA1CA8.s deleted file mode 100644 index 4369aca284..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80241578_BA1CA8.s +++ /dev/null @@ -1,71 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241578_BA1CA8 -/* BA1CA8 80241578 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* BA1CAC 8024157C AFB10034 */ sw $s1, 0x34($sp) -/* BA1CB0 80241580 0080882D */ daddu $s1, $a0, $zero -/* BA1CB4 80241584 AFBF0038 */ sw $ra, 0x38($sp) -/* BA1CB8 80241588 AFB00030 */ sw $s0, 0x30($sp) -/* BA1CBC 8024158C 8E300148 */ lw $s0, 0x148($s1) -/* BA1CC0 80241590 0C00EABB */ jal get_npc_unsafe -/* BA1CC4 80241594 86040008 */ lh $a0, 8($s0) -/* BA1CC8 80241598 0040282D */ daddu $a1, $v0, $zero -/* BA1CCC 8024159C 94A2008E */ lhu $v0, 0x8e($a1) -/* BA1CD0 802415A0 24420001 */ addiu $v0, $v0, 1 -/* BA1CD4 802415A4 A4A2008E */ sh $v0, 0x8e($a1) -/* BA1CD8 802415A8 00021400 */ sll $v0, $v0, 0x10 -/* BA1CDC 802415AC 8E0300A0 */ lw $v1, 0xa0($s0) -/* BA1CE0 802415B0 00021403 */ sra $v0, $v0, 0x10 -/* BA1CE4 802415B4 14430004 */ bne $v0, $v1, .L802415C8 -/* BA1CE8 802415B8 00000000 */ nop -/* BA1CEC 802415BC 8E0200CC */ lw $v0, 0xcc($s0) -/* BA1CF0 802415C0 8C42002C */ lw $v0, 0x2c($v0) -/* BA1CF4 802415C4 ACA20028 */ sw $v0, 0x28($a1) -.L802415C8: -/* BA1CF8 802415C8 84A3008E */ lh $v1, 0x8e($a1) -/* BA1CFC 802415CC 8E0200A4 */ lw $v0, 0xa4($s0) -/* BA1D00 802415D0 14620002 */ bne $v1, $v0, .L802415DC -/* BA1D04 802415D4 24020003 */ addiu $v0, $zero, 3 -/* BA1D08 802415D8 AE02006C */ sw $v0, 0x6c($s0) -.L802415DC: -/* BA1D0C 802415DC 84A2008E */ lh $v0, 0x8e($a1) -/* BA1D10 802415E0 8E03009C */ lw $v1, 0x9c($s0) -/* BA1D14 802415E4 0043102A */ slt $v0, $v0, $v1 -/* BA1D18 802415E8 1440001E */ bnez $v0, .L80241664 -/* BA1D1C 802415EC 24020004 */ addiu $v0, $zero, 4 -/* BA1D20 802415F0 AE02006C */ sw $v0, 0x6c($s0) -/* BA1D24 802415F4 24020008 */ addiu $v0, $zero, 8 -/* BA1D28 802415F8 24040003 */ addiu $a0, $zero, 3 -/* BA1D2C 802415FC A4A2008E */ sh $v0, 0x8e($a1) -/* BA1D30 80241600 8E0200CC */ lw $v0, 0xcc($s0) -/* BA1D34 80241604 84A300A8 */ lh $v1, 0xa8($a1) -/* BA1D38 80241608 3C013F80 */ lui $at, 0x3f80 -/* BA1D3C 8024160C 44810000 */ mtc1 $at, $f0 -/* BA1D40 80241610 3C014000 */ lui $at, 0x4000 -/* BA1D44 80241614 44811000 */ mtc1 $at, $f2 -/* BA1D48 80241618 3C01C1A0 */ lui $at, 0xc1a0 -/* BA1D4C 8024161C 44812000 */ mtc1 $at, $f4 -/* BA1D50 80241620 44833000 */ mtc1 $v1, $f6 -/* BA1D54 80241624 00000000 */ nop -/* BA1D58 80241628 468031A0 */ cvt.s.w $f6, $f6 -/* BA1D5C 8024162C 8C420000 */ lw $v0, ($v0) -/* BA1D60 80241630 44073000 */ mfc1 $a3, $f6 -/* BA1D64 80241634 0000302D */ daddu $a2, $zero, $zero -/* BA1D68 80241638 ACA20028 */ sw $v0, 0x28($a1) -/* BA1D6C 8024163C 2402000A */ addiu $v0, $zero, 0xa -/* BA1D70 80241640 AFA2001C */ sw $v0, 0x1c($sp) -/* BA1D74 80241644 27A20028 */ addiu $v0, $sp, 0x28 -/* BA1D78 80241648 E7A00010 */ swc1 $f0, 0x10($sp) -/* BA1D7C 8024164C E7A20014 */ swc1 $f2, 0x14($sp) -/* BA1D80 80241650 E7A40018 */ swc1 $f4, 0x18($sp) -/* BA1D84 80241654 0C01BFA4 */ jal fx_emote -/* BA1D88 80241658 AFA20020 */ sw $v0, 0x20($sp) -/* BA1D8C 8024165C 2402000D */ addiu $v0, $zero, 0xd -/* BA1D90 80241660 AE220070 */ sw $v0, 0x70($s1) -.L80241664: -/* BA1D94 80241664 8FBF0038 */ lw $ra, 0x38($sp) -/* BA1D98 80241668 8FB10034 */ lw $s1, 0x34($sp) -/* BA1D9C 8024166C 8FB00030 */ lw $s0, 0x30($sp) -/* BA1DA0 80241670 03E00008 */ jr $ra -/* BA1DA4 80241674 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802417C4_BA1EF4.s b/ver/us/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802417C4_BA1EF4.s index 17ff6411e7..7cabd1c6f8 100644 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802417C4_BA1EF4.s +++ b/ver/us/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802417C4_BA1EF4.s @@ -99,12 +99,12 @@ glabel func_802417C4_BA1EF4 /* BA205C 8024192C 00000000 */ nop .L80241930: /* BA2060 80241930 0260282D */ daddu $a1, $s3, $zero -/* BA2064 80241934 0C090250 */ jal func_80240940_BA1070 +/* BA2064 80241934 0C090250 */ jal mim_05_UnkNpcAIFunc31 /* BA2068 80241938 0280302D */ daddu $a2, $s4, $zero .L8024193C: /* BA206C 8024193C 0240202D */ daddu $a0, $s2, $zero /* BA2070 80241940 0260282D */ daddu $a1, $s3, $zero -/* BA2074 80241944 0C09026B */ jal func_802409AC_BA10DC +/* BA2074 80241944 0C09026B */ jal mim_05_UnkNpcAIFunc32 /* BA2078 80241948 0280302D */ daddu $a2, $s4, $zero /* BA207C 8024194C 0809067B */ j .L802419EC /* BA2080 80241950 00000000 */ nop @@ -127,7 +127,7 @@ glabel func_802417C4_BA1EF4 /* BA20BC 8024198C 0240202D */ daddu $a0, $s2, $zero .L80241990: /* BA20C0 80241990 0260282D */ daddu $a1, $s3, $zero -/* BA20C4 80241994 0C09055E */ jal func_80241578_BA1CA8 +/* BA20C4 80241994 0C09055E */ jal mim_05_UnkNpcAIFunc33 /* BA20C8 80241998 0280302D */ daddu $a2, $s4, $zero /* BA20CC 8024199C 8E430070 */ lw $v1, 0x70($s2) /* BA20D0 802419A0 2402000D */ addiu $v0, $zero, 0xd diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240E40_BA55C0.s b/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240E40_BA55C0.s deleted file mode 100644 index d764903f48..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240E40_BA55C0.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E40_BA55C0 -/* BA55C0 80240E40 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BA55C4 80240E44 AFB10014 */ sw $s1, 0x14($sp) -/* BA55C8 80240E48 0080882D */ daddu $s1, $a0, $zero -/* BA55CC 80240E4C AFBF0018 */ sw $ra, 0x18($sp) -/* BA55D0 80240E50 AFB00010 */ sw $s0, 0x10($sp) -/* BA55D4 80240E54 8E300148 */ lw $s0, 0x148($s1) -/* BA55D8 80240E58 0C00EABB */ jal get_npc_unsafe -/* BA55DC 80240E5C 86040008 */ lh $a0, 8($s0) -/* BA55E0 80240E60 0040202D */ daddu $a0, $v0, $zero -/* BA55E4 80240E64 8482008E */ lh $v0, 0x8e($a0) -/* BA55E8 80240E68 9483008E */ lhu $v1, 0x8e($a0) -/* BA55EC 80240E6C 18400003 */ blez $v0, .L80240E7C -/* BA55F0 80240E70 2462FFFF */ addiu $v0, $v1, -1 -/* BA55F4 80240E74 080903A6 */ j .L80240E98 -/* BA55F8 80240E78 A482008E */ sh $v0, 0x8e($a0) -.L80240E7C: -/* BA55FC 80240E7C 8E0200CC */ lw $v0, 0xcc($s0) -/* BA5600 80240E80 AE00006C */ sw $zero, 0x6c($s0) -/* BA5604 80240E84 8C420000 */ lw $v0, ($v0) -/* BA5608 80240E88 AC820028 */ sw $v0, 0x28($a0) -/* BA560C 80240E8C 24020001 */ addiu $v0, $zero, 1 -/* BA5610 80240E90 AE200074 */ sw $zero, 0x74($s1) -/* BA5614 80240E94 AE220070 */ sw $v0, 0x70($s1) -.L80240E98: -/* BA5618 80240E98 8FBF0018 */ lw $ra, 0x18($sp) -/* BA561C 80240E9C 8FB10014 */ lw $s1, 0x14($sp) -/* BA5620 80240EA0 8FB00010 */ lw $s0, 0x10($sp) -/* BA5624 80240EA4 03E00008 */ jr $ra -/* BA5628 80240EA8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240EAC_BA562C.s b/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240EAC_BA562C.s deleted file mode 100644 index e6047d4035..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240EAC_BA562C.s +++ /dev/null @@ -1,68 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EAC_BA562C -/* BA562C 80240EAC 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* BA5630 80240EB0 AFB3003C */ sw $s3, 0x3c($sp) -/* BA5634 80240EB4 0080982D */ daddu $s3, $a0, $zero -/* BA5638 80240EB8 AFBF0040 */ sw $ra, 0x40($sp) -/* BA563C 80240EBC AFB20038 */ sw $s2, 0x38($sp) -/* BA5640 80240EC0 AFB10034 */ sw $s1, 0x34($sp) -/* BA5644 80240EC4 AFB00030 */ sw $s0, 0x30($sp) -/* BA5648 80240EC8 8E720148 */ lw $s2, 0x148($s3) -/* BA564C 80240ECC 00A0882D */ daddu $s1, $a1, $zero -/* BA5650 80240ED0 86440008 */ lh $a0, 8($s2) -/* BA5654 80240ED4 0C00EABB */ jal get_npc_unsafe -/* BA5658 80240ED8 00C0802D */ daddu $s0, $a2, $zero -/* BA565C 80240EDC 0200202D */ daddu $a0, $s0, $zero -/* BA5660 80240EE0 0240282D */ daddu $a1, $s2, $zero -/* BA5664 80240EE4 AFA00010 */ sw $zero, 0x10($sp) -/* BA5668 80240EE8 8E26000C */ lw $a2, 0xc($s1) -/* BA566C 80240EEC 8E270010 */ lw $a3, 0x10($s1) -/* BA5670 80240EF0 0C01242D */ jal func_800490B4 -/* BA5674 80240EF4 0040882D */ daddu $s1, $v0, $zero -/* BA5678 80240EF8 10400024 */ beqz $v0, .L80240F8C -/* BA567C 80240EFC 0220202D */ daddu $a0, $s1, $zero -/* BA5680 80240F00 24050322 */ addiu $a1, $zero, 0x322 -/* BA5684 80240F04 0C012530 */ jal ai_enemy_play_sound -/* BA5688 80240F08 0000302D */ daddu $a2, $zero, $zero -/* BA568C 80240F0C 0000202D */ daddu $a0, $zero, $zero -/* BA5690 80240F10 0220282D */ daddu $a1, $s1, $zero -/* BA5694 80240F14 0000302D */ daddu $a2, $zero, $zero -/* BA5698 80240F18 2410000A */ addiu $s0, $zero, 0xa -/* BA569C 80240F1C 862300A8 */ lh $v1, 0xa8($s1) -/* BA56A0 80240F20 3C013F80 */ lui $at, 0x3f80 -/* BA56A4 80240F24 44810000 */ mtc1 $at, $f0 -/* BA56A8 80240F28 3C014000 */ lui $at, 0x4000 -/* BA56AC 80240F2C 44811000 */ mtc1 $at, $f2 -/* BA56B0 80240F30 3C01C1A0 */ lui $at, 0xc1a0 -/* BA56B4 80240F34 44812000 */ mtc1 $at, $f4 -/* BA56B8 80240F38 44833000 */ mtc1 $v1, $f6 -/* BA56BC 80240F3C 00000000 */ nop -/* BA56C0 80240F40 468031A0 */ cvt.s.w $f6, $f6 -/* BA56C4 80240F44 44073000 */ mfc1 $a3, $f6 -/* BA56C8 80240F48 27A20028 */ addiu $v0, $sp, 0x28 -/* BA56CC 80240F4C AFB0001C */ sw $s0, 0x1c($sp) -/* BA56D0 80240F50 AFA20020 */ sw $v0, 0x20($sp) -/* BA56D4 80240F54 E7A00010 */ swc1 $f0, 0x10($sp) -/* BA56D8 80240F58 E7A20014 */ swc1 $f2, 0x14($sp) -/* BA56DC 80240F5C 0C01BFA4 */ jal fx_emote -/* BA56E0 80240F60 E7A40018 */ swc1 $f4, 0x18($sp) -/* BA56E4 80240F64 0220202D */ daddu $a0, $s1, $zero -/* BA56E8 80240F68 240502F4 */ addiu $a1, $zero, 0x2f4 -/* BA56EC 80240F6C 0C012530 */ jal ai_enemy_play_sound -/* BA56F0 80240F70 3C060020 */ lui $a2, 0x20 -/* BA56F4 80240F74 8E4200CC */ lw $v0, 0xcc($s2) -/* BA56F8 80240F78 8C420020 */ lw $v0, 0x20($v0) -/* BA56FC 80240F7C AE220028 */ sw $v0, 0x28($s1) -/* BA5700 80240F80 9642008E */ lhu $v0, 0x8e($s2) -/* BA5704 80240F84 A622008E */ sh $v0, 0x8e($s1) -/* BA5708 80240F88 AE700070 */ sw $s0, 0x70($s3) -.L80240F8C: -/* BA570C 80240F8C 8FBF0040 */ lw $ra, 0x40($sp) -/* BA5710 80240F90 8FB3003C */ lw $s3, 0x3c($sp) -/* BA5714 80240F94 8FB20038 */ lw $s2, 0x38($sp) -/* BA5718 80240F98 8FB10034 */ lw $s1, 0x34($sp) -/* BA571C 80240F9C 8FB00030 */ lw $s0, 0x30($sp) -/* BA5720 80240FA0 03E00008 */ jr $ra -/* BA5724 80240FA4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241A78_BA61F8.s b/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241A78_BA61F8.s deleted file mode 100644 index 1201af0949..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241A78_BA61F8.s +++ /dev/null @@ -1,71 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A78_BA61F8 -/* BA61F8 80241A78 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* BA61FC 80241A7C AFB10034 */ sw $s1, 0x34($sp) -/* BA6200 80241A80 0080882D */ daddu $s1, $a0, $zero -/* BA6204 80241A84 AFBF0038 */ sw $ra, 0x38($sp) -/* BA6208 80241A88 AFB00030 */ sw $s0, 0x30($sp) -/* BA620C 80241A8C 8E300148 */ lw $s0, 0x148($s1) -/* BA6210 80241A90 0C00EABB */ jal get_npc_unsafe -/* BA6214 80241A94 86040008 */ lh $a0, 8($s0) -/* BA6218 80241A98 0040282D */ daddu $a1, $v0, $zero -/* BA621C 80241A9C 94A2008E */ lhu $v0, 0x8e($a1) -/* BA6220 80241AA0 24420001 */ addiu $v0, $v0, 1 -/* BA6224 80241AA4 A4A2008E */ sh $v0, 0x8e($a1) -/* BA6228 80241AA8 00021400 */ sll $v0, $v0, 0x10 -/* BA622C 80241AAC 8E0300A0 */ lw $v1, 0xa0($s0) -/* BA6230 80241AB0 00021403 */ sra $v0, $v0, 0x10 -/* BA6234 80241AB4 14430004 */ bne $v0, $v1, .L80241AC8 -/* BA6238 80241AB8 00000000 */ nop -/* BA623C 80241ABC 8E0200CC */ lw $v0, 0xcc($s0) -/* BA6240 80241AC0 8C42002C */ lw $v0, 0x2c($v0) -/* BA6244 80241AC4 ACA20028 */ sw $v0, 0x28($a1) -.L80241AC8: -/* BA6248 80241AC8 84A3008E */ lh $v1, 0x8e($a1) -/* BA624C 80241ACC 8E0200A4 */ lw $v0, 0xa4($s0) -/* BA6250 80241AD0 14620002 */ bne $v1, $v0, .L80241ADC -/* BA6254 80241AD4 24020003 */ addiu $v0, $zero, 3 -/* BA6258 80241AD8 AE02006C */ sw $v0, 0x6c($s0) -.L80241ADC: -/* BA625C 80241ADC 84A2008E */ lh $v0, 0x8e($a1) -/* BA6260 80241AE0 8E03009C */ lw $v1, 0x9c($s0) -/* BA6264 80241AE4 0043102A */ slt $v0, $v0, $v1 -/* BA6268 80241AE8 1440001E */ bnez $v0, .L80241B64 -/* BA626C 80241AEC 24020004 */ addiu $v0, $zero, 4 -/* BA6270 80241AF0 AE02006C */ sw $v0, 0x6c($s0) -/* BA6274 80241AF4 24020008 */ addiu $v0, $zero, 8 -/* BA6278 80241AF8 24040003 */ addiu $a0, $zero, 3 -/* BA627C 80241AFC A4A2008E */ sh $v0, 0x8e($a1) -/* BA6280 80241B00 8E0200CC */ lw $v0, 0xcc($s0) -/* BA6284 80241B04 84A300A8 */ lh $v1, 0xa8($a1) -/* BA6288 80241B08 3C013F80 */ lui $at, 0x3f80 -/* BA628C 80241B0C 44810000 */ mtc1 $at, $f0 -/* BA6290 80241B10 3C014000 */ lui $at, 0x4000 -/* BA6294 80241B14 44811000 */ mtc1 $at, $f2 -/* BA6298 80241B18 3C01C1A0 */ lui $at, 0xc1a0 -/* BA629C 80241B1C 44812000 */ mtc1 $at, $f4 -/* BA62A0 80241B20 44833000 */ mtc1 $v1, $f6 -/* BA62A4 80241B24 00000000 */ nop -/* BA62A8 80241B28 468031A0 */ cvt.s.w $f6, $f6 -/* BA62AC 80241B2C 8C420000 */ lw $v0, ($v0) -/* BA62B0 80241B30 44073000 */ mfc1 $a3, $f6 -/* BA62B4 80241B34 0000302D */ daddu $a2, $zero, $zero -/* BA62B8 80241B38 ACA20028 */ sw $v0, 0x28($a1) -/* BA62BC 80241B3C 2402000A */ addiu $v0, $zero, 0xa -/* BA62C0 80241B40 AFA2001C */ sw $v0, 0x1c($sp) -/* BA62C4 80241B44 27A20028 */ addiu $v0, $sp, 0x28 -/* BA62C8 80241B48 E7A00010 */ swc1 $f0, 0x10($sp) -/* BA62CC 80241B4C E7A20014 */ swc1 $f2, 0x14($sp) -/* BA62D0 80241B50 E7A40018 */ swc1 $f4, 0x18($sp) -/* BA62D4 80241B54 0C01BFA4 */ jal fx_emote -/* BA62D8 80241B58 AFA20020 */ sw $v0, 0x20($sp) -/* BA62DC 80241B5C 2402000D */ addiu $v0, $zero, 0xd -/* BA62E0 80241B60 AE220070 */ sw $v0, 0x70($s1) -.L80241B64: -/* BA62E4 80241B64 8FBF0038 */ lw $ra, 0x38($sp) -/* BA62E8 80241B68 8FB10034 */ lw $s1, 0x34($sp) -/* BA62EC 80241B6C 8FB00030 */ lw $s0, 0x30($sp) -/* BA62F0 80241B70 03E00008 */ jr $ra -/* BA62F4 80241B74 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241CC4_BA6444.s b/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241CC4_BA6444.s index a771c0cad9..9c770a8310 100644 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241CC4_BA6444.s +++ b/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241CC4_BA6444.s @@ -99,12 +99,12 @@ glabel func_80241CC4_BA6444 /* BA65AC 80241E2C 00000000 */ nop .L80241E30: /* BA65B0 80241E30 0260282D */ daddu $a1, $s3, $zero -/* BA65B4 80241E34 0C090390 */ jal func_80240E40_BA55C0 +/* BA65B4 80241E34 0C090390 */ jal mim_06_UnkNpcAIFunc31 /* BA65B8 80241E38 0280302D */ daddu $a2, $s4, $zero .L80241E3C: /* BA65BC 80241E3C 0240202D */ daddu $a0, $s2, $zero /* BA65C0 80241E40 0260282D */ daddu $a1, $s3, $zero -/* BA65C4 80241E44 0C0903AB */ jal func_80240EAC_BA562C +/* BA65C4 80241E44 0C0903AB */ jal mim_06_UnkNpcAIFunc32 /* BA65C8 80241E48 0280302D */ daddu $a2, $s4, $zero /* BA65CC 80241E4C 080907BB */ j .L80241EEC /* BA65D0 80241E50 00000000 */ nop @@ -127,7 +127,7 @@ glabel func_80241CC4_BA6444 /* BA660C 80241E8C 0240202D */ daddu $a0, $s2, $zero .L80241E90: /* BA6610 80241E90 0260282D */ daddu $a1, $s3, $zero -/* BA6614 80241E94 0C09069E */ jal func_80241A78_BA61F8 +/* BA6614 80241E94 0C09069E */ jal mim_06_UnkNpcAIFunc33 /* BA6618 80241E98 0280302D */ daddu $a2, $s4, $zero /* BA661C 80241E9C 8E430070 */ lw $v1, 0x70($s2) /* BA6620 80241EA0 2402000D */ addiu $v0, $zero, 0xd diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241E68_BAF7A8.s b/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241E68_BAF7A8.s deleted file mode 100644 index 09b0adefa9..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241E68_BAF7A8.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E68_BAF7A8 -/* BAF7A8 80241E68 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BAF7AC 80241E6C AFB10014 */ sw $s1, 0x14($sp) -/* BAF7B0 80241E70 0080882D */ daddu $s1, $a0, $zero -/* BAF7B4 80241E74 AFBF0018 */ sw $ra, 0x18($sp) -/* BAF7B8 80241E78 AFB00010 */ sw $s0, 0x10($sp) -/* BAF7BC 80241E7C 8E300148 */ lw $s0, 0x148($s1) -/* BAF7C0 80241E80 0C00EABB */ jal get_npc_unsafe -/* BAF7C4 80241E84 86040008 */ lh $a0, 8($s0) -/* BAF7C8 80241E88 0040202D */ daddu $a0, $v0, $zero -/* BAF7CC 80241E8C 8482008E */ lh $v0, 0x8e($a0) -/* BAF7D0 80241E90 9483008E */ lhu $v1, 0x8e($a0) -/* BAF7D4 80241E94 18400003 */ blez $v0, .L80241EA4 -/* BAF7D8 80241E98 2462FFFF */ addiu $v0, $v1, -1 -/* BAF7DC 80241E9C 080907B0 */ j .L80241EC0 -/* BAF7E0 80241EA0 A482008E */ sh $v0, 0x8e($a0) -.L80241EA4: -/* BAF7E4 80241EA4 8E0200CC */ lw $v0, 0xcc($s0) -/* BAF7E8 80241EA8 AE00006C */ sw $zero, 0x6c($s0) -/* BAF7EC 80241EAC 8C420000 */ lw $v0, ($v0) -/* BAF7F0 80241EB0 AC820028 */ sw $v0, 0x28($a0) -/* BAF7F4 80241EB4 24020001 */ addiu $v0, $zero, 1 -/* BAF7F8 80241EB8 AE200074 */ sw $zero, 0x74($s1) -/* BAF7FC 80241EBC AE220070 */ sw $v0, 0x70($s1) -.L80241EC0: -/* BAF800 80241EC0 8FBF0018 */ lw $ra, 0x18($sp) -/* BAF804 80241EC4 8FB10014 */ lw $s1, 0x14($sp) -/* BAF808 80241EC8 8FB00010 */ lw $s0, 0x10($sp) -/* BAF80C 80241ECC 03E00008 */ jr $ra -/* BAF810 80241ED0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241ED4_BAF814.s b/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241ED4_BAF814.s deleted file mode 100644 index a68c470225..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241ED4_BAF814.s +++ /dev/null @@ -1,68 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241ED4_BAF814 -/* BAF814 80241ED4 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* BAF818 80241ED8 AFB3003C */ sw $s3, 0x3c($sp) -/* BAF81C 80241EDC 0080982D */ daddu $s3, $a0, $zero -/* BAF820 80241EE0 AFBF0040 */ sw $ra, 0x40($sp) -/* BAF824 80241EE4 AFB20038 */ sw $s2, 0x38($sp) -/* BAF828 80241EE8 AFB10034 */ sw $s1, 0x34($sp) -/* BAF82C 80241EEC AFB00030 */ sw $s0, 0x30($sp) -/* BAF830 80241EF0 8E720148 */ lw $s2, 0x148($s3) -/* BAF834 80241EF4 00A0882D */ daddu $s1, $a1, $zero -/* BAF838 80241EF8 86440008 */ lh $a0, 8($s2) -/* BAF83C 80241EFC 0C00EABB */ jal get_npc_unsafe -/* BAF840 80241F00 00C0802D */ daddu $s0, $a2, $zero -/* BAF844 80241F04 0200202D */ daddu $a0, $s0, $zero -/* BAF848 80241F08 0240282D */ daddu $a1, $s2, $zero -/* BAF84C 80241F0C AFA00010 */ sw $zero, 0x10($sp) -/* BAF850 80241F10 8E26000C */ lw $a2, 0xc($s1) -/* BAF854 80241F14 8E270010 */ lw $a3, 0x10($s1) -/* BAF858 80241F18 0C01242D */ jal func_800490B4 -/* BAF85C 80241F1C 0040882D */ daddu $s1, $v0, $zero -/* BAF860 80241F20 10400024 */ beqz $v0, .L80241FB4 -/* BAF864 80241F24 0220202D */ daddu $a0, $s1, $zero -/* BAF868 80241F28 24050322 */ addiu $a1, $zero, 0x322 -/* BAF86C 80241F2C 0C012530 */ jal ai_enemy_play_sound -/* BAF870 80241F30 0000302D */ daddu $a2, $zero, $zero -/* BAF874 80241F34 0000202D */ daddu $a0, $zero, $zero -/* BAF878 80241F38 0220282D */ daddu $a1, $s1, $zero -/* BAF87C 80241F3C 0000302D */ daddu $a2, $zero, $zero -/* BAF880 80241F40 2410000A */ addiu $s0, $zero, 0xa -/* BAF884 80241F44 862300A8 */ lh $v1, 0xa8($s1) -/* BAF888 80241F48 3C013F80 */ lui $at, 0x3f80 -/* BAF88C 80241F4C 44810000 */ mtc1 $at, $f0 -/* BAF890 80241F50 3C014000 */ lui $at, 0x4000 -/* BAF894 80241F54 44811000 */ mtc1 $at, $f2 -/* BAF898 80241F58 3C01C1A0 */ lui $at, 0xc1a0 -/* BAF89C 80241F5C 44812000 */ mtc1 $at, $f4 -/* BAF8A0 80241F60 44833000 */ mtc1 $v1, $f6 -/* BAF8A4 80241F64 00000000 */ nop -/* BAF8A8 80241F68 468031A0 */ cvt.s.w $f6, $f6 -/* BAF8AC 80241F6C 44073000 */ mfc1 $a3, $f6 -/* BAF8B0 80241F70 27A20028 */ addiu $v0, $sp, 0x28 -/* BAF8B4 80241F74 AFB0001C */ sw $s0, 0x1c($sp) -/* BAF8B8 80241F78 AFA20020 */ sw $v0, 0x20($sp) -/* BAF8BC 80241F7C E7A00010 */ swc1 $f0, 0x10($sp) -/* BAF8C0 80241F80 E7A20014 */ swc1 $f2, 0x14($sp) -/* BAF8C4 80241F84 0C01BFA4 */ jal fx_emote -/* BAF8C8 80241F88 E7A40018 */ swc1 $f4, 0x18($sp) -/* BAF8CC 80241F8C 0220202D */ daddu $a0, $s1, $zero -/* BAF8D0 80241F90 240502F4 */ addiu $a1, $zero, 0x2f4 -/* BAF8D4 80241F94 0C012530 */ jal ai_enemy_play_sound -/* BAF8D8 80241F98 3C060020 */ lui $a2, 0x20 -/* BAF8DC 80241F9C 8E4200CC */ lw $v0, 0xcc($s2) -/* BAF8E0 80241FA0 8C420020 */ lw $v0, 0x20($v0) -/* BAF8E4 80241FA4 AE220028 */ sw $v0, 0x28($s1) -/* BAF8E8 80241FA8 9642008E */ lhu $v0, 0x8e($s2) -/* BAF8EC 80241FAC A622008E */ sh $v0, 0x8e($s1) -/* BAF8F0 80241FB0 AE700070 */ sw $s0, 0x70($s3) -.L80241FB4: -/* BAF8F4 80241FB4 8FBF0040 */ lw $ra, 0x40($sp) -/* BAF8F8 80241FB8 8FB3003C */ lw $s3, 0x3c($sp) -/* BAF8FC 80241FBC 8FB20038 */ lw $s2, 0x38($sp) -/* BAF900 80241FC0 8FB10034 */ lw $s1, 0x34($sp) -/* BAF904 80241FC4 8FB00030 */ lw $s0, 0x30($sp) -/* BAF908 80241FC8 03E00008 */ jr $ra -/* BAF90C 80241FCC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242AA0_BB03E0.s b/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242AA0_BB03E0.s deleted file mode 100644 index 222a7fc58e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242AA0_BB03E0.s +++ /dev/null @@ -1,71 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242AA0_BB03E0 -/* BB03E0 80242AA0 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* BB03E4 80242AA4 AFB10034 */ sw $s1, 0x34($sp) -/* BB03E8 80242AA8 0080882D */ daddu $s1, $a0, $zero -/* BB03EC 80242AAC AFBF0038 */ sw $ra, 0x38($sp) -/* BB03F0 80242AB0 AFB00030 */ sw $s0, 0x30($sp) -/* BB03F4 80242AB4 8E300148 */ lw $s0, 0x148($s1) -/* BB03F8 80242AB8 0C00EABB */ jal get_npc_unsafe -/* BB03FC 80242ABC 86040008 */ lh $a0, 8($s0) -/* BB0400 80242AC0 0040282D */ daddu $a1, $v0, $zero -/* BB0404 80242AC4 94A2008E */ lhu $v0, 0x8e($a1) -/* BB0408 80242AC8 24420001 */ addiu $v0, $v0, 1 -/* BB040C 80242ACC A4A2008E */ sh $v0, 0x8e($a1) -/* BB0410 80242AD0 00021400 */ sll $v0, $v0, 0x10 -/* BB0414 80242AD4 8E0300A0 */ lw $v1, 0xa0($s0) -/* BB0418 80242AD8 00021403 */ sra $v0, $v0, 0x10 -/* BB041C 80242ADC 14430004 */ bne $v0, $v1, .L80242AF0 -/* BB0420 80242AE0 00000000 */ nop -/* BB0424 80242AE4 8E0200CC */ lw $v0, 0xcc($s0) -/* BB0428 80242AE8 8C42002C */ lw $v0, 0x2c($v0) -/* BB042C 80242AEC ACA20028 */ sw $v0, 0x28($a1) -.L80242AF0: -/* BB0430 80242AF0 84A3008E */ lh $v1, 0x8e($a1) -/* BB0434 80242AF4 8E0200A4 */ lw $v0, 0xa4($s0) -/* BB0438 80242AF8 14620002 */ bne $v1, $v0, .L80242B04 -/* BB043C 80242AFC 24020003 */ addiu $v0, $zero, 3 -/* BB0440 80242B00 AE02006C */ sw $v0, 0x6c($s0) -.L80242B04: -/* BB0444 80242B04 84A2008E */ lh $v0, 0x8e($a1) -/* BB0448 80242B08 8E03009C */ lw $v1, 0x9c($s0) -/* BB044C 80242B0C 0043102A */ slt $v0, $v0, $v1 -/* BB0450 80242B10 1440001E */ bnez $v0, .L80242B8C -/* BB0454 80242B14 24020004 */ addiu $v0, $zero, 4 -/* BB0458 80242B18 AE02006C */ sw $v0, 0x6c($s0) -/* BB045C 80242B1C 24020008 */ addiu $v0, $zero, 8 -/* BB0460 80242B20 24040003 */ addiu $a0, $zero, 3 -/* BB0464 80242B24 A4A2008E */ sh $v0, 0x8e($a1) -/* BB0468 80242B28 8E0200CC */ lw $v0, 0xcc($s0) -/* BB046C 80242B2C 84A300A8 */ lh $v1, 0xa8($a1) -/* BB0470 80242B30 3C013F80 */ lui $at, 0x3f80 -/* BB0474 80242B34 44810000 */ mtc1 $at, $f0 -/* BB0478 80242B38 3C014000 */ lui $at, 0x4000 -/* BB047C 80242B3C 44811000 */ mtc1 $at, $f2 -/* BB0480 80242B40 3C01C1A0 */ lui $at, 0xc1a0 -/* BB0484 80242B44 44812000 */ mtc1 $at, $f4 -/* BB0488 80242B48 44833000 */ mtc1 $v1, $f6 -/* BB048C 80242B4C 00000000 */ nop -/* BB0490 80242B50 468031A0 */ cvt.s.w $f6, $f6 -/* BB0494 80242B54 8C420000 */ lw $v0, ($v0) -/* BB0498 80242B58 44073000 */ mfc1 $a3, $f6 -/* BB049C 80242B5C 0000302D */ daddu $a2, $zero, $zero -/* BB04A0 80242B60 ACA20028 */ sw $v0, 0x28($a1) -/* BB04A4 80242B64 2402000A */ addiu $v0, $zero, 0xa -/* BB04A8 80242B68 AFA2001C */ sw $v0, 0x1c($sp) -/* BB04AC 80242B6C 27A20028 */ addiu $v0, $sp, 0x28 -/* BB04B0 80242B70 E7A00010 */ swc1 $f0, 0x10($sp) -/* BB04B4 80242B74 E7A20014 */ swc1 $f2, 0x14($sp) -/* BB04B8 80242B78 E7A40018 */ swc1 $f4, 0x18($sp) -/* BB04BC 80242B7C 0C01BFA4 */ jal fx_emote -/* BB04C0 80242B80 AFA20020 */ sw $v0, 0x20($sp) -/* BB04C4 80242B84 2402000D */ addiu $v0, $zero, 0xd -/* BB04C8 80242B88 AE220070 */ sw $v0, 0x70($s1) -.L80242B8C: -/* BB04CC 80242B8C 8FBF0038 */ lw $ra, 0x38($sp) -/* BB04D0 80242B90 8FB10034 */ lw $s1, 0x34($sp) -/* BB04D4 80242B94 8FB00030 */ lw $s0, 0x30($sp) -/* BB04D8 80242B98 03E00008 */ jr $ra -/* BB04DC 80242B9C 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242CEC_BB062C.s b/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242CEC_BB062C.s index 682c086fa8..c890752a11 100644 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242CEC_BB062C.s +++ b/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242CEC_BB062C.s @@ -99,12 +99,12 @@ glabel func_80242CEC_BB062C /* BB0794 80242E54 00000000 */ nop .L80242E58: /* BB0798 80242E58 0260282D */ daddu $a1, $s3, $zero -/* BB079C 80242E5C 0C09079A */ jal func_80241E68_BAF7A8 +/* BB079C 80242E5C 0C09079A */ jal mim_08_UnkNpcAIFunc31 /* BB07A0 80242E60 0280302D */ daddu $a2, $s4, $zero .L80242E64: /* BB07A4 80242E64 0240202D */ daddu $a0, $s2, $zero /* BB07A8 80242E68 0260282D */ daddu $a1, $s3, $zero -/* BB07AC 80242E6C 0C0907B5 */ jal func_80241ED4_BAF814 +/* BB07AC 80242E6C 0C0907B5 */ jal mim_08_UnkNpcAIFunc32 /* BB07B0 80242E70 0280302D */ daddu $a2, $s4, $zero /* BB07B4 80242E74 08090BC5 */ j .L80242F14 /* BB07B8 80242E78 00000000 */ nop @@ -127,7 +127,7 @@ glabel func_80242CEC_BB062C /* BB07F4 80242EB4 0240202D */ daddu $a0, $s2, $zero .L80242EB8: /* BB07F8 80242EB8 0260282D */ daddu $a1, $s3, $zero -/* BB07FC 80242EBC 0C090AA8 */ jal func_80242AA0_BB03E0 +/* BB07FC 80242EBC 0C090AA8 */ jal mim_08_UnkNpcAIFunc33 /* BB0800 80242EC0 0280302D */ daddu $a2, $s4, $zero /* BB0804 80242EC4 8E430070 */ lw $v1, 0x70($s2) /* BB0808 80242EC8 2402000D */ addiu $v0, $zero, 0xd diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_802408D0_D190B0.s b/ver/us/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_802408D0_D190B0.s deleted file mode 100644 index 46a4bd2e83..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_802408D0_D190B0.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408D0_D190B0 -/* D190B0 802408D0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D190B4 802408D4 AFB10014 */ sw $s1, 0x14($sp) -/* D190B8 802408D8 0080882D */ daddu $s1, $a0, $zero -/* D190BC 802408DC AFBF0018 */ sw $ra, 0x18($sp) -/* D190C0 802408E0 AFB00010 */ sw $s0, 0x10($sp) -/* D190C4 802408E4 8E300148 */ lw $s0, 0x148($s1) -/* D190C8 802408E8 0C00EABB */ jal get_npc_unsafe -/* D190CC 802408EC 86040008 */ lh $a0, 8($s0) -/* D190D0 802408F0 0040202D */ daddu $a0, $v0, $zero -/* D190D4 802408F4 8482008E */ lh $v0, 0x8e($a0) -/* D190D8 802408F8 9483008E */ lhu $v1, 0x8e($a0) -/* D190DC 802408FC 18400003 */ blez $v0, .L8024090C -/* D190E0 80240900 2462FFFF */ addiu $v0, $v1, -1 -/* D190E4 80240904 0809024A */ j .L80240928 -/* D190E8 80240908 A482008E */ sh $v0, 0x8e($a0) -.L8024090C: -/* D190EC 8024090C 8E0200CC */ lw $v0, 0xcc($s0) -/* D190F0 80240910 AE00006C */ sw $zero, 0x6c($s0) -/* D190F4 80240914 8C420000 */ lw $v0, ($v0) -/* D190F8 80240918 AC820028 */ sw $v0, 0x28($a0) -/* D190FC 8024091C 24020001 */ addiu $v0, $zero, 1 -/* D19100 80240920 AE200074 */ sw $zero, 0x74($s1) -/* D19104 80240924 AE220070 */ sw $v0, 0x70($s1) -.L80240928: -/* D19108 80240928 8FBF0018 */ lw $ra, 0x18($sp) -/* D1910C 8024092C 8FB10014 */ lw $s1, 0x14($sp) -/* D19110 80240930 8FB00010 */ lw $s0, 0x10($sp) -/* D19114 80240934 03E00008 */ jr $ra -/* D19118 80240938 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024093C_D1911C.s b/ver/us/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024093C_D1911C.s deleted file mode 100644 index 2aaa256919..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024093C_D1911C.s +++ /dev/null @@ -1,68 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024093C_D1911C -/* D1911C 8024093C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* D19120 80240940 AFB3003C */ sw $s3, 0x3c($sp) -/* D19124 80240944 0080982D */ daddu $s3, $a0, $zero -/* D19128 80240948 AFBF0040 */ sw $ra, 0x40($sp) -/* D1912C 8024094C AFB20038 */ sw $s2, 0x38($sp) -/* D19130 80240950 AFB10034 */ sw $s1, 0x34($sp) -/* D19134 80240954 AFB00030 */ sw $s0, 0x30($sp) -/* D19138 80240958 8E720148 */ lw $s2, 0x148($s3) -/* D1913C 8024095C 00A0882D */ daddu $s1, $a1, $zero -/* D19140 80240960 86440008 */ lh $a0, 8($s2) -/* D19144 80240964 0C00EABB */ jal get_npc_unsafe -/* D19148 80240968 00C0802D */ daddu $s0, $a2, $zero -/* D1914C 8024096C 0200202D */ daddu $a0, $s0, $zero -/* D19150 80240970 0240282D */ daddu $a1, $s2, $zero -/* D19154 80240974 AFA00010 */ sw $zero, 0x10($sp) -/* D19158 80240978 8E26000C */ lw $a2, 0xc($s1) -/* D1915C 8024097C 8E270010 */ lw $a3, 0x10($s1) -/* D19160 80240980 0C01242D */ jal func_800490B4 -/* D19164 80240984 0040882D */ daddu $s1, $v0, $zero -/* D19168 80240988 10400024 */ beqz $v0, .L80240A1C -/* D1916C 8024098C 0220202D */ daddu $a0, $s1, $zero -/* D19170 80240990 24050322 */ addiu $a1, $zero, 0x322 -/* D19174 80240994 0C012530 */ jal ai_enemy_play_sound -/* D19178 80240998 0000302D */ daddu $a2, $zero, $zero -/* D1917C 8024099C 0000202D */ daddu $a0, $zero, $zero -/* D19180 802409A0 0220282D */ daddu $a1, $s1, $zero -/* D19184 802409A4 0000302D */ daddu $a2, $zero, $zero -/* D19188 802409A8 2410000A */ addiu $s0, $zero, 0xa -/* D1918C 802409AC 862300A8 */ lh $v1, 0xa8($s1) -/* D19190 802409B0 3C013F80 */ lui $at, 0x3f80 -/* D19194 802409B4 44810000 */ mtc1 $at, $f0 -/* D19198 802409B8 3C014000 */ lui $at, 0x4000 -/* D1919C 802409BC 44811000 */ mtc1 $at, $f2 -/* D191A0 802409C0 3C01C1A0 */ lui $at, 0xc1a0 -/* D191A4 802409C4 44812000 */ mtc1 $at, $f4 -/* D191A8 802409C8 44833000 */ mtc1 $v1, $f6 -/* D191AC 802409CC 00000000 */ nop -/* D191B0 802409D0 468031A0 */ cvt.s.w $f6, $f6 -/* D191B4 802409D4 44073000 */ mfc1 $a3, $f6 -/* D191B8 802409D8 27A20028 */ addiu $v0, $sp, 0x28 -/* D191BC 802409DC AFB0001C */ sw $s0, 0x1c($sp) -/* D191C0 802409E0 AFA20020 */ sw $v0, 0x20($sp) -/* D191C4 802409E4 E7A00010 */ swc1 $f0, 0x10($sp) -/* D191C8 802409E8 E7A20014 */ swc1 $f2, 0x14($sp) -/* D191CC 802409EC 0C01BFA4 */ jal fx_emote -/* D191D0 802409F0 E7A40018 */ swc1 $f4, 0x18($sp) -/* D191D4 802409F4 0220202D */ daddu $a0, $s1, $zero -/* D191D8 802409F8 240502F4 */ addiu $a1, $zero, 0x2f4 -/* D191DC 802409FC 0C012530 */ jal ai_enemy_play_sound -/* D191E0 80240A00 3C060020 */ lui $a2, 0x20 -/* D191E4 80240A04 8E4200CC */ lw $v0, 0xcc($s2) -/* D191E8 80240A08 8C420020 */ lw $v0, 0x20($v0) -/* D191EC 80240A0C AE220028 */ sw $v0, 0x28($s1) -/* D191F0 80240A10 9642008E */ lhu $v0, 0x8e($s2) -/* D191F4 80240A14 A622008E */ sh $v0, 0x8e($s1) -/* D191F8 80240A18 AE700070 */ sw $s0, 0x70($s3) -.L80240A1C: -/* D191FC 80240A1C 8FBF0040 */ lw $ra, 0x40($sp) -/* D19200 80240A20 8FB3003C */ lw $s3, 0x3c($sp) -/* D19204 80240A24 8FB20038 */ lw $s2, 0x38($sp) -/* D19208 80240A28 8FB10034 */ lw $s1, 0x34($sp) -/* D1920C 80240A2C 8FB00030 */ lw $s0, 0x30($sp) -/* D19210 80240A30 03E00008 */ jr $ra -/* D19214 80240A34 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241508_D19CE8.s b/ver/us/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241508_D19CE8.s deleted file mode 100644 index fdf8fe8c68..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241508_D19CE8.s +++ /dev/null @@ -1,71 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241508_D19CE8 -/* D19CE8 80241508 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* D19CEC 8024150C AFB10034 */ sw $s1, 0x34($sp) -/* D19CF0 80241510 0080882D */ daddu $s1, $a0, $zero -/* D19CF4 80241514 AFBF0038 */ sw $ra, 0x38($sp) -/* D19CF8 80241518 AFB00030 */ sw $s0, 0x30($sp) -/* D19CFC 8024151C 8E300148 */ lw $s0, 0x148($s1) -/* D19D00 80241520 0C00EABB */ jal get_npc_unsafe -/* D19D04 80241524 86040008 */ lh $a0, 8($s0) -/* D19D08 80241528 0040282D */ daddu $a1, $v0, $zero -/* D19D0C 8024152C 94A2008E */ lhu $v0, 0x8e($a1) -/* D19D10 80241530 24420001 */ addiu $v0, $v0, 1 -/* D19D14 80241534 A4A2008E */ sh $v0, 0x8e($a1) -/* D19D18 80241538 00021400 */ sll $v0, $v0, 0x10 -/* D19D1C 8024153C 8E0300A0 */ lw $v1, 0xa0($s0) -/* D19D20 80241540 00021403 */ sra $v0, $v0, 0x10 -/* D19D24 80241544 14430004 */ bne $v0, $v1, .L80241558 -/* D19D28 80241548 00000000 */ nop -/* D19D2C 8024154C 8E0200CC */ lw $v0, 0xcc($s0) -/* D19D30 80241550 8C42002C */ lw $v0, 0x2c($v0) -/* D19D34 80241554 ACA20028 */ sw $v0, 0x28($a1) -.L80241558: -/* D19D38 80241558 84A3008E */ lh $v1, 0x8e($a1) -/* D19D3C 8024155C 8E0200A4 */ lw $v0, 0xa4($s0) -/* D19D40 80241560 14620002 */ bne $v1, $v0, .L8024156C -/* D19D44 80241564 24020003 */ addiu $v0, $zero, 3 -/* D19D48 80241568 AE02006C */ sw $v0, 0x6c($s0) -.L8024156C: -/* D19D4C 8024156C 84A2008E */ lh $v0, 0x8e($a1) -/* D19D50 80241570 8E03009C */ lw $v1, 0x9c($s0) -/* D19D54 80241574 0043102A */ slt $v0, $v0, $v1 -/* D19D58 80241578 1440001E */ bnez $v0, .L802415F4 -/* D19D5C 8024157C 24020004 */ addiu $v0, $zero, 4 -/* D19D60 80241580 AE02006C */ sw $v0, 0x6c($s0) -/* D19D64 80241584 24020008 */ addiu $v0, $zero, 8 -/* D19D68 80241588 24040003 */ addiu $a0, $zero, 3 -/* D19D6C 8024158C A4A2008E */ sh $v0, 0x8e($a1) -/* D19D70 80241590 8E0200CC */ lw $v0, 0xcc($s0) -/* D19D74 80241594 84A300A8 */ lh $v1, 0xa8($a1) -/* D19D78 80241598 3C013F80 */ lui $at, 0x3f80 -/* D19D7C 8024159C 44810000 */ mtc1 $at, $f0 -/* D19D80 802415A0 3C014000 */ lui $at, 0x4000 -/* D19D84 802415A4 44811000 */ mtc1 $at, $f2 -/* D19D88 802415A8 3C01C1A0 */ lui $at, 0xc1a0 -/* D19D8C 802415AC 44812000 */ mtc1 $at, $f4 -/* D19D90 802415B0 44833000 */ mtc1 $v1, $f6 -/* D19D94 802415B4 00000000 */ nop -/* D19D98 802415B8 468031A0 */ cvt.s.w $f6, $f6 -/* D19D9C 802415BC 8C420000 */ lw $v0, ($v0) -/* D19DA0 802415C0 44073000 */ mfc1 $a3, $f6 -/* D19DA4 802415C4 0000302D */ daddu $a2, $zero, $zero -/* D19DA8 802415C8 ACA20028 */ sw $v0, 0x28($a1) -/* D19DAC 802415CC 2402000A */ addiu $v0, $zero, 0xa -/* D19DB0 802415D0 AFA2001C */ sw $v0, 0x1c($sp) -/* D19DB4 802415D4 27A20028 */ addiu $v0, $sp, 0x28 -/* D19DB8 802415D8 E7A00010 */ swc1 $f0, 0x10($sp) -/* D19DBC 802415DC E7A20014 */ swc1 $f2, 0x14($sp) -/* D19DC0 802415E0 E7A40018 */ swc1 $f4, 0x18($sp) -/* D19DC4 802415E4 0C01BFA4 */ jal fx_emote -/* D19DC8 802415E8 AFA20020 */ sw $v0, 0x20($sp) -/* D19DCC 802415EC 2402000D */ addiu $v0, $zero, 0xd -/* D19DD0 802415F0 AE220070 */ sw $v0, 0x70($s1) -.L802415F4: -/* D19DD4 802415F4 8FBF0038 */ lw $ra, 0x38($sp) -/* D19DD8 802415F8 8FB10034 */ lw $s1, 0x34($sp) -/* D19DDC 802415FC 8FB00030 */ lw $s0, 0x30($sp) -/* D19DE0 80241600 03E00008 */ jr $ra -/* D19DE4 80241604 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241754_D19F34.s b/ver/us/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241754_D19F34.s index df50e5870c..2f8fb619fd 100644 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241754_D19F34.s +++ b/ver/us/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241754_D19F34.s @@ -99,12 +99,12 @@ glabel func_80241754_D19F34 /* D1A09C 802418BC 00000000 */ nop .L802418C0: /* D1A0A0 802418C0 0260282D */ daddu $a1, $s3, $zero -/* D1A0A4 802418C4 0C090234 */ jal func_802408D0_D190B0 +/* D1A0A4 802418C4 0C090234 */ jal sam_05_UnkNpcAIFunc31 /* D1A0A8 802418C8 0280302D */ daddu $a2, $s4, $zero .L802418CC: /* D1A0AC 802418CC 0240202D */ daddu $a0, $s2, $zero /* D1A0B0 802418D0 0260282D */ daddu $a1, $s3, $zero -/* D1A0B4 802418D4 0C09024F */ jal func_8024093C_D1911C +/* D1A0B4 802418D4 0C09024F */ jal sam_05_UnkNpcAIFunc32 /* D1A0B8 802418D8 0280302D */ daddu $a2, $s4, $zero /* D1A0BC 802418DC 0809065F */ j .L8024197C /* D1A0C0 802418E0 00000000 */ nop @@ -127,7 +127,7 @@ glabel func_80241754_D19F34 /* D1A0FC 8024191C 0240202D */ daddu $a0, $s2, $zero .L80241920: /* D1A100 80241920 0260282D */ daddu $a1, $s3, $zero -/* D1A104 80241924 0C090542 */ jal func_80241508_D19CE8 +/* D1A104 80241924 0C090542 */ jal sam_05_UnkNpcAIFunc33 /* D1A108 80241928 0280302D */ daddu $a2, $s4, $zero /* D1A10C 8024192C 8E430070 */ lw $v1, 0x70($s2) /* D1A110 80241930 2402000D */ addiu $v0, $zero, 0xd diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240F20_D2CC50.s b/ver/us/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240F20_D2CC50.s deleted file mode 100644 index 0f21d3506c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240F20_D2CC50.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F20_D2CC50 -/* D2CC50 80240F20 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D2CC54 80240F24 AFB10014 */ sw $s1, 0x14($sp) -/* D2CC58 80240F28 0080882D */ daddu $s1, $a0, $zero -/* D2CC5C 80240F2C AFBF0018 */ sw $ra, 0x18($sp) -/* D2CC60 80240F30 AFB00010 */ sw $s0, 0x10($sp) -/* D2CC64 80240F34 8E300148 */ lw $s0, 0x148($s1) -/* D2CC68 80240F38 0C00EABB */ jal get_npc_unsafe -/* D2CC6C 80240F3C 86040008 */ lh $a0, 8($s0) -/* D2CC70 80240F40 0040202D */ daddu $a0, $v0, $zero -/* D2CC74 80240F44 8482008E */ lh $v0, 0x8e($a0) -/* D2CC78 80240F48 9483008E */ lhu $v1, 0x8e($a0) -/* D2CC7C 80240F4C 18400003 */ blez $v0, .L80240F5C -/* D2CC80 80240F50 2462FFFF */ addiu $v0, $v1, -1 -/* D2CC84 80240F54 080903DE */ j .L80240F78 -/* D2CC88 80240F58 A482008E */ sh $v0, 0x8e($a0) -.L80240F5C: -/* D2CC8C 80240F5C 8E0200CC */ lw $v0, 0xcc($s0) -/* D2CC90 80240F60 AE00006C */ sw $zero, 0x6c($s0) -/* D2CC94 80240F64 8C420000 */ lw $v0, ($v0) -/* D2CC98 80240F68 AC820028 */ sw $v0, 0x28($a0) -/* D2CC9C 80240F6C 24020001 */ addiu $v0, $zero, 1 -/* D2CCA0 80240F70 AE200074 */ sw $zero, 0x74($s1) -/* D2CCA4 80240F74 AE220070 */ sw $v0, 0x70($s1) -.L80240F78: -/* D2CCA8 80240F78 8FBF0018 */ lw $ra, 0x18($sp) -/* D2CCAC 80240F7C 8FB10014 */ lw $s1, 0x14($sp) -/* D2CCB0 80240F80 8FB00010 */ lw $s0, 0x10($sp) -/* D2CCB4 80240F84 03E00008 */ jr $ra -/* D2CCB8 80240F88 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240F8C_D2CCBC.s b/ver/us/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240F8C_D2CCBC.s deleted file mode 100644 index a33603d1fb..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240F8C_D2CCBC.s +++ /dev/null @@ -1,68 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F8C_D2CCBC -/* D2CCBC 80240F8C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* D2CCC0 80240F90 AFB3003C */ sw $s3, 0x3c($sp) -/* D2CCC4 80240F94 0080982D */ daddu $s3, $a0, $zero -/* D2CCC8 80240F98 AFBF0040 */ sw $ra, 0x40($sp) -/* D2CCCC 80240F9C AFB20038 */ sw $s2, 0x38($sp) -/* D2CCD0 80240FA0 AFB10034 */ sw $s1, 0x34($sp) -/* D2CCD4 80240FA4 AFB00030 */ sw $s0, 0x30($sp) -/* D2CCD8 80240FA8 8E720148 */ lw $s2, 0x148($s3) -/* D2CCDC 80240FAC 00A0882D */ daddu $s1, $a1, $zero -/* D2CCE0 80240FB0 86440008 */ lh $a0, 8($s2) -/* D2CCE4 80240FB4 0C00EABB */ jal get_npc_unsafe -/* D2CCE8 80240FB8 00C0802D */ daddu $s0, $a2, $zero -/* D2CCEC 80240FBC 0200202D */ daddu $a0, $s0, $zero -/* D2CCF0 80240FC0 0240282D */ daddu $a1, $s2, $zero -/* D2CCF4 80240FC4 AFA00010 */ sw $zero, 0x10($sp) -/* D2CCF8 80240FC8 8E26000C */ lw $a2, 0xc($s1) -/* D2CCFC 80240FCC 8E270010 */ lw $a3, 0x10($s1) -/* D2CD00 80240FD0 0C01242D */ jal func_800490B4 -/* D2CD04 80240FD4 0040882D */ daddu $s1, $v0, $zero -/* D2CD08 80240FD8 10400024 */ beqz $v0, .L8024106C -/* D2CD0C 80240FDC 0220202D */ daddu $a0, $s1, $zero -/* D2CD10 80240FE0 24050322 */ addiu $a1, $zero, 0x322 -/* D2CD14 80240FE4 0C012530 */ jal ai_enemy_play_sound -/* D2CD18 80240FE8 0000302D */ daddu $a2, $zero, $zero -/* D2CD1C 80240FEC 0000202D */ daddu $a0, $zero, $zero -/* D2CD20 80240FF0 0220282D */ daddu $a1, $s1, $zero -/* D2CD24 80240FF4 0000302D */ daddu $a2, $zero, $zero -/* D2CD28 80240FF8 2410000A */ addiu $s0, $zero, 0xa -/* D2CD2C 80240FFC 862300A8 */ lh $v1, 0xa8($s1) -/* D2CD30 80241000 3C013F80 */ lui $at, 0x3f80 -/* D2CD34 80241004 44810000 */ mtc1 $at, $f0 -/* D2CD38 80241008 3C014000 */ lui $at, 0x4000 -/* D2CD3C 8024100C 44811000 */ mtc1 $at, $f2 -/* D2CD40 80241010 3C01C1A0 */ lui $at, 0xc1a0 -/* D2CD44 80241014 44812000 */ mtc1 $at, $f4 -/* D2CD48 80241018 44833000 */ mtc1 $v1, $f6 -/* D2CD4C 8024101C 00000000 */ nop -/* D2CD50 80241020 468031A0 */ cvt.s.w $f6, $f6 -/* D2CD54 80241024 44073000 */ mfc1 $a3, $f6 -/* D2CD58 80241028 27A20028 */ addiu $v0, $sp, 0x28 -/* D2CD5C 8024102C AFB0001C */ sw $s0, 0x1c($sp) -/* D2CD60 80241030 AFA20020 */ sw $v0, 0x20($sp) -/* D2CD64 80241034 E7A00010 */ swc1 $f0, 0x10($sp) -/* D2CD68 80241038 E7A20014 */ swc1 $f2, 0x14($sp) -/* D2CD6C 8024103C 0C01BFA4 */ jal fx_emote -/* D2CD70 80241040 E7A40018 */ swc1 $f4, 0x18($sp) -/* D2CD74 80241044 0220202D */ daddu $a0, $s1, $zero -/* D2CD78 80241048 240502F4 */ addiu $a1, $zero, 0x2f4 -/* D2CD7C 8024104C 0C012530 */ jal ai_enemy_play_sound -/* D2CD80 80241050 3C060020 */ lui $a2, 0x20 -/* D2CD84 80241054 8E4200CC */ lw $v0, 0xcc($s2) -/* D2CD88 80241058 8C420020 */ lw $v0, 0x20($v0) -/* D2CD8C 8024105C AE220028 */ sw $v0, 0x28($s1) -/* D2CD90 80241060 9642008E */ lhu $v0, 0x8e($s2) -/* D2CD94 80241064 A622008E */ sh $v0, 0x8e($s1) -/* D2CD98 80241068 AE700070 */ sw $s0, 0x70($s3) -.L8024106C: -/* D2CD9C 8024106C 8FBF0040 */ lw $ra, 0x40($sp) -/* D2CDA0 80241070 8FB3003C */ lw $s3, 0x3c($sp) -/* D2CDA4 80241074 8FB20038 */ lw $s2, 0x38($sp) -/* D2CDA8 80241078 8FB10034 */ lw $s1, 0x34($sp) -/* D2CDAC 8024107C 8FB00030 */ lw $s0, 0x30($sp) -/* D2CDB0 80241080 03E00008 */ jr $ra -/* D2CDB4 80241084 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241B58_D2D888.s b/ver/us/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241B58_D2D888.s deleted file mode 100644 index 61afb843b0..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241B58_D2D888.s +++ /dev/null @@ -1,71 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B58_D2D888 -/* D2D888 80241B58 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* D2D88C 80241B5C AFB10034 */ sw $s1, 0x34($sp) -/* D2D890 80241B60 0080882D */ daddu $s1, $a0, $zero -/* D2D894 80241B64 AFBF0038 */ sw $ra, 0x38($sp) -/* D2D898 80241B68 AFB00030 */ sw $s0, 0x30($sp) -/* D2D89C 80241B6C 8E300148 */ lw $s0, 0x148($s1) -/* D2D8A0 80241B70 0C00EABB */ jal get_npc_unsafe -/* D2D8A4 80241B74 86040008 */ lh $a0, 8($s0) -/* D2D8A8 80241B78 0040282D */ daddu $a1, $v0, $zero -/* D2D8AC 80241B7C 94A2008E */ lhu $v0, 0x8e($a1) -/* D2D8B0 80241B80 24420001 */ addiu $v0, $v0, 1 -/* D2D8B4 80241B84 A4A2008E */ sh $v0, 0x8e($a1) -/* D2D8B8 80241B88 00021400 */ sll $v0, $v0, 0x10 -/* D2D8BC 80241B8C 8E0300A0 */ lw $v1, 0xa0($s0) -/* D2D8C0 80241B90 00021403 */ sra $v0, $v0, 0x10 -/* D2D8C4 80241B94 14430004 */ bne $v0, $v1, .L80241BA8 -/* D2D8C8 80241B98 00000000 */ nop -/* D2D8CC 80241B9C 8E0200CC */ lw $v0, 0xcc($s0) -/* D2D8D0 80241BA0 8C42002C */ lw $v0, 0x2c($v0) -/* D2D8D4 80241BA4 ACA20028 */ sw $v0, 0x28($a1) -.L80241BA8: -/* D2D8D8 80241BA8 84A3008E */ lh $v1, 0x8e($a1) -/* D2D8DC 80241BAC 8E0200A4 */ lw $v0, 0xa4($s0) -/* D2D8E0 80241BB0 14620002 */ bne $v1, $v0, .L80241BBC -/* D2D8E4 80241BB4 24020003 */ addiu $v0, $zero, 3 -/* D2D8E8 80241BB8 AE02006C */ sw $v0, 0x6c($s0) -.L80241BBC: -/* D2D8EC 80241BBC 84A2008E */ lh $v0, 0x8e($a1) -/* D2D8F0 80241BC0 8E03009C */ lw $v1, 0x9c($s0) -/* D2D8F4 80241BC4 0043102A */ slt $v0, $v0, $v1 -/* D2D8F8 80241BC8 1440001E */ bnez $v0, .L80241C44 -/* D2D8FC 80241BCC 24020004 */ addiu $v0, $zero, 4 -/* D2D900 80241BD0 AE02006C */ sw $v0, 0x6c($s0) -/* D2D904 80241BD4 24020008 */ addiu $v0, $zero, 8 -/* D2D908 80241BD8 24040003 */ addiu $a0, $zero, 3 -/* D2D90C 80241BDC A4A2008E */ sh $v0, 0x8e($a1) -/* D2D910 80241BE0 8E0200CC */ lw $v0, 0xcc($s0) -/* D2D914 80241BE4 84A300A8 */ lh $v1, 0xa8($a1) -/* D2D918 80241BE8 3C013F80 */ lui $at, 0x3f80 -/* D2D91C 80241BEC 44810000 */ mtc1 $at, $f0 -/* D2D920 80241BF0 3C014000 */ lui $at, 0x4000 -/* D2D924 80241BF4 44811000 */ mtc1 $at, $f2 -/* D2D928 80241BF8 3C01C1A0 */ lui $at, 0xc1a0 -/* D2D92C 80241BFC 44812000 */ mtc1 $at, $f4 -/* D2D930 80241C00 44833000 */ mtc1 $v1, $f6 -/* D2D934 80241C04 00000000 */ nop -/* D2D938 80241C08 468031A0 */ cvt.s.w $f6, $f6 -/* D2D93C 80241C0C 8C420000 */ lw $v0, ($v0) -/* D2D940 80241C10 44073000 */ mfc1 $a3, $f6 -/* D2D944 80241C14 0000302D */ daddu $a2, $zero, $zero -/* D2D948 80241C18 ACA20028 */ sw $v0, 0x28($a1) -/* D2D94C 80241C1C 2402000A */ addiu $v0, $zero, 0xa -/* D2D950 80241C20 AFA2001C */ sw $v0, 0x1c($sp) -/* D2D954 80241C24 27A20028 */ addiu $v0, $sp, 0x28 -/* D2D958 80241C28 E7A00010 */ swc1 $f0, 0x10($sp) -/* D2D95C 80241C2C E7A20014 */ swc1 $f2, 0x14($sp) -/* D2D960 80241C30 E7A40018 */ swc1 $f4, 0x18($sp) -/* D2D964 80241C34 0C01BFA4 */ jal fx_emote -/* D2D968 80241C38 AFA20020 */ sw $v0, 0x20($sp) -/* D2D96C 80241C3C 2402000D */ addiu $v0, $zero, 0xd -/* D2D970 80241C40 AE220070 */ sw $v0, 0x70($s1) -.L80241C44: -/* D2D974 80241C44 8FBF0038 */ lw $ra, 0x38($sp) -/* D2D978 80241C48 8FB10034 */ lw $s1, 0x34($sp) -/* D2D97C 80241C4C 8FB00030 */ lw $s0, 0x30($sp) -/* D2D980 80241C50 03E00008 */ jr $ra -/* D2D984 80241C54 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241DA4_D2DAD4.s b/ver/us/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241DA4_D2DAD4.s index d377aeffe0..ae996569bc 100644 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241DA4_D2DAD4.s +++ b/ver/us/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241DA4_D2DAD4.s @@ -99,12 +99,12 @@ glabel func_80241DA4_D2DAD4 /* D2DC3C 80241F0C 00000000 */ nop .L80241F10: /* D2DC40 80241F10 0260282D */ daddu $a1, $s3, $zero -/* D2DC44 80241F14 0C0903C8 */ jal func_80240F20_D2CC50 +/* D2DC44 80241F14 0C0903C8 */ jal sam_07_UnkNpcAIFunc31 /* D2DC48 80241F18 0280302D */ daddu $a2, $s4, $zero .L80241F1C: /* D2DC4C 80241F1C 0240202D */ daddu $a0, $s2, $zero /* D2DC50 80241F20 0260282D */ daddu $a1, $s3, $zero -/* D2DC54 80241F24 0C0903E3 */ jal func_80240F8C_D2CCBC +/* D2DC54 80241F24 0C0903E3 */ jal sam_07_UnkNpcAIFunc32 /* D2DC58 80241F28 0280302D */ daddu $a2, $s4, $zero /* D2DC5C 80241F2C 080907F3 */ j .L80241FCC /* D2DC60 80241F30 00000000 */ nop @@ -127,7 +127,7 @@ glabel func_80241DA4_D2DAD4 /* D2DC9C 80241F6C 0240202D */ daddu $a0, $s2, $zero .L80241F70: /* D2DCA0 80241F70 0260282D */ daddu $a1, $s3, $zero -/* D2DCA4 80241F74 0C0906D6 */ jal func_80241B58_D2D888 +/* D2DCA4 80241F74 0C0906D6 */ jal sam_07_UnkNpcAIFunc33 /* D2DCA8 80241F78 0280302D */ daddu $a2, $s4, $zero /* D2DCAC 80241F7C 8E430070 */ lw $v1, 0x70($s2) /* D2DCB0 80241F80 2402000D */ addiu $v0, $zero, 0xd diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index 0542bc0a3d..6a206599d2 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -12291,11 +12291,11 @@ mim_01_UnkNpcAIFunc5 = 0x802406B4; // type:func rom:0xB93AF4 mim_01_UnkNpcAIFunc26 = 0x80240708; // type:func rom:0xB93B48 mim_01_UnkFunc7 = 0x802408BC; // type:func rom:0xB93CFC mim_01_UnkNpcAIFunc27 = 0x80240B1C; // type:func rom:0xB93F5C -func_80240DD0_B94210 = 0x80240DD0; // type:func rom:0xB94210 -func_80240E3C_B9427C = 0x80240E3C; // type:func rom:0xB9427C +mim_01_UnkNpcAIFunc31 = 0x80240DD0; // type:func rom:0xB94210 +mim_01_UnkNpcAIFunc32 = 0x80240E3C; // type:func rom:0xB9427C func_80240F38_B94378 = 0x80240F38; // type:func rom:0xB94378 mim_01_UnkNpcDurationFlagFunc3 = 0x80241978; // type:func rom:0xB94DB8 -func_80241A08_B94E48 = 0x80241A08; // type:func rom:0xB94E48 +mim_01_UnkNpcAIFunc33 = 0x80241A08; // type:func rom:0xB94E48 mim_01_UnkNpcDurationFlagFunc2 = 0x80241B08; // type:func rom:0xB94F48 mim_01_UnkNpcAIFunc30 = 0x80241B68; // type:func rom:0xB94FA8 func_80241C54_B95094 = 0x80241C54; // type:func rom:0xB95094 @@ -12354,11 +12354,11 @@ mim_05_UnkNpcAIFunc5 = 0x80240224; // type:func rom:0xBA0954 mim_05_UnkNpcAIFunc26 = 0x80240278; // type:func rom:0xBA09A8 mim_05_UnkFunc7 = 0x8024042C; // type:func rom:0xBA0B5C mim_05_UnkNpcAIFunc27 = 0x8024068C; // type:func rom:0xBA0DBC -func_80240940_BA1070 = 0x80240940; // type:func rom:0xBA1070 -func_802409AC_BA10DC = 0x802409AC; // type:func rom:0xBA10DC +mim_05_UnkNpcAIFunc31 = 0x80240940; // type:func rom:0xBA1070 +mim_05_UnkNpcAIFunc32 = 0x802409AC; // type:func rom:0xBA10DC btl_restore_world_cameras_BA11D8 = 0x80240AA8; // type:func rom:0xBA11D8 mim_05_UnkNpcDurationFlagFunc3 = 0x802414E8; // type:func rom:0xBA1C18 -func_80241578_BA1CA8 = 0x80241578; // type:func rom:0xBA1CA8 +mim_05_UnkNpcAIFunc33 = 0x80241578; // type:func rom:0xBA1CA8 mim_05_UnkNpcDurationFlagFunc2 = 0x80241678; // type:func rom:0xBA1DA8 mim_05_UnkNpcAIFunc30 = 0x802416D8; // type:func rom:0xBA1E08 func_802417C4_BA1EF4 = 0x802417C4; // type:func rom:0xBA1EF4 @@ -12380,11 +12380,11 @@ mim_06_UnkNpcAIFunc5 = 0x80240724; // type:func rom:0xBA4EA4 mim_06_UnkNpcAIFunc26 = 0x80240778; // type:func rom:0xBA4EF8 mim_06_UnkFunc7 = 0x8024092C; // type:func rom:0xBA50AC mim_06_UnkNpcAIFunc27 = 0x80240B8C; // type:func rom:0xBA530C -func_80240E40_BA55C0 = 0x80240E40; // type:func rom:0xBA55C0 -func_80240EAC_BA562C = 0x80240EAC; // type:func rom:0xBA562C +mim_06_UnkNpcAIFunc31 = 0x80240E40; // type:func rom:0xBA55C0 +mim_06_UnkNpcAIFunc32 = 0x80240EAC; // type:func rom:0xBA562C func_80240FA8_BA5728 = 0x80240FA8; // type:func rom:0xBA5728 mim_06_UnkNpcDurationFlagFunc3 = 0x802419E8; // type:func rom:0xBA6168 -func_80241A78_BA61F8 = 0x80241A78; // type:func rom:0xBA61F8 +mim_06_UnkNpcAIFunc33 = 0x80241A78; // type:func rom:0xBA61F8 mim_06_UnkNpcDurationFlagFunc2 = 0x80241B78; // type:func rom:0xBA62F8 mim_06_UnkNpcAIFunc30 = 0x80241BD8; // type:func rom:0xBA6358 func_80241CC4_BA6444 = 0x80241CC4; // type:func rom:0xBA6444 @@ -12441,11 +12441,11 @@ mim_08_UnkNpcAIFunc5 = 0x8024174C; // type:func rom:0xBAF08C mim_08_UnkNpcAIFunc26 = 0x802417A0; // type:func rom:0xBAF0E0 mim_08_UnkFunc7 = 0x80241954; // type:func rom:0xBAF294 mim_08_UnkNpcAIFunc27 = 0x80241BB4; // type:func rom:0xBAF4F4 -func_80241E68_BAF7A8 = 0x80241E68; // type:func rom:0xBAF7A8 -func_80241ED4_BAF814 = 0x80241ED4; // type:func rom:0xBAF814 +mim_08_UnkNpcAIFunc31 = 0x80241E68; // type:func rom:0xBAF7A8 +mim_08_UnkNpcAIFunc32 = 0x80241ED4; // type:func rom:0xBAF814 func_80241FD0_BAF910 = 0x80241FD0; // type:func rom:0xBAF910 mim_08_UnkNpcDurationFlagFunc3 = 0x80242A10; // type:func rom:0xBB0350 -func_80242AA0_BB03E0 = 0x80242AA0; // type:func rom:0xBB03E0 +mim_08_UnkNpcAIFunc33 = 0x80242AA0; // type:func rom:0xBB03E0 mim_08_UnkNpcDurationFlagFunc2 = 0x80242BA0; // type:func rom:0xBB04E0 mim_08_UnkNpcAIFunc30 = 0x80242C00; // type:func rom:0xBB0540 func_80242CEC_BB062C = 0x80242CEC; // type:func rom:0xBB062C @@ -14366,11 +14366,11 @@ kzn_03_UnkNpcAIFunc5 = 0x80240DAC; // type:func rom:0xC61ABC kzn_03_UnkNpcAIFunc26 = 0x80240E00; // type:func rom:0xC61B10 kzn_03_UnkFunc7 = 0x80240FB4; // type:func rom:0xC61CC4 kzn_03_UnkNpcAIFunc27 = 0x80241214; // type:func rom:0xC61F24 -func_802414C8_C621D8 = 0x802414C8; // type:func rom:0xC621D8 -func_80241534_C62244 = 0x80241534; // type:func rom:0xC62244 +kzn_03_UnkNpcAIFunc31 = 0x802414C8; // type:func rom:0xC621D8 +kzn_03_UnkNpcAIFunc32 = 0x80241534; // type:func rom:0xC62244 func_80241630_C62340 = 0x80241630; // type:func rom:0xC62340 kzn_03_UnkNpcDurationFlagFunc3 = 0x80242070; // type:func rom:0xC62D80 -func_80242100_C62E10 = 0x80242100; // type:func rom:0xC62E10 +kzn_03_UnkNpcAIFunc33 = 0x80242100; // type:func rom:0xC62E10 kzn_03_UnkNpcDurationFlagFunc2 = 0x80242200; // type:func rom:0xC62F10 kzn_03_UnkNpcAIFunc30 = 0x80242260; // type:func rom:0xC62F70 func_8024234C_C6305C = 0x8024234C; // type:func rom:0xC6305C @@ -14504,11 +14504,11 @@ kzn_08_UnkNpcAIFunc5 = 0x802426F0; // type:func rom:0xC73B70 kzn_08_UnkNpcAIFunc26 = 0x80242744; // type:func rom:0xC73BC4 kzn_08_UnkFunc7 = 0x802428F8; // type:func rom:0xC73D78 kzn_08_UnkNpcAIFunc27 = 0x80242B58; // type:func rom:0xC73FD8 -func_80242E0C_C7428C = 0x80242E0C; // type:func rom:0xC7428C -func_80242E78_C742F8 = 0x80242E78; // type:func rom:0xC742F8 +kzn_08_UnkNpcAIFunc31 = 0x80242E0C; // type:func rom:0xC7428C +kzn_08_UnkNpcAIFunc32 = 0x80242E78; // type:func rom:0xC742F8 func_80242F74_C743F4 = 0x80242F74; // type:func rom:0xC743F4 kzn_08_UnkNpcDurationFlagFunc3 = 0x802439B4; // type:func rom:0xC74E34 -func_80243A44_C74EC4 = 0x80243A44; // type:func rom:0xC74EC4 +kzn_08_UnkNpcAIFunc33 = 0x80243A44; // type:func rom:0xC74EC4 kzn_08_UnkNpcDurationFlagFunc2 = 0x80243B44; // type:func rom:0xC74FC4 kzn_08_UnkNpcAIFunc30 = 0x80243BA4; // type:func rom:0xC75024 func_80243C90_C75110 = 0x80243C90; // type:func rom:0xC75110 @@ -14557,11 +14557,11 @@ kzn_09_UnkNpcAIFunc5 = 0x802411D4; // type:func rom:0xC77EB4 kzn_09_UnkNpcAIFunc26 = 0x80241228; // type:func rom:0xC77F08 kzn_09_UnkFunc7 = 0x802413DC; // type:func rom:0xC780BC kzn_09_UnkNpcAIFunc27 = 0x8024163C; // type:func rom:0xC7831C -func_802418F0_C785D0 = 0x802418F0; // type:func rom:0xC785D0 -func_8024195C_C7863C = 0x8024195C; // type:func rom:0xC7863C +kzn_09_UnkNpcAIFunc31 = 0x802418F0; // type:func rom:0xC785D0 +kzn_08_UnkNpcAIFunc32 = 0x8024195C; // type:func rom:0xC7863C func_80241A58_C78738 = 0x80241A58; // type:func rom:0xC78738 kzn_09_UnkNpcDurationFlagFunc3 = 0x80242498; // type:func rom:0xC79178 -func_80242528_C79208 = 0x80242528; // type:func rom:0xC79208 +kzn_09_UnkNpcAIFunc33 = 0x80242528; // type:func rom:0xC79208 kzn_09_UnkNpcDurationFlagFunc2 = 0x80242628; // type:func rom:0xC79308 kzn_09_UnkNpcAIFunc30 = 0x80242688; // type:func rom:0xC79368 func_80242774_C79454 = 0x80242774; // type:func rom:0xC79454 @@ -14651,11 +14651,11 @@ kzn_17_UnkNpcAIFunc5 = 0x802404C4; // type:func rom:0xC85F74 kzn_17_UnkNpcAIFunc26 = 0x80240518; // type:func rom:0xC85FC8 kzn_17_UnkFunc7 = 0x802406CC; // type:func rom:0xC8617C kzn_17_UnkNpcAIFunc27 = 0x8024092C; // type:func rom:0xC863DC -func_80240BE0_C86690 = 0x80240BE0; // type:func rom:0xC86690 -func_80240C4C_C866FC = 0x80240C4C; // type:func rom:0xC866FC +kzn_17_UnkNpcAIFunc31 = 0x80240BE0; // type:func rom:0xC86690 +kzn_17_UnkNpcAIFunc32 = 0x80240C4C; // type:func rom:0xC866FC func_80240D48_C867F8 = 0x80240D48; // type:func rom:0xC867F8 kzn_17_UnkNpcDurationFlagFunc3 = 0x80241788; // type:func rom:0xC87238 -func_80241818_C872C8 = 0x80241818; // type:func rom:0xC872C8 +kzn_17_UnkNpcAIFunc33 = 0x80241818; // type:func rom:0xC872C8 kzn_17_UnkNpcDurationFlagFunc2 = 0x80241918; // type:func rom:0xC873C8 kzn_17_UnkNpcAIFunc30 = 0x80241978; // type:func rom:0xC87428 func_80241A64_C87514 = 0x80241A64; // type:func rom:0xC87514 @@ -16038,11 +16038,11 @@ sam_05_UnkNpcAIFunc5 = 0x802401B4; // type:func rom:0xD18994 sam_05_UnkNpcAIFunc26 = 0x80240208; // type:func rom:0xD189E8 sam_05_UnkFunc7 = 0x802403BC; // type:func rom:0xD18B9C sam_05_UnkNpcAIFunc27 = 0x8024061C; // type:func rom:0xD18DFC -func_802408D0_D190B0 = 0x802408D0; // type:func rom:0xD190B0 -func_8024093C_D1911C = 0x8024093C; // type:func rom:0xD1911C +sam_05_UnkNpcAIFunc31 = 0x802408D0; // type:func rom:0xD190B0 +sam_05_UnkNpcAIFunc32 = 0x8024093C; // type:func rom:0xD1911C func_80240A38_D19218 = 0x80240A38; // type:func rom:0xD19218 sam_05_UnkNpcDurationFlagFunc3 = 0x80241478; // type:func rom:0xD19C58 -func_80241508_D19CE8 = 0x80241508; // type:func rom:0xD19CE8 +sam_05_UnkNpcAIFunc33 = 0x80241508; // type:func rom:0xD19CE8 sam_05_UnkNpcDurationFlagFunc2 = 0x80241608; // type:func rom:0xD19DE8 sam_05_UnkNpcAIFunc30 = 0x80241668; // type:func rom:0xD19E48 func_80241754_D19F34 = 0x80241754; // type:func rom:0xD19F34 @@ -16115,11 +16115,11 @@ sam_07_UnkNpcAIFunc5 = 0x80240804; // type:func rom:0xD2C534 sam_07_UnkNpcAIFunc26 = 0x80240858; // type:func rom:0xD2C588 sam_07_UnkFunc7 = 0x80240A0C; // type:func rom:0xD2C73C sam_07_UnkNpcAIFunc27 = 0x80240C6C; // type:func rom:0xD2C99C -func_80240F20_D2CC50 = 0x80240F20; // type:func rom:0xD2CC50 -func_80240F8C_D2CCBC = 0x80240F8C; // type:func rom:0xD2CCBC +sam_07_UnkNpcAIFunc31 = 0x80240F20; // type:func rom:0xD2CC50 +sam_07_UnkNpcAIFunc32 = 0x80240F8C; // type:func rom:0xD2CCBC func_80241088_D2CDB8 = 0x80241088; // type:func rom:0xD2CDB8 sam_07_UnkNpcDurationFlagFunc3 = 0x80241AC8; // type:func rom:0xD2D7F8 -func_80241B58_D2D888 = 0x80241B58; // type:func rom:0xD2D888 +sam_07_UnkNpcAIFunc33 = 0x80241B58; // type:func rom:0xD2D888 sam_07_UnkNpcDurationFlagFunc2 = 0x80241C58; // type:func rom:0xD2D988 sam_07_UnkNpcAIFunc30 = 0x80241CB8; // type:func rom:0xD2D9E8 func_80241DA4_D2DAD4 = 0x80241DA4; // type:func rom:0xD2DAD4 @@ -17670,38 +17670,38 @@ D_802BCBD0_E31520 = 0x802BCBD0; // type:data rom:0xE31520 D_802BCBD8_E31528 = 0x802BCBD8; // type:data rom:0xE31528 EA0900_DeadUnkTexturePanFunc = 0x80240000; // type:func rom:0xEA0900 EA0900_DeadUnkTexturePanFunc2 = 0x80240124; // type:func rom:0xEA0A24 -func_80240310_EA0C10 = 0x80240310; // type:func rom:0xEA0C10 -func_8024037C_EA0C7C = 0x8024037C; // type:func rom:0xEA0C7C -func_802403EC_EA0CEC = 0x802403EC; // type:func rom:0xEA0CEC -func_802404C4_EA0DC4 = 0x802404C4; // type:func rom:0xEA0DC4 -func_80240518_EA0E18 = 0x80240518; // type:func rom:0xEA0E18 +EA0C10_UnkNpcAIFunc6 = 0x80240310; // type:func rom:0xEA0C10 +EA0C10_UnkNpcAIFunc7 = 0x8024037C; // type:func rom:0xEA0C7C +EA0C10_UnkNpcAIFunc8 = 0x802403EC; // type:func rom:0xEA0CEC +EA0C10_UnkNpcAIFunc5 = 0x802404C4; // type:func rom:0xEA0DC4 +EA0C10_UnkNpcAIFunc26 = 0x80240518; // type:func rom:0xEA0E18 func_802406CC_EA0FCC = 0x802406CC; // type:func rom:0xEA0FCC func_8024097C_EA127C = 0x8024097C; // type:func rom:0xEA127C -func_80240C5C_EA155C = 0x80240C5C; // type:func rom:0xEA155C -func_80240CC8_EA15C8 = 0x80240CC8; // type:func rom:0xEA15C8 +EA0C10_UnkNpcAIFunc31 = 0x80240C5C; // type:func rom:0xEA155C +EA0C10_UnkNpcAIFunc32 = 0x80240CC8; // type:func rom:0xEA15C8 func_80240DC4_EA16C4 = 0x80240DC4; // type:func rom:0xEA16C4 -func_80241804_EA2104 = 0x80241804; // type:func rom:0xEA2104 -func_80241894_EA2194 = 0x80241894; // type:func rom:0xEA2194 -func_80241994_EA2294 = 0x80241994; // type:func rom:0xEA2294 -func_802419F4_EA22F4 = 0x802419F4; // type:func rom:0xEA22F4 +EA0C10_UnkNpcDurationFlagFunc3 = 0x80241804; // type:func rom:0xEA2104 +EA0C10_UnkNpcAIFunc33 = 0x80241894; // type:func rom:0xEA2194 +EA0C10_UnkNpcDurationFlagFunc2 = 0x80241994; // type:func rom:0xEA2294 +EA0C10_UnkNpcAIFunc30 = 0x802419F4; // type:func rom:0xEA22F4 func_80241AE0_EA23E0 = 0x80241AE0; // type:func rom:0xEA23E0 -func_80241D68_EA2668 = 0x80241D68; // type:func rom:0xEA2668 -func_80241DE4_EA26E4 = 0x80241DE4; // type:func rom:0xEA26E4 -func_80241F18_EA2818 = 0x80241F18; // type:func rom:0xEA2818 -func_8024207C_EA297C = 0x8024207C; // type:func rom:0xEA297C +EA0C10_set_script_owner_npc_anim = 0x80241D68; // type:func rom:0xEA2668 +EA0C10_UnkDistFunc = 0x80241DE4; // type:func rom:0xEA26E4 +EA0C10_UnkNpcAIFunc12 = 0x80241F18; // type:func rom:0xEA2818 +EA0C10_set_script_owner_npc_col_height = 0x8024207C; // type:func rom:0xEA297C func_802420FC_EA29FC = 0x802420FC; // type:func rom:0xEA29FC func_80242568_EA2E68 = 0x80242568; // type:func rom:0xEA2E68 func_802425B0_EA2EB0 = 0x802425B0; // type:func rom:0xEA2EB0 func_80242608_EA2F08 = 0x80242608; // type:func rom:0xEA2F08 func_8024267C_EA2F7C = 0x8024267C; // type:func rom:0xEA2F7C EA0C10_DeadGetItemName = 0x80242730; // type:func rom:0xEA3030 -func_80242794_EA3094 = 0x80242794; // type:func rom:0xEA3094 +func_802427F0_EA30F0 = 0x80242794; // type:func rom:0xEA3094 func_802427F0_EA30F0 = 0x802427F0; // type:func rom:0xEA30F0 func_802429C0_EA32C0 = 0x802429C0; // type:func rom:0xEA32C0 func_80242A14_EA3314 = 0x80242A14; // type:func rom:0xEA3314 func_80242A4C_EA334C = 0x80242A4C; // type:func rom:0xEA334C func_80242AE8_EA33E8 = 0x80242AE8; // type:func rom:0xEA33E8 -func_80242BD8_EA34D8 = 0x80242BD8; // type:func rom:0xEA34D8 +EA0C10_UnkYawFunc = 0x80242BD8; // type:func rom:0xEA34D8 func_80242D64_EA3664 = 0x80242D64; // type:func rom:0xEA3664 func_80242DA8_EA36A8 = 0x80242DA8; // type:func rom:0xEA36A8 func_80242DE0_EA36E0 = 0x80242DE0; // type:func rom:0xEA36E0 @@ -17753,13 +17753,13 @@ func_802413FC_EA9EDC = 0x802413FC; // type:func rom:0xEA9EDC func_8024140C_EA9EEC = 0x8024140C; // type:func rom:0xEA9EEC func_80241468_EA9F48 = 0x80241468; // type:func rom:0xEA9F48 EA8AE0_DeadGetItemName = 0x8024151C; // type:func rom:0xEA9FFC -func_80241580_EAA060 = 0x80241580; // type:func rom:0xEAA060 +EA8AE0_GetNpcCollisionHeight = 0x80241580; // type:func rom:0xEAA060 func_802415DC_EAA0BC = 0x802415DC; // type:func rom:0xEAA0BC func_802417AC_EAA28C = 0x802417AC; // type:func rom:0xEAA28C func_80241800_EAA2E0 = 0x80241800; // type:func rom:0xEAA2E0 func_80241838_EAA318 = 0x80241838; // type:func rom:0xEAA318 func_802418D4_EAA3B4 = 0x802418D4; // type:func rom:0xEAA3B4 -func_802419C4_EAA4A4 = 0x802419C4; // type:func rom:0xEAA4A4 +EA8AE0_UnkYawFunc = 0x802419C4; // type:func rom:0xEAA4A4 func_80241B50_EAA630 = 0x80241B50; // type:func rom:0xEAA630 func_80241B94_EAA674 = 0x80241B94; // type:func rom:0xEAA674 func_80241BC0_EAA6A0 = 0x80241BC0; // type:func rom:0xEAA6A0 @@ -17773,13 +17773,13 @@ EB0E60_DeadUnkTexturePanFunc = 0x80240000; // type:func rom:0xEB0E60 EB0E60_DeadUnkTexturePanFunc2 = 0x80240124; // type:func rom:0xEB0F84 func_80240310_EB1170 = 0x80240310; // type:func rom:0xEB1170 EB1170_DeadGetItemName = 0x802403C4; // type:func rom:0xEB1224 -func_80240428_EB1288 = 0x80240428; // type:func rom:0xEB1288 +EB1170_GetNpcCollisionHeight = 0x80240428; // type:func rom:0xEB1288 func_80240484_EB12E4 = 0x80240484; // type:func rom:0xEB12E4 func_80240654_EB14B4 = 0x80240654; // type:func rom:0xEB14B4 func_802406A8_EB1508 = 0x802406A8; // type:func rom:0xEB1508 func_802406E0_EB1540 = 0x802406E0; // type:func rom:0xEB1540 func_8024077C_EB15DC = 0x8024077C; // type:func rom:0xEB15DC -func_8024086C_EB16CC = 0x8024086C; // type:func rom:0xEB16CC +EB1170_UnkYawFunc = 0x8024086C; // type:func rom:0xEB16CC func_802409F8_EB1858 = 0x802409F8; // type:func rom:0xEB1858 func_80240A3C_EB189C = 0x80240A3C; // type:func rom:0xEB189C func_80240A68_EB18C8 = 0x80240A68; // type:func rom:0xEB18C8 @@ -17872,7 +17872,7 @@ func_80240D80_ECAA80 = 0x80240D80; // type:func rom:0xECAA80 func_80241364_ECB064 = 0x80241364; // type:func rom:0xECB064 func_802414C8_ECB1C8 = 0x802414C8; // type:func rom:0xECB1C8 func_8024150C_ECB20C = 0x8024150C; // type:func rom:0xECB20C -func_80241770_ECB470 = 0x80241770; // type:func rom:0xECB470 +ECAA80_GetNpcCollisionHeight = 0x80241770; // type:func rom:0xECB470 func_802417CC_ECB4CC = 0x802417CC; // type:func rom:0xECB4CC func_8024199C_ECB69C = 0x8024199C; // type:func rom:0xECB69C func_802419F0_ECB6F0 = 0x802419F0; // type:func rom:0xECB6F0 @@ -17935,7 +17935,7 @@ EDC020_dead_foliage_setup_shear_mtx = 0x80240040; // type:func rom:0xEDC020 EDC020_DeadTransformFoliage = 0x802400B0; // type:func rom:0xEDC090 func_8024027C_EDC25C = 0x8024027C; // type:func rom:0xEDC25C EDC020_DeadGetItemName = 0x80240330; // type:func rom:0xEDC310 -func_80240394_EDC374 = 0x80240394; // type:func rom:0xEDC374 +EDC020_GetNpcCollisionHeight = 0x80240394; // type:func rom:0xEDC374 func_802403F0_EDC3D0 = 0x802403F0; // type:func rom:0xEDC3D0 func_802405C0_EDC5A0 = 0x802405C0; // type:func rom:0xEDC5A0 func_80240614_EDC5F4 = 0x80240614; // type:func rom:0xEDC5F4 @@ -17960,10 +17960,10 @@ func_802416E8_EE00A8 = 0x802416E8; // type:func rom:0xEE00A8 func_80241730_EE00F0 = 0x80241730; // type:func rom:0xEE00F0 func_80241B94_EE0554 = 0x80241B94; // type:func rom:0xEE0554 func_80241DE4_EE07A4 = 0x80241DE4; // type:func rom:0xEE07A4 -func_802422F0_EE0CB0 = 0x802422F0; // type:func rom:0xEE0CB0 -func_8024236C_EE0D2C = 0x8024236C; // type:func rom:0xEE0D2C -func_802424A0_EE0E60 = 0x802424A0; // type:func rom:0xEE0E60 -func_80242604_EE0FC4 = 0x80242604; // type:func rom:0xEE0FC4 +EDEA00_set_script_owner_npc_anim = 0x802422F0; // type:func rom:0xEE0CB0 +EDEA00_UnkDistFunc = 0x8024236C; // type:func rom:0xEE0D2C +EDEA00_UnkNpcAIFunc12 = 0x802424A0; // type:func rom:0xEE0E60 +EDEA00_set_script_owner_npc_col_height = 0x80242604; // type:func rom:0xEE0FC4 func_80242684_EE1044 = 0x80242684; // type:func rom:0xEE1044 func_80242AF0_EE14B0 = 0x80242AF0; // type:func rom:0xEE14B0 pause_interp_text_scroll_EE1DD8 = 0x80243418; // type:func rom:0xEE1DD8 @@ -17998,7 +17998,7 @@ EE70C0_UnkNpcAIFunc3 = 0x80241904; // type:func rom:0xEE7EB4 EE70C0_UnkFunc6 = 0x80241968; // type:func rom:0xEE7F18 EE70C0_UnkFunc5 = 0x80241CF8; // type:func rom:0xEE82A8 func_80241E1C_EE83CC = 0x80241E1C; // type:func rom:0xEE83CC -func_80242034_EE85E4 = 0x80242034; // type:func rom:0xEE85E4 +EE70C0_GetNpcCollisionHeight = 0x80242034; // type:func rom:0xEE85E4 func_80242090_EE8640 = 0x80242090; // type:func rom:0xEE8640 func_80242260_EE8810 = 0x80242260; // type:func rom:0xEE8810 func_802422B4_EE8864 = 0x802422B4; // type:func rom:0xEE8864 @@ -18183,7 +18183,7 @@ EnemyNpcHit = 0x80077F70; // EnemyNpcDefeat = 0x8007809C; // D_80079430 = 0x80079430; // type:data D_80079540 = 0x80079540; // type:data -D_8007C760 = 0x8007C760; // type:data +dead_gCurrentCameraID = 0x8007C760; // type:data D_8007FF20 = 0x8007FF20; // type:data D_80080208 = 0x80080208; // type:data D_800806A0 = 0x800806A0; // type:data @@ -18374,7 +18374,7 @@ D_800A0F44 = 0x800A0F44; // type:data D_800A0F50 = 0x800A0F50; // type:data D_800A0F58 = 0x800A0F58; // type:data D_800A1530 = 0x800A1530; // type:data -D_800A158C = 0x800A158C; // type:data +dead_gCurrentCamID = 0x800A158C; // type:data D_800A15A4 = 0x800A15A4; // type:data D_800A15A8 = 0x800A15A8; // type:data D_800A15C4 = 0x800A15C4; // type:data @@ -18836,7 +18836,7 @@ D_8010F250 = 0x8010F250; // type:data gPlayerData = 0x8010F290; // size:0x340 gSpinHistoryPosAngle = 0x8010F6B8; // type:data D_80117160 = 0x80117160; // type:data -D_80117163 = 0x80117163; // type:data +dead_gPartnerActionStatus = 0x80117163; // type:data dead_gPlayerStatus = 0x80117578; // type:data D_80117604 = 0x80117604; // type:data dead_gPlayerActionState = 0x8011762C; // type:data diff --git a/ver/us/undefined_syms.txt b/ver/us/undefined_syms.txt index cefc867b94..e1cdb1dc46 100644 --- a/ver/us/undefined_syms.txt +++ b/ver/us/undefined_syms.txt @@ -65,7 +65,7 @@ D_8000031C = 0x8000031C; D_80026AC7 = 0x80026AC7; D_8004AA85 = 0x8004AA85; D_80117160 = 0x80117160; -D_80117163 = 0x80117163; +dead_gPartnerActionStatus = 0x80117163; dead_gPlayerStatus = 0x80117578; D_80117604 = 0x80117604; dead_gPlayerActionState = 0x8011762C; @@ -1413,7 +1413,7 @@ D_800A0F44 = 0x800A0F44; D_800A0F50 = 0x800A0F50; D_800A0F58 = 0x800A0F58; D_800A1530 = 0x800A1530; -D_800A158C = 0x800A158C; +dead_gCurrentCamID = 0x800A158C; D_800A15A4 = 0x800A15A4; D_800A15A8 = 0x800A15A8; D_800A15C4 = 0x800A15C4; @@ -1757,7 +1757,7 @@ dead_dist2D = 0x8002B1C4; dead_get_clamped_angle_diff = 0x8002AF18; dead_clamp_angle = 0x8002AE14; dead_ai_enemy_play_sound = 0x8004D800; -func_8002B28C = 0x8002B28C; +dead_add_vec2D_polar = 0x8002B28C; func_8004D9C0 = 0x8004D9C0; func_8004DAD8 = 0x8004DAD8; func_8004DF64 = 0x8004DF64; @@ -1776,7 +1776,7 @@ dead_npc_raycast_down_sides = 0x800E423C; dead_is_point_within_region = 0x8004D0C4; func_8004D8E0 = 0x8004D8E0; dead_rand_int = 0x8002ACEC; -func_8003E534 = 0x8003E534; +dead_get_npc_safe = 0x8003E534; func_8002BFD4 = 0x8002BFD4; func_8002C01C = 0x8002C01C; dead_sin_deg = 0x8002B5DC;