diff --git a/include/common_structs.h b/include/common_structs.h index 697a93c047..72e9308c7f 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -2318,6 +2318,62 @@ typedef struct unkPartnerStruct { /* 0x018 */ f32 unk_18; } unkPartnerStruct; // size = 0x1C +typedef struct EffectStruct { + char unk_00[0x4]; + f32 unk_04; + f32 unk_08; + f32 unk_0C; + f32 unk_10; + char unk_14[0x4]; + s32 unk_18; + s32 unk_1C; + s32 unk_20; + X32 unk_24; + s32 unk_28; + s32 unk_2C; + s32 unk_30; + u8 unk_34; + s32 unk_38; + char unk_3C[0xC]; + EffectUnkStruct1* unk_48; + char unk_4C[0x24]; + s32 unk_70; + s32 unk_74; +} EffectStruct; + +typedef struct StarSpiritEffectUnkStruct { + char unk_00[0xC]; + EffectStruct* unk_0C; +} StarSpiritEffectUnkStruct; + +typedef struct StarSpiritEffect { + /* 0x00 */ f32 unk_00; + /* 0x04 */ f32 unk_04; + /* 0x08 */ f32 unk_08; + /* 0x0C */ f32 unk_0C; + /* 0x10 */ f32 unk_10; + /* 0x14 */ f32 unk_14; + /* 0x18 */ f32 unk_18; + /* 0x1C */ f32 unk_1C; + /* 0x20 */ f32 unk_20; + /* 0x24 */ f32 unk_24; + /* 0x28 */ f32 unk_28; + /* 0x2C */ f32 unk_2C; + /* 0x30 */ f32 unk_30; + /* 0x34 */ f32 unk_34; + /* 0x38 */ s32 unk_38; + /* 0x3C */ s32 unk_3C; + /* 0x40 */ Shadow* unk_40; + /* 0x44 */ s16 unk_44; + /* 0x46 */ s16 unk_46; + /* 0x48 */ s16 unk_48; + /* 0x4A */ s16 unk_4A; + /* 0x4C */ s16 unk_4C; + /* 0x4E */ s16 unk_4E; + /* 0x50 */ struct StarSpiritEffectUnkStruct* unk_50; + /* 0x54 */ struct StarSpiritEffectUnkStruct* unk_54; +} StarSpiritEffect; // size = 0x58 + typedef struct struct8015A578 { /* 0x00 */ u8 unk_00; /* 0x01 */ u8 unk_01; diff --git a/include/dead.h b/include/dead.h index 42d4001dd1..f80dd43437 100644 --- a/include/dead.h +++ b/include/dead.h @@ -1,3 +1,5 @@ +#include "ultra64.h" + #ifndef _DEAD_H_ #define _DEAD_H_ @@ -45,5 +47,14 @@ #define gCurrentCamID dead_gCurrentCamID #define gPartnerActionStatus dead_gPartnerActionStatus #define get_npc_safe dead_get_npc_safe +#define sfx_adjust_env_sound_pos dead_sfx_adjust_env_sound_pos +#define playFX_83 dead_playFX_83 +#define heap_malloc dead_heap_malloc +#define update_lerp dead_update_lerp +#define create_shadow_type dead_create_shadow_type +#define playFX_7B dead_playFX_7B +#define dist3D dead_dist3D +#define subtract_hp dead_subtract_hp +//#define sqrtf dead_sqrtf // <- This somehow breaks things #endif diff --git a/include/enums.h b/include/enums.h index c6103ec5a1..f12ef2fe0c 100644 --- a/include/enums.h +++ b/include/enums.h @@ -503,6 +503,8 @@ enum SoundIDs { SOUND_JR_TROOPA_SPLASH = 69, SOUND_JR_TROOPA_SWIM, SOUND_BOO_SPOOK, + SOUND_UNKNOWN_52 = 82, + SOUND_UNKNOWN_A2 = 162, SOUND_UNKNOWN_B4 = 180, SOUND_BOO_VANISH = 193, SOUND_BOO_APPEAR = 195, diff --git a/src/EA0C10.c b/src/EA0C10.c index 02b2de0f95..a53504b0df 100644 --- a/src/EA0C10.c +++ b/src/EA0C10.c @@ -130,7 +130,7 @@ ApiStatus func_80242A4C_EA334C(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "EA0C10", func_80242AE8_EA33E8); +#include "world/common/SetManyVars.inc.c" #include "world/common/UnkYawFunc.inc.c" diff --git a/src/EA36E0.c b/src/EA36E0.c index 4990f0ecfc..1aef2498b6 100644 --- a/src/EA36E0.c +++ b/src/EA36E0.c @@ -1,18 +1,57 @@ #include "dead.h" #include "common.h" -INCLUDE_ASM(s32, "EA36E0", func_80242DE0_EA36E0); +#define NAMESPACE EA36E0 + +// Copy of kzn_17? + +#define UNK_FUNC_50_VAR1 -583.0 +#define UNK_FUNC_50_VAR2 165.0 + +ApiStatus N(SpinyTrompHit)(Evt* script, s32 isInitialCall) { + subtract_hp(1); + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "EA36E0", func_80242E00_EA3700); -INCLUDE_ASM(s32, "EA36E0", func_80242E2C_EA372C); +#include "world/common/UnkFunc46.inc.c" +// TODO: Linker magic +// Normally this would be #include "world/common/UnkFunc47.inc.c" +// Due to sqrtf being an inline/instrinsic func, we can't use dead.h +#ifdef NON_MATCHING +ApiStatus func_80242EC4_EA37C4(Evt* script, s32 isInitialCall) { + f32 var1 = script->varTable[0] - gPlayerStatus.position.x; + f32 var2 = script->varTable[2] - gPlayerStatus.position.y; + f32 var3 = 0.0f - gPlayerStatus.position.z; + + script->varTable[4] = sqrtf((var1 * var1) + (var2 * var2) + (var3 * var3)); + + return ApiStatus_DONE2; +} +#else INCLUDE_ASM(s32, "EA36E0", func_80242EC4_EA37C4); +#endif -INCLUDE_ASM(s32, "EA36E0", func_80242F64_EA3864); +#include "world/common/UnkFunc48.inc.c" -INCLUDE_ASM(s32, "EA36E0", func_80242F9C_EA389C); +#include "world/common/UnkFunc49.inc.c" +// TODO: Linker magic +// Normally this would be #include "world/common/UnkFunc50.inc.c" +// Due to sqrtf being an inline/instrinsic func, we can't use dead.h +#ifdef NON_MATCHING +ApiStatus func_80243054_EA3954(Evt* script, s32 isInitialCall) { + f32 temp_f2 = UNK_FUNC_50_VAR1 - script->varTable[0]; //-469.0 + f32 temp_f0 = UNK_FUNC_50_VAR2 - script->varTable[2]; //46.0 + + script->varTable[3] = -sqrtf((temp_f2 * temp_f2) + (temp_f0 * temp_f0)); + + return ApiStatus_DONE2; +} +#else INCLUDE_ASM(s32, "EA36E0", func_80243054_EA3954); +#endif -INCLUDE_ASM(s32, "EA36E0", func_802430E4_EA39E4); +#include "world/common/UnkFunc51.inc.c" diff --git a/src/EA7320.c b/src/EA7320.c index 42e00b0d6c..897e6de0f3 100644 --- a/src/EA7320.c +++ b/src/EA7320.c @@ -3,6 +3,8 @@ #define NAMESPACE EA7320 +extern s16 D_80169B12; + ApiStatus func_80240350_EA7320(Evt* script, s32 isInitialCall) { Camera* camera = &gCameras[0]; @@ -10,6 +12,12 @@ ApiStatus func_80240350_EA7320(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "EA7320", func_8024036C_EA733C); +ApiStatus func_8024036C_EA733C(Evt* script, s32 isInitialCall) { + gCameras->flags &= ~0x1000; + return ApiStatus_DONE2; +} -INCLUDE_ASM(s32, "EA7320", func_80240388_EA7358); +ApiStatus func_80240388_EA7358(Evt* script, s32 isInitialCall) { + evt_set_variable(script, *script->ptrReadPos, D_80169B12); + return ApiStatus_DONE2; +} diff --git a/src/EA8AE0.c b/src/EA8AE0.c index caf5ed5196..2c9ae4b5b9 100644 --- a/src/EA8AE0.c +++ b/src/EA8AE0.c @@ -1,30 +1,24 @@ #include "dead.h" #include "common.h" +#include "effects.h" + +// Copy of kzn_19? #define NAMESPACE EA8AE0 extern s32 D_80248388[]; +extern s32 D_80248380; #include "world/common/DeadUnkTexturePanFunc.inc.c" #include "world/common/DeadUnkTexturePanFunc2.inc.c" -INCLUDE_ASM(s32, "EA8AE0", func_8024030C_EA8DEC); - -INCLUDE_ASM(s32, "EA8AE0", func_80240358_EA8E38); - -INCLUDE_ASM(s32, "EA8AE0", func_802404B8_EA8F98); +#include "world/common/StarSpiritEffectFunc.inc.c" static char* N(exit_str_0) = "kmr_23"; static char* N(exit_str_1) = "kzn_18"; static char* N(exit_str_2) = "kzn_20"; -INCLUDE_ASM(s32, "EA8AE0", func_802408C8_EA93A8); - -INCLUDE_ASM(s32, "EA8AE0", func_80240908_EA93E8); - -INCLUDE_ASM(s32, "EA8AE0", func_80240A14_EA94F4); - INCLUDE_ASM(s32, "EA8AE0", func_80240B00_EA95E0); INCLUDE_ASM(s32, "EA8AE0", func_80240BD4_EA96B4); @@ -37,7 +31,11 @@ INCLUDE_ASM(s32, "EA8AE0", func_80240E2C_EA990C); INCLUDE_ASM(s32, "EA8AE0", func_802413C0_EA9EA0); -INCLUDE_ASM(s32, "EA8AE0", func_802413FC_EA9EDC); +ApiStatus func_802413FC_EA9EDC(Evt* script, s32 isInitialCall) { + D_80248380 = 0; + return ApiStatus_DONE2; +} + INCLUDE_ASM(s32, "EA8AE0", func_8024140C_EA9EEC); @@ -72,9 +70,8 @@ ApiStatus func_80241838_EAA318(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "EA8AE0", func_802418D4_EAA3B4); +#include "world/common/SetManyVars.inc.c" -//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 4250ce0fe7..b23e875065 100644 --- a/src/EB1170.c +++ b/src/EB1170.c @@ -36,9 +36,8 @@ ApiStatus func_802406E0_EB1540(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "EB1170", func_8024077C_EB15DC); +#include "world/common/SetManyVars.inc.c" -//INCLUDE_ASM(s32, "EB1170", func_8024086C_EB16CC); #include "world/common/UnkYawFunc.inc.c" INCLUDE_ASM(s32, "EB1170", func_802409F8_EB1858); diff --git a/src/world/area_arn/arn_07/BECDF0.c b/src/world/area_arn/arn_07/BECDF0.c index 33c5b2c5e7..f5936b401b 100644 --- a/src/world/area_arn/arn_07/BECDF0.c +++ b/src/world/area_arn/arn_07/BECDF0.c @@ -3,217 +3,7 @@ #include "sprite/npc/world_tubba.h" #include "sprite/npc/tubbas_heart.h" -typedef struct N(temp) { - char unk_00[0xC]; - EffectInstanceDataThing* unk_0C; -} N(temp); - -typedef struct { - /* 0x00 */ f32 unk_00; - /* 0x04 */ f32 unk_04; - /* 0x08 */ f32 unk_08; - /* 0x0C */ f32 unk_0C; - /* 0x10 */ f32 unk_10; - /* 0x14 */ f32 unk_14; - /* 0x18 */ f32 unk_18; - /* 0x1C */ f32 unk_1C; - /* 0x20 */ f32 unk_20; - /* 0x24 */ f32 unk_24; - /* 0x28 */ f32 unk_28; - /* 0x2C */ f32 unk_2C; - /* 0x30 */ f32 unk_30; - /* 0x34 */ f32 unk_34; - /* 0x38 */ s32 unk_38; - /* 0x3C */ s32 unk_3C; - /* 0x40 */ Shadow* unk_40; - /* 0x44 */ s16 unk_44; - /* 0x46 */ s16 unk_46; - /* 0x48 */ s16 unk_48; - /* 0x4A */ s16 unk_4A; - /* 0x4C */ s16 unk_4C; - /* 0x4E */ s16 unk_4E; - /* 0x50 */ struct N(temp)* unk_50; - /* 0x54 */ struct N(temp)* unk_54; -} arn_07_struct; // size = 0x58 - -ApiStatus N(func_80240000_BECDF0)(Evt* script, s32 isInitialCall) { - arn_07_struct* ptr = script->varTable[0]; - - sfx_adjust_env_sound_pos(0xA2, 0, ptr->unk_00, ptr->unk_04, ptr->unk_08); - return ((ptr->unk_44 < 2) == 0) * ApiStatus_DONE2; -} - -ApiStatus N(func_8024004C_BECE3C)(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - - if (isInitialCall) { - arn_07_struct* ptr = heap_malloc(sizeof(arn_07_struct)); - script->varTable[0] = ptr; - evt_set_variable(NULL, EVT_MAP_VAR(1), ptr); - ptr->unk_38 = evt_get_variable(script, *args++); - ptr->unk_3C = evt_get_variable(script, *args++); - ptr->unk_0C = evt_get_float_variable(script, *args++); - ptr->unk_10 = evt_get_float_variable(script, *args++); - ptr->unk_14 = evt_get_float_variable(script, *args++); - ptr->unk_18 = evt_get_float_variable(script, *args++); - ptr->unk_1C = evt_get_float_variable(script, *args++); - ptr->unk_20 = evt_get_float_variable(script, *args++); - ptr->unk_24 = evt_get_float_variable(script, *args++); - ptr->unk_28 = evt_get_float_variable(script, *args++); - ptr->unk_50 = (struct N(temp)*)playFX_83(2, ptr->unk_0C, ptr->unk_10, ptr->unk_14, 1.0f, 0); - ptr->unk_4E = 0; - ptr->unk_48 = 0; - ptr->unk_4A = 0; - ptr->unk_44 = 0; - ptr->unk_46 = 0; - } - - return ApiStatus_DONE2; -} - -ApiStatus N(func_802401AC_BECF9C)(Evt* script, s32 isInitialCall) { - PlayerStatus* playerStatus = &gPlayerStatus; - arn_07_struct* ptr = script->varTable[0]; - - switch (ptr->unk_44) { - case 0: - ptr->unk_04 = update_lerp(5, ptr->unk_10, ptr->unk_1C, ptr->unk_46, ptr->unk_3C); - ptr->unk_00 = update_lerp(0, ptr->unk_0C, ptr->unk_18, ptr->unk_46, ptr->unk_3C); - ptr->unk_08 = update_lerp(0, ptr->unk_14, ptr->unk_20, ptr->unk_46, ptr->unk_3C); - ptr->unk_50->unk_0C->unk_08 = ptr->unk_00; - ptr->unk_50->unk_0C->unk_0C = ptr->unk_04; - ptr->unk_50->unk_0C->unk_10 = ptr->unk_08; - ptr->unk_46++; - if (ptr->unk_46 >= ptr->unk_3C) { - ptr->unk_44 = 1; - ptr->unk_46 = 0; - } - break; - - case 1: - ptr->unk_46++; - if (ptr->unk_46 >= 60) { - ptr->unk_44 = 2; - ptr->unk_46 = 0; - ptr->unk_50->unk_0C->unk_70 = 1; - ptr->unk_50->unk_0C->unk_74 = 0; - } - break; - - case 2: - ptr->unk_46++; - if (ptr->unk_46 >= 60) { - ptr->unk_54 = playFX_7B(1, ptr->unk_18, ptr->unk_1C, ptr->unk_20, 1.0f, 0); - *((s8*)ptr->unk_54->unk_0C + 0x34) = ptr->unk_38; - ptr->unk_54->unk_0C->unk_20 = 0; - ptr->unk_40 = create_shadow_type(0, ptr->unk_18, ptr->unk_28, ptr->unk_20); - ptr->unk_44 = 3; - ptr->unk_46 = 0; - ptr->unk_2C = 0.0f; - ptr->unk_48 = 1; - ptr->unk_30 = 36.0f; - } - break; - - case 3: - ptr->unk_30 = update_lerp(0, 36.0f, 19.0f, ptr->unk_46, 120); - ptr->unk_46++; - if (ptr->unk_46 >= 120) { - ptr->unk_4C = 0; - ptr->unk_4A = 1; - ptr->unk_48 = 2; - ptr->unk_4E = 1; - ptr->unk_44 = 4; - ptr->unk_46 = 0; - ptr->unk_34 = ptr->unk_2C; - } - break; - - case 4: - break; - } - - switch (ptr->unk_4A) { - case 1: - ptr->unk_2C = update_lerp(4, ptr->unk_34, 1440.0f, ptr->unk_4C, 120); - ptr->unk_04 = update_lerp(0xA, ptr->unk_1C, ptr->unk_24, ptr->unk_4C, 120); - ptr->unk_4C++; - if (ptr->unk_4C >= 120) { - ptr->unk_4C = 0x10E; - ptr->unk_4A = 2; - ptr->unk_4E = 2; - } - break; - - case 2: - ptr->unk_04 = ptr->unk_24 + (2.0f * (sin_deg(ptr->unk_4C) + 1.0f)); - ptr->unk_4C = clamp_angle(ptr->unk_4C + 8); - if (!(dist3D(playerStatus->position.x, playerStatus->position.y + 20.0f, playerStatus->position.z, - ptr->unk_00, ptr->unk_04, ptr->unk_08) > 30.0f)) { - ptr->unk_4E = 3; - } - break; - } - - switch (ptr->unk_48) { - case 1: - ptr->unk_2C = clamp_angle(ptr->unk_2C + ptr->unk_30); - - case 2: - ptr->unk_54->unk_0C->unk_24.f = ptr->unk_2C; - ptr->unk_54->unk_0C->unk_04 = ptr->unk_18; - ptr->unk_54->unk_0C->unk_08 = ptr->unk_04; - ptr->unk_54->unk_0C->unk_0C = ptr->unk_20; - break; - } - - return ApiStatus_BLOCK; -} - -ApiStatus N(func_802405BC_BED3AC)(Evt* script, s32 isInitialCall) { - s32 var = evt_get_variable(script, *script->ptrReadPos); - arn_07_struct* ptr = script->varTable[0]; - - return (ptr->unk_4E == var) * ApiStatus_DONE2; -} - -ApiStatus N(func_802405FC_BED3EC)(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - - if (isInitialCall) { - arn_07_struct* ptr = heap_malloc(sizeof(arn_07_struct)); - script->varTable[0] = ptr; - ptr->unk_38 = evt_get_variable(script, *args++); - ptr->unk_18 = evt_get_float_variable(script, *args++); - ptr->unk_24 = evt_get_float_variable(script, *args++); - ptr->unk_20 = evt_get_float_variable(script, *args++); - ptr->unk_28 = evt_get_float_variable(script, *args++); - ptr->unk_54 = playFX_7B(1, ptr->unk_18, ptr->unk_24, ptr->unk_20, 1.0f, 0); - *((s8*)ptr->unk_54->unk_0C + 0x34) = ptr->unk_38; - ptr->unk_54->unk_0C->unk_20 = 0; - ptr->unk_40 = create_shadow_type(0, ptr->unk_18, ptr->unk_28, ptr->unk_20); - ptr->unk_4C = 0x10E; - } - - return ApiStatus_DONE2; -} - -ApiStatus N(func_80240708_BED4F8)(Evt* script, s32 isInitialCall) { - PlayerStatus* playerStatus = &gPlayerStatus; - arn_07_struct* ptr = script->varTable[0]; - - ptr->unk_04 = ptr->unk_24 + (2.0f * (sin_deg(ptr->unk_4C) + 1.0f)); - ptr->unk_4C = clamp_angle(ptr->unk_4C + 8); - if (dist2D(playerStatus->position.x, playerStatus->position.z, - ptr->unk_18, ptr->unk_20) <= 30.0f) { - ptr->unk_4E = 3; - } - ptr->unk_54->unk_0C->unk_04 = ptr->unk_18; - ptr->unk_54->unk_0C->unk_08 = ptr->unk_04; - ptr->unk_54->unk_0C->unk_0C = ptr->unk_20; - - return ApiStatus_BLOCK; -} +#include "world/common/StarSpiritEffectFunc.inc.c" s32 N(itemList_80242040)[] = { ITEM_MYSTICAL_KEY, @@ -236,14 +26,14 @@ EvtSource N(80242048) = SCRIPT({ SetCamPitch(0, EVT_VAR(2), 10000); } PanToTarget(0, 0, 1); - N(func_8024004C_BECE3C)(2, 50, 100, 31, -6, 145, 65, 0, 30, 0); + N(StarSpiritEffectFunc2)(2, 50, 100, 31, -6, 145, 65, 0, 30, 0); spawn { - N(func_802401AC_BECF9C)(); + N(StarSpiritEffectFunc3)(); } spawn { sleep 1; PlaySound(0x80000067); - N(func_80240000_BECDF0)(); + N(StarSpiritEffectFunc1)(); StopSound(0x80000067); PlaySoundAt(0xB2, 0, 145, 65, 0); } @@ -256,7 +46,7 @@ EvtSource N(80242048) = SCRIPT({ sleep 115; PlaySoundAt(0x137, 0, 145, 65, 0); } - N(func_802405BC_BED3AC)(1); + N(StarSpiritEffectFunc4)(1); spawn { sleep 80; SetPlayerAnimation(ANIM_10002); @@ -264,7 +54,7 @@ EvtSource N(80242048) = SCRIPT({ EVT_VAR(1) += 100; SetCamDistance(0, EVT_VAR(1)); SetPanTarget(0, 145, 0, 0); - N(func_802405BC_BED3AC)(2); + N(StarSpiritEffectFunc4)(2); GetPlayerPos(EVT_VAR(2), EVT_VAR(3), EVT_VAR(4)); UseSettingsFrom(0, EVT_VAR(2), EVT_VAR(3), EVT_VAR(4)); SetCamSpeed(0, 1.0); @@ -273,13 +63,13 @@ EvtSource N(80242048) = SCRIPT({ PanToTarget(0, 0, 0); DisablePlayerInput(FALSE); } else { - N(func_802405FC_BED3EC)(2, 145, 30, 0, 0); + N(StarSpiritEffectFunc5)(2, 145, 30, 0, 0); spawn { - N(func_80240708_BED4F8)(); + N(StarSpiritEffectFunc6)(); } sleep 1; } - N(func_802405BC_BED3AC)(3); + N(StarSpiritEffectFunc4)(3); PlaySoundAtPlayer(312, 0); DisablePlayerInput(TRUE); EVT_STORY_PROGRESS = STORY_CH3_STAR_SPIRIT_RESCUED; @@ -302,14 +92,14 @@ EvtSource N(80242498) = SCRIPT({ SetCamPitch(0, EVT_VAR(2), 10000); } PanToTarget(0, 0, 1); - N(func_8024004C_BECE3C)(2, 50, 100, 31, -6, 145, 65, 0, 30, 0); + N(StarSpiritEffectFunc2)(2, 50, 100, 31, -6, 145, 65, 0, 30, 0); spawn { - N(func_802401AC_BECF9C)(); + N(StarSpiritEffectFunc3)(); } spawn { sleep 1; PlaySound(0x80000067); - N(func_80240000_BECDF0)(); + N(StarSpiritEffectFunc1)(); StopSound(0x80000067); PlaySoundAt(0xB2, 0, 145, 65, 0); } @@ -322,7 +112,7 @@ EvtSource N(80242498) = SCRIPT({ sleep 115; PlaySoundAt(0x137, 0, 145, 65, 0); } - N(func_802405BC_BED3AC)(1); + N(StarSpiritEffectFunc4)(1); spawn { sleep 80; SetPlayerAnimation(ANIM_10002); @@ -330,7 +120,7 @@ EvtSource N(80242498) = SCRIPT({ EVT_VAR(1) += 100; SetCamDistance(0, EVT_VAR(1)); SetPanTarget(0, 145, 0, 0); - N(func_802405BC_BED3AC)(2); + N(StarSpiritEffectFunc4)(2); GetPlayerPos(EVT_VAR(2), EVT_VAR(3), EVT_VAR(4)); UseSettingsFrom(0, EVT_VAR(2), EVT_VAR(3), EVT_VAR(4)); SetCamSpeed(0, 1.0); @@ -339,13 +129,13 @@ EvtSource N(80242498) = SCRIPT({ PanToTarget(0, 0, 0); DisablePlayerInput(FALSE); } else { - N(func_802405FC_BED3EC)(2, 145, 30, 0, 0); + N(StarSpiritEffectFunc5)(2, 145, 30, 0, 0); spawn { - N(func_80240708_BED4F8)(); + N(StarSpiritEffectFunc6)(); } sleep 1; } - N(func_802405BC_BED3AC)(3); + N(StarSpiritEffectFunc4)(3); PlaySoundAtPlayer(312, 0); DisablePlayerInput(TRUE); EVT_STORY_PROGRESS = STORY_CH3_STAR_SPIRIT_RESCUED; diff --git a/src/world/area_arn/arn_07/arn_07.h b/src/world/area_arn/arn_07/arn_07.h index c7d58e3df1..15bb79a9f5 100644 --- a/src/world/area_arn/arn_07/arn_07.h +++ b/src/world/area_arn/arn_07/arn_07.h @@ -21,12 +21,12 @@ enum { NPC_WORLD_SKOLAR, }; -ApiStatus N(func_80240000_BECDF0)(Evt* script, s32 isInitialCall); -ApiStatus N(func_8024004C_BECE3C)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802401AC_BECF9C)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802405BC_BED3AC)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802405FC_BED3EC)(Evt* script, s32 isInitialCall); -ApiStatus N(func_80240708_BED4F8)(Evt* script, s32 isInitialCall); +ApiStatus N(arn_07_StarSpiritEffectFunc1)(Evt* script, s32 isInitialCall); +ApiStatus N(arn_07_StarSpiritEffectFunc2)(Evt* script, s32 isInitialCall); +ApiStatus N(arn_07_StarSpiritEffectFunc3)(Evt* script, s32 isInitialCall); +ApiStatus N(arn_07_StarSpiritEffectFunc4)(Evt* script, s32 isInitialCall); +ApiStatus N(arn_07_StarSpiritEffectFunc5)(Evt* script, s32 isInitialCall); +ApiStatus N(arn_07_StarSpiritEffectFunc6)(Evt* script, s32 isInitialCall); ApiStatus N(func_80240800_BED5F0)(Evt* script, s32 isInitialCall); ApiStatus N(func_80241C5C_BEEA4C)(Evt* script, s32 isInitialCall); ApiStatus N(SetEntityFlags100000)(Evt* script, s32 isInitialCall); diff --git a/src/world/area_flo/flo_21/CE6700.c b/src/world/area_flo/flo_21/CE6700.c index fe66b34013..748d478d3b 100644 --- a/src/world/area_flo/flo_21/CE6700.c +++ b/src/world/area_flo/flo_21/CE6700.c @@ -4,62 +4,6 @@ #include "sprite/npc/huff_n_puff.h" #include "sprite/npc/tuff_puff.h" -typedef struct { - char unk_00[0x4]; - f32 unk_04; - f32 unk_08; - f32 unk_0C; - f32 unk_10; - char unk_14[0x4]; - s32 unk_18; - s32 unk_1C; - s32 unk_20; - X32 unk_24; - s32 unk_28; - s32 unk_2C; - s32 unk_30; - u8 unk_34; - s32 unk_38; - char unk_3C[0xC]; - EffectUnkStruct1* unk_48; - char unk_4C[0x24]; - s32 unk_70; - s32 unk_74; -} N(EffectStruct); - -typedef struct N(temp) { - char unk_00[0xC]; - N(EffectStruct)* unk_0C; -} N(temp); - -typedef struct { - /* 0x00 */ f32 unk_00; - /* 0x04 */ f32 unk_04; - /* 0x08 */ f32 unk_08; - /* 0x0C */ f32 unk_0C; - /* 0x10 */ f32 unk_10; - /* 0x14 */ f32 unk_14; - /* 0x18 */ f32 unk_18; - /* 0x1C */ f32 unk_1C; - /* 0x20 */ f32 unk_20; - /* 0x24 */ f32 unk_24; - /* 0x28 */ f32 unk_28; - /* 0x2C */ f32 unk_2C; - /* 0x30 */ f32 unk_30; - /* 0x34 */ f32 unk_34; - /* 0x38 */ s32 unk_38; - /* 0x3C */ s32 unk_3C; - /* 0x40 */ Shadow* unk_40; - /* 0x44 */ s16 unk_44; - /* 0x46 */ s16 unk_46; - /* 0x48 */ s16 unk_48; - /* 0x4A */ s16 unk_4A; - /* 0x4C */ s16 unk_4C; - /* 0x4E */ s16 unk_4E; - /* 0x50 */ struct N(temp)* unk_50; - /* 0x54 */ struct N(temp)* unk_54; -} N(Unk_effect_struct); // size = 0x58 - enum { NPC_HUFF_N_PUFF0, NPC_HUFF_N_PUFF1, @@ -101,184 +45,7 @@ EvtSource N(80240D40) = SCRIPT({ } }); -ApiStatus N(func_80240000_CE6700)(Evt* script, s32 isInitialCall) { - N(Unk_effect_struct)* ptr = (N(Unk_effect_struct)*)script->varTable[0]; - - sfx_adjust_env_sound_pos(0xA2, 0, ptr->unk_00, ptr->unk_04, ptr->unk_08); - return ((ptr->unk_44 < 2) == 0) * ApiStatus_DONE2; -} - -ApiStatus N(func_8024004C_CE674C)(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - - if (isInitialCall) { - N(Unk_effect_struct)* ptr = (N(Unk_effect_struct)*)heap_malloc(sizeof(N(Unk_effect_struct))); - script->varTable[0] = ptr; - evt_set_variable(NULL, EVT_MAP_VAR(1), ptr); - ptr->unk_38 = evt_get_variable(script, *args++); - ptr->unk_3C = evt_get_variable(script, *args++); - ptr->unk_0C = evt_get_float_variable(script, *args++); - ptr->unk_10 = evt_get_float_variable(script, *args++); - ptr->unk_14 = evt_get_float_variable(script, *args++); - ptr->unk_18 = evt_get_float_variable(script, *args++); - ptr->unk_1C = evt_get_float_variable(script, *args++); - ptr->unk_20 = evt_get_float_variable(script, *args++); - ptr->unk_24 = evt_get_float_variable(script, *args++); - ptr->unk_28 = evt_get_float_variable(script, *args++); - ptr->unk_50 = (struct N(temp)*)playFX_83(2, ptr->unk_0C, ptr->unk_10, ptr->unk_14, 1.0f, 0); - ptr->unk_4E = 0; - ptr->unk_48 = 0; - ptr->unk_4A = 0; - ptr->unk_44 = 0; - ptr->unk_46 = 0; - } - - return ApiStatus_DONE2; -} - -ApiStatus N(func_802401AC_CE68AC)(Evt* script, s32 isInitialCall) { - PlayerStatus* playerStatus = &gPlayerStatus; - N(Unk_effect_struct)* ptr = (N(Unk_effect_struct)*)script->varTable[0]; - - switch (ptr->unk_44) { - case 0: - ptr->unk_04 = update_lerp(5, ptr->unk_10, ptr->unk_1C, ptr->unk_46, ptr->unk_3C); - ptr->unk_00 = update_lerp(0, ptr->unk_0C, ptr->unk_18, ptr->unk_46, ptr->unk_3C); - ptr->unk_08 = update_lerp(0, ptr->unk_14, ptr->unk_20, ptr->unk_46, ptr->unk_3C); - ptr->unk_50->unk_0C->unk_08 = ptr->unk_00; - ptr->unk_50->unk_0C->unk_0C = ptr->unk_04; - ptr->unk_50->unk_0C->unk_10 = ptr->unk_08; - ptr->unk_46++; - if (ptr->unk_46 >= ptr->unk_3C) { - ptr->unk_44 = 1; - ptr->unk_46 = 0; - } - break; - - case 1: - ptr->unk_46++; - if (ptr->unk_46 >= 60) { - ptr->unk_44 = 2; - ptr->unk_46 = 0; - ptr->unk_50->unk_0C->unk_70 = 1; - ptr->unk_50->unk_0C->unk_74 = 0; - } - break; - - case 2: - ptr->unk_46++; - if (ptr->unk_46 >= 60) { - ptr->unk_54 = playFX_7B(1, ptr->unk_18, ptr->unk_1C, ptr->unk_20, 1.0f, 0); - *((s8*)ptr->unk_54->unk_0C + 0x34) = ptr->unk_38; - ptr->unk_54->unk_0C->unk_20 = 0; - ptr->unk_40 = create_shadow_type(0, ptr->unk_18, ptr->unk_28, ptr->unk_20); - ptr->unk_44 = 3; - ptr->unk_46 = 0; - ptr->unk_2C = 0.0f; - ptr->unk_48 = 1; - ptr->unk_30 = 36.0f; - } - break; - - case 3: - ptr->unk_30 = update_lerp(0, 36.0f, 19.0f, ptr->unk_46, 120); - ptr->unk_46++; - if (ptr->unk_46 >= 120) { - ptr->unk_4C = 0; - ptr->unk_4A = 1; - ptr->unk_48 = 2; - ptr->unk_4E = 1; - ptr->unk_44 = 4; - ptr->unk_46 = 0; - ptr->unk_34 = ptr->unk_2C; - } - break; - - case 4: - break; - } - - switch (ptr->unk_4A) { - case 1: - ptr->unk_2C = update_lerp(4, ptr->unk_34, 1440.0f, ptr->unk_4C, 120); - ptr->unk_04 = update_lerp(0xA, ptr->unk_1C, ptr->unk_24, ptr->unk_4C, 120); - ptr->unk_4C++; - if (ptr->unk_4C >= 120) { - ptr->unk_4C = 0x10E; - ptr->unk_4A = 2; - ptr->unk_4E = 2; - } - break; - - case 2: - ptr->unk_04 = ptr->unk_24 + (2.0f * (sin_deg(ptr->unk_4C) + 1.0f)); - ptr->unk_4C = clamp_angle(ptr->unk_4C + 8); - if (!(dist3D(playerStatus->position.x, playerStatus->position.y + 20.0f, playerStatus->position.z, - ptr->unk_00, ptr->unk_04, ptr->unk_08) > 30.0f)) { - ptr->unk_4E = 3; - } - break; - } - - switch (ptr->unk_48) { - case 1: - ptr->unk_2C = clamp_angle(ptr->unk_2C + ptr->unk_30); - - case 2: - ptr->unk_54->unk_0C->unk_24.f = ptr->unk_2C; - ptr->unk_54->unk_0C->unk_04 = ptr->unk_18; - ptr->unk_54->unk_0C->unk_08 = ptr->unk_04; - ptr->unk_54->unk_0C->unk_0C = ptr->unk_20; - break; - } - - return ApiStatus_BLOCK; -} - -ApiStatus N(func_802405BC_CE6CBC)(Evt* script, s32 isInitialCall) { - s32 var = evt_get_variable(script, *script->ptrReadPos); - N(Unk_effect_struct)* ptr = (N(Unk_effect_struct)*)script->varTable[0]; - - return (ptr->unk_4E == var) * ApiStatus_DONE2; -} - -ApiStatus N(func_802405FC_CE6CFC)(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - - if (isInitialCall) { - N(Unk_effect_struct)* ptr = (N(Unk_effect_struct)*)heap_malloc(sizeof(N(Unk_effect_struct))); - script->varTable[0] = ptr; - ptr->unk_38 = evt_get_variable(script, *args++); - ptr->unk_18 = evt_get_float_variable(script, *args++); - ptr->unk_24 = evt_get_float_variable(script, *args++); - ptr->unk_20 = evt_get_float_variable(script, *args++); - ptr->unk_28 = evt_get_float_variable(script, *args++); - ptr->unk_54 = playFX_7B(1, ptr->unk_18, ptr->unk_24, ptr->unk_20, 1.0f, 0); - ptr->unk_54->unk_0C->unk_34 = ptr->unk_38; - ptr->unk_54->unk_0C->unk_20 = 0; - ptr->unk_40 = create_shadow_type(0, ptr->unk_18, ptr->unk_28, ptr->unk_20); - ptr->unk_4C = 0x10E; - } - - return ApiStatus_DONE2; -} - -ApiStatus N(func_80240708_CE6E08)(Evt* script, s32 isInitialCall) { - PlayerStatus* playerStatus = &gPlayerStatus; - N(Unk_effect_struct)* ptr = (N(Unk_effect_struct)*)script->varTable[0]; - - ptr->unk_04 = ptr->unk_24 + (2.0f * (sin_deg(ptr->unk_4C) + 1.0f)); - ptr->unk_4C = clamp_angle(ptr->unk_4C + 8); - if (dist2D(playerStatus->position.x, playerStatus->position.z, - ptr->unk_18, ptr->unk_20) <= 30.0f) { - ptr->unk_4E = 3; - } - ptr->unk_54->unk_0C->unk_04 = ptr->unk_18; - ptr->unk_54->unk_0C->unk_08 = ptr->unk_04; - ptr->unk_54->unk_0C->unk_0C = ptr->unk_20; - - return ApiStatus_BLOCK; -} +#include "world/common/StarSpiritEffectFunc.inc.c" EvtSource N(80240DA0) = SCRIPT({ group 0; @@ -323,14 +90,14 @@ EvtSource N(80240E3C) = SCRIPT({ SetCamPitch(0, EVT_VAR(2), -5.5); } PanToTarget(0, 0, 1); - N(func_8024004C_CE674C)(5, 180, 650, 170, 0, 650, 205, 0, 150, 120); + N(StarSpiritEffectFunc2)(5, 180, 650, 170, 0, 650, 205, 0, 150, 120); spawn { - N(func_802401AC_CE68AC)(); + N(StarSpiritEffectFunc3)(); } spawn { sleep 1; PlaySound(0x80000067); - N(func_80240000_CE6700)(); + N(StarSpiritEffectFunc1)(); StopSound(0x80000067); PlaySoundAt(0xB2, 0, 650, 205, 0); } @@ -343,7 +110,7 @@ EvtSource N(80240E3C) = SCRIPT({ sleep 115; PlaySoundAt(0x137, 0, 650, 205, 0); } - N(func_802405BC_CE6CBC)(1); + N(StarSpiritEffectFunc4)(1); spawn { sleep 80; SetPlayerAnimation(ANIM_10002); @@ -351,7 +118,7 @@ EvtSource N(80240E3C) = SCRIPT({ EVT_VAR(1) += 100; SetCamDistance(0, EVT_VAR(1)); SetPanTarget(0, 650, 120, 0); - N(func_802405BC_CE6CBC)(2); + N(StarSpiritEffectFunc4)(2); GetPlayerPos(EVT_VAR(2), EVT_VAR(3), EVT_VAR(4)); UseSettingsFrom(0, EVT_VAR(2), EVT_VAR(3), EVT_VAR(4)); SetCamSpeed(0, 1.0); @@ -360,13 +127,13 @@ EvtSource N(80240E3C) = SCRIPT({ PanToTarget(0, 0, 0); DisablePlayerInput(FALSE); } else { - N(func_802405FC_CE6CFC)(5, 650, 150, 0, 120); + N(StarSpiritEffectFunc5)(5, 650, 150, 0, 120); spawn { - N(func_80240708_CE6E08)(); + N(StarSpiritEffectFunc6)(); } sleep 1; } - N(func_802405BC_CE6CBC)(3); + N(StarSpiritEffectFunc4)(3); PlaySoundAtPlayer(312, 0); DisablePlayerInput(TRUE); EVT_STORY_PROGRESS = STORY_CH6_STAR_SPIRIT_RESCUED; diff --git a/src/world/area_flo/flo_21/flo_21.h b/src/world/area_flo/flo_21/flo_21.h index cd5170d5cf..90b213433b 100644 --- a/src/world/area_flo/flo_21/flo_21.h +++ b/src/world/area_flo/flo_21/flo_21.h @@ -6,12 +6,12 @@ ApiStatus N(UnkTexturePanFunc)(Evt* script, s32 isInitialCall); ApiStatus N(UnkTexturePanFunc2)(Evt* script, s32 isInitialCall); ApiStatus N(UnkFloatFunc)(Evt* script, s32 isInitialCall); -ApiStatus N(func_80240000_CE6700)(Evt* script, s32 isInitialCall); -ApiStatus N(func_8024004C_CE674C)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802401AC_CE68AC)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802405BC_CE6CBC)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802405FC_CE6CFC)(Evt* script, s32 isInitialCall); -ApiStatus N(func_80240708_CE6E08)(Evt* script, s32 isInitialCall); +ApiStatus N(flo_21_StarSpiritEffectFunc1)(Evt* script, s32 isInitialCall); +ApiStatus N(flo_21_StarSpiritEffectFunc2)(Evt* script, s32 isInitialCall); +ApiStatus N(flo_21_StarSpiritEffectFunc3)(Evt* script, s32 isInitialCall); +ApiStatus N(flo_21_StarSpiritEffectFunc4)(Evt* script, s32 isInitialCall); +ApiStatus N(flo_21_StarSpiritEffectFunc5)(Evt* script, s32 isInitialCall); +ApiStatus N(flo_21_StarSpiritEffectFunc6)(Evt* script, s32 isInitialCall); ApiStatus N(func_80240B00_CE7200)(Evt* script, s32 isInitialCall); extern NpcGroupList N(npcGroupList_80245AEC); diff --git a/src/world/area_isk/isk_16/9951F0.c b/src/world/area_isk/isk_16/9951F0.c index 34664dc52d..5229ed12b0 100644 --- a/src/world/area_isk/isk_16/9951F0.c +++ b/src/world/area_isk/isk_16/9951F0.c @@ -1,83 +1,6 @@ #include "isk_16.h" -INCLUDE_ASM(s32, "world/area_isk/isk_16/9951F0", func_80240000_9951F0); -/* -ApiStatus N(func_80240000_9951F0)(Evt* script, s32 isInitialCall) { - arn_07_struct* ptr = script->varTable[0]; - - sfx_adjust_env_sound_pos(0xA2, 0, ptr->unk_00, ptr->unk_04, ptr->unk_08); - return ((ptr->unk_44 < 2) == 0) * ApiStatus_DONE2; -} -*/ - -INCLUDE_ASM(s32, "world/area_isk/isk_16/9951F0", func_8024004C_99523C); -/* -ApiStatus N(func_8024004C_99523C)(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - - if (isInitialCall) { - arn_07_struct* ptr = heap_malloc(sizeof(arn_07_struct)); - script->varTable[0] = ptr; - evt_set_variable(NULL, EVT_MAP_VAR(1), ptr); - ptr->unk_38 = evt_get_variable(script, *args++); - ptr->unk_3C = evt_get_variable(script, *args++); - ptr->unk_0C = evt_get_float_variable(script, *args++); - ptr->unk_10 = evt_get_float_variable(script, *args++); - ptr->unk_14 = evt_get_float_variable(script, *args++); - ptr->unk_18 = evt_get_float_variable(script, *args++); - ptr->unk_1C = evt_get_float_variable(script, *args++); - ptr->unk_20 = evt_get_float_variable(script, *args++); - ptr->unk_24 = evt_get_float_variable(script, *args++); - ptr->unk_28 = evt_get_float_variable(script, *args++); - ptr->unk_50 = (struct N(temp)*)playFX_83(2, ptr->unk_0C, ptr->unk_10, ptr->unk_14, 1.0f, 0); - ptr->unk_4E = 0; - ptr->unk_48 = 0; - ptr->unk_4A = 0; - ptr->unk_44 = 0; - ptr->unk_46 = 0; - } - - return ApiStatus_DONE2; -} -*/ - -INCLUDE_ASM(s32, "world/area_isk/isk_16/9951F0", func_802401AC_99539C); +#include "world/common/StarSpiritEffectFunc.inc.c" static char* N(exit_str_0) = "kmr_23"; static char* N(exit_str_1) = "isk_19"; - -INCLUDE_ASM(s32, "world/area_isk/isk_16/9951F0", func_802405BC_9957AC); -/* -ApiStatus N(func_802405BC_9957AC)(Evt* script, s32 isInitialCall) { - s32 var = evt_get_variable(script, *script->ptrReadPos); - arn_07_struct* ptr = script->varTable[0]; - - return (ptr->unk_4E == var) * ApiStatus_DONE2; -} -*/ - -INCLUDE_ASM(s32, "world/area_isk/isk_16/9951F0", func_802405FC_9957EC); -/* -ApiStatus N(func_802405FC_9957EC)(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - - if (isInitialCall) { - arn_07_struct* ptr = heap_malloc(sizeof(arn_07_struct)); - script->varTable[0] = ptr; - ptr->unk_38 = evt_get_variable(script, *args++); - ptr->unk_18 = evt_get_float_variable(script, *args++); - ptr->unk_24 = evt_get_float_variable(script, *args++); - ptr->unk_20 = evt_get_float_variable(script, *args++); - ptr->unk_28 = evt_get_float_variable(script, *args++); - ptr->unk_54 = playFX_7B(1, ptr->unk_18, ptr->unk_24, ptr->unk_20, 1.0f, 0); - ptr->unk_54->unk_0C->unk_34 = ptr->unk_38; - ptr->unk_54->unk_0C->unk_20 = 0; - ptr->unk_40 = create_shadow_type(0, ptr->unk_18, ptr->unk_28, ptr->unk_20); - ptr->unk_4C = 0x10E; - } - - return ApiStatus_DONE2; -} -*/ - -INCLUDE_ASM(s32, "world/area_isk/isk_16/9951F0", func_80240708_9958F8); diff --git a/src/world/area_kzn/kzn_10/C7E4B0.c b/src/world/area_kzn/kzn_10/C7E4B0.c index af166a7ae8..e3da21d2eb 100644 --- a/src/world/area_kzn/kzn_10/C7E4B0.c +++ b/src/world/area_kzn/kzn_10/C7E4B0.c @@ -1,28 +1,23 @@ #include "kzn_10.h" -INCLUDE_ASM(s32, "world/area_kzn/kzn_10/C7E4B0", func_80240330_C7E4B0); +#define UNK_FUNC_50_VAR1 -469.0 +#define UNK_FUNC_50_VAR2 46.0 + +ApiStatus N(SpinyTrompHit)(Evt* script, s32 isInitialCall) { + subtract_hp(1); + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "world/area_kzn/kzn_10/C7E4B0", func_80240350_C7E4D0); -INCLUDE_ASM(s32, "world/area_kzn/kzn_10/C7E4B0", func_8024037C_C7E4FC); +#include "world/common/UnkFunc46.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_10/C7E4B0", func_80240414_C7E594); +#include "world/common/UnkFunc47.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_10/C7E4B0", func_802404B4_C7E634); +#include "world/common/UnkFunc48.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_10/C7E4B0", func_802404EC_C7E66C); +#include "world/common/UnkFunc49.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_10/C7E4B0", func_802405A4_C7E724); +#include "world/common/UnkFunc50.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_10/C7E4B0", func_80240638_C7E7B8); -/* -ApiStatus N(func_80240638_C7E7B8)(Evt *script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - - script->functionTemp[0] = evt_get_variable(script, *args++); - script->functionTemp[1] = evt_get_variable(script, *args++); - script->functionTemp[2] = evt_get_variable(script, *args++); - sfx_adjust_env_sound_pos(0x194, 0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); - return ApiStatus_DONE2; -} -*/ +#include "world/common/UnkFunc51.inc.c" diff --git a/src/world/area_kzn/kzn_17/C887B0.c b/src/world/area_kzn/kzn_17/C887B0.c index 3446fc0252..726565af33 100644 --- a/src/world/area_kzn/kzn_17/C887B0.c +++ b/src/world/area_kzn/kzn_17/C887B0.c @@ -1,28 +1,24 @@ #include "kzn_17.h" -INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C887B0", func_80242D00_C887B0); +#define UNK_FUNC_50_VAR1 -583.0 +#define UNK_FUNC_50_VAR2 165.0 + +//func_80242D00_C887B0 +ApiStatus N(SpinyTrompHit)(Evt* script, s32 isInitialCall) { + subtract_hp(1); + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C887B0", func_80242D20_C887D0); -INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C887B0", func_80242D4C_C887FC); +#include "world/common/UnkFunc46.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C887B0", func_80242DE4_C88894); +#include "world/common/UnkFunc47.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C887B0", func_80242E84_C88934); +#include "world/common/UnkFunc48.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C887B0", func_80242EBC_C8896C); +#include "world/common/UnkFunc49.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C887B0", func_80242F74_C88A24); +#include "world/common/UnkFunc50.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C887B0", func_80243004_C88AB4); -/* -ApiStatus N(func_80243004_C88AB4)(Evt *script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - - script->functionTemp[0] = evt_get_variable(script, *args++); - script->functionTemp[1] = evt_get_variable(script, *args++); - script->functionTemp[2] = evt_get_variable(script, *args++); - sfx_adjust_env_sound_pos(0x194, 0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); - return ApiStatus_DONE2; -} -*/ +#include "world/common/UnkFunc51.inc.c" diff --git a/src/world/area_kzn/kzn_19/C8DBB0.c b/src/world/area_kzn/kzn_19/C8DBB0.c index e1f49b4fc2..e6972d65b4 100644 --- a/src/world/area_kzn/kzn_19/C8DBB0.c +++ b/src/world/area_kzn/kzn_19/C8DBB0.c @@ -4,107 +4,12 @@ #include "world/common/UnkTexturePanFunc2.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_8024030C_C8DEBC); -/* -ApiStatus N(func_8024030C_C8DEBC)(Evt* script, s32 isInitialCall) { - arn_07_struct* ptr = script->varTable[0]; - - sfx_adjust_env_sound_pos(0xA2, 0, ptr->unk_00, ptr->unk_04, ptr->unk_08); - return ((ptr->unk_44 < 2) == 0) * ApiStatus_DONE2; -} -*/ - -INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_80240358_C8DF08); -/* -ApiStatus N(func_80240358_C8DF08)(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - - if (isInitialCall) { - arn_07_struct* ptr = heap_malloc(sizeof(arn_07_struct)); - script->varTable[0] = ptr; - evt_set_variable(NULL, EVT_MAP_VAR(1), ptr); - ptr->unk_38 = evt_get_variable(script, *args++); - ptr->unk_3C = evt_get_variable(script, *args++); - ptr->unk_0C = evt_get_float_variable(script, *args++); - ptr->unk_10 = evt_get_float_variable(script, *args++); - ptr->unk_14 = evt_get_float_variable(script, *args++); - ptr->unk_18 = evt_get_float_variable(script, *args++); - ptr->unk_1C = evt_get_float_variable(script, *args++); - ptr->unk_20 = evt_get_float_variable(script, *args++); - ptr->unk_24 = evt_get_float_variable(script, *args++); - ptr->unk_28 = evt_get_float_variable(script, *args++); - ptr->unk_50 = (struct N(temp)*)playFX_83(2, ptr->unk_0C, ptr->unk_10, ptr->unk_14, 1.0f, 0); - ptr->unk_4E = 0; - ptr->unk_48 = 0; - ptr->unk_4A = 0; - ptr->unk_44 = 0; - ptr->unk_46 = 0; - } - - return ApiStatus_DONE2; -} -*/ - -INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_802404B8_C8E068); +#include "world/common/StarSpiritEffectFunc.inc.c" static char* N(exit_str_0) = "kmr_23"; static char* N(exit_str_1) = "kzn_18"; static char* N(exit_str_2) = "kzn_20"; -INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_802408C8_C8E478); -/* -ApiStatus N(func_802408C8_C8E478)(Evt* script, s32 isInitialCall) { - s32 var = evt_get_variable(script, *script->ptrReadPos); - arn_07_struct* ptr = script->varTable[0]; - - return (ptr->unk_4E == var) * ApiStatus_DONE2; -} -*/ - -INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_80240908_C8E4B8); -/* -ApiStatus N(func_80240908_C8E4B8)(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - - if (isInitialCall) { - arn_07_struct* ptr = heap_malloc(sizeof(arn_07_struct)); - script->varTable[0] = ptr; - ptr->unk_38 = evt_get_variable(script, *args++); - ptr->unk_18 = evt_get_float_variable(script, *args++); - ptr->unk_24 = evt_get_float_variable(script, *args++); - ptr->unk_20 = evt_get_float_variable(script, *args++); - ptr->unk_28 = evt_get_float_variable(script, *args++); - ptr->unk_54 = playFX_7B(1, ptr->unk_18, ptr->unk_24, ptr->unk_20, 1.0f, 0); - ptr->unk_54->unk_0C->unk_34 = ptr->unk_38; - ptr->unk_54->unk_0C->unk_20 = 0; - ptr->unk_40 = create_shadow_type(0, ptr->unk_18, ptr->unk_28, ptr->unk_20); - ptr->unk_4C = 0x10E; - } - - return ApiStatus_DONE2; -} -*/ - -INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_80240A14_C8E5C4); -/* -ApiStatus N(func_80240A14_C8E5C4)(Evt* script, s32 isInitialCall) { - PlayerStatus* playerStatus = &gPlayerStatus; - arn_07_struct* ptr = script->varTable[0]; - - ptr->unk_04 = ptr->unk_24 + (2.0f * (sin_deg(ptr->unk_4C) + 1.0f)); - ptr->unk_4C = clamp_angle(ptr->unk_4C + 8); - if (dist2D(playerStatus->position.x, playerStatus->position.z, - ptr->unk_18, ptr->unk_20) <= 30.0f) { - ptr->unk_4E = 3; - } - ptr->unk_54->unk_0C->unk_04 = ptr->unk_18; - ptr->unk_54->unk_0C->unk_08 = ptr->unk_04; - ptr->unk_54->unk_0C->unk_0C = ptr->unk_20; - - return ApiStatus_BLOCK; -} -*/ - INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_80240B00_C8E6B0); INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_80240BD4_C8E784); diff --git a/src/world/area_omo/omo_15/DE8770.c b/src/world/area_omo/omo_15/DE8770.c index 2be7cf57da..e44879f386 100644 --- a/src/world/area_omo/omo_15/DE8770.c +++ b/src/world/area_omo/omo_15/DE8770.c @@ -1,83 +1,6 @@ #include "omo_15.h" -INCLUDE_ASM(s32, "world/area_omo/omo_15/DE8770", func_80240000_DE8770); -/* -ApiStatus N(func_80240000_DE8770)(Evt* script, s32 isInitialCall) { - arn_07_struct* ptr = script->varTable[0]; - - sfx_adjust_env_sound_pos(0xA2, 0, ptr->unk_00, ptr->unk_04, ptr->unk_08); - return ((ptr->unk_44 < 2) == 0) * ApiStatus_DONE2; -} -*/ - -INCLUDE_ASM(s32, "world/area_omo/omo_15/DE8770", func_8024004C_DE87BC); -/* -ApiStatus N(func_8024004C_DE87BC)(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - - if (isInitialCall) { - arn_07_struct* ptr = heap_malloc(sizeof(arn_07_struct)); - script->varTable[0] = ptr; - evt_set_variable(NULL, EVT_MAP_VAR(1), ptr); - ptr->unk_38 = evt_get_variable(script, *args++); - ptr->unk_3C = evt_get_variable(script, *args++); - ptr->unk_0C = evt_get_float_variable(script, *args++); - ptr->unk_10 = evt_get_float_variable(script, *args++); - ptr->unk_14 = evt_get_float_variable(script, *args++); - ptr->unk_18 = evt_get_float_variable(script, *args++); - ptr->unk_1C = evt_get_float_variable(script, *args++); - ptr->unk_20 = evt_get_float_variable(script, *args++); - ptr->unk_24 = evt_get_float_variable(script, *args++); - ptr->unk_28 = evt_get_float_variable(script, *args++); - ptr->unk_50 = (struct N(temp)*)playFX_83(2, ptr->unk_0C, ptr->unk_10, ptr->unk_14, 1.0f, 0); - ptr->unk_4E = 0; - ptr->unk_48 = 0; - ptr->unk_4A = 0; - ptr->unk_44 = 0; - ptr->unk_46 = 0; - } - - return ApiStatus_DONE2; -} -*/ - -INCLUDE_ASM(s32, "world/area_omo/omo_15/DE8770", func_802401AC_DE891C); +#include "world/common/StarSpiritEffectFunc.inc.c" static char* N(exit_str_0) = "kmr_23"; static char* N(exit_str_1) = "omo_14"; - -INCLUDE_ASM(s32, "world/area_omo/omo_15/DE8770", func_802405BC_DE8D2C); -/* -ApiStatus N(func_802405BC_DE8D2C)(Evt* script, s32 isInitialCall) { - s32 var = evt_get_variable(script, *script->ptrReadPos); - arn_07_struct* ptr = script->varTable[0]; - - return (ptr->unk_4E == var) * ApiStatus_DONE2; -} -*/ - -INCLUDE_ASM(s32, "world/area_omo/omo_15/DE8770", func_802405FC_DE8D6C); -/* -ApiStatus N(func_802405FC_DE8D6C)(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - - if (isInitialCall) { - arn_07_struct* ptr = heap_malloc(sizeof(arn_07_struct)); - script->varTable[0] = ptr; - ptr->unk_38 = evt_get_variable(script, *args++); - ptr->unk_18 = evt_get_float_variable(script, *args++); - ptr->unk_24 = evt_get_float_variable(script, *args++); - ptr->unk_20 = evt_get_float_variable(script, *args++); - ptr->unk_28 = evt_get_float_variable(script, *args++); - ptr->unk_54 = playFX_7B(1, ptr->unk_18, ptr->unk_24, ptr->unk_20, 1.0f, 0); - ptr->unk_54->unk_0C->unk_34 = ptr->unk_38; - ptr->unk_54->unk_0C->unk_20 = 0; - ptr->unk_40 = create_shadow_type(0, ptr->unk_18, ptr->unk_28, ptr->unk_20); - ptr->unk_4C = 0x10E; - } - - return ApiStatus_DONE2; -} -*/ - -INCLUDE_ASM(s32, "world/area_omo/omo_15/DE8770", func_80240708_DE8E78); diff --git a/src/world/area_pra/pra_32/D86A20.c b/src/world/area_pra/pra_32/D86A20.c index eccbc1926b..282e2cfc1d 100644 --- a/src/world/area_pra/pra_32/D86A20.c +++ b/src/world/area_pra/pra_32/D86A20.c @@ -1,103 +1,8 @@ #include "pra_32.h" -INCLUDE_ASM(s32, "world/area_pra/pra_32/D86A20", func_80240020_D86A20); -/* -ApiStatus N(func_80240020_D86A20)(Evt* script, s32 isInitialCall) { - arn_07_struct* ptr = script->varTable[0]; - - sfx_adjust_env_sound_pos(0xA2, 0, ptr->unk_00, ptr->unk_04, ptr->unk_08); - return ((ptr->unk_44 < 2) == 0) * ApiStatus_DONE2; -} -*/ - -INCLUDE_ASM(s32, "world/area_pra/pra_32/D86A20", func_8024006C_D86A6C); -/* -ApiStatus N(func_8024006C_D86A6C)(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - - if (isInitialCall) { - arn_07_struct* ptr = heap_malloc(sizeof(arn_07_struct)); - script->varTable[0] = ptr; - evt_set_variable(NULL, EVT_MAP_VAR(1), ptr); - ptr->unk_38 = evt_get_variable(script, *args++); - ptr->unk_3C = evt_get_variable(script, *args++); - ptr->unk_0C = evt_get_float_variable(script, *args++); - ptr->unk_10 = evt_get_float_variable(script, *args++); - ptr->unk_14 = evt_get_float_variable(script, *args++); - ptr->unk_18 = evt_get_float_variable(script, *args++); - ptr->unk_1C = evt_get_float_variable(script, *args++); - ptr->unk_20 = evt_get_float_variable(script, *args++); - ptr->unk_24 = evt_get_float_variable(script, *args++); - ptr->unk_28 = evt_get_float_variable(script, *args++); - ptr->unk_50 = (struct N(temp)*)playFX_83(2, ptr->unk_0C, ptr->unk_10, ptr->unk_14, 1.0f, 0); - ptr->unk_4E = 0; - ptr->unk_48 = 0; - ptr->unk_4A = 0; - ptr->unk_44 = 0; - ptr->unk_46 = 0; - } - - return ApiStatus_DONE2; -} -*/ - -INCLUDE_ASM(s32, "world/area_pra/pra_32/D86A20", func_802401CC_D86BCC); +#include "world/common/StarSpiritEffectFunc.inc.c" static char* N(exit_str_0) = "kmr_23"; static char* N(exit_str_1) = "pra_40"; -INCLUDE_ASM(s32, "world/area_pra/pra_32/D86A20", func_802405DC_D86FDC); -/* -ApiStatus N(func_802405DC_D86FDC)(Evt* script, s32 isInitialCall) { - s32 var = evt_get_variable(script, *script->ptrReadPos); - arn_07_struct* ptr = script->varTable[0]; - - return (ptr->unk_4E == var) * ApiStatus_DONE2; -} -*/ - -INCLUDE_ASM(s32, "world/area_pra/pra_32/D86A20", func_8024061C_D8701C); -/* -ApiStatus N(func_8024061C_D8701C)(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - - if (isInitialCall) { - arn_07_struct* ptr = heap_malloc(sizeof(arn_07_struct)); - script->varTable[0] = ptr; - ptr->unk_38 = evt_get_variable(script, *args++); - ptr->unk_18 = evt_get_float_variable(script, *args++); - ptr->unk_24 = evt_get_float_variable(script, *args++); - ptr->unk_20 = evt_get_float_variable(script, *args++); - ptr->unk_28 = evt_get_float_variable(script, *args++); - ptr->unk_54 = playFX_7B(1, ptr->unk_18, ptr->unk_24, ptr->unk_20, 1.0f, 0); - ptr->unk_54->unk_0C->unk_34 = ptr->unk_38; - ptr->unk_54->unk_0C->unk_20 = 0; - ptr->unk_40 = create_shadow_type(0, ptr->unk_18, ptr->unk_28, ptr->unk_20); - ptr->unk_4C = 0x10E; - } - - return ApiStatus_DONE2; -} -*/ - -INCLUDE_ASM(s32, "world/area_pra/pra_32/D86A20", func_80240728_D87128); -/* -ApiStatus N(func_80240728_D87128)(Evt* script, s32 isInitialCall) { - PlayerStatus* playerStatus = &gPlayerStatus; - arn_07_struct* ptr = script->varTable[0]; - - ptr->unk_04 = ptr->unk_24 + (2.0f * (sin_deg(ptr->unk_4C) + 1.0f)); - ptr->unk_4C = clamp_angle(ptr->unk_4C + 8); - if (dist2D(playerStatus->position.x, playerStatus->position.z, - ptr->unk_18, ptr->unk_20) <= 30.0f) { - ptr->unk_4E = 3; - } - ptr->unk_54->unk_0C->unk_04 = ptr->unk_18; - ptr->unk_54->unk_0C->unk_08 = ptr->unk_04; - ptr->unk_54->unk_0C->unk_0C = ptr->unk_20; - - return ApiStatus_BLOCK; -} -*/ - INCLUDE_ASM(s32, "world/area_pra/pra_32/D86A20", func_80240814_D87214); diff --git a/src/world/area_trd/trd_10/9C2910.c b/src/world/area_trd/trd_10/9C2910.c index bc9a5cd723..7635ffc42b 100644 --- a/src/world/area_trd/trd_10/9C2910.c +++ b/src/world/area_trd/trd_10/9C2910.c @@ -1,104 +1,9 @@ #include "trd_10.h" -INCLUDE_ASM(s32, "world/area_trd/trd_10/9C2910", func_80240000_9C2910); -/* -ApiStatus N(func_80240000_9C2910)(Evt* script, s32 isInitialCall) { - arn_07_struct* ptr = script->varTable[0]; - - sfx_adjust_env_sound_pos(0xA2, 0, ptr->unk_00, ptr->unk_04, ptr->unk_08); - return ((ptr->unk_44 < 2) == 0) * ApiStatus_DONE2; -} -*/ - -INCLUDE_ASM(s32, "world/area_trd/trd_10/9C2910", func_8024004C_9C295C); -/* -ApiStatus N(func_8024004C_9C295C)(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - - if (isInitialCall) { - arn_07_struct* ptr = heap_malloc(sizeof(arn_07_struct)); - script->varTable[0] = ptr; - evt_set_variable(NULL, EVT_MAP_VAR(1), ptr); - ptr->unk_38 = evt_get_variable(script, *args++); - ptr->unk_3C = evt_get_variable(script, *args++); - ptr->unk_0C = evt_get_float_variable(script, *args++); - ptr->unk_10 = evt_get_float_variable(script, *args++); - ptr->unk_14 = evt_get_float_variable(script, *args++); - ptr->unk_18 = evt_get_float_variable(script, *args++); - ptr->unk_1C = evt_get_float_variable(script, *args++); - ptr->unk_20 = evt_get_float_variable(script, *args++); - ptr->unk_24 = evt_get_float_variable(script, *args++); - ptr->unk_28 = evt_get_float_variable(script, *args++); - ptr->unk_50 = (struct N(temp)*)playFX_83(2, ptr->unk_0C, ptr->unk_10, ptr->unk_14, 1.0f, 0); - ptr->unk_4E = 0; - ptr->unk_48 = 0; - ptr->unk_4A = 0; - ptr->unk_44 = 0; - ptr->unk_46 = 0; - } - - return ApiStatus_DONE2; -} -*/ - -INCLUDE_ASM(s32, "world/area_trd/trd_10/9C2910", func_802401AC_9C2ABC); +#include "world/common/StarSpiritEffectFunc.inc.c" static char* N(exit_str_0) = "kmr_23"; static char* N(exit_str_1) = "trd_06"; static char* N(exit_str_2) = "trd_09"; -INCLUDE_ASM(s32, "world/area_trd/trd_10/9C2910", func_802405BC_9C2ECC); -/* -ApiStatus N(func_802405BC_9C2ECC)(Evt* script, s32 isInitialCall) { - s32 var = evt_get_variable(script, *script->ptrReadPos); - arn_07_struct* ptr = script->varTable[0]; - - return (ptr->unk_4E == var) * ApiStatus_DONE2; -} -*/ - -INCLUDE_ASM(s32, "world/area_trd/trd_10/9C2910", func_802405FC_9C2F0C); -/* -ApiStatus N(func_802405FC_9C2F0C)(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - - if (isInitialCall) { - arn_07_struct* ptr = heap_malloc(sizeof(arn_07_struct)); - script->varTable[0] = ptr; - ptr->unk_38 = evt_get_variable(script, *args++); - ptr->unk_18 = evt_get_float_variable(script, *args++); - ptr->unk_24 = evt_get_float_variable(script, *args++); - ptr->unk_20 = evt_get_float_variable(script, *args++); - ptr->unk_28 = evt_get_float_variable(script, *args++); - ptr->unk_54 = playFX_7B(1, ptr->unk_18, ptr->unk_24, ptr->unk_20, 1.0f, 0); - ptr->unk_54->unk_0C->unk_34 = ptr->unk_38; - ptr->unk_54->unk_0C->unk_20 = 0; - ptr->unk_40 = create_shadow_type(0, ptr->unk_18, ptr->unk_28, ptr->unk_20); - ptr->unk_4C = 0x10E; - } - - return ApiStatus_DONE2; -} -*/ - -INCLUDE_ASM(s32, "world/area_trd/trd_10/9C2910", func_80240708_9C3018); -/* -ApiStatus N(func_80240708_9C3018)(Evt* script, s32 isInitialCall) { - PlayerStatus* playerStatus = &gPlayerStatus; - arn_07_struct* ptr = script->varTable[0]; - - ptr->unk_04 = ptr->unk_24 + (2.0f * (sin_deg(ptr->unk_4C) + 1.0f)); - ptr->unk_4C = clamp_angle(ptr->unk_4C + 8); - if (dist2D(playerStatus->position.x, playerStatus->position.z, - ptr->unk_18, ptr->unk_20) <= 30.0f) { - ptr->unk_4E = 3; - } - ptr->unk_54->unk_0C->unk_04 = ptr->unk_18; - ptr->unk_54->unk_0C->unk_08 = ptr->unk_04; - ptr->unk_54->unk_0C->unk_0C = ptr->unk_20; - - return ApiStatus_BLOCK; -} -*/ - INCLUDE_ASM(s32, "world/area_trd/trd_10/9C2910", func_802407F4_9C3104); diff --git a/src/world/common/StarSpiritEffectFunc.inc.c b/src/world/common/StarSpiritEffectFunc.inc.c new file mode 100644 index 0000000000..3b2f050bd2 --- /dev/null +++ b/src/world/common/StarSpiritEffectFunc.inc.c @@ -0,0 +1,187 @@ +#include "common.h" +#include "map.h" +#include "effects.h" + +ApiStatus N(StarSpiritEffectFunc1)(Evt* script, s32 isInitialCall) { + StarSpiritEffect* ptr = script->varTable[0]; + + sfx_adjust_env_sound_pos(SOUND_UNKNOWN_A2, 0, ptr->unk_00, ptr->unk_04, ptr->unk_08); + + if (ptr->unk_44 < 2) { + return ApiStatus_BLOCK; + } else { + return ApiStatus_DONE2; + } +} + +ApiStatus N(StarSpiritEffectFunc2)(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + + if (isInitialCall) { + StarSpiritEffect* ptr = heap_malloc(sizeof(StarSpiritEffect)); + script->varTable[0] = ptr; + evt_set_variable(NULL, EVT_MAP_VAR(1), ptr); + ptr->unk_38 = evt_get_variable(script, *args++); + ptr->unk_3C = evt_get_variable(script, *args++); + ptr->unk_0C = evt_get_float_variable(script, *args++); + ptr->unk_10 = evt_get_float_variable(script, *args++); + ptr->unk_14 = evt_get_float_variable(script, *args++); + ptr->unk_18 = evt_get_float_variable(script, *args++); + ptr->unk_1C = evt_get_float_variable(script, *args++); + ptr->unk_20 = evt_get_float_variable(script, *args++); + ptr->unk_24 = evt_get_float_variable(script, *args++); + ptr->unk_28 = evt_get_float_variable(script, *args++); + ptr->unk_50 = (struct StarSpiritEffectUnkStruct*) playFX_83(2, ptr->unk_0C, ptr->unk_10, ptr->unk_14, 1.0f, 0); + ptr->unk_4E = 0; + ptr->unk_48 = 0; + ptr->unk_4A = 0; + ptr->unk_44 = 0; + ptr->unk_46 = 0; + } + + return ApiStatus_DONE2; +} + +ApiStatus N(StarSpiritEffectFunc3)(Evt* script, s32 isInitialCall) { + PlayerStatus* playerStatus = &gPlayerStatus; + StarSpiritEffect* ptr = (StarSpiritEffect*)script->varTable[0]; + + switch (ptr->unk_44) { + case 0: + ptr->unk_04 = update_lerp(5, ptr->unk_10, ptr->unk_1C, ptr->unk_46, ptr->unk_3C); + ptr->unk_00 = update_lerp(0, ptr->unk_0C, ptr->unk_18, ptr->unk_46, ptr->unk_3C); + ptr->unk_08 = update_lerp(0, ptr->unk_14, ptr->unk_20, ptr->unk_46, ptr->unk_3C); + ptr->unk_50->unk_0C->unk_08 = ptr->unk_00; + ptr->unk_50->unk_0C->unk_0C = ptr->unk_04; + ptr->unk_50->unk_0C->unk_10 = ptr->unk_08; + ptr->unk_46++; + if (ptr->unk_46 >= ptr->unk_3C) { + ptr->unk_44 = 1; + ptr->unk_46 = 0; + } + break; + + case 1: + ptr->unk_46++; + if (ptr->unk_46 >= 60) { + ptr->unk_44 = 2; + ptr->unk_46 = 0; + ptr->unk_50->unk_0C->unk_70 = 1; + ptr->unk_50->unk_0C->unk_74 = 0; + } + break; + + case 2: + ptr->unk_46++; + if (ptr->unk_46 >= 60) { + ptr->unk_54 = playFX_7B(1, ptr->unk_18, ptr->unk_1C, ptr->unk_20, 1.0f, 0); + *((s8*)ptr->unk_54->unk_0C + 0x34) = ptr->unk_38; + ptr->unk_54->unk_0C->unk_20 = 0; + ptr->unk_40 = create_shadow_type(0, ptr->unk_18, ptr->unk_28, ptr->unk_20); + ptr->unk_44 = 3; + ptr->unk_46 = 0; + ptr->unk_2C = 0.0f; + ptr->unk_48 = 1; + ptr->unk_30 = 36.0f; + } + break; + + case 3: + ptr->unk_30 = update_lerp(0, 36.0f, 19.0f, ptr->unk_46, 120); + ptr->unk_46++; + if (ptr->unk_46 >= 120) { + ptr->unk_4C = 0; + ptr->unk_4A = 1; + ptr->unk_48 = 2; + ptr->unk_4E = 1; + ptr->unk_44 = 4; + ptr->unk_46 = 0; + ptr->unk_34 = ptr->unk_2C; + } + break; + + case 4: + break; + } + + switch (ptr->unk_4A) { + case 1: + ptr->unk_2C = update_lerp(4, ptr->unk_34, 1440.0f, ptr->unk_4C, 120); + ptr->unk_04 = update_lerp(0xA, ptr->unk_1C, ptr->unk_24, ptr->unk_4C, 120); + ptr->unk_4C++; + if (ptr->unk_4C >= 120) { + ptr->unk_4C = 0x10E; + ptr->unk_4A = 2; + ptr->unk_4E = 2; + } + break; + + case 2: + ptr->unk_04 = ptr->unk_24 + (2.0f * (sin_deg(ptr->unk_4C) + 1.0f)); + ptr->unk_4C = clamp_angle(ptr->unk_4C + 8); + if (!(dist3D(playerStatus->position.x, playerStatus->position.y + 20.0f, playerStatus->position.z, + ptr->unk_00, ptr->unk_04, ptr->unk_08) > 30.0f)) { + ptr->unk_4E = 3; + } + break; + } + + switch (ptr->unk_48) { + case 1: + ptr->unk_2C = clamp_angle(ptr->unk_2C + ptr->unk_30); + + case 2: + ptr->unk_54->unk_0C->unk_24.f = ptr->unk_2C; + ptr->unk_54->unk_0C->unk_04 = ptr->unk_18; + ptr->unk_54->unk_0C->unk_08 = ptr->unk_04; + ptr->unk_54->unk_0C->unk_0C = ptr->unk_20; + break; + } + + return ApiStatus_BLOCK; +} + +ApiStatus N(StarSpiritEffectFunc4)(Evt* script, s32 isInitialCall) { + s32 var = evt_get_variable(script, *script->ptrReadPos); + StarSpiritEffect* ptr = (StarSpiritEffect*) script->varTable[0]; + + return (ptr->unk_4E == var) * ApiStatus_DONE2; +} + +ApiStatus N(StarSpiritEffectFunc5)(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + + if (isInitialCall) { + StarSpiritEffect* ptr = (StarSpiritEffect*) heap_malloc(sizeof(StarSpiritEffect)); + script->varTable[0] = ptr; + ptr->unk_38 = evt_get_variable(script, *args++); + ptr->unk_18 = evt_get_float_variable(script, *args++); + ptr->unk_24 = evt_get_float_variable(script, *args++); + ptr->unk_20 = evt_get_float_variable(script, *args++); + ptr->unk_28 = evt_get_float_variable(script, *args++); + ptr->unk_54 = playFX_7B(1, ptr->unk_18, ptr->unk_24, ptr->unk_20, 1.0f, 0); + ptr->unk_54->unk_0C->unk_34 = ptr->unk_38; + ptr->unk_54->unk_0C->unk_20 = 0; + ptr->unk_40 = create_shadow_type(0, ptr->unk_18, ptr->unk_28, ptr->unk_20); + ptr->unk_4C = 0x10E; + } + + return ApiStatus_DONE2; +} + +ApiStatus N(StarSpiritEffectFunc6)(Evt* script, s32 isInitialCall) { + PlayerStatus* playerStatus = &gPlayerStatus; + StarSpiritEffect* ptr = (StarSpiritEffect*) script->varTable[0]; + + ptr->unk_04 = ptr->unk_24 + (2.0f * (sin_deg(ptr->unk_4C) + 1.0f)); + ptr->unk_4C = clamp_angle(ptr->unk_4C + 8); + if (dist2D(playerStatus->position.x, playerStatus->position.z, + ptr->unk_18, ptr->unk_20) <= 30.0f) { + ptr->unk_4E = 3; + } + ptr->unk_54->unk_0C->unk_04 = ptr->unk_18; + ptr->unk_54->unk_0C->unk_08 = ptr->unk_04; + ptr->unk_54->unk_0C->unk_0C = ptr->unk_20; + + return ApiStatus_BLOCK; +} diff --git a/src/world/common/UnkFunc46.inc.c b/src/world/common/UnkFunc46.inc.c new file mode 100644 index 0000000000..8645d2d994 --- /dev/null +++ b/src/world/common/UnkFunc46.inc.c @@ -0,0 +1,16 @@ +#include "common.h" +#include "map.h" + +ApiStatus N(UnkFunc46)(Evt* script, s32 isInitialCall) { + f32 var1 = script->varTable[0]; + f32 var2 = script->varTable[2]; + f32 var3 = 0.0f; + f32 var4 = 2000.0f; + + if (npc_raycast_down_sides(0x10000, &var1, &var2, &var3, &var4)) { + script->varTable[0] = var1; + script->varTable[2] = var2 + 55.0f; + } + + return ApiStatus_DONE2; +} diff --git a/src/world/common/UnkFunc47.inc.c b/src/world/common/UnkFunc47.inc.c new file mode 100644 index 0000000000..a17ce9384f --- /dev/null +++ b/src/world/common/UnkFunc47.inc.c @@ -0,0 +1,12 @@ +#include "common.h" +#include "map.h" + +ApiStatus N(UnkFunc47)(Evt* script, s32 isInitialCall) { + f32 x = script->varTable[0] - gPlayerStatus.position.x; + f32 y = script->varTable[2] - gPlayerStatus.position.y; + f32 z = 0.0f - gPlayerStatus.position.z; + + script->varTable[4] = sqrtf(SQ(x) + SQ(y) + SQ(z)); + + return ApiStatus_DONE2; +} diff --git a/src/world/common/UnkFunc48.inc.c b/src/world/common/UnkFunc48.inc.c new file mode 100644 index 0000000000..df80984e44 --- /dev/null +++ b/src/world/common/UnkFunc48.inc.c @@ -0,0 +1,7 @@ +#include "common.h" +#include "map.h" + +ApiStatus N(UnkFunc48)(Evt* script, s32 isInitialCall) { + gPlayerStatus.unk_8C = evt_get_variable(script, *script->ptrReadPos); + return ApiStatus_DONE2; +} diff --git a/src/world/common/UnkFunc49.inc.c b/src/world/common/UnkFunc49.inc.c new file mode 100644 index 0000000000..bef54eb645 --- /dev/null +++ b/src/world/common/UnkFunc49.inc.c @@ -0,0 +1,9 @@ +#include "common.h" +#include "map.h" + +ApiStatus N(UnkFunc49)(Evt* script, s32 isInitialCall) { + script->varTable[5] = (cos_deg(-(f32) script->varTable[3] - 35.0) * 3.0) - 2.3; + script->varTable[6] = sin_deg(-(f32) script->varTable[3] - 35.0) * 5.0; + + return ApiStatus_DONE2; +} diff --git a/src/world/common/UnkFunc50.inc.c b/src/world/common/UnkFunc50.inc.c new file mode 100644 index 0000000000..d4003fb2a8 --- /dev/null +++ b/src/world/common/UnkFunc50.inc.c @@ -0,0 +1,11 @@ +#include "common.h" +#include "map.h" + +ApiStatus N(UnkFunc50)(Evt* script, s32 isInitialCall) { + f32 x = UNK_FUNC_50_VAR1 - script->varTable[0]; + f32 z = UNK_FUNC_50_VAR2 - script->varTable[2]; + + script->varTable[3] = -sqrtf(SQ(x) + SQ(z)); + + return ApiStatus_DONE2; +} diff --git a/src/world/common/UnkFunc51.inc.c b/src/world/common/UnkFunc51.inc.c new file mode 100644 index 0000000000..3e47781359 --- /dev/null +++ b/src/world/common/UnkFunc51.inc.c @@ -0,0 +1,13 @@ +#include "common.h" +#include "map.h" + +ApiStatus N(UnkFunc51)(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + + script->functionTemp[0] = evt_get_variable(script, *args++); + script->functionTemp[1] = evt_get_variable(script, *args++); + script->functionTemp[2] = evt_get_variable(script, *args++); + sfx_adjust_env_sound_pos(SOUND_UNKNOWN_52, 0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); + + return ApiStatus_DONE2; +} diff --git a/tools/ignored_funcs.txt b/tools/ignored_funcs.txt index daf0d56af1..381852058d 100644 --- a/tools/ignored_funcs.txt +++ b/tools/ignored_funcs.txt @@ -24,26 +24,26 @@ func_8004E808 = 0x8004E808; func_8004EB8C = 0x8004EB8C; func_8004D1A4 = 0x8004D1A4; dead_npc_move_heading = 0x8003E424; -func_80067040 = 0x80067040; +dead_sqrtf = 0x80067040; dead_npc_test_move_simple_with_slipping = 0x800E5304; dead_npc_raycast_down_sides = 0x800E423C; dead_is_point_within_region = 0x8004D0C4; func_8004D8E0 = 0x8004D8E0; dead_rand_int = 0x8002ACEC; dead_get_npc_safe = 0x8003E534; // get_npc_safe -func_8002BFD4 = 0x8002BFD4; +dead_heap_malloc = 0x8002BFD4; func_8002C01C = 0x8002C01C; dead_evt_set_variable = 0x802D5468; dead_sin_deg = 0x8002B5DC; dead_cos_deg = 0x8002B640; -func_800F1EF8 = 0x800F1EF8; -func_8015704C = 0x8015704C; +dead_subtract_hp = 0x800F1EF8; +dead_sfx_adjust_env_sound_pos = 0x8015704C; dead_evt_get_float_variable = 0x802D57FC; -func_80077C30 = 0x80077C30; -func_8002B6A4 = 0x8002B6A4; -func_80077930 = 0x80077930; -func_8011AAB4 = 0x8011AAB4; -func_8002B21C = 0x8002B21C; +dead_playFX_83 = 0x80077C30; +dead_update_lerp = 0x8002B6A4; +dead_playFX_7B = 0x80077930; +dead_create_shadow_type = 0x8011AAB4; +dead_dist3D = 0x8002B21C; func_802E2A80 = 0x802E2A80; func_802E2B74 = 0x802E2B74; func_80128510 = 0x80128510; diff --git a/ver/us/asm/data/EA3A80.data.s b/ver/us/asm/data/EA3A80.data.s index 5142b5ff3a..47fb659c15 100644 --- a/ver/us/asm/data/EA3A80.data.s +++ b/ver/us/asm/data/EA3A80.data.s @@ -126,10 +126,10 @@ glabel D_80244A60_EA5360 .word 0x00000054, 0x00000000 glabel D_80244A68_EA5368 -.word 0x00000043, 0x0000000B, func_80242AE8_EA33E8, 0x00000000, 0x00B60008, 0x00B60001, 0x00000054, 0x00000000, 0x001000E4, 0x001000E5, 0x001000E6, 0x001000E7, D_80244A60_EA5360, 0x00000046, 0x00000001, D_80244768_EA5068, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x0000000B, EA0C10_SetManyVars, 0x00000000, 0x00B60008, 0x00B60001, 0x00000054, 0x00000000, 0x001000E4, 0x001000E5, 0x001000E6, 0x001000E7, D_80244A60_EA5360, 0x00000046, 0x00000001, D_80244768_EA5068, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80244AB8_EA53B8 -.word 0x00000043, 0x0000000B, func_80242AE8_EA33E8, 0x00000000, 0x00B60008, 0x00B60001, 0x00000054, 0x00000000, 0x001000E8, 0x001000E9, 0x001000EA, 0x001000EB, D_80244A60_EA5360, 0x00000046, 0x00000001, D_80244768_EA5068, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x0000000B, EA0C10_SetManyVars, 0x00000000, 0x00B60008, 0x00B60001, 0x00000054, 0x00000000, 0x001000E8, 0x001000E9, 0x001000EA, 0x001000EB, D_80244A60_EA5360, 0x00000046, 0x00000001, D_80244768_EA5068, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80244B08_EA5408 .word 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80244158_EA4A58, 0x00000043, 0x00000002, 0x802E4940, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -168,13 +168,13 @@ glabel D_802458F0_EA61F0 .word 0x00000001, D_80245130_EA5A30, 0x00000000, 0x00000002, D_80245320_EA5C20, 0x18140001, 0x00000001, D_80245700_EA6000, 0x180D0001, 0x00000000, 0x00000000, 0x00000000 glabel D_80245920_EA6220 -.word 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, 0x802E0158, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, 0x802E01B8, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, 0x802E0158, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000009, 0x00000004, 0x00000001, 0x00000002, 0x00000012, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, D_802DF3F0, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DF348, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000003, 0x802DEF5C, 0x0000005A, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_80242F64_EA3864, 0x00000014, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802DEF5C, 0x0000010E, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_80242F64_EA3864, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x0001000F, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, func_80242DE0_EA36E0, 0x00000043, 0x00000007, 0x802DFB40, 0x0001000F, 0x00000004, 0xF24A8680, 0xF24A8680, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000007, 0x802DFB40, 0x0001000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010030, 0x00000043, 0x00000002, func_80242F64_EA3864, 0x00000000, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, 0x802E0158, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, 0x802E01B8, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, 0x802E0158, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000009, 0x00000004, 0x00000001, 0x00000002, 0x00000012, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, D_802DF3F0, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DF348, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000003, 0x802DEF5C, 0x0000005A, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, EA36E0_UnkFunc48, 0x00000014, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802DEF5C, 0x0000010E, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, EA36E0_UnkFunc48, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x0001000F, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, EA36E0_SpinyTrompHit, 0x00000043, 0x00000007, 0x802DFB40, 0x0001000F, 0x00000004, 0xF24A8680, 0xF24A8680, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000007, 0x802DFB40, 0x0001000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010030, 0x00000043, 0x00000002, EA36E0_UnkFunc48, 0x00000000, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80245BC0_EA64C0 -.word 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x000001F4, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24AA280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF9718886, 0x00000000, 0x0000000C, 0x00000002, 0xFD050F80, 0x00000226, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0xFD050F80, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00000037, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C81, 0x00000043, 0x00000001, func_80242E2C_EA372C, 0x00000028, 0x00000002, 0xFE363C82, 0x00000037, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x000001F4, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24AA280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF9718886, 0x00000000, 0x0000000C, 0x00000002, 0xFD050F80, 0x00000226, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0xFD050F80, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00000037, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C81, 0x00000043, 0x00000001, EA36E0_UnkFunc46, 0x00000028, 0x00000002, 0xFE363C82, 0x00000037, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80245D88_EA6688 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802D8758, 0x00000000, 0x00000000, 0x0000001E, 0xF24A7E80, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80245DC8_EA66C8 -.word 0x0000004D, 0x00000001, 0x000000EF, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000020, 0x00000043, 0x00000003, 0x802D6788, 0x0000001B, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00000020, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000006, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x0000001E, 0x00000000, 0x00000024, 0x00000002, 0xF9718885, 0x00000000, 0x00000024, 0x00000002, 0xF9718886, 0x00000000, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000024, 0x00000002, 0xF9718882, 0x00000000, 0x00000024, 0x00000002, 0xF9718887, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFDB9, 0x00000024, 0x00000002, 0xFE363C82, 0x000000A5, 0x00000043, 0x00000005, 0x802D6C60, 0x0000001B, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000005, 0x802D5FE0, 0x0000001C, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF84060AA, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000045, 0x00000002, D_80245BC0_EA64C0, 0xFE363C8A, 0x00000044, 0x00000001, D_80244BA8_EA54A8, 0x00000045, 0x00000002, D_80245D88_EA6688, 0xFD050F8A, 0x00000043, 0x00000002, 0x802E37A0, 0x8000001B, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0xFFFFFDB9, 0x000002EE, 0x0000010E, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000001, func_80242E2C_EA372C, 0x00000043, 0x00000004, func_802430E4_EA39E4, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000027, 0x00000002, 0xFD050F80, 0x00000014, 0x00000043, 0x00000005, 0x802D6C60, 0x0000001B, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000005, 0x802D5FE0, 0x0000001C, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000006, 0x802D6D84, 0x0000001B, 0xFE363C83, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x0000001C, 0xFE363C83, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000001, func_80242F9C_EA389C, 0x00000043, 0x00000005, 0x802D5FE0, 0x0000001C, 0xFE363C85, 0xFE363C86, 0x0000001E, 0x00000043, 0x00000001, func_80243054_EA3954, 0x0000000A, 0x00000002, 0xF9718887, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C83, 0x00000014, 0x0000000C, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000024, 0x00000002, 0xF9718887, 0x00000001, 0x00000003, 0x00000001, 0x0000000C, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xF9718887, 0x00000000, 0x00000004, 0x00000001, 0x0000000C, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF9718885, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C80, 0x000001AE, 0x00000044, 0x00000001, D_80244BFC_EA54FC, 0x00000024, 0x00000002, 0xF9718885, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF9718886, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000276, 0x00000049, 0x00000001, 0xFD050F8A, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000006, 0x7FFFFE00, 0x00000043, 0x00000004, 0x802D7AC0, 0x00000006, 0x000001E4, 0x00000000, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000042, 0x00000002, 0x00000020, 0x00000020, 0x00000001, 0x0000000A, 0x0000002D, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00000020, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x0000001E, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000005, 0x802D8758, 0x00000000, 0x00000000, 0x00000014, 0xF24A8680, 0x00000043, 0x00000005, 0x802D8758, 0x00000000, 0x00000000, 0x0000000A, 0xF24A814D, 0x00000043, 0x00000005, 0x802D8758, 0x00000000, 0x00000000, 0x00000005, 0xF24A7C80, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xF9718886, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, func_80242EC4_EA37C4, 0x0000000C, 0x00000002, 0xFE363C84, 0x00000050, 0x0000000A, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000001, filemenu_set_cursor_goal_pos_EA3700, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000009, 0x00000024, 0x00000002, 0xF9718883, 0x00000001, 0x00000044, 0x00000001, D_80245920_EA6220, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000020, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000002, 0x802E3908, 0x8000001B, 0x00000043, 0x00000003, 0x802D6788, 0x0000001B, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x0000001C, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, 0x802D9DE4, 0x00000000, 0xF24BE280, 0x00000024, 0x00000002, 0xF9718887, 0x00000000, 0x00000024, 0x00000002, 0xF9718882, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x000000EF, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000020, 0x00000043, 0x00000003, 0x802D6788, 0x0000001B, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00000020, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000006, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x0000001E, 0x00000000, 0x00000024, 0x00000002, 0xF9718885, 0x00000000, 0x00000024, 0x00000002, 0xF9718886, 0x00000000, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000024, 0x00000002, 0xF9718882, 0x00000000, 0x00000024, 0x00000002, 0xF9718887, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFDB9, 0x00000024, 0x00000002, 0xFE363C82, 0x000000A5, 0x00000043, 0x00000005, 0x802D6C60, 0x0000001B, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000005, 0x802D5FE0, 0x0000001C, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF84060AA, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000045, 0x00000002, D_80245BC0_EA64C0, 0xFE363C8A, 0x00000044, 0x00000001, D_80244BA8_EA54A8, 0x00000045, 0x00000002, D_80245D88_EA6688, 0xFD050F8A, 0x00000043, 0x00000002, 0x802E37A0, 0x8000001B, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0xFFFFFDB9, 0x000002EE, 0x0000010E, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000001, EA36E0_UnkFunc46, 0x00000043, 0x00000004, EA36E0_UnkFunc51, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000027, 0x00000002, 0xFD050F80, 0x00000014, 0x00000043, 0x00000005, 0x802D6C60, 0x0000001B, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000005, 0x802D5FE0, 0x0000001C, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000006, 0x802D6D84, 0x0000001B, 0xFE363C83, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x0000001C, 0xFE363C83, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000001, EA36E0_UnkFunc49, 0x00000043, 0x00000005, 0x802D5FE0, 0x0000001C, 0xFE363C85, 0xFE363C86, 0x0000001E, 0x00000043, 0x00000001, func_80243054_EA3954, 0x0000000A, 0x00000002, 0xF9718887, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C83, 0x00000014, 0x0000000C, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000024, 0x00000002, 0xF9718887, 0x00000001, 0x00000003, 0x00000001, 0x0000000C, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xF9718887, 0x00000000, 0x00000004, 0x00000001, 0x0000000C, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF9718885, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C80, 0x000001AE, 0x00000044, 0x00000001, D_80244BFC_EA54FC, 0x00000024, 0x00000002, 0xF9718885, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF9718886, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000276, 0x00000049, 0x00000001, 0xFD050F8A, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000006, 0x7FFFFE00, 0x00000043, 0x00000004, 0x802D7AC0, 0x00000006, 0x000001E4, 0x00000000, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000042, 0x00000002, 0x00000020, 0x00000020, 0x00000001, 0x0000000A, 0x0000002D, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00000020, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x0000001E, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000005, 0x802D8758, 0x00000000, 0x00000000, 0x00000014, 0xF24A8680, 0x00000043, 0x00000005, 0x802D8758, 0x00000000, 0x00000000, 0x0000000A, 0xF24A814D, 0x00000043, 0x00000005, 0x802D8758, 0x00000000, 0x00000000, 0x00000005, 0xF24A7C80, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xF9718886, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, EA36E0_UnkFunc47, 0x0000000C, 0x00000002, 0xFE363C84, 0x00000050, 0x0000000A, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000001, filemenu_set_cursor_goal_pos_EA3700, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000009, 0x00000024, 0x00000002, 0xF9718883, 0x00000001, 0x00000044, 0x00000001, D_80245920_EA6220, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000020, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000002, 0x802E3908, 0x8000001B, 0x00000043, 0x00000003, 0x802D6788, 0x0000001B, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x0000001C, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, 0x802D9DE4, 0x00000000, 0xF24BE280, 0x00000024, 0x00000002, 0xF9718887, 0x00000000, 0x00000024, 0x00000002, 0xF9718882, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/EAA810.data.s b/ver/us/asm/data/EAA810.data.s index 5cb59d043c..e54038eb17 100644 --- a/ver/us/asm/data/EAA810.data.s +++ b/ver/us/asm/data/EAA810.data.s @@ -18,7 +18,7 @@ glabel D_80242048_EAAB28 .word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802D6480, 0xFE363C80, 0x00000004, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000024, 0x00000002, 0xFE363C81, 0x000001F4, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80241E90_EAA970, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80242164_EAAC44 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000016, 0x00000001, 0x00000022, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F8A, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000023, 0x00000016, 0x00000001, 0x00000023, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x0000001C, 0x00000000, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0x000000B9, 0x0000006E, 0xFFFFFFE2, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A7C43, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0x000000B9, 0x00000037, 0xFFFFFFE2, 0x00000043, 0x00000003, 0x802D9578, 0x00000000, 0xFE363C81, 0x00000028, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0xFE363C81, 0x0000000B, 0x00000002, 0x00002710, 0x00002710, 0x00000043, 0x00000004, 0x802D94E8, 0x00000000, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xFE363C82, 0x00002710, 0x00000013, 0x00000000, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x0000000B, func_80240358_EA8E38, 0x00000004, 0x000000B4, 0x00000130, 0x0000000F, 0xFFFFFFCA, 0x000000B9, 0x0000006E, 0xFFFFFFE2, 0x00000037, 0x00000019, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_802404B8_EA8F98, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, 0x802E37A0, 0x80000067, 0x00000043, 0x00000001, func_8024030C_EA8DEC, 0x00000043, 0x00000002, 0x802E3908, 0x80000067, 0x00000043, 0x00000006, 0x802E382C, 0x000000B2, 0x00000000, 0x000000B9, 0x0000006E, 0xFFFFFFE2, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, 0x802DE6A4, 0x0001002A, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x000000B4, 0x00000008, 0x00000001, 0x00000073, 0x00000043, 0x00000006, 0x802E382C, 0x00000137, 0x00000000, 0x000000B9, 0x0000006E, 0xFFFFFFE2, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802408C8_EA93A8, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000057, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0xFE363C81, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0x000000B9, 0x00000019, 0xFFFFFFE2, 0x00000043, 0x00000002, func_802408C8_EA93A8, 0x00000002, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, func_80240908_EA93E8, 0x00000004, 0x000000B9, 0x00000037, 0xFFFFFFE2, 0x00000019, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240A14_EA94F4, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_802408C8_EA93A8, 0x00000003, 0x00000043, 0x00000003, 0x802E0324, 0x00000138, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000004, 0x802D78CC, 0x80248354, 0x00000004, 0x0000000E, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000016, 0x00000001, 0x00000022, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F8A, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000023, 0x00000016, 0x00000001, 0x00000023, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x0000001C, 0x00000000, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0x000000B9, 0x0000006E, 0xFFFFFFE2, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A7C43, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0x000000B9, 0x00000037, 0xFFFFFFE2, 0x00000043, 0x00000003, 0x802D9578, 0x00000000, 0xFE363C81, 0x00000028, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0xFE363C81, 0x0000000B, 0x00000002, 0x00002710, 0x00002710, 0x00000043, 0x00000004, 0x802D94E8, 0x00000000, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xFE363C82, 0x00002710, 0x00000013, 0x00000000, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x0000000B, EA8AE0_StarSpiritEffectFunc2, 0x00000004, 0x000000B4, 0x00000130, 0x0000000F, 0xFFFFFFCA, 0x000000B9, 0x0000006E, 0xFFFFFFE2, 0x00000037, 0x00000019, 0x00000056, 0x00000000, 0x00000043, 0x00000001, EA8AE0_StarSpiritEffectFunc3, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, 0x802E37A0, 0x80000067, 0x00000043, 0x00000001, EA8AE0_StarSpiritEffectFunc1, 0x00000043, 0x00000002, 0x802E3908, 0x80000067, 0x00000043, 0x00000006, 0x802E382C, 0x000000B2, 0x00000000, 0x000000B9, 0x0000006E, 0xFFFFFFE2, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, 0x802DE6A4, 0x0001002A, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x000000B4, 0x00000008, 0x00000001, 0x00000073, 0x00000043, 0x00000006, 0x802E382C, 0x00000137, 0x00000000, 0x000000B9, 0x0000006E, 0xFFFFFFE2, 0x00000057, 0x00000000, 0x00000043, 0x00000002, EA8AE0_StarSpiritEffectFunc4, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000057, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0xFE363C81, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0x000000B9, 0x00000019, 0xFFFFFFE2, 0x00000043, 0x00000002, EA8AE0_StarSpiritEffectFunc4, 0x00000002, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, EA8AE0_StarSpiritEffectFunc5, 0x00000004, 0x000000B9, 0x00000037, 0xFFFFFFE2, 0x00000019, 0x00000056, 0x00000000, 0x00000043, 0x00000001, EA8AE0_StarSpiritEffectFunc6, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, EA8AE0_StarSpiritEffectFunc4, 0x00000003, 0x00000043, 0x00000003, 0x802E0324, 0x00000138, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000004, 0x802D78CC, 0x80248354, 0x00000004, 0x0000000E, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_8024263C_EAB11C .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x8024835C, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -174,7 +174,7 @@ glabel D_80244680_EAD160 .word 0x00000054, 0x00000000 glabel D_80244688_EAD168 -.word 0x00000043, 0x0000000B, func_802418D4_EAA3B4, 0x00000000, 0x00B60008, 0x00B60001, 0x00000054, 0x00000000, 0x001000E4, 0x001000E5, 0x001000E6, 0x001000E7, D_80244680_EAD160, 0x00000046, 0x00000001, D_80244388_EACE68, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x0000000B, EA8AE0_SetManyVars, 0x00000000, 0x00B60008, 0x00B60001, 0x00000054, 0x00000000, 0x001000E4, 0x001000E5, 0x001000E6, 0x001000E7, D_80244680_EAD160, 0x00000046, 0x00000001, D_80244388_EACE68, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_802446D8_EAD1B8 .word 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80243D78_EAC858, 0x00000043, 0x00000002, 0x802E4940, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/EB1920.data.s b/ver/us/asm/data/EB1920.data.s index 7fe17950a3..9860e3ac33 100644 --- a/ver/us/asm/data/EB1920.data.s +++ b/ver/us/asm/data/EB1920.data.s @@ -81,7 +81,7 @@ glabel D_8024208C_EB2EEC .word 0x00000054, 0x00000000 glabel D_80242094_EB2EF4 -.word 0x00000043, 0x0000000B, func_8024077C_EB15DC, 0x00000000, 0x00B60008, 0x00B60001, 0x00000054, 0x00000000, 0x001000E4, 0x001000E5, 0x001000E6, 0x001000E7, D_8024208C_EB2EEC, 0x00000046, 0x00000001, D_80241D94_EB2BF4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x0000000B, EB1170_SetManyVars, 0x00000000, 0x00B60008, 0x00B60001, 0x00000054, 0x00000000, 0x001000E4, 0x001000E5, 0x001000E6, 0x001000E7, D_8024208C_EB2EEC, 0x00000046, 0x00000001, D_80241D94_EB2BF4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_802420E4_EB2F44 .word 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80241784_EB25E4, 0x00000043, 0x00000002, 0x802E4940, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_arn/arn_07/BEEE30.data.s b/ver/us/asm/data/world/area_arn/arn_07/BEEE30.data.s index 591c02b6af..0fc3cccb56 100644 --- a/ver/us/asm/data/world/area_arn/arn_07/BEEE30.data.s +++ b/ver/us/asm/data/world/area_arn/arn_07/BEEE30.data.s @@ -3,4 +3,4 @@ .section .data glabel D_80242040_BEEE30 -.word 0x0000001F, 0x00000000, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000003E8, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000091, 0x00000041, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7CE7, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000091, 0x0000001E, 0x00000000, 0x00000043, 0x00000003, GetCamDistance, 0x00000000, 0xFE363C81, 0x00000028, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C81, 0x0000000B, 0x00000002, 0x00002710, 0x00002710, 0x00000043, 0x00000004, GetCamPitch, 0x00000000, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xFE363C82, 0x00002710, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x0000000B, func_8024004C_BECE3C, 0x00000002, 0x00000032, 0x00000064, 0x0000001F, 0xFFFFFFFA, 0x00000091, 0x00000041, 0x00000000, 0x0000001E, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_802401AC_BECF9C, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x80000067, 0x00000043, 0x00000001, func_80240000_BECDF0, 0x00000043, 0x00000002, StopSound, 0x80000067, 0x00000043, 0x00000006, PlaySoundAt, 0x000000B2, 0x00000000, 0x00000091, 0x00000041, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000C, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000008, 0x00000001, 0x00000073, 0x00000043, 0x00000006, PlaySoundAt, 0x00000137, 0x00000000, 0x00000091, 0x00000041, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802405BC_BED3AC, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000057, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C81, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000091, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802405BC_BED3AC, 0x00000002, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, func_802405FC_BED3EC, 0x00000002, 0x00000091, 0x0000001E, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240708_BED4F8, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_802405BC_BED3AC, 0x00000003, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000138, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFF1, 0x00000043, 0x00000004, GotoMapSpecial, 0x80247914, 0x00000002, 0x0000000E, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000091, 0x00000041, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7CE7, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000091, 0x0000001E, 0x00000000, 0x00000043, 0x00000003, GetCamDistance, 0x00000000, 0xFE363C81, 0x00000028, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C81, 0x0000000B, 0x00000002, 0x00002710, 0x00002710, 0x00000043, 0x00000004, GetCamPitch, 0x00000000, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xFE363C82, 0x00002710, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x0000000B, func_8024004C_BECE3C, 0x00000002, 0x00000032, 0x00000064, 0x0000001F, 0xFFFFFFFA, 0x00000091, 0x00000041, 0x00000000, 0x0000001E, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_802401AC_BECF9C, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x80000067, 0x00000043, 0x00000001, func_80240000_BECDF0, 0x00000043, 0x00000002, StopSound, 0x80000067, 0x00000043, 0x00000006, PlaySoundAt, 0x000000B2, 0x00000000, 0x00000091, 0x00000041, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000C, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000008, 0x00000001, 0x00000073, 0x00000043, 0x00000006, PlaySoundAt, 0x00000137, 0x00000000, 0x00000091, 0x00000041, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802405BC_BED3AC, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000057, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C81, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000091, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802405BC_BED3AC, 0x00000002, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, func_802405FC_BED3EC, 0x00000002, 0x00000091, 0x0000001E, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240708_BED4F8, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_802405BC_BED3AC, 0x00000003, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000138, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFF1, 0x00000043, 0x00000004, GotoMapSpecial, 0x80247914, 0x00000002, 0x0000000E, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C82, 0x0000001D, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000044, 0x00000001, ExitSingleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x8024791C, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80247924, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x8024792C, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFFE4, 0x00000000, 0xFFFFFEB3, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFFE4, 0x00000000, 0xFFFFFEB3, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ADE80, 0xF24A6A80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000044C, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x000001F4, 0x00000000, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000000, 0xFFFFFE0C, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000005, 0x00000000, 0xFFFFFF6D, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x0000001D, 0x00000050, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000020C8, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A8480, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x00000000, 0x00000014, 0xFFFFFF88, 0x00000008, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000020C8, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x00000000, 0x0000000A, 0xFFFFFFC4, 0x0000000C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000020C8, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000020C8, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetNpcVar, 0x00000000, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000050, 0x00000000, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000001D, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000A, 0x000001C2, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x006C000A, 0x006C0001, 0x00000005, 0x000E00C7, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetNpcVar, 0x00000000, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000020C8, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x0000004B, 0x00000000, 0x0000000A, 0x0000000C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000020C8, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x00000096, 0x00000000, 0x00000014, 0x0000000C, 0x00000008, 0x00000001, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A8280, 0xF24A5680, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000002BC, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x000001F4, 0x00000000, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000000, 0xFFFFFE0C, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000041, 0x00000000, 0xFFFFFF77, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x006A0022, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000020C8, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x0000012A, 0x00000038, 0x0000001F, 0x00000012, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x006A0023, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x006A0006, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000A, 0x000001C1, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000050, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000001D, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000000EC, 0x00000000, 0xFFFFFFD2, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A9A80, 0xF24A5680, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001C2, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000FA, 0x00000000, 0xFFFFFFD2, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000A, 0x7FFFFE00, 0x00000043, 0x00000004, SetPlayerPos, 0x00000000, 0x00000014, 0xFFFFFF3D, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0x00000014, 0xFFFFFF3D, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000000, 0x00000000, 0x0000002D, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000000A, 0x7FFFFE00, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000050, 0x00000000, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000001D, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000A, 0x000001C2, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0x000000C8, 0x00000000, 0x00000023, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x006A0010, 0x006A0006, 0x00000000, 0x000E00C8, 0x00000043, 0x00000004, SetNpcVar, 0x00000001, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80242978, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x802429D4, 0x00080000, 0x00000001, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFE8, 0x0000004E, 0x00000006, 0x802439B0, 0x00000100, 0x00004000, D_80242040_BEEE30, 0x00000000, 0x00000001, 0x00000012, 0x00000000, 0x00000047, 0x00000005, 0x802428D4, 0x00000100, 0x0000000A, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFEF, 0x00000046, 0x00000001, 0x80242A30, 0x00000044, 0x00000001, 0x802433C8, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000001D, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000046, 0x00000001, EnterSingleDoor, 0x00000044, 0x00000001, 0x802433C8, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x802433C8, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x802433C8, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000044, 0x00000001, 0x802433C8, 0x00000008, 0x00000001, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000022, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF8406339, 0x00000001, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFE6, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x802478B8, 0x00000018, 0x00000001, 0xFFFFFFF2, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x8024787C, 0x00000016, 0x00000001, 0xFFFFFFF2, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x802478E8, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x802478B8, 0x00000023, 0x00000000, 0x00000046, 0x00000001, 0x80243B54, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFF0, 0x00000044, 0x00000001, 0x80242498, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0x8024346C, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000008, 0x00000001, 0x00000041, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0x80243790, 0x00000044, 0x00000001, 0x80241F10, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7BB4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x0000001F, 0x00000000, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000003E8, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000091, 0x00000041, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7CE7, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000091, 0x0000001E, 0x00000000, 0x00000043, 0x00000003, GetCamDistance, 0x00000000, 0xFE363C81, 0x00000028, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C81, 0x0000000B, 0x00000002, 0x00002710, 0x00002710, 0x00000043, 0x00000004, GetCamPitch, 0x00000000, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xFE363C82, 0x00002710, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x0000000B, arn_07_StarSpiritEffectFunc2, 0x00000002, 0x00000032, 0x00000064, 0x0000001F, 0xFFFFFFFA, 0x00000091, 0x00000041, 0x00000000, 0x0000001E, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, arn_07_StarSpiritEffectFunc3, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x80000067, 0x00000043, 0x00000001, arn_07_StarSpiritEffectFunc1, 0x00000043, 0x00000002, StopSound, 0x80000067, 0x00000043, 0x00000006, PlaySoundAt, 0x000000B2, 0x00000000, 0x00000091, 0x00000041, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000C, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000008, 0x00000001, 0x00000073, 0x00000043, 0x00000006, PlaySoundAt, 0x00000137, 0x00000000, 0x00000091, 0x00000041, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, arn_07_StarSpiritEffectFunc4, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000057, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C81, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000091, 0x00000000, 0x00000000, 0x00000043, 0x00000002, arn_07_StarSpiritEffectFunc4, 0x00000002, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, arn_07_StarSpiritEffectFunc5, 0x00000002, 0x00000091, 0x0000001E, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, arn_07_StarSpiritEffectFunc6, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, arn_07_StarSpiritEffectFunc4, 0x00000003, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000138, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFF1, 0x00000043, 0x00000004, GotoMapSpecial, 0x80247914, 0x00000002, 0x0000000E, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000091, 0x00000041, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7CE7, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000091, 0x0000001E, 0x00000000, 0x00000043, 0x00000003, GetCamDistance, 0x00000000, 0xFE363C81, 0x00000028, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C81, 0x0000000B, 0x00000002, 0x00002710, 0x00002710, 0x00000043, 0x00000004, GetCamPitch, 0x00000000, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xFE363C82, 0x00002710, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x0000000B, arn_07_StarSpiritEffectFunc2, 0x00000002, 0x00000032, 0x00000064, 0x0000001F, 0xFFFFFFFA, 0x00000091, 0x00000041, 0x00000000, 0x0000001E, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, arn_07_StarSpiritEffectFunc3, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x80000067, 0x00000043, 0x00000001, arn_07_StarSpiritEffectFunc1, 0x00000043, 0x00000002, StopSound, 0x80000067, 0x00000043, 0x00000006, PlaySoundAt, 0x000000B2, 0x00000000, 0x00000091, 0x00000041, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000C, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000008, 0x00000001, 0x00000073, 0x00000043, 0x00000006, PlaySoundAt, 0x00000137, 0x00000000, 0x00000091, 0x00000041, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, arn_07_StarSpiritEffectFunc4, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000057, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C81, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000091, 0x00000000, 0x00000000, 0x00000043, 0x00000002, arn_07_StarSpiritEffectFunc4, 0x00000002, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, arn_07_StarSpiritEffectFunc5, 0x00000002, 0x00000091, 0x0000001E, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, arn_07_StarSpiritEffectFunc6, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, arn_07_StarSpiritEffectFunc4, 0x00000003, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000138, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFF1, 0x00000043, 0x00000004, GotoMapSpecial, 0x80247914, 0x00000002, 0x0000000E, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C82, 0x0000001D, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000044, 0x00000001, ExitSingleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x8024791C, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80247924, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x8024792C, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFFE4, 0x00000000, 0xFFFFFEB3, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFFE4, 0x00000000, 0xFFFFFEB3, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ADE80, 0xF24A6A80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000044C, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x000001F4, 0x00000000, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000000, 0xFFFFFE0C, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000005, 0x00000000, 0xFFFFFF6D, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x0000001D, 0x00000050, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000020C8, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A8480, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x00000000, 0x00000014, 0xFFFFFF88, 0x00000008, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000020C8, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x00000000, 0x0000000A, 0xFFFFFFC4, 0x0000000C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000020C8, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000020C8, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetNpcVar, 0x00000000, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000050, 0x00000000, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000001D, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000A, 0x000001C2, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x006C000A, 0x006C0001, 0x00000005, 0x000E00C7, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetNpcVar, 0x00000000, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000020C8, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x0000004B, 0x00000000, 0x0000000A, 0x0000000C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000020C8, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x00000096, 0x00000000, 0x00000014, 0x0000000C, 0x00000008, 0x00000001, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A8280, 0xF24A5680, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000002BC, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x000001F4, 0x00000000, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000000, 0xFFFFFE0C, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000041, 0x00000000, 0xFFFFFF77, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x006A0022, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000020C8, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x0000012A, 0x00000038, 0x0000001F, 0x00000012, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x006A0023, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x006A0006, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000A, 0x000001C1, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000050, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000001D, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000000EC, 0x00000000, 0xFFFFFFD2, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A9A80, 0xF24A5680, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001C2, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000FA, 0x00000000, 0xFFFFFFD2, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000A, 0x7FFFFE00, 0x00000043, 0x00000004, SetPlayerPos, 0x00000000, 0x00000014, 0xFFFFFF3D, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0x00000014, 0xFFFFFF3D, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000000, 0x00000000, 0x0000002D, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000000A, 0x7FFFFE00, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000050, 0x00000000, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000001D, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000A, 0x000001C2, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0x000000C8, 0x00000000, 0x00000023, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x006A0010, 0x006A0006, 0x00000000, 0x000E00C8, 0x00000043, 0x00000004, SetNpcVar, 0x00000001, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80242978, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x802429D4, 0x00080000, 0x00000001, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFE8, 0x0000004E, 0x00000006, 0x802439B0, 0x00000100, 0x00004000, D_80242040_BEEE30, 0x00000000, 0x00000001, 0x00000012, 0x00000000, 0x00000047, 0x00000005, 0x802428D4, 0x00000100, 0x0000000A, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFEF, 0x00000046, 0x00000001, 0x80242A30, 0x00000044, 0x00000001, 0x802433C8, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000001D, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000046, 0x00000001, EnterSingleDoor, 0x00000044, 0x00000001, 0x802433C8, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x802433C8, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x802433C8, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000044, 0x00000001, 0x802433C8, 0x00000008, 0x00000001, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000022, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF8406339, 0x00000001, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFE6, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x802478B8, 0x00000018, 0x00000001, 0xFFFFFFF2, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x8024787C, 0x00000016, 0x00000001, 0xFFFFFFF2, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x802478E8, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x802478B8, 0x00000023, 0x00000000, 0x00000046, 0x00000001, 0x80243B54, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFF0, 0x00000044, 0x00000001, 0x80242498, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0x8024346C, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000008, 0x00000001, 0x00000041, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0x80243790, 0x00000044, 0x00000001, 0x80241F10, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7BB4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_21/CE73F0.data.s b/ver/us/asm/data/world/area_flo/flo_21/CE73F0.data.s index d2bfa70abd..be4df4bbe4 100644 --- a/ver/us/asm/data/world/area_flo/flo_21/CE73F0.data.s +++ b/ver/us/asm/data/world/area_flo/flo_21/CE73F0.data.s @@ -9,7 +9,7 @@ glabel D_80240D40_CE7440 .word 0x0000000A, 0x00000002, 0xF5DE0180, 0x00000038, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000001F4, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000032, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, flo_21_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, flo_21_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80240E3C_CE753C -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000016, 0x00000001, 0x00000037, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F8A, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000038, 0x00000016, 0x00000001, 0x00000038, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x0000001C, 0x00000000, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x0000028A, 0x000000CD, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7CE7, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000028A, 0x00000096, 0x00000000, 0x00000043, 0x00000003, GetCamDistance, 0x00000000, 0xFE363C81, 0x00000028, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C81, 0x0000000B, 0x00000002, 0xF24A6480, 0x00002710, 0x00000043, 0x00000004, GetCamPitch, 0x00000000, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xFE363C82, 0xF24A6480, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x0000000B, func_8024004C_CE674C, 0x00000005, 0x000000B4, 0x0000028A, 0x000000AA, 0x00000000, 0x0000028A, 0x000000CD, 0x00000000, 0x00000096, 0x00000078, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_802401AC_CE68AC, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x80000067, 0x00000043, 0x00000001, func_80240000_CE6700, 0x00000043, 0x00000002, StopSound, 0x80000067, 0x00000043, 0x00000006, PlaySoundAt, 0x000000B2, 0x00000000, 0x0000028A, 0x000000CD, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x000000B4, 0x00000008, 0x00000001, 0x00000073, 0x00000043, 0x00000006, PlaySoundAt, 0x00000137, 0x00000000, 0x0000028A, 0x000000CD, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802405BC_CE6CBC, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000057, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C81, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000028A, 0x00000078, 0x00000000, 0x00000043, 0x00000002, func_802405BC_CE6CBC, 0x00000002, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, func_802405FC_CE6CFC, 0x00000005, 0x0000028A, 0x00000096, 0x00000000, 0x00000078, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240708_CE6E08, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_802405BC_CE6CBC, 0x00000003, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000138, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000039, 0x00000043, 0x00000004, GotoMapSpecial, 0x80245B24, 0x00000005, 0x0000000E, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000016, 0x00000001, 0x00000037, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F8A, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000038, 0x00000016, 0x00000001, 0x00000038, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x0000001C, 0x00000000, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x0000028A, 0x000000CD, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7CE7, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000028A, 0x00000096, 0x00000000, 0x00000043, 0x00000003, GetCamDistance, 0x00000000, 0xFE363C81, 0x00000028, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C81, 0x0000000B, 0x00000002, 0xF24A6480, 0x00002710, 0x00000043, 0x00000004, GetCamPitch, 0x00000000, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xFE363C82, 0xF24A6480, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x0000000B, flo_21_StarSpiritEffectFunc2, 0x00000005, 0x000000B4, 0x0000028A, 0x000000AA, 0x00000000, 0x0000028A, 0x000000CD, 0x00000000, 0x00000096, 0x00000078, 0x00000056, 0x00000000, 0x00000043, 0x00000001, flo_21_StarSpiritEffectFunc3, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x80000067, 0x00000043, 0x00000001, flo_21_StarSpiritEffectFunc1, 0x00000043, 0x00000002, StopSound, 0x80000067, 0x00000043, 0x00000006, PlaySoundAt, 0x000000B2, 0x00000000, 0x0000028A, 0x000000CD, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x000000B4, 0x00000008, 0x00000001, 0x00000073, 0x00000043, 0x00000006, PlaySoundAt, 0x00000137, 0x00000000, 0x0000028A, 0x000000CD, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, flo_21_StarSpiritEffectFunc4, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000057, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C81, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000028A, 0x00000078, 0x00000000, 0x00000043, 0x00000002, flo_21_StarSpiritEffectFunc4, 0x00000002, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, flo_21_StarSpiritEffectFunc5, 0x00000005, 0x0000028A, 0x00000096, 0x00000000, 0x00000078, 0x00000056, 0x00000000, 0x00000043, 0x00000001, flo_21_StarSpiritEffectFunc6, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, flo_21_StarSpiritEffectFunc4, 0x00000003, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000138, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000039, 0x00000043, 0x00000004, GotoMapSpecial, 0x80245B24, 0x00000005, 0x0000000E, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_802412F4_CE79F4 .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80245B2C, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_16/995CF0.data.s b/ver/us/asm/data/world/area_isk/isk_16/995CF0.data.s index 7c64fe24f6..3728db617c 100644 --- a/ver/us/asm/data/world/area_isk/isk_16/995CF0.data.s +++ b/ver/us/asm/data/world/area_isk/isk_16/995CF0.data.s @@ -6,7 +6,7 @@ glabel D_80240B00_995CF0 .word 0x43998000, 0xC4638000, 0x43F60000, 0x42480000, 0x43F60000, 0xC4638000, 0x43998000, 0x435C0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80241080_996270, D_80240B00_995CF0, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x001900A3 glabel D_80240B60_995D50 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000016, 0x00000001, 0xFFFFFFC7, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFC8, 0x00000016, 0x00000001, 0xFFFFFFC8, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x0000001C, 0x00000000, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000198, 0xFFFFFCC7, 0x0000019E, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7CE7, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000198, 0xFFFFFC90, 0x0000019E, 0x00000043, 0x00000003, GetCamDistance, 0x00000000, 0xFE363C81, 0x00000028, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C81, 0x0000000B, 0x00000002, 0x00002710, 0x00002710, 0x00000043, 0x00000004, GetCamPitch, 0x00000000, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xFE363C82, 0x00002710, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x0000000B, func_8024004C_99523C, 0x00000001, 0x000000B4, 0x00000198, 0xFFFFFC7C, 0x0000019E, 0x00000198, 0xFFFFFCC7, 0x0000019E, 0xFFFFFC90, 0xFFFFFC72, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_802401AC_99539C, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x80000067, 0x00000043, 0x00000001, func_80240000_9951F0, 0x00000043, 0x00000002, StopSound, 0x80000067, 0x00000043, 0x00000006, PlaySoundAt, 0x000000B2, 0x00000000, 0x00000198, 0xFFFFFCC7, 0x0000019E, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x000000B4, 0x00000008, 0x00000001, 0x00000073, 0x00000043, 0x00000006, PlaySoundAt, 0x00000137, 0x00000000, 0x00000198, 0xFFFFFCC7, 0x0000019E, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802405BC_9957AC, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000057, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C81, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000198, 0xFFFFFC72, 0x0000019E, 0x00000043, 0x00000002, func_802405BC_9957AC, 0x00000002, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, func_802405FC_9957EC, 0x00000001, 0x00000198, 0xFFFFFC90, 0x0000019E, 0xFFFFFC72, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240708_9958F8, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_802405BC_9957AC, 0x00000003, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000138, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFC9, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242D64, 0x00000001, 0x0000000E, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000016, 0x00000001, 0xFFFFFFC7, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFC8, 0x00000016, 0x00000001, 0xFFFFFFC8, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x0000001C, 0x00000000, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000198, 0xFFFFFCC7, 0x0000019E, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7CE7, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000198, 0xFFFFFC90, 0x0000019E, 0x00000043, 0x00000003, GetCamDistance, 0x00000000, 0xFE363C81, 0x00000028, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C81, 0x0000000B, 0x00000002, 0x00002710, 0x00002710, 0x00000043, 0x00000004, GetCamPitch, 0x00000000, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xFE363C82, 0x00002710, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x0000000B, isk_16_StarSpiritEffectFunc2, 0x00000001, 0x000000B4, 0x00000198, 0xFFFFFC7C, 0x0000019E, 0x00000198, 0xFFFFFCC7, 0x0000019E, 0xFFFFFC90, 0xFFFFFC72, 0x00000056, 0x00000000, 0x00000043, 0x00000001, isk_16_StarSpiritEffectFunc3, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x80000067, 0x00000043, 0x00000001, isk_16_StarSpiritEffectFunc1, 0x00000043, 0x00000002, StopSound, 0x80000067, 0x00000043, 0x00000006, PlaySoundAt, 0x000000B2, 0x00000000, 0x00000198, 0xFFFFFCC7, 0x0000019E, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x000000B4, 0x00000008, 0x00000001, 0x00000073, 0x00000043, 0x00000006, PlaySoundAt, 0x00000137, 0x00000000, 0x00000198, 0xFFFFFCC7, 0x0000019E, 0x00000057, 0x00000000, 0x00000043, 0x00000002, isk_16_StarSpiritEffectFunc4, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000057, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C81, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000198, 0xFFFFFC72, 0x0000019E, 0x00000043, 0x00000002, isk_16_StarSpiritEffectFunc4, 0x00000002, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, isk_16_StarSpiritEffectFunc5, 0x00000001, 0x00000198, 0xFFFFFC90, 0x0000019E, 0xFFFFFC72, 0x00000056, 0x00000000, 0x00000043, 0x00000001, isk_16_StarSpiritEffectFunc6, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, isk_16_StarSpiritEffectFunc4, 0x00000003, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000138, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFC9, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242D64, 0x00000001, 0x0000000E, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80240FF8_9961E8 .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242D6C, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kzn/kzn_10/C7EE90.data.s b/ver/us/asm/data/world/area_kzn/kzn_10/C7EE90.data.s index 1460b7b6fb..458c1590e5 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_10/C7EE90.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_10/C7EE90.data.s @@ -3,13 +3,13 @@ .section .data glabel D_80240D10_C7EE90 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000009, 0x00000004, 0x00000001, 0x00000002, 0x00000012, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerTargetYaw, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_802404B4_C7E634, 0x00000014, 0x00000012, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_802404B4_C7E634, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001000F, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, func_80240330_C7E4B0, 0x00000043, 0x00000007, func_802D2520, 0x0001000F, 0x00000004, 0xF24A8680, 0xF24A8680, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000007, func_802D2520, 0x0001000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010030, 0x00000043, 0x00000002, func_802404B4_C7E634, 0x00000000, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000009, 0x00000004, 0x00000001, 0x00000002, 0x00000012, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerTargetYaw, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, kzn_10_UnkFunc48, 0x00000014, 0x00000012, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, kzn_10_UnkFunc48, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001000F, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, kzn_10_SpinyTrompHit, 0x00000043, 0x00000007, func_802D2520, 0x0001000F, 0x00000004, 0xF24A8680, 0xF24A8680, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000007, func_802D2520, 0x0001000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010030, 0x00000043, 0x00000002, kzn_10_UnkFunc48, 0x00000000, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80240FB0_C7F130 -.word 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24AA280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFD050F80, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C83, 0x00000018, 0x00000001, 0xFFFFFEA2, 0x00000024, 0x00000002, 0xFE363C86, 0x000001F4, 0x00000018, 0x00000001, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C86, 0x00000352, 0x00000018, 0x00000001, 0x00000096, 0x00000024, 0x00000002, 0xFE363C86, 0x0000028A, 0x00000018, 0x00000001, 0x0000012C, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C86, 0x00000320, 0x00000028, 0x00000002, 0xFE363C86, 0xFE363C80, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x000001F4, 0x00000023, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000043, 0x00000001, func_8024037C_C7E4FC, 0x00000028, 0x00000002, 0xFE363C82, 0x00000037, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C83, 0xFE363C82, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24AA280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFD050F80, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C83, 0x00000018, 0x00000001, 0xFFFFFEA2, 0x00000024, 0x00000002, 0xFE363C86, 0x000001F4, 0x00000018, 0x00000001, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C86, 0x00000352, 0x00000018, 0x00000001, 0x00000096, 0x00000024, 0x00000002, 0xFE363C86, 0x0000028A, 0x00000018, 0x00000001, 0x0000012C, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C86, 0x00000320, 0x00000028, 0x00000002, 0xFE363C86, 0xFE363C80, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x000001F4, 0x00000023, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000043, 0x00000001, kzn_10_UnkFunc46, 0x00000028, 0x00000002, 0xFE363C82, 0x00000037, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C83, 0xFE363C82, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80241224_C7F3A4 .word 0x0000004D, 0x00000001, 0x0000000A, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x0000000F, PlayEffect, 0x00000015, 0x00000001, 0xFFFFFE52, 0x00000064, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x0000000F, PlayEffect, 0x00000015, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000028, 0x00000002, 0xFE363C80, 0x00000064, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x0000000F, PlayEffect, 0x00000015, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x0000000A, 0x00000002, 0xF9718884, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x00000008, 0x00000043, 0x0000000F, PlayEffect, 0x00000015, 0x00000001, 0x00000190, 0xFFFFFFB0, 0x00000000, 0x00000028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80241424_C7F5A4 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000001E, 0xF24A7E80, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x000000EF, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000029, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000002A, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000029, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000029, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF9718884, 0x00000000, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000024, 0x00000002, 0xF9718882, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C83, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C83, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C80, 0xFFFFFE70, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x0000000E, 0x00000002, 0xFE363C80, 0xFFFFFE70, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000029, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000002A, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFE2B, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000043, 0x00000001, func_8024037C_C7E4FC, 0x00000043, 0x00000005, MakeLerp, 0x000000C8, 0xFE363C82, 0x00000014, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFD050F80, 0xFFFFFE2B, 0x00000043, 0x00000005, TranslateGroup, 0x00000029, 0xFFFFFE2B, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000002A, 0xFFFFFE2B, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000028, 0x00000002, 0xFE363C82, 0x00000037, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000004, 0xFFFFFE2B, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, D_80241224_C7F3A4, 0x00000056, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000004, 0x00000016, 0x00000001, 0x00000009, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A8480, 0x00000043, 0x00000005, PlayerJump1, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000008, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002B, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x000001E3, 0x00000000, 0xFFFFFE2F, 0x00000000, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000A, 0xF24A8480, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000005, 0xF24A7F4D, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000045, 0x00000002, D_80240FB0_C7F130, 0xFE363C8A, 0x00000045, 0x00000002, D_80241424_C7F5A4, 0xFD050F8A, 0x00000043, 0x00000006, PlaySoundAt, 0x8000001B, 0x00000000, 0xFFFFFE2F, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFE2B, 0x000001A2, 0x000000B4, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000001, func_8024037C_C7E4FC, 0x00000043, 0x00000004, func_80240638_C7E7B8, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000005, TranslateGroup, 0x00000029, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000002A, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C82, 0x00000043, 0x00000006, RotateGroup, 0x00000029, 0xFE363C83, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x0000002A, 0xFE363C83, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000001, func_802404EC_C7E66C, 0x00000043, 0x00000005, TranslateModel, 0x0000002A, 0xFE363C85, 0xFE363C86, 0x00000000, 0x00000043, 0x00000001, func_802405A4_C7E724, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, func_80240414_C7E594, 0x0000000C, 0x00000002, 0xFE363C84, 0x00000050, 0x0000000A, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000001, func_80240350_C7E4D0, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000009, 0x00000044, 0x00000001, D_80240D10_C7EE90, 0x0000000A, 0x00000002, 0xF9718883, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xF9718883, 0x00000001, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8280, 0x00000008, 0x00000001, 0x0000002D, 0x00000024, 0x00000002, 0xF9718882, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xF9718884, 0x00000001, 0x00000049, 0x00000001, 0xFD050F8A, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000023, 0xF24A8280, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000014, 0xF24A7E80, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000A, 0xF24A7C80, 0x00000057, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x8000001B, 0x00000043, 0x00000006, PlaySoundAt, 0x000001E4, 0x00000000, 0x0000019F, 0xFFFFFF10, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000002A, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x000001A2, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000043, 0x00000001, func_8024037C_C7E4FC, 0x00000043, 0x0000000F, PlayEffect, 0x00000000, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000001, 0x00000014, 0x00000003, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C88, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C89, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C88, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C89, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C88, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C89, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C88, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C89, 0x00000005, 0x00000001, 0x0000005A, 0x00000043, 0x00000005, TranslateModel, 0x00000015, 0xFE363C86, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000016, 0xFE363C86, 0xFE363C83, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000018, 0xFE363C84, 0xFE363C85, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000017, 0xFE363C84, 0xFE363C87, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000001A, 0xFE363C82, 0xFE363C83, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000001B, 0xFE363C82, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000001C, 0xFE363C80, 0xFE363C87, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000001D, 0xFE363C80, 0xFE363C85, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000001F, 0xFE363C80, 0xFE363C85, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000020, 0xFE363C80, 0xFE363C87, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000021, 0xFE363C82, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0xFE363C82, 0xFE363C83, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0xFE363C84, 0xFE363C87, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000025, 0xFE363C84, 0xFE363C85, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000026, 0xFE363C86, 0xFE363C83, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000027, 0xFE363C86, 0xFE363C81, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00000002, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFF9, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFFB, 0x00000027, 0x00000002, 0xFE363C83, 0x00000007, 0x00000027, 0x00000002, 0xFE363C84, 0x00000009, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFD, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFFA, 0x00000027, 0x00000002, 0xFE363C87, 0x00000007, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000029, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000002A, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xF9718883, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24BE280, 0x00000024, 0x00000002, 0xF9718882, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000001E, 0xF24A7E80, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x000000EF, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000029, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000002A, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000029, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000029, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF9718884, 0x00000000, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000024, 0x00000002, 0xF9718882, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C83, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C83, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C80, 0xFFFFFE70, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x0000000E, 0x00000002, 0xFE363C80, 0xFFFFFE70, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000029, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000002A, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFE2B, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000043, 0x00000001, kzn_10_UnkFunc46, 0x00000043, 0x00000005, MakeLerp, 0x000000C8, 0xFE363C82, 0x00000014, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFD050F80, 0xFFFFFE2B, 0x00000043, 0x00000005, TranslateGroup, 0x00000029, 0xFFFFFE2B, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000002A, 0xFFFFFE2B, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000028, 0x00000002, 0xFE363C82, 0x00000037, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000004, 0xFFFFFE2B, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, D_80241224_C7F3A4, 0x00000056, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000004, 0x00000016, 0x00000001, 0x00000009, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A8480, 0x00000043, 0x00000005, PlayerJump1, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000008, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002B, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x000001E3, 0x00000000, 0xFFFFFE2F, 0x00000000, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000A, 0xF24A8480, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000005, 0xF24A7F4D, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000045, 0x00000002, D_80240FB0_C7F130, 0xFE363C8A, 0x00000045, 0x00000002, D_80241424_C7F5A4, 0xFD050F8A, 0x00000043, 0x00000006, PlaySoundAt, 0x8000001B, 0x00000000, 0xFFFFFE2F, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFE2B, 0x000001A2, 0x000000B4, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000001, kzn_10_UnkFunc46, 0x00000043, 0x00000004, kzn_10_UnkFunc51, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000005, TranslateGroup, 0x00000029, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000002A, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C82, 0x00000043, 0x00000006, RotateGroup, 0x00000029, 0xFE363C83, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x0000002A, 0xFE363C83, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000001, kzn_10_UnkFunc49, 0x00000043, 0x00000005, TranslateModel, 0x0000002A, 0xFE363C85, 0xFE363C86, 0x00000000, 0x00000043, 0x00000001, kzn_10_UnkFunc50, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, kzn_10_UnkFunc47, 0x0000000C, 0x00000002, 0xFE363C84, 0x00000050, 0x0000000A, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000001, func_80240350_C7E4D0, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000009, 0x00000044, 0x00000001, D_80240D10_C7EE90, 0x0000000A, 0x00000002, 0xF9718883, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xF9718883, 0x00000001, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8280, 0x00000008, 0x00000001, 0x0000002D, 0x00000024, 0x00000002, 0xF9718882, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xF9718884, 0x00000001, 0x00000049, 0x00000001, 0xFD050F8A, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000023, 0xF24A8280, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000014, 0xF24A7E80, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000A, 0xF24A7C80, 0x00000057, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x8000001B, 0x00000043, 0x00000006, PlaySoundAt, 0x000001E4, 0x00000000, 0x0000019F, 0xFFFFFF10, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000002A, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x000001A2, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000043, 0x00000001, kzn_10_UnkFunc46, 0x00000043, 0x0000000F, PlayEffect, 0x00000000, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000001, 0x00000014, 0x00000003, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C88, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C89, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C88, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C89, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C88, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C89, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C88, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C89, 0x00000005, 0x00000001, 0x0000005A, 0x00000043, 0x00000005, TranslateModel, 0x00000015, 0xFE363C86, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000016, 0xFE363C86, 0xFE363C83, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000018, 0xFE363C84, 0xFE363C85, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000017, 0xFE363C84, 0xFE363C87, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000001A, 0xFE363C82, 0xFE363C83, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000001B, 0xFE363C82, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000001C, 0xFE363C80, 0xFE363C87, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000001D, 0xFE363C80, 0xFE363C85, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000001F, 0xFE363C80, 0xFE363C85, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000020, 0xFE363C80, 0xFE363C87, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000021, 0xFE363C82, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0xFE363C82, 0xFE363C83, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0xFE363C84, 0xFE363C87, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000025, 0xFE363C84, 0xFE363C85, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000026, 0xFE363C86, 0xFE363C83, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000027, 0xFE363C86, 0xFE363C81, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00000002, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFF9, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFFB, 0x00000027, 0x00000002, 0xFE363C83, 0x00000007, 0x00000027, 0x00000002, 0xFE363C84, 0x00000009, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFD, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFFA, 0x00000027, 0x00000002, 0xFE363C87, 0x00000007, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000029, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000002A, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xF9718883, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24BE280, 0x00000024, 0x00000002, 0xF9718882, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kzn/kzn_17/C89450.data.s b/ver/us/asm/data/world/area_kzn/kzn_17/C89450.data.s index 22e08464d2..1d9761386e 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_17/C89450.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_17/C89450.data.s @@ -117,10 +117,10 @@ glabel D_80245620_C8B0D0 .word 0x00000003, D_8024401C_C89ACC, 0xC3E10000, 0x00000000, 0x42C80000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005009B, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980004, 0x3FFF2666, 0x4CCC0004, 0x3FFF3FFF, 0x3FFF0004, 0x33326665, 0x33320004, 0x33327FFF, 0x26660004, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00030000, 0xFFFFFE3E, 0x00000000, 0x00000064, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFE3E, 0x00000000, 0x00000064, 0x0000010E, 0x00000082, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x004D0003, 0x004D0006, 0x004D0008, 0x004D0008, 0x004D0003, 0x004D0003, 0x004D0013, 0x004D0013, 0x004D000B, 0x004D000A, 0x004D000C, 0x004D0003, 0x004D0003, 0x004D0003, 0x004D0003, 0x004D0003, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80245050_C8AB00, 0x00000000, 0x00000002, D_80245240_C8ACF0, 0x16140001, 0x00000001, D_80245620_C8B0D0, 0x160D0001, 0x00000000, 0x00000000, 0x00000000 glabel D_80245840_C8B2F0 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000009, 0x00000004, 0x00000001, 0x00000002, 0x00000012, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerTargetYaw, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_80242E84_C88934, 0x00000014, 0x00000012, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_80242E84_C88934, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001000F, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, func_80242D00_C887B0, 0x00000043, 0x00000007, func_802D2520, 0x0001000F, 0x00000004, 0xF24A8680, 0xF24A8680, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000007, func_802D2520, 0x0001000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010030, 0x00000043, 0x00000002, func_80242E84_C88934, 0x00000000, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000009, 0x00000004, 0x00000001, 0x00000002, 0x00000012, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerTargetYaw, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, kzn_17_UnkFunc48, 0x00000014, 0x00000012, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, kzn_17_UnkFunc48, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001000F, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, kzn_17_SpinyTrompHit, 0x00000043, 0x00000007, func_802D2520, 0x0001000F, 0x00000004, 0xF24A8680, 0xF24A8680, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000007, func_802D2520, 0x0001000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010030, 0x00000043, 0x00000002, kzn_17_UnkFunc48, 0x00000000, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80245AE0_C8B590 -.word 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001F4, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24AA280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF9718886, 0x00000000, 0x0000000C, 0x00000002, 0xFD050F80, 0x00000226, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0xFD050F80, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00000037, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C81, 0x00000043, 0x00000001, func_80242D4C_C887FC, 0x00000028, 0x00000002, 0xFE363C82, 0x00000037, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001F4, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24AA280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF9718886, 0x00000000, 0x0000000C, 0x00000002, 0xFD050F80, 0x00000226, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0xFD050F80, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00000037, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C81, 0x00000043, 0x00000001, kzn_17_UnkFunc46, 0x00000028, 0x00000002, 0xFE363C82, 0x00000037, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80245CA8_C8B758 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000001E, 0xF24A7E80, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x000000EF, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000020, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000001B, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000020, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000006, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000001E, 0x00000000, 0x00000024, 0x00000002, 0xF9718885, 0x00000000, 0x00000024, 0x00000002, 0xF9718886, 0x00000000, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000024, 0x00000002, 0xF9718882, 0x00000000, 0x00000024, 0x00000002, 0xF9718887, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFDB9, 0x00000024, 0x00000002, 0xFE363C82, 0x000000A5, 0x00000043, 0x00000005, TranslateGroup, 0x0000001B, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000005, TranslateModel, 0x0000001C, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF84060AA, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000045, 0x00000002, D_80245AE0_C8B590, 0xFE363C8A, 0x00000044, 0x00000001, D_80244AC8_C8A578, 0x00000045, 0x00000002, D_80245CA8_C8B758, 0xFD050F8A, 0x00000043, 0x00000002, PlaySound, 0x8000001B, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFDB9, 0x000002EE, 0x0000010E, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000001, func_80242D4C_C887FC, 0x00000043, 0x00000004, func_80243004_C88AB4, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000027, 0x00000002, 0xFD050F80, 0x00000014, 0x00000043, 0x00000005, TranslateGroup, 0x0000001B, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000005, TranslateModel, 0x0000001C, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000006, RotateGroup, 0x0000001B, 0xFE363C83, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x0000001C, 0xFE363C83, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000001, func_80242EBC_C8896C, 0x00000043, 0x00000005, TranslateModel, 0x0000001C, 0xFE363C85, 0xFE363C86, 0x0000001E, 0x00000043, 0x00000001, func_80242F74_C88A24, 0x0000000A, 0x00000002, 0xF9718887, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C83, 0x00000014, 0x0000000C, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF9718887, 0x00000001, 0x00000003, 0x00000001, 0x0000000C, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xF9718887, 0x00000000, 0x00000004, 0x00000001, 0x0000000C, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF9718885, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C80, 0x000001AE, 0x00000044, 0x00000001, D_80244B1C_C8A5CC, 0x00000024, 0x00000002, 0xF9718885, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF9718886, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000276, 0x00000049, 0x00000001, 0xFD050F8A, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000006, 0x7FFFFE00, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000006, 0x000001E4, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000042, 0x00000002, 0x00000020, 0x00000020, 0x00000001, 0x0000000A, 0x0000002D, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000020, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000001E, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000014, 0xF24A8680, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000A, 0xF24A814D, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000005, 0xF24A7C80, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xF9718886, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, func_80242DE4_C88894, 0x0000000C, 0x00000002, 0xFE363C84, 0x00000050, 0x0000000A, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000001, func_80242D20_C887D0, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000009, 0x00000024, 0x00000002, 0xF9718883, 0x00000001, 0x00000044, 0x00000001, D_80245840_C8B2F0, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000020, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000002, StopSound, 0x8000001B, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000001B, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000001C, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24BE280, 0x00000024, 0x00000002, 0xF9718887, 0x00000000, 0x00000024, 0x00000002, 0xF9718882, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000001E, 0xF24A7E80, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x000000EF, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000020, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000001B, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000020, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000006, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000001E, 0x00000000, 0x00000024, 0x00000002, 0xF9718885, 0x00000000, 0x00000024, 0x00000002, 0xF9718886, 0x00000000, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000024, 0x00000002, 0xF9718882, 0x00000000, 0x00000024, 0x00000002, 0xF9718887, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFDB9, 0x00000024, 0x00000002, 0xFE363C82, 0x000000A5, 0x00000043, 0x00000005, TranslateGroup, 0x0000001B, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000005, TranslateModel, 0x0000001C, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF84060AA, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000045, 0x00000002, D_80245AE0_C8B590, 0xFE363C8A, 0x00000044, 0x00000001, D_80244AC8_C8A578, 0x00000045, 0x00000002, D_80245CA8_C8B758, 0xFD050F8A, 0x00000043, 0x00000002, PlaySound, 0x8000001B, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFDB9, 0x000002EE, 0x0000010E, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000001, kzn_17_UnkFunc46, 0x00000043, 0x00000004, kzn_17_UnkFunc51, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000027, 0x00000002, 0xFD050F80, 0x00000014, 0x00000043, 0x00000005, TranslateGroup, 0x0000001B, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000005, TranslateModel, 0x0000001C, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000006, RotateGroup, 0x0000001B, 0xFE363C83, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x0000001C, 0xFE363C83, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000001, kzn_17_UnkFunc49, 0x00000043, 0x00000005, TranslateModel, 0x0000001C, 0xFE363C85, 0xFE363C86, 0x0000001E, 0x00000043, 0x00000001, kzn_17_UnkFunc50, 0x0000000A, 0x00000002, 0xF9718887, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C83, 0x00000014, 0x0000000C, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF9718887, 0x00000001, 0x00000003, 0x00000001, 0x0000000C, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xF9718887, 0x00000000, 0x00000004, 0x00000001, 0x0000000C, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF9718885, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C80, 0x000001AE, 0x00000044, 0x00000001, D_80244B1C_C8A5CC, 0x00000024, 0x00000002, 0xF9718885, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF9718886, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000276, 0x00000049, 0x00000001, 0xFD050F8A, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000006, 0x7FFFFE00, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000006, 0x000001E4, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000042, 0x00000002, 0x00000020, 0x00000020, 0x00000001, 0x0000000A, 0x0000002D, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000020, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000001E, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000014, 0xF24A8680, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000A, 0xF24A814D, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000005, 0xF24A7C80, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xF9718886, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, kzn_17_UnkFunc47, 0x0000000C, 0x00000002, 0xFE363C84, 0x00000050, 0x0000000A, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000001, func_80242D20_C887D0, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000009, 0x00000024, 0x00000002, 0xF9718883, 0x00000001, 0x00000044, 0x00000001, D_80245840_C8B2F0, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000020, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000002, StopSound, 0x8000001B, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000001B, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000001C, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24BE280, 0x00000024, 0x00000002, 0xF9718887, 0x00000000, 0x00000024, 0x00000002, 0xF9718882, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kzn/kzn_19/C8FA40.data.s b/ver/us/asm/data/world/area_kzn/kzn_19/C8FA40.data.s index 8e66d90baa..3ccea7ecdf 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_19/C8FA40.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_19/C8FA40.data.s @@ -12,7 +12,7 @@ glabel D_80242048_C8FBF8 .word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0xFE363C80, 0x00000004, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000024, 0x00000002, 0xFE363C81, 0x000001F4, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80241E90_C8FA40, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80242164_C8FD14 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000016, 0x00000001, 0x00000022, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F8A, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000023, 0x00000016, 0x00000001, 0x00000023, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x0000001C, 0x00000000, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000000B9, 0x0000006E, 0xFFFFFFE2, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7C43, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000B9, 0x00000037, 0xFFFFFFE2, 0x00000043, 0x00000003, GetCamDistance, 0x00000000, 0xFE363C81, 0x00000028, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C81, 0x0000000B, 0x00000002, 0x00002710, 0x00002710, 0x00000043, 0x00000004, GetCamPitch, 0x00000000, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xFE363C82, 0x00002710, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x0000000B, func_80240358_C8DF08, 0x00000004, 0x000000B4, 0x00000130, 0x0000000F, 0xFFFFFFCA, 0x000000B9, 0x0000006E, 0xFFFFFFE2, 0x00000037, 0x00000019, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_802404B8_C8E068, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x80000067, 0x00000043, 0x00000001, func_8024030C_C8DEBC, 0x00000043, 0x00000002, StopSound, 0x80000067, 0x00000043, 0x00000006, PlaySoundAt, 0x000000B2, 0x00000000, 0x000000B9, 0x0000006E, 0xFFFFFFE2, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x000000B4, 0x00000008, 0x00000001, 0x00000073, 0x00000043, 0x00000006, PlaySoundAt, 0x00000137, 0x00000000, 0x000000B9, 0x0000006E, 0xFFFFFFE2, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802408C8_C8E478, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000057, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C81, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000B9, 0x00000019, 0xFFFFFFE2, 0x00000043, 0x00000002, func_802408C8_C8E478, 0x00000002, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, func_80240908_C8E4B8, 0x00000004, 0x000000B9, 0x00000037, 0xFFFFFFE2, 0x00000019, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240A14_C8E5C4, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_802408C8_C8E478, 0x00000003, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000138, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80248354, 0x00000004, 0x0000000E, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000016, 0x00000001, 0x00000022, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F8A, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000023, 0x00000016, 0x00000001, 0x00000023, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x0000001C, 0x00000000, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000000B9, 0x0000006E, 0xFFFFFFE2, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7C43, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000B9, 0x00000037, 0xFFFFFFE2, 0x00000043, 0x00000003, GetCamDistance, 0x00000000, 0xFE363C81, 0x00000028, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C81, 0x0000000B, 0x00000002, 0x00002710, 0x00002710, 0x00000043, 0x00000004, GetCamPitch, 0x00000000, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xFE363C82, 0x00002710, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x0000000B, kzn_19_StarSpiritEffectFunc2, 0x00000004, 0x000000B4, 0x00000130, 0x0000000F, 0xFFFFFFCA, 0x000000B9, 0x0000006E, 0xFFFFFFE2, 0x00000037, 0x00000019, 0x00000056, 0x00000000, 0x00000043, 0x00000001, kzn_19_StarSpiritEffectFunc3, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x80000067, 0x00000043, 0x00000001, kzn_19_StarSpiritEffectFunc1, 0x00000043, 0x00000002, StopSound, 0x80000067, 0x00000043, 0x00000006, PlaySoundAt, 0x000000B2, 0x00000000, 0x000000B9, 0x0000006E, 0xFFFFFFE2, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x000000B4, 0x00000008, 0x00000001, 0x00000073, 0x00000043, 0x00000006, PlaySoundAt, 0x00000137, 0x00000000, 0x000000B9, 0x0000006E, 0xFFFFFFE2, 0x00000057, 0x00000000, 0x00000043, 0x00000002, kzn_19_StarSpiritEffectFunc4, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000057, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C81, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000B9, 0x00000019, 0xFFFFFFE2, 0x00000043, 0x00000002, kzn_19_StarSpiritEffectFunc4, 0x00000002, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, kzn_19_StarSpiritEffectFunc5, 0x00000004, 0x000000B9, 0x00000037, 0xFFFFFFE2, 0x00000019, 0x00000056, 0x00000000, 0x00000043, 0x00000001, kzn_19_StarSpiritEffectFunc6, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kzn_19_StarSpiritEffectFunc4, 0x00000003, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000138, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80248354, 0x00000004, 0x0000000E, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_8024263C_C901EC .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x8024835C, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_15/DE8F70.data.s b/ver/us/asm/data/world/area_omo/omo_15/DE8F70.data.s index 28ce718332..91ff4a562c 100644 --- a/ver/us/asm/data/world/area_omo/omo_15/DE8F70.data.s +++ b/ver/us/asm/data/world/area_omo/omo_15/DE8F70.data.s @@ -9,7 +9,7 @@ glabel D_80240850_DE8FC0 .word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000004, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000016, 0x00000001, 0x00000004, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000001F4, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000020, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_802408E0_DE9050 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000004, 0x00000016, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x0000001C, 0x00000000, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF9C, 0x00000055, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7C80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF9C, 0x0000001E, 0x00000000, 0x00000043, 0x00000003, GetCamDistance, 0x00000000, 0xFE363C81, 0x00000028, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C81, 0x0000000B, 0x00000002, 0x00002710, 0x00002710, 0x00000043, 0x00000004, GetCamPitch, 0x00000000, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xFE363C82, 0x00002710, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x0000000B, func_8024004C_DE87BC, 0x00000003, 0x000000B4, 0x000000D7, 0x0000003C, 0x00000000, 0xFFFFFF9C, 0x00000055, 0x00000000, 0x0000001E, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_802401AC_DE891C, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x80000067, 0x00000043, 0x00000001, func_80240000_DE8770, 0x00000043, 0x00000002, StopSound, 0x80000067, 0x00000043, 0x00000006, PlaySoundAt, 0x000000B2, 0x00000000, 0xFFFFFF9C, 0x00000055, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x000000B4, 0x00000008, 0x00000001, 0x00000073, 0x00000043, 0x00000006, PlaySoundAt, 0x00000137, 0x00000000, 0xFFFFFF9C, 0x00000055, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802405BC_DE8D2C, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000057, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C81, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802405BC_DE8D2C, 0x00000002, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, func_802405FC_DE8D6C, 0x00000003, 0xFFFFFF9C, 0x0000001E, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240708_DE8E78, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_802405BC_DE8D2C, 0x00000003, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000138, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000005, 0x00000043, 0x00000004, GotoMapSpecial, 0x80243744, 0x00000003, 0x0000000E, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000004, 0x00000016, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x0000001C, 0x00000000, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF9C, 0x00000055, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7C80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF9C, 0x0000001E, 0x00000000, 0x00000043, 0x00000003, GetCamDistance, 0x00000000, 0xFE363C81, 0x00000028, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C81, 0x0000000B, 0x00000002, 0x00002710, 0x00002710, 0x00000043, 0x00000004, GetCamPitch, 0x00000000, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xFE363C82, 0x00002710, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x0000000B, omo_15_StarSpiritEffectFunc2, 0x00000003, 0x000000B4, 0x000000D7, 0x0000003C, 0x00000000, 0xFFFFFF9C, 0x00000055, 0x00000000, 0x0000001E, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, omo_15_StarSpiritEffectFunc3, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x80000067, 0x00000043, 0x00000001, omo_15_StarSpiritEffectFunc1, 0x00000043, 0x00000002, StopSound, 0x80000067, 0x00000043, 0x00000006, PlaySoundAt, 0x000000B2, 0x00000000, 0xFFFFFF9C, 0x00000055, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x000000B4, 0x00000008, 0x00000001, 0x00000073, 0x00000043, 0x00000006, PlaySoundAt, 0x00000137, 0x00000000, 0xFFFFFF9C, 0x00000055, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, omo_15_StarSpiritEffectFunc4, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000057, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C81, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000002, omo_15_StarSpiritEffectFunc4, 0x00000002, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, omo_15_StarSpiritEffectFunc5, 0x00000003, 0xFFFFFF9C, 0x0000001E, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, omo_15_StarSpiritEffectFunc6, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, omo_15_StarSpiritEffectFunc4, 0x00000003, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000138, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000005, 0x00000043, 0x00000004, GotoMapSpecial, 0x80243744, 0x00000003, 0x0000000E, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80240D78_DE94E8 .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x8024374C, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_32/D87240.data.s b/ver/us/asm/data/world/area_pra/pra_32/D87240.data.s index 5e83a21863..23a34d9725 100644 --- a/ver/us/asm/data/world/area_pra/pra_32/D87240.data.s +++ b/ver/us/asm/data/world/area_pra/pra_32/D87240.data.s @@ -6,7 +6,7 @@ glabel D_80240840_D87240 .word 0x41500000, 0x00000000, 0x428C0000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802412A0_D87CA0, D_80240840_D87240, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x0019014D glabel D_80240890_D87290 -.word 0x0000000A, 0x00000002, 0xF5DE0180, 0x00000056, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000001F4, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000037, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000253, 0x000000B9, 0x00000074, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7CE7, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000253, 0x00000082, 0x00000074, 0x00000043, 0x00000003, GetCamDistance, 0x00000000, 0xFE363C81, 0x00000028, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C81, 0x0000000B, 0x00000002, 0x00002710, 0x00002710, 0x00000043, 0x00000004, GetCamPitch, 0x00000000, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xFE363C82, 0x00002710, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x0000000B, func_8024006C_D86A6C, 0x00000006, 0x000000B4, 0x0000024E, 0x00000078, 0x00000074, 0x00000253, 0x000000B9, 0x00000074, 0x00000082, 0x00000064, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_802401CC_D86BCC, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x80000067, 0x00000043, 0x00000001, func_80240020_D86A20, 0x00000043, 0x00000002, StopSound, 0x80000067, 0x00000043, 0x00000006, PlaySoundAt, 0x000000B2, 0x00000000, 0x00000253, 0x000000B9, 0x00000074, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x000000B4, 0x00000008, 0x00000001, 0x00000073, 0x00000043, 0x00000006, PlaySoundAt, 0x00000137, 0x00000000, 0x00000253, 0x000000B9, 0x00000074, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802405DC_D86FDC, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000057, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C81, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000253, 0x00000064, 0x00000074, 0x00000043, 0x00000002, func_802405DC_D86FDC, 0x00000002, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, func_8024061C_D8701C, 0x00000006, 0x00000253, 0x00000082, 0x00000074, 0x00000064, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240728_D87128, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_802405DC_D86FDC, 0x00000003, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000138, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000057, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242CC4, 0x00000006, 0x0000000E, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000253, 0x000000B9, 0x00000074, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7CE7, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000253, 0x00000082, 0x00000074, 0x00000043, 0x00000003, GetCamDistance, 0x00000000, 0xFE363C81, 0x00000028, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C81, 0x0000000B, 0x00000002, 0x00002710, 0x00002710, 0x00000043, 0x00000004, GetCamPitch, 0x00000000, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xFE363C82, 0x00002710, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x0000000B, func_8024006C_D86A6C, 0x00000006, 0x000000B4, 0x0000024E, 0x00000078, 0x00000074, 0x00000253, 0x000000B9, 0x00000074, 0x00000082, 0x00000064, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_802401CC_D86BCC, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x80000067, 0x00000043, 0x00000001, func_80240020_D86A20, 0x00000043, 0x00000002, StopSound, 0x80000067, 0x00000043, 0x00000006, PlaySoundAt, 0x000000B2, 0x00000000, 0x00000253, 0x000000B9, 0x00000074, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x000000B4, 0x00000008, 0x00000001, 0x00000073, 0x00000043, 0x00000006, PlaySoundAt, 0x00000137, 0x00000000, 0x00000253, 0x000000B9, 0x00000074, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802405DC_D86FDC, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000057, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C81, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000253, 0x00000064, 0x00000074, 0x00000043, 0x00000002, func_802405DC_D86FDC, 0x00000002, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, func_8024061C_D8701C, 0x00000006, 0x00000253, 0x00000082, 0x00000074, 0x00000064, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240728_D87128, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_802405DC_D86FDC, 0x00000003, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000138, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000057, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242CC4, 0x00000006, 0x0000000E, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF5DE0180, 0x00000056, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000001F4, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000037, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000253, 0x000000B9, 0x00000074, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7CE7, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000253, 0x00000082, 0x00000074, 0x00000043, 0x00000003, GetCamDistance, 0x00000000, 0xFE363C81, 0x00000028, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C81, 0x0000000B, 0x00000002, 0x00002710, 0x00002710, 0x00000043, 0x00000004, GetCamPitch, 0x00000000, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xFE363C82, 0x00002710, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x0000000B, pra_32_StarSpiritEffectFunc2, 0x00000006, 0x000000B4, 0x0000024E, 0x00000078, 0x00000074, 0x00000253, 0x000000B9, 0x00000074, 0x00000082, 0x00000064, 0x00000056, 0x00000000, 0x00000043, 0x00000001, pra_32_StarSpiritEffectFunc3, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x80000067, 0x00000043, 0x00000001, pra_32_StarSpiritEffectFunc1, 0x00000043, 0x00000002, StopSound, 0x80000067, 0x00000043, 0x00000006, PlaySoundAt, 0x000000B2, 0x00000000, 0x00000253, 0x000000B9, 0x00000074, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x000000B4, 0x00000008, 0x00000001, 0x00000073, 0x00000043, 0x00000006, PlaySoundAt, 0x00000137, 0x00000000, 0x00000253, 0x000000B9, 0x00000074, 0x00000057, 0x00000000, 0x00000043, 0x00000002, pra_32_StarSpiritEffectFunc4, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000057, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C81, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000253, 0x00000064, 0x00000074, 0x00000043, 0x00000002, pra_32_StarSpiritEffectFunc4, 0x00000002, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, pra_32_StarSpiritEffectFunc5, 0x00000006, 0x00000253, 0x00000082, 0x00000074, 0x00000064, 0x00000056, 0x00000000, 0x00000043, 0x00000001, pra_32_StarSpiritEffectFunc6, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_32_StarSpiritEffectFunc4, 0x00000003, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000138, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000057, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242CC4, 0x00000006, 0x0000000E, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000253, 0x000000B9, 0x00000074, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7CE7, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000253, 0x00000082, 0x00000074, 0x00000043, 0x00000003, GetCamDistance, 0x00000000, 0xFE363C81, 0x00000028, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C81, 0x0000000B, 0x00000002, 0x00002710, 0x00002710, 0x00000043, 0x00000004, GetCamPitch, 0x00000000, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xFE363C82, 0x00002710, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x0000000B, pra_32_StarSpiritEffectFunc2, 0x00000006, 0x000000B4, 0x0000024E, 0x00000078, 0x00000074, 0x00000253, 0x000000B9, 0x00000074, 0x00000082, 0x00000064, 0x00000056, 0x00000000, 0x00000043, 0x00000001, pra_32_StarSpiritEffectFunc3, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x80000067, 0x00000043, 0x00000001, pra_32_StarSpiritEffectFunc1, 0x00000043, 0x00000002, StopSound, 0x80000067, 0x00000043, 0x00000006, PlaySoundAt, 0x000000B2, 0x00000000, 0x00000253, 0x000000B9, 0x00000074, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x000000B4, 0x00000008, 0x00000001, 0x00000073, 0x00000043, 0x00000006, PlaySoundAt, 0x00000137, 0x00000000, 0x00000253, 0x000000B9, 0x00000074, 0x00000057, 0x00000000, 0x00000043, 0x00000002, pra_32_StarSpiritEffectFunc4, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000057, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C81, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000253, 0x00000064, 0x00000074, 0x00000043, 0x00000002, pra_32_StarSpiritEffectFunc4, 0x00000002, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, pra_32_StarSpiritEffectFunc5, 0x00000006, 0x00000253, 0x00000082, 0x00000074, 0x00000064, 0x00000056, 0x00000000, 0x00000043, 0x00000001, pra_32_StarSpiritEffectFunc6, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_32_StarSpiritEffectFunc4, 0x00000003, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000138, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000057, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242CC4, 0x00000006, 0x0000000E, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80241178_D87B78 .word 0x00000006, 0xFFFFFFFF diff --git a/ver/us/asm/data/world/area_trd/trd_10/9C3160.data.s b/ver/us/asm/data/world/area_trd/trd_10/9C3160.data.s index 57e7d94d7a..838ab4bd73 100644 --- a/ver/us/asm/data/world/area_trd/trd_10/9C3160.data.s +++ b/ver/us/asm/data/world/area_trd/trd_10/9C3160.data.s @@ -9,7 +9,7 @@ glabel D_802408B0_9C31C0 .word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFB2, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000052, 0x00000001, 0x00000008, 0x00000016, 0x00000001, 0xFFFFFFB2, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000001F4, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000014, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80240950_9C3260 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000016, 0x00000001, 0xFFFFFFB1, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFB2, 0x00000043, 0x00000003, GotoMap, 0x80242ABC, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFB2, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000002, GetEntryID, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x0000001C, 0x00000000, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF79, 0x00000055, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7CE7, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF79, 0x0000001E, 0x00000000, 0x00000043, 0x00000003, GetCamDistance, 0x00000000, 0xFE363C81, 0x00000028, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C81, 0x0000000B, 0x00000002, 0x00002710, 0x00002710, 0x00000043, 0x00000004, GetCamPitch, 0x00000000, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xFE363C82, 0x00002710, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x0000000B, func_8024004C_9C295C, 0x00000000, 0x000000B4, 0xFFFFFF79, 0x0000000A, 0x00000000, 0xFFFFFF79, 0x00000055, 0x00000000, 0x0000001E, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_802401AC_9C2ABC, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x80000067, 0x00000043, 0x00000001, func_80240000_9C2910, 0x00000043, 0x00000002, StopSound, 0x80000067, 0x00000043, 0x00000006, PlaySoundAt, 0x000000B2, 0x00000000, 0xFFFFFF79, 0x00000055, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x000000B4, 0x00000008, 0x00000001, 0x00000073, 0x00000043, 0x00000006, PlaySoundAt, 0x00000137, 0x00000000, 0xFFFFFF79, 0x00000055, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802405BC_9C2ECC, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000057, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C81, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF79, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802405BC_9C2ECC, 0x00000002, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, func_802405FC_9C2F0C, 0x00000000, 0xFFFFFF79, 0x0000001E, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240708_9C3018, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_802405BC_9C2ECC, 0x00000003, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000138, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFB3, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242AB4, 0x00000000, 0x0000000E, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000016, 0x00000001, 0xFFFFFFB1, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFB2, 0x00000043, 0x00000003, GotoMap, 0x80242ABC, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFB2, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000002, GetEntryID, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x0000001C, 0x00000000, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF79, 0x00000055, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7CE7, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF79, 0x0000001E, 0x00000000, 0x00000043, 0x00000003, GetCamDistance, 0x00000000, 0xFE363C81, 0x00000028, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C81, 0x0000000B, 0x00000002, 0x00002710, 0x00002710, 0x00000043, 0x00000004, GetCamPitch, 0x00000000, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xFE363C82, 0x00002710, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x0000000B, trd_10_StarSpiritEffectFunc2, 0x00000000, 0x000000B4, 0xFFFFFF79, 0x0000000A, 0x00000000, 0xFFFFFF79, 0x00000055, 0x00000000, 0x0000001E, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, trd_10_StarSpiritEffectFunc3, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x80000067, 0x00000043, 0x00000001, trd_10_StarSpiritEffectFunc1, 0x00000043, 0x00000002, StopSound, 0x80000067, 0x00000043, 0x00000006, PlaySoundAt, 0x000000B2, 0x00000000, 0xFFFFFF79, 0x00000055, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x000000B4, 0x00000008, 0x00000001, 0x00000073, 0x00000043, 0x00000006, PlaySoundAt, 0x00000137, 0x00000000, 0xFFFFFF79, 0x00000055, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, trd_10_StarSpiritEffectFunc4, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000057, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C81, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF79, 0x00000000, 0x00000000, 0x00000043, 0x00000002, trd_10_StarSpiritEffectFunc4, 0x00000002, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, trd_10_StarSpiritEffectFunc5, 0x00000000, 0xFFFFFF79, 0x0000001E, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, trd_10_StarSpiritEffectFunc6, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, trd_10_StarSpiritEffectFunc4, 0x00000003, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000138, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFB3, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242AB4, 0x00000000, 0x0000000E, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80240E38_9C3748 .word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000029, 0x00000024, 0x00000002, 0xFE363C83, 0x00000027, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFF03, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/nonmatchings/EA0C10/func_80240DC4_EA16C4.s b/ver/us/asm/nonmatchings/EA0C10/func_80240DC4_EA16C4.s index 77587dda20..048caf8ea9 100644 --- a/ver/us/asm/nonmatchings/EA0C10/func_80240DC4_EA16C4.s +++ b/ver/us/asm/nonmatchings/EA0C10/func_80240DC4_EA16C4.s @@ -238,7 +238,7 @@ glabel func_80240DC4_EA16C4 /* EA19E4 802410E4 00000000 */ nop /* EA19E8 802410E8 45010003 */ bc1t .L802410F8 /* EA19EC 802410EC 00000000 */ nop -/* EA19F0 802410F0 0C019C10 */ jal func_80067040 +/* EA19F0 802410F0 0C019C10 */ jal dead_sqrtf /* EA19F4 802410F4 00000000 */ nop .L802410F8: /* EA19F8 802410F8 8E260038 */ lw $a2, 0x38($s1) diff --git a/ver/us/asm/nonmatchings/EA0C10/func_8024267C_EA2F7C.s b/ver/us/asm/nonmatchings/EA0C10/func_8024267C_EA2F7C.s index cf55967c5d..4a0c03f8da 100644 --- a/ver/us/asm/nonmatchings/EA0C10/func_8024267C_EA2F7C.s +++ b/ver/us/asm/nonmatchings/EA0C10/func_8024267C_EA2F7C.s @@ -11,7 +11,7 @@ glabel func_8024267C_EA2F7C /* EA2F94 80242694 8E020000 */ lw $v0, ($s0) /* EA2F98 80242698 14400010 */ bnez $v0, .L802426DC /* EA2F9C 8024269C 0080882D */ daddu $s1, $a0, $zero -/* EA2FA0 802426A0 0C00AFF5 */ jal func_8002BFD4 +/* EA2FA0 802426A0 0C00AFF5 */ jal dead_heap_malloc /* EA2FA4 802426A4 24040040 */ addiu $a0, $zero, 0x40 /* EA2FA8 802426A8 AE020000 */ sw $v0, ($s0) /* EA2FAC 802426AC 0000182D */ daddu $v1, $zero, $zero diff --git a/ver/us/asm/nonmatchings/EA0C10/func_80242AE8_EA33E8.s b/ver/us/asm/nonmatchings/EA0C10/func_80242AE8_EA33E8.s deleted file mode 100644 index baf050270a..0000000000 --- a/ver/us/asm/nonmatchings/EA0C10/func_80242AE8_EA33E8.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242AE8_EA33E8 -/* EA33E8 80242AE8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* EA33EC 80242AEC AFB10014 */ sw $s1, 0x14($sp) -/* EA33F0 80242AF0 0080882D */ daddu $s1, $a0, $zero -/* EA33F4 80242AF4 AFBF0018 */ sw $ra, 0x18($sp) -/* EA33F8 80242AF8 AFB00010 */ sw $s0, 0x10($sp) -/* EA33FC 80242AFC 8E30000C */ lw $s0, 0xc($s1) -/* EA3400 80242B00 8E050000 */ lw $a1, ($s0) -/* EA3404 80242B04 0C0B53A3 */ jal dead_evt_get_variable -/* EA3408 80242B08 26100004 */ addiu $s0, $s0, 4 -/* EA340C 80242B0C AE22008C */ sw $v0, 0x8c($s1) -/* EA3410 80242B10 8E050000 */ lw $a1, ($s0) -/* EA3414 80242B14 26100004 */ addiu $s0, $s0, 4 -/* EA3418 80242B18 0C0B53A3 */ jal dead_evt_get_variable -/* EA341C 80242B1C 0220202D */ daddu $a0, $s1, $zero -/* EA3420 80242B20 AE220090 */ sw $v0, 0x90($s1) -/* EA3424 80242B24 8E050000 */ lw $a1, ($s0) -/* EA3428 80242B28 26100004 */ addiu $s0, $s0, 4 -/* EA342C 80242B2C 0C0B53A3 */ jal dead_evt_get_variable -/* EA3430 80242B30 0220202D */ daddu $a0, $s1, $zero -/* EA3434 80242B34 AE220094 */ sw $v0, 0x94($s1) -/* EA3438 80242B38 8E050000 */ lw $a1, ($s0) -/* EA343C 80242B3C 26100004 */ addiu $s0, $s0, 4 -/* EA3440 80242B40 0C0B53A3 */ jal dead_evt_get_variable -/* EA3444 80242B44 0220202D */ daddu $a0, $s1, $zero -/* EA3448 80242B48 AE220098 */ sw $v0, 0x98($s1) -/* EA344C 80242B4C 8E050000 */ lw $a1, ($s0) -/* EA3450 80242B50 26100004 */ addiu $s0, $s0, 4 -/* EA3454 80242B54 0C0B53A3 */ jal dead_evt_get_variable -/* EA3458 80242B58 0220202D */ daddu $a0, $s1, $zero -/* EA345C 80242B5C AE22009C */ sw $v0, 0x9c($s1) -/* EA3460 80242B60 8E050000 */ lw $a1, ($s0) -/* EA3464 80242B64 26100004 */ addiu $s0, $s0, 4 -/* EA3468 80242B68 0C0B53A3 */ jal dead_evt_get_variable -/* EA346C 80242B6C 0220202D */ daddu $a0, $s1, $zero -/* EA3470 80242B70 AE2200A0 */ sw $v0, 0xa0($s1) -/* EA3474 80242B74 8E050000 */ lw $a1, ($s0) -/* EA3478 80242B78 26100004 */ addiu $s0, $s0, 4 -/* EA347C 80242B7C 0C0B53A3 */ jal dead_evt_get_variable -/* EA3480 80242B80 0220202D */ daddu $a0, $s1, $zero -/* EA3484 80242B84 AE2200A4 */ sw $v0, 0xa4($s1) -/* EA3488 80242B88 8E050000 */ lw $a1, ($s0) -/* EA348C 80242B8C 26100004 */ addiu $s0, $s0, 4 -/* EA3490 80242B90 0C0B53A3 */ jal dead_evt_get_variable -/* EA3494 80242B94 0220202D */ daddu $a0, $s1, $zero -/* EA3498 80242B98 AE2200A8 */ sw $v0, 0xa8($s1) -/* EA349C 80242B9C 8E050000 */ lw $a1, ($s0) -/* EA34A0 80242BA0 26100004 */ addiu $s0, $s0, 4 -/* EA34A4 80242BA4 0C0B53A3 */ jal dead_evt_get_variable -/* EA34A8 80242BA8 0220202D */ daddu $a0, $s1, $zero -/* EA34AC 80242BAC AE2200AC */ sw $v0, 0xac($s1) -/* EA34B0 80242BB0 8E050000 */ lw $a1, ($s0) -/* EA34B4 80242BB4 0C0B53A3 */ jal dead_evt_get_variable -/* EA34B8 80242BB8 0220202D */ daddu $a0, $s1, $zero -/* EA34BC 80242BBC AE2200B0 */ sw $v0, 0xb0($s1) -/* EA34C0 80242BC0 8FBF0018 */ lw $ra, 0x18($sp) -/* EA34C4 80242BC4 8FB10014 */ lw $s1, 0x14($sp) -/* EA34C8 80242BC8 8FB00010 */ lw $s0, 0x10($sp) -/* EA34CC 80242BCC 24020002 */ addiu $v0, $zero, 2 -/* EA34D0 80242BD0 03E00008 */ jr $ra -/* EA34D4 80242BD4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/EA36E0/func_80242DE0_EA36E0.s b/ver/us/asm/nonmatchings/EA36E0/func_80242DE0_EA36E0.s deleted file mode 100644 index 1d85d1d3d4..0000000000 --- a/ver/us/asm/nonmatchings/EA36E0/func_80242DE0_EA36E0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242DE0_EA36E0 -/* EA36E0 80242DE0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* EA36E4 80242DE4 AFBF0010 */ sw $ra, 0x10($sp) -/* EA36E8 80242DE8 0C03C7BE */ jal func_800F1EF8 -/* EA36EC 80242DEC 24040001 */ addiu $a0, $zero, 1 -/* EA36F0 80242DF0 8FBF0010 */ lw $ra, 0x10($sp) -/* EA36F4 80242DF4 24020002 */ addiu $v0, $zero, 2 -/* EA36F8 80242DF8 03E00008 */ jr $ra -/* EA36FC 80242DFC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/EA36E0/func_80242E2C_EA372C.s b/ver/us/asm/nonmatchings/EA36E0/func_80242E2C_EA372C.s deleted file mode 100644 index a25d7ae23b..0000000000 --- a/ver/us/asm/nonmatchings/EA36E0/func_80242E2C_EA372C.s +++ /dev/null @@ -1,43 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242E2C_EA372C -/* EA372C 80242E2C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* EA3730 80242E30 AFB00028 */ sw $s0, 0x28($sp) -/* EA3734 80242E34 0080802D */ daddu $s0, $a0, $zero -/* EA3738 80242E38 AFBF002C */ sw $ra, 0x2c($sp) -/* EA373C 80242E3C C6000084 */ lwc1 $f0, 0x84($s0) -/* EA3740 80242E40 46800020 */ cvt.s.w $f0, $f0 -/* EA3744 80242E44 E7A00018 */ swc1 $f0, 0x18($sp) -/* EA3748 80242E48 C600008C */ lwc1 $f0, 0x8c($s0) -/* EA374C 80242E4C 46800020 */ cvt.s.w $f0, $f0 -/* EA3750 80242E50 27A20024 */ addiu $v0, $sp, 0x24 -/* EA3754 80242E54 3C040001 */ lui $a0, 1 -/* EA3758 80242E58 27A50018 */ addiu $a1, $sp, 0x18 -/* EA375C 80242E5C 27A6001C */ addiu $a2, $sp, 0x1c -/* EA3760 80242E60 3C0144FA */ lui $at, 0x44fa -/* EA3764 80242E64 44811000 */ mtc1 $at, $f2 -/* EA3768 80242E68 27A70020 */ addiu $a3, $sp, 0x20 -/* EA376C 80242E6C E7A0001C */ swc1 $f0, 0x1c($sp) -/* EA3770 80242E70 AFA00020 */ sw $zero, 0x20($sp) -/* EA3774 80242E74 E7A20024 */ swc1 $f2, 0x24($sp) -/* EA3778 80242E78 0C03908F */ jal dead_npc_raycast_down_sides -/* EA377C 80242E7C AFA20010 */ sw $v0, 0x10($sp) -/* EA3780 80242E80 1040000B */ beqz $v0, .L80242EB0 -/* EA3784 80242E84 00000000 */ nop -/* EA3788 80242E88 C7A2001C */ lwc1 $f2, 0x1c($sp) -/* EA378C 80242E8C 3C01425C */ lui $at, 0x425c -/* EA3790 80242E90 44810000 */ mtc1 $at, $f0 -/* EA3794 80242E94 00000000 */ nop -/* EA3798 80242E98 46001080 */ add.s $f2, $f2, $f0 -/* EA379C 80242E9C C7A00018 */ lwc1 $f0, 0x18($sp) -/* EA37A0 80242EA0 4600010D */ trunc.w.s $f4, $f0 -/* EA37A4 80242EA4 E6040084 */ swc1 $f4, 0x84($s0) -/* EA37A8 80242EA8 4600110D */ trunc.w.s $f4, $f2 -/* EA37AC 80242EAC E604008C */ swc1 $f4, 0x8c($s0) -.L80242EB0: -/* EA37B0 80242EB0 8FBF002C */ lw $ra, 0x2c($sp) -/* EA37B4 80242EB4 8FB00028 */ lw $s0, 0x28($sp) -/* EA37B8 80242EB8 24020002 */ addiu $v0, $zero, 2 -/* EA37BC 80242EBC 03E00008 */ jr $ra -/* EA37C0 80242EC0 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/EA36E0/func_80242EC4_EA37C4.s b/ver/us/asm/nonmatchings/EA36E0/func_80242EC4_EA37C4.s index d65be2073c..5b669fb535 100644 --- a/ver/us/asm/nonmatchings/EA36E0/func_80242EC4_EA37C4.s +++ b/ver/us/asm/nonmatchings/EA36E0/func_80242EC4_EA37C4.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80242EC4_EA37C4 +glabel EA36E0_UnkFunc47 /* EA37C4 80242EC4 27BDFFE8 */ addiu $sp, $sp, -0x18 /* EA37C8 80242EC8 AFB00010 */ sw $s0, 0x10($sp) /* EA37CC 80242ECC 0080802D */ daddu $s0, $a0, $zero @@ -33,7 +33,7 @@ glabel func_80242EC4_EA37C4 /* EA3834 80242F34 00000000 */ nop /* EA3838 80242F38 45010003 */ bc1t .L80242F48 /* EA383C 80242F3C 00000000 */ nop -/* EA3840 80242F40 0C019C10 */ jal func_80067040 +/* EA3840 80242F40 0C019C10 */ jal dead_sqrtf /* EA3844 80242F44 00000000 */ nop .L80242F48: /* EA3848 80242F48 4600020D */ trunc.w.s $f8, $f0 diff --git a/ver/us/asm/nonmatchings/EA36E0/func_80242F64_EA3864.s b/ver/us/asm/nonmatchings/EA36E0/func_80242F64_EA3864.s deleted file mode 100644 index 6e9d72bcf6..0000000000 --- a/ver/us/asm/nonmatchings/EA36E0/func_80242F64_EA3864.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242F64_EA3864 -/* EA3864 80242F64 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* EA3868 80242F68 AFBF0010 */ sw $ra, 0x10($sp) -/* EA386C 80242F6C 8C82000C */ lw $v0, 0xc($a0) -/* EA3870 80242F70 0C0B53A3 */ jal dead_evt_get_variable -/* EA3874 80242F74 8C450000 */ lw $a1, ($v0) -/* EA3878 80242F78 44820000 */ mtc1 $v0, $f0 -/* EA387C 80242F7C 00000000 */ nop -/* EA3880 80242F80 46800020 */ cvt.s.w $f0, $f0 -/* EA3884 80242F84 8FBF0010 */ lw $ra, 0x10($sp) -/* EA3888 80242F88 24020002 */ addiu $v0, $zero, 2 -/* EA388C 80242F8C 3C018011 */ lui $at, %hi(D_80117604) -/* EA3890 80242F90 E4207604 */ swc1 $f0, %lo(D_80117604)($at) -/* EA3894 80242F94 03E00008 */ jr $ra -/* EA3898 80242F98 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/EA36E0/func_80242F9C_EA389C.s b/ver/us/asm/nonmatchings/EA36E0/func_80242F9C_EA389C.s deleted file mode 100644 index 50464ce86e..0000000000 --- a/ver/us/asm/nonmatchings/EA36E0/func_80242F9C_EA389C.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_802466B0_EA6FB0 -.double 35.0 - -glabel D_802466B8_EA6FB8 -.double 2.3 - -.section .text - -glabel func_80242F9C_EA389C -/* EA389C 80242F9C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* EA38A0 80242FA0 AFB00010 */ sw $s0, 0x10($sp) -/* EA38A4 80242FA4 0080802D */ daddu $s0, $a0, $zero -/* EA38A8 80242FA8 AFBF0014 */ sw $ra, 0x14($sp) -/* EA38AC 80242FAC F7B40018 */ sdc1 $f20, 0x18($sp) -/* EA38B0 80242FB0 C60C0090 */ lwc1 $f12, 0x90($s0) -/* EA38B4 80242FB4 46806320 */ cvt.s.w $f12, $f12 -/* EA38B8 80242FB8 3C018024 */ lui $at, %hi(D_802466B0_EA6FB0) -/* EA38BC 80242FBC D43466B0 */ ldc1 $f20, %lo(D_802466B0_EA6FB0)($at) -/* EA38C0 80242FC0 46006307 */ neg.s $f12, $f12 -/* EA38C4 80242FC4 46006321 */ cvt.d.s $f12, $f12 -/* EA38C8 80242FC8 46346301 */ sub.d $f12, $f12, $f20 -/* EA38CC 80242FCC 0C00AD90 */ jal dead_cos_deg -/* EA38D0 80242FD0 46206320 */ cvt.s.d $f12, $f12 -/* EA38D4 80242FD4 3C014008 */ lui $at, 0x4008 -/* EA38D8 80242FD8 44811800 */ mtc1 $at, $f3 -/* EA38DC 80242FDC 44801000 */ mtc1 $zero, $f2 -/* EA38E0 80242FE0 46000021 */ cvt.d.s $f0, $f0 -/* EA38E4 80242FE4 46220002 */ mul.d $f0, $f0, $f2 -/* EA38E8 80242FE8 00000000 */ nop -/* EA38EC 80242FEC C60C0090 */ lwc1 $f12, 0x90($s0) -/* EA38F0 80242FF0 46806320 */ cvt.s.w $f12, $f12 -/* EA38F4 80242FF4 46006307 */ neg.s $f12, $f12 -/* EA38F8 80242FF8 46006321 */ cvt.d.s $f12, $f12 -/* EA38FC 80242FFC 46346301 */ sub.d $f12, $f12, $f20 -/* EA3900 80243000 3C018024 */ lui $at, %hi(D_802466B8_EA6FB8) -/* EA3904 80243004 D42266B8 */ ldc1 $f2, %lo(D_802466B8_EA6FB8)($at) -/* EA3908 80243008 46220001 */ sub.d $f0, $f0, $f2 -/* EA390C 8024300C 4620010D */ trunc.w.d $f4, $f0 -/* EA3910 80243010 E6040098 */ swc1 $f4, 0x98($s0) -/* EA3914 80243014 0C00AD77 */ jal dead_sin_deg -/* EA3918 80243018 46206320 */ cvt.s.d $f12, $f12 -/* EA391C 8024301C 3C014014 */ lui $at, 0x4014 -/* EA3920 80243020 44811800 */ mtc1 $at, $f3 -/* EA3924 80243024 44801000 */ mtc1 $zero, $f2 -/* EA3928 80243028 46000021 */ cvt.d.s $f0, $f0 -/* EA392C 8024302C 46220002 */ mul.d $f0, $f0, $f2 -/* EA3930 80243030 00000000 */ nop -/* EA3934 80243034 4620010D */ trunc.w.d $f4, $f0 -/* EA3938 80243038 E604009C */ swc1 $f4, 0x9c($s0) -/* EA393C 8024303C 8FBF0014 */ lw $ra, 0x14($sp) -/* EA3940 80243040 8FB00010 */ lw $s0, 0x10($sp) -/* EA3944 80243044 D7B40018 */ ldc1 $f20, 0x18($sp) -/* EA3948 80243048 24020002 */ addiu $v0, $zero, 2 -/* EA394C 8024304C 03E00008 */ jr $ra -/* EA3950 80243050 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/EA36E0/func_80243054_EA3954.s b/ver/us/asm/nonmatchings/EA36E0/func_80243054_EA3954.s index 86d04094a5..9de1274a40 100644 --- a/ver/us/asm/nonmatchings/EA36E0/func_80243054_EA3954.s +++ b/ver/us/asm/nonmatchings/EA36E0/func_80243054_EA3954.s @@ -38,7 +38,7 @@ glabel func_80243054_EA3954 /* EA39B0 802430B0 00000000 */ nop /* EA39B4 802430B4 45030004 */ bc1tl .L802430C8 /* EA39B8 802430B8 46000007 */ neg.s $f0, $f0 -/* EA39BC 802430BC 0C019C10 */ jal func_80067040 +/* EA39BC 802430BC 0C019C10 */ jal dead_sqrtf /* EA39C0 802430C0 00000000 */ nop /* EA39C4 802430C4 46000007 */ neg.s $f0, $f0 .L802430C8: diff --git a/ver/us/asm/nonmatchings/EA36E0/func_802430E4_EA39E4.s b/ver/us/asm/nonmatchings/EA36E0/func_802430E4_EA39E4.s deleted file mode 100644 index 06873efde4..0000000000 --- a/ver/us/asm/nonmatchings/EA36E0/func_802430E4_EA39E4.s +++ /dev/null @@ -1,43 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802430E4_EA39E4 -/* EA39E4 802430E4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* EA39E8 802430E8 AFB1001C */ sw $s1, 0x1c($sp) -/* EA39EC 802430EC 0080882D */ daddu $s1, $a0, $zero -/* EA39F0 802430F0 AFBF0020 */ sw $ra, 0x20($sp) -/* EA39F4 802430F4 AFB00018 */ sw $s0, 0x18($sp) -/* EA39F8 802430F8 8E30000C */ lw $s0, 0xc($s1) -/* EA39FC 802430FC 8E050000 */ lw $a1, ($s0) -/* EA3A00 80243100 0C0B53A3 */ jal dead_evt_get_variable -/* EA3A04 80243104 26100004 */ addiu $s0, $s0, 4 -/* EA3A08 80243108 AE220070 */ sw $v0, 0x70($s1) -/* EA3A0C 8024310C 8E050000 */ lw $a1, ($s0) -/* EA3A10 80243110 26100004 */ addiu $s0, $s0, 4 -/* EA3A14 80243114 0C0B53A3 */ jal dead_evt_get_variable -/* EA3A18 80243118 0220202D */ daddu $a0, $s1, $zero -/* EA3A1C 8024311C AE220074 */ sw $v0, 0x74($s1) -/* EA3A20 80243120 8E050000 */ lw $a1, ($s0) -/* EA3A24 80243124 0C0B53A3 */ jal dead_evt_get_variable -/* EA3A28 80243128 0220202D */ daddu $a0, $s1, $zero -/* EA3A2C 8024312C 24040052 */ addiu $a0, $zero, 0x52 -/* EA3A30 80243130 0000282D */ daddu $a1, $zero, $zero -/* EA3A34 80243134 C6200070 */ lwc1 $f0, 0x70($s1) -/* EA3A38 80243138 46800020 */ cvt.s.w $f0, $f0 -/* EA3A3C 8024313C C6220074 */ lwc1 $f2, 0x74($s1) -/* EA3A40 80243140 468010A0 */ cvt.s.w $f2, $f2 -/* EA3A44 80243144 44060000 */ mfc1 $a2, $f0 -/* EA3A48 80243148 44071000 */ mfc1 $a3, $f2 -/* EA3A4C 8024314C 44820000 */ mtc1 $v0, $f0 -/* EA3A50 80243150 00000000 */ nop -/* EA3A54 80243154 46800020 */ cvt.s.w $f0, $f0 -/* EA3A58 80243158 AE220078 */ sw $v0, 0x78($s1) -/* EA3A5C 8024315C 0C055C13 */ jal func_8015704C -/* EA3A60 80243160 E7A00010 */ swc1 $f0, 0x10($sp) -/* EA3A64 80243164 8FBF0020 */ lw $ra, 0x20($sp) -/* EA3A68 80243168 8FB1001C */ lw $s1, 0x1c($sp) -/* EA3A6C 8024316C 8FB00018 */ lw $s0, 0x18($sp) -/* EA3A70 80243170 24020002 */ addiu $v0, $zero, 2 -/* EA3A74 80243174 03E00008 */ jr $ra -/* EA3A78 80243178 27BD0028 */ addiu $sp, $sp, 0x28 -/* EA3A7C 8024317C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/EA7320/func_8024036C_EA733C.s b/ver/us/asm/nonmatchings/EA7320/func_8024036C_EA733C.s deleted file mode 100644 index 445e7aec37..0000000000 --- a/ver/us/asm/nonmatchings/EA7320/func_8024036C_EA733C.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024036C_EA733C -/* EA733C 8024036C 3C03800C */ lui $v1, %hi(dead_gCameras) -/* EA7340 80240370 24638D80 */ addiu $v1, $v1, %lo(dead_gCameras) -/* EA7344 80240374 94620000 */ lhu $v0, ($v1) -/* EA7348 80240378 3042EFFF */ andi $v0, $v0, 0xefff -/* EA734C 8024037C A4620000 */ sh $v0, ($v1) -/* EA7350 80240380 03E00008 */ jr $ra -/* EA7354 80240384 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/EA7320/func_80240388_EA7358.s b/ver/us/asm/nonmatchings/EA7320/func_80240388_EA7358.s deleted file mode 100644 index 08d1a2c000..0000000000 --- a/ver/us/asm/nonmatchings/EA7320/func_80240388_EA7358.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240388_EA7358 -/* EA7358 80240388 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* EA735C 8024038C AFBF0010 */ sw $ra, 0x10($sp) -/* EA7360 80240390 8C82000C */ lw $v0, 0xc($a0) -/* EA7364 80240394 3C068017 */ lui $a2, %hi(D_80169B12) -/* EA7368 80240398 84C69B12 */ lh $a2, %lo(D_80169B12)($a2) -/* EA736C 8024039C 0C0B551A */ jal dead_evt_set_variable -/* EA7370 802403A0 8C450000 */ lw $a1, ($v0) -/* EA7374 802403A4 8FBF0010 */ lw $ra, 0x10($sp) -/* EA7378 802403A8 24020002 */ addiu $v0, $zero, 2 -/* EA737C 802403AC 03E00008 */ jr $ra -/* EA7380 802403B0 27BD0018 */ addiu $sp, $sp, 0x18 -/* EA7384 802403B4 00000000 */ nop -/* EA7388 802403B8 00000000 */ nop -/* EA738C 802403BC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/EA8AE0/func_8024030C_EA8DEC.s b/ver/us/asm/nonmatchings/EA8AE0/func_8024030C_EA8DEC.s deleted file mode 100644 index 349246c06a..0000000000 --- a/ver/us/asm/nonmatchings/EA8AE0/func_8024030C_EA8DEC.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024030C_EA8DEC -/* EA8DEC 8024030C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* EA8DF0 80240310 AFBF001C */ sw $ra, 0x1c($sp) -/* EA8DF4 80240314 AFB00018 */ sw $s0, 0x18($sp) -/* EA8DF8 80240318 8C900084 */ lw $s0, 0x84($a0) -/* EA8DFC 8024031C C6000008 */ lwc1 $f0, 8($s0) -/* EA8E00 80240320 240400A2 */ addiu $a0, $zero, 0xa2 -/* EA8E04 80240324 E7A00010 */ swc1 $f0, 0x10($sp) -/* EA8E08 80240328 8E060000 */ lw $a2, ($s0) -/* EA8E0C 8024032C 8E070004 */ lw $a3, 4($s0) -/* EA8E10 80240330 0C055C13 */ jal func_8015704C -/* EA8E14 80240334 0000282D */ daddu $a1, $zero, $zero -/* EA8E18 80240338 86020044 */ lh $v0, 0x44($s0) -/* EA8E1C 8024033C 8FBF001C */ lw $ra, 0x1c($sp) -/* EA8E20 80240340 8FB00018 */ lw $s0, 0x18($sp) -/* EA8E24 80240344 28420002 */ slti $v0, $v0, 2 -/* EA8E28 80240348 38420001 */ xori $v0, $v0, 1 -/* EA8E2C 8024034C 00021040 */ sll $v0, $v0, 1 -/* EA8E30 80240350 03E00008 */ jr $ra -/* EA8E34 80240354 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/EA8AE0/func_80240358_EA8E38.s b/ver/us/asm/nonmatchings/EA8AE0/func_80240358_EA8E38.s deleted file mode 100644 index 7cf6ebc4ce..0000000000 --- a/ver/us/asm/nonmatchings/EA8AE0/func_80240358_EA8E38.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240358_EA8E38 -/* EA8E38 80240358 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* EA8E3C 8024035C AFB20020 */ sw $s2, 0x20($sp) -/* EA8E40 80240360 0080902D */ daddu $s2, $a0, $zero -/* EA8E44 80240364 AFBF0024 */ sw $ra, 0x24($sp) -/* EA8E48 80240368 AFB1001C */ sw $s1, 0x1c($sp) -/* EA8E4C 8024036C AFB00018 */ sw $s0, 0x18($sp) -/* EA8E50 80240370 10A0004A */ beqz $a1, .L8024049C -/* EA8E54 80240374 8E51000C */ lw $s1, 0xc($s2) -/* EA8E58 80240378 0C00AFF5 */ jal func_8002BFD4 -/* EA8E5C 8024037C 24040058 */ addiu $a0, $zero, 0x58 -/* EA8E60 80240380 0000202D */ daddu $a0, $zero, $zero -/* EA8E64 80240384 3C05FD05 */ lui $a1, 0xfd05 -/* EA8E68 80240388 34A50F81 */ ori $a1, $a1, 0xf81 -/* EA8E6C 8024038C 0040802D */ daddu $s0, $v0, $zero -/* EA8E70 80240390 0200302D */ daddu $a2, $s0, $zero -/* EA8E74 80240394 0C0B551A */ jal dead_evt_set_variable -/* EA8E78 80240398 AE500084 */ sw $s0, 0x84($s2) -/* EA8E7C 8024039C 8E250000 */ lw $a1, ($s1) -/* EA8E80 802403A0 26310004 */ addiu $s1, $s1, 4 -/* EA8E84 802403A4 0C0B53A3 */ jal dead_evt_get_variable -/* EA8E88 802403A8 0240202D */ daddu $a0, $s2, $zero -/* EA8E8C 802403AC AE020038 */ sw $v0, 0x38($s0) -/* EA8E90 802403B0 8E250000 */ lw $a1, ($s1) -/* EA8E94 802403B4 26310004 */ addiu $s1, $s1, 4 -/* EA8E98 802403B8 0C0B53A3 */ jal dead_evt_get_variable -/* EA8E9C 802403BC 0240202D */ daddu $a0, $s2, $zero -/* EA8EA0 802403C0 AE02003C */ sw $v0, 0x3c($s0) -/* EA8EA4 802403C4 8E250000 */ lw $a1, ($s1) -/* EA8EA8 802403C8 26310004 */ addiu $s1, $s1, 4 -/* EA8EAC 802403CC 0C0B55FF */ jal dead_evt_get_float_variable -/* EA8EB0 802403D0 0240202D */ daddu $a0, $s2, $zero -/* EA8EB4 802403D4 E600000C */ swc1 $f0, 0xc($s0) -/* EA8EB8 802403D8 8E250000 */ lw $a1, ($s1) -/* EA8EBC 802403DC 26310004 */ addiu $s1, $s1, 4 -/* EA8EC0 802403E0 0C0B55FF */ jal dead_evt_get_float_variable -/* EA8EC4 802403E4 0240202D */ daddu $a0, $s2, $zero -/* EA8EC8 802403E8 E6000010 */ swc1 $f0, 0x10($s0) -/* EA8ECC 802403EC 8E250000 */ lw $a1, ($s1) -/* EA8ED0 802403F0 26310004 */ addiu $s1, $s1, 4 -/* EA8ED4 802403F4 0C0B55FF */ jal dead_evt_get_float_variable -/* EA8ED8 802403F8 0240202D */ daddu $a0, $s2, $zero -/* EA8EDC 802403FC E6000014 */ swc1 $f0, 0x14($s0) -/* EA8EE0 80240400 8E250000 */ lw $a1, ($s1) -/* EA8EE4 80240404 26310004 */ addiu $s1, $s1, 4 -/* EA8EE8 80240408 0C0B55FF */ jal dead_evt_get_float_variable -/* EA8EEC 8024040C 0240202D */ daddu $a0, $s2, $zero -/* EA8EF0 80240410 E6000018 */ swc1 $f0, 0x18($s0) -/* EA8EF4 80240414 8E250000 */ lw $a1, ($s1) -/* EA8EF8 80240418 26310004 */ addiu $s1, $s1, 4 -/* EA8EFC 8024041C 0C0B55FF */ jal dead_evt_get_float_variable -/* EA8F00 80240420 0240202D */ daddu $a0, $s2, $zero -/* EA8F04 80240424 E600001C */ swc1 $f0, 0x1c($s0) -/* EA8F08 80240428 8E250000 */ lw $a1, ($s1) -/* EA8F0C 8024042C 26310004 */ addiu $s1, $s1, 4 -/* EA8F10 80240430 0C0B55FF */ jal dead_evt_get_float_variable -/* EA8F14 80240434 0240202D */ daddu $a0, $s2, $zero -/* EA8F18 80240438 E6000020 */ swc1 $f0, 0x20($s0) -/* EA8F1C 8024043C 8E250000 */ lw $a1, ($s1) -/* EA8F20 80240440 26310004 */ addiu $s1, $s1, 4 -/* EA8F24 80240444 0C0B55FF */ jal dead_evt_get_float_variable -/* EA8F28 80240448 0240202D */ daddu $a0, $s2, $zero -/* EA8F2C 8024044C E6000024 */ swc1 $f0, 0x24($s0) -/* EA8F30 80240450 8E250000 */ lw $a1, ($s1) -/* EA8F34 80240454 0C0B55FF */ jal dead_evt_get_float_variable -/* EA8F38 80240458 0240202D */ daddu $a0, $s2, $zero -/* EA8F3C 8024045C 3C013F80 */ lui $at, 0x3f80 -/* EA8F40 80240460 44811000 */ mtc1 $at, $f2 -/* EA8F44 80240464 E6000028 */ swc1 $f0, 0x28($s0) -/* EA8F48 80240468 AFA00014 */ sw $zero, 0x14($sp) -/* EA8F4C 8024046C E7A20010 */ swc1 $f2, 0x10($sp) -/* EA8F50 80240470 8E05000C */ lw $a1, 0xc($s0) -/* EA8F54 80240474 8E060010 */ lw $a2, 0x10($s0) -/* EA8F58 80240478 8E070014 */ lw $a3, 0x14($s0) -/* EA8F5C 8024047C 0C01DF0C */ jal func_80077C30 -/* EA8F60 80240480 24040002 */ addiu $a0, $zero, 2 -/* EA8F64 80240484 AE020050 */ sw $v0, 0x50($s0) -/* EA8F68 80240488 A600004E */ sh $zero, 0x4e($s0) -/* EA8F6C 8024048C A6000048 */ sh $zero, 0x48($s0) -/* EA8F70 80240490 A600004A */ sh $zero, 0x4a($s0) -/* EA8F74 80240494 A6000044 */ sh $zero, 0x44($s0) -/* EA8F78 80240498 A6000046 */ sh $zero, 0x46($s0) -.L8024049C: -/* EA8F7C 8024049C 8FBF0024 */ lw $ra, 0x24($sp) -/* EA8F80 802404A0 8FB20020 */ lw $s2, 0x20($sp) -/* EA8F84 802404A4 8FB1001C */ lw $s1, 0x1c($sp) -/* EA8F88 802404A8 8FB00018 */ lw $s0, 0x18($sp) -/* EA8F8C 802404AC 24020002 */ addiu $v0, $zero, 2 -/* EA8F90 802404B0 03E00008 */ jr $ra -/* EA8F94 802404B4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/EA8AE0/func_802404B8_EA8F98.s b/ver/us/asm/nonmatchings/EA8AE0/func_802404B8_EA8F98.s deleted file mode 100644 index 6d9da95534..0000000000 --- a/ver/us/asm/nonmatchings/EA8AE0/func_802404B8_EA8F98.s +++ /dev/null @@ -1,283 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel jtbl_80248340_EB0E20 -.word L802404F8_EA8FD8, L802405B8_EA9098, L80240600_EA90E0, L802406A0_EA9180, L80240708_EA91E8 - -.section .text - -glabel func_802404B8_EA8F98 -/* EA8F98 802404B8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* EA8F9C 802404BC AFBF0020 */ sw $ra, 0x20($sp) -/* EA8FA0 802404C0 AFB1001C */ sw $s1, 0x1c($sp) -/* EA8FA4 802404C4 AFB00018 */ sw $s0, 0x18($sp) -/* EA8FA8 802404C8 8C910084 */ lw $s1, 0x84($a0) -/* EA8FAC 802404CC 86230044 */ lh $v1, 0x44($s1) -/* EA8FB0 802404D0 3C108011 */ lui $s0, %hi(dead_gPlayerStatus) -/* EA8FB4 802404D4 26107578 */ addiu $s0, $s0, %lo(dead_gPlayerStatus) -/* EA8FB8 802404D8 2C620005 */ sltiu $v0, $v1, 5 -/* EA8FBC 802404DC 1040008A */ beqz $v0, L80240708_EA91E8 -/* EA8FC0 802404E0 00031080 */ sll $v0, $v1, 2 -/* EA8FC4 802404E4 3C018025 */ lui $at, %hi(jtbl_80248340_EB0E20) -/* EA8FC8 802404E8 00220821 */ addu $at, $at, $v0 -/* EA8FCC 802404EC 8C228340 */ lw $v0, %lo(jtbl_80248340_EB0E20)($at) -/* EA8FD0 802404F0 00400008 */ jr $v0 -/* EA8FD4 802404F4 00000000 */ nop -glabel L802404F8_EA8FD8 -/* EA8FD8 802404F8 8E22003C */ lw $v0, 0x3c($s1) -/* EA8FDC 802404FC 86270046 */ lh $a3, 0x46($s1) -/* EA8FE0 80240500 AFA20010 */ sw $v0, 0x10($sp) -/* EA8FE4 80240504 8E250010 */ lw $a1, 0x10($s1) -/* EA8FE8 80240508 8E26001C */ lw $a2, 0x1c($s1) -/* EA8FEC 8024050C 0C00ADA9 */ jal func_8002B6A4 -/* EA8FF0 80240510 24040005 */ addiu $a0, $zero, 5 -/* EA8FF4 80240514 86270046 */ lh $a3, 0x46($s1) -/* EA8FF8 80240518 8E22003C */ lw $v0, 0x3c($s1) -/* EA8FFC 8024051C E6200004 */ swc1 $f0, 4($s1) -/* EA9000 80240520 AFA20010 */ sw $v0, 0x10($sp) -/* EA9004 80240524 8E25000C */ lw $a1, 0xc($s1) -/* EA9008 80240528 8E260018 */ lw $a2, 0x18($s1) -/* EA900C 8024052C 0C00ADA9 */ jal func_8002B6A4 -/* EA9010 80240530 0000202D */ daddu $a0, $zero, $zero -/* EA9014 80240534 86270046 */ lh $a3, 0x46($s1) -/* EA9018 80240538 8E22003C */ lw $v0, 0x3c($s1) -/* EA901C 8024053C E6200000 */ swc1 $f0, ($s1) -/* EA9020 80240540 AFA20010 */ sw $v0, 0x10($sp) -/* EA9024 80240544 8E250014 */ lw $a1, 0x14($s1) -/* EA9028 80240548 8E260020 */ lw $a2, 0x20($s1) -/* EA902C 8024054C 0C00ADA9 */ jal func_8002B6A4 -/* EA9030 80240550 0000202D */ daddu $a0, $zero, $zero -/* EA9034 80240554 8E220050 */ lw $v0, 0x50($s1) -/* EA9038 80240558 E6200008 */ swc1 $f0, 8($s1) -/* EA903C 8024055C C6200000 */ lwc1 $f0, ($s1) -/* EA9040 80240560 8C42000C */ lw $v0, 0xc($v0) -/* EA9044 80240564 E4400008 */ swc1 $f0, 8($v0) -/* EA9048 80240568 8E220050 */ lw $v0, 0x50($s1) -/* EA904C 8024056C C6200004 */ lwc1 $f0, 4($s1) -/* EA9050 80240570 8C42000C */ lw $v0, 0xc($v0) -/* EA9054 80240574 E440000C */ swc1 $f0, 0xc($v0) -/* EA9058 80240578 8E220050 */ lw $v0, 0x50($s1) -/* EA905C 8024057C C6200008 */ lwc1 $f0, 8($s1) -/* EA9060 80240580 8C42000C */ lw $v0, 0xc($v0) -/* EA9064 80240584 E4400010 */ swc1 $f0, 0x10($v0) -/* EA9068 80240588 96220046 */ lhu $v0, 0x46($s1) -/* EA906C 8024058C 8E23003C */ lw $v1, 0x3c($s1) -/* EA9070 80240590 24420001 */ addiu $v0, $v0, 1 -/* EA9074 80240594 A6220046 */ sh $v0, 0x46($s1) -/* EA9078 80240598 00021400 */ sll $v0, $v0, 0x10 -/* EA907C 8024059C 00021403 */ sra $v0, $v0, 0x10 -/* EA9080 802405A0 0043102A */ slt $v0, $v0, $v1 -/* EA9084 802405A4 14400058 */ bnez $v0, L80240708_EA91E8 -/* EA9088 802405A8 24020001 */ addiu $v0, $zero, 1 -/* EA908C 802405AC A6220044 */ sh $v0, 0x44($s1) -/* EA9090 802405B0 080901C2 */ j L80240708_EA91E8 -/* EA9094 802405B4 A6200046 */ sh $zero, 0x46($s1) -glabel L802405B8_EA9098 -/* EA9098 802405B8 96220046 */ lhu $v0, 0x46($s1) -/* EA909C 802405BC 24420001 */ addiu $v0, $v0, 1 -/* EA90A0 802405C0 A6220046 */ sh $v0, 0x46($s1) -/* EA90A4 802405C4 00021400 */ sll $v0, $v0, 0x10 -/* EA90A8 802405C8 00021403 */ sra $v0, $v0, 0x10 -/* EA90AC 802405CC 2842003C */ slti $v0, $v0, 0x3c -/* EA90B0 802405D0 1440004D */ bnez $v0, L80240708_EA91E8 -/* EA90B4 802405D4 24020002 */ addiu $v0, $zero, 2 -/* EA90B8 802405D8 8E230050 */ lw $v1, 0x50($s1) -/* EA90BC 802405DC A6220044 */ sh $v0, 0x44($s1) -/* EA90C0 802405E0 A6200046 */ sh $zero, 0x46($s1) -/* EA90C4 802405E4 8C63000C */ lw $v1, 0xc($v1) -/* EA90C8 802405E8 24020001 */ addiu $v0, $zero, 1 -/* EA90CC 802405EC AC620070 */ sw $v0, 0x70($v1) -/* EA90D0 802405F0 8E220050 */ lw $v0, 0x50($s1) -/* EA90D4 802405F4 8C42000C */ lw $v0, 0xc($v0) -/* EA90D8 802405F8 080901C2 */ j L80240708_EA91E8 -/* EA90DC 802405FC AC400074 */ sw $zero, 0x74($v0) -glabel L80240600_EA90E0 -/* EA90E0 80240600 96220046 */ lhu $v0, 0x46($s1) -/* EA90E4 80240604 24420001 */ addiu $v0, $v0, 1 -/* EA90E8 80240608 A6220046 */ sh $v0, 0x46($s1) -/* EA90EC 8024060C 00021400 */ sll $v0, $v0, 0x10 -/* EA90F0 80240610 00021403 */ sra $v0, $v0, 0x10 -/* EA90F4 80240614 2842003C */ slti $v0, $v0, 0x3c -/* EA90F8 80240618 1440003B */ bnez $v0, L80240708_EA91E8 -/* EA90FC 8024061C 00000000 */ nop -/* EA9100 80240620 3C013F80 */ lui $at, 0x3f80 -/* EA9104 80240624 44810000 */ mtc1 $at, $f0 -/* EA9108 80240628 AFA00014 */ sw $zero, 0x14($sp) -/* EA910C 8024062C E7A00010 */ swc1 $f0, 0x10($sp) -/* EA9110 80240630 8E250018 */ lw $a1, 0x18($s1) -/* EA9114 80240634 8E26001C */ lw $a2, 0x1c($s1) -/* EA9118 80240638 8E270020 */ lw $a3, 0x20($s1) -/* EA911C 8024063C 0C01DE4C */ jal func_80077930 -/* EA9120 80240640 24040001 */ addiu $a0, $zero, 1 -/* EA9124 80240644 AE220054 */ sw $v0, 0x54($s1) -/* EA9128 80240648 8C43000C */ lw $v1, 0xc($v0) -/* EA912C 8024064C 9222003B */ lbu $v0, 0x3b($s1) -/* EA9130 80240650 A0620034 */ sb $v0, 0x34($v1) -/* EA9134 80240654 8E220054 */ lw $v0, 0x54($s1) -/* EA9138 80240658 8C42000C */ lw $v0, 0xc($v0) -/* EA913C 8024065C AC400020 */ sw $zero, 0x20($v0) -/* EA9140 80240660 8E250018 */ lw $a1, 0x18($s1) -/* EA9144 80240664 8E260028 */ lw $a2, 0x28($s1) -/* EA9148 80240668 8E270020 */ lw $a3, 0x20($s1) -/* EA914C 8024066C 0C046AAD */ jal func_8011AAB4 -/* EA9150 80240670 0000202D */ daddu $a0, $zero, $zero -/* EA9154 80240674 3C014210 */ lui $at, 0x4210 -/* EA9158 80240678 44810000 */ mtc1 $at, $f0 -/* EA915C 8024067C AE220040 */ sw $v0, 0x40($s1) -/* EA9160 80240680 24020003 */ addiu $v0, $zero, 3 -/* EA9164 80240684 A6220044 */ sh $v0, 0x44($s1) -/* EA9168 80240688 24020001 */ addiu $v0, $zero, 1 -/* EA916C 8024068C A6200046 */ sh $zero, 0x46($s1) -/* EA9170 80240690 AE20002C */ sw $zero, 0x2c($s1) -/* EA9174 80240694 A6220048 */ sh $v0, 0x48($s1) -/* EA9178 80240698 080901C2 */ j L80240708_EA91E8 -/* EA917C 8024069C E6200030 */ swc1 $f0, 0x30($s1) -glabel L802406A0_EA9180 -/* EA9180 802406A0 0000202D */ daddu $a0, $zero, $zero -/* EA9184 802406A4 3C054210 */ lui $a1, 0x4210 -/* EA9188 802406A8 3C064198 */ lui $a2, 0x4198 -/* EA918C 802406AC 86270046 */ lh $a3, 0x46($s1) -/* EA9190 802406B0 24020078 */ addiu $v0, $zero, 0x78 -/* EA9194 802406B4 0C00ADA9 */ jal func_8002B6A4 -/* EA9198 802406B8 AFA20010 */ sw $v0, 0x10($sp) -/* EA919C 802406BC 96220046 */ lhu $v0, 0x46($s1) -/* EA91A0 802406C0 E6200030 */ swc1 $f0, 0x30($s1) -/* EA91A4 802406C4 24420001 */ addiu $v0, $v0, 1 -/* EA91A8 802406C8 A6220046 */ sh $v0, 0x46($s1) -/* EA91AC 802406CC 00021400 */ sll $v0, $v0, 0x10 -/* EA91B0 802406D0 00021403 */ sra $v0, $v0, 0x10 -/* EA91B4 802406D4 28420078 */ slti $v0, $v0, 0x78 -/* EA91B8 802406D8 1440000B */ bnez $v0, L80240708_EA91E8 -/* EA91BC 802406DC 24030001 */ addiu $v1, $zero, 1 -/* EA91C0 802406E0 C620002C */ lwc1 $f0, 0x2c($s1) -/* EA91C4 802406E4 24020002 */ addiu $v0, $zero, 2 -/* EA91C8 802406E8 A6220048 */ sh $v0, 0x48($s1) -/* EA91CC 802406EC 24020004 */ addiu $v0, $zero, 4 -/* EA91D0 802406F0 A620004C */ sh $zero, 0x4c($s1) -/* EA91D4 802406F4 A623004A */ sh $v1, 0x4a($s1) -/* EA91D8 802406F8 A623004E */ sh $v1, 0x4e($s1) -/* EA91DC 802406FC A6220044 */ sh $v0, 0x44($s1) -/* EA91E0 80240700 A6200046 */ sh $zero, 0x46($s1) -/* EA91E4 80240704 E6200034 */ swc1 $f0, 0x34($s1) -glabel L80240708_EA91E8 -/* EA91E8 80240708 8623004A */ lh $v1, 0x4a($s1) -/* EA91EC 8024070C 24020001 */ addiu $v0, $zero, 1 -/* EA91F0 80240710 10620005 */ beq $v1, $v0, .L80240728 -/* EA91F4 80240714 24020002 */ addiu $v0, $zero, 2 -/* EA91F8 80240718 1062001E */ beq $v1, $v0, .L80240794 -/* EA91FC 8024071C 00000000 */ nop -/* EA9200 80240720 0809020F */ j .L8024083C -/* EA9204 80240724 00000000 */ nop -.L80240728: -/* EA9208 80240728 8627004C */ lh $a3, 0x4c($s1) -/* EA920C 8024072C 24100078 */ addiu $s0, $zero, 0x78 -/* EA9210 80240730 AFB00010 */ sw $s0, 0x10($sp) -/* EA9214 80240734 8E250034 */ lw $a1, 0x34($s1) -/* EA9218 80240738 3C0644B4 */ lui $a2, 0x44b4 -/* EA921C 8024073C 0C00ADA9 */ jal func_8002B6A4 -/* EA9220 80240740 24040004 */ addiu $a0, $zero, 4 -/* EA9224 80240744 8627004C */ lh $a3, 0x4c($s1) -/* EA9228 80240748 E620002C */ swc1 $f0, 0x2c($s1) -/* EA922C 8024074C AFB00010 */ sw $s0, 0x10($sp) -/* EA9230 80240750 8E25001C */ lw $a1, 0x1c($s1) -/* EA9234 80240754 8E260024 */ lw $a2, 0x24($s1) -/* EA9238 80240758 0C00ADA9 */ jal func_8002B6A4 -/* EA923C 8024075C 2404000A */ addiu $a0, $zero, 0xa -/* EA9240 80240760 9622004C */ lhu $v0, 0x4c($s1) -/* EA9244 80240764 E6200004 */ swc1 $f0, 4($s1) -/* EA9248 80240768 24420001 */ addiu $v0, $v0, 1 -/* EA924C 8024076C A622004C */ sh $v0, 0x4c($s1) -/* EA9250 80240770 00021400 */ sll $v0, $v0, 0x10 -/* EA9254 80240774 00021403 */ sra $v0, $v0, 0x10 -/* EA9258 80240778 0050102A */ slt $v0, $v0, $s0 -/* EA925C 8024077C 1440002F */ bnez $v0, .L8024083C -/* EA9260 80240780 2402010E */ addiu $v0, $zero, 0x10e -/* EA9264 80240784 A622004C */ sh $v0, 0x4c($s1) -/* EA9268 80240788 24020002 */ addiu $v0, $zero, 2 -/* EA926C 8024078C 0809020E */ j .L80240838 -/* EA9270 80240790 A622004A */ sh $v0, 0x4a($s1) -.L80240794: -/* EA9274 80240794 8622004C */ lh $v0, 0x4c($s1) -/* EA9278 80240798 44826000 */ mtc1 $v0, $f12 -/* EA927C 8024079C 00000000 */ nop -/* EA9280 802407A0 0C00AD77 */ jal dead_sin_deg -/* EA9284 802407A4 46806320 */ cvt.s.w $f12, $f12 -/* EA9288 802407A8 3C013F80 */ lui $at, 0x3f80 -/* EA928C 802407AC 44811000 */ mtc1 $at, $f2 -/* EA9290 802407B0 00000000 */ nop -/* EA9294 802407B4 46020000 */ add.s $f0, $f0, $f2 -/* EA9298 802407B8 46000000 */ add.s $f0, $f0, $f0 -/* EA929C 802407BC C6220024 */ lwc1 $f2, 0x24($s1) -/* EA92A0 802407C0 8622004C */ lh $v0, 0x4c($s1) -/* EA92A4 802407C4 46001080 */ add.s $f2, $f2, $f0 -/* EA92A8 802407C8 24420008 */ addiu $v0, $v0, 8 -/* EA92AC 802407CC 44826000 */ mtc1 $v0, $f12 -/* EA92B0 802407D0 00000000 */ nop -/* EA92B4 802407D4 46806320 */ cvt.s.w $f12, $f12 -/* EA92B8 802407D8 0C00AB85 */ jal dead_clamp_angle -/* EA92BC 802407DC E6220004 */ swc1 $f2, 4($s1) -/* EA92C0 802407E0 4600010D */ trunc.w.s $f4, $f0 -/* EA92C4 802407E4 44022000 */ mfc1 $v0, $f4 -/* EA92C8 802407E8 C6200004 */ lwc1 $f0, 4($s1) -/* EA92CC 802407EC A622004C */ sh $v0, 0x4c($s1) -/* EA92D0 802407F0 C60C0028 */ lwc1 $f12, 0x28($s0) -/* EA92D4 802407F4 8E060030 */ lw $a2, 0x30($s0) -/* EA92D8 802407F8 3C0141A0 */ lui $at, 0x41a0 -/* EA92DC 802407FC 44817000 */ mtc1 $at, $f14 -/* EA92E0 80240800 E7A00010 */ swc1 $f0, 0x10($sp) -/* EA92E4 80240804 C602002C */ lwc1 $f2, 0x2c($s0) -/* EA92E8 80240808 C6200008 */ lwc1 $f0, 8($s1) -/* EA92EC 8024080C E7A00014 */ swc1 $f0, 0x14($sp) -/* EA92F0 80240810 8E270000 */ lw $a3, ($s1) -/* EA92F4 80240814 0C00AC87 */ jal func_8002B21C -/* EA92F8 80240818 460E1380 */ add.s $f14, $f2, $f14 -/* EA92FC 8024081C 3C0141F0 */ lui $at, 0x41f0 -/* EA9300 80240820 44811000 */ mtc1 $at, $f2 -/* EA9304 80240824 00000000 */ nop -/* EA9308 80240828 4600103C */ c.lt.s $f2, $f0 -/* EA930C 8024082C 00000000 */ nop -/* EA9310 80240830 45010002 */ bc1t .L8024083C -/* EA9314 80240834 24020003 */ addiu $v0, $zero, 3 -.L80240838: -/* EA9318 80240838 A622004E */ sh $v0, 0x4e($s1) -.L8024083C: -/* EA931C 8024083C 86230048 */ lh $v1, 0x48($s1) -/* EA9320 80240840 24020001 */ addiu $v0, $zero, 1 -/* EA9324 80240844 10620005 */ beq $v1, $v0, .L8024085C -/* EA9328 80240848 24020002 */ addiu $v0, $zero, 2 -/* EA932C 8024084C 10620008 */ beq $v1, $v0, .L80240870 -/* EA9330 80240850 00000000 */ nop -/* EA9334 80240854 0809022C */ j .L802408B0 -/* EA9338 80240858 00000000 */ nop -.L8024085C: -/* EA933C 8024085C C620002C */ lwc1 $f0, 0x2c($s1) -/* EA9340 80240860 C62C0030 */ lwc1 $f12, 0x30($s1) -/* EA9344 80240864 0C00AB85 */ jal dead_clamp_angle -/* EA9348 80240868 460C0300 */ add.s $f12, $f0, $f12 -/* EA934C 8024086C E620002C */ swc1 $f0, 0x2c($s1) -.L80240870: -/* EA9350 80240870 8E220054 */ lw $v0, 0x54($s1) -/* EA9354 80240874 C620002C */ lwc1 $f0, 0x2c($s1) -/* EA9358 80240878 8C42000C */ lw $v0, 0xc($v0) -/* EA935C 8024087C E4400024 */ swc1 $f0, 0x24($v0) -/* EA9360 80240880 8E220054 */ lw $v0, 0x54($s1) -/* EA9364 80240884 C6200018 */ lwc1 $f0, 0x18($s1) -/* EA9368 80240888 8C42000C */ lw $v0, 0xc($v0) -/* EA936C 8024088C E4400004 */ swc1 $f0, 4($v0) -/* EA9370 80240890 8E220054 */ lw $v0, 0x54($s1) -/* EA9374 80240894 C6200004 */ lwc1 $f0, 4($s1) -/* EA9378 80240898 8C42000C */ lw $v0, 0xc($v0) -/* EA937C 8024089C E4400008 */ swc1 $f0, 8($v0) -/* EA9380 802408A0 8E220054 */ lw $v0, 0x54($s1) -/* EA9384 802408A4 C6200020 */ lwc1 $f0, 0x20($s1) -/* EA9388 802408A8 8C42000C */ lw $v0, 0xc($v0) -/* EA938C 802408AC E440000C */ swc1 $f0, 0xc($v0) -.L802408B0: -/* EA9390 802408B0 8FBF0020 */ lw $ra, 0x20($sp) -/* EA9394 802408B4 8FB1001C */ lw $s1, 0x1c($sp) -/* EA9398 802408B8 8FB00018 */ lw $s0, 0x18($sp) -/* EA939C 802408BC 0000102D */ daddu $v0, $zero, $zero -/* EA93A0 802408C0 03E00008 */ jr $ra -/* EA93A4 802408C4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/EA8AE0/func_802408C8_EA93A8.s b/ver/us/asm/nonmatchings/EA8AE0/func_802408C8_EA93A8.s deleted file mode 100644 index 4c51ff7f9b..0000000000 --- a/ver/us/asm/nonmatchings/EA8AE0/func_802408C8_EA93A8.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408C8_EA93A8 -/* EA93A8 802408C8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* EA93AC 802408CC AFB00010 */ sw $s0, 0x10($sp) -/* EA93B0 802408D0 0080802D */ daddu $s0, $a0, $zero -/* EA93B4 802408D4 AFBF0014 */ sw $ra, 0x14($sp) -/* EA93B8 802408D8 8E02000C */ lw $v0, 0xc($s0) -/* EA93BC 802408DC 0C0B53A3 */ jal dead_evt_get_variable -/* EA93C0 802408E0 8C450000 */ lw $a1, ($v0) -/* EA93C4 802408E4 8E030084 */ lw $v1, 0x84($s0) -/* EA93C8 802408E8 8FBF0014 */ lw $ra, 0x14($sp) -/* EA93CC 802408EC 8463004E */ lh $v1, 0x4e($v1) -/* EA93D0 802408F0 8FB00010 */ lw $s0, 0x10($sp) -/* EA93D4 802408F4 00621826 */ xor $v1, $v1, $v0 -/* EA93D8 802408F8 2C630001 */ sltiu $v1, $v1, 1 -/* EA93DC 802408FC 00031040 */ sll $v0, $v1, 1 -/* EA93E0 80240900 03E00008 */ jr $ra -/* EA93E4 80240904 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/EA8AE0/func_80240908_EA93E8.s b/ver/us/asm/nonmatchings/EA8AE0/func_80240908_EA93E8.s deleted file mode 100644 index 0afc62e952..0000000000 --- a/ver/us/asm/nonmatchings/EA8AE0/func_80240908_EA93E8.s +++ /dev/null @@ -1,72 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240908_EA93E8 -/* EA93E8 80240908 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* EA93EC 8024090C AFB20020 */ sw $s2, 0x20($sp) -/* EA93F0 80240910 0080902D */ daddu $s2, $a0, $zero -/* EA93F4 80240914 AFBF0024 */ sw $ra, 0x24($sp) -/* EA93F8 80240918 AFB1001C */ sw $s1, 0x1c($sp) -/* EA93FC 8024091C AFB00018 */ sw $s0, 0x18($sp) -/* EA9400 80240920 10A00035 */ beqz $a1, .L802409F8 -/* EA9404 80240924 8E51000C */ lw $s1, 0xc($s2) -/* EA9408 80240928 0C00AFF5 */ jal func_8002BFD4 -/* EA940C 8024092C 24040058 */ addiu $a0, $zero, 0x58 -/* EA9410 80240930 0040802D */ daddu $s0, $v0, $zero -/* EA9414 80240934 AE500084 */ sw $s0, 0x84($s2) -/* EA9418 80240938 8E250000 */ lw $a1, ($s1) -/* EA941C 8024093C 26310004 */ addiu $s1, $s1, 4 -/* EA9420 80240940 0C0B53A3 */ jal dead_evt_get_variable -/* EA9424 80240944 0240202D */ daddu $a0, $s2, $zero -/* EA9428 80240948 AE020038 */ sw $v0, 0x38($s0) -/* EA942C 8024094C 8E250000 */ lw $a1, ($s1) -/* EA9430 80240950 26310004 */ addiu $s1, $s1, 4 -/* EA9434 80240954 0C0B55FF */ jal dead_evt_get_float_variable -/* EA9438 80240958 0240202D */ daddu $a0, $s2, $zero -/* EA943C 8024095C E6000018 */ swc1 $f0, 0x18($s0) -/* EA9440 80240960 8E250000 */ lw $a1, ($s1) -/* EA9444 80240964 26310004 */ addiu $s1, $s1, 4 -/* EA9448 80240968 0C0B55FF */ jal dead_evt_get_float_variable -/* EA944C 8024096C 0240202D */ daddu $a0, $s2, $zero -/* EA9450 80240970 E6000024 */ swc1 $f0, 0x24($s0) -/* EA9454 80240974 8E250000 */ lw $a1, ($s1) -/* EA9458 80240978 26310004 */ addiu $s1, $s1, 4 -/* EA945C 8024097C 0C0B55FF */ jal dead_evt_get_float_variable -/* EA9460 80240980 0240202D */ daddu $a0, $s2, $zero -/* EA9464 80240984 E6000020 */ swc1 $f0, 0x20($s0) -/* EA9468 80240988 8E250000 */ lw $a1, ($s1) -/* EA946C 8024098C 0C0B55FF */ jal dead_evt_get_float_variable -/* EA9470 80240990 0240202D */ daddu $a0, $s2, $zero -/* EA9474 80240994 3C013F80 */ lui $at, 0x3f80 -/* EA9478 80240998 44811000 */ mtc1 $at, $f2 -/* EA947C 8024099C E6000028 */ swc1 $f0, 0x28($s0) -/* EA9480 802409A0 AFA00014 */ sw $zero, 0x14($sp) -/* EA9484 802409A4 E7A20010 */ swc1 $f2, 0x10($sp) -/* EA9488 802409A8 8E050018 */ lw $a1, 0x18($s0) -/* EA948C 802409AC 8E060024 */ lw $a2, 0x24($s0) -/* EA9490 802409B0 8E070020 */ lw $a3, 0x20($s0) -/* EA9494 802409B4 0C01DE4C */ jal func_80077930 -/* EA9498 802409B8 24040001 */ addiu $a0, $zero, 1 -/* EA949C 802409BC AE020054 */ sw $v0, 0x54($s0) -/* EA94A0 802409C0 8C43000C */ lw $v1, 0xc($v0) -/* EA94A4 802409C4 9202003B */ lbu $v0, 0x3b($s0) -/* EA94A8 802409C8 A0620034 */ sb $v0, 0x34($v1) -/* EA94AC 802409CC 8E020054 */ lw $v0, 0x54($s0) -/* EA94B0 802409D0 8C42000C */ lw $v0, 0xc($v0) -/* EA94B4 802409D4 AC400020 */ sw $zero, 0x20($v0) -/* EA94B8 802409D8 8E050018 */ lw $a1, 0x18($s0) -/* EA94BC 802409DC 8E060028 */ lw $a2, 0x28($s0) -/* EA94C0 802409E0 8E070020 */ lw $a3, 0x20($s0) -/* EA94C4 802409E4 0C046AAD */ jal func_8011AAB4 -/* EA94C8 802409E8 0000202D */ daddu $a0, $zero, $zero -/* EA94CC 802409EC AE020040 */ sw $v0, 0x40($s0) -/* EA94D0 802409F0 2402010E */ addiu $v0, $zero, 0x10e -/* EA94D4 802409F4 A602004C */ sh $v0, 0x4c($s0) -.L802409F8: -/* EA94D8 802409F8 8FBF0024 */ lw $ra, 0x24($sp) -/* EA94DC 802409FC 8FB20020 */ lw $s2, 0x20($sp) -/* EA94E0 80240A00 8FB1001C */ lw $s1, 0x1c($sp) -/* EA94E4 80240A04 8FB00018 */ lw $s0, 0x18($sp) -/* EA94E8 80240A08 24020002 */ addiu $v0, $zero, 2 -/* EA94EC 80240A0C 03E00008 */ jr $ra -/* EA94F0 80240A10 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/EA8AE0/func_80240A14_EA94F4.s b/ver/us/asm/nonmatchings/EA8AE0/func_80240A14_EA94F4.s deleted file mode 100644 index 7bb711e047..0000000000 --- a/ver/us/asm/nonmatchings/EA8AE0/func_80240A14_EA94F4.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A14_EA94F4 -/* EA94F4 80240A14 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* EA94F8 80240A18 AFBF0014 */ sw $ra, 0x14($sp) -/* EA94FC 80240A1C AFB00010 */ sw $s0, 0x10($sp) -/* EA9500 80240A20 8C900084 */ lw $s0, 0x84($a0) -/* EA9504 80240A24 8602004C */ lh $v0, 0x4c($s0) -/* EA9508 80240A28 44826000 */ mtc1 $v0, $f12 -/* EA950C 80240A2C 00000000 */ nop -/* EA9510 80240A30 0C00AD77 */ jal dead_sin_deg -/* EA9514 80240A34 46806320 */ cvt.s.w $f12, $f12 -/* EA9518 80240A38 3C013F80 */ lui $at, 0x3f80 -/* EA951C 80240A3C 44811000 */ mtc1 $at, $f2 -/* EA9520 80240A40 00000000 */ nop -/* EA9524 80240A44 46020000 */ add.s $f0, $f0, $f2 -/* EA9528 80240A48 46000000 */ add.s $f0, $f0, $f0 -/* EA952C 80240A4C C6020024 */ lwc1 $f2, 0x24($s0) -/* EA9530 80240A50 8602004C */ lh $v0, 0x4c($s0) -/* EA9534 80240A54 46001080 */ add.s $f2, $f2, $f0 -/* EA9538 80240A58 24420008 */ addiu $v0, $v0, 8 -/* EA953C 80240A5C 44826000 */ mtc1 $v0, $f12 -/* EA9540 80240A60 00000000 */ nop -/* EA9544 80240A64 46806320 */ cvt.s.w $f12, $f12 -/* EA9548 80240A68 0C00AB85 */ jal dead_clamp_angle -/* EA954C 80240A6C E6020004 */ swc1 $f2, 4($s0) -/* EA9550 80240A70 4600010D */ trunc.w.s $f4, $f0 -/* EA9554 80240A74 44022000 */ mfc1 $v0, $f4 -/* EA9558 80240A78 00000000 */ nop -/* EA955C 80240A7C A602004C */ sh $v0, 0x4c($s0) -/* EA9560 80240A80 3C028011 */ lui $v0, %hi(dead_gPlayerStatus) -/* EA9564 80240A84 24427578 */ addiu $v0, $v0, %lo(dead_gPlayerStatus) -/* EA9568 80240A88 C44C0028 */ lwc1 $f12, 0x28($v0) -/* EA956C 80240A8C C44E0030 */ lwc1 $f14, 0x30($v0) -/* EA9570 80240A90 8E060018 */ lw $a2, 0x18($s0) -/* EA9574 80240A94 0C00AC71 */ jal dead_dist2D -/* EA9578 80240A98 8E070020 */ lw $a3, 0x20($s0) -/* EA957C 80240A9C 3C0141F0 */ lui $at, 0x41f0 -/* EA9580 80240AA0 44811000 */ mtc1 $at, $f2 -/* EA9584 80240AA4 00000000 */ nop -/* EA9588 80240AA8 4602003E */ c.le.s $f0, $f2 -/* EA958C 80240AAC 00000000 */ nop -/* EA9590 80240AB0 45000002 */ bc1f .L80240ABC -/* EA9594 80240AB4 24020003 */ addiu $v0, $zero, 3 -/* EA9598 80240AB8 A602004E */ sh $v0, 0x4e($s0) -.L80240ABC: -/* EA959C 80240ABC 8E020054 */ lw $v0, 0x54($s0) -/* EA95A0 80240AC0 C6000018 */ lwc1 $f0, 0x18($s0) -/* EA95A4 80240AC4 8C42000C */ lw $v0, 0xc($v0) -/* EA95A8 80240AC8 E4400004 */ swc1 $f0, 4($v0) -/* EA95AC 80240ACC 8E020054 */ lw $v0, 0x54($s0) -/* EA95B0 80240AD0 C6000004 */ lwc1 $f0, 4($s0) -/* EA95B4 80240AD4 8C42000C */ lw $v0, 0xc($v0) -/* EA95B8 80240AD8 E4400008 */ swc1 $f0, 8($v0) -/* EA95BC 80240ADC 8E020054 */ lw $v0, 0x54($s0) -/* EA95C0 80240AE0 C6000020 */ lwc1 $f0, 0x20($s0) -/* EA95C4 80240AE4 8C42000C */ lw $v0, 0xc($v0) -/* EA95C8 80240AE8 E440000C */ swc1 $f0, 0xc($v0) -/* EA95CC 80240AEC 8FBF0014 */ lw $ra, 0x14($sp) -/* EA95D0 80240AF0 8FB00010 */ lw $s0, 0x10($sp) -/* EA95D4 80240AF4 0000102D */ daddu $v0, $zero, $zero -/* EA95D8 80240AF8 03E00008 */ jr $ra -/* EA95DC 80240AFC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/EA8AE0/func_802413FC_EA9EDC.s b/ver/us/asm/nonmatchings/EA8AE0/func_802413FC_EA9EDC.s deleted file mode 100644 index b06c7bd309..0000000000 --- a/ver/us/asm/nonmatchings/EA8AE0/func_802413FC_EA9EDC.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413FC_EA9EDC -/* EA9EDC 802413FC 3C018025 */ lui $at, %hi(D_80248380) -/* EA9EE0 80241400 AC208380 */ sw $zero, %lo(D_80248380)($at) -/* EA9EE4 80241404 03E00008 */ jr $ra -/* EA9EE8 80241408 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/EA8AE0/func_8024140C_EA9EEC.s b/ver/us/asm/nonmatchings/EA8AE0/func_8024140C_EA9EEC.s index 35b6672835..cb1f2349e4 100644 --- a/ver/us/asm/nonmatchings/EA8AE0/func_8024140C_EA9EEC.s +++ b/ver/us/asm/nonmatchings/EA8AE0/func_8024140C_EA9EEC.s @@ -6,7 +6,7 @@ glabel func_8024140C_EA9EEC /* EA9EF0 80241410 AFB00010 */ sw $s0, 0x10($sp) /* EA9EF4 80241414 0080802D */ daddu $s0, $a0, $zero /* EA9EF8 80241418 AFBF0014 */ sw $ra, 0x14($sp) -/* EA9EFC 8024141C 0C00AFF5 */ jal func_8002BFD4 +/* EA9EFC 8024141C 0C00AFF5 */ jal dead_heap_malloc /* EA9F00 80241420 24040780 */ addiu $a0, $zero, 0x780 /* EA9F04 80241424 0200202D */ daddu $a0, $s0, $zero /* EA9F08 80241428 3C05FD05 */ lui $a1, 0xfd05 diff --git a/ver/us/asm/nonmatchings/EA8AE0/func_80241468_EA9F48.s b/ver/us/asm/nonmatchings/EA8AE0/func_80241468_EA9F48.s index 4553e5005f..6caadf98cb 100644 --- a/ver/us/asm/nonmatchings/EA8AE0/func_80241468_EA9F48.s +++ b/ver/us/asm/nonmatchings/EA8AE0/func_80241468_EA9F48.s @@ -11,7 +11,7 @@ glabel func_80241468_EA9F48 /* EA9F60 80241480 8E020000 */ lw $v0, ($s0) /* EA9F64 80241484 14400010 */ bnez $v0, .L802414C8 /* EA9F68 80241488 0080882D */ daddu $s1, $a0, $zero -/* EA9F6C 8024148C 0C00AFF5 */ jal func_8002BFD4 +/* EA9F6C 8024148C 0C00AFF5 */ jal dead_heap_malloc /* EA9F70 80241490 24040040 */ addiu $a0, $zero, 0x40 /* EA9F74 80241494 AE020000 */ sw $v0, ($s0) /* EA9F78 80241498 0000182D */ daddu $v1, $zero, $zero diff --git a/ver/us/asm/nonmatchings/EA8AE0/func_802418D4_EAA3B4.s b/ver/us/asm/nonmatchings/EA8AE0/func_802418D4_EAA3B4.s deleted file mode 100644 index f48b873f43..0000000000 --- a/ver/us/asm/nonmatchings/EA8AE0/func_802418D4_EAA3B4.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802418D4_EAA3B4 -/* EAA3B4 802418D4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* EAA3B8 802418D8 AFB10014 */ sw $s1, 0x14($sp) -/* EAA3BC 802418DC 0080882D */ daddu $s1, $a0, $zero -/* EAA3C0 802418E0 AFBF0018 */ sw $ra, 0x18($sp) -/* EAA3C4 802418E4 AFB00010 */ sw $s0, 0x10($sp) -/* EAA3C8 802418E8 8E30000C */ lw $s0, 0xc($s1) -/* EAA3CC 802418EC 8E050000 */ lw $a1, ($s0) -/* EAA3D0 802418F0 0C0B53A3 */ jal dead_evt_get_variable -/* EAA3D4 802418F4 26100004 */ addiu $s0, $s0, 4 -/* EAA3D8 802418F8 AE22008C */ sw $v0, 0x8c($s1) -/* EAA3DC 802418FC 8E050000 */ lw $a1, ($s0) -/* EAA3E0 80241900 26100004 */ addiu $s0, $s0, 4 -/* EAA3E4 80241904 0C0B53A3 */ jal dead_evt_get_variable -/* EAA3E8 80241908 0220202D */ daddu $a0, $s1, $zero -/* EAA3EC 8024190C AE220090 */ sw $v0, 0x90($s1) -/* EAA3F0 80241910 8E050000 */ lw $a1, ($s0) -/* EAA3F4 80241914 26100004 */ addiu $s0, $s0, 4 -/* EAA3F8 80241918 0C0B53A3 */ jal dead_evt_get_variable -/* EAA3FC 8024191C 0220202D */ daddu $a0, $s1, $zero -/* EAA400 80241920 AE220094 */ sw $v0, 0x94($s1) -/* EAA404 80241924 8E050000 */ lw $a1, ($s0) -/* EAA408 80241928 26100004 */ addiu $s0, $s0, 4 -/* EAA40C 8024192C 0C0B53A3 */ jal dead_evt_get_variable -/* EAA410 80241930 0220202D */ daddu $a0, $s1, $zero -/* EAA414 80241934 AE220098 */ sw $v0, 0x98($s1) -/* EAA418 80241938 8E050000 */ lw $a1, ($s0) -/* EAA41C 8024193C 26100004 */ addiu $s0, $s0, 4 -/* EAA420 80241940 0C0B53A3 */ jal dead_evt_get_variable -/* EAA424 80241944 0220202D */ daddu $a0, $s1, $zero -/* EAA428 80241948 AE22009C */ sw $v0, 0x9c($s1) -/* EAA42C 8024194C 8E050000 */ lw $a1, ($s0) -/* EAA430 80241950 26100004 */ addiu $s0, $s0, 4 -/* EAA434 80241954 0C0B53A3 */ jal dead_evt_get_variable -/* EAA438 80241958 0220202D */ daddu $a0, $s1, $zero -/* EAA43C 8024195C AE2200A0 */ sw $v0, 0xa0($s1) -/* EAA440 80241960 8E050000 */ lw $a1, ($s0) -/* EAA444 80241964 26100004 */ addiu $s0, $s0, 4 -/* EAA448 80241968 0C0B53A3 */ jal dead_evt_get_variable -/* EAA44C 8024196C 0220202D */ daddu $a0, $s1, $zero -/* EAA450 80241970 AE2200A4 */ sw $v0, 0xa4($s1) -/* EAA454 80241974 8E050000 */ lw $a1, ($s0) -/* EAA458 80241978 26100004 */ addiu $s0, $s0, 4 -/* EAA45C 8024197C 0C0B53A3 */ jal dead_evt_get_variable -/* EAA460 80241980 0220202D */ daddu $a0, $s1, $zero -/* EAA464 80241984 AE2200A8 */ sw $v0, 0xa8($s1) -/* EAA468 80241988 8E050000 */ lw $a1, ($s0) -/* EAA46C 8024198C 26100004 */ addiu $s0, $s0, 4 -/* EAA470 80241990 0C0B53A3 */ jal dead_evt_get_variable -/* EAA474 80241994 0220202D */ daddu $a0, $s1, $zero -/* EAA478 80241998 AE2200AC */ sw $v0, 0xac($s1) -/* EAA47C 8024199C 8E050000 */ lw $a1, ($s0) -/* EAA480 802419A0 0C0B53A3 */ jal dead_evt_get_variable -/* EAA484 802419A4 0220202D */ daddu $a0, $s1, $zero -/* EAA488 802419A8 AE2200B0 */ sw $v0, 0xb0($s1) -/* EAA48C 802419AC 8FBF0018 */ lw $ra, 0x18($sp) -/* EAA490 802419B0 8FB10014 */ lw $s1, 0x14($sp) -/* EAA494 802419B4 8FB00010 */ lw $s0, 0x10($sp) -/* EAA498 802419B8 24020002 */ addiu $v0, $zero, 2 -/* EAA49C 802419BC 03E00008 */ jr $ra -/* EAA4A0 802419C0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/EB1170/func_80240310_EB1170.s b/ver/us/asm/nonmatchings/EB1170/func_80240310_EB1170.s index d840b6dfa3..046f1d3c88 100644 --- a/ver/us/asm/nonmatchings/EB1170/func_80240310_EB1170.s +++ b/ver/us/asm/nonmatchings/EB1170/func_80240310_EB1170.s @@ -11,7 +11,7 @@ glabel func_80240310_EB1170 /* EB1188 80240328 8E020000 */ lw $v0, ($s0) /* EB118C 8024032C 14400010 */ bnez $v0, .L80240370 /* EB1190 80240330 0080882D */ daddu $s1, $a0, $zero -/* EB1194 80240334 0C00AFF5 */ jal func_8002BFD4 +/* EB1194 80240334 0C00AFF5 */ jal dead_heap_malloc /* EB1198 80240338 24040040 */ addiu $a0, $zero, 0x40 /* EB119C 8024033C AE020000 */ sw $v0, ($s0) /* EB11A0 80240340 0000182D */ daddu $v1, $zero, $zero diff --git a/ver/us/asm/nonmatchings/EB1170/func_8024077C_EB15DC.s b/ver/us/asm/nonmatchings/EB1170/func_8024077C_EB15DC.s deleted file mode 100644 index 016aef1858..0000000000 --- a/ver/us/asm/nonmatchings/EB1170/func_8024077C_EB15DC.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024077C_EB15DC -/* EB15DC 8024077C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* EB15E0 80240780 AFB10014 */ sw $s1, 0x14($sp) -/* EB15E4 80240784 0080882D */ daddu $s1, $a0, $zero -/* EB15E8 80240788 AFBF0018 */ sw $ra, 0x18($sp) -/* EB15EC 8024078C AFB00010 */ sw $s0, 0x10($sp) -/* EB15F0 80240790 8E30000C */ lw $s0, 0xc($s1) -/* EB15F4 80240794 8E050000 */ lw $a1, ($s0) -/* EB15F8 80240798 0C0B53A3 */ jal dead_evt_get_variable -/* EB15FC 8024079C 26100004 */ addiu $s0, $s0, 4 -/* EB1600 802407A0 AE22008C */ sw $v0, 0x8c($s1) -/* EB1604 802407A4 8E050000 */ lw $a1, ($s0) -/* EB1608 802407A8 26100004 */ addiu $s0, $s0, 4 -/* EB160C 802407AC 0C0B53A3 */ jal dead_evt_get_variable -/* EB1610 802407B0 0220202D */ daddu $a0, $s1, $zero -/* EB1614 802407B4 AE220090 */ sw $v0, 0x90($s1) -/* EB1618 802407B8 8E050000 */ lw $a1, ($s0) -/* EB161C 802407BC 26100004 */ addiu $s0, $s0, 4 -/* EB1620 802407C0 0C0B53A3 */ jal dead_evt_get_variable -/* EB1624 802407C4 0220202D */ daddu $a0, $s1, $zero -/* EB1628 802407C8 AE220094 */ sw $v0, 0x94($s1) -/* EB162C 802407CC 8E050000 */ lw $a1, ($s0) -/* EB1630 802407D0 26100004 */ addiu $s0, $s0, 4 -/* EB1634 802407D4 0C0B53A3 */ jal dead_evt_get_variable -/* EB1638 802407D8 0220202D */ daddu $a0, $s1, $zero -/* EB163C 802407DC AE220098 */ sw $v0, 0x98($s1) -/* EB1640 802407E0 8E050000 */ lw $a1, ($s0) -/* EB1644 802407E4 26100004 */ addiu $s0, $s0, 4 -/* EB1648 802407E8 0C0B53A3 */ jal dead_evt_get_variable -/* EB164C 802407EC 0220202D */ daddu $a0, $s1, $zero -/* EB1650 802407F0 AE22009C */ sw $v0, 0x9c($s1) -/* EB1654 802407F4 8E050000 */ lw $a1, ($s0) -/* EB1658 802407F8 26100004 */ addiu $s0, $s0, 4 -/* EB165C 802407FC 0C0B53A3 */ jal dead_evt_get_variable -/* EB1660 80240800 0220202D */ daddu $a0, $s1, $zero -/* EB1664 80240804 AE2200A0 */ sw $v0, 0xa0($s1) -/* EB1668 80240808 8E050000 */ lw $a1, ($s0) -/* EB166C 8024080C 26100004 */ addiu $s0, $s0, 4 -/* EB1670 80240810 0C0B53A3 */ jal dead_evt_get_variable -/* EB1674 80240814 0220202D */ daddu $a0, $s1, $zero -/* EB1678 80240818 AE2200A4 */ sw $v0, 0xa4($s1) -/* EB167C 8024081C 8E050000 */ lw $a1, ($s0) -/* EB1680 80240820 26100004 */ addiu $s0, $s0, 4 -/* EB1684 80240824 0C0B53A3 */ jal dead_evt_get_variable -/* EB1688 80240828 0220202D */ daddu $a0, $s1, $zero -/* EB168C 8024082C AE2200A8 */ sw $v0, 0xa8($s1) -/* EB1690 80240830 8E050000 */ lw $a1, ($s0) -/* EB1694 80240834 26100004 */ addiu $s0, $s0, 4 -/* EB1698 80240838 0C0B53A3 */ jal dead_evt_get_variable -/* EB169C 8024083C 0220202D */ daddu $a0, $s1, $zero -/* EB16A0 80240840 AE2200AC */ sw $v0, 0xac($s1) -/* EB16A4 80240844 8E050000 */ lw $a1, ($s0) -/* EB16A8 80240848 0C0B53A3 */ jal dead_evt_get_variable -/* EB16AC 8024084C 0220202D */ daddu $a0, $s1, $zero -/* EB16B0 80240850 AE2200B0 */ sw $v0, 0xb0($s1) -/* EB16B4 80240854 8FBF0018 */ lw $ra, 0x18($sp) -/* EB16B8 80240858 8FB10014 */ lw $s1, 0x14($sp) -/* EB16BC 8024085C 8FB00010 */ lw $s0, 0x10($sp) -/* EB16C0 80240860 24020002 */ addiu $v0, $zero, 2 -/* EB16C4 80240864 03E00008 */ jr $ra -/* EB16C8 80240868 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/EC2240/func_80240040_EC2240.s b/ver/us/asm/nonmatchings/EC2240/func_80240040_EC2240.s index 4a17008728..07450882fc 100644 --- a/ver/us/asm/nonmatchings/EC2240/func_80240040_EC2240.s +++ b/ver/us/asm/nonmatchings/EC2240/func_80240040_EC2240.s @@ -11,7 +11,7 @@ glabel func_80240040_EC2240 /* EC2258 80240058 8E020000 */ lw $v0, ($s0) /* EC225C 8024005C 14400010 */ bnez $v0, .L802400A0 /* EC2260 80240060 0080882D */ daddu $s1, $a0, $zero -/* EC2264 80240064 0C00AFF5 */ jal func_8002BFD4 +/* EC2264 80240064 0C00AFF5 */ jal dead_heap_malloc /* EC2268 80240068 24040040 */ addiu $a0, $zero, 0x40 /* EC226C 8024006C AE020000 */ sw $v0, ($s0) /* EC2270 80240070 0000182D */ daddu $v1, $zero, $zero diff --git a/ver/us/asm/nonmatchings/EC7590/func_8024061C_EC77CC.s b/ver/us/asm/nonmatchings/EC7590/func_8024061C_EC77CC.s index 1a53662ee7..addb4ddb48 100644 --- a/ver/us/asm/nonmatchings/EC7590/func_8024061C_EC77CC.s +++ b/ver/us/asm/nonmatchings/EC7590/func_8024061C_EC77CC.s @@ -11,7 +11,7 @@ glabel func_8024061C_EC77CC /* EC77E4 80240634 8E020000 */ lw $v0, ($s0) /* EC77E8 80240638 14400010 */ bnez $v0, .L8024067C /* EC77EC 8024063C 0080882D */ daddu $s1, $a0, $zero -/* EC77F0 80240640 0C00AFF5 */ jal func_8002BFD4 +/* EC77F0 80240640 0C00AFF5 */ jal dead_heap_malloc /* EC77F4 80240644 24040040 */ addiu $a0, $zero, 0x40 /* EC77F8 80240648 AE020000 */ sw $v0, ($s0) /* EC77FC 8024064C 0000182D */ daddu $v1, $zero, $zero diff --git a/ver/us/asm/nonmatchings/EC9D00/func_802401CC_EC9ECC.s b/ver/us/asm/nonmatchings/EC9D00/func_802401CC_EC9ECC.s index 8b0001713e..2482adf557 100644 --- a/ver/us/asm/nonmatchings/EC9D00/func_802401CC_EC9ECC.s +++ b/ver/us/asm/nonmatchings/EC9D00/func_802401CC_EC9ECC.s @@ -17,7 +17,7 @@ glabel func_802401CC_EC9ECC /* EC9EFC 802401FC AFB1001C */ sw $s1, 0x1c($sp) /* EC9F00 80240200 10A0004F */ beqz $a1, .L80240340 /* EC9F04 80240204 AFB00018 */ sw $s0, 0x18($sp) -/* EC9F08 80240208 0C00AFF5 */ jal func_8002BFD4 +/* EC9F08 80240208 0C00AFF5 */ jal dead_heap_malloc /* EC9F0C 8024020C 24040330 */ addiu $a0, $zero, 0x330 /* EC9F10 80240210 0040982D */ daddu $s3, $v0, $zero /* EC9F14 80240214 0000B02D */ daddu $s6, $zero, $zero diff --git a/ver/us/asm/nonmatchings/EC9D00/func_80240600_ECA300.s b/ver/us/asm/nonmatchings/EC9D00/func_80240600_ECA300.s index 2ec86d2cfe..52bb158f74 100644 --- a/ver/us/asm/nonmatchings/EC9D00/func_80240600_ECA300.s +++ b/ver/us/asm/nonmatchings/EC9D00/func_80240600_ECA300.s @@ -160,7 +160,7 @@ glabel func_80240600_ECA300 /* ECA558 80240858 44050000 */ mfc1 $a1, $f0 /* ECA55C 8024085C 8E470060 */ lw $a3, 0x60($s2) /* ECA560 80240860 4485B000 */ mtc1 $a1, $f22 -/* ECA564 80240864 0C00ADA9 */ jal func_8002B6A4 +/* ECA564 80240864 0C00ADA9 */ jal dead_update_lerp /* ECA568 80240868 0240802D */ daddu $s0, $s2, $zero /* ECA56C 8024086C 46000506 */ mov.s $f20, $f0 .L80240870: @@ -282,7 +282,7 @@ glabel func_80240600_ECA300 /* ECA71C 80240A1C AFB30010 */ sw $s3, 0x10($sp) /* ECA720 80240A20 8E060038 */ lw $a2, 0x38($s0) /* ECA724 80240A24 8E470064 */ lw $a3, 0x64($s2) -/* ECA728 80240A28 0C00ADA9 */ jal func_8002B6A4 +/* ECA728 80240A28 0C00ADA9 */ jal dead_update_lerp /* ECA72C 80240A2C 24040001 */ addiu $a0, $zero, 1 /* ECA730 80240A30 C6020014 */ lwc1 $f2, 0x14($s0) /* ECA734 80240A34 46001080 */ add.s $f2, $f2, $f0 @@ -291,7 +291,7 @@ glabel func_80240600_ECA300 /* ECA740 80240A40 AFB30010 */ sw $s3, 0x10($sp) /* ECA744 80240A44 8E060044 */ lw $a2, 0x44($s0) /* ECA748 80240A48 8E470064 */ lw $a3, 0x64($s2) -/* ECA74C 80240A4C 0C00ADA9 */ jal func_8002B6A4 +/* ECA74C 80240A4C 0C00ADA9 */ jal dead_update_lerp /* ECA750 80240A50 24040001 */ addiu $a0, $zero, 1 /* ECA754 80240A54 C6020020 */ lwc1 $f2, 0x20($s0) /* ECA758 80240A58 46001080 */ add.s $f2, $f2, $f0 @@ -300,7 +300,7 @@ glabel func_80240600_ECA300 /* ECA764 80240A64 AFB30010 */ sw $s3, 0x10($sp) /* ECA768 80240A68 8E060050 */ lw $a2, 0x50($s0) /* ECA76C 80240A6C 8E470064 */ lw $a3, 0x64($s2) -/* ECA770 80240A70 0C00ADA9 */ jal func_8002B6A4 +/* ECA770 80240A70 0C00ADA9 */ jal dead_update_lerp /* ECA774 80240A74 24040001 */ addiu $a0, $zero, 1 /* ECA778 80240A78 C602002C */ lwc1 $f2, 0x2c($s0) /* ECA77C 80240A7C 46001080 */ add.s $f2, $f2, $f0 diff --git a/ver/us/asm/nonmatchings/ED42A0/func_80240080_ED42A0.s b/ver/us/asm/nonmatchings/ED42A0/func_80240080_ED42A0.s index d4f97a6158..283e783a8e 100644 --- a/ver/us/asm/nonmatchings/ED42A0/func_80240080_ED42A0.s +++ b/ver/us/asm/nonmatchings/ED42A0/func_80240080_ED42A0.s @@ -11,7 +11,7 @@ glabel func_80240080_ED42A0 /* ED42B8 80240098 8E020000 */ lw $v0, ($s0) /* ED42BC 8024009C 14400010 */ bnez $v0, .L802400E0 /* ED42C0 802400A0 0080882D */ daddu $s1, $a0, $zero -/* ED42C4 802400A4 0C00AFF5 */ jal func_8002BFD4 +/* ED42C4 802400A4 0C00AFF5 */ jal dead_heap_malloc /* ED42C8 802400A8 24040040 */ addiu $a0, $zero, 0x40 /* ED42CC 802400AC AE020000 */ sw $v0, ($s0) /* ED42D0 802400B0 0000182D */ daddu $v1, $zero, $zero diff --git a/ver/us/asm/nonmatchings/EDC020/func_8024027C_EDC25C.s b/ver/us/asm/nonmatchings/EDC020/func_8024027C_EDC25C.s index a8d4ca5d41..44e00c762d 100644 --- a/ver/us/asm/nonmatchings/EDC020/func_8024027C_EDC25C.s +++ b/ver/us/asm/nonmatchings/EDC020/func_8024027C_EDC25C.s @@ -11,7 +11,7 @@ glabel func_8024027C_EDC25C /* EDC274 80240294 8E020000 */ lw $v0, ($s0) /* EDC278 80240298 14400010 */ bnez $v0, .L802402DC /* EDC27C 8024029C 0080882D */ daddu $s1, $a0, $zero -/* EDC280 802402A0 0C00AFF5 */ jal func_8002BFD4 +/* EDC280 802402A0 0C00AFF5 */ jal dead_heap_malloc /* EDC284 802402A4 24040040 */ addiu $a0, $zero, 0x40 /* EDC288 802402A8 AE020000 */ sw $v0, ($s0) /* EDC28C 802402AC 0000182D */ daddu $v1, $zero, $zero diff --git a/ver/us/asm/nonmatchings/EDEA00/func_80241DE4_EE07A4.s b/ver/us/asm/nonmatchings/EDEA00/func_80241DE4_EE07A4.s index 6b82b0186a..f9f5cc698f 100644 --- a/ver/us/asm/nonmatchings/EDEA00/func_80241DE4_EE07A4.s +++ b/ver/us/asm/nonmatchings/EDEA00/func_80241DE4_EE07A4.s @@ -330,7 +330,7 @@ glabel func_80241DE4_EE07A4 /* EE0C58 80242298 8EC60018 */ lw $a2, 0x18($s6) /* EE0C5C 8024229C 4600218D */ trunc.w.s $f6, $f4 /* EE0C60 802422A0 44073000 */ mfc1 $a3, $f6 -/* EE0C64 802422A4 0C00ADA9 */ jal func_8002B6A4 +/* EE0C64 802422A4 0C00ADA9 */ jal dead_update_lerp /* EE0C68 802422A8 0000202D */ daddu $a0, $zero, $zero /* EE0C6C 802422AC 44050000 */ mfc1 $a1, $f0 /* EE0C70 802422B0 8E46000C */ lw $a2, 0xc($s2) diff --git a/ver/us/asm/nonmatchings/EDEA00/func_80243470_EE1E30.s b/ver/us/asm/nonmatchings/EDEA00/func_80243470_EE1E30.s index 809835e606..be3878c87f 100644 --- a/ver/us/asm/nonmatchings/EDEA00/func_80243470_EE1E30.s +++ b/ver/us/asm/nonmatchings/EDEA00/func_80243470_EE1E30.s @@ -48,7 +48,7 @@ glabel func_80243470_EE1E30 /* EE1ED8 80243518 0000202D */ daddu $a0, $zero, $zero /* EE1EDC 8024351C AFA20010 */ sw $v0, 0x10($sp) /* EE1EE0 80243520 8E670070 */ lw $a3, 0x70($s3) -/* EE1EE4 80243524 0C00ADA9 */ jal func_8002B6A4 +/* EE1EE4 80243524 0C00ADA9 */ jal dead_update_lerp /* EE1EE8 80243528 0000302D */ daddu $a2, $zero, $zero /* EE1EEC 8024352C 24040295 */ addiu $a0, $zero, 0x295 /* EE1EF0 80243530 4600008D */ trunc.w.s $f2, $f0 diff --git a/ver/us/asm/nonmatchings/EDEA00/func_80243584_EE1F44.s b/ver/us/asm/nonmatchings/EDEA00/func_80243584_EE1F44.s index 8639733bd9..cdf6e9daf9 100644 --- a/ver/us/asm/nonmatchings/EDEA00/func_80243584_EE1F44.s +++ b/ver/us/asm/nonmatchings/EDEA00/func_80243584_EE1F44.s @@ -42,7 +42,7 @@ glabel func_80243584_EE1F44 /* EE1FD4 80243614 24020050 */ addiu $v0, $zero, 0x50 /* EE1FD8 80243618 AFA20010 */ sw $v0, 0x10($sp) /* EE1FDC 8024361C 8E470070 */ lw $a3, 0x70($s2) -/* EE1FE0 80243620 0C00ADA9 */ jal func_8002B6A4 +/* EE1FE0 80243620 0C00ADA9 */ jal dead_update_lerp /* EE1FE4 80243624 0000302D */ daddu $a2, $zero, $zero /* EE1FE8 80243628 24040295 */ addiu $a0, $zero, 0x295 /* EE1FEC 8024362C 4600008D */ trunc.w.s $f2, $f0 diff --git a/ver/us/asm/nonmatchings/EE65B0/func_8024046C_EE6A1C.s b/ver/us/asm/nonmatchings/EE65B0/func_8024046C_EE6A1C.s index 904d95fedb..059cf2bb18 100644 --- a/ver/us/asm/nonmatchings/EE65B0/func_8024046C_EE6A1C.s +++ b/ver/us/asm/nonmatchings/EE65B0/func_8024046C_EE6A1C.s @@ -32,7 +32,7 @@ glabel func_8024046C_EE6A1C /* EE6A88 802404D8 00000000 */ nop /* EE6A8C 802404DC 46800020 */ cvt.s.w $f0, $f0 /* EE6A90 802404E0 AE220078 */ sw $v0, 0x78($s1) -/* EE6A94 802404E4 0C055C13 */ jal func_8015704C +/* EE6A94 802404E4 0C055C13 */ jal dead_sfx_adjust_env_sound_pos /* EE6A98 802404E8 E7A00010 */ swc1 $f0, 0x10($sp) /* EE6A9C 802404EC 8FBF0020 */ lw $ra, 0x20($sp) /* EE6AA0 802404F0 8FB1001C */ lw $s1, 0x1c($sp) diff --git a/ver/us/asm/nonmatchings/EED1E0/func_802402AC_EED3AC.s b/ver/us/asm/nonmatchings/EED1E0/func_802402AC_EED3AC.s index e44992f599..3671ae9fdf 100644 --- a/ver/us/asm/nonmatchings/EED1E0/func_802402AC_EED3AC.s +++ b/ver/us/asm/nonmatchings/EED1E0/func_802402AC_EED3AC.s @@ -17,7 +17,7 @@ glabel func_802402AC_EED3AC /* EED3DC 802402DC AFB1001C */ sw $s1, 0x1c($sp) /* EED3E0 802402E0 10A0004F */ beqz $a1, .L80240420 /* EED3E4 802402E4 AFB00018 */ sw $s0, 0x18($sp) -/* EED3E8 802402E8 0C00AFF5 */ jal func_8002BFD4 +/* EED3E8 802402E8 0C00AFF5 */ jal dead_heap_malloc /* EED3EC 802402EC 24040330 */ addiu $a0, $zero, 0x330 /* EED3F0 802402F0 0040982D */ daddu $s3, $v0, $zero /* EED3F4 802402F4 0000B02D */ daddu $s6, $zero, $zero diff --git a/ver/us/asm/nonmatchings/EED1E0/func_802406E0_EED7E0.s b/ver/us/asm/nonmatchings/EED1E0/func_802406E0_EED7E0.s index d09602a387..39ca49be39 100644 --- a/ver/us/asm/nonmatchings/EED1E0/func_802406E0_EED7E0.s +++ b/ver/us/asm/nonmatchings/EED1E0/func_802406E0_EED7E0.s @@ -160,7 +160,7 @@ glabel func_802406E0_EED7E0 /* EEDA38 80240938 44050000 */ mfc1 $a1, $f0 /* EEDA3C 8024093C 8E470060 */ lw $a3, 0x60($s2) /* EEDA40 80240940 4485B000 */ mtc1 $a1, $f22 -/* EEDA44 80240944 0C00ADA9 */ jal func_8002B6A4 +/* EEDA44 80240944 0C00ADA9 */ jal dead_update_lerp /* EEDA48 80240948 0240802D */ daddu $s0, $s2, $zero /* EEDA4C 8024094C 46000506 */ mov.s $f20, $f0 .L80240950: @@ -282,7 +282,7 @@ glabel func_802406E0_EED7E0 /* EEDBFC 80240AFC AFB30010 */ sw $s3, 0x10($sp) /* EEDC00 80240B00 8E060038 */ lw $a2, 0x38($s0) /* EEDC04 80240B04 8E470064 */ lw $a3, 0x64($s2) -/* EEDC08 80240B08 0C00ADA9 */ jal func_8002B6A4 +/* EEDC08 80240B08 0C00ADA9 */ jal dead_update_lerp /* EEDC0C 80240B0C 24040001 */ addiu $a0, $zero, 1 /* EEDC10 80240B10 C6020014 */ lwc1 $f2, 0x14($s0) /* EEDC14 80240B14 46001080 */ add.s $f2, $f2, $f0 @@ -291,7 +291,7 @@ glabel func_802406E0_EED7E0 /* EEDC20 80240B20 AFB30010 */ sw $s3, 0x10($sp) /* EEDC24 80240B24 8E060044 */ lw $a2, 0x44($s0) /* EEDC28 80240B28 8E470064 */ lw $a3, 0x64($s2) -/* EEDC2C 80240B2C 0C00ADA9 */ jal func_8002B6A4 +/* EEDC2C 80240B2C 0C00ADA9 */ jal dead_update_lerp /* EEDC30 80240B30 24040001 */ addiu $a0, $zero, 1 /* EEDC34 80240B34 C6020020 */ lwc1 $f2, 0x20($s0) /* EEDC38 80240B38 46001080 */ add.s $f2, $f2, $f0 @@ -300,7 +300,7 @@ glabel func_802406E0_EED7E0 /* EEDC44 80240B44 AFB30010 */ sw $s3, 0x10($sp) /* EEDC48 80240B48 8E060050 */ lw $a2, 0x50($s0) /* EEDC4C 80240B4C 8E470064 */ lw $a3, 0x64($s2) -/* EEDC50 80240B50 0C00ADA9 */ jal func_8002B6A4 +/* EEDC50 80240B50 0C00ADA9 */ jal dead_update_lerp /* EEDC54 80240B54 24040001 */ addiu $a0, $zero, 1 /* EEDC58 80240B58 C602002C */ lwc1 $f2, 0x2c($s0) /* EEDC5C 80240B5C 46001080 */ add.s $f2, $f2, $f0 diff --git a/ver/us/asm/nonmatchings/EF2680/func_80241C90_EF42A0.s b/ver/us/asm/nonmatchings/EF2680/func_80241C90_EF42A0.s index 68690b568f..4df1b87069 100644 --- a/ver/us/asm/nonmatchings/EF2680/func_80241C90_EF42A0.s +++ b/ver/us/asm/nonmatchings/EF2680/func_80241C90_EF42A0.s @@ -330,7 +330,7 @@ glabel func_80241C90_EF42A0 /* EF4754 80242144 8EC60018 */ lw $a2, 0x18($s6) /* EF4758 80242148 4600218D */ trunc.w.s $f6, $f4 /* EF475C 8024214C 44073000 */ mfc1 $a3, $f6 -/* EF4760 80242150 0C00ADA9 */ jal func_8002B6A4 +/* EF4760 80242150 0C00ADA9 */ jal dead_update_lerp /* EF4764 80242154 0000202D */ daddu $a0, $zero, $zero /* EF4768 80242158 44050000 */ mfc1 $a1, $f0 /* EF476C 8024215C 8E46000C */ lw $a2, 0xc($s2) diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_80240000_9951F0.s b/ver/us/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_80240000_9951F0.s deleted file mode 100644 index e97a5231c4..0000000000 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_80240000_9951F0.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_9951F0 -/* 9951F0 80240000 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9951F4 80240004 AFBF001C */ sw $ra, 0x1c($sp) -/* 9951F8 80240008 AFB00018 */ sw $s0, 0x18($sp) -/* 9951FC 8024000C 8C900084 */ lw $s0, 0x84($a0) -/* 995200 80240010 C6000008 */ lwc1 $f0, 8($s0) -/* 995204 80240014 240400A2 */ addiu $a0, $zero, 0xa2 -/* 995208 80240018 E7A00010 */ swc1 $f0, 0x10($sp) -/* 99520C 8024001C 8E060000 */ lw $a2, ($s0) -/* 995210 80240020 8E070004 */ lw $a3, 4($s0) -/* 995214 80240024 0C05267B */ jal sfx_adjust_env_sound_pos -/* 995218 80240028 0000282D */ daddu $a1, $zero, $zero -/* 99521C 8024002C 86020044 */ lh $v0, 0x44($s0) -/* 995220 80240030 8FBF001C */ lw $ra, 0x1c($sp) -/* 995224 80240034 8FB00018 */ lw $s0, 0x18($sp) -/* 995228 80240038 28420002 */ slti $v0, $v0, 2 -/* 99522C 8024003C 38420001 */ xori $v0, $v0, 1 -/* 995230 80240040 00021040 */ sll $v0, $v0, 1 -/* 995234 80240044 03E00008 */ jr $ra -/* 995238 80240048 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_8024004C_99523C.s b/ver/us/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_8024004C_99523C.s deleted file mode 100644 index 5ce7b939ef..0000000000 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_8024004C_99523C.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024004C_99523C -/* 99523C 8024004C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 995240 80240050 AFB20020 */ sw $s2, 0x20($sp) -/* 995244 80240054 0080902D */ daddu $s2, $a0, $zero -/* 995248 80240058 AFBF0024 */ sw $ra, 0x24($sp) -/* 99524C 8024005C AFB1001C */ sw $s1, 0x1c($sp) -/* 995250 80240060 AFB00018 */ sw $s0, 0x18($sp) -/* 995254 80240064 10A0004A */ beqz $a1, .L80240190 -/* 995258 80240068 8E51000C */ lw $s1, 0xc($s2) -/* 99525C 8024006C 0C00AB39 */ jal heap_malloc -/* 995260 80240070 24040058 */ addiu $a0, $zero, 0x58 -/* 995264 80240074 0000202D */ daddu $a0, $zero, $zero -/* 995268 80240078 3C05FD05 */ lui $a1, 0xfd05 -/* 99526C 8024007C 34A50F81 */ ori $a1, $a1, 0xf81 -/* 995270 80240080 0040802D */ daddu $s0, $v0, $zero -/* 995274 80240084 0200302D */ daddu $a2, $s0, $zero -/* 995278 80240088 0C0B2026 */ jal evt_set_variable -/* 99527C 8024008C AE500084 */ sw $s0, 0x84($s2) -/* 995280 80240090 8E250000 */ lw $a1, ($s1) -/* 995284 80240094 26310004 */ addiu $s1, $s1, 4 -/* 995288 80240098 0C0B1EAF */ jal evt_get_variable -/* 99528C 8024009C 0240202D */ daddu $a0, $s2, $zero -/* 995290 802400A0 AE020038 */ sw $v0, 0x38($s0) -/* 995294 802400A4 8E250000 */ lw $a1, ($s1) -/* 995298 802400A8 26310004 */ addiu $s1, $s1, 4 -/* 99529C 802400AC 0C0B1EAF */ jal evt_get_variable -/* 9952A0 802400B0 0240202D */ daddu $a0, $s2, $zero -/* 9952A4 802400B4 AE02003C */ sw $v0, 0x3c($s0) -/* 9952A8 802400B8 8E250000 */ lw $a1, ($s1) -/* 9952AC 802400BC 26310004 */ addiu $s1, $s1, 4 -/* 9952B0 802400C0 0C0B210B */ jal evt_get_float_variable -/* 9952B4 802400C4 0240202D */ daddu $a0, $s2, $zero -/* 9952B8 802400C8 E600000C */ swc1 $f0, 0xc($s0) -/* 9952BC 802400CC 8E250000 */ lw $a1, ($s1) -/* 9952C0 802400D0 26310004 */ addiu $s1, $s1, 4 -/* 9952C4 802400D4 0C0B210B */ jal evt_get_float_variable -/* 9952C8 802400D8 0240202D */ daddu $a0, $s2, $zero -/* 9952CC 802400DC E6000010 */ swc1 $f0, 0x10($s0) -/* 9952D0 802400E0 8E250000 */ lw $a1, ($s1) -/* 9952D4 802400E4 26310004 */ addiu $s1, $s1, 4 -/* 9952D8 802400E8 0C0B210B */ jal evt_get_float_variable -/* 9952DC 802400EC 0240202D */ daddu $a0, $s2, $zero -/* 9952E0 802400F0 E6000014 */ swc1 $f0, 0x14($s0) -/* 9952E4 802400F4 8E250000 */ lw $a1, ($s1) -/* 9952E8 802400F8 26310004 */ addiu $s1, $s1, 4 -/* 9952EC 802400FC 0C0B210B */ jal evt_get_float_variable -/* 9952F0 80240100 0240202D */ daddu $a0, $s2, $zero -/* 9952F4 80240104 E6000018 */ swc1 $f0, 0x18($s0) -/* 9952F8 80240108 8E250000 */ lw $a1, ($s1) -/* 9952FC 8024010C 26310004 */ addiu $s1, $s1, 4 -/* 995300 80240110 0C0B210B */ jal evt_get_float_variable -/* 995304 80240114 0240202D */ daddu $a0, $s2, $zero -/* 995308 80240118 E600001C */ swc1 $f0, 0x1c($s0) -/* 99530C 8024011C 8E250000 */ lw $a1, ($s1) -/* 995310 80240120 26310004 */ addiu $s1, $s1, 4 -/* 995314 80240124 0C0B210B */ jal evt_get_float_variable -/* 995318 80240128 0240202D */ daddu $a0, $s2, $zero -/* 99531C 8024012C E6000020 */ swc1 $f0, 0x20($s0) -/* 995320 80240130 8E250000 */ lw $a1, ($s1) -/* 995324 80240134 26310004 */ addiu $s1, $s1, 4 -/* 995328 80240138 0C0B210B */ jal evt_get_float_variable -/* 99532C 8024013C 0240202D */ daddu $a0, $s2, $zero -/* 995330 80240140 E6000024 */ swc1 $f0, 0x24($s0) -/* 995334 80240144 8E250000 */ lw $a1, ($s1) -/* 995338 80240148 0C0B210B */ jal evt_get_float_variable -/* 99533C 8024014C 0240202D */ daddu $a0, $s2, $zero -/* 995340 80240150 3C013F80 */ lui $at, 0x3f80 -/* 995344 80240154 44811000 */ mtc1 $at, $f2 -/* 995348 80240158 E6000028 */ swc1 $f0, 0x28($s0) -/* 99534C 8024015C AFA00014 */ sw $zero, 0x14($sp) -/* 995350 80240160 E7A20010 */ swc1 $f2, 0x10($sp) -/* 995354 80240164 8E05000C */ lw $a1, 0xc($s0) -/* 995358 80240168 8E060010 */ lw $a2, 0x10($s0) -/* 99535C 8024016C 8E070014 */ lw $a3, 0x14($s0) -/* 995360 80240170 0C01CA6C */ jal playFX_83 -/* 995364 80240174 24040002 */ addiu $a0, $zero, 2 -/* 995368 80240178 AE020050 */ sw $v0, 0x50($s0) -/* 99536C 8024017C A600004E */ sh $zero, 0x4e($s0) -/* 995370 80240180 A6000048 */ sh $zero, 0x48($s0) -/* 995374 80240184 A600004A */ sh $zero, 0x4a($s0) -/* 995378 80240188 A6000044 */ sh $zero, 0x44($s0) -/* 99537C 8024018C A6000046 */ sh $zero, 0x46($s0) -.L80240190: -/* 995380 80240190 8FBF0024 */ lw $ra, 0x24($sp) -/* 995384 80240194 8FB20020 */ lw $s2, 0x20($sp) -/* 995388 80240198 8FB1001C */ lw $s1, 0x1c($sp) -/* 99538C 8024019C 8FB00018 */ lw $s0, 0x18($sp) -/* 995390 802401A0 24020002 */ addiu $v0, $zero, 2 -/* 995394 802401A4 03E00008 */ jr $ra -/* 995398 802401A8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_802401AC_99539C.s b/ver/us/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_802401AC_99539C.s deleted file mode 100644 index ad3f2797c2..0000000000 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_802401AC_99539C.s +++ /dev/null @@ -1,283 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel jtbl_80242D50_997F40 -.word L802401EC_9953DC, L802402AC_99549C, L802402F4_9954E4, L80240394_995584, L802403FC_9955EC - -.section .text - -glabel func_802401AC_99539C -/* 99539C 802401AC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9953A0 802401B0 AFBF0020 */ sw $ra, 0x20($sp) -/* 9953A4 802401B4 AFB1001C */ sw $s1, 0x1c($sp) -/* 9953A8 802401B8 AFB00018 */ sw $s0, 0x18($sp) -/* 9953AC 802401BC 8C910084 */ lw $s1, 0x84($a0) -/* 9953B0 802401C0 86230044 */ lh $v1, 0x44($s1) -/* 9953B4 802401C4 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* 9953B8 802401C8 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* 9953BC 802401CC 2C620005 */ sltiu $v0, $v1, 5 -/* 9953C0 802401D0 1040008A */ beqz $v0, L802403FC_9955EC -/* 9953C4 802401D4 00031080 */ sll $v0, $v1, 2 -/* 9953C8 802401D8 3C018024 */ lui $at, %hi(jtbl_80242D50_997F40) -/* 9953CC 802401DC 00220821 */ addu $at, $at, $v0 -/* 9953D0 802401E0 8C222D50 */ lw $v0, %lo(jtbl_80242D50_997F40)($at) -/* 9953D4 802401E4 00400008 */ jr $v0 -/* 9953D8 802401E8 00000000 */ nop -glabel L802401EC_9953DC -/* 9953DC 802401EC 8E22003C */ lw $v0, 0x3c($s1) -/* 9953E0 802401F0 86270046 */ lh $a3, 0x46($s1) -/* 9953E4 802401F4 AFA20010 */ sw $v0, 0x10($sp) -/* 9953E8 802401F8 8E250010 */ lw $a1, 0x10($s1) -/* 9953EC 802401FC 8E26001C */ lw $a2, 0x1c($s1) -/* 9953F0 80240200 0C00A8ED */ jal update_lerp -/* 9953F4 80240204 24040005 */ addiu $a0, $zero, 5 -/* 9953F8 80240208 86270046 */ lh $a3, 0x46($s1) -/* 9953FC 8024020C 8E22003C */ lw $v0, 0x3c($s1) -/* 995400 80240210 E6200004 */ swc1 $f0, 4($s1) -/* 995404 80240214 AFA20010 */ sw $v0, 0x10($sp) -/* 995408 80240218 8E25000C */ lw $a1, 0xc($s1) -/* 99540C 8024021C 8E260018 */ lw $a2, 0x18($s1) -/* 995410 80240220 0C00A8ED */ jal update_lerp -/* 995414 80240224 0000202D */ daddu $a0, $zero, $zero -/* 995418 80240228 86270046 */ lh $a3, 0x46($s1) -/* 99541C 8024022C 8E22003C */ lw $v0, 0x3c($s1) -/* 995420 80240230 E6200000 */ swc1 $f0, ($s1) -/* 995424 80240234 AFA20010 */ sw $v0, 0x10($sp) -/* 995428 80240238 8E250014 */ lw $a1, 0x14($s1) -/* 99542C 8024023C 8E260020 */ lw $a2, 0x20($s1) -/* 995430 80240240 0C00A8ED */ jal update_lerp -/* 995434 80240244 0000202D */ daddu $a0, $zero, $zero -/* 995438 80240248 8E220050 */ lw $v0, 0x50($s1) -/* 99543C 8024024C E6200008 */ swc1 $f0, 8($s1) -/* 995440 80240250 C6200000 */ lwc1 $f0, ($s1) -/* 995444 80240254 8C42000C */ lw $v0, 0xc($v0) -/* 995448 80240258 E4400008 */ swc1 $f0, 8($v0) -/* 99544C 8024025C 8E220050 */ lw $v0, 0x50($s1) -/* 995450 80240260 C6200004 */ lwc1 $f0, 4($s1) -/* 995454 80240264 8C42000C */ lw $v0, 0xc($v0) -/* 995458 80240268 E440000C */ swc1 $f0, 0xc($v0) -/* 99545C 8024026C 8E220050 */ lw $v0, 0x50($s1) -/* 995460 80240270 C6200008 */ lwc1 $f0, 8($s1) -/* 995464 80240274 8C42000C */ lw $v0, 0xc($v0) -/* 995468 80240278 E4400010 */ swc1 $f0, 0x10($v0) -/* 99546C 8024027C 96220046 */ lhu $v0, 0x46($s1) -/* 995470 80240280 8E23003C */ lw $v1, 0x3c($s1) -/* 995474 80240284 24420001 */ addiu $v0, $v0, 1 -/* 995478 80240288 A6220046 */ sh $v0, 0x46($s1) -/* 99547C 8024028C 00021400 */ sll $v0, $v0, 0x10 -/* 995480 80240290 00021403 */ sra $v0, $v0, 0x10 -/* 995484 80240294 0043102A */ slt $v0, $v0, $v1 -/* 995488 80240298 14400058 */ bnez $v0, L802403FC_9955EC -/* 99548C 8024029C 24020001 */ addiu $v0, $zero, 1 -/* 995490 802402A0 A6220044 */ sh $v0, 0x44($s1) -/* 995494 802402A4 080900FF */ j L802403FC_9955EC -/* 995498 802402A8 A6200046 */ sh $zero, 0x46($s1) -glabel L802402AC_99549C -/* 99549C 802402AC 96220046 */ lhu $v0, 0x46($s1) -/* 9954A0 802402B0 24420001 */ addiu $v0, $v0, 1 -/* 9954A4 802402B4 A6220046 */ sh $v0, 0x46($s1) -/* 9954A8 802402B8 00021400 */ sll $v0, $v0, 0x10 -/* 9954AC 802402BC 00021403 */ sra $v0, $v0, 0x10 -/* 9954B0 802402C0 2842003C */ slti $v0, $v0, 0x3c -/* 9954B4 802402C4 1440004D */ bnez $v0, L802403FC_9955EC -/* 9954B8 802402C8 24020002 */ addiu $v0, $zero, 2 -/* 9954BC 802402CC 8E230050 */ lw $v1, 0x50($s1) -/* 9954C0 802402D0 A6220044 */ sh $v0, 0x44($s1) -/* 9954C4 802402D4 A6200046 */ sh $zero, 0x46($s1) -/* 9954C8 802402D8 8C63000C */ lw $v1, 0xc($v1) -/* 9954CC 802402DC 24020001 */ addiu $v0, $zero, 1 -/* 9954D0 802402E0 AC620070 */ sw $v0, 0x70($v1) -/* 9954D4 802402E4 8E220050 */ lw $v0, 0x50($s1) -/* 9954D8 802402E8 8C42000C */ lw $v0, 0xc($v0) -/* 9954DC 802402EC 080900FF */ j L802403FC_9955EC -/* 9954E0 802402F0 AC400074 */ sw $zero, 0x74($v0) -glabel L802402F4_9954E4 -/* 9954E4 802402F4 96220046 */ lhu $v0, 0x46($s1) -/* 9954E8 802402F8 24420001 */ addiu $v0, $v0, 1 -/* 9954EC 802402FC A6220046 */ sh $v0, 0x46($s1) -/* 9954F0 80240300 00021400 */ sll $v0, $v0, 0x10 -/* 9954F4 80240304 00021403 */ sra $v0, $v0, 0x10 -/* 9954F8 80240308 2842003C */ slti $v0, $v0, 0x3c -/* 9954FC 8024030C 1440003B */ bnez $v0, L802403FC_9955EC -/* 995500 80240310 00000000 */ nop -/* 995504 80240314 3C013F80 */ lui $at, 0x3f80 -/* 995508 80240318 44810000 */ mtc1 $at, $f0 -/* 99550C 8024031C AFA00014 */ sw $zero, 0x14($sp) -/* 995510 80240320 E7A00010 */ swc1 $f0, 0x10($sp) -/* 995514 80240324 8E250018 */ lw $a1, 0x18($s1) -/* 995518 80240328 8E26001C */ lw $a2, 0x1c($s1) -/* 99551C 8024032C 8E270020 */ lw $a3, 0x20($s1) -/* 995520 80240330 0C01C9AC */ jal playFX_7B -/* 995524 80240334 24040001 */ addiu $a0, $zero, 1 -/* 995528 80240338 AE220054 */ sw $v0, 0x54($s1) -/* 99552C 8024033C 8C43000C */ lw $v1, 0xc($v0) -/* 995530 80240340 9222003B */ lbu $v0, 0x3b($s1) -/* 995534 80240344 A0620034 */ sb $v0, 0x34($v1) -/* 995538 80240348 8E220054 */ lw $v0, 0x54($s1) -/* 99553C 8024034C 8C42000C */ lw $v0, 0xc($v0) -/* 995540 80240350 AC400020 */ sw $zero, 0x20($v0) -/* 995544 80240354 8E250018 */ lw $a1, 0x18($s1) -/* 995548 80240358 8E260028 */ lw $a2, 0x28($s1) -/* 99554C 8024035C 8E270020 */ lw $a3, 0x20($s1) -/* 995550 80240360 0C044898 */ jal create_shadow_type -/* 995554 80240364 0000202D */ daddu $a0, $zero, $zero -/* 995558 80240368 3C014210 */ lui $at, 0x4210 -/* 99555C 8024036C 44810000 */ mtc1 $at, $f0 -/* 995560 80240370 AE220040 */ sw $v0, 0x40($s1) -/* 995564 80240374 24020003 */ addiu $v0, $zero, 3 -/* 995568 80240378 A6220044 */ sh $v0, 0x44($s1) -/* 99556C 8024037C 24020001 */ addiu $v0, $zero, 1 -/* 995570 80240380 A6200046 */ sh $zero, 0x46($s1) -/* 995574 80240384 AE20002C */ sw $zero, 0x2c($s1) -/* 995578 80240388 A6220048 */ sh $v0, 0x48($s1) -/* 99557C 8024038C 080900FF */ j L802403FC_9955EC -/* 995580 80240390 E6200030 */ swc1 $f0, 0x30($s1) -glabel L80240394_995584 -/* 995584 80240394 0000202D */ daddu $a0, $zero, $zero -/* 995588 80240398 3C054210 */ lui $a1, 0x4210 -/* 99558C 8024039C 3C064198 */ lui $a2, 0x4198 -/* 995590 802403A0 86270046 */ lh $a3, 0x46($s1) -/* 995594 802403A4 24020078 */ addiu $v0, $zero, 0x78 -/* 995598 802403A8 0C00A8ED */ jal update_lerp -/* 99559C 802403AC AFA20010 */ sw $v0, 0x10($sp) -/* 9955A0 802403B0 96220046 */ lhu $v0, 0x46($s1) -/* 9955A4 802403B4 E6200030 */ swc1 $f0, 0x30($s1) -/* 9955A8 802403B8 24420001 */ addiu $v0, $v0, 1 -/* 9955AC 802403BC A6220046 */ sh $v0, 0x46($s1) -/* 9955B0 802403C0 00021400 */ sll $v0, $v0, 0x10 -/* 9955B4 802403C4 00021403 */ sra $v0, $v0, 0x10 -/* 9955B8 802403C8 28420078 */ slti $v0, $v0, 0x78 -/* 9955BC 802403CC 1440000B */ bnez $v0, L802403FC_9955EC -/* 9955C0 802403D0 24030001 */ addiu $v1, $zero, 1 -/* 9955C4 802403D4 C620002C */ lwc1 $f0, 0x2c($s1) -/* 9955C8 802403D8 24020002 */ addiu $v0, $zero, 2 -/* 9955CC 802403DC A6220048 */ sh $v0, 0x48($s1) -/* 9955D0 802403E0 24020004 */ addiu $v0, $zero, 4 -/* 9955D4 802403E4 A620004C */ sh $zero, 0x4c($s1) -/* 9955D8 802403E8 A623004A */ sh $v1, 0x4a($s1) -/* 9955DC 802403EC A623004E */ sh $v1, 0x4e($s1) -/* 9955E0 802403F0 A6220044 */ sh $v0, 0x44($s1) -/* 9955E4 802403F4 A6200046 */ sh $zero, 0x46($s1) -/* 9955E8 802403F8 E6200034 */ swc1 $f0, 0x34($s1) -glabel L802403FC_9955EC -/* 9955EC 802403FC 8623004A */ lh $v1, 0x4a($s1) -/* 9955F0 80240400 24020001 */ addiu $v0, $zero, 1 -/* 9955F4 80240404 10620005 */ beq $v1, $v0, .L8024041C -/* 9955F8 80240408 24020002 */ addiu $v0, $zero, 2 -/* 9955FC 8024040C 1062001E */ beq $v1, $v0, .L80240488 -/* 995600 80240410 00000000 */ nop -/* 995604 80240414 0809014C */ j .L80240530 -/* 995608 80240418 00000000 */ nop -.L8024041C: -/* 99560C 8024041C 8627004C */ lh $a3, 0x4c($s1) -/* 995610 80240420 24100078 */ addiu $s0, $zero, 0x78 -/* 995614 80240424 AFB00010 */ sw $s0, 0x10($sp) -/* 995618 80240428 8E250034 */ lw $a1, 0x34($s1) -/* 99561C 8024042C 3C0644B4 */ lui $a2, 0x44b4 -/* 995620 80240430 0C00A8ED */ jal update_lerp -/* 995624 80240434 24040004 */ addiu $a0, $zero, 4 -/* 995628 80240438 8627004C */ lh $a3, 0x4c($s1) -/* 99562C 8024043C E620002C */ swc1 $f0, 0x2c($s1) -/* 995630 80240440 AFB00010 */ sw $s0, 0x10($sp) -/* 995634 80240444 8E25001C */ lw $a1, 0x1c($s1) -/* 995638 80240448 8E260024 */ lw $a2, 0x24($s1) -/* 99563C 8024044C 0C00A8ED */ jal update_lerp -/* 995640 80240450 2404000A */ addiu $a0, $zero, 0xa -/* 995644 80240454 9622004C */ lhu $v0, 0x4c($s1) -/* 995648 80240458 E6200004 */ swc1 $f0, 4($s1) -/* 99564C 8024045C 24420001 */ addiu $v0, $v0, 1 -/* 995650 80240460 A622004C */ sh $v0, 0x4c($s1) -/* 995654 80240464 00021400 */ sll $v0, $v0, 0x10 -/* 995658 80240468 00021403 */ sra $v0, $v0, 0x10 -/* 99565C 8024046C 0050102A */ slt $v0, $v0, $s0 -/* 995660 80240470 1440002F */ bnez $v0, .L80240530 -/* 995664 80240474 2402010E */ addiu $v0, $zero, 0x10e -/* 995668 80240478 A622004C */ sh $v0, 0x4c($s1) -/* 99566C 8024047C 24020002 */ addiu $v0, $zero, 2 -/* 995670 80240480 0809014B */ j .L8024052C -/* 995674 80240484 A622004A */ sh $v0, 0x4a($s1) -.L80240488: -/* 995678 80240488 8622004C */ lh $v0, 0x4c($s1) -/* 99567C 8024048C 44826000 */ mtc1 $v0, $f12 -/* 995680 80240490 00000000 */ nop -/* 995684 80240494 0C00A8BB */ jal sin_deg -/* 995688 80240498 46806320 */ cvt.s.w $f12, $f12 -/* 99568C 8024049C 3C013F80 */ lui $at, 0x3f80 -/* 995690 802404A0 44811000 */ mtc1 $at, $f2 -/* 995694 802404A4 00000000 */ nop -/* 995698 802404A8 46020000 */ add.s $f0, $f0, $f2 -/* 99569C 802404AC 46000000 */ add.s $f0, $f0, $f0 -/* 9956A0 802404B0 C6220024 */ lwc1 $f2, 0x24($s1) -/* 9956A4 802404B4 8622004C */ lh $v0, 0x4c($s1) -/* 9956A8 802404B8 46001080 */ add.s $f2, $f2, $f0 -/* 9956AC 802404BC 24420008 */ addiu $v0, $v0, 8 -/* 9956B0 802404C0 44826000 */ mtc1 $v0, $f12 -/* 9956B4 802404C4 00000000 */ nop -/* 9956B8 802404C8 46806320 */ cvt.s.w $f12, $f12 -/* 9956BC 802404CC 0C00A6C9 */ jal clamp_angle -/* 9956C0 802404D0 E6220004 */ swc1 $f2, 4($s1) -/* 9956C4 802404D4 4600010D */ trunc.w.s $f4, $f0 -/* 9956C8 802404D8 44022000 */ mfc1 $v0, $f4 -/* 9956CC 802404DC C6200004 */ lwc1 $f0, 4($s1) -/* 9956D0 802404E0 A622004C */ sh $v0, 0x4c($s1) -/* 9956D4 802404E4 C60C0028 */ lwc1 $f12, 0x28($s0) -/* 9956D8 802404E8 8E060030 */ lw $a2, 0x30($s0) -/* 9956DC 802404EC 3C0141A0 */ lui $at, 0x41a0 -/* 9956E0 802404F0 44817000 */ mtc1 $at, $f14 -/* 9956E4 802404F4 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9956E8 802404F8 C602002C */ lwc1 $f2, 0x2c($s0) -/* 9956EC 802404FC C6200008 */ lwc1 $f0, 8($s1) -/* 9956F0 80240500 E7A00014 */ swc1 $f0, 0x14($sp) -/* 9956F4 80240504 8E270000 */ lw $a3, ($s1) -/* 9956F8 80240508 0C00A7CB */ jal dist3D -/* 9956FC 8024050C 460E1380 */ add.s $f14, $f2, $f14 -/* 995700 80240510 3C0141F0 */ lui $at, 0x41f0 -/* 995704 80240514 44811000 */ mtc1 $at, $f2 -/* 995708 80240518 00000000 */ nop -/* 99570C 8024051C 4600103C */ c.lt.s $f2, $f0 -/* 995710 80240520 00000000 */ nop -/* 995714 80240524 45010002 */ bc1t .L80240530 -/* 995718 80240528 24020003 */ addiu $v0, $zero, 3 -.L8024052C: -/* 99571C 8024052C A622004E */ sh $v0, 0x4e($s1) -.L80240530: -/* 995720 80240530 86230048 */ lh $v1, 0x48($s1) -/* 995724 80240534 24020001 */ addiu $v0, $zero, 1 -/* 995728 80240538 10620005 */ beq $v1, $v0, .L80240550 -/* 99572C 8024053C 24020002 */ addiu $v0, $zero, 2 -/* 995730 80240540 10620008 */ beq $v1, $v0, .L80240564 -/* 995734 80240544 00000000 */ nop -/* 995738 80240548 08090169 */ j .L802405A4 -/* 99573C 8024054C 00000000 */ nop -.L80240550: -/* 995740 80240550 C620002C */ lwc1 $f0, 0x2c($s1) -/* 995744 80240554 C62C0030 */ lwc1 $f12, 0x30($s1) -/* 995748 80240558 0C00A6C9 */ jal clamp_angle -/* 99574C 8024055C 460C0300 */ add.s $f12, $f0, $f12 -/* 995750 80240560 E620002C */ swc1 $f0, 0x2c($s1) -.L80240564: -/* 995754 80240564 8E220054 */ lw $v0, 0x54($s1) -/* 995758 80240568 C620002C */ lwc1 $f0, 0x2c($s1) -/* 99575C 8024056C 8C42000C */ lw $v0, 0xc($v0) -/* 995760 80240570 E4400024 */ swc1 $f0, 0x24($v0) -/* 995764 80240574 8E220054 */ lw $v0, 0x54($s1) -/* 995768 80240578 C6200018 */ lwc1 $f0, 0x18($s1) -/* 99576C 8024057C 8C42000C */ lw $v0, 0xc($v0) -/* 995770 80240580 E4400004 */ swc1 $f0, 4($v0) -/* 995774 80240584 8E220054 */ lw $v0, 0x54($s1) -/* 995778 80240588 C6200004 */ lwc1 $f0, 4($s1) -/* 99577C 8024058C 8C42000C */ lw $v0, 0xc($v0) -/* 995780 80240590 E4400008 */ swc1 $f0, 8($v0) -/* 995784 80240594 8E220054 */ lw $v0, 0x54($s1) -/* 995788 80240598 C6200020 */ lwc1 $f0, 0x20($s1) -/* 99578C 8024059C 8C42000C */ lw $v0, 0xc($v0) -/* 995790 802405A0 E440000C */ swc1 $f0, 0xc($v0) -.L802405A4: -/* 995794 802405A4 8FBF0020 */ lw $ra, 0x20($sp) -/* 995798 802405A8 8FB1001C */ lw $s1, 0x1c($sp) -/* 99579C 802405AC 8FB00018 */ lw $s0, 0x18($sp) -/* 9957A0 802405B0 0000102D */ daddu $v0, $zero, $zero -/* 9957A4 802405B4 03E00008 */ jr $ra -/* 9957A8 802405B8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_802405BC_9957AC.s b/ver/us/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_802405BC_9957AC.s deleted file mode 100644 index b1d13e99e5..0000000000 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_802405BC_9957AC.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405BC_9957AC -/* 9957AC 802405BC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9957B0 802405C0 AFB00010 */ sw $s0, 0x10($sp) -/* 9957B4 802405C4 0080802D */ daddu $s0, $a0, $zero -/* 9957B8 802405C8 AFBF0014 */ sw $ra, 0x14($sp) -/* 9957BC 802405CC 8E02000C */ lw $v0, 0xc($s0) -/* 9957C0 802405D0 0C0B1EAF */ jal evt_get_variable -/* 9957C4 802405D4 8C450000 */ lw $a1, ($v0) -/* 9957C8 802405D8 8E030084 */ lw $v1, 0x84($s0) -/* 9957CC 802405DC 8FBF0014 */ lw $ra, 0x14($sp) -/* 9957D0 802405E0 8463004E */ lh $v1, 0x4e($v1) -/* 9957D4 802405E4 8FB00010 */ lw $s0, 0x10($sp) -/* 9957D8 802405E8 00621826 */ xor $v1, $v1, $v0 -/* 9957DC 802405EC 2C630001 */ sltiu $v1, $v1, 1 -/* 9957E0 802405F0 00031040 */ sll $v0, $v1, 1 -/* 9957E4 802405F4 03E00008 */ jr $ra -/* 9957E8 802405F8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_802405FC_9957EC.s b/ver/us/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_802405FC_9957EC.s deleted file mode 100644 index efeefc8a05..0000000000 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_802405FC_9957EC.s +++ /dev/null @@ -1,72 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405FC_9957EC -/* 9957EC 802405FC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9957F0 80240600 AFB20020 */ sw $s2, 0x20($sp) -/* 9957F4 80240604 0080902D */ daddu $s2, $a0, $zero -/* 9957F8 80240608 AFBF0024 */ sw $ra, 0x24($sp) -/* 9957FC 8024060C AFB1001C */ sw $s1, 0x1c($sp) -/* 995800 80240610 AFB00018 */ sw $s0, 0x18($sp) -/* 995804 80240614 10A00035 */ beqz $a1, .L802406EC -/* 995808 80240618 8E51000C */ lw $s1, 0xc($s2) -/* 99580C 8024061C 0C00AB39 */ jal heap_malloc -/* 995810 80240620 24040058 */ addiu $a0, $zero, 0x58 -/* 995814 80240624 0040802D */ daddu $s0, $v0, $zero -/* 995818 80240628 AE500084 */ sw $s0, 0x84($s2) -/* 99581C 8024062C 8E250000 */ lw $a1, ($s1) -/* 995820 80240630 26310004 */ addiu $s1, $s1, 4 -/* 995824 80240634 0C0B1EAF */ jal evt_get_variable -/* 995828 80240638 0240202D */ daddu $a0, $s2, $zero -/* 99582C 8024063C AE020038 */ sw $v0, 0x38($s0) -/* 995830 80240640 8E250000 */ lw $a1, ($s1) -/* 995834 80240644 26310004 */ addiu $s1, $s1, 4 -/* 995838 80240648 0C0B210B */ jal evt_get_float_variable -/* 99583C 8024064C 0240202D */ daddu $a0, $s2, $zero -/* 995840 80240650 E6000018 */ swc1 $f0, 0x18($s0) -/* 995844 80240654 8E250000 */ lw $a1, ($s1) -/* 995848 80240658 26310004 */ addiu $s1, $s1, 4 -/* 99584C 8024065C 0C0B210B */ jal evt_get_float_variable -/* 995850 80240660 0240202D */ daddu $a0, $s2, $zero -/* 995854 80240664 E6000024 */ swc1 $f0, 0x24($s0) -/* 995858 80240668 8E250000 */ lw $a1, ($s1) -/* 99585C 8024066C 26310004 */ addiu $s1, $s1, 4 -/* 995860 80240670 0C0B210B */ jal evt_get_float_variable -/* 995864 80240674 0240202D */ daddu $a0, $s2, $zero -/* 995868 80240678 E6000020 */ swc1 $f0, 0x20($s0) -/* 99586C 8024067C 8E250000 */ lw $a1, ($s1) -/* 995870 80240680 0C0B210B */ jal evt_get_float_variable -/* 995874 80240684 0240202D */ daddu $a0, $s2, $zero -/* 995878 80240688 3C013F80 */ lui $at, 0x3f80 -/* 99587C 8024068C 44811000 */ mtc1 $at, $f2 -/* 995880 80240690 E6000028 */ swc1 $f0, 0x28($s0) -/* 995884 80240694 AFA00014 */ sw $zero, 0x14($sp) -/* 995888 80240698 E7A20010 */ swc1 $f2, 0x10($sp) -/* 99588C 8024069C 8E050018 */ lw $a1, 0x18($s0) -/* 995890 802406A0 8E060024 */ lw $a2, 0x24($s0) -/* 995894 802406A4 8E070020 */ lw $a3, 0x20($s0) -/* 995898 802406A8 0C01C9AC */ jal playFX_7B -/* 99589C 802406AC 24040001 */ addiu $a0, $zero, 1 -/* 9958A0 802406B0 AE020054 */ sw $v0, 0x54($s0) -/* 9958A4 802406B4 8C43000C */ lw $v1, 0xc($v0) -/* 9958A8 802406B8 9202003B */ lbu $v0, 0x3b($s0) -/* 9958AC 802406BC A0620034 */ sb $v0, 0x34($v1) -/* 9958B0 802406C0 8E020054 */ lw $v0, 0x54($s0) -/* 9958B4 802406C4 8C42000C */ lw $v0, 0xc($v0) -/* 9958B8 802406C8 AC400020 */ sw $zero, 0x20($v0) -/* 9958BC 802406CC 8E050018 */ lw $a1, 0x18($s0) -/* 9958C0 802406D0 8E060028 */ lw $a2, 0x28($s0) -/* 9958C4 802406D4 8E070020 */ lw $a3, 0x20($s0) -/* 9958C8 802406D8 0C044898 */ jal create_shadow_type -/* 9958CC 802406DC 0000202D */ daddu $a0, $zero, $zero -/* 9958D0 802406E0 AE020040 */ sw $v0, 0x40($s0) -/* 9958D4 802406E4 2402010E */ addiu $v0, $zero, 0x10e -/* 9958D8 802406E8 A602004C */ sh $v0, 0x4c($s0) -.L802406EC: -/* 9958DC 802406EC 8FBF0024 */ lw $ra, 0x24($sp) -/* 9958E0 802406F0 8FB20020 */ lw $s2, 0x20($sp) -/* 9958E4 802406F4 8FB1001C */ lw $s1, 0x1c($sp) -/* 9958E8 802406F8 8FB00018 */ lw $s0, 0x18($sp) -/* 9958EC 802406FC 24020002 */ addiu $v0, $zero, 2 -/* 9958F0 80240700 03E00008 */ jr $ra -/* 9958F4 80240704 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_80240708_9958F8.s b/ver/us/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_80240708_9958F8.s deleted file mode 100644 index 93747fd644..0000000000 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_80240708_9958F8.s +++ /dev/null @@ -1,67 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240708_9958F8 -/* 9958F8 80240708 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9958FC 8024070C AFBF0014 */ sw $ra, 0x14($sp) -/* 995900 80240710 AFB00010 */ sw $s0, 0x10($sp) -/* 995904 80240714 8C900084 */ lw $s0, 0x84($a0) -/* 995908 80240718 8602004C */ lh $v0, 0x4c($s0) -/* 99590C 8024071C 44826000 */ mtc1 $v0, $f12 -/* 995910 80240720 00000000 */ nop -/* 995914 80240724 0C00A8BB */ jal sin_deg -/* 995918 80240728 46806320 */ cvt.s.w $f12, $f12 -/* 99591C 8024072C 3C013F80 */ lui $at, 0x3f80 -/* 995920 80240730 44811000 */ mtc1 $at, $f2 -/* 995924 80240734 00000000 */ nop -/* 995928 80240738 46020000 */ add.s $f0, $f0, $f2 -/* 99592C 8024073C 46000000 */ add.s $f0, $f0, $f0 -/* 995930 80240740 C6020024 */ lwc1 $f2, 0x24($s0) -/* 995934 80240744 8602004C */ lh $v0, 0x4c($s0) -/* 995938 80240748 46001080 */ add.s $f2, $f2, $f0 -/* 99593C 8024074C 24420008 */ addiu $v0, $v0, 8 -/* 995940 80240750 44826000 */ mtc1 $v0, $f12 -/* 995944 80240754 00000000 */ nop -/* 995948 80240758 46806320 */ cvt.s.w $f12, $f12 -/* 99594C 8024075C 0C00A6C9 */ jal clamp_angle -/* 995950 80240760 E6020004 */ swc1 $f2, 4($s0) -/* 995954 80240764 4600010D */ trunc.w.s $f4, $f0 -/* 995958 80240768 44022000 */ mfc1 $v0, $f4 -/* 99595C 8024076C 00000000 */ nop -/* 995960 80240770 A602004C */ sh $v0, 0x4c($s0) -/* 995964 80240774 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 995968 80240778 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 99596C 8024077C C44C0028 */ lwc1 $f12, 0x28($v0) -/* 995970 80240780 C44E0030 */ lwc1 $f14, 0x30($v0) -/* 995974 80240784 8E060018 */ lw $a2, 0x18($s0) -/* 995978 80240788 0C00A7B5 */ jal dist2D -/* 99597C 8024078C 8E070020 */ lw $a3, 0x20($s0) -/* 995980 80240790 3C0141F0 */ lui $at, 0x41f0 -/* 995984 80240794 44811000 */ mtc1 $at, $f2 -/* 995988 80240798 00000000 */ nop -/* 99598C 8024079C 4602003E */ c.le.s $f0, $f2 -/* 995990 802407A0 00000000 */ nop -/* 995994 802407A4 45000002 */ bc1f .L802407B0 -/* 995998 802407A8 24020003 */ addiu $v0, $zero, 3 -/* 99599C 802407AC A602004E */ sh $v0, 0x4e($s0) -.L802407B0: -/* 9959A0 802407B0 8E020054 */ lw $v0, 0x54($s0) -/* 9959A4 802407B4 C6000018 */ lwc1 $f0, 0x18($s0) -/* 9959A8 802407B8 8C42000C */ lw $v0, 0xc($v0) -/* 9959AC 802407BC E4400004 */ swc1 $f0, 4($v0) -/* 9959B0 802407C0 8E020054 */ lw $v0, 0x54($s0) -/* 9959B4 802407C4 C6000004 */ lwc1 $f0, 4($s0) -/* 9959B8 802407C8 8C42000C */ lw $v0, 0xc($v0) -/* 9959BC 802407CC E4400008 */ swc1 $f0, 8($v0) -/* 9959C0 802407D0 8E020054 */ lw $v0, 0x54($s0) -/* 9959C4 802407D4 C6000020 */ lwc1 $f0, 0x20($s0) -/* 9959C8 802407D8 8C42000C */ lw $v0, 0xc($v0) -/* 9959CC 802407DC E440000C */ swc1 $f0, 0xc($v0) -/* 9959D0 802407E0 8FBF0014 */ lw $ra, 0x14($sp) -/* 9959D4 802407E4 8FB00010 */ lw $s0, 0x10($sp) -/* 9959D8 802407E8 0000102D */ daddu $v0, $zero, $zero -/* 9959DC 802407EC 03E00008 */ jr $ra -/* 9959E0 802407F0 27BD0018 */ addiu $sp, $sp, 0x18 -/* 9959E4 802407F4 00000000 */ nop -/* 9959E8 802407F8 00000000 */ nop -/* 9959EC 802407FC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_80240330_C7E4B0.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_80240330_C7E4B0.s deleted file mode 100644 index 0011ce531f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_80240330_C7E4B0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240330_C7E4B0 -/* C7E4B0 80240330 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C7E4B4 80240334 AFBF0010 */ sw $ra, 0x10($sp) -/* C7E4B8 80240338 0C03A8CD */ jal subtract_hp -/* C7E4BC 8024033C 24040001 */ addiu $a0, $zero, 1 -/* C7E4C0 80240340 8FBF0010 */ lw $ra, 0x10($sp) -/* C7E4C4 80240344 24020002 */ addiu $v0, $zero, 2 -/* C7E4C8 80240348 03E00008 */ jr $ra -/* C7E4CC 8024034C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_8024037C_C7E4FC.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_8024037C_C7E4FC.s deleted file mode 100644 index ece8c4a415..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_8024037C_C7E4FC.s +++ /dev/null @@ -1,43 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024037C_C7E4FC -/* C7E4FC 8024037C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C7E500 80240380 AFB00028 */ sw $s0, 0x28($sp) -/* C7E504 80240384 0080802D */ daddu $s0, $a0, $zero -/* C7E508 80240388 AFBF002C */ sw $ra, 0x2c($sp) -/* C7E50C 8024038C C6000084 */ lwc1 $f0, 0x84($s0) -/* C7E510 80240390 46800020 */ cvt.s.w $f0, $f0 -/* C7E514 80240394 E7A00018 */ swc1 $f0, 0x18($sp) -/* C7E518 80240398 C600008C */ lwc1 $f0, 0x8c($s0) -/* C7E51C 8024039C 46800020 */ cvt.s.w $f0, $f0 -/* C7E520 802403A0 27A20024 */ addiu $v0, $sp, 0x24 -/* C7E524 802403A4 3C040001 */ lui $a0, 1 -/* C7E528 802403A8 27A50018 */ addiu $a1, $sp, 0x18 -/* C7E52C 802403AC 27A6001C */ addiu $a2, $sp, 0x1c -/* C7E530 802403B0 3C0144FA */ lui $at, 0x44fa -/* C7E534 802403B4 44811000 */ mtc1 $at, $f2 -/* C7E538 802403B8 27A70020 */ addiu $a3, $sp, 0x20 -/* C7E53C 802403BC E7A0001C */ swc1 $f0, 0x1c($sp) -/* C7E540 802403C0 AFA00020 */ sw $zero, 0x20($sp) -/* C7E544 802403C4 E7A20024 */ swc1 $f2, 0x24($sp) -/* C7E548 802403C8 0C0372DF */ jal npc_raycast_down_sides -/* C7E54C 802403CC AFA20010 */ sw $v0, 0x10($sp) -/* C7E550 802403D0 1040000B */ beqz $v0, .L80240400 -/* C7E554 802403D4 00000000 */ nop -/* C7E558 802403D8 C7A2001C */ lwc1 $f2, 0x1c($sp) -/* C7E55C 802403DC 3C01425C */ lui $at, 0x425c -/* C7E560 802403E0 44810000 */ mtc1 $at, $f0 -/* C7E564 802403E4 00000000 */ nop -/* C7E568 802403E8 46001080 */ add.s $f2, $f2, $f0 -/* C7E56C 802403EC C7A00018 */ lwc1 $f0, 0x18($sp) -/* C7E570 802403F0 4600010D */ trunc.w.s $f4, $f0 -/* C7E574 802403F4 E6040084 */ swc1 $f4, 0x84($s0) -/* C7E578 802403F8 4600110D */ trunc.w.s $f4, $f2 -/* C7E57C 802403FC E604008C */ swc1 $f4, 0x8c($s0) -.L80240400: -/* C7E580 80240400 8FBF002C */ lw $ra, 0x2c($sp) -/* C7E584 80240404 8FB00028 */ lw $s0, 0x28($sp) -/* C7E588 80240408 24020002 */ addiu $v0, $zero, 2 -/* C7E58C 8024040C 03E00008 */ jr $ra -/* C7E590 80240410 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_80240414_C7E594.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_80240414_C7E594.s deleted file mode 100644 index 6a549a9712..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_80240414_C7E594.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240414_C7E594 -/* C7E594 80240414 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C7E598 80240418 AFB00010 */ sw $s0, 0x10($sp) -/* C7E59C 8024041C 0080802D */ daddu $s0, $a0, $zero -/* C7E5A0 80240420 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* C7E5A4 80240424 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* C7E5A8 80240428 AFBF0014 */ sw $ra, 0x14($sp) -/* C7E5AC 8024042C C4400028 */ lwc1 $f0, 0x28($v0) -/* C7E5B0 80240430 C6020084 */ lwc1 $f2, 0x84($s0) -/* C7E5B4 80240434 468010A0 */ cvt.s.w $f2, $f2 -/* C7E5B8 80240438 46001081 */ sub.s $f2, $f2, $f0 -/* C7E5BC 8024043C 46021082 */ mul.s $f2, $f2, $f2 -/* C7E5C0 80240440 00000000 */ nop -/* C7E5C4 80240444 C440002C */ lwc1 $f0, 0x2c($v0) -/* C7E5C8 80240448 C604008C */ lwc1 $f4, 0x8c($s0) -/* C7E5CC 8024044C 46802120 */ cvt.s.w $f4, $f4 -/* C7E5D0 80240450 46002101 */ sub.s $f4, $f4, $f0 -/* C7E5D4 80240454 46042102 */ mul.s $f4, $f4, $f4 -/* C7E5D8 80240458 00000000 */ nop -/* C7E5DC 8024045C C4460030 */ lwc1 $f6, 0x30($v0) -/* C7E5E0 80240460 44800000 */ mtc1 $zero, $f0 -/* C7E5E4 80240464 00000000 */ nop -/* C7E5E8 80240468 46060001 */ sub.s $f0, $f0, $f6 -/* C7E5EC 8024046C 46000002 */ mul.s $f0, $f0, $f0 -/* C7E5F0 80240470 00000000 */ nop -/* C7E5F4 80240474 46041080 */ add.s $f2, $f2, $f4 -/* C7E5F8 80240478 46001300 */ add.s $f12, $f2, $f0 -/* C7E5FC 8024047C 46006004 */ sqrt.s $f0, $f12 -/* C7E600 80240480 46000032 */ c.eq.s $f0, $f0 -/* C7E604 80240484 00000000 */ nop -/* C7E608 80240488 45010003 */ bc1t .L80240498 -/* C7E60C 8024048C 00000000 */ nop -/* C7E610 80240490 0C0187BC */ jal sqrtf -/* C7E614 80240494 00000000 */ nop -.L80240498: -/* C7E618 80240498 4600020D */ trunc.w.s $f8, $f0 -/* C7E61C 8024049C E6080094 */ swc1 $f8, 0x94($s0) -/* C7E620 802404A0 8FBF0014 */ lw $ra, 0x14($sp) -/* C7E624 802404A4 8FB00010 */ lw $s0, 0x10($sp) -/* C7E628 802404A8 24020002 */ addiu $v0, $zero, 2 -/* C7E62C 802404AC 03E00008 */ jr $ra -/* C7E630 802404B0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_802404B4_C7E634.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_802404B4_C7E634.s deleted file mode 100644 index 2326b6acea..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_802404B4_C7E634.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404B4_C7E634 -/* C7E634 802404B4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C7E638 802404B8 AFBF0010 */ sw $ra, 0x10($sp) -/* C7E63C 802404BC 8C82000C */ lw $v0, 0xc($a0) -/* C7E640 802404C0 0C0B1EAF */ jal evt_get_variable -/* C7E644 802404C4 8C450000 */ lw $a1, ($v0) -/* C7E648 802404C8 44820000 */ mtc1 $v0, $f0 -/* C7E64C 802404CC 00000000 */ nop -/* C7E650 802404D0 46800020 */ cvt.s.w $f0, $f0 -/* C7E654 802404D4 8FBF0010 */ lw $ra, 0x10($sp) -/* C7E658 802404D8 24020002 */ addiu $v0, $zero, 2 -/* C7E65C 802404DC 3C018011 */ lui $at, %hi(gPlayerStatus+0x8C) -/* C7E660 802404E0 E420F054 */ swc1 $f0, %lo(gPlayerStatus+0x8C)($at) -/* C7E664 802404E4 03E00008 */ jr $ra -/* C7E668 802404E8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_802404EC_C7E66C.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_802404EC_C7E66C.s deleted file mode 100644 index 842e2e9e88..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_802404EC_C7E66C.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80242000_C80180 -.double 35.0 - -glabel D_80242008_C80188 -.double 2.3 - -.section .text - -glabel func_802404EC_C7E66C -/* C7E66C 802404EC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C7E670 802404F0 AFB00010 */ sw $s0, 0x10($sp) -/* C7E674 802404F4 0080802D */ daddu $s0, $a0, $zero -/* C7E678 802404F8 AFBF0014 */ sw $ra, 0x14($sp) -/* C7E67C 802404FC F7B40018 */ sdc1 $f20, 0x18($sp) -/* C7E680 80240500 C60C0090 */ lwc1 $f12, 0x90($s0) -/* C7E684 80240504 46806320 */ cvt.s.w $f12, $f12 -/* C7E688 80240508 3C018024 */ lui $at, %hi(D_80242000_C80180) -/* C7E68C 8024050C D4342000 */ ldc1 $f20, %lo(D_80242000_C80180)($at) -/* C7E690 80240510 46006307 */ neg.s $f12, $f12 -/* C7E694 80240514 46006321 */ cvt.d.s $f12, $f12 -/* C7E698 80240518 46346301 */ sub.d $f12, $f12, $f20 -/* C7E69C 8024051C 0C00A8D4 */ jal cos_deg -/* C7E6A0 80240520 46206320 */ cvt.s.d $f12, $f12 -/* C7E6A4 80240524 3C014008 */ lui $at, 0x4008 -/* C7E6A8 80240528 44811800 */ mtc1 $at, $f3 -/* C7E6AC 8024052C 44801000 */ mtc1 $zero, $f2 -/* C7E6B0 80240530 46000021 */ cvt.d.s $f0, $f0 -/* C7E6B4 80240534 46220002 */ mul.d $f0, $f0, $f2 -/* C7E6B8 80240538 00000000 */ nop -/* C7E6BC 8024053C C60C0090 */ lwc1 $f12, 0x90($s0) -/* C7E6C0 80240540 46806320 */ cvt.s.w $f12, $f12 -/* C7E6C4 80240544 46006307 */ neg.s $f12, $f12 -/* C7E6C8 80240548 46006321 */ cvt.d.s $f12, $f12 -/* C7E6CC 8024054C 46346301 */ sub.d $f12, $f12, $f20 -/* C7E6D0 80240550 3C018024 */ lui $at, %hi(D_80242008_C80188) -/* C7E6D4 80240554 D4222008 */ ldc1 $f2, %lo(D_80242008_C80188)($at) -/* C7E6D8 80240558 46220001 */ sub.d $f0, $f0, $f2 -/* C7E6DC 8024055C 4620010D */ trunc.w.d $f4, $f0 -/* C7E6E0 80240560 E6040098 */ swc1 $f4, 0x98($s0) -/* C7E6E4 80240564 0C00A8BB */ jal sin_deg -/* C7E6E8 80240568 46206320 */ cvt.s.d $f12, $f12 -/* C7E6EC 8024056C 3C014014 */ lui $at, 0x4014 -/* C7E6F0 80240570 44811800 */ mtc1 $at, $f3 -/* C7E6F4 80240574 44801000 */ mtc1 $zero, $f2 -/* C7E6F8 80240578 46000021 */ cvt.d.s $f0, $f0 -/* C7E6FC 8024057C 46220002 */ mul.d $f0, $f0, $f2 -/* C7E700 80240580 00000000 */ nop -/* C7E704 80240584 4620010D */ trunc.w.d $f4, $f0 -/* C7E708 80240588 E604009C */ swc1 $f4, 0x9c($s0) -/* C7E70C 8024058C 8FBF0014 */ lw $ra, 0x14($sp) -/* C7E710 80240590 8FB00010 */ lw $s0, 0x10($sp) -/* C7E714 80240594 D7B40018 */ ldc1 $f20, 0x18($sp) -/* C7E718 80240598 24020002 */ addiu $v0, $zero, 2 -/* C7E71C 8024059C 03E00008 */ jr $ra -/* C7E720 802405A0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_802405A4_C7E724.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_802405A4_C7E724.s deleted file mode 100644 index 1f6a94f078..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_802405A4_C7E724.s +++ /dev/null @@ -1,49 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80242010_C80190 -.double -469.0, 0.0 - -.section .text - -glabel func_802405A4_C7E724 -/* C7E724 802405A4 3C018024 */ lui $at, %hi(D_80242010_C80190) -/* C7E728 802405A8 D4222010 */ ldc1 $f2, %lo(D_80242010_C80190)($at) -/* C7E72C 802405AC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C7E730 802405B0 AFB00010 */ sw $s0, 0x10($sp) -/* C7E734 802405B4 0080802D */ daddu $s0, $a0, $zero -/* C7E738 802405B8 AFBF0014 */ sw $ra, 0x14($sp) -/* C7E73C 802405BC C6000084 */ lwc1 $f0, 0x84($s0) -/* C7E740 802405C0 46800021 */ cvt.d.w $f0, $f0 -/* C7E744 802405C4 46201081 */ sub.d $f2, $f2, $f0 -/* C7E748 802405C8 462010A0 */ cvt.s.d $f2, $f2 -/* C7E74C 802405CC 46021082 */ mul.s $f2, $f2, $f2 -/* C7E750 802405D0 00000000 */ nop -/* C7E754 802405D4 3C014047 */ lui $at, 0x4047 -/* C7E758 802405D8 44810800 */ mtc1 $at, $f1 -/* C7E75C 802405DC 44800000 */ mtc1 $zero, $f0 -/* C7E760 802405E0 C604008C */ lwc1 $f4, 0x8c($s0) -/* C7E764 802405E4 46802121 */ cvt.d.w $f4, $f4 -/* C7E768 802405E8 46240001 */ sub.d $f0, $f0, $f4 -/* C7E76C 802405EC 46200020 */ cvt.s.d $f0, $f0 -/* C7E770 802405F0 46000002 */ mul.s $f0, $f0, $f0 -/* C7E774 802405F4 00000000 */ nop -/* C7E778 802405F8 46001300 */ add.s $f12, $f2, $f0 -/* C7E77C 802405FC 46006004 */ sqrt.s $f0, $f12 -/* C7E780 80240600 46000032 */ c.eq.s $f0, $f0 -/* C7E784 80240604 00000000 */ nop -/* C7E788 80240608 45030004 */ bc1tl .L8024061C -/* C7E78C 8024060C 46000007 */ neg.s $f0, $f0 -/* C7E790 80240610 0C0187BC */ jal sqrtf -/* C7E794 80240614 00000000 */ nop -/* C7E798 80240618 46000007 */ neg.s $f0, $f0 -.L8024061C: -/* C7E79C 8024061C 4600018D */ trunc.w.s $f6, $f0 -/* C7E7A0 80240620 E6060090 */ swc1 $f6, 0x90($s0) -/* C7E7A4 80240624 8FBF0014 */ lw $ra, 0x14($sp) -/* C7E7A8 80240628 8FB00010 */ lw $s0, 0x10($sp) -/* C7E7AC 8024062C 24020002 */ addiu $v0, $zero, 2 -/* C7E7B0 80240630 03E00008 */ jr $ra -/* C7E7B4 80240634 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_80240638_C7E7B8.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_80240638_C7E7B8.s deleted file mode 100644 index e1fe69f632..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_80240638_C7E7B8.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240638_C7E7B8 -/* C7E7B8 80240638 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C7E7BC 8024063C AFB1001C */ sw $s1, 0x1c($sp) -/* C7E7C0 80240640 0080882D */ daddu $s1, $a0, $zero -/* C7E7C4 80240644 AFBF0020 */ sw $ra, 0x20($sp) -/* C7E7C8 80240648 AFB00018 */ sw $s0, 0x18($sp) -/* C7E7CC 8024064C 8E30000C */ lw $s0, 0xc($s1) -/* C7E7D0 80240650 8E050000 */ lw $a1, ($s0) -/* C7E7D4 80240654 0C0B1EAF */ jal evt_get_variable -/* C7E7D8 80240658 26100004 */ addiu $s0, $s0, 4 -/* C7E7DC 8024065C AE220070 */ sw $v0, 0x70($s1) -/* C7E7E0 80240660 8E050000 */ lw $a1, ($s0) -/* C7E7E4 80240664 26100004 */ addiu $s0, $s0, 4 -/* C7E7E8 80240668 0C0B1EAF */ jal evt_get_variable -/* C7E7EC 8024066C 0220202D */ daddu $a0, $s1, $zero -/* C7E7F0 80240670 AE220074 */ sw $v0, 0x74($s1) -/* C7E7F4 80240674 8E050000 */ lw $a1, ($s0) -/* C7E7F8 80240678 0C0B1EAF */ jal evt_get_variable -/* C7E7FC 8024067C 0220202D */ daddu $a0, $s1, $zero -/* C7E800 80240680 24040052 */ addiu $a0, $zero, 0x52 -/* C7E804 80240684 0000282D */ daddu $a1, $zero, $zero -/* C7E808 80240688 C6200070 */ lwc1 $f0, 0x70($s1) -/* C7E80C 8024068C 46800020 */ cvt.s.w $f0, $f0 -/* C7E810 80240690 C6220074 */ lwc1 $f2, 0x74($s1) -/* C7E814 80240694 468010A0 */ cvt.s.w $f2, $f2 -/* C7E818 80240698 44060000 */ mfc1 $a2, $f0 -/* C7E81C 8024069C 44071000 */ mfc1 $a3, $f2 -/* C7E820 802406A0 44820000 */ mtc1 $v0, $f0 -/* C7E824 802406A4 00000000 */ nop -/* C7E828 802406A8 46800020 */ cvt.s.w $f0, $f0 -/* C7E82C 802406AC AE220078 */ sw $v0, 0x78($s1) -/* C7E830 802406B0 0C05267B */ jal sfx_adjust_env_sound_pos -/* C7E834 802406B4 E7A00010 */ swc1 $f0, 0x10($sp) -/* C7E838 802406B8 8FBF0020 */ lw $ra, 0x20($sp) -/* C7E83C 802406BC 8FB1001C */ lw $s1, 0x1c($sp) -/* C7E840 802406C0 8FB00018 */ lw $s0, 0x18($sp) -/* C7E844 802406C4 24020002 */ addiu $v0, $zero, 2 -/* C7E848 802406C8 03E00008 */ jr $ra -/* C7E84C 802406CC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242D00_C887B0.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242D00_C887B0.s deleted file mode 100644 index 274e03d9e3..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242D00_C887B0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242D00_C887B0 -/* C887B0 80242D00 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C887B4 80242D04 AFBF0010 */ sw $ra, 0x10($sp) -/* C887B8 80242D08 0C03A8CD */ jal subtract_hp -/* C887BC 80242D0C 24040001 */ addiu $a0, $zero, 1 -/* C887C0 80242D10 8FBF0010 */ lw $ra, 0x10($sp) -/* C887C4 80242D14 24020002 */ addiu $v0, $zero, 2 -/* C887C8 80242D18 03E00008 */ jr $ra -/* C887CC 80242D1C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242D4C_C887FC.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242D4C_C887FC.s deleted file mode 100644 index a61aca6255..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242D4C_C887FC.s +++ /dev/null @@ -1,43 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242D4C_C887FC -/* C887FC 80242D4C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C88800 80242D50 AFB00028 */ sw $s0, 0x28($sp) -/* C88804 80242D54 0080802D */ daddu $s0, $a0, $zero -/* C88808 80242D58 AFBF002C */ sw $ra, 0x2c($sp) -/* C8880C 80242D5C C6000084 */ lwc1 $f0, 0x84($s0) -/* C88810 80242D60 46800020 */ cvt.s.w $f0, $f0 -/* C88814 80242D64 E7A00018 */ swc1 $f0, 0x18($sp) -/* C88818 80242D68 C600008C */ lwc1 $f0, 0x8c($s0) -/* C8881C 80242D6C 46800020 */ cvt.s.w $f0, $f0 -/* C88820 80242D70 27A20024 */ addiu $v0, $sp, 0x24 -/* C88824 80242D74 3C040001 */ lui $a0, 1 -/* C88828 80242D78 27A50018 */ addiu $a1, $sp, 0x18 -/* C8882C 80242D7C 27A6001C */ addiu $a2, $sp, 0x1c -/* C88830 80242D80 3C0144FA */ lui $at, 0x44fa -/* C88834 80242D84 44811000 */ mtc1 $at, $f2 -/* C88838 80242D88 27A70020 */ addiu $a3, $sp, 0x20 -/* C8883C 80242D8C E7A0001C */ swc1 $f0, 0x1c($sp) -/* C88840 80242D90 AFA00020 */ sw $zero, 0x20($sp) -/* C88844 80242D94 E7A20024 */ swc1 $f2, 0x24($sp) -/* C88848 80242D98 0C0372DF */ jal npc_raycast_down_sides -/* C8884C 80242D9C AFA20010 */ sw $v0, 0x10($sp) -/* C88850 80242DA0 1040000B */ beqz $v0, .L80242DD0 -/* C88854 80242DA4 00000000 */ nop -/* C88858 80242DA8 C7A2001C */ lwc1 $f2, 0x1c($sp) -/* C8885C 80242DAC 3C01425C */ lui $at, 0x425c -/* C88860 80242DB0 44810000 */ mtc1 $at, $f0 -/* C88864 80242DB4 00000000 */ nop -/* C88868 80242DB8 46001080 */ add.s $f2, $f2, $f0 -/* C8886C 80242DBC C7A00018 */ lwc1 $f0, 0x18($sp) -/* C88870 80242DC0 4600010D */ trunc.w.s $f4, $f0 -/* C88874 80242DC4 E6040084 */ swc1 $f4, 0x84($s0) -/* C88878 80242DC8 4600110D */ trunc.w.s $f4, $f2 -/* C8887C 80242DCC E604008C */ swc1 $f4, 0x8c($s0) -.L80242DD0: -/* C88880 80242DD0 8FBF002C */ lw $ra, 0x2c($sp) -/* C88884 80242DD4 8FB00028 */ lw $s0, 0x28($sp) -/* C88888 80242DD8 24020002 */ addiu $v0, $zero, 2 -/* C8888C 80242DDC 03E00008 */ jr $ra -/* C88890 80242DE0 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242DE4_C88894.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242DE4_C88894.s deleted file mode 100644 index ebd04f4aed..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242DE4_C88894.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242DE4_C88894 -/* C88894 80242DE4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C88898 80242DE8 AFB00010 */ sw $s0, 0x10($sp) -/* C8889C 80242DEC 0080802D */ daddu $s0, $a0, $zero -/* C888A0 80242DF0 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* C888A4 80242DF4 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* C888A8 80242DF8 AFBF0014 */ sw $ra, 0x14($sp) -/* C888AC 80242DFC C4400028 */ lwc1 $f0, 0x28($v0) -/* C888B0 80242E00 C6020084 */ lwc1 $f2, 0x84($s0) -/* C888B4 80242E04 468010A0 */ cvt.s.w $f2, $f2 -/* C888B8 80242E08 46001081 */ sub.s $f2, $f2, $f0 -/* C888BC 80242E0C 46021082 */ mul.s $f2, $f2, $f2 -/* C888C0 80242E10 00000000 */ nop -/* C888C4 80242E14 C440002C */ lwc1 $f0, 0x2c($v0) -/* C888C8 80242E18 C604008C */ lwc1 $f4, 0x8c($s0) -/* C888CC 80242E1C 46802120 */ cvt.s.w $f4, $f4 -/* C888D0 80242E20 46002101 */ sub.s $f4, $f4, $f0 -/* C888D4 80242E24 46042102 */ mul.s $f4, $f4, $f4 -/* C888D8 80242E28 00000000 */ nop -/* C888DC 80242E2C C4460030 */ lwc1 $f6, 0x30($v0) -/* C888E0 80242E30 44800000 */ mtc1 $zero, $f0 -/* C888E4 80242E34 00000000 */ nop -/* C888E8 80242E38 46060001 */ sub.s $f0, $f0, $f6 -/* C888EC 80242E3C 46000002 */ mul.s $f0, $f0, $f0 -/* C888F0 80242E40 00000000 */ nop -/* C888F4 80242E44 46041080 */ add.s $f2, $f2, $f4 -/* C888F8 80242E48 46001300 */ add.s $f12, $f2, $f0 -/* C888FC 80242E4C 46006004 */ sqrt.s $f0, $f12 -/* C88900 80242E50 46000032 */ c.eq.s $f0, $f0 -/* C88904 80242E54 00000000 */ nop -/* C88908 80242E58 45010003 */ bc1t .L80242E68 -/* C8890C 80242E5C 00000000 */ nop -/* C88910 80242E60 0C0187BC */ jal sqrtf -/* C88914 80242E64 00000000 */ nop -.L80242E68: -/* C88918 80242E68 4600020D */ trunc.w.s $f8, $f0 -/* C8891C 80242E6C E6080094 */ swc1 $f8, 0x94($s0) -/* C88920 80242E70 8FBF0014 */ lw $ra, 0x14($sp) -/* C88924 80242E74 8FB00010 */ lw $s0, 0x10($sp) -/* C88928 80242E78 24020002 */ addiu $v0, $zero, 2 -/* C8892C 80242E7C 03E00008 */ jr $ra -/* C88930 80242E80 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242E84_C88934.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242E84_C88934.s deleted file mode 100644 index fcf5837f64..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242E84_C88934.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242E84_C88934 -/* C88934 80242E84 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C88938 80242E88 AFBF0010 */ sw $ra, 0x10($sp) -/* C8893C 80242E8C 8C82000C */ lw $v0, 0xc($a0) -/* C88940 80242E90 0C0B1EAF */ jal evt_get_variable -/* C88944 80242E94 8C450000 */ lw $a1, ($v0) -/* C88948 80242E98 44820000 */ mtc1 $v0, $f0 -/* C8894C 80242E9C 00000000 */ nop -/* C88950 80242EA0 46800020 */ cvt.s.w $f0, $f0 -/* C88954 80242EA4 8FBF0010 */ lw $ra, 0x10($sp) -/* C88958 80242EA8 24020002 */ addiu $v0, $zero, 2 -/* C8895C 80242EAC 3C018011 */ lui $at, %hi(gPlayerStatus+0x8C) -/* C88960 80242EB0 E420F054 */ swc1 $f0, %lo(gPlayerStatus+0x8C)($at) -/* C88964 80242EB4 03E00008 */ jr $ra -/* C88968 80242EB8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242EBC_C8896C.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242EBC_C8896C.s deleted file mode 100644 index bae8cdb18f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242EBC_C8896C.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_802465D0_C8C080 -.double 35.0 - -glabel D_802465D8_C8C088 -.double 2.3 - -.section .text - -glabel func_80242EBC_C8896C -/* C8896C 80242EBC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C88970 80242EC0 AFB00010 */ sw $s0, 0x10($sp) -/* C88974 80242EC4 0080802D */ daddu $s0, $a0, $zero -/* C88978 80242EC8 AFBF0014 */ sw $ra, 0x14($sp) -/* C8897C 80242ECC F7B40018 */ sdc1 $f20, 0x18($sp) -/* C88980 80242ED0 C60C0090 */ lwc1 $f12, 0x90($s0) -/* C88984 80242ED4 46806320 */ cvt.s.w $f12, $f12 -/* C88988 80242ED8 3C018024 */ lui $at, %hi(D_802465D0_C8C080) -/* C8898C 80242EDC D43465D0 */ ldc1 $f20, %lo(D_802465D0_C8C080)($at) -/* C88990 80242EE0 46006307 */ neg.s $f12, $f12 -/* C88994 80242EE4 46006321 */ cvt.d.s $f12, $f12 -/* C88998 80242EE8 46346301 */ sub.d $f12, $f12, $f20 -/* C8899C 80242EEC 0C00A8D4 */ jal cos_deg -/* C889A0 80242EF0 46206320 */ cvt.s.d $f12, $f12 -/* C889A4 80242EF4 3C014008 */ lui $at, 0x4008 -/* C889A8 80242EF8 44811800 */ mtc1 $at, $f3 -/* C889AC 80242EFC 44801000 */ mtc1 $zero, $f2 -/* C889B0 80242F00 46000021 */ cvt.d.s $f0, $f0 -/* C889B4 80242F04 46220002 */ mul.d $f0, $f0, $f2 -/* C889B8 80242F08 00000000 */ nop -/* C889BC 80242F0C C60C0090 */ lwc1 $f12, 0x90($s0) -/* C889C0 80242F10 46806320 */ cvt.s.w $f12, $f12 -/* C889C4 80242F14 46006307 */ neg.s $f12, $f12 -/* C889C8 80242F18 46006321 */ cvt.d.s $f12, $f12 -/* C889CC 80242F1C 46346301 */ sub.d $f12, $f12, $f20 -/* C889D0 80242F20 3C018024 */ lui $at, %hi(D_802465D8_C8C088) -/* C889D4 80242F24 D42265D8 */ ldc1 $f2, %lo(D_802465D8_C8C088)($at) -/* C889D8 80242F28 46220001 */ sub.d $f0, $f0, $f2 -/* C889DC 80242F2C 4620010D */ trunc.w.d $f4, $f0 -/* C889E0 80242F30 E6040098 */ swc1 $f4, 0x98($s0) -/* C889E4 80242F34 0C00A8BB */ jal sin_deg -/* C889E8 80242F38 46206320 */ cvt.s.d $f12, $f12 -/* C889EC 80242F3C 3C014014 */ lui $at, 0x4014 -/* C889F0 80242F40 44811800 */ mtc1 $at, $f3 -/* C889F4 80242F44 44801000 */ mtc1 $zero, $f2 -/* C889F8 80242F48 46000021 */ cvt.d.s $f0, $f0 -/* C889FC 80242F4C 46220002 */ mul.d $f0, $f0, $f2 -/* C88A00 80242F50 00000000 */ nop -/* C88A04 80242F54 4620010D */ trunc.w.d $f4, $f0 -/* C88A08 80242F58 E604009C */ swc1 $f4, 0x9c($s0) -/* C88A0C 80242F5C 8FBF0014 */ lw $ra, 0x14($sp) -/* C88A10 80242F60 8FB00010 */ lw $s0, 0x10($sp) -/* C88A14 80242F64 D7B40018 */ ldc1 $f20, 0x18($sp) -/* C88A18 80242F68 24020002 */ addiu $v0, $zero, 2 -/* C88A1C 80242F6C 03E00008 */ jr $ra -/* C88A20 80242F70 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242F74_C88A24.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242F74_C88A24.s deleted file mode 100644 index 305a5b73e2..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242F74_C88A24.s +++ /dev/null @@ -1,51 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_802465E0_C8C090 -.double -583.0 - -glabel D_802465E8_C8C098 -.double 165.0 - -.section .text - -glabel func_80242F74_C88A24 -/* C88A24 80242F74 3C018024 */ lui $at, %hi(D_802465E0_C8C090) -/* C88A28 80242F78 D42265E0 */ ldc1 $f2, %lo(D_802465E0_C8C090)($at) -/* C88A2C 80242F7C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C88A30 80242F80 AFB00010 */ sw $s0, 0x10($sp) -/* C88A34 80242F84 0080802D */ daddu $s0, $a0, $zero -/* C88A38 80242F88 AFBF0014 */ sw $ra, 0x14($sp) -/* C88A3C 80242F8C C6000084 */ lwc1 $f0, 0x84($s0) -/* C88A40 80242F90 46800021 */ cvt.d.w $f0, $f0 -/* C88A44 80242F94 46201081 */ sub.d $f2, $f2, $f0 -/* C88A48 80242F98 462010A0 */ cvt.s.d $f2, $f2 -/* C88A4C 80242F9C 46021082 */ mul.s $f2, $f2, $f2 -/* C88A50 80242FA0 00000000 */ nop -/* C88A54 80242FA4 3C018024 */ lui $at, %hi(D_802465E8_C8C098) -/* C88A58 80242FA8 D42065E8 */ ldc1 $f0, %lo(D_802465E8_C8C098)($at) -/* C88A5C 80242FAC C604008C */ lwc1 $f4, 0x8c($s0) -/* C88A60 80242FB0 46802121 */ cvt.d.w $f4, $f4 -/* C88A64 80242FB4 46240001 */ sub.d $f0, $f0, $f4 -/* C88A68 80242FB8 46200020 */ cvt.s.d $f0, $f0 -/* C88A6C 80242FBC 46000002 */ mul.s $f0, $f0, $f0 -/* C88A70 80242FC0 00000000 */ nop -/* C88A74 80242FC4 46001300 */ add.s $f12, $f2, $f0 -/* C88A78 80242FC8 46006004 */ sqrt.s $f0, $f12 -/* C88A7C 80242FCC 46000032 */ c.eq.s $f0, $f0 -/* C88A80 80242FD0 00000000 */ nop -/* C88A84 80242FD4 45030004 */ bc1tl .L80242FE8 -/* C88A88 80242FD8 46000007 */ neg.s $f0, $f0 -/* C88A8C 80242FDC 0C0187BC */ jal sqrtf -/* C88A90 80242FE0 00000000 */ nop -/* C88A94 80242FE4 46000007 */ neg.s $f0, $f0 -.L80242FE8: -/* C88A98 80242FE8 4600018D */ trunc.w.s $f6, $f0 -/* C88A9C 80242FEC E6060090 */ swc1 $f6, 0x90($s0) -/* C88AA0 80242FF0 8FBF0014 */ lw $ra, 0x14($sp) -/* C88AA4 80242FF4 8FB00010 */ lw $s0, 0x10($sp) -/* C88AA8 80242FF8 24020002 */ addiu $v0, $zero, 2 -/* C88AAC 80242FFC 03E00008 */ jr $ra -/* C88AB0 80243000 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80243004_C88AB4.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80243004_C88AB4.s deleted file mode 100644 index 05e051d1b2..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80243004_C88AB4.s +++ /dev/null @@ -1,43 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243004_C88AB4 -/* C88AB4 80243004 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C88AB8 80243008 AFB1001C */ sw $s1, 0x1c($sp) -/* C88ABC 8024300C 0080882D */ daddu $s1, $a0, $zero -/* C88AC0 80243010 AFBF0020 */ sw $ra, 0x20($sp) -/* C88AC4 80243014 AFB00018 */ sw $s0, 0x18($sp) -/* C88AC8 80243018 8E30000C */ lw $s0, 0xc($s1) -/* C88ACC 8024301C 8E050000 */ lw $a1, ($s0) -/* C88AD0 80243020 0C0B1EAF */ jal evt_get_variable -/* C88AD4 80243024 26100004 */ addiu $s0, $s0, 4 -/* C88AD8 80243028 AE220070 */ sw $v0, 0x70($s1) -/* C88ADC 8024302C 8E050000 */ lw $a1, ($s0) -/* C88AE0 80243030 26100004 */ addiu $s0, $s0, 4 -/* C88AE4 80243034 0C0B1EAF */ jal evt_get_variable -/* C88AE8 80243038 0220202D */ daddu $a0, $s1, $zero -/* C88AEC 8024303C AE220074 */ sw $v0, 0x74($s1) -/* C88AF0 80243040 8E050000 */ lw $a1, ($s0) -/* C88AF4 80243044 0C0B1EAF */ jal evt_get_variable -/* C88AF8 80243048 0220202D */ daddu $a0, $s1, $zero -/* C88AFC 8024304C 24040052 */ addiu $a0, $zero, 0x52 -/* C88B00 80243050 0000282D */ daddu $a1, $zero, $zero -/* C88B04 80243054 C6200070 */ lwc1 $f0, 0x70($s1) -/* C88B08 80243058 46800020 */ cvt.s.w $f0, $f0 -/* C88B0C 8024305C C6220074 */ lwc1 $f2, 0x74($s1) -/* C88B10 80243060 468010A0 */ cvt.s.w $f2, $f2 -/* C88B14 80243064 44060000 */ mfc1 $a2, $f0 -/* C88B18 80243068 44071000 */ mfc1 $a3, $f2 -/* C88B1C 8024306C 44820000 */ mtc1 $v0, $f0 -/* C88B20 80243070 00000000 */ nop -/* C88B24 80243074 46800020 */ cvt.s.w $f0, $f0 -/* C88B28 80243078 AE220078 */ sw $v0, 0x78($s1) -/* C88B2C 8024307C 0C05267B */ jal sfx_adjust_env_sound_pos -/* C88B30 80243080 E7A00010 */ swc1 $f0, 0x10($sp) -/* C88B34 80243084 8FBF0020 */ lw $ra, 0x20($sp) -/* C88B38 80243088 8FB1001C */ lw $s1, 0x1c($sp) -/* C88B3C 8024308C 8FB00018 */ lw $s0, 0x18($sp) -/* C88B40 80243090 24020002 */ addiu $v0, $zero, 2 -/* C88B44 80243094 03E00008 */ jr $ra -/* C88B48 80243098 27BD0028 */ addiu $sp, $sp, 0x28 -/* C88B4C 8024309C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_8024030C_C8DEBC.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_8024030C_C8DEBC.s deleted file mode 100644 index 58e08485f8..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_8024030C_C8DEBC.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024030C_C8DEBC -/* C8DEBC 8024030C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C8DEC0 80240310 AFBF001C */ sw $ra, 0x1c($sp) -/* C8DEC4 80240314 AFB00018 */ sw $s0, 0x18($sp) -/* C8DEC8 80240318 8C900084 */ lw $s0, 0x84($a0) -/* C8DECC 8024031C C6000008 */ lwc1 $f0, 8($s0) -/* C8DED0 80240320 240400A2 */ addiu $a0, $zero, 0xa2 -/* C8DED4 80240324 E7A00010 */ swc1 $f0, 0x10($sp) -/* C8DED8 80240328 8E060000 */ lw $a2, ($s0) -/* C8DEDC 8024032C 8E070004 */ lw $a3, 4($s0) -/* C8DEE0 80240330 0C05267B */ jal sfx_adjust_env_sound_pos -/* C8DEE4 80240334 0000282D */ daddu $a1, $zero, $zero -/* C8DEE8 80240338 86020044 */ lh $v0, 0x44($s0) -/* C8DEEC 8024033C 8FBF001C */ lw $ra, 0x1c($sp) -/* C8DEF0 80240340 8FB00018 */ lw $s0, 0x18($sp) -/* C8DEF4 80240344 28420002 */ slti $v0, $v0, 2 -/* C8DEF8 80240348 38420001 */ xori $v0, $v0, 1 -/* C8DEFC 8024034C 00021040 */ sll $v0, $v0, 1 -/* C8DF00 80240350 03E00008 */ jr $ra -/* C8DF04 80240354 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240358_C8DF08.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240358_C8DF08.s deleted file mode 100644 index 14ce9be7ed..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240358_C8DF08.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240358_C8DF08 -/* C8DF08 80240358 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C8DF0C 8024035C AFB20020 */ sw $s2, 0x20($sp) -/* C8DF10 80240360 0080902D */ daddu $s2, $a0, $zero -/* C8DF14 80240364 AFBF0024 */ sw $ra, 0x24($sp) -/* C8DF18 80240368 AFB1001C */ sw $s1, 0x1c($sp) -/* C8DF1C 8024036C AFB00018 */ sw $s0, 0x18($sp) -/* C8DF20 80240370 10A0004A */ beqz $a1, .L8024049C -/* C8DF24 80240374 8E51000C */ lw $s1, 0xc($s2) -/* C8DF28 80240378 0C00AB39 */ jal heap_malloc -/* C8DF2C 8024037C 24040058 */ addiu $a0, $zero, 0x58 -/* C8DF30 80240380 0000202D */ daddu $a0, $zero, $zero -/* C8DF34 80240384 3C05FD05 */ lui $a1, 0xfd05 -/* C8DF38 80240388 34A50F81 */ ori $a1, $a1, 0xf81 -/* C8DF3C 8024038C 0040802D */ daddu $s0, $v0, $zero -/* C8DF40 80240390 0200302D */ daddu $a2, $s0, $zero -/* C8DF44 80240394 0C0B2026 */ jal evt_set_variable -/* C8DF48 80240398 AE500084 */ sw $s0, 0x84($s2) -/* C8DF4C 8024039C 8E250000 */ lw $a1, ($s1) -/* C8DF50 802403A0 26310004 */ addiu $s1, $s1, 4 -/* C8DF54 802403A4 0C0B1EAF */ jal evt_get_variable -/* C8DF58 802403A8 0240202D */ daddu $a0, $s2, $zero -/* C8DF5C 802403AC AE020038 */ sw $v0, 0x38($s0) -/* C8DF60 802403B0 8E250000 */ lw $a1, ($s1) -/* C8DF64 802403B4 26310004 */ addiu $s1, $s1, 4 -/* C8DF68 802403B8 0C0B1EAF */ jal evt_get_variable -/* C8DF6C 802403BC 0240202D */ daddu $a0, $s2, $zero -/* C8DF70 802403C0 AE02003C */ sw $v0, 0x3c($s0) -/* C8DF74 802403C4 8E250000 */ lw $a1, ($s1) -/* C8DF78 802403C8 26310004 */ addiu $s1, $s1, 4 -/* C8DF7C 802403CC 0C0B210B */ jal evt_get_float_variable -/* C8DF80 802403D0 0240202D */ daddu $a0, $s2, $zero -/* C8DF84 802403D4 E600000C */ swc1 $f0, 0xc($s0) -/* C8DF88 802403D8 8E250000 */ lw $a1, ($s1) -/* C8DF8C 802403DC 26310004 */ addiu $s1, $s1, 4 -/* C8DF90 802403E0 0C0B210B */ jal evt_get_float_variable -/* C8DF94 802403E4 0240202D */ daddu $a0, $s2, $zero -/* C8DF98 802403E8 E6000010 */ swc1 $f0, 0x10($s0) -/* C8DF9C 802403EC 8E250000 */ lw $a1, ($s1) -/* C8DFA0 802403F0 26310004 */ addiu $s1, $s1, 4 -/* C8DFA4 802403F4 0C0B210B */ jal evt_get_float_variable -/* C8DFA8 802403F8 0240202D */ daddu $a0, $s2, $zero -/* C8DFAC 802403FC E6000014 */ swc1 $f0, 0x14($s0) -/* C8DFB0 80240400 8E250000 */ lw $a1, ($s1) -/* C8DFB4 80240404 26310004 */ addiu $s1, $s1, 4 -/* C8DFB8 80240408 0C0B210B */ jal evt_get_float_variable -/* C8DFBC 8024040C 0240202D */ daddu $a0, $s2, $zero -/* C8DFC0 80240410 E6000018 */ swc1 $f0, 0x18($s0) -/* C8DFC4 80240414 8E250000 */ lw $a1, ($s1) -/* C8DFC8 80240418 26310004 */ addiu $s1, $s1, 4 -/* C8DFCC 8024041C 0C0B210B */ jal evt_get_float_variable -/* C8DFD0 80240420 0240202D */ daddu $a0, $s2, $zero -/* C8DFD4 80240424 E600001C */ swc1 $f0, 0x1c($s0) -/* C8DFD8 80240428 8E250000 */ lw $a1, ($s1) -/* C8DFDC 8024042C 26310004 */ addiu $s1, $s1, 4 -/* C8DFE0 80240430 0C0B210B */ jal evt_get_float_variable -/* C8DFE4 80240434 0240202D */ daddu $a0, $s2, $zero -/* C8DFE8 80240438 E6000020 */ swc1 $f0, 0x20($s0) -/* C8DFEC 8024043C 8E250000 */ lw $a1, ($s1) -/* C8DFF0 80240440 26310004 */ addiu $s1, $s1, 4 -/* C8DFF4 80240444 0C0B210B */ jal evt_get_float_variable -/* C8DFF8 80240448 0240202D */ daddu $a0, $s2, $zero -/* C8DFFC 8024044C E6000024 */ swc1 $f0, 0x24($s0) -/* C8E000 80240450 8E250000 */ lw $a1, ($s1) -/* C8E004 80240454 0C0B210B */ jal evt_get_float_variable -/* C8E008 80240458 0240202D */ daddu $a0, $s2, $zero -/* C8E00C 8024045C 3C013F80 */ lui $at, 0x3f80 -/* C8E010 80240460 44811000 */ mtc1 $at, $f2 -/* C8E014 80240464 E6000028 */ swc1 $f0, 0x28($s0) -/* C8E018 80240468 AFA00014 */ sw $zero, 0x14($sp) -/* C8E01C 8024046C E7A20010 */ swc1 $f2, 0x10($sp) -/* C8E020 80240470 8E05000C */ lw $a1, 0xc($s0) -/* C8E024 80240474 8E060010 */ lw $a2, 0x10($s0) -/* C8E028 80240478 8E070014 */ lw $a3, 0x14($s0) -/* C8E02C 8024047C 0C01CA6C */ jal playFX_83 -/* C8E030 80240480 24040002 */ addiu $a0, $zero, 2 -/* C8E034 80240484 AE020050 */ sw $v0, 0x50($s0) -/* C8E038 80240488 A600004E */ sh $zero, 0x4e($s0) -/* C8E03C 8024048C A6000048 */ sh $zero, 0x48($s0) -/* C8E040 80240490 A600004A */ sh $zero, 0x4a($s0) -/* C8E044 80240494 A6000044 */ sh $zero, 0x44($s0) -/* C8E048 80240498 A6000046 */ sh $zero, 0x46($s0) -.L8024049C: -/* C8E04C 8024049C 8FBF0024 */ lw $ra, 0x24($sp) -/* C8E050 802404A0 8FB20020 */ lw $s2, 0x20($sp) -/* C8E054 802404A4 8FB1001C */ lw $s1, 0x1c($sp) -/* C8E058 802404A8 8FB00018 */ lw $s0, 0x18($sp) -/* C8E05C 802404AC 24020002 */ addiu $v0, $zero, 2 -/* C8E060 802404B0 03E00008 */ jr $ra -/* C8E064 802404B4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802404B8_C8E068.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802404B8_C8E068.s deleted file mode 100644 index 7e754a2bb4..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802404B8_C8E068.s +++ /dev/null @@ -1,283 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel jtbl_80248340_C95EF0 -.word L802404F8_C8E0A8, L802405B8_C8E168, L80240600_C8E1B0, L802406A0_C8E250, L80240708_C8E2B8 - -.section .text - -glabel func_802404B8_C8E068 -/* C8E068 802404B8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C8E06C 802404BC AFBF0020 */ sw $ra, 0x20($sp) -/* C8E070 802404C0 AFB1001C */ sw $s1, 0x1c($sp) -/* C8E074 802404C4 AFB00018 */ sw $s0, 0x18($sp) -/* C8E078 802404C8 8C910084 */ lw $s1, 0x84($a0) -/* C8E07C 802404CC 86230044 */ lh $v1, 0x44($s1) -/* C8E080 802404D0 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* C8E084 802404D4 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* C8E088 802404D8 2C620005 */ sltiu $v0, $v1, 5 -/* C8E08C 802404DC 1040008A */ beqz $v0, L80240708_C8E2B8 -/* C8E090 802404E0 00031080 */ sll $v0, $v1, 2 -/* C8E094 802404E4 3C018025 */ lui $at, %hi(jtbl_80248340_C95EF0) -/* C8E098 802404E8 00220821 */ addu $at, $at, $v0 -/* C8E09C 802404EC 8C228340 */ lw $v0, %lo(jtbl_80248340_C95EF0)($at) -/* C8E0A0 802404F0 00400008 */ jr $v0 -/* C8E0A4 802404F4 00000000 */ nop -glabel L802404F8_C8E0A8 -/* C8E0A8 802404F8 8E22003C */ lw $v0, 0x3c($s1) -/* C8E0AC 802404FC 86270046 */ lh $a3, 0x46($s1) -/* C8E0B0 80240500 AFA20010 */ sw $v0, 0x10($sp) -/* C8E0B4 80240504 8E250010 */ lw $a1, 0x10($s1) -/* C8E0B8 80240508 8E26001C */ lw $a2, 0x1c($s1) -/* C8E0BC 8024050C 0C00A8ED */ jal update_lerp -/* C8E0C0 80240510 24040005 */ addiu $a0, $zero, 5 -/* C8E0C4 80240514 86270046 */ lh $a3, 0x46($s1) -/* C8E0C8 80240518 8E22003C */ lw $v0, 0x3c($s1) -/* C8E0CC 8024051C E6200004 */ swc1 $f0, 4($s1) -/* C8E0D0 80240520 AFA20010 */ sw $v0, 0x10($sp) -/* C8E0D4 80240524 8E25000C */ lw $a1, 0xc($s1) -/* C8E0D8 80240528 8E260018 */ lw $a2, 0x18($s1) -/* C8E0DC 8024052C 0C00A8ED */ jal update_lerp -/* C8E0E0 80240530 0000202D */ daddu $a0, $zero, $zero -/* C8E0E4 80240534 86270046 */ lh $a3, 0x46($s1) -/* C8E0E8 80240538 8E22003C */ lw $v0, 0x3c($s1) -/* C8E0EC 8024053C E6200000 */ swc1 $f0, ($s1) -/* C8E0F0 80240540 AFA20010 */ sw $v0, 0x10($sp) -/* C8E0F4 80240544 8E250014 */ lw $a1, 0x14($s1) -/* C8E0F8 80240548 8E260020 */ lw $a2, 0x20($s1) -/* C8E0FC 8024054C 0C00A8ED */ jal update_lerp -/* C8E100 80240550 0000202D */ daddu $a0, $zero, $zero -/* C8E104 80240554 8E220050 */ lw $v0, 0x50($s1) -/* C8E108 80240558 E6200008 */ swc1 $f0, 8($s1) -/* C8E10C 8024055C C6200000 */ lwc1 $f0, ($s1) -/* C8E110 80240560 8C42000C */ lw $v0, 0xc($v0) -/* C8E114 80240564 E4400008 */ swc1 $f0, 8($v0) -/* C8E118 80240568 8E220050 */ lw $v0, 0x50($s1) -/* C8E11C 8024056C C6200004 */ lwc1 $f0, 4($s1) -/* C8E120 80240570 8C42000C */ lw $v0, 0xc($v0) -/* C8E124 80240574 E440000C */ swc1 $f0, 0xc($v0) -/* C8E128 80240578 8E220050 */ lw $v0, 0x50($s1) -/* C8E12C 8024057C C6200008 */ lwc1 $f0, 8($s1) -/* C8E130 80240580 8C42000C */ lw $v0, 0xc($v0) -/* C8E134 80240584 E4400010 */ swc1 $f0, 0x10($v0) -/* C8E138 80240588 96220046 */ lhu $v0, 0x46($s1) -/* C8E13C 8024058C 8E23003C */ lw $v1, 0x3c($s1) -/* C8E140 80240590 24420001 */ addiu $v0, $v0, 1 -/* C8E144 80240594 A6220046 */ sh $v0, 0x46($s1) -/* C8E148 80240598 00021400 */ sll $v0, $v0, 0x10 -/* C8E14C 8024059C 00021403 */ sra $v0, $v0, 0x10 -/* C8E150 802405A0 0043102A */ slt $v0, $v0, $v1 -/* C8E154 802405A4 14400058 */ bnez $v0, L80240708_C8E2B8 -/* C8E158 802405A8 24020001 */ addiu $v0, $zero, 1 -/* C8E15C 802405AC A6220044 */ sh $v0, 0x44($s1) -/* C8E160 802405B0 080901C2 */ j L80240708_C8E2B8 -/* C8E164 802405B4 A6200046 */ sh $zero, 0x46($s1) -glabel L802405B8_C8E168 -/* C8E168 802405B8 96220046 */ lhu $v0, 0x46($s1) -/* C8E16C 802405BC 24420001 */ addiu $v0, $v0, 1 -/* C8E170 802405C0 A6220046 */ sh $v0, 0x46($s1) -/* C8E174 802405C4 00021400 */ sll $v0, $v0, 0x10 -/* C8E178 802405C8 00021403 */ sra $v0, $v0, 0x10 -/* C8E17C 802405CC 2842003C */ slti $v0, $v0, 0x3c -/* C8E180 802405D0 1440004D */ bnez $v0, L80240708_C8E2B8 -/* C8E184 802405D4 24020002 */ addiu $v0, $zero, 2 -/* C8E188 802405D8 8E230050 */ lw $v1, 0x50($s1) -/* C8E18C 802405DC A6220044 */ sh $v0, 0x44($s1) -/* C8E190 802405E0 A6200046 */ sh $zero, 0x46($s1) -/* C8E194 802405E4 8C63000C */ lw $v1, 0xc($v1) -/* C8E198 802405E8 24020001 */ addiu $v0, $zero, 1 -/* C8E19C 802405EC AC620070 */ sw $v0, 0x70($v1) -/* C8E1A0 802405F0 8E220050 */ lw $v0, 0x50($s1) -/* C8E1A4 802405F4 8C42000C */ lw $v0, 0xc($v0) -/* C8E1A8 802405F8 080901C2 */ j L80240708_C8E2B8 -/* C8E1AC 802405FC AC400074 */ sw $zero, 0x74($v0) -glabel L80240600_C8E1B0 -/* C8E1B0 80240600 96220046 */ lhu $v0, 0x46($s1) -/* C8E1B4 80240604 24420001 */ addiu $v0, $v0, 1 -/* C8E1B8 80240608 A6220046 */ sh $v0, 0x46($s1) -/* C8E1BC 8024060C 00021400 */ sll $v0, $v0, 0x10 -/* C8E1C0 80240610 00021403 */ sra $v0, $v0, 0x10 -/* C8E1C4 80240614 2842003C */ slti $v0, $v0, 0x3c -/* C8E1C8 80240618 1440003B */ bnez $v0, L80240708_C8E2B8 -/* C8E1CC 8024061C 00000000 */ nop -/* C8E1D0 80240620 3C013F80 */ lui $at, 0x3f80 -/* C8E1D4 80240624 44810000 */ mtc1 $at, $f0 -/* C8E1D8 80240628 AFA00014 */ sw $zero, 0x14($sp) -/* C8E1DC 8024062C E7A00010 */ swc1 $f0, 0x10($sp) -/* C8E1E0 80240630 8E250018 */ lw $a1, 0x18($s1) -/* C8E1E4 80240634 8E26001C */ lw $a2, 0x1c($s1) -/* C8E1E8 80240638 8E270020 */ lw $a3, 0x20($s1) -/* C8E1EC 8024063C 0C01C9AC */ jal playFX_7B -/* C8E1F0 80240640 24040001 */ addiu $a0, $zero, 1 -/* C8E1F4 80240644 AE220054 */ sw $v0, 0x54($s1) -/* C8E1F8 80240648 8C43000C */ lw $v1, 0xc($v0) -/* C8E1FC 8024064C 9222003B */ lbu $v0, 0x3b($s1) -/* C8E200 80240650 A0620034 */ sb $v0, 0x34($v1) -/* C8E204 80240654 8E220054 */ lw $v0, 0x54($s1) -/* C8E208 80240658 8C42000C */ lw $v0, 0xc($v0) -/* C8E20C 8024065C AC400020 */ sw $zero, 0x20($v0) -/* C8E210 80240660 8E250018 */ lw $a1, 0x18($s1) -/* C8E214 80240664 8E260028 */ lw $a2, 0x28($s1) -/* C8E218 80240668 8E270020 */ lw $a3, 0x20($s1) -/* C8E21C 8024066C 0C044898 */ jal create_shadow_type -/* C8E220 80240670 0000202D */ daddu $a0, $zero, $zero -/* C8E224 80240674 3C014210 */ lui $at, 0x4210 -/* C8E228 80240678 44810000 */ mtc1 $at, $f0 -/* C8E22C 8024067C AE220040 */ sw $v0, 0x40($s1) -/* C8E230 80240680 24020003 */ addiu $v0, $zero, 3 -/* C8E234 80240684 A6220044 */ sh $v0, 0x44($s1) -/* C8E238 80240688 24020001 */ addiu $v0, $zero, 1 -/* C8E23C 8024068C A6200046 */ sh $zero, 0x46($s1) -/* C8E240 80240690 AE20002C */ sw $zero, 0x2c($s1) -/* C8E244 80240694 A6220048 */ sh $v0, 0x48($s1) -/* C8E248 80240698 080901C2 */ j L80240708_C8E2B8 -/* C8E24C 8024069C E6200030 */ swc1 $f0, 0x30($s1) -glabel L802406A0_C8E250 -/* C8E250 802406A0 0000202D */ daddu $a0, $zero, $zero -/* C8E254 802406A4 3C054210 */ lui $a1, 0x4210 -/* C8E258 802406A8 3C064198 */ lui $a2, 0x4198 -/* C8E25C 802406AC 86270046 */ lh $a3, 0x46($s1) -/* C8E260 802406B0 24020078 */ addiu $v0, $zero, 0x78 -/* C8E264 802406B4 0C00A8ED */ jal update_lerp -/* C8E268 802406B8 AFA20010 */ sw $v0, 0x10($sp) -/* C8E26C 802406BC 96220046 */ lhu $v0, 0x46($s1) -/* C8E270 802406C0 E6200030 */ swc1 $f0, 0x30($s1) -/* C8E274 802406C4 24420001 */ addiu $v0, $v0, 1 -/* C8E278 802406C8 A6220046 */ sh $v0, 0x46($s1) -/* C8E27C 802406CC 00021400 */ sll $v0, $v0, 0x10 -/* C8E280 802406D0 00021403 */ sra $v0, $v0, 0x10 -/* C8E284 802406D4 28420078 */ slti $v0, $v0, 0x78 -/* C8E288 802406D8 1440000B */ bnez $v0, L80240708_C8E2B8 -/* C8E28C 802406DC 24030001 */ addiu $v1, $zero, 1 -/* C8E290 802406E0 C620002C */ lwc1 $f0, 0x2c($s1) -/* C8E294 802406E4 24020002 */ addiu $v0, $zero, 2 -/* C8E298 802406E8 A6220048 */ sh $v0, 0x48($s1) -/* C8E29C 802406EC 24020004 */ addiu $v0, $zero, 4 -/* C8E2A0 802406F0 A620004C */ sh $zero, 0x4c($s1) -/* C8E2A4 802406F4 A623004A */ sh $v1, 0x4a($s1) -/* C8E2A8 802406F8 A623004E */ sh $v1, 0x4e($s1) -/* C8E2AC 802406FC A6220044 */ sh $v0, 0x44($s1) -/* C8E2B0 80240700 A6200046 */ sh $zero, 0x46($s1) -/* C8E2B4 80240704 E6200034 */ swc1 $f0, 0x34($s1) -glabel L80240708_C8E2B8 -/* C8E2B8 80240708 8623004A */ lh $v1, 0x4a($s1) -/* C8E2BC 8024070C 24020001 */ addiu $v0, $zero, 1 -/* C8E2C0 80240710 10620005 */ beq $v1, $v0, .L80240728 -/* C8E2C4 80240714 24020002 */ addiu $v0, $zero, 2 -/* C8E2C8 80240718 1062001E */ beq $v1, $v0, .L80240794 -/* C8E2CC 8024071C 00000000 */ nop -/* C8E2D0 80240720 0809020F */ j .L8024083C -/* C8E2D4 80240724 00000000 */ nop -.L80240728: -/* C8E2D8 80240728 8627004C */ lh $a3, 0x4c($s1) -/* C8E2DC 8024072C 24100078 */ addiu $s0, $zero, 0x78 -/* C8E2E0 80240730 AFB00010 */ sw $s0, 0x10($sp) -/* C8E2E4 80240734 8E250034 */ lw $a1, 0x34($s1) -/* C8E2E8 80240738 3C0644B4 */ lui $a2, 0x44b4 -/* C8E2EC 8024073C 0C00A8ED */ jal update_lerp -/* C8E2F0 80240740 24040004 */ addiu $a0, $zero, 4 -/* C8E2F4 80240744 8627004C */ lh $a3, 0x4c($s1) -/* C8E2F8 80240748 E620002C */ swc1 $f0, 0x2c($s1) -/* C8E2FC 8024074C AFB00010 */ sw $s0, 0x10($sp) -/* C8E300 80240750 8E25001C */ lw $a1, 0x1c($s1) -/* C8E304 80240754 8E260024 */ lw $a2, 0x24($s1) -/* C8E308 80240758 0C00A8ED */ jal update_lerp -/* C8E30C 8024075C 2404000A */ addiu $a0, $zero, 0xa -/* C8E310 80240760 9622004C */ lhu $v0, 0x4c($s1) -/* C8E314 80240764 E6200004 */ swc1 $f0, 4($s1) -/* C8E318 80240768 24420001 */ addiu $v0, $v0, 1 -/* C8E31C 8024076C A622004C */ sh $v0, 0x4c($s1) -/* C8E320 80240770 00021400 */ sll $v0, $v0, 0x10 -/* C8E324 80240774 00021403 */ sra $v0, $v0, 0x10 -/* C8E328 80240778 0050102A */ slt $v0, $v0, $s0 -/* C8E32C 8024077C 1440002F */ bnez $v0, .L8024083C -/* C8E330 80240780 2402010E */ addiu $v0, $zero, 0x10e -/* C8E334 80240784 A622004C */ sh $v0, 0x4c($s1) -/* C8E338 80240788 24020002 */ addiu $v0, $zero, 2 -/* C8E33C 8024078C 0809020E */ j .L80240838 -/* C8E340 80240790 A622004A */ sh $v0, 0x4a($s1) -.L80240794: -/* C8E344 80240794 8622004C */ lh $v0, 0x4c($s1) -/* C8E348 80240798 44826000 */ mtc1 $v0, $f12 -/* C8E34C 8024079C 00000000 */ nop -/* C8E350 802407A0 0C00A8BB */ jal sin_deg -/* C8E354 802407A4 46806320 */ cvt.s.w $f12, $f12 -/* C8E358 802407A8 3C013F80 */ lui $at, 0x3f80 -/* C8E35C 802407AC 44811000 */ mtc1 $at, $f2 -/* C8E360 802407B0 00000000 */ nop -/* C8E364 802407B4 46020000 */ add.s $f0, $f0, $f2 -/* C8E368 802407B8 46000000 */ add.s $f0, $f0, $f0 -/* C8E36C 802407BC C6220024 */ lwc1 $f2, 0x24($s1) -/* C8E370 802407C0 8622004C */ lh $v0, 0x4c($s1) -/* C8E374 802407C4 46001080 */ add.s $f2, $f2, $f0 -/* C8E378 802407C8 24420008 */ addiu $v0, $v0, 8 -/* C8E37C 802407CC 44826000 */ mtc1 $v0, $f12 -/* C8E380 802407D0 00000000 */ nop -/* C8E384 802407D4 46806320 */ cvt.s.w $f12, $f12 -/* C8E388 802407D8 0C00A6C9 */ jal clamp_angle -/* C8E38C 802407DC E6220004 */ swc1 $f2, 4($s1) -/* C8E390 802407E0 4600010D */ trunc.w.s $f4, $f0 -/* C8E394 802407E4 44022000 */ mfc1 $v0, $f4 -/* C8E398 802407E8 C6200004 */ lwc1 $f0, 4($s1) -/* C8E39C 802407EC A622004C */ sh $v0, 0x4c($s1) -/* C8E3A0 802407F0 C60C0028 */ lwc1 $f12, 0x28($s0) -/* C8E3A4 802407F4 8E060030 */ lw $a2, 0x30($s0) -/* C8E3A8 802407F8 3C0141A0 */ lui $at, 0x41a0 -/* C8E3AC 802407FC 44817000 */ mtc1 $at, $f14 -/* C8E3B0 80240800 E7A00010 */ swc1 $f0, 0x10($sp) -/* C8E3B4 80240804 C602002C */ lwc1 $f2, 0x2c($s0) -/* C8E3B8 80240808 C6200008 */ lwc1 $f0, 8($s1) -/* C8E3BC 8024080C E7A00014 */ swc1 $f0, 0x14($sp) -/* C8E3C0 80240810 8E270000 */ lw $a3, ($s1) -/* C8E3C4 80240814 0C00A7CB */ jal dist3D -/* C8E3C8 80240818 460E1380 */ add.s $f14, $f2, $f14 -/* C8E3CC 8024081C 3C0141F0 */ lui $at, 0x41f0 -/* C8E3D0 80240820 44811000 */ mtc1 $at, $f2 -/* C8E3D4 80240824 00000000 */ nop -/* C8E3D8 80240828 4600103C */ c.lt.s $f2, $f0 -/* C8E3DC 8024082C 00000000 */ nop -/* C8E3E0 80240830 45010002 */ bc1t .L8024083C -/* C8E3E4 80240834 24020003 */ addiu $v0, $zero, 3 -.L80240838: -/* C8E3E8 80240838 A622004E */ sh $v0, 0x4e($s1) -.L8024083C: -/* C8E3EC 8024083C 86230048 */ lh $v1, 0x48($s1) -/* C8E3F0 80240840 24020001 */ addiu $v0, $zero, 1 -/* C8E3F4 80240844 10620005 */ beq $v1, $v0, .L8024085C -/* C8E3F8 80240848 24020002 */ addiu $v0, $zero, 2 -/* C8E3FC 8024084C 10620008 */ beq $v1, $v0, .L80240870 -/* C8E400 80240850 00000000 */ nop -/* C8E404 80240854 0809022C */ j .L802408B0 -/* C8E408 80240858 00000000 */ nop -.L8024085C: -/* C8E40C 8024085C C620002C */ lwc1 $f0, 0x2c($s1) -/* C8E410 80240860 C62C0030 */ lwc1 $f12, 0x30($s1) -/* C8E414 80240864 0C00A6C9 */ jal clamp_angle -/* C8E418 80240868 460C0300 */ add.s $f12, $f0, $f12 -/* C8E41C 8024086C E620002C */ swc1 $f0, 0x2c($s1) -.L80240870: -/* C8E420 80240870 8E220054 */ lw $v0, 0x54($s1) -/* C8E424 80240874 C620002C */ lwc1 $f0, 0x2c($s1) -/* C8E428 80240878 8C42000C */ lw $v0, 0xc($v0) -/* C8E42C 8024087C E4400024 */ swc1 $f0, 0x24($v0) -/* C8E430 80240880 8E220054 */ lw $v0, 0x54($s1) -/* C8E434 80240884 C6200018 */ lwc1 $f0, 0x18($s1) -/* C8E438 80240888 8C42000C */ lw $v0, 0xc($v0) -/* C8E43C 8024088C E4400004 */ swc1 $f0, 4($v0) -/* C8E440 80240890 8E220054 */ lw $v0, 0x54($s1) -/* C8E444 80240894 C6200004 */ lwc1 $f0, 4($s1) -/* C8E448 80240898 8C42000C */ lw $v0, 0xc($v0) -/* C8E44C 8024089C E4400008 */ swc1 $f0, 8($v0) -/* C8E450 802408A0 8E220054 */ lw $v0, 0x54($s1) -/* C8E454 802408A4 C6200020 */ lwc1 $f0, 0x20($s1) -/* C8E458 802408A8 8C42000C */ lw $v0, 0xc($v0) -/* C8E45C 802408AC E440000C */ swc1 $f0, 0xc($v0) -.L802408B0: -/* C8E460 802408B0 8FBF0020 */ lw $ra, 0x20($sp) -/* C8E464 802408B4 8FB1001C */ lw $s1, 0x1c($sp) -/* C8E468 802408B8 8FB00018 */ lw $s0, 0x18($sp) -/* C8E46C 802408BC 0000102D */ daddu $v0, $zero, $zero -/* C8E470 802408C0 03E00008 */ jr $ra -/* C8E474 802408C4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802408C8_C8E478.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802408C8_C8E478.s deleted file mode 100644 index 634dafb96f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802408C8_C8E478.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408C8_C8E478 -/* C8E478 802408C8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C8E47C 802408CC AFB00010 */ sw $s0, 0x10($sp) -/* C8E480 802408D0 0080802D */ daddu $s0, $a0, $zero -/* C8E484 802408D4 AFBF0014 */ sw $ra, 0x14($sp) -/* C8E488 802408D8 8E02000C */ lw $v0, 0xc($s0) -/* C8E48C 802408DC 0C0B1EAF */ jal evt_get_variable -/* C8E490 802408E0 8C450000 */ lw $a1, ($v0) -/* C8E494 802408E4 8E030084 */ lw $v1, 0x84($s0) -/* C8E498 802408E8 8FBF0014 */ lw $ra, 0x14($sp) -/* C8E49C 802408EC 8463004E */ lh $v1, 0x4e($v1) -/* C8E4A0 802408F0 8FB00010 */ lw $s0, 0x10($sp) -/* C8E4A4 802408F4 00621826 */ xor $v1, $v1, $v0 -/* C8E4A8 802408F8 2C630001 */ sltiu $v1, $v1, 1 -/* C8E4AC 802408FC 00031040 */ sll $v0, $v1, 1 -/* C8E4B0 80240900 03E00008 */ jr $ra -/* C8E4B4 80240904 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240908_C8E4B8.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240908_C8E4B8.s deleted file mode 100644 index 8979719462..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240908_C8E4B8.s +++ /dev/null @@ -1,72 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240908_C8E4B8 -/* C8E4B8 80240908 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C8E4BC 8024090C AFB20020 */ sw $s2, 0x20($sp) -/* C8E4C0 80240910 0080902D */ daddu $s2, $a0, $zero -/* C8E4C4 80240914 AFBF0024 */ sw $ra, 0x24($sp) -/* C8E4C8 80240918 AFB1001C */ sw $s1, 0x1c($sp) -/* C8E4CC 8024091C AFB00018 */ sw $s0, 0x18($sp) -/* C8E4D0 80240920 10A00035 */ beqz $a1, .L802409F8 -/* C8E4D4 80240924 8E51000C */ lw $s1, 0xc($s2) -/* C8E4D8 80240928 0C00AB39 */ jal heap_malloc -/* C8E4DC 8024092C 24040058 */ addiu $a0, $zero, 0x58 -/* C8E4E0 80240930 0040802D */ daddu $s0, $v0, $zero -/* C8E4E4 80240934 AE500084 */ sw $s0, 0x84($s2) -/* C8E4E8 80240938 8E250000 */ lw $a1, ($s1) -/* C8E4EC 8024093C 26310004 */ addiu $s1, $s1, 4 -/* C8E4F0 80240940 0C0B1EAF */ jal evt_get_variable -/* C8E4F4 80240944 0240202D */ daddu $a0, $s2, $zero -/* C8E4F8 80240948 AE020038 */ sw $v0, 0x38($s0) -/* C8E4FC 8024094C 8E250000 */ lw $a1, ($s1) -/* C8E500 80240950 26310004 */ addiu $s1, $s1, 4 -/* C8E504 80240954 0C0B210B */ jal evt_get_float_variable -/* C8E508 80240958 0240202D */ daddu $a0, $s2, $zero -/* C8E50C 8024095C E6000018 */ swc1 $f0, 0x18($s0) -/* C8E510 80240960 8E250000 */ lw $a1, ($s1) -/* C8E514 80240964 26310004 */ addiu $s1, $s1, 4 -/* C8E518 80240968 0C0B210B */ jal evt_get_float_variable -/* C8E51C 8024096C 0240202D */ daddu $a0, $s2, $zero -/* C8E520 80240970 E6000024 */ swc1 $f0, 0x24($s0) -/* C8E524 80240974 8E250000 */ lw $a1, ($s1) -/* C8E528 80240978 26310004 */ addiu $s1, $s1, 4 -/* C8E52C 8024097C 0C0B210B */ jal evt_get_float_variable -/* C8E530 80240980 0240202D */ daddu $a0, $s2, $zero -/* C8E534 80240984 E6000020 */ swc1 $f0, 0x20($s0) -/* C8E538 80240988 8E250000 */ lw $a1, ($s1) -/* C8E53C 8024098C 0C0B210B */ jal evt_get_float_variable -/* C8E540 80240990 0240202D */ daddu $a0, $s2, $zero -/* C8E544 80240994 3C013F80 */ lui $at, 0x3f80 -/* C8E548 80240998 44811000 */ mtc1 $at, $f2 -/* C8E54C 8024099C E6000028 */ swc1 $f0, 0x28($s0) -/* C8E550 802409A0 AFA00014 */ sw $zero, 0x14($sp) -/* C8E554 802409A4 E7A20010 */ swc1 $f2, 0x10($sp) -/* C8E558 802409A8 8E050018 */ lw $a1, 0x18($s0) -/* C8E55C 802409AC 8E060024 */ lw $a2, 0x24($s0) -/* C8E560 802409B0 8E070020 */ lw $a3, 0x20($s0) -/* C8E564 802409B4 0C01C9AC */ jal playFX_7B -/* C8E568 802409B8 24040001 */ addiu $a0, $zero, 1 -/* C8E56C 802409BC AE020054 */ sw $v0, 0x54($s0) -/* C8E570 802409C0 8C43000C */ lw $v1, 0xc($v0) -/* C8E574 802409C4 9202003B */ lbu $v0, 0x3b($s0) -/* C8E578 802409C8 A0620034 */ sb $v0, 0x34($v1) -/* C8E57C 802409CC 8E020054 */ lw $v0, 0x54($s0) -/* C8E580 802409D0 8C42000C */ lw $v0, 0xc($v0) -/* C8E584 802409D4 AC400020 */ sw $zero, 0x20($v0) -/* C8E588 802409D8 8E050018 */ lw $a1, 0x18($s0) -/* C8E58C 802409DC 8E060028 */ lw $a2, 0x28($s0) -/* C8E590 802409E0 8E070020 */ lw $a3, 0x20($s0) -/* C8E594 802409E4 0C044898 */ jal create_shadow_type -/* C8E598 802409E8 0000202D */ daddu $a0, $zero, $zero -/* C8E59C 802409EC AE020040 */ sw $v0, 0x40($s0) -/* C8E5A0 802409F0 2402010E */ addiu $v0, $zero, 0x10e -/* C8E5A4 802409F4 A602004C */ sh $v0, 0x4c($s0) -.L802409F8: -/* C8E5A8 802409F8 8FBF0024 */ lw $ra, 0x24($sp) -/* C8E5AC 802409FC 8FB20020 */ lw $s2, 0x20($sp) -/* C8E5B0 80240A00 8FB1001C */ lw $s1, 0x1c($sp) -/* C8E5B4 80240A04 8FB00018 */ lw $s0, 0x18($sp) -/* C8E5B8 80240A08 24020002 */ addiu $v0, $zero, 2 -/* C8E5BC 80240A0C 03E00008 */ jr $ra -/* C8E5C0 80240A10 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240A14_C8E5C4.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240A14_C8E5C4.s deleted file mode 100644 index 6ce7ccf3db..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240A14_C8E5C4.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A14_C8E5C4 -/* C8E5C4 80240A14 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C8E5C8 80240A18 AFBF0014 */ sw $ra, 0x14($sp) -/* C8E5CC 80240A1C AFB00010 */ sw $s0, 0x10($sp) -/* C8E5D0 80240A20 8C900084 */ lw $s0, 0x84($a0) -/* C8E5D4 80240A24 8602004C */ lh $v0, 0x4c($s0) -/* C8E5D8 80240A28 44826000 */ mtc1 $v0, $f12 -/* C8E5DC 80240A2C 00000000 */ nop -/* C8E5E0 80240A30 0C00A8BB */ jal sin_deg -/* C8E5E4 80240A34 46806320 */ cvt.s.w $f12, $f12 -/* C8E5E8 80240A38 3C013F80 */ lui $at, 0x3f80 -/* C8E5EC 80240A3C 44811000 */ mtc1 $at, $f2 -/* C8E5F0 80240A40 00000000 */ nop -/* C8E5F4 80240A44 46020000 */ add.s $f0, $f0, $f2 -/* C8E5F8 80240A48 46000000 */ add.s $f0, $f0, $f0 -/* C8E5FC 80240A4C C6020024 */ lwc1 $f2, 0x24($s0) -/* C8E600 80240A50 8602004C */ lh $v0, 0x4c($s0) -/* C8E604 80240A54 46001080 */ add.s $f2, $f2, $f0 -/* C8E608 80240A58 24420008 */ addiu $v0, $v0, 8 -/* C8E60C 80240A5C 44826000 */ mtc1 $v0, $f12 -/* C8E610 80240A60 00000000 */ nop -/* C8E614 80240A64 46806320 */ cvt.s.w $f12, $f12 -/* C8E618 80240A68 0C00A6C9 */ jal clamp_angle -/* C8E61C 80240A6C E6020004 */ swc1 $f2, 4($s0) -/* C8E620 80240A70 4600010D */ trunc.w.s $f4, $f0 -/* C8E624 80240A74 44022000 */ mfc1 $v0, $f4 -/* C8E628 80240A78 00000000 */ nop -/* C8E62C 80240A7C A602004C */ sh $v0, 0x4c($s0) -/* C8E630 80240A80 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* C8E634 80240A84 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* C8E638 80240A88 C44C0028 */ lwc1 $f12, 0x28($v0) -/* C8E63C 80240A8C C44E0030 */ lwc1 $f14, 0x30($v0) -/* C8E640 80240A90 8E060018 */ lw $a2, 0x18($s0) -/* C8E644 80240A94 0C00A7B5 */ jal dist2D -/* C8E648 80240A98 8E070020 */ lw $a3, 0x20($s0) -/* C8E64C 80240A9C 3C0141F0 */ lui $at, 0x41f0 -/* C8E650 80240AA0 44811000 */ mtc1 $at, $f2 -/* C8E654 80240AA4 00000000 */ nop -/* C8E658 80240AA8 4602003E */ c.le.s $f0, $f2 -/* C8E65C 80240AAC 00000000 */ nop -/* C8E660 80240AB0 45000002 */ bc1f .L80240ABC -/* C8E664 80240AB4 24020003 */ addiu $v0, $zero, 3 -/* C8E668 80240AB8 A602004E */ sh $v0, 0x4e($s0) -.L80240ABC: -/* C8E66C 80240ABC 8E020054 */ lw $v0, 0x54($s0) -/* C8E670 80240AC0 C6000018 */ lwc1 $f0, 0x18($s0) -/* C8E674 80240AC4 8C42000C */ lw $v0, 0xc($v0) -/* C8E678 80240AC8 E4400004 */ swc1 $f0, 4($v0) -/* C8E67C 80240ACC 8E020054 */ lw $v0, 0x54($s0) -/* C8E680 80240AD0 C6000004 */ lwc1 $f0, 4($s0) -/* C8E684 80240AD4 8C42000C */ lw $v0, 0xc($v0) -/* C8E688 80240AD8 E4400008 */ swc1 $f0, 8($v0) -/* C8E68C 80240ADC 8E020054 */ lw $v0, 0x54($s0) -/* C8E690 80240AE0 C6000020 */ lwc1 $f0, 0x20($s0) -/* C8E694 80240AE4 8C42000C */ lw $v0, 0xc($v0) -/* C8E698 80240AE8 E440000C */ swc1 $f0, 0xc($v0) -/* C8E69C 80240AEC 8FBF0014 */ lw $ra, 0x14($sp) -/* C8E6A0 80240AF0 8FB00010 */ lw $s0, 0x10($sp) -/* C8E6A4 80240AF4 0000102D */ daddu $v0, $zero, $zero -/* C8E6A8 80240AF8 03E00008 */ jr $ra -/* C8E6AC 80240AFC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_15/DE8770/func_80240000_DE8770.s b/ver/us/asm/nonmatchings/world/area_omo/omo_15/DE8770/func_80240000_DE8770.s deleted file mode 100644 index 166a81ce5f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_15/DE8770/func_80240000_DE8770.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_DE8770 -/* DE8770 80240000 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DE8774 80240004 AFBF001C */ sw $ra, 0x1c($sp) -/* DE8778 80240008 AFB00018 */ sw $s0, 0x18($sp) -/* DE877C 8024000C 8C900084 */ lw $s0, 0x84($a0) -/* DE8780 80240010 C6000008 */ lwc1 $f0, 8($s0) -/* DE8784 80240014 240400A2 */ addiu $a0, $zero, 0xa2 -/* DE8788 80240018 E7A00010 */ swc1 $f0, 0x10($sp) -/* DE878C 8024001C 8E060000 */ lw $a2, ($s0) -/* DE8790 80240020 8E070004 */ lw $a3, 4($s0) -/* DE8794 80240024 0C05267B */ jal sfx_adjust_env_sound_pos -/* DE8798 80240028 0000282D */ daddu $a1, $zero, $zero -/* DE879C 8024002C 86020044 */ lh $v0, 0x44($s0) -/* DE87A0 80240030 8FBF001C */ lw $ra, 0x1c($sp) -/* DE87A4 80240034 8FB00018 */ lw $s0, 0x18($sp) -/* DE87A8 80240038 28420002 */ slti $v0, $v0, 2 -/* DE87AC 8024003C 38420001 */ xori $v0, $v0, 1 -/* DE87B0 80240040 00021040 */ sll $v0, $v0, 1 -/* DE87B4 80240044 03E00008 */ jr $ra -/* DE87B8 80240048 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_15/DE8770/func_8024004C_DE87BC.s b/ver/us/asm/nonmatchings/world/area_omo/omo_15/DE8770/func_8024004C_DE87BC.s deleted file mode 100644 index 5d4a8ed657..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_15/DE8770/func_8024004C_DE87BC.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024004C_DE87BC -/* DE87BC 8024004C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* DE87C0 80240050 AFB20020 */ sw $s2, 0x20($sp) -/* DE87C4 80240054 0080902D */ daddu $s2, $a0, $zero -/* DE87C8 80240058 AFBF0024 */ sw $ra, 0x24($sp) -/* DE87CC 8024005C AFB1001C */ sw $s1, 0x1c($sp) -/* DE87D0 80240060 AFB00018 */ sw $s0, 0x18($sp) -/* DE87D4 80240064 10A0004A */ beqz $a1, .L80240190 -/* DE87D8 80240068 8E51000C */ lw $s1, 0xc($s2) -/* DE87DC 8024006C 0C00AB39 */ jal heap_malloc -/* DE87E0 80240070 24040058 */ addiu $a0, $zero, 0x58 -/* DE87E4 80240074 0000202D */ daddu $a0, $zero, $zero -/* DE87E8 80240078 3C05FD05 */ lui $a1, 0xfd05 -/* DE87EC 8024007C 34A50F81 */ ori $a1, $a1, 0xf81 -/* DE87F0 80240080 0040802D */ daddu $s0, $v0, $zero -/* DE87F4 80240084 0200302D */ daddu $a2, $s0, $zero -/* DE87F8 80240088 0C0B2026 */ jal evt_set_variable -/* DE87FC 8024008C AE500084 */ sw $s0, 0x84($s2) -/* DE8800 80240090 8E250000 */ lw $a1, ($s1) -/* DE8804 80240094 26310004 */ addiu $s1, $s1, 4 -/* DE8808 80240098 0C0B1EAF */ jal evt_get_variable -/* DE880C 8024009C 0240202D */ daddu $a0, $s2, $zero -/* DE8810 802400A0 AE020038 */ sw $v0, 0x38($s0) -/* DE8814 802400A4 8E250000 */ lw $a1, ($s1) -/* DE8818 802400A8 26310004 */ addiu $s1, $s1, 4 -/* DE881C 802400AC 0C0B1EAF */ jal evt_get_variable -/* DE8820 802400B0 0240202D */ daddu $a0, $s2, $zero -/* DE8824 802400B4 AE02003C */ sw $v0, 0x3c($s0) -/* DE8828 802400B8 8E250000 */ lw $a1, ($s1) -/* DE882C 802400BC 26310004 */ addiu $s1, $s1, 4 -/* DE8830 802400C0 0C0B210B */ jal evt_get_float_variable -/* DE8834 802400C4 0240202D */ daddu $a0, $s2, $zero -/* DE8838 802400C8 E600000C */ swc1 $f0, 0xc($s0) -/* DE883C 802400CC 8E250000 */ lw $a1, ($s1) -/* DE8840 802400D0 26310004 */ addiu $s1, $s1, 4 -/* DE8844 802400D4 0C0B210B */ jal evt_get_float_variable -/* DE8848 802400D8 0240202D */ daddu $a0, $s2, $zero -/* DE884C 802400DC E6000010 */ swc1 $f0, 0x10($s0) -/* DE8850 802400E0 8E250000 */ lw $a1, ($s1) -/* DE8854 802400E4 26310004 */ addiu $s1, $s1, 4 -/* DE8858 802400E8 0C0B210B */ jal evt_get_float_variable -/* DE885C 802400EC 0240202D */ daddu $a0, $s2, $zero -/* DE8860 802400F0 E6000014 */ swc1 $f0, 0x14($s0) -/* DE8864 802400F4 8E250000 */ lw $a1, ($s1) -/* DE8868 802400F8 26310004 */ addiu $s1, $s1, 4 -/* DE886C 802400FC 0C0B210B */ jal evt_get_float_variable -/* DE8870 80240100 0240202D */ daddu $a0, $s2, $zero -/* DE8874 80240104 E6000018 */ swc1 $f0, 0x18($s0) -/* DE8878 80240108 8E250000 */ lw $a1, ($s1) -/* DE887C 8024010C 26310004 */ addiu $s1, $s1, 4 -/* DE8880 80240110 0C0B210B */ jal evt_get_float_variable -/* DE8884 80240114 0240202D */ daddu $a0, $s2, $zero -/* DE8888 80240118 E600001C */ swc1 $f0, 0x1c($s0) -/* DE888C 8024011C 8E250000 */ lw $a1, ($s1) -/* DE8890 80240120 26310004 */ addiu $s1, $s1, 4 -/* DE8894 80240124 0C0B210B */ jal evt_get_float_variable -/* DE8898 80240128 0240202D */ daddu $a0, $s2, $zero -/* DE889C 8024012C E6000020 */ swc1 $f0, 0x20($s0) -/* DE88A0 80240130 8E250000 */ lw $a1, ($s1) -/* DE88A4 80240134 26310004 */ addiu $s1, $s1, 4 -/* DE88A8 80240138 0C0B210B */ jal evt_get_float_variable -/* DE88AC 8024013C 0240202D */ daddu $a0, $s2, $zero -/* DE88B0 80240140 E6000024 */ swc1 $f0, 0x24($s0) -/* DE88B4 80240144 8E250000 */ lw $a1, ($s1) -/* DE88B8 80240148 0C0B210B */ jal evt_get_float_variable -/* DE88BC 8024014C 0240202D */ daddu $a0, $s2, $zero -/* DE88C0 80240150 3C013F80 */ lui $at, 0x3f80 -/* DE88C4 80240154 44811000 */ mtc1 $at, $f2 -/* DE88C8 80240158 E6000028 */ swc1 $f0, 0x28($s0) -/* DE88CC 8024015C AFA00014 */ sw $zero, 0x14($sp) -/* DE88D0 80240160 E7A20010 */ swc1 $f2, 0x10($sp) -/* DE88D4 80240164 8E05000C */ lw $a1, 0xc($s0) -/* DE88D8 80240168 8E060010 */ lw $a2, 0x10($s0) -/* DE88DC 8024016C 8E070014 */ lw $a3, 0x14($s0) -/* DE88E0 80240170 0C01CA6C */ jal playFX_83 -/* DE88E4 80240174 24040002 */ addiu $a0, $zero, 2 -/* DE88E8 80240178 AE020050 */ sw $v0, 0x50($s0) -/* DE88EC 8024017C A600004E */ sh $zero, 0x4e($s0) -/* DE88F0 80240180 A6000048 */ sh $zero, 0x48($s0) -/* DE88F4 80240184 A600004A */ sh $zero, 0x4a($s0) -/* DE88F8 80240188 A6000044 */ sh $zero, 0x44($s0) -/* DE88FC 8024018C A6000046 */ sh $zero, 0x46($s0) -.L80240190: -/* DE8900 80240190 8FBF0024 */ lw $ra, 0x24($sp) -/* DE8904 80240194 8FB20020 */ lw $s2, 0x20($sp) -/* DE8908 80240198 8FB1001C */ lw $s1, 0x1c($sp) -/* DE890C 8024019C 8FB00018 */ lw $s0, 0x18($sp) -/* DE8910 802401A0 24020002 */ addiu $v0, $zero, 2 -/* DE8914 802401A4 03E00008 */ jr $ra -/* DE8918 802401A8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_15/DE8770/func_802401AC_DE891C.s b/ver/us/asm/nonmatchings/world/area_omo/omo_15/DE8770/func_802401AC_DE891C.s deleted file mode 100644 index 2320b04c20..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_15/DE8770/func_802401AC_DE891C.s +++ /dev/null @@ -1,283 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel jtbl_80243730_DEBEA0 -.word L802401EC_DE895C, L802402AC_DE8A1C, L802402F4_DE8A64, L80240394_DE8B04, L802403FC_DE8B6C - -.section .text - -glabel func_802401AC_DE891C -/* DE891C 802401AC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* DE8920 802401B0 AFBF0020 */ sw $ra, 0x20($sp) -/* DE8924 802401B4 AFB1001C */ sw $s1, 0x1c($sp) -/* DE8928 802401B8 AFB00018 */ sw $s0, 0x18($sp) -/* DE892C 802401BC 8C910084 */ lw $s1, 0x84($a0) -/* DE8930 802401C0 86230044 */ lh $v1, 0x44($s1) -/* DE8934 802401C4 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* DE8938 802401C8 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* DE893C 802401CC 2C620005 */ sltiu $v0, $v1, 5 -/* DE8940 802401D0 1040008A */ beqz $v0, L802403FC_DE8B6C -/* DE8944 802401D4 00031080 */ sll $v0, $v1, 2 -/* DE8948 802401D8 3C018024 */ lui $at, %hi(jtbl_80243730_DEBEA0) -/* DE894C 802401DC 00220821 */ addu $at, $at, $v0 -/* DE8950 802401E0 8C223730 */ lw $v0, %lo(jtbl_80243730_DEBEA0)($at) -/* DE8954 802401E4 00400008 */ jr $v0 -/* DE8958 802401E8 00000000 */ nop -glabel L802401EC_DE895C -/* DE895C 802401EC 8E22003C */ lw $v0, 0x3c($s1) -/* DE8960 802401F0 86270046 */ lh $a3, 0x46($s1) -/* DE8964 802401F4 AFA20010 */ sw $v0, 0x10($sp) -/* DE8968 802401F8 8E250010 */ lw $a1, 0x10($s1) -/* DE896C 802401FC 8E26001C */ lw $a2, 0x1c($s1) -/* DE8970 80240200 0C00A8ED */ jal update_lerp -/* DE8974 80240204 24040005 */ addiu $a0, $zero, 5 -/* DE8978 80240208 86270046 */ lh $a3, 0x46($s1) -/* DE897C 8024020C 8E22003C */ lw $v0, 0x3c($s1) -/* DE8980 80240210 E6200004 */ swc1 $f0, 4($s1) -/* DE8984 80240214 AFA20010 */ sw $v0, 0x10($sp) -/* DE8988 80240218 8E25000C */ lw $a1, 0xc($s1) -/* DE898C 8024021C 8E260018 */ lw $a2, 0x18($s1) -/* DE8990 80240220 0C00A8ED */ jal update_lerp -/* DE8994 80240224 0000202D */ daddu $a0, $zero, $zero -/* DE8998 80240228 86270046 */ lh $a3, 0x46($s1) -/* DE899C 8024022C 8E22003C */ lw $v0, 0x3c($s1) -/* DE89A0 80240230 E6200000 */ swc1 $f0, ($s1) -/* DE89A4 80240234 AFA20010 */ sw $v0, 0x10($sp) -/* DE89A8 80240238 8E250014 */ lw $a1, 0x14($s1) -/* DE89AC 8024023C 8E260020 */ lw $a2, 0x20($s1) -/* DE89B0 80240240 0C00A8ED */ jal update_lerp -/* DE89B4 80240244 0000202D */ daddu $a0, $zero, $zero -/* DE89B8 80240248 8E220050 */ lw $v0, 0x50($s1) -/* DE89BC 8024024C E6200008 */ swc1 $f0, 8($s1) -/* DE89C0 80240250 C6200000 */ lwc1 $f0, ($s1) -/* DE89C4 80240254 8C42000C */ lw $v0, 0xc($v0) -/* DE89C8 80240258 E4400008 */ swc1 $f0, 8($v0) -/* DE89CC 8024025C 8E220050 */ lw $v0, 0x50($s1) -/* DE89D0 80240260 C6200004 */ lwc1 $f0, 4($s1) -/* DE89D4 80240264 8C42000C */ lw $v0, 0xc($v0) -/* DE89D8 80240268 E440000C */ swc1 $f0, 0xc($v0) -/* DE89DC 8024026C 8E220050 */ lw $v0, 0x50($s1) -/* DE89E0 80240270 C6200008 */ lwc1 $f0, 8($s1) -/* DE89E4 80240274 8C42000C */ lw $v0, 0xc($v0) -/* DE89E8 80240278 E4400010 */ swc1 $f0, 0x10($v0) -/* DE89EC 8024027C 96220046 */ lhu $v0, 0x46($s1) -/* DE89F0 80240280 8E23003C */ lw $v1, 0x3c($s1) -/* DE89F4 80240284 24420001 */ addiu $v0, $v0, 1 -/* DE89F8 80240288 A6220046 */ sh $v0, 0x46($s1) -/* DE89FC 8024028C 00021400 */ sll $v0, $v0, 0x10 -/* DE8A00 80240290 00021403 */ sra $v0, $v0, 0x10 -/* DE8A04 80240294 0043102A */ slt $v0, $v0, $v1 -/* DE8A08 80240298 14400058 */ bnez $v0, L802403FC_DE8B6C -/* DE8A0C 8024029C 24020001 */ addiu $v0, $zero, 1 -/* DE8A10 802402A0 A6220044 */ sh $v0, 0x44($s1) -/* DE8A14 802402A4 080900FF */ j L802403FC_DE8B6C -/* DE8A18 802402A8 A6200046 */ sh $zero, 0x46($s1) -glabel L802402AC_DE8A1C -/* DE8A1C 802402AC 96220046 */ lhu $v0, 0x46($s1) -/* DE8A20 802402B0 24420001 */ addiu $v0, $v0, 1 -/* DE8A24 802402B4 A6220046 */ sh $v0, 0x46($s1) -/* DE8A28 802402B8 00021400 */ sll $v0, $v0, 0x10 -/* DE8A2C 802402BC 00021403 */ sra $v0, $v0, 0x10 -/* DE8A30 802402C0 2842003C */ slti $v0, $v0, 0x3c -/* DE8A34 802402C4 1440004D */ bnez $v0, L802403FC_DE8B6C -/* DE8A38 802402C8 24020002 */ addiu $v0, $zero, 2 -/* DE8A3C 802402CC 8E230050 */ lw $v1, 0x50($s1) -/* DE8A40 802402D0 A6220044 */ sh $v0, 0x44($s1) -/* DE8A44 802402D4 A6200046 */ sh $zero, 0x46($s1) -/* DE8A48 802402D8 8C63000C */ lw $v1, 0xc($v1) -/* DE8A4C 802402DC 24020001 */ addiu $v0, $zero, 1 -/* DE8A50 802402E0 AC620070 */ sw $v0, 0x70($v1) -/* DE8A54 802402E4 8E220050 */ lw $v0, 0x50($s1) -/* DE8A58 802402E8 8C42000C */ lw $v0, 0xc($v0) -/* DE8A5C 802402EC 080900FF */ j L802403FC_DE8B6C -/* DE8A60 802402F0 AC400074 */ sw $zero, 0x74($v0) -glabel L802402F4_DE8A64 -/* DE8A64 802402F4 96220046 */ lhu $v0, 0x46($s1) -/* DE8A68 802402F8 24420001 */ addiu $v0, $v0, 1 -/* DE8A6C 802402FC A6220046 */ sh $v0, 0x46($s1) -/* DE8A70 80240300 00021400 */ sll $v0, $v0, 0x10 -/* DE8A74 80240304 00021403 */ sra $v0, $v0, 0x10 -/* DE8A78 80240308 2842003C */ slti $v0, $v0, 0x3c -/* DE8A7C 8024030C 1440003B */ bnez $v0, L802403FC_DE8B6C -/* DE8A80 80240310 00000000 */ nop -/* DE8A84 80240314 3C013F80 */ lui $at, 0x3f80 -/* DE8A88 80240318 44810000 */ mtc1 $at, $f0 -/* DE8A8C 8024031C AFA00014 */ sw $zero, 0x14($sp) -/* DE8A90 80240320 E7A00010 */ swc1 $f0, 0x10($sp) -/* DE8A94 80240324 8E250018 */ lw $a1, 0x18($s1) -/* DE8A98 80240328 8E26001C */ lw $a2, 0x1c($s1) -/* DE8A9C 8024032C 8E270020 */ lw $a3, 0x20($s1) -/* DE8AA0 80240330 0C01C9AC */ jal playFX_7B -/* DE8AA4 80240334 24040001 */ addiu $a0, $zero, 1 -/* DE8AA8 80240338 AE220054 */ sw $v0, 0x54($s1) -/* DE8AAC 8024033C 8C43000C */ lw $v1, 0xc($v0) -/* DE8AB0 80240340 9222003B */ lbu $v0, 0x3b($s1) -/* DE8AB4 80240344 A0620034 */ sb $v0, 0x34($v1) -/* DE8AB8 80240348 8E220054 */ lw $v0, 0x54($s1) -/* DE8ABC 8024034C 8C42000C */ lw $v0, 0xc($v0) -/* DE8AC0 80240350 AC400020 */ sw $zero, 0x20($v0) -/* DE8AC4 80240354 8E250018 */ lw $a1, 0x18($s1) -/* DE8AC8 80240358 8E260028 */ lw $a2, 0x28($s1) -/* DE8ACC 8024035C 8E270020 */ lw $a3, 0x20($s1) -/* DE8AD0 80240360 0C044898 */ jal create_shadow_type -/* DE8AD4 80240364 0000202D */ daddu $a0, $zero, $zero -/* DE8AD8 80240368 3C014210 */ lui $at, 0x4210 -/* DE8ADC 8024036C 44810000 */ mtc1 $at, $f0 -/* DE8AE0 80240370 AE220040 */ sw $v0, 0x40($s1) -/* DE8AE4 80240374 24020003 */ addiu $v0, $zero, 3 -/* DE8AE8 80240378 A6220044 */ sh $v0, 0x44($s1) -/* DE8AEC 8024037C 24020001 */ addiu $v0, $zero, 1 -/* DE8AF0 80240380 A6200046 */ sh $zero, 0x46($s1) -/* DE8AF4 80240384 AE20002C */ sw $zero, 0x2c($s1) -/* DE8AF8 80240388 A6220048 */ sh $v0, 0x48($s1) -/* DE8AFC 8024038C 080900FF */ j L802403FC_DE8B6C -/* DE8B00 80240390 E6200030 */ swc1 $f0, 0x30($s1) -glabel L80240394_DE8B04 -/* DE8B04 80240394 0000202D */ daddu $a0, $zero, $zero -/* DE8B08 80240398 3C054210 */ lui $a1, 0x4210 -/* DE8B0C 8024039C 3C064198 */ lui $a2, 0x4198 -/* DE8B10 802403A0 86270046 */ lh $a3, 0x46($s1) -/* DE8B14 802403A4 24020078 */ addiu $v0, $zero, 0x78 -/* DE8B18 802403A8 0C00A8ED */ jal update_lerp -/* DE8B1C 802403AC AFA20010 */ sw $v0, 0x10($sp) -/* DE8B20 802403B0 96220046 */ lhu $v0, 0x46($s1) -/* DE8B24 802403B4 E6200030 */ swc1 $f0, 0x30($s1) -/* DE8B28 802403B8 24420001 */ addiu $v0, $v0, 1 -/* DE8B2C 802403BC A6220046 */ sh $v0, 0x46($s1) -/* DE8B30 802403C0 00021400 */ sll $v0, $v0, 0x10 -/* DE8B34 802403C4 00021403 */ sra $v0, $v0, 0x10 -/* DE8B38 802403C8 28420078 */ slti $v0, $v0, 0x78 -/* DE8B3C 802403CC 1440000B */ bnez $v0, L802403FC_DE8B6C -/* DE8B40 802403D0 24030001 */ addiu $v1, $zero, 1 -/* DE8B44 802403D4 C620002C */ lwc1 $f0, 0x2c($s1) -/* DE8B48 802403D8 24020002 */ addiu $v0, $zero, 2 -/* DE8B4C 802403DC A6220048 */ sh $v0, 0x48($s1) -/* DE8B50 802403E0 24020004 */ addiu $v0, $zero, 4 -/* DE8B54 802403E4 A620004C */ sh $zero, 0x4c($s1) -/* DE8B58 802403E8 A623004A */ sh $v1, 0x4a($s1) -/* DE8B5C 802403EC A623004E */ sh $v1, 0x4e($s1) -/* DE8B60 802403F0 A6220044 */ sh $v0, 0x44($s1) -/* DE8B64 802403F4 A6200046 */ sh $zero, 0x46($s1) -/* DE8B68 802403F8 E6200034 */ swc1 $f0, 0x34($s1) -glabel L802403FC_DE8B6C -/* DE8B6C 802403FC 8623004A */ lh $v1, 0x4a($s1) -/* DE8B70 80240400 24020001 */ addiu $v0, $zero, 1 -/* DE8B74 80240404 10620005 */ beq $v1, $v0, .L8024041C -/* DE8B78 80240408 24020002 */ addiu $v0, $zero, 2 -/* DE8B7C 8024040C 1062001E */ beq $v1, $v0, .L80240488 -/* DE8B80 80240410 00000000 */ nop -/* DE8B84 80240414 0809014C */ j .L80240530 -/* DE8B88 80240418 00000000 */ nop -.L8024041C: -/* DE8B8C 8024041C 8627004C */ lh $a3, 0x4c($s1) -/* DE8B90 80240420 24100078 */ addiu $s0, $zero, 0x78 -/* DE8B94 80240424 AFB00010 */ sw $s0, 0x10($sp) -/* DE8B98 80240428 8E250034 */ lw $a1, 0x34($s1) -/* DE8B9C 8024042C 3C0644B4 */ lui $a2, 0x44b4 -/* DE8BA0 80240430 0C00A8ED */ jal update_lerp -/* DE8BA4 80240434 24040004 */ addiu $a0, $zero, 4 -/* DE8BA8 80240438 8627004C */ lh $a3, 0x4c($s1) -/* DE8BAC 8024043C E620002C */ swc1 $f0, 0x2c($s1) -/* DE8BB0 80240440 AFB00010 */ sw $s0, 0x10($sp) -/* DE8BB4 80240444 8E25001C */ lw $a1, 0x1c($s1) -/* DE8BB8 80240448 8E260024 */ lw $a2, 0x24($s1) -/* DE8BBC 8024044C 0C00A8ED */ jal update_lerp -/* DE8BC0 80240450 2404000A */ addiu $a0, $zero, 0xa -/* DE8BC4 80240454 9622004C */ lhu $v0, 0x4c($s1) -/* DE8BC8 80240458 E6200004 */ swc1 $f0, 4($s1) -/* DE8BCC 8024045C 24420001 */ addiu $v0, $v0, 1 -/* DE8BD0 80240460 A622004C */ sh $v0, 0x4c($s1) -/* DE8BD4 80240464 00021400 */ sll $v0, $v0, 0x10 -/* DE8BD8 80240468 00021403 */ sra $v0, $v0, 0x10 -/* DE8BDC 8024046C 0050102A */ slt $v0, $v0, $s0 -/* DE8BE0 80240470 1440002F */ bnez $v0, .L80240530 -/* DE8BE4 80240474 2402010E */ addiu $v0, $zero, 0x10e -/* DE8BE8 80240478 A622004C */ sh $v0, 0x4c($s1) -/* DE8BEC 8024047C 24020002 */ addiu $v0, $zero, 2 -/* DE8BF0 80240480 0809014B */ j .L8024052C -/* DE8BF4 80240484 A622004A */ sh $v0, 0x4a($s1) -.L80240488: -/* DE8BF8 80240488 8622004C */ lh $v0, 0x4c($s1) -/* DE8BFC 8024048C 44826000 */ mtc1 $v0, $f12 -/* DE8C00 80240490 00000000 */ nop -/* DE8C04 80240494 0C00A8BB */ jal sin_deg -/* DE8C08 80240498 46806320 */ cvt.s.w $f12, $f12 -/* DE8C0C 8024049C 3C013F80 */ lui $at, 0x3f80 -/* DE8C10 802404A0 44811000 */ mtc1 $at, $f2 -/* DE8C14 802404A4 00000000 */ nop -/* DE8C18 802404A8 46020000 */ add.s $f0, $f0, $f2 -/* DE8C1C 802404AC 46000000 */ add.s $f0, $f0, $f0 -/* DE8C20 802404B0 C6220024 */ lwc1 $f2, 0x24($s1) -/* DE8C24 802404B4 8622004C */ lh $v0, 0x4c($s1) -/* DE8C28 802404B8 46001080 */ add.s $f2, $f2, $f0 -/* DE8C2C 802404BC 24420008 */ addiu $v0, $v0, 8 -/* DE8C30 802404C0 44826000 */ mtc1 $v0, $f12 -/* DE8C34 802404C4 00000000 */ nop -/* DE8C38 802404C8 46806320 */ cvt.s.w $f12, $f12 -/* DE8C3C 802404CC 0C00A6C9 */ jal clamp_angle -/* DE8C40 802404D0 E6220004 */ swc1 $f2, 4($s1) -/* DE8C44 802404D4 4600010D */ trunc.w.s $f4, $f0 -/* DE8C48 802404D8 44022000 */ mfc1 $v0, $f4 -/* DE8C4C 802404DC C6200004 */ lwc1 $f0, 4($s1) -/* DE8C50 802404E0 A622004C */ sh $v0, 0x4c($s1) -/* DE8C54 802404E4 C60C0028 */ lwc1 $f12, 0x28($s0) -/* DE8C58 802404E8 8E060030 */ lw $a2, 0x30($s0) -/* DE8C5C 802404EC 3C0141A0 */ lui $at, 0x41a0 -/* DE8C60 802404F0 44817000 */ mtc1 $at, $f14 -/* DE8C64 802404F4 E7A00010 */ swc1 $f0, 0x10($sp) -/* DE8C68 802404F8 C602002C */ lwc1 $f2, 0x2c($s0) -/* DE8C6C 802404FC C6200008 */ lwc1 $f0, 8($s1) -/* DE8C70 80240500 E7A00014 */ swc1 $f0, 0x14($sp) -/* DE8C74 80240504 8E270000 */ lw $a3, ($s1) -/* DE8C78 80240508 0C00A7CB */ jal dist3D -/* DE8C7C 8024050C 460E1380 */ add.s $f14, $f2, $f14 -/* DE8C80 80240510 3C0141F0 */ lui $at, 0x41f0 -/* DE8C84 80240514 44811000 */ mtc1 $at, $f2 -/* DE8C88 80240518 00000000 */ nop -/* DE8C8C 8024051C 4600103C */ c.lt.s $f2, $f0 -/* DE8C90 80240520 00000000 */ nop -/* DE8C94 80240524 45010002 */ bc1t .L80240530 -/* DE8C98 80240528 24020003 */ addiu $v0, $zero, 3 -.L8024052C: -/* DE8C9C 8024052C A622004E */ sh $v0, 0x4e($s1) -.L80240530: -/* DE8CA0 80240530 86230048 */ lh $v1, 0x48($s1) -/* DE8CA4 80240534 24020001 */ addiu $v0, $zero, 1 -/* DE8CA8 80240538 10620005 */ beq $v1, $v0, .L80240550 -/* DE8CAC 8024053C 24020002 */ addiu $v0, $zero, 2 -/* DE8CB0 80240540 10620008 */ beq $v1, $v0, .L80240564 -/* DE8CB4 80240544 00000000 */ nop -/* DE8CB8 80240548 08090169 */ j .L802405A4 -/* DE8CBC 8024054C 00000000 */ nop -.L80240550: -/* DE8CC0 80240550 C620002C */ lwc1 $f0, 0x2c($s1) -/* DE8CC4 80240554 C62C0030 */ lwc1 $f12, 0x30($s1) -/* DE8CC8 80240558 0C00A6C9 */ jal clamp_angle -/* DE8CCC 8024055C 460C0300 */ add.s $f12, $f0, $f12 -/* DE8CD0 80240560 E620002C */ swc1 $f0, 0x2c($s1) -.L80240564: -/* DE8CD4 80240564 8E220054 */ lw $v0, 0x54($s1) -/* DE8CD8 80240568 C620002C */ lwc1 $f0, 0x2c($s1) -/* DE8CDC 8024056C 8C42000C */ lw $v0, 0xc($v0) -/* DE8CE0 80240570 E4400024 */ swc1 $f0, 0x24($v0) -/* DE8CE4 80240574 8E220054 */ lw $v0, 0x54($s1) -/* DE8CE8 80240578 C6200018 */ lwc1 $f0, 0x18($s1) -/* DE8CEC 8024057C 8C42000C */ lw $v0, 0xc($v0) -/* DE8CF0 80240580 E4400004 */ swc1 $f0, 4($v0) -/* DE8CF4 80240584 8E220054 */ lw $v0, 0x54($s1) -/* DE8CF8 80240588 C6200004 */ lwc1 $f0, 4($s1) -/* DE8CFC 8024058C 8C42000C */ lw $v0, 0xc($v0) -/* DE8D00 80240590 E4400008 */ swc1 $f0, 8($v0) -/* DE8D04 80240594 8E220054 */ lw $v0, 0x54($s1) -/* DE8D08 80240598 C6200020 */ lwc1 $f0, 0x20($s1) -/* DE8D0C 8024059C 8C42000C */ lw $v0, 0xc($v0) -/* DE8D10 802405A0 E440000C */ swc1 $f0, 0xc($v0) -.L802405A4: -/* DE8D14 802405A4 8FBF0020 */ lw $ra, 0x20($sp) -/* DE8D18 802405A8 8FB1001C */ lw $s1, 0x1c($sp) -/* DE8D1C 802405AC 8FB00018 */ lw $s0, 0x18($sp) -/* DE8D20 802405B0 0000102D */ daddu $v0, $zero, $zero -/* DE8D24 802405B4 03E00008 */ jr $ra -/* DE8D28 802405B8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_15/DE8770/func_802405BC_DE8D2C.s b/ver/us/asm/nonmatchings/world/area_omo/omo_15/DE8770/func_802405BC_DE8D2C.s deleted file mode 100644 index e79a339642..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_15/DE8770/func_802405BC_DE8D2C.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405BC_DE8D2C -/* DE8D2C 802405BC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DE8D30 802405C0 AFB00010 */ sw $s0, 0x10($sp) -/* DE8D34 802405C4 0080802D */ daddu $s0, $a0, $zero -/* DE8D38 802405C8 AFBF0014 */ sw $ra, 0x14($sp) -/* DE8D3C 802405CC 8E02000C */ lw $v0, 0xc($s0) -/* DE8D40 802405D0 0C0B1EAF */ jal evt_get_variable -/* DE8D44 802405D4 8C450000 */ lw $a1, ($v0) -/* DE8D48 802405D8 8E030084 */ lw $v1, 0x84($s0) -/* DE8D4C 802405DC 8FBF0014 */ lw $ra, 0x14($sp) -/* DE8D50 802405E0 8463004E */ lh $v1, 0x4e($v1) -/* DE8D54 802405E4 8FB00010 */ lw $s0, 0x10($sp) -/* DE8D58 802405E8 00621826 */ xor $v1, $v1, $v0 -/* DE8D5C 802405EC 2C630001 */ sltiu $v1, $v1, 1 -/* DE8D60 802405F0 00031040 */ sll $v0, $v1, 1 -/* DE8D64 802405F4 03E00008 */ jr $ra -/* DE8D68 802405F8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_15/DE8770/func_802405FC_DE8D6C.s b/ver/us/asm/nonmatchings/world/area_omo/omo_15/DE8770/func_802405FC_DE8D6C.s deleted file mode 100644 index b02c25eb90..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_15/DE8770/func_802405FC_DE8D6C.s +++ /dev/null @@ -1,72 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405FC_DE8D6C -/* DE8D6C 802405FC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* DE8D70 80240600 AFB20020 */ sw $s2, 0x20($sp) -/* DE8D74 80240604 0080902D */ daddu $s2, $a0, $zero -/* DE8D78 80240608 AFBF0024 */ sw $ra, 0x24($sp) -/* DE8D7C 8024060C AFB1001C */ sw $s1, 0x1c($sp) -/* DE8D80 80240610 AFB00018 */ sw $s0, 0x18($sp) -/* DE8D84 80240614 10A00035 */ beqz $a1, .L802406EC -/* DE8D88 80240618 8E51000C */ lw $s1, 0xc($s2) -/* DE8D8C 8024061C 0C00AB39 */ jal heap_malloc -/* DE8D90 80240620 24040058 */ addiu $a0, $zero, 0x58 -/* DE8D94 80240624 0040802D */ daddu $s0, $v0, $zero -/* DE8D98 80240628 AE500084 */ sw $s0, 0x84($s2) -/* DE8D9C 8024062C 8E250000 */ lw $a1, ($s1) -/* DE8DA0 80240630 26310004 */ addiu $s1, $s1, 4 -/* DE8DA4 80240634 0C0B1EAF */ jal evt_get_variable -/* DE8DA8 80240638 0240202D */ daddu $a0, $s2, $zero -/* DE8DAC 8024063C AE020038 */ sw $v0, 0x38($s0) -/* DE8DB0 80240640 8E250000 */ lw $a1, ($s1) -/* DE8DB4 80240644 26310004 */ addiu $s1, $s1, 4 -/* DE8DB8 80240648 0C0B210B */ jal evt_get_float_variable -/* DE8DBC 8024064C 0240202D */ daddu $a0, $s2, $zero -/* DE8DC0 80240650 E6000018 */ swc1 $f0, 0x18($s0) -/* DE8DC4 80240654 8E250000 */ lw $a1, ($s1) -/* DE8DC8 80240658 26310004 */ addiu $s1, $s1, 4 -/* DE8DCC 8024065C 0C0B210B */ jal evt_get_float_variable -/* DE8DD0 80240660 0240202D */ daddu $a0, $s2, $zero -/* DE8DD4 80240664 E6000024 */ swc1 $f0, 0x24($s0) -/* DE8DD8 80240668 8E250000 */ lw $a1, ($s1) -/* DE8DDC 8024066C 26310004 */ addiu $s1, $s1, 4 -/* DE8DE0 80240670 0C0B210B */ jal evt_get_float_variable -/* DE8DE4 80240674 0240202D */ daddu $a0, $s2, $zero -/* DE8DE8 80240678 E6000020 */ swc1 $f0, 0x20($s0) -/* DE8DEC 8024067C 8E250000 */ lw $a1, ($s1) -/* DE8DF0 80240680 0C0B210B */ jal evt_get_float_variable -/* DE8DF4 80240684 0240202D */ daddu $a0, $s2, $zero -/* DE8DF8 80240688 3C013F80 */ lui $at, 0x3f80 -/* DE8DFC 8024068C 44811000 */ mtc1 $at, $f2 -/* DE8E00 80240690 E6000028 */ swc1 $f0, 0x28($s0) -/* DE8E04 80240694 AFA00014 */ sw $zero, 0x14($sp) -/* DE8E08 80240698 E7A20010 */ swc1 $f2, 0x10($sp) -/* DE8E0C 8024069C 8E050018 */ lw $a1, 0x18($s0) -/* DE8E10 802406A0 8E060024 */ lw $a2, 0x24($s0) -/* DE8E14 802406A4 8E070020 */ lw $a3, 0x20($s0) -/* DE8E18 802406A8 0C01C9AC */ jal playFX_7B -/* DE8E1C 802406AC 24040001 */ addiu $a0, $zero, 1 -/* DE8E20 802406B0 AE020054 */ sw $v0, 0x54($s0) -/* DE8E24 802406B4 8C43000C */ lw $v1, 0xc($v0) -/* DE8E28 802406B8 9202003B */ lbu $v0, 0x3b($s0) -/* DE8E2C 802406BC A0620034 */ sb $v0, 0x34($v1) -/* DE8E30 802406C0 8E020054 */ lw $v0, 0x54($s0) -/* DE8E34 802406C4 8C42000C */ lw $v0, 0xc($v0) -/* DE8E38 802406C8 AC400020 */ sw $zero, 0x20($v0) -/* DE8E3C 802406CC 8E050018 */ lw $a1, 0x18($s0) -/* DE8E40 802406D0 8E060028 */ lw $a2, 0x28($s0) -/* DE8E44 802406D4 8E070020 */ lw $a3, 0x20($s0) -/* DE8E48 802406D8 0C044898 */ jal create_shadow_type -/* DE8E4C 802406DC 0000202D */ daddu $a0, $zero, $zero -/* DE8E50 802406E0 AE020040 */ sw $v0, 0x40($s0) -/* DE8E54 802406E4 2402010E */ addiu $v0, $zero, 0x10e -/* DE8E58 802406E8 A602004C */ sh $v0, 0x4c($s0) -.L802406EC: -/* DE8E5C 802406EC 8FBF0024 */ lw $ra, 0x24($sp) -/* DE8E60 802406F0 8FB20020 */ lw $s2, 0x20($sp) -/* DE8E64 802406F4 8FB1001C */ lw $s1, 0x1c($sp) -/* DE8E68 802406F8 8FB00018 */ lw $s0, 0x18($sp) -/* DE8E6C 802406FC 24020002 */ addiu $v0, $zero, 2 -/* DE8E70 80240700 03E00008 */ jr $ra -/* DE8E74 80240704 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_15/DE8770/func_80240708_DE8E78.s b/ver/us/asm/nonmatchings/world/area_omo/omo_15/DE8770/func_80240708_DE8E78.s deleted file mode 100644 index fa79a8a45b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_15/DE8770/func_80240708_DE8E78.s +++ /dev/null @@ -1,67 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240708_DE8E78 -/* DE8E78 80240708 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DE8E7C 8024070C AFBF0014 */ sw $ra, 0x14($sp) -/* DE8E80 80240710 AFB00010 */ sw $s0, 0x10($sp) -/* DE8E84 80240714 8C900084 */ lw $s0, 0x84($a0) -/* DE8E88 80240718 8602004C */ lh $v0, 0x4c($s0) -/* DE8E8C 8024071C 44826000 */ mtc1 $v0, $f12 -/* DE8E90 80240720 00000000 */ nop -/* DE8E94 80240724 0C00A8BB */ jal sin_deg -/* DE8E98 80240728 46806320 */ cvt.s.w $f12, $f12 -/* DE8E9C 8024072C 3C013F80 */ lui $at, 0x3f80 -/* DE8EA0 80240730 44811000 */ mtc1 $at, $f2 -/* DE8EA4 80240734 00000000 */ nop -/* DE8EA8 80240738 46020000 */ add.s $f0, $f0, $f2 -/* DE8EAC 8024073C 46000000 */ add.s $f0, $f0, $f0 -/* DE8EB0 80240740 C6020024 */ lwc1 $f2, 0x24($s0) -/* DE8EB4 80240744 8602004C */ lh $v0, 0x4c($s0) -/* DE8EB8 80240748 46001080 */ add.s $f2, $f2, $f0 -/* DE8EBC 8024074C 24420008 */ addiu $v0, $v0, 8 -/* DE8EC0 80240750 44826000 */ mtc1 $v0, $f12 -/* DE8EC4 80240754 00000000 */ nop -/* DE8EC8 80240758 46806320 */ cvt.s.w $f12, $f12 -/* DE8ECC 8024075C 0C00A6C9 */ jal clamp_angle -/* DE8ED0 80240760 E6020004 */ swc1 $f2, 4($s0) -/* DE8ED4 80240764 4600010D */ trunc.w.s $f4, $f0 -/* DE8ED8 80240768 44022000 */ mfc1 $v0, $f4 -/* DE8EDC 8024076C 00000000 */ nop -/* DE8EE0 80240770 A602004C */ sh $v0, 0x4c($s0) -/* DE8EE4 80240774 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* DE8EE8 80240778 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* DE8EEC 8024077C C44C0028 */ lwc1 $f12, 0x28($v0) -/* DE8EF0 80240780 C44E0030 */ lwc1 $f14, 0x30($v0) -/* DE8EF4 80240784 8E060018 */ lw $a2, 0x18($s0) -/* DE8EF8 80240788 0C00A7B5 */ jal dist2D -/* DE8EFC 8024078C 8E070020 */ lw $a3, 0x20($s0) -/* DE8F00 80240790 3C0141F0 */ lui $at, 0x41f0 -/* DE8F04 80240794 44811000 */ mtc1 $at, $f2 -/* DE8F08 80240798 00000000 */ nop -/* DE8F0C 8024079C 4602003E */ c.le.s $f0, $f2 -/* DE8F10 802407A0 00000000 */ nop -/* DE8F14 802407A4 45000002 */ bc1f .L802407B0 -/* DE8F18 802407A8 24020003 */ addiu $v0, $zero, 3 -/* DE8F1C 802407AC A602004E */ sh $v0, 0x4e($s0) -.L802407B0: -/* DE8F20 802407B0 8E020054 */ lw $v0, 0x54($s0) -/* DE8F24 802407B4 C6000018 */ lwc1 $f0, 0x18($s0) -/* DE8F28 802407B8 8C42000C */ lw $v0, 0xc($v0) -/* DE8F2C 802407BC E4400004 */ swc1 $f0, 4($v0) -/* DE8F30 802407C0 8E020054 */ lw $v0, 0x54($s0) -/* DE8F34 802407C4 C6000004 */ lwc1 $f0, 4($s0) -/* DE8F38 802407C8 8C42000C */ lw $v0, 0xc($v0) -/* DE8F3C 802407CC E4400008 */ swc1 $f0, 8($v0) -/* DE8F40 802407D0 8E020054 */ lw $v0, 0x54($s0) -/* DE8F44 802407D4 C6000020 */ lwc1 $f0, 0x20($s0) -/* DE8F48 802407D8 8C42000C */ lw $v0, 0xc($v0) -/* DE8F4C 802407DC E440000C */ swc1 $f0, 0xc($v0) -/* DE8F50 802407E0 8FBF0014 */ lw $ra, 0x14($sp) -/* DE8F54 802407E4 8FB00010 */ lw $s0, 0x10($sp) -/* DE8F58 802407E8 0000102D */ daddu $v0, $zero, $zero -/* DE8F5C 802407EC 03E00008 */ jr $ra -/* DE8F60 802407F0 27BD0018 */ addiu $sp, $sp, 0x18 -/* DE8F64 802407F4 00000000 */ nop -/* DE8F68 802407F8 00000000 */ nop -/* DE8F6C 802407FC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_32/D86A20/func_80240020_D86A20.s b/ver/us/asm/nonmatchings/world/area_pra/pra_32/D86A20/func_80240020_D86A20.s deleted file mode 100644 index 59fd5903a8..0000000000 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_32/D86A20/func_80240020_D86A20.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D86A20 -/* D86A20 80240020 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D86A24 80240024 AFBF001C */ sw $ra, 0x1c($sp) -/* D86A28 80240028 AFB00018 */ sw $s0, 0x18($sp) -/* D86A2C 8024002C 8C900084 */ lw $s0, 0x84($a0) -/* D86A30 80240030 C6000008 */ lwc1 $f0, 8($s0) -/* D86A34 80240034 240400A2 */ addiu $a0, $zero, 0xa2 -/* D86A38 80240038 E7A00010 */ swc1 $f0, 0x10($sp) -/* D86A3C 8024003C 8E060000 */ lw $a2, ($s0) -/* D86A40 80240040 8E070004 */ lw $a3, 4($s0) -/* D86A44 80240044 0C05267B */ jal sfx_adjust_env_sound_pos -/* D86A48 80240048 0000282D */ daddu $a1, $zero, $zero -/* D86A4C 8024004C 86020044 */ lh $v0, 0x44($s0) -/* D86A50 80240050 8FBF001C */ lw $ra, 0x1c($sp) -/* D86A54 80240054 8FB00018 */ lw $s0, 0x18($sp) -/* D86A58 80240058 28420002 */ slti $v0, $v0, 2 -/* D86A5C 8024005C 38420001 */ xori $v0, $v0, 1 -/* D86A60 80240060 00021040 */ sll $v0, $v0, 1 -/* D86A64 80240064 03E00008 */ jr $ra -/* D86A68 80240068 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_32/D86A20/func_8024006C_D86A6C.s b/ver/us/asm/nonmatchings/world/area_pra/pra_32/D86A20/func_8024006C_D86A6C.s deleted file mode 100644 index e1e14455b7..0000000000 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_32/D86A20/func_8024006C_D86A6C.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024006C_D86A6C -/* D86A6C 8024006C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* D86A70 80240070 AFB20020 */ sw $s2, 0x20($sp) -/* D86A74 80240074 0080902D */ daddu $s2, $a0, $zero -/* D86A78 80240078 AFBF0024 */ sw $ra, 0x24($sp) -/* D86A7C 8024007C AFB1001C */ sw $s1, 0x1c($sp) -/* D86A80 80240080 AFB00018 */ sw $s0, 0x18($sp) -/* D86A84 80240084 10A0004A */ beqz $a1, .L802401B0 -/* D86A88 80240088 8E51000C */ lw $s1, 0xc($s2) -/* D86A8C 8024008C 0C00AB39 */ jal heap_malloc -/* D86A90 80240090 24040058 */ addiu $a0, $zero, 0x58 -/* D86A94 80240094 0000202D */ daddu $a0, $zero, $zero -/* D86A98 80240098 3C05FD05 */ lui $a1, 0xfd05 -/* D86A9C 8024009C 34A50F81 */ ori $a1, $a1, 0xf81 -/* D86AA0 802400A0 0040802D */ daddu $s0, $v0, $zero -/* D86AA4 802400A4 0200302D */ daddu $a2, $s0, $zero -/* D86AA8 802400A8 0C0B2026 */ jal evt_set_variable -/* D86AAC 802400AC AE500084 */ sw $s0, 0x84($s2) -/* D86AB0 802400B0 8E250000 */ lw $a1, ($s1) -/* D86AB4 802400B4 26310004 */ addiu $s1, $s1, 4 -/* D86AB8 802400B8 0C0B1EAF */ jal evt_get_variable -/* D86ABC 802400BC 0240202D */ daddu $a0, $s2, $zero -/* D86AC0 802400C0 AE020038 */ sw $v0, 0x38($s0) -/* D86AC4 802400C4 8E250000 */ lw $a1, ($s1) -/* D86AC8 802400C8 26310004 */ addiu $s1, $s1, 4 -/* D86ACC 802400CC 0C0B1EAF */ jal evt_get_variable -/* D86AD0 802400D0 0240202D */ daddu $a0, $s2, $zero -/* D86AD4 802400D4 AE02003C */ sw $v0, 0x3c($s0) -/* D86AD8 802400D8 8E250000 */ lw $a1, ($s1) -/* D86ADC 802400DC 26310004 */ addiu $s1, $s1, 4 -/* D86AE0 802400E0 0C0B210B */ jal evt_get_float_variable -/* D86AE4 802400E4 0240202D */ daddu $a0, $s2, $zero -/* D86AE8 802400E8 E600000C */ swc1 $f0, 0xc($s0) -/* D86AEC 802400EC 8E250000 */ lw $a1, ($s1) -/* D86AF0 802400F0 26310004 */ addiu $s1, $s1, 4 -/* D86AF4 802400F4 0C0B210B */ jal evt_get_float_variable -/* D86AF8 802400F8 0240202D */ daddu $a0, $s2, $zero -/* D86AFC 802400FC E6000010 */ swc1 $f0, 0x10($s0) -/* D86B00 80240100 8E250000 */ lw $a1, ($s1) -/* D86B04 80240104 26310004 */ addiu $s1, $s1, 4 -/* D86B08 80240108 0C0B210B */ jal evt_get_float_variable -/* D86B0C 8024010C 0240202D */ daddu $a0, $s2, $zero -/* D86B10 80240110 E6000014 */ swc1 $f0, 0x14($s0) -/* D86B14 80240114 8E250000 */ lw $a1, ($s1) -/* D86B18 80240118 26310004 */ addiu $s1, $s1, 4 -/* D86B1C 8024011C 0C0B210B */ jal evt_get_float_variable -/* D86B20 80240120 0240202D */ daddu $a0, $s2, $zero -/* D86B24 80240124 E6000018 */ swc1 $f0, 0x18($s0) -/* D86B28 80240128 8E250000 */ lw $a1, ($s1) -/* D86B2C 8024012C 26310004 */ addiu $s1, $s1, 4 -/* D86B30 80240130 0C0B210B */ jal evt_get_float_variable -/* D86B34 80240134 0240202D */ daddu $a0, $s2, $zero -/* D86B38 80240138 E600001C */ swc1 $f0, 0x1c($s0) -/* D86B3C 8024013C 8E250000 */ lw $a1, ($s1) -/* D86B40 80240140 26310004 */ addiu $s1, $s1, 4 -/* D86B44 80240144 0C0B210B */ jal evt_get_float_variable -/* D86B48 80240148 0240202D */ daddu $a0, $s2, $zero -/* D86B4C 8024014C E6000020 */ swc1 $f0, 0x20($s0) -/* D86B50 80240150 8E250000 */ lw $a1, ($s1) -/* D86B54 80240154 26310004 */ addiu $s1, $s1, 4 -/* D86B58 80240158 0C0B210B */ jal evt_get_float_variable -/* D86B5C 8024015C 0240202D */ daddu $a0, $s2, $zero -/* D86B60 80240160 E6000024 */ swc1 $f0, 0x24($s0) -/* D86B64 80240164 8E250000 */ lw $a1, ($s1) -/* D86B68 80240168 0C0B210B */ jal evt_get_float_variable -/* D86B6C 8024016C 0240202D */ daddu $a0, $s2, $zero -/* D86B70 80240170 3C013F80 */ lui $at, 0x3f80 -/* D86B74 80240174 44811000 */ mtc1 $at, $f2 -/* D86B78 80240178 E6000028 */ swc1 $f0, 0x28($s0) -/* D86B7C 8024017C AFA00014 */ sw $zero, 0x14($sp) -/* D86B80 80240180 E7A20010 */ swc1 $f2, 0x10($sp) -/* D86B84 80240184 8E05000C */ lw $a1, 0xc($s0) -/* D86B88 80240188 8E060010 */ lw $a2, 0x10($s0) -/* D86B8C 8024018C 8E070014 */ lw $a3, 0x14($s0) -/* D86B90 80240190 0C01CA6C */ jal playFX_83 -/* D86B94 80240194 24040002 */ addiu $a0, $zero, 2 -/* D86B98 80240198 AE020050 */ sw $v0, 0x50($s0) -/* D86B9C 8024019C A600004E */ sh $zero, 0x4e($s0) -/* D86BA0 802401A0 A6000048 */ sh $zero, 0x48($s0) -/* D86BA4 802401A4 A600004A */ sh $zero, 0x4a($s0) -/* D86BA8 802401A8 A6000044 */ sh $zero, 0x44($s0) -/* D86BAC 802401AC A6000046 */ sh $zero, 0x46($s0) -.L802401B0: -/* D86BB0 802401B0 8FBF0024 */ lw $ra, 0x24($sp) -/* D86BB4 802401B4 8FB20020 */ lw $s2, 0x20($sp) -/* D86BB8 802401B8 8FB1001C */ lw $s1, 0x1c($sp) -/* D86BBC 802401BC 8FB00018 */ lw $s0, 0x18($sp) -/* D86BC0 802401C0 24020002 */ addiu $v0, $zero, 2 -/* D86BC4 802401C4 03E00008 */ jr $ra -/* D86BC8 802401C8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_32/D86A20/func_802401CC_D86BCC.s b/ver/us/asm/nonmatchings/world/area_pra/pra_32/D86A20/func_802401CC_D86BCC.s deleted file mode 100644 index a4b1c83c77..0000000000 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_32/D86A20/func_802401CC_D86BCC.s +++ /dev/null @@ -1,283 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel jtbl_80242CB0_D896B0 -.word L8024020C_D86C0C, L802402CC_D86CCC, L80240314_D86D14, L802403B4_D86DB4, L8024041C_D86E1C - -.section .text - -glabel func_802401CC_D86BCC -/* D86BCC 802401CC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* D86BD0 802401D0 AFBF0020 */ sw $ra, 0x20($sp) -/* D86BD4 802401D4 AFB1001C */ sw $s1, 0x1c($sp) -/* D86BD8 802401D8 AFB00018 */ sw $s0, 0x18($sp) -/* D86BDC 802401DC 8C910084 */ lw $s1, 0x84($a0) -/* D86BE0 802401E0 86230044 */ lh $v1, 0x44($s1) -/* D86BE4 802401E4 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D86BE8 802401E8 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D86BEC 802401EC 2C620005 */ sltiu $v0, $v1, 5 -/* D86BF0 802401F0 1040008A */ beqz $v0, L8024041C_D86E1C -/* D86BF4 802401F4 00031080 */ sll $v0, $v1, 2 -/* D86BF8 802401F8 3C018024 */ lui $at, %hi(jtbl_80242CB0_D896B0) -/* D86BFC 802401FC 00220821 */ addu $at, $at, $v0 -/* D86C00 80240200 8C222CB0 */ lw $v0, %lo(jtbl_80242CB0_D896B0)($at) -/* D86C04 80240204 00400008 */ jr $v0 -/* D86C08 80240208 00000000 */ nop -glabel L8024020C_D86C0C -/* D86C0C 8024020C 8E22003C */ lw $v0, 0x3c($s1) -/* D86C10 80240210 86270046 */ lh $a3, 0x46($s1) -/* D86C14 80240214 AFA20010 */ sw $v0, 0x10($sp) -/* D86C18 80240218 8E250010 */ lw $a1, 0x10($s1) -/* D86C1C 8024021C 8E26001C */ lw $a2, 0x1c($s1) -/* D86C20 80240220 0C00A8ED */ jal update_lerp -/* D86C24 80240224 24040005 */ addiu $a0, $zero, 5 -/* D86C28 80240228 86270046 */ lh $a3, 0x46($s1) -/* D86C2C 8024022C 8E22003C */ lw $v0, 0x3c($s1) -/* D86C30 80240230 E6200004 */ swc1 $f0, 4($s1) -/* D86C34 80240234 AFA20010 */ sw $v0, 0x10($sp) -/* D86C38 80240238 8E25000C */ lw $a1, 0xc($s1) -/* D86C3C 8024023C 8E260018 */ lw $a2, 0x18($s1) -/* D86C40 80240240 0C00A8ED */ jal update_lerp -/* D86C44 80240244 0000202D */ daddu $a0, $zero, $zero -/* D86C48 80240248 86270046 */ lh $a3, 0x46($s1) -/* D86C4C 8024024C 8E22003C */ lw $v0, 0x3c($s1) -/* D86C50 80240250 E6200000 */ swc1 $f0, ($s1) -/* D86C54 80240254 AFA20010 */ sw $v0, 0x10($sp) -/* D86C58 80240258 8E250014 */ lw $a1, 0x14($s1) -/* D86C5C 8024025C 8E260020 */ lw $a2, 0x20($s1) -/* D86C60 80240260 0C00A8ED */ jal update_lerp -/* D86C64 80240264 0000202D */ daddu $a0, $zero, $zero -/* D86C68 80240268 8E220050 */ lw $v0, 0x50($s1) -/* D86C6C 8024026C E6200008 */ swc1 $f0, 8($s1) -/* D86C70 80240270 C6200000 */ lwc1 $f0, ($s1) -/* D86C74 80240274 8C42000C */ lw $v0, 0xc($v0) -/* D86C78 80240278 E4400008 */ swc1 $f0, 8($v0) -/* D86C7C 8024027C 8E220050 */ lw $v0, 0x50($s1) -/* D86C80 80240280 C6200004 */ lwc1 $f0, 4($s1) -/* D86C84 80240284 8C42000C */ lw $v0, 0xc($v0) -/* D86C88 80240288 E440000C */ swc1 $f0, 0xc($v0) -/* D86C8C 8024028C 8E220050 */ lw $v0, 0x50($s1) -/* D86C90 80240290 C6200008 */ lwc1 $f0, 8($s1) -/* D86C94 80240294 8C42000C */ lw $v0, 0xc($v0) -/* D86C98 80240298 E4400010 */ swc1 $f0, 0x10($v0) -/* D86C9C 8024029C 96220046 */ lhu $v0, 0x46($s1) -/* D86CA0 802402A0 8E23003C */ lw $v1, 0x3c($s1) -/* D86CA4 802402A4 24420001 */ addiu $v0, $v0, 1 -/* D86CA8 802402A8 A6220046 */ sh $v0, 0x46($s1) -/* D86CAC 802402AC 00021400 */ sll $v0, $v0, 0x10 -/* D86CB0 802402B0 00021403 */ sra $v0, $v0, 0x10 -/* D86CB4 802402B4 0043102A */ slt $v0, $v0, $v1 -/* D86CB8 802402B8 14400058 */ bnez $v0, L8024041C_D86E1C -/* D86CBC 802402BC 24020001 */ addiu $v0, $zero, 1 -/* D86CC0 802402C0 A6220044 */ sh $v0, 0x44($s1) -/* D86CC4 802402C4 08090107 */ j L8024041C_D86E1C -/* D86CC8 802402C8 A6200046 */ sh $zero, 0x46($s1) -glabel L802402CC_D86CCC -/* D86CCC 802402CC 96220046 */ lhu $v0, 0x46($s1) -/* D86CD0 802402D0 24420001 */ addiu $v0, $v0, 1 -/* D86CD4 802402D4 A6220046 */ sh $v0, 0x46($s1) -/* D86CD8 802402D8 00021400 */ sll $v0, $v0, 0x10 -/* D86CDC 802402DC 00021403 */ sra $v0, $v0, 0x10 -/* D86CE0 802402E0 2842003C */ slti $v0, $v0, 0x3c -/* D86CE4 802402E4 1440004D */ bnez $v0, L8024041C_D86E1C -/* D86CE8 802402E8 24020002 */ addiu $v0, $zero, 2 -/* D86CEC 802402EC 8E230050 */ lw $v1, 0x50($s1) -/* D86CF0 802402F0 A6220044 */ sh $v0, 0x44($s1) -/* D86CF4 802402F4 A6200046 */ sh $zero, 0x46($s1) -/* D86CF8 802402F8 8C63000C */ lw $v1, 0xc($v1) -/* D86CFC 802402FC 24020001 */ addiu $v0, $zero, 1 -/* D86D00 80240300 AC620070 */ sw $v0, 0x70($v1) -/* D86D04 80240304 8E220050 */ lw $v0, 0x50($s1) -/* D86D08 80240308 8C42000C */ lw $v0, 0xc($v0) -/* D86D0C 8024030C 08090107 */ j L8024041C_D86E1C -/* D86D10 80240310 AC400074 */ sw $zero, 0x74($v0) -glabel L80240314_D86D14 -/* D86D14 80240314 96220046 */ lhu $v0, 0x46($s1) -/* D86D18 80240318 24420001 */ addiu $v0, $v0, 1 -/* D86D1C 8024031C A6220046 */ sh $v0, 0x46($s1) -/* D86D20 80240320 00021400 */ sll $v0, $v0, 0x10 -/* D86D24 80240324 00021403 */ sra $v0, $v0, 0x10 -/* D86D28 80240328 2842003C */ slti $v0, $v0, 0x3c -/* D86D2C 8024032C 1440003B */ bnez $v0, L8024041C_D86E1C -/* D86D30 80240330 00000000 */ nop -/* D86D34 80240334 3C013F80 */ lui $at, 0x3f80 -/* D86D38 80240338 44810000 */ mtc1 $at, $f0 -/* D86D3C 8024033C AFA00014 */ sw $zero, 0x14($sp) -/* D86D40 80240340 E7A00010 */ swc1 $f0, 0x10($sp) -/* D86D44 80240344 8E250018 */ lw $a1, 0x18($s1) -/* D86D48 80240348 8E26001C */ lw $a2, 0x1c($s1) -/* D86D4C 8024034C 8E270020 */ lw $a3, 0x20($s1) -/* D86D50 80240350 0C01C9AC */ jal playFX_7B -/* D86D54 80240354 24040001 */ addiu $a0, $zero, 1 -/* D86D58 80240358 AE220054 */ sw $v0, 0x54($s1) -/* D86D5C 8024035C 8C43000C */ lw $v1, 0xc($v0) -/* D86D60 80240360 9222003B */ lbu $v0, 0x3b($s1) -/* D86D64 80240364 A0620034 */ sb $v0, 0x34($v1) -/* D86D68 80240368 8E220054 */ lw $v0, 0x54($s1) -/* D86D6C 8024036C 8C42000C */ lw $v0, 0xc($v0) -/* D86D70 80240370 AC400020 */ sw $zero, 0x20($v0) -/* D86D74 80240374 8E250018 */ lw $a1, 0x18($s1) -/* D86D78 80240378 8E260028 */ lw $a2, 0x28($s1) -/* D86D7C 8024037C 8E270020 */ lw $a3, 0x20($s1) -/* D86D80 80240380 0C044898 */ jal create_shadow_type -/* D86D84 80240384 0000202D */ daddu $a0, $zero, $zero -/* D86D88 80240388 3C014210 */ lui $at, 0x4210 -/* D86D8C 8024038C 44810000 */ mtc1 $at, $f0 -/* D86D90 80240390 AE220040 */ sw $v0, 0x40($s1) -/* D86D94 80240394 24020003 */ addiu $v0, $zero, 3 -/* D86D98 80240398 A6220044 */ sh $v0, 0x44($s1) -/* D86D9C 8024039C 24020001 */ addiu $v0, $zero, 1 -/* D86DA0 802403A0 A6200046 */ sh $zero, 0x46($s1) -/* D86DA4 802403A4 AE20002C */ sw $zero, 0x2c($s1) -/* D86DA8 802403A8 A6220048 */ sh $v0, 0x48($s1) -/* D86DAC 802403AC 08090107 */ j L8024041C_D86E1C -/* D86DB0 802403B0 E6200030 */ swc1 $f0, 0x30($s1) -glabel L802403B4_D86DB4 -/* D86DB4 802403B4 0000202D */ daddu $a0, $zero, $zero -/* D86DB8 802403B8 3C054210 */ lui $a1, 0x4210 -/* D86DBC 802403BC 3C064198 */ lui $a2, 0x4198 -/* D86DC0 802403C0 86270046 */ lh $a3, 0x46($s1) -/* D86DC4 802403C4 24020078 */ addiu $v0, $zero, 0x78 -/* D86DC8 802403C8 0C00A8ED */ jal update_lerp -/* D86DCC 802403CC AFA20010 */ sw $v0, 0x10($sp) -/* D86DD0 802403D0 96220046 */ lhu $v0, 0x46($s1) -/* D86DD4 802403D4 E6200030 */ swc1 $f0, 0x30($s1) -/* D86DD8 802403D8 24420001 */ addiu $v0, $v0, 1 -/* D86DDC 802403DC A6220046 */ sh $v0, 0x46($s1) -/* D86DE0 802403E0 00021400 */ sll $v0, $v0, 0x10 -/* D86DE4 802403E4 00021403 */ sra $v0, $v0, 0x10 -/* D86DE8 802403E8 28420078 */ slti $v0, $v0, 0x78 -/* D86DEC 802403EC 1440000B */ bnez $v0, L8024041C_D86E1C -/* D86DF0 802403F0 24030001 */ addiu $v1, $zero, 1 -/* D86DF4 802403F4 C620002C */ lwc1 $f0, 0x2c($s1) -/* D86DF8 802403F8 24020002 */ addiu $v0, $zero, 2 -/* D86DFC 802403FC A6220048 */ sh $v0, 0x48($s1) -/* D86E00 80240400 24020004 */ addiu $v0, $zero, 4 -/* D86E04 80240404 A620004C */ sh $zero, 0x4c($s1) -/* D86E08 80240408 A623004A */ sh $v1, 0x4a($s1) -/* D86E0C 8024040C A623004E */ sh $v1, 0x4e($s1) -/* D86E10 80240410 A6220044 */ sh $v0, 0x44($s1) -/* D86E14 80240414 A6200046 */ sh $zero, 0x46($s1) -/* D86E18 80240418 E6200034 */ swc1 $f0, 0x34($s1) -glabel L8024041C_D86E1C -/* D86E1C 8024041C 8623004A */ lh $v1, 0x4a($s1) -/* D86E20 80240420 24020001 */ addiu $v0, $zero, 1 -/* D86E24 80240424 10620005 */ beq $v1, $v0, .L8024043C -/* D86E28 80240428 24020002 */ addiu $v0, $zero, 2 -/* D86E2C 8024042C 1062001E */ beq $v1, $v0, .L802404A8 -/* D86E30 80240430 00000000 */ nop -/* D86E34 80240434 08090154 */ j .L80240550 -/* D86E38 80240438 00000000 */ nop -.L8024043C: -/* D86E3C 8024043C 8627004C */ lh $a3, 0x4c($s1) -/* D86E40 80240440 24100078 */ addiu $s0, $zero, 0x78 -/* D86E44 80240444 AFB00010 */ sw $s0, 0x10($sp) -/* D86E48 80240448 8E250034 */ lw $a1, 0x34($s1) -/* D86E4C 8024044C 3C0644B4 */ lui $a2, 0x44b4 -/* D86E50 80240450 0C00A8ED */ jal update_lerp -/* D86E54 80240454 24040004 */ addiu $a0, $zero, 4 -/* D86E58 80240458 8627004C */ lh $a3, 0x4c($s1) -/* D86E5C 8024045C E620002C */ swc1 $f0, 0x2c($s1) -/* D86E60 80240460 AFB00010 */ sw $s0, 0x10($sp) -/* D86E64 80240464 8E25001C */ lw $a1, 0x1c($s1) -/* D86E68 80240468 8E260024 */ lw $a2, 0x24($s1) -/* D86E6C 8024046C 0C00A8ED */ jal update_lerp -/* D86E70 80240470 2404000A */ addiu $a0, $zero, 0xa -/* D86E74 80240474 9622004C */ lhu $v0, 0x4c($s1) -/* D86E78 80240478 E6200004 */ swc1 $f0, 4($s1) -/* D86E7C 8024047C 24420001 */ addiu $v0, $v0, 1 -/* D86E80 80240480 A622004C */ sh $v0, 0x4c($s1) -/* D86E84 80240484 00021400 */ sll $v0, $v0, 0x10 -/* D86E88 80240488 00021403 */ sra $v0, $v0, 0x10 -/* D86E8C 8024048C 0050102A */ slt $v0, $v0, $s0 -/* D86E90 80240490 1440002F */ bnez $v0, .L80240550 -/* D86E94 80240494 2402010E */ addiu $v0, $zero, 0x10e -/* D86E98 80240498 A622004C */ sh $v0, 0x4c($s1) -/* D86E9C 8024049C 24020002 */ addiu $v0, $zero, 2 -/* D86EA0 802404A0 08090153 */ j .L8024054C -/* D86EA4 802404A4 A622004A */ sh $v0, 0x4a($s1) -.L802404A8: -/* D86EA8 802404A8 8622004C */ lh $v0, 0x4c($s1) -/* D86EAC 802404AC 44826000 */ mtc1 $v0, $f12 -/* D86EB0 802404B0 00000000 */ nop -/* D86EB4 802404B4 0C00A8BB */ jal sin_deg -/* D86EB8 802404B8 46806320 */ cvt.s.w $f12, $f12 -/* D86EBC 802404BC 3C013F80 */ lui $at, 0x3f80 -/* D86EC0 802404C0 44811000 */ mtc1 $at, $f2 -/* D86EC4 802404C4 00000000 */ nop -/* D86EC8 802404C8 46020000 */ add.s $f0, $f0, $f2 -/* D86ECC 802404CC 46000000 */ add.s $f0, $f0, $f0 -/* D86ED0 802404D0 C6220024 */ lwc1 $f2, 0x24($s1) -/* D86ED4 802404D4 8622004C */ lh $v0, 0x4c($s1) -/* D86ED8 802404D8 46001080 */ add.s $f2, $f2, $f0 -/* D86EDC 802404DC 24420008 */ addiu $v0, $v0, 8 -/* D86EE0 802404E0 44826000 */ mtc1 $v0, $f12 -/* D86EE4 802404E4 00000000 */ nop -/* D86EE8 802404E8 46806320 */ cvt.s.w $f12, $f12 -/* D86EEC 802404EC 0C00A6C9 */ jal clamp_angle -/* D86EF0 802404F0 E6220004 */ swc1 $f2, 4($s1) -/* D86EF4 802404F4 4600010D */ trunc.w.s $f4, $f0 -/* D86EF8 802404F8 44022000 */ mfc1 $v0, $f4 -/* D86EFC 802404FC C6200004 */ lwc1 $f0, 4($s1) -/* D86F00 80240500 A622004C */ sh $v0, 0x4c($s1) -/* D86F04 80240504 C60C0028 */ lwc1 $f12, 0x28($s0) -/* D86F08 80240508 8E060030 */ lw $a2, 0x30($s0) -/* D86F0C 8024050C 3C0141A0 */ lui $at, 0x41a0 -/* D86F10 80240510 44817000 */ mtc1 $at, $f14 -/* D86F14 80240514 E7A00010 */ swc1 $f0, 0x10($sp) -/* D86F18 80240518 C602002C */ lwc1 $f2, 0x2c($s0) -/* D86F1C 8024051C C6200008 */ lwc1 $f0, 8($s1) -/* D86F20 80240520 E7A00014 */ swc1 $f0, 0x14($sp) -/* D86F24 80240524 8E270000 */ lw $a3, ($s1) -/* D86F28 80240528 0C00A7CB */ jal dist3D -/* D86F2C 8024052C 460E1380 */ add.s $f14, $f2, $f14 -/* D86F30 80240530 3C0141F0 */ lui $at, 0x41f0 -/* D86F34 80240534 44811000 */ mtc1 $at, $f2 -/* D86F38 80240538 00000000 */ nop -/* D86F3C 8024053C 4600103C */ c.lt.s $f2, $f0 -/* D86F40 80240540 00000000 */ nop -/* D86F44 80240544 45010002 */ bc1t .L80240550 -/* D86F48 80240548 24020003 */ addiu $v0, $zero, 3 -.L8024054C: -/* D86F4C 8024054C A622004E */ sh $v0, 0x4e($s1) -.L80240550: -/* D86F50 80240550 86230048 */ lh $v1, 0x48($s1) -/* D86F54 80240554 24020001 */ addiu $v0, $zero, 1 -/* D86F58 80240558 10620005 */ beq $v1, $v0, .L80240570 -/* D86F5C 8024055C 24020002 */ addiu $v0, $zero, 2 -/* D86F60 80240560 10620008 */ beq $v1, $v0, .L80240584 -/* D86F64 80240564 00000000 */ nop -/* D86F68 80240568 08090171 */ j .L802405C4 -/* D86F6C 8024056C 00000000 */ nop -.L80240570: -/* D86F70 80240570 C620002C */ lwc1 $f0, 0x2c($s1) -/* D86F74 80240574 C62C0030 */ lwc1 $f12, 0x30($s1) -/* D86F78 80240578 0C00A6C9 */ jal clamp_angle -/* D86F7C 8024057C 460C0300 */ add.s $f12, $f0, $f12 -/* D86F80 80240580 E620002C */ swc1 $f0, 0x2c($s1) -.L80240584: -/* D86F84 80240584 8E220054 */ lw $v0, 0x54($s1) -/* D86F88 80240588 C620002C */ lwc1 $f0, 0x2c($s1) -/* D86F8C 8024058C 8C42000C */ lw $v0, 0xc($v0) -/* D86F90 80240590 E4400024 */ swc1 $f0, 0x24($v0) -/* D86F94 80240594 8E220054 */ lw $v0, 0x54($s1) -/* D86F98 80240598 C6200018 */ lwc1 $f0, 0x18($s1) -/* D86F9C 8024059C 8C42000C */ lw $v0, 0xc($v0) -/* D86FA0 802405A0 E4400004 */ swc1 $f0, 4($v0) -/* D86FA4 802405A4 8E220054 */ lw $v0, 0x54($s1) -/* D86FA8 802405A8 C6200004 */ lwc1 $f0, 4($s1) -/* D86FAC 802405AC 8C42000C */ lw $v0, 0xc($v0) -/* D86FB0 802405B0 E4400008 */ swc1 $f0, 8($v0) -/* D86FB4 802405B4 8E220054 */ lw $v0, 0x54($s1) -/* D86FB8 802405B8 C6200020 */ lwc1 $f0, 0x20($s1) -/* D86FBC 802405BC 8C42000C */ lw $v0, 0xc($v0) -/* D86FC0 802405C0 E440000C */ swc1 $f0, 0xc($v0) -.L802405C4: -/* D86FC4 802405C4 8FBF0020 */ lw $ra, 0x20($sp) -/* D86FC8 802405C8 8FB1001C */ lw $s1, 0x1c($sp) -/* D86FCC 802405CC 8FB00018 */ lw $s0, 0x18($sp) -/* D86FD0 802405D0 0000102D */ daddu $v0, $zero, $zero -/* D86FD4 802405D4 03E00008 */ jr $ra -/* D86FD8 802405D8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_32/D86A20/func_802405DC_D86FDC.s b/ver/us/asm/nonmatchings/world/area_pra/pra_32/D86A20/func_802405DC_D86FDC.s deleted file mode 100644 index 1c1fe37b1b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_32/D86A20/func_802405DC_D86FDC.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405DC_D86FDC -/* D86FDC 802405DC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D86FE0 802405E0 AFB00010 */ sw $s0, 0x10($sp) -/* D86FE4 802405E4 0080802D */ daddu $s0, $a0, $zero -/* D86FE8 802405E8 AFBF0014 */ sw $ra, 0x14($sp) -/* D86FEC 802405EC 8E02000C */ lw $v0, 0xc($s0) -/* D86FF0 802405F0 0C0B1EAF */ jal evt_get_variable -/* D86FF4 802405F4 8C450000 */ lw $a1, ($v0) -/* D86FF8 802405F8 8E030084 */ lw $v1, 0x84($s0) -/* D86FFC 802405FC 8FBF0014 */ lw $ra, 0x14($sp) -/* D87000 80240600 8463004E */ lh $v1, 0x4e($v1) -/* D87004 80240604 8FB00010 */ lw $s0, 0x10($sp) -/* D87008 80240608 00621826 */ xor $v1, $v1, $v0 -/* D8700C 8024060C 2C630001 */ sltiu $v1, $v1, 1 -/* D87010 80240610 00031040 */ sll $v0, $v1, 1 -/* D87014 80240614 03E00008 */ jr $ra -/* D87018 80240618 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_32/D86A20/func_8024061C_D8701C.s b/ver/us/asm/nonmatchings/world/area_pra/pra_32/D86A20/func_8024061C_D8701C.s deleted file mode 100644 index 0ad9eefab6..0000000000 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_32/D86A20/func_8024061C_D8701C.s +++ /dev/null @@ -1,72 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024061C_D8701C -/* D8701C 8024061C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* D87020 80240620 AFB20020 */ sw $s2, 0x20($sp) -/* D87024 80240624 0080902D */ daddu $s2, $a0, $zero -/* D87028 80240628 AFBF0024 */ sw $ra, 0x24($sp) -/* D8702C 8024062C AFB1001C */ sw $s1, 0x1c($sp) -/* D87030 80240630 AFB00018 */ sw $s0, 0x18($sp) -/* D87034 80240634 10A00035 */ beqz $a1, .L8024070C -/* D87038 80240638 8E51000C */ lw $s1, 0xc($s2) -/* D8703C 8024063C 0C00AB39 */ jal heap_malloc -/* D87040 80240640 24040058 */ addiu $a0, $zero, 0x58 -/* D87044 80240644 0040802D */ daddu $s0, $v0, $zero -/* D87048 80240648 AE500084 */ sw $s0, 0x84($s2) -/* D8704C 8024064C 8E250000 */ lw $a1, ($s1) -/* D87050 80240650 26310004 */ addiu $s1, $s1, 4 -/* D87054 80240654 0C0B1EAF */ jal evt_get_variable -/* D87058 80240658 0240202D */ daddu $a0, $s2, $zero -/* D8705C 8024065C AE020038 */ sw $v0, 0x38($s0) -/* D87060 80240660 8E250000 */ lw $a1, ($s1) -/* D87064 80240664 26310004 */ addiu $s1, $s1, 4 -/* D87068 80240668 0C0B210B */ jal evt_get_float_variable -/* D8706C 8024066C 0240202D */ daddu $a0, $s2, $zero -/* D87070 80240670 E6000018 */ swc1 $f0, 0x18($s0) -/* D87074 80240674 8E250000 */ lw $a1, ($s1) -/* D87078 80240678 26310004 */ addiu $s1, $s1, 4 -/* D8707C 8024067C 0C0B210B */ jal evt_get_float_variable -/* D87080 80240680 0240202D */ daddu $a0, $s2, $zero -/* D87084 80240684 E6000024 */ swc1 $f0, 0x24($s0) -/* D87088 80240688 8E250000 */ lw $a1, ($s1) -/* D8708C 8024068C 26310004 */ addiu $s1, $s1, 4 -/* D87090 80240690 0C0B210B */ jal evt_get_float_variable -/* D87094 80240694 0240202D */ daddu $a0, $s2, $zero -/* D87098 80240698 E6000020 */ swc1 $f0, 0x20($s0) -/* D8709C 8024069C 8E250000 */ lw $a1, ($s1) -/* D870A0 802406A0 0C0B210B */ jal evt_get_float_variable -/* D870A4 802406A4 0240202D */ daddu $a0, $s2, $zero -/* D870A8 802406A8 3C013F80 */ lui $at, 0x3f80 -/* D870AC 802406AC 44811000 */ mtc1 $at, $f2 -/* D870B0 802406B0 E6000028 */ swc1 $f0, 0x28($s0) -/* D870B4 802406B4 AFA00014 */ sw $zero, 0x14($sp) -/* D870B8 802406B8 E7A20010 */ swc1 $f2, 0x10($sp) -/* D870BC 802406BC 8E050018 */ lw $a1, 0x18($s0) -/* D870C0 802406C0 8E060024 */ lw $a2, 0x24($s0) -/* D870C4 802406C4 8E070020 */ lw $a3, 0x20($s0) -/* D870C8 802406C8 0C01C9AC */ jal playFX_7B -/* D870CC 802406CC 24040001 */ addiu $a0, $zero, 1 -/* D870D0 802406D0 AE020054 */ sw $v0, 0x54($s0) -/* D870D4 802406D4 8C43000C */ lw $v1, 0xc($v0) -/* D870D8 802406D8 9202003B */ lbu $v0, 0x3b($s0) -/* D870DC 802406DC A0620034 */ sb $v0, 0x34($v1) -/* D870E0 802406E0 8E020054 */ lw $v0, 0x54($s0) -/* D870E4 802406E4 8C42000C */ lw $v0, 0xc($v0) -/* D870E8 802406E8 AC400020 */ sw $zero, 0x20($v0) -/* D870EC 802406EC 8E050018 */ lw $a1, 0x18($s0) -/* D870F0 802406F0 8E060028 */ lw $a2, 0x28($s0) -/* D870F4 802406F4 8E070020 */ lw $a3, 0x20($s0) -/* D870F8 802406F8 0C044898 */ jal create_shadow_type -/* D870FC 802406FC 0000202D */ daddu $a0, $zero, $zero -/* D87100 80240700 AE020040 */ sw $v0, 0x40($s0) -/* D87104 80240704 2402010E */ addiu $v0, $zero, 0x10e -/* D87108 80240708 A602004C */ sh $v0, 0x4c($s0) -.L8024070C: -/* D8710C 8024070C 8FBF0024 */ lw $ra, 0x24($sp) -/* D87110 80240710 8FB20020 */ lw $s2, 0x20($sp) -/* D87114 80240714 8FB1001C */ lw $s1, 0x1c($sp) -/* D87118 80240718 8FB00018 */ lw $s0, 0x18($sp) -/* D8711C 8024071C 24020002 */ addiu $v0, $zero, 2 -/* D87120 80240720 03E00008 */ jr $ra -/* D87124 80240724 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_32/D86A20/func_80240728_D87128.s b/ver/us/asm/nonmatchings/world/area_pra/pra_32/D86A20/func_80240728_D87128.s deleted file mode 100644 index e73d932e5a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_32/D86A20/func_80240728_D87128.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240728_D87128 -/* D87128 80240728 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D8712C 8024072C AFBF0014 */ sw $ra, 0x14($sp) -/* D87130 80240730 AFB00010 */ sw $s0, 0x10($sp) -/* D87134 80240734 8C900084 */ lw $s0, 0x84($a0) -/* D87138 80240738 8602004C */ lh $v0, 0x4c($s0) -/* D8713C 8024073C 44826000 */ mtc1 $v0, $f12 -/* D87140 80240740 00000000 */ nop -/* D87144 80240744 0C00A8BB */ jal sin_deg -/* D87148 80240748 46806320 */ cvt.s.w $f12, $f12 -/* D8714C 8024074C 3C013F80 */ lui $at, 0x3f80 -/* D87150 80240750 44811000 */ mtc1 $at, $f2 -/* D87154 80240754 00000000 */ nop -/* D87158 80240758 46020000 */ add.s $f0, $f0, $f2 -/* D8715C 8024075C 46000000 */ add.s $f0, $f0, $f0 -/* D87160 80240760 C6020024 */ lwc1 $f2, 0x24($s0) -/* D87164 80240764 8602004C */ lh $v0, 0x4c($s0) -/* D87168 80240768 46001080 */ add.s $f2, $f2, $f0 -/* D8716C 8024076C 24420008 */ addiu $v0, $v0, 8 -/* D87170 80240770 44826000 */ mtc1 $v0, $f12 -/* D87174 80240774 00000000 */ nop -/* D87178 80240778 46806320 */ cvt.s.w $f12, $f12 -/* D8717C 8024077C 0C00A6C9 */ jal clamp_angle -/* D87180 80240780 E6020004 */ swc1 $f2, 4($s0) -/* D87184 80240784 4600010D */ trunc.w.s $f4, $f0 -/* D87188 80240788 44022000 */ mfc1 $v0, $f4 -/* D8718C 8024078C 00000000 */ nop -/* D87190 80240790 A602004C */ sh $v0, 0x4c($s0) -/* D87194 80240794 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* D87198 80240798 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* D8719C 8024079C C44C0028 */ lwc1 $f12, 0x28($v0) -/* D871A0 802407A0 C44E0030 */ lwc1 $f14, 0x30($v0) -/* D871A4 802407A4 8E060018 */ lw $a2, 0x18($s0) -/* D871A8 802407A8 0C00A7B5 */ jal dist2D -/* D871AC 802407AC 8E070020 */ lw $a3, 0x20($s0) -/* D871B0 802407B0 3C0141F0 */ lui $at, 0x41f0 -/* D871B4 802407B4 44811000 */ mtc1 $at, $f2 -/* D871B8 802407B8 00000000 */ nop -/* D871BC 802407BC 4602003E */ c.le.s $f0, $f2 -/* D871C0 802407C0 00000000 */ nop -/* D871C4 802407C4 45000002 */ bc1f .L802407D0 -/* D871C8 802407C8 24020003 */ addiu $v0, $zero, 3 -/* D871CC 802407CC A602004E */ sh $v0, 0x4e($s0) -.L802407D0: -/* D871D0 802407D0 8E020054 */ lw $v0, 0x54($s0) -/* D871D4 802407D4 C6000018 */ lwc1 $f0, 0x18($s0) -/* D871D8 802407D8 8C42000C */ lw $v0, 0xc($v0) -/* D871DC 802407DC E4400004 */ swc1 $f0, 4($v0) -/* D871E0 802407E0 8E020054 */ lw $v0, 0x54($s0) -/* D871E4 802407E4 C6000004 */ lwc1 $f0, 4($s0) -/* D871E8 802407E8 8C42000C */ lw $v0, 0xc($v0) -/* D871EC 802407EC E4400008 */ swc1 $f0, 8($v0) -/* D871F0 802407F0 8E020054 */ lw $v0, 0x54($s0) -/* D871F4 802407F4 C6000020 */ lwc1 $f0, 0x20($s0) -/* D871F8 802407F8 8C42000C */ lw $v0, 0xc($v0) -/* D871FC 802407FC E440000C */ swc1 $f0, 0xc($v0) -/* D87200 80240800 8FBF0014 */ lw $ra, 0x14($sp) -/* D87204 80240804 8FB00010 */ lw $s0, 0x10($sp) -/* D87208 80240808 0000102D */ daddu $v0, $zero, $zero -/* D8720C 8024080C 03E00008 */ jr $ra -/* D87210 80240810 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_10/9C2910/func_80240000_9C2910.s b/ver/us/asm/nonmatchings/world/area_trd/trd_10/9C2910/func_80240000_9C2910.s deleted file mode 100644 index c880142f2b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_10/9C2910/func_80240000_9C2910.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_9C2910 -/* 9C2910 80240000 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9C2914 80240004 AFBF001C */ sw $ra, 0x1c($sp) -/* 9C2918 80240008 AFB00018 */ sw $s0, 0x18($sp) -/* 9C291C 8024000C 8C900084 */ lw $s0, 0x84($a0) -/* 9C2920 80240010 C6000008 */ lwc1 $f0, 8($s0) -/* 9C2924 80240014 240400A2 */ addiu $a0, $zero, 0xa2 -/* 9C2928 80240018 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9C292C 8024001C 8E060000 */ lw $a2, ($s0) -/* 9C2930 80240020 8E070004 */ lw $a3, 4($s0) -/* 9C2934 80240024 0C05267B */ jal sfx_adjust_env_sound_pos -/* 9C2938 80240028 0000282D */ daddu $a1, $zero, $zero -/* 9C293C 8024002C 86020044 */ lh $v0, 0x44($s0) -/* 9C2940 80240030 8FBF001C */ lw $ra, 0x1c($sp) -/* 9C2944 80240034 8FB00018 */ lw $s0, 0x18($sp) -/* 9C2948 80240038 28420002 */ slti $v0, $v0, 2 -/* 9C294C 8024003C 38420001 */ xori $v0, $v0, 1 -/* 9C2950 80240040 00021040 */ sll $v0, $v0, 1 -/* 9C2954 80240044 03E00008 */ jr $ra -/* 9C2958 80240048 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_10/9C2910/func_8024004C_9C295C.s b/ver/us/asm/nonmatchings/world/area_trd/trd_10/9C2910/func_8024004C_9C295C.s deleted file mode 100644 index 55ff7f8375..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_10/9C2910/func_8024004C_9C295C.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024004C_9C295C -/* 9C295C 8024004C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9C2960 80240050 AFB20020 */ sw $s2, 0x20($sp) -/* 9C2964 80240054 0080902D */ daddu $s2, $a0, $zero -/* 9C2968 80240058 AFBF0024 */ sw $ra, 0x24($sp) -/* 9C296C 8024005C AFB1001C */ sw $s1, 0x1c($sp) -/* 9C2970 80240060 AFB00018 */ sw $s0, 0x18($sp) -/* 9C2974 80240064 10A0004A */ beqz $a1, .L80240190 -/* 9C2978 80240068 8E51000C */ lw $s1, 0xc($s2) -/* 9C297C 8024006C 0C00AB39 */ jal heap_malloc -/* 9C2980 80240070 24040058 */ addiu $a0, $zero, 0x58 -/* 9C2984 80240074 0000202D */ daddu $a0, $zero, $zero -/* 9C2988 80240078 3C05FD05 */ lui $a1, 0xfd05 -/* 9C298C 8024007C 34A50F81 */ ori $a1, $a1, 0xf81 -/* 9C2990 80240080 0040802D */ daddu $s0, $v0, $zero -/* 9C2994 80240084 0200302D */ daddu $a2, $s0, $zero -/* 9C2998 80240088 0C0B2026 */ jal evt_set_variable -/* 9C299C 8024008C AE500084 */ sw $s0, 0x84($s2) -/* 9C29A0 80240090 8E250000 */ lw $a1, ($s1) -/* 9C29A4 80240094 26310004 */ addiu $s1, $s1, 4 -/* 9C29A8 80240098 0C0B1EAF */ jal evt_get_variable -/* 9C29AC 8024009C 0240202D */ daddu $a0, $s2, $zero -/* 9C29B0 802400A0 AE020038 */ sw $v0, 0x38($s0) -/* 9C29B4 802400A4 8E250000 */ lw $a1, ($s1) -/* 9C29B8 802400A8 26310004 */ addiu $s1, $s1, 4 -/* 9C29BC 802400AC 0C0B1EAF */ jal evt_get_variable -/* 9C29C0 802400B0 0240202D */ daddu $a0, $s2, $zero -/* 9C29C4 802400B4 AE02003C */ sw $v0, 0x3c($s0) -/* 9C29C8 802400B8 8E250000 */ lw $a1, ($s1) -/* 9C29CC 802400BC 26310004 */ addiu $s1, $s1, 4 -/* 9C29D0 802400C0 0C0B210B */ jal evt_get_float_variable -/* 9C29D4 802400C4 0240202D */ daddu $a0, $s2, $zero -/* 9C29D8 802400C8 E600000C */ swc1 $f0, 0xc($s0) -/* 9C29DC 802400CC 8E250000 */ lw $a1, ($s1) -/* 9C29E0 802400D0 26310004 */ addiu $s1, $s1, 4 -/* 9C29E4 802400D4 0C0B210B */ jal evt_get_float_variable -/* 9C29E8 802400D8 0240202D */ daddu $a0, $s2, $zero -/* 9C29EC 802400DC E6000010 */ swc1 $f0, 0x10($s0) -/* 9C29F0 802400E0 8E250000 */ lw $a1, ($s1) -/* 9C29F4 802400E4 26310004 */ addiu $s1, $s1, 4 -/* 9C29F8 802400E8 0C0B210B */ jal evt_get_float_variable -/* 9C29FC 802400EC 0240202D */ daddu $a0, $s2, $zero -/* 9C2A00 802400F0 E6000014 */ swc1 $f0, 0x14($s0) -/* 9C2A04 802400F4 8E250000 */ lw $a1, ($s1) -/* 9C2A08 802400F8 26310004 */ addiu $s1, $s1, 4 -/* 9C2A0C 802400FC 0C0B210B */ jal evt_get_float_variable -/* 9C2A10 80240100 0240202D */ daddu $a0, $s2, $zero -/* 9C2A14 80240104 E6000018 */ swc1 $f0, 0x18($s0) -/* 9C2A18 80240108 8E250000 */ lw $a1, ($s1) -/* 9C2A1C 8024010C 26310004 */ addiu $s1, $s1, 4 -/* 9C2A20 80240110 0C0B210B */ jal evt_get_float_variable -/* 9C2A24 80240114 0240202D */ daddu $a0, $s2, $zero -/* 9C2A28 80240118 E600001C */ swc1 $f0, 0x1c($s0) -/* 9C2A2C 8024011C 8E250000 */ lw $a1, ($s1) -/* 9C2A30 80240120 26310004 */ addiu $s1, $s1, 4 -/* 9C2A34 80240124 0C0B210B */ jal evt_get_float_variable -/* 9C2A38 80240128 0240202D */ daddu $a0, $s2, $zero -/* 9C2A3C 8024012C E6000020 */ swc1 $f0, 0x20($s0) -/* 9C2A40 80240130 8E250000 */ lw $a1, ($s1) -/* 9C2A44 80240134 26310004 */ addiu $s1, $s1, 4 -/* 9C2A48 80240138 0C0B210B */ jal evt_get_float_variable -/* 9C2A4C 8024013C 0240202D */ daddu $a0, $s2, $zero -/* 9C2A50 80240140 E6000024 */ swc1 $f0, 0x24($s0) -/* 9C2A54 80240144 8E250000 */ lw $a1, ($s1) -/* 9C2A58 80240148 0C0B210B */ jal evt_get_float_variable -/* 9C2A5C 8024014C 0240202D */ daddu $a0, $s2, $zero -/* 9C2A60 80240150 3C013F80 */ lui $at, 0x3f80 -/* 9C2A64 80240154 44811000 */ mtc1 $at, $f2 -/* 9C2A68 80240158 E6000028 */ swc1 $f0, 0x28($s0) -/* 9C2A6C 8024015C AFA00014 */ sw $zero, 0x14($sp) -/* 9C2A70 80240160 E7A20010 */ swc1 $f2, 0x10($sp) -/* 9C2A74 80240164 8E05000C */ lw $a1, 0xc($s0) -/* 9C2A78 80240168 8E060010 */ lw $a2, 0x10($s0) -/* 9C2A7C 8024016C 8E070014 */ lw $a3, 0x14($s0) -/* 9C2A80 80240170 0C01CA6C */ jal playFX_83 -/* 9C2A84 80240174 24040002 */ addiu $a0, $zero, 2 -/* 9C2A88 80240178 AE020050 */ sw $v0, 0x50($s0) -/* 9C2A8C 8024017C A600004E */ sh $zero, 0x4e($s0) -/* 9C2A90 80240180 A6000048 */ sh $zero, 0x48($s0) -/* 9C2A94 80240184 A600004A */ sh $zero, 0x4a($s0) -/* 9C2A98 80240188 A6000044 */ sh $zero, 0x44($s0) -/* 9C2A9C 8024018C A6000046 */ sh $zero, 0x46($s0) -.L80240190: -/* 9C2AA0 80240190 8FBF0024 */ lw $ra, 0x24($sp) -/* 9C2AA4 80240194 8FB20020 */ lw $s2, 0x20($sp) -/* 9C2AA8 80240198 8FB1001C */ lw $s1, 0x1c($sp) -/* 9C2AAC 8024019C 8FB00018 */ lw $s0, 0x18($sp) -/* 9C2AB0 802401A0 24020002 */ addiu $v0, $zero, 2 -/* 9C2AB4 802401A4 03E00008 */ jr $ra -/* 9C2AB8 802401A8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_10/9C2910/func_802401AC_9C2ABC.s b/ver/us/asm/nonmatchings/world/area_trd/trd_10/9C2910/func_802401AC_9C2ABC.s deleted file mode 100644 index ff47cb82cb..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_10/9C2910/func_802401AC_9C2ABC.s +++ /dev/null @@ -1,283 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel jtbl_80242AA0_9C53B0 -.word L802401EC_9C2AFC, L802402AC_9C2BBC, L802402F4_9C2C04, L80240394_9C2CA4, L802403FC_9C2D0C - -.section .text - -glabel func_802401AC_9C2ABC -/* 9C2ABC 802401AC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9C2AC0 802401B0 AFBF0020 */ sw $ra, 0x20($sp) -/* 9C2AC4 802401B4 AFB1001C */ sw $s1, 0x1c($sp) -/* 9C2AC8 802401B8 AFB00018 */ sw $s0, 0x18($sp) -/* 9C2ACC 802401BC 8C910084 */ lw $s1, 0x84($a0) -/* 9C2AD0 802401C0 86230044 */ lh $v1, 0x44($s1) -/* 9C2AD4 802401C4 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* 9C2AD8 802401C8 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* 9C2ADC 802401CC 2C620005 */ sltiu $v0, $v1, 5 -/* 9C2AE0 802401D0 1040008A */ beqz $v0, L802403FC_9C2D0C -/* 9C2AE4 802401D4 00031080 */ sll $v0, $v1, 2 -/* 9C2AE8 802401D8 3C018024 */ lui $at, %hi(jtbl_80242AA0_9C53B0) -/* 9C2AEC 802401DC 00220821 */ addu $at, $at, $v0 -/* 9C2AF0 802401E0 8C222AA0 */ lw $v0, %lo(jtbl_80242AA0_9C53B0)($at) -/* 9C2AF4 802401E4 00400008 */ jr $v0 -/* 9C2AF8 802401E8 00000000 */ nop -glabel L802401EC_9C2AFC -/* 9C2AFC 802401EC 8E22003C */ lw $v0, 0x3c($s1) -/* 9C2B00 802401F0 86270046 */ lh $a3, 0x46($s1) -/* 9C2B04 802401F4 AFA20010 */ sw $v0, 0x10($sp) -/* 9C2B08 802401F8 8E250010 */ lw $a1, 0x10($s1) -/* 9C2B0C 802401FC 8E26001C */ lw $a2, 0x1c($s1) -/* 9C2B10 80240200 0C00A8ED */ jal update_lerp -/* 9C2B14 80240204 24040005 */ addiu $a0, $zero, 5 -/* 9C2B18 80240208 86270046 */ lh $a3, 0x46($s1) -/* 9C2B1C 8024020C 8E22003C */ lw $v0, 0x3c($s1) -/* 9C2B20 80240210 E6200004 */ swc1 $f0, 4($s1) -/* 9C2B24 80240214 AFA20010 */ sw $v0, 0x10($sp) -/* 9C2B28 80240218 8E25000C */ lw $a1, 0xc($s1) -/* 9C2B2C 8024021C 8E260018 */ lw $a2, 0x18($s1) -/* 9C2B30 80240220 0C00A8ED */ jal update_lerp -/* 9C2B34 80240224 0000202D */ daddu $a0, $zero, $zero -/* 9C2B38 80240228 86270046 */ lh $a3, 0x46($s1) -/* 9C2B3C 8024022C 8E22003C */ lw $v0, 0x3c($s1) -/* 9C2B40 80240230 E6200000 */ swc1 $f0, ($s1) -/* 9C2B44 80240234 AFA20010 */ sw $v0, 0x10($sp) -/* 9C2B48 80240238 8E250014 */ lw $a1, 0x14($s1) -/* 9C2B4C 8024023C 8E260020 */ lw $a2, 0x20($s1) -/* 9C2B50 80240240 0C00A8ED */ jal update_lerp -/* 9C2B54 80240244 0000202D */ daddu $a0, $zero, $zero -/* 9C2B58 80240248 8E220050 */ lw $v0, 0x50($s1) -/* 9C2B5C 8024024C E6200008 */ swc1 $f0, 8($s1) -/* 9C2B60 80240250 C6200000 */ lwc1 $f0, ($s1) -/* 9C2B64 80240254 8C42000C */ lw $v0, 0xc($v0) -/* 9C2B68 80240258 E4400008 */ swc1 $f0, 8($v0) -/* 9C2B6C 8024025C 8E220050 */ lw $v0, 0x50($s1) -/* 9C2B70 80240260 C6200004 */ lwc1 $f0, 4($s1) -/* 9C2B74 80240264 8C42000C */ lw $v0, 0xc($v0) -/* 9C2B78 80240268 E440000C */ swc1 $f0, 0xc($v0) -/* 9C2B7C 8024026C 8E220050 */ lw $v0, 0x50($s1) -/* 9C2B80 80240270 C6200008 */ lwc1 $f0, 8($s1) -/* 9C2B84 80240274 8C42000C */ lw $v0, 0xc($v0) -/* 9C2B88 80240278 E4400010 */ swc1 $f0, 0x10($v0) -/* 9C2B8C 8024027C 96220046 */ lhu $v0, 0x46($s1) -/* 9C2B90 80240280 8E23003C */ lw $v1, 0x3c($s1) -/* 9C2B94 80240284 24420001 */ addiu $v0, $v0, 1 -/* 9C2B98 80240288 A6220046 */ sh $v0, 0x46($s1) -/* 9C2B9C 8024028C 00021400 */ sll $v0, $v0, 0x10 -/* 9C2BA0 80240290 00021403 */ sra $v0, $v0, 0x10 -/* 9C2BA4 80240294 0043102A */ slt $v0, $v0, $v1 -/* 9C2BA8 80240298 14400058 */ bnez $v0, L802403FC_9C2D0C -/* 9C2BAC 8024029C 24020001 */ addiu $v0, $zero, 1 -/* 9C2BB0 802402A0 A6220044 */ sh $v0, 0x44($s1) -/* 9C2BB4 802402A4 080900FF */ j L802403FC_9C2D0C -/* 9C2BB8 802402A8 A6200046 */ sh $zero, 0x46($s1) -glabel L802402AC_9C2BBC -/* 9C2BBC 802402AC 96220046 */ lhu $v0, 0x46($s1) -/* 9C2BC0 802402B0 24420001 */ addiu $v0, $v0, 1 -/* 9C2BC4 802402B4 A6220046 */ sh $v0, 0x46($s1) -/* 9C2BC8 802402B8 00021400 */ sll $v0, $v0, 0x10 -/* 9C2BCC 802402BC 00021403 */ sra $v0, $v0, 0x10 -/* 9C2BD0 802402C0 2842003C */ slti $v0, $v0, 0x3c -/* 9C2BD4 802402C4 1440004D */ bnez $v0, L802403FC_9C2D0C -/* 9C2BD8 802402C8 24020002 */ addiu $v0, $zero, 2 -/* 9C2BDC 802402CC 8E230050 */ lw $v1, 0x50($s1) -/* 9C2BE0 802402D0 A6220044 */ sh $v0, 0x44($s1) -/* 9C2BE4 802402D4 A6200046 */ sh $zero, 0x46($s1) -/* 9C2BE8 802402D8 8C63000C */ lw $v1, 0xc($v1) -/* 9C2BEC 802402DC 24020001 */ addiu $v0, $zero, 1 -/* 9C2BF0 802402E0 AC620070 */ sw $v0, 0x70($v1) -/* 9C2BF4 802402E4 8E220050 */ lw $v0, 0x50($s1) -/* 9C2BF8 802402E8 8C42000C */ lw $v0, 0xc($v0) -/* 9C2BFC 802402EC 080900FF */ j L802403FC_9C2D0C -/* 9C2C00 802402F0 AC400074 */ sw $zero, 0x74($v0) -glabel L802402F4_9C2C04 -/* 9C2C04 802402F4 96220046 */ lhu $v0, 0x46($s1) -/* 9C2C08 802402F8 24420001 */ addiu $v0, $v0, 1 -/* 9C2C0C 802402FC A6220046 */ sh $v0, 0x46($s1) -/* 9C2C10 80240300 00021400 */ sll $v0, $v0, 0x10 -/* 9C2C14 80240304 00021403 */ sra $v0, $v0, 0x10 -/* 9C2C18 80240308 2842003C */ slti $v0, $v0, 0x3c -/* 9C2C1C 8024030C 1440003B */ bnez $v0, L802403FC_9C2D0C -/* 9C2C20 80240310 00000000 */ nop -/* 9C2C24 80240314 3C013F80 */ lui $at, 0x3f80 -/* 9C2C28 80240318 44810000 */ mtc1 $at, $f0 -/* 9C2C2C 8024031C AFA00014 */ sw $zero, 0x14($sp) -/* 9C2C30 80240320 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9C2C34 80240324 8E250018 */ lw $a1, 0x18($s1) -/* 9C2C38 80240328 8E26001C */ lw $a2, 0x1c($s1) -/* 9C2C3C 8024032C 8E270020 */ lw $a3, 0x20($s1) -/* 9C2C40 80240330 0C01C9AC */ jal playFX_7B -/* 9C2C44 80240334 24040001 */ addiu $a0, $zero, 1 -/* 9C2C48 80240338 AE220054 */ sw $v0, 0x54($s1) -/* 9C2C4C 8024033C 8C43000C */ lw $v1, 0xc($v0) -/* 9C2C50 80240340 9222003B */ lbu $v0, 0x3b($s1) -/* 9C2C54 80240344 A0620034 */ sb $v0, 0x34($v1) -/* 9C2C58 80240348 8E220054 */ lw $v0, 0x54($s1) -/* 9C2C5C 8024034C 8C42000C */ lw $v0, 0xc($v0) -/* 9C2C60 80240350 AC400020 */ sw $zero, 0x20($v0) -/* 9C2C64 80240354 8E250018 */ lw $a1, 0x18($s1) -/* 9C2C68 80240358 8E260028 */ lw $a2, 0x28($s1) -/* 9C2C6C 8024035C 8E270020 */ lw $a3, 0x20($s1) -/* 9C2C70 80240360 0C044898 */ jal create_shadow_type -/* 9C2C74 80240364 0000202D */ daddu $a0, $zero, $zero -/* 9C2C78 80240368 3C014210 */ lui $at, 0x4210 -/* 9C2C7C 8024036C 44810000 */ mtc1 $at, $f0 -/* 9C2C80 80240370 AE220040 */ sw $v0, 0x40($s1) -/* 9C2C84 80240374 24020003 */ addiu $v0, $zero, 3 -/* 9C2C88 80240378 A6220044 */ sh $v0, 0x44($s1) -/* 9C2C8C 8024037C 24020001 */ addiu $v0, $zero, 1 -/* 9C2C90 80240380 A6200046 */ sh $zero, 0x46($s1) -/* 9C2C94 80240384 AE20002C */ sw $zero, 0x2c($s1) -/* 9C2C98 80240388 A6220048 */ sh $v0, 0x48($s1) -/* 9C2C9C 8024038C 080900FF */ j L802403FC_9C2D0C -/* 9C2CA0 80240390 E6200030 */ swc1 $f0, 0x30($s1) -glabel L80240394_9C2CA4 -/* 9C2CA4 80240394 0000202D */ daddu $a0, $zero, $zero -/* 9C2CA8 80240398 3C054210 */ lui $a1, 0x4210 -/* 9C2CAC 8024039C 3C064198 */ lui $a2, 0x4198 -/* 9C2CB0 802403A0 86270046 */ lh $a3, 0x46($s1) -/* 9C2CB4 802403A4 24020078 */ addiu $v0, $zero, 0x78 -/* 9C2CB8 802403A8 0C00A8ED */ jal update_lerp -/* 9C2CBC 802403AC AFA20010 */ sw $v0, 0x10($sp) -/* 9C2CC0 802403B0 96220046 */ lhu $v0, 0x46($s1) -/* 9C2CC4 802403B4 E6200030 */ swc1 $f0, 0x30($s1) -/* 9C2CC8 802403B8 24420001 */ addiu $v0, $v0, 1 -/* 9C2CCC 802403BC A6220046 */ sh $v0, 0x46($s1) -/* 9C2CD0 802403C0 00021400 */ sll $v0, $v0, 0x10 -/* 9C2CD4 802403C4 00021403 */ sra $v0, $v0, 0x10 -/* 9C2CD8 802403C8 28420078 */ slti $v0, $v0, 0x78 -/* 9C2CDC 802403CC 1440000B */ bnez $v0, L802403FC_9C2D0C -/* 9C2CE0 802403D0 24030001 */ addiu $v1, $zero, 1 -/* 9C2CE4 802403D4 C620002C */ lwc1 $f0, 0x2c($s1) -/* 9C2CE8 802403D8 24020002 */ addiu $v0, $zero, 2 -/* 9C2CEC 802403DC A6220048 */ sh $v0, 0x48($s1) -/* 9C2CF0 802403E0 24020004 */ addiu $v0, $zero, 4 -/* 9C2CF4 802403E4 A620004C */ sh $zero, 0x4c($s1) -/* 9C2CF8 802403E8 A623004A */ sh $v1, 0x4a($s1) -/* 9C2CFC 802403EC A623004E */ sh $v1, 0x4e($s1) -/* 9C2D00 802403F0 A6220044 */ sh $v0, 0x44($s1) -/* 9C2D04 802403F4 A6200046 */ sh $zero, 0x46($s1) -/* 9C2D08 802403F8 E6200034 */ swc1 $f0, 0x34($s1) -glabel L802403FC_9C2D0C -/* 9C2D0C 802403FC 8623004A */ lh $v1, 0x4a($s1) -/* 9C2D10 80240400 24020001 */ addiu $v0, $zero, 1 -/* 9C2D14 80240404 10620005 */ beq $v1, $v0, .L8024041C -/* 9C2D18 80240408 24020002 */ addiu $v0, $zero, 2 -/* 9C2D1C 8024040C 1062001E */ beq $v1, $v0, .L80240488 -/* 9C2D20 80240410 00000000 */ nop -/* 9C2D24 80240414 0809014C */ j .L80240530 -/* 9C2D28 80240418 00000000 */ nop -.L8024041C: -/* 9C2D2C 8024041C 8627004C */ lh $a3, 0x4c($s1) -/* 9C2D30 80240420 24100078 */ addiu $s0, $zero, 0x78 -/* 9C2D34 80240424 AFB00010 */ sw $s0, 0x10($sp) -/* 9C2D38 80240428 8E250034 */ lw $a1, 0x34($s1) -/* 9C2D3C 8024042C 3C0644B4 */ lui $a2, 0x44b4 -/* 9C2D40 80240430 0C00A8ED */ jal update_lerp -/* 9C2D44 80240434 24040004 */ addiu $a0, $zero, 4 -/* 9C2D48 80240438 8627004C */ lh $a3, 0x4c($s1) -/* 9C2D4C 8024043C E620002C */ swc1 $f0, 0x2c($s1) -/* 9C2D50 80240440 AFB00010 */ sw $s0, 0x10($sp) -/* 9C2D54 80240444 8E25001C */ lw $a1, 0x1c($s1) -/* 9C2D58 80240448 8E260024 */ lw $a2, 0x24($s1) -/* 9C2D5C 8024044C 0C00A8ED */ jal update_lerp -/* 9C2D60 80240450 2404000A */ addiu $a0, $zero, 0xa -/* 9C2D64 80240454 9622004C */ lhu $v0, 0x4c($s1) -/* 9C2D68 80240458 E6200004 */ swc1 $f0, 4($s1) -/* 9C2D6C 8024045C 24420001 */ addiu $v0, $v0, 1 -/* 9C2D70 80240460 A622004C */ sh $v0, 0x4c($s1) -/* 9C2D74 80240464 00021400 */ sll $v0, $v0, 0x10 -/* 9C2D78 80240468 00021403 */ sra $v0, $v0, 0x10 -/* 9C2D7C 8024046C 0050102A */ slt $v0, $v0, $s0 -/* 9C2D80 80240470 1440002F */ bnez $v0, .L80240530 -/* 9C2D84 80240474 2402010E */ addiu $v0, $zero, 0x10e -/* 9C2D88 80240478 A622004C */ sh $v0, 0x4c($s1) -/* 9C2D8C 8024047C 24020002 */ addiu $v0, $zero, 2 -/* 9C2D90 80240480 0809014B */ j .L8024052C -/* 9C2D94 80240484 A622004A */ sh $v0, 0x4a($s1) -.L80240488: -/* 9C2D98 80240488 8622004C */ lh $v0, 0x4c($s1) -/* 9C2D9C 8024048C 44826000 */ mtc1 $v0, $f12 -/* 9C2DA0 80240490 00000000 */ nop -/* 9C2DA4 80240494 0C00A8BB */ jal sin_deg -/* 9C2DA8 80240498 46806320 */ cvt.s.w $f12, $f12 -/* 9C2DAC 8024049C 3C013F80 */ lui $at, 0x3f80 -/* 9C2DB0 802404A0 44811000 */ mtc1 $at, $f2 -/* 9C2DB4 802404A4 00000000 */ nop -/* 9C2DB8 802404A8 46020000 */ add.s $f0, $f0, $f2 -/* 9C2DBC 802404AC 46000000 */ add.s $f0, $f0, $f0 -/* 9C2DC0 802404B0 C6220024 */ lwc1 $f2, 0x24($s1) -/* 9C2DC4 802404B4 8622004C */ lh $v0, 0x4c($s1) -/* 9C2DC8 802404B8 46001080 */ add.s $f2, $f2, $f0 -/* 9C2DCC 802404BC 24420008 */ addiu $v0, $v0, 8 -/* 9C2DD0 802404C0 44826000 */ mtc1 $v0, $f12 -/* 9C2DD4 802404C4 00000000 */ nop -/* 9C2DD8 802404C8 46806320 */ cvt.s.w $f12, $f12 -/* 9C2DDC 802404CC 0C00A6C9 */ jal clamp_angle -/* 9C2DE0 802404D0 E6220004 */ swc1 $f2, 4($s1) -/* 9C2DE4 802404D4 4600010D */ trunc.w.s $f4, $f0 -/* 9C2DE8 802404D8 44022000 */ mfc1 $v0, $f4 -/* 9C2DEC 802404DC C6200004 */ lwc1 $f0, 4($s1) -/* 9C2DF0 802404E0 A622004C */ sh $v0, 0x4c($s1) -/* 9C2DF4 802404E4 C60C0028 */ lwc1 $f12, 0x28($s0) -/* 9C2DF8 802404E8 8E060030 */ lw $a2, 0x30($s0) -/* 9C2DFC 802404EC 3C0141A0 */ lui $at, 0x41a0 -/* 9C2E00 802404F0 44817000 */ mtc1 $at, $f14 -/* 9C2E04 802404F4 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9C2E08 802404F8 C602002C */ lwc1 $f2, 0x2c($s0) -/* 9C2E0C 802404FC C6200008 */ lwc1 $f0, 8($s1) -/* 9C2E10 80240500 E7A00014 */ swc1 $f0, 0x14($sp) -/* 9C2E14 80240504 8E270000 */ lw $a3, ($s1) -/* 9C2E18 80240508 0C00A7CB */ jal dist3D -/* 9C2E1C 8024050C 460E1380 */ add.s $f14, $f2, $f14 -/* 9C2E20 80240510 3C0141F0 */ lui $at, 0x41f0 -/* 9C2E24 80240514 44811000 */ mtc1 $at, $f2 -/* 9C2E28 80240518 00000000 */ nop -/* 9C2E2C 8024051C 4600103C */ c.lt.s $f2, $f0 -/* 9C2E30 80240520 00000000 */ nop -/* 9C2E34 80240524 45010002 */ bc1t .L80240530 -/* 9C2E38 80240528 24020003 */ addiu $v0, $zero, 3 -.L8024052C: -/* 9C2E3C 8024052C A622004E */ sh $v0, 0x4e($s1) -.L80240530: -/* 9C2E40 80240530 86230048 */ lh $v1, 0x48($s1) -/* 9C2E44 80240534 24020001 */ addiu $v0, $zero, 1 -/* 9C2E48 80240538 10620005 */ beq $v1, $v0, .L80240550 -/* 9C2E4C 8024053C 24020002 */ addiu $v0, $zero, 2 -/* 9C2E50 80240540 10620008 */ beq $v1, $v0, .L80240564 -/* 9C2E54 80240544 00000000 */ nop -/* 9C2E58 80240548 08090169 */ j .L802405A4 -/* 9C2E5C 8024054C 00000000 */ nop -.L80240550: -/* 9C2E60 80240550 C620002C */ lwc1 $f0, 0x2c($s1) -/* 9C2E64 80240554 C62C0030 */ lwc1 $f12, 0x30($s1) -/* 9C2E68 80240558 0C00A6C9 */ jal clamp_angle -/* 9C2E6C 8024055C 460C0300 */ add.s $f12, $f0, $f12 -/* 9C2E70 80240560 E620002C */ swc1 $f0, 0x2c($s1) -.L80240564: -/* 9C2E74 80240564 8E220054 */ lw $v0, 0x54($s1) -/* 9C2E78 80240568 C620002C */ lwc1 $f0, 0x2c($s1) -/* 9C2E7C 8024056C 8C42000C */ lw $v0, 0xc($v0) -/* 9C2E80 80240570 E4400024 */ swc1 $f0, 0x24($v0) -/* 9C2E84 80240574 8E220054 */ lw $v0, 0x54($s1) -/* 9C2E88 80240578 C6200018 */ lwc1 $f0, 0x18($s1) -/* 9C2E8C 8024057C 8C42000C */ lw $v0, 0xc($v0) -/* 9C2E90 80240580 E4400004 */ swc1 $f0, 4($v0) -/* 9C2E94 80240584 8E220054 */ lw $v0, 0x54($s1) -/* 9C2E98 80240588 C6200004 */ lwc1 $f0, 4($s1) -/* 9C2E9C 8024058C 8C42000C */ lw $v0, 0xc($v0) -/* 9C2EA0 80240590 E4400008 */ swc1 $f0, 8($v0) -/* 9C2EA4 80240594 8E220054 */ lw $v0, 0x54($s1) -/* 9C2EA8 80240598 C6200020 */ lwc1 $f0, 0x20($s1) -/* 9C2EAC 8024059C 8C42000C */ lw $v0, 0xc($v0) -/* 9C2EB0 802405A0 E440000C */ swc1 $f0, 0xc($v0) -.L802405A4: -/* 9C2EB4 802405A4 8FBF0020 */ lw $ra, 0x20($sp) -/* 9C2EB8 802405A8 8FB1001C */ lw $s1, 0x1c($sp) -/* 9C2EBC 802405AC 8FB00018 */ lw $s0, 0x18($sp) -/* 9C2EC0 802405B0 0000102D */ daddu $v0, $zero, $zero -/* 9C2EC4 802405B4 03E00008 */ jr $ra -/* 9C2EC8 802405B8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_10/9C2910/func_802405BC_9C2ECC.s b/ver/us/asm/nonmatchings/world/area_trd/trd_10/9C2910/func_802405BC_9C2ECC.s deleted file mode 100644 index 20dddfecba..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_10/9C2910/func_802405BC_9C2ECC.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405BC_9C2ECC -/* 9C2ECC 802405BC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9C2ED0 802405C0 AFB00010 */ sw $s0, 0x10($sp) -/* 9C2ED4 802405C4 0080802D */ daddu $s0, $a0, $zero -/* 9C2ED8 802405C8 AFBF0014 */ sw $ra, 0x14($sp) -/* 9C2EDC 802405CC 8E02000C */ lw $v0, 0xc($s0) -/* 9C2EE0 802405D0 0C0B1EAF */ jal evt_get_variable -/* 9C2EE4 802405D4 8C450000 */ lw $a1, ($v0) -/* 9C2EE8 802405D8 8E030084 */ lw $v1, 0x84($s0) -/* 9C2EEC 802405DC 8FBF0014 */ lw $ra, 0x14($sp) -/* 9C2EF0 802405E0 8463004E */ lh $v1, 0x4e($v1) -/* 9C2EF4 802405E4 8FB00010 */ lw $s0, 0x10($sp) -/* 9C2EF8 802405E8 00621826 */ xor $v1, $v1, $v0 -/* 9C2EFC 802405EC 2C630001 */ sltiu $v1, $v1, 1 -/* 9C2F00 802405F0 00031040 */ sll $v0, $v1, 1 -/* 9C2F04 802405F4 03E00008 */ jr $ra -/* 9C2F08 802405F8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_10/9C2910/func_802405FC_9C2F0C.s b/ver/us/asm/nonmatchings/world/area_trd/trd_10/9C2910/func_802405FC_9C2F0C.s deleted file mode 100644 index 182088e76f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_10/9C2910/func_802405FC_9C2F0C.s +++ /dev/null @@ -1,72 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405FC_9C2F0C -/* 9C2F0C 802405FC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9C2F10 80240600 AFB20020 */ sw $s2, 0x20($sp) -/* 9C2F14 80240604 0080902D */ daddu $s2, $a0, $zero -/* 9C2F18 80240608 AFBF0024 */ sw $ra, 0x24($sp) -/* 9C2F1C 8024060C AFB1001C */ sw $s1, 0x1c($sp) -/* 9C2F20 80240610 AFB00018 */ sw $s0, 0x18($sp) -/* 9C2F24 80240614 10A00035 */ beqz $a1, .L802406EC -/* 9C2F28 80240618 8E51000C */ lw $s1, 0xc($s2) -/* 9C2F2C 8024061C 0C00AB39 */ jal heap_malloc -/* 9C2F30 80240620 24040058 */ addiu $a0, $zero, 0x58 -/* 9C2F34 80240624 0040802D */ daddu $s0, $v0, $zero -/* 9C2F38 80240628 AE500084 */ sw $s0, 0x84($s2) -/* 9C2F3C 8024062C 8E250000 */ lw $a1, ($s1) -/* 9C2F40 80240630 26310004 */ addiu $s1, $s1, 4 -/* 9C2F44 80240634 0C0B1EAF */ jal evt_get_variable -/* 9C2F48 80240638 0240202D */ daddu $a0, $s2, $zero -/* 9C2F4C 8024063C AE020038 */ sw $v0, 0x38($s0) -/* 9C2F50 80240640 8E250000 */ lw $a1, ($s1) -/* 9C2F54 80240644 26310004 */ addiu $s1, $s1, 4 -/* 9C2F58 80240648 0C0B210B */ jal evt_get_float_variable -/* 9C2F5C 8024064C 0240202D */ daddu $a0, $s2, $zero -/* 9C2F60 80240650 E6000018 */ swc1 $f0, 0x18($s0) -/* 9C2F64 80240654 8E250000 */ lw $a1, ($s1) -/* 9C2F68 80240658 26310004 */ addiu $s1, $s1, 4 -/* 9C2F6C 8024065C 0C0B210B */ jal evt_get_float_variable -/* 9C2F70 80240660 0240202D */ daddu $a0, $s2, $zero -/* 9C2F74 80240664 E6000024 */ swc1 $f0, 0x24($s0) -/* 9C2F78 80240668 8E250000 */ lw $a1, ($s1) -/* 9C2F7C 8024066C 26310004 */ addiu $s1, $s1, 4 -/* 9C2F80 80240670 0C0B210B */ jal evt_get_float_variable -/* 9C2F84 80240674 0240202D */ daddu $a0, $s2, $zero -/* 9C2F88 80240678 E6000020 */ swc1 $f0, 0x20($s0) -/* 9C2F8C 8024067C 8E250000 */ lw $a1, ($s1) -/* 9C2F90 80240680 0C0B210B */ jal evt_get_float_variable -/* 9C2F94 80240684 0240202D */ daddu $a0, $s2, $zero -/* 9C2F98 80240688 3C013F80 */ lui $at, 0x3f80 -/* 9C2F9C 8024068C 44811000 */ mtc1 $at, $f2 -/* 9C2FA0 80240690 E6000028 */ swc1 $f0, 0x28($s0) -/* 9C2FA4 80240694 AFA00014 */ sw $zero, 0x14($sp) -/* 9C2FA8 80240698 E7A20010 */ swc1 $f2, 0x10($sp) -/* 9C2FAC 8024069C 8E050018 */ lw $a1, 0x18($s0) -/* 9C2FB0 802406A0 8E060024 */ lw $a2, 0x24($s0) -/* 9C2FB4 802406A4 8E070020 */ lw $a3, 0x20($s0) -/* 9C2FB8 802406A8 0C01C9AC */ jal playFX_7B -/* 9C2FBC 802406AC 24040001 */ addiu $a0, $zero, 1 -/* 9C2FC0 802406B0 AE020054 */ sw $v0, 0x54($s0) -/* 9C2FC4 802406B4 8C43000C */ lw $v1, 0xc($v0) -/* 9C2FC8 802406B8 9202003B */ lbu $v0, 0x3b($s0) -/* 9C2FCC 802406BC A0620034 */ sb $v0, 0x34($v1) -/* 9C2FD0 802406C0 8E020054 */ lw $v0, 0x54($s0) -/* 9C2FD4 802406C4 8C42000C */ lw $v0, 0xc($v0) -/* 9C2FD8 802406C8 AC400020 */ sw $zero, 0x20($v0) -/* 9C2FDC 802406CC 8E050018 */ lw $a1, 0x18($s0) -/* 9C2FE0 802406D0 8E060028 */ lw $a2, 0x28($s0) -/* 9C2FE4 802406D4 8E070020 */ lw $a3, 0x20($s0) -/* 9C2FE8 802406D8 0C044898 */ jal create_shadow_type -/* 9C2FEC 802406DC 0000202D */ daddu $a0, $zero, $zero -/* 9C2FF0 802406E0 AE020040 */ sw $v0, 0x40($s0) -/* 9C2FF4 802406E4 2402010E */ addiu $v0, $zero, 0x10e -/* 9C2FF8 802406E8 A602004C */ sh $v0, 0x4c($s0) -.L802406EC: -/* 9C2FFC 802406EC 8FBF0024 */ lw $ra, 0x24($sp) -/* 9C3000 802406F0 8FB20020 */ lw $s2, 0x20($sp) -/* 9C3004 802406F4 8FB1001C */ lw $s1, 0x1c($sp) -/* 9C3008 802406F8 8FB00018 */ lw $s0, 0x18($sp) -/* 9C300C 802406FC 24020002 */ addiu $v0, $zero, 2 -/* 9C3010 80240700 03E00008 */ jr $ra -/* 9C3014 80240704 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_10/9C2910/func_80240708_9C3018.s b/ver/us/asm/nonmatchings/world/area_trd/trd_10/9C2910/func_80240708_9C3018.s deleted file mode 100644 index 903e412868..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_10/9C2910/func_80240708_9C3018.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240708_9C3018 -/* 9C3018 80240708 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9C301C 8024070C AFBF0014 */ sw $ra, 0x14($sp) -/* 9C3020 80240710 AFB00010 */ sw $s0, 0x10($sp) -/* 9C3024 80240714 8C900084 */ lw $s0, 0x84($a0) -/* 9C3028 80240718 8602004C */ lh $v0, 0x4c($s0) -/* 9C302C 8024071C 44826000 */ mtc1 $v0, $f12 -/* 9C3030 80240720 00000000 */ nop -/* 9C3034 80240724 0C00A8BB */ jal sin_deg -/* 9C3038 80240728 46806320 */ cvt.s.w $f12, $f12 -/* 9C303C 8024072C 3C013F80 */ lui $at, 0x3f80 -/* 9C3040 80240730 44811000 */ mtc1 $at, $f2 -/* 9C3044 80240734 00000000 */ nop -/* 9C3048 80240738 46020000 */ add.s $f0, $f0, $f2 -/* 9C304C 8024073C 46000000 */ add.s $f0, $f0, $f0 -/* 9C3050 80240740 C6020024 */ lwc1 $f2, 0x24($s0) -/* 9C3054 80240744 8602004C */ lh $v0, 0x4c($s0) -/* 9C3058 80240748 46001080 */ add.s $f2, $f2, $f0 -/* 9C305C 8024074C 24420008 */ addiu $v0, $v0, 8 -/* 9C3060 80240750 44826000 */ mtc1 $v0, $f12 -/* 9C3064 80240754 00000000 */ nop -/* 9C3068 80240758 46806320 */ cvt.s.w $f12, $f12 -/* 9C306C 8024075C 0C00A6C9 */ jal clamp_angle -/* 9C3070 80240760 E6020004 */ swc1 $f2, 4($s0) -/* 9C3074 80240764 4600010D */ trunc.w.s $f4, $f0 -/* 9C3078 80240768 44022000 */ mfc1 $v0, $f4 -/* 9C307C 8024076C 00000000 */ nop -/* 9C3080 80240770 A602004C */ sh $v0, 0x4c($s0) -/* 9C3084 80240774 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 9C3088 80240778 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 9C308C 8024077C C44C0028 */ lwc1 $f12, 0x28($v0) -/* 9C3090 80240780 C44E0030 */ lwc1 $f14, 0x30($v0) -/* 9C3094 80240784 8E060018 */ lw $a2, 0x18($s0) -/* 9C3098 80240788 0C00A7B5 */ jal dist2D -/* 9C309C 8024078C 8E070020 */ lw $a3, 0x20($s0) -/* 9C30A0 80240790 3C0141F0 */ lui $at, 0x41f0 -/* 9C30A4 80240794 44811000 */ mtc1 $at, $f2 -/* 9C30A8 80240798 00000000 */ nop -/* 9C30AC 8024079C 4602003E */ c.le.s $f0, $f2 -/* 9C30B0 802407A0 00000000 */ nop -/* 9C30B4 802407A4 45000002 */ bc1f .L802407B0 -/* 9C30B8 802407A8 24020003 */ addiu $v0, $zero, 3 -/* 9C30BC 802407AC A602004E */ sh $v0, 0x4e($s0) -.L802407B0: -/* 9C30C0 802407B0 8E020054 */ lw $v0, 0x54($s0) -/* 9C30C4 802407B4 C6000018 */ lwc1 $f0, 0x18($s0) -/* 9C30C8 802407B8 8C42000C */ lw $v0, 0xc($v0) -/* 9C30CC 802407BC E4400004 */ swc1 $f0, 4($v0) -/* 9C30D0 802407C0 8E020054 */ lw $v0, 0x54($s0) -/* 9C30D4 802407C4 C6000004 */ lwc1 $f0, 4($s0) -/* 9C30D8 802407C8 8C42000C */ lw $v0, 0xc($v0) -/* 9C30DC 802407CC E4400008 */ swc1 $f0, 8($v0) -/* 9C30E0 802407D0 8E020054 */ lw $v0, 0x54($s0) -/* 9C30E4 802407D4 C6000020 */ lwc1 $f0, 0x20($s0) -/* 9C30E8 802407D8 8C42000C */ lw $v0, 0xc($v0) -/* 9C30EC 802407DC E440000C */ swc1 $f0, 0xc($v0) -/* 9C30F0 802407E0 8FBF0014 */ lw $ra, 0x14($sp) -/* 9C30F4 802407E4 8FB00010 */ lw $s0, 0x10($sp) -/* 9C30F8 802407E8 0000102D */ daddu $v0, $zero, $zero -/* 9C30FC 802407EC 03E00008 */ jr $ra -/* 9C3100 802407F0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index 994fb205a7..a543b6660f 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -10002,12 +10002,12 @@ func_80241BC4_9942F4 = 0x80241BC4; // type:func rom:0x9942F4 func_80241BEC_99431C = 0x80241BEC; // type:func rom:0x99431C func_80241CA0_9943D0 = 0x80241CA0; // type:func rom:0x9943D0 D_80242A30_995160 = 0x80242A30; // type:data rom:0x995160 -func_80240000_9951F0 = 0x80240000; // type:func rom:0x9951F0 -func_8024004C_99523C = 0x8024004C; // type:func rom:0x99523C -func_802401AC_99539C = 0x802401AC; // type:func rom:0x99539C -func_802405BC_9957AC = 0x802405BC; // type:func rom:0x9957AC -func_802405FC_9957EC = 0x802405FC; // type:func rom:0x9957EC -func_80240708_9958F8 = 0x80240708; // type:func rom:0x9958F8 +isk_16_StarSpiritEffectFunc1 = 0x80240000; // type:func rom:0x9951F0 +isk_16_StarSpiritEffectFunc2 = 0x8024004C; // type:func rom:0x99523C +isk_16_StarSpiritEffectFunc3 = 0x802401AC; // type:func rom:0x99539C +isk_16_StarSpiritEffectFunc4 = 0x802405BC; // type:func rom:0x9957AC +isk_16_StarSpiritEffectFunc5 = 0x802405FC; // type:func rom:0x9957EC +isk_16_StarSpiritEffectFunc6 = 0x80240708; // type:func rom:0x9958F8 isk_16_UnkFunc27 = 0x80240800; // type:func rom:0x9959F0 isk_16_UnkFunc26 = 0x80240924; // type:func rom:0x995B14 isk_18_set_script_owner_npc_anim = 0x80240000; // type:func rom:0x997F70 @@ -10194,12 +10194,12 @@ D_80240F2C_9BC1CC = 0x80240F2C; // type:data rom:0x9BC1CC func_80240000_9BD660 = 0x80240000; // type:func rom:0x9BD660 func_802400C0_9BD720 = 0x802400C0; // type:func rom:0x9BD720 D_80245234_9C2894 = 0x80245234; // type:data rom:0x9C2894 -func_80240000_9C2910 = 0x80240000; // type:func rom:0x9C2910 -func_8024004C_9C295C = 0x8024004C; // type:func rom:0x9C295C -func_802401AC_9C2ABC = 0x802401AC; // type:func rom:0x9C2ABC -func_802405BC_9C2ECC = 0x802405BC; // type:func rom:0x9C2ECC -func_802405FC_9C2F0C = 0x802405FC; // type:func rom:0x9C2F0C -func_80240708_9C3018 = 0x80240708; // type:func rom:0x9C3018 +trd_10_StarSpiritEffectFunc1 = 0x80240000; // type:func rom:0x9C2910 +trd_10_StarSpiritEffectFunc2 = 0x8024004C; // type:func rom:0x9C295C +trd_10_StarSpiritEffectFunc3 = 0x802401AC; // type:func rom:0x9C2ABC +trd_10_StarSpiritEffectFunc4 = 0x802405BC; // type:func rom:0x9C2ECC +trd_10_StarSpiritEffectFunc5 = 0x802405FC; // type:func rom:0x9C2F0C +trd_10_StarSpiritEffectFunc6 = 0x80240708; // type:func rom:0x9C3018 func_802407F4_9C3104 = 0x802407F4; // type:func rom:0x9C3104 func_80240820_9C3130 = 0x80240820; // type:func rom:0x9C3130 func_80240000_9C53E0 = 0x80240000; // type:func rom:0x9C53E0 @@ -12896,12 +12896,12 @@ arn_05_npcGroupList_80244FC8 = 0x80244FC8; // type:data rom:0xBECBA8 arn_05_makeEntities = 0x80245000; // type:data rom:0xBECBE0 D_80245050_BECC30 = 0x80245050; // type:data rom:0xBECC30 D_80245058_BECC38 = 0x80245058; // type:data rom:0xBECC38 -arn_07_func_80240000_BECDF0 = 0x80240000; // type:func rom:0xBECDF0 -arn_07_func_8024004C_BECE3C = 0x8024004C; // type:func rom:0xBECE3C -arn_07_func_802401AC_BECF9C = 0x802401AC; // type:func rom:0xBECF9C -arn_07_func_802405BC_BED3AC = 0x802405BC; // type:func rom:0xBED3AC -arn_07_func_802405FC_BED3EC = 0x802405FC; // type:func rom:0xBED3EC -arn_07_func_80240708_BED4F8 = 0x80240708; // type:func rom:0xBED4F8 +arn_07_arn_07_StarSpiritEffectFunc1 = 0x80240000; // type:func rom:0xBECDF0 +arn_07_arn_07_StarSpiritEffectFunc2 = 0x8024004C; // type:func rom:0xBECE3C +arn_07_arn_07_StarSpiritEffectFunc3 = 0x802401AC; // type:func rom:0xBECF9C +arn_07_arn_07_StarSpiritEffectFunc4 = 0x802405BC; // type:func rom:0xBED3AC +arn_07_arn_07_StarSpiritEffectFunc5 = 0x802405FC; // type:func rom:0xBED3EC +arn_07_arn_07_StarSpiritEffectFunc6 = 0x80240708; // type:func rom:0xBED4F8 arn_07_func_80240800_BED5F0 = 0x80240800; // type:func rom:0xBED5F0 arn_07_SetEntityFlags100000 = 0x80240870; // type:func rom:0xBED660 arn_07_GetEntityPosition = 0x802408A4; // type:func rom:0xBED694 @@ -14602,14 +14602,14 @@ D_80247438_C7E118 = 0x80247438; // type:data rom:0xC7E118 kzn_10_UnkTexturePanFunc = 0x80240000; // type:func rom:0xC7E180 kzn_10_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xC7E2A4 func_8024030C_C7E48C = 0x8024030C; // type:func rom:0xC7E48C -func_80240330_C7E4B0 = 0x80240330; // type:func rom:0xC7E4B0 +kzn_10_SpinyTrompHit = 0x80240330; // type:func rom:0xC7E4B0 func_80240350_C7E4D0 = 0x80240350; // type:func rom:0xC7E4D0 -func_8024037C_C7E4FC = 0x8024037C; // type:func rom:0xC7E4FC -func_80240414_C7E594 = 0x80240414; // type:func rom:0xC7E594 -func_802404B4_C7E634 = 0x802404B4; // type:func rom:0xC7E634 -func_802404EC_C7E66C = 0x802404EC; // type:func rom:0xC7E66C -func_802405A4_C7E724 = 0x802405A4; // type:func rom:0xC7E724 -func_80240638_C7E7B8 = 0x80240638; // type:func rom:0xC7E7B8 +kzn_10_UnkFunc46 = 0x8024037C; // type:func rom:0xC7E4FC +kzn_10_UnkFunc47 = 0x80240414; // type:func rom:0xC7E594 +kzn_10_UnkFunc48 = 0x802404B4; // type:func rom:0xC7E634 +kzn_10_UnkFunc49 = 0x802404EC; // type:func rom:0xC7E66C +kzn_10_UnkFunc50 = 0x802405A4; // type:func rom:0xC7E724 +kzn_10_UnkFunc51 = 0x80240638; // type:func rom:0xC7E7B8 D_80242000_C80180 = 0x80242000; // type:data rom:0xC80180 D_80242008_C80188 = 0x80242008; // type:data rom:0xC80188 D_80242010_C80190 = 0x80242010; // type:data rom:0xC80190 @@ -14678,14 +14678,14 @@ kzn_17_SetManyVars = 0x80242A08; // type:func rom:0xC884B8 kzn_17_UnkYawFunc = 0x80242AF8; // type:func rom:0xC885A8 func_80242C84_C88734 = 0x80242C84; // type:func rom:0xC88734 func_80242CC8_C88778 = 0x80242CC8; // type:func rom:0xC88778 -func_80242D00_C887B0 = 0x80242D00; // type:func rom:0xC887B0 +kzn_17_SpinyTrompHit = 0x80242D00; // type:func rom:0xC887B0 func_80242D20_C887D0 = 0x80242D20; // type:func rom:0xC887D0 -func_80242D4C_C887FC = 0x80242D4C; // type:func rom:0xC887FC -func_80242DE4_C88894 = 0x80242DE4; // type:func rom:0xC88894 -func_80242E84_C88934 = 0x80242E84; // type:func rom:0xC88934 -func_80242EBC_C8896C = 0x80242EBC; // type:func rom:0xC8896C -func_80242F74_C88A24 = 0x80242F74; // type:func rom:0xC88A24 -func_80243004_C88AB4 = 0x80243004; // type:func rom:0xC88AB4 +kzn_17_UnkFunc46 = 0x80242D4C; // type:func rom:0xC887FC +kzn_17_UnkFunc47 = 0x80242DE4; // type:func rom:0xC88894 +kzn_17_UnkFunc48 = 0x80242E84; // type:func rom:0xC88934 +kzn_17_UnkFunc49 = 0x80242EBC; // type:func rom:0xC8896C +kzn_17_UnkFunc50 = 0x80242F74; // type:func rom:0xC88A24 +kzn_17_UnkFunc51 = 0x80243004; // type:func rom:0xC88AB4 D_80244074_C89B24 = 0x80244074; // type:data rom:0xC89B24 D_802440D8_C89B88 = 0x802440D8; // type:data rom:0xC89B88 D_802440DC_C89B8C = 0x802440DC; // type:data rom:0xC89B8C @@ -14709,12 +14709,12 @@ kzn_18_UnsetCamera0Flag1000 = 0x8024036C; // type:func rom:0xC8C40C kzn_18_GetFloorCollider = 0x80240388; // type:func rom:0xC8C428 kzn_19_UnkTexturePanFunc = 0x80240000; // type:func rom:0xC8DBB0 kzn_19_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xC8DCD4 -func_8024030C_C8DEBC = 0x8024030C; // type:func rom:0xC8DEBC -func_80240358_C8DF08 = 0x80240358; // type:func rom:0xC8DF08 -func_802404B8_C8E068 = 0x802404B8; // type:func rom:0xC8E068 -func_802408C8_C8E478 = 0x802408C8; // type:func rom:0xC8E478 -func_80240908_C8E4B8 = 0x80240908; // type:func rom:0xC8E4B8 -func_80240A14_C8E5C4 = 0x80240A14; // type:func rom:0xC8E5C4 +kzn_19_StarSpiritEffectFunc1 = 0x8024030C; // type:func rom:0xC8DEBC +kzn_19_StarSpiritEffectFunc2 = 0x80240358; // type:func rom:0xC8DF08 +kzn_19_StarSpiritEffectFunc3 = 0x802404B8; // type:func rom:0xC8E068 +kzn_19_StarSpiritEffectFunc4 = 0x802408C8; // type:func rom:0xC8E478 +kzn_19_StarSpiritEffectFunc5 = 0x80240908; // type:func rom:0xC8E4B8 +kzn_19_StarSpiritEffectFunc6 = 0x80240A14; // type:func rom:0xC8E5C4 func_80240B00_C8E6B0 = 0x80240B00; // type:func rom:0xC8E6B0 func_80240BD4_C8E784 = 0x80240BD4; // type:func rom:0xC8E784 func_80240CD8_C8E888 = 0x80240CD8; // type:func rom:0xC8E888 @@ -15684,12 +15684,12 @@ flo_19_80241CC4 = 0x80241CC4; // type:data rom:0xCE53B4 flo_19_802423F8 = 0x802423F8; // type:data rom:0xCE5AE8 flo_19_80242A2C = 0x80242A2C; // type:data rom:0xCE611C flo_19_80242FD0 = 0x80242FD0; // type:data rom:0xCE66C0 -flo_21_func_80240000_CE6700 = 0x80240000; // type:func rom:0xCE6700 -flo_21_func_8024004C_CE674C = 0x8024004C; // type:func rom:0xCE674C -flo_21_func_802401AC_CE68AC = 0x802401AC; // type:func rom:0xCE68AC -flo_21_func_802405BC_CE6CBC = 0x802405BC; // type:func rom:0xCE6CBC -flo_21_func_802405FC_CE6CFC = 0x802405FC; // type:func rom:0xCE6CFC -flo_21_func_80240708_CE6E08 = 0x80240708; // type:func rom:0xCE6E08 +flo_21_StarSpiritEffectFunc1 = 0x80240000; // type:func rom:0xCE6700 +flo_21_StarSpiritEffectFunc2 = 0x8024004C; // type:func rom:0xCE674C +flo_21_flo_21_StarSpiritEffectFunc3 = 0x802401AC; // type:func rom:0xCE68AC +flo_21_StarSpiritEffectFunc4 = 0x802405BC; // type:func rom:0xCE6CBC +flo_21_StarSpiritEffectFunc5 = 0x802405FC; // type:func rom:0xCE6CFC +flo_21_StarSpiritEffectFunc6 = 0x80240708; // type:func rom:0xCE6E08 flo_21_UnkTexturePanFunc = 0x802407F4; // type:func rom:0xCE6EF4 flo_21_UnkTexturePanFunc2 = 0x80240918; // type:func rom:0xCE7018 flo_21_func_80240B00_CE7200 = 0x80240B00; // type:func rom:0xCE7200 @@ -16646,12 +16646,12 @@ D_80242514_D81274 = 0x80242514; // type:data rom:0xD81274 D_80242538_D81298 = 0x80242538; // type:data rom:0xD81298 D_80247C90_D869F0 = 0x80247C90; // type:data rom:0xD869F0 pra_32_SetGameStatusUnk84_1 = 0x80240000; // type:func rom:0xD86A00 -func_80240020_D86A20 = 0x80240020; // type:func rom:0xD86A20 -func_8024006C_D86A6C = 0x8024006C; // type:func rom:0xD86A6C -func_802401CC_D86BCC = 0x802401CC; // type:func rom:0xD86BCC -func_802405DC_D86FDC = 0x802405DC; // type:func rom:0xD86FDC -func_8024061C_D8701C = 0x8024061C; // type:func rom:0xD8701C -func_80240728_D87128 = 0x80240728; // type:func rom:0xD87128 +pra_32_StarSpiritEffectFunc1 = 0x80240020; // type:func rom:0xD86A20 +pra_32_StarSpiritEffectFunc2 = 0x8024006C; // type:func rom:0xD86A6C +pra_32_StarSpiritEffectFunc3 = 0x802401CC; // type:func rom:0xD86BCC +pra_32_StarSpiritEffectFunc4 = 0x802405DC; // type:func rom:0xD86FDC +pra_32_StarSpiritEffectFunc5 = 0x8024061C; // type:func rom:0xD8701C +pra_32_StarSpiritEffectFunc6 = 0x80240728; // type:func rom:0xD87128 func_80240814_D87214 = 0x80240814; // type:func rom:0xD87214 pra_33_SetGameStatusUnk84_1 = 0x80240000; // type:func rom:0xD896E0 pra_33_reflection_unk_resolve_anim = 0x80240020; // type:func rom:0xD89700 @@ -17178,12 +17178,12 @@ func_80240160_DE5810 = 0x80240160; // type:func rom:0xDE5810 func_802403FC_DE5AAC = 0x802403FC; // type:func rom:0xDE5AAC func_80240564_DE5C14 = 0x80240564; // type:func rom:0xDE5C14 func_80240590_DE5C40 = 0x80240590; // type:func rom:0xDE5C40 -func_80240000_DE8770 = 0x80240000; // type:func rom:0xDE8770 -func_8024004C_DE87BC = 0x8024004C; // type:func rom:0xDE87BC -func_802401AC_DE891C = 0x802401AC; // type:func rom:0xDE891C -func_802405BC_DE8D2C = 0x802405BC; // type:func rom:0xDE8D2C -func_802405FC_DE8D6C = 0x802405FC; // type:func rom:0xDE8D6C -func_80240708_DE8E78 = 0x80240708; // type:func rom:0xDE8E78 +omo_15_StarSpiritEffectFunc1 = 0x80240000; // type:func rom:0xDE8770 +omo_15_StarSpiritEffectFunc2 = 0x8024004C; // type:func rom:0xDE87BC +omo_15_StarSpiritEffectFunc3 = 0x802401AC; // type:func rom:0xDE891C +omo_15_StarSpiritEffectFunc4 = 0x802405BC; // type:func rom:0xDE8D2C +omo_15_StarSpiritEffectFunc5 = 0x802405FC; // type:func rom:0xDE8D6C +omo_15_StarSpiritEffectFunc6 = 0x80240708; // type:func rom:0xDE8E78 omo_16_UnsetCamera0MoveFlag1 = 0x80240000; // type:func rom:0xDEBED0 func_8024001C_DEBEEC = 0x8024001C; // type:func rom:0xDEBEEC func_802400E4_DEBFB4 = 0x802400E4; // type:func rom:0xDEBFB4 @@ -17700,18 +17700,18 @@ 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 +EA0C10_SetManyVars = 0x80242AE8; // type:func rom:0xEA33E8 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 +EA36E0_SpinyTrompHit = 0x80242DE0; // type:func rom:0xEA36E0 filemenu_set_cursor_goal_pos_EA3700 = 0x80242E00; // type:func rom:0xEA3700 -func_80242E2C_EA372C = 0x80242E2C; // type:func rom:0xEA372C -func_80242EC4_EA37C4 = 0x80242EC4; // type:func rom:0xEA37C4 -func_80242F64_EA3864 = 0x80242F64; // type:func rom:0xEA3864 -func_80242F9C_EA389C = 0x80242F9C; // type:func rom:0xEA389C +EA36E0_UnkFunc46 = 0x80242E2C; // type:func rom:0xEA372C +EA36E0_UnkFunc47 = 0x80242EC4; // type:func rom:0xEA37C4 +EA36E0_UnkFunc48 = 0x80242F64; // type:func rom:0xEA3864 +EA36E0_UnkFunc49 = 0x80242F9C; // type:func rom:0xEA389C func_80243054_EA3954 = 0x80243054; // type:func rom:0xEA3954 -func_802430E4_EA39E4 = 0x802430E4; // type:func rom:0xEA39E4 +EA36E0_UnkFunc51 = 0x802430E4; // type:func rom:0xEA39E4 D_80244154_EA4A54 = 0x80244154; // type:data rom:0xEA4A54 D_802441B8_EA4AB8 = 0x802441B8; // type:data rom:0xEA4AB8 D_802441BC_EA4ABC = 0x802441BC; // type:data rom:0xEA4ABC @@ -17737,12 +17737,12 @@ func_8024036C_EA733C = 0x8024036C; // type:func rom:0xEA733C func_80240388_EA7358 = 0x80240388; // type:func rom:0xEA7358 EA8AE0_DeadUnkTexturePanFunc = 0x80240000; // type:func rom:0xEA8AE0 EA8AE0_DeadUnkTexturePanFunc2 = 0x80240124; // type:func rom:0xEA8C04 -func_8024030C_EA8DEC = 0x8024030C; // type:func rom:0xEA8DEC -func_80240358_EA8E38 = 0x80240358; // type:func rom:0xEA8E38 -func_802404B8_EA8F98 = 0x802404B8; // type:func rom:0xEA8F98 -func_802408C8_EA93A8 = 0x802408C8; // type:func rom:0xEA93A8 -func_80240908_EA93E8 = 0x80240908; // type:func rom:0xEA93E8 -func_80240A14_EA94F4 = 0x80240A14; // type:func rom:0xEA94F4 +EA8AE0_StarSpiritEffectFunc1 = 0x8024030C; // type:func rom:0xEA8DEC +EA8AE0_StarSpiritEffectFunc2 = 0x80240358; // type:func rom:0xEA8E38 +EA8AE0_StarSpiritEffectFunc3 = 0x802404B8; // type:func rom:0xEA8F98 +EA8AE0_StarSpiritEffectFunc4 = 0x802408C8; // type:func rom:0xEA93A8 +EA8AE0_StarSpiritEffectFunc5 = 0x80240908; // type:func rom:0xEA93E8 +EA8AE0_StarSpiritEffectFunc6 = 0x80240A14; // type:func rom:0xEA94F4 func_80240B00_EA95E0 = 0x80240B00; // type:func rom:0xEA95E0 func_80240BD4_EA96B4 = 0x80240BD4; // type:func rom:0xEA96B4 func_80240CD8_EA97B8 = 0x80240CD8; // type:func rom:0xEA97B8 @@ -17758,7 +17758,7 @@ 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 +EA8AE0_SetManyVars = 0x802418D4; // type:func rom:0xEAA3B4 EA8AE0_UnkYawFunc = 0x802419C4; // type:func rom:0xEAA4A4 func_80241B50_EAA630 = 0x80241B50; // type:func rom:0xEAA630 func_80241B94_EAA674 = 0x80241B94; // type:func rom:0xEAA674 @@ -17778,7 +17778,7 @@ 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 +EB1170_SetManyVars = 0x8024077C; // type:func rom:0xEB15DC EB1170_UnkYawFunc = 0x8024086C; // type:func rom:0xEB16CC func_802409F8_EB1858 = 0x802409F8; // type:func rom:0xEB1858 func_80240A3C_EB189C = 0x80240A3C; // type:func rom:0xEB189C diff --git a/ver/us/undefined_syms.txt b/ver/us/undefined_syms.txt index a067226cb9..420465a258 100644 --- a/ver/us/undefined_syms.txt +++ b/ver/us/undefined_syms.txt @@ -1757,24 +1757,24 @@ func_8004E808 = 0x8004E808; func_8004EB8C = 0x8004EB8C; func_8004D1A4 = 0x8004D1A4; dead_npc_move_heading = 0x8003E424; -func_80067040 = 0x80067040; +dead_sqrtf = 0x80067040; dead_npc_test_move_simple_with_slipping = 0x800E5304; dead_npc_raycast_down_sides = 0x800E423C; dead_is_point_within_region = 0x8004D0C4; func_8004D8E0 = 0x8004D8E0; dead_rand_int = 0x8002ACEC; dead_get_npc_safe = 0x8003E534; -func_8002BFD4 = 0x8002BFD4; +dead_heap_malloc = 0x8002BFD4; func_8002C01C = 0x8002C01C; dead_sin_deg = 0x8002B5DC; dead_cos_deg = 0x8002B640; -func_800F1EF8 = 0x800F1EF8; -func_8015704C = 0x8015704C; -func_80077C30 = 0x80077C30; -func_8002B6A4 = 0x8002B6A4; -func_80077930 = 0x80077930; -func_8011AAB4 = 0x8011AAB4; -func_8002B21C = 0x8002B21C; +dead_subtract_hp = 0x800F1EF8; +dead_sfx_adjust_env_sound_pos = 0x8015704C; +dead_playFX_83 = 0x80077C30; +dead_update_lerp = 0x8002B6A4; +dead_playFX_7B = 0x80077930; +dead_create_shadow_type = 0x8011AAB4; +dead_dist3D = 0x8002B21C; func_802E2A80 = 0x802E2A80; func_802E2B74 = 0x802E2B74; func_80128510 = 0x80128510;