From 7a6368c96083b5162fa47d8960eaf7b5392218d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Fa=C3=9Fbender?= <31699028+Brotenko@users.noreply.github.com> Date: Wed, 4 Aug 2021 11:12:31 +0200 Subject: [PATCH] Decompilation of duplicated functions (#354) * match last bow fumction * decomp more partner functions * :) * :) * resolve merge conflict and style conflicts * fix * decomp :) * :( * :((( * :) * :( * :) * :))))) * :( * :/ * idk * :/ * What * Done. * PR comments * :( * decompile dead funcs * find_duplicates.py +x * rename dead functions and resolve PR * :) * . * . * decompile duplicate functions * :( * decompile several dupliacte funcions * decompile several dupliacte funcions * . * -- * resolve coverage issue * rename include-file to specify original use-case Co-authored-by: Ethan Roseman --- src/1A5830.c | 46 ++++++------- src/battle/action_cmd/07.c | 4 +- src/battle/action_cmd/0A.c | 4 +- src/battle/action_cmd/air_lift.c | 4 +- src/battle/action_cmd/air_raid.c | 4 +- src/battle/action_cmd/body_slam.c | 2 + src/battle/action_cmd/bomb.c | 4 +- src/battle/action_cmd/break_free.c | 2 + src/battle/action_cmd/dizzy_shell.c | 4 +- src/battle/action_cmd/fire_shell.c | 4 +- src/battle/action_cmd/flee.c | 2 + src/battle/action_cmd/hammer.c | 2 + src/battle/action_cmd/hurricane.c | 2 + src/battle/action_cmd/jump.c | 2 + src/battle/action_cmd/mega_shock.c | 2 + src/battle/action_cmd/power_shock.c | 2 + src/battle/action_cmd/smack.c | 4 +- src/battle/action_cmd/spiny_surge.c | 4 +- src/battle/action_cmd/spook.c | 4 +- src/battle/action_cmd/squirt.c | 2 + src/battle/action_cmd/stop_leech.c | 2 + src/battle/action_cmd/tidal_wave.c | 2 + src/battle/action_cmd/water_block.c | 2 + src/battle/action_cmd/whirlwind.c | 2 + src/common/FreeHudElements.inc.c | 15 +++++ src/world/area_kzn/kzn_03/C61020.c | 6 +- src/world/area_kzn/kzn_08/C71ED0.c | 6 +- src/world/area_kzn/kzn_09/C77D00.c | 6 +- src/world/area_kzn/kzn_17/C85DC0.c | 6 +- src/world/area_mim/mim_01/B93440.c | 2 +- src/world/area_mim/mim_01/B93940.c | 6 +- src/world/area_mim/mim_02/B97C00.c | 2 +- src/world/area_mim/mim_03/B9B480.c | 2 +- src/world/area_mim/mim_04/B9D960.c | 2 +- src/world/area_mim/mim_05/BA0730.c | 2 +- src/world/area_mim/mim_05/BA07A0.c | 6 +- src/world/area_mim/mim_06/BA4780.c | 2 +- src/world/area_mim/mim_06/BA4CF0.c | 6 +- src/world/area_mim/mim_07/BAA140.c | 4 +- src/world/area_mim/mim_07/BAA1B0.c | 2 +- src/world/area_mim/mim_08/BAD940.c | 8 +-- src/world/area_mim/mim_09/BB2E00.c | 2 +- src/world/area_omo/omo_02/D9D510.c | 2 +- src/world/area_omo/omo_04/DAD400.c | 2 +- src/world/area_omo/omo_05/DB22C0.c | 2 +- src/world/area_omo/omo_07/DBD2B0.c | 6 +- src/world/area_omo/omo_08/DC4C40.c | 2 +- src/world/area_omo/omo_09/DCD6B0.c | 6 +- src/world/area_omo/omo_13/DE2710.c | 2 +- src/world/area_omo/omo_17/DEF400.c | 2 +- src/world/area_sam/sam_05/D187E0.c | 6 +- src/world/area_sam/sam_07/D2BD30.c | 6 +- src/world/common/SetForeverForestFog.inc.c | 13 ++++ src/world/common/UnkNpcAIFunc30.inc.c | 18 +++++ .../common/UnkNpcDurationAnimationFunc.inc.c | 13 ++++ .../common/UnkNpcDurationFlagFunc2.inc.c | 13 ++++ .../common/UnkNpcDurationFlagFunc3.inc.c | 17 +++++ .../data/world/area_mim/mim_01/B953B0.data.s | 2 +- .../data/world/area_mim/mim_02/B98EA0.data.s | 2 +- .../data/world/area_mim/mim_03/B9BA70.data.s | 2 +- .../data/world/area_mim/mim_04/B9EB50.data.s | 2 +- .../data/world/area_mim/mim_05/BA2210.data.s | 2 +- .../data/world/area_mim/mim_06/BA7570.data.s | 2 +- .../data/world/area_mim/mim_07/BAB2C0.data.s | 2 +- .../data/world/area_mim/mim_08/BB0940.data.s | 2 +- .../data/world/area_mim/mim_09/BB3D80.data.s | 2 +- .../asm/nonmatchings/196AA0/func_80268C9C.s | 20 +++--- .../action_cmd/07/func_802A959C_4260EC.s | 21 ------ .../action_cmd/0A/func_802A963C_4279EC.s | 21 ------ .../air_lift/func_802A9810_429280.s | 20 ------ .../air_raid/func_802A992C_429C4C.s | 21 ------ .../action_cmd/bomb/func_802A97CC_42823C.s | 21 ------ .../dizzy_shell/func_802A97BC_42692C.s | 21 ------ .../fire_shell/func_802A9914_4272E4.s | 19 ------ .../action_cmd/smack/func_802A9990_42ED30.s | 20 ------ .../spiny_surge/func_802A981C_42F63C.s | 21 ------ .../action_cmd/spook/func_802A98DC_4308FC.s | 21 ------ .../kzn_03/C61020/func_80242070_C62D80.s | 42 ------------ .../kzn_03/C61020/func_80242200_C62F10.s | 29 --------- .../kzn_03/C61020/func_80242260_C62F70.s | 65 ------------------- .../kzn_03/C61020/func_8024234C_C6305C.s | 6 +- .../kzn_08/C71ED0/func_802439B4_C74E34.s | 42 ------------ .../kzn_08/C71ED0/func_80243B44_C74FC4.s | 29 --------- .../kzn_08/C71ED0/func_80243BA4_C75024.s | 65 ------------------- .../kzn_08/C71ED0/func_80243C90_C75110.s | 6 +- .../kzn_09/C77D00/func_80242498_C79178.s | 42 ------------ .../kzn_09/C77D00/func_80242628_C79308.s | 29 --------- .../kzn_09/C77D00/func_80242688_C79368.s | 65 ------------------- .../kzn_09/C77D00/func_80242774_C79454.s | 6 +- .../kzn_17/C85DC0/func_80241788_C87238.s | 42 ------------ .../kzn_17/C85DC0/func_80241918_C873C8.s | 29 --------- .../kzn_17/C85DC0/func_80241978_C87428.s | 65 ------------------- .../kzn_17/C85DC0/func_80241A64_C87514.s | 6 +- .../mim_01/B93440/func_80240000_B93440.s | 32 --------- .../mim_01/B93940/func_80241978_B94DB8.s | 42 ------------ .../mim_01/B93940/func_80241B08_B94F48.s | 29 --------- .../mim_01/B93940/func_80241B68_B94FA8.s | 65 ------------------- .../mim_01/B93940/func_80241C54_B95094.s | 6 +- .../mim_02/B97C00/func_80240000_B97C00.s | 32 --------- .../mim_03/B9B480/func_80240000_B9B480.s | 30 --------- .../mim_04/B9D960/func_80240000_B9D960.s | 32 --------- .../mim_05/BA0730/func_80240000_BA0730.s | 32 --------- .../mim_05/BA07A0/func_802414E8_BA1C18.s | 42 ------------ .../mim_05/BA07A0/func_80241678_BA1DA8.s | 29 --------- .../mim_05/BA07A0/func_802416D8_BA1E08.s | 65 ------------------- .../mim_05/BA07A0/func_802417C4_BA1EF4.s | 6 +- .../mim_06/BA4780/func_80240000_BA4780.s | 32 --------- .../mim_06/BA4CF0/func_802419E8_BA6168.s | 42 ------------ .../mim_06/BA4CF0/func_80241B78_BA62F8.s | 29 --------- .../mim_06/BA4CF0/func_80241BD8_BA6358.s | 65 ------------------- .../mim_06/BA4CF0/func_80241CC4_BA6444.s | 6 +- .../mim_07/BAA140/func_80240000_BAA140.s | 32 --------- .../mim_07/BAA1B0/func_80240070_BAA1B0.s | 30 --------- .../mim_08/BAD940/func_80240000_BAD940.s | 30 --------- .../mim_08/BAD940/func_80242A10_BB0350.s | 42 ------------ .../mim_08/BAD940/func_80242BA0_BB04E0.s | 29 --------- .../mim_08/BAD940/func_80242C00_BB0540.s | 65 ------------------- .../mim_08/BAD940/func_80242CEC_BB062C.s | 6 +- .../mim_09/BB2E00/func_80240000_BB2E00.s | 30 --------- .../omo_02/D9D510/func_80240B48_D9E018.s | 29 --------- .../omo_02/D9D510/func_80240BA8_D9E078.s | 2 +- .../omo_04/DAD400/func_80241A70_DAEE70.s | 29 --------- .../omo_04/DAD400/func_80241AD0_DAEED0.s | 2 +- .../omo_05/DB22C0/func_802401D8_DB2498.s | 29 --------- .../omo_05/DB22C0/func_80240238_DB24F8.s | 2 +- .../omo_07/DBD2B0/func_802401D8_DBD488.s | 29 --------- .../omo_07/DBD2B0/func_80240238_DBD4E8.s | 2 +- .../omo_07/DBD2B0/func_802415D4_DBE884.s | 29 --------- .../omo_07/DBD2B0/func_80241634_DBE8E4.s | 2 +- .../omo_08/DC4C40/func_80240A48_DC4E18.s | 29 --------- .../omo_08/DC4C40/func_80240AA8_DC4E78.s | 2 +- .../omo_09/DCD6B0/func_80240BB8_DCD888.s | 29 --------- .../omo_09/DCD6B0/func_80240C18_DCD8E8.s | 2 +- .../omo_09/DCD6B0/func_80241FB4_DCEC84.s | 29 --------- .../omo_09/DCD6B0/func_80242014_DCECE4.s | 2 +- .../omo_13/DE2710/func_80240458_DE28E8.s | 29 --------- .../omo_13/DE2710/func_802404B8_DE2948.s | 2 +- .../omo_17/DEF400/func_80240738_DEF5D8.s | 29 --------- .../omo_17/DEF400/func_80240798_DEF638.s | 2 +- .../sam_05/D187E0/func_80241478_D19C58.s | 42 ------------ .../sam_05/D187E0/func_80241608_D19DE8.s | 29 --------- .../sam_05/D187E0/func_80241668_D19E48.s | 65 ------------------- .../sam_05/D187E0/func_80241754_D19F34.s | 6 +- .../sam_07/D2BD30/func_80241AC8_D2D7F8.s | 42 ------------ .../sam_07/D2BD30/func_80241C58_D2D988.s | 29 --------- .../sam_07/D2BD30/func_80241CB8_D2D9E8.s | 65 ------------------- .../sam_07/D2BD30/func_80241DA4_D2DAD4.s | 6 +- 147 files changed, 284 insertions(+), 2309 deletions(-) create mode 100644 src/common/FreeHudElements.inc.c create mode 100644 src/world/common/SetForeverForestFog.inc.c create mode 100644 src/world/common/UnkNpcAIFunc30.inc.c create mode 100644 src/world/common/UnkNpcDurationAnimationFunc.inc.c create mode 100644 src/world/common/UnkNpcDurationFlagFunc2.inc.c create mode 100644 src/world/common/UnkNpcDurationFlagFunc3.inc.c delete mode 100644 ver/us/asm/nonmatchings/battle/action_cmd/07/func_802A959C_4260EC.s delete mode 100644 ver/us/asm/nonmatchings/battle/action_cmd/0A/func_802A963C_4279EC.s delete mode 100644 ver/us/asm/nonmatchings/battle/action_cmd/air_lift/func_802A9810_429280.s delete mode 100644 ver/us/asm/nonmatchings/battle/action_cmd/air_raid/func_802A992C_429C4C.s delete mode 100644 ver/us/asm/nonmatchings/battle/action_cmd/bomb/func_802A97CC_42823C.s delete mode 100644 ver/us/asm/nonmatchings/battle/action_cmd/dizzy_shell/func_802A97BC_42692C.s delete mode 100644 ver/us/asm/nonmatchings/battle/action_cmd/fire_shell/func_802A9914_4272E4.s delete mode 100644 ver/us/asm/nonmatchings/battle/action_cmd/smack/func_802A9990_42ED30.s delete mode 100644 ver/us/asm/nonmatchings/battle/action_cmd/spiny_surge/func_802A981C_42F63C.s delete mode 100644 ver/us/asm/nonmatchings/battle/action_cmd/spook/func_802A98DC_4308FC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242070_C62D80.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242200_C62F10.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242260_C62F70.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802439B4_C74E34.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243B44_C74FC4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243BA4_C75024.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242498_C79178.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242628_C79308.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242688_C79368.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241788_C87238.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241918_C873C8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241978_C87428.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_01/B93440/func_80240000_B93440.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241978_B94DB8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241B08_B94F48.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241B68_B94FA8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_02/B97C00/func_80240000_B97C00.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_03/B9B480/func_80240000_B9B480.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_04/B9D960/func_80240000_B9D960.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_05/BA0730/func_80240000_BA0730.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802414E8_BA1C18.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80241678_BA1DA8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802416D8_BA1E08.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4780/func_80240000_BA4780.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_802419E8_BA6168.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241B78_BA62F8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241BD8_BA6358.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_07/BAA140/func_80240000_BAA140.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_07/BAA1B0/func_80240070_BAA1B0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240000_BAD940.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242A10_BB0350.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242BA0_BB04E0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242C00_BB0540.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240000_BB2E00.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240B48_D9E018.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241A70_DAEE70.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802401D8_DB2498.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_802401D8_DBD488.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_802415D4_DBE884.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_80240A48_DC4E18.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240BB8_DCD888.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241FB4_DCEC84.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240458_DE28E8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240738_DEF5D8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241478_D19C58.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241608_D19DE8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241668_D19E48.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241AC8_D2D7F8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241C58_D2D988.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241CB8_D2D9E8.s diff --git a/src/1A5830.c b/src/1A5830.c index 4ded025dc9..dd351b70e0 100644 --- a/src/1A5830.c +++ b/src/1A5830.c @@ -137,6 +137,8 @@ INCLUDE_ASM(s32, "1A5830", calc_enemy_test_target); #ifdef NON_MATCHING // attacker needs to be in 0x58(sp) not a save register s32 calc_enemy_damage_target(Actor* attacker) { + BattleStatus* battleStatus = &gBattleStatus; + ActorMovementWalk* walk = &attacker->walk; Actor *target; s32 attack; s32 eventFlags; @@ -144,7 +146,6 @@ s32 calc_enemy_damage_target(Actor* attacker) { s32 defense; s32 attackElement; s32 targetPartIdx; - ActorMovementWalk* walk; s32 phi_s2; s8 phi_s5; s8 phi_s7; @@ -153,7 +154,6 @@ s32 calc_enemy_damage_target(Actor* attacker) { s32 isEnchanted = FALSE; s32 damage; ActorPart* targetPart; - BattleStatus* battleStatus = &gBattleStatus; s32 hitResult = HIT_RESULT_HIT; // ? targetID = battleStatus->currentTargetID; @@ -162,9 +162,9 @@ s32 calc_enemy_damage_target(Actor* attacker) { battleStatus->wasStatusInflicted = FALSE; battleStatus->lastAttackDamage = 0; battleStatus->currentTargetID2 = targetID; - battleStatus->attackerActorID = attacker->actorID; battleStatus->currentTargetPart2 = targetPartIdx; - walk = &attacker->walk; + battleStatus->attackerActorID = attacker->actorID; + //walk = &attacker->walk; target = get_actor(targetID); if (target == NULL) { @@ -174,8 +174,8 @@ s32 calc_enemy_damage_target(Actor* attacker) { targetPart = get_actor_part(target, targetPartIdx); ASSERT(targetPart != NULL); - targetID &= 0x700; - target->lastDamageTaken = 0; + targetID = battleStatus->currentTargetID2 & 0x700; + target->lastDamageTaken = 256; /* if (targetID != ACTOR_PARTNER) { @@ -197,14 +197,14 @@ s32 calc_enemy_damage_target(Actor* attacker) { eventFlags = targetPart->eventFlags; if ((eventFlags & 0x20) == 0) { - if (target->transStatus == 0xE) { + if (target->transStatus == 6) { return HIT_RESULT_MISS; } - if (((eventFlags & 0x800) != 0) && ((battleStatus->currentAttackElement & 0x800) == 0)) { + if (((eventFlags & 0x800) != 0) && ((battleStatus->currentAttackElement & 0x800) != 1)) { return HIT_RESULT_MISS; } if (target->stoneStatus == STATUS_STONE) { - func_8024EFE0(walk->goalPos.x, walk->goalPos.y, /*eventFlags,*/ walk->goalPos.z, /*0,*/ 1, -1); + func_8024EFE0(walk->goalPos.x, walk->goalPos.y, /*eventFlags,*/ walk->goalPos.z, /*0,*/ 0, -1); show_damage_popup(walk->goalPos.x, walk->goalPos.y, walk->goalPos.z, 0, 0); play_hit_sound(attacker, walk->goalPos.x, walk->goalPos.y, walk->goalPos.z, 0); dispatch_event_general(target, EVENT_IMMUNE); @@ -236,11 +236,11 @@ s32 calc_enemy_damage_target(Actor* attacker) { // TODO: if/else ordering if (attacker->staticStatus == STATUS_STATIC) { - gBattleStatus.flags1 &= ~1; - } else if ((targetPart->eventFlags & EVENT_FLAG_ELECTRIFIED) && !(battleStatus->currentAttackElement & 0x10000020)) { + battleStatus->flags1 &= ~1; + } else if ((targetPart->eventFlags & EVENT_FLAG_ELECTRIFIED) && !(battleStatus->currentAttackElement & ~0x80008000)) { if (!(battleStatus->currentAttackEventSuppression & 8)) { if (!has_enchanted_part(attacker)) { - battleStatus->flags1 |= 0x20; + gBattleStatus.flags1 |= ~0x80000000; } gBattleStatus.flags1 &= ~1; } @@ -248,8 +248,8 @@ s32 calc_enemy_damage_target(Actor* attacker) { gBattleStatus.flags1 &= ~1; } - defense = get_defense(target, targetPart->defenseTable, gBattleStatus.currentAttackElement); - attackElement = gBattleStatus.currentAttackElement; + defense = get_defense(target, targetPart->defenseTable, battleStatus->currentAttackElement); + attackElement = battleStatus->currentAttackElement; if (!(attackElement & DAMAGE_TYPE_IGNORE_DEFENSE)) { defense += target->defenseBoost; @@ -257,9 +257,9 @@ s32 calc_enemy_damage_target(Actor* attacker) { if (targetID == ACTOR_PLAYER) { if (battleStatus->waterBlockTurnsLeft > 0) { if (!(attackElement & (DAMAGE_TYPE_BLAST | DAMAGE_TYPE_FIRE))) { - defense += 1; - } else { defense += 2; + } else { + defense += 1; } } @@ -331,7 +331,8 @@ s32 calc_enemy_damage_target(Actor* attacker) { } if (blocked) { - damage = damage - 1 - player_team_is_ability_active(target, ABILITY_DAMAGE_DODGE); + damage--; + damage = damage - player_team_is_ability_active(target, ABILITY_DAMAGE_DODGE); sfx_play_sound_at_position(0x231, 0, walk->goalPos.x, walk->goalPos.y, walk->goalPos.z); func_802667F0(0, target, walk->goalPos.x, walk->goalPos.y, walk->goalPos.z); gBattleStatus.flags1 |= 0x80000000; @@ -359,8 +360,8 @@ s32 calc_enemy_damage_target(Actor* attacker) { } if (damage <= 0) { - target->hpChangeCounter = 0; - if ((battleStatus->currentAttackElement & 0x40000000) == 0) { + target->hpChangeCounter = 9; + if ((gBattleStatus.currentAttackElement & 0x40000000) == 0) { hitResult = HIT_RESULT_MISS_QUAKE; phi_s2 = 0x17; } else { @@ -472,10 +473,10 @@ s32 calc_enemy_damage_target(Actor* attacker) { phi_s5 = FALSE; phi_s7 = FALSE; // what is this for if (gBattleStatus.flags1 & 0x20) { - if (battleStatus->lastAttackDamage >= 0 && phi_s2 != EVENT_DEATH && phi_s2 != EVENT_SPIN_SMASH_DEATH) { + if (gBattleStatus.lastAttackDamage >= 0 && phi_s2 != EVENT_DEATH && phi_s2 != EVENT_SPIN_SMASH_DEATH) { if (phi_s2 != EVENT_EXPLODE_TRIGGER) { - if (!(battleStatus->flags1 & 0x80000000)) { - if (!(battleStatus->flags2 & 0x1000000)) { + if (!(gBattleStatus.flags1 & 0x80000000)) { + if (!(gBattleStatus.flags2 & 0x1000000)) { if (targetID != ACTOR_PLAYER || !is_ability_active(ABILITY_HEALTHY_HEALTHY) || !(rand_int(100) < 20)) { if ((battleStatus->currentAttackStatus & STATUS_FLAG_SHRINK) && try_inflict_status(target, STATUS_SHRINK, STATUS_SHRINK_TURN_MOD)) { phi_s5 = TRUE; @@ -571,6 +572,7 @@ s32 calc_enemy_damage_target(Actor* attacker) { if (!phi_s7 && !phi_s5) { // immune star fx? func_8024EFE0(walk->goalPos.x, walk->goalPos.y, walk->goalPos.z, 0, -3); + show_damage_popup(walk->goalPos.x, walk->goalPos.y, walk->goalPos.z, 0, 0); } } else { if (battleStatus->currentAttackElement & 0x20000040) { // TODO flags diff --git a/src/battle/action_cmd/07.c b/src/battle/action_cmd/07.c index dec2917928..1a1bf867b5 100644 --- a/src/battle/action_cmd/07.c +++ b/src/battle/action_cmd/07.c @@ -1,5 +1,7 @@ #include "common.h" +#define NAMESPACE action_command_07 + INCLUDE_ASM(s32, "battle/action_cmd/07", func_802A9000_425B50); INCLUDE_ASM(s32, "battle/action_cmd/07", func_802A916C_425CBC); @@ -8,4 +10,4 @@ INCLUDE_ASM(s32, "battle/action_cmd/07", func_802A9228_425D78); INCLUDE_ASM(s32, "battle/action_cmd/07", func_802A94D8_426028); -INCLUDE_ASM(s32, "battle/action_cmd/07", func_802A959C_4260EC); +#include "common/FreeHudElements.inc.c" diff --git a/src/battle/action_cmd/0A.c b/src/battle/action_cmd/0A.c index f55d4594dd..1ae56754cf 100644 --- a/src/battle/action_cmd/0A.c +++ b/src/battle/action_cmd/0A.c @@ -1,5 +1,7 @@ #include "common.h" +#define NAMESPACE action_command_0A + INCLUDE_ASM(s32, "battle/action_cmd/0A", func_802A9000_4273B0); INCLUDE_ASM(s32, "battle/action_cmd/0A", func_802A9170_427520); @@ -8,4 +10,4 @@ INCLUDE_ASM(s32, "battle/action_cmd/0A", func_802A928C_42763C); INCLUDE_ASM(s32, "battle/action_cmd/0A", func_802A955C_42790C); -INCLUDE_ASM(s32, "battle/action_cmd/0A", func_802A963C_4279EC); +#include "common/FreeHudElements.inc.c" diff --git a/src/battle/action_cmd/air_lift.c b/src/battle/action_cmd/air_lift.c index 909817476f..0e7363b9a5 100644 --- a/src/battle/action_cmd/air_lift.c +++ b/src/battle/action_cmd/air_lift.c @@ -1,5 +1,7 @@ #include "common.h" +#define NAMESPACE action_command_air_lift + INCLUDE_ASM(s32, "battle/action_cmd/air_lift", func_802A9000_428A70); INCLUDE_ASM(s32, "battle/action_cmd/air_lift", func_802A9184_428BF4); @@ -8,4 +10,4 @@ INCLUDE_ASM(s32, "battle/action_cmd/air_lift", func_802A9278_428CE8); INCLUDE_ASM(s32, "battle/action_cmd/air_lift", func_802A96EC_42915C); -INCLUDE_ASM(s32, "battle/action_cmd/air_lift", func_802A9810_429280); +#include "common/FreeHudElements.inc.c" diff --git a/src/battle/action_cmd/air_raid.c b/src/battle/action_cmd/air_raid.c index f2bd59a334..a01df5c4a2 100644 --- a/src/battle/action_cmd/air_raid.c +++ b/src/battle/action_cmd/air_raid.c @@ -1,5 +1,7 @@ #include "common.h" +#define NAMESPACE action_command_air_raid + INCLUDE_ASM(s32, "battle/action_cmd/air_raid", func_802A9000_429320); INCLUDE_ASM(s32, "battle/action_cmd/air_raid", func_802A9178_429498); @@ -8,4 +10,4 @@ INCLUDE_ASM(s32, "battle/action_cmd/air_raid", func_802A9294_4295B4); INCLUDE_ASM(s32, "battle/action_cmd/air_raid", func_802A984C_429B6C); -INCLUDE_ASM(s32, "battle/action_cmd/air_raid", func_802A992C_429C4C); +#include "common/FreeHudElements.inc.c" diff --git a/src/battle/action_cmd/body_slam.c b/src/battle/action_cmd/body_slam.c index abd0c41983..339af1e56b 100644 --- a/src/battle/action_cmd/body_slam.c +++ b/src/battle/action_cmd/body_slam.c @@ -1,5 +1,7 @@ #include "common.h" +#define NAMESPACE action_command_body_slam + INCLUDE_ASM(s32, "battle/action_cmd/body_slam", func_802A9000_4282E0); INCLUDE_ASM(s32, "battle/action_cmd/body_slam", func_802A91B8_428498); diff --git a/src/battle/action_cmd/bomb.c b/src/battle/action_cmd/bomb.c index 1b4461a275..382a852042 100644 --- a/src/battle/action_cmd/bomb.c +++ b/src/battle/action_cmd/bomb.c @@ -1,5 +1,7 @@ #include "common.h" +#define NAMESPACE action_command_bomb + INCLUDE_ASM(s32, "battle/action_cmd/bomb", func_802A9000_427A70); INCLUDE_ASM(s32, "battle/action_cmd/bomb", func_802A9170_427BE0); @@ -8,4 +10,4 @@ INCLUDE_ASM(s32, "battle/action_cmd/bomb", func_802A928C_427CFC); INCLUDE_ASM(s32, "battle/action_cmd/bomb", func_802A96EC_42815C); -INCLUDE_ASM(s32, "battle/action_cmd/bomb", func_802A97CC_42823C); +#include "common/FreeHudElements.inc.c" diff --git a/src/battle/action_cmd/break_free.c b/src/battle/action_cmd/break_free.c index 5953624f76..1efff0c044 100644 --- a/src/battle/action_cmd/break_free.c +++ b/src/battle/action_cmd/break_free.c @@ -1,5 +1,7 @@ #include "common.h" +#define NAMESPACE action_command_break_free + INCLUDE_ASM(s32, "battle/action_cmd/break_free", func_802A9000_4233F0); INCLUDE_ASM(s32, "battle/action_cmd/break_free", func_802A91B0_4235A0); diff --git a/src/battle/action_cmd/dizzy_shell.c b/src/battle/action_cmd/dizzy_shell.c index 64d6012c00..53277398d4 100644 --- a/src/battle/action_cmd/dizzy_shell.c +++ b/src/battle/action_cmd/dizzy_shell.c @@ -1,5 +1,7 @@ #include "common.h" +#define NAMESPACE action_command_dizzy_shell + INCLUDE_ASM(s32, "battle/action_cmd/dizzy_shell", func_802A9000_426170); INCLUDE_ASM(s32, "battle/action_cmd/dizzy_shell", func_802A9170_4262E0); @@ -8,4 +10,4 @@ INCLUDE_ASM(s32, "battle/action_cmd/dizzy_shell", func_802A928C_4263FC); INCLUDE_ASM(s32, "battle/action_cmd/dizzy_shell", func_802A96DC_42684C); -INCLUDE_ASM(s32, "battle/action_cmd/dizzy_shell", func_802A97BC_42692C); +#include "common/FreeHudElements.inc.c" diff --git a/src/battle/action_cmd/fire_shell.c b/src/battle/action_cmd/fire_shell.c index 195a985db6..e41f4dc7da 100644 --- a/src/battle/action_cmd/fire_shell.c +++ b/src/battle/action_cmd/fire_shell.c @@ -1,5 +1,7 @@ #include "common.h" +#define NAMESPACE action_command_fire_shell + INCLUDE_ASM(s32, "battle/action_cmd/fire_shell", func_802A9000_4269D0); INCLUDE_ASM(s32, "battle/action_cmd/fire_shell", func_802A9178_426B48); @@ -8,4 +10,4 @@ INCLUDE_ASM(s32, "battle/action_cmd/fire_shell", func_802A9294_426C64); INCLUDE_ASM(s32, "battle/action_cmd/fire_shell", func_802A9834_427204); -INCLUDE_ASM(s32, "battle/action_cmd/fire_shell", func_802A9914_4272E4); +#include "common/FreeHudElements.inc.c" diff --git a/src/battle/action_cmd/flee.c b/src/battle/action_cmd/flee.c index 758f3134a5..fbaf86d0cf 100644 --- a/src/battle/action_cmd/flee.c +++ b/src/battle/action_cmd/flee.c @@ -1,5 +1,7 @@ #include "common.h" +#define NAMESPACE action_command_flee + INCLUDE_ASM(s32, "battle/action_cmd/flee", func_802A9000_422AD0); INCLUDE_ASM(s32, "battle/action_cmd/flee", func_802A92A0_422D70); diff --git a/src/battle/action_cmd/hammer.c b/src/battle/action_cmd/hammer.c index 990c36297e..833bc870ee 100644 --- a/src/battle/action_cmd/hammer.c +++ b/src/battle/action_cmd/hammer.c @@ -1,5 +1,7 @@ #include "common.h" +#define NAMESPACE action_command_hammer + INCLUDE_ASM(s32, "battle/action_cmd/hammer", func_802A9000_422000); INCLUDE_ASM(s32, "battle/action_cmd/hammer", func_802A9258_422258); diff --git a/src/battle/action_cmd/hurricane.c b/src/battle/action_cmd/hurricane.c index 65b4ff856e..f0daba43f2 100644 --- a/src/battle/action_cmd/hurricane.c +++ b/src/battle/action_cmd/hurricane.c @@ -1,5 +1,7 @@ #include "common.h" +#define NAMESPACE action_command_hurricane + INCLUDE_ASM(s32, "battle/action_cmd/hurricane", func_802A9000_42F6E0); INCLUDE_ASM(s32, "battle/action_cmd/hurricane", func_802A91A0_42F880); diff --git a/src/battle/action_cmd/jump.c b/src/battle/action_cmd/jump.c index 29608eb656..37dbe73f60 100644 --- a/src/battle/action_cmd/jump.c +++ b/src/battle/action_cmd/jump.c @@ -1,5 +1,7 @@ #include "common.h" +#define NAMESPACE action_command_jump + INCLUDE_ASM(s32, "battle/action_cmd/jump", func_802A9000_4219F0); INCLUDE_ASM(s32, "battle/action_cmd/jump", func_802A9120_421B10); diff --git a/src/battle/action_cmd/mega_shock.c b/src/battle/action_cmd/mega_shock.c index 88d05ef2c7..8063fa57af 100644 --- a/src/battle/action_cmd/mega_shock.c +++ b/src/battle/action_cmd/mega_shock.c @@ -1,5 +1,7 @@ #include "common.h" +#define NAMESPACE action_command_mega_shock + INCLUDE_ASM(s32, "battle/action_cmd/mega_shock", func_802A9000_42DA10); INCLUDE_ASM(s32, "battle/action_cmd/mega_shock", func_802A91A0_42DBB0); diff --git a/src/battle/action_cmd/power_shock.c b/src/battle/action_cmd/power_shock.c index 27024e82e4..ef2f4adc75 100644 --- a/src/battle/action_cmd/power_shock.c +++ b/src/battle/action_cmd/power_shock.c @@ -1,5 +1,7 @@ #include "common.h" +#define NAMESPACE action_command_power_shock + INCLUDE_ASM(s32, "battle/action_cmd/power_shock", func_802A9000_42CF10); INCLUDE_ASM(s32, "battle/action_cmd/power_shock", func_802A9210_42D120); diff --git a/src/battle/action_cmd/smack.c b/src/battle/action_cmd/smack.c index 5093df1a49..decb91ebb0 100644 --- a/src/battle/action_cmd/smack.c +++ b/src/battle/action_cmd/smack.c @@ -1,5 +1,7 @@ #include "common.h" +#define NAMESPACE action_command_smack + INCLUDE_ASM(s32, "battle/action_cmd/smack", func_802A9000_42E3A0); INCLUDE_ASM(s32, "battle/action_cmd/smack", func_802A917C_42E51C); @@ -8,4 +10,4 @@ INCLUDE_ASM(s32, "battle/action_cmd/smack", func_802A9298_42E638); INCLUDE_ASM(s32, "battle/action_cmd/smack", func_802A98B0_42EC50); -INCLUDE_ASM(s32, "battle/action_cmd/smack", func_802A9990_42ED30); +#include "common/FreeHudElements.inc.c" diff --git a/src/battle/action_cmd/spiny_surge.c b/src/battle/action_cmd/spiny_surge.c index 0d345a349c..d96b3e9939 100644 --- a/src/battle/action_cmd/spiny_surge.c +++ b/src/battle/action_cmd/spiny_surge.c @@ -1,5 +1,7 @@ #include "common.h" +#define NAMESPACE action_command_spiny_surge + INCLUDE_ASM(s32, "battle/action_cmd/spiny_surge", func_802A9000_42EE20); INCLUDE_ASM(s32, "battle/action_cmd/spiny_surge", func_802A916C_42EF8C); @@ -8,4 +10,4 @@ INCLUDE_ASM(s32, "battle/action_cmd/spiny_surge", func_802A9254_42F074); INCLUDE_ASM(s32, "battle/action_cmd/spiny_surge", func_802A973C_42F55C); -INCLUDE_ASM(s32, "battle/action_cmd/spiny_surge", func_802A981C_42F63C); +#include "common/FreeHudElements.inc.c" diff --git a/src/battle/action_cmd/spook.c b/src/battle/action_cmd/spook.c index 54808ebcd6..68d9992cc7 100644 --- a/src/battle/action_cmd/spook.c +++ b/src/battle/action_cmd/spook.c @@ -1,5 +1,7 @@ #include "common.h" +#define NAMESPACE action_command_spook + INCLUDE_ASM(s32, "battle/action_cmd/spook", func_802A9000_430020); INCLUDE_ASM(s32, "battle/action_cmd/spook", func_802A917C_43019C); @@ -8,4 +10,4 @@ INCLUDE_ASM(s32, "battle/action_cmd/spook", func_802A9298_4302B8); INCLUDE_ASM(s32, "battle/action_cmd/spook", func_802A97FC_43081C); -INCLUDE_ASM(s32, "battle/action_cmd/spook", func_802A98DC_4308FC); +#include "common/FreeHudElements.inc.c" diff --git a/src/battle/action_cmd/squirt.c b/src/battle/action_cmd/squirt.c index 6f3fb784ae..b5e0fd568d 100644 --- a/src/battle/action_cmd/squirt.c +++ b/src/battle/action_cmd/squirt.c @@ -1,5 +1,7 @@ #include "common.h" +#define NAMESPACE action_command_squirt + INCLUDE_ASM(s32, "battle/action_cmd/squirt", func_802A9000_429D20); INCLUDE_ASM(s32, "battle/action_cmd/squirt", func_802A911C_429E3C); diff --git a/src/battle/action_cmd/stop_leech.c b/src/battle/action_cmd/stop_leech.c index f49ed4a902..8ff5d0f563 100644 --- a/src/battle/action_cmd/stop_leech.c +++ b/src/battle/action_cmd/stop_leech.c @@ -1,5 +1,7 @@ #include "common.h" +#define NAMESPACE action_command_stop_leech + INCLUDE_ASM(s32, "battle/action_cmd/stop_leech", func_802A9000_425590); INCLUDE_ASM(s32, "battle/action_cmd/stop_leech", func_802A9110_4256A0); diff --git a/src/battle/action_cmd/tidal_wave.c b/src/battle/action_cmd/tidal_wave.c index e0714ffd15..6a6dd488a0 100644 --- a/src/battle/action_cmd/tidal_wave.c +++ b/src/battle/action_cmd/tidal_wave.c @@ -1,5 +1,7 @@ #include "common.h" +#define NAMESPACE action_command_tidal_wave + INCLUDE_ASM(s32, "battle/action_cmd/tidal_wave", func_802A9000_42C6F0); INCLUDE_ASM(s32, "battle/action_cmd/tidal_wave", func_802A9138_42C828); diff --git a/src/battle/action_cmd/water_block.c b/src/battle/action_cmd/water_block.c index 9df063bdb2..d347af6dd5 100644 --- a/src/battle/action_cmd/water_block.c +++ b/src/battle/action_cmd/water_block.c @@ -1,5 +1,7 @@ #include "common.h" +#define NAMESPACE action_command_water_block + INCLUDE_ASM(s32, "battle/action_cmd/water_block", func_802A9000_42A4F0); INCLUDE_ASM(s32, "battle/action_cmd/water_block", func_802A9398_42A888); diff --git a/src/battle/action_cmd/whirlwind.c b/src/battle/action_cmd/whirlwind.c index b417eb1366..31947e699b 100644 --- a/src/battle/action_cmd/whirlwind.c +++ b/src/battle/action_cmd/whirlwind.c @@ -1,5 +1,7 @@ #include "common.h" +#define NAMESPACE action_command_whirlwind + INCLUDE_ASM(s32, "battle/action_cmd/whirlwind", func_802A9000_423C70); INCLUDE_ASM(s32, "battle/action_cmd/whirlwind", func_802A91E0_423E50); diff --git a/src/common/FreeHudElements.inc.c b/src/common/FreeHudElements.inc.c new file mode 100644 index 0000000000..5d7184ba77 --- /dev/null +++ b/src/common/FreeHudElements.inc.c @@ -0,0 +1,15 @@ +#include "common.h" + +extern struct D_8029FBE0 { + /* 0x00 */ s32 unk_00; + /* 0x04 */ s32 unk_04; + /* 0x08 */ s32 unk_08; + /* 0x0C */ s32 unk_0C; +} D_8029FBE0; // size = 0x10 + +void N(FreeHudElements)(void) { + free_hud_element(D_8029FBE0.unk_04); + free_hud_element(D_8029FBE0.unk_08); + free_hud_element(D_8029FBE0.unk_0C); +} + diff --git a/src/world/area_kzn/kzn_03/C61020.c b/src/world/area_kzn/kzn_03/C61020.c index 507d2e206d..09aadb2527 100644 --- a/src/world/area_kzn/kzn_03/C61020.c +++ b/src/world/area_kzn/kzn_03/C61020.c @@ -32,13 +32,13 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80241534_C62244); INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80241630_C62340); -INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80242070_C62D80); +#include "world/common/UnkNpcDurationFlagFunc3.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80242100_C62E10); -INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80242200_C62F10); +#include "world/common/UnkNpcDurationFlagFunc2.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80242260_C62F70); +#include "world/common/UnkNpcAIFunc30.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_8024234C_C6305C); diff --git a/src/world/area_kzn/kzn_08/C71ED0.c b/src/world/area_kzn/kzn_08/C71ED0.c index 454f8c6bf6..50d2ca3885 100644 --- a/src/world/area_kzn/kzn_08/C71ED0.c +++ b/src/world/area_kzn/kzn_08/C71ED0.c @@ -229,13 +229,13 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80242E78_C742F8); INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80242F74_C743F4); -INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_802439B4_C74E34); +#include "world/common/UnkNpcDurationFlagFunc3.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80243A44_C74EC4); -INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80243B44_C74FC4); +#include "world/common/UnkNpcDurationFlagFunc2.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80243BA4_C75024); +#include "world/common/UnkNpcAIFunc30.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80243C90_C75110); diff --git a/src/world/area_kzn/kzn_09/C77D00.c b/src/world/area_kzn/kzn_09/C77D00.c index 171edc8e3a..e773d5bf52 100644 --- a/src/world/area_kzn/kzn_09/C77D00.c +++ b/src/world/area_kzn/kzn_09/C77D00.c @@ -20,13 +20,13 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_8024195C_C7863C); INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80241A58_C78738); -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80242498_C79178); +#include "world/common/UnkNpcDurationFlagFunc3.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80242528_C79208); -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80242628_C79308); +#include "world/common/UnkNpcDurationFlagFunc2.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80242688_C79368); +#include "world/common/UnkNpcAIFunc30.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80242774_C79454); diff --git a/src/world/area_kzn/kzn_17/C85DC0.c b/src/world/area_kzn/kzn_17/C85DC0.c index e35c3d37f0..b94b333557 100644 --- a/src/world/area_kzn/kzn_17/C85DC0.c +++ b/src/world/area_kzn/kzn_17/C85DC0.c @@ -20,13 +20,13 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80240C4C_C866FC); INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80240D48_C867F8); -INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80241788_C87238); +#include "world/common/UnkNpcDurationFlagFunc3.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80241818_C872C8); -INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80241918_C873C8); +#include "world/common/UnkNpcDurationFlagFunc2.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80241978_C87428); +#include "world/common/UnkNpcAIFunc30.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80241A64_C87514); diff --git a/src/world/area_mim/mim_01/B93440.c b/src/world/area_mim/mim_01/B93440.c index 4ec1758bec..6fed0bff9a 100644 --- a/src/world/area_mim/mim_01/B93440.c +++ b/src/world/area_mim/mim_01/B93440.c @@ -5,4 +5,4 @@ static char* N(exit_str_1) = "mim_10"; static char* N(exit_str_2) = "mim_02"; static char* N(exit_str_3) = ""; -INCLUDE_ASM(s32, "world/area_mim/mim_01/B93440", func_80240000_B93440); +#include "world/common/SetForeverForestFog.inc.c" diff --git a/src/world/area_mim/mim_01/B93940.c b/src/world/area_mim/mim_01/B93940.c index 00d1685398..2cfe534ec0 100644 --- a/src/world/area_mim/mim_01/B93940.c +++ b/src/world/area_mim/mim_01/B93940.c @@ -20,12 +20,12 @@ INCLUDE_ASM(s32, "world/area_mim/mim_01/B93940", func_80240E3C_B9427C); INCLUDE_ASM(s32, "world/area_mim/mim_01/B93940", func_80240F38_B94378); -INCLUDE_ASM(s32, "world/area_mim/mim_01/B93940", func_80241978_B94DB8); +#include "world/common/UnkNpcDurationFlagFunc3.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_01/B93940", func_80241A08_B94E48); -INCLUDE_ASM(s32, "world/area_mim/mim_01/B93940", func_80241B08_B94F48); +#include "world/common/UnkNpcDurationFlagFunc2.inc.c" -INCLUDE_ASM(s32, "world/area_mim/mim_01/B93940", func_80241B68_B94FA8); +#include "world/common/UnkNpcAIFunc30.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_01/B93940", func_80241C54_B95094); diff --git a/src/world/area_mim/mim_02/B97C00.c b/src/world/area_mim/mim_02/B97C00.c index a7c9626a30..035a1960f1 100644 --- a/src/world/area_mim/mim_02/B97C00.c +++ b/src/world/area_mim/mim_02/B97C00.c @@ -3,4 +3,4 @@ static char* N(exit_str_0) = "mim_03"; static char* N(exit_str_1) = "mim_01"; -INCLUDE_ASM(s32, "world/area_mim/mim_02/B97C00", func_80240000_B97C00); +#include "world/common/SetForeverForestFog.inc.c" diff --git a/src/world/area_mim/mim_03/B9B480.c b/src/world/area_mim/mim_03/B9B480.c index 2bafd9529a..9cfc412400 100644 --- a/src/world/area_mim/mim_03/B9B480.c +++ b/src/world/area_mim/mim_03/B9B480.c @@ -5,7 +5,7 @@ static char* N(exit_str_1) = "mim_04"; static char* N(exit_str_2) = "mim_02"; static char* N(exit_str_3) = ""; -INCLUDE_ASM(s32, "world/area_mim/mim_03/B9B480", func_80240000_B9B480); +#include "world/common/SetForeverForestFog.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_03/B9B480", func_80240068_B9B4E8); diff --git a/src/world/area_mim/mim_04/B9D960.c b/src/world/area_mim/mim_04/B9D960.c index 2ed0fa1a5b..2489bae451 100644 --- a/src/world/area_mim/mim_04/B9D960.c +++ b/src/world/area_mim/mim_04/B9D960.c @@ -5,4 +5,4 @@ static char* N(exit_str_1) = "mim_01"; static char* N(exit_str_2) = "mim_03"; static char* N(exit_str_3) = ""; -INCLUDE_ASM(s32, "world/area_mim/mim_04/B9D960", func_80240000_B9D960); +#include "world/common/SetForeverForestFog.inc.c" diff --git a/src/world/area_mim/mim_05/BA0730.c b/src/world/area_mim/mim_05/BA0730.c index 5304192594..dddb7f86c8 100644 --- a/src/world/area_mim/mim_05/BA0730.c +++ b/src/world/area_mim/mim_05/BA0730.c @@ -5,4 +5,4 @@ static char* N(exit_str_1) = "mim_06"; static char* N(exit_str_2) = "mim_04"; static char* N(exit_str_3) = "mim_08"; -INCLUDE_ASM(s32, "world/area_mim/mim_05/BA0730", func_80240000_BA0730); +#include "world/common/SetForeverForestFog.inc.c" diff --git a/src/world/area_mim/mim_05/BA07A0.c b/src/world/area_mim/mim_05/BA07A0.c index ba149245d2..c7ca0169cc 100644 --- a/src/world/area_mim/mim_05/BA07A0.c +++ b/src/world/area_mim/mim_05/BA07A0.c @@ -20,12 +20,12 @@ INCLUDE_ASM(s32, "world/area_mim/mim_05/BA07A0", func_802409AC_BA10DC); INCLUDE_ASM(s32, "world/area_mim/mim_05/BA07A0", func_80240AA8_BA11D8); -INCLUDE_ASM(s32, "world/area_mim/mim_05/BA07A0", func_802414E8_BA1C18); +#include "world/common/UnkNpcDurationFlagFunc3.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_05/BA07A0", func_80241578_BA1CA8); -INCLUDE_ASM(s32, "world/area_mim/mim_05/BA07A0", func_80241678_BA1DA8); +#include "world/common/UnkNpcDurationFlagFunc2.inc.c" -INCLUDE_ASM(s32, "world/area_mim/mim_05/BA07A0", func_802416D8_BA1E08); +#include "world/common/UnkNpcAIFunc30.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_05/BA07A0", func_802417C4_BA1EF4); diff --git a/src/world/area_mim/mim_06/BA4780.c b/src/world/area_mim/mim_06/BA4780.c index e4576f9952..594cd78e0e 100644 --- a/src/world/area_mim/mim_06/BA4780.c +++ b/src/world/area_mim/mim_06/BA4780.c @@ -5,4 +5,4 @@ static char* N(exit_str_1) = "mim_01"; static char* N(exit_str_2) = "mim_05"; static char* N(exit_str_3) = ""; -INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4780", func_80240000_BA4780); +#include "world/common/SetForeverForestFog.inc.c" diff --git a/src/world/area_mim/mim_06/BA4CF0.c b/src/world/area_mim/mim_06/BA4CF0.c index 87a2761789..3ba4809b36 100644 --- a/src/world/area_mim/mim_06/BA4CF0.c +++ b/src/world/area_mim/mim_06/BA4CF0.c @@ -20,13 +20,13 @@ INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_80240EAC_BA562C); INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_80240FA8_BA5728); -INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_802419E8_BA6168); +#include "world/common/UnkNpcDurationFlagFunc3.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_80241A78_BA61F8); -INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_80241B78_BA62F8); +#include "world/common/UnkNpcDurationFlagFunc2.inc.c" -INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_80241BD8_BA6358); +#include "world/common/UnkNpcAIFunc30.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_80241CC4_BA6444); diff --git a/src/world/area_mim/mim_07/BAA140.c b/src/world/area_mim/mim_07/BAA140.c index 48e3a29c84..34700797ff 100644 --- a/src/world/area_mim/mim_07/BAA140.c +++ b/src/world/area_mim/mim_07/BAA140.c @@ -5,4 +5,6 @@ static char* N(exit_str_1) = "mim_01"; static char* N(exit_str_2) = "mim_06"; static char* N(exit_str_3) = "mim_11"; -INCLUDE_ASM(s32, "world/area_mim/mim_07/BAA140", func_80240000_BAA140); +#define NAMESPACE dup_mim_07 +#include "world/common/SetForeverForestFog.inc.c" +#define NAMESPACE mim_07 diff --git a/src/world/area_mim/mim_07/BAA1B0.c b/src/world/area_mim/mim_07/BAA1B0.c index 0759e6b240..e69383a73b 100644 --- a/src/world/area_mim/mim_07/BAA1B0.c +++ b/src/world/area_mim/mim_07/BAA1B0.c @@ -1,6 +1,6 @@ #include "mim_07.h" -INCLUDE_ASM(s32, "world/area_mim/mim_07/BAA1B0", func_80240070_BAA1B0); +#include "world/common/SetForeverForestFog.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_07/BAA1B0", func_802400D8_BAA218); diff --git a/src/world/area_mim/mim_08/BAD940.c b/src/world/area_mim/mim_08/BAD940.c index a42c5d815c..3b1eee25f1 100644 --- a/src/world/area_mim/mim_08/BAD940.c +++ b/src/world/area_mim/mim_08/BAD940.c @@ -3,7 +3,7 @@ static char* N(exit_str_0) = "mim_01"; static char* N(exit_str_1) = "mim_05"; -INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80240000_BAD940); +#include "world/common/SetForeverForestFog.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80240068_BAD9A8); @@ -121,12 +121,12 @@ INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80241ED4_BAF814); INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80241FD0_BAF910); -INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80242A10_BB0350); +#include "world/common/UnkNpcDurationFlagFunc3.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80242AA0_BB03E0); -INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80242BA0_BB04E0); +#include "world/common/UnkNpcDurationFlagFunc2.inc.c" -INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80242C00_BB0540); +#include "world/common/UnkNpcAIFunc30.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80242CEC_BB062C); diff --git a/src/world/area_mim/mim_09/BB2E00.c b/src/world/area_mim/mim_09/BB2E00.c index 2bea136830..a22c56e809 100644 --- a/src/world/area_mim/mim_09/BB2E00.c +++ b/src/world/area_mim/mim_09/BB2E00.c @@ -3,7 +3,7 @@ static char* N(exit_str_0) = "mim_01"; static char* N(exit_str_1) = "mim_07"; -INCLUDE_ASM(s32, "world/area_mim/mim_09/BB2E00", func_80240000_BB2E00); +#include "world/common/SetForeverForestFog.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_09/BB2E00", func_80240068_BB2E68); diff --git a/src/world/area_omo/omo_02/D9D510.c b/src/world/area_omo/omo_02/D9D510.c index deb15821f2..35cc122fd1 100644 --- a/src/world/area_omo/omo_02/D9D510.c +++ b/src/world/area_omo/omo_02/D9D510.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_802409E0_D9DEB0); INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80240AB0_D9DF80); -INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80240B48_D9E018); +#include "world/common/UnkNpcDurationAnimationFunc.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80240BA8_D9E078); diff --git a/src/world/area_omo/omo_04/DAD400.c b/src/world/area_omo/omo_04/DAD400.c index d2d2c6f611..9841475c12 100644 --- a/src/world/area_omo/omo_04/DAD400.c +++ b/src/world/area_omo/omo_04/DAD400.c @@ -136,7 +136,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80241908_DAED08); INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_802419D8_DAEDD8); -INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80241A70_DAEE70); +#include "world/common/UnkNpcDurationAnimationFunc.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80241AD0_DAEED0); diff --git a/src/world/area_omo/omo_05/DB22C0.c b/src/world/area_omo/omo_05/DB22C0.c index 3603be7011..b4ed7d729b 100644 --- a/src/world/area_omo/omo_05/DB22C0.c +++ b/src/world/area_omo/omo_05/DB22C0.c @@ -9,7 +9,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80240070_DB2330); INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80240140_DB2400); -INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_802401D8_DB2498); +#include "world/common/UnkNpcDurationAnimationFunc.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80240238_DB24F8); diff --git a/src/world/area_omo/omo_07/DBD2B0.c b/src/world/area_omo/omo_07/DBD2B0.c index a59081dd50..f6f2b842d5 100644 --- a/src/world/area_omo/omo_07/DBD2B0.c +++ b/src/world/area_omo/omo_07/DBD2B0.c @@ -9,7 +9,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80240070_DBD320); INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80240140_DBD3F0); -INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_802401D8_DBD488); +#include "world/common/UnkNpcDurationAnimationFunc.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80240238_DBD4E8); @@ -128,7 +128,9 @@ INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_8024146C_DBE71C); INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_8024153C_DBE7EC); -INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_802415D4_DBE884); +#define NAMESPACE dup_omo_07 +#include "world/common/UnkNpcDurationAnimationFunc.inc.c" +#define NAMESPACE omo_07 INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80241634_DBE8E4); diff --git a/src/world/area_omo/omo_08/DC4C40.c b/src/world/area_omo/omo_08/DC4C40.c index 9cb2ca852f..1549be2683 100644 --- a/src/world/area_omo/omo_08/DC4C40.c +++ b/src/world/area_omo/omo_08/DC4C40.c @@ -6,6 +6,6 @@ INCLUDE_ASM(s32, "world/area_omo/omo_08/DC4C40", func_802408E0_DC4CB0); INCLUDE_ASM(s32, "world/area_omo/omo_08/DC4C40", func_802409B0_DC4D80); -INCLUDE_ASM(s32, "world/area_omo/omo_08/DC4C40", func_80240A48_DC4E18); +#include "world/common/UnkNpcDurationAnimationFunc.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_08/DC4C40", func_80240AA8_DC4E78); diff --git a/src/world/area_omo/omo_09/DCD6B0.c b/src/world/area_omo/omo_09/DCD6B0.c index c0f669d40e..fbf074b315 100644 --- a/src/world/area_omo/omo_09/DCD6B0.c +++ b/src/world/area_omo/omo_09/DCD6B0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80240A50_DCD720); INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80240B20_DCD7F0); -INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80240BB8_DCD888); +#include "world/common/UnkNpcDurationAnimationFunc.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80240C18_DCD8E8); @@ -125,7 +125,9 @@ INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80241E4C_DCEB1C); INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80241F1C_DCEBEC); -INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80241FB4_DCEC84); +#define NAMESPACE dup_omo_09 +#include "world/common/UnkNpcDurationAnimationFunc.inc.c" +#define NAMESPACE omo_09 INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80242014_DCECE4); diff --git a/src/world/area_omo/omo_13/DE2710.c b/src/world/area_omo/omo_13/DE2710.c index 53cfad6645..eed3f4338f 100644 --- a/src/world/area_omo/omo_13/DE2710.c +++ b/src/world/area_omo/omo_13/DE2710.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_13/DE2710", func_802402F0_DE2780); INCLUDE_ASM(s32, "world/area_omo/omo_13/DE2710", func_802403C0_DE2850); -INCLUDE_ASM(s32, "world/area_omo/omo_13/DE2710", func_80240458_DE28E8); +#include "world/common/UnkNpcDurationAnimationFunc.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_13/DE2710", func_802404B8_DE2948); diff --git a/src/world/area_omo/omo_17/DEF400.c b/src/world/area_omo/omo_17/DEF400.c index efea0303b5..4b29bb1683 100644 --- a/src/world/area_omo/omo_17/DEF400.c +++ b/src/world/area_omo/omo_17/DEF400.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_802405D0_DEF470); INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_802406A0_DEF540); -INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80240738_DEF5D8); +#include "world/common/UnkNpcDurationAnimationFunc.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80240798_DEF638); diff --git a/src/world/area_sam/sam_05/D187E0.c b/src/world/area_sam/sam_05/D187E0.c index 20697b0bcf..708a7a28b4 100644 --- a/src/world/area_sam/sam_05/D187E0.c +++ b/src/world/area_sam/sam_05/D187E0.c @@ -23,13 +23,13 @@ INCLUDE_ASM(s32, "world/area_sam/sam_05/D187E0", func_8024093C_D1911C); INCLUDE_ASM(s32, "world/area_sam/sam_05/D187E0", func_80240A38_D19218); -INCLUDE_ASM(s32, "world/area_sam/sam_05/D187E0", func_80241478_D19C58); +#include "world/common/UnkNpcDurationFlagFunc3.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_05/D187E0", func_80241508_D19CE8); -INCLUDE_ASM(s32, "world/area_sam/sam_05/D187E0", func_80241608_D19DE8); +#include "world/common/UnkNpcDurationFlagFunc2.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_05/D187E0", func_80241668_D19E48); +#include "world/common/UnkNpcAIFunc30.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_05/D187E0", func_80241754_D19F34); diff --git a/src/world/area_sam/sam_07/D2BD30.c b/src/world/area_sam/sam_07/D2BD30.c index 74e3aa3738..14fc029fd2 100644 --- a/src/world/area_sam/sam_07/D2BD30.c +++ b/src/world/area_sam/sam_07/D2BD30.c @@ -33,12 +33,12 @@ INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80240F8C_D2CCBC); INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80241088_D2CDB8); -INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80241AC8_D2D7F8); +#include "world/common/UnkNpcDurationFlagFunc3.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80241B58_D2D888); -INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80241C58_D2D988); +#include "world/common/UnkNpcDurationFlagFunc2.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80241CB8_D2D9E8); +#include "world/common/UnkNpcAIFunc30.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80241DA4_D2DAD4); diff --git a/src/world/common/SetForeverForestFog.inc.c b/src/world/common/SetForeverForestFog.inc.c new file mode 100644 index 0000000000..9625db74dd --- /dev/null +++ b/src/world/common/SetForeverForestFog.inc.c @@ -0,0 +1,13 @@ +#include "common.h" +#include "map.h" + +ApiStatus N(SetForeverForestFog)(ScriptInstance* script, s32 isInitialCall) { + enable_world_fog(); + set_world_fog_dist(990, 1000); + set_world_fog_color(0, 0, 0, 255); + enable_entity_fog(); + set_entity_fog_dist(990, 1000); + set_entity_fog_color(0, 0, 0, 255); + + return ApiStatus_DONE2; +} diff --git a/src/world/common/UnkNpcAIFunc30.inc.c b/src/world/common/UnkNpcAIFunc30.inc.c new file mode 100644 index 0000000000..8ec22028cf --- /dev/null +++ b/src/world/common/UnkNpcAIFunc30.inc.c @@ -0,0 +1,18 @@ +#include "common.h" +#include "map.h" +#include "effects.h" + +void N(UnkNpcAIFunc30)(ScriptInstance *script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + s32 retVal; + + npc->duration--; + if (npc->duration == 0) { + if (func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0) == 0) { + fx_emote(2, npc, 0, npc->collisionHeight, 1, 2, -20, 15, &retVal); + } + npc->duration = 0; + script->functionTemp[0] = 0; + } +} diff --git a/src/world/common/UnkNpcDurationAnimationFunc.inc.c b/src/world/common/UnkNpcDurationAnimationFunc.inc.c new file mode 100644 index 0000000000..7fbe36b237 --- /dev/null +++ b/src/world/common/UnkNpcDurationAnimationFunc.inc.c @@ -0,0 +1,13 @@ +#include "common.h" +#include "map.h" + +void N(UnkNpcDurationAnimationFunc)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->duration--; + if (npc->duration == 0) { + npc->currentAnim.w = *enemy->animList; + script->functionTemp[0] = 0; + } +} diff --git a/src/world/common/UnkNpcDurationFlagFunc2.inc.c b/src/world/common/UnkNpcDurationFlagFunc2.inc.c new file mode 100644 index 0000000000..fb2c73333d --- /dev/null +++ b/src/world/common/UnkNpcDurationFlagFunc2.inc.c @@ -0,0 +1,13 @@ +#include "common.h" +#include "map.h" + +void N(UnkNpcDurationFlagFunc2)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->duration--; + if (npc->duration == 0) { + npc->duration = enemy->varTable[15]; + script->functionTemp[0] = 14; + } +} diff --git a/src/world/common/UnkNpcDurationFlagFunc3.inc.c b/src/world/common/UnkNpcDurationFlagFunc3.inc.c new file mode 100644 index 0000000000..9da2a513c2 --- /dev/null +++ b/src/world/common/UnkNpcDurationFlagFunc3.inc.c @@ -0,0 +1,17 @@ +#include "common.h" +#include "map.h" + +void N(UnkNpcDurationFlagFunc3)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->duration--; + if (enemy->varTable[11] >= npc->duration) { + enemy->flags &= ~0x1F100000; + } + if (npc->duration == 0) { + npc->currentAnim.w = enemy->animList[10]; + npc->duration = 0; + script->functionTemp[0] = 12; + } +} diff --git a/ver/us/asm/data/world/area_mim/mim_01/B953B0.data.s b/ver/us/asm/data/world/area_mim/mim_01/B953B0.data.s index d660b259cb..90b3cd5056 100644 --- a/ver/us/asm/data/world/area_mim/mim_01/B953B0.data.s +++ b/ver/us/asm/data/world/area_mim/mim_01/B953B0.data.s @@ -15,7 +15,7 @@ glabel D_80242084_B954C4 .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802445E0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_802420E0_B95520 -.word 0x00000047, 0x00000005, D_80241F70_B953B0, 0x00080000, 0x00000001, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241FCC_B9540C, 0x00080000, 0x00000010, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80242028_B95468, 0x00080000, 0x0000000B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80242084_B954C4, 0x00080000, 0x00000006, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000C, 0x00000043, 0x00000002, SetSpriteShading, 0x00070000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x0000028A, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF8406337, 0x00000001, 0x00000024, 0x00000002, 0xF70F2E82, 0xF5DE022B, 0x00000043, 0x00000002, GetMapID, 0xF5DE022B, 0x00000046, 0x00000001, 0x80243CD8, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x802445B4, 0x00000046, 0x00000001, D_80242354_B95794, 0x00000046, 0x00000001, 0x80242C40, 0x00000024, 0x00000002, 0xFE363C80, D_802420E0_B95520, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, func_80240000_B93440, 0x00000044, 0x00000001, 0x80241F30, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000047, 0x00000005, D_80241F70_B953B0, 0x00080000, 0x00000001, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241FCC_B9540C, 0x00080000, 0x00000010, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80242028_B95468, 0x00080000, 0x0000000B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80242084_B954C4, 0x00080000, 0x00000006, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000C, 0x00000043, 0x00000002, SetSpriteShading, 0x00070000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x0000028A, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF8406337, 0x00000001, 0x00000024, 0x00000002, 0xF70F2E82, 0xF5DE022B, 0x00000043, 0x00000002, GetMapID, 0xF5DE022B, 0x00000046, 0x00000001, 0x80243CD8, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x802445B4, 0x00000046, 0x00000001, D_80242354_B95794, 0x00000046, 0x00000001, 0x80242C40, 0x00000024, 0x00000002, 0xFE363C80, D_802420E0_B95520, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, mim_01_SetForeverForestFog, 0x00000044, 0x00000001, 0x80241F30, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_802422B0_B956F0 .word 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D017E, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_02/B98EA0.data.s b/ver/us/asm/data/world/area_mim/mim_02/B98EA0.data.s index 3f7c9790b2..08778747d8 100644 --- a/ver/us/asm/data/world/area_mim/mim_02/B98EA0.data.s +++ b/ver/us/asm/data/world/area_mim/mim_02/B98EA0.data.s @@ -15,7 +15,7 @@ glabel D_802413B4_B98FB4 .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80243828, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80241410_B99010 -.word 0x00000047, 0x00000005, D_802412A0_B98EA0, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802412FC_B98EFC, 0x00080000, 0x00000013, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241358_B98F58, 0x00080000, 0x0000000E, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802413B4_B98FB4, 0x00080000, 0x00000009, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000C, 0x00000043, 0x00000002, SetSpriteShading, 0x00070001, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x0000028A, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E82, 0xF5DE022B, 0x00000043, 0x00000002, GetMapID, 0xF5DE022B, 0x00000046, 0x00000001, 0x80243430, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, D_80242754_B9A354, 0x00000024, 0x00000002, 0xFE363C80, D_80241410_B99010, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x80241260, 0x00000044, 0x00000001, 0x80243650, 0x00000043, 0x00000001, func_80240000_B97C00, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000047, 0x00000005, D_802412A0_B98EA0, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802412FC_B98EFC, 0x00080000, 0x00000013, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241358_B98F58, 0x00080000, 0x0000000E, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802413B4_B98FB4, 0x00080000, 0x00000009, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000C, 0x00000043, 0x00000002, SetSpriteShading, 0x00070001, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x0000028A, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E82, 0xF5DE022B, 0x00000043, 0x00000002, GetMapID, 0xF5DE022B, 0x00000046, 0x00000001, 0x80243430, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, D_80242754_B9A354, 0x00000024, 0x00000002, 0xFE363C80, D_80241410_B99010, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x80241260, 0x00000044, 0x00000001, 0x80243650, 0x00000043, 0x00000001, mim_02_SetForeverForestFog, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_802415E0_B991E0 .word 0x00000000, 0x00200018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 diff --git a/ver/us/asm/data/world/area_mim/mim_03/B9BA70.data.s b/ver/us/asm/data/world/area_mim/mim_03/B9BA70.data.s index c020e1b00d..bc536fdd5e 100644 --- a/ver/us/asm/data/world/area_mim/mim_03/B9BA70.data.s +++ b/ver/us/asm/data/world/area_mim/mim_03/B9BA70.data.s @@ -15,4 +15,4 @@ glabel D_80240704_B9BB84 .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802424C0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80240760_B9BBE0 -.word 0x00000047, 0x00000005, D_802405F0_B9BA70, 0x00080000, 0x00000001, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024064C_B9BACC, 0x00080000, 0x00000010, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802406A8_B9BB28, 0x00080000, 0x0000000B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240704_B9BB84, 0x00080000, 0x00000006, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000C, 0x00000043, 0x00000002, SetSpriteShading, 0x00070002, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x0000028A, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E82, 0xF5DE022B, 0x00000043, 0x00000002, GetMapID, 0xF5DE022B, 0x00000024, 0x00000002, 0xF9718882, 0x00000000, 0x00000046, 0x00000001, 0x80241EA0, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x802424A8, 0x00000046, 0x00000001, 0x802409B0, 0x00000024, 0x00000002, 0xFE363C80, D_80240760_B9BBE0, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x802405B0, 0x00000046, 0x00000001, 0x8024107C, 0x00000043, 0x00000001, func_80240000_B9B480, 0x00000056, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000001, func_80240068_B9B4E8, 0x0000000C, 0x00000002, 0xFE363C80, 0x0000015E, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000047, 0x00000005, D_802405F0_B9BA70, 0x00080000, 0x00000001, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024064C_B9BACC, 0x00080000, 0x00000010, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802406A8_B9BB28, 0x00080000, 0x0000000B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240704_B9BB84, 0x00080000, 0x00000006, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000C, 0x00000043, 0x00000002, SetSpriteShading, 0x00070002, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x0000028A, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E82, 0xF5DE022B, 0x00000043, 0x00000002, GetMapID, 0xF5DE022B, 0x00000024, 0x00000002, 0xF9718882, 0x00000000, 0x00000046, 0x00000001, 0x80241EA0, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x802424A8, 0x00000046, 0x00000001, 0x802409B0, 0x00000024, 0x00000002, 0xFE363C80, D_80240760_B9BBE0, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x802405B0, 0x00000046, 0x00000001, 0x8024107C, 0x00000043, 0x00000001, mim_03_SetForeverForestFog, 0x00000056, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000001, func_80240068_B9B4E8, 0x0000000C, 0x00000002, 0xFE363C80, 0x0000015E, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_04/B9EB50.data.s b/ver/us/asm/data/world/area_mim/mim_04/B9EB50.data.s index c6fcc51319..42036c6ad9 100644 --- a/ver/us/asm/data/world/area_mim/mim_04/B9EB50.data.s +++ b/ver/us/asm/data/world/area_mim/mim_04/B9EB50.data.s @@ -15,7 +15,7 @@ glabel D_80241304_B9EC64 .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242D70, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80241360_B9ECC0 -.word 0x00000047, 0x00000005, D_802411F0_B9EB50, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024124C_B9EBAC, 0x00080000, 0x00000014, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802412A8_B9EC08, 0x00080000, 0x0000000F, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241304_B9EC64, 0x00080000, 0x0000000A, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000C, 0x00000043, 0x00000002, SetSpriteShading, 0x00070003, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x0000028A, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E82, 0xF5DE022B, 0x00000043, 0x00000002, GetMapID, 0xF5DE022B, 0x00000046, 0x00000001, 0x80242360, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x80242D34, 0x00000024, 0x00000002, 0xFE363C80, D_80241360_B9ECC0, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x802411B0, 0x00000044, 0x00000001, D_802415C0_B9EF20, 0x00000043, 0x00000001, func_80240000_B9D960, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000047, 0x00000005, D_802411F0_B9EB50, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024124C_B9EBAC, 0x00080000, 0x00000014, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802412A8_B9EC08, 0x00080000, 0x0000000F, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241304_B9EC64, 0x00080000, 0x0000000A, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000C, 0x00000043, 0x00000002, SetSpriteShading, 0x00070003, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x0000028A, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E82, 0xF5DE022B, 0x00000043, 0x00000002, GetMapID, 0xF5DE022B, 0x00000046, 0x00000001, 0x80242360, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x80242D34, 0x00000024, 0x00000002, 0xFE363C80, D_80241360_B9ECC0, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x802411B0, 0x00000044, 0x00000001, D_802415C0_B9EF20, 0x00000043, 0x00000001, mim_04_SetForeverForestFog, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80241530_B9EE90 .word 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_05/BA2210.data.s b/ver/us/asm/data/world/area_mim/mim_05/BA2210.data.s index cc1544e4d5..c1e5e57f1a 100644 --- a/ver/us/asm/data/world/area_mim/mim_05/BA2210.data.s +++ b/ver/us/asm/data/world/area_mim/mim_05/BA2210.data.s @@ -15,7 +15,7 @@ glabel D_80241BF4_BA2324 .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80243E78, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80241C50_BA2380 -.word 0x00000047, 0x00000005, D_80241AE0_BA2210, 0x00080000, 0x00000001, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241B3C_BA226C, 0x00080000, 0x00000010, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241B98_BA22C8, 0x00080000, 0x0000000B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241BF4_BA2324, 0x00080000, 0x00000006, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000C, 0x00000043, 0x00000002, SetSpriteShading, 0x00070004, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x0000028A, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E82, 0xF5DE022B, 0x00000043, 0x00000002, GetMapID, 0xF5DE022B, 0x00000046, 0x00000001, D_80243170_BA38A0, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x80243E34, 0x00000024, 0x00000002, 0xFE363C80, D_80241C50_BA2380, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x80241AA0, 0x00000046, 0x00000001, D_80242290_BA29C0, 0x00000043, 0x00000001, func_80240000_BA0730, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000047, 0x00000005, D_80241AE0_BA2210, 0x00080000, 0x00000001, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241B3C_BA226C, 0x00080000, 0x00000010, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241B98_BA22C8, 0x00080000, 0x0000000B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241BF4_BA2324, 0x00080000, 0x00000006, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000C, 0x00000043, 0x00000002, SetSpriteShading, 0x00070004, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x0000028A, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E82, 0xF5DE022B, 0x00000043, 0x00000002, GetMapID, 0xF5DE022B, 0x00000046, 0x00000001, D_80243170_BA38A0, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x80243E34, 0x00000024, 0x00000002, 0xFE363C80, D_80241C50_BA2380, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x80241AA0, 0x00000046, 0x00000001, D_80242290_BA29C0, 0x00000043, 0x00000001, mim_05_SetForeverForestFog, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80241E20_BA2550 .word 0x0000003C, 0x00000001, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xF4ACD480, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8A, 0xF4ACD481, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8A, 0xF4ACD482, 0x00000016, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8A, 0xF4ACD484, 0x00000016, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C8A, 0xF4ACD485, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000006, PlaySoundAt, 0x000003A0, 0x00000000, 0xFFFFFED4, 0x00000000, 0xFFFFFFF6, 0x00000043, 0x00000005, SetTexPanOffset, 0xFE363C81, 0x00000000, 0x00000000, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetTexPanOffset, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFF8000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000001, 0x00000028, 0x00000002, 0xFE363C89, 0xFE363C8A, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF4ACD480, 0xFE363C89, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xF4ACD481, 0xFE363C89, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xF4ACD482, 0xFE363C89, 0x00000016, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xF4ACD484, 0xFE363C89, 0x00000016, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xF4ACD485, 0xFE363C89, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_06/BA7570.data.s b/ver/us/asm/data/world/area_mim/mim_06/BA7570.data.s index 340a950a98..c5ee891aa7 100644 --- a/ver/us/asm/data/world/area_mim/mim_06/BA7570.data.s +++ b/ver/us/asm/data/world/area_mim/mim_06/BA7570.data.s @@ -15,7 +15,7 @@ glabel D_80242F04_BA7684 .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802457A0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80242F60_BA76E0 -.word 0x00000047, 0x00000005, D_80242DF0_BA7570, 0x00080000, 0x00000001, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80242E4C_BA75CC, 0x00080000, 0x00000010, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80242EA8_BA7628, 0x00080000, 0x0000000B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80242F04_BA7684, 0x00080000, 0x00000006, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000C, 0x00000043, 0x00000002, SetSpriteShading, 0x00070005, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x0000028A, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E82, 0xF5DE022B, 0x00000043, 0x00000002, GetMapID, 0xF5DE022B, 0x00000046, 0x00000001, 0x80244810, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x8024575C, 0x00000024, 0x00000002, 0xFE363C80, D_80242F60_BA76E0, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x80242DB0, 0x00000046, 0x00000001, D_802439F8_BA8178, 0x00000043, 0x00000001, func_80240000_BA4780, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000047, 0x00000005, D_80242DF0_BA7570, 0x00080000, 0x00000001, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80242E4C_BA75CC, 0x00080000, 0x00000010, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80242EA8_BA7628, 0x00080000, 0x0000000B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80242F04_BA7684, 0x00080000, 0x00000006, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000C, 0x00000043, 0x00000002, SetSpriteShading, 0x00070005, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x0000028A, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E82, 0xF5DE022B, 0x00000043, 0x00000002, GetMapID, 0xF5DE022B, 0x00000046, 0x00000001, 0x80244810, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x8024575C, 0x00000024, 0x00000002, 0xFE363C80, D_80242F60_BA76E0, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x80242DB0, 0x00000046, 0x00000001, D_802439F8_BA8178, 0x00000043, 0x00000001, mim_06_SetForeverForestFog, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80243130_BA78B0 .word 0x0000005A, 0x0000005B, 0x0000005D, 0x0000005E, 0x00000060, 0x00000061 diff --git a/ver/us/asm/data/world/area_mim/mim_07/BAB2C0.data.s b/ver/us/asm/data/world/area_mim/mim_07/BAB2C0.data.s index 81ca2c5040..d6ecd1b68d 100644 --- a/ver/us/asm/data/world/area_mim/mim_07/BAB2C0.data.s +++ b/ver/us/asm/data/world/area_mim/mim_07/BAB2C0.data.s @@ -15,4 +15,4 @@ glabel D_80241294_BAB3D4 .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802437A8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_802412F0_BAB430 -.word 0x00000047, 0x00000005, D_80241180_BAB2C0, 0x00080000, 0x00000001, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802411DC_BAB31C, 0x00080000, 0x00000010, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241238_BAB378, 0x00080000, 0x0000000B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241294_BAB3D4, 0x00080000, 0x00000006, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000C, 0x00000043, 0x00000002, SetSpriteShading, 0x00070006, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x0000028A, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E82, 0xF5DE022B, 0x00000043, 0x00000002, GetMapID, 0xF5DE022B, 0x00000046, 0x00000001, 0x802426A0, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x80243758, 0x00000046, 0x00000001, 0x80241634, 0x00000024, 0x00000002, 0xFE363C80, D_802412F0_BAB430, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x80241110, 0x00000046, 0x00000001, 0x80241900, 0x00000043, 0x00000001, func_80240000_BAA140, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000001F4, 0xFFFFFF9C, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000212, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000057, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000047, 0x00000005, D_80241180_BAB2C0, 0x00080000, 0x00000001, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802411DC_BAB31C, 0x00080000, 0x00000010, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241238_BAB378, 0x00080000, 0x0000000B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241294_BAB3D4, 0x00080000, 0x00000006, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000C, 0x00000043, 0x00000002, SetSpriteShading, 0x00070006, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x0000028A, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E82, 0xF5DE022B, 0x00000043, 0x00000002, GetMapID, 0xF5DE022B, 0x00000046, 0x00000001, 0x802426A0, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x80243758, 0x00000046, 0x00000001, 0x80241634, 0x00000024, 0x00000002, 0xFE363C80, D_802412F0_BAB430, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x80241110, 0x00000046, 0x00000001, 0x80241900, 0x00000043, 0x00000001, dup_mim_07_SetForeverForestFog, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000001F4, 0xFFFFFF9C, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000212, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000057, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_08/BB0940.data.s b/ver/us/asm/data/world/area_mim/mim_08/BB0940.data.s index 4e05a3726d..94357e2d74 100644 --- a/ver/us/asm/data/world/area_mim/mim_08/BB0940.data.s +++ b/ver/us/asm/data/world/area_mim/mim_08/BB0940.data.s @@ -18,4 +18,4 @@ glabel D_80243170_BB0AB0 .word 0x00000047, 0x00000005, D_80243000_BB0940, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024305C_BB099C, 0x00080000, 0x00000013, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802430B8_BB09F8, 0x00080000, 0x0000000E, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80243114_BB0A54, 0x00080000, 0x00000009, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_802431F0_BB0B30 -.word 0x00000005, 0x00000001, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, TranslateModel, 0x0000001F, 0xFE363C80, 0x00000000, 0xFE363C80, 0x00000043, 0x00000005, TranslateModel, 0x00000020, 0xFE363C80, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFFE, 0x00000043, 0x00000005, TranslateModel, 0x0000001F, 0xFE363C80, 0x00000000, 0xFE363C80, 0x00000043, 0x00000005, TranslateModel, 0x00000020, 0xFE363C80, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000001F, 0xFE363C80, 0x00000000, 0xFE363C80, 0x00000043, 0x00000005, TranslateModel, 0x00000020, 0xFE363C80, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFD050F80, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000C, 0x00000043, 0x00000002, SetSpriteShading, 0x00070007, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x0000028A, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E82, 0xF5DE022B, 0x00000043, 0x00000002, GetMapID, 0xF5DE022B, 0x00000046, 0x00000001, 0x802441E0, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x80245258, 0x00000046, 0x00000001, 0x802434F0, 0x00000024, 0x00000002, 0xFE363C80, D_80243170_BB0AB0, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x80242FC0, 0x00000047, 0x00000005, D_802431F0_BB0B30, 0x00001000, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80240000_BAD940, 0x00000056, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000001, func_80240068_BAD9A8, 0x0000000C, 0x00000002, 0xFE363C80, 0x0000015E, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000005, 0x00000001, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, TranslateModel, 0x0000001F, 0xFE363C80, 0x00000000, 0xFE363C80, 0x00000043, 0x00000005, TranslateModel, 0x00000020, 0xFE363C80, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFFE, 0x00000043, 0x00000005, TranslateModel, 0x0000001F, 0xFE363C80, 0x00000000, 0xFE363C80, 0x00000043, 0x00000005, TranslateModel, 0x00000020, 0xFE363C80, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000001F, 0xFE363C80, 0x00000000, 0xFE363C80, 0x00000043, 0x00000005, TranslateModel, 0x00000020, 0xFE363C80, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFD050F80, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000C, 0x00000043, 0x00000002, SetSpriteShading, 0x00070007, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x0000028A, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E82, 0xF5DE022B, 0x00000043, 0x00000002, GetMapID, 0xF5DE022B, 0x00000046, 0x00000001, 0x802441E0, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x80245258, 0x00000046, 0x00000001, 0x802434F0, 0x00000024, 0x00000002, 0xFE363C80, D_80243170_BB0AB0, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x80242FC0, 0x00000047, 0x00000005, D_802431F0_BB0B30, 0x00001000, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000001, mim_08_SetForeverForestFog, 0x00000056, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000001, func_80240068_BAD9A8, 0x0000000C, 0x00000002, 0xFE363C80, 0x0000015E, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_09/BB3D80.data.s b/ver/us/asm/data/world/area_mim/mim_09/BB3D80.data.s index 50ca09b2a0..92dec80023 100644 --- a/ver/us/asm/data/world/area_mim/mim_09/BB3D80.data.s +++ b/ver/us/asm/data/world/area_mim/mim_09/BB3D80.data.s @@ -15,4 +15,4 @@ glabel D_80241094_BB3E94 .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242B80, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_802410F0_BB3EF0 -.word 0x00000047, 0x00000005, D_80240F80_BB3D80, 0x00080000, 0x00000007, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240FDC_BB3DDC, 0x00080000, 0x00000016, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241038_BB3E38, 0x00080000, 0x00000011, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241094_BB3E94, 0x00080000, 0x0000000C, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000C, 0x00000043, 0x00000002, SetSpriteShading, 0x00070008, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x0000028A, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E82, 0xF5DE022B, 0x00000043, 0x00000002, GetMapID, 0xF5DE022B, 0x00000046, 0x00000001, 0x802426D0, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x80242B64, 0x00000046, 0x00000001, 0x80241330, 0x00000024, 0x00000002, 0xFE363C80, D_802410F0_BB3EF0, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x80240F40, 0x00000046, 0x00000001, 0x802419A0, 0x00000043, 0x00000001, func_80240000_BB2E00, 0x00000056, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000001, func_80240068_BB2E68, 0x0000000C, 0x00000002, 0xFE363C80, 0x0000015E, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000047, 0x00000005, D_80240F80_BB3D80, 0x00080000, 0x00000007, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240FDC_BB3DDC, 0x00080000, 0x00000016, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241038_BB3E38, 0x00080000, 0x00000011, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241094_BB3E94, 0x00080000, 0x0000000C, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000C, 0x00000043, 0x00000002, SetSpriteShading, 0x00070008, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x0000028A, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E82, 0xF5DE022B, 0x00000043, 0x00000002, GetMapID, 0xF5DE022B, 0x00000046, 0x00000001, 0x802426D0, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x80242B64, 0x00000046, 0x00000001, 0x80241330, 0x00000024, 0x00000002, 0xFE363C80, D_802410F0_BB3EF0, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x80240F40, 0x00000046, 0x00000001, 0x802419A0, 0x00000043, 0x00000001, mim_09_SetForeverForestFog, 0x00000056, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000001, func_80240068_BB2E68, 0x0000000C, 0x00000002, 0xFE363C80, 0x0000015E, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/nonmatchings/196AA0/func_80268C9C.s b/ver/us/asm/nonmatchings/196AA0/func_80268C9C.s index c2bcca21a8..3d3f57c729 100644 --- a/ver/us/asm/nonmatchings/196AA0/func_80268C9C.s +++ b/ver/us/asm/nonmatchings/196AA0/func_80268C9C.s @@ -54,27 +54,27 @@ glabel L80268D24_197604 /* 19760C 80268D2C 0809A390 */ j .L80268E40 /* 197610 80268D30 3C05FFFF */ lui $a1, 0xffff glabel L80268D34_197614 -/* 197614 80268D34 0C0AA567 */ jal func_802A959C_4260EC +/* 197614 80268D34 0C0AA567 */ jal action_command_07_FreeHudElements /* 197618 80268D38 00000000 */ nop /* 19761C 80268D3C 0809A390 */ j .L80268E40 /* 197620 80268D40 3C05FFFF */ lui $a1, 0xffff glabel L80268D44_197624 -/* 197624 80268D44 0C0AA5EF */ jal func_802A97BC_42692C +/* 197624 80268D44 0C0AA5EF */ jal action_command_dizzy_shell_FreeHudElements /* 197628 80268D48 00000000 */ nop /* 19762C 80268D4C 0809A390 */ j .L80268E40 /* 197630 80268D50 3C05FFFF */ lui $a1, 0xffff glabel L80268D54_197634 -/* 197634 80268D54 0C0AA645 */ jal func_802A9914_4272E4 +/* 197634 80268D54 0C0AA645 */ jal action_command_fire_shell_FreeHudElements /* 197638 80268D58 00000000 */ nop /* 19763C 80268D5C 0809A390 */ j .L80268E40 /* 197640 80268D60 3C05FFFF */ lui $a1, 0xffff glabel L80268D64_197644 -/* 197644 80268D64 0C0AA58F */ jal func_802A963C_4279EC +/* 197644 80268D64 0C0AA58F */ jal action_command_0A_FreeHudElements /* 197648 80268D68 00000000 */ nop /* 19764C 80268D6C 0809A390 */ j .L80268E40 /* 197650 80268D70 3C05FFFF */ lui $a1, 0xffff glabel L80268D74_197654 -/* 197654 80268D74 0C0AA5F3 */ jal func_802A97CC_42823C +/* 197654 80268D74 0C0AA5F3 */ jal action_command_bomb_FreeHudElements /* 197658 80268D78 00000000 */ nop /* 19765C 80268D7C 0809A390 */ j .L80268E40 /* 197660 80268D80 3C05FFFF */ lui $a1, 0xffff @@ -84,12 +84,12 @@ glabel L80268D84_197664 /* 19766C 80268D8C 0809A390 */ j .L80268E40 /* 197670 80268D90 3C05FFFF */ lui $a1, 0xffff glabel L80268D94_197674 -/* 197674 80268D94 0C0AA604 */ jal func_802A9810_429280 +/* 197674 80268D94 0C0AA604 */ jal action_command_air_lift_FreeHudElements /* 197678 80268D98 00000000 */ nop /* 19767C 80268D9C 0809A390 */ j .L80268E40 /* 197680 80268DA0 3C05FFFF */ lui $a1, 0xffff glabel L80268DA4_197684 -/* 197684 80268DA4 0C0AA64B */ jal func_802A992C_429C4C +/* 197684 80268DA4 0C0AA64B */ jal action_command_air_raid_FreeHudElements /* 197688 80268DA8 00000000 */ nop /* 19768C 80268DAC 0809A390 */ j .L80268E40 /* 197690 80268DB0 3C05FFFF */ lui $a1, 0xffff @@ -109,12 +109,12 @@ glabel L80268DD4_1976B4 /* 1976BC 80268DDC 0809A390 */ j .L80268E40 /* 1976C0 80268DE0 3C05FFFF */ lui $a1, 0xffff glabel L80268DE4_1976C4 -/* 1976C4 80268DE4 0C0AA664 */ jal func_802A9990_42ED30 +/* 1976C4 80268DE4 0C0AA664 */ jal action_command_smack_FreeHudElements /* 1976C8 80268DE8 00000000 */ nop /* 1976CC 80268DEC 0809A390 */ j .L80268E40 /* 1976D0 80268DF0 3C05FFFF */ lui $a1, 0xffff glabel L80268DF4_1976D4 -/* 1976D4 80268DF4 0C0AA607 */ jal func_802A981C_42F63C +/* 1976D4 80268DF4 0C0AA607 */ jal action_command_spiny_surge_FreeHudElements /* 1976D8 80268DF8 00000000 */ nop /* 1976DC 80268DFC 0809A390 */ j .L80268E40 /* 1976E0 80268E00 3C05FFFF */ lui $a1, 0xffff @@ -124,7 +124,7 @@ glabel L80268E04_1976E4 /* 1976EC 80268E0C 0809A390 */ j .L80268E40 /* 1976F0 80268E10 3C05FFFF */ lui $a1, 0xffff glabel L80268E14_1976F4 -/* 1976F4 80268E14 0C0AA637 */ jal func_802A98DC_4308FC +/* 1976F4 80268E14 0C0AA637 */ jal action_command_spook_FreeHudElements /* 1976F8 80268E18 00000000 */ nop /* 1976FC 80268E1C 0809A390 */ j .L80268E40 /* 197700 80268E20 3C05FFFF */ lui $a1, 0xffff diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/07/func_802A959C_4260EC.s b/ver/us/asm/nonmatchings/battle/action_cmd/07/func_802A959C_4260EC.s deleted file mode 100644 index 852086b962..0000000000 --- a/ver/us/asm/nonmatchings/battle/action_cmd/07/func_802A959C_4260EC.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A959C_4260EC -/* 4260EC 802A959C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 4260F0 802A95A0 AFB00010 */ sw $s0, 0x10($sp) -/* 4260F4 802A95A4 3C10802A */ lui $s0, %hi(D_8029FBE0) -/* 4260F8 802A95A8 2610FBE0 */ addiu $s0, $s0, %lo(D_8029FBE0) -/* 4260FC 802A95AC AFBF0014 */ sw $ra, 0x14($sp) -/* 426100 802A95B0 0C05123D */ jal free_hud_element -/* 426104 802A95B4 8E040004 */ lw $a0, 4($s0) -/* 426108 802A95B8 0C05123D */ jal free_hud_element -/* 42610C 802A95BC 8E040008 */ lw $a0, 8($s0) -/* 426110 802A95C0 0C05123D */ jal free_hud_element -/* 426114 802A95C4 8E04000C */ lw $a0, 0xc($s0) -/* 426118 802A95C8 8FBF0014 */ lw $ra, 0x14($sp) -/* 42611C 802A95CC 8FB00010 */ lw $s0, 0x10($sp) -/* 426120 802A95D0 03E00008 */ jr $ra -/* 426124 802A95D4 27BD0018 */ addiu $sp, $sp, 0x18 -/* 426128 802A95D8 00000000 */ nop -/* 42612C 802A95DC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/0A/func_802A963C_4279EC.s b/ver/us/asm/nonmatchings/battle/action_cmd/0A/func_802A963C_4279EC.s deleted file mode 100644 index 43aa0d7e32..0000000000 --- a/ver/us/asm/nonmatchings/battle/action_cmd/0A/func_802A963C_4279EC.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A963C_4279EC -/* 4279EC 802A963C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 4279F0 802A9640 AFB00010 */ sw $s0, 0x10($sp) -/* 4279F4 802A9644 3C10802A */ lui $s0, %hi(D_8029FBE0) -/* 4279F8 802A9648 2610FBE0 */ addiu $s0, $s0, %lo(D_8029FBE0) -/* 4279FC 802A964C AFBF0014 */ sw $ra, 0x14($sp) -/* 427A00 802A9650 0C05123D */ jal free_hud_element -/* 427A04 802A9654 8E040004 */ lw $a0, 4($s0) -/* 427A08 802A9658 0C05123D */ jal free_hud_element -/* 427A0C 802A965C 8E040008 */ lw $a0, 8($s0) -/* 427A10 802A9660 0C05123D */ jal free_hud_element -/* 427A14 802A9664 8E04000C */ lw $a0, 0xc($s0) -/* 427A18 802A9668 8FBF0014 */ lw $ra, 0x14($sp) -/* 427A1C 802A966C 8FB00010 */ lw $s0, 0x10($sp) -/* 427A20 802A9670 03E00008 */ jr $ra -/* 427A24 802A9674 27BD0018 */ addiu $sp, $sp, 0x18 -/* 427A28 802A9678 00000000 */ nop -/* 427A2C 802A967C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/air_lift/func_802A9810_429280.s b/ver/us/asm/nonmatchings/battle/action_cmd/air_lift/func_802A9810_429280.s deleted file mode 100644 index bea511a253..0000000000 --- a/ver/us/asm/nonmatchings/battle/action_cmd/air_lift/func_802A9810_429280.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A9810_429280 -/* 429280 802A9810 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 429284 802A9814 AFB00010 */ sw $s0, 0x10($sp) -/* 429288 802A9818 3C10802A */ lui $s0, %hi(D_8029FBE0) -/* 42928C 802A981C 2610FBE0 */ addiu $s0, $s0, %lo(D_8029FBE0) -/* 429290 802A9820 AFBF0014 */ sw $ra, 0x14($sp) -/* 429294 802A9824 0C05123D */ jal free_hud_element -/* 429298 802A9828 8E040004 */ lw $a0, 4($s0) -/* 42929C 802A982C 0C05123D */ jal free_hud_element -/* 4292A0 802A9830 8E040008 */ lw $a0, 8($s0) -/* 4292A4 802A9834 0C05123D */ jal free_hud_element -/* 4292A8 802A9838 8E04000C */ lw $a0, 0xc($s0) -/* 4292AC 802A983C 8FBF0014 */ lw $ra, 0x14($sp) -/* 4292B0 802A9840 8FB00010 */ lw $s0, 0x10($sp) -/* 4292B4 802A9844 03E00008 */ jr $ra -/* 4292B8 802A9848 27BD0018 */ addiu $sp, $sp, 0x18 -/* 4292BC 802A984C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/air_raid/func_802A992C_429C4C.s b/ver/us/asm/nonmatchings/battle/action_cmd/air_raid/func_802A992C_429C4C.s deleted file mode 100644 index e354a87733..0000000000 --- a/ver/us/asm/nonmatchings/battle/action_cmd/air_raid/func_802A992C_429C4C.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A992C_429C4C -/* 429C4C 802A992C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 429C50 802A9930 AFB00010 */ sw $s0, 0x10($sp) -/* 429C54 802A9934 3C10802A */ lui $s0, %hi(D_8029FBE0) -/* 429C58 802A9938 2610FBE0 */ addiu $s0, $s0, %lo(D_8029FBE0) -/* 429C5C 802A993C AFBF0014 */ sw $ra, 0x14($sp) -/* 429C60 802A9940 0C05123D */ jal free_hud_element -/* 429C64 802A9944 8E040004 */ lw $a0, 4($s0) -/* 429C68 802A9948 0C05123D */ jal free_hud_element -/* 429C6C 802A994C 8E040008 */ lw $a0, 8($s0) -/* 429C70 802A9950 0C05123D */ jal free_hud_element -/* 429C74 802A9954 8E04000C */ lw $a0, 0xc($s0) -/* 429C78 802A9958 8FBF0014 */ lw $ra, 0x14($sp) -/* 429C7C 802A995C 8FB00010 */ lw $s0, 0x10($sp) -/* 429C80 802A9960 03E00008 */ jr $ra -/* 429C84 802A9964 27BD0018 */ addiu $sp, $sp, 0x18 -/* 429C88 802A9968 00000000 */ nop -/* 429C8C 802A996C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/bomb/func_802A97CC_42823C.s b/ver/us/asm/nonmatchings/battle/action_cmd/bomb/func_802A97CC_42823C.s deleted file mode 100644 index 3a6b8869c6..0000000000 --- a/ver/us/asm/nonmatchings/battle/action_cmd/bomb/func_802A97CC_42823C.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A97CC_42823C -/* 42823C 802A97CC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 428240 802A97D0 AFB00010 */ sw $s0, 0x10($sp) -/* 428244 802A97D4 3C10802A */ lui $s0, %hi(D_8029FBE0) -/* 428248 802A97D8 2610FBE0 */ addiu $s0, $s0, %lo(D_8029FBE0) -/* 42824C 802A97DC AFBF0014 */ sw $ra, 0x14($sp) -/* 428250 802A97E0 0C05123D */ jal free_hud_element -/* 428254 802A97E4 8E040004 */ lw $a0, 4($s0) -/* 428258 802A97E8 0C05123D */ jal free_hud_element -/* 42825C 802A97EC 8E040008 */ lw $a0, 8($s0) -/* 428260 802A97F0 0C05123D */ jal free_hud_element -/* 428264 802A97F4 8E04000C */ lw $a0, 0xc($s0) -/* 428268 802A97F8 8FBF0014 */ lw $ra, 0x14($sp) -/* 42826C 802A97FC 8FB00010 */ lw $s0, 0x10($sp) -/* 428270 802A9800 03E00008 */ jr $ra -/* 428274 802A9804 27BD0018 */ addiu $sp, $sp, 0x18 -/* 428278 802A9808 00000000 */ nop -/* 42827C 802A980C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/dizzy_shell/func_802A97BC_42692C.s b/ver/us/asm/nonmatchings/battle/action_cmd/dizzy_shell/func_802A97BC_42692C.s deleted file mode 100644 index 198d0a7830..0000000000 --- a/ver/us/asm/nonmatchings/battle/action_cmd/dizzy_shell/func_802A97BC_42692C.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A97BC_42692C -/* 42692C 802A97BC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 426930 802A97C0 AFB00010 */ sw $s0, 0x10($sp) -/* 426934 802A97C4 3C10802A */ lui $s0, %hi(D_8029FBE0) -/* 426938 802A97C8 2610FBE0 */ addiu $s0, $s0, %lo(D_8029FBE0) -/* 42693C 802A97CC AFBF0014 */ sw $ra, 0x14($sp) -/* 426940 802A97D0 0C05123D */ jal free_hud_element -/* 426944 802A97D4 8E040004 */ lw $a0, 4($s0) -/* 426948 802A97D8 0C05123D */ jal free_hud_element -/* 42694C 802A97DC 8E040008 */ lw $a0, 8($s0) -/* 426950 802A97E0 0C05123D */ jal free_hud_element -/* 426954 802A97E4 8E04000C */ lw $a0, 0xc($s0) -/* 426958 802A97E8 8FBF0014 */ lw $ra, 0x14($sp) -/* 42695C 802A97EC 8FB00010 */ lw $s0, 0x10($sp) -/* 426960 802A97F0 03E00008 */ jr $ra -/* 426964 802A97F4 27BD0018 */ addiu $sp, $sp, 0x18 -/* 426968 802A97F8 00000000 */ nop -/* 42696C 802A97FC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/fire_shell/func_802A9914_4272E4.s b/ver/us/asm/nonmatchings/battle/action_cmd/fire_shell/func_802A9914_4272E4.s deleted file mode 100644 index 01822e2273..0000000000 --- a/ver/us/asm/nonmatchings/battle/action_cmd/fire_shell/func_802A9914_4272E4.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A9914_4272E4 -/* 4272E4 802A9914 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 4272E8 802A9918 AFB00010 */ sw $s0, 0x10($sp) -/* 4272EC 802A991C 3C10802A */ lui $s0, %hi(D_8029FBE0) -/* 4272F0 802A9920 2610FBE0 */ addiu $s0, $s0, %lo(D_8029FBE0) -/* 4272F4 802A9924 AFBF0014 */ sw $ra, 0x14($sp) -/* 4272F8 802A9928 0C05123D */ jal free_hud_element -/* 4272FC 802A992C 8E040004 */ lw $a0, 4($s0) -/* 427300 802A9930 0C05123D */ jal free_hud_element -/* 427304 802A9934 8E040008 */ lw $a0, 8($s0) -/* 427308 802A9938 0C05123D */ jal free_hud_element -/* 42730C 802A993C 8E04000C */ lw $a0, 0xc($s0) -/* 427310 802A9940 8FBF0014 */ lw $ra, 0x14($sp) -/* 427314 802A9944 8FB00010 */ lw $s0, 0x10($sp) -/* 427318 802A9948 03E00008 */ jr $ra -/* 42731C 802A994C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/smack/func_802A9990_42ED30.s b/ver/us/asm/nonmatchings/battle/action_cmd/smack/func_802A9990_42ED30.s deleted file mode 100644 index c593d4e361..0000000000 --- a/ver/us/asm/nonmatchings/battle/action_cmd/smack/func_802A9990_42ED30.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A9990_42ED30 -/* 42ED30 802A9990 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 42ED34 802A9994 AFB00010 */ sw $s0, 0x10($sp) -/* 42ED38 802A9998 3C10802A */ lui $s0, %hi(D_8029FBE0) -/* 42ED3C 802A999C 2610FBE0 */ addiu $s0, $s0, %lo(D_8029FBE0) -/* 42ED40 802A99A0 AFBF0014 */ sw $ra, 0x14($sp) -/* 42ED44 802A99A4 0C05123D */ jal free_hud_element -/* 42ED48 802A99A8 8E040004 */ lw $a0, 4($s0) -/* 42ED4C 802A99AC 0C05123D */ jal free_hud_element -/* 42ED50 802A99B0 8E040008 */ lw $a0, 8($s0) -/* 42ED54 802A99B4 0C05123D */ jal free_hud_element -/* 42ED58 802A99B8 8E04000C */ lw $a0, 0xc($s0) -/* 42ED5C 802A99BC 8FBF0014 */ lw $ra, 0x14($sp) -/* 42ED60 802A99C0 8FB00010 */ lw $s0, 0x10($sp) -/* 42ED64 802A99C4 03E00008 */ jr $ra -/* 42ED68 802A99C8 27BD0018 */ addiu $sp, $sp, 0x18 -/* 42ED6C 802A99CC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/spiny_surge/func_802A981C_42F63C.s b/ver/us/asm/nonmatchings/battle/action_cmd/spiny_surge/func_802A981C_42F63C.s deleted file mode 100644 index 1110a688da..0000000000 --- a/ver/us/asm/nonmatchings/battle/action_cmd/spiny_surge/func_802A981C_42F63C.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A981C_42F63C -/* 42F63C 802A981C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 42F640 802A9820 AFB00010 */ sw $s0, 0x10($sp) -/* 42F644 802A9824 3C10802A */ lui $s0, %hi(D_8029FBE0) -/* 42F648 802A9828 2610FBE0 */ addiu $s0, $s0, %lo(D_8029FBE0) -/* 42F64C 802A982C AFBF0014 */ sw $ra, 0x14($sp) -/* 42F650 802A9830 0C05123D */ jal free_hud_element -/* 42F654 802A9834 8E040004 */ lw $a0, 4($s0) -/* 42F658 802A9838 0C05123D */ jal free_hud_element -/* 42F65C 802A983C 8E040008 */ lw $a0, 8($s0) -/* 42F660 802A9840 0C05123D */ jal free_hud_element -/* 42F664 802A9844 8E04000C */ lw $a0, 0xc($s0) -/* 42F668 802A9848 8FBF0014 */ lw $ra, 0x14($sp) -/* 42F66C 802A984C 8FB00010 */ lw $s0, 0x10($sp) -/* 42F670 802A9850 03E00008 */ jr $ra -/* 42F674 802A9854 27BD0018 */ addiu $sp, $sp, 0x18 -/* 42F678 802A9858 00000000 */ nop -/* 42F67C 802A985C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/spook/func_802A98DC_4308FC.s b/ver/us/asm/nonmatchings/battle/action_cmd/spook/func_802A98DC_4308FC.s deleted file mode 100644 index 023466603e..0000000000 --- a/ver/us/asm/nonmatchings/battle/action_cmd/spook/func_802A98DC_4308FC.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A98DC_4308FC -/* 4308FC 802A98DC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 430900 802A98E0 AFB00010 */ sw $s0, 0x10($sp) -/* 430904 802A98E4 3C10802A */ lui $s0, %hi(D_8029FBE0) -/* 430908 802A98E8 2610FBE0 */ addiu $s0, $s0, %lo(D_8029FBE0) -/* 43090C 802A98EC AFBF0014 */ sw $ra, 0x14($sp) -/* 430910 802A98F0 0C05123D */ jal free_hud_element -/* 430914 802A98F4 8E040004 */ lw $a0, 4($s0) -/* 430918 802A98F8 0C05123D */ jal free_hud_element -/* 43091C 802A98FC 8E040008 */ lw $a0, 8($s0) -/* 430920 802A9900 0C05123D */ jal free_hud_element -/* 430924 802A9904 8E04000C */ lw $a0, 0xc($s0) -/* 430928 802A9908 8FBF0014 */ lw $ra, 0x14($sp) -/* 43092C 802A990C 8FB00010 */ lw $s0, 0x10($sp) -/* 430930 802A9910 03E00008 */ jr $ra -/* 430934 802A9914 27BD0018 */ addiu $sp, $sp, 0x18 -/* 430938 802A9918 00000000 */ nop -/* 43093C 802A991C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242070_C62D80.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242070_C62D80.s deleted file mode 100644 index 886037d91b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242070_C62D80.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242070_C62D80 -/* C62D80 80242070 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C62D84 80242074 AFB10014 */ sw $s1, 0x14($sp) -/* C62D88 80242078 0080882D */ daddu $s1, $a0, $zero -/* C62D8C 8024207C AFBF0018 */ sw $ra, 0x18($sp) -/* C62D90 80242080 AFB00010 */ sw $s0, 0x10($sp) -/* C62D94 80242084 8E300148 */ lw $s0, 0x148($s1) -/* C62D98 80242088 0C00EABB */ jal get_npc_unsafe -/* C62D9C 8024208C 86040008 */ lh $a0, 8($s0) -/* C62DA0 80242090 0040202D */ daddu $a0, $v0, $zero -/* C62DA4 80242094 9482008E */ lhu $v0, 0x8e($a0) -/* C62DA8 80242098 2442FFFF */ addiu $v0, $v0, -1 -/* C62DAC 8024209C A482008E */ sh $v0, 0x8e($a0) -/* C62DB0 802420A0 00021400 */ sll $v0, $v0, 0x10 -/* C62DB4 802420A4 8E030098 */ lw $v1, 0x98($s0) -/* C62DB8 802420A8 00021403 */ sra $v0, $v0, 0x10 -/* C62DBC 802420AC 0062182A */ slt $v1, $v1, $v0 -/* C62DC0 802420B0 14600005 */ bnez $v1, .L802420C8 -/* C62DC4 802420B4 3C03E0EF */ lui $v1, 0xe0ef -/* C62DC8 802420B8 8E020000 */ lw $v0, ($s0) -/* C62DCC 802420BC 3463FFFF */ ori $v1, $v1, 0xffff -/* C62DD0 802420C0 00431024 */ and $v0, $v0, $v1 -/* C62DD4 802420C4 AE020000 */ sw $v0, ($s0) -.L802420C8: -/* C62DD8 802420C8 8482008E */ lh $v0, 0x8e($a0) -/* C62DDC 802420CC 14400007 */ bnez $v0, .L802420EC -/* C62DE0 802420D0 00000000 */ nop -/* C62DE4 802420D4 8E0200CC */ lw $v0, 0xcc($s0) -/* C62DE8 802420D8 8C420028 */ lw $v0, 0x28($v0) -/* C62DEC 802420DC A480008E */ sh $zero, 0x8e($a0) -/* C62DF0 802420E0 AC820028 */ sw $v0, 0x28($a0) -/* C62DF4 802420E4 2402000C */ addiu $v0, $zero, 0xc -/* C62DF8 802420E8 AE220070 */ sw $v0, 0x70($s1) -.L802420EC: -/* C62DFC 802420EC 8FBF0018 */ lw $ra, 0x18($sp) -/* C62E00 802420F0 8FB10014 */ lw $s1, 0x14($sp) -/* C62E04 802420F4 8FB00010 */ lw $s0, 0x10($sp) -/* C62E08 802420F8 03E00008 */ jr $ra -/* C62E0C 802420FC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242200_C62F10.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242200_C62F10.s deleted file mode 100644 index 80bf8b84be..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242200_C62F10.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242200_C62F10 -/* C62F10 80242200 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C62F14 80242204 AFB10014 */ sw $s1, 0x14($sp) -/* C62F18 80242208 0080882D */ daddu $s1, $a0, $zero -/* C62F1C 8024220C AFBF0018 */ sw $ra, 0x18($sp) -/* C62F20 80242210 AFB00010 */ sw $s0, 0x10($sp) -/* C62F24 80242214 8E300148 */ lw $s0, 0x148($s1) -/* C62F28 80242218 0C00EABB */ jal get_npc_unsafe -/* C62F2C 8024221C 86040008 */ lh $a0, 8($s0) -/* C62F30 80242220 0040182D */ daddu $v1, $v0, $zero -/* C62F34 80242224 9462008E */ lhu $v0, 0x8e($v1) -/* C62F38 80242228 2442FFFF */ addiu $v0, $v0, -1 -/* C62F3C 8024222C A462008E */ sh $v0, 0x8e($v1) -/* C62F40 80242230 00021400 */ sll $v0, $v0, 0x10 -/* C62F44 80242234 14400005 */ bnez $v0, .L8024224C -/* C62F48 80242238 00000000 */ nop -/* C62F4C 8024223C 960200AA */ lhu $v0, 0xaa($s0) -/* C62F50 80242240 A462008E */ sh $v0, 0x8e($v1) -/* C62F54 80242244 2402000E */ addiu $v0, $zero, 0xe -/* C62F58 80242248 AE220070 */ sw $v0, 0x70($s1) -.L8024224C: -/* C62F5C 8024224C 8FBF0018 */ lw $ra, 0x18($sp) -/* C62F60 80242250 8FB10014 */ lw $s1, 0x14($sp) -/* C62F64 80242254 8FB00010 */ lw $s0, 0x10($sp) -/* C62F68 80242258 03E00008 */ jr $ra -/* C62F6C 8024225C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242260_C62F70.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242260_C62F70.s deleted file mode 100644 index c7c6a4d3e3..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242260_C62F70.s +++ /dev/null @@ -1,65 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242260_C62F70 -/* C62F70 80242260 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C62F74 80242264 AFB40040 */ sw $s4, 0x40($sp) -/* C62F78 80242268 0080A02D */ daddu $s4, $a0, $zero -/* C62F7C 8024226C AFBF0044 */ sw $ra, 0x44($sp) -/* C62F80 80242270 AFB3003C */ sw $s3, 0x3c($sp) -/* C62F84 80242274 AFB20038 */ sw $s2, 0x38($sp) -/* C62F88 80242278 AFB10034 */ sw $s1, 0x34($sp) -/* C62F8C 8024227C AFB00030 */ sw $s0, 0x30($sp) -/* C62F90 80242280 8E910148 */ lw $s1, 0x148($s4) -/* C62F94 80242284 00A0902D */ daddu $s2, $a1, $zero -/* C62F98 80242288 86240008 */ lh $a0, 8($s1) -/* C62F9C 8024228C 0C00EABB */ jal get_npc_unsafe -/* C62FA0 80242290 00C0982D */ daddu $s3, $a2, $zero -/* C62FA4 80242294 0040802D */ daddu $s0, $v0, $zero -/* C62FA8 80242298 9602008E */ lhu $v0, 0x8e($s0) -/* C62FAC 8024229C 2442FFFF */ addiu $v0, $v0, -1 -/* C62FB0 802422A0 A602008E */ sh $v0, 0x8e($s0) -/* C62FB4 802422A4 00021400 */ sll $v0, $v0, 0x10 -/* C62FB8 802422A8 14400020 */ bnez $v0, .L8024232C -/* C62FBC 802422AC 0260202D */ daddu $a0, $s3, $zero -/* C62FC0 802422B0 AFA00010 */ sw $zero, 0x10($sp) -/* C62FC4 802422B4 8E46000C */ lw $a2, 0xc($s2) -/* C62FC8 802422B8 8E470010 */ lw $a3, 0x10($s2) -/* C62FCC 802422BC 0C01242D */ jal func_800490B4 -/* C62FD0 802422C0 0220282D */ daddu $a1, $s1, $zero -/* C62FD4 802422C4 54400018 */ bnel $v0, $zero, .L80242328 -/* C62FD8 802422C8 A600008E */ sh $zero, 0x8e($s0) -/* C62FDC 802422CC 24040002 */ addiu $a0, $zero, 2 -/* C62FE0 802422D0 0200282D */ daddu $a1, $s0, $zero -/* C62FE4 802422D4 0000302D */ daddu $a2, $zero, $zero -/* C62FE8 802422D8 860300A8 */ lh $v1, 0xa8($s0) -/* C62FEC 802422DC 3C013F80 */ lui $at, 0x3f80 -/* C62FF0 802422E0 44810000 */ mtc1 $at, $f0 -/* C62FF4 802422E4 3C014000 */ lui $at, 0x4000 -/* C62FF8 802422E8 44811000 */ mtc1 $at, $f2 -/* C62FFC 802422EC 3C01C1A0 */ lui $at, 0xc1a0 -/* C63000 802422F0 44812000 */ mtc1 $at, $f4 -/* C63004 802422F4 2402000F */ addiu $v0, $zero, 0xf -/* C63008 802422F8 AFA2001C */ sw $v0, 0x1c($sp) -/* C6300C 802422FC 44833000 */ mtc1 $v1, $f6 -/* C63010 80242300 00000000 */ nop -/* C63014 80242304 468031A0 */ cvt.s.w $f6, $f6 -/* C63018 80242308 44073000 */ mfc1 $a3, $f6 -/* C6301C 8024230C 27A20028 */ addiu $v0, $sp, 0x28 -/* C63020 80242310 AFA20020 */ sw $v0, 0x20($sp) -/* C63024 80242314 E7A00010 */ swc1 $f0, 0x10($sp) -/* C63028 80242318 E7A20014 */ swc1 $f2, 0x14($sp) -/* C6302C 8024231C 0C01BFA4 */ jal fx_emote -/* C63030 80242320 E7A40018 */ swc1 $f4, 0x18($sp) -/* C63034 80242324 A600008E */ sh $zero, 0x8e($s0) -.L80242328: -/* C63038 80242328 AE800070 */ sw $zero, 0x70($s4) -.L8024232C: -/* C6303C 8024232C 8FBF0044 */ lw $ra, 0x44($sp) -/* C63040 80242330 8FB40040 */ lw $s4, 0x40($sp) -/* C63044 80242334 8FB3003C */ lw $s3, 0x3c($sp) -/* C63048 80242338 8FB20038 */ lw $s2, 0x38($sp) -/* C6304C 8024233C 8FB10034 */ lw $s1, 0x34($sp) -/* C63050 80242340 8FB00030 */ lw $s0, 0x30($sp) -/* C63054 80242344 03E00008 */ jr $ra -/* C63058 80242348 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_8024234C_C6305C.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_8024234C_C6305C.s index 5292c58738..89ae0dffd9 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_8024234C_C6305C.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_8024234C_C6305C.s @@ -118,7 +118,7 @@ glabel func_8024234C_C6305C .L802424F4: /* C63204 802424F4 0240202D */ daddu $a0, $s2, $zero /* C63208 802424F8 0260282D */ daddu $a1, $s3, $zero -/* C6320C 802424FC 0C09081C */ jal func_80242070_C62D80 +/* C6320C 802424FC 0C09081C */ jal kzn_03_UnkNpcDurationFlagFunc3 /* C63210 80242500 0280302D */ daddu $a2, $s4, $zero /* C63214 80242504 8E430070 */ lw $v1, 0x70($s2) /* C63218 80242508 2402000C */ addiu $v0, $zero, 0xc @@ -136,7 +136,7 @@ glabel func_8024234C_C6305C .L80242534: /* C63244 80242534 0240202D */ daddu $a0, $s2, $zero /* C63248 80242538 0260282D */ daddu $a1, $s3, $zero -/* C6324C 8024253C 0C090880 */ jal func_80242200_C62F10 +/* C6324C 8024253C 0C090880 */ jal kzn_03_UnkNpcDurationFlagFunc2 /* C63250 80242540 0280302D */ daddu $a2, $s4, $zero /* C63254 80242544 8E430070 */ lw $v1, 0x70($s2) /* C63258 80242548 2402000E */ addiu $v0, $zero, 0xe @@ -145,7 +145,7 @@ glabel func_8024234C_C6305C /* C63264 80242554 0240202D */ daddu $a0, $s2, $zero .L80242558: /* C63268 80242558 0260282D */ daddu $a1, $s3, $zero -/* C6326C 8024255C 0C090898 */ jal func_80242260_C62F70 +/* C6326C 8024255C 0C090898 */ jal kzn_03_UnkNpcAIFunc30 /* C63270 80242560 0280302D */ daddu $a2, $s4, $zero /* C63274 80242564 0809095D */ j .L80242574 /* C63278 80242568 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802439B4_C74E34.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802439B4_C74E34.s deleted file mode 100644 index 2b543aab69..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802439B4_C74E34.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802439B4_C74E34 -/* C74E34 802439B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C74E38 802439B8 AFB10014 */ sw $s1, 0x14($sp) -/* C74E3C 802439BC 0080882D */ daddu $s1, $a0, $zero -/* C74E40 802439C0 AFBF0018 */ sw $ra, 0x18($sp) -/* C74E44 802439C4 AFB00010 */ sw $s0, 0x10($sp) -/* C74E48 802439C8 8E300148 */ lw $s0, 0x148($s1) -/* C74E4C 802439CC 0C00EABB */ jal get_npc_unsafe -/* C74E50 802439D0 86040008 */ lh $a0, 8($s0) -/* C74E54 802439D4 0040202D */ daddu $a0, $v0, $zero -/* C74E58 802439D8 9482008E */ lhu $v0, 0x8e($a0) -/* C74E5C 802439DC 2442FFFF */ addiu $v0, $v0, -1 -/* C74E60 802439E0 A482008E */ sh $v0, 0x8e($a0) -/* C74E64 802439E4 00021400 */ sll $v0, $v0, 0x10 -/* C74E68 802439E8 8E030098 */ lw $v1, 0x98($s0) -/* C74E6C 802439EC 00021403 */ sra $v0, $v0, 0x10 -/* C74E70 802439F0 0062182A */ slt $v1, $v1, $v0 -/* C74E74 802439F4 14600005 */ bnez $v1, .L80243A0C -/* C74E78 802439F8 3C03E0EF */ lui $v1, 0xe0ef -/* C74E7C 802439FC 8E020000 */ lw $v0, ($s0) -/* C74E80 80243A00 3463FFFF */ ori $v1, $v1, 0xffff -/* C74E84 80243A04 00431024 */ and $v0, $v0, $v1 -/* C74E88 80243A08 AE020000 */ sw $v0, ($s0) -.L80243A0C: -/* C74E8C 80243A0C 8482008E */ lh $v0, 0x8e($a0) -/* C74E90 80243A10 14400007 */ bnez $v0, .L80243A30 -/* C74E94 80243A14 00000000 */ nop -/* C74E98 80243A18 8E0200CC */ lw $v0, 0xcc($s0) -/* C74E9C 80243A1C 8C420028 */ lw $v0, 0x28($v0) -/* C74EA0 80243A20 A480008E */ sh $zero, 0x8e($a0) -/* C74EA4 80243A24 AC820028 */ sw $v0, 0x28($a0) -/* C74EA8 80243A28 2402000C */ addiu $v0, $zero, 0xc -/* C74EAC 80243A2C AE220070 */ sw $v0, 0x70($s1) -.L80243A30: -/* C74EB0 80243A30 8FBF0018 */ lw $ra, 0x18($sp) -/* C74EB4 80243A34 8FB10014 */ lw $s1, 0x14($sp) -/* C74EB8 80243A38 8FB00010 */ lw $s0, 0x10($sp) -/* C74EBC 80243A3C 03E00008 */ jr $ra -/* C74EC0 80243A40 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243B44_C74FC4.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243B44_C74FC4.s deleted file mode 100644 index 4d90ae7363..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243B44_C74FC4.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243B44_C74FC4 -/* C74FC4 80243B44 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C74FC8 80243B48 AFB10014 */ sw $s1, 0x14($sp) -/* C74FCC 80243B4C 0080882D */ daddu $s1, $a0, $zero -/* C74FD0 80243B50 AFBF0018 */ sw $ra, 0x18($sp) -/* C74FD4 80243B54 AFB00010 */ sw $s0, 0x10($sp) -/* C74FD8 80243B58 8E300148 */ lw $s0, 0x148($s1) -/* C74FDC 80243B5C 0C00EABB */ jal get_npc_unsafe -/* C74FE0 80243B60 86040008 */ lh $a0, 8($s0) -/* C74FE4 80243B64 0040182D */ daddu $v1, $v0, $zero -/* C74FE8 80243B68 9462008E */ lhu $v0, 0x8e($v1) -/* C74FEC 80243B6C 2442FFFF */ addiu $v0, $v0, -1 -/* C74FF0 80243B70 A462008E */ sh $v0, 0x8e($v1) -/* C74FF4 80243B74 00021400 */ sll $v0, $v0, 0x10 -/* C74FF8 80243B78 14400005 */ bnez $v0, .L80243B90 -/* C74FFC 80243B7C 00000000 */ nop -/* C75000 80243B80 960200AA */ lhu $v0, 0xaa($s0) -/* C75004 80243B84 A462008E */ sh $v0, 0x8e($v1) -/* C75008 80243B88 2402000E */ addiu $v0, $zero, 0xe -/* C7500C 80243B8C AE220070 */ sw $v0, 0x70($s1) -.L80243B90: -/* C75010 80243B90 8FBF0018 */ lw $ra, 0x18($sp) -/* C75014 80243B94 8FB10014 */ lw $s1, 0x14($sp) -/* C75018 80243B98 8FB00010 */ lw $s0, 0x10($sp) -/* C7501C 80243B9C 03E00008 */ jr $ra -/* C75020 80243BA0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243BA4_C75024.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243BA4_C75024.s deleted file mode 100644 index 71935e89b4..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243BA4_C75024.s +++ /dev/null @@ -1,65 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243BA4_C75024 -/* C75024 80243BA4 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C75028 80243BA8 AFB40040 */ sw $s4, 0x40($sp) -/* C7502C 80243BAC 0080A02D */ daddu $s4, $a0, $zero -/* C75030 80243BB0 AFBF0044 */ sw $ra, 0x44($sp) -/* C75034 80243BB4 AFB3003C */ sw $s3, 0x3c($sp) -/* C75038 80243BB8 AFB20038 */ sw $s2, 0x38($sp) -/* C7503C 80243BBC AFB10034 */ sw $s1, 0x34($sp) -/* C75040 80243BC0 AFB00030 */ sw $s0, 0x30($sp) -/* C75044 80243BC4 8E910148 */ lw $s1, 0x148($s4) -/* C75048 80243BC8 00A0902D */ daddu $s2, $a1, $zero -/* C7504C 80243BCC 86240008 */ lh $a0, 8($s1) -/* C75050 80243BD0 0C00EABB */ jal get_npc_unsafe -/* C75054 80243BD4 00C0982D */ daddu $s3, $a2, $zero -/* C75058 80243BD8 0040802D */ daddu $s0, $v0, $zero -/* C7505C 80243BDC 9602008E */ lhu $v0, 0x8e($s0) -/* C75060 80243BE0 2442FFFF */ addiu $v0, $v0, -1 -/* C75064 80243BE4 A602008E */ sh $v0, 0x8e($s0) -/* C75068 80243BE8 00021400 */ sll $v0, $v0, 0x10 -/* C7506C 80243BEC 14400020 */ bnez $v0, .L80243C70 -/* C75070 80243BF0 0260202D */ daddu $a0, $s3, $zero -/* C75074 80243BF4 AFA00010 */ sw $zero, 0x10($sp) -/* C75078 80243BF8 8E46000C */ lw $a2, 0xc($s2) -/* C7507C 80243BFC 8E470010 */ lw $a3, 0x10($s2) -/* C75080 80243C00 0C01242D */ jal func_800490B4 -/* C75084 80243C04 0220282D */ daddu $a1, $s1, $zero -/* C75088 80243C08 54400018 */ bnel $v0, $zero, .L80243C6C -/* C7508C 80243C0C A600008E */ sh $zero, 0x8e($s0) -/* C75090 80243C10 24040002 */ addiu $a0, $zero, 2 -/* C75094 80243C14 0200282D */ daddu $a1, $s0, $zero -/* C75098 80243C18 0000302D */ daddu $a2, $zero, $zero -/* C7509C 80243C1C 860300A8 */ lh $v1, 0xa8($s0) -/* C750A0 80243C20 3C013F80 */ lui $at, 0x3f80 -/* C750A4 80243C24 44810000 */ mtc1 $at, $f0 -/* C750A8 80243C28 3C014000 */ lui $at, 0x4000 -/* C750AC 80243C2C 44811000 */ mtc1 $at, $f2 -/* C750B0 80243C30 3C01C1A0 */ lui $at, 0xc1a0 -/* C750B4 80243C34 44812000 */ mtc1 $at, $f4 -/* C750B8 80243C38 2402000F */ addiu $v0, $zero, 0xf -/* C750BC 80243C3C AFA2001C */ sw $v0, 0x1c($sp) -/* C750C0 80243C40 44833000 */ mtc1 $v1, $f6 -/* C750C4 80243C44 00000000 */ nop -/* C750C8 80243C48 468031A0 */ cvt.s.w $f6, $f6 -/* C750CC 80243C4C 44073000 */ mfc1 $a3, $f6 -/* C750D0 80243C50 27A20028 */ addiu $v0, $sp, 0x28 -/* C750D4 80243C54 AFA20020 */ sw $v0, 0x20($sp) -/* C750D8 80243C58 E7A00010 */ swc1 $f0, 0x10($sp) -/* C750DC 80243C5C E7A20014 */ swc1 $f2, 0x14($sp) -/* C750E0 80243C60 0C01BFA4 */ jal fx_emote -/* C750E4 80243C64 E7A40018 */ swc1 $f4, 0x18($sp) -/* C750E8 80243C68 A600008E */ sh $zero, 0x8e($s0) -.L80243C6C: -/* C750EC 80243C6C AE800070 */ sw $zero, 0x70($s4) -.L80243C70: -/* C750F0 80243C70 8FBF0044 */ lw $ra, 0x44($sp) -/* C750F4 80243C74 8FB40040 */ lw $s4, 0x40($sp) -/* C750F8 80243C78 8FB3003C */ lw $s3, 0x3c($sp) -/* C750FC 80243C7C 8FB20038 */ lw $s2, 0x38($sp) -/* C75100 80243C80 8FB10034 */ lw $s1, 0x34($sp) -/* C75104 80243C84 8FB00030 */ lw $s0, 0x30($sp) -/* C75108 80243C88 03E00008 */ jr $ra -/* C7510C 80243C8C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243C90_C75110.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243C90_C75110.s index fdd7573e07..ef683007ff 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243C90_C75110.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243C90_C75110.s @@ -118,7 +118,7 @@ glabel func_80243C90_C75110 .L80243E38: /* C752B8 80243E38 0240202D */ daddu $a0, $s2, $zero /* C752BC 80243E3C 0260282D */ daddu $a1, $s3, $zero -/* C752C0 80243E40 0C090E6D */ jal func_802439B4_C74E34 +/* C752C0 80243E40 0C090E6D */ jal kzn_08_UnkNpcDurationFlagFunc3 /* C752C4 80243E44 0280302D */ daddu $a2, $s4, $zero /* C752C8 80243E48 8E430070 */ lw $v1, 0x70($s2) /* C752CC 80243E4C 2402000C */ addiu $v0, $zero, 0xc @@ -136,7 +136,7 @@ glabel func_80243C90_C75110 .L80243E78: /* C752F8 80243E78 0240202D */ daddu $a0, $s2, $zero /* C752FC 80243E7C 0260282D */ daddu $a1, $s3, $zero -/* C75300 80243E80 0C090ED1 */ jal func_80243B44_C74FC4 +/* C75300 80243E80 0C090ED1 */ jal kzn_08_UnkNpcDurationFlagFunc2 /* C75304 80243E84 0280302D */ daddu $a2, $s4, $zero /* C75308 80243E88 8E430070 */ lw $v1, 0x70($s2) /* C7530C 80243E8C 2402000E */ addiu $v0, $zero, 0xe @@ -145,7 +145,7 @@ glabel func_80243C90_C75110 /* C75318 80243E98 0240202D */ daddu $a0, $s2, $zero .L80243E9C: /* C7531C 80243E9C 0260282D */ daddu $a1, $s3, $zero -/* C75320 80243EA0 0C090EE9 */ jal func_80243BA4_C75024 +/* C75320 80243EA0 0C090EE9 */ jal kzn_08_UnkNpcAIFunc30 /* C75324 80243EA4 0280302D */ daddu $a2, $s4, $zero /* C75328 80243EA8 08090FAE */ j .L80243EB8 /* C7532C 80243EAC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242498_C79178.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242498_C79178.s deleted file mode 100644 index 8b58e30e83..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242498_C79178.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242498_C79178 -/* C79178 80242498 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C7917C 8024249C AFB10014 */ sw $s1, 0x14($sp) -/* C79180 802424A0 0080882D */ daddu $s1, $a0, $zero -/* C79184 802424A4 AFBF0018 */ sw $ra, 0x18($sp) -/* C79188 802424A8 AFB00010 */ sw $s0, 0x10($sp) -/* C7918C 802424AC 8E300148 */ lw $s0, 0x148($s1) -/* C79190 802424B0 0C00EABB */ jal get_npc_unsafe -/* C79194 802424B4 86040008 */ lh $a0, 8($s0) -/* C79198 802424B8 0040202D */ daddu $a0, $v0, $zero -/* C7919C 802424BC 9482008E */ lhu $v0, 0x8e($a0) -/* C791A0 802424C0 2442FFFF */ addiu $v0, $v0, -1 -/* C791A4 802424C4 A482008E */ sh $v0, 0x8e($a0) -/* C791A8 802424C8 00021400 */ sll $v0, $v0, 0x10 -/* C791AC 802424CC 8E030098 */ lw $v1, 0x98($s0) -/* C791B0 802424D0 00021403 */ sra $v0, $v0, 0x10 -/* C791B4 802424D4 0062182A */ slt $v1, $v1, $v0 -/* C791B8 802424D8 14600005 */ bnez $v1, .L802424F0 -/* C791BC 802424DC 3C03E0EF */ lui $v1, 0xe0ef -/* C791C0 802424E0 8E020000 */ lw $v0, ($s0) -/* C791C4 802424E4 3463FFFF */ ori $v1, $v1, 0xffff -/* C791C8 802424E8 00431024 */ and $v0, $v0, $v1 -/* C791CC 802424EC AE020000 */ sw $v0, ($s0) -.L802424F0: -/* C791D0 802424F0 8482008E */ lh $v0, 0x8e($a0) -/* C791D4 802424F4 14400007 */ bnez $v0, .L80242514 -/* C791D8 802424F8 00000000 */ nop -/* C791DC 802424FC 8E0200CC */ lw $v0, 0xcc($s0) -/* C791E0 80242500 8C420028 */ lw $v0, 0x28($v0) -/* C791E4 80242504 A480008E */ sh $zero, 0x8e($a0) -/* C791E8 80242508 AC820028 */ sw $v0, 0x28($a0) -/* C791EC 8024250C 2402000C */ addiu $v0, $zero, 0xc -/* C791F0 80242510 AE220070 */ sw $v0, 0x70($s1) -.L80242514: -/* C791F4 80242514 8FBF0018 */ lw $ra, 0x18($sp) -/* C791F8 80242518 8FB10014 */ lw $s1, 0x14($sp) -/* C791FC 8024251C 8FB00010 */ lw $s0, 0x10($sp) -/* C79200 80242520 03E00008 */ jr $ra -/* C79204 80242524 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242628_C79308.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242628_C79308.s deleted file mode 100644 index 9e8ae74dd5..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242628_C79308.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242628_C79308 -/* C79308 80242628 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C7930C 8024262C AFB10014 */ sw $s1, 0x14($sp) -/* C79310 80242630 0080882D */ daddu $s1, $a0, $zero -/* C79314 80242634 AFBF0018 */ sw $ra, 0x18($sp) -/* C79318 80242638 AFB00010 */ sw $s0, 0x10($sp) -/* C7931C 8024263C 8E300148 */ lw $s0, 0x148($s1) -/* C79320 80242640 0C00EABB */ jal get_npc_unsafe -/* C79324 80242644 86040008 */ lh $a0, 8($s0) -/* C79328 80242648 0040182D */ daddu $v1, $v0, $zero -/* C7932C 8024264C 9462008E */ lhu $v0, 0x8e($v1) -/* C79330 80242650 2442FFFF */ addiu $v0, $v0, -1 -/* C79334 80242654 A462008E */ sh $v0, 0x8e($v1) -/* C79338 80242658 00021400 */ sll $v0, $v0, 0x10 -/* C7933C 8024265C 14400005 */ bnez $v0, .L80242674 -/* C79340 80242660 00000000 */ nop -/* C79344 80242664 960200AA */ lhu $v0, 0xaa($s0) -/* C79348 80242668 A462008E */ sh $v0, 0x8e($v1) -/* C7934C 8024266C 2402000E */ addiu $v0, $zero, 0xe -/* C79350 80242670 AE220070 */ sw $v0, 0x70($s1) -.L80242674: -/* C79354 80242674 8FBF0018 */ lw $ra, 0x18($sp) -/* C79358 80242678 8FB10014 */ lw $s1, 0x14($sp) -/* C7935C 8024267C 8FB00010 */ lw $s0, 0x10($sp) -/* C79360 80242680 03E00008 */ jr $ra -/* C79364 80242684 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242688_C79368.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242688_C79368.s deleted file mode 100644 index 96c2553c08..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242688_C79368.s +++ /dev/null @@ -1,65 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242688_C79368 -/* C79368 80242688 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C7936C 8024268C AFB40040 */ sw $s4, 0x40($sp) -/* C79370 80242690 0080A02D */ daddu $s4, $a0, $zero -/* C79374 80242694 AFBF0044 */ sw $ra, 0x44($sp) -/* C79378 80242698 AFB3003C */ sw $s3, 0x3c($sp) -/* C7937C 8024269C AFB20038 */ sw $s2, 0x38($sp) -/* C79380 802426A0 AFB10034 */ sw $s1, 0x34($sp) -/* C79384 802426A4 AFB00030 */ sw $s0, 0x30($sp) -/* C79388 802426A8 8E910148 */ lw $s1, 0x148($s4) -/* C7938C 802426AC 00A0902D */ daddu $s2, $a1, $zero -/* C79390 802426B0 86240008 */ lh $a0, 8($s1) -/* C79394 802426B4 0C00EABB */ jal get_npc_unsafe -/* C79398 802426B8 00C0982D */ daddu $s3, $a2, $zero -/* C7939C 802426BC 0040802D */ daddu $s0, $v0, $zero -/* C793A0 802426C0 9602008E */ lhu $v0, 0x8e($s0) -/* C793A4 802426C4 2442FFFF */ addiu $v0, $v0, -1 -/* C793A8 802426C8 A602008E */ sh $v0, 0x8e($s0) -/* C793AC 802426CC 00021400 */ sll $v0, $v0, 0x10 -/* C793B0 802426D0 14400020 */ bnez $v0, .L80242754 -/* C793B4 802426D4 0260202D */ daddu $a0, $s3, $zero -/* C793B8 802426D8 AFA00010 */ sw $zero, 0x10($sp) -/* C793BC 802426DC 8E46000C */ lw $a2, 0xc($s2) -/* C793C0 802426E0 8E470010 */ lw $a3, 0x10($s2) -/* C793C4 802426E4 0C01242D */ jal func_800490B4 -/* C793C8 802426E8 0220282D */ daddu $a1, $s1, $zero -/* C793CC 802426EC 54400018 */ bnel $v0, $zero, .L80242750 -/* C793D0 802426F0 A600008E */ sh $zero, 0x8e($s0) -/* C793D4 802426F4 24040002 */ addiu $a0, $zero, 2 -/* C793D8 802426F8 0200282D */ daddu $a1, $s0, $zero -/* C793DC 802426FC 0000302D */ daddu $a2, $zero, $zero -/* C793E0 80242700 860300A8 */ lh $v1, 0xa8($s0) -/* C793E4 80242704 3C013F80 */ lui $at, 0x3f80 -/* C793E8 80242708 44810000 */ mtc1 $at, $f0 -/* C793EC 8024270C 3C014000 */ lui $at, 0x4000 -/* C793F0 80242710 44811000 */ mtc1 $at, $f2 -/* C793F4 80242714 3C01C1A0 */ lui $at, 0xc1a0 -/* C793F8 80242718 44812000 */ mtc1 $at, $f4 -/* C793FC 8024271C 2402000F */ addiu $v0, $zero, 0xf -/* C79400 80242720 AFA2001C */ sw $v0, 0x1c($sp) -/* C79404 80242724 44833000 */ mtc1 $v1, $f6 -/* C79408 80242728 00000000 */ nop -/* C7940C 8024272C 468031A0 */ cvt.s.w $f6, $f6 -/* C79410 80242730 44073000 */ mfc1 $a3, $f6 -/* C79414 80242734 27A20028 */ addiu $v0, $sp, 0x28 -/* C79418 80242738 AFA20020 */ sw $v0, 0x20($sp) -/* C7941C 8024273C E7A00010 */ swc1 $f0, 0x10($sp) -/* C79420 80242740 E7A20014 */ swc1 $f2, 0x14($sp) -/* C79424 80242744 0C01BFA4 */ jal fx_emote -/* C79428 80242748 E7A40018 */ swc1 $f4, 0x18($sp) -/* C7942C 8024274C A600008E */ sh $zero, 0x8e($s0) -.L80242750: -/* C79430 80242750 AE800070 */ sw $zero, 0x70($s4) -.L80242754: -/* C79434 80242754 8FBF0044 */ lw $ra, 0x44($sp) -/* C79438 80242758 8FB40040 */ lw $s4, 0x40($sp) -/* C7943C 8024275C 8FB3003C */ lw $s3, 0x3c($sp) -/* C79440 80242760 8FB20038 */ lw $s2, 0x38($sp) -/* C79444 80242764 8FB10034 */ lw $s1, 0x34($sp) -/* C79448 80242768 8FB00030 */ lw $s0, 0x30($sp) -/* C7944C 8024276C 03E00008 */ jr $ra -/* C79450 80242770 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242774_C79454.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242774_C79454.s index 825f1d166b..891d35f027 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242774_C79454.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242774_C79454.s @@ -118,7 +118,7 @@ glabel func_80242774_C79454 .L8024291C: /* C795FC 8024291C 0240202D */ daddu $a0, $s2, $zero /* C79600 80242920 0260282D */ daddu $a1, $s3, $zero -/* C79604 80242924 0C090926 */ jal func_80242498_C79178 +/* C79604 80242924 0C090926 */ jal kzn_09_UnkNpcDurationFlagFunc3 /* C79608 80242928 0280302D */ daddu $a2, $s4, $zero /* C7960C 8024292C 8E430070 */ lw $v1, 0x70($s2) /* C79610 80242930 2402000C */ addiu $v0, $zero, 0xc @@ -136,7 +136,7 @@ glabel func_80242774_C79454 .L8024295C: /* C7963C 8024295C 0240202D */ daddu $a0, $s2, $zero /* C79640 80242960 0260282D */ daddu $a1, $s3, $zero -/* C79644 80242964 0C09098A */ jal func_80242628_C79308 +/* C79644 80242964 0C09098A */ jal kzn_09_UnkNpcDurationFlagFunc2 /* C79648 80242968 0280302D */ daddu $a2, $s4, $zero /* C7964C 8024296C 8E430070 */ lw $v1, 0x70($s2) /* C79650 80242970 2402000E */ addiu $v0, $zero, 0xe @@ -145,7 +145,7 @@ glabel func_80242774_C79454 /* C7965C 8024297C 0240202D */ daddu $a0, $s2, $zero .L80242980: /* C79660 80242980 0260282D */ daddu $a1, $s3, $zero -/* C79664 80242984 0C0909A2 */ jal func_80242688_C79368 +/* C79664 80242984 0C0909A2 */ jal kzn_09_UnkNpcAIFunc30 /* C79668 80242988 0280302D */ daddu $a2, $s4, $zero /* C7966C 8024298C 08090A67 */ j .L8024299C /* C79670 80242990 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241788_C87238.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241788_C87238.s deleted file mode 100644 index d61a67522e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241788_C87238.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241788_C87238 -/* C87238 80241788 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C8723C 8024178C AFB10014 */ sw $s1, 0x14($sp) -/* C87240 80241790 0080882D */ daddu $s1, $a0, $zero -/* C87244 80241794 AFBF0018 */ sw $ra, 0x18($sp) -/* C87248 80241798 AFB00010 */ sw $s0, 0x10($sp) -/* C8724C 8024179C 8E300148 */ lw $s0, 0x148($s1) -/* C87250 802417A0 0C00EABB */ jal get_npc_unsafe -/* C87254 802417A4 86040008 */ lh $a0, 8($s0) -/* C87258 802417A8 0040202D */ daddu $a0, $v0, $zero -/* C8725C 802417AC 9482008E */ lhu $v0, 0x8e($a0) -/* C87260 802417B0 2442FFFF */ addiu $v0, $v0, -1 -/* C87264 802417B4 A482008E */ sh $v0, 0x8e($a0) -/* C87268 802417B8 00021400 */ sll $v0, $v0, 0x10 -/* C8726C 802417BC 8E030098 */ lw $v1, 0x98($s0) -/* C87270 802417C0 00021403 */ sra $v0, $v0, 0x10 -/* C87274 802417C4 0062182A */ slt $v1, $v1, $v0 -/* C87278 802417C8 14600005 */ bnez $v1, .L802417E0 -/* C8727C 802417CC 3C03E0EF */ lui $v1, 0xe0ef -/* C87280 802417D0 8E020000 */ lw $v0, ($s0) -/* C87284 802417D4 3463FFFF */ ori $v1, $v1, 0xffff -/* C87288 802417D8 00431024 */ and $v0, $v0, $v1 -/* C8728C 802417DC AE020000 */ sw $v0, ($s0) -.L802417E0: -/* C87290 802417E0 8482008E */ lh $v0, 0x8e($a0) -/* C87294 802417E4 14400007 */ bnez $v0, .L80241804 -/* C87298 802417E8 00000000 */ nop -/* C8729C 802417EC 8E0200CC */ lw $v0, 0xcc($s0) -/* C872A0 802417F0 8C420028 */ lw $v0, 0x28($v0) -/* C872A4 802417F4 A480008E */ sh $zero, 0x8e($a0) -/* C872A8 802417F8 AC820028 */ sw $v0, 0x28($a0) -/* C872AC 802417FC 2402000C */ addiu $v0, $zero, 0xc -/* C872B0 80241800 AE220070 */ sw $v0, 0x70($s1) -.L80241804: -/* C872B4 80241804 8FBF0018 */ lw $ra, 0x18($sp) -/* C872B8 80241808 8FB10014 */ lw $s1, 0x14($sp) -/* C872BC 8024180C 8FB00010 */ lw $s0, 0x10($sp) -/* C872C0 80241810 03E00008 */ jr $ra -/* C872C4 80241814 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241918_C873C8.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241918_C873C8.s deleted file mode 100644 index 77f2c413dc..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241918_C873C8.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241918_C873C8 -/* C873C8 80241918 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C873CC 8024191C AFB10014 */ sw $s1, 0x14($sp) -/* C873D0 80241920 0080882D */ daddu $s1, $a0, $zero -/* C873D4 80241924 AFBF0018 */ sw $ra, 0x18($sp) -/* C873D8 80241928 AFB00010 */ sw $s0, 0x10($sp) -/* C873DC 8024192C 8E300148 */ lw $s0, 0x148($s1) -/* C873E0 80241930 0C00EABB */ jal get_npc_unsafe -/* C873E4 80241934 86040008 */ lh $a0, 8($s0) -/* C873E8 80241938 0040182D */ daddu $v1, $v0, $zero -/* C873EC 8024193C 9462008E */ lhu $v0, 0x8e($v1) -/* C873F0 80241940 2442FFFF */ addiu $v0, $v0, -1 -/* C873F4 80241944 A462008E */ sh $v0, 0x8e($v1) -/* C873F8 80241948 00021400 */ sll $v0, $v0, 0x10 -/* C873FC 8024194C 14400005 */ bnez $v0, .L80241964 -/* C87400 80241950 00000000 */ nop -/* C87404 80241954 960200AA */ lhu $v0, 0xaa($s0) -/* C87408 80241958 A462008E */ sh $v0, 0x8e($v1) -/* C8740C 8024195C 2402000E */ addiu $v0, $zero, 0xe -/* C87410 80241960 AE220070 */ sw $v0, 0x70($s1) -.L80241964: -/* C87414 80241964 8FBF0018 */ lw $ra, 0x18($sp) -/* C87418 80241968 8FB10014 */ lw $s1, 0x14($sp) -/* C8741C 8024196C 8FB00010 */ lw $s0, 0x10($sp) -/* C87420 80241970 03E00008 */ jr $ra -/* C87424 80241974 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241978_C87428.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241978_C87428.s deleted file mode 100644 index efc20f5939..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241978_C87428.s +++ /dev/null @@ -1,65 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241978_C87428 -/* C87428 80241978 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C8742C 8024197C AFB40040 */ sw $s4, 0x40($sp) -/* C87430 80241980 0080A02D */ daddu $s4, $a0, $zero -/* C87434 80241984 AFBF0044 */ sw $ra, 0x44($sp) -/* C87438 80241988 AFB3003C */ sw $s3, 0x3c($sp) -/* C8743C 8024198C AFB20038 */ sw $s2, 0x38($sp) -/* C87440 80241990 AFB10034 */ sw $s1, 0x34($sp) -/* C87444 80241994 AFB00030 */ sw $s0, 0x30($sp) -/* C87448 80241998 8E910148 */ lw $s1, 0x148($s4) -/* C8744C 8024199C 00A0902D */ daddu $s2, $a1, $zero -/* C87450 802419A0 86240008 */ lh $a0, 8($s1) -/* C87454 802419A4 0C00EABB */ jal get_npc_unsafe -/* C87458 802419A8 00C0982D */ daddu $s3, $a2, $zero -/* C8745C 802419AC 0040802D */ daddu $s0, $v0, $zero -/* C87460 802419B0 9602008E */ lhu $v0, 0x8e($s0) -/* C87464 802419B4 2442FFFF */ addiu $v0, $v0, -1 -/* C87468 802419B8 A602008E */ sh $v0, 0x8e($s0) -/* C8746C 802419BC 00021400 */ sll $v0, $v0, 0x10 -/* C87470 802419C0 14400020 */ bnez $v0, .L80241A44 -/* C87474 802419C4 0260202D */ daddu $a0, $s3, $zero -/* C87478 802419C8 AFA00010 */ sw $zero, 0x10($sp) -/* C8747C 802419CC 8E46000C */ lw $a2, 0xc($s2) -/* C87480 802419D0 8E470010 */ lw $a3, 0x10($s2) -/* C87484 802419D4 0C01242D */ jal func_800490B4 -/* C87488 802419D8 0220282D */ daddu $a1, $s1, $zero -/* C8748C 802419DC 54400018 */ bnel $v0, $zero, .L80241A40 -/* C87490 802419E0 A600008E */ sh $zero, 0x8e($s0) -/* C87494 802419E4 24040002 */ addiu $a0, $zero, 2 -/* C87498 802419E8 0200282D */ daddu $a1, $s0, $zero -/* C8749C 802419EC 0000302D */ daddu $a2, $zero, $zero -/* C874A0 802419F0 860300A8 */ lh $v1, 0xa8($s0) -/* C874A4 802419F4 3C013F80 */ lui $at, 0x3f80 -/* C874A8 802419F8 44810000 */ mtc1 $at, $f0 -/* C874AC 802419FC 3C014000 */ lui $at, 0x4000 -/* C874B0 80241A00 44811000 */ mtc1 $at, $f2 -/* C874B4 80241A04 3C01C1A0 */ lui $at, 0xc1a0 -/* C874B8 80241A08 44812000 */ mtc1 $at, $f4 -/* C874BC 80241A0C 2402000F */ addiu $v0, $zero, 0xf -/* C874C0 80241A10 AFA2001C */ sw $v0, 0x1c($sp) -/* C874C4 80241A14 44833000 */ mtc1 $v1, $f6 -/* C874C8 80241A18 00000000 */ nop -/* C874CC 80241A1C 468031A0 */ cvt.s.w $f6, $f6 -/* C874D0 80241A20 44073000 */ mfc1 $a3, $f6 -/* C874D4 80241A24 27A20028 */ addiu $v0, $sp, 0x28 -/* C874D8 80241A28 AFA20020 */ sw $v0, 0x20($sp) -/* C874DC 80241A2C E7A00010 */ swc1 $f0, 0x10($sp) -/* C874E0 80241A30 E7A20014 */ swc1 $f2, 0x14($sp) -/* C874E4 80241A34 0C01BFA4 */ jal fx_emote -/* C874E8 80241A38 E7A40018 */ swc1 $f4, 0x18($sp) -/* C874EC 80241A3C A600008E */ sh $zero, 0x8e($s0) -.L80241A40: -/* C874F0 80241A40 AE800070 */ sw $zero, 0x70($s4) -.L80241A44: -/* C874F4 80241A44 8FBF0044 */ lw $ra, 0x44($sp) -/* C874F8 80241A48 8FB40040 */ lw $s4, 0x40($sp) -/* C874FC 80241A4C 8FB3003C */ lw $s3, 0x3c($sp) -/* C87500 80241A50 8FB20038 */ lw $s2, 0x38($sp) -/* C87504 80241A54 8FB10034 */ lw $s1, 0x34($sp) -/* C87508 80241A58 8FB00030 */ lw $s0, 0x30($sp) -/* C8750C 80241A5C 03E00008 */ jr $ra -/* C87510 80241A60 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241A64_C87514.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241A64_C87514.s index 950c793c01..7ebef27fc1 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241A64_C87514.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241A64_C87514.s @@ -118,7 +118,7 @@ glabel func_80241A64_C87514 .L80241C0C: /* C876BC 80241C0C 0240202D */ daddu $a0, $s2, $zero /* C876C0 80241C10 0260282D */ daddu $a1, $s3, $zero -/* C876C4 80241C14 0C0905E2 */ jal func_80241788_C87238 +/* C876C4 80241C14 0C0905E2 */ jal kzn_17_UnkNpcDurationFlagFunc3 /* C876C8 80241C18 0280302D */ daddu $a2, $s4, $zero /* C876CC 80241C1C 8E430070 */ lw $v1, 0x70($s2) /* C876D0 80241C20 2402000C */ addiu $v0, $zero, 0xc @@ -136,7 +136,7 @@ glabel func_80241A64_C87514 .L80241C4C: /* C876FC 80241C4C 0240202D */ daddu $a0, $s2, $zero /* C87700 80241C50 0260282D */ daddu $a1, $s3, $zero -/* C87704 80241C54 0C090646 */ jal func_80241918_C873C8 +/* C87704 80241C54 0C090646 */ jal kzn_17_UnkNpcDurationFlagFunc2 /* C87708 80241C58 0280302D */ daddu $a2, $s4, $zero /* C8770C 80241C5C 8E430070 */ lw $v1, 0x70($s2) /* C87710 80241C60 2402000E */ addiu $v0, $zero, 0xe @@ -145,7 +145,7 @@ glabel func_80241A64_C87514 /* C8771C 80241C6C 0240202D */ daddu $a0, $s2, $zero .L80241C70: /* C87720 80241C70 0260282D */ daddu $a1, $s3, $zero -/* C87724 80241C74 0C09065E */ jal func_80241978_C87428 +/* C87724 80241C74 0C09065E */ jal kzn_17_UnkNpcAIFunc30 /* C87728 80241C78 0280302D */ daddu $a2, $s4, $zero /* C8772C 80241C7C 08090723 */ j .L80241C8C /* C87730 80241C80 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_01/B93440/func_80240000_B93440.s b/ver/us/asm/nonmatchings/world/area_mim/mim_01/B93440/func_80240000_B93440.s deleted file mode 100644 index 1d4bba33ad..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_01/B93440/func_80240000_B93440.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_B93440 -/* B93440 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B93444 80240004 AFBF0010 */ sw $ra, 0x10($sp) -/* B93448 80240008 0C046ED4 */ jal enable_world_fog -/* B9344C 8024000C 00000000 */ nop -/* B93450 80240010 240403DE */ addiu $a0, $zero, 0x3de -/* B93454 80240014 0C046EDD */ jal set_world_fog_dist -/* B93458 80240018 240503E8 */ addiu $a1, $zero, 0x3e8 -/* B9345C 8024001C 0000202D */ daddu $a0, $zero, $zero -/* B93460 80240020 0080282D */ daddu $a1, $a0, $zero -/* B93464 80240024 0080302D */ daddu $a2, $a0, $zero -/* B93468 80240028 0C046EE2 */ jal set_world_fog_color -/* B9346C 8024002C 240700FF */ addiu $a3, $zero, 0xff -/* B93470 80240030 0C048BFB */ jal enable_entity_fog -/* B93474 80240034 00000000 */ nop -/* B93478 80240038 240403DE */ addiu $a0, $zero, 0x3de -/* B9347C 8024003C 0C048C04 */ jal set_entity_fog_dist -/* B93480 80240040 240503E8 */ addiu $a1, $zero, 0x3e8 -/* B93484 80240044 0000202D */ daddu $a0, $zero, $zero -/* B93488 80240048 0080282D */ daddu $a1, $a0, $zero -/* B9348C 8024004C 0080302D */ daddu $a2, $a0, $zero -/* B93490 80240050 0C048C0A */ jal set_entity_fog_color -/* B93494 80240054 240700FF */ addiu $a3, $zero, 0xff -/* B93498 80240058 8FBF0010 */ lw $ra, 0x10($sp) -/* B9349C 8024005C 24020002 */ addiu $v0, $zero, 2 -/* B934A0 80240060 03E00008 */ jr $ra -/* B934A4 80240064 27BD0018 */ addiu $sp, $sp, 0x18 -/* B934A8 80240068 00000000 */ nop -/* B934AC 8024006C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241978_B94DB8.s b/ver/us/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241978_B94DB8.s deleted file mode 100644 index 02fe1985da..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241978_B94DB8.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241978_B94DB8 -/* B94DB8 80241978 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B94DBC 8024197C AFB10014 */ sw $s1, 0x14($sp) -/* B94DC0 80241980 0080882D */ daddu $s1, $a0, $zero -/* B94DC4 80241984 AFBF0018 */ sw $ra, 0x18($sp) -/* B94DC8 80241988 AFB00010 */ sw $s0, 0x10($sp) -/* B94DCC 8024198C 8E300148 */ lw $s0, 0x148($s1) -/* B94DD0 80241990 0C00EABB */ jal get_npc_unsafe -/* B94DD4 80241994 86040008 */ lh $a0, 8($s0) -/* B94DD8 80241998 0040202D */ daddu $a0, $v0, $zero -/* B94DDC 8024199C 9482008E */ lhu $v0, 0x8e($a0) -/* B94DE0 802419A0 2442FFFF */ addiu $v0, $v0, -1 -/* B94DE4 802419A4 A482008E */ sh $v0, 0x8e($a0) -/* B94DE8 802419A8 00021400 */ sll $v0, $v0, 0x10 -/* B94DEC 802419AC 8E030098 */ lw $v1, 0x98($s0) -/* B94DF0 802419B0 00021403 */ sra $v0, $v0, 0x10 -/* B94DF4 802419B4 0062182A */ slt $v1, $v1, $v0 -/* B94DF8 802419B8 14600005 */ bnez $v1, .L802419D0 -/* B94DFC 802419BC 3C03E0EF */ lui $v1, 0xe0ef -/* B94E00 802419C0 8E020000 */ lw $v0, ($s0) -/* B94E04 802419C4 3463FFFF */ ori $v1, $v1, 0xffff -/* B94E08 802419C8 00431024 */ and $v0, $v0, $v1 -/* B94E0C 802419CC AE020000 */ sw $v0, ($s0) -.L802419D0: -/* B94E10 802419D0 8482008E */ lh $v0, 0x8e($a0) -/* B94E14 802419D4 14400007 */ bnez $v0, .L802419F4 -/* B94E18 802419D8 00000000 */ nop -/* B94E1C 802419DC 8E0200CC */ lw $v0, 0xcc($s0) -/* B94E20 802419E0 8C420028 */ lw $v0, 0x28($v0) -/* B94E24 802419E4 A480008E */ sh $zero, 0x8e($a0) -/* B94E28 802419E8 AC820028 */ sw $v0, 0x28($a0) -/* B94E2C 802419EC 2402000C */ addiu $v0, $zero, 0xc -/* B94E30 802419F0 AE220070 */ sw $v0, 0x70($s1) -.L802419F4: -/* B94E34 802419F4 8FBF0018 */ lw $ra, 0x18($sp) -/* B94E38 802419F8 8FB10014 */ lw $s1, 0x14($sp) -/* B94E3C 802419FC 8FB00010 */ lw $s0, 0x10($sp) -/* B94E40 80241A00 03E00008 */ jr $ra -/* B94E44 80241A04 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241B08_B94F48.s b/ver/us/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241B08_B94F48.s deleted file mode 100644 index 6de02ba560..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241B08_B94F48.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B08_B94F48 -/* B94F48 80241B08 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B94F4C 80241B0C AFB10014 */ sw $s1, 0x14($sp) -/* B94F50 80241B10 0080882D */ daddu $s1, $a0, $zero -/* B94F54 80241B14 AFBF0018 */ sw $ra, 0x18($sp) -/* B94F58 80241B18 AFB00010 */ sw $s0, 0x10($sp) -/* B94F5C 80241B1C 8E300148 */ lw $s0, 0x148($s1) -/* B94F60 80241B20 0C00EABB */ jal get_npc_unsafe -/* B94F64 80241B24 86040008 */ lh $a0, 8($s0) -/* B94F68 80241B28 0040182D */ daddu $v1, $v0, $zero -/* B94F6C 80241B2C 9462008E */ lhu $v0, 0x8e($v1) -/* B94F70 80241B30 2442FFFF */ addiu $v0, $v0, -1 -/* B94F74 80241B34 A462008E */ sh $v0, 0x8e($v1) -/* B94F78 80241B38 00021400 */ sll $v0, $v0, 0x10 -/* B94F7C 80241B3C 14400005 */ bnez $v0, .L80241B54 -/* B94F80 80241B40 00000000 */ nop -/* B94F84 80241B44 960200AA */ lhu $v0, 0xaa($s0) -/* B94F88 80241B48 A462008E */ sh $v0, 0x8e($v1) -/* B94F8C 80241B4C 2402000E */ addiu $v0, $zero, 0xe -/* B94F90 80241B50 AE220070 */ sw $v0, 0x70($s1) -.L80241B54: -/* B94F94 80241B54 8FBF0018 */ lw $ra, 0x18($sp) -/* B94F98 80241B58 8FB10014 */ lw $s1, 0x14($sp) -/* B94F9C 80241B5C 8FB00010 */ lw $s0, 0x10($sp) -/* B94FA0 80241B60 03E00008 */ jr $ra -/* B94FA4 80241B64 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241B68_B94FA8.s b/ver/us/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241B68_B94FA8.s deleted file mode 100644 index 6341d56de5..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241B68_B94FA8.s +++ /dev/null @@ -1,65 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B68_B94FA8 -/* B94FA8 80241B68 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* B94FAC 80241B6C AFB40040 */ sw $s4, 0x40($sp) -/* B94FB0 80241B70 0080A02D */ daddu $s4, $a0, $zero -/* B94FB4 80241B74 AFBF0044 */ sw $ra, 0x44($sp) -/* B94FB8 80241B78 AFB3003C */ sw $s3, 0x3c($sp) -/* B94FBC 80241B7C AFB20038 */ sw $s2, 0x38($sp) -/* B94FC0 80241B80 AFB10034 */ sw $s1, 0x34($sp) -/* B94FC4 80241B84 AFB00030 */ sw $s0, 0x30($sp) -/* B94FC8 80241B88 8E910148 */ lw $s1, 0x148($s4) -/* B94FCC 80241B8C 00A0902D */ daddu $s2, $a1, $zero -/* B94FD0 80241B90 86240008 */ lh $a0, 8($s1) -/* B94FD4 80241B94 0C00EABB */ jal get_npc_unsafe -/* B94FD8 80241B98 00C0982D */ daddu $s3, $a2, $zero -/* B94FDC 80241B9C 0040802D */ daddu $s0, $v0, $zero -/* B94FE0 80241BA0 9602008E */ lhu $v0, 0x8e($s0) -/* B94FE4 80241BA4 2442FFFF */ addiu $v0, $v0, -1 -/* B94FE8 80241BA8 A602008E */ sh $v0, 0x8e($s0) -/* B94FEC 80241BAC 00021400 */ sll $v0, $v0, 0x10 -/* B94FF0 80241BB0 14400020 */ bnez $v0, .L80241C34 -/* B94FF4 80241BB4 0260202D */ daddu $a0, $s3, $zero -/* B94FF8 80241BB8 AFA00010 */ sw $zero, 0x10($sp) -/* B94FFC 80241BBC 8E46000C */ lw $a2, 0xc($s2) -/* B95000 80241BC0 8E470010 */ lw $a3, 0x10($s2) -/* B95004 80241BC4 0C01242D */ jal func_800490B4 -/* B95008 80241BC8 0220282D */ daddu $a1, $s1, $zero -/* B9500C 80241BCC 54400018 */ bnel $v0, $zero, .L80241C30 -/* B95010 80241BD0 A600008E */ sh $zero, 0x8e($s0) -/* B95014 80241BD4 24040002 */ addiu $a0, $zero, 2 -/* B95018 80241BD8 0200282D */ daddu $a1, $s0, $zero -/* B9501C 80241BDC 0000302D */ daddu $a2, $zero, $zero -/* B95020 80241BE0 860300A8 */ lh $v1, 0xa8($s0) -/* B95024 80241BE4 3C013F80 */ lui $at, 0x3f80 -/* B95028 80241BE8 44810000 */ mtc1 $at, $f0 -/* B9502C 80241BEC 3C014000 */ lui $at, 0x4000 -/* B95030 80241BF0 44811000 */ mtc1 $at, $f2 -/* B95034 80241BF4 3C01C1A0 */ lui $at, 0xc1a0 -/* B95038 80241BF8 44812000 */ mtc1 $at, $f4 -/* B9503C 80241BFC 2402000F */ addiu $v0, $zero, 0xf -/* B95040 80241C00 AFA2001C */ sw $v0, 0x1c($sp) -/* B95044 80241C04 44833000 */ mtc1 $v1, $f6 -/* B95048 80241C08 00000000 */ nop -/* B9504C 80241C0C 468031A0 */ cvt.s.w $f6, $f6 -/* B95050 80241C10 44073000 */ mfc1 $a3, $f6 -/* B95054 80241C14 27A20028 */ addiu $v0, $sp, 0x28 -/* B95058 80241C18 AFA20020 */ sw $v0, 0x20($sp) -/* B9505C 80241C1C E7A00010 */ swc1 $f0, 0x10($sp) -/* B95060 80241C20 E7A20014 */ swc1 $f2, 0x14($sp) -/* B95064 80241C24 0C01BFA4 */ jal fx_emote -/* B95068 80241C28 E7A40018 */ swc1 $f4, 0x18($sp) -/* B9506C 80241C2C A600008E */ sh $zero, 0x8e($s0) -.L80241C30: -/* B95070 80241C30 AE800070 */ sw $zero, 0x70($s4) -.L80241C34: -/* B95074 80241C34 8FBF0044 */ lw $ra, 0x44($sp) -/* B95078 80241C38 8FB40040 */ lw $s4, 0x40($sp) -/* B9507C 80241C3C 8FB3003C */ lw $s3, 0x3c($sp) -/* B95080 80241C40 8FB20038 */ lw $s2, 0x38($sp) -/* B95084 80241C44 8FB10034 */ lw $s1, 0x34($sp) -/* B95088 80241C48 8FB00030 */ lw $s0, 0x30($sp) -/* B9508C 80241C4C 03E00008 */ jr $ra -/* B95090 80241C50 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241C54_B95094.s b/ver/us/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241C54_B95094.s index 7baa383cf3..cbfa7371f9 100644 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241C54_B95094.s +++ b/ver/us/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241C54_B95094.s @@ -118,7 +118,7 @@ glabel func_80241C54_B95094 .L80241DFC: /* B9523C 80241DFC 0240202D */ daddu $a0, $s2, $zero /* B95240 80241E00 0260282D */ daddu $a1, $s3, $zero -/* B95244 80241E04 0C09065E */ jal func_80241978_B94DB8 +/* B95244 80241E04 0C09065E */ jal mim_01_UnkNpcDurationFlagFunc3 /* B95248 80241E08 0280302D */ daddu $a2, $s4, $zero /* B9524C 80241E0C 8E430070 */ lw $v1, 0x70($s2) /* B95250 80241E10 2402000C */ addiu $v0, $zero, 0xc @@ -136,7 +136,7 @@ glabel func_80241C54_B95094 .L80241E3C: /* B9527C 80241E3C 0240202D */ daddu $a0, $s2, $zero /* B95280 80241E40 0260282D */ daddu $a1, $s3, $zero -/* B95284 80241E44 0C0906C2 */ jal func_80241B08_B94F48 +/* B95284 80241E44 0C0906C2 */ jal mim_01_UnkNpcDurationFlagFunc2 /* B95288 80241E48 0280302D */ daddu $a2, $s4, $zero /* B9528C 80241E4C 8E430070 */ lw $v1, 0x70($s2) /* B95290 80241E50 2402000E */ addiu $v0, $zero, 0xe @@ -145,7 +145,7 @@ glabel func_80241C54_B95094 /* B9529C 80241E5C 0240202D */ daddu $a0, $s2, $zero .L80241E60: /* B952A0 80241E60 0260282D */ daddu $a1, $s3, $zero -/* B952A4 80241E64 0C0906DA */ jal func_80241B68_B94FA8 +/* B952A4 80241E64 0C0906DA */ jal mim_01_UnkNpcAIFunc30 /* B952A8 80241E68 0280302D */ daddu $a2, $s4, $zero /* B952AC 80241E6C 0809079F */ j .L80241E7C /* B952B0 80241E70 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_02/B97C00/func_80240000_B97C00.s b/ver/us/asm/nonmatchings/world/area_mim/mim_02/B97C00/func_80240000_B97C00.s deleted file mode 100644 index b3d380caf8..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_02/B97C00/func_80240000_B97C00.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_B97C00 -/* B97C00 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B97C04 80240004 AFBF0010 */ sw $ra, 0x10($sp) -/* B97C08 80240008 0C046ED4 */ jal enable_world_fog -/* B97C0C 8024000C 00000000 */ nop -/* B97C10 80240010 240403DE */ addiu $a0, $zero, 0x3de -/* B97C14 80240014 0C046EDD */ jal set_world_fog_dist -/* B97C18 80240018 240503E8 */ addiu $a1, $zero, 0x3e8 -/* B97C1C 8024001C 0000202D */ daddu $a0, $zero, $zero -/* B97C20 80240020 0080282D */ daddu $a1, $a0, $zero -/* B97C24 80240024 0080302D */ daddu $a2, $a0, $zero -/* B97C28 80240028 0C046EE2 */ jal set_world_fog_color -/* B97C2C 8024002C 240700FF */ addiu $a3, $zero, 0xff -/* B97C30 80240030 0C048BFB */ jal enable_entity_fog -/* B97C34 80240034 00000000 */ nop -/* B97C38 80240038 240403DE */ addiu $a0, $zero, 0x3de -/* B97C3C 8024003C 0C048C04 */ jal set_entity_fog_dist -/* B97C40 80240040 240503E8 */ addiu $a1, $zero, 0x3e8 -/* B97C44 80240044 0000202D */ daddu $a0, $zero, $zero -/* B97C48 80240048 0080282D */ daddu $a1, $a0, $zero -/* B97C4C 8024004C 0080302D */ daddu $a2, $a0, $zero -/* B97C50 80240050 0C048C0A */ jal set_entity_fog_color -/* B97C54 80240054 240700FF */ addiu $a3, $zero, 0xff -/* B97C58 80240058 8FBF0010 */ lw $ra, 0x10($sp) -/* B97C5C 8024005C 24020002 */ addiu $v0, $zero, 2 -/* B97C60 80240060 03E00008 */ jr $ra -/* B97C64 80240064 27BD0018 */ addiu $sp, $sp, 0x18 -/* B97C68 80240068 00000000 */ nop -/* B97C6C 8024006C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_03/B9B480/func_80240000_B9B480.s b/ver/us/asm/nonmatchings/world/area_mim/mim_03/B9B480/func_80240000_B9B480.s deleted file mode 100644 index fd7bb17939..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_03/B9B480/func_80240000_B9B480.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_B9B480 -/* B9B480 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B9B484 80240004 AFBF0010 */ sw $ra, 0x10($sp) -/* B9B488 80240008 0C046ED4 */ jal enable_world_fog -/* B9B48C 8024000C 00000000 */ nop -/* B9B490 80240010 240403DE */ addiu $a0, $zero, 0x3de -/* B9B494 80240014 0C046EDD */ jal set_world_fog_dist -/* B9B498 80240018 240503E8 */ addiu $a1, $zero, 0x3e8 -/* B9B49C 8024001C 0000202D */ daddu $a0, $zero, $zero -/* B9B4A0 80240020 0080282D */ daddu $a1, $a0, $zero -/* B9B4A4 80240024 0080302D */ daddu $a2, $a0, $zero -/* B9B4A8 80240028 0C046EE2 */ jal set_world_fog_color -/* B9B4AC 8024002C 240700FF */ addiu $a3, $zero, 0xff -/* B9B4B0 80240030 0C048BFB */ jal enable_entity_fog -/* B9B4B4 80240034 00000000 */ nop -/* B9B4B8 80240038 240403DE */ addiu $a0, $zero, 0x3de -/* B9B4BC 8024003C 0C048C04 */ jal set_entity_fog_dist -/* B9B4C0 80240040 240503E8 */ addiu $a1, $zero, 0x3e8 -/* B9B4C4 80240044 0000202D */ daddu $a0, $zero, $zero -/* B9B4C8 80240048 0080282D */ daddu $a1, $a0, $zero -/* B9B4CC 8024004C 0080302D */ daddu $a2, $a0, $zero -/* B9B4D0 80240050 0C048C0A */ jal set_entity_fog_color -/* B9B4D4 80240054 240700FF */ addiu $a3, $zero, 0xff -/* B9B4D8 80240058 8FBF0010 */ lw $ra, 0x10($sp) -/* B9B4DC 8024005C 24020002 */ addiu $v0, $zero, 2 -/* B9B4E0 80240060 03E00008 */ jr $ra -/* B9B4E4 80240064 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_04/B9D960/func_80240000_B9D960.s b/ver/us/asm/nonmatchings/world/area_mim/mim_04/B9D960/func_80240000_B9D960.s deleted file mode 100644 index e78a3815e0..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_04/B9D960/func_80240000_B9D960.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_B9D960 -/* B9D960 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B9D964 80240004 AFBF0010 */ sw $ra, 0x10($sp) -/* B9D968 80240008 0C046ED4 */ jal enable_world_fog -/* B9D96C 8024000C 00000000 */ nop -/* B9D970 80240010 240403DE */ addiu $a0, $zero, 0x3de -/* B9D974 80240014 0C046EDD */ jal set_world_fog_dist -/* B9D978 80240018 240503E8 */ addiu $a1, $zero, 0x3e8 -/* B9D97C 8024001C 0000202D */ daddu $a0, $zero, $zero -/* B9D980 80240020 0080282D */ daddu $a1, $a0, $zero -/* B9D984 80240024 0080302D */ daddu $a2, $a0, $zero -/* B9D988 80240028 0C046EE2 */ jal set_world_fog_color -/* B9D98C 8024002C 240700FF */ addiu $a3, $zero, 0xff -/* B9D990 80240030 0C048BFB */ jal enable_entity_fog -/* B9D994 80240034 00000000 */ nop -/* B9D998 80240038 240403DE */ addiu $a0, $zero, 0x3de -/* B9D99C 8024003C 0C048C04 */ jal set_entity_fog_dist -/* B9D9A0 80240040 240503E8 */ addiu $a1, $zero, 0x3e8 -/* B9D9A4 80240044 0000202D */ daddu $a0, $zero, $zero -/* B9D9A8 80240048 0080282D */ daddu $a1, $a0, $zero -/* B9D9AC 8024004C 0080302D */ daddu $a2, $a0, $zero -/* B9D9B0 80240050 0C048C0A */ jal set_entity_fog_color -/* B9D9B4 80240054 240700FF */ addiu $a3, $zero, 0xff -/* B9D9B8 80240058 8FBF0010 */ lw $ra, 0x10($sp) -/* B9D9BC 8024005C 24020002 */ addiu $v0, $zero, 2 -/* B9D9C0 80240060 03E00008 */ jr $ra -/* B9D9C4 80240064 27BD0018 */ addiu $sp, $sp, 0x18 -/* B9D9C8 80240068 00000000 */ nop -/* B9D9CC 8024006C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_05/BA0730/func_80240000_BA0730.s b/ver/us/asm/nonmatchings/world/area_mim/mim_05/BA0730/func_80240000_BA0730.s deleted file mode 100644 index 8ca24fa74c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_05/BA0730/func_80240000_BA0730.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_BA0730 -/* BA0730 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BA0734 80240004 AFBF0010 */ sw $ra, 0x10($sp) -/* BA0738 80240008 0C046ED4 */ jal enable_world_fog -/* BA073C 8024000C 00000000 */ nop -/* BA0740 80240010 240403DE */ addiu $a0, $zero, 0x3de -/* BA0744 80240014 0C046EDD */ jal set_world_fog_dist -/* BA0748 80240018 240503E8 */ addiu $a1, $zero, 0x3e8 -/* BA074C 8024001C 0000202D */ daddu $a0, $zero, $zero -/* BA0750 80240020 0080282D */ daddu $a1, $a0, $zero -/* BA0754 80240024 0080302D */ daddu $a2, $a0, $zero -/* BA0758 80240028 0C046EE2 */ jal set_world_fog_color -/* BA075C 8024002C 240700FF */ addiu $a3, $zero, 0xff -/* BA0760 80240030 0C048BFB */ jal enable_entity_fog -/* BA0764 80240034 00000000 */ nop -/* BA0768 80240038 240403DE */ addiu $a0, $zero, 0x3de -/* BA076C 8024003C 0C048C04 */ jal set_entity_fog_dist -/* BA0770 80240040 240503E8 */ addiu $a1, $zero, 0x3e8 -/* BA0774 80240044 0000202D */ daddu $a0, $zero, $zero -/* BA0778 80240048 0080282D */ daddu $a1, $a0, $zero -/* BA077C 8024004C 0080302D */ daddu $a2, $a0, $zero -/* BA0780 80240050 0C048C0A */ jal set_entity_fog_color -/* BA0784 80240054 240700FF */ addiu $a3, $zero, 0xff -/* BA0788 80240058 8FBF0010 */ lw $ra, 0x10($sp) -/* BA078C 8024005C 24020002 */ addiu $v0, $zero, 2 -/* BA0790 80240060 03E00008 */ jr $ra -/* BA0794 80240064 27BD0018 */ addiu $sp, $sp, 0x18 -/* BA0798 80240068 00000000 */ nop -/* BA079C 8024006C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802414E8_BA1C18.s b/ver/us/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802414E8_BA1C18.s deleted file mode 100644 index 10a5d7366d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802414E8_BA1C18.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802414E8_BA1C18 -/* BA1C18 802414E8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BA1C1C 802414EC AFB10014 */ sw $s1, 0x14($sp) -/* BA1C20 802414F0 0080882D */ daddu $s1, $a0, $zero -/* BA1C24 802414F4 AFBF0018 */ sw $ra, 0x18($sp) -/* BA1C28 802414F8 AFB00010 */ sw $s0, 0x10($sp) -/* BA1C2C 802414FC 8E300148 */ lw $s0, 0x148($s1) -/* BA1C30 80241500 0C00EABB */ jal get_npc_unsafe -/* BA1C34 80241504 86040008 */ lh $a0, 8($s0) -/* BA1C38 80241508 0040202D */ daddu $a0, $v0, $zero -/* BA1C3C 8024150C 9482008E */ lhu $v0, 0x8e($a0) -/* BA1C40 80241510 2442FFFF */ addiu $v0, $v0, -1 -/* BA1C44 80241514 A482008E */ sh $v0, 0x8e($a0) -/* BA1C48 80241518 00021400 */ sll $v0, $v0, 0x10 -/* BA1C4C 8024151C 8E030098 */ lw $v1, 0x98($s0) -/* BA1C50 80241520 00021403 */ sra $v0, $v0, 0x10 -/* BA1C54 80241524 0062182A */ slt $v1, $v1, $v0 -/* BA1C58 80241528 14600005 */ bnez $v1, .L80241540 -/* BA1C5C 8024152C 3C03E0EF */ lui $v1, 0xe0ef -/* BA1C60 80241530 8E020000 */ lw $v0, ($s0) -/* BA1C64 80241534 3463FFFF */ ori $v1, $v1, 0xffff -/* BA1C68 80241538 00431024 */ and $v0, $v0, $v1 -/* BA1C6C 8024153C AE020000 */ sw $v0, ($s0) -.L80241540: -/* BA1C70 80241540 8482008E */ lh $v0, 0x8e($a0) -/* BA1C74 80241544 14400007 */ bnez $v0, .L80241564 -/* BA1C78 80241548 00000000 */ nop -/* BA1C7C 8024154C 8E0200CC */ lw $v0, 0xcc($s0) -/* BA1C80 80241550 8C420028 */ lw $v0, 0x28($v0) -/* BA1C84 80241554 A480008E */ sh $zero, 0x8e($a0) -/* BA1C88 80241558 AC820028 */ sw $v0, 0x28($a0) -/* BA1C8C 8024155C 2402000C */ addiu $v0, $zero, 0xc -/* BA1C90 80241560 AE220070 */ sw $v0, 0x70($s1) -.L80241564: -/* BA1C94 80241564 8FBF0018 */ lw $ra, 0x18($sp) -/* BA1C98 80241568 8FB10014 */ lw $s1, 0x14($sp) -/* BA1C9C 8024156C 8FB00010 */ lw $s0, 0x10($sp) -/* BA1CA0 80241570 03E00008 */ jr $ra -/* BA1CA4 80241574 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80241678_BA1DA8.s b/ver/us/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80241678_BA1DA8.s deleted file mode 100644 index 04910c095b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80241678_BA1DA8.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241678_BA1DA8 -/* BA1DA8 80241678 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BA1DAC 8024167C AFB10014 */ sw $s1, 0x14($sp) -/* BA1DB0 80241680 0080882D */ daddu $s1, $a0, $zero -/* BA1DB4 80241684 AFBF0018 */ sw $ra, 0x18($sp) -/* BA1DB8 80241688 AFB00010 */ sw $s0, 0x10($sp) -/* BA1DBC 8024168C 8E300148 */ lw $s0, 0x148($s1) -/* BA1DC0 80241690 0C00EABB */ jal get_npc_unsafe -/* BA1DC4 80241694 86040008 */ lh $a0, 8($s0) -/* BA1DC8 80241698 0040182D */ daddu $v1, $v0, $zero -/* BA1DCC 8024169C 9462008E */ lhu $v0, 0x8e($v1) -/* BA1DD0 802416A0 2442FFFF */ addiu $v0, $v0, -1 -/* BA1DD4 802416A4 A462008E */ sh $v0, 0x8e($v1) -/* BA1DD8 802416A8 00021400 */ sll $v0, $v0, 0x10 -/* BA1DDC 802416AC 14400005 */ bnez $v0, .L802416C4 -/* BA1DE0 802416B0 00000000 */ nop -/* BA1DE4 802416B4 960200AA */ lhu $v0, 0xaa($s0) -/* BA1DE8 802416B8 A462008E */ sh $v0, 0x8e($v1) -/* BA1DEC 802416BC 2402000E */ addiu $v0, $zero, 0xe -/* BA1DF0 802416C0 AE220070 */ sw $v0, 0x70($s1) -.L802416C4: -/* BA1DF4 802416C4 8FBF0018 */ lw $ra, 0x18($sp) -/* BA1DF8 802416C8 8FB10014 */ lw $s1, 0x14($sp) -/* BA1DFC 802416CC 8FB00010 */ lw $s0, 0x10($sp) -/* BA1E00 802416D0 03E00008 */ jr $ra -/* BA1E04 802416D4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802416D8_BA1E08.s b/ver/us/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802416D8_BA1E08.s deleted file mode 100644 index 4194b9c88b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802416D8_BA1E08.s +++ /dev/null @@ -1,65 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416D8_BA1E08 -/* BA1E08 802416D8 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* BA1E0C 802416DC AFB40040 */ sw $s4, 0x40($sp) -/* BA1E10 802416E0 0080A02D */ daddu $s4, $a0, $zero -/* BA1E14 802416E4 AFBF0044 */ sw $ra, 0x44($sp) -/* BA1E18 802416E8 AFB3003C */ sw $s3, 0x3c($sp) -/* BA1E1C 802416EC AFB20038 */ sw $s2, 0x38($sp) -/* BA1E20 802416F0 AFB10034 */ sw $s1, 0x34($sp) -/* BA1E24 802416F4 AFB00030 */ sw $s0, 0x30($sp) -/* BA1E28 802416F8 8E910148 */ lw $s1, 0x148($s4) -/* BA1E2C 802416FC 00A0902D */ daddu $s2, $a1, $zero -/* BA1E30 80241700 86240008 */ lh $a0, 8($s1) -/* BA1E34 80241704 0C00EABB */ jal get_npc_unsafe -/* BA1E38 80241708 00C0982D */ daddu $s3, $a2, $zero -/* BA1E3C 8024170C 0040802D */ daddu $s0, $v0, $zero -/* BA1E40 80241710 9602008E */ lhu $v0, 0x8e($s0) -/* BA1E44 80241714 2442FFFF */ addiu $v0, $v0, -1 -/* BA1E48 80241718 A602008E */ sh $v0, 0x8e($s0) -/* BA1E4C 8024171C 00021400 */ sll $v0, $v0, 0x10 -/* BA1E50 80241720 14400020 */ bnez $v0, .L802417A4 -/* BA1E54 80241724 0260202D */ daddu $a0, $s3, $zero -/* BA1E58 80241728 AFA00010 */ sw $zero, 0x10($sp) -/* BA1E5C 8024172C 8E46000C */ lw $a2, 0xc($s2) -/* BA1E60 80241730 8E470010 */ lw $a3, 0x10($s2) -/* BA1E64 80241734 0C01242D */ jal func_800490B4 -/* BA1E68 80241738 0220282D */ daddu $a1, $s1, $zero -/* BA1E6C 8024173C 54400018 */ bnel $v0, $zero, .L802417A0 -/* BA1E70 80241740 A600008E */ sh $zero, 0x8e($s0) -/* BA1E74 80241744 24040002 */ addiu $a0, $zero, 2 -/* BA1E78 80241748 0200282D */ daddu $a1, $s0, $zero -/* BA1E7C 8024174C 0000302D */ daddu $a2, $zero, $zero -/* BA1E80 80241750 860300A8 */ lh $v1, 0xa8($s0) -/* BA1E84 80241754 3C013F80 */ lui $at, 0x3f80 -/* BA1E88 80241758 44810000 */ mtc1 $at, $f0 -/* BA1E8C 8024175C 3C014000 */ lui $at, 0x4000 -/* BA1E90 80241760 44811000 */ mtc1 $at, $f2 -/* BA1E94 80241764 3C01C1A0 */ lui $at, 0xc1a0 -/* BA1E98 80241768 44812000 */ mtc1 $at, $f4 -/* BA1E9C 8024176C 2402000F */ addiu $v0, $zero, 0xf -/* BA1EA0 80241770 AFA2001C */ sw $v0, 0x1c($sp) -/* BA1EA4 80241774 44833000 */ mtc1 $v1, $f6 -/* BA1EA8 80241778 00000000 */ nop -/* BA1EAC 8024177C 468031A0 */ cvt.s.w $f6, $f6 -/* BA1EB0 80241780 44073000 */ mfc1 $a3, $f6 -/* BA1EB4 80241784 27A20028 */ addiu $v0, $sp, 0x28 -/* BA1EB8 80241788 AFA20020 */ sw $v0, 0x20($sp) -/* BA1EBC 8024178C E7A00010 */ swc1 $f0, 0x10($sp) -/* BA1EC0 80241790 E7A20014 */ swc1 $f2, 0x14($sp) -/* BA1EC4 80241794 0C01BFA4 */ jal fx_emote -/* BA1EC8 80241798 E7A40018 */ swc1 $f4, 0x18($sp) -/* BA1ECC 8024179C A600008E */ sh $zero, 0x8e($s0) -.L802417A0: -/* BA1ED0 802417A0 AE800070 */ sw $zero, 0x70($s4) -.L802417A4: -/* BA1ED4 802417A4 8FBF0044 */ lw $ra, 0x44($sp) -/* BA1ED8 802417A8 8FB40040 */ lw $s4, 0x40($sp) -/* BA1EDC 802417AC 8FB3003C */ lw $s3, 0x3c($sp) -/* BA1EE0 802417B0 8FB20038 */ lw $s2, 0x38($sp) -/* BA1EE4 802417B4 8FB10034 */ lw $s1, 0x34($sp) -/* BA1EE8 802417B8 8FB00030 */ lw $s0, 0x30($sp) -/* BA1EEC 802417BC 03E00008 */ jr $ra -/* BA1EF0 802417C0 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802417C4_BA1EF4.s b/ver/us/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802417C4_BA1EF4.s index 0b6ae2d5e5..c2af17b1ca 100644 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802417C4_BA1EF4.s +++ b/ver/us/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802417C4_BA1EF4.s @@ -118,7 +118,7 @@ glabel func_802417C4_BA1EF4 .L8024196C: /* BA209C 8024196C 0240202D */ daddu $a0, $s2, $zero /* BA20A0 80241970 0260282D */ daddu $a1, $s3, $zero -/* BA20A4 80241974 0C09053A */ jal func_802414E8_BA1C18 +/* BA20A4 80241974 0C09053A */ jal mim_05_UnkNpcDurationFlagFunc3 /* BA20A8 80241978 0280302D */ daddu $a2, $s4, $zero /* BA20AC 8024197C 8E430070 */ lw $v1, 0x70($s2) /* BA20B0 80241980 2402000C */ addiu $v0, $zero, 0xc @@ -136,7 +136,7 @@ glabel func_802417C4_BA1EF4 .L802419AC: /* BA20DC 802419AC 0240202D */ daddu $a0, $s2, $zero /* BA20E0 802419B0 0260282D */ daddu $a1, $s3, $zero -/* BA20E4 802419B4 0C09059E */ jal func_80241678_BA1DA8 +/* BA20E4 802419B4 0C09059E */ jal mim_05_UnkNpcDurationFlagFunc2 /* BA20E8 802419B8 0280302D */ daddu $a2, $s4, $zero /* BA20EC 802419BC 8E430070 */ lw $v1, 0x70($s2) /* BA20F0 802419C0 2402000E */ addiu $v0, $zero, 0xe @@ -145,7 +145,7 @@ glabel func_802417C4_BA1EF4 /* BA20FC 802419CC 0240202D */ daddu $a0, $s2, $zero .L802419D0: /* BA2100 802419D0 0260282D */ daddu $a1, $s3, $zero -/* BA2104 802419D4 0C0905B6 */ jal func_802416D8_BA1E08 +/* BA2104 802419D4 0C0905B6 */ jal mim_05_UnkNpcAIFunc30 /* BA2108 802419D8 0280302D */ daddu $a2, $s4, $zero /* BA210C 802419DC 0809067B */ j .L802419EC /* BA2110 802419E0 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4780/func_80240000_BA4780.s b/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4780/func_80240000_BA4780.s deleted file mode 100644 index 92d7c3447c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4780/func_80240000_BA4780.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_BA4780 -/* BA4780 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BA4784 80240004 AFBF0010 */ sw $ra, 0x10($sp) -/* BA4788 80240008 0C046ED4 */ jal enable_world_fog -/* BA478C 8024000C 00000000 */ nop -/* BA4790 80240010 240403DE */ addiu $a0, $zero, 0x3de -/* BA4794 80240014 0C046EDD */ jal set_world_fog_dist -/* BA4798 80240018 240503E8 */ addiu $a1, $zero, 0x3e8 -/* BA479C 8024001C 0000202D */ daddu $a0, $zero, $zero -/* BA47A0 80240020 0080282D */ daddu $a1, $a0, $zero -/* BA47A4 80240024 0080302D */ daddu $a2, $a0, $zero -/* BA47A8 80240028 0C046EE2 */ jal set_world_fog_color -/* BA47AC 8024002C 240700FF */ addiu $a3, $zero, 0xff -/* BA47B0 80240030 0C048BFB */ jal enable_entity_fog -/* BA47B4 80240034 00000000 */ nop -/* BA47B8 80240038 240403DE */ addiu $a0, $zero, 0x3de -/* BA47BC 8024003C 0C048C04 */ jal set_entity_fog_dist -/* BA47C0 80240040 240503E8 */ addiu $a1, $zero, 0x3e8 -/* BA47C4 80240044 0000202D */ daddu $a0, $zero, $zero -/* BA47C8 80240048 0080282D */ daddu $a1, $a0, $zero -/* BA47CC 8024004C 0080302D */ daddu $a2, $a0, $zero -/* BA47D0 80240050 0C048C0A */ jal set_entity_fog_color -/* BA47D4 80240054 240700FF */ addiu $a3, $zero, 0xff -/* BA47D8 80240058 8FBF0010 */ lw $ra, 0x10($sp) -/* BA47DC 8024005C 24020002 */ addiu $v0, $zero, 2 -/* BA47E0 80240060 03E00008 */ jr $ra -/* BA47E4 80240064 27BD0018 */ addiu $sp, $sp, 0x18 -/* BA47E8 80240068 00000000 */ nop -/* BA47EC 8024006C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_802419E8_BA6168.s b/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_802419E8_BA6168.s deleted file mode 100644 index f28c99c2df..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_802419E8_BA6168.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802419E8_BA6168 -/* BA6168 802419E8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BA616C 802419EC AFB10014 */ sw $s1, 0x14($sp) -/* BA6170 802419F0 0080882D */ daddu $s1, $a0, $zero -/* BA6174 802419F4 AFBF0018 */ sw $ra, 0x18($sp) -/* BA6178 802419F8 AFB00010 */ sw $s0, 0x10($sp) -/* BA617C 802419FC 8E300148 */ lw $s0, 0x148($s1) -/* BA6180 80241A00 0C00EABB */ jal get_npc_unsafe -/* BA6184 80241A04 86040008 */ lh $a0, 8($s0) -/* BA6188 80241A08 0040202D */ daddu $a0, $v0, $zero -/* BA618C 80241A0C 9482008E */ lhu $v0, 0x8e($a0) -/* BA6190 80241A10 2442FFFF */ addiu $v0, $v0, -1 -/* BA6194 80241A14 A482008E */ sh $v0, 0x8e($a0) -/* BA6198 80241A18 00021400 */ sll $v0, $v0, 0x10 -/* BA619C 80241A1C 8E030098 */ lw $v1, 0x98($s0) -/* BA61A0 80241A20 00021403 */ sra $v0, $v0, 0x10 -/* BA61A4 80241A24 0062182A */ slt $v1, $v1, $v0 -/* BA61A8 80241A28 14600005 */ bnez $v1, .L80241A40 -/* BA61AC 80241A2C 3C03E0EF */ lui $v1, 0xe0ef -/* BA61B0 80241A30 8E020000 */ lw $v0, ($s0) -/* BA61B4 80241A34 3463FFFF */ ori $v1, $v1, 0xffff -/* BA61B8 80241A38 00431024 */ and $v0, $v0, $v1 -/* BA61BC 80241A3C AE020000 */ sw $v0, ($s0) -.L80241A40: -/* BA61C0 80241A40 8482008E */ lh $v0, 0x8e($a0) -/* BA61C4 80241A44 14400007 */ bnez $v0, .L80241A64 -/* BA61C8 80241A48 00000000 */ nop -/* BA61CC 80241A4C 8E0200CC */ lw $v0, 0xcc($s0) -/* BA61D0 80241A50 8C420028 */ lw $v0, 0x28($v0) -/* BA61D4 80241A54 A480008E */ sh $zero, 0x8e($a0) -/* BA61D8 80241A58 AC820028 */ sw $v0, 0x28($a0) -/* BA61DC 80241A5C 2402000C */ addiu $v0, $zero, 0xc -/* BA61E0 80241A60 AE220070 */ sw $v0, 0x70($s1) -.L80241A64: -/* BA61E4 80241A64 8FBF0018 */ lw $ra, 0x18($sp) -/* BA61E8 80241A68 8FB10014 */ lw $s1, 0x14($sp) -/* BA61EC 80241A6C 8FB00010 */ lw $s0, 0x10($sp) -/* BA61F0 80241A70 03E00008 */ jr $ra -/* BA61F4 80241A74 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241B78_BA62F8.s b/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241B78_BA62F8.s deleted file mode 100644 index 240edaf770..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241B78_BA62F8.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B78_BA62F8 -/* BA62F8 80241B78 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BA62FC 80241B7C AFB10014 */ sw $s1, 0x14($sp) -/* BA6300 80241B80 0080882D */ daddu $s1, $a0, $zero -/* BA6304 80241B84 AFBF0018 */ sw $ra, 0x18($sp) -/* BA6308 80241B88 AFB00010 */ sw $s0, 0x10($sp) -/* BA630C 80241B8C 8E300148 */ lw $s0, 0x148($s1) -/* BA6310 80241B90 0C00EABB */ jal get_npc_unsafe -/* BA6314 80241B94 86040008 */ lh $a0, 8($s0) -/* BA6318 80241B98 0040182D */ daddu $v1, $v0, $zero -/* BA631C 80241B9C 9462008E */ lhu $v0, 0x8e($v1) -/* BA6320 80241BA0 2442FFFF */ addiu $v0, $v0, -1 -/* BA6324 80241BA4 A462008E */ sh $v0, 0x8e($v1) -/* BA6328 80241BA8 00021400 */ sll $v0, $v0, 0x10 -/* BA632C 80241BAC 14400005 */ bnez $v0, .L80241BC4 -/* BA6330 80241BB0 00000000 */ nop -/* BA6334 80241BB4 960200AA */ lhu $v0, 0xaa($s0) -/* BA6338 80241BB8 A462008E */ sh $v0, 0x8e($v1) -/* BA633C 80241BBC 2402000E */ addiu $v0, $zero, 0xe -/* BA6340 80241BC0 AE220070 */ sw $v0, 0x70($s1) -.L80241BC4: -/* BA6344 80241BC4 8FBF0018 */ lw $ra, 0x18($sp) -/* BA6348 80241BC8 8FB10014 */ lw $s1, 0x14($sp) -/* BA634C 80241BCC 8FB00010 */ lw $s0, 0x10($sp) -/* BA6350 80241BD0 03E00008 */ jr $ra -/* BA6354 80241BD4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241BD8_BA6358.s b/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241BD8_BA6358.s deleted file mode 100644 index e83c403771..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241BD8_BA6358.s +++ /dev/null @@ -1,65 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241BD8_BA6358 -/* BA6358 80241BD8 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* BA635C 80241BDC AFB40040 */ sw $s4, 0x40($sp) -/* BA6360 80241BE0 0080A02D */ daddu $s4, $a0, $zero -/* BA6364 80241BE4 AFBF0044 */ sw $ra, 0x44($sp) -/* BA6368 80241BE8 AFB3003C */ sw $s3, 0x3c($sp) -/* BA636C 80241BEC AFB20038 */ sw $s2, 0x38($sp) -/* BA6370 80241BF0 AFB10034 */ sw $s1, 0x34($sp) -/* BA6374 80241BF4 AFB00030 */ sw $s0, 0x30($sp) -/* BA6378 80241BF8 8E910148 */ lw $s1, 0x148($s4) -/* BA637C 80241BFC 00A0902D */ daddu $s2, $a1, $zero -/* BA6380 80241C00 86240008 */ lh $a0, 8($s1) -/* BA6384 80241C04 0C00EABB */ jal get_npc_unsafe -/* BA6388 80241C08 00C0982D */ daddu $s3, $a2, $zero -/* BA638C 80241C0C 0040802D */ daddu $s0, $v0, $zero -/* BA6390 80241C10 9602008E */ lhu $v0, 0x8e($s0) -/* BA6394 80241C14 2442FFFF */ addiu $v0, $v0, -1 -/* BA6398 80241C18 A602008E */ sh $v0, 0x8e($s0) -/* BA639C 80241C1C 00021400 */ sll $v0, $v0, 0x10 -/* BA63A0 80241C20 14400020 */ bnez $v0, .L80241CA4 -/* BA63A4 80241C24 0260202D */ daddu $a0, $s3, $zero -/* BA63A8 80241C28 AFA00010 */ sw $zero, 0x10($sp) -/* BA63AC 80241C2C 8E46000C */ lw $a2, 0xc($s2) -/* BA63B0 80241C30 8E470010 */ lw $a3, 0x10($s2) -/* BA63B4 80241C34 0C01242D */ jal func_800490B4 -/* BA63B8 80241C38 0220282D */ daddu $a1, $s1, $zero -/* BA63BC 80241C3C 54400018 */ bnel $v0, $zero, .L80241CA0 -/* BA63C0 80241C40 A600008E */ sh $zero, 0x8e($s0) -/* BA63C4 80241C44 24040002 */ addiu $a0, $zero, 2 -/* BA63C8 80241C48 0200282D */ daddu $a1, $s0, $zero -/* BA63CC 80241C4C 0000302D */ daddu $a2, $zero, $zero -/* BA63D0 80241C50 860300A8 */ lh $v1, 0xa8($s0) -/* BA63D4 80241C54 3C013F80 */ lui $at, 0x3f80 -/* BA63D8 80241C58 44810000 */ mtc1 $at, $f0 -/* BA63DC 80241C5C 3C014000 */ lui $at, 0x4000 -/* BA63E0 80241C60 44811000 */ mtc1 $at, $f2 -/* BA63E4 80241C64 3C01C1A0 */ lui $at, 0xc1a0 -/* BA63E8 80241C68 44812000 */ mtc1 $at, $f4 -/* BA63EC 80241C6C 2402000F */ addiu $v0, $zero, 0xf -/* BA63F0 80241C70 AFA2001C */ sw $v0, 0x1c($sp) -/* BA63F4 80241C74 44833000 */ mtc1 $v1, $f6 -/* BA63F8 80241C78 00000000 */ nop -/* BA63FC 80241C7C 468031A0 */ cvt.s.w $f6, $f6 -/* BA6400 80241C80 44073000 */ mfc1 $a3, $f6 -/* BA6404 80241C84 27A20028 */ addiu $v0, $sp, 0x28 -/* BA6408 80241C88 AFA20020 */ sw $v0, 0x20($sp) -/* BA640C 80241C8C E7A00010 */ swc1 $f0, 0x10($sp) -/* BA6410 80241C90 E7A20014 */ swc1 $f2, 0x14($sp) -/* BA6414 80241C94 0C01BFA4 */ jal fx_emote -/* BA6418 80241C98 E7A40018 */ swc1 $f4, 0x18($sp) -/* BA641C 80241C9C A600008E */ sh $zero, 0x8e($s0) -.L80241CA0: -/* BA6420 80241CA0 AE800070 */ sw $zero, 0x70($s4) -.L80241CA4: -/* BA6424 80241CA4 8FBF0044 */ lw $ra, 0x44($sp) -/* BA6428 80241CA8 8FB40040 */ lw $s4, 0x40($sp) -/* BA642C 80241CAC 8FB3003C */ lw $s3, 0x3c($sp) -/* BA6430 80241CB0 8FB20038 */ lw $s2, 0x38($sp) -/* BA6434 80241CB4 8FB10034 */ lw $s1, 0x34($sp) -/* BA6438 80241CB8 8FB00030 */ lw $s0, 0x30($sp) -/* BA643C 80241CBC 03E00008 */ jr $ra -/* BA6440 80241CC0 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241CC4_BA6444.s b/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241CC4_BA6444.s index 4848535215..d4388e2c9e 100644 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241CC4_BA6444.s +++ b/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241CC4_BA6444.s @@ -118,7 +118,7 @@ glabel func_80241CC4_BA6444 .L80241E6C: /* BA65EC 80241E6C 0240202D */ daddu $a0, $s2, $zero /* BA65F0 80241E70 0260282D */ daddu $a1, $s3, $zero -/* BA65F4 80241E74 0C09067A */ jal func_802419E8_BA6168 +/* BA65F4 80241E74 0C09067A */ jal mim_06_UnkNpcDurationFlagFunc3 /* BA65F8 80241E78 0280302D */ daddu $a2, $s4, $zero /* BA65FC 80241E7C 8E430070 */ lw $v1, 0x70($s2) /* BA6600 80241E80 2402000C */ addiu $v0, $zero, 0xc @@ -136,7 +136,7 @@ glabel func_80241CC4_BA6444 .L80241EAC: /* BA662C 80241EAC 0240202D */ daddu $a0, $s2, $zero /* BA6630 80241EB0 0260282D */ daddu $a1, $s3, $zero -/* BA6634 80241EB4 0C0906DE */ jal func_80241B78_BA62F8 +/* BA6634 80241EB4 0C0906DE */ jal mim_06_UnkNpcDurationFlagFunc2 /* BA6638 80241EB8 0280302D */ daddu $a2, $s4, $zero /* BA663C 80241EBC 8E430070 */ lw $v1, 0x70($s2) /* BA6640 80241EC0 2402000E */ addiu $v0, $zero, 0xe @@ -145,7 +145,7 @@ glabel func_80241CC4_BA6444 /* BA664C 80241ECC 0240202D */ daddu $a0, $s2, $zero .L80241ED0: /* BA6650 80241ED0 0260282D */ daddu $a1, $s3, $zero -/* BA6654 80241ED4 0C0906F6 */ jal func_80241BD8_BA6358 +/* BA6654 80241ED4 0C0906F6 */ jal mim_06_UnkNpcAIFunc30 /* BA6658 80241ED8 0280302D */ daddu $a2, $s4, $zero /* BA665C 80241EDC 080907BB */ j .L80241EEC /* BA6660 80241EE0 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_07/BAA140/func_80240000_BAA140.s b/ver/us/asm/nonmatchings/world/area_mim/mim_07/BAA140/func_80240000_BAA140.s deleted file mode 100644 index 899ada72c9..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_07/BAA140/func_80240000_BAA140.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_BAA140 -/* BAA140 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BAA144 80240004 AFBF0010 */ sw $ra, 0x10($sp) -/* BAA148 80240008 0C046ED4 */ jal enable_world_fog -/* BAA14C 8024000C 00000000 */ nop -/* BAA150 80240010 240403DE */ addiu $a0, $zero, 0x3de -/* BAA154 80240014 0C046EDD */ jal set_world_fog_dist -/* BAA158 80240018 240503E8 */ addiu $a1, $zero, 0x3e8 -/* BAA15C 8024001C 0000202D */ daddu $a0, $zero, $zero -/* BAA160 80240020 0080282D */ daddu $a1, $a0, $zero -/* BAA164 80240024 0080302D */ daddu $a2, $a0, $zero -/* BAA168 80240028 0C046EE2 */ jal set_world_fog_color -/* BAA16C 8024002C 240700FF */ addiu $a3, $zero, 0xff -/* BAA170 80240030 0C048BFB */ jal enable_entity_fog -/* BAA174 80240034 00000000 */ nop -/* BAA178 80240038 240403DE */ addiu $a0, $zero, 0x3de -/* BAA17C 8024003C 0C048C04 */ jal set_entity_fog_dist -/* BAA180 80240040 240503E8 */ addiu $a1, $zero, 0x3e8 -/* BAA184 80240044 0000202D */ daddu $a0, $zero, $zero -/* BAA188 80240048 0080282D */ daddu $a1, $a0, $zero -/* BAA18C 8024004C 0080302D */ daddu $a2, $a0, $zero -/* BAA190 80240050 0C048C0A */ jal set_entity_fog_color -/* BAA194 80240054 240700FF */ addiu $a3, $zero, 0xff -/* BAA198 80240058 8FBF0010 */ lw $ra, 0x10($sp) -/* BAA19C 8024005C 24020002 */ addiu $v0, $zero, 2 -/* BAA1A0 80240060 03E00008 */ jr $ra -/* BAA1A4 80240064 27BD0018 */ addiu $sp, $sp, 0x18 -/* BAA1A8 80240068 00000000 */ nop -/* BAA1AC 8024006C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_07/BAA1B0/func_80240070_BAA1B0.s b/ver/us/asm/nonmatchings/world/area_mim/mim_07/BAA1B0/func_80240070_BAA1B0.s deleted file mode 100644 index 3ab3da209a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_07/BAA1B0/func_80240070_BAA1B0.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240070_BAA1B0 -/* BAA1B0 80240070 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BAA1B4 80240074 AFBF0010 */ sw $ra, 0x10($sp) -/* BAA1B8 80240078 0C046ED4 */ jal enable_world_fog -/* BAA1BC 8024007C 00000000 */ nop -/* BAA1C0 80240080 240403DE */ addiu $a0, $zero, 0x3de -/* BAA1C4 80240084 0C046EDD */ jal set_world_fog_dist -/* BAA1C8 80240088 240503E8 */ addiu $a1, $zero, 0x3e8 -/* BAA1CC 8024008C 0000202D */ daddu $a0, $zero, $zero -/* BAA1D0 80240090 0080282D */ daddu $a1, $a0, $zero -/* BAA1D4 80240094 0080302D */ daddu $a2, $a0, $zero -/* BAA1D8 80240098 0C046EE2 */ jal set_world_fog_color -/* BAA1DC 8024009C 240700FF */ addiu $a3, $zero, 0xff -/* BAA1E0 802400A0 0C048BFB */ jal enable_entity_fog -/* BAA1E4 802400A4 00000000 */ nop -/* BAA1E8 802400A8 240403DE */ addiu $a0, $zero, 0x3de -/* BAA1EC 802400AC 0C048C04 */ jal set_entity_fog_dist -/* BAA1F0 802400B0 240503E8 */ addiu $a1, $zero, 0x3e8 -/* BAA1F4 802400B4 0000202D */ daddu $a0, $zero, $zero -/* BAA1F8 802400B8 0080282D */ daddu $a1, $a0, $zero -/* BAA1FC 802400BC 0080302D */ daddu $a2, $a0, $zero -/* BAA200 802400C0 0C048C0A */ jal set_entity_fog_color -/* BAA204 802400C4 240700FF */ addiu $a3, $zero, 0xff -/* BAA208 802400C8 8FBF0010 */ lw $ra, 0x10($sp) -/* BAA20C 802400CC 24020002 */ addiu $v0, $zero, 2 -/* BAA210 802400D0 03E00008 */ jr $ra -/* BAA214 802400D4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240000_BAD940.s b/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240000_BAD940.s deleted file mode 100644 index d5b2be416d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240000_BAD940.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_BAD940 -/* BAD940 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BAD944 80240004 AFBF0010 */ sw $ra, 0x10($sp) -/* BAD948 80240008 0C046ED4 */ jal enable_world_fog -/* BAD94C 8024000C 00000000 */ nop -/* BAD950 80240010 240403DE */ addiu $a0, $zero, 0x3de -/* BAD954 80240014 0C046EDD */ jal set_world_fog_dist -/* BAD958 80240018 240503E8 */ addiu $a1, $zero, 0x3e8 -/* BAD95C 8024001C 0000202D */ daddu $a0, $zero, $zero -/* BAD960 80240020 0080282D */ daddu $a1, $a0, $zero -/* BAD964 80240024 0080302D */ daddu $a2, $a0, $zero -/* BAD968 80240028 0C046EE2 */ jal set_world_fog_color -/* BAD96C 8024002C 240700FF */ addiu $a3, $zero, 0xff -/* BAD970 80240030 0C048BFB */ jal enable_entity_fog -/* BAD974 80240034 00000000 */ nop -/* BAD978 80240038 240403DE */ addiu $a0, $zero, 0x3de -/* BAD97C 8024003C 0C048C04 */ jal set_entity_fog_dist -/* BAD980 80240040 240503E8 */ addiu $a1, $zero, 0x3e8 -/* BAD984 80240044 0000202D */ daddu $a0, $zero, $zero -/* BAD988 80240048 0080282D */ daddu $a1, $a0, $zero -/* BAD98C 8024004C 0080302D */ daddu $a2, $a0, $zero -/* BAD990 80240050 0C048C0A */ jal set_entity_fog_color -/* BAD994 80240054 240700FF */ addiu $a3, $zero, 0xff -/* BAD998 80240058 8FBF0010 */ lw $ra, 0x10($sp) -/* BAD99C 8024005C 24020002 */ addiu $v0, $zero, 2 -/* BAD9A0 80240060 03E00008 */ jr $ra -/* BAD9A4 80240064 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242A10_BB0350.s b/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242A10_BB0350.s deleted file mode 100644 index 39a66d3de1..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242A10_BB0350.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242A10_BB0350 -/* BB0350 80242A10 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BB0354 80242A14 AFB10014 */ sw $s1, 0x14($sp) -/* BB0358 80242A18 0080882D */ daddu $s1, $a0, $zero -/* BB035C 80242A1C AFBF0018 */ sw $ra, 0x18($sp) -/* BB0360 80242A20 AFB00010 */ sw $s0, 0x10($sp) -/* BB0364 80242A24 8E300148 */ lw $s0, 0x148($s1) -/* BB0368 80242A28 0C00EABB */ jal get_npc_unsafe -/* BB036C 80242A2C 86040008 */ lh $a0, 8($s0) -/* BB0370 80242A30 0040202D */ daddu $a0, $v0, $zero -/* BB0374 80242A34 9482008E */ lhu $v0, 0x8e($a0) -/* BB0378 80242A38 2442FFFF */ addiu $v0, $v0, -1 -/* BB037C 80242A3C A482008E */ sh $v0, 0x8e($a0) -/* BB0380 80242A40 00021400 */ sll $v0, $v0, 0x10 -/* BB0384 80242A44 8E030098 */ lw $v1, 0x98($s0) -/* BB0388 80242A48 00021403 */ sra $v0, $v0, 0x10 -/* BB038C 80242A4C 0062182A */ slt $v1, $v1, $v0 -/* BB0390 80242A50 14600005 */ bnez $v1, .L80242A68 -/* BB0394 80242A54 3C03E0EF */ lui $v1, 0xe0ef -/* BB0398 80242A58 8E020000 */ lw $v0, ($s0) -/* BB039C 80242A5C 3463FFFF */ ori $v1, $v1, 0xffff -/* BB03A0 80242A60 00431024 */ and $v0, $v0, $v1 -/* BB03A4 80242A64 AE020000 */ sw $v0, ($s0) -.L80242A68: -/* BB03A8 80242A68 8482008E */ lh $v0, 0x8e($a0) -/* BB03AC 80242A6C 14400007 */ bnez $v0, .L80242A8C -/* BB03B0 80242A70 00000000 */ nop -/* BB03B4 80242A74 8E0200CC */ lw $v0, 0xcc($s0) -/* BB03B8 80242A78 8C420028 */ lw $v0, 0x28($v0) -/* BB03BC 80242A7C A480008E */ sh $zero, 0x8e($a0) -/* BB03C0 80242A80 AC820028 */ sw $v0, 0x28($a0) -/* BB03C4 80242A84 2402000C */ addiu $v0, $zero, 0xc -/* BB03C8 80242A88 AE220070 */ sw $v0, 0x70($s1) -.L80242A8C: -/* BB03CC 80242A8C 8FBF0018 */ lw $ra, 0x18($sp) -/* BB03D0 80242A90 8FB10014 */ lw $s1, 0x14($sp) -/* BB03D4 80242A94 8FB00010 */ lw $s0, 0x10($sp) -/* BB03D8 80242A98 03E00008 */ jr $ra -/* BB03DC 80242A9C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242BA0_BB04E0.s b/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242BA0_BB04E0.s deleted file mode 100644 index ed608fe770..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242BA0_BB04E0.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242BA0_BB04E0 -/* BB04E0 80242BA0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BB04E4 80242BA4 AFB10014 */ sw $s1, 0x14($sp) -/* BB04E8 80242BA8 0080882D */ daddu $s1, $a0, $zero -/* BB04EC 80242BAC AFBF0018 */ sw $ra, 0x18($sp) -/* BB04F0 80242BB0 AFB00010 */ sw $s0, 0x10($sp) -/* BB04F4 80242BB4 8E300148 */ lw $s0, 0x148($s1) -/* BB04F8 80242BB8 0C00EABB */ jal get_npc_unsafe -/* BB04FC 80242BBC 86040008 */ lh $a0, 8($s0) -/* BB0500 80242BC0 0040182D */ daddu $v1, $v0, $zero -/* BB0504 80242BC4 9462008E */ lhu $v0, 0x8e($v1) -/* BB0508 80242BC8 2442FFFF */ addiu $v0, $v0, -1 -/* BB050C 80242BCC A462008E */ sh $v0, 0x8e($v1) -/* BB0510 80242BD0 00021400 */ sll $v0, $v0, 0x10 -/* BB0514 80242BD4 14400005 */ bnez $v0, .L80242BEC -/* BB0518 80242BD8 00000000 */ nop -/* BB051C 80242BDC 960200AA */ lhu $v0, 0xaa($s0) -/* BB0520 80242BE0 A462008E */ sh $v0, 0x8e($v1) -/* BB0524 80242BE4 2402000E */ addiu $v0, $zero, 0xe -/* BB0528 80242BE8 AE220070 */ sw $v0, 0x70($s1) -.L80242BEC: -/* BB052C 80242BEC 8FBF0018 */ lw $ra, 0x18($sp) -/* BB0530 80242BF0 8FB10014 */ lw $s1, 0x14($sp) -/* BB0534 80242BF4 8FB00010 */ lw $s0, 0x10($sp) -/* BB0538 80242BF8 03E00008 */ jr $ra -/* BB053C 80242BFC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242C00_BB0540.s b/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242C00_BB0540.s deleted file mode 100644 index 498919f840..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242C00_BB0540.s +++ /dev/null @@ -1,65 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242C00_BB0540 -/* BB0540 80242C00 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* BB0544 80242C04 AFB40040 */ sw $s4, 0x40($sp) -/* BB0548 80242C08 0080A02D */ daddu $s4, $a0, $zero -/* BB054C 80242C0C AFBF0044 */ sw $ra, 0x44($sp) -/* BB0550 80242C10 AFB3003C */ sw $s3, 0x3c($sp) -/* BB0554 80242C14 AFB20038 */ sw $s2, 0x38($sp) -/* BB0558 80242C18 AFB10034 */ sw $s1, 0x34($sp) -/* BB055C 80242C1C AFB00030 */ sw $s0, 0x30($sp) -/* BB0560 80242C20 8E910148 */ lw $s1, 0x148($s4) -/* BB0564 80242C24 00A0902D */ daddu $s2, $a1, $zero -/* BB0568 80242C28 86240008 */ lh $a0, 8($s1) -/* BB056C 80242C2C 0C00EABB */ jal get_npc_unsafe -/* BB0570 80242C30 00C0982D */ daddu $s3, $a2, $zero -/* BB0574 80242C34 0040802D */ daddu $s0, $v0, $zero -/* BB0578 80242C38 9602008E */ lhu $v0, 0x8e($s0) -/* BB057C 80242C3C 2442FFFF */ addiu $v0, $v0, -1 -/* BB0580 80242C40 A602008E */ sh $v0, 0x8e($s0) -/* BB0584 80242C44 00021400 */ sll $v0, $v0, 0x10 -/* BB0588 80242C48 14400020 */ bnez $v0, .L80242CCC -/* BB058C 80242C4C 0260202D */ daddu $a0, $s3, $zero -/* BB0590 80242C50 AFA00010 */ sw $zero, 0x10($sp) -/* BB0594 80242C54 8E46000C */ lw $a2, 0xc($s2) -/* BB0598 80242C58 8E470010 */ lw $a3, 0x10($s2) -/* BB059C 80242C5C 0C01242D */ jal func_800490B4 -/* BB05A0 80242C60 0220282D */ daddu $a1, $s1, $zero -/* BB05A4 80242C64 54400018 */ bnel $v0, $zero, .L80242CC8 -/* BB05A8 80242C68 A600008E */ sh $zero, 0x8e($s0) -/* BB05AC 80242C6C 24040002 */ addiu $a0, $zero, 2 -/* BB05B0 80242C70 0200282D */ daddu $a1, $s0, $zero -/* BB05B4 80242C74 0000302D */ daddu $a2, $zero, $zero -/* BB05B8 80242C78 860300A8 */ lh $v1, 0xa8($s0) -/* BB05BC 80242C7C 3C013F80 */ lui $at, 0x3f80 -/* BB05C0 80242C80 44810000 */ mtc1 $at, $f0 -/* BB05C4 80242C84 3C014000 */ lui $at, 0x4000 -/* BB05C8 80242C88 44811000 */ mtc1 $at, $f2 -/* BB05CC 80242C8C 3C01C1A0 */ lui $at, 0xc1a0 -/* BB05D0 80242C90 44812000 */ mtc1 $at, $f4 -/* BB05D4 80242C94 2402000F */ addiu $v0, $zero, 0xf -/* BB05D8 80242C98 AFA2001C */ sw $v0, 0x1c($sp) -/* BB05DC 80242C9C 44833000 */ mtc1 $v1, $f6 -/* BB05E0 80242CA0 00000000 */ nop -/* BB05E4 80242CA4 468031A0 */ cvt.s.w $f6, $f6 -/* BB05E8 80242CA8 44073000 */ mfc1 $a3, $f6 -/* BB05EC 80242CAC 27A20028 */ addiu $v0, $sp, 0x28 -/* BB05F0 80242CB0 AFA20020 */ sw $v0, 0x20($sp) -/* BB05F4 80242CB4 E7A00010 */ swc1 $f0, 0x10($sp) -/* BB05F8 80242CB8 E7A20014 */ swc1 $f2, 0x14($sp) -/* BB05FC 80242CBC 0C01BFA4 */ jal fx_emote -/* BB0600 80242CC0 E7A40018 */ swc1 $f4, 0x18($sp) -/* BB0604 80242CC4 A600008E */ sh $zero, 0x8e($s0) -.L80242CC8: -/* BB0608 80242CC8 AE800070 */ sw $zero, 0x70($s4) -.L80242CCC: -/* BB060C 80242CCC 8FBF0044 */ lw $ra, 0x44($sp) -/* BB0610 80242CD0 8FB40040 */ lw $s4, 0x40($sp) -/* BB0614 80242CD4 8FB3003C */ lw $s3, 0x3c($sp) -/* BB0618 80242CD8 8FB20038 */ lw $s2, 0x38($sp) -/* BB061C 80242CDC 8FB10034 */ lw $s1, 0x34($sp) -/* BB0620 80242CE0 8FB00030 */ lw $s0, 0x30($sp) -/* BB0624 80242CE4 03E00008 */ jr $ra -/* BB0628 80242CE8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242CEC_BB062C.s b/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242CEC_BB062C.s index cd539657d4..6216ea1a04 100644 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242CEC_BB062C.s +++ b/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242CEC_BB062C.s @@ -118,7 +118,7 @@ glabel func_80242CEC_BB062C .L80242E94: /* BB07D4 80242E94 0240202D */ daddu $a0, $s2, $zero /* BB07D8 80242E98 0260282D */ daddu $a1, $s3, $zero -/* BB07DC 80242E9C 0C090A84 */ jal func_80242A10_BB0350 +/* BB07DC 80242E9C 0C090A84 */ jal mim_08_UnkNpcDurationFlagFunc3 /* BB07E0 80242EA0 0280302D */ daddu $a2, $s4, $zero /* BB07E4 80242EA4 8E430070 */ lw $v1, 0x70($s2) /* BB07E8 80242EA8 2402000C */ addiu $v0, $zero, 0xc @@ -136,7 +136,7 @@ glabel func_80242CEC_BB062C .L80242ED4: /* BB0814 80242ED4 0240202D */ daddu $a0, $s2, $zero /* BB0818 80242ED8 0260282D */ daddu $a1, $s3, $zero -/* BB081C 80242EDC 0C090AE8 */ jal func_80242BA0_BB04E0 +/* BB081C 80242EDC 0C090AE8 */ jal mim_08_UnkNpcDurationFlagFunc2 /* BB0820 80242EE0 0280302D */ daddu $a2, $s4, $zero /* BB0824 80242EE4 8E430070 */ lw $v1, 0x70($s2) /* BB0828 80242EE8 2402000E */ addiu $v0, $zero, 0xe @@ -145,7 +145,7 @@ glabel func_80242CEC_BB062C /* BB0834 80242EF4 0240202D */ daddu $a0, $s2, $zero .L80242EF8: /* BB0838 80242EF8 0260282D */ daddu $a1, $s3, $zero -/* BB083C 80242EFC 0C090B00 */ jal func_80242C00_BB0540 +/* BB083C 80242EFC 0C090B00 */ jal mim_08_UnkNpcAIFunc30 /* BB0840 80242F00 0280302D */ daddu $a2, $s4, $zero /* BB0844 80242F04 08090BC5 */ j .L80242F14 /* BB0848 80242F08 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240000_BB2E00.s b/ver/us/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240000_BB2E00.s deleted file mode 100644 index f39f0ada8a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240000_BB2E00.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_BB2E00 -/* BB2E00 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BB2E04 80240004 AFBF0010 */ sw $ra, 0x10($sp) -/* BB2E08 80240008 0C046ED4 */ jal enable_world_fog -/* BB2E0C 8024000C 00000000 */ nop -/* BB2E10 80240010 240403DE */ addiu $a0, $zero, 0x3de -/* BB2E14 80240014 0C046EDD */ jal set_world_fog_dist -/* BB2E18 80240018 240503E8 */ addiu $a1, $zero, 0x3e8 -/* BB2E1C 8024001C 0000202D */ daddu $a0, $zero, $zero -/* BB2E20 80240020 0080282D */ daddu $a1, $a0, $zero -/* BB2E24 80240024 0080302D */ daddu $a2, $a0, $zero -/* BB2E28 80240028 0C046EE2 */ jal set_world_fog_color -/* BB2E2C 8024002C 240700FF */ addiu $a3, $zero, 0xff -/* BB2E30 80240030 0C048BFB */ jal enable_entity_fog -/* BB2E34 80240034 00000000 */ nop -/* BB2E38 80240038 240403DE */ addiu $a0, $zero, 0x3de -/* BB2E3C 8024003C 0C048C04 */ jal set_entity_fog_dist -/* BB2E40 80240040 240503E8 */ addiu $a1, $zero, 0x3e8 -/* BB2E44 80240044 0000202D */ daddu $a0, $zero, $zero -/* BB2E48 80240048 0080282D */ daddu $a1, $a0, $zero -/* BB2E4C 8024004C 0080302D */ daddu $a2, $a0, $zero -/* BB2E50 80240050 0C048C0A */ jal set_entity_fog_color -/* BB2E54 80240054 240700FF */ addiu $a3, $zero, 0xff -/* BB2E58 80240058 8FBF0010 */ lw $ra, 0x10($sp) -/* BB2E5C 8024005C 24020002 */ addiu $v0, $zero, 2 -/* BB2E60 80240060 03E00008 */ jr $ra -/* BB2E64 80240064 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240B48_D9E018.s b/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240B48_D9E018.s deleted file mode 100644 index f658161387..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240B48_D9E018.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B48_D9E018 -/* D9E018 80240B48 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D9E01C 80240B4C AFB10014 */ sw $s1, 0x14($sp) -/* D9E020 80240B50 0080882D */ daddu $s1, $a0, $zero -/* D9E024 80240B54 AFBF0018 */ sw $ra, 0x18($sp) -/* D9E028 80240B58 AFB00010 */ sw $s0, 0x10($sp) -/* D9E02C 80240B5C 8E300148 */ lw $s0, 0x148($s1) -/* D9E030 80240B60 0C00EABB */ jal get_npc_unsafe -/* D9E034 80240B64 86040008 */ lh $a0, 8($s0) -/* D9E038 80240B68 0040182D */ daddu $v1, $v0, $zero -/* D9E03C 80240B6C 9462008E */ lhu $v0, 0x8e($v1) -/* D9E040 80240B70 2442FFFF */ addiu $v0, $v0, -1 -/* D9E044 80240B74 A462008E */ sh $v0, 0x8e($v1) -/* D9E048 80240B78 00021400 */ sll $v0, $v0, 0x10 -/* D9E04C 80240B7C 14400005 */ bnez $v0, .L80240B94 -/* D9E050 80240B80 00000000 */ nop -/* D9E054 80240B84 8E0200CC */ lw $v0, 0xcc($s0) -/* D9E058 80240B88 8C420000 */ lw $v0, ($v0) -/* D9E05C 80240B8C AC620028 */ sw $v0, 0x28($v1) -/* D9E060 80240B90 AE200070 */ sw $zero, 0x70($s1) -.L80240B94: -/* D9E064 80240B94 8FBF0018 */ lw $ra, 0x18($sp) -/* D9E068 80240B98 8FB10014 */ lw $s1, 0x14($sp) -/* D9E06C 80240B9C 8FB00010 */ lw $s0, 0x10($sp) -/* D9E070 80240BA0 03E00008 */ jr $ra -/* D9E074 80240BA4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240BA8_D9E078.s b/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240BA8_D9E078.s index c72fbb6a83..311edbe0c6 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240BA8_D9E078.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240BA8_D9E078.s @@ -216,7 +216,7 @@ glabel L80240E74_D9E344 glabel L80240E94_D9E364 /* D9E364 80240E94 0260202D */ daddu $a0, $s3, $zero /* D9E368 80240E98 0280282D */ daddu $a1, $s4, $zero -/* D9E36C 80240E9C 0C0902D2 */ jal func_80240B48_D9E018 +/* D9E36C 80240E9C 0C0902D2 */ jal omo_02_UnkNpcDurationAnimationFunc /* D9E370 80240EA0 02A0302D */ daddu $a2, $s5, $zero /* D9E374 80240EA4 080903AD */ j L80240EB4_D9E384 /* D9E378 80240EA8 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241A70_DAEE70.s b/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241A70_DAEE70.s deleted file mode 100644 index 902353b5c8..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241A70_DAEE70.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A70_DAEE70 -/* DAEE70 80241A70 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DAEE74 80241A74 AFB10014 */ sw $s1, 0x14($sp) -/* DAEE78 80241A78 0080882D */ daddu $s1, $a0, $zero -/* DAEE7C 80241A7C AFBF0018 */ sw $ra, 0x18($sp) -/* DAEE80 80241A80 AFB00010 */ sw $s0, 0x10($sp) -/* DAEE84 80241A84 8E300148 */ lw $s0, 0x148($s1) -/* DAEE88 80241A88 0C00EABB */ jal get_npc_unsafe -/* DAEE8C 80241A8C 86040008 */ lh $a0, 8($s0) -/* DAEE90 80241A90 0040182D */ daddu $v1, $v0, $zero -/* DAEE94 80241A94 9462008E */ lhu $v0, 0x8e($v1) -/* DAEE98 80241A98 2442FFFF */ addiu $v0, $v0, -1 -/* DAEE9C 80241A9C A462008E */ sh $v0, 0x8e($v1) -/* DAEEA0 80241AA0 00021400 */ sll $v0, $v0, 0x10 -/* DAEEA4 80241AA4 14400005 */ bnez $v0, .L80241ABC -/* DAEEA8 80241AA8 00000000 */ nop -/* DAEEAC 80241AAC 8E0200CC */ lw $v0, 0xcc($s0) -/* DAEEB0 80241AB0 8C420000 */ lw $v0, ($v0) -/* DAEEB4 80241AB4 AC620028 */ sw $v0, 0x28($v1) -/* DAEEB8 80241AB8 AE200070 */ sw $zero, 0x70($s1) -.L80241ABC: -/* DAEEBC 80241ABC 8FBF0018 */ lw $ra, 0x18($sp) -/* DAEEC0 80241AC0 8FB10014 */ lw $s1, 0x14($sp) -/* DAEEC4 80241AC4 8FB00010 */ lw $s0, 0x10($sp) -/* DAEEC8 80241AC8 03E00008 */ jr $ra -/* DAEECC 80241ACC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241AD0_DAEED0.s b/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241AD0_DAEED0.s index efc01ebd3c..01285bc358 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241AD0_DAEED0.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241AD0_DAEED0.s @@ -216,7 +216,7 @@ glabel L80241D9C_DAF19C glabel L80241DBC_DAF1BC /* DAF1BC 80241DBC 0260202D */ daddu $a0, $s3, $zero /* DAF1C0 80241DC0 0280282D */ daddu $a1, $s4, $zero -/* DAF1C4 80241DC4 0C09069C */ jal func_80241A70_DAEE70 +/* DAF1C4 80241DC4 0C09069C */ jal omo_04_UnkNpcDurationAnimationFunc /* DAF1C8 80241DC8 02A0302D */ daddu $a2, $s5, $zero /* DAF1CC 80241DCC 08090777 */ j L80241DDC_DAF1DC /* DAF1D0 80241DD0 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802401D8_DB2498.s b/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802401D8_DB2498.s deleted file mode 100644 index 60cbfea14e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802401D8_DB2498.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D8_DB2498 -/* DB2498 802401D8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DB249C 802401DC AFB10014 */ sw $s1, 0x14($sp) -/* DB24A0 802401E0 0080882D */ daddu $s1, $a0, $zero -/* DB24A4 802401E4 AFBF0018 */ sw $ra, 0x18($sp) -/* DB24A8 802401E8 AFB00010 */ sw $s0, 0x10($sp) -/* DB24AC 802401EC 8E300148 */ lw $s0, 0x148($s1) -/* DB24B0 802401F0 0C00EABB */ jal get_npc_unsafe -/* DB24B4 802401F4 86040008 */ lh $a0, 8($s0) -/* DB24B8 802401F8 0040182D */ daddu $v1, $v0, $zero -/* DB24BC 802401FC 9462008E */ lhu $v0, 0x8e($v1) -/* DB24C0 80240200 2442FFFF */ addiu $v0, $v0, -1 -/* DB24C4 80240204 A462008E */ sh $v0, 0x8e($v1) -/* DB24C8 80240208 00021400 */ sll $v0, $v0, 0x10 -/* DB24CC 8024020C 14400005 */ bnez $v0, .L80240224 -/* DB24D0 80240210 00000000 */ nop -/* DB24D4 80240214 8E0200CC */ lw $v0, 0xcc($s0) -/* DB24D8 80240218 8C420000 */ lw $v0, ($v0) -/* DB24DC 8024021C AC620028 */ sw $v0, 0x28($v1) -/* DB24E0 80240220 AE200070 */ sw $zero, 0x70($s1) -.L80240224: -/* DB24E4 80240224 8FBF0018 */ lw $ra, 0x18($sp) -/* DB24E8 80240228 8FB10014 */ lw $s1, 0x14($sp) -/* DB24EC 8024022C 8FB00010 */ lw $s0, 0x10($sp) -/* DB24F0 80240230 03E00008 */ jr $ra -/* DB24F4 80240234 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240238_DB24F8.s b/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240238_DB24F8.s index d300e76fc6..f05b6329f9 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240238_DB24F8.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240238_DB24F8.s @@ -216,7 +216,7 @@ glabel L80240504_DB27C4 glabel L80240524_DB27E4 /* DB27E4 80240524 0260202D */ daddu $a0, $s3, $zero /* DB27E8 80240528 0280282D */ daddu $a1, $s4, $zero -/* DB27EC 8024052C 0C090076 */ jal func_802401D8_DB2498 +/* DB27EC 8024052C 0C090076 */ jal omo_05_UnkNpcDurationAnimationFunc /* DB27F0 80240530 02A0302D */ daddu $a2, $s5, $zero /* DB27F4 80240534 08090151 */ j L80240544_DB2804 /* DB27F8 80240538 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_802401D8_DBD488.s b/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_802401D8_DBD488.s deleted file mode 100644 index 9896cb0574..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_802401D8_DBD488.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D8_DBD488 -/* DBD488 802401D8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DBD48C 802401DC AFB10014 */ sw $s1, 0x14($sp) -/* DBD490 802401E0 0080882D */ daddu $s1, $a0, $zero -/* DBD494 802401E4 AFBF0018 */ sw $ra, 0x18($sp) -/* DBD498 802401E8 AFB00010 */ sw $s0, 0x10($sp) -/* DBD49C 802401EC 8E300148 */ lw $s0, 0x148($s1) -/* DBD4A0 802401F0 0C00EABB */ jal get_npc_unsafe -/* DBD4A4 802401F4 86040008 */ lh $a0, 8($s0) -/* DBD4A8 802401F8 0040182D */ daddu $v1, $v0, $zero -/* DBD4AC 802401FC 9462008E */ lhu $v0, 0x8e($v1) -/* DBD4B0 80240200 2442FFFF */ addiu $v0, $v0, -1 -/* DBD4B4 80240204 A462008E */ sh $v0, 0x8e($v1) -/* DBD4B8 80240208 00021400 */ sll $v0, $v0, 0x10 -/* DBD4BC 8024020C 14400005 */ bnez $v0, .L80240224 -/* DBD4C0 80240210 00000000 */ nop -/* DBD4C4 80240214 8E0200CC */ lw $v0, 0xcc($s0) -/* DBD4C8 80240218 8C420000 */ lw $v0, ($v0) -/* DBD4CC 8024021C AC620028 */ sw $v0, 0x28($v1) -/* DBD4D0 80240220 AE200070 */ sw $zero, 0x70($s1) -.L80240224: -/* DBD4D4 80240224 8FBF0018 */ lw $ra, 0x18($sp) -/* DBD4D8 80240228 8FB10014 */ lw $s1, 0x14($sp) -/* DBD4DC 8024022C 8FB00010 */ lw $s0, 0x10($sp) -/* DBD4E0 80240230 03E00008 */ jr $ra -/* DBD4E4 80240234 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240238_DBD4E8.s b/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240238_DBD4E8.s index 0a5c2da793..a45dfce5c0 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240238_DBD4E8.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240238_DBD4E8.s @@ -216,7 +216,7 @@ glabel L80240504_DBD7B4 glabel L80240524_DBD7D4 /* DBD7D4 80240524 0260202D */ daddu $a0, $s3, $zero /* DBD7D8 80240528 0280282D */ daddu $a1, $s4, $zero -/* DBD7DC 8024052C 0C090076 */ jal func_802401D8_DBD488 +/* DBD7DC 8024052C 0C090076 */ jal omo_07_UnkNpcDurationAnimationFunc /* DBD7E0 80240530 02A0302D */ daddu $a2, $s5, $zero /* DBD7E4 80240534 08090151 */ j L80240544_DBD7F4 /* DBD7E8 80240538 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_802415D4_DBE884.s b/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_802415D4_DBE884.s deleted file mode 100644 index 102b24d823..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_802415D4_DBE884.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802415D4_DBE884 -/* DBE884 802415D4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DBE888 802415D8 AFB10014 */ sw $s1, 0x14($sp) -/* DBE88C 802415DC 0080882D */ daddu $s1, $a0, $zero -/* DBE890 802415E0 AFBF0018 */ sw $ra, 0x18($sp) -/* DBE894 802415E4 AFB00010 */ sw $s0, 0x10($sp) -/* DBE898 802415E8 8E300148 */ lw $s0, 0x148($s1) -/* DBE89C 802415EC 0C00EABB */ jal get_npc_unsafe -/* DBE8A0 802415F0 86040008 */ lh $a0, 8($s0) -/* DBE8A4 802415F4 0040182D */ daddu $v1, $v0, $zero -/* DBE8A8 802415F8 9462008E */ lhu $v0, 0x8e($v1) -/* DBE8AC 802415FC 2442FFFF */ addiu $v0, $v0, -1 -/* DBE8B0 80241600 A462008E */ sh $v0, 0x8e($v1) -/* DBE8B4 80241604 00021400 */ sll $v0, $v0, 0x10 -/* DBE8B8 80241608 14400005 */ bnez $v0, .L80241620 -/* DBE8BC 8024160C 00000000 */ nop -/* DBE8C0 80241610 8E0200CC */ lw $v0, 0xcc($s0) -/* DBE8C4 80241614 8C420000 */ lw $v0, ($v0) -/* DBE8C8 80241618 AC620028 */ sw $v0, 0x28($v1) -/* DBE8CC 8024161C AE200070 */ sw $zero, 0x70($s1) -.L80241620: -/* DBE8D0 80241620 8FBF0018 */ lw $ra, 0x18($sp) -/* DBE8D4 80241624 8FB10014 */ lw $s1, 0x14($sp) -/* DBE8D8 80241628 8FB00010 */ lw $s0, 0x10($sp) -/* DBE8DC 8024162C 03E00008 */ jr $ra -/* DBE8E0 80241630 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241634_DBE8E4.s b/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241634_DBE8E4.s index b6e4e177b5..f4e5d667f5 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241634_DBE8E4.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241634_DBE8E4.s @@ -221,7 +221,7 @@ glabel L80241910_DBEBC0 glabel L80241930_DBEBE0 /* DBEBE0 80241930 0260202D */ daddu $a0, $s3, $zero /* DBEBE4 80241934 0280282D */ daddu $a1, $s4, $zero -/* DBEBE8 80241938 0C090575 */ jal func_802415D4_DBE884 +/* DBEBE8 80241938 0C090575 */ jal dup_omo_07_UnkNpcDurationAnimationFunc /* DBEBEC 8024193C 02A0302D */ daddu $a2, $s5, $zero /* DBEBF0 80241940 08090654 */ j L80241950_DBEC00 /* DBEBF4 80241944 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_80240A48_DC4E18.s b/ver/us/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_80240A48_DC4E18.s deleted file mode 100644 index 34d9e8b82e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_80240A48_DC4E18.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A48_DC4E18 -/* DC4E18 80240A48 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DC4E1C 80240A4C AFB10014 */ sw $s1, 0x14($sp) -/* DC4E20 80240A50 0080882D */ daddu $s1, $a0, $zero -/* DC4E24 80240A54 AFBF0018 */ sw $ra, 0x18($sp) -/* DC4E28 80240A58 AFB00010 */ sw $s0, 0x10($sp) -/* DC4E2C 80240A5C 8E300148 */ lw $s0, 0x148($s1) -/* DC4E30 80240A60 0C00EABB */ jal get_npc_unsafe -/* DC4E34 80240A64 86040008 */ lh $a0, 8($s0) -/* DC4E38 80240A68 0040182D */ daddu $v1, $v0, $zero -/* DC4E3C 80240A6C 9462008E */ lhu $v0, 0x8e($v1) -/* DC4E40 80240A70 2442FFFF */ addiu $v0, $v0, -1 -/* DC4E44 80240A74 A462008E */ sh $v0, 0x8e($v1) -/* DC4E48 80240A78 00021400 */ sll $v0, $v0, 0x10 -/* DC4E4C 80240A7C 14400005 */ bnez $v0, .L80240A94 -/* DC4E50 80240A80 00000000 */ nop -/* DC4E54 80240A84 8E0200CC */ lw $v0, 0xcc($s0) -/* DC4E58 80240A88 8C420000 */ lw $v0, ($v0) -/* DC4E5C 80240A8C AC620028 */ sw $v0, 0x28($v1) -/* DC4E60 80240A90 AE200070 */ sw $zero, 0x70($s1) -.L80240A94: -/* DC4E64 80240A94 8FBF0018 */ lw $ra, 0x18($sp) -/* DC4E68 80240A98 8FB10014 */ lw $s1, 0x14($sp) -/* DC4E6C 80240A9C 8FB00010 */ lw $s0, 0x10($sp) -/* DC4E70 80240AA0 03E00008 */ jr $ra -/* DC4E74 80240AA4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_80240AA8_DC4E78.s b/ver/us/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_80240AA8_DC4E78.s index 606726167b..b19724930e 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_80240AA8_DC4E78.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_80240AA8_DC4E78.s @@ -216,7 +216,7 @@ glabel L80240D74_DC5144 glabel L80240D94_DC5164 /* DC5164 80240D94 0260202D */ daddu $a0, $s3, $zero /* DC5168 80240D98 0280282D */ daddu $a1, $s4, $zero -/* DC516C 80240D9C 0C090292 */ jal func_80240A48_DC4E18 +/* DC516C 80240D9C 0C090292 */ jal omo_08_UnkNpcDurationAnimationFunc /* DC5170 80240DA0 02A0302D */ daddu $a2, $s5, $zero /* DC5174 80240DA4 0809036D */ j L80240DB4_DC5184 /* DC5178 80240DA8 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240BB8_DCD888.s b/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240BB8_DCD888.s deleted file mode 100644 index 6217a52412..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240BB8_DCD888.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BB8_DCD888 -/* DCD888 80240BB8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DCD88C 80240BBC AFB10014 */ sw $s1, 0x14($sp) -/* DCD890 80240BC0 0080882D */ daddu $s1, $a0, $zero -/* DCD894 80240BC4 AFBF0018 */ sw $ra, 0x18($sp) -/* DCD898 80240BC8 AFB00010 */ sw $s0, 0x10($sp) -/* DCD89C 80240BCC 8E300148 */ lw $s0, 0x148($s1) -/* DCD8A0 80240BD0 0C00EABB */ jal get_npc_unsafe -/* DCD8A4 80240BD4 86040008 */ lh $a0, 8($s0) -/* DCD8A8 80240BD8 0040182D */ daddu $v1, $v0, $zero -/* DCD8AC 80240BDC 9462008E */ lhu $v0, 0x8e($v1) -/* DCD8B0 80240BE0 2442FFFF */ addiu $v0, $v0, -1 -/* DCD8B4 80240BE4 A462008E */ sh $v0, 0x8e($v1) -/* DCD8B8 80240BE8 00021400 */ sll $v0, $v0, 0x10 -/* DCD8BC 80240BEC 14400005 */ bnez $v0, .L80240C04 -/* DCD8C0 80240BF0 00000000 */ nop -/* DCD8C4 80240BF4 8E0200CC */ lw $v0, 0xcc($s0) -/* DCD8C8 80240BF8 8C420000 */ lw $v0, ($v0) -/* DCD8CC 80240BFC AC620028 */ sw $v0, 0x28($v1) -/* DCD8D0 80240C00 AE200070 */ sw $zero, 0x70($s1) -.L80240C04: -/* DCD8D4 80240C04 8FBF0018 */ lw $ra, 0x18($sp) -/* DCD8D8 80240C08 8FB10014 */ lw $s1, 0x14($sp) -/* DCD8DC 80240C0C 8FB00010 */ lw $s0, 0x10($sp) -/* DCD8E0 80240C10 03E00008 */ jr $ra -/* DCD8E4 80240C14 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240C18_DCD8E8.s b/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240C18_DCD8E8.s index e84e959044..f15db67834 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240C18_DCD8E8.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240C18_DCD8E8.s @@ -216,7 +216,7 @@ glabel L80240EE4_DCDBB4 glabel L80240F04_DCDBD4 /* DCDBD4 80240F04 0260202D */ daddu $a0, $s3, $zero /* DCDBD8 80240F08 0280282D */ daddu $a1, $s4, $zero -/* DCDBDC 80240F0C 0C0902EE */ jal func_80240BB8_DCD888 +/* DCDBDC 80240F0C 0C0902EE */ jal omo_09_UnkNpcDurationAnimationFunc /* DCDBE0 80240F10 02A0302D */ daddu $a2, $s5, $zero /* DCDBE4 80240F14 080903C9 */ j L80240F24_DCDBF4 /* DCDBE8 80240F18 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241FB4_DCEC84.s b/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241FB4_DCEC84.s deleted file mode 100644 index d0c0d61f14..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241FB4_DCEC84.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241FB4_DCEC84 -/* DCEC84 80241FB4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DCEC88 80241FB8 AFB10014 */ sw $s1, 0x14($sp) -/* DCEC8C 80241FBC 0080882D */ daddu $s1, $a0, $zero -/* DCEC90 80241FC0 AFBF0018 */ sw $ra, 0x18($sp) -/* DCEC94 80241FC4 AFB00010 */ sw $s0, 0x10($sp) -/* DCEC98 80241FC8 8E300148 */ lw $s0, 0x148($s1) -/* DCEC9C 80241FCC 0C00EABB */ jal get_npc_unsafe -/* DCECA0 80241FD0 86040008 */ lh $a0, 8($s0) -/* DCECA4 80241FD4 0040182D */ daddu $v1, $v0, $zero -/* DCECA8 80241FD8 9462008E */ lhu $v0, 0x8e($v1) -/* DCECAC 80241FDC 2442FFFF */ addiu $v0, $v0, -1 -/* DCECB0 80241FE0 A462008E */ sh $v0, 0x8e($v1) -/* DCECB4 80241FE4 00021400 */ sll $v0, $v0, 0x10 -/* DCECB8 80241FE8 14400005 */ bnez $v0, .L80242000 -/* DCECBC 80241FEC 00000000 */ nop -/* DCECC0 80241FF0 8E0200CC */ lw $v0, 0xcc($s0) -/* DCECC4 80241FF4 8C420000 */ lw $v0, ($v0) -/* DCECC8 80241FF8 AC620028 */ sw $v0, 0x28($v1) -/* DCECCC 80241FFC AE200070 */ sw $zero, 0x70($s1) -.L80242000: -/* DCECD0 80242000 8FBF0018 */ lw $ra, 0x18($sp) -/* DCECD4 80242004 8FB10014 */ lw $s1, 0x14($sp) -/* DCECD8 80242008 8FB00010 */ lw $s0, 0x10($sp) -/* DCECDC 8024200C 03E00008 */ jr $ra -/* DCECE0 80242010 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242014_DCECE4.s b/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242014_DCECE4.s index 4d91149696..87b24b7d82 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242014_DCECE4.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242014_DCECE4.s @@ -221,7 +221,7 @@ glabel L802422F0_DCEFC0 glabel L80242310_DCEFE0 /* DCEFE0 80242310 0260202D */ daddu $a0, $s3, $zero /* DCEFE4 80242314 0280282D */ daddu $a1, $s4, $zero -/* DCEFE8 80242318 0C0907ED */ jal func_80241FB4_DCEC84 +/* DCEFE8 80242318 0C0907ED */ jal dup_omo_09_UnkNpcDurationAnimationFunc /* DCEFEC 8024231C 02A0302D */ daddu $a2, $s5, $zero /* DCEFF0 80242320 080908CC */ j L80242330_DCF000 /* DCEFF4 80242324 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240458_DE28E8.s b/ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240458_DE28E8.s deleted file mode 100644 index 4fac3e8e96..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240458_DE28E8.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240458_DE28E8 -/* DE28E8 80240458 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DE28EC 8024045C AFB10014 */ sw $s1, 0x14($sp) -/* DE28F0 80240460 0080882D */ daddu $s1, $a0, $zero -/* DE28F4 80240464 AFBF0018 */ sw $ra, 0x18($sp) -/* DE28F8 80240468 AFB00010 */ sw $s0, 0x10($sp) -/* DE28FC 8024046C 8E300148 */ lw $s0, 0x148($s1) -/* DE2900 80240470 0C00EABB */ jal get_npc_unsafe -/* DE2904 80240474 86040008 */ lh $a0, 8($s0) -/* DE2908 80240478 0040182D */ daddu $v1, $v0, $zero -/* DE290C 8024047C 9462008E */ lhu $v0, 0x8e($v1) -/* DE2910 80240480 2442FFFF */ addiu $v0, $v0, -1 -/* DE2914 80240484 A462008E */ sh $v0, 0x8e($v1) -/* DE2918 80240488 00021400 */ sll $v0, $v0, 0x10 -/* DE291C 8024048C 14400005 */ bnez $v0, .L802404A4 -/* DE2920 80240490 00000000 */ nop -/* DE2924 80240494 8E0200CC */ lw $v0, 0xcc($s0) -/* DE2928 80240498 8C420000 */ lw $v0, ($v0) -/* DE292C 8024049C AC620028 */ sw $v0, 0x28($v1) -/* DE2930 802404A0 AE200070 */ sw $zero, 0x70($s1) -.L802404A4: -/* DE2934 802404A4 8FBF0018 */ lw $ra, 0x18($sp) -/* DE2938 802404A8 8FB10014 */ lw $s1, 0x14($sp) -/* DE293C 802404AC 8FB00010 */ lw $s0, 0x10($sp) -/* DE2940 802404B0 03E00008 */ jr $ra -/* DE2944 802404B4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802404B8_DE2948.s b/ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802404B8_DE2948.s index d4c0021c9e..b464a8acec 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802404B8_DE2948.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802404B8_DE2948.s @@ -216,7 +216,7 @@ glabel L80240784_DE2C14 glabel L802407A4_DE2C34 /* DE2C34 802407A4 0260202D */ daddu $a0, $s3, $zero /* DE2C38 802407A8 0280282D */ daddu $a1, $s4, $zero -/* DE2C3C 802407AC 0C090116 */ jal func_80240458_DE28E8 +/* DE2C3C 802407AC 0C090116 */ jal omo_13_UnkNpcDurationAnimationFunc /* DE2C40 802407B0 02A0302D */ daddu $a2, $s5, $zero /* DE2C44 802407B4 080901F1 */ j L802407C4_DE2C54 /* DE2C48 802407B8 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240738_DEF5D8.s b/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240738_DEF5D8.s deleted file mode 100644 index b5fa9c8579..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240738_DEF5D8.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240738_DEF5D8 -/* DEF5D8 80240738 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DEF5DC 8024073C AFB10014 */ sw $s1, 0x14($sp) -/* DEF5E0 80240740 0080882D */ daddu $s1, $a0, $zero -/* DEF5E4 80240744 AFBF0018 */ sw $ra, 0x18($sp) -/* DEF5E8 80240748 AFB00010 */ sw $s0, 0x10($sp) -/* DEF5EC 8024074C 8E300148 */ lw $s0, 0x148($s1) -/* DEF5F0 80240750 0C00EABB */ jal get_npc_unsafe -/* DEF5F4 80240754 86040008 */ lh $a0, 8($s0) -/* DEF5F8 80240758 0040182D */ daddu $v1, $v0, $zero -/* DEF5FC 8024075C 9462008E */ lhu $v0, 0x8e($v1) -/* DEF600 80240760 2442FFFF */ addiu $v0, $v0, -1 -/* DEF604 80240764 A462008E */ sh $v0, 0x8e($v1) -/* DEF608 80240768 00021400 */ sll $v0, $v0, 0x10 -/* DEF60C 8024076C 14400005 */ bnez $v0, .L80240784 -/* DEF610 80240770 00000000 */ nop -/* DEF614 80240774 8E0200CC */ lw $v0, 0xcc($s0) -/* DEF618 80240778 8C420000 */ lw $v0, ($v0) -/* DEF61C 8024077C AC620028 */ sw $v0, 0x28($v1) -/* DEF620 80240780 AE200070 */ sw $zero, 0x70($s1) -.L80240784: -/* DEF624 80240784 8FBF0018 */ lw $ra, 0x18($sp) -/* DEF628 80240788 8FB10014 */ lw $s1, 0x14($sp) -/* DEF62C 8024078C 8FB00010 */ lw $s0, 0x10($sp) -/* DEF630 80240790 03E00008 */ jr $ra -/* DEF634 80240794 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240798_DEF638.s b/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240798_DEF638.s index 4c24e73e9f..0eaae44049 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240798_DEF638.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240798_DEF638.s @@ -216,7 +216,7 @@ glabel L80240A64_DEF904 glabel L80240A84_DEF924 /* DEF924 80240A84 0260202D */ daddu $a0, $s3, $zero /* DEF928 80240A88 0280282D */ daddu $a1, $s4, $zero -/* DEF92C 80240A8C 0C0901CE */ jal func_80240738_DEF5D8 +/* DEF92C 80240A8C 0C0901CE */ jal omo_17_UnkNpcDurationAnimationFunc /* DEF930 80240A90 02A0302D */ daddu $a2, $s5, $zero /* DEF934 80240A94 080902A9 */ j L80240AA4_DEF944 /* DEF938 80240A98 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241478_D19C58.s b/ver/us/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241478_D19C58.s deleted file mode 100644 index 3f7a2a7803..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241478_D19C58.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241478_D19C58 -/* D19C58 80241478 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D19C5C 8024147C AFB10014 */ sw $s1, 0x14($sp) -/* D19C60 80241480 0080882D */ daddu $s1, $a0, $zero -/* D19C64 80241484 AFBF0018 */ sw $ra, 0x18($sp) -/* D19C68 80241488 AFB00010 */ sw $s0, 0x10($sp) -/* D19C6C 8024148C 8E300148 */ lw $s0, 0x148($s1) -/* D19C70 80241490 0C00EABB */ jal get_npc_unsafe -/* D19C74 80241494 86040008 */ lh $a0, 8($s0) -/* D19C78 80241498 0040202D */ daddu $a0, $v0, $zero -/* D19C7C 8024149C 9482008E */ lhu $v0, 0x8e($a0) -/* D19C80 802414A0 2442FFFF */ addiu $v0, $v0, -1 -/* D19C84 802414A4 A482008E */ sh $v0, 0x8e($a0) -/* D19C88 802414A8 00021400 */ sll $v0, $v0, 0x10 -/* D19C8C 802414AC 8E030098 */ lw $v1, 0x98($s0) -/* D19C90 802414B0 00021403 */ sra $v0, $v0, 0x10 -/* D19C94 802414B4 0062182A */ slt $v1, $v1, $v0 -/* D19C98 802414B8 14600005 */ bnez $v1, .L802414D0 -/* D19C9C 802414BC 3C03E0EF */ lui $v1, 0xe0ef -/* D19CA0 802414C0 8E020000 */ lw $v0, ($s0) -/* D19CA4 802414C4 3463FFFF */ ori $v1, $v1, 0xffff -/* D19CA8 802414C8 00431024 */ and $v0, $v0, $v1 -/* D19CAC 802414CC AE020000 */ sw $v0, ($s0) -.L802414D0: -/* D19CB0 802414D0 8482008E */ lh $v0, 0x8e($a0) -/* D19CB4 802414D4 14400007 */ bnez $v0, .L802414F4 -/* D19CB8 802414D8 00000000 */ nop -/* D19CBC 802414DC 8E0200CC */ lw $v0, 0xcc($s0) -/* D19CC0 802414E0 8C420028 */ lw $v0, 0x28($v0) -/* D19CC4 802414E4 A480008E */ sh $zero, 0x8e($a0) -/* D19CC8 802414E8 AC820028 */ sw $v0, 0x28($a0) -/* D19CCC 802414EC 2402000C */ addiu $v0, $zero, 0xc -/* D19CD0 802414F0 AE220070 */ sw $v0, 0x70($s1) -.L802414F4: -/* D19CD4 802414F4 8FBF0018 */ lw $ra, 0x18($sp) -/* D19CD8 802414F8 8FB10014 */ lw $s1, 0x14($sp) -/* D19CDC 802414FC 8FB00010 */ lw $s0, 0x10($sp) -/* D19CE0 80241500 03E00008 */ jr $ra -/* D19CE4 80241504 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241608_D19DE8.s b/ver/us/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241608_D19DE8.s deleted file mode 100644 index a153d0d703..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241608_D19DE8.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241608_D19DE8 -/* D19DE8 80241608 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D19DEC 8024160C AFB10014 */ sw $s1, 0x14($sp) -/* D19DF0 80241610 0080882D */ daddu $s1, $a0, $zero -/* D19DF4 80241614 AFBF0018 */ sw $ra, 0x18($sp) -/* D19DF8 80241618 AFB00010 */ sw $s0, 0x10($sp) -/* D19DFC 8024161C 8E300148 */ lw $s0, 0x148($s1) -/* D19E00 80241620 0C00EABB */ jal get_npc_unsafe -/* D19E04 80241624 86040008 */ lh $a0, 8($s0) -/* D19E08 80241628 0040182D */ daddu $v1, $v0, $zero -/* D19E0C 8024162C 9462008E */ lhu $v0, 0x8e($v1) -/* D19E10 80241630 2442FFFF */ addiu $v0, $v0, -1 -/* D19E14 80241634 A462008E */ sh $v0, 0x8e($v1) -/* D19E18 80241638 00021400 */ sll $v0, $v0, 0x10 -/* D19E1C 8024163C 14400005 */ bnez $v0, .L80241654 -/* D19E20 80241640 00000000 */ nop -/* D19E24 80241644 960200AA */ lhu $v0, 0xaa($s0) -/* D19E28 80241648 A462008E */ sh $v0, 0x8e($v1) -/* D19E2C 8024164C 2402000E */ addiu $v0, $zero, 0xe -/* D19E30 80241650 AE220070 */ sw $v0, 0x70($s1) -.L80241654: -/* D19E34 80241654 8FBF0018 */ lw $ra, 0x18($sp) -/* D19E38 80241658 8FB10014 */ lw $s1, 0x14($sp) -/* D19E3C 8024165C 8FB00010 */ lw $s0, 0x10($sp) -/* D19E40 80241660 03E00008 */ jr $ra -/* D19E44 80241664 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241668_D19E48.s b/ver/us/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241668_D19E48.s deleted file mode 100644 index 1becaa2c0c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241668_D19E48.s +++ /dev/null @@ -1,65 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241668_D19E48 -/* D19E48 80241668 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* D19E4C 8024166C AFB40040 */ sw $s4, 0x40($sp) -/* D19E50 80241670 0080A02D */ daddu $s4, $a0, $zero -/* D19E54 80241674 AFBF0044 */ sw $ra, 0x44($sp) -/* D19E58 80241678 AFB3003C */ sw $s3, 0x3c($sp) -/* D19E5C 8024167C AFB20038 */ sw $s2, 0x38($sp) -/* D19E60 80241680 AFB10034 */ sw $s1, 0x34($sp) -/* D19E64 80241684 AFB00030 */ sw $s0, 0x30($sp) -/* D19E68 80241688 8E910148 */ lw $s1, 0x148($s4) -/* D19E6C 8024168C 00A0902D */ daddu $s2, $a1, $zero -/* D19E70 80241690 86240008 */ lh $a0, 8($s1) -/* D19E74 80241694 0C00EABB */ jal get_npc_unsafe -/* D19E78 80241698 00C0982D */ daddu $s3, $a2, $zero -/* D19E7C 8024169C 0040802D */ daddu $s0, $v0, $zero -/* D19E80 802416A0 9602008E */ lhu $v0, 0x8e($s0) -/* D19E84 802416A4 2442FFFF */ addiu $v0, $v0, -1 -/* D19E88 802416A8 A602008E */ sh $v0, 0x8e($s0) -/* D19E8C 802416AC 00021400 */ sll $v0, $v0, 0x10 -/* D19E90 802416B0 14400020 */ bnez $v0, .L80241734 -/* D19E94 802416B4 0260202D */ daddu $a0, $s3, $zero -/* D19E98 802416B8 AFA00010 */ sw $zero, 0x10($sp) -/* D19E9C 802416BC 8E46000C */ lw $a2, 0xc($s2) -/* D19EA0 802416C0 8E470010 */ lw $a3, 0x10($s2) -/* D19EA4 802416C4 0C01242D */ jal func_800490B4 -/* D19EA8 802416C8 0220282D */ daddu $a1, $s1, $zero -/* D19EAC 802416CC 54400018 */ bnel $v0, $zero, .L80241730 -/* D19EB0 802416D0 A600008E */ sh $zero, 0x8e($s0) -/* D19EB4 802416D4 24040002 */ addiu $a0, $zero, 2 -/* D19EB8 802416D8 0200282D */ daddu $a1, $s0, $zero -/* D19EBC 802416DC 0000302D */ daddu $a2, $zero, $zero -/* D19EC0 802416E0 860300A8 */ lh $v1, 0xa8($s0) -/* D19EC4 802416E4 3C013F80 */ lui $at, 0x3f80 -/* D19EC8 802416E8 44810000 */ mtc1 $at, $f0 -/* D19ECC 802416EC 3C014000 */ lui $at, 0x4000 -/* D19ED0 802416F0 44811000 */ mtc1 $at, $f2 -/* D19ED4 802416F4 3C01C1A0 */ lui $at, 0xc1a0 -/* D19ED8 802416F8 44812000 */ mtc1 $at, $f4 -/* D19EDC 802416FC 2402000F */ addiu $v0, $zero, 0xf -/* D19EE0 80241700 AFA2001C */ sw $v0, 0x1c($sp) -/* D19EE4 80241704 44833000 */ mtc1 $v1, $f6 -/* D19EE8 80241708 00000000 */ nop -/* D19EEC 8024170C 468031A0 */ cvt.s.w $f6, $f6 -/* D19EF0 80241710 44073000 */ mfc1 $a3, $f6 -/* D19EF4 80241714 27A20028 */ addiu $v0, $sp, 0x28 -/* D19EF8 80241718 AFA20020 */ sw $v0, 0x20($sp) -/* D19EFC 8024171C E7A00010 */ swc1 $f0, 0x10($sp) -/* D19F00 80241720 E7A20014 */ swc1 $f2, 0x14($sp) -/* D19F04 80241724 0C01BFA4 */ jal fx_emote -/* D19F08 80241728 E7A40018 */ swc1 $f4, 0x18($sp) -/* D19F0C 8024172C A600008E */ sh $zero, 0x8e($s0) -.L80241730: -/* D19F10 80241730 AE800070 */ sw $zero, 0x70($s4) -.L80241734: -/* D19F14 80241734 8FBF0044 */ lw $ra, 0x44($sp) -/* D19F18 80241738 8FB40040 */ lw $s4, 0x40($sp) -/* D19F1C 8024173C 8FB3003C */ lw $s3, 0x3c($sp) -/* D19F20 80241740 8FB20038 */ lw $s2, 0x38($sp) -/* D19F24 80241744 8FB10034 */ lw $s1, 0x34($sp) -/* D19F28 80241748 8FB00030 */ lw $s0, 0x30($sp) -/* D19F2C 8024174C 03E00008 */ jr $ra -/* D19F30 80241750 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241754_D19F34.s b/ver/us/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241754_D19F34.s index f905b181ba..4248f9d362 100644 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241754_D19F34.s +++ b/ver/us/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241754_D19F34.s @@ -118,7 +118,7 @@ glabel func_80241754_D19F34 .L802418FC: /* D1A0DC 802418FC 0240202D */ daddu $a0, $s2, $zero /* D1A0E0 80241900 0260282D */ daddu $a1, $s3, $zero -/* D1A0E4 80241904 0C09051E */ jal func_80241478_D19C58 +/* D1A0E4 80241904 0C09051E */ jal sam_05_UnkNpcDurationFlagFunc3 /* D1A0E8 80241908 0280302D */ daddu $a2, $s4, $zero /* D1A0EC 8024190C 8E430070 */ lw $v1, 0x70($s2) /* D1A0F0 80241910 2402000C */ addiu $v0, $zero, 0xc @@ -136,7 +136,7 @@ glabel func_80241754_D19F34 .L8024193C: /* D1A11C 8024193C 0240202D */ daddu $a0, $s2, $zero /* D1A120 80241940 0260282D */ daddu $a1, $s3, $zero -/* D1A124 80241944 0C090582 */ jal func_80241608_D19DE8 +/* D1A124 80241944 0C090582 */ jal sam_05_UnkNpcDurationFlagFunc2 /* D1A128 80241948 0280302D */ daddu $a2, $s4, $zero /* D1A12C 8024194C 8E430070 */ lw $v1, 0x70($s2) /* D1A130 80241950 2402000E */ addiu $v0, $zero, 0xe @@ -145,7 +145,7 @@ glabel func_80241754_D19F34 /* D1A13C 8024195C 0240202D */ daddu $a0, $s2, $zero .L80241960: /* D1A140 80241960 0260282D */ daddu $a1, $s3, $zero -/* D1A144 80241964 0C09059A */ jal func_80241668_D19E48 +/* D1A144 80241964 0C09059A */ jal sam_05_UnkNpcAIFunc30 /* D1A148 80241968 0280302D */ daddu $a2, $s4, $zero /* D1A14C 8024196C 0809065F */ j .L8024197C /* D1A150 80241970 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241AC8_D2D7F8.s b/ver/us/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241AC8_D2D7F8.s deleted file mode 100644 index cb8df19999..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241AC8_D2D7F8.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241AC8_D2D7F8 -/* D2D7F8 80241AC8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D2D7FC 80241ACC AFB10014 */ sw $s1, 0x14($sp) -/* D2D800 80241AD0 0080882D */ daddu $s1, $a0, $zero -/* D2D804 80241AD4 AFBF0018 */ sw $ra, 0x18($sp) -/* D2D808 80241AD8 AFB00010 */ sw $s0, 0x10($sp) -/* D2D80C 80241ADC 8E300148 */ lw $s0, 0x148($s1) -/* D2D810 80241AE0 0C00EABB */ jal get_npc_unsafe -/* D2D814 80241AE4 86040008 */ lh $a0, 8($s0) -/* D2D818 80241AE8 0040202D */ daddu $a0, $v0, $zero -/* D2D81C 80241AEC 9482008E */ lhu $v0, 0x8e($a0) -/* D2D820 80241AF0 2442FFFF */ addiu $v0, $v0, -1 -/* D2D824 80241AF4 A482008E */ sh $v0, 0x8e($a0) -/* D2D828 80241AF8 00021400 */ sll $v0, $v0, 0x10 -/* D2D82C 80241AFC 8E030098 */ lw $v1, 0x98($s0) -/* D2D830 80241B00 00021403 */ sra $v0, $v0, 0x10 -/* D2D834 80241B04 0062182A */ slt $v1, $v1, $v0 -/* D2D838 80241B08 14600005 */ bnez $v1, .L80241B20 -/* D2D83C 80241B0C 3C03E0EF */ lui $v1, 0xe0ef -/* D2D840 80241B10 8E020000 */ lw $v0, ($s0) -/* D2D844 80241B14 3463FFFF */ ori $v1, $v1, 0xffff -/* D2D848 80241B18 00431024 */ and $v0, $v0, $v1 -/* D2D84C 80241B1C AE020000 */ sw $v0, ($s0) -.L80241B20: -/* D2D850 80241B20 8482008E */ lh $v0, 0x8e($a0) -/* D2D854 80241B24 14400007 */ bnez $v0, .L80241B44 -/* D2D858 80241B28 00000000 */ nop -/* D2D85C 80241B2C 8E0200CC */ lw $v0, 0xcc($s0) -/* D2D860 80241B30 8C420028 */ lw $v0, 0x28($v0) -/* D2D864 80241B34 A480008E */ sh $zero, 0x8e($a0) -/* D2D868 80241B38 AC820028 */ sw $v0, 0x28($a0) -/* D2D86C 80241B3C 2402000C */ addiu $v0, $zero, 0xc -/* D2D870 80241B40 AE220070 */ sw $v0, 0x70($s1) -.L80241B44: -/* D2D874 80241B44 8FBF0018 */ lw $ra, 0x18($sp) -/* D2D878 80241B48 8FB10014 */ lw $s1, 0x14($sp) -/* D2D87C 80241B4C 8FB00010 */ lw $s0, 0x10($sp) -/* D2D880 80241B50 03E00008 */ jr $ra -/* D2D884 80241B54 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241C58_D2D988.s b/ver/us/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241C58_D2D988.s deleted file mode 100644 index dc07486d1c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241C58_D2D988.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241C58_D2D988 -/* D2D988 80241C58 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D2D98C 80241C5C AFB10014 */ sw $s1, 0x14($sp) -/* D2D990 80241C60 0080882D */ daddu $s1, $a0, $zero -/* D2D994 80241C64 AFBF0018 */ sw $ra, 0x18($sp) -/* D2D998 80241C68 AFB00010 */ sw $s0, 0x10($sp) -/* D2D99C 80241C6C 8E300148 */ lw $s0, 0x148($s1) -/* D2D9A0 80241C70 0C00EABB */ jal get_npc_unsafe -/* D2D9A4 80241C74 86040008 */ lh $a0, 8($s0) -/* D2D9A8 80241C78 0040182D */ daddu $v1, $v0, $zero -/* D2D9AC 80241C7C 9462008E */ lhu $v0, 0x8e($v1) -/* D2D9B0 80241C80 2442FFFF */ addiu $v0, $v0, -1 -/* D2D9B4 80241C84 A462008E */ sh $v0, 0x8e($v1) -/* D2D9B8 80241C88 00021400 */ sll $v0, $v0, 0x10 -/* D2D9BC 80241C8C 14400005 */ bnez $v0, .L80241CA4 -/* D2D9C0 80241C90 00000000 */ nop -/* D2D9C4 80241C94 960200AA */ lhu $v0, 0xaa($s0) -/* D2D9C8 80241C98 A462008E */ sh $v0, 0x8e($v1) -/* D2D9CC 80241C9C 2402000E */ addiu $v0, $zero, 0xe -/* D2D9D0 80241CA0 AE220070 */ sw $v0, 0x70($s1) -.L80241CA4: -/* D2D9D4 80241CA4 8FBF0018 */ lw $ra, 0x18($sp) -/* D2D9D8 80241CA8 8FB10014 */ lw $s1, 0x14($sp) -/* D2D9DC 80241CAC 8FB00010 */ lw $s0, 0x10($sp) -/* D2D9E0 80241CB0 03E00008 */ jr $ra -/* D2D9E4 80241CB4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241CB8_D2D9E8.s b/ver/us/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241CB8_D2D9E8.s deleted file mode 100644 index c24ec3df94..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241CB8_D2D9E8.s +++ /dev/null @@ -1,65 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241CB8_D2D9E8 -/* D2D9E8 80241CB8 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* D2D9EC 80241CBC AFB40040 */ sw $s4, 0x40($sp) -/* D2D9F0 80241CC0 0080A02D */ daddu $s4, $a0, $zero -/* D2D9F4 80241CC4 AFBF0044 */ sw $ra, 0x44($sp) -/* D2D9F8 80241CC8 AFB3003C */ sw $s3, 0x3c($sp) -/* D2D9FC 80241CCC AFB20038 */ sw $s2, 0x38($sp) -/* D2DA00 80241CD0 AFB10034 */ sw $s1, 0x34($sp) -/* D2DA04 80241CD4 AFB00030 */ sw $s0, 0x30($sp) -/* D2DA08 80241CD8 8E910148 */ lw $s1, 0x148($s4) -/* D2DA0C 80241CDC 00A0902D */ daddu $s2, $a1, $zero -/* D2DA10 80241CE0 86240008 */ lh $a0, 8($s1) -/* D2DA14 80241CE4 0C00EABB */ jal get_npc_unsafe -/* D2DA18 80241CE8 00C0982D */ daddu $s3, $a2, $zero -/* D2DA1C 80241CEC 0040802D */ daddu $s0, $v0, $zero -/* D2DA20 80241CF0 9602008E */ lhu $v0, 0x8e($s0) -/* D2DA24 80241CF4 2442FFFF */ addiu $v0, $v0, -1 -/* D2DA28 80241CF8 A602008E */ sh $v0, 0x8e($s0) -/* D2DA2C 80241CFC 00021400 */ sll $v0, $v0, 0x10 -/* D2DA30 80241D00 14400020 */ bnez $v0, .L80241D84 -/* D2DA34 80241D04 0260202D */ daddu $a0, $s3, $zero -/* D2DA38 80241D08 AFA00010 */ sw $zero, 0x10($sp) -/* D2DA3C 80241D0C 8E46000C */ lw $a2, 0xc($s2) -/* D2DA40 80241D10 8E470010 */ lw $a3, 0x10($s2) -/* D2DA44 80241D14 0C01242D */ jal func_800490B4 -/* D2DA48 80241D18 0220282D */ daddu $a1, $s1, $zero -/* D2DA4C 80241D1C 54400018 */ bnel $v0, $zero, .L80241D80 -/* D2DA50 80241D20 A600008E */ sh $zero, 0x8e($s0) -/* D2DA54 80241D24 24040002 */ addiu $a0, $zero, 2 -/* D2DA58 80241D28 0200282D */ daddu $a1, $s0, $zero -/* D2DA5C 80241D2C 0000302D */ daddu $a2, $zero, $zero -/* D2DA60 80241D30 860300A8 */ lh $v1, 0xa8($s0) -/* D2DA64 80241D34 3C013F80 */ lui $at, 0x3f80 -/* D2DA68 80241D38 44810000 */ mtc1 $at, $f0 -/* D2DA6C 80241D3C 3C014000 */ lui $at, 0x4000 -/* D2DA70 80241D40 44811000 */ mtc1 $at, $f2 -/* D2DA74 80241D44 3C01C1A0 */ lui $at, 0xc1a0 -/* D2DA78 80241D48 44812000 */ mtc1 $at, $f4 -/* D2DA7C 80241D4C 2402000F */ addiu $v0, $zero, 0xf -/* D2DA80 80241D50 AFA2001C */ sw $v0, 0x1c($sp) -/* D2DA84 80241D54 44833000 */ mtc1 $v1, $f6 -/* D2DA88 80241D58 00000000 */ nop -/* D2DA8C 80241D5C 468031A0 */ cvt.s.w $f6, $f6 -/* D2DA90 80241D60 44073000 */ mfc1 $a3, $f6 -/* D2DA94 80241D64 27A20028 */ addiu $v0, $sp, 0x28 -/* D2DA98 80241D68 AFA20020 */ sw $v0, 0x20($sp) -/* D2DA9C 80241D6C E7A00010 */ swc1 $f0, 0x10($sp) -/* D2DAA0 80241D70 E7A20014 */ swc1 $f2, 0x14($sp) -/* D2DAA4 80241D74 0C01BFA4 */ jal fx_emote -/* D2DAA8 80241D78 E7A40018 */ swc1 $f4, 0x18($sp) -/* D2DAAC 80241D7C A600008E */ sh $zero, 0x8e($s0) -.L80241D80: -/* D2DAB0 80241D80 AE800070 */ sw $zero, 0x70($s4) -.L80241D84: -/* D2DAB4 80241D84 8FBF0044 */ lw $ra, 0x44($sp) -/* D2DAB8 80241D88 8FB40040 */ lw $s4, 0x40($sp) -/* D2DABC 80241D8C 8FB3003C */ lw $s3, 0x3c($sp) -/* D2DAC0 80241D90 8FB20038 */ lw $s2, 0x38($sp) -/* D2DAC4 80241D94 8FB10034 */ lw $s1, 0x34($sp) -/* D2DAC8 80241D98 8FB00030 */ lw $s0, 0x30($sp) -/* D2DACC 80241D9C 03E00008 */ jr $ra -/* D2DAD0 80241DA0 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241DA4_D2DAD4.s b/ver/us/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241DA4_D2DAD4.s index 0bb2d4bed8..28ae52d7ec 100644 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241DA4_D2DAD4.s +++ b/ver/us/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241DA4_D2DAD4.s @@ -118,7 +118,7 @@ glabel func_80241DA4_D2DAD4 .L80241F4C: /* D2DC7C 80241F4C 0240202D */ daddu $a0, $s2, $zero /* D2DC80 80241F50 0260282D */ daddu $a1, $s3, $zero -/* D2DC84 80241F54 0C0906B2 */ jal func_80241AC8_D2D7F8 +/* D2DC84 80241F54 0C0906B2 */ jal sam_07_UnkNpcDurationFlagFunc3 /* D2DC88 80241F58 0280302D */ daddu $a2, $s4, $zero /* D2DC8C 80241F5C 8E430070 */ lw $v1, 0x70($s2) /* D2DC90 80241F60 2402000C */ addiu $v0, $zero, 0xc @@ -136,7 +136,7 @@ glabel func_80241DA4_D2DAD4 .L80241F8C: /* D2DCBC 80241F8C 0240202D */ daddu $a0, $s2, $zero /* D2DCC0 80241F90 0260282D */ daddu $a1, $s3, $zero -/* D2DCC4 80241F94 0C090716 */ jal func_80241C58_D2D988 +/* D2DCC4 80241F94 0C090716 */ jal sam_07_UnkNpcDurationFlagFunc2 /* D2DCC8 80241F98 0280302D */ daddu $a2, $s4, $zero /* D2DCCC 80241F9C 8E430070 */ lw $v1, 0x70($s2) /* D2DCD0 80241FA0 2402000E */ addiu $v0, $zero, 0xe @@ -145,7 +145,7 @@ glabel func_80241DA4_D2DAD4 /* D2DCDC 80241FAC 0240202D */ daddu $a0, $s2, $zero .L80241FB0: /* D2DCE0 80241FB0 0260282D */ daddu $a1, $s3, $zero -/* D2DCE4 80241FB4 0C09072E */ jal func_80241CB8_D2D9E8 +/* D2DCE4 80241FB4 0C09072E */ jal sam_07_UnkNpcAIFunc30 /* D2DCE8 80241FB8 0280302D */ daddu $a2, $s4, $zero /* D2DCEC 80241FBC 080907F3 */ j .L80241FCC /* D2DCF0 80241FC0 00000000 */ nop