diff --git a/include/variables.h b/include/variables.h index 8ea3513fc1..d7b4917bd7 100644 --- a/include/variables.h +++ b/include/variables.h @@ -162,8 +162,8 @@ extern s32 D_800A0924; extern s8 D_800A0921; extern s16 D_800A0922; extern s32 wMapTexName; -extern char* wMapHitName; -extern s32 wMapShapeName; +extern char wMapHitName[]; +extern char wMapShapeName[]; extern s32* D_80210000; extern u8 D_802D9D70; // player alpha1 copy? extern u8 D_802D9D71; // player alpha2 copy? diff --git a/src/world/area_kkj/kkj_16/AED410.c b/src/world/area_kkj/kkj_16/AED410.c index 0049b9ab3b..731fe1d726 100644 --- a/src/world/area_kkj/kkj_16/AED410.c +++ b/src/world/area_kkj/kkj_16/AED410.c @@ -3,9 +3,18 @@ static char* N(exit_str_0) = "sbk_02"; static char* N(exit_str_1) = "kkj_11"; -INCLUDE_ASM(s32, "world/area_kkj/kkj_16/AED410", func_80240000_AED410); +ApiStatus func_80240000_AED410(Evt* script, s32 isInitialCall) { + gGameStatusPtr->peachFlags &= ~0x1; + gPlayerData.currentPartner = script->varTable[0]; + return ApiStatus_DONE2; +} -INCLUDE_ASM(s32, "world/area_kkj/kkj_16/AED410", func_80240028_AED438); +ApiStatus func_80240028_AED438(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + + gPlayerStatus.unk_0D = evt_get_float_variable(script, *args++); + return ApiStatus_DONE2; +} #include "world/common/atomic/UnkPhysicsFuncs.inc.c" diff --git a/src/world/area_kpa/kpa_114/A9E980.c b/src/world/area_kpa/kpa_114/A9E980.c index 5dbac0e6e3..c267b5115b 100644 --- a/src/world/area_kpa/kpa_114/A9E980.c +++ b/src/world/area_kpa/kpa_114/A9E980.c @@ -1,3 +1,9 @@ #include "kpa_114.h" -INCLUDE_ASM(s32, "world/area_kpa/kpa_114/A9E980", func_80240000_A9E980); +ApiStatus func_80240000_A9E980(Evt* script, s32 isInitialCall) { + sprintf(wMapShapeName, "kpa_112_shape"); + sprintf(wMapHitName, "kpa_112_hit"); + return ApiStatus_BLOCK; +} + +const char* N(exit_str_0) = "kpa_113\0kpa_115"; diff --git a/src/world/area_kpa/kpa_134/AA92B0.c b/src/world/area_kpa/kpa_134/AA92B0.c index 31003afd24..cb6739cc09 100644 --- a/src/world/area_kpa/kpa_134/AA92B0.c +++ b/src/world/area_kpa/kpa_134/AA92B0.c @@ -1,9 +1,15 @@ #include "kpa_134.h" -INCLUDE_ASM(s32, "world/area_kpa/kpa_134/AA92B0", func_80240310_AA92B0); +ApiStatus func_80240310_AA92B0(Evt* script, s32 isInitialCall) { + create_shadow_type(0, 50.0f, 115.0f, -34.0f); + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "world/area_kpa/kpa_134/AA92B0", func_8024033C_AA92DC); -INCLUDE_ASM(s32, "world/area_kpa/kpa_134/AA92B0", func_80240408_AA93A8); +ApiStatus func_80240408_AA93A8(Evt* script, s32 isInitialCall) { + create_shadow_type(0, 680.0f, 240.0f, -35.0f); + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "world/area_kpa/kpa_134/AA92B0", func_80240434_AA93D4); diff --git a/src/world/area_kpa/kpa_134/AA94B0.c b/src/world/area_kpa/kpa_134/AA94B0.c index dbc3d80279..829ba7e470 100644 --- a/src/world/area_kpa/kpa_134/AA94B0.c +++ b/src/world/area_kpa/kpa_134/AA94B0.c @@ -1,6 +1,13 @@ #include "kpa_134.h" -INCLUDE_ASM(s32, "world/area_kpa/kpa_134/AA94B0", func_80240510_AA94B0); +ApiStatus func_80240510_AA94B0(Evt* script, s32 isInitialCall) { + Entity* entity = get_entity_by_index(script->varTable[10]); + + entity->position.x = script->varTable[0]; + entity->position.y = script->varTable[1]; + entity->position.z = script->varTable[2]; + return ApiStatus_DONE2; +} #include "world/common/SetEntityPosition.inc.c" diff --git a/src/world/area_kpa/kpa_14/A574F0.c b/src/world/area_kpa/kpa_14/A574F0.c index 8257ce5c75..6f9b3d46e9 100644 --- a/src/world/area_kpa/kpa_14/A574F0.c +++ b/src/world/area_kpa/kpa_14/A574F0.c @@ -2,4 +2,11 @@ #include "world/common/atomic/TexturePan.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_14/A574F0", func_8024034C_A577FC); +ApiStatus func_8024034C_A577FC(Evt* script, s32 isInitialCall) { + if (gPartnerActionStatus.partnerActionState != 0) { + script->varTable[9] = gPartnerActionStatus.actingPartner; + } else { + script->varTable[9] = -1; + } + return ApiStatus_DONE2; +} diff --git a/src/world/area_kpa/kpa_81/A78510.c b/src/world/area_kpa/kpa_81/A78510.c index a03fcfe231..5504a0e542 100644 --- a/src/world/area_kpa/kpa_81/A78510.c +++ b/src/world/area_kpa/kpa_81/A78510.c @@ -4,9 +4,41 @@ #include "world/common/AddPlayerHandsOffset.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_81/A78510", func_8024027C_A7873C); +extern s32 D_80240D98_A79258; +extern s32 D_80240D9C_A7925C; +// Needs data migrated +#ifdef NON_MATCHING +ApiStatus func_8024027C_A7873C(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + + if (isInitialCall) { + D_80240D98_A79258 = 0; + } + if (D_80240D98_A79258 != 0) { + D_80240D98_A79258 = 0; + evt_set_variable(script, *args++, D_80240D9C_A7925C); + return ApiStatus_DONE2; + } + + return ApiStatus_BLOCK; +} +#else +INCLUDE_ASM(s32, "world/area_kpa/kpa_81/A78510", func_8024027C_A7873C); +#endif + +// Needs data migrated +#ifdef NON_MATCHING +ApiStatus func_802402D0_A78790(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + + D_80240D9C_A7925C = evt_get_variable(script, *args++); + D_80240D98_A79258 = 1; + return ApiStatus_DONE2; +} +#else INCLUDE_ASM(s32, "world/area_kpa/kpa_81/A78510", func_802402D0_A78790); +#endif INCLUDE_ASM(s32, "world/area_kpa/kpa_81/A78510", func_80240308_A787C8); diff --git a/src/world/area_kpa/kpa_82/A7A550.c b/src/world/area_kpa/kpa_82/A7A550.c index 5dce2b45e3..314acf5706 100644 --- a/src/world/area_kpa/kpa_82/A7A550.c +++ b/src/world/area_kpa/kpa_82/A7A550.c @@ -6,7 +6,16 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_82/A7A550", func_8024027C_A7A77C); -INCLUDE_ASM(s32, "world/area_kpa/kpa_82/A7A550", func_802402D0_A7A7D0); +extern s32 D_80240C20_A7B120; +extern s32 D_80240C24_A7B124; + +ApiStatus func_802402D0_A7A7D0(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + + D_80240C24_A7B124 = evt_get_variable(script, *args++); + D_80240C20_A7B120 = 1; + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "world/area_kpa/kpa_82/A7A550", func_80240308_A7A808); diff --git a/src/world/area_kpa/kpa_83/A834E0.c b/src/world/area_kpa/kpa_83/A834E0.c index 0162b7a54b..cd3de3b790 100644 --- a/src/world/area_kpa/kpa_83/A834E0.c +++ b/src/world/area_kpa/kpa_83/A834E0.c @@ -1,3 +1,6 @@ #include "kpa_83.h" -INCLUDE_ASM(s32, "world/area_kpa/kpa_83/A834E0", func_80240050_A834E0); +ApiStatus func_80240050_A834E0(Evt* script, s32 isInitialCall) { + gPlayerStatus.spriteFacingAngle = script->varTable[0]; + return ApiStatus_DONE2; +} diff --git a/src/world/area_kpa/kpa_96/A927C0.c b/src/world/area_kpa/kpa_96/A927C0.c index e95179ad81..7820445479 100644 --- a/src/world/area_kpa/kpa_96/A927C0.c +++ b/src/world/area_kpa/kpa_96/A927C0.c @@ -3,4 +3,11 @@ static char* N(exit_str_0) = "kpa_32"; static char* N(exit_str_1) = ""; -INCLUDE_ASM(s32, "world/area_kpa/kpa_96/A927C0", func_80240000_A927C0); +ApiStatus func_80240000_A927C0(Evt* script, s32 isInitialCall) { + if (gPlayerData.coins > 0) { + script->varTable[0] = FALSE; + } else { + script->varTable[0] = TRUE; + } + return ApiStatus_DONE2; +} diff --git a/src/world/area_obk/obk_08/BD40B0.c b/src/world/area_obk/obk_08/BD40B0.c index aaf93573c2..91c37cec3d 100644 --- a/src/world/area_obk/obk_08/BD40B0.c +++ b/src/world/area_obk/obk_08/BD40B0.c @@ -1,5 +1,14 @@ #include "obk_08.h" -INCLUDE_ASM(s32, "world/area_obk/obk_08/BD40B0", func_80240840_BD40B0); +ApiStatus func_80240840_BD40B0(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + + start_rumble(0x64, evt_get_variable(script, *args++) & 0xFFFF); + return ApiStatus_DONE2; +} + +ApiStatus func_80240870_BD40E0(Evt* script, s32 isInitialCall) { + set_item_entity_flags(script->varTable[0], 0x80000); + return ApiStatus_DONE2; +} -INCLUDE_ASM(s32, "world/area_obk/obk_08/BD40B0", func_80240870_BD40E0); diff --git a/src/world/area_osr/osr_00/AAC830.c b/src/world/area_osr/osr_00/AAC830.c index 6af45a2f06..d8483e3ac2 100644 --- a/src/world/area_osr/osr_00/AAC830.c +++ b/src/world/area_osr/osr_00/AAC830.c @@ -1,4 +1,5 @@ #include "osr_00.h" +#include "effects.h" static char* N(exit_str_0) = "mac_01"; static char* N(exit_str_1) = "kkj_00"; @@ -7,6 +8,9 @@ static char* N(exit_str_3) = "kkj_00\0"; #include "world/common/atomic/TexturePan.inc.c" -INCLUDE_ASM(s32, "world/area_osr/osr_00/AAC830", func_8024030C_AACB3C); +ApiStatus func_8024030C_AACB3C(Evt* script, s32 isInitialCall) { + fx_sun(1, 0.0f, 0.0f, 0.0f, 0.0f, 0); + return ApiStatus_DONE2; +} #include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_osr/osr_01/AAFFF0.c b/src/world/area_osr/osr_01/AAFFF0.c index aecc8dd319..c686fa23d5 100644 --- a/src/world/area_osr/osr_01/AAFFF0.c +++ b/src/world/area_osr/osr_01/AAFFF0.c @@ -1,3 +1,12 @@ #include "osr_01.h" -INCLUDE_ASM(s32, "world/area_osr/osr_01/AAFFF0", func_80240000_AAFFF0); +extern s8 D_800D9668; + +ApiStatus func_80240000_AAFFF0(Evt* script, s32 isInitialCall) { + if (gGameStatusPtr->entryID == 3) { + sprintf(&D_800D9668, "hos_bg"); + } + return ApiStatus_BLOCK; +} + +const char* N(exit_str_0) = "mac_01\0\0hos_00\0\0mac_04"; diff --git a/src/world/area_osr/osr_01/AB0350.c b/src/world/area_osr/osr_01/AB0350.c index b8d5bbb5f9..bba030c05c 100644 --- a/src/world/area_osr/osr_01/AB0350.c +++ b/src/world/area_osr/osr_01/AB0350.c @@ -8,9 +8,42 @@ #include "world/common/AddPlayerHandsOffset.inc.c" -INCLUDE_ASM(s32, "world/area_osr/osr_01/AB0350", func_802406A4_AB0694); +extern s32 D_8024121C_AB120C; +extern s32 D_80241220_AB1210; +// Needs data migrated +#ifdef NON_MATCHING +ApiStatus func_802406A4_AB0694(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + + if (isInitialCall != 0) { + D_8024121C_AB120C = 0; + } + + if (D_8024121C_AB120C != 0) { + D_8024121C_AB120C = 0; + evt_set_variable(script, *args++, D_80241220_AB1210); + return ApiStatus_DONE2; + } + + return ApiStatus_BLOCK; +} +#else +INCLUDE_ASM(s32, "world/area_osr/osr_01/AB0350", func_802406A4_AB0694); +#endif + +// Needs data migrated +#ifdef NON_MATCHING +ApiStatus func_802406F8_AB06E8(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + + D_80241220_AB1210 = evt_get_variable(script, *args++); + D_8024121C_AB120C = 1; + return ApiStatus_DONE2; +} +#else INCLUDE_ASM(s32, "world/area_osr/osr_01/AB0350", func_802406F8_AB06E8); +#endif INCLUDE_ASM(s32, "world/area_osr/osr_01/AB0350", func_80240730_AB0720); diff --git a/src/world/area_osr/osr_02/AB2190.c b/src/world/area_osr/osr_02/AB2190.c index 877675dde3..b2078f2f87 100644 --- a/src/world/area_osr/osr_02/AB2190.c +++ b/src/world/area_osr/osr_02/AB2190.c @@ -1,3 +1,8 @@ #include "osr_02.h" -INCLUDE_ASM(s32, "world/area_osr/osr_02/AB2190", func_80240020_AB2190); +ApiStatus func_80240020_AB2190(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + + gPlayerStatus.unk_0D = evt_get_float_variable(script, *args++); + return ApiStatus_DONE2; +} diff --git a/src/world/area_osr/osr_03/AB62B0.c b/src/world/area_osr/osr_03/AB62B0.c index 8c00e8fd46..83558df263 100644 --- a/src/world/area_osr/osr_03/AB62B0.c +++ b/src/world/area_osr/osr_03/AB62B0.c @@ -1,8 +1,18 @@ #include "osr_03.h" -INCLUDE_ASM(s32, "world/area_osr/osr_03/AB62B0", func_80240020_AB62B0); +ApiStatus func_80240020_AB62B0(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + + evt_set_variable(script, *args, sin_deg(evt_get_variable(script, *args)) * 20.0f); + return ApiStatus_DONE2; +} -INCLUDE_ASM(s32, "world/area_osr/osr_03/AB62B0", func_80240090_AB6320); +ApiStatus func_80240090_AB6320(Evt* script, s32 isInitialCall) { + gGameStatusPtr->peachFlags |= 1; + script->varTable[0] = gPlayerData.currentPartner; + gPlayerData.currentPartner = PARTNER_TWINK; + return ApiStatus_DONE2; +} ApiStatus func_802400C4_AB6354(Evt* script, s32 isInitialCall) { Npc* npc = get_npc_unsafe(0); @@ -14,6 +24,62 @@ ApiStatus func_802400C4_AB6354(Evt* script, s32 isInitialCall) { } -INCLUDE_ASM(s32, "world/area_osr/osr_03/AB62B0", func_802401A0_AB6430); +ApiStatus func_802401A0_AB6430(Evt* script, s32 isInitialCall) { + if (isInitialCall) { + script->functionTemp[1] = 0; + script->functionTemp[2] = 0; + } + switch (script->functionTemp[2]) { + case 0: + set_screen_overlay_color(0, 208, 208, 208); + set_screen_overlay_params_front(1, script->functionTemp[1]); + if (script->functionTemp[1] == 255) { + script->functionTemp[2] = 1; + break; + } + script->functionTemp[1] += 64; + if (script->functionTemp[1] < 256) { + break; + } + script->functionTemp[1] = 255; + break; + case 1: + set_screen_overlay_color(0, 208, 208, 208); + set_screen_overlay_params_front(1, script->functionTemp[1]); + if (script->functionTemp[1] == 0) { + return ApiStatus_DONE2; + } + script->functionTemp[1] -= 64; + if (script->functionTemp[1] <= 0) { + script->functionTemp[1] = 0; + } + break; + } -INCLUDE_ASM(s32, "world/area_osr/osr_03/AB62B0", func_80240290_AB6520); + return ApiStatus_BLOCK; +} + +ApiStatus func_80240290_AB6520(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + f32 frequency; + s32 duration; + + if (isInitialCall) { + duration = evt_get_variable(script, *args++); + frequency = 2.0f * evt_get_float_variable(script, *args++); + script->functionTemp[0] = duration; + if (frequency > 10.0f) { + frequency = 10.0f; + } + + start_rumble((u8) ((frequency / 10.0f) * 256.0f), (duration & 0xFFFF) * 2); + } + + script->functionTemp[0] -= 1; + if (script->functionTemp[0] == 0) + { + return ApiStatus_DONE1; + } + + return ApiStatus_BLOCK; +} diff --git a/src/world/area_osr/osr_04/AB92B0.c b/src/world/area_osr/osr_04/AB92B0.c index a7bdc76c9e..ae95eb79ea 100644 --- a/src/world/area_osr/osr_04/AB92B0.c +++ b/src/world/area_osr/osr_04/AB92B0.c @@ -1,5 +1,17 @@ #include "osr_04.h" -INCLUDE_ASM(s32, "world/area_osr/osr_04/AB92B0", func_80240000_AB92B0); +ApiStatus func_80240000_AB92B0(Evt *script, s32 isInitialCall) { + gGameStatusPtr->playerSpriteSet = 2; + sprintf(wMapShapeName, "osr_03_shape"); + sprintf(wMapHitName, "osr_03_hit"); + return ApiStatus_BLOCK; +} -INCLUDE_ASM(s32, "world/area_osr/osr_04/AB92B0", func_80240050_AB9300); +const char* N(exit_str_0) = "kkj_03"; + +ApiStatus func_80240050_AB9300(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + + evt_set_variable(script, *args, (sin_deg(evt_get_variable(script, *args)) * 20.0f)); + return ApiStatus_DONE2; +} diff --git a/src/world/area_pra/pra_33/D89700.c b/src/world/area_pra/pra_33/D89700.c index 4546a46708..954411df47 100644 --- a/src/world/area_pra/pra_33/D89700.c +++ b/src/world/area_pra/pra_33/D89700.c @@ -4,6 +4,14 @@ INCLUDE_ASM(s32, "world/area_pra/pra_33/D89700", func_80240F20_D8A600); -INCLUDE_ASM(s32, "world/area_pra/pra_33/D89700", func_80240F58_D8A638); +ApiStatus func_80240F58_D8A638(Evt* script, s32 isInitialCall) { + s32 temp_f2; + + script->varTable[6] = dist2D(200.0f, 0.0f, gPlayerStatus.position.x, gPlayerStatus.position.z); + temp_f2 = atan2(200.0f, 0.0f, gPlayerStatus.position.x, gPlayerStatus.position.z); + script->varTable[7] = temp_f2; + script->varTable[7] = clamp_angle(temp_f2); + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "world/area_pra/pra_33/D89700", func_80241000_D8A6E0); diff --git a/src/world/area_pra/pra_36/D91700.c b/src/world/area_pra/pra_36/D91700.c index 6c8660e973..a02b23f478 100644 --- a/src/world/area_pra/pra_36/D91700.c +++ b/src/world/area_pra/pra_36/D91700.c @@ -1,5 +1,12 @@ #include "pra_36.h" -INCLUDE_ASM(s32, "world/area_pra/pra_36/D91700", func_80240000_D91700); +ApiStatus func_80240000_D91700(Evt* script, s32 isInitialCall) { + gGameStatusPtr->playerSpriteSet = 1; + sprintf(wMapShapeName, "pra_10_shape"); + sprintf(wMapHitName, "pra_10_hit"); + return ApiStatus_BLOCK; +} + +const char* N(exit_str_0) = "pra_21\0\0pra_27"; #include "world/common/atomic/Reflection.inc.c" diff --git a/src/world/area_pra/pra_37/D92F40.c b/src/world/area_pra/pra_37/D92F40.c index 5457a70026..14926b5292 100644 --- a/src/world/area_pra/pra_37/D92F40.c +++ b/src/world/area_pra/pra_37/D92F40.c @@ -1,6 +1,13 @@ #include "pra_37.h" -INCLUDE_ASM(s32, "world/area_pra/pra_37/D92F40", func_80240000_D92F40); +ApiStatus func_80240000_D92F40(Evt* script, s32 isInitialCall) { + gGameStatusPtr->playerSpriteSet = 1; + sprintf(wMapShapeName, "pra_10_shape"); + sprintf(wMapHitName, "pra_10_hit"); + return ApiStatus_BLOCK; +} + +const char* N(exit_str_0) = "pra_22\0\0pra_28"; #include "world/common/atomic/Reflection.inc.c" diff --git a/src/world/area_pra/pra_38/D955F0.c b/src/world/area_pra/pra_38/D955F0.c index 7692b3def5..99d274de52 100644 --- a/src/world/area_pra/pra_38/D955F0.c +++ b/src/world/area_pra/pra_38/D955F0.c @@ -1,6 +1,13 @@ #include "pra_38.h" -INCLUDE_ASM(s32, "world/area_pra/pra_38/D955F0", func_80240000_D955F0); +ApiStatus func_80240000_D955F0(Evt* script, s32 isInitialCall) { + gGameStatusPtr->playerSpriteSet = 1; + sprintf(wMapShapeName, "pra_10_shape"); + sprintf(wMapHitName, "pra_10_hit"); + return ApiStatus_BLOCK; +} + +const char* N(exit_str_0) = "pra_03\0\0pra_05"; #include "world/common/atomic/Reflection.inc.c" diff --git a/src/world/area_pra/pra_39/D97890.c b/src/world/area_pra/pra_39/D97890.c index f288082e94..1959ef7f48 100644 --- a/src/world/area_pra/pra_39/D97890.c +++ b/src/world/area_pra/pra_39/D97890.c @@ -1,6 +1,13 @@ #include "pra_39.h" -INCLUDE_ASM(s32, "world/area_pra/pra_39/D97890", func_80240000_D97890); +ApiStatus func_80240000_D97890(Evt* script, s32 isInitialCall) { + gGameStatusPtr->playerSpriteSet = 1; + sprintf(wMapShapeName, "pra_10_shape"); + sprintf(wMapHitName, "pra_10_hit"); + return ApiStatus_BLOCK; +} + +const char* N(exit_str_0) = "pra_04\0\0pra_06"; #include "world/common/atomic/Reflection.inc.c" diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240000_AED410.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240000_AED410.s deleted file mode 100644 index 820eae1f4a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240000_AED410.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_AED410 -/* AED410 80240000 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* AED414 80240004 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* AED418 80240008 9043007E */ lbu $v1, 0x7e($v0) -/* AED41C 8024000C 306300FE */ andi $v1, $v1, 0xfe -/* AED420 80240010 A043007E */ sb $v1, 0x7e($v0) -/* AED424 80240014 90820087 */ lbu $v0, 0x87($a0) -/* AED428 80240018 3C018011 */ lui $at, %hi(gPlayerData+0x12) -/* AED42C 8024001C A022F2A2 */ sb $v0, %lo(gPlayerData+0x12)($at) -/* AED430 80240020 03E00008 */ jr $ra -/* AED434 80240024 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240028_AED438.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240028_AED438.s deleted file mode 100644 index d7a61ec3b5..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240028_AED438.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240028_AED438 -/* AED438 80240028 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AED43C 8024002C AFBF0010 */ sw $ra, 0x10($sp) -/* AED440 80240030 8C82000C */ lw $v0, 0xc($a0) -/* AED444 80240034 0C0B210B */ jal evt_get_float_variable -/* AED448 80240038 8C450000 */ lw $a1, ($v0) -/* AED44C 8024003C 8FBF0010 */ lw $ra, 0x10($sp) -/* AED450 80240040 4600008D */ trunc.w.s $f2, $f0 -/* AED454 80240044 44021000 */ mfc1 $v0, $f2 -/* AED458 80240048 00000000 */ nop -/* AED45C 8024004C 3C018011 */ lui $at, %hi(gPlayerStatus+0xD) -/* AED460 80240050 A022EFD5 */ sb $v0, %lo(gPlayerStatus+0xD)($at) -/* AED464 80240054 24020002 */ addiu $v0, $zero, 2 -/* AED468 80240058 03E00008 */ jr $ra -/* AED46C 8024005C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_114/A9E980/func_80240000_A9E980.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_114/A9E980/func_80240000_A9E980.s deleted file mode 100644 index adce451e6e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_114/A9E980/func_80240000_A9E980.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80240390_A9ED10 -.ascii "kpa_112_shape\0\0\0" - -dlabel D_802403A0_A9ED20 -.ascii "kpa_112_hit\0kpa_113\0kpa_115\0\0\0\0\0" - -.section .text - -glabel func_80240000_A9E980 -/* A9E980 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A9E984 80240004 3C04800E */ lui $a0, %hi(wMapShapeName) -/* A9E988 80240008 24849230 */ addiu $a0, $a0, %lo(wMapShapeName) -/* A9E98C 8024000C 3C058024 */ lui $a1, %hi(D_80240390_A9ED10) -/* A9E990 80240010 24A50390 */ addiu $a1, $a1, %lo(D_80240390_A9ED10) -/* A9E994 80240014 AFBF0010 */ sw $ra, 0x10($sp) -/* A9E998 80240018 0C01953C */ jal sprintf -/* A9E99C 8024001C 00000000 */ nop -/* A9E9A0 80240020 3C04800E */ lui $a0, %hi(wMapHitName) -/* A9E9A4 80240024 248491E0 */ addiu $a0, $a0, %lo(wMapHitName) -/* A9E9A8 80240028 3C058024 */ lui $a1, %hi(D_802403A0_A9ED20) -/* A9E9AC 8024002C 0C01953C */ jal sprintf -/* A9E9B0 80240030 24A503A0 */ addiu $a1, $a1, %lo(D_802403A0_A9ED20) -/* A9E9B4 80240034 8FBF0010 */ lw $ra, 0x10($sp) -/* A9E9B8 80240038 0000102D */ daddu $v0, $zero, $zero -/* A9E9BC 8024003C 03E00008 */ jr $ra -/* A9E9C0 80240040 27BD0018 */ addiu $sp, $sp, 0x18 -/* A9E9C4 80240044 00000000 */ nop -/* A9E9C8 80240048 00000000 */ nop -/* A9E9CC 8024004C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_134/AA92B0/func_80240310_AA92B0.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_134/AA92B0/func_80240310_AA92B0.s deleted file mode 100644 index 0851daccd5..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_134/AA92B0/func_80240310_AA92B0.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240310_AA92B0 -/* AA92B0 80240310 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AA92B4 80240314 3C054248 */ lui $a1, 0x4248 -/* AA92B8 80240318 3C0642E6 */ lui $a2, 0x42e6 -/* AA92BC 8024031C 3C07C208 */ lui $a3, 0xc208 -/* AA92C0 80240320 AFBF0010 */ sw $ra, 0x10($sp) -/* AA92C4 80240324 0C044898 */ jal create_shadow_type -/* AA92C8 80240328 0000202D */ daddu $a0, $zero, $zero -/* AA92CC 8024032C 8FBF0010 */ lw $ra, 0x10($sp) -/* AA92D0 80240330 24020002 */ addiu $v0, $zero, 2 -/* AA92D4 80240334 03E00008 */ jr $ra -/* AA92D8 80240338 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_134/AA92B0/func_80240408_AA93A8.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_134/AA92B0/func_80240408_AA93A8.s deleted file mode 100644 index 0243c4bda7..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_134/AA92B0/func_80240408_AA93A8.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240408_AA93A8 -/* AA93A8 80240408 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AA93AC 8024040C 3C05442A */ lui $a1, 0x442a -/* AA93B0 80240410 3C064370 */ lui $a2, 0x4370 -/* AA93B4 80240414 3C07C20C */ lui $a3, 0xc20c -/* AA93B8 80240418 AFBF0010 */ sw $ra, 0x10($sp) -/* AA93BC 8024041C 0C044898 */ jal create_shadow_type -/* AA93C0 80240420 0000202D */ daddu $a0, $zero, $zero -/* AA93C4 80240424 8FBF0010 */ lw $ra, 0x10($sp) -/* AA93C8 80240428 24020002 */ addiu $v0, $zero, 2 -/* AA93CC 8024042C 03E00008 */ jr $ra -/* AA93D0 80240430 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_134/AA94B0/func_80240510_AA94B0.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_134/AA94B0/func_80240510_AA94B0.s deleted file mode 100644 index 7e2ce03965..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_134/AA94B0/func_80240510_AA94B0.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240510_AA94B0 -/* AA94B0 80240510 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AA94B4 80240514 AFB00010 */ sw $s0, 0x10($sp) -/* AA94B8 80240518 0080802D */ daddu $s0, $a0, $zero -/* AA94BC 8024051C AFBF0014 */ sw $ra, 0x14($sp) -/* AA94C0 80240520 0C04417A */ jal get_entity_by_index -/* AA94C4 80240524 8E0400AC */ lw $a0, 0xac($s0) -/* AA94C8 80240528 0040182D */ daddu $v1, $v0, $zero -/* AA94CC 8024052C C6000084 */ lwc1 $f0, 0x84($s0) -/* AA94D0 80240530 46800020 */ cvt.s.w $f0, $f0 -/* AA94D4 80240534 E4600048 */ swc1 $f0, 0x48($v1) -/* AA94D8 80240538 C6000088 */ lwc1 $f0, 0x88($s0) -/* AA94DC 8024053C 46800020 */ cvt.s.w $f0, $f0 -/* AA94E0 80240540 E460004C */ swc1 $f0, 0x4c($v1) -/* AA94E4 80240544 C600008C */ lwc1 $f0, 0x8c($s0) -/* AA94E8 80240548 46800020 */ cvt.s.w $f0, $f0 -/* AA94EC 8024054C E4600050 */ swc1 $f0, 0x50($v1) -/* AA94F0 80240550 8FBF0014 */ lw $ra, 0x14($sp) -/* AA94F4 80240554 8FB00010 */ lw $s0, 0x10($sp) -/* AA94F8 80240558 24020002 */ addiu $v0, $zero, 2 -/* AA94FC 8024055C 03E00008 */ jr $ra -/* AA9500 80240560 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_14/A574F0/func_8024034C_A577FC.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_14/A574F0/func_8024034C_A577FC.s deleted file mode 100644 index 23845f5b4a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_14/A574F0/func_8024034C_A577FC.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024034C_A577FC -/* A577FC 8024034C 3C038011 */ lui $v1, %hi(gPartnerActionStatus) -/* A57800 80240350 2463EBB0 */ addiu $v1, $v1, %lo(gPartnerActionStatus) -/* A57804 80240354 80620000 */ lb $v0, ($v1) -/* A57808 80240358 10400004 */ beqz $v0, .L8024036C -/* A5780C 8024035C 2402FFFF */ addiu $v0, $zero, -1 -/* A57810 80240360 80620003 */ lb $v0, 3($v1) -/* A57814 80240364 080900DC */ j .L80240370 -/* A57818 80240368 AC8200A8 */ sw $v0, 0xa8($a0) -.L8024036C: -/* A5781C 8024036C AC8200A8 */ sw $v0, 0xa8($a0) -.L80240370: -/* A57820 80240370 03E00008 */ jr $ra -/* A57824 80240374 24020002 */ addiu $v0, $zero, 2 -/* A57828 80240378 00000000 */ nop -/* A5782C 8024037C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_82/A7A550/func_802402D0_A7A7D0.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_82/A7A550/func_802402D0_A7A7D0.s deleted file mode 100644 index c8ba5e00bc..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_82/A7A550/func_802402D0_A7A7D0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402D0_A7A7D0 -/* A7A7D0 802402D0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A7A7D4 802402D4 AFBF0010 */ sw $ra, 0x10($sp) -/* A7A7D8 802402D8 8C82000C */ lw $v0, 0xc($a0) -/* A7A7DC 802402DC 0C0B1EAF */ jal evt_get_variable -/* A7A7E0 802402E0 8C450000 */ lw $a1, ($v0) -/* A7A7E4 802402E4 3C018024 */ lui $at, %hi(D_80240C24_A7B124) -/* A7A7E8 802402E8 AC220C24 */ sw $v0, %lo(D_80240C24_A7B124)($at) -/* A7A7EC 802402EC 24020002 */ addiu $v0, $zero, 2 -/* A7A7F0 802402F0 8FBF0010 */ lw $ra, 0x10($sp) -/* A7A7F4 802402F4 24030001 */ addiu $v1, $zero, 1 -/* A7A7F8 802402F8 3C018024 */ lui $at, %hi(D_80240C20_A7B120) -/* A7A7FC 802402FC AC230C20 */ sw $v1, %lo(D_80240C20_A7B120)($at) -/* A7A800 80240300 03E00008 */ jr $ra -/* A7A804 80240304 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_83/A834E0/func_80240050_A834E0.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_83/A834E0/func_80240050_A834E0.s deleted file mode 100644 index 4f6db0ef25..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_83/A834E0/func_80240050_A834E0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240050_A834E0 -/* A834E0 80240050 C4800084 */ lwc1 $f0, 0x84($a0) -/* A834E4 80240054 46800020 */ cvt.s.w $f0, $f0 -/* A834E8 80240058 3C018011 */ lui $at, %hi(gPlayerStatus+0xA8) -/* A834EC 8024005C E420F070 */ swc1 $f0, %lo(gPlayerStatus+0xA8)($at) -/* A834F0 80240060 03E00008 */ jr $ra -/* A834F4 80240064 24020002 */ addiu $v0, $zero, 2 -/* A834F8 80240068 00000000 */ nop -/* A834FC 8024006C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_96/A927C0/func_80240000_A927C0.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_96/A927C0/func_80240000_A927C0.s deleted file mode 100644 index d23c59e69d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_96/A927C0/func_80240000_A927C0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_A927C0 -/* A927C0 80240000 3C028011 */ lui $v0, %hi(gPlayerData+0xC) -/* A927C4 80240004 8442F29C */ lh $v0, %lo(gPlayerData+0xC)($v0) -/* A927C8 80240008 18400003 */ blez $v0, .L80240018 -/* A927CC 8024000C 24020001 */ addiu $v0, $zero, 1 -/* A927D0 80240010 08090007 */ j .L8024001C -/* A927D4 80240014 AC800084 */ sw $zero, 0x84($a0) -.L80240018: -/* A927D8 80240018 AC820084 */ sw $v0, 0x84($a0) -.L8024001C: -/* A927DC 8024001C 03E00008 */ jr $ra -/* A927E0 80240020 24020002 */ addiu $v0, $zero, 2 -/* A927E4 80240024 00000000 */ nop -/* A927E8 80240028 00000000 */ nop -/* A927EC 8024002C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD40B0/func_80240840_BD40B0.s b/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD40B0/func_80240840_BD40B0.s deleted file mode 100644 index 700e90be06..0000000000 --- a/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD40B0/func_80240840_BD40B0.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240840_BD40B0 -/* BD40B0 80240840 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BD40B4 80240844 AFBF0010 */ sw $ra, 0x10($sp) -/* BD40B8 80240848 8C82000C */ lw $v0, 0xc($a0) -/* BD40BC 8024084C 0C0B1EAF */ jal evt_get_variable -/* BD40C0 80240850 8C450000 */ lw $a1, ($v0) -/* BD40C4 80240854 24040064 */ addiu $a0, $zero, 0x64 -/* BD40C8 80240858 0C00A3C2 */ jal start_rumble -/* BD40CC 8024085C 3045FFFF */ andi $a1, $v0, 0xffff -/* BD40D0 80240860 8FBF0010 */ lw $ra, 0x10($sp) -/* BD40D4 80240864 24020002 */ addiu $v0, $zero, 2 -/* BD40D8 80240868 03E00008 */ jr $ra -/* BD40DC 8024086C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD40B0/func_80240870_BD40E0.s b/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD40B0/func_80240870_BD40E0.s deleted file mode 100644 index 1e0921c5ec..0000000000 --- a/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD40B0/func_80240870_BD40E0.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240870_BD40E0 -/* BD40E0 80240870 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BD40E4 80240874 AFBF0010 */ sw $ra, 0x10($sp) -/* BD40E8 80240878 8C840084 */ lw $a0, 0x84($a0) -/* BD40EC 8024087C 0C04D052 */ jal set_item_entity_flags -/* BD40F0 80240880 3C050008 */ lui $a1, 8 -/* BD40F4 80240884 8FBF0010 */ lw $ra, 0x10($sp) -/* BD40F8 80240888 24020002 */ addiu $v0, $zero, 2 -/* BD40FC 8024088C 03E00008 */ jr $ra -/* BD4100 80240890 27BD0018 */ addiu $sp, $sp, 0x18 -/* BD4104 80240894 00000000 */ nop -/* BD4108 80240898 00000000 */ nop -/* BD410C 8024089C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_osr/osr_00/AAC830/func_8024030C_AACB3C.s b/ver/us/asm/nonmatchings/world/area_osr/osr_00/AAC830/func_8024030C_AACB3C.s deleted file mode 100644 index 8a04229c35..0000000000 --- a/ver/us/asm/nonmatchings/world/area_osr/osr_00/AAC830/func_8024030C_AACB3C.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024030C_AACB3C -/* AACB3C 8024030C 44800000 */ mtc1 $zero, $f0 -/* AACB40 80240310 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AACB44 80240314 44050000 */ mfc1 $a1, $f0 -/* AACB48 80240318 24040001 */ addiu $a0, $zero, 1 -/* AACB4C 8024031C AFBF0018 */ sw $ra, 0x18($sp) -/* AACB50 80240320 AFA00014 */ sw $zero, 0x14($sp) -/* AACB54 80240324 E7A00010 */ swc1 $f0, 0x10($sp) -/* AACB58 80240328 00A0302D */ daddu $a2, $a1, $zero -/* AACB5C 8024032C 0C01CA54 */ jal fx_sun -/* AACB60 80240330 00A0382D */ daddu $a3, $a1, $zero -/* AACB64 80240334 8FBF0018 */ lw $ra, 0x18($sp) -/* AACB68 80240338 24020002 */ addiu $v0, $zero, 2 -/* AACB6C 8024033C 03E00008 */ jr $ra -/* AACB70 80240340 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_osr/osr_01/AAFFF0/func_80240000_AAFFF0.s b/ver/us/asm/nonmatchings/world/area_osr/osr_01/AAFFF0/func_80240000_AAFFF0.s deleted file mode 100644 index e5d1c395fd..0000000000 --- a/ver/us/asm/nonmatchings/world/area_osr/osr_01/AAFFF0/func_80240000_AAFFF0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80242160_AB2150 -.ascii "hos_bg\0\0mac_01\0\0hos_00\0\0mac_04\0\0" - -.section .text - -glabel func_80240000_AAFFF0 -/* AAFFF0 80240000 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* AAFFF4 80240004 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* AAFFF8 80240008 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AAFFFC 8024000C AFBF0010 */ sw $ra, 0x10($sp) -/* AB0000 80240010 8443008E */ lh $v1, 0x8e($v0) -/* AB0004 80240014 24020003 */ addiu $v0, $zero, 3 -/* AB0008 80240018 14620006 */ bne $v1, $v0, .L80240034 -/* AB000C 8024001C 00000000 */ nop -/* AB0010 80240020 3C04800E */ lui $a0, %hi(D_800D9668) -/* AB0014 80240024 24849668 */ addiu $a0, $a0, %lo(D_800D9668) -/* AB0018 80240028 3C058024 */ lui $a1, %hi(D_80242160_AB2150) -/* AB001C 8024002C 0C01953C */ jal sprintf -/* AB0020 80240030 24A52160 */ addiu $a1, $a1, %lo(D_80242160_AB2150) -.L80240034: -/* AB0024 80240034 8FBF0010 */ lw $ra, 0x10($sp) -/* AB0028 80240038 0000102D */ daddu $v0, $zero, $zero -/* AB002C 8024003C 03E00008 */ jr $ra -/* AB0030 80240040 27BD0018 */ addiu $sp, $sp, 0x18 -/* AB0034 80240044 00000000 */ nop -/* AB0038 80240048 00000000 */ nop -/* AB003C 8024004C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_osr/osr_02/AB2190/func_80240020_AB2190.s b/ver/us/asm/nonmatchings/world/area_osr/osr_02/AB2190/func_80240020_AB2190.s deleted file mode 100644 index 7027788187..0000000000 --- a/ver/us/asm/nonmatchings/world/area_osr/osr_02/AB2190/func_80240020_AB2190.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_AB2190 -/* AB2190 80240020 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AB2194 80240024 AFBF0010 */ sw $ra, 0x10($sp) -/* AB2198 80240028 8C82000C */ lw $v0, 0xc($a0) -/* AB219C 8024002C 0C0B210B */ jal evt_get_float_variable -/* AB21A0 80240030 8C450000 */ lw $a1, ($v0) -/* AB21A4 80240034 8FBF0010 */ lw $ra, 0x10($sp) -/* AB21A8 80240038 4600008D */ trunc.w.s $f2, $f0 -/* AB21AC 8024003C 44021000 */ mfc1 $v0, $f2 -/* AB21B0 80240040 00000000 */ nop -/* AB21B4 80240044 3C018011 */ lui $at, %hi(gPlayerStatus+0xD) -/* AB21B8 80240048 A022EFD5 */ sb $v0, %lo(gPlayerStatus+0xD)($at) -/* AB21BC 8024004C 24020002 */ addiu $v0, $zero, 2 -/* AB21C0 80240050 03E00008 */ jr $ra -/* AB21C4 80240054 27BD0018 */ addiu $sp, $sp, 0x18 -/* AB21C8 80240058 00000000 */ nop -/* AB21CC 8024005C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_osr/osr_03/AB62B0/func_80240020_AB62B0.s b/ver/us/asm/nonmatchings/world/area_osr/osr_03/AB62B0/func_80240020_AB62B0.s deleted file mode 100644 index 0e011a45d7..0000000000 --- a/ver/us/asm/nonmatchings/world/area_osr/osr_03/AB62B0/func_80240020_AB62B0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_AB62B0 -/* AB62B0 80240020 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AB62B4 80240024 AFB00010 */ sw $s0, 0x10($sp) -/* AB62B8 80240028 0080802D */ daddu $s0, $a0, $zero -/* AB62BC 8024002C AFBF0018 */ sw $ra, 0x18($sp) -/* AB62C0 80240030 AFB10014 */ sw $s1, 0x14($sp) -/* AB62C4 80240034 8E11000C */ lw $s1, 0xc($s0) -/* AB62C8 80240038 0C0B1EAF */ jal evt_get_variable -/* AB62CC 8024003C 8E250000 */ lw $a1, ($s1) -/* AB62D0 80240040 44826000 */ mtc1 $v0, $f12 -/* AB62D4 80240044 00000000 */ nop -/* AB62D8 80240048 0C00A8BB */ jal sin_deg -/* AB62DC 8024004C 46806320 */ cvt.s.w $f12, $f12 -/* AB62E0 80240050 3C0141A0 */ lui $at, 0x41a0 -/* AB62E4 80240054 44811000 */ mtc1 $at, $f2 -/* AB62E8 80240058 00000000 */ nop -/* AB62EC 8024005C 46020002 */ mul.s $f0, $f0, $f2 -/* AB62F0 80240060 00000000 */ nop -/* AB62F4 80240064 8E250000 */ lw $a1, ($s1) -/* AB62F8 80240068 4600010D */ trunc.w.s $f4, $f0 -/* AB62FC 8024006C 44062000 */ mfc1 $a2, $f4 -/* AB6300 80240070 0C0B2026 */ jal evt_set_variable -/* AB6304 80240074 0200202D */ daddu $a0, $s0, $zero -/* AB6308 80240078 8FBF0018 */ lw $ra, 0x18($sp) -/* AB630C 8024007C 8FB10014 */ lw $s1, 0x14($sp) -/* AB6310 80240080 8FB00010 */ lw $s0, 0x10($sp) -/* AB6314 80240084 24020002 */ addiu $v0, $zero, 2 -/* AB6318 80240088 03E00008 */ jr $ra -/* AB631C 8024008C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_osr/osr_03/AB62B0/func_80240090_AB6320.s b/ver/us/asm/nonmatchings/world/area_osr/osr_03/AB62B0/func_80240090_AB6320.s deleted file mode 100644 index 24f5f162c3..0000000000 --- a/ver/us/asm/nonmatchings/world/area_osr/osr_03/AB62B0/func_80240090_AB6320.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240090_AB6320 -/* AB6320 80240090 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* AB6324 80240094 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* AB6328 80240098 9062007E */ lbu $v0, 0x7e($v1) -/* AB632C 8024009C 34420001 */ ori $v0, $v0, 1 -/* AB6330 802400A0 A062007E */ sb $v0, 0x7e($v1) -/* AB6334 802400A4 3C038011 */ lui $v1, %hi(gPlayerData) -/* AB6338 802400A8 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* AB633C 802400AC 80620012 */ lb $v0, 0x12($v1) -/* AB6340 802400B0 AC820084 */ sw $v0, 0x84($a0) -/* AB6344 802400B4 2402000B */ addiu $v0, $zero, 0xb -/* AB6348 802400B8 A0620012 */ sb $v0, 0x12($v1) -/* AB634C 802400BC 03E00008 */ jr $ra -/* AB6350 802400C0 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_osr/osr_03/AB62B0/func_802401A0_AB6430.s b/ver/us/asm/nonmatchings/world/area_osr/osr_03/AB62B0/func_802401A0_AB6430.s deleted file mode 100644 index 640f877a9e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_osr/osr_03/AB62B0/func_802401A0_AB6430.s +++ /dev/null @@ -1,71 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401A0_AB6430 -/* AB6430 802401A0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AB6434 802401A4 AFB00010 */ sw $s0, 0x10($sp) -/* AB6438 802401A8 0080802D */ daddu $s0, $a0, $zero -/* AB643C 802401AC 10A00003 */ beqz $a1, .L802401BC -/* AB6440 802401B0 AFBF0014 */ sw $ra, 0x14($sp) -/* AB6444 802401B4 AE000074 */ sw $zero, 0x74($s0) -/* AB6448 802401B8 AE000078 */ sw $zero, 0x78($s0) -.L802401BC: -/* AB644C 802401BC 8E030078 */ lw $v1, 0x78($s0) -/* AB6450 802401C0 10600005 */ beqz $v1, .L802401D8 -/* AB6454 802401C4 24020001 */ addiu $v0, $zero, 1 -/* AB6458 802401C8 1062001A */ beq $v1, $v0, .L80240234 -/* AB645C 802401CC 0000102D */ daddu $v0, $zero, $zero -/* AB6460 802401D0 080900A0 */ j .L80240280 -/* AB6464 802401D4 00000000 */ nop -.L802401D8: -/* AB6468 802401D8 0000202D */ daddu $a0, $zero, $zero -/* AB646C 802401DC 240500D0 */ addiu $a1, $zero, 0xd0 -/* AB6470 802401E0 00A0302D */ daddu $a2, $a1, $zero -/* AB6474 802401E4 0C04DF84 */ jal set_screen_overlay_color -/* AB6478 802401E8 00A0382D */ daddu $a3, $a1, $zero -/* AB647C 802401EC C6000074 */ lwc1 $f0, 0x74($s0) -/* AB6480 802401F0 46800020 */ cvt.s.w $f0, $f0 -/* AB6484 802401F4 44050000 */ mfc1 $a1, $f0 -/* AB6488 802401F8 0C04DF62 */ jal set_screen_overlay_params_front -/* AB648C 802401FC 24040001 */ addiu $a0, $zero, 1 -/* AB6490 80240200 8E020074 */ lw $v0, 0x74($s0) -/* AB6494 80240204 240300FF */ addiu $v1, $zero, 0xff -/* AB6498 80240208 14430004 */ bne $v0, $v1, .L8024021C -/* AB649C 8024020C 24420040 */ addiu $v0, $v0, 0x40 -/* AB64A0 80240210 24020001 */ addiu $v0, $zero, 1 -/* AB64A4 80240214 0809009F */ j .L8024027C -/* AB64A8 80240218 AE020078 */ sw $v0, 0x78($s0) -.L8024021C: -/* AB64AC 8024021C AE020074 */ sw $v0, 0x74($s0) -/* AB64B0 80240220 28420100 */ slti $v0, $v0, 0x100 -/* AB64B4 80240224 50400015 */ beql $v0, $zero, .L8024027C -/* AB64B8 80240228 AE030074 */ sw $v1, 0x74($s0) -/* AB64BC 8024022C 080900A0 */ j .L80240280 -/* AB64C0 80240230 0000102D */ daddu $v0, $zero, $zero -.L80240234: -/* AB64C4 80240234 0000202D */ daddu $a0, $zero, $zero -/* AB64C8 80240238 240500D0 */ addiu $a1, $zero, 0xd0 -/* AB64CC 8024023C 00A0302D */ daddu $a2, $a1, $zero -/* AB64D0 80240240 0C04DF84 */ jal set_screen_overlay_color -/* AB64D4 80240244 00A0382D */ daddu $a3, $a1, $zero -/* AB64D8 80240248 C6000074 */ lwc1 $f0, 0x74($s0) -/* AB64DC 8024024C 46800020 */ cvt.s.w $f0, $f0 -/* AB64E0 80240250 44050000 */ mfc1 $a1, $f0 -/* AB64E4 80240254 0C04DF62 */ jal set_screen_overlay_params_front -/* AB64E8 80240258 24040001 */ addiu $a0, $zero, 1 -/* AB64EC 8024025C 8E020074 */ lw $v0, 0x74($s0) -/* AB64F0 80240260 14400003 */ bnez $v0, .L80240270 -/* AB64F4 80240264 2442FFC0 */ addiu $v0, $v0, -0x40 -/* AB64F8 80240268 080900A0 */ j .L80240280 -/* AB64FC 8024026C 24020002 */ addiu $v0, $zero, 2 -.L80240270: -/* AB6500 80240270 1C400002 */ bgtz $v0, .L8024027C -/* AB6504 80240274 AE020074 */ sw $v0, 0x74($s0) -/* AB6508 80240278 AE000074 */ sw $zero, 0x74($s0) -.L8024027C: -/* AB650C 8024027C 0000102D */ daddu $v0, $zero, $zero -.L80240280: -/* AB6510 80240280 8FBF0014 */ lw $ra, 0x14($sp) -/* AB6514 80240284 8FB00010 */ lw $s0, 0x10($sp) -/* AB6518 80240288 03E00008 */ jr $ra -/* AB651C 8024028C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_osr/osr_03/AB62B0/func_80240290_AB6520.s b/ver/us/asm/nonmatchings/world/area_osr/osr_03/AB62B0/func_80240290_AB6520.s deleted file mode 100644 index 93849bc2e0..0000000000 --- a/ver/us/asm/nonmatchings/world/area_osr/osr_03/AB62B0/func_80240290_AB6520.s +++ /dev/null @@ -1,68 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240290_AB6520 -/* AB6520 80240290 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AB6524 80240294 AFB10014 */ sw $s1, 0x14($sp) -/* AB6528 80240298 0080882D */ daddu $s1, $a0, $zero -/* AB652C 8024029C AFBF0018 */ sw $ra, 0x18($sp) -/* AB6530 802402A0 AFB00010 */ sw $s0, 0x10($sp) -/* AB6534 802402A4 10A0002A */ beqz $a1, .L80240350 -/* AB6538 802402A8 8E30000C */ lw $s0, 0xc($s1) -/* AB653C 802402AC 8E050000 */ lw $a1, ($s0) -/* AB6540 802402B0 0C0B1EAF */ jal evt_get_variable -/* AB6544 802402B4 26100004 */ addiu $s0, $s0, 4 -/* AB6548 802402B8 0220202D */ daddu $a0, $s1, $zero -/* AB654C 802402BC 8E050000 */ lw $a1, ($s0) -/* AB6550 802402C0 0C0B210B */ jal evt_get_float_variable -/* AB6554 802402C4 0040802D */ daddu $s0, $v0, $zero -/* AB6558 802402C8 46000000 */ add.s $f0, $f0, $f0 -/* AB655C 802402CC 3C014120 */ lui $at, 0x4120 -/* AB6560 802402D0 44812000 */ mtc1 $at, $f4 -/* AB6564 802402D4 00000000 */ nop -/* AB6568 802402D8 4600203C */ c.lt.s $f4, $f0 -/* AB656C 802402DC 00000000 */ nop -/* AB6570 802402E0 45000002 */ bc1f .L802402EC -/* AB6574 802402E4 AE300070 */ sw $s0, 0x70($s1) -/* AB6578 802402E8 46002006 */ mov.s $f0, $f4 -.L802402EC: -/* AB657C 802402EC 3C014380 */ lui $at, 0x4380 -/* AB6580 802402F0 44811000 */ mtc1 $at, $f2 -/* AB6584 802402F4 46040003 */ div.s $f0, $f0, $f4 -/* AB6588 802402F8 46020002 */ mul.s $f0, $f0, $f2 -/* AB658C 802402FC 00000000 */ nop -/* AB6590 80240300 3C014F00 */ lui $at, 0x4f00 -/* AB6594 80240304 44811000 */ mtc1 $at, $f2 -/* AB6598 80240308 00000000 */ nop -/* AB659C 8024030C 4600103E */ c.le.s $f2, $f0 -/* AB65A0 80240310 00000000 */ nop -/* AB65A4 80240314 45030005 */ bc1tl .L8024032C -/* AB65A8 80240318 46020001 */ sub.s $f0, $f0, $f2 -/* AB65AC 8024031C 4600018D */ trunc.w.s $f6, $f0 -/* AB65B0 80240320 44043000 */ mfc1 $a0, $f6 -/* AB65B4 80240324 080900D1 */ j .L80240344 -/* AB65B8 80240328 308400FF */ andi $a0, $a0, 0xff -.L8024032C: -/* AB65BC 8024032C 3C028000 */ lui $v0, 0x8000 -/* AB65C0 80240330 4600018D */ trunc.w.s $f6, $f0 -/* AB65C4 80240334 44043000 */ mfc1 $a0, $f6 -/* AB65C8 80240338 00000000 */ nop -/* AB65CC 8024033C 00822025 */ or $a0, $a0, $v0 -/* AB65D0 80240340 308400FF */ andi $a0, $a0, 0xff -.L80240344: -/* AB65D4 80240344 3205FFFF */ andi $a1, $s0, 0xffff -/* AB65D8 80240348 0C00A3C2 */ jal start_rumble -/* AB65DC 8024034C 00052840 */ sll $a1, $a1, 1 -.L80240350: -/* AB65E0 80240350 8E230070 */ lw $v1, 0x70($s1) -/* AB65E4 80240354 2463FFFF */ addiu $v1, $v1, -1 -/* AB65E8 80240358 AE230070 */ sw $v1, 0x70($s1) -/* AB65EC 8024035C 8FBF0018 */ lw $ra, 0x18($sp) -/* AB65F0 80240360 8FB10014 */ lw $s1, 0x14($sp) -/* AB65F4 80240364 8FB00010 */ lw $s0, 0x10($sp) -/* AB65F8 80240368 2C620001 */ sltiu $v0, $v1, 1 -/* AB65FC 8024036C 03E00008 */ jr $ra -/* AB6600 80240370 27BD0020 */ addiu $sp, $sp, 0x20 -/* AB6604 80240374 00000000 */ nop -/* AB6608 80240378 00000000 */ nop -/* AB660C 8024037C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_osr/osr_04/AB92B0/func_80240000_AB92B0.s b/ver/us/asm/nonmatchings/world/area_osr/osr_04/AB92B0/func_80240000_AB92B0.s deleted file mode 100644 index 8ae3ffab77..0000000000 --- a/ver/us/asm/nonmatchings/world/area_osr/osr_04/AB92B0/func_80240000_AB92B0.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80241FB0_ABB260 -.ascii "osr_03_shape\0\0\0\0" - -dlabel D_80241FC0_ABB270 -.ascii "osr_03_hit\0\0kkj_03\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - -.section .text - -glabel func_80240000_AB92B0 -/* AB92B0 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AB92B4 80240004 3C04800E */ lui $a0, %hi(wMapShapeName) -/* AB92B8 80240008 24849230 */ addiu $a0, $a0, %lo(wMapShapeName) -/* AB92BC 8024000C 3C058024 */ lui $a1, %hi(D_80241FB0_ABB260) -/* AB92C0 80240010 24A51FB0 */ addiu $a1, $a1, %lo(D_80241FB0_ABB260) -/* AB92C4 80240014 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* AB92C8 80240018 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* AB92CC 8024001C 24020002 */ addiu $v0, $zero, 2 -/* AB92D0 80240020 AFBF0010 */ sw $ra, 0x10($sp) -/* AB92D4 80240024 0C01953C */ jal sprintf -/* AB92D8 80240028 A0620084 */ sb $v0, 0x84($v1) -/* AB92DC 8024002C 3C04800E */ lui $a0, %hi(wMapHitName) -/* AB92E0 80240030 248491E0 */ addiu $a0, $a0, %lo(wMapHitName) -/* AB92E4 80240034 3C058024 */ lui $a1, %hi(D_80241FC0_ABB270) -/* AB92E8 80240038 0C01953C */ jal sprintf -/* AB92EC 8024003C 24A51FC0 */ addiu $a1, $a1, %lo(D_80241FC0_ABB270) -/* AB92F0 80240040 8FBF0010 */ lw $ra, 0x10($sp) -/* AB92F4 80240044 0000102D */ daddu $v0, $zero, $zero -/* AB92F8 80240048 03E00008 */ jr $ra -/* AB92FC 8024004C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_osr/osr_04/AB92B0/func_80240050_AB9300.s b/ver/us/asm/nonmatchings/world/area_osr/osr_04/AB92B0/func_80240050_AB9300.s deleted file mode 100644 index 8b775a5c7a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_osr/osr_04/AB92B0/func_80240050_AB9300.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240050_AB9300 -/* AB9300 80240050 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AB9304 80240054 AFB00010 */ sw $s0, 0x10($sp) -/* AB9308 80240058 0080802D */ daddu $s0, $a0, $zero -/* AB930C 8024005C AFBF0018 */ sw $ra, 0x18($sp) -/* AB9310 80240060 AFB10014 */ sw $s1, 0x14($sp) -/* AB9314 80240064 8E11000C */ lw $s1, 0xc($s0) -/* AB9318 80240068 0C0B1EAF */ jal evt_get_variable -/* AB931C 8024006C 8E250000 */ lw $a1, ($s1) -/* AB9320 80240070 44826000 */ mtc1 $v0, $f12 -/* AB9324 80240074 00000000 */ nop -/* AB9328 80240078 0C00A8BB */ jal sin_deg -/* AB932C 8024007C 46806320 */ cvt.s.w $f12, $f12 -/* AB9330 80240080 3C0141A0 */ lui $at, 0x41a0 -/* AB9334 80240084 44811000 */ mtc1 $at, $f2 -/* AB9338 80240088 00000000 */ nop -/* AB933C 8024008C 46020002 */ mul.s $f0, $f0, $f2 -/* AB9340 80240090 00000000 */ nop -/* AB9344 80240094 8E250000 */ lw $a1, ($s1) -/* AB9348 80240098 4600010D */ trunc.w.s $f4, $f0 -/* AB934C 8024009C 44062000 */ mfc1 $a2, $f4 -/* AB9350 802400A0 0C0B2026 */ jal evt_set_variable -/* AB9354 802400A4 0200202D */ daddu $a0, $s0, $zero -/* AB9358 802400A8 8FBF0018 */ lw $ra, 0x18($sp) -/* AB935C 802400AC 8FB10014 */ lw $s1, 0x14($sp) -/* AB9360 802400B0 8FB00010 */ lw $s0, 0x10($sp) -/* AB9364 802400B4 24020002 */ addiu $v0, $zero, 2 -/* AB9368 802400B8 03E00008 */ jr $ra -/* AB936C 802400BC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240F58_D8A638.s b/ver/us/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240F58_D8A638.s deleted file mode 100644 index 1339fbefd2..0000000000 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240F58_D8A638.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F58_D8A638 -/* D8A638 80240F58 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* D8A63C 80240F5C AFB10014 */ sw $s1, 0x14($sp) -/* D8A640 80240F60 0080882D */ daddu $s1, $a0, $zero -/* D8A644 80240F64 AFB00010 */ sw $s0, 0x10($sp) -/* D8A648 80240F68 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D8A64C 80240F6C 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D8A650 80240F70 AFBF0018 */ sw $ra, 0x18($sp) -/* D8A654 80240F74 F7B60028 */ sdc1 $f22, 0x28($sp) -/* D8A658 80240F78 F7B40020 */ sdc1 $f20, 0x20($sp) -/* D8A65C 80240F7C 8E060028 */ lw $a2, 0x28($s0) -/* D8A660 80240F80 8E070030 */ lw $a3, 0x30($s0) -/* D8A664 80240F84 3C014348 */ lui $at, 0x4348 -/* D8A668 80240F88 4481A000 */ mtc1 $at, $f20 -/* D8A66C 80240F8C 4480B000 */ mtc1 $zero, $f22 -/* D8A670 80240F90 4600A306 */ mov.s $f12, $f20 -/* D8A674 80240F94 0C00A7B5 */ jal dist2D -/* D8A678 80240F98 4600B386 */ mov.s $f14, $f22 -/* D8A67C 80240F9C 4600008D */ trunc.w.s $f2, $f0 -/* D8A680 80240FA0 E622009C */ swc1 $f2, 0x9c($s1) -/* D8A684 80240FA4 4600A306 */ mov.s $f12, $f20 -/* D8A688 80240FA8 8E060028 */ lw $a2, 0x28($s0) -/* D8A68C 80240FAC 8E070030 */ lw $a3, 0x30($s0) -/* D8A690 80240FB0 0C00A720 */ jal atan2 -/* D8A694 80240FB4 4600B386 */ mov.s $f14, $f22 -/* D8A698 80240FB8 4600008D */ trunc.w.s $f2, $f0 -/* D8A69C 80240FBC 44021000 */ mfc1 $v0, $f2 -/* D8A6A0 80240FC0 00000000 */ nop -/* D8A6A4 80240FC4 44826000 */ mtc1 $v0, $f12 -/* D8A6A8 80240FC8 00000000 */ nop -/* D8A6AC 80240FCC 46806320 */ cvt.s.w $f12, $f12 -/* D8A6B0 80240FD0 0C00A6C9 */ jal clamp_angle -/* D8A6B4 80240FD4 AE2200A0 */ sw $v0, 0xa0($s1) -/* D8A6B8 80240FD8 4600008D */ trunc.w.s $f2, $f0 -/* D8A6BC 80240FDC E62200A0 */ swc1 $f2, 0xa0($s1) -/* D8A6C0 80240FE0 8FBF0018 */ lw $ra, 0x18($sp) -/* D8A6C4 80240FE4 8FB10014 */ lw $s1, 0x14($sp) -/* D8A6C8 80240FE8 8FB00010 */ lw $s0, 0x10($sp) -/* D8A6CC 80240FEC D7B60028 */ ldc1 $f22, 0x28($sp) -/* D8A6D0 80240FF0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* D8A6D4 80240FF4 24020002 */ addiu $v0, $zero, 2 -/* D8A6D8 80240FF8 03E00008 */ jr $ra -/* D8A6DC 80240FFC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240000_D91700.s b/ver/us/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240000_D91700.s deleted file mode 100644 index 8bbb81b436..0000000000 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240000_D91700.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80241810_D92F10 -.ascii "pra_10_shape\0\0\0\0" - -dlabel D_80241820_D92F20 -.ascii "pra_10_hit\0\0pra_21\0\0pra_27\0\0\0\0\0\0" - -.section .text - -glabel func_80240000_D91700 -/* D91700 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D91704 80240004 3C04800E */ lui $a0, %hi(wMapShapeName) -/* D91708 80240008 24849230 */ addiu $a0, $a0, %lo(wMapShapeName) -/* D9170C 8024000C 3C058024 */ lui $a1, %hi(D_80241810_D92F10) -/* D91710 80240010 24A51810 */ addiu $a1, $a1, %lo(D_80241810_D92F10) -/* D91714 80240014 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* D91718 80240018 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* D9171C 8024001C 24020001 */ addiu $v0, $zero, 1 -/* D91720 80240020 AFBF0010 */ sw $ra, 0x10($sp) -/* D91724 80240024 0C01953C */ jal sprintf -/* D91728 80240028 A0620084 */ sb $v0, 0x84($v1) -/* D9172C 8024002C 3C04800E */ lui $a0, %hi(wMapHitName) -/* D91730 80240030 248491E0 */ addiu $a0, $a0, %lo(wMapHitName) -/* D91734 80240034 3C058024 */ lui $a1, %hi(D_80241820_D92F20) -/* D91738 80240038 0C01953C */ jal sprintf -/* D9173C 8024003C 24A51820 */ addiu $a1, $a1, %lo(D_80241820_D92F20) -/* D91740 80240040 8FBF0010 */ lw $ra, 0x10($sp) -/* D91744 80240044 0000102D */ daddu $v0, $zero, $zero -/* D91748 80240048 03E00008 */ jr $ra -/* D9174C 8024004C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240000_D92F40.s b/ver/us/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240000_D92F40.s deleted file mode 100644 index 257283fb1b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240000_D92F40.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_802424E0_D95420 -.ascii "pra_10_shape\0\0\0\0" - -dlabel D_802424F0_D95430 -.ascii "pra_10_hit\0\0pra_22\0\0pra_28\0\0\0\0\0\0" - -.section .text - -glabel func_80240000_D92F40 -/* D92F40 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D92F44 80240004 3C04800E */ lui $a0, %hi(wMapShapeName) -/* D92F48 80240008 24849230 */ addiu $a0, $a0, %lo(wMapShapeName) -/* D92F4C 8024000C 3C058024 */ lui $a1, %hi(D_802424E0_D95420) -/* D92F50 80240010 24A524E0 */ addiu $a1, $a1, %lo(D_802424E0_D95420) -/* D92F54 80240014 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* D92F58 80240018 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* D92F5C 8024001C 24020001 */ addiu $v0, $zero, 1 -/* D92F60 80240020 AFBF0010 */ sw $ra, 0x10($sp) -/* D92F64 80240024 0C01953C */ jal sprintf -/* D92F68 80240028 A0620084 */ sb $v0, 0x84($v1) -/* D92F6C 8024002C 3C04800E */ lui $a0, %hi(wMapHitName) -/* D92F70 80240030 248491E0 */ addiu $a0, $a0, %lo(wMapHitName) -/* D92F74 80240034 3C058024 */ lui $a1, %hi(D_802424F0_D95430) -/* D92F78 80240038 0C01953C */ jal sprintf -/* D92F7C 8024003C 24A524F0 */ addiu $a1, $a1, %lo(D_802424F0_D95430) -/* D92F80 80240040 8FBF0010 */ lw $ra, 0x10($sp) -/* D92F84 80240044 0000102D */ daddu $v0, $zero, $zero -/* D92F88 80240048 03E00008 */ jr $ra -/* D92F8C 8024004C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240000_D955F0.s b/ver/us/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240000_D955F0.s deleted file mode 100644 index df98e33a67..0000000000 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240000_D955F0.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80242220_D97810 -.ascii "pra_10_shape\0\0\0\0" - -dlabel D_80242230_D97820 -.ascii "pra_10_hit\0\0pra_03\0\0pra_05\0\0\0\0\0\0" - -.section .text - -glabel func_80240000_D955F0 -/* D955F0 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D955F4 80240004 3C04800E */ lui $a0, %hi(wMapShapeName) -/* D955F8 80240008 24849230 */ addiu $a0, $a0, %lo(wMapShapeName) -/* D955FC 8024000C 3C058024 */ lui $a1, %hi(D_80242220_D97810) -/* D95600 80240010 24A52220 */ addiu $a1, $a1, %lo(D_80242220_D97810) -/* D95604 80240014 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* D95608 80240018 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* D9560C 8024001C 24020001 */ addiu $v0, $zero, 1 -/* D95610 80240020 AFBF0010 */ sw $ra, 0x10($sp) -/* D95614 80240024 0C01953C */ jal sprintf -/* D95618 80240028 A0620084 */ sb $v0, 0x84($v1) -/* D9561C 8024002C 3C04800E */ lui $a0, %hi(wMapHitName) -/* D95620 80240030 248491E0 */ addiu $a0, $a0, %lo(wMapHitName) -/* D95624 80240034 3C058024 */ lui $a1, %hi(D_80242230_D97820) -/* D95628 80240038 0C01953C */ jal sprintf -/* D9562C 8024003C 24A52230 */ addiu $a1, $a1, %lo(D_80242230_D97820) -/* D95630 80240040 8FBF0010 */ lw $ra, 0x10($sp) -/* D95634 80240044 0000102D */ daddu $v0, $zero, $zero -/* D95638 80240048 03E00008 */ jr $ra -/* D9563C 8024004C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240000_D97890.s b/ver/us/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240000_D97890.s deleted file mode 100644 index 72e15868ac..0000000000 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240000_D97890.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_802420A0_D99930 -.ascii "pra_10_shape\0\0\0\0" - -dlabel D_802420B0_D99940 -.ascii "pra_10_hit\0\0pra_04\0\0pra_06\0\0\0\0\0\0" - -.section .text - -glabel func_80240000_D97890 -/* D97890 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D97894 80240004 3C04800E */ lui $a0, %hi(wMapShapeName) -/* D97898 80240008 24849230 */ addiu $a0, $a0, %lo(wMapShapeName) -/* D9789C 8024000C 3C058024 */ lui $a1, %hi(D_802420A0_D99930) -/* D978A0 80240010 24A520A0 */ addiu $a1, $a1, %lo(D_802420A0_D99930) -/* D978A4 80240014 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* D978A8 80240018 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* D978AC 8024001C 24020001 */ addiu $v0, $zero, 1 -/* D978B0 80240020 AFBF0010 */ sw $ra, 0x10($sp) -/* D978B4 80240024 0C01953C */ jal sprintf -/* D978B8 80240028 A0620084 */ sb $v0, 0x84($v1) -/* D978BC 8024002C 3C04800E */ lui $a0, %hi(wMapHitName) -/* D978C0 80240030 248491E0 */ addiu $a0, $a0, %lo(wMapHitName) -/* D978C4 80240034 3C058024 */ lui $a1, %hi(D_802420B0_D99940) -/* D978C8 80240038 0C01953C */ jal sprintf -/* D978CC 8024003C 24A520B0 */ addiu $a1, $a1, %lo(D_802420B0_D99940) -/* D978D0 80240040 8FBF0010 */ lw $ra, 0x10($sp) -/* D978D4 80240044 0000102D */ daddu $v0, $zero, $zero -/* D978D8 80240048 03E00008 */ jr $ra -/* D978DC 8024004C 27BD0018 */ addiu $sp, $sp, 0x18