From 68792f4331eb5566d5708f407583b98017970f3e Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Mon, 22 Feb 2021 08:00:49 -0500 Subject: [PATCH] Misc decomp (#193) * fixing segment * redoing subtree * git subrepo clone https://github.com/ethteck/splat.git tools/splat subrepo: subdir: "tools/splat" merged: "99cf514297" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "99cf514297" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * fix symbol_addrs * sweet victory * reformat collision_main_lateral.s * Lots of matches, fixed diff.py issue, improved coverage.py * some more * update symbol_addrs * git subrepo pull tools/splat subrepo: subdir: "tools/splat" merged: "c46026725a" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "c46026725a" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * update symbol_addrs * fix disasm * 2 mo * Jenkinsfile * PR comments * check_input_status_menu, removing some macros * a few funcs * assist updates * UnkAlphaFunc * UnkPartnerPosFuncs * Deleting stuff * oopz * dead_syms.txt, UnkNpcAIFunc14 * update symbol_addrs * cleanup * symbol_addrs * cleanup * Set80071270_0_16 * UnkFloatFunc2 * fix watt data start * UnkNpcAIFunc15 * :cat: * :cat: :cat: * symbol_addrs * fix assist.py * delete unnecessary data file * fix diff.py, remove parens * parens --- diff_settings.py | 2 +- src/battle/area_kmr_part_1/431180.c | 4 +- src/battle/area_kmr_part_1/4313F0.c | 2 +- src/battle/area_kmr_part_1/431660.c | 4 +- src/battle/area_kmr_part_1/4318D0.c | 4 +- src/battle/area_kmr_part_2/43A7E0.c | 2 +- src/battle/area_kmr_part_2/43AA50.c | 4 +- src/battle/area_kmr_part_2/43ACC0.c | 4 +- src/battle/area_kmr_part_2/43AF30.c | 5 +- src/battle/area_kmr_part_3/448420.c | 6 +- src/battle/area_kmr_part_3/448690.c | 4 +- src/battle/area_kmr_part_3/448900.c | 4 +- src/battle/area_kmr_part_3/448B70.c | 2 +- src/battle/area_kmr_part_3/448E80.c | 6 +- src/battle/area_pra2/660E10.c | 6 +- src/battle/area_sam/625750.c | 45 +++-- src/battle/area_sam2/63DD60.c | 46 +++-- src/battle/area_trd_part_1/4A12C0.c | 2 +- src/battle/area_trd_part_2/4B34D0.c | 2 +- src/battle/partner/parakarry_6FFD80.c | 1 + src/common/Set80071270_0_16.inc.c | 6 + src/common/UnkAngleFunc2.inc.c | 33 ++++ src/common/UnkFloatFunc2.inc.c | 17 ++ src/world/area_isk/isk_05/97DAD0.c | 2 +- src/world/area_isk/isk_13/98F7E0.c | 2 +- src/world/area_isk/isk_14/992730.c | 2 +- src/world/area_jan/jan_01/B28030.c | 2 +- src/world/area_jan/jan_05/B4B260.c | 2 +- src/world/area_jan/jan_06/B52F70.c | 2 +- src/world/area_jan/jan_10/B6C6A0.c | 2 +- src/world/area_jan/jan_14/B7A510.c | 2 +- src/world/area_kmr/kmr_10/8D84D0.c | 15 +- src/world/area_kpa/kpa_134/AA94B0.c | 2 +- src/world/area_mim/mim_02/B97C70.c | 2 +- src/world/area_mim/mim_04/B9DB60.c | 2 +- src/world/area_mim/mim_06/BA4CF0.c | 2 +- src/world/area_mim/mim_07/BAA3B0.c | 2 +- src/world/area_mim/mim_09/BB2E00.c | 2 +- src/world/area_nok/nok_03/9EB7F0.c | 2 +- src/world/area_nok/nok_12/9FA970.c | 2 +- src/world/area_nok/nok_13/A00600.c | 2 +- src/world/area_tik/tik_01/869AA0.c | 2 +- src/world/area_tik/tik_05/8750D0.c | 2 +- src/world/area_tik/tik_08/87F3E0.c | 2 +- src/world/area_tik/tik_09/8827B0.c | 2 +- src/world/area_tik/tik_25/8A8600.c | 2 +- src/world/common/UnkNpcAIFunc15.inc.c | 15 ++ tools/assist.py | 8 +- ...{watt_704A70.data.s => watt_704A80.data.s} | 4 +- .../431180/func_802187E0_431180.s | 164 ------------------ .../4313F0/func_80218A50_4313F0.s | 164 ------------------ .../431660/func_80218CC0_431660.s | 164 ------------------ .../4318D0/func_80218F30_4318D0.s | 162 ----------------- .../43A7E0/func_80218D50_43A7E0.s | 164 ------------------ .../43AA50/func_80218FC0_43AA50.s | 164 ------------------ .../43ACC0/func_80219230_43ACC0.s | 164 ------------------ .../43AF30/func_802194A0_43AF30.s | 162 ----------------- .../448420/func_80218FE0_448420.s | 164 ------------------ .../448690/func_80219250_448690.s | 164 ------------------ .../448900/func_802194C0_448900.s | 164 ------------------ .../448B70/func_80219730_448B70.s | 162 ----------------- .../448E80/func_80219C38_449078.s | 13 -- .../448E80/func_80219C5C_44909C.s | 69 -------- .../area_pra2/660E10/func_802188B8_661008.s | 13 -- .../area_pra2/660E10/func_802188DC_66102C.s | 69 -------- .../area_sam/625750/func_80219DA8_625948.s | 13 -- .../area_sam/625750/func_80219DCC_62596C.s | 69 -------- .../area_sam/625750/func_8021A0C8_625C68.s | 13 -- .../area_sam/625750/func_8021A0EC_625C8C.s | 69 -------- .../area_sam/625750/func_8021A3E8_625F88.s | 13 -- .../area_sam/625750/func_8021A40C_625FAC.s | 69 -------- .../area_sam/625750/func_8021A708_6262A8.s | 13 -- .../area_sam/625750/func_8021A72C_6262CC.s | 69 -------- .../area_sam/625750/func_8021AA28_6265C8.s | 13 -- .../area_sam/625750/func_8021AA4C_6265EC.s | 69 -------- .../area_sam/625750/func_8021AD48_6268E8.s | 13 -- .../area_sam/625750/func_8021AD6C_62690C.s | 69 -------- .../area_sam2/63DD60/func_80218D78_63DF58.s | 13 -- .../area_sam2/63DD60/func_80218D9C_63DF7C.s | 69 -------- .../area_sam2/63DD60/func_80219098_63E278.s | 13 -- .../area_sam2/63DD60/func_802190BC_63E29C.s | 69 -------- .../area_sam2/63DD60/func_802193B8_63E598.s | 13 -- .../area_sam2/63DD60/func_802193DC_63E5BC.s | 69 -------- .../area_sam2/63DD60/func_802196D8_63E8B8.s | 13 -- .../area_sam2/63DD60/func_802196FC_63E8DC.s | 69 -------- .../area_sam2/63DD60/func_802199F8_63EBD8.s | 13 -- .../area_sam2/63DD60/func_80219A1C_63EBFC.s | 69 -------- .../area_sam2/63DD60/func_80219D18_63EEF8.s | 13 -- .../area_sam2/63DD60/func_80219D3C_63EF1C.s | 69 -------- .../4A12C0/func_80218220_4A12C0.s | 164 ------------------ .../4B34D0/func_8021A2E0_4B34D0.s | 164 ------------------ .../watt_703AF0/func_80238E5C_70494C.s | 4 + .../code_7900D0/func_802A14E8_7905B8.s | 16 -- .../code_7900D0/func_802A1518_7905E8.s | 8 - .../code_7900D0/func_802A1528_7905F8.s | 9 - .../isk_05/97DAD0/func_802407CC_97E29C.s | 60 ------- .../isk_05/97DAD0/func_80240BF0_97E6C0.s | 2 +- .../isk_13/98F7E0/func_802407CC_98FFAC.s | 60 ------- .../isk_13/98F7E0/func_80240BF0_9903D0.s | 2 +- .../isk_14/992730/func_802407CC_992EFC.s | 60 ------- .../isk_14/992730/func_80240BF0_993320.s | 2 +- .../jan_01/B28030/func_80240B0C_B28B3C.s | 60 ------- .../jan_01/B28030/func_80240F30_B28F60.s | 2 +- .../jan_05/B4B260/func_80241070_B4BAE0.s | 60 ------- .../jan_05/B4B260/func_80241494_B4BF04.s | 2 +- .../jan_06/B52F70/func_80240F0C_B5373C.s | 60 ------- .../jan_06/B52F70/func_80241330_B53B60.s | 2 +- .../jan_10/B6C6A0/func_80240ADC_B6CE6C.s | 60 ------- .../jan_10/B6C6A0/func_80240F00_B6D290.s | 2 +- .../jan_14/B7A510/func_80240C8C_B7ACDC.s | 60 ------- .../jan_14/B7A510/func_802410B0_B7B100.s | 2 +- .../kpa_134/AA94B0/func_80240564_AA9504.s | 53 ------ .../mim_02/B97C70/func_8024083C_B9843C.s | 60 ------- .../mim_02/B97C70/func_80240C60_B98860.s | 2 +- .../mim_04/B9DB60/func_802409CC_B9E32C.s | 60 ------- .../mim_04/B9DB60/func_80240DF0_B9E750.s | 2 +- .../mim_06/BA4CF0/func_802426E0_BA6E60.s | 60 ------- .../mim_06/BA4CF0/func_80242B04_BA7284.s | 2 +- .../mim_07/BAA3B0/func_80240A3C_BAAB7C.s | 60 ------- .../mim_07/BAA3B0/func_80240E60_BAAFA0.s | 2 +- .../mim_09/BB2E00/func_8024086C_BB366C.s | 60 ------- .../mim_09/BB2E00/func_80240C90_BB3A90.s | 2 +- .../nok_03/9EB7F0/func_802407CC_9EBFBC.s | 60 ------- .../nok_03/9EB7F0/func_80240BF0_9EC3E0.s | 2 +- .../nok_12/9FA970/func_80240224_9FAA14.s | 55 ------ .../nok_13/A00600/func_802407CC_A00DCC.s | 60 ------- .../nok_13/A00600/func_80240BF0_A011F0.s | 2 +- .../tik_01/869AA0/func_80240960_869E10.s | 56 ------ .../tik_05/8750D0/func_80240984_875744.s | 55 ------ .../tik_08/87F3E0/func_80240960_87F750.s | 56 ------ .../tik_09/8827B0/func_80240960_882B20.s | 56 ------ .../tik_25/8A8600/func_802406AC_8A862C.s | 53 ------ ver/us/splat.yaml | 2 +- ver/us/symbol_addrs.txt | 130 +++++++------- 134 files changed, 298 insertions(+), 4920 deletions(-) create mode 100644 src/common/Set80071270_0_16.inc.c create mode 100644 src/common/UnkAngleFunc2.inc.c create mode 100644 src/common/UnkFloatFunc2.inc.c create mode 100644 src/world/common/UnkNpcAIFunc15.inc.c rename ver/us/asm/data/battle/partner/{watt_704A70.data.s => watt_704A80.data.s} (79%) delete mode 100644 ver/us/asm/nonmatchings/battle/area_kmr_part_1/431180/func_802187E0_431180.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_kmr_part_1/4313F0/func_80218A50_4313F0.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_kmr_part_1/431660/func_80218CC0_431660.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_kmr_part_1/4318D0/func_80218F30_4318D0.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_kmr_part_2/43A7E0/func_80218D50_43A7E0.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_kmr_part_2/43AA50/func_80218FC0_43AA50.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_kmr_part_2/43ACC0/func_80219230_43ACC0.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_kmr_part_2/43AF30/func_802194A0_43AF30.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_kmr_part_3/448420/func_80218FE0_448420.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_kmr_part_3/448690/func_80219250_448690.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_kmr_part_3/448900/func_802194C0_448900.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_kmr_part_3/448B70/func_80219730_448B70.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_kmr_part_3/448E80/func_80219C38_449078.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_kmr_part_3/448E80/func_80219C5C_44909C.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_pra2/660E10/func_802188B8_661008.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_pra2/660E10/func_802188DC_66102C.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_sam/625750/func_80219DA8_625948.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_sam/625750/func_80219DCC_62596C.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_sam/625750/func_8021A0C8_625C68.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_sam/625750/func_8021A0EC_625C8C.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_sam/625750/func_8021A3E8_625F88.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_sam/625750/func_8021A40C_625FAC.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_sam/625750/func_8021A708_6262A8.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_sam/625750/func_8021A72C_6262CC.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_sam/625750/func_8021AA28_6265C8.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_sam/625750/func_8021AA4C_6265EC.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_sam/625750/func_8021AD48_6268E8.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_sam/625750/func_8021AD6C_62690C.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_sam2/63DD60/func_80218D78_63DF58.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_sam2/63DD60/func_80218D9C_63DF7C.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_sam2/63DD60/func_80219098_63E278.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_sam2/63DD60/func_802190BC_63E29C.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_sam2/63DD60/func_802193B8_63E598.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_sam2/63DD60/func_802193DC_63E5BC.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_sam2/63DD60/func_802196D8_63E8B8.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_sam2/63DD60/func_802196FC_63E8DC.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_sam2/63DD60/func_802199F8_63EBD8.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_sam2/63DD60/func_80219A1C_63EBFC.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_sam2/63DD60/func_80219D18_63EEF8.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_sam2/63DD60/func_80219D3C_63EF1C.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_trd_part_1/4A12C0/func_80218220_4A12C0.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_trd_part_2/4B34D0/func_8021A2E0_4B34D0.s delete mode 100644 ver/us/asm/nonmatchings/code_7900D0/func_802A14E8_7905B8.s delete mode 100644 ver/us/asm/nonmatchings/code_7900D0/func_802A1518_7905E8.s delete mode 100644 ver/us/asm/nonmatchings/code_7900D0/func_802A1528_7905F8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_802407CC_97E29C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_802407CC_98FFAC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_isk/isk_14/992730/func_802407CC_992EFC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240B0C_B28B3C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241070_B4BAE0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80240F0C_B5373C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240ADC_B6CE6C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_80240C8C_B7ACDC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_134/AA94B0/func_80240564_AA9504.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_8024083C_B9843C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_802409CC_B9E32C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_802426E0_BA6E60.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240A3C_BAAB7C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_8024086C_BB366C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_802407CC_9EBFBC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_12/9FA970/func_80240224_9FAA14.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_13/A00600/func_802407CC_A00DCC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_01/869AA0/func_80240960_869E10.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_80240984_875744.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_08/87F3E0/func_80240960_87F750.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_09/8827B0/func_80240960_882B20.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_25/8A8600/func_802406AC_8A862C.s diff --git a/diff_settings.py b/diff_settings.py index ed2557cc87..34c3e65606 100644 --- a/diff_settings.py +++ b/diff_settings.py @@ -3,7 +3,7 @@ def apply(config, args): ver_dir = 'ver/current/' config['baseimg'] = f'{ver_dir}baserom.z64' - config['myimg'] = f'{ver_dir}papermario.z64' + config['myimg'] = f'{ver_dir}build/papermario.z64' config['mapfile'] = f'{ver_dir}build/papermario.map' config['source_directories'] = ['src', f'{ver_dir}asm', 'include', f'{ver_dir}assets'] config['make_command'] = ['ninja'] diff --git a/src/battle/area_kmr_part_1/431180.c b/src/battle/area_kmr_part_1/431180.c index b8f522f083..73db36db54 100644 --- a/src/battle/area_kmr_part_1/431180.c +++ b/src/battle/area_kmr_part_1/431180.c @@ -2,4 +2,6 @@ #define NAMESPACE b_area_kmr_part_1 -INCLUDE_ASM(s32, "battle/area_kmr_part_1/431180", func_802187E0_431180); +#define NAMESPACE dup2_b_area_kmr_part_1 +#include "common/UnkAngleFunc2.inc.c" +#define NAMESPACE b_area_kmr_part_1 diff --git a/src/battle/area_kmr_part_1/4313F0.c b/src/battle/area_kmr_part_1/4313F0.c index 279936233f..90e7f3c232 100644 --- a/src/battle/area_kmr_part_1/4313F0.c +++ b/src/battle/area_kmr_part_1/4313F0.c @@ -2,4 +2,4 @@ #define NAMESPACE b_area_kmr_part_1 -INCLUDE_ASM(s32, "battle/area_kmr_part_1/4313F0", func_80218A50_4313F0); +#include "common/UnkAngleFunc2.inc.c" diff --git a/src/battle/area_kmr_part_1/431660.c b/src/battle/area_kmr_part_1/431660.c index 94783f5858..c4e6ed06bf 100644 --- a/src/battle/area_kmr_part_1/431660.c +++ b/src/battle/area_kmr_part_1/431660.c @@ -2,4 +2,6 @@ #define NAMESPACE b_area_kmr_part_1 -INCLUDE_ASM(s32, "battle/area_kmr_part_1/431660", func_80218CC0_431660); +#define NAMESPACE dup3_b_area_kmr_part_1 +#include "common/UnkAngleFunc2.inc.c" +#define NAMESPACE b_area_kmr_part_1 diff --git a/src/battle/area_kmr_part_1/4318D0.c b/src/battle/area_kmr_part_1/4318D0.c index abb53280b6..8bfb12beca 100644 --- a/src/battle/area_kmr_part_1/4318D0.c +++ b/src/battle/area_kmr_part_1/4318D0.c @@ -2,6 +2,8 @@ #define NAMESPACE b_area_kmr_part_1 -INCLUDE_ASM(s32, "battle/area_kmr_part_1/4318D0", func_80218F30_4318D0); +#define NAMESPACE dup_b_area_kmr_part_1 +#include "common/UnkAngleFunc2.inc.c" +#define NAMESPACE b_area_kmr_part_1 INCLUDE_ASM(s32, "battle/area_kmr_part_1/4318D0", func_80219198_431B38); diff --git a/src/battle/area_kmr_part_2/43A7E0.c b/src/battle/area_kmr_part_2/43A7E0.c index f143e9d6c4..477a8fa5d5 100644 --- a/src/battle/area_kmr_part_2/43A7E0.c +++ b/src/battle/area_kmr_part_2/43A7E0.c @@ -2,4 +2,4 @@ #define NAMESPACE b_area_kmr_part_2 -INCLUDE_ASM(s32, "battle/area_kmr_part_2/43A7E0", func_80218D50_43A7E0); +#include "common/UnkAngleFunc2.inc.c" diff --git a/src/battle/area_kmr_part_2/43AA50.c b/src/battle/area_kmr_part_2/43AA50.c index e459444032..783dc08f5c 100644 --- a/src/battle/area_kmr_part_2/43AA50.c +++ b/src/battle/area_kmr_part_2/43AA50.c @@ -2,4 +2,6 @@ #define NAMESPACE b_area_kmr_part_2 -INCLUDE_ASM(s32, "battle/area_kmr_part_2/43AA50", func_80218FC0_43AA50); +#define NAMESPACE dup_b_area_kmr_part_2 +#include "common/UnkAngleFunc2.inc.c" +#define NAMESPACE b_area_kmr_part_2 diff --git a/src/battle/area_kmr_part_2/43ACC0.c b/src/battle/area_kmr_part_2/43ACC0.c index 7bbca453df..2f04acc77a 100644 --- a/src/battle/area_kmr_part_2/43ACC0.c +++ b/src/battle/area_kmr_part_2/43ACC0.c @@ -2,4 +2,6 @@ #define NAMESPACE b_area_kmr_part_2 -INCLUDE_ASM(s32, "battle/area_kmr_part_2/43ACC0", func_80219230_43ACC0); +#define NAMESPACE dup2_b_area_kmr_part_2 +#include "common/UnkAngleFunc2.inc.c" +#define NAMESPACE b_area_kmr_part_2 diff --git a/src/battle/area_kmr_part_2/43AF30.c b/src/battle/area_kmr_part_2/43AF30.c index f14d465290..3fa48f0246 100644 --- a/src/battle/area_kmr_part_2/43AF30.c +++ b/src/battle/area_kmr_part_2/43AF30.c @@ -2,6 +2,9 @@ #define NAMESPACE b_area_kmr_part_2 -INCLUDE_ASM(s32, "battle/area_kmr_part_2/43AF30", func_802194A0_43AF30); +#define NAMESPACE dup3_b_area_kmr_part_2 +#include "common/UnkAngleFunc2.inc.c" +#define NAMESPACE b_area_kmr_part_2 + INCLUDE_ASM(s32, "battle/area_kmr_part_2/43AF30", func_80219708_43B198); diff --git a/src/battle/area_kmr_part_3/448420.c b/src/battle/area_kmr_part_3/448420.c index 5166fc631a..994b45c87e 100644 --- a/src/battle/area_kmr_part_3/448420.c +++ b/src/battle/area_kmr_part_3/448420.c @@ -1,3 +1,7 @@ #include "common.h" -INCLUDE_ASM(s32, "battle/area_kmr_part_3/448420", func_80218FE0_448420); +#define NAMESPACE b_area_kmr_part_3 + +#define NAMESPACE dup_b_area_kmr_part_3 +#include "common/UnkAngleFunc2.inc.c" +#define NAMESPACE b_area_kmr_part_3 diff --git a/src/battle/area_kmr_part_3/448690.c b/src/battle/area_kmr_part_3/448690.c index e64c730598..5eb85bdfc6 100644 --- a/src/battle/area_kmr_part_3/448690.c +++ b/src/battle/area_kmr_part_3/448690.c @@ -2,4 +2,6 @@ #define NAMESPACE b_area_kmr_part_3 -INCLUDE_ASM(s32, "battle/area_kmr_part_3/448690", func_80219250_448690); +#define NAMESPACE dup2_b_area_kmr_part_3 +#include "common/UnkAngleFunc2.inc.c" +#define NAMESPACE b_area_kmr_part_3 diff --git a/src/battle/area_kmr_part_3/448900.c b/src/battle/area_kmr_part_3/448900.c index 48302e8005..580129d6fc 100644 --- a/src/battle/area_kmr_part_3/448900.c +++ b/src/battle/area_kmr_part_3/448900.c @@ -2,4 +2,6 @@ #define NAMESPACE b_area_kmr_part_3 -INCLUDE_ASM(s32, "battle/area_kmr_part_3/448900", func_802194C0_448900); +#define NAMESPACE dup3_b_area_kmr_part_3 +#include "common/UnkAngleFunc2.inc.c" +#define NAMESPACE b_area_kmr_part_3 diff --git a/src/battle/area_kmr_part_3/448B70.c b/src/battle/area_kmr_part_3/448B70.c index bdcf74a8b9..3290aa4e15 100644 --- a/src/battle/area_kmr_part_3/448B70.c +++ b/src/battle/area_kmr_part_3/448B70.c @@ -2,6 +2,6 @@ #define NAMESPACE b_area_kmr_part_3 -INCLUDE_ASM(s32, "battle/area_kmr_part_3/448B70", func_80219730_448B70); +#include "common/UnkAngleFunc2.inc.c" INCLUDE_ASM(s32, "battle/area_kmr_part_3/448B70", func_80219998_448DD8); diff --git a/src/battle/area_kmr_part_3/448E80.c b/src/battle/area_kmr_part_3/448E80.c index d31fa25260..46a721b232 100644 --- a/src/battle/area_kmr_part_3/448E80.c +++ b/src/battle/area_kmr_part_3/448E80.c @@ -1,9 +1,11 @@ #include "common.h" +#define NAMESPACE b_area_kmr_part_3 + INCLUDE_ASM(s32, "battle/area_kmr_part_3/448E80", func_80219A40_448E80); -INCLUDE_ASM(s32, "battle/area_kmr_part_3/448E80", func_80219C38_449078); +#include "common/Set80071270_0_16.inc.c" -INCLUDE_ASM(s32, "battle/area_kmr_part_3/448E80", func_80219C5C_44909C); +#include "common/UnkFloatFunc2.inc.c" INCLUDE_ASM(s32, "battle/area_kmr_part_3/448E80", func_80219D60_4491A0); diff --git a/src/battle/area_pra2/660E10.c b/src/battle/area_pra2/660E10.c index 760834365b..adf1e52b9a 100644 --- a/src/battle/area_pra2/660E10.c +++ b/src/battle/area_pra2/660E10.c @@ -1,9 +1,11 @@ #include "common.h" +#define NAMESPACE b_area_pra2 + INCLUDE_ASM(s32, "battle/area_pra2/660E10", func_802186C0_660E10); -INCLUDE_ASM(s32, "battle/area_pra2/660E10", func_802188B8_661008); +#include "common/Set80071270_0_16.inc.c" -INCLUDE_ASM(s32, "battle/area_pra2/660E10", func_802188DC_66102C); +#include "common/UnkFloatFunc2.inc.c" INCLUDE_ASM(s32, "battle/area_pra2/660E10", func_802189E0_661130); diff --git a/src/battle/area_sam/625750.c b/src/battle/area_sam/625750.c index cae8f9ea9d..5a1023ce08 100644 --- a/src/battle/area_sam/625750.c +++ b/src/battle/area_sam/625750.c @@ -1,39 +1,60 @@ #include "common.h" +#define NAMESPACE b_area_sam + INCLUDE_ASM(s32, "battle/area_sam/625750", func_80219BB0_625750); -INCLUDE_ASM(s32, "battle/area_sam/625750", func_80219DA8_625948); +#include "common/Set80071270_0_16.inc.c" -INCLUDE_ASM(s32, "battle/area_sam/625750", func_80219DCC_62596C); +#include "common/UnkFloatFunc2.inc.c" INCLUDE_ASM(s32, "battle/area_sam/625750", func_80219ED0_625A70); -INCLUDE_ASM(s32, "battle/area_sam/625750", func_8021A0C8_625C68); +#define NAMESPACE dup_b_area_sam +#include "common/Set80071270_0_16.inc.c" +#define NAMESPACE b_area_sam -INCLUDE_ASM(s32, "battle/area_sam/625750", func_8021A0EC_625C8C); +#define NAMESPACE dup_b_area_sam +#include "common/UnkFloatFunc2.inc.c" INCLUDE_ASM(s32, "battle/area_sam/625750", func_8021A1F0_625D90); -INCLUDE_ASM(s32, "battle/area_sam/625750", func_8021A3E8_625F88); +#define NAMESPACE dup2_b_area_sam +#include "common/Set80071270_0_16.inc.c" +#define NAMESPACE b_area_sam -INCLUDE_ASM(s32, "battle/area_sam/625750", func_8021A40C_625FAC); +#define NAMESPACE dup2_b_area_sam +#include "common/UnkFloatFunc2.inc.c" +#define NAMESPACE b_area_sam INCLUDE_ASM(s32, "battle/area_sam/625750", func_8021A510_6260B0); -INCLUDE_ASM(s32, "battle/area_sam/625750", func_8021A708_6262A8); +#define NAMESPACE dup3_b_area_sam +#include "common/Set80071270_0_16.inc.c" +#define NAMESPACE b_area_sam -INCLUDE_ASM(s32, "battle/area_sam/625750", func_8021A72C_6262CC); +#define NAMESPACE dup3_b_area_sam +#include "common/UnkFloatFunc2.inc.c" +#define NAMESPACE b_area_sam INCLUDE_ASM(s32, "battle/area_sam/625750", func_8021A830_6263D0); -INCLUDE_ASM(s32, "battle/area_sam/625750", func_8021AA28_6265C8); +#define NAMESPACE dup4_b_area_sam +#include "common/Set80071270_0_16.inc.c" +#define NAMESPACE b_area_sam -INCLUDE_ASM(s32, "battle/area_sam/625750", func_8021AA4C_6265EC); +#define NAMESPACE dup4_b_area_sam +#include "common/UnkFloatFunc2.inc.c" +#define NAMESPACE b_area_sam INCLUDE_ASM(s32, "battle/area_sam/625750", func_8021AB50_6266F0); -INCLUDE_ASM(s32, "battle/area_sam/625750", func_8021AD48_6268E8); +#define NAMESPACE dup5_b_area_sam +#include "common/Set80071270_0_16.inc.c" +#define NAMESPACE b_area_sam -INCLUDE_ASM(s32, "battle/area_sam/625750", func_8021AD6C_62690C); +#define NAMESPACE dup5_b_area_sam +#include "common/UnkFloatFunc2.inc.c" +#define NAMESPACE b_area_sam INCLUDE_ASM(s32, "battle/area_sam/625750", func_8021AE70_626A10); diff --git a/src/battle/area_sam2/63DD60.c b/src/battle/area_sam2/63DD60.c index 41db24ee22..6d26a6d0b1 100644 --- a/src/battle/area_sam2/63DD60.c +++ b/src/battle/area_sam2/63DD60.c @@ -1,39 +1,61 @@ #include "common.h" +#define NAMESPACE b_area_sam2 + INCLUDE_ASM(s32, "battle/area_sam2/63DD60", func_80218B80_63DD60); -INCLUDE_ASM(s32, "battle/area_sam2/63DD60", func_80218D78_63DF58); +#include "common/Set80071270_0_16.inc.c" -INCLUDE_ASM(s32, "battle/area_sam2/63DD60", func_80218D9C_63DF7C); +#include "common/UnkFloatFunc2.inc.c" INCLUDE_ASM(s32, "battle/area_sam2/63DD60", func_80218EA0_63E080); -INCLUDE_ASM(s32, "battle/area_sam2/63DD60", func_80219098_63E278); +#define NAMESPACE dup_b_area_sam2 +#include "common/Set80071270_0_16.inc.c" +#define NAMESPACE b_area_sam2 -INCLUDE_ASM(s32, "battle/area_sam2/63DD60", func_802190BC_63E29C); +#define NAMESPACE dup_b_area_sam2 +#include "common/UnkFloatFunc2.inc.c" +#define NAMESPACE b_area_sam2 INCLUDE_ASM(s32, "battle/area_sam2/63DD60", func_802191C0_63E3A0); -INCLUDE_ASM(s32, "battle/area_sam2/63DD60", func_802193B8_63E598); +#define NAMESPACE dup2_b_area_sam2 +#include "common/Set80071270_0_16.inc.c" +#define NAMESPACE b_area_sam2 -INCLUDE_ASM(s32, "battle/area_sam2/63DD60", func_802193DC_63E5BC); +#define NAMESPACE dup2_b_area_sam2 +#include "common/UnkFloatFunc2.inc.c" +#define NAMESPACE b_area_sam2 INCLUDE_ASM(s32, "battle/area_sam2/63DD60", func_802194E0_63E6C0); -INCLUDE_ASM(s32, "battle/area_sam2/63DD60", func_802196D8_63E8B8); +#define NAMESPACE dup3_b_area_sam2 +#include "common/Set80071270_0_16.inc.c" +#define NAMESPACE b_area_sam2 -INCLUDE_ASM(s32, "battle/area_sam2/63DD60", func_802196FC_63E8DC); +#define NAMESPACE dup3_b_area_sam2 +#include "common/UnkFloatFunc2.inc.c" +#define NAMESPACE b_area_sam2 INCLUDE_ASM(s32, "battle/area_sam2/63DD60", func_80219800_63E9E0); -INCLUDE_ASM(s32, "battle/area_sam2/63DD60", func_802199F8_63EBD8); +#define NAMESPACE dup4_b_area_sam2 +#include "common/Set80071270_0_16.inc.c" +#define NAMESPACE b_area_sam2 -INCLUDE_ASM(s32, "battle/area_sam2/63DD60", func_80219A1C_63EBFC); +#define NAMESPACE dup4_b_area_sam2 +#include "common/UnkFloatFunc2.inc.c" +#define NAMESPACE b_area_sam2 INCLUDE_ASM(s32, "battle/area_sam2/63DD60", func_80219B20_63ED00); -INCLUDE_ASM(s32, "battle/area_sam2/63DD60", func_80219D18_63EEF8); +#define NAMESPACE dup5_b_area_sam2 +#include "common/Set80071270_0_16.inc.c" +#define NAMESPACE b_area_sam2 -INCLUDE_ASM(s32, "battle/area_sam2/63DD60", func_80219D3C_63EF1C); +#define NAMESPACE dup5_b_area_sam2 +#include "common/UnkFloatFunc2.inc.c" +#define NAMESPACE b_area_sam2 INCLUDE_ASM(s32, "battle/area_sam2/63DD60", func_80219E40_63F020); diff --git a/src/battle/area_trd_part_1/4A12C0.c b/src/battle/area_trd_part_1/4A12C0.c index f2df2df57c..f8167b29ad 100644 --- a/src/battle/area_trd_part_1/4A12C0.c +++ b/src/battle/area_trd_part_1/4A12C0.c @@ -2,4 +2,4 @@ #define NAMESPACE b_area_trd_part_1 -INCLUDE_ASM(s32, "battle/area_trd_part_1/4A12C0", func_80218220_4A12C0); +#include "common/UnkAngleFunc2.inc.c" diff --git a/src/battle/area_trd_part_2/4B34D0.c b/src/battle/area_trd_part_2/4B34D0.c index 9acdf319ae..8cfec55c23 100644 --- a/src/battle/area_trd_part_2/4B34D0.c +++ b/src/battle/area_trd_part_2/4B34D0.c @@ -2,4 +2,4 @@ #define NAMESPACE b_area_trd_part_2 -INCLUDE_ASM(s32, "battle/area_trd_part_2/4B34D0", func_8021A2E0_4B34D0); +#include "common/UnkAngleFunc2.inc.c" diff --git a/src/battle/partner/parakarry_6FFD80.c b/src/battle/partner/parakarry_6FFD80.c index 9e48b3c582..b2a212b186 100644 --- a/src/battle/partner/parakarry_6FFD80.c +++ b/src/battle/partner/parakarry_6FFD80.c @@ -1,4 +1,5 @@ #include "common.h" +#include "battle/battle.h" INCLUDE_ASM(s32, "battle/partner/parakarry_6FFD80", func_80238000_6FFD80); diff --git a/src/common/Set80071270_0_16.inc.c b/src/common/Set80071270_0_16.inc.c new file mode 100644 index 0000000000..a0d1b2398b --- /dev/null +++ b/src/common/Set80071270_0_16.inc.c @@ -0,0 +1,6 @@ +#include "common.h" + +ApiStatus N(Set80071270_0_16)(ScriptInstance* script, s32 isInitialCall) { + func_80071270(0, 0x10); + return ApiStatus_DONE2; +} diff --git a/src/common/UnkAngleFunc2.inc.c b/src/common/UnkAngleFunc2.inc.c new file mode 100644 index 0000000000..89e20d74da --- /dev/null +++ b/src/common/UnkAngleFunc2.inc.c @@ -0,0 +1,33 @@ +#include "common.h" + +ApiStatus N(UnkAngleFunc2)(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + f32 var0 = get_variable(script, *args++) / 10.0; + s32 a3 = *args++; + s32 a4 = *args++; + s32 a5 = *args++; + s32 a6 = *args++; + f32 temp1 = var0 * TAU / 360.0f; + f32 fout1 = sin_rad(temp1) * 150.0f + 0.0f; + f32 fout2 = sin_rad(temp1 * 8.0f) * 10.0f + 0.0f; + f32 fout3 = cos_rad(temp1) * 150.0f / 20.0f + -50.0f; + s32 outVal; + + set_float_variable(script, a3, fout1); + set_float_variable(script, a4, fout2); + set_float_variable(script, a5, fout3); + + outVal = 0; + if (var0 > 90.0f && var0 < 270.0f) { + outVal = 180; + } + if ((s32)fabsf(90.0f - var0) < 45) { + outVal = 2.0f * (var0 - 45.0f); + } + if ((s32)fabsf(270.0f - var0) < 45) { + outVal = 2.0f * (var0 - 225.0f) + 180.0f; + } + set_variable(script, a6, outVal); + + return ApiStatus_DONE2; +} diff --git a/src/common/UnkFloatFunc2.inc.c b/src/common/UnkFloatFunc2.inc.c new file mode 100644 index 0000000000..9885a271df --- /dev/null +++ b/src/common/UnkFloatFunc2.inc.c @@ -0,0 +1,17 @@ +#include "common.h" +#include "map.h" + +ApiStatus N(UnkFloatFunc2)(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 var0 = get_variable(script, *args++); + s32 a1 = *args++; + s32 a2 = *args++; + s32 a3 = *args++; + f32 temp = sin_rad(var0 / 10 * 6.28318f / 360.0f * 8.0f) * 10.0f; + + set_variable(script, a1, 0); + set_variable(script, a2, temp); + set_variable(script, a3, 0); + + return ApiStatus_DONE2; +} diff --git a/src/world/area_isk/isk_05/97DAD0.c b/src/world/area_isk/isk_05/97DAD0.c index 6af4505ca1..f260d75a55 100644 --- a/src/world/area_isk/isk_05/97DAD0.c +++ b/src/world/area_isk/isk_05/97DAD0.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_80240230_97DD00); INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_80240628_97E0F8); -INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_802407CC_97E29C); +#include "world/common/UnkNpcAIFunc15.inc.c" INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_802408AC_97E37C); diff --git a/src/world/area_isk/isk_13/98F7E0.c b/src/world/area_isk/isk_13/98F7E0.c index 271d8df102..ba4372b11f 100644 --- a/src/world/area_isk/isk_13/98F7E0.c +++ b/src/world/area_isk/isk_13/98F7E0.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_isk/isk_13/98F7E0", func_80240230_98FA10); INCLUDE_ASM(s32, "world/area_isk/isk_13/98F7E0", func_80240628_98FE08); -INCLUDE_ASM(s32, "world/area_isk/isk_13/98F7E0", func_802407CC_98FFAC); +#include "world/common/UnkNpcAIFunc15.inc.c" INCLUDE_ASM(s32, "world/area_isk/isk_13/98F7E0", func_802408AC_99008C); diff --git a/src/world/area_isk/isk_14/992730.c b/src/world/area_isk/isk_14/992730.c index aaae2df28f..39079fcc83 100644 --- a/src/world/area_isk/isk_14/992730.c +++ b/src/world/area_isk/isk_14/992730.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_isk/isk_14/992730", func_80240230_992960); INCLUDE_ASM(s32, "world/area_isk/isk_14/992730", func_80240628_992D58); -INCLUDE_ASM(s32, "world/area_isk/isk_14/992730", func_802407CC_992EFC); +#include "world/common/UnkNpcAIFunc15.inc.c" INCLUDE_ASM(s32, "world/area_isk/isk_14/992730", func_802408AC_992FDC); diff --git a/src/world/area_jan/jan_01/B28030.c b/src/world/area_jan/jan_01/B28030.c index f4b95eaf9f..fe125be895 100644 --- a/src/world/area_jan/jan_01/B28030.c +++ b/src/world/area_jan/jan_01/B28030.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_01/B28030", func_80240570_B285A0); INCLUDE_ASM(s32, "world/area_jan/jan_01/B28030", func_80240968_B28998); -INCLUDE_ASM(s32, "world/area_jan/jan_01/B28030", func_80240B0C_B28B3C); +#include "world/common/UnkNpcAIFunc15.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_01/B28030", func_80240BEC_B28C1C); diff --git a/src/world/area_jan/jan_05/B4B260.c b/src/world/area_jan/jan_05/B4B260.c index 0ab46bb7b9..f7743fc55a 100644 --- a/src/world/area_jan/jan_05/B4B260.c +++ b/src/world/area_jan/jan_05/B4B260.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80240AD4_B4B544); INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80240ECC_B4B93C); -INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80241070_B4BAE0); +#include "world/common/UnkNpcAIFunc15.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80241150_B4BBC0); diff --git a/src/world/area_jan/jan_06/B52F70.c b/src/world/area_jan/jan_06/B52F70.c index 6e51b8d36e..cb277c99c8 100644 --- a/src/world/area_jan/jan_06/B52F70.c +++ b/src/world/area_jan/jan_06/B52F70.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_80240970_B531A0); INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", delete_player_actor_B53598); -INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_80240F0C_B5373C); +#include "world/common/UnkNpcAIFunc15.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_80240FEC_B5381C); diff --git a/src/world/area_jan/jan_10/B6C6A0.c b/src/world/area_jan/jan_10/B6C6A0.c index d66e571d77..1c6a2d398e 100644 --- a/src/world/area_jan/jan_10/B6C6A0.c +++ b/src/world/area_jan/jan_10/B6C6A0.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_10/B6C6A0", func_80240540_B6C8D0); INCLUDE_ASM(s32, "world/area_jan/jan_10/B6C6A0", func_80240938_B6CCC8); -INCLUDE_ASM(s32, "world/area_jan/jan_10/B6C6A0", func_80240ADC_B6CE6C); +#include "world/common/UnkNpcAIFunc15.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_10/B6C6A0", delete_actor_B6CF4C); diff --git a/src/world/area_jan/jan_14/B7A510.c b/src/world/area_jan/jan_14/B7A510.c index dca0a7aa2f..a5b3a87bbf 100644 --- a/src/world/area_jan/jan_14/B7A510.c +++ b/src/world/area_jan/jan_14/B7A510.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_14/B7A510", func_802406F0_B7A740); INCLUDE_ASM(s32, "world/area_jan/jan_14/B7A510", func_80240AE8_B7AB38); -INCLUDE_ASM(s32, "world/area_jan/jan_14/B7A510", func_80240C8C_B7ACDC); +#include "world/common/UnkNpcAIFunc15.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_14/B7A510", func_80240D6C_B7ADBC); diff --git a/src/world/area_kmr/kmr_10/8D84D0.c b/src/world/area_kmr/kmr_10/8D84D0.c index 30e9e15943..a01192fcd3 100644 --- a/src/world/area_kmr/kmr_10/8D84D0.c +++ b/src/world/area_kmr/kmr_10/8D84D0.c @@ -26,17 +26,4 @@ ApiStatus func_802402BC_8D878C(ScriptInstance* script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_kmr/kmr_10/8D84D0", func_802402BC_8D878C); #endif -ApiStatus func_80240304_8D87D4(ScriptInstance* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32 entityIndex = get_variable(script, *args++); - s32 x = get_variable(script, *args++); - s32 y = get_variable(script, *args++); - s32 z = get_variable(script, *args++); - Entity* entity = get_entity_by_index(entityIndex); - - entity->position.x = x; - entity->position.y = y; - entity->position.z = z; - - return ApiStatus_DONE2; -} +#include "world/common/SetEntityPosition.inc.c" diff --git a/src/world/area_kpa/kpa_134/AA94B0.c b/src/world/area_kpa/kpa_134/AA94B0.c index fbd30b26f4..dbc3d80279 100644 --- a/src/world/area_kpa/kpa_134/AA94B0.c +++ b/src/world/area_kpa/kpa_134/AA94B0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_134/AA94B0", func_80240510_AA94B0); -INCLUDE_ASM(s32, "world/area_kpa/kpa_134/AA94B0", func_80240564_AA9504); +#include "world/common/SetEntityPosition.inc.c" #include "world/common/SetEntityFlags100000.inc.c" diff --git a/src/world/area_mim/mim_02/B97C70.c b/src/world/area_mim/mim_02/B97C70.c index c1cb67ad99..99a76e7503 100644 --- a/src/world/area_mim/mim_02/B97C70.c +++ b/src/world/area_mim/mim_02/B97C70.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_mim/mim_02/B97C70", func_802402A0_B97EA0); INCLUDE_ASM(s32, "world/area_mim/mim_02/B97C70", func_80240698_B98298); -INCLUDE_ASM(s32, "world/area_mim/mim_02/B97C70", func_8024083C_B9843C); +#include "world/common/UnkNpcAIFunc15.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_02/B97C70", func_8024091C_B9851C); diff --git a/src/world/area_mim/mim_04/B9DB60.c b/src/world/area_mim/mim_04/B9DB60.c index d01646e7bd..2353199354 100644 --- a/src/world/area_mim/mim_04/B9DB60.c +++ b/src/world/area_mim/mim_04/B9DB60.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_mim/mim_04/B9DB60", func_80240430_B9DD90); INCLUDE_ASM(s32, "world/area_mim/mim_04/B9DB60", func_80240828_B9E188); -INCLUDE_ASM(s32, "world/area_mim/mim_04/B9DB60", func_802409CC_B9E32C); +#include "world/common/UnkNpcAIFunc15.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_04/B9DB60", func_80240AAC_B9E40C); diff --git a/src/world/area_mim/mim_06/BA4CF0.c b/src/world/area_mim/mim_06/BA4CF0.c index 989c849e0a..5b1b02b984 100644 --- a/src/world/area_mim/mim_06/BA4CF0.c +++ b/src/world/area_mim/mim_06/BA4CF0.c @@ -38,7 +38,7 @@ INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_80242144_BA68C4); INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_8024253C_BA6CBC); -INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_802426E0_BA6E60); +#include "world/common/UnkNpcAIFunc15.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_802427C0_BA6F40); diff --git a/src/world/area_mim/mim_07/BAA3B0.c b/src/world/area_mim/mim_07/BAA3B0.c index 20435058fa..21d205f54f 100644 --- a/src/world/area_mim/mim_07/BAA3B0.c +++ b/src/world/area_mim/mim_07/BAA3B0.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_mim/mim_07/BAA3B0", func_802404A0_BAA5E0); INCLUDE_ASM(s32, "world/area_mim/mim_07/BAA3B0", func_80240898_BAA9D8); -INCLUDE_ASM(s32, "world/area_mim/mim_07/BAA3B0", func_80240A3C_BAAB7C); +#include "world/common/UnkNpcAIFunc15.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_07/BAA3B0", func_80240B1C_BAAC5C); diff --git a/src/world/area_mim/mim_09/BB2E00.c b/src/world/area_mim/mim_09/BB2E00.c index f4a29f4a27..df23f880b7 100644 --- a/src/world/area_mim/mim_09/BB2E00.c +++ b/src/world/area_mim/mim_09/BB2E00.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_mim/mim_09/BB2E00", func_802402D0_BB30D0); INCLUDE_ASM(s32, "world/area_mim/mim_09/BB2E00", func_802406C8_BB34C8); -INCLUDE_ASM(s32, "world/area_mim/mim_09/BB2E00", func_8024086C_BB366C); +#include "world/common/UnkNpcAIFunc15.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_09/BB2E00", func_8024094C_BB374C); diff --git a/src/world/area_nok/nok_03/9EB7F0.c b/src/world/area_nok/nok_03/9EB7F0.c index 6f65ca93bd..10cf6528f0 100644 --- a/src/world/area_nok/nok_03/9EB7F0.c +++ b/src/world/area_nok/nok_03/9EB7F0.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_03/9EB7F0", func_80240230_9EBA20); INCLUDE_ASM(s32, "world/area_nok/nok_03/9EB7F0", func_80240628_9EBE18); -INCLUDE_ASM(s32, "world/area_nok/nok_03/9EB7F0", func_802407CC_9EBFBC); +#include "world/common/UnkNpcAIFunc15.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_03/9EB7F0", func_802408AC_9EC09C); diff --git a/src/world/area_nok/nok_12/9FA970.c b/src/world/area_nok/nok_12/9FA970.c index 673101b8a2..65a3e3e2b9 100644 --- a/src/world/area_nok/nok_12/9FA970.c +++ b/src/world/area_nok/nok_12/9FA970.c @@ -2,4 +2,4 @@ INCLUDE_ASM(s32, "world/area_nok/nok_12/9FA970", func_80240180_9FA970); -INCLUDE_ASM(s32, "world/area_nok/nok_12/9FA970", func_80240224_9FAA14); +#include "world/common/SetEntityPosition.inc.c" diff --git a/src/world/area_nok/nok_13/A00600.c b/src/world/area_nok/nok_13/A00600.c index 24e52d2595..dfe96f8717 100644 --- a/src/world/area_nok/nok_13/A00600.c +++ b/src/world/area_nok/nok_13/A00600.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_13/A00600", func_80240230_A00830); INCLUDE_ASM(s32, "world/area_nok/nok_13/A00600", func_80240628_A00C28); -INCLUDE_ASM(s32, "world/area_nok/nok_13/A00600", func_802407CC_A00DCC); +#include "world/common/UnkNpcAIFunc15.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_13/A00600", func_802408AC_A00EAC); diff --git a/src/world/area_tik/tik_01/869AA0.c b/src/world/area_tik/tik_01/869AA0.c index b79e7f2316..937a75cf4d 100644 --- a/src/world/area_tik/tik_01/869AA0.c +++ b/src/world/area_tik/tik_01/869AA0.c @@ -2,4 +2,4 @@ INCLUDE_ASM(s32, "world/area_tik/tik_01/869AA0", func_802405F0_869AA0); -INCLUDE_ASM(s32, "world/area_tik/tik_01/869AA0", func_80240960_869E10); +#include "world/common/SetEntityPosition.inc.c" diff --git a/src/world/area_tik/tik_05/8750D0.c b/src/world/area_tik/tik_05/8750D0.c index afa714dfa2..8cb8d387b6 100644 --- a/src/world/area_tik/tik_05/8750D0.c +++ b/src/world/area_tik/tik_05/8750D0.c @@ -12,4 +12,4 @@ INCLUDE_ASM(s32, "world/area_tik/tik_05/8750D0", func_80240680_875440); INCLUDE_ASM(s32, "world/area_tik/tik_05/8750D0", func_8024093C_8756FC); -INCLUDE_ASM(s32, "world/area_tik/tik_05/8750D0", func_80240984_875744); +#include "world/common/SetEntityPosition.inc.c" diff --git a/src/world/area_tik/tik_08/87F3E0.c b/src/world/area_tik/tik_08/87F3E0.c index f65461fa44..1dc9f9afb6 100644 --- a/src/world/area_tik/tik_08/87F3E0.c +++ b/src/world/area_tik/tik_08/87F3E0.c @@ -2,4 +2,4 @@ INCLUDE_ASM(s32, "world/area_tik/tik_08/87F3E0", func_802405F0_87F3E0); -INCLUDE_ASM(s32, "world/area_tik/tik_08/87F3E0", func_80240960_87F750); +#include "world/common/SetEntityPosition.inc.c" diff --git a/src/world/area_tik/tik_09/8827B0.c b/src/world/area_tik/tik_09/8827B0.c index 7b97b61feb..694c5d9053 100644 --- a/src/world/area_tik/tik_09/8827B0.c +++ b/src/world/area_tik/tik_09/8827B0.c @@ -2,4 +2,4 @@ INCLUDE_ASM(s32, "world/area_tik/tik_09/8827B0", func_802405F0_8827B0); -INCLUDE_ASM(s32, "world/area_tik/tik_09/8827B0", func_80240960_882B20); +#include "world/common/SetEntityPosition.inc.c" diff --git a/src/world/area_tik/tik_25/8A8600.c b/src/world/area_tik/tik_25/8A8600.c index 67812ad6ac..24b6899085 100644 --- a/src/world/area_tik/tik_25/8A8600.c +++ b/src/world/area_tik/tik_25/8A8600.c @@ -2,6 +2,6 @@ INCLUDE_ASM(s32, "world/area_tik/tik_25/8A8600", func_80240680_8A8600); -INCLUDE_ASM(s32, "world/area_tik/tik_25/8A8600", func_802406AC_8A862C); +#include "world/common/SetEntityPosition.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_25/8A8600", func_80240770_8A86F0); diff --git a/src/world/common/UnkNpcAIFunc15.inc.c b/src/world/common/UnkNpcAIFunc15.inc.c new file mode 100644 index 0000000000..f2c6f45be0 --- /dev/null +++ b/src/world/common/UnkNpcAIFunc15.inc.c @@ -0,0 +1,15 @@ +#include "common.h" +#include "map.h" + +void N(UnkNpcAIFunc15)(ScriptInstance* script, NpcAISettings* aiSettings, s32 arg2) { + Npc* enemy = get_npc_unsafe(script->owner1.enemy->npcID); + + func_80049F7C(script, aiSettings, arg2); + enemy->flags = enemy->flags | 0x800; + enemy->jumpVelocity = rand_int(5) + 10.0; + enemy->jumpScale = 1.5f; + enemy->yaw = atan2(enemy->pos.x, enemy->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + enemy->moveSpeed = aiSettings->chaseSpeed; + script->functionTemp[0].s = 13; + func_800494C0(enemy, 0xB0000017, 0); +} diff --git a/tools/assist.py b/tools/assist.py index 48ee779111..30742a7e87 100755 --- a/tools/assist.py +++ b/tools/assist.py @@ -45,13 +45,15 @@ def get_symbol_bytes(offsets, func): return None start = offsets[func]["start"] end = offsets[func]["end"] - bs = list(rom_bytes[start:end][0::4]) + bs = list(rom_bytes[start:end]) while len(bs) > 0 and bs[-1] == 0: bs.pop() + insns = bs[0::4] + ret = [] - for ins in bs: + for ins in insns: ret.append(ins >> 2) return bytes(ret).decode('utf-8'), bs @@ -218,7 +220,7 @@ parser.add_argument("--num-out", help="number of functions to display", type=int args = parser.parse_args() rom_bytes = read_rom() -map_syms = parse_map(build_dir + "papermario.map") +map_syms = parse_map(os.path.join(root_dir, "ver", "current", "build", "papermario.map")) map_offsets = get_map_offsets(map_syms) s_files = get_all_s_files() diff --git a/ver/us/asm/data/battle/partner/watt_704A70.data.s b/ver/us/asm/data/battle/partner/watt_704A80.data.s similarity index 79% rename from ver/us/asm/data/battle/partner/watt_704A70.data.s rename to ver/us/asm/data/battle/partner/watt_704A80.data.s index 9d8fc7a0c8..595fc02c2b 100644 --- a/ver/us/asm/data/battle/partner/watt_704A70.data.s +++ b/ver/us/asm/data/battle/partner/watt_704A80.data.s @@ -2,8 +2,8 @@ .section .data -glabel D_80238F80_704A70 -.word 0x27BD0038, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x000E0002, 0x0000000C, 0x000E0000, 0x00000006, 0x000E000A, 0x00000009, 0x000E0000, 0x00000008, 0x000E0000, 0x0000000D, 0x000E000F, 0x00000012, 0x000E0000, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000063, 0x00000000, 0x00000001, 0x00000064, 0x00000002, 0x00000064, 0x00000006, 0x00000064, 0x00000009, 0x00000064, 0x00000007, 0x00000064, 0x00000004, 0x00000064, 0x00000003, 0x00000064, 0x0000000B, 0x00000064, 0x00000005, 0x00000064, 0x0000000A, 0x00000064, 0x00000008, 0x00000064, 0x0000001F, 0x00000000, 0x00000020, 0x00000000, 0x00000025, 0x00000000, 0x00000022, 0x00000000, 0x00000024, 0x00000000, 0x00000023, 0x00000000, 0x00000021, 0x00000000, 0x00000026, 0x00000000, 0x00000027, 0x00000000, 0x00000029, 0x00000000, 0x00000000, 0x00800000, 0x01000000, 0x0A1600FF, 0x80238F90, 0x80238FCC, 0x00000080, 0x00000000, 0x00000000, 0x00000000, 0x00000200, 0x00740063, 0x00010000, 0x8023908C, 0x802390D8, 0x80238FE0, 0x00000000, 0x00045000, 0x221C0000, 0xF6140A14, 0x00000043, 0x00000003, BindTakeTurn, 0xFFFFFF81, 0x80239578, 0x00000043, 0x00000003, BindIdle, 0xFFFFFF81, 0x80239138, 0x00000043, 0x00000003, BindHandleEvent, 0xFFFFFF81, 0x80239160, 0x00000043, 0x00000003, BindNextTurn, 0xFFFFFF81, 0x802397BC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004B, 0x00000001, 0x00000063, 0x00000043, 0x00000001, func_80238000_703AF0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000100, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000043, 0x00000001, func_802383D4_703EC4, 0x00000043, 0x00000001, func_802383E4_703ED4, 0x00000043, 0x00000002, func_80238408_703EF8, 0x00000000, 0x00000043, 0x00000003, GetLastEvent, 0x00000100, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000009, 0x0000001D, 0x00000001, 0x0000000A, 0x00000025, 0x00000002, 0xFE363C81, 0x000E000C, 0x00000025, 0x00000002, 0xFE363C82, 0x000E000C, 0x00000046, 0x00000001, 0x802977BC, 0x00000025, 0x00000002, 0xFE363C81, 0x000E000C, 0x00000046, 0x00000001, 0x80296014, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000017, 0x0000001D, 0x00000001, 0x00000019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000100, 0x0000208C, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x000E000C, 0x00000046, 0x00000001, 0x80297814, 0x00000043, 0x00000001, func_802383C0_703EB0, 0x00000020, 0x00000000, 0x00000016, 0x00000001, 0x0000002A, 0x00000025, 0x00000002, 0xFE363C81, 0x000E000C, 0x00000025, 0x00000002, 0xFE363C82, 0x0000000C, 0x00000046, 0x00000001, 0x80294FE4, 0x00000025, 0x00000002, 0xFE363C81, 0x000E000C, 0x00000046, 0x00000001, 0x80296014, 0x00000016, 0x00000001, 0x0000002C, 0x00000043, 0x00000001, func_802383F8_703EE8, 0x00000025, 0x00000002, 0xFE363C81, 0x000E000D, 0x00000024, 0x00000002, 0xFE363C82, 0x0000000C, 0x00000025, 0x00000002, 0xFE363C83, 0x000E000E, 0x00000046, 0x00000001, 0x80294C68, 0x00000043, 0x00000001, func_802383E4_703ED4, 0x00000025, 0x00000002, 0xFE363C81, 0x000E000C, 0x00000046, 0x00000001, 0x80296014, 0x00000016, 0x00000001, 0x0000000E, 0x00000025, 0x00000002, 0xFE363C81, 0x000E000D, 0x00000025, 0x00000002, 0xFE363C82, 0x000E000E, 0x00000046, 0x00000001, 0x8029621C, 0x00000025, 0x00000002, 0xFE363C81, 0x000E000C, 0x00000046, 0x00000001, 0x80296014, 0x00000016, 0x00000001, 0x0000002F, 0x00000025, 0x00000002, 0xFE363C81, 0x000E000C, 0x00000024, 0x00000002, 0xFE363C82, 0x0000000C, 0x00000046, 0x00000001, 0x80295744, 0x00000016, 0x00000001, 0x00000033, 0x00000025, 0x00000002, 0xFE363C81, 0x000E000C, 0x00000046, 0x00000001, 0x80296014, 0x00000016, 0x00000001, 0x00000034, 0x00000043, 0x00000001, func_802383C0_703EB0, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x000E0001, 0x00000025, 0x00000002, 0xFE363C82, 0x000E0003, 0x00000024, 0x00000002, 0xFE363C83, 0x00000014, 0x00000046, 0x00000001, 0x80295EC4, 0x00000043, 0x00000001, func_802383C0_703EB0, 0x00000016, 0x00000001, 0x0000003E, 0x00000043, 0x00000001, func_80238370_703E60, 0x0000001D, 0x00000001, 0x00000018, 0x0000001D, 0x00000001, 0x0000001A, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000100, 0x0000208C, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x000E0013, 0x00000046, 0x00000001, 0x80297814, 0x00000008, 0x00000001, 0x0000000A, 0x00000020, 0x00000000, 0x00000016, 0x00000001, 0x00000040, 0x00000043, 0x00000001, func_802383F8_703EE8, 0x00000016, 0x00000001, 0x00000041, 0x00000043, 0x00000001, func_802383E4_703ED4, 0x0000001C, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000100, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetBattlePhase, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, 0x802397CC, 0x00000016, 0x00000001, 0x00000005, 0x00000046, 0x00000001, 0x8023960C, 0x00000016, 0x00000001, 0x00000003, 0x00000046, 0x00000001, 0x80239684, 0x00000016, 0x00000001, 0x00000007, 0x00000046, 0x00000001, 0x802396DC, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802383E4_703ED4, 0x00000043, 0x00000002, func_80238408_703EF8, 0x00000001, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x000E0008, 0x00000025, 0x00000002, 0xFE363C82, 0x000E0002, 0x00000025, 0x00000002, 0xFE363C83, 0x000E0001, 0x00000046, 0x00000001, 0x80294720, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802383E4_703ED4, 0x00000043, 0x00000002, func_80238408_703EF8, 0x00000001, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x000E0003, 0x00000046, 0x00000001, 0x80294AFC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802383E4_703ED4, 0x00000043, 0x00000002, func_80238408_703EF8, 0x00000001, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000100, 0x00000000, 0x00000043, 0x00000002, SetGoalToHome, 0x00000100, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A9280, 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x000E0003, 0x00000043, 0x00000003, SetActorYaw, 0x00000100, 0x00000000, 0x00000043, 0x00000003, RunToGoal, 0x00000100, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x000E0001, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000100, 0x00000001, 0x00000043, 0x00000002, func_80238408_703EF8, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802694A4, 0x00000001, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00004000, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000008, 0x00000043, 0x00000001, LoadStarPowerScript, 0x00000046, 0x00000001, 0xFE363C80, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C82, 0x00000016, 0x00000001, 0x000000A1, 0x00000046, 0x00000001, 0x80239BC8, 0x00000016, 0x00000001, 0x000000A2, 0x00000046, 0x00000001, 0x80239BC8, 0x00000016, 0x00000001, 0x000000A3, 0x00000046, 0x00000001, 0x80239BC8, 0x00000016, 0x00000001, 0x000000A4, 0x00000046, 0x00000001, 0x8023A684, 0x00000016, 0x00000001, 0x000000A5, 0x00000046, 0x00000001, 0x8023B8EC, 0x00000016, 0x00000001, 0x000000A6, 0x00000046, 0x00000001, 0x8023B970, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000004, 0x00000043, 0x00000002, SetGoalToHome, 0x00000100, 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x000E0003, 0x00000043, 0x00000005, FlyToGoal, 0x00000100, 0x0000001E, 0x00000000, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x000E0001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000033, 0x00000043, 0x00000002, SetGoalToHome, 0x00000100, 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x000E0003, 0x00000043, 0x00000005, FlyToGoal, 0x00000100, 0x0000001E, 0x00000000, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x000E0001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +glabel D_80238F90_704A80 +.word 0x00000001, 0x000E0002, 0x0000000C, 0x000E0000, 0x00000006, 0x000E000A, 0x00000009, 0x000E0000, 0x00000008, 0x000E0000, 0x0000000D, 0x000E000F, 0x00000012, 0x000E0000, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000063, 0x00000000, 0x00000001, 0x00000064, 0x00000002, 0x00000064, 0x00000006, 0x00000064, 0x00000009, 0x00000064, 0x00000007, 0x00000064, 0x00000004, 0x00000064, 0x00000003, 0x00000064, 0x0000000B, 0x00000064, 0x00000005, 0x00000064, 0x0000000A, 0x00000064, 0x00000008, 0x00000064, 0x0000001F, 0x00000000, 0x00000020, 0x00000000, 0x00000025, 0x00000000, 0x00000022, 0x00000000, 0x00000024, 0x00000000, 0x00000023, 0x00000000, 0x00000021, 0x00000000, 0x00000026, 0x00000000, 0x00000027, 0x00000000, 0x00000029, 0x00000000, 0x00000000, 0x00800000, 0x01000000, 0x0A1600FF, 0x80238F90, 0x80238FCC, 0x00000080, 0x00000000, 0x00000000, 0x00000000, 0x00000200, 0x00740063, 0x00010000, 0x8023908C, 0x802390D8, 0x80238FE0, 0x00000000, 0x00045000, 0x221C0000, 0xF6140A14, 0x00000043, 0x00000003, BindTakeTurn, 0xFFFFFF81, 0x80239578, 0x00000043, 0x00000003, BindIdle, 0xFFFFFF81, 0x80239138, 0x00000043, 0x00000003, BindHandleEvent, 0xFFFFFF81, 0x80239160, 0x00000043, 0x00000003, BindNextTurn, 0xFFFFFF81, 0x802397BC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004B, 0x00000001, 0x00000063, 0x00000043, 0x00000001, func_80238000_703AF0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000100, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000043, 0x00000001, func_802383D4_703EC4, 0x00000043, 0x00000001, func_802383E4_703ED4, 0x00000043, 0x00000002, func_80238408_703EF8, 0x00000000, 0x00000043, 0x00000003, GetLastEvent, 0x00000100, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000009, 0x0000001D, 0x00000001, 0x0000000A, 0x00000025, 0x00000002, 0xFE363C81, 0x000E000C, 0x00000025, 0x00000002, 0xFE363C82, 0x000E000C, 0x00000046, 0x00000001, 0x802977BC, 0x00000025, 0x00000002, 0xFE363C81, 0x000E000C, 0x00000046, 0x00000001, 0x80296014, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000017, 0x0000001D, 0x00000001, 0x00000019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000100, 0x0000208C, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x000E000C, 0x00000046, 0x00000001, 0x80297814, 0x00000043, 0x00000001, func_802383C0_703EB0, 0x00000020, 0x00000000, 0x00000016, 0x00000001, 0x0000002A, 0x00000025, 0x00000002, 0xFE363C81, 0x000E000C, 0x00000025, 0x00000002, 0xFE363C82, 0x0000000C, 0x00000046, 0x00000001, 0x80294FE4, 0x00000025, 0x00000002, 0xFE363C81, 0x000E000C, 0x00000046, 0x00000001, 0x80296014, 0x00000016, 0x00000001, 0x0000002C, 0x00000043, 0x00000001, func_802383F8_703EE8, 0x00000025, 0x00000002, 0xFE363C81, 0x000E000D, 0x00000024, 0x00000002, 0xFE363C82, 0x0000000C, 0x00000025, 0x00000002, 0xFE363C83, 0x000E000E, 0x00000046, 0x00000001, 0x80294C68, 0x00000043, 0x00000001, func_802383E4_703ED4, 0x00000025, 0x00000002, 0xFE363C81, 0x000E000C, 0x00000046, 0x00000001, 0x80296014, 0x00000016, 0x00000001, 0x0000000E, 0x00000025, 0x00000002, 0xFE363C81, 0x000E000D, 0x00000025, 0x00000002, 0xFE363C82, 0x000E000E, 0x00000046, 0x00000001, 0x8029621C, 0x00000025, 0x00000002, 0xFE363C81, 0x000E000C, 0x00000046, 0x00000001, 0x80296014, 0x00000016, 0x00000001, 0x0000002F, 0x00000025, 0x00000002, 0xFE363C81, 0x000E000C, 0x00000024, 0x00000002, 0xFE363C82, 0x0000000C, 0x00000046, 0x00000001, 0x80295744, 0x00000016, 0x00000001, 0x00000033, 0x00000025, 0x00000002, 0xFE363C81, 0x000E000C, 0x00000046, 0x00000001, 0x80296014, 0x00000016, 0x00000001, 0x00000034, 0x00000043, 0x00000001, func_802383C0_703EB0, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x000E0001, 0x00000025, 0x00000002, 0xFE363C82, 0x000E0003, 0x00000024, 0x00000002, 0xFE363C83, 0x00000014, 0x00000046, 0x00000001, 0x80295EC4, 0x00000043, 0x00000001, func_802383C0_703EB0, 0x00000016, 0x00000001, 0x0000003E, 0x00000043, 0x00000001, func_80238370_703E60, 0x0000001D, 0x00000001, 0x00000018, 0x0000001D, 0x00000001, 0x0000001A, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000100, 0x0000208C, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x000E0013, 0x00000046, 0x00000001, 0x80297814, 0x00000008, 0x00000001, 0x0000000A, 0x00000020, 0x00000000, 0x00000016, 0x00000001, 0x00000040, 0x00000043, 0x00000001, func_802383F8_703EE8, 0x00000016, 0x00000001, 0x00000041, 0x00000043, 0x00000001, func_802383E4_703ED4, 0x0000001C, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000100, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetBattlePhase, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, 0x802397CC, 0x00000016, 0x00000001, 0x00000005, 0x00000046, 0x00000001, 0x8023960C, 0x00000016, 0x00000001, 0x00000003, 0x00000046, 0x00000001, 0x80239684, 0x00000016, 0x00000001, 0x00000007, 0x00000046, 0x00000001, 0x802396DC, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802383E4_703ED4, 0x00000043, 0x00000002, func_80238408_703EF8, 0x00000001, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x000E0008, 0x00000025, 0x00000002, 0xFE363C82, 0x000E0002, 0x00000025, 0x00000002, 0xFE363C83, 0x000E0001, 0x00000046, 0x00000001, 0x80294720, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802383E4_703ED4, 0x00000043, 0x00000002, func_80238408_703EF8, 0x00000001, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x000E0003, 0x00000046, 0x00000001, 0x80294AFC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802383E4_703ED4, 0x00000043, 0x00000002, func_80238408_703EF8, 0x00000001, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000100, 0x00000000, 0x00000043, 0x00000002, SetGoalToHome, 0x00000100, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A9280, 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x000E0003, 0x00000043, 0x00000003, SetActorYaw, 0x00000100, 0x00000000, 0x00000043, 0x00000003, RunToGoal, 0x00000100, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x000E0001, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000100, 0x00000001, 0x00000043, 0x00000002, func_80238408_703EF8, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802694A4, 0x00000001, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00004000, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000008, 0x00000043, 0x00000001, LoadStarPowerScript, 0x00000046, 0x00000001, 0xFE363C80, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C82, 0x00000016, 0x00000001, 0x000000A1, 0x00000046, 0x00000001, 0x80239BC8, 0x00000016, 0x00000001, 0x000000A2, 0x00000046, 0x00000001, 0x80239BC8, 0x00000016, 0x00000001, 0x000000A3, 0x00000046, 0x00000001, 0x80239BC8, 0x00000016, 0x00000001, 0x000000A4, 0x00000046, 0x00000001, 0x8023A684, 0x00000016, 0x00000001, 0x000000A5, 0x00000046, 0x00000001, 0x8023B8EC, 0x00000016, 0x00000001, 0x000000A6, 0x00000046, 0x00000001, 0x8023B970, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000004, 0x00000043, 0x00000002, SetGoalToHome, 0x00000100, 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x000E0003, 0x00000043, 0x00000005, FlyToGoal, 0x00000100, 0x0000001E, 0x00000000, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x000E0001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000033, 0x00000043, 0x00000002, SetGoalToHome, 0x00000100, 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x000E0003, 0x00000043, 0x00000005, FlyToGoal, 0x00000100, 0x0000001E, 0x00000000, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x000E0001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80239A0C_7054FC .word 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x000E0003, 0x00000043, 0x00000005, FlyToGoal, 0x00000100, 0x00000014, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x000E0005, 0x00000043, 0x00000001, func_802383F8_703EE8, 0x00000043, 0x00000004, PlayLoopingSoundAtActor, 0x00000100, 0x00000000, 0x00000289, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000C, 0x00000043, 0x00000004, func_802384B0_703FA0, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, func_80238434_703F24, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x000E0006, 0x00000005, 0x00000001, 0x00000037, 0x00000027, 0x00000002, 0xFE363C89, 0x0000001E, 0x0000000D, 0x00000002, 0xFE363C89, 0x000000C8, 0x00000024, 0x00000002, 0xFE363C89, 0x000000C8, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80238478_703F68, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, func_8026EA7C, 0xFFFFFF81, 0x00000001, 0x00000009, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x0000000C, 0x00000043, 0x00000001, func_802A9000_4219F0, 0x00000043, 0x00000007, func_802691C8, 0x00000001, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, UseCamPreset, 0x00000030, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000100, 0x00000043, 0x00000005, AddGoalPos, 0x00000100, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E282, 0x00000000, 0x00000005, 0x00000001, 0x0000003C, 0x00000043, 0x00000003, CheckButtonDown, 0x00008000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E282, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, MoveBattleCamOver, 0x0000004B, 0x0000000A, 0x00000002, 0xFBD3E282, 0x00000001, 0x00000043, 0x00000005, func_802A91B8_428498, 0x00000000, 0x00000066, 0x00000003, 0x00000001, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000045, 0x00000002, 0x80239A10, 0xFE363C8A, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000003, CheckButtonDown, 0x00008000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000007, PartnerTestEnemy, 0xFE363C80, 0x00000000, 0x00000004, 0x00000000, 0x00000001, 0x00000010, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000045, 0x00000002, 0x80239A54, 0xFE363C8A, 0x00000005, 0x00000001, 0x00000037, 0x00000043, 0x00000003, CheckButtonDown, 0x00008000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000045, 0x00000002, 0x80239B98, 0xFE363C8A, 0x00000005, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, CheckButtonDown, 0x00008000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000045, 0x00000002, 0x80239A10, 0xFE363C8A, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000003, CheckButtonDown, 0x00008000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E282, 0x00000000, 0x00000043, 0x00000005, func_802A91B8_428498, 0x00000000, 0x0000005C, 0x00000003, 0x00000001, 0x00000024, 0x00000002, 0xFBD3E282, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E282, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000007, PartnerTestEnemy, 0xFE363C80, 0x00000000, 0x00000004, 0x00000000, 0x00000001, 0x00000010, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000045, 0x00000002, 0x80239A54, 0xFE363C8A, 0x00000005, 0x00000001, 0x00000037, 0x00000043, 0x00000003, CheckButtonDown, 0x00008000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E282, 0x00000000, 0x00000043, 0x00000005, func_802A91B8_428498, 0x00000000, 0x0000005C, 0x00000003, 0x00000001, 0x00000024, 0x00000002, 0xFBD3E282, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E282, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000045, 0x00000002, 0x80239B98, 0xFE363C8A, 0x00000005, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, CheckButtonDown, 0x00008000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000043, 0x00000001, func_80238570_704060, 0x00000043, 0x00000003, StopLoopingSoundAtActor, 0x00000100, 0x00000000, 0x00000043, 0x00000002, func_80269EAC, 0x00000013, 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x000E0005, 0x00000043, 0x00000004, func_8026EA7C, 0xFFFFFF81, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000100, 0x00000043, 0x00000005, AddGoalPos, 0x00000100, 0xFFFFFFFB, 0x00000000, 0x00000000, 0x00000043, 0x00000005, FlyToGoal, 0x00000100, 0x00000005, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80238478_703F68, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000007, PartnerTestEnemy, 0xFE363C80, 0x00000000, 0x00000004, 0x00000000, 0x00000001, 0x00000010, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x000E0001, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000100, 0x00000043, 0x00000005, AddGoalPos, 0x00000100, 0x00000028, 0x0000000A, 0x00000000, 0x00000043, 0x00000005, FlyToGoal, 0x00000100, 0x0000000A, 0xFFFFFFEC, 0x00000004, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetGoalToHome, 0x00000100, 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x000E0003, 0x00000043, 0x00000005, FlyToGoal, 0x00000100, 0x0000001E, 0x00000000, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x000E0001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802383E4_703ED4, 0x00000043, 0x00000001, func_802383C0_703EB0, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C82, 0x00000016, 0x00000001, 0x000000A1, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000003, 0x00000016, 0x00000001, 0x000000A2, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000004, 0x00000016, 0x00000001, 0x000000A3, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802807D0, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000007, PartnerDamageEnemy, 0xFE363C80, 0x08000020, 0x0000008D, 0x00000000, 0xFE363C8F, 0x00000070, 0x0000001C, 0x00000000, 0x00000043, 0x00000007, PartnerDamageEnemy, 0xFE363C80, 0x08000020, 0x0000008D, 0x00000000, 0xFE363C8E, 0x00000030, 0x00000023, 0x00000000, 0x00000043, 0x00000001, func_80280818, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x00000046, 0x00000001, 0x80239914, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000046, 0x00000001, 0x80239990, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000010, 0x00000043, 0x00000001, func_802A9000_4219F0, 0x00000043, 0x00000007, func_802691C8, 0x00000001, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_80269344, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E28F, 0x00000000, 0x00000043, 0x00000003, GetOwnerTarget, 0xFE363C8A, 0xFE363C8B, 0x00000043, 0x00000003, GetActorFlags, 0xFE363C8A, 0xFE363C80, 0x00000010, 0x00000002, 0xFE363C80, 0x00000800, 0x00000024, 0x00000002, 0xFBD3E28F, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x0000002F, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000028, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000100, 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x000E0003, 0x00000043, 0x00000002, func_80238408_703EF8, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000100, 0xFFFFFFF1, 0xFFFFFFF6, 0x00000000, 0x00000043, 0x00000005, FlyToGoal, 0x00000100, 0x0000001E, 0x00000000, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x000E0001, 0x00000043, 0x00000007, PartnerTestEnemy, 0xFE363C80, 0x00000000, 0x00000004, 0x00000000, 0x00000001, 0x00000010, 0x00000043, 0x00000002, AddBattleCamZoom, 0xFFFFFF9C, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000050, 0x00000043, 0x00000001, func_802383F8_703EE8, 0x00000043, 0x00000001, func_80238784_704274, 0x00000043, 0x00000005, func_802A9210_42D120, 0x00000000, 0x00000048, 0x00000003, 0xFE363C80, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C82, 0x00000005, 0x00000043, 0x0000000F, PlayEffect, 0x00000057, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7E80, 0x0000004B, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000001, func_80238434_703F24, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x000E0006, 0x00000043, 0x00000004, func_8026EA7C, 0xFFFFFF81, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x0000004B, 0x00000027, 0x00000002, 0xFE363C89, 0x00000003, 0x00000043, 0x00000002, func_80238478_703F68, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000004B, 0x00000043, 0x00000004, func_8026EA7C, 0xFFFFFF81, 0x00000001, 0x00000009, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000100, 0x0000028A, 0x00000056, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000005, 0x00000001, 0x00000003, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A7C1A, 0x00000043, 0x00000005, SetActorScale, 0x00000100, 0xFE363C80, 0xFE363C80, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000008, 0x00000043, 0x0000000F, PlayEffect, 0x0000006B, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A81B4, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000027, 0x00000002, 0xFE363C82, 0x00000005, 0x00000043, 0x00000004, func_8023859C_70408C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, UseCamPreset, 0x0000002F, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000064, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000005, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80238668_704158, 0x00000014, 0x00000057, 0x00000000, 0x00000005, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80238478_703F68, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_80238478_703F68, 0x000000C8, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, func_80238478_703F68, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, func_802383E4_703ED4, 0x00000043, 0x00000002, func_80238408_703EF8, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, SetActorRotationOffset, 0xFFFFFF81, 0x00000000, 0x00000014, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A834D, 0x00000005, 0x00000001, 0x0000000C, 0x0000002D, 0x00000002, 0xFE363C80, 0xF24A7AE7, 0x00000043, 0x00000005, SetActorScale, 0x00000100, 0xFE363C80, 0xFE363C80, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetActorRotationOffset, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x000E0001, 0x00000057, 0x00000000, 0x00000043, 0x00000007, PartnerTestEnemy, 0xFE363C80, 0x00000000, 0x00000004, 0x00000000, 0x00000001, 0x00000010, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000008, 0x00000001, 0x0000000F, 0x00000046, 0x00000001, 0x80239990, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_802695A8, 0xFE363C8F, 0x00000043, 0x00000002, func_802807D0, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000008, PartnerAfflictEnemy, 0xFE363C80, 0x50000020, 0x00000000, 0xC0010300, 0x000000FE, 0x00000000, 0x00000070, 0x0000001C, 0x00000000, 0x00000043, 0x00000008, PartnerAfflictEnemy, 0xFE363C80, 0x50000020, 0x00000000, 0xC0010300, 0x000000FF, 0x00000000, 0x00000030, 0x00000023, 0x00000000, 0x00000043, 0x00000001, func_80280818, 0x0000000B, 0x00000002, 0xFBD3E28F, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000100, 0xFFFFFFE7, 0x0000000A, 0x00000000, 0x00000043, 0x00000005, FlyToGoal, 0x00000100, 0x0000000F, 0xFFFFFFF6, 0x0000000A, 0x00000012, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000100, 0xFFFFFFE7, 0xFFFFFFF6, 0x00000000, 0x00000043, 0x00000005, FlyToGoal, 0x00000100, 0x0000000F, 0xFFFFFFF6, 0x0000000A, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x00000046, 0x00000001, 0x80239914, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000046, 0x00000001, 0x80239990, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000016, 0x00000043, 0x00000002, func_802A9000_4219F0, 0x00000001, 0x00000043, 0x00000002, func_80269344, 0x00000000, 0x00000043, 0x00000004, SetActorFlagBits, 0x00000000, 0x20000000, 0x00000001, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, UseCamPreset, 0x00000013, 0x00000043, 0x00000004, SetBattleCamTarget, 0xFFFFFF83, 0x0000002A, 0x00000000, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000000, 0x00000043, 0x00000002, SetBattleCamZoom, 0x00000154, 0x00000043, 0x00000002, MoveBattleCamOver, 0x0000001E, 0x00000043, 0x00000003, SetActorYaw, 0x00000100, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000100, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000100, 0x0000005A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000100, 0x00000078, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000100, 0x00000096, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000100, 0x000000B4, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, func_802A9398_42A888, 0x00000000, 0x00000064, 0x00000003, 0x00000043, 0x00000002, AddBattleCamZoom, 0xFFFFFFB5, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000064, 0x00000043, 0x00000004, func_8024ECF8, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, EnableActorBlur, 0x00000100, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x000E0005, 0x00000043, 0x00000002, func_80238810_704300, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x000E0003, 0x00000043, 0x00000002, SetGoalToHome, 0x00000100, 0x00000043, 0x00000005, FlyToGoal, 0x00000100, 0x0000000A, 0xFFFFFFF6, 0x00000005, 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x000E0001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableActorBlur, 0x00000100, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000100, 0x0000028B, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000002A, 0x00000043, 0x00000004, func_80238B3C_70462C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000003B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000064, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000005, 0x00000056, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000160, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80273444, 0x00000014, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000043, 0x00000002, MoveBattleCamOver, 0x0000000A, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000100, 0x0000208E, 0x00000043, 0x00000002, func_802807D0, 0xFE363C80, 0x00000043, 0x00000001, func_80238C08_7046F8, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C8F, 0x0000000D, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x00000023, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000056, 0xFE363C8F, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A8080, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowVariableMessageBox, 0x0000002A, 0x0000003C, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, WaitForMessageBoxDone, 0x00000043, 0x00000004, SetActorFlagBits, 0x00000000, 0x20000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000016, 0x00000043, 0x00000002, func_802A9000_4219F0, 0x00000001, 0x00000043, 0x00000002, func_80269344, 0x00000000, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, UseCamPreset, 0x00000013, 0x00000043, 0x00000004, SetBattleCamTarget, 0xFFFFFF83, 0x0000002A, 0x00000000, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000000, 0x00000043, 0x00000002, SetBattleCamZoom, 0x00000154, 0x00000043, 0x00000002, MoveBattleCamOver, 0x0000001E, 0x00000043, 0x00000003, SetActorYaw, 0x00000100, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000100, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000100, 0x0000005A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000100, 0x00000078, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000100, 0x00000096, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000100, 0x000000B4, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, func_802A9398_42A888, 0x00000000, 0x00000064, 0x00000003, 0x00000043, 0x00000002, AddBattleCamZoom, 0xFFFFFF9C, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000064, 0x00000043, 0x00000004, func_8024ECF8, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, EnableActorBlur, 0x00000100, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x000E0005, 0x00000043, 0x00000002, func_80238810_704300, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x000E0003, 0x00000043, 0x00000002, SetGoalToHome, 0x00000100, 0x00000043, 0x00000005, FlyToGoal, 0x00000100, 0x0000000A, 0xFFFFFFF6, 0x00000005, 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x000E0001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableActorBlur, 0x00000100, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000100, 0x0000028B, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000002A, 0x00000043, 0x00000004, func_80238B3C_70462C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000003B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000064, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000043, 0x00000002, MoveBattleCamOver, 0x0000000A, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000100, 0x0000208E, 0x00000043, 0x00000002, func_802807D0, 0xFE363C80, 0x00000043, 0x00000001, func_80238C08_7046F8, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C8F, 0x0000000D, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x00000023, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000056, 0xFE363C8F, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A8080, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowVariableMessageBox, 0x0000002A, 0x0000003C, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, WaitForMessageBoxDone, 0x00000043, 0x00000004, SetActorFlagBits, 0x00000000, 0x20000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetStatusFlags, 0x00000000, 0xFE363C80, 0x00000010, 0x00000002, 0xFE363C80, 0x0035D000, 0x00000046, 0x00000001, 0x8023B450, 0x00000012, 0x00000000, 0x00000046, 0x00000001, 0x8023AE8C, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/nonmatchings/battle/area_kmr_part_1/431180/func_802187E0_431180.s b/ver/us/asm/nonmatchings/battle/area_kmr_part_1/431180/func_802187E0_431180.s deleted file mode 100644 index b0782dee91..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_kmr_part_1/431180/func_802187E0_431180.s +++ /dev/null @@ -1,164 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802187E0_431180 -/* 431180 802187E0 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 431184 802187E4 AFB40020 */ sw $s4, 0x20($sp) -/* 431188 802187E8 0080A02D */ daddu $s4, $a0, $zero -/* 43118C 802187EC AFBF0024 */ sw $ra, 0x24($sp) -/* 431190 802187F0 AFB3001C */ sw $s3, 0x1c($sp) -/* 431194 802187F4 AFB20018 */ sw $s2, 0x18($sp) -/* 431198 802187F8 AFB10014 */ sw $s1, 0x14($sp) -/* 43119C 802187FC AFB00010 */ sw $s0, 0x10($sp) -/* 4311A0 80218800 F7BE0050 */ sdc1 $f30, 0x50($sp) -/* 4311A4 80218804 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* 4311A8 80218808 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 4311AC 8021880C F7B80038 */ sdc1 $f24, 0x38($sp) -/* 4311B0 80218810 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 4311B4 80218814 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 4311B8 80218818 8E90000C */ lw $s0, 0xc($s4) -/* 4311BC 8021881C 8E050000 */ lw $a1, ($s0) -/* 4311C0 80218820 0C0B1EAF */ jal get_variable -/* 4311C4 80218824 26100004 */ addiu $s0, $s0, 4 -/* 4311C8 80218828 44820000 */ mtc1 $v0, $f0 -/* 4311CC 8021882C 00000000 */ nop -/* 4311D0 80218830 46800021 */ cvt.d.w $f0, $f0 -/* 4311D4 80218834 8E110000 */ lw $s1, ($s0) -/* 4311D8 80218838 26100004 */ addiu $s0, $s0, 4 -/* 4311DC 8021883C 3C014024 */ lui $at, 0x4024 -/* 4311E0 80218840 44811800 */ mtc1 $at, $f3 -/* 4311E4 80218844 44801000 */ mtc1 $zero, $f2 -/* 4311E8 80218848 3C0140C9 */ lui $at, 0x40c9 -/* 4311EC 8021884C 34210FD0 */ ori $at, $at, 0xfd0 -/* 4311F0 80218850 4481A000 */ mtc1 $at, $f20 -/* 4311F4 80218854 8E130000 */ lw $s3, ($s0) -/* 4311F8 80218858 46220003 */ div.d $f0, $f0, $f2 -/* 4311FC 8021885C 462007A0 */ cvt.s.d $f30, $f0 -/* 431200 80218860 4614F502 */ mul.s $f20, $f30, $f20 -/* 431204 80218864 00000000 */ nop -/* 431208 80218868 26100004 */ addiu $s0, $s0, 4 -/* 43120C 8021886C 8E120000 */ lw $s2, ($s0) -/* 431210 80218870 3C0143B4 */ lui $at, 0x43b4 -/* 431214 80218874 44810000 */ mtc1 $at, $f0 -/* 431218 80218878 8E100004 */ lw $s0, 4($s0) -/* 43121C 8021887C 4600A503 */ div.s $f20, $f20, $f0 -/* 431220 80218880 0C00A85B */ jal sin_rad -/* 431224 80218884 4600A306 */ mov.s $f12, $f20 -/* 431228 80218888 3C014100 */ lui $at, 0x4100 -/* 43122C 8021888C 44816000 */ mtc1 $at, $f12 -/* 431230 80218890 00000000 */ nop -/* 431234 80218894 460CA302 */ mul.s $f12, $f20, $f12 -/* 431238 80218898 00000000 */ nop -/* 43123C 8021889C 3C014316 */ lui $at, 0x4316 -/* 431240 802188A0 4481E000 */ mtc1 $at, $f28 -/* 431244 802188A4 00000000 */ nop -/* 431248 802188A8 461C0582 */ mul.s $f22, $f0, $f28 -/* 43124C 802188AC 00000000 */ nop -/* 431250 802188B0 4480D000 */ mtc1 $zero, $f26 -/* 431254 802188B4 0C00A85B */ jal sin_rad -/* 431258 802188B8 461AB580 */ add.s $f22, $f22, $f26 -/* 43125C 802188BC 3C014120 */ lui $at, 0x4120 -/* 431260 802188C0 44811000 */ mtc1 $at, $f2 -/* 431264 802188C4 00000000 */ nop -/* 431268 802188C8 46020602 */ mul.s $f24, $f0, $f2 -/* 43126C 802188CC 00000000 */ nop -/* 431270 802188D0 4600A306 */ mov.s $f12, $f20 -/* 431274 802188D4 0C00A874 */ jal cos_rad -/* 431278 802188D8 461AC600 */ add.s $f24, $f24, $f26 -/* 43127C 802188DC 0280202D */ daddu $a0, $s4, $zero -/* 431280 802188E0 461C0502 */ mul.s $f20, $f0, $f28 -/* 431284 802188E4 00000000 */ nop -/* 431288 802188E8 0220282D */ daddu $a1, $s1, $zero -/* 43128C 802188EC 4406B000 */ mfc1 $a2, $f22 -/* 431290 802188F0 3C0141A0 */ lui $at, 0x41a0 -/* 431294 802188F4 44810000 */ mtc1 $at, $f0 -/* 431298 802188F8 3C01C248 */ lui $at, 0xc248 -/* 43129C 802188FC 44811000 */ mtc1 $at, $f2 -/* 4312A0 80218900 4600A503 */ div.s $f20, $f20, $f0 -/* 4312A4 80218904 0C0B2190 */ jal set_float_variable -/* 4312A8 80218908 4602A500 */ add.s $f20, $f20, $f2 -/* 4312AC 8021890C 0280202D */ daddu $a0, $s4, $zero -/* 4312B0 80218910 4406C000 */ mfc1 $a2, $f24 -/* 4312B4 80218914 0C0B2190 */ jal set_float_variable -/* 4312B8 80218918 0260282D */ daddu $a1, $s3, $zero -/* 4312BC 8021891C 0280202D */ daddu $a0, $s4, $zero -/* 4312C0 80218920 4406A000 */ mfc1 $a2, $f20 -/* 4312C4 80218924 0C0B2190 */ jal set_float_variable -/* 4312C8 80218928 0240282D */ daddu $a1, $s2, $zero -/* 4312CC 8021892C 3C0142B4 */ lui $at, 0x42b4 -/* 4312D0 80218930 44810000 */ mtc1 $at, $f0 -/* 4312D4 80218934 00000000 */ nop -/* 4312D8 80218938 461E003C */ c.lt.s $f0, $f30 -/* 4312DC 8021893C 00000000 */ nop -/* 4312E0 80218940 4500000B */ bc1f .L80218970 -/* 4312E4 80218944 0000302D */ daddu $a2, $zero, $zero -/* 4312E8 80218948 3C014387 */ lui $at, 0x4387 -/* 4312EC 8021894C 44810000 */ mtc1 $at, $f0 -/* 4312F0 80218950 00000000 */ nop -/* 4312F4 80218954 4600F03C */ c.lt.s $f30, $f0 -/* 4312F8 80218958 00000000 */ nop -/* 4312FC 8021895C 45030001 */ bc1tl .L80218964 -/* 431300 80218960 240600B4 */ addiu $a2, $zero, 0xb4 -.L80218964: -/* 431304 80218964 3C0142B4 */ lui $at, 0x42b4 -/* 431308 80218968 44810000 */ mtc1 $at, $f0 -/* 43130C 8021896C 00000000 */ nop -.L80218970: -/* 431310 80218970 461E0001 */ sub.s $f0, $f0, $f30 -/* 431314 80218974 46000005 */ abs.s $f0, $f0 -/* 431318 80218978 4600010D */ trunc.w.s $f4, $f0 -/* 43131C 8021897C 44022000 */ mfc1 $v0, $f4 -/* 431320 80218980 00000000 */ nop -/* 431324 80218984 2842002D */ slti $v0, $v0, 0x2d -/* 431328 80218988 10400008 */ beqz $v0, .L802189AC -/* 43132C 8021898C 00000000 */ nop -/* 431330 80218990 3C014234 */ lui $at, 0x4234 -/* 431334 80218994 44810000 */ mtc1 $at, $f0 -/* 431338 80218998 00000000 */ nop -/* 43133C 8021899C 4600F001 */ sub.s $f0, $f30, $f0 -/* 431340 802189A0 46000000 */ add.s $f0, $f0, $f0 -/* 431344 802189A4 4600010D */ trunc.w.s $f4, $f0 -/* 431348 802189A8 44062000 */ mfc1 $a2, $f4 -.L802189AC: -/* 43134C 802189AC 3C014387 */ lui $at, 0x4387 -/* 431350 802189B0 44810000 */ mtc1 $at, $f0 -/* 431354 802189B4 00000000 */ nop -/* 431358 802189B8 461E0001 */ sub.s $f0, $f0, $f30 -/* 43135C 802189BC 46000005 */ abs.s $f0, $f0 -/* 431360 802189C0 4600010D */ trunc.w.s $f4, $f0 -/* 431364 802189C4 44022000 */ mfc1 $v0, $f4 -/* 431368 802189C8 00000000 */ nop -/* 43136C 802189CC 2842002D */ slti $v0, $v0, 0x2d -/* 431370 802189D0 1040000C */ beqz $v0, .L80218A04 -/* 431374 802189D4 0280202D */ daddu $a0, $s4, $zero -/* 431378 802189D8 3C014361 */ lui $at, 0x4361 -/* 43137C 802189DC 44810000 */ mtc1 $at, $f0 -/* 431380 802189E0 00000000 */ nop -/* 431384 802189E4 4600F001 */ sub.s $f0, $f30, $f0 -/* 431388 802189E8 46000000 */ add.s $f0, $f0, $f0 -/* 43138C 802189EC 3C014334 */ lui $at, 0x4334 -/* 431390 802189F0 44811000 */ mtc1 $at, $f2 -/* 431394 802189F4 00000000 */ nop -/* 431398 802189F8 46020000 */ add.s $f0, $f0, $f2 -/* 43139C 802189FC 4600010D */ trunc.w.s $f4, $f0 -/* 4313A0 80218A00 44062000 */ mfc1 $a2, $f4 -.L80218A04: -/* 4313A4 80218A04 0C0B2026 */ jal set_variable -/* 4313A8 80218A08 0200282D */ daddu $a1, $s0, $zero -/* 4313AC 80218A0C 8FBF0024 */ lw $ra, 0x24($sp) -/* 4313B0 80218A10 8FB40020 */ lw $s4, 0x20($sp) -/* 4313B4 80218A14 8FB3001C */ lw $s3, 0x1c($sp) -/* 4313B8 80218A18 8FB20018 */ lw $s2, 0x18($sp) -/* 4313BC 80218A1C 8FB10014 */ lw $s1, 0x14($sp) -/* 4313C0 80218A20 8FB00010 */ lw $s0, 0x10($sp) -/* 4313C4 80218A24 D7BE0050 */ ldc1 $f30, 0x50($sp) -/* 4313C8 80218A28 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* 4313CC 80218A2C D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 4313D0 80218A30 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 4313D4 80218A34 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 4313D8 80218A38 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 4313DC 80218A3C 24020002 */ addiu $v0, $zero, 2 -/* 4313E0 80218A40 03E00008 */ jr $ra -/* 4313E4 80218A44 27BD0058 */ addiu $sp, $sp, 0x58 -/* 4313E8 80218A48 00000000 */ nop -/* 4313EC 80218A4C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/battle/area_kmr_part_1/4313F0/func_80218A50_4313F0.s b/ver/us/asm/nonmatchings/battle/area_kmr_part_1/4313F0/func_80218A50_4313F0.s deleted file mode 100644 index f3c30954c4..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_kmr_part_1/4313F0/func_80218A50_4313F0.s +++ /dev/null @@ -1,164 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218A50_4313F0 -/* 4313F0 80218A50 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 4313F4 80218A54 AFB40020 */ sw $s4, 0x20($sp) -/* 4313F8 80218A58 0080A02D */ daddu $s4, $a0, $zero -/* 4313FC 80218A5C AFBF0024 */ sw $ra, 0x24($sp) -/* 431400 80218A60 AFB3001C */ sw $s3, 0x1c($sp) -/* 431404 80218A64 AFB20018 */ sw $s2, 0x18($sp) -/* 431408 80218A68 AFB10014 */ sw $s1, 0x14($sp) -/* 43140C 80218A6C AFB00010 */ sw $s0, 0x10($sp) -/* 431410 80218A70 F7BE0050 */ sdc1 $f30, 0x50($sp) -/* 431414 80218A74 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* 431418 80218A78 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 43141C 80218A7C F7B80038 */ sdc1 $f24, 0x38($sp) -/* 431420 80218A80 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 431424 80218A84 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 431428 80218A88 8E90000C */ lw $s0, 0xc($s4) -/* 43142C 80218A8C 8E050000 */ lw $a1, ($s0) -/* 431430 80218A90 0C0B1EAF */ jal get_variable -/* 431434 80218A94 26100004 */ addiu $s0, $s0, 4 -/* 431438 80218A98 44820000 */ mtc1 $v0, $f0 -/* 43143C 80218A9C 00000000 */ nop -/* 431440 80218AA0 46800021 */ cvt.d.w $f0, $f0 -/* 431444 80218AA4 8E110000 */ lw $s1, ($s0) -/* 431448 80218AA8 26100004 */ addiu $s0, $s0, 4 -/* 43144C 80218AAC 3C014024 */ lui $at, 0x4024 -/* 431450 80218AB0 44811800 */ mtc1 $at, $f3 -/* 431454 80218AB4 44801000 */ mtc1 $zero, $f2 -/* 431458 80218AB8 3C0140C9 */ lui $at, 0x40c9 -/* 43145C 80218ABC 34210FD0 */ ori $at, $at, 0xfd0 -/* 431460 80218AC0 4481A000 */ mtc1 $at, $f20 -/* 431464 80218AC4 8E130000 */ lw $s3, ($s0) -/* 431468 80218AC8 46220003 */ div.d $f0, $f0, $f2 -/* 43146C 80218ACC 462007A0 */ cvt.s.d $f30, $f0 -/* 431470 80218AD0 4614F502 */ mul.s $f20, $f30, $f20 -/* 431474 80218AD4 00000000 */ nop -/* 431478 80218AD8 26100004 */ addiu $s0, $s0, 4 -/* 43147C 80218ADC 8E120000 */ lw $s2, ($s0) -/* 431480 80218AE0 3C0143B4 */ lui $at, 0x43b4 -/* 431484 80218AE4 44810000 */ mtc1 $at, $f0 -/* 431488 80218AE8 8E100004 */ lw $s0, 4($s0) -/* 43148C 80218AEC 4600A503 */ div.s $f20, $f20, $f0 -/* 431490 80218AF0 0C00A85B */ jal sin_rad -/* 431494 80218AF4 4600A306 */ mov.s $f12, $f20 -/* 431498 80218AF8 3C014100 */ lui $at, 0x4100 -/* 43149C 80218AFC 44816000 */ mtc1 $at, $f12 -/* 4314A0 80218B00 00000000 */ nop -/* 4314A4 80218B04 460CA302 */ mul.s $f12, $f20, $f12 -/* 4314A8 80218B08 00000000 */ nop -/* 4314AC 80218B0C 3C014316 */ lui $at, 0x4316 -/* 4314B0 80218B10 4481E000 */ mtc1 $at, $f28 -/* 4314B4 80218B14 00000000 */ nop -/* 4314B8 80218B18 461C0582 */ mul.s $f22, $f0, $f28 -/* 4314BC 80218B1C 00000000 */ nop -/* 4314C0 80218B20 4480D000 */ mtc1 $zero, $f26 -/* 4314C4 80218B24 0C00A85B */ jal sin_rad -/* 4314C8 80218B28 461AB580 */ add.s $f22, $f22, $f26 -/* 4314CC 80218B2C 3C014120 */ lui $at, 0x4120 -/* 4314D0 80218B30 44811000 */ mtc1 $at, $f2 -/* 4314D4 80218B34 00000000 */ nop -/* 4314D8 80218B38 46020602 */ mul.s $f24, $f0, $f2 -/* 4314DC 80218B3C 00000000 */ nop -/* 4314E0 80218B40 4600A306 */ mov.s $f12, $f20 -/* 4314E4 80218B44 0C00A874 */ jal cos_rad -/* 4314E8 80218B48 461AC600 */ add.s $f24, $f24, $f26 -/* 4314EC 80218B4C 0280202D */ daddu $a0, $s4, $zero -/* 4314F0 80218B50 461C0502 */ mul.s $f20, $f0, $f28 -/* 4314F4 80218B54 00000000 */ nop -/* 4314F8 80218B58 0220282D */ daddu $a1, $s1, $zero -/* 4314FC 80218B5C 4406B000 */ mfc1 $a2, $f22 -/* 431500 80218B60 3C0141A0 */ lui $at, 0x41a0 -/* 431504 80218B64 44810000 */ mtc1 $at, $f0 -/* 431508 80218B68 3C01C248 */ lui $at, 0xc248 -/* 43150C 80218B6C 44811000 */ mtc1 $at, $f2 -/* 431510 80218B70 4600A503 */ div.s $f20, $f20, $f0 -/* 431514 80218B74 0C0B2190 */ jal set_float_variable -/* 431518 80218B78 4602A500 */ add.s $f20, $f20, $f2 -/* 43151C 80218B7C 0280202D */ daddu $a0, $s4, $zero -/* 431520 80218B80 4406C000 */ mfc1 $a2, $f24 -/* 431524 80218B84 0C0B2190 */ jal set_float_variable -/* 431528 80218B88 0260282D */ daddu $a1, $s3, $zero -/* 43152C 80218B8C 0280202D */ daddu $a0, $s4, $zero -/* 431530 80218B90 4406A000 */ mfc1 $a2, $f20 -/* 431534 80218B94 0C0B2190 */ jal set_float_variable -/* 431538 80218B98 0240282D */ daddu $a1, $s2, $zero -/* 43153C 80218B9C 3C0142B4 */ lui $at, 0x42b4 -/* 431540 80218BA0 44810000 */ mtc1 $at, $f0 -/* 431544 80218BA4 00000000 */ nop -/* 431548 80218BA8 461E003C */ c.lt.s $f0, $f30 -/* 43154C 80218BAC 00000000 */ nop -/* 431550 80218BB0 4500000B */ bc1f .L80218BE0 -/* 431554 80218BB4 0000302D */ daddu $a2, $zero, $zero -/* 431558 80218BB8 3C014387 */ lui $at, 0x4387 -/* 43155C 80218BBC 44810000 */ mtc1 $at, $f0 -/* 431560 80218BC0 00000000 */ nop -/* 431564 80218BC4 4600F03C */ c.lt.s $f30, $f0 -/* 431568 80218BC8 00000000 */ nop -/* 43156C 80218BCC 45030001 */ bc1tl .L80218BD4 -/* 431570 80218BD0 240600B4 */ addiu $a2, $zero, 0xb4 -.L80218BD4: -/* 431574 80218BD4 3C0142B4 */ lui $at, 0x42b4 -/* 431578 80218BD8 44810000 */ mtc1 $at, $f0 -/* 43157C 80218BDC 00000000 */ nop -.L80218BE0: -/* 431580 80218BE0 461E0001 */ sub.s $f0, $f0, $f30 -/* 431584 80218BE4 46000005 */ abs.s $f0, $f0 -/* 431588 80218BE8 4600010D */ trunc.w.s $f4, $f0 -/* 43158C 80218BEC 44022000 */ mfc1 $v0, $f4 -/* 431590 80218BF0 00000000 */ nop -/* 431594 80218BF4 2842002D */ slti $v0, $v0, 0x2d -/* 431598 80218BF8 10400008 */ beqz $v0, .L80218C1C -/* 43159C 80218BFC 00000000 */ nop -/* 4315A0 80218C00 3C014234 */ lui $at, 0x4234 -/* 4315A4 80218C04 44810000 */ mtc1 $at, $f0 -/* 4315A8 80218C08 00000000 */ nop -/* 4315AC 80218C0C 4600F001 */ sub.s $f0, $f30, $f0 -/* 4315B0 80218C10 46000000 */ add.s $f0, $f0, $f0 -/* 4315B4 80218C14 4600010D */ trunc.w.s $f4, $f0 -/* 4315B8 80218C18 44062000 */ mfc1 $a2, $f4 -.L80218C1C: -/* 4315BC 80218C1C 3C014387 */ lui $at, 0x4387 -/* 4315C0 80218C20 44810000 */ mtc1 $at, $f0 -/* 4315C4 80218C24 00000000 */ nop -/* 4315C8 80218C28 461E0001 */ sub.s $f0, $f0, $f30 -/* 4315CC 80218C2C 46000005 */ abs.s $f0, $f0 -/* 4315D0 80218C30 4600010D */ trunc.w.s $f4, $f0 -/* 4315D4 80218C34 44022000 */ mfc1 $v0, $f4 -/* 4315D8 80218C38 00000000 */ nop -/* 4315DC 80218C3C 2842002D */ slti $v0, $v0, 0x2d -/* 4315E0 80218C40 1040000C */ beqz $v0, .L80218C74 -/* 4315E4 80218C44 0280202D */ daddu $a0, $s4, $zero -/* 4315E8 80218C48 3C014361 */ lui $at, 0x4361 -/* 4315EC 80218C4C 44810000 */ mtc1 $at, $f0 -/* 4315F0 80218C50 00000000 */ nop -/* 4315F4 80218C54 4600F001 */ sub.s $f0, $f30, $f0 -/* 4315F8 80218C58 46000000 */ add.s $f0, $f0, $f0 -/* 4315FC 80218C5C 3C014334 */ lui $at, 0x4334 -/* 431600 80218C60 44811000 */ mtc1 $at, $f2 -/* 431604 80218C64 00000000 */ nop -/* 431608 80218C68 46020000 */ add.s $f0, $f0, $f2 -/* 43160C 80218C6C 4600010D */ trunc.w.s $f4, $f0 -/* 431610 80218C70 44062000 */ mfc1 $a2, $f4 -.L80218C74: -/* 431614 80218C74 0C0B2026 */ jal set_variable -/* 431618 80218C78 0200282D */ daddu $a1, $s0, $zero -/* 43161C 80218C7C 8FBF0024 */ lw $ra, 0x24($sp) -/* 431620 80218C80 8FB40020 */ lw $s4, 0x20($sp) -/* 431624 80218C84 8FB3001C */ lw $s3, 0x1c($sp) -/* 431628 80218C88 8FB20018 */ lw $s2, 0x18($sp) -/* 43162C 80218C8C 8FB10014 */ lw $s1, 0x14($sp) -/* 431630 80218C90 8FB00010 */ lw $s0, 0x10($sp) -/* 431634 80218C94 D7BE0050 */ ldc1 $f30, 0x50($sp) -/* 431638 80218C98 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* 43163C 80218C9C D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 431640 80218CA0 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 431644 80218CA4 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 431648 80218CA8 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 43164C 80218CAC 24020002 */ addiu $v0, $zero, 2 -/* 431650 80218CB0 03E00008 */ jr $ra -/* 431654 80218CB4 27BD0058 */ addiu $sp, $sp, 0x58 -/* 431658 80218CB8 00000000 */ nop -/* 43165C 80218CBC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/battle/area_kmr_part_1/431660/func_80218CC0_431660.s b/ver/us/asm/nonmatchings/battle/area_kmr_part_1/431660/func_80218CC0_431660.s deleted file mode 100644 index 8e2f1b475b..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_kmr_part_1/431660/func_80218CC0_431660.s +++ /dev/null @@ -1,164 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218CC0_431660 -/* 431660 80218CC0 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 431664 80218CC4 AFB40020 */ sw $s4, 0x20($sp) -/* 431668 80218CC8 0080A02D */ daddu $s4, $a0, $zero -/* 43166C 80218CCC AFBF0024 */ sw $ra, 0x24($sp) -/* 431670 80218CD0 AFB3001C */ sw $s3, 0x1c($sp) -/* 431674 80218CD4 AFB20018 */ sw $s2, 0x18($sp) -/* 431678 80218CD8 AFB10014 */ sw $s1, 0x14($sp) -/* 43167C 80218CDC AFB00010 */ sw $s0, 0x10($sp) -/* 431680 80218CE0 F7BE0050 */ sdc1 $f30, 0x50($sp) -/* 431684 80218CE4 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* 431688 80218CE8 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 43168C 80218CEC F7B80038 */ sdc1 $f24, 0x38($sp) -/* 431690 80218CF0 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 431694 80218CF4 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 431698 80218CF8 8E90000C */ lw $s0, 0xc($s4) -/* 43169C 80218CFC 8E050000 */ lw $a1, ($s0) -/* 4316A0 80218D00 0C0B1EAF */ jal get_variable -/* 4316A4 80218D04 26100004 */ addiu $s0, $s0, 4 -/* 4316A8 80218D08 44820000 */ mtc1 $v0, $f0 -/* 4316AC 80218D0C 00000000 */ nop -/* 4316B0 80218D10 46800021 */ cvt.d.w $f0, $f0 -/* 4316B4 80218D14 8E110000 */ lw $s1, ($s0) -/* 4316B8 80218D18 26100004 */ addiu $s0, $s0, 4 -/* 4316BC 80218D1C 3C014024 */ lui $at, 0x4024 -/* 4316C0 80218D20 44811800 */ mtc1 $at, $f3 -/* 4316C4 80218D24 44801000 */ mtc1 $zero, $f2 -/* 4316C8 80218D28 3C0140C9 */ lui $at, 0x40c9 -/* 4316CC 80218D2C 34210FD0 */ ori $at, $at, 0xfd0 -/* 4316D0 80218D30 4481A000 */ mtc1 $at, $f20 -/* 4316D4 80218D34 8E130000 */ lw $s3, ($s0) -/* 4316D8 80218D38 46220003 */ div.d $f0, $f0, $f2 -/* 4316DC 80218D3C 462007A0 */ cvt.s.d $f30, $f0 -/* 4316E0 80218D40 4614F502 */ mul.s $f20, $f30, $f20 -/* 4316E4 80218D44 00000000 */ nop -/* 4316E8 80218D48 26100004 */ addiu $s0, $s0, 4 -/* 4316EC 80218D4C 8E120000 */ lw $s2, ($s0) -/* 4316F0 80218D50 3C0143B4 */ lui $at, 0x43b4 -/* 4316F4 80218D54 44810000 */ mtc1 $at, $f0 -/* 4316F8 80218D58 8E100004 */ lw $s0, 4($s0) -/* 4316FC 80218D5C 4600A503 */ div.s $f20, $f20, $f0 -/* 431700 80218D60 0C00A85B */ jal sin_rad -/* 431704 80218D64 4600A306 */ mov.s $f12, $f20 -/* 431708 80218D68 3C014100 */ lui $at, 0x4100 -/* 43170C 80218D6C 44816000 */ mtc1 $at, $f12 -/* 431710 80218D70 00000000 */ nop -/* 431714 80218D74 460CA302 */ mul.s $f12, $f20, $f12 -/* 431718 80218D78 00000000 */ nop -/* 43171C 80218D7C 3C014316 */ lui $at, 0x4316 -/* 431720 80218D80 4481E000 */ mtc1 $at, $f28 -/* 431724 80218D84 00000000 */ nop -/* 431728 80218D88 461C0582 */ mul.s $f22, $f0, $f28 -/* 43172C 80218D8C 00000000 */ nop -/* 431730 80218D90 4480D000 */ mtc1 $zero, $f26 -/* 431734 80218D94 0C00A85B */ jal sin_rad -/* 431738 80218D98 461AB580 */ add.s $f22, $f22, $f26 -/* 43173C 80218D9C 3C014120 */ lui $at, 0x4120 -/* 431740 80218DA0 44811000 */ mtc1 $at, $f2 -/* 431744 80218DA4 00000000 */ nop -/* 431748 80218DA8 46020602 */ mul.s $f24, $f0, $f2 -/* 43174C 80218DAC 00000000 */ nop -/* 431750 80218DB0 4600A306 */ mov.s $f12, $f20 -/* 431754 80218DB4 0C00A874 */ jal cos_rad -/* 431758 80218DB8 461AC600 */ add.s $f24, $f24, $f26 -/* 43175C 80218DBC 0280202D */ daddu $a0, $s4, $zero -/* 431760 80218DC0 461C0502 */ mul.s $f20, $f0, $f28 -/* 431764 80218DC4 00000000 */ nop -/* 431768 80218DC8 0220282D */ daddu $a1, $s1, $zero -/* 43176C 80218DCC 4406B000 */ mfc1 $a2, $f22 -/* 431770 80218DD0 3C0141A0 */ lui $at, 0x41a0 -/* 431774 80218DD4 44810000 */ mtc1 $at, $f0 -/* 431778 80218DD8 3C01C248 */ lui $at, 0xc248 -/* 43177C 80218DDC 44811000 */ mtc1 $at, $f2 -/* 431780 80218DE0 4600A503 */ div.s $f20, $f20, $f0 -/* 431784 80218DE4 0C0B2190 */ jal set_float_variable -/* 431788 80218DE8 4602A500 */ add.s $f20, $f20, $f2 -/* 43178C 80218DEC 0280202D */ daddu $a0, $s4, $zero -/* 431790 80218DF0 4406C000 */ mfc1 $a2, $f24 -/* 431794 80218DF4 0C0B2190 */ jal set_float_variable -/* 431798 80218DF8 0260282D */ daddu $a1, $s3, $zero -/* 43179C 80218DFC 0280202D */ daddu $a0, $s4, $zero -/* 4317A0 80218E00 4406A000 */ mfc1 $a2, $f20 -/* 4317A4 80218E04 0C0B2190 */ jal set_float_variable -/* 4317A8 80218E08 0240282D */ daddu $a1, $s2, $zero -/* 4317AC 80218E0C 3C0142B4 */ lui $at, 0x42b4 -/* 4317B0 80218E10 44810000 */ mtc1 $at, $f0 -/* 4317B4 80218E14 00000000 */ nop -/* 4317B8 80218E18 461E003C */ c.lt.s $f0, $f30 -/* 4317BC 80218E1C 00000000 */ nop -/* 4317C0 80218E20 4500000B */ bc1f .L80218E50 -/* 4317C4 80218E24 0000302D */ daddu $a2, $zero, $zero -/* 4317C8 80218E28 3C014387 */ lui $at, 0x4387 -/* 4317CC 80218E2C 44810000 */ mtc1 $at, $f0 -/* 4317D0 80218E30 00000000 */ nop -/* 4317D4 80218E34 4600F03C */ c.lt.s $f30, $f0 -/* 4317D8 80218E38 00000000 */ nop -/* 4317DC 80218E3C 45030001 */ bc1tl .L80218E44 -/* 4317E0 80218E40 240600B4 */ addiu $a2, $zero, 0xb4 -.L80218E44: -/* 4317E4 80218E44 3C0142B4 */ lui $at, 0x42b4 -/* 4317E8 80218E48 44810000 */ mtc1 $at, $f0 -/* 4317EC 80218E4C 00000000 */ nop -.L80218E50: -/* 4317F0 80218E50 461E0001 */ sub.s $f0, $f0, $f30 -/* 4317F4 80218E54 46000005 */ abs.s $f0, $f0 -/* 4317F8 80218E58 4600010D */ trunc.w.s $f4, $f0 -/* 4317FC 80218E5C 44022000 */ mfc1 $v0, $f4 -/* 431800 80218E60 00000000 */ nop -/* 431804 80218E64 2842002D */ slti $v0, $v0, 0x2d -/* 431808 80218E68 10400008 */ beqz $v0, .L80218E8C -/* 43180C 80218E6C 00000000 */ nop -/* 431810 80218E70 3C014234 */ lui $at, 0x4234 -/* 431814 80218E74 44810000 */ mtc1 $at, $f0 -/* 431818 80218E78 00000000 */ nop -/* 43181C 80218E7C 4600F001 */ sub.s $f0, $f30, $f0 -/* 431820 80218E80 46000000 */ add.s $f0, $f0, $f0 -/* 431824 80218E84 4600010D */ trunc.w.s $f4, $f0 -/* 431828 80218E88 44062000 */ mfc1 $a2, $f4 -.L80218E8C: -/* 43182C 80218E8C 3C014387 */ lui $at, 0x4387 -/* 431830 80218E90 44810000 */ mtc1 $at, $f0 -/* 431834 80218E94 00000000 */ nop -/* 431838 80218E98 461E0001 */ sub.s $f0, $f0, $f30 -/* 43183C 80218E9C 46000005 */ abs.s $f0, $f0 -/* 431840 80218EA0 4600010D */ trunc.w.s $f4, $f0 -/* 431844 80218EA4 44022000 */ mfc1 $v0, $f4 -/* 431848 80218EA8 00000000 */ nop -/* 43184C 80218EAC 2842002D */ slti $v0, $v0, 0x2d -/* 431850 80218EB0 1040000C */ beqz $v0, .L80218EE4 -/* 431854 80218EB4 0280202D */ daddu $a0, $s4, $zero -/* 431858 80218EB8 3C014361 */ lui $at, 0x4361 -/* 43185C 80218EBC 44810000 */ mtc1 $at, $f0 -/* 431860 80218EC0 00000000 */ nop -/* 431864 80218EC4 4600F001 */ sub.s $f0, $f30, $f0 -/* 431868 80218EC8 46000000 */ add.s $f0, $f0, $f0 -/* 43186C 80218ECC 3C014334 */ lui $at, 0x4334 -/* 431870 80218ED0 44811000 */ mtc1 $at, $f2 -/* 431874 80218ED4 00000000 */ nop -/* 431878 80218ED8 46020000 */ add.s $f0, $f0, $f2 -/* 43187C 80218EDC 4600010D */ trunc.w.s $f4, $f0 -/* 431880 80218EE0 44062000 */ mfc1 $a2, $f4 -.L80218EE4: -/* 431884 80218EE4 0C0B2026 */ jal set_variable -/* 431888 80218EE8 0200282D */ daddu $a1, $s0, $zero -/* 43188C 80218EEC 8FBF0024 */ lw $ra, 0x24($sp) -/* 431890 80218EF0 8FB40020 */ lw $s4, 0x20($sp) -/* 431894 80218EF4 8FB3001C */ lw $s3, 0x1c($sp) -/* 431898 80218EF8 8FB20018 */ lw $s2, 0x18($sp) -/* 43189C 80218EFC 8FB10014 */ lw $s1, 0x14($sp) -/* 4318A0 80218F00 8FB00010 */ lw $s0, 0x10($sp) -/* 4318A4 80218F04 D7BE0050 */ ldc1 $f30, 0x50($sp) -/* 4318A8 80218F08 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* 4318AC 80218F0C D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 4318B0 80218F10 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 4318B4 80218F14 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 4318B8 80218F18 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 4318BC 80218F1C 24020002 */ addiu $v0, $zero, 2 -/* 4318C0 80218F20 03E00008 */ jr $ra -/* 4318C4 80218F24 27BD0058 */ addiu $sp, $sp, 0x58 -/* 4318C8 80218F28 00000000 */ nop -/* 4318CC 80218F2C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/battle/area_kmr_part_1/4318D0/func_80218F30_4318D0.s b/ver/us/asm/nonmatchings/battle/area_kmr_part_1/4318D0/func_80218F30_4318D0.s deleted file mode 100644 index a623cb295b..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_kmr_part_1/4318D0/func_80218F30_4318D0.s +++ /dev/null @@ -1,162 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218F30_4318D0 -/* 4318D0 80218F30 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 4318D4 80218F34 AFB40020 */ sw $s4, 0x20($sp) -/* 4318D8 80218F38 0080A02D */ daddu $s4, $a0, $zero -/* 4318DC 80218F3C AFBF0024 */ sw $ra, 0x24($sp) -/* 4318E0 80218F40 AFB3001C */ sw $s3, 0x1c($sp) -/* 4318E4 80218F44 AFB20018 */ sw $s2, 0x18($sp) -/* 4318E8 80218F48 AFB10014 */ sw $s1, 0x14($sp) -/* 4318EC 80218F4C AFB00010 */ sw $s0, 0x10($sp) -/* 4318F0 80218F50 F7BE0050 */ sdc1 $f30, 0x50($sp) -/* 4318F4 80218F54 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* 4318F8 80218F58 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 4318FC 80218F5C F7B80038 */ sdc1 $f24, 0x38($sp) -/* 431900 80218F60 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 431904 80218F64 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 431908 80218F68 8E90000C */ lw $s0, 0xc($s4) -/* 43190C 80218F6C 8E050000 */ lw $a1, ($s0) -/* 431910 80218F70 0C0B1EAF */ jal get_variable -/* 431914 80218F74 26100004 */ addiu $s0, $s0, 4 -/* 431918 80218F78 44820000 */ mtc1 $v0, $f0 -/* 43191C 80218F7C 00000000 */ nop -/* 431920 80218F80 46800021 */ cvt.d.w $f0, $f0 -/* 431924 80218F84 8E110000 */ lw $s1, ($s0) -/* 431928 80218F88 26100004 */ addiu $s0, $s0, 4 -/* 43192C 80218F8C 3C014024 */ lui $at, 0x4024 -/* 431930 80218F90 44811800 */ mtc1 $at, $f3 -/* 431934 80218F94 44801000 */ mtc1 $zero, $f2 -/* 431938 80218F98 3C0140C9 */ lui $at, 0x40c9 -/* 43193C 80218F9C 34210FD0 */ ori $at, $at, 0xfd0 -/* 431940 80218FA0 4481A000 */ mtc1 $at, $f20 -/* 431944 80218FA4 8E130000 */ lw $s3, ($s0) -/* 431948 80218FA8 46220003 */ div.d $f0, $f0, $f2 -/* 43194C 80218FAC 462007A0 */ cvt.s.d $f30, $f0 -/* 431950 80218FB0 4614F502 */ mul.s $f20, $f30, $f20 -/* 431954 80218FB4 00000000 */ nop -/* 431958 80218FB8 26100004 */ addiu $s0, $s0, 4 -/* 43195C 80218FBC 8E120000 */ lw $s2, ($s0) -/* 431960 80218FC0 3C0143B4 */ lui $at, 0x43b4 -/* 431964 80218FC4 44810000 */ mtc1 $at, $f0 -/* 431968 80218FC8 8E100004 */ lw $s0, 4($s0) -/* 43196C 80218FCC 4600A503 */ div.s $f20, $f20, $f0 -/* 431970 80218FD0 0C00A85B */ jal sin_rad -/* 431974 80218FD4 4600A306 */ mov.s $f12, $f20 -/* 431978 80218FD8 3C014100 */ lui $at, 0x4100 -/* 43197C 80218FDC 44816000 */ mtc1 $at, $f12 -/* 431980 80218FE0 00000000 */ nop -/* 431984 80218FE4 460CA302 */ mul.s $f12, $f20, $f12 -/* 431988 80218FE8 00000000 */ nop -/* 43198C 80218FEC 3C014316 */ lui $at, 0x4316 -/* 431990 80218FF0 4481E000 */ mtc1 $at, $f28 -/* 431994 80218FF4 00000000 */ nop -/* 431998 80218FF8 461C0582 */ mul.s $f22, $f0, $f28 -/* 43199C 80218FFC 00000000 */ nop -/* 4319A0 80219000 4480D000 */ mtc1 $zero, $f26 -/* 4319A4 80219004 0C00A85B */ jal sin_rad -/* 4319A8 80219008 461AB580 */ add.s $f22, $f22, $f26 -/* 4319AC 8021900C 3C014120 */ lui $at, 0x4120 -/* 4319B0 80219010 44811000 */ mtc1 $at, $f2 -/* 4319B4 80219014 00000000 */ nop -/* 4319B8 80219018 46020602 */ mul.s $f24, $f0, $f2 -/* 4319BC 8021901C 00000000 */ nop -/* 4319C0 80219020 4600A306 */ mov.s $f12, $f20 -/* 4319C4 80219024 0C00A874 */ jal cos_rad -/* 4319C8 80219028 461AC600 */ add.s $f24, $f24, $f26 -/* 4319CC 8021902C 0280202D */ daddu $a0, $s4, $zero -/* 4319D0 80219030 461C0502 */ mul.s $f20, $f0, $f28 -/* 4319D4 80219034 00000000 */ nop -/* 4319D8 80219038 0220282D */ daddu $a1, $s1, $zero -/* 4319DC 8021903C 4406B000 */ mfc1 $a2, $f22 -/* 4319E0 80219040 3C0141A0 */ lui $at, 0x41a0 -/* 4319E4 80219044 44810000 */ mtc1 $at, $f0 -/* 4319E8 80219048 3C01C248 */ lui $at, 0xc248 -/* 4319EC 8021904C 44811000 */ mtc1 $at, $f2 -/* 4319F0 80219050 4600A503 */ div.s $f20, $f20, $f0 -/* 4319F4 80219054 0C0B2190 */ jal set_float_variable -/* 4319F8 80219058 4602A500 */ add.s $f20, $f20, $f2 -/* 4319FC 8021905C 0280202D */ daddu $a0, $s4, $zero -/* 431A00 80219060 4406C000 */ mfc1 $a2, $f24 -/* 431A04 80219064 0C0B2190 */ jal set_float_variable -/* 431A08 80219068 0260282D */ daddu $a1, $s3, $zero -/* 431A0C 8021906C 0280202D */ daddu $a0, $s4, $zero -/* 431A10 80219070 4406A000 */ mfc1 $a2, $f20 -/* 431A14 80219074 0C0B2190 */ jal set_float_variable -/* 431A18 80219078 0240282D */ daddu $a1, $s2, $zero -/* 431A1C 8021907C 3C0142B4 */ lui $at, 0x42b4 -/* 431A20 80219080 44810000 */ mtc1 $at, $f0 -/* 431A24 80219084 00000000 */ nop -/* 431A28 80219088 461E003C */ c.lt.s $f0, $f30 -/* 431A2C 8021908C 00000000 */ nop -/* 431A30 80219090 4500000B */ bc1f .L802190C0 -/* 431A34 80219094 0000302D */ daddu $a2, $zero, $zero -/* 431A38 80219098 3C014387 */ lui $at, 0x4387 -/* 431A3C 8021909C 44810000 */ mtc1 $at, $f0 -/* 431A40 802190A0 00000000 */ nop -/* 431A44 802190A4 4600F03C */ c.lt.s $f30, $f0 -/* 431A48 802190A8 00000000 */ nop -/* 431A4C 802190AC 45030001 */ bc1tl .L802190B4 -/* 431A50 802190B0 240600B4 */ addiu $a2, $zero, 0xb4 -.L802190B4: -/* 431A54 802190B4 3C0142B4 */ lui $at, 0x42b4 -/* 431A58 802190B8 44810000 */ mtc1 $at, $f0 -/* 431A5C 802190BC 00000000 */ nop -.L802190C0: -/* 431A60 802190C0 461E0001 */ sub.s $f0, $f0, $f30 -/* 431A64 802190C4 46000005 */ abs.s $f0, $f0 -/* 431A68 802190C8 4600010D */ trunc.w.s $f4, $f0 -/* 431A6C 802190CC 44022000 */ mfc1 $v0, $f4 -/* 431A70 802190D0 00000000 */ nop -/* 431A74 802190D4 2842002D */ slti $v0, $v0, 0x2d -/* 431A78 802190D8 10400008 */ beqz $v0, .L802190FC -/* 431A7C 802190DC 00000000 */ nop -/* 431A80 802190E0 3C014234 */ lui $at, 0x4234 -/* 431A84 802190E4 44810000 */ mtc1 $at, $f0 -/* 431A88 802190E8 00000000 */ nop -/* 431A8C 802190EC 4600F001 */ sub.s $f0, $f30, $f0 -/* 431A90 802190F0 46000000 */ add.s $f0, $f0, $f0 -/* 431A94 802190F4 4600010D */ trunc.w.s $f4, $f0 -/* 431A98 802190F8 44062000 */ mfc1 $a2, $f4 -.L802190FC: -/* 431A9C 802190FC 3C014387 */ lui $at, 0x4387 -/* 431AA0 80219100 44810000 */ mtc1 $at, $f0 -/* 431AA4 80219104 00000000 */ nop -/* 431AA8 80219108 461E0001 */ sub.s $f0, $f0, $f30 -/* 431AAC 8021910C 46000005 */ abs.s $f0, $f0 -/* 431AB0 80219110 4600010D */ trunc.w.s $f4, $f0 -/* 431AB4 80219114 44022000 */ mfc1 $v0, $f4 -/* 431AB8 80219118 00000000 */ nop -/* 431ABC 8021911C 2842002D */ slti $v0, $v0, 0x2d -/* 431AC0 80219120 1040000C */ beqz $v0, .L80219154 -/* 431AC4 80219124 0280202D */ daddu $a0, $s4, $zero -/* 431AC8 80219128 3C014361 */ lui $at, 0x4361 -/* 431ACC 8021912C 44810000 */ mtc1 $at, $f0 -/* 431AD0 80219130 00000000 */ nop -/* 431AD4 80219134 4600F001 */ sub.s $f0, $f30, $f0 -/* 431AD8 80219138 46000000 */ add.s $f0, $f0, $f0 -/* 431ADC 8021913C 3C014334 */ lui $at, 0x4334 -/* 431AE0 80219140 44811000 */ mtc1 $at, $f2 -/* 431AE4 80219144 00000000 */ nop -/* 431AE8 80219148 46020000 */ add.s $f0, $f0, $f2 -/* 431AEC 8021914C 4600010D */ trunc.w.s $f4, $f0 -/* 431AF0 80219150 44062000 */ mfc1 $a2, $f4 -.L80219154: -/* 431AF4 80219154 0C0B2026 */ jal set_variable -/* 431AF8 80219158 0200282D */ daddu $a1, $s0, $zero -/* 431AFC 8021915C 8FBF0024 */ lw $ra, 0x24($sp) -/* 431B00 80219160 8FB40020 */ lw $s4, 0x20($sp) -/* 431B04 80219164 8FB3001C */ lw $s3, 0x1c($sp) -/* 431B08 80219168 8FB20018 */ lw $s2, 0x18($sp) -/* 431B0C 8021916C 8FB10014 */ lw $s1, 0x14($sp) -/* 431B10 80219170 8FB00010 */ lw $s0, 0x10($sp) -/* 431B14 80219174 D7BE0050 */ ldc1 $f30, 0x50($sp) -/* 431B18 80219178 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* 431B1C 8021917C D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 431B20 80219180 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 431B24 80219184 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 431B28 80219188 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 431B2C 8021918C 24020002 */ addiu $v0, $zero, 2 -/* 431B30 80219190 03E00008 */ jr $ra -/* 431B34 80219194 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/battle/area_kmr_part_2/43A7E0/func_80218D50_43A7E0.s b/ver/us/asm/nonmatchings/battle/area_kmr_part_2/43A7E0/func_80218D50_43A7E0.s deleted file mode 100644 index 4c652965dd..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_kmr_part_2/43A7E0/func_80218D50_43A7E0.s +++ /dev/null @@ -1,164 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218D50_43A7E0 -/* 43A7E0 80218D50 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 43A7E4 80218D54 AFB40020 */ sw $s4, 0x20($sp) -/* 43A7E8 80218D58 0080A02D */ daddu $s4, $a0, $zero -/* 43A7EC 80218D5C AFBF0024 */ sw $ra, 0x24($sp) -/* 43A7F0 80218D60 AFB3001C */ sw $s3, 0x1c($sp) -/* 43A7F4 80218D64 AFB20018 */ sw $s2, 0x18($sp) -/* 43A7F8 80218D68 AFB10014 */ sw $s1, 0x14($sp) -/* 43A7FC 80218D6C AFB00010 */ sw $s0, 0x10($sp) -/* 43A800 80218D70 F7BE0050 */ sdc1 $f30, 0x50($sp) -/* 43A804 80218D74 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* 43A808 80218D78 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 43A80C 80218D7C F7B80038 */ sdc1 $f24, 0x38($sp) -/* 43A810 80218D80 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 43A814 80218D84 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 43A818 80218D88 8E90000C */ lw $s0, 0xc($s4) -/* 43A81C 80218D8C 8E050000 */ lw $a1, ($s0) -/* 43A820 80218D90 0C0B1EAF */ jal get_variable -/* 43A824 80218D94 26100004 */ addiu $s0, $s0, 4 -/* 43A828 80218D98 44820000 */ mtc1 $v0, $f0 -/* 43A82C 80218D9C 00000000 */ nop -/* 43A830 80218DA0 46800021 */ cvt.d.w $f0, $f0 -/* 43A834 80218DA4 8E110000 */ lw $s1, ($s0) -/* 43A838 80218DA8 26100004 */ addiu $s0, $s0, 4 -/* 43A83C 80218DAC 3C014024 */ lui $at, 0x4024 -/* 43A840 80218DB0 44811800 */ mtc1 $at, $f3 -/* 43A844 80218DB4 44801000 */ mtc1 $zero, $f2 -/* 43A848 80218DB8 3C0140C9 */ lui $at, 0x40c9 -/* 43A84C 80218DBC 34210FD0 */ ori $at, $at, 0xfd0 -/* 43A850 80218DC0 4481A000 */ mtc1 $at, $f20 -/* 43A854 80218DC4 8E130000 */ lw $s3, ($s0) -/* 43A858 80218DC8 46220003 */ div.d $f0, $f0, $f2 -/* 43A85C 80218DCC 462007A0 */ cvt.s.d $f30, $f0 -/* 43A860 80218DD0 4614F502 */ mul.s $f20, $f30, $f20 -/* 43A864 80218DD4 00000000 */ nop -/* 43A868 80218DD8 26100004 */ addiu $s0, $s0, 4 -/* 43A86C 80218DDC 8E120000 */ lw $s2, ($s0) -/* 43A870 80218DE0 3C0143B4 */ lui $at, 0x43b4 -/* 43A874 80218DE4 44810000 */ mtc1 $at, $f0 -/* 43A878 80218DE8 8E100004 */ lw $s0, 4($s0) -/* 43A87C 80218DEC 4600A503 */ div.s $f20, $f20, $f0 -/* 43A880 80218DF0 0C00A85B */ jal sin_rad -/* 43A884 80218DF4 4600A306 */ mov.s $f12, $f20 -/* 43A888 80218DF8 3C014100 */ lui $at, 0x4100 -/* 43A88C 80218DFC 44816000 */ mtc1 $at, $f12 -/* 43A890 80218E00 00000000 */ nop -/* 43A894 80218E04 460CA302 */ mul.s $f12, $f20, $f12 -/* 43A898 80218E08 00000000 */ nop -/* 43A89C 80218E0C 3C014316 */ lui $at, 0x4316 -/* 43A8A0 80218E10 4481E000 */ mtc1 $at, $f28 -/* 43A8A4 80218E14 00000000 */ nop -/* 43A8A8 80218E18 461C0582 */ mul.s $f22, $f0, $f28 -/* 43A8AC 80218E1C 00000000 */ nop -/* 43A8B0 80218E20 4480D000 */ mtc1 $zero, $f26 -/* 43A8B4 80218E24 0C00A85B */ jal sin_rad -/* 43A8B8 80218E28 461AB580 */ add.s $f22, $f22, $f26 -/* 43A8BC 80218E2C 3C014120 */ lui $at, 0x4120 -/* 43A8C0 80218E30 44811000 */ mtc1 $at, $f2 -/* 43A8C4 80218E34 00000000 */ nop -/* 43A8C8 80218E38 46020602 */ mul.s $f24, $f0, $f2 -/* 43A8CC 80218E3C 00000000 */ nop -/* 43A8D0 80218E40 4600A306 */ mov.s $f12, $f20 -/* 43A8D4 80218E44 0C00A874 */ jal cos_rad -/* 43A8D8 80218E48 461AC600 */ add.s $f24, $f24, $f26 -/* 43A8DC 80218E4C 0280202D */ daddu $a0, $s4, $zero -/* 43A8E0 80218E50 461C0502 */ mul.s $f20, $f0, $f28 -/* 43A8E4 80218E54 00000000 */ nop -/* 43A8E8 80218E58 0220282D */ daddu $a1, $s1, $zero -/* 43A8EC 80218E5C 4406B000 */ mfc1 $a2, $f22 -/* 43A8F0 80218E60 3C0141A0 */ lui $at, 0x41a0 -/* 43A8F4 80218E64 44810000 */ mtc1 $at, $f0 -/* 43A8F8 80218E68 3C01C248 */ lui $at, 0xc248 -/* 43A8FC 80218E6C 44811000 */ mtc1 $at, $f2 -/* 43A900 80218E70 4600A503 */ div.s $f20, $f20, $f0 -/* 43A904 80218E74 0C0B2190 */ jal set_float_variable -/* 43A908 80218E78 4602A500 */ add.s $f20, $f20, $f2 -/* 43A90C 80218E7C 0280202D */ daddu $a0, $s4, $zero -/* 43A910 80218E80 4406C000 */ mfc1 $a2, $f24 -/* 43A914 80218E84 0C0B2190 */ jal set_float_variable -/* 43A918 80218E88 0260282D */ daddu $a1, $s3, $zero -/* 43A91C 80218E8C 0280202D */ daddu $a0, $s4, $zero -/* 43A920 80218E90 4406A000 */ mfc1 $a2, $f20 -/* 43A924 80218E94 0C0B2190 */ jal set_float_variable -/* 43A928 80218E98 0240282D */ daddu $a1, $s2, $zero -/* 43A92C 80218E9C 3C0142B4 */ lui $at, 0x42b4 -/* 43A930 80218EA0 44810000 */ mtc1 $at, $f0 -/* 43A934 80218EA4 00000000 */ nop -/* 43A938 80218EA8 461E003C */ c.lt.s $f0, $f30 -/* 43A93C 80218EAC 00000000 */ nop -/* 43A940 80218EB0 4500000B */ bc1f .L80218EE0 -/* 43A944 80218EB4 0000302D */ daddu $a2, $zero, $zero -/* 43A948 80218EB8 3C014387 */ lui $at, 0x4387 -/* 43A94C 80218EBC 44810000 */ mtc1 $at, $f0 -/* 43A950 80218EC0 00000000 */ nop -/* 43A954 80218EC4 4600F03C */ c.lt.s $f30, $f0 -/* 43A958 80218EC8 00000000 */ nop -/* 43A95C 80218ECC 45030001 */ bc1tl .L80218ED4 -/* 43A960 80218ED0 240600B4 */ addiu $a2, $zero, 0xb4 -.L80218ED4: -/* 43A964 80218ED4 3C0142B4 */ lui $at, 0x42b4 -/* 43A968 80218ED8 44810000 */ mtc1 $at, $f0 -/* 43A96C 80218EDC 00000000 */ nop -.L80218EE0: -/* 43A970 80218EE0 461E0001 */ sub.s $f0, $f0, $f30 -/* 43A974 80218EE4 46000005 */ abs.s $f0, $f0 -/* 43A978 80218EE8 4600010D */ trunc.w.s $f4, $f0 -/* 43A97C 80218EEC 44022000 */ mfc1 $v0, $f4 -/* 43A980 80218EF0 00000000 */ nop -/* 43A984 80218EF4 2842002D */ slti $v0, $v0, 0x2d -/* 43A988 80218EF8 10400008 */ beqz $v0, .L80218F1C -/* 43A98C 80218EFC 00000000 */ nop -/* 43A990 80218F00 3C014234 */ lui $at, 0x4234 -/* 43A994 80218F04 44810000 */ mtc1 $at, $f0 -/* 43A998 80218F08 00000000 */ nop -/* 43A99C 80218F0C 4600F001 */ sub.s $f0, $f30, $f0 -/* 43A9A0 80218F10 46000000 */ add.s $f0, $f0, $f0 -/* 43A9A4 80218F14 4600010D */ trunc.w.s $f4, $f0 -/* 43A9A8 80218F18 44062000 */ mfc1 $a2, $f4 -.L80218F1C: -/* 43A9AC 80218F1C 3C014387 */ lui $at, 0x4387 -/* 43A9B0 80218F20 44810000 */ mtc1 $at, $f0 -/* 43A9B4 80218F24 00000000 */ nop -/* 43A9B8 80218F28 461E0001 */ sub.s $f0, $f0, $f30 -/* 43A9BC 80218F2C 46000005 */ abs.s $f0, $f0 -/* 43A9C0 80218F30 4600010D */ trunc.w.s $f4, $f0 -/* 43A9C4 80218F34 44022000 */ mfc1 $v0, $f4 -/* 43A9C8 80218F38 00000000 */ nop -/* 43A9CC 80218F3C 2842002D */ slti $v0, $v0, 0x2d -/* 43A9D0 80218F40 1040000C */ beqz $v0, .L80218F74 -/* 43A9D4 80218F44 0280202D */ daddu $a0, $s4, $zero -/* 43A9D8 80218F48 3C014361 */ lui $at, 0x4361 -/* 43A9DC 80218F4C 44810000 */ mtc1 $at, $f0 -/* 43A9E0 80218F50 00000000 */ nop -/* 43A9E4 80218F54 4600F001 */ sub.s $f0, $f30, $f0 -/* 43A9E8 80218F58 46000000 */ add.s $f0, $f0, $f0 -/* 43A9EC 80218F5C 3C014334 */ lui $at, 0x4334 -/* 43A9F0 80218F60 44811000 */ mtc1 $at, $f2 -/* 43A9F4 80218F64 00000000 */ nop -/* 43A9F8 80218F68 46020000 */ add.s $f0, $f0, $f2 -/* 43A9FC 80218F6C 4600010D */ trunc.w.s $f4, $f0 -/* 43AA00 80218F70 44062000 */ mfc1 $a2, $f4 -.L80218F74: -/* 43AA04 80218F74 0C0B2026 */ jal set_variable -/* 43AA08 80218F78 0200282D */ daddu $a1, $s0, $zero -/* 43AA0C 80218F7C 8FBF0024 */ lw $ra, 0x24($sp) -/* 43AA10 80218F80 8FB40020 */ lw $s4, 0x20($sp) -/* 43AA14 80218F84 8FB3001C */ lw $s3, 0x1c($sp) -/* 43AA18 80218F88 8FB20018 */ lw $s2, 0x18($sp) -/* 43AA1C 80218F8C 8FB10014 */ lw $s1, 0x14($sp) -/* 43AA20 80218F90 8FB00010 */ lw $s0, 0x10($sp) -/* 43AA24 80218F94 D7BE0050 */ ldc1 $f30, 0x50($sp) -/* 43AA28 80218F98 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* 43AA2C 80218F9C D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 43AA30 80218FA0 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 43AA34 80218FA4 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 43AA38 80218FA8 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 43AA3C 80218FAC 24020002 */ addiu $v0, $zero, 2 -/* 43AA40 80218FB0 03E00008 */ jr $ra -/* 43AA44 80218FB4 27BD0058 */ addiu $sp, $sp, 0x58 -/* 43AA48 80218FB8 00000000 */ nop -/* 43AA4C 80218FBC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/battle/area_kmr_part_2/43AA50/func_80218FC0_43AA50.s b/ver/us/asm/nonmatchings/battle/area_kmr_part_2/43AA50/func_80218FC0_43AA50.s deleted file mode 100644 index ba6ee75fba..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_kmr_part_2/43AA50/func_80218FC0_43AA50.s +++ /dev/null @@ -1,164 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218FC0_43AA50 -/* 43AA50 80218FC0 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 43AA54 80218FC4 AFB40020 */ sw $s4, 0x20($sp) -/* 43AA58 80218FC8 0080A02D */ daddu $s4, $a0, $zero -/* 43AA5C 80218FCC AFBF0024 */ sw $ra, 0x24($sp) -/* 43AA60 80218FD0 AFB3001C */ sw $s3, 0x1c($sp) -/* 43AA64 80218FD4 AFB20018 */ sw $s2, 0x18($sp) -/* 43AA68 80218FD8 AFB10014 */ sw $s1, 0x14($sp) -/* 43AA6C 80218FDC AFB00010 */ sw $s0, 0x10($sp) -/* 43AA70 80218FE0 F7BE0050 */ sdc1 $f30, 0x50($sp) -/* 43AA74 80218FE4 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* 43AA78 80218FE8 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 43AA7C 80218FEC F7B80038 */ sdc1 $f24, 0x38($sp) -/* 43AA80 80218FF0 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 43AA84 80218FF4 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 43AA88 80218FF8 8E90000C */ lw $s0, 0xc($s4) -/* 43AA8C 80218FFC 8E050000 */ lw $a1, ($s0) -/* 43AA90 80219000 0C0B1EAF */ jal get_variable -/* 43AA94 80219004 26100004 */ addiu $s0, $s0, 4 -/* 43AA98 80219008 44820000 */ mtc1 $v0, $f0 -/* 43AA9C 8021900C 00000000 */ nop -/* 43AAA0 80219010 46800021 */ cvt.d.w $f0, $f0 -/* 43AAA4 80219014 8E110000 */ lw $s1, ($s0) -/* 43AAA8 80219018 26100004 */ addiu $s0, $s0, 4 -/* 43AAAC 8021901C 3C014024 */ lui $at, 0x4024 -/* 43AAB0 80219020 44811800 */ mtc1 $at, $f3 -/* 43AAB4 80219024 44801000 */ mtc1 $zero, $f2 -/* 43AAB8 80219028 3C0140C9 */ lui $at, 0x40c9 -/* 43AABC 8021902C 34210FD0 */ ori $at, $at, 0xfd0 -/* 43AAC0 80219030 4481A000 */ mtc1 $at, $f20 -/* 43AAC4 80219034 8E130000 */ lw $s3, ($s0) -/* 43AAC8 80219038 46220003 */ div.d $f0, $f0, $f2 -/* 43AACC 8021903C 462007A0 */ cvt.s.d $f30, $f0 -/* 43AAD0 80219040 4614F502 */ mul.s $f20, $f30, $f20 -/* 43AAD4 80219044 00000000 */ nop -/* 43AAD8 80219048 26100004 */ addiu $s0, $s0, 4 -/* 43AADC 8021904C 8E120000 */ lw $s2, ($s0) -/* 43AAE0 80219050 3C0143B4 */ lui $at, 0x43b4 -/* 43AAE4 80219054 44810000 */ mtc1 $at, $f0 -/* 43AAE8 80219058 8E100004 */ lw $s0, 4($s0) -/* 43AAEC 8021905C 4600A503 */ div.s $f20, $f20, $f0 -/* 43AAF0 80219060 0C00A85B */ jal sin_rad -/* 43AAF4 80219064 4600A306 */ mov.s $f12, $f20 -/* 43AAF8 80219068 3C014100 */ lui $at, 0x4100 -/* 43AAFC 8021906C 44816000 */ mtc1 $at, $f12 -/* 43AB00 80219070 00000000 */ nop -/* 43AB04 80219074 460CA302 */ mul.s $f12, $f20, $f12 -/* 43AB08 80219078 00000000 */ nop -/* 43AB0C 8021907C 3C014316 */ lui $at, 0x4316 -/* 43AB10 80219080 4481E000 */ mtc1 $at, $f28 -/* 43AB14 80219084 00000000 */ nop -/* 43AB18 80219088 461C0582 */ mul.s $f22, $f0, $f28 -/* 43AB1C 8021908C 00000000 */ nop -/* 43AB20 80219090 4480D000 */ mtc1 $zero, $f26 -/* 43AB24 80219094 0C00A85B */ jal sin_rad -/* 43AB28 80219098 461AB580 */ add.s $f22, $f22, $f26 -/* 43AB2C 8021909C 3C014120 */ lui $at, 0x4120 -/* 43AB30 802190A0 44811000 */ mtc1 $at, $f2 -/* 43AB34 802190A4 00000000 */ nop -/* 43AB38 802190A8 46020602 */ mul.s $f24, $f0, $f2 -/* 43AB3C 802190AC 00000000 */ nop -/* 43AB40 802190B0 4600A306 */ mov.s $f12, $f20 -/* 43AB44 802190B4 0C00A874 */ jal cos_rad -/* 43AB48 802190B8 461AC600 */ add.s $f24, $f24, $f26 -/* 43AB4C 802190BC 0280202D */ daddu $a0, $s4, $zero -/* 43AB50 802190C0 461C0502 */ mul.s $f20, $f0, $f28 -/* 43AB54 802190C4 00000000 */ nop -/* 43AB58 802190C8 0220282D */ daddu $a1, $s1, $zero -/* 43AB5C 802190CC 4406B000 */ mfc1 $a2, $f22 -/* 43AB60 802190D0 3C0141A0 */ lui $at, 0x41a0 -/* 43AB64 802190D4 44810000 */ mtc1 $at, $f0 -/* 43AB68 802190D8 3C01C248 */ lui $at, 0xc248 -/* 43AB6C 802190DC 44811000 */ mtc1 $at, $f2 -/* 43AB70 802190E0 4600A503 */ div.s $f20, $f20, $f0 -/* 43AB74 802190E4 0C0B2190 */ jal set_float_variable -/* 43AB78 802190E8 4602A500 */ add.s $f20, $f20, $f2 -/* 43AB7C 802190EC 0280202D */ daddu $a0, $s4, $zero -/* 43AB80 802190F0 4406C000 */ mfc1 $a2, $f24 -/* 43AB84 802190F4 0C0B2190 */ jal set_float_variable -/* 43AB88 802190F8 0260282D */ daddu $a1, $s3, $zero -/* 43AB8C 802190FC 0280202D */ daddu $a0, $s4, $zero -/* 43AB90 80219100 4406A000 */ mfc1 $a2, $f20 -/* 43AB94 80219104 0C0B2190 */ jal set_float_variable -/* 43AB98 80219108 0240282D */ daddu $a1, $s2, $zero -/* 43AB9C 8021910C 3C0142B4 */ lui $at, 0x42b4 -/* 43ABA0 80219110 44810000 */ mtc1 $at, $f0 -/* 43ABA4 80219114 00000000 */ nop -/* 43ABA8 80219118 461E003C */ c.lt.s $f0, $f30 -/* 43ABAC 8021911C 00000000 */ nop -/* 43ABB0 80219120 4500000B */ bc1f .L80219150 -/* 43ABB4 80219124 0000302D */ daddu $a2, $zero, $zero -/* 43ABB8 80219128 3C014387 */ lui $at, 0x4387 -/* 43ABBC 8021912C 44810000 */ mtc1 $at, $f0 -/* 43ABC0 80219130 00000000 */ nop -/* 43ABC4 80219134 4600F03C */ c.lt.s $f30, $f0 -/* 43ABC8 80219138 00000000 */ nop -/* 43ABCC 8021913C 45030001 */ bc1tl .L80219144 -/* 43ABD0 80219140 240600B4 */ addiu $a2, $zero, 0xb4 -.L80219144: -/* 43ABD4 80219144 3C0142B4 */ lui $at, 0x42b4 -/* 43ABD8 80219148 44810000 */ mtc1 $at, $f0 -/* 43ABDC 8021914C 00000000 */ nop -.L80219150: -/* 43ABE0 80219150 461E0001 */ sub.s $f0, $f0, $f30 -/* 43ABE4 80219154 46000005 */ abs.s $f0, $f0 -/* 43ABE8 80219158 4600010D */ trunc.w.s $f4, $f0 -/* 43ABEC 8021915C 44022000 */ mfc1 $v0, $f4 -/* 43ABF0 80219160 00000000 */ nop -/* 43ABF4 80219164 2842002D */ slti $v0, $v0, 0x2d -/* 43ABF8 80219168 10400008 */ beqz $v0, .L8021918C -/* 43ABFC 8021916C 00000000 */ nop -/* 43AC00 80219170 3C014234 */ lui $at, 0x4234 -/* 43AC04 80219174 44810000 */ mtc1 $at, $f0 -/* 43AC08 80219178 00000000 */ nop -/* 43AC0C 8021917C 4600F001 */ sub.s $f0, $f30, $f0 -/* 43AC10 80219180 46000000 */ add.s $f0, $f0, $f0 -/* 43AC14 80219184 4600010D */ trunc.w.s $f4, $f0 -/* 43AC18 80219188 44062000 */ mfc1 $a2, $f4 -.L8021918C: -/* 43AC1C 8021918C 3C014387 */ lui $at, 0x4387 -/* 43AC20 80219190 44810000 */ mtc1 $at, $f0 -/* 43AC24 80219194 00000000 */ nop -/* 43AC28 80219198 461E0001 */ sub.s $f0, $f0, $f30 -/* 43AC2C 8021919C 46000005 */ abs.s $f0, $f0 -/* 43AC30 802191A0 4600010D */ trunc.w.s $f4, $f0 -/* 43AC34 802191A4 44022000 */ mfc1 $v0, $f4 -/* 43AC38 802191A8 00000000 */ nop -/* 43AC3C 802191AC 2842002D */ slti $v0, $v0, 0x2d -/* 43AC40 802191B0 1040000C */ beqz $v0, .L802191E4 -/* 43AC44 802191B4 0280202D */ daddu $a0, $s4, $zero -/* 43AC48 802191B8 3C014361 */ lui $at, 0x4361 -/* 43AC4C 802191BC 44810000 */ mtc1 $at, $f0 -/* 43AC50 802191C0 00000000 */ nop -/* 43AC54 802191C4 4600F001 */ sub.s $f0, $f30, $f0 -/* 43AC58 802191C8 46000000 */ add.s $f0, $f0, $f0 -/* 43AC5C 802191CC 3C014334 */ lui $at, 0x4334 -/* 43AC60 802191D0 44811000 */ mtc1 $at, $f2 -/* 43AC64 802191D4 00000000 */ nop -/* 43AC68 802191D8 46020000 */ add.s $f0, $f0, $f2 -/* 43AC6C 802191DC 4600010D */ trunc.w.s $f4, $f0 -/* 43AC70 802191E0 44062000 */ mfc1 $a2, $f4 -.L802191E4: -/* 43AC74 802191E4 0C0B2026 */ jal set_variable -/* 43AC78 802191E8 0200282D */ daddu $a1, $s0, $zero -/* 43AC7C 802191EC 8FBF0024 */ lw $ra, 0x24($sp) -/* 43AC80 802191F0 8FB40020 */ lw $s4, 0x20($sp) -/* 43AC84 802191F4 8FB3001C */ lw $s3, 0x1c($sp) -/* 43AC88 802191F8 8FB20018 */ lw $s2, 0x18($sp) -/* 43AC8C 802191FC 8FB10014 */ lw $s1, 0x14($sp) -/* 43AC90 80219200 8FB00010 */ lw $s0, 0x10($sp) -/* 43AC94 80219204 D7BE0050 */ ldc1 $f30, 0x50($sp) -/* 43AC98 80219208 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* 43AC9C 8021920C D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 43ACA0 80219210 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 43ACA4 80219214 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 43ACA8 80219218 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 43ACAC 8021921C 24020002 */ addiu $v0, $zero, 2 -/* 43ACB0 80219220 03E00008 */ jr $ra -/* 43ACB4 80219224 27BD0058 */ addiu $sp, $sp, 0x58 -/* 43ACB8 80219228 00000000 */ nop -/* 43ACBC 8021922C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/battle/area_kmr_part_2/43ACC0/func_80219230_43ACC0.s b/ver/us/asm/nonmatchings/battle/area_kmr_part_2/43ACC0/func_80219230_43ACC0.s deleted file mode 100644 index 57946074f6..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_kmr_part_2/43ACC0/func_80219230_43ACC0.s +++ /dev/null @@ -1,164 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80219230_43ACC0 -/* 43ACC0 80219230 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 43ACC4 80219234 AFB40020 */ sw $s4, 0x20($sp) -/* 43ACC8 80219238 0080A02D */ daddu $s4, $a0, $zero -/* 43ACCC 8021923C AFBF0024 */ sw $ra, 0x24($sp) -/* 43ACD0 80219240 AFB3001C */ sw $s3, 0x1c($sp) -/* 43ACD4 80219244 AFB20018 */ sw $s2, 0x18($sp) -/* 43ACD8 80219248 AFB10014 */ sw $s1, 0x14($sp) -/* 43ACDC 8021924C AFB00010 */ sw $s0, 0x10($sp) -/* 43ACE0 80219250 F7BE0050 */ sdc1 $f30, 0x50($sp) -/* 43ACE4 80219254 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* 43ACE8 80219258 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 43ACEC 8021925C F7B80038 */ sdc1 $f24, 0x38($sp) -/* 43ACF0 80219260 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 43ACF4 80219264 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 43ACF8 80219268 8E90000C */ lw $s0, 0xc($s4) -/* 43ACFC 8021926C 8E050000 */ lw $a1, ($s0) -/* 43AD00 80219270 0C0B1EAF */ jal get_variable -/* 43AD04 80219274 26100004 */ addiu $s0, $s0, 4 -/* 43AD08 80219278 44820000 */ mtc1 $v0, $f0 -/* 43AD0C 8021927C 00000000 */ nop -/* 43AD10 80219280 46800021 */ cvt.d.w $f0, $f0 -/* 43AD14 80219284 8E110000 */ lw $s1, ($s0) -/* 43AD18 80219288 26100004 */ addiu $s0, $s0, 4 -/* 43AD1C 8021928C 3C014024 */ lui $at, 0x4024 -/* 43AD20 80219290 44811800 */ mtc1 $at, $f3 -/* 43AD24 80219294 44801000 */ mtc1 $zero, $f2 -/* 43AD28 80219298 3C0140C9 */ lui $at, 0x40c9 -/* 43AD2C 8021929C 34210FD0 */ ori $at, $at, 0xfd0 -/* 43AD30 802192A0 4481A000 */ mtc1 $at, $f20 -/* 43AD34 802192A4 8E130000 */ lw $s3, ($s0) -/* 43AD38 802192A8 46220003 */ div.d $f0, $f0, $f2 -/* 43AD3C 802192AC 462007A0 */ cvt.s.d $f30, $f0 -/* 43AD40 802192B0 4614F502 */ mul.s $f20, $f30, $f20 -/* 43AD44 802192B4 00000000 */ nop -/* 43AD48 802192B8 26100004 */ addiu $s0, $s0, 4 -/* 43AD4C 802192BC 8E120000 */ lw $s2, ($s0) -/* 43AD50 802192C0 3C0143B4 */ lui $at, 0x43b4 -/* 43AD54 802192C4 44810000 */ mtc1 $at, $f0 -/* 43AD58 802192C8 8E100004 */ lw $s0, 4($s0) -/* 43AD5C 802192CC 4600A503 */ div.s $f20, $f20, $f0 -/* 43AD60 802192D0 0C00A85B */ jal sin_rad -/* 43AD64 802192D4 4600A306 */ mov.s $f12, $f20 -/* 43AD68 802192D8 3C014100 */ lui $at, 0x4100 -/* 43AD6C 802192DC 44816000 */ mtc1 $at, $f12 -/* 43AD70 802192E0 00000000 */ nop -/* 43AD74 802192E4 460CA302 */ mul.s $f12, $f20, $f12 -/* 43AD78 802192E8 00000000 */ nop -/* 43AD7C 802192EC 3C014316 */ lui $at, 0x4316 -/* 43AD80 802192F0 4481E000 */ mtc1 $at, $f28 -/* 43AD84 802192F4 00000000 */ nop -/* 43AD88 802192F8 461C0582 */ mul.s $f22, $f0, $f28 -/* 43AD8C 802192FC 00000000 */ nop -/* 43AD90 80219300 4480D000 */ mtc1 $zero, $f26 -/* 43AD94 80219304 0C00A85B */ jal sin_rad -/* 43AD98 80219308 461AB580 */ add.s $f22, $f22, $f26 -/* 43AD9C 8021930C 3C014120 */ lui $at, 0x4120 -/* 43ADA0 80219310 44811000 */ mtc1 $at, $f2 -/* 43ADA4 80219314 00000000 */ nop -/* 43ADA8 80219318 46020602 */ mul.s $f24, $f0, $f2 -/* 43ADAC 8021931C 00000000 */ nop -/* 43ADB0 80219320 4600A306 */ mov.s $f12, $f20 -/* 43ADB4 80219324 0C00A874 */ jal cos_rad -/* 43ADB8 80219328 461AC600 */ add.s $f24, $f24, $f26 -/* 43ADBC 8021932C 0280202D */ daddu $a0, $s4, $zero -/* 43ADC0 80219330 461C0502 */ mul.s $f20, $f0, $f28 -/* 43ADC4 80219334 00000000 */ nop -/* 43ADC8 80219338 0220282D */ daddu $a1, $s1, $zero -/* 43ADCC 8021933C 4406B000 */ mfc1 $a2, $f22 -/* 43ADD0 80219340 3C0141A0 */ lui $at, 0x41a0 -/* 43ADD4 80219344 44810000 */ mtc1 $at, $f0 -/* 43ADD8 80219348 3C01C248 */ lui $at, 0xc248 -/* 43ADDC 8021934C 44811000 */ mtc1 $at, $f2 -/* 43ADE0 80219350 4600A503 */ div.s $f20, $f20, $f0 -/* 43ADE4 80219354 0C0B2190 */ jal set_float_variable -/* 43ADE8 80219358 4602A500 */ add.s $f20, $f20, $f2 -/* 43ADEC 8021935C 0280202D */ daddu $a0, $s4, $zero -/* 43ADF0 80219360 4406C000 */ mfc1 $a2, $f24 -/* 43ADF4 80219364 0C0B2190 */ jal set_float_variable -/* 43ADF8 80219368 0260282D */ daddu $a1, $s3, $zero -/* 43ADFC 8021936C 0280202D */ daddu $a0, $s4, $zero -/* 43AE00 80219370 4406A000 */ mfc1 $a2, $f20 -/* 43AE04 80219374 0C0B2190 */ jal set_float_variable -/* 43AE08 80219378 0240282D */ daddu $a1, $s2, $zero -/* 43AE0C 8021937C 3C0142B4 */ lui $at, 0x42b4 -/* 43AE10 80219380 44810000 */ mtc1 $at, $f0 -/* 43AE14 80219384 00000000 */ nop -/* 43AE18 80219388 461E003C */ c.lt.s $f0, $f30 -/* 43AE1C 8021938C 00000000 */ nop -/* 43AE20 80219390 4500000B */ bc1f .L802193C0 -/* 43AE24 80219394 0000302D */ daddu $a2, $zero, $zero -/* 43AE28 80219398 3C014387 */ lui $at, 0x4387 -/* 43AE2C 8021939C 44810000 */ mtc1 $at, $f0 -/* 43AE30 802193A0 00000000 */ nop -/* 43AE34 802193A4 4600F03C */ c.lt.s $f30, $f0 -/* 43AE38 802193A8 00000000 */ nop -/* 43AE3C 802193AC 45030001 */ bc1tl .L802193B4 -/* 43AE40 802193B0 240600B4 */ addiu $a2, $zero, 0xb4 -.L802193B4: -/* 43AE44 802193B4 3C0142B4 */ lui $at, 0x42b4 -/* 43AE48 802193B8 44810000 */ mtc1 $at, $f0 -/* 43AE4C 802193BC 00000000 */ nop -.L802193C0: -/* 43AE50 802193C0 461E0001 */ sub.s $f0, $f0, $f30 -/* 43AE54 802193C4 46000005 */ abs.s $f0, $f0 -/* 43AE58 802193C8 4600010D */ trunc.w.s $f4, $f0 -/* 43AE5C 802193CC 44022000 */ mfc1 $v0, $f4 -/* 43AE60 802193D0 00000000 */ nop -/* 43AE64 802193D4 2842002D */ slti $v0, $v0, 0x2d -/* 43AE68 802193D8 10400008 */ beqz $v0, .L802193FC -/* 43AE6C 802193DC 00000000 */ nop -/* 43AE70 802193E0 3C014234 */ lui $at, 0x4234 -/* 43AE74 802193E4 44810000 */ mtc1 $at, $f0 -/* 43AE78 802193E8 00000000 */ nop -/* 43AE7C 802193EC 4600F001 */ sub.s $f0, $f30, $f0 -/* 43AE80 802193F0 46000000 */ add.s $f0, $f0, $f0 -/* 43AE84 802193F4 4600010D */ trunc.w.s $f4, $f0 -/* 43AE88 802193F8 44062000 */ mfc1 $a2, $f4 -.L802193FC: -/* 43AE8C 802193FC 3C014387 */ lui $at, 0x4387 -/* 43AE90 80219400 44810000 */ mtc1 $at, $f0 -/* 43AE94 80219404 00000000 */ nop -/* 43AE98 80219408 461E0001 */ sub.s $f0, $f0, $f30 -/* 43AE9C 8021940C 46000005 */ abs.s $f0, $f0 -/* 43AEA0 80219410 4600010D */ trunc.w.s $f4, $f0 -/* 43AEA4 80219414 44022000 */ mfc1 $v0, $f4 -/* 43AEA8 80219418 00000000 */ nop -/* 43AEAC 8021941C 2842002D */ slti $v0, $v0, 0x2d -/* 43AEB0 80219420 1040000C */ beqz $v0, .L80219454 -/* 43AEB4 80219424 0280202D */ daddu $a0, $s4, $zero -/* 43AEB8 80219428 3C014361 */ lui $at, 0x4361 -/* 43AEBC 8021942C 44810000 */ mtc1 $at, $f0 -/* 43AEC0 80219430 00000000 */ nop -/* 43AEC4 80219434 4600F001 */ sub.s $f0, $f30, $f0 -/* 43AEC8 80219438 46000000 */ add.s $f0, $f0, $f0 -/* 43AECC 8021943C 3C014334 */ lui $at, 0x4334 -/* 43AED0 80219440 44811000 */ mtc1 $at, $f2 -/* 43AED4 80219444 00000000 */ nop -/* 43AED8 80219448 46020000 */ add.s $f0, $f0, $f2 -/* 43AEDC 8021944C 4600010D */ trunc.w.s $f4, $f0 -/* 43AEE0 80219450 44062000 */ mfc1 $a2, $f4 -.L80219454: -/* 43AEE4 80219454 0C0B2026 */ jal set_variable -/* 43AEE8 80219458 0200282D */ daddu $a1, $s0, $zero -/* 43AEEC 8021945C 8FBF0024 */ lw $ra, 0x24($sp) -/* 43AEF0 80219460 8FB40020 */ lw $s4, 0x20($sp) -/* 43AEF4 80219464 8FB3001C */ lw $s3, 0x1c($sp) -/* 43AEF8 80219468 8FB20018 */ lw $s2, 0x18($sp) -/* 43AEFC 8021946C 8FB10014 */ lw $s1, 0x14($sp) -/* 43AF00 80219470 8FB00010 */ lw $s0, 0x10($sp) -/* 43AF04 80219474 D7BE0050 */ ldc1 $f30, 0x50($sp) -/* 43AF08 80219478 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* 43AF0C 8021947C D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 43AF10 80219480 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 43AF14 80219484 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 43AF18 80219488 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 43AF1C 8021948C 24020002 */ addiu $v0, $zero, 2 -/* 43AF20 80219490 03E00008 */ jr $ra -/* 43AF24 80219494 27BD0058 */ addiu $sp, $sp, 0x58 -/* 43AF28 80219498 00000000 */ nop -/* 43AF2C 8021949C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/battle/area_kmr_part_2/43AF30/func_802194A0_43AF30.s b/ver/us/asm/nonmatchings/battle/area_kmr_part_2/43AF30/func_802194A0_43AF30.s deleted file mode 100644 index 890bb5ab90..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_kmr_part_2/43AF30/func_802194A0_43AF30.s +++ /dev/null @@ -1,162 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802194A0_43AF30 -/* 43AF30 802194A0 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 43AF34 802194A4 AFB40020 */ sw $s4, 0x20($sp) -/* 43AF38 802194A8 0080A02D */ daddu $s4, $a0, $zero -/* 43AF3C 802194AC AFBF0024 */ sw $ra, 0x24($sp) -/* 43AF40 802194B0 AFB3001C */ sw $s3, 0x1c($sp) -/* 43AF44 802194B4 AFB20018 */ sw $s2, 0x18($sp) -/* 43AF48 802194B8 AFB10014 */ sw $s1, 0x14($sp) -/* 43AF4C 802194BC AFB00010 */ sw $s0, 0x10($sp) -/* 43AF50 802194C0 F7BE0050 */ sdc1 $f30, 0x50($sp) -/* 43AF54 802194C4 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* 43AF58 802194C8 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 43AF5C 802194CC F7B80038 */ sdc1 $f24, 0x38($sp) -/* 43AF60 802194D0 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 43AF64 802194D4 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 43AF68 802194D8 8E90000C */ lw $s0, 0xc($s4) -/* 43AF6C 802194DC 8E050000 */ lw $a1, ($s0) -/* 43AF70 802194E0 0C0B1EAF */ jal get_variable -/* 43AF74 802194E4 26100004 */ addiu $s0, $s0, 4 -/* 43AF78 802194E8 44820000 */ mtc1 $v0, $f0 -/* 43AF7C 802194EC 00000000 */ nop -/* 43AF80 802194F0 46800021 */ cvt.d.w $f0, $f0 -/* 43AF84 802194F4 8E110000 */ lw $s1, ($s0) -/* 43AF88 802194F8 26100004 */ addiu $s0, $s0, 4 -/* 43AF8C 802194FC 3C014024 */ lui $at, 0x4024 -/* 43AF90 80219500 44811800 */ mtc1 $at, $f3 -/* 43AF94 80219504 44801000 */ mtc1 $zero, $f2 -/* 43AF98 80219508 3C0140C9 */ lui $at, 0x40c9 -/* 43AF9C 8021950C 34210FD0 */ ori $at, $at, 0xfd0 -/* 43AFA0 80219510 4481A000 */ mtc1 $at, $f20 -/* 43AFA4 80219514 8E130000 */ lw $s3, ($s0) -/* 43AFA8 80219518 46220003 */ div.d $f0, $f0, $f2 -/* 43AFAC 8021951C 462007A0 */ cvt.s.d $f30, $f0 -/* 43AFB0 80219520 4614F502 */ mul.s $f20, $f30, $f20 -/* 43AFB4 80219524 00000000 */ nop -/* 43AFB8 80219528 26100004 */ addiu $s0, $s0, 4 -/* 43AFBC 8021952C 8E120000 */ lw $s2, ($s0) -/* 43AFC0 80219530 3C0143B4 */ lui $at, 0x43b4 -/* 43AFC4 80219534 44810000 */ mtc1 $at, $f0 -/* 43AFC8 80219538 8E100004 */ lw $s0, 4($s0) -/* 43AFCC 8021953C 4600A503 */ div.s $f20, $f20, $f0 -/* 43AFD0 80219540 0C00A85B */ jal sin_rad -/* 43AFD4 80219544 4600A306 */ mov.s $f12, $f20 -/* 43AFD8 80219548 3C014100 */ lui $at, 0x4100 -/* 43AFDC 8021954C 44816000 */ mtc1 $at, $f12 -/* 43AFE0 80219550 00000000 */ nop -/* 43AFE4 80219554 460CA302 */ mul.s $f12, $f20, $f12 -/* 43AFE8 80219558 00000000 */ nop -/* 43AFEC 8021955C 3C014316 */ lui $at, 0x4316 -/* 43AFF0 80219560 4481E000 */ mtc1 $at, $f28 -/* 43AFF4 80219564 00000000 */ nop -/* 43AFF8 80219568 461C0582 */ mul.s $f22, $f0, $f28 -/* 43AFFC 8021956C 00000000 */ nop -/* 43B000 80219570 4480D000 */ mtc1 $zero, $f26 -/* 43B004 80219574 0C00A85B */ jal sin_rad -/* 43B008 80219578 461AB580 */ add.s $f22, $f22, $f26 -/* 43B00C 8021957C 3C014120 */ lui $at, 0x4120 -/* 43B010 80219580 44811000 */ mtc1 $at, $f2 -/* 43B014 80219584 00000000 */ nop -/* 43B018 80219588 46020602 */ mul.s $f24, $f0, $f2 -/* 43B01C 8021958C 00000000 */ nop -/* 43B020 80219590 4600A306 */ mov.s $f12, $f20 -/* 43B024 80219594 0C00A874 */ jal cos_rad -/* 43B028 80219598 461AC600 */ add.s $f24, $f24, $f26 -/* 43B02C 8021959C 0280202D */ daddu $a0, $s4, $zero -/* 43B030 802195A0 461C0502 */ mul.s $f20, $f0, $f28 -/* 43B034 802195A4 00000000 */ nop -/* 43B038 802195A8 0220282D */ daddu $a1, $s1, $zero -/* 43B03C 802195AC 4406B000 */ mfc1 $a2, $f22 -/* 43B040 802195B0 3C0141A0 */ lui $at, 0x41a0 -/* 43B044 802195B4 44810000 */ mtc1 $at, $f0 -/* 43B048 802195B8 3C01C248 */ lui $at, 0xc248 -/* 43B04C 802195BC 44811000 */ mtc1 $at, $f2 -/* 43B050 802195C0 4600A503 */ div.s $f20, $f20, $f0 -/* 43B054 802195C4 0C0B2190 */ jal set_float_variable -/* 43B058 802195C8 4602A500 */ add.s $f20, $f20, $f2 -/* 43B05C 802195CC 0280202D */ daddu $a0, $s4, $zero -/* 43B060 802195D0 4406C000 */ mfc1 $a2, $f24 -/* 43B064 802195D4 0C0B2190 */ jal set_float_variable -/* 43B068 802195D8 0260282D */ daddu $a1, $s3, $zero -/* 43B06C 802195DC 0280202D */ daddu $a0, $s4, $zero -/* 43B070 802195E0 4406A000 */ mfc1 $a2, $f20 -/* 43B074 802195E4 0C0B2190 */ jal set_float_variable -/* 43B078 802195E8 0240282D */ daddu $a1, $s2, $zero -/* 43B07C 802195EC 3C0142B4 */ lui $at, 0x42b4 -/* 43B080 802195F0 44810000 */ mtc1 $at, $f0 -/* 43B084 802195F4 00000000 */ nop -/* 43B088 802195F8 461E003C */ c.lt.s $f0, $f30 -/* 43B08C 802195FC 00000000 */ nop -/* 43B090 80219600 4500000B */ bc1f .L80219630 -/* 43B094 80219604 0000302D */ daddu $a2, $zero, $zero -/* 43B098 80219608 3C014387 */ lui $at, 0x4387 -/* 43B09C 8021960C 44810000 */ mtc1 $at, $f0 -/* 43B0A0 80219610 00000000 */ nop -/* 43B0A4 80219614 4600F03C */ c.lt.s $f30, $f0 -/* 43B0A8 80219618 00000000 */ nop -/* 43B0AC 8021961C 45030001 */ bc1tl .L80219624 -/* 43B0B0 80219620 240600B4 */ addiu $a2, $zero, 0xb4 -.L80219624: -/* 43B0B4 80219624 3C0142B4 */ lui $at, 0x42b4 -/* 43B0B8 80219628 44810000 */ mtc1 $at, $f0 -/* 43B0BC 8021962C 00000000 */ nop -.L80219630: -/* 43B0C0 80219630 461E0001 */ sub.s $f0, $f0, $f30 -/* 43B0C4 80219634 46000005 */ abs.s $f0, $f0 -/* 43B0C8 80219638 4600010D */ trunc.w.s $f4, $f0 -/* 43B0CC 8021963C 44022000 */ mfc1 $v0, $f4 -/* 43B0D0 80219640 00000000 */ nop -/* 43B0D4 80219644 2842002D */ slti $v0, $v0, 0x2d -/* 43B0D8 80219648 10400008 */ beqz $v0, .L8021966C -/* 43B0DC 8021964C 00000000 */ nop -/* 43B0E0 80219650 3C014234 */ lui $at, 0x4234 -/* 43B0E4 80219654 44810000 */ mtc1 $at, $f0 -/* 43B0E8 80219658 00000000 */ nop -/* 43B0EC 8021965C 4600F001 */ sub.s $f0, $f30, $f0 -/* 43B0F0 80219660 46000000 */ add.s $f0, $f0, $f0 -/* 43B0F4 80219664 4600010D */ trunc.w.s $f4, $f0 -/* 43B0F8 80219668 44062000 */ mfc1 $a2, $f4 -.L8021966C: -/* 43B0FC 8021966C 3C014387 */ lui $at, 0x4387 -/* 43B100 80219670 44810000 */ mtc1 $at, $f0 -/* 43B104 80219674 00000000 */ nop -/* 43B108 80219678 461E0001 */ sub.s $f0, $f0, $f30 -/* 43B10C 8021967C 46000005 */ abs.s $f0, $f0 -/* 43B110 80219680 4600010D */ trunc.w.s $f4, $f0 -/* 43B114 80219684 44022000 */ mfc1 $v0, $f4 -/* 43B118 80219688 00000000 */ nop -/* 43B11C 8021968C 2842002D */ slti $v0, $v0, 0x2d -/* 43B120 80219690 1040000C */ beqz $v0, .L802196C4 -/* 43B124 80219694 0280202D */ daddu $a0, $s4, $zero -/* 43B128 80219698 3C014361 */ lui $at, 0x4361 -/* 43B12C 8021969C 44810000 */ mtc1 $at, $f0 -/* 43B130 802196A0 00000000 */ nop -/* 43B134 802196A4 4600F001 */ sub.s $f0, $f30, $f0 -/* 43B138 802196A8 46000000 */ add.s $f0, $f0, $f0 -/* 43B13C 802196AC 3C014334 */ lui $at, 0x4334 -/* 43B140 802196B0 44811000 */ mtc1 $at, $f2 -/* 43B144 802196B4 00000000 */ nop -/* 43B148 802196B8 46020000 */ add.s $f0, $f0, $f2 -/* 43B14C 802196BC 4600010D */ trunc.w.s $f4, $f0 -/* 43B150 802196C0 44062000 */ mfc1 $a2, $f4 -.L802196C4: -/* 43B154 802196C4 0C0B2026 */ jal set_variable -/* 43B158 802196C8 0200282D */ daddu $a1, $s0, $zero -/* 43B15C 802196CC 8FBF0024 */ lw $ra, 0x24($sp) -/* 43B160 802196D0 8FB40020 */ lw $s4, 0x20($sp) -/* 43B164 802196D4 8FB3001C */ lw $s3, 0x1c($sp) -/* 43B168 802196D8 8FB20018 */ lw $s2, 0x18($sp) -/* 43B16C 802196DC 8FB10014 */ lw $s1, 0x14($sp) -/* 43B170 802196E0 8FB00010 */ lw $s0, 0x10($sp) -/* 43B174 802196E4 D7BE0050 */ ldc1 $f30, 0x50($sp) -/* 43B178 802196E8 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* 43B17C 802196EC D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 43B180 802196F0 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 43B184 802196F4 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 43B188 802196F8 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 43B18C 802196FC 24020002 */ addiu $v0, $zero, 2 -/* 43B190 80219700 03E00008 */ jr $ra -/* 43B194 80219704 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/battle/area_kmr_part_3/448420/func_80218FE0_448420.s b/ver/us/asm/nonmatchings/battle/area_kmr_part_3/448420/func_80218FE0_448420.s deleted file mode 100644 index 6a9c29aa16..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_kmr_part_3/448420/func_80218FE0_448420.s +++ /dev/null @@ -1,164 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218FE0_448420 -/* 448420 80218FE0 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 448424 80218FE4 AFB40020 */ sw $s4, 0x20($sp) -/* 448428 80218FE8 0080A02D */ daddu $s4, $a0, $zero -/* 44842C 80218FEC AFBF0024 */ sw $ra, 0x24($sp) -/* 448430 80218FF0 AFB3001C */ sw $s3, 0x1c($sp) -/* 448434 80218FF4 AFB20018 */ sw $s2, 0x18($sp) -/* 448438 80218FF8 AFB10014 */ sw $s1, 0x14($sp) -/* 44843C 80218FFC AFB00010 */ sw $s0, 0x10($sp) -/* 448440 80219000 F7BE0050 */ sdc1 $f30, 0x50($sp) -/* 448444 80219004 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* 448448 80219008 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 44844C 8021900C F7B80038 */ sdc1 $f24, 0x38($sp) -/* 448450 80219010 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 448454 80219014 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 448458 80219018 8E90000C */ lw $s0, 0xc($s4) -/* 44845C 8021901C 8E050000 */ lw $a1, ($s0) -/* 448460 80219020 0C0B1EAF */ jal get_variable -/* 448464 80219024 26100004 */ addiu $s0, $s0, 4 -/* 448468 80219028 44820000 */ mtc1 $v0, $f0 -/* 44846C 8021902C 00000000 */ nop -/* 448470 80219030 46800021 */ cvt.d.w $f0, $f0 -/* 448474 80219034 8E110000 */ lw $s1, ($s0) -/* 448478 80219038 26100004 */ addiu $s0, $s0, 4 -/* 44847C 8021903C 3C014024 */ lui $at, 0x4024 -/* 448480 80219040 44811800 */ mtc1 $at, $f3 -/* 448484 80219044 44801000 */ mtc1 $zero, $f2 -/* 448488 80219048 3C0140C9 */ lui $at, 0x40c9 -/* 44848C 8021904C 34210FD0 */ ori $at, $at, 0xfd0 -/* 448490 80219050 4481A000 */ mtc1 $at, $f20 -/* 448494 80219054 8E130000 */ lw $s3, ($s0) -/* 448498 80219058 46220003 */ div.d $f0, $f0, $f2 -/* 44849C 8021905C 462007A0 */ cvt.s.d $f30, $f0 -/* 4484A0 80219060 4614F502 */ mul.s $f20, $f30, $f20 -/* 4484A4 80219064 00000000 */ nop -/* 4484A8 80219068 26100004 */ addiu $s0, $s0, 4 -/* 4484AC 8021906C 8E120000 */ lw $s2, ($s0) -/* 4484B0 80219070 3C0143B4 */ lui $at, 0x43b4 -/* 4484B4 80219074 44810000 */ mtc1 $at, $f0 -/* 4484B8 80219078 8E100004 */ lw $s0, 4($s0) -/* 4484BC 8021907C 4600A503 */ div.s $f20, $f20, $f0 -/* 4484C0 80219080 0C00A85B */ jal sin_rad -/* 4484C4 80219084 4600A306 */ mov.s $f12, $f20 -/* 4484C8 80219088 3C014100 */ lui $at, 0x4100 -/* 4484CC 8021908C 44816000 */ mtc1 $at, $f12 -/* 4484D0 80219090 00000000 */ nop -/* 4484D4 80219094 460CA302 */ mul.s $f12, $f20, $f12 -/* 4484D8 80219098 00000000 */ nop -/* 4484DC 8021909C 3C014316 */ lui $at, 0x4316 -/* 4484E0 802190A0 4481E000 */ mtc1 $at, $f28 -/* 4484E4 802190A4 00000000 */ nop -/* 4484E8 802190A8 461C0582 */ mul.s $f22, $f0, $f28 -/* 4484EC 802190AC 00000000 */ nop -/* 4484F0 802190B0 4480D000 */ mtc1 $zero, $f26 -/* 4484F4 802190B4 0C00A85B */ jal sin_rad -/* 4484F8 802190B8 461AB580 */ add.s $f22, $f22, $f26 -/* 4484FC 802190BC 3C014120 */ lui $at, 0x4120 -/* 448500 802190C0 44811000 */ mtc1 $at, $f2 -/* 448504 802190C4 00000000 */ nop -/* 448508 802190C8 46020602 */ mul.s $f24, $f0, $f2 -/* 44850C 802190CC 00000000 */ nop -/* 448510 802190D0 4600A306 */ mov.s $f12, $f20 -/* 448514 802190D4 0C00A874 */ jal cos_rad -/* 448518 802190D8 461AC600 */ add.s $f24, $f24, $f26 -/* 44851C 802190DC 0280202D */ daddu $a0, $s4, $zero -/* 448520 802190E0 461C0502 */ mul.s $f20, $f0, $f28 -/* 448524 802190E4 00000000 */ nop -/* 448528 802190E8 0220282D */ daddu $a1, $s1, $zero -/* 44852C 802190EC 4406B000 */ mfc1 $a2, $f22 -/* 448530 802190F0 3C0141A0 */ lui $at, 0x41a0 -/* 448534 802190F4 44810000 */ mtc1 $at, $f0 -/* 448538 802190F8 3C01C248 */ lui $at, 0xc248 -/* 44853C 802190FC 44811000 */ mtc1 $at, $f2 -/* 448540 80219100 4600A503 */ div.s $f20, $f20, $f0 -/* 448544 80219104 0C0B2190 */ jal set_float_variable -/* 448548 80219108 4602A500 */ add.s $f20, $f20, $f2 -/* 44854C 8021910C 0280202D */ daddu $a0, $s4, $zero -/* 448550 80219110 4406C000 */ mfc1 $a2, $f24 -/* 448554 80219114 0C0B2190 */ jal set_float_variable -/* 448558 80219118 0260282D */ daddu $a1, $s3, $zero -/* 44855C 8021911C 0280202D */ daddu $a0, $s4, $zero -/* 448560 80219120 4406A000 */ mfc1 $a2, $f20 -/* 448564 80219124 0C0B2190 */ jal set_float_variable -/* 448568 80219128 0240282D */ daddu $a1, $s2, $zero -/* 44856C 8021912C 3C0142B4 */ lui $at, 0x42b4 -/* 448570 80219130 44810000 */ mtc1 $at, $f0 -/* 448574 80219134 00000000 */ nop -/* 448578 80219138 461E003C */ c.lt.s $f0, $f30 -/* 44857C 8021913C 00000000 */ nop -/* 448580 80219140 4500000B */ bc1f .L80219170 -/* 448584 80219144 0000302D */ daddu $a2, $zero, $zero -/* 448588 80219148 3C014387 */ lui $at, 0x4387 -/* 44858C 8021914C 44810000 */ mtc1 $at, $f0 -/* 448590 80219150 00000000 */ nop -/* 448594 80219154 4600F03C */ c.lt.s $f30, $f0 -/* 448598 80219158 00000000 */ nop -/* 44859C 8021915C 45030001 */ bc1tl .L80219164 -/* 4485A0 80219160 240600B4 */ addiu $a2, $zero, 0xb4 -.L80219164: -/* 4485A4 80219164 3C0142B4 */ lui $at, 0x42b4 -/* 4485A8 80219168 44810000 */ mtc1 $at, $f0 -/* 4485AC 8021916C 00000000 */ nop -.L80219170: -/* 4485B0 80219170 461E0001 */ sub.s $f0, $f0, $f30 -/* 4485B4 80219174 46000005 */ abs.s $f0, $f0 -/* 4485B8 80219178 4600010D */ trunc.w.s $f4, $f0 -/* 4485BC 8021917C 44022000 */ mfc1 $v0, $f4 -/* 4485C0 80219180 00000000 */ nop -/* 4485C4 80219184 2842002D */ slti $v0, $v0, 0x2d -/* 4485C8 80219188 10400008 */ beqz $v0, .L802191AC -/* 4485CC 8021918C 00000000 */ nop -/* 4485D0 80219190 3C014234 */ lui $at, 0x4234 -/* 4485D4 80219194 44810000 */ mtc1 $at, $f0 -/* 4485D8 80219198 00000000 */ nop -/* 4485DC 8021919C 4600F001 */ sub.s $f0, $f30, $f0 -/* 4485E0 802191A0 46000000 */ add.s $f0, $f0, $f0 -/* 4485E4 802191A4 4600010D */ trunc.w.s $f4, $f0 -/* 4485E8 802191A8 44062000 */ mfc1 $a2, $f4 -.L802191AC: -/* 4485EC 802191AC 3C014387 */ lui $at, 0x4387 -/* 4485F0 802191B0 44810000 */ mtc1 $at, $f0 -/* 4485F4 802191B4 00000000 */ nop -/* 4485F8 802191B8 461E0001 */ sub.s $f0, $f0, $f30 -/* 4485FC 802191BC 46000005 */ abs.s $f0, $f0 -/* 448600 802191C0 4600010D */ trunc.w.s $f4, $f0 -/* 448604 802191C4 44022000 */ mfc1 $v0, $f4 -/* 448608 802191C8 00000000 */ nop -/* 44860C 802191CC 2842002D */ slti $v0, $v0, 0x2d -/* 448610 802191D0 1040000C */ beqz $v0, .L80219204 -/* 448614 802191D4 0280202D */ daddu $a0, $s4, $zero -/* 448618 802191D8 3C014361 */ lui $at, 0x4361 -/* 44861C 802191DC 44810000 */ mtc1 $at, $f0 -/* 448620 802191E0 00000000 */ nop -/* 448624 802191E4 4600F001 */ sub.s $f0, $f30, $f0 -/* 448628 802191E8 46000000 */ add.s $f0, $f0, $f0 -/* 44862C 802191EC 3C014334 */ lui $at, 0x4334 -/* 448630 802191F0 44811000 */ mtc1 $at, $f2 -/* 448634 802191F4 00000000 */ nop -/* 448638 802191F8 46020000 */ add.s $f0, $f0, $f2 -/* 44863C 802191FC 4600010D */ trunc.w.s $f4, $f0 -/* 448640 80219200 44062000 */ mfc1 $a2, $f4 -.L80219204: -/* 448644 80219204 0C0B2026 */ jal set_variable -/* 448648 80219208 0200282D */ daddu $a1, $s0, $zero -/* 44864C 8021920C 8FBF0024 */ lw $ra, 0x24($sp) -/* 448650 80219210 8FB40020 */ lw $s4, 0x20($sp) -/* 448654 80219214 8FB3001C */ lw $s3, 0x1c($sp) -/* 448658 80219218 8FB20018 */ lw $s2, 0x18($sp) -/* 44865C 8021921C 8FB10014 */ lw $s1, 0x14($sp) -/* 448660 80219220 8FB00010 */ lw $s0, 0x10($sp) -/* 448664 80219224 D7BE0050 */ ldc1 $f30, 0x50($sp) -/* 448668 80219228 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* 44866C 8021922C D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 448670 80219230 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 448674 80219234 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 448678 80219238 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 44867C 8021923C 24020002 */ addiu $v0, $zero, 2 -/* 448680 80219240 03E00008 */ jr $ra -/* 448684 80219244 27BD0058 */ addiu $sp, $sp, 0x58 -/* 448688 80219248 00000000 */ nop -/* 44868C 8021924C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/battle/area_kmr_part_3/448690/func_80219250_448690.s b/ver/us/asm/nonmatchings/battle/area_kmr_part_3/448690/func_80219250_448690.s deleted file mode 100644 index cf123ea831..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_kmr_part_3/448690/func_80219250_448690.s +++ /dev/null @@ -1,164 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80219250_448690 -/* 448690 80219250 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 448694 80219254 AFB40020 */ sw $s4, 0x20($sp) -/* 448698 80219258 0080A02D */ daddu $s4, $a0, $zero -/* 44869C 8021925C AFBF0024 */ sw $ra, 0x24($sp) -/* 4486A0 80219260 AFB3001C */ sw $s3, 0x1c($sp) -/* 4486A4 80219264 AFB20018 */ sw $s2, 0x18($sp) -/* 4486A8 80219268 AFB10014 */ sw $s1, 0x14($sp) -/* 4486AC 8021926C AFB00010 */ sw $s0, 0x10($sp) -/* 4486B0 80219270 F7BE0050 */ sdc1 $f30, 0x50($sp) -/* 4486B4 80219274 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* 4486B8 80219278 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 4486BC 8021927C F7B80038 */ sdc1 $f24, 0x38($sp) -/* 4486C0 80219280 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 4486C4 80219284 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 4486C8 80219288 8E90000C */ lw $s0, 0xc($s4) -/* 4486CC 8021928C 8E050000 */ lw $a1, ($s0) -/* 4486D0 80219290 0C0B1EAF */ jal get_variable -/* 4486D4 80219294 26100004 */ addiu $s0, $s0, 4 -/* 4486D8 80219298 44820000 */ mtc1 $v0, $f0 -/* 4486DC 8021929C 00000000 */ nop -/* 4486E0 802192A0 46800021 */ cvt.d.w $f0, $f0 -/* 4486E4 802192A4 8E110000 */ lw $s1, ($s0) -/* 4486E8 802192A8 26100004 */ addiu $s0, $s0, 4 -/* 4486EC 802192AC 3C014024 */ lui $at, 0x4024 -/* 4486F0 802192B0 44811800 */ mtc1 $at, $f3 -/* 4486F4 802192B4 44801000 */ mtc1 $zero, $f2 -/* 4486F8 802192B8 3C0140C9 */ lui $at, 0x40c9 -/* 4486FC 802192BC 34210FD0 */ ori $at, $at, 0xfd0 -/* 448700 802192C0 4481A000 */ mtc1 $at, $f20 -/* 448704 802192C4 8E130000 */ lw $s3, ($s0) -/* 448708 802192C8 46220003 */ div.d $f0, $f0, $f2 -/* 44870C 802192CC 462007A0 */ cvt.s.d $f30, $f0 -/* 448710 802192D0 4614F502 */ mul.s $f20, $f30, $f20 -/* 448714 802192D4 00000000 */ nop -/* 448718 802192D8 26100004 */ addiu $s0, $s0, 4 -/* 44871C 802192DC 8E120000 */ lw $s2, ($s0) -/* 448720 802192E0 3C0143B4 */ lui $at, 0x43b4 -/* 448724 802192E4 44810000 */ mtc1 $at, $f0 -/* 448728 802192E8 8E100004 */ lw $s0, 4($s0) -/* 44872C 802192EC 4600A503 */ div.s $f20, $f20, $f0 -/* 448730 802192F0 0C00A85B */ jal sin_rad -/* 448734 802192F4 4600A306 */ mov.s $f12, $f20 -/* 448738 802192F8 3C014100 */ lui $at, 0x4100 -/* 44873C 802192FC 44816000 */ mtc1 $at, $f12 -/* 448740 80219300 00000000 */ nop -/* 448744 80219304 460CA302 */ mul.s $f12, $f20, $f12 -/* 448748 80219308 00000000 */ nop -/* 44874C 8021930C 3C014316 */ lui $at, 0x4316 -/* 448750 80219310 4481E000 */ mtc1 $at, $f28 -/* 448754 80219314 00000000 */ nop -/* 448758 80219318 461C0582 */ mul.s $f22, $f0, $f28 -/* 44875C 8021931C 00000000 */ nop -/* 448760 80219320 4480D000 */ mtc1 $zero, $f26 -/* 448764 80219324 0C00A85B */ jal sin_rad -/* 448768 80219328 461AB580 */ add.s $f22, $f22, $f26 -/* 44876C 8021932C 3C014120 */ lui $at, 0x4120 -/* 448770 80219330 44811000 */ mtc1 $at, $f2 -/* 448774 80219334 00000000 */ nop -/* 448778 80219338 46020602 */ mul.s $f24, $f0, $f2 -/* 44877C 8021933C 00000000 */ nop -/* 448780 80219340 4600A306 */ mov.s $f12, $f20 -/* 448784 80219344 0C00A874 */ jal cos_rad -/* 448788 80219348 461AC600 */ add.s $f24, $f24, $f26 -/* 44878C 8021934C 0280202D */ daddu $a0, $s4, $zero -/* 448790 80219350 461C0502 */ mul.s $f20, $f0, $f28 -/* 448794 80219354 00000000 */ nop -/* 448798 80219358 0220282D */ daddu $a1, $s1, $zero -/* 44879C 8021935C 4406B000 */ mfc1 $a2, $f22 -/* 4487A0 80219360 3C0141A0 */ lui $at, 0x41a0 -/* 4487A4 80219364 44810000 */ mtc1 $at, $f0 -/* 4487A8 80219368 3C01C248 */ lui $at, 0xc248 -/* 4487AC 8021936C 44811000 */ mtc1 $at, $f2 -/* 4487B0 80219370 4600A503 */ div.s $f20, $f20, $f0 -/* 4487B4 80219374 0C0B2190 */ jal set_float_variable -/* 4487B8 80219378 4602A500 */ add.s $f20, $f20, $f2 -/* 4487BC 8021937C 0280202D */ daddu $a0, $s4, $zero -/* 4487C0 80219380 4406C000 */ mfc1 $a2, $f24 -/* 4487C4 80219384 0C0B2190 */ jal set_float_variable -/* 4487C8 80219388 0260282D */ daddu $a1, $s3, $zero -/* 4487CC 8021938C 0280202D */ daddu $a0, $s4, $zero -/* 4487D0 80219390 4406A000 */ mfc1 $a2, $f20 -/* 4487D4 80219394 0C0B2190 */ jal set_float_variable -/* 4487D8 80219398 0240282D */ daddu $a1, $s2, $zero -/* 4487DC 8021939C 3C0142B4 */ lui $at, 0x42b4 -/* 4487E0 802193A0 44810000 */ mtc1 $at, $f0 -/* 4487E4 802193A4 00000000 */ nop -/* 4487E8 802193A8 461E003C */ c.lt.s $f0, $f30 -/* 4487EC 802193AC 00000000 */ nop -/* 4487F0 802193B0 4500000B */ bc1f .L802193E0 -/* 4487F4 802193B4 0000302D */ daddu $a2, $zero, $zero -/* 4487F8 802193B8 3C014387 */ lui $at, 0x4387 -/* 4487FC 802193BC 44810000 */ mtc1 $at, $f0 -/* 448800 802193C0 00000000 */ nop -/* 448804 802193C4 4600F03C */ c.lt.s $f30, $f0 -/* 448808 802193C8 00000000 */ nop -/* 44880C 802193CC 45030001 */ bc1tl .L802193D4 -/* 448810 802193D0 240600B4 */ addiu $a2, $zero, 0xb4 -.L802193D4: -/* 448814 802193D4 3C0142B4 */ lui $at, 0x42b4 -/* 448818 802193D8 44810000 */ mtc1 $at, $f0 -/* 44881C 802193DC 00000000 */ nop -.L802193E0: -/* 448820 802193E0 461E0001 */ sub.s $f0, $f0, $f30 -/* 448824 802193E4 46000005 */ abs.s $f0, $f0 -/* 448828 802193E8 4600010D */ trunc.w.s $f4, $f0 -/* 44882C 802193EC 44022000 */ mfc1 $v0, $f4 -/* 448830 802193F0 00000000 */ nop -/* 448834 802193F4 2842002D */ slti $v0, $v0, 0x2d -/* 448838 802193F8 10400008 */ beqz $v0, .L8021941C -/* 44883C 802193FC 00000000 */ nop -/* 448840 80219400 3C014234 */ lui $at, 0x4234 -/* 448844 80219404 44810000 */ mtc1 $at, $f0 -/* 448848 80219408 00000000 */ nop -/* 44884C 8021940C 4600F001 */ sub.s $f0, $f30, $f0 -/* 448850 80219410 46000000 */ add.s $f0, $f0, $f0 -/* 448854 80219414 4600010D */ trunc.w.s $f4, $f0 -/* 448858 80219418 44062000 */ mfc1 $a2, $f4 -.L8021941C: -/* 44885C 8021941C 3C014387 */ lui $at, 0x4387 -/* 448860 80219420 44810000 */ mtc1 $at, $f0 -/* 448864 80219424 00000000 */ nop -/* 448868 80219428 461E0001 */ sub.s $f0, $f0, $f30 -/* 44886C 8021942C 46000005 */ abs.s $f0, $f0 -/* 448870 80219430 4600010D */ trunc.w.s $f4, $f0 -/* 448874 80219434 44022000 */ mfc1 $v0, $f4 -/* 448878 80219438 00000000 */ nop -/* 44887C 8021943C 2842002D */ slti $v0, $v0, 0x2d -/* 448880 80219440 1040000C */ beqz $v0, .L80219474 -/* 448884 80219444 0280202D */ daddu $a0, $s4, $zero -/* 448888 80219448 3C014361 */ lui $at, 0x4361 -/* 44888C 8021944C 44810000 */ mtc1 $at, $f0 -/* 448890 80219450 00000000 */ nop -/* 448894 80219454 4600F001 */ sub.s $f0, $f30, $f0 -/* 448898 80219458 46000000 */ add.s $f0, $f0, $f0 -/* 44889C 8021945C 3C014334 */ lui $at, 0x4334 -/* 4488A0 80219460 44811000 */ mtc1 $at, $f2 -/* 4488A4 80219464 00000000 */ nop -/* 4488A8 80219468 46020000 */ add.s $f0, $f0, $f2 -/* 4488AC 8021946C 4600010D */ trunc.w.s $f4, $f0 -/* 4488B0 80219470 44062000 */ mfc1 $a2, $f4 -.L80219474: -/* 4488B4 80219474 0C0B2026 */ jal set_variable -/* 4488B8 80219478 0200282D */ daddu $a1, $s0, $zero -/* 4488BC 8021947C 8FBF0024 */ lw $ra, 0x24($sp) -/* 4488C0 80219480 8FB40020 */ lw $s4, 0x20($sp) -/* 4488C4 80219484 8FB3001C */ lw $s3, 0x1c($sp) -/* 4488C8 80219488 8FB20018 */ lw $s2, 0x18($sp) -/* 4488CC 8021948C 8FB10014 */ lw $s1, 0x14($sp) -/* 4488D0 80219490 8FB00010 */ lw $s0, 0x10($sp) -/* 4488D4 80219494 D7BE0050 */ ldc1 $f30, 0x50($sp) -/* 4488D8 80219498 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* 4488DC 8021949C D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 4488E0 802194A0 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 4488E4 802194A4 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 4488E8 802194A8 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 4488EC 802194AC 24020002 */ addiu $v0, $zero, 2 -/* 4488F0 802194B0 03E00008 */ jr $ra -/* 4488F4 802194B4 27BD0058 */ addiu $sp, $sp, 0x58 -/* 4488F8 802194B8 00000000 */ nop -/* 4488FC 802194BC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/battle/area_kmr_part_3/448900/func_802194C0_448900.s b/ver/us/asm/nonmatchings/battle/area_kmr_part_3/448900/func_802194C0_448900.s deleted file mode 100644 index e934b31413..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_kmr_part_3/448900/func_802194C0_448900.s +++ /dev/null @@ -1,164 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802194C0_448900 -/* 448900 802194C0 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 448904 802194C4 AFB40020 */ sw $s4, 0x20($sp) -/* 448908 802194C8 0080A02D */ daddu $s4, $a0, $zero -/* 44890C 802194CC AFBF0024 */ sw $ra, 0x24($sp) -/* 448910 802194D0 AFB3001C */ sw $s3, 0x1c($sp) -/* 448914 802194D4 AFB20018 */ sw $s2, 0x18($sp) -/* 448918 802194D8 AFB10014 */ sw $s1, 0x14($sp) -/* 44891C 802194DC AFB00010 */ sw $s0, 0x10($sp) -/* 448920 802194E0 F7BE0050 */ sdc1 $f30, 0x50($sp) -/* 448924 802194E4 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* 448928 802194E8 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 44892C 802194EC F7B80038 */ sdc1 $f24, 0x38($sp) -/* 448930 802194F0 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 448934 802194F4 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 448938 802194F8 8E90000C */ lw $s0, 0xc($s4) -/* 44893C 802194FC 8E050000 */ lw $a1, ($s0) -/* 448940 80219500 0C0B1EAF */ jal get_variable -/* 448944 80219504 26100004 */ addiu $s0, $s0, 4 -/* 448948 80219508 44820000 */ mtc1 $v0, $f0 -/* 44894C 8021950C 00000000 */ nop -/* 448950 80219510 46800021 */ cvt.d.w $f0, $f0 -/* 448954 80219514 8E110000 */ lw $s1, ($s0) -/* 448958 80219518 26100004 */ addiu $s0, $s0, 4 -/* 44895C 8021951C 3C014024 */ lui $at, 0x4024 -/* 448960 80219520 44811800 */ mtc1 $at, $f3 -/* 448964 80219524 44801000 */ mtc1 $zero, $f2 -/* 448968 80219528 3C0140C9 */ lui $at, 0x40c9 -/* 44896C 8021952C 34210FD0 */ ori $at, $at, 0xfd0 -/* 448970 80219530 4481A000 */ mtc1 $at, $f20 -/* 448974 80219534 8E130000 */ lw $s3, ($s0) -/* 448978 80219538 46220003 */ div.d $f0, $f0, $f2 -/* 44897C 8021953C 462007A0 */ cvt.s.d $f30, $f0 -/* 448980 80219540 4614F502 */ mul.s $f20, $f30, $f20 -/* 448984 80219544 00000000 */ nop -/* 448988 80219548 26100004 */ addiu $s0, $s0, 4 -/* 44898C 8021954C 8E120000 */ lw $s2, ($s0) -/* 448990 80219550 3C0143B4 */ lui $at, 0x43b4 -/* 448994 80219554 44810000 */ mtc1 $at, $f0 -/* 448998 80219558 8E100004 */ lw $s0, 4($s0) -/* 44899C 8021955C 4600A503 */ div.s $f20, $f20, $f0 -/* 4489A0 80219560 0C00A85B */ jal sin_rad -/* 4489A4 80219564 4600A306 */ mov.s $f12, $f20 -/* 4489A8 80219568 3C014100 */ lui $at, 0x4100 -/* 4489AC 8021956C 44816000 */ mtc1 $at, $f12 -/* 4489B0 80219570 00000000 */ nop -/* 4489B4 80219574 460CA302 */ mul.s $f12, $f20, $f12 -/* 4489B8 80219578 00000000 */ nop -/* 4489BC 8021957C 3C014316 */ lui $at, 0x4316 -/* 4489C0 80219580 4481E000 */ mtc1 $at, $f28 -/* 4489C4 80219584 00000000 */ nop -/* 4489C8 80219588 461C0582 */ mul.s $f22, $f0, $f28 -/* 4489CC 8021958C 00000000 */ nop -/* 4489D0 80219590 4480D000 */ mtc1 $zero, $f26 -/* 4489D4 80219594 0C00A85B */ jal sin_rad -/* 4489D8 80219598 461AB580 */ add.s $f22, $f22, $f26 -/* 4489DC 8021959C 3C014120 */ lui $at, 0x4120 -/* 4489E0 802195A0 44811000 */ mtc1 $at, $f2 -/* 4489E4 802195A4 00000000 */ nop -/* 4489E8 802195A8 46020602 */ mul.s $f24, $f0, $f2 -/* 4489EC 802195AC 00000000 */ nop -/* 4489F0 802195B0 4600A306 */ mov.s $f12, $f20 -/* 4489F4 802195B4 0C00A874 */ jal cos_rad -/* 4489F8 802195B8 461AC600 */ add.s $f24, $f24, $f26 -/* 4489FC 802195BC 0280202D */ daddu $a0, $s4, $zero -/* 448A00 802195C0 461C0502 */ mul.s $f20, $f0, $f28 -/* 448A04 802195C4 00000000 */ nop -/* 448A08 802195C8 0220282D */ daddu $a1, $s1, $zero -/* 448A0C 802195CC 4406B000 */ mfc1 $a2, $f22 -/* 448A10 802195D0 3C0141A0 */ lui $at, 0x41a0 -/* 448A14 802195D4 44810000 */ mtc1 $at, $f0 -/* 448A18 802195D8 3C01C248 */ lui $at, 0xc248 -/* 448A1C 802195DC 44811000 */ mtc1 $at, $f2 -/* 448A20 802195E0 4600A503 */ div.s $f20, $f20, $f0 -/* 448A24 802195E4 0C0B2190 */ jal set_float_variable -/* 448A28 802195E8 4602A500 */ add.s $f20, $f20, $f2 -/* 448A2C 802195EC 0280202D */ daddu $a0, $s4, $zero -/* 448A30 802195F0 4406C000 */ mfc1 $a2, $f24 -/* 448A34 802195F4 0C0B2190 */ jal set_float_variable -/* 448A38 802195F8 0260282D */ daddu $a1, $s3, $zero -/* 448A3C 802195FC 0280202D */ daddu $a0, $s4, $zero -/* 448A40 80219600 4406A000 */ mfc1 $a2, $f20 -/* 448A44 80219604 0C0B2190 */ jal set_float_variable -/* 448A48 80219608 0240282D */ daddu $a1, $s2, $zero -/* 448A4C 8021960C 3C0142B4 */ lui $at, 0x42b4 -/* 448A50 80219610 44810000 */ mtc1 $at, $f0 -/* 448A54 80219614 00000000 */ nop -/* 448A58 80219618 461E003C */ c.lt.s $f0, $f30 -/* 448A5C 8021961C 00000000 */ nop -/* 448A60 80219620 4500000B */ bc1f .L80219650 -/* 448A64 80219624 0000302D */ daddu $a2, $zero, $zero -/* 448A68 80219628 3C014387 */ lui $at, 0x4387 -/* 448A6C 8021962C 44810000 */ mtc1 $at, $f0 -/* 448A70 80219630 00000000 */ nop -/* 448A74 80219634 4600F03C */ c.lt.s $f30, $f0 -/* 448A78 80219638 00000000 */ nop -/* 448A7C 8021963C 45030001 */ bc1tl .L80219644 -/* 448A80 80219640 240600B4 */ addiu $a2, $zero, 0xb4 -.L80219644: -/* 448A84 80219644 3C0142B4 */ lui $at, 0x42b4 -/* 448A88 80219648 44810000 */ mtc1 $at, $f0 -/* 448A8C 8021964C 00000000 */ nop -.L80219650: -/* 448A90 80219650 461E0001 */ sub.s $f0, $f0, $f30 -/* 448A94 80219654 46000005 */ abs.s $f0, $f0 -/* 448A98 80219658 4600010D */ trunc.w.s $f4, $f0 -/* 448A9C 8021965C 44022000 */ mfc1 $v0, $f4 -/* 448AA0 80219660 00000000 */ nop -/* 448AA4 80219664 2842002D */ slti $v0, $v0, 0x2d -/* 448AA8 80219668 10400008 */ beqz $v0, .L8021968C -/* 448AAC 8021966C 00000000 */ nop -/* 448AB0 80219670 3C014234 */ lui $at, 0x4234 -/* 448AB4 80219674 44810000 */ mtc1 $at, $f0 -/* 448AB8 80219678 00000000 */ nop -/* 448ABC 8021967C 4600F001 */ sub.s $f0, $f30, $f0 -/* 448AC0 80219680 46000000 */ add.s $f0, $f0, $f0 -/* 448AC4 80219684 4600010D */ trunc.w.s $f4, $f0 -/* 448AC8 80219688 44062000 */ mfc1 $a2, $f4 -.L8021968C: -/* 448ACC 8021968C 3C014387 */ lui $at, 0x4387 -/* 448AD0 80219690 44810000 */ mtc1 $at, $f0 -/* 448AD4 80219694 00000000 */ nop -/* 448AD8 80219698 461E0001 */ sub.s $f0, $f0, $f30 -/* 448ADC 8021969C 46000005 */ abs.s $f0, $f0 -/* 448AE0 802196A0 4600010D */ trunc.w.s $f4, $f0 -/* 448AE4 802196A4 44022000 */ mfc1 $v0, $f4 -/* 448AE8 802196A8 00000000 */ nop -/* 448AEC 802196AC 2842002D */ slti $v0, $v0, 0x2d -/* 448AF0 802196B0 1040000C */ beqz $v0, .L802196E4 -/* 448AF4 802196B4 0280202D */ daddu $a0, $s4, $zero -/* 448AF8 802196B8 3C014361 */ lui $at, 0x4361 -/* 448AFC 802196BC 44810000 */ mtc1 $at, $f0 -/* 448B00 802196C0 00000000 */ nop -/* 448B04 802196C4 4600F001 */ sub.s $f0, $f30, $f0 -/* 448B08 802196C8 46000000 */ add.s $f0, $f0, $f0 -/* 448B0C 802196CC 3C014334 */ lui $at, 0x4334 -/* 448B10 802196D0 44811000 */ mtc1 $at, $f2 -/* 448B14 802196D4 00000000 */ nop -/* 448B18 802196D8 46020000 */ add.s $f0, $f0, $f2 -/* 448B1C 802196DC 4600010D */ trunc.w.s $f4, $f0 -/* 448B20 802196E0 44062000 */ mfc1 $a2, $f4 -.L802196E4: -/* 448B24 802196E4 0C0B2026 */ jal set_variable -/* 448B28 802196E8 0200282D */ daddu $a1, $s0, $zero -/* 448B2C 802196EC 8FBF0024 */ lw $ra, 0x24($sp) -/* 448B30 802196F0 8FB40020 */ lw $s4, 0x20($sp) -/* 448B34 802196F4 8FB3001C */ lw $s3, 0x1c($sp) -/* 448B38 802196F8 8FB20018 */ lw $s2, 0x18($sp) -/* 448B3C 802196FC 8FB10014 */ lw $s1, 0x14($sp) -/* 448B40 80219700 8FB00010 */ lw $s0, 0x10($sp) -/* 448B44 80219704 D7BE0050 */ ldc1 $f30, 0x50($sp) -/* 448B48 80219708 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* 448B4C 8021970C D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 448B50 80219710 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 448B54 80219714 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 448B58 80219718 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 448B5C 8021971C 24020002 */ addiu $v0, $zero, 2 -/* 448B60 80219720 03E00008 */ jr $ra -/* 448B64 80219724 27BD0058 */ addiu $sp, $sp, 0x58 -/* 448B68 80219728 00000000 */ nop -/* 448B6C 8021972C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/battle/area_kmr_part_3/448B70/func_80219730_448B70.s b/ver/us/asm/nonmatchings/battle/area_kmr_part_3/448B70/func_80219730_448B70.s deleted file mode 100644 index 35f83c13eb..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_kmr_part_3/448B70/func_80219730_448B70.s +++ /dev/null @@ -1,162 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80219730_448B70 -/* 448B70 80219730 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 448B74 80219734 AFB40020 */ sw $s4, 0x20($sp) -/* 448B78 80219738 0080A02D */ daddu $s4, $a0, $zero -/* 448B7C 8021973C AFBF0024 */ sw $ra, 0x24($sp) -/* 448B80 80219740 AFB3001C */ sw $s3, 0x1c($sp) -/* 448B84 80219744 AFB20018 */ sw $s2, 0x18($sp) -/* 448B88 80219748 AFB10014 */ sw $s1, 0x14($sp) -/* 448B8C 8021974C AFB00010 */ sw $s0, 0x10($sp) -/* 448B90 80219750 F7BE0050 */ sdc1 $f30, 0x50($sp) -/* 448B94 80219754 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* 448B98 80219758 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 448B9C 8021975C F7B80038 */ sdc1 $f24, 0x38($sp) -/* 448BA0 80219760 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 448BA4 80219764 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 448BA8 80219768 8E90000C */ lw $s0, 0xc($s4) -/* 448BAC 8021976C 8E050000 */ lw $a1, ($s0) -/* 448BB0 80219770 0C0B1EAF */ jal get_variable -/* 448BB4 80219774 26100004 */ addiu $s0, $s0, 4 -/* 448BB8 80219778 44820000 */ mtc1 $v0, $f0 -/* 448BBC 8021977C 00000000 */ nop -/* 448BC0 80219780 46800021 */ cvt.d.w $f0, $f0 -/* 448BC4 80219784 8E110000 */ lw $s1, ($s0) -/* 448BC8 80219788 26100004 */ addiu $s0, $s0, 4 -/* 448BCC 8021978C 3C014024 */ lui $at, 0x4024 -/* 448BD0 80219790 44811800 */ mtc1 $at, $f3 -/* 448BD4 80219794 44801000 */ mtc1 $zero, $f2 -/* 448BD8 80219798 3C0140C9 */ lui $at, 0x40c9 -/* 448BDC 8021979C 34210FD0 */ ori $at, $at, 0xfd0 -/* 448BE0 802197A0 4481A000 */ mtc1 $at, $f20 -/* 448BE4 802197A4 8E130000 */ lw $s3, ($s0) -/* 448BE8 802197A8 46220003 */ div.d $f0, $f0, $f2 -/* 448BEC 802197AC 462007A0 */ cvt.s.d $f30, $f0 -/* 448BF0 802197B0 4614F502 */ mul.s $f20, $f30, $f20 -/* 448BF4 802197B4 00000000 */ nop -/* 448BF8 802197B8 26100004 */ addiu $s0, $s0, 4 -/* 448BFC 802197BC 8E120000 */ lw $s2, ($s0) -/* 448C00 802197C0 3C0143B4 */ lui $at, 0x43b4 -/* 448C04 802197C4 44810000 */ mtc1 $at, $f0 -/* 448C08 802197C8 8E100004 */ lw $s0, 4($s0) -/* 448C0C 802197CC 4600A503 */ div.s $f20, $f20, $f0 -/* 448C10 802197D0 0C00A85B */ jal sin_rad -/* 448C14 802197D4 4600A306 */ mov.s $f12, $f20 -/* 448C18 802197D8 3C014100 */ lui $at, 0x4100 -/* 448C1C 802197DC 44816000 */ mtc1 $at, $f12 -/* 448C20 802197E0 00000000 */ nop -/* 448C24 802197E4 460CA302 */ mul.s $f12, $f20, $f12 -/* 448C28 802197E8 00000000 */ nop -/* 448C2C 802197EC 3C014316 */ lui $at, 0x4316 -/* 448C30 802197F0 4481E000 */ mtc1 $at, $f28 -/* 448C34 802197F4 00000000 */ nop -/* 448C38 802197F8 461C0582 */ mul.s $f22, $f0, $f28 -/* 448C3C 802197FC 00000000 */ nop -/* 448C40 80219800 4480D000 */ mtc1 $zero, $f26 -/* 448C44 80219804 0C00A85B */ jal sin_rad -/* 448C48 80219808 461AB580 */ add.s $f22, $f22, $f26 -/* 448C4C 8021980C 3C014120 */ lui $at, 0x4120 -/* 448C50 80219810 44811000 */ mtc1 $at, $f2 -/* 448C54 80219814 00000000 */ nop -/* 448C58 80219818 46020602 */ mul.s $f24, $f0, $f2 -/* 448C5C 8021981C 00000000 */ nop -/* 448C60 80219820 4600A306 */ mov.s $f12, $f20 -/* 448C64 80219824 0C00A874 */ jal cos_rad -/* 448C68 80219828 461AC600 */ add.s $f24, $f24, $f26 -/* 448C6C 8021982C 0280202D */ daddu $a0, $s4, $zero -/* 448C70 80219830 461C0502 */ mul.s $f20, $f0, $f28 -/* 448C74 80219834 00000000 */ nop -/* 448C78 80219838 0220282D */ daddu $a1, $s1, $zero -/* 448C7C 8021983C 4406B000 */ mfc1 $a2, $f22 -/* 448C80 80219840 3C0141A0 */ lui $at, 0x41a0 -/* 448C84 80219844 44810000 */ mtc1 $at, $f0 -/* 448C88 80219848 3C01C248 */ lui $at, 0xc248 -/* 448C8C 8021984C 44811000 */ mtc1 $at, $f2 -/* 448C90 80219850 4600A503 */ div.s $f20, $f20, $f0 -/* 448C94 80219854 0C0B2190 */ jal set_float_variable -/* 448C98 80219858 4602A500 */ add.s $f20, $f20, $f2 -/* 448C9C 8021985C 0280202D */ daddu $a0, $s4, $zero -/* 448CA0 80219860 4406C000 */ mfc1 $a2, $f24 -/* 448CA4 80219864 0C0B2190 */ jal set_float_variable -/* 448CA8 80219868 0260282D */ daddu $a1, $s3, $zero -/* 448CAC 8021986C 0280202D */ daddu $a0, $s4, $zero -/* 448CB0 80219870 4406A000 */ mfc1 $a2, $f20 -/* 448CB4 80219874 0C0B2190 */ jal set_float_variable -/* 448CB8 80219878 0240282D */ daddu $a1, $s2, $zero -/* 448CBC 8021987C 3C0142B4 */ lui $at, 0x42b4 -/* 448CC0 80219880 44810000 */ mtc1 $at, $f0 -/* 448CC4 80219884 00000000 */ nop -/* 448CC8 80219888 461E003C */ c.lt.s $f0, $f30 -/* 448CCC 8021988C 00000000 */ nop -/* 448CD0 80219890 4500000B */ bc1f .L802198C0 -/* 448CD4 80219894 0000302D */ daddu $a2, $zero, $zero -/* 448CD8 80219898 3C014387 */ lui $at, 0x4387 -/* 448CDC 8021989C 44810000 */ mtc1 $at, $f0 -/* 448CE0 802198A0 00000000 */ nop -/* 448CE4 802198A4 4600F03C */ c.lt.s $f30, $f0 -/* 448CE8 802198A8 00000000 */ nop -/* 448CEC 802198AC 45030001 */ bc1tl .L802198B4 -/* 448CF0 802198B0 240600B4 */ addiu $a2, $zero, 0xb4 -.L802198B4: -/* 448CF4 802198B4 3C0142B4 */ lui $at, 0x42b4 -/* 448CF8 802198B8 44810000 */ mtc1 $at, $f0 -/* 448CFC 802198BC 00000000 */ nop -.L802198C0: -/* 448D00 802198C0 461E0001 */ sub.s $f0, $f0, $f30 -/* 448D04 802198C4 46000005 */ abs.s $f0, $f0 -/* 448D08 802198C8 4600010D */ trunc.w.s $f4, $f0 -/* 448D0C 802198CC 44022000 */ mfc1 $v0, $f4 -/* 448D10 802198D0 00000000 */ nop -/* 448D14 802198D4 2842002D */ slti $v0, $v0, 0x2d -/* 448D18 802198D8 10400008 */ beqz $v0, .L802198FC -/* 448D1C 802198DC 00000000 */ nop -/* 448D20 802198E0 3C014234 */ lui $at, 0x4234 -/* 448D24 802198E4 44810000 */ mtc1 $at, $f0 -/* 448D28 802198E8 00000000 */ nop -/* 448D2C 802198EC 4600F001 */ sub.s $f0, $f30, $f0 -/* 448D30 802198F0 46000000 */ add.s $f0, $f0, $f0 -/* 448D34 802198F4 4600010D */ trunc.w.s $f4, $f0 -/* 448D38 802198F8 44062000 */ mfc1 $a2, $f4 -.L802198FC: -/* 448D3C 802198FC 3C014387 */ lui $at, 0x4387 -/* 448D40 80219900 44810000 */ mtc1 $at, $f0 -/* 448D44 80219904 00000000 */ nop -/* 448D48 80219908 461E0001 */ sub.s $f0, $f0, $f30 -/* 448D4C 8021990C 46000005 */ abs.s $f0, $f0 -/* 448D50 80219910 4600010D */ trunc.w.s $f4, $f0 -/* 448D54 80219914 44022000 */ mfc1 $v0, $f4 -/* 448D58 80219918 00000000 */ nop -/* 448D5C 8021991C 2842002D */ slti $v0, $v0, 0x2d -/* 448D60 80219920 1040000C */ beqz $v0, .L80219954 -/* 448D64 80219924 0280202D */ daddu $a0, $s4, $zero -/* 448D68 80219928 3C014361 */ lui $at, 0x4361 -/* 448D6C 8021992C 44810000 */ mtc1 $at, $f0 -/* 448D70 80219930 00000000 */ nop -/* 448D74 80219934 4600F001 */ sub.s $f0, $f30, $f0 -/* 448D78 80219938 46000000 */ add.s $f0, $f0, $f0 -/* 448D7C 8021993C 3C014334 */ lui $at, 0x4334 -/* 448D80 80219940 44811000 */ mtc1 $at, $f2 -/* 448D84 80219944 00000000 */ nop -/* 448D88 80219948 46020000 */ add.s $f0, $f0, $f2 -/* 448D8C 8021994C 4600010D */ trunc.w.s $f4, $f0 -/* 448D90 80219950 44062000 */ mfc1 $a2, $f4 -.L80219954: -/* 448D94 80219954 0C0B2026 */ jal set_variable -/* 448D98 80219958 0200282D */ daddu $a1, $s0, $zero -/* 448D9C 8021995C 8FBF0024 */ lw $ra, 0x24($sp) -/* 448DA0 80219960 8FB40020 */ lw $s4, 0x20($sp) -/* 448DA4 80219964 8FB3001C */ lw $s3, 0x1c($sp) -/* 448DA8 80219968 8FB20018 */ lw $s2, 0x18($sp) -/* 448DAC 8021996C 8FB10014 */ lw $s1, 0x14($sp) -/* 448DB0 80219970 8FB00010 */ lw $s0, 0x10($sp) -/* 448DB4 80219974 D7BE0050 */ ldc1 $f30, 0x50($sp) -/* 448DB8 80219978 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* 448DBC 8021997C D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 448DC0 80219980 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 448DC4 80219984 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 448DC8 80219988 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 448DCC 8021998C 24020002 */ addiu $v0, $zero, 2 -/* 448DD0 80219990 03E00008 */ jr $ra -/* 448DD4 80219994 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/battle/area_kmr_part_3/448E80/func_80219C38_449078.s b/ver/us/asm/nonmatchings/battle/area_kmr_part_3/448E80/func_80219C38_449078.s deleted file mode 100644 index fee586fbe0..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_kmr_part_3/448E80/func_80219C38_449078.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80219C38_449078 -/* 449078 80219C38 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 44907C 80219C3C 0000202D */ daddu $a0, $zero, $zero -/* 449080 80219C40 AFBF0010 */ sw $ra, 0x10($sp) -/* 449084 80219C44 0C01C49C */ jal func_80071270 -/* 449088 80219C48 24050010 */ addiu $a1, $zero, 0x10 -/* 44908C 80219C4C 8FBF0010 */ lw $ra, 0x10($sp) -/* 449090 80219C50 24020002 */ addiu $v0, $zero, 2 -/* 449094 80219C54 03E00008 */ jr $ra -/* 449098 80219C58 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/area_kmr_part_3/448E80/func_80219C5C_44909C.s b/ver/us/asm/nonmatchings/battle/area_kmr_part_3/448E80/func_80219C5C_44909C.s deleted file mode 100644 index c38007c051..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_kmr_part_3/448E80/func_80219C5C_44909C.s +++ /dev/null @@ -1,69 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80219C5C_44909C -/* 44909C 80219C5C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4490A0 80219C60 AFB10014 */ sw $s1, 0x14($sp) -/* 4490A4 80219C64 0080882D */ daddu $s1, $a0, $zero -/* 4490A8 80219C68 AFBF0020 */ sw $ra, 0x20($sp) -/* 4490AC 80219C6C AFB3001C */ sw $s3, 0x1c($sp) -/* 4490B0 80219C70 AFB20018 */ sw $s2, 0x18($sp) -/* 4490B4 80219C74 AFB00010 */ sw $s0, 0x10($sp) -/* 4490B8 80219C78 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 4490BC 80219C7C 8E30000C */ lw $s0, 0xc($s1) -/* 4490C0 80219C80 8E050000 */ lw $a1, ($s0) -/* 4490C4 80219C84 0C0B1EAF */ jal get_variable -/* 4490C8 80219C88 26100004 */ addiu $s0, $s0, 4 -/* 4490CC 80219C8C 3C036666 */ lui $v1, 0x6666 -/* 4490D0 80219C90 34636667 */ ori $v1, $v1, 0x6667 -/* 4490D4 80219C94 00430018 */ mult $v0, $v1 -/* 4490D8 80219C98 000217C3 */ sra $v0, $v0, 0x1f -/* 4490DC 80219C9C 3C0140C9 */ lui $at, 0x40c9 -/* 4490E0 80219CA0 34210FD0 */ ori $at, $at, 0xfd0 -/* 4490E4 80219CA4 44810000 */ mtc1 $at, $f0 -/* 4490E8 80219CA8 00003810 */ mfhi $a3 -/* 4490EC 80219CAC 00071883 */ sra $v1, $a3, 2 -/* 4490F0 80219CB0 00621823 */ subu $v1, $v1, $v0 -/* 4490F4 80219CB4 44836000 */ mtc1 $v1, $f12 -/* 4490F8 80219CB8 00000000 */ nop -/* 4490FC 80219CBC 46806320 */ cvt.s.w $f12, $f12 -/* 449100 80219CC0 46006302 */ mul.s $f12, $f12, $f0 -/* 449104 80219CC4 00000000 */ nop -/* 449108 80219CC8 3C0143B4 */ lui $at, 0x43b4 -/* 44910C 80219CCC 44810000 */ mtc1 $at, $f0 -/* 449110 80219CD0 3C014100 */ lui $at, 0x4100 -/* 449114 80219CD4 44811000 */ mtc1 $at, $f2 -/* 449118 80219CD8 46006303 */ div.s $f12, $f12, $f0 -/* 44911C 80219CDC 46026302 */ mul.s $f12, $f12, $f2 -/* 449120 80219CE0 00000000 */ nop -/* 449124 80219CE4 8E120000 */ lw $s2, ($s0) -/* 449128 80219CE8 26100004 */ addiu $s0, $s0, 4 -/* 44912C 80219CEC 8E130000 */ lw $s3, ($s0) -/* 449130 80219CF0 0C00A85B */ jal sin_rad -/* 449134 80219CF4 8E100004 */ lw $s0, 4($s0) -/* 449138 80219CF8 0220202D */ daddu $a0, $s1, $zero -/* 44913C 80219CFC 3C014120 */ lui $at, 0x4120 -/* 449140 80219D00 44811000 */ mtc1 $at, $f2 -/* 449144 80219D04 0240282D */ daddu $a1, $s2, $zero -/* 449148 80219D08 46020502 */ mul.s $f20, $f0, $f2 -/* 44914C 80219D0C 00000000 */ nop -/* 449150 80219D10 0C0B2026 */ jal set_variable -/* 449154 80219D14 0000302D */ daddu $a2, $zero, $zero -/* 449158 80219D18 0220202D */ daddu $a0, $s1, $zero -/* 44915C 80219D1C 4600A10D */ trunc.w.s $f4, $f20 -/* 449160 80219D20 44062000 */ mfc1 $a2, $f4 -/* 449164 80219D24 0C0B2026 */ jal set_variable -/* 449168 80219D28 0260282D */ daddu $a1, $s3, $zero -/* 44916C 80219D2C 0220202D */ daddu $a0, $s1, $zero -/* 449170 80219D30 0200282D */ daddu $a1, $s0, $zero -/* 449174 80219D34 0C0B2026 */ jal set_variable -/* 449178 80219D38 0000302D */ daddu $a2, $zero, $zero -/* 44917C 80219D3C 8FBF0020 */ lw $ra, 0x20($sp) -/* 449180 80219D40 8FB3001C */ lw $s3, 0x1c($sp) -/* 449184 80219D44 8FB20018 */ lw $s2, 0x18($sp) -/* 449188 80219D48 8FB10014 */ lw $s1, 0x14($sp) -/* 44918C 80219D4C 8FB00010 */ lw $s0, 0x10($sp) -/* 449190 80219D50 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 449194 80219D54 24020002 */ addiu $v0, $zero, 2 -/* 449198 80219D58 03E00008 */ jr $ra -/* 44919C 80219D5C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/battle/area_pra2/660E10/func_802188B8_661008.s b/ver/us/asm/nonmatchings/battle/area_pra2/660E10/func_802188B8_661008.s deleted file mode 100644 index 1568b7167a..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_pra2/660E10/func_802188B8_661008.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802188B8_661008 -/* 661008 802188B8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 66100C 802188BC 0000202D */ daddu $a0, $zero, $zero -/* 661010 802188C0 AFBF0010 */ sw $ra, 0x10($sp) -/* 661014 802188C4 0C01C49C */ jal func_80071270 -/* 661018 802188C8 24050010 */ addiu $a1, $zero, 0x10 -/* 66101C 802188CC 8FBF0010 */ lw $ra, 0x10($sp) -/* 661020 802188D0 24020002 */ addiu $v0, $zero, 2 -/* 661024 802188D4 03E00008 */ jr $ra -/* 661028 802188D8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/area_pra2/660E10/func_802188DC_66102C.s b/ver/us/asm/nonmatchings/battle/area_pra2/660E10/func_802188DC_66102C.s deleted file mode 100644 index 2226445211..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_pra2/660E10/func_802188DC_66102C.s +++ /dev/null @@ -1,69 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802188DC_66102C -/* 66102C 802188DC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 661030 802188E0 AFB10014 */ sw $s1, 0x14($sp) -/* 661034 802188E4 0080882D */ daddu $s1, $a0, $zero -/* 661038 802188E8 AFBF0020 */ sw $ra, 0x20($sp) -/* 66103C 802188EC AFB3001C */ sw $s3, 0x1c($sp) -/* 661040 802188F0 AFB20018 */ sw $s2, 0x18($sp) -/* 661044 802188F4 AFB00010 */ sw $s0, 0x10($sp) -/* 661048 802188F8 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 66104C 802188FC 8E30000C */ lw $s0, 0xc($s1) -/* 661050 80218900 8E050000 */ lw $a1, ($s0) -/* 661054 80218904 0C0B1EAF */ jal get_variable -/* 661058 80218908 26100004 */ addiu $s0, $s0, 4 -/* 66105C 8021890C 3C036666 */ lui $v1, 0x6666 -/* 661060 80218910 34636667 */ ori $v1, $v1, 0x6667 -/* 661064 80218914 00430018 */ mult $v0, $v1 -/* 661068 80218918 000217C3 */ sra $v0, $v0, 0x1f -/* 66106C 8021891C 3C0140C9 */ lui $at, 0x40c9 -/* 661070 80218920 34210FD0 */ ori $at, $at, 0xfd0 -/* 661074 80218924 44810000 */ mtc1 $at, $f0 -/* 661078 80218928 00003810 */ mfhi $a3 -/* 66107C 8021892C 00071883 */ sra $v1, $a3, 2 -/* 661080 80218930 00621823 */ subu $v1, $v1, $v0 -/* 661084 80218934 44836000 */ mtc1 $v1, $f12 -/* 661088 80218938 00000000 */ nop -/* 66108C 8021893C 46806320 */ cvt.s.w $f12, $f12 -/* 661090 80218940 46006302 */ mul.s $f12, $f12, $f0 -/* 661094 80218944 00000000 */ nop -/* 661098 80218948 3C0143B4 */ lui $at, 0x43b4 -/* 66109C 8021894C 44810000 */ mtc1 $at, $f0 -/* 6610A0 80218950 3C014100 */ lui $at, 0x4100 -/* 6610A4 80218954 44811000 */ mtc1 $at, $f2 -/* 6610A8 80218958 46006303 */ div.s $f12, $f12, $f0 -/* 6610AC 8021895C 46026302 */ mul.s $f12, $f12, $f2 -/* 6610B0 80218960 00000000 */ nop -/* 6610B4 80218964 8E120000 */ lw $s2, ($s0) -/* 6610B8 80218968 26100004 */ addiu $s0, $s0, 4 -/* 6610BC 8021896C 8E130000 */ lw $s3, ($s0) -/* 6610C0 80218970 0C00A85B */ jal sin_rad -/* 6610C4 80218974 8E100004 */ lw $s0, 4($s0) -/* 6610C8 80218978 0220202D */ daddu $a0, $s1, $zero -/* 6610CC 8021897C 3C014120 */ lui $at, 0x4120 -/* 6610D0 80218980 44811000 */ mtc1 $at, $f2 -/* 6610D4 80218984 0240282D */ daddu $a1, $s2, $zero -/* 6610D8 80218988 46020502 */ mul.s $f20, $f0, $f2 -/* 6610DC 8021898C 00000000 */ nop -/* 6610E0 80218990 0C0B2026 */ jal set_variable -/* 6610E4 80218994 0000302D */ daddu $a2, $zero, $zero -/* 6610E8 80218998 0220202D */ daddu $a0, $s1, $zero -/* 6610EC 8021899C 4600A10D */ trunc.w.s $f4, $f20 -/* 6610F0 802189A0 44062000 */ mfc1 $a2, $f4 -/* 6610F4 802189A4 0C0B2026 */ jal set_variable -/* 6610F8 802189A8 0260282D */ daddu $a1, $s3, $zero -/* 6610FC 802189AC 0220202D */ daddu $a0, $s1, $zero -/* 661100 802189B0 0200282D */ daddu $a1, $s0, $zero -/* 661104 802189B4 0C0B2026 */ jal set_variable -/* 661108 802189B8 0000302D */ daddu $a2, $zero, $zero -/* 66110C 802189BC 8FBF0020 */ lw $ra, 0x20($sp) -/* 661110 802189C0 8FB3001C */ lw $s3, 0x1c($sp) -/* 661114 802189C4 8FB20018 */ lw $s2, 0x18($sp) -/* 661118 802189C8 8FB10014 */ lw $s1, 0x14($sp) -/* 66111C 802189CC 8FB00010 */ lw $s0, 0x10($sp) -/* 661120 802189D0 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 661124 802189D4 24020002 */ addiu $v0, $zero, 2 -/* 661128 802189D8 03E00008 */ jr $ra -/* 66112C 802189DC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/battle/area_sam/625750/func_80219DA8_625948.s b/ver/us/asm/nonmatchings/battle/area_sam/625750/func_80219DA8_625948.s deleted file mode 100644 index 1add8ea914..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_sam/625750/func_80219DA8_625948.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80219DA8_625948 -/* 625948 80219DA8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 62594C 80219DAC 0000202D */ daddu $a0, $zero, $zero -/* 625950 80219DB0 AFBF0010 */ sw $ra, 0x10($sp) -/* 625954 80219DB4 0C01C49C */ jal func_80071270 -/* 625958 80219DB8 24050010 */ addiu $a1, $zero, 0x10 -/* 62595C 80219DBC 8FBF0010 */ lw $ra, 0x10($sp) -/* 625960 80219DC0 24020002 */ addiu $v0, $zero, 2 -/* 625964 80219DC4 03E00008 */ jr $ra -/* 625968 80219DC8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/area_sam/625750/func_80219DCC_62596C.s b/ver/us/asm/nonmatchings/battle/area_sam/625750/func_80219DCC_62596C.s deleted file mode 100644 index 20ec92ffe0..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_sam/625750/func_80219DCC_62596C.s +++ /dev/null @@ -1,69 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80219DCC_62596C -/* 62596C 80219DCC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 625970 80219DD0 AFB10014 */ sw $s1, 0x14($sp) -/* 625974 80219DD4 0080882D */ daddu $s1, $a0, $zero -/* 625978 80219DD8 AFBF0020 */ sw $ra, 0x20($sp) -/* 62597C 80219DDC AFB3001C */ sw $s3, 0x1c($sp) -/* 625980 80219DE0 AFB20018 */ sw $s2, 0x18($sp) -/* 625984 80219DE4 AFB00010 */ sw $s0, 0x10($sp) -/* 625988 80219DE8 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 62598C 80219DEC 8E30000C */ lw $s0, 0xc($s1) -/* 625990 80219DF0 8E050000 */ lw $a1, ($s0) -/* 625994 80219DF4 0C0B1EAF */ jal get_variable -/* 625998 80219DF8 26100004 */ addiu $s0, $s0, 4 -/* 62599C 80219DFC 3C036666 */ lui $v1, 0x6666 -/* 6259A0 80219E00 34636667 */ ori $v1, $v1, 0x6667 -/* 6259A4 80219E04 00430018 */ mult $v0, $v1 -/* 6259A8 80219E08 000217C3 */ sra $v0, $v0, 0x1f -/* 6259AC 80219E0C 3C0140C9 */ lui $at, 0x40c9 -/* 6259B0 80219E10 34210FD0 */ ori $at, $at, 0xfd0 -/* 6259B4 80219E14 44810000 */ mtc1 $at, $f0 -/* 6259B8 80219E18 00003810 */ mfhi $a3 -/* 6259BC 80219E1C 00071883 */ sra $v1, $a3, 2 -/* 6259C0 80219E20 00621823 */ subu $v1, $v1, $v0 -/* 6259C4 80219E24 44836000 */ mtc1 $v1, $f12 -/* 6259C8 80219E28 00000000 */ nop -/* 6259CC 80219E2C 46806320 */ cvt.s.w $f12, $f12 -/* 6259D0 80219E30 46006302 */ mul.s $f12, $f12, $f0 -/* 6259D4 80219E34 00000000 */ nop -/* 6259D8 80219E38 3C0143B4 */ lui $at, 0x43b4 -/* 6259DC 80219E3C 44810000 */ mtc1 $at, $f0 -/* 6259E0 80219E40 3C014100 */ lui $at, 0x4100 -/* 6259E4 80219E44 44811000 */ mtc1 $at, $f2 -/* 6259E8 80219E48 46006303 */ div.s $f12, $f12, $f0 -/* 6259EC 80219E4C 46026302 */ mul.s $f12, $f12, $f2 -/* 6259F0 80219E50 00000000 */ nop -/* 6259F4 80219E54 8E120000 */ lw $s2, ($s0) -/* 6259F8 80219E58 26100004 */ addiu $s0, $s0, 4 -/* 6259FC 80219E5C 8E130000 */ lw $s3, ($s0) -/* 625A00 80219E60 0C00A85B */ jal sin_rad -/* 625A04 80219E64 8E100004 */ lw $s0, 4($s0) -/* 625A08 80219E68 0220202D */ daddu $a0, $s1, $zero -/* 625A0C 80219E6C 3C014120 */ lui $at, 0x4120 -/* 625A10 80219E70 44811000 */ mtc1 $at, $f2 -/* 625A14 80219E74 0240282D */ daddu $a1, $s2, $zero -/* 625A18 80219E78 46020502 */ mul.s $f20, $f0, $f2 -/* 625A1C 80219E7C 00000000 */ nop -/* 625A20 80219E80 0C0B2026 */ jal set_variable -/* 625A24 80219E84 0000302D */ daddu $a2, $zero, $zero -/* 625A28 80219E88 0220202D */ daddu $a0, $s1, $zero -/* 625A2C 80219E8C 4600A10D */ trunc.w.s $f4, $f20 -/* 625A30 80219E90 44062000 */ mfc1 $a2, $f4 -/* 625A34 80219E94 0C0B2026 */ jal set_variable -/* 625A38 80219E98 0260282D */ daddu $a1, $s3, $zero -/* 625A3C 80219E9C 0220202D */ daddu $a0, $s1, $zero -/* 625A40 80219EA0 0200282D */ daddu $a1, $s0, $zero -/* 625A44 80219EA4 0C0B2026 */ jal set_variable -/* 625A48 80219EA8 0000302D */ daddu $a2, $zero, $zero -/* 625A4C 80219EAC 8FBF0020 */ lw $ra, 0x20($sp) -/* 625A50 80219EB0 8FB3001C */ lw $s3, 0x1c($sp) -/* 625A54 80219EB4 8FB20018 */ lw $s2, 0x18($sp) -/* 625A58 80219EB8 8FB10014 */ lw $s1, 0x14($sp) -/* 625A5C 80219EBC 8FB00010 */ lw $s0, 0x10($sp) -/* 625A60 80219EC0 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 625A64 80219EC4 24020002 */ addiu $v0, $zero, 2 -/* 625A68 80219EC8 03E00008 */ jr $ra -/* 625A6C 80219ECC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/battle/area_sam/625750/func_8021A0C8_625C68.s b/ver/us/asm/nonmatchings/battle/area_sam/625750/func_8021A0C8_625C68.s deleted file mode 100644 index db031f897a..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_sam/625750/func_8021A0C8_625C68.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8021A0C8_625C68 -/* 625C68 8021A0C8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 625C6C 8021A0CC 0000202D */ daddu $a0, $zero, $zero -/* 625C70 8021A0D0 AFBF0010 */ sw $ra, 0x10($sp) -/* 625C74 8021A0D4 0C01C49C */ jal func_80071270 -/* 625C78 8021A0D8 24050010 */ addiu $a1, $zero, 0x10 -/* 625C7C 8021A0DC 8FBF0010 */ lw $ra, 0x10($sp) -/* 625C80 8021A0E0 24020002 */ addiu $v0, $zero, 2 -/* 625C84 8021A0E4 03E00008 */ jr $ra -/* 625C88 8021A0E8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/area_sam/625750/func_8021A0EC_625C8C.s b/ver/us/asm/nonmatchings/battle/area_sam/625750/func_8021A0EC_625C8C.s deleted file mode 100644 index 16003c2dbd..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_sam/625750/func_8021A0EC_625C8C.s +++ /dev/null @@ -1,69 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8021A0EC_625C8C -/* 625C8C 8021A0EC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 625C90 8021A0F0 AFB10014 */ sw $s1, 0x14($sp) -/* 625C94 8021A0F4 0080882D */ daddu $s1, $a0, $zero -/* 625C98 8021A0F8 AFBF0020 */ sw $ra, 0x20($sp) -/* 625C9C 8021A0FC AFB3001C */ sw $s3, 0x1c($sp) -/* 625CA0 8021A100 AFB20018 */ sw $s2, 0x18($sp) -/* 625CA4 8021A104 AFB00010 */ sw $s0, 0x10($sp) -/* 625CA8 8021A108 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 625CAC 8021A10C 8E30000C */ lw $s0, 0xc($s1) -/* 625CB0 8021A110 8E050000 */ lw $a1, ($s0) -/* 625CB4 8021A114 0C0B1EAF */ jal get_variable -/* 625CB8 8021A118 26100004 */ addiu $s0, $s0, 4 -/* 625CBC 8021A11C 3C036666 */ lui $v1, 0x6666 -/* 625CC0 8021A120 34636667 */ ori $v1, $v1, 0x6667 -/* 625CC4 8021A124 00430018 */ mult $v0, $v1 -/* 625CC8 8021A128 000217C3 */ sra $v0, $v0, 0x1f -/* 625CCC 8021A12C 3C0140C9 */ lui $at, 0x40c9 -/* 625CD0 8021A130 34210FD0 */ ori $at, $at, 0xfd0 -/* 625CD4 8021A134 44810000 */ mtc1 $at, $f0 -/* 625CD8 8021A138 00003810 */ mfhi $a3 -/* 625CDC 8021A13C 00071883 */ sra $v1, $a3, 2 -/* 625CE0 8021A140 00621823 */ subu $v1, $v1, $v0 -/* 625CE4 8021A144 44836000 */ mtc1 $v1, $f12 -/* 625CE8 8021A148 00000000 */ nop -/* 625CEC 8021A14C 46806320 */ cvt.s.w $f12, $f12 -/* 625CF0 8021A150 46006302 */ mul.s $f12, $f12, $f0 -/* 625CF4 8021A154 00000000 */ nop -/* 625CF8 8021A158 3C0143B4 */ lui $at, 0x43b4 -/* 625CFC 8021A15C 44810000 */ mtc1 $at, $f0 -/* 625D00 8021A160 3C014100 */ lui $at, 0x4100 -/* 625D04 8021A164 44811000 */ mtc1 $at, $f2 -/* 625D08 8021A168 46006303 */ div.s $f12, $f12, $f0 -/* 625D0C 8021A16C 46026302 */ mul.s $f12, $f12, $f2 -/* 625D10 8021A170 00000000 */ nop -/* 625D14 8021A174 8E120000 */ lw $s2, ($s0) -/* 625D18 8021A178 26100004 */ addiu $s0, $s0, 4 -/* 625D1C 8021A17C 8E130000 */ lw $s3, ($s0) -/* 625D20 8021A180 0C00A85B */ jal sin_rad -/* 625D24 8021A184 8E100004 */ lw $s0, 4($s0) -/* 625D28 8021A188 0220202D */ daddu $a0, $s1, $zero -/* 625D2C 8021A18C 3C014120 */ lui $at, 0x4120 -/* 625D30 8021A190 44811000 */ mtc1 $at, $f2 -/* 625D34 8021A194 0240282D */ daddu $a1, $s2, $zero -/* 625D38 8021A198 46020502 */ mul.s $f20, $f0, $f2 -/* 625D3C 8021A19C 00000000 */ nop -/* 625D40 8021A1A0 0C0B2026 */ jal set_variable -/* 625D44 8021A1A4 0000302D */ daddu $a2, $zero, $zero -/* 625D48 8021A1A8 0220202D */ daddu $a0, $s1, $zero -/* 625D4C 8021A1AC 4600A10D */ trunc.w.s $f4, $f20 -/* 625D50 8021A1B0 44062000 */ mfc1 $a2, $f4 -/* 625D54 8021A1B4 0C0B2026 */ jal set_variable -/* 625D58 8021A1B8 0260282D */ daddu $a1, $s3, $zero -/* 625D5C 8021A1BC 0220202D */ daddu $a0, $s1, $zero -/* 625D60 8021A1C0 0200282D */ daddu $a1, $s0, $zero -/* 625D64 8021A1C4 0C0B2026 */ jal set_variable -/* 625D68 8021A1C8 0000302D */ daddu $a2, $zero, $zero -/* 625D6C 8021A1CC 8FBF0020 */ lw $ra, 0x20($sp) -/* 625D70 8021A1D0 8FB3001C */ lw $s3, 0x1c($sp) -/* 625D74 8021A1D4 8FB20018 */ lw $s2, 0x18($sp) -/* 625D78 8021A1D8 8FB10014 */ lw $s1, 0x14($sp) -/* 625D7C 8021A1DC 8FB00010 */ lw $s0, 0x10($sp) -/* 625D80 8021A1E0 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 625D84 8021A1E4 24020002 */ addiu $v0, $zero, 2 -/* 625D88 8021A1E8 03E00008 */ jr $ra -/* 625D8C 8021A1EC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/battle/area_sam/625750/func_8021A3E8_625F88.s b/ver/us/asm/nonmatchings/battle/area_sam/625750/func_8021A3E8_625F88.s deleted file mode 100644 index a3825a0713..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_sam/625750/func_8021A3E8_625F88.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8021A3E8_625F88 -/* 625F88 8021A3E8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 625F8C 8021A3EC 0000202D */ daddu $a0, $zero, $zero -/* 625F90 8021A3F0 AFBF0010 */ sw $ra, 0x10($sp) -/* 625F94 8021A3F4 0C01C49C */ jal func_80071270 -/* 625F98 8021A3F8 24050010 */ addiu $a1, $zero, 0x10 -/* 625F9C 8021A3FC 8FBF0010 */ lw $ra, 0x10($sp) -/* 625FA0 8021A400 24020002 */ addiu $v0, $zero, 2 -/* 625FA4 8021A404 03E00008 */ jr $ra -/* 625FA8 8021A408 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/area_sam/625750/func_8021A40C_625FAC.s b/ver/us/asm/nonmatchings/battle/area_sam/625750/func_8021A40C_625FAC.s deleted file mode 100644 index d4ce577d92..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_sam/625750/func_8021A40C_625FAC.s +++ /dev/null @@ -1,69 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8021A40C_625FAC -/* 625FAC 8021A40C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 625FB0 8021A410 AFB10014 */ sw $s1, 0x14($sp) -/* 625FB4 8021A414 0080882D */ daddu $s1, $a0, $zero -/* 625FB8 8021A418 AFBF0020 */ sw $ra, 0x20($sp) -/* 625FBC 8021A41C AFB3001C */ sw $s3, 0x1c($sp) -/* 625FC0 8021A420 AFB20018 */ sw $s2, 0x18($sp) -/* 625FC4 8021A424 AFB00010 */ sw $s0, 0x10($sp) -/* 625FC8 8021A428 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 625FCC 8021A42C 8E30000C */ lw $s0, 0xc($s1) -/* 625FD0 8021A430 8E050000 */ lw $a1, ($s0) -/* 625FD4 8021A434 0C0B1EAF */ jal get_variable -/* 625FD8 8021A438 26100004 */ addiu $s0, $s0, 4 -/* 625FDC 8021A43C 3C036666 */ lui $v1, 0x6666 -/* 625FE0 8021A440 34636667 */ ori $v1, $v1, 0x6667 -/* 625FE4 8021A444 00430018 */ mult $v0, $v1 -/* 625FE8 8021A448 000217C3 */ sra $v0, $v0, 0x1f -/* 625FEC 8021A44C 3C0140C9 */ lui $at, 0x40c9 -/* 625FF0 8021A450 34210FD0 */ ori $at, $at, 0xfd0 -/* 625FF4 8021A454 44810000 */ mtc1 $at, $f0 -/* 625FF8 8021A458 00003810 */ mfhi $a3 -/* 625FFC 8021A45C 00071883 */ sra $v1, $a3, 2 -/* 626000 8021A460 00621823 */ subu $v1, $v1, $v0 -/* 626004 8021A464 44836000 */ mtc1 $v1, $f12 -/* 626008 8021A468 00000000 */ nop -/* 62600C 8021A46C 46806320 */ cvt.s.w $f12, $f12 -/* 626010 8021A470 46006302 */ mul.s $f12, $f12, $f0 -/* 626014 8021A474 00000000 */ nop -/* 626018 8021A478 3C0143B4 */ lui $at, 0x43b4 -/* 62601C 8021A47C 44810000 */ mtc1 $at, $f0 -/* 626020 8021A480 3C014100 */ lui $at, 0x4100 -/* 626024 8021A484 44811000 */ mtc1 $at, $f2 -/* 626028 8021A488 46006303 */ div.s $f12, $f12, $f0 -/* 62602C 8021A48C 46026302 */ mul.s $f12, $f12, $f2 -/* 626030 8021A490 00000000 */ nop -/* 626034 8021A494 8E120000 */ lw $s2, ($s0) -/* 626038 8021A498 26100004 */ addiu $s0, $s0, 4 -/* 62603C 8021A49C 8E130000 */ lw $s3, ($s0) -/* 626040 8021A4A0 0C00A85B */ jal sin_rad -/* 626044 8021A4A4 8E100004 */ lw $s0, 4($s0) -/* 626048 8021A4A8 0220202D */ daddu $a0, $s1, $zero -/* 62604C 8021A4AC 3C014120 */ lui $at, 0x4120 -/* 626050 8021A4B0 44811000 */ mtc1 $at, $f2 -/* 626054 8021A4B4 0240282D */ daddu $a1, $s2, $zero -/* 626058 8021A4B8 46020502 */ mul.s $f20, $f0, $f2 -/* 62605C 8021A4BC 00000000 */ nop -/* 626060 8021A4C0 0C0B2026 */ jal set_variable -/* 626064 8021A4C4 0000302D */ daddu $a2, $zero, $zero -/* 626068 8021A4C8 0220202D */ daddu $a0, $s1, $zero -/* 62606C 8021A4CC 4600A10D */ trunc.w.s $f4, $f20 -/* 626070 8021A4D0 44062000 */ mfc1 $a2, $f4 -/* 626074 8021A4D4 0C0B2026 */ jal set_variable -/* 626078 8021A4D8 0260282D */ daddu $a1, $s3, $zero -/* 62607C 8021A4DC 0220202D */ daddu $a0, $s1, $zero -/* 626080 8021A4E0 0200282D */ daddu $a1, $s0, $zero -/* 626084 8021A4E4 0C0B2026 */ jal set_variable -/* 626088 8021A4E8 0000302D */ daddu $a2, $zero, $zero -/* 62608C 8021A4EC 8FBF0020 */ lw $ra, 0x20($sp) -/* 626090 8021A4F0 8FB3001C */ lw $s3, 0x1c($sp) -/* 626094 8021A4F4 8FB20018 */ lw $s2, 0x18($sp) -/* 626098 8021A4F8 8FB10014 */ lw $s1, 0x14($sp) -/* 62609C 8021A4FC 8FB00010 */ lw $s0, 0x10($sp) -/* 6260A0 8021A500 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 6260A4 8021A504 24020002 */ addiu $v0, $zero, 2 -/* 6260A8 8021A508 03E00008 */ jr $ra -/* 6260AC 8021A50C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/battle/area_sam/625750/func_8021A708_6262A8.s b/ver/us/asm/nonmatchings/battle/area_sam/625750/func_8021A708_6262A8.s deleted file mode 100644 index 262a09f450..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_sam/625750/func_8021A708_6262A8.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8021A708_6262A8 -/* 6262A8 8021A708 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 6262AC 8021A70C 0000202D */ daddu $a0, $zero, $zero -/* 6262B0 8021A710 AFBF0010 */ sw $ra, 0x10($sp) -/* 6262B4 8021A714 0C01C49C */ jal func_80071270 -/* 6262B8 8021A718 24050010 */ addiu $a1, $zero, 0x10 -/* 6262BC 8021A71C 8FBF0010 */ lw $ra, 0x10($sp) -/* 6262C0 8021A720 24020002 */ addiu $v0, $zero, 2 -/* 6262C4 8021A724 03E00008 */ jr $ra -/* 6262C8 8021A728 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/area_sam/625750/func_8021A72C_6262CC.s b/ver/us/asm/nonmatchings/battle/area_sam/625750/func_8021A72C_6262CC.s deleted file mode 100644 index ed69c18b3c..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_sam/625750/func_8021A72C_6262CC.s +++ /dev/null @@ -1,69 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8021A72C_6262CC -/* 6262CC 8021A72C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 6262D0 8021A730 AFB10014 */ sw $s1, 0x14($sp) -/* 6262D4 8021A734 0080882D */ daddu $s1, $a0, $zero -/* 6262D8 8021A738 AFBF0020 */ sw $ra, 0x20($sp) -/* 6262DC 8021A73C AFB3001C */ sw $s3, 0x1c($sp) -/* 6262E0 8021A740 AFB20018 */ sw $s2, 0x18($sp) -/* 6262E4 8021A744 AFB00010 */ sw $s0, 0x10($sp) -/* 6262E8 8021A748 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 6262EC 8021A74C 8E30000C */ lw $s0, 0xc($s1) -/* 6262F0 8021A750 8E050000 */ lw $a1, ($s0) -/* 6262F4 8021A754 0C0B1EAF */ jal get_variable -/* 6262F8 8021A758 26100004 */ addiu $s0, $s0, 4 -/* 6262FC 8021A75C 3C036666 */ lui $v1, 0x6666 -/* 626300 8021A760 34636667 */ ori $v1, $v1, 0x6667 -/* 626304 8021A764 00430018 */ mult $v0, $v1 -/* 626308 8021A768 000217C3 */ sra $v0, $v0, 0x1f -/* 62630C 8021A76C 3C0140C9 */ lui $at, 0x40c9 -/* 626310 8021A770 34210FD0 */ ori $at, $at, 0xfd0 -/* 626314 8021A774 44810000 */ mtc1 $at, $f0 -/* 626318 8021A778 00003810 */ mfhi $a3 -/* 62631C 8021A77C 00071883 */ sra $v1, $a3, 2 -/* 626320 8021A780 00621823 */ subu $v1, $v1, $v0 -/* 626324 8021A784 44836000 */ mtc1 $v1, $f12 -/* 626328 8021A788 00000000 */ nop -/* 62632C 8021A78C 46806320 */ cvt.s.w $f12, $f12 -/* 626330 8021A790 46006302 */ mul.s $f12, $f12, $f0 -/* 626334 8021A794 00000000 */ nop -/* 626338 8021A798 3C0143B4 */ lui $at, 0x43b4 -/* 62633C 8021A79C 44810000 */ mtc1 $at, $f0 -/* 626340 8021A7A0 3C014100 */ lui $at, 0x4100 -/* 626344 8021A7A4 44811000 */ mtc1 $at, $f2 -/* 626348 8021A7A8 46006303 */ div.s $f12, $f12, $f0 -/* 62634C 8021A7AC 46026302 */ mul.s $f12, $f12, $f2 -/* 626350 8021A7B0 00000000 */ nop -/* 626354 8021A7B4 8E120000 */ lw $s2, ($s0) -/* 626358 8021A7B8 26100004 */ addiu $s0, $s0, 4 -/* 62635C 8021A7BC 8E130000 */ lw $s3, ($s0) -/* 626360 8021A7C0 0C00A85B */ jal sin_rad -/* 626364 8021A7C4 8E100004 */ lw $s0, 4($s0) -/* 626368 8021A7C8 0220202D */ daddu $a0, $s1, $zero -/* 62636C 8021A7CC 3C014120 */ lui $at, 0x4120 -/* 626370 8021A7D0 44811000 */ mtc1 $at, $f2 -/* 626374 8021A7D4 0240282D */ daddu $a1, $s2, $zero -/* 626378 8021A7D8 46020502 */ mul.s $f20, $f0, $f2 -/* 62637C 8021A7DC 00000000 */ nop -/* 626380 8021A7E0 0C0B2026 */ jal set_variable -/* 626384 8021A7E4 0000302D */ daddu $a2, $zero, $zero -/* 626388 8021A7E8 0220202D */ daddu $a0, $s1, $zero -/* 62638C 8021A7EC 4600A10D */ trunc.w.s $f4, $f20 -/* 626390 8021A7F0 44062000 */ mfc1 $a2, $f4 -/* 626394 8021A7F4 0C0B2026 */ jal set_variable -/* 626398 8021A7F8 0260282D */ daddu $a1, $s3, $zero -/* 62639C 8021A7FC 0220202D */ daddu $a0, $s1, $zero -/* 6263A0 8021A800 0200282D */ daddu $a1, $s0, $zero -/* 6263A4 8021A804 0C0B2026 */ jal set_variable -/* 6263A8 8021A808 0000302D */ daddu $a2, $zero, $zero -/* 6263AC 8021A80C 8FBF0020 */ lw $ra, 0x20($sp) -/* 6263B0 8021A810 8FB3001C */ lw $s3, 0x1c($sp) -/* 6263B4 8021A814 8FB20018 */ lw $s2, 0x18($sp) -/* 6263B8 8021A818 8FB10014 */ lw $s1, 0x14($sp) -/* 6263BC 8021A81C 8FB00010 */ lw $s0, 0x10($sp) -/* 6263C0 8021A820 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 6263C4 8021A824 24020002 */ addiu $v0, $zero, 2 -/* 6263C8 8021A828 03E00008 */ jr $ra -/* 6263CC 8021A82C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/battle/area_sam/625750/func_8021AA28_6265C8.s b/ver/us/asm/nonmatchings/battle/area_sam/625750/func_8021AA28_6265C8.s deleted file mode 100644 index 6e68e6c071..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_sam/625750/func_8021AA28_6265C8.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8021AA28_6265C8 -/* 6265C8 8021AA28 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 6265CC 8021AA2C 0000202D */ daddu $a0, $zero, $zero -/* 6265D0 8021AA30 AFBF0010 */ sw $ra, 0x10($sp) -/* 6265D4 8021AA34 0C01C49C */ jal func_80071270 -/* 6265D8 8021AA38 24050010 */ addiu $a1, $zero, 0x10 -/* 6265DC 8021AA3C 8FBF0010 */ lw $ra, 0x10($sp) -/* 6265E0 8021AA40 24020002 */ addiu $v0, $zero, 2 -/* 6265E4 8021AA44 03E00008 */ jr $ra -/* 6265E8 8021AA48 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/area_sam/625750/func_8021AA4C_6265EC.s b/ver/us/asm/nonmatchings/battle/area_sam/625750/func_8021AA4C_6265EC.s deleted file mode 100644 index 29fb2d14e7..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_sam/625750/func_8021AA4C_6265EC.s +++ /dev/null @@ -1,69 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8021AA4C_6265EC -/* 6265EC 8021AA4C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 6265F0 8021AA50 AFB10014 */ sw $s1, 0x14($sp) -/* 6265F4 8021AA54 0080882D */ daddu $s1, $a0, $zero -/* 6265F8 8021AA58 AFBF0020 */ sw $ra, 0x20($sp) -/* 6265FC 8021AA5C AFB3001C */ sw $s3, 0x1c($sp) -/* 626600 8021AA60 AFB20018 */ sw $s2, 0x18($sp) -/* 626604 8021AA64 AFB00010 */ sw $s0, 0x10($sp) -/* 626608 8021AA68 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 62660C 8021AA6C 8E30000C */ lw $s0, 0xc($s1) -/* 626610 8021AA70 8E050000 */ lw $a1, ($s0) -/* 626614 8021AA74 0C0B1EAF */ jal get_variable -/* 626618 8021AA78 26100004 */ addiu $s0, $s0, 4 -/* 62661C 8021AA7C 3C036666 */ lui $v1, 0x6666 -/* 626620 8021AA80 34636667 */ ori $v1, $v1, 0x6667 -/* 626624 8021AA84 00430018 */ mult $v0, $v1 -/* 626628 8021AA88 000217C3 */ sra $v0, $v0, 0x1f -/* 62662C 8021AA8C 3C0140C9 */ lui $at, 0x40c9 -/* 626630 8021AA90 34210FD0 */ ori $at, $at, 0xfd0 -/* 626634 8021AA94 44810000 */ mtc1 $at, $f0 -/* 626638 8021AA98 00003810 */ mfhi $a3 -/* 62663C 8021AA9C 00071883 */ sra $v1, $a3, 2 -/* 626640 8021AAA0 00621823 */ subu $v1, $v1, $v0 -/* 626644 8021AAA4 44836000 */ mtc1 $v1, $f12 -/* 626648 8021AAA8 00000000 */ nop -/* 62664C 8021AAAC 46806320 */ cvt.s.w $f12, $f12 -/* 626650 8021AAB0 46006302 */ mul.s $f12, $f12, $f0 -/* 626654 8021AAB4 00000000 */ nop -/* 626658 8021AAB8 3C0143B4 */ lui $at, 0x43b4 -/* 62665C 8021AABC 44810000 */ mtc1 $at, $f0 -/* 626660 8021AAC0 3C014100 */ lui $at, 0x4100 -/* 626664 8021AAC4 44811000 */ mtc1 $at, $f2 -/* 626668 8021AAC8 46006303 */ div.s $f12, $f12, $f0 -/* 62666C 8021AACC 46026302 */ mul.s $f12, $f12, $f2 -/* 626670 8021AAD0 00000000 */ nop -/* 626674 8021AAD4 8E120000 */ lw $s2, ($s0) -/* 626678 8021AAD8 26100004 */ addiu $s0, $s0, 4 -/* 62667C 8021AADC 8E130000 */ lw $s3, ($s0) -/* 626680 8021AAE0 0C00A85B */ jal sin_rad -/* 626684 8021AAE4 8E100004 */ lw $s0, 4($s0) -/* 626688 8021AAE8 0220202D */ daddu $a0, $s1, $zero -/* 62668C 8021AAEC 3C014120 */ lui $at, 0x4120 -/* 626690 8021AAF0 44811000 */ mtc1 $at, $f2 -/* 626694 8021AAF4 0240282D */ daddu $a1, $s2, $zero -/* 626698 8021AAF8 46020502 */ mul.s $f20, $f0, $f2 -/* 62669C 8021AAFC 00000000 */ nop -/* 6266A0 8021AB00 0C0B2026 */ jal set_variable -/* 6266A4 8021AB04 0000302D */ daddu $a2, $zero, $zero -/* 6266A8 8021AB08 0220202D */ daddu $a0, $s1, $zero -/* 6266AC 8021AB0C 4600A10D */ trunc.w.s $f4, $f20 -/* 6266B0 8021AB10 44062000 */ mfc1 $a2, $f4 -/* 6266B4 8021AB14 0C0B2026 */ jal set_variable -/* 6266B8 8021AB18 0260282D */ daddu $a1, $s3, $zero -/* 6266BC 8021AB1C 0220202D */ daddu $a0, $s1, $zero -/* 6266C0 8021AB20 0200282D */ daddu $a1, $s0, $zero -/* 6266C4 8021AB24 0C0B2026 */ jal set_variable -/* 6266C8 8021AB28 0000302D */ daddu $a2, $zero, $zero -/* 6266CC 8021AB2C 8FBF0020 */ lw $ra, 0x20($sp) -/* 6266D0 8021AB30 8FB3001C */ lw $s3, 0x1c($sp) -/* 6266D4 8021AB34 8FB20018 */ lw $s2, 0x18($sp) -/* 6266D8 8021AB38 8FB10014 */ lw $s1, 0x14($sp) -/* 6266DC 8021AB3C 8FB00010 */ lw $s0, 0x10($sp) -/* 6266E0 8021AB40 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 6266E4 8021AB44 24020002 */ addiu $v0, $zero, 2 -/* 6266E8 8021AB48 03E00008 */ jr $ra -/* 6266EC 8021AB4C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/battle/area_sam/625750/func_8021AD48_6268E8.s b/ver/us/asm/nonmatchings/battle/area_sam/625750/func_8021AD48_6268E8.s deleted file mode 100644 index 7f7804b87c..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_sam/625750/func_8021AD48_6268E8.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8021AD48_6268E8 -/* 6268E8 8021AD48 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 6268EC 8021AD4C 0000202D */ daddu $a0, $zero, $zero -/* 6268F0 8021AD50 AFBF0010 */ sw $ra, 0x10($sp) -/* 6268F4 8021AD54 0C01C49C */ jal func_80071270 -/* 6268F8 8021AD58 24050010 */ addiu $a1, $zero, 0x10 -/* 6268FC 8021AD5C 8FBF0010 */ lw $ra, 0x10($sp) -/* 626900 8021AD60 24020002 */ addiu $v0, $zero, 2 -/* 626904 8021AD64 03E00008 */ jr $ra -/* 626908 8021AD68 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/area_sam/625750/func_8021AD6C_62690C.s b/ver/us/asm/nonmatchings/battle/area_sam/625750/func_8021AD6C_62690C.s deleted file mode 100644 index 90d68faf70..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_sam/625750/func_8021AD6C_62690C.s +++ /dev/null @@ -1,69 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8021AD6C_62690C -/* 62690C 8021AD6C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 626910 8021AD70 AFB10014 */ sw $s1, 0x14($sp) -/* 626914 8021AD74 0080882D */ daddu $s1, $a0, $zero -/* 626918 8021AD78 AFBF0020 */ sw $ra, 0x20($sp) -/* 62691C 8021AD7C AFB3001C */ sw $s3, 0x1c($sp) -/* 626920 8021AD80 AFB20018 */ sw $s2, 0x18($sp) -/* 626924 8021AD84 AFB00010 */ sw $s0, 0x10($sp) -/* 626928 8021AD88 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 62692C 8021AD8C 8E30000C */ lw $s0, 0xc($s1) -/* 626930 8021AD90 8E050000 */ lw $a1, ($s0) -/* 626934 8021AD94 0C0B1EAF */ jal get_variable -/* 626938 8021AD98 26100004 */ addiu $s0, $s0, 4 -/* 62693C 8021AD9C 3C036666 */ lui $v1, 0x6666 -/* 626940 8021ADA0 34636667 */ ori $v1, $v1, 0x6667 -/* 626944 8021ADA4 00430018 */ mult $v0, $v1 -/* 626948 8021ADA8 000217C3 */ sra $v0, $v0, 0x1f -/* 62694C 8021ADAC 3C0140C9 */ lui $at, 0x40c9 -/* 626950 8021ADB0 34210FD0 */ ori $at, $at, 0xfd0 -/* 626954 8021ADB4 44810000 */ mtc1 $at, $f0 -/* 626958 8021ADB8 00003810 */ mfhi $a3 -/* 62695C 8021ADBC 00071883 */ sra $v1, $a3, 2 -/* 626960 8021ADC0 00621823 */ subu $v1, $v1, $v0 -/* 626964 8021ADC4 44836000 */ mtc1 $v1, $f12 -/* 626968 8021ADC8 00000000 */ nop -/* 62696C 8021ADCC 46806320 */ cvt.s.w $f12, $f12 -/* 626970 8021ADD0 46006302 */ mul.s $f12, $f12, $f0 -/* 626974 8021ADD4 00000000 */ nop -/* 626978 8021ADD8 3C0143B4 */ lui $at, 0x43b4 -/* 62697C 8021ADDC 44810000 */ mtc1 $at, $f0 -/* 626980 8021ADE0 3C014100 */ lui $at, 0x4100 -/* 626984 8021ADE4 44811000 */ mtc1 $at, $f2 -/* 626988 8021ADE8 46006303 */ div.s $f12, $f12, $f0 -/* 62698C 8021ADEC 46026302 */ mul.s $f12, $f12, $f2 -/* 626990 8021ADF0 00000000 */ nop -/* 626994 8021ADF4 8E120000 */ lw $s2, ($s0) -/* 626998 8021ADF8 26100004 */ addiu $s0, $s0, 4 -/* 62699C 8021ADFC 8E130000 */ lw $s3, ($s0) -/* 6269A0 8021AE00 0C00A85B */ jal sin_rad -/* 6269A4 8021AE04 8E100004 */ lw $s0, 4($s0) -/* 6269A8 8021AE08 0220202D */ daddu $a0, $s1, $zero -/* 6269AC 8021AE0C 3C014120 */ lui $at, 0x4120 -/* 6269B0 8021AE10 44811000 */ mtc1 $at, $f2 -/* 6269B4 8021AE14 0240282D */ daddu $a1, $s2, $zero -/* 6269B8 8021AE18 46020502 */ mul.s $f20, $f0, $f2 -/* 6269BC 8021AE1C 00000000 */ nop -/* 6269C0 8021AE20 0C0B2026 */ jal set_variable -/* 6269C4 8021AE24 0000302D */ daddu $a2, $zero, $zero -/* 6269C8 8021AE28 0220202D */ daddu $a0, $s1, $zero -/* 6269CC 8021AE2C 4600A10D */ trunc.w.s $f4, $f20 -/* 6269D0 8021AE30 44062000 */ mfc1 $a2, $f4 -/* 6269D4 8021AE34 0C0B2026 */ jal set_variable -/* 6269D8 8021AE38 0260282D */ daddu $a1, $s3, $zero -/* 6269DC 8021AE3C 0220202D */ daddu $a0, $s1, $zero -/* 6269E0 8021AE40 0200282D */ daddu $a1, $s0, $zero -/* 6269E4 8021AE44 0C0B2026 */ jal set_variable -/* 6269E8 8021AE48 0000302D */ daddu $a2, $zero, $zero -/* 6269EC 8021AE4C 8FBF0020 */ lw $ra, 0x20($sp) -/* 6269F0 8021AE50 8FB3001C */ lw $s3, 0x1c($sp) -/* 6269F4 8021AE54 8FB20018 */ lw $s2, 0x18($sp) -/* 6269F8 8021AE58 8FB10014 */ lw $s1, 0x14($sp) -/* 6269FC 8021AE5C 8FB00010 */ lw $s0, 0x10($sp) -/* 626A00 8021AE60 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 626A04 8021AE64 24020002 */ addiu $v0, $zero, 2 -/* 626A08 8021AE68 03E00008 */ jr $ra -/* 626A0C 8021AE6C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/battle/area_sam2/63DD60/func_80218D78_63DF58.s b/ver/us/asm/nonmatchings/battle/area_sam2/63DD60/func_80218D78_63DF58.s deleted file mode 100644 index bbebdb4568..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_sam2/63DD60/func_80218D78_63DF58.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218D78_63DF58 -/* 63DF58 80218D78 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 63DF5C 80218D7C 0000202D */ daddu $a0, $zero, $zero -/* 63DF60 80218D80 AFBF0010 */ sw $ra, 0x10($sp) -/* 63DF64 80218D84 0C01C49C */ jal func_80071270 -/* 63DF68 80218D88 24050010 */ addiu $a1, $zero, 0x10 -/* 63DF6C 80218D8C 8FBF0010 */ lw $ra, 0x10($sp) -/* 63DF70 80218D90 24020002 */ addiu $v0, $zero, 2 -/* 63DF74 80218D94 03E00008 */ jr $ra -/* 63DF78 80218D98 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/area_sam2/63DD60/func_80218D9C_63DF7C.s b/ver/us/asm/nonmatchings/battle/area_sam2/63DD60/func_80218D9C_63DF7C.s deleted file mode 100644 index f2ea4ee49a..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_sam2/63DD60/func_80218D9C_63DF7C.s +++ /dev/null @@ -1,69 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218D9C_63DF7C -/* 63DF7C 80218D9C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 63DF80 80218DA0 AFB10014 */ sw $s1, 0x14($sp) -/* 63DF84 80218DA4 0080882D */ daddu $s1, $a0, $zero -/* 63DF88 80218DA8 AFBF0020 */ sw $ra, 0x20($sp) -/* 63DF8C 80218DAC AFB3001C */ sw $s3, 0x1c($sp) -/* 63DF90 80218DB0 AFB20018 */ sw $s2, 0x18($sp) -/* 63DF94 80218DB4 AFB00010 */ sw $s0, 0x10($sp) -/* 63DF98 80218DB8 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 63DF9C 80218DBC 8E30000C */ lw $s0, 0xc($s1) -/* 63DFA0 80218DC0 8E050000 */ lw $a1, ($s0) -/* 63DFA4 80218DC4 0C0B1EAF */ jal get_variable -/* 63DFA8 80218DC8 26100004 */ addiu $s0, $s0, 4 -/* 63DFAC 80218DCC 3C036666 */ lui $v1, 0x6666 -/* 63DFB0 80218DD0 34636667 */ ori $v1, $v1, 0x6667 -/* 63DFB4 80218DD4 00430018 */ mult $v0, $v1 -/* 63DFB8 80218DD8 000217C3 */ sra $v0, $v0, 0x1f -/* 63DFBC 80218DDC 3C0140C9 */ lui $at, 0x40c9 -/* 63DFC0 80218DE0 34210FD0 */ ori $at, $at, 0xfd0 -/* 63DFC4 80218DE4 44810000 */ mtc1 $at, $f0 -/* 63DFC8 80218DE8 00003810 */ mfhi $a3 -/* 63DFCC 80218DEC 00071883 */ sra $v1, $a3, 2 -/* 63DFD0 80218DF0 00621823 */ subu $v1, $v1, $v0 -/* 63DFD4 80218DF4 44836000 */ mtc1 $v1, $f12 -/* 63DFD8 80218DF8 00000000 */ nop -/* 63DFDC 80218DFC 46806320 */ cvt.s.w $f12, $f12 -/* 63DFE0 80218E00 46006302 */ mul.s $f12, $f12, $f0 -/* 63DFE4 80218E04 00000000 */ nop -/* 63DFE8 80218E08 3C0143B4 */ lui $at, 0x43b4 -/* 63DFEC 80218E0C 44810000 */ mtc1 $at, $f0 -/* 63DFF0 80218E10 3C014100 */ lui $at, 0x4100 -/* 63DFF4 80218E14 44811000 */ mtc1 $at, $f2 -/* 63DFF8 80218E18 46006303 */ div.s $f12, $f12, $f0 -/* 63DFFC 80218E1C 46026302 */ mul.s $f12, $f12, $f2 -/* 63E000 80218E20 00000000 */ nop -/* 63E004 80218E24 8E120000 */ lw $s2, ($s0) -/* 63E008 80218E28 26100004 */ addiu $s0, $s0, 4 -/* 63E00C 80218E2C 8E130000 */ lw $s3, ($s0) -/* 63E010 80218E30 0C00A85B */ jal sin_rad -/* 63E014 80218E34 8E100004 */ lw $s0, 4($s0) -/* 63E018 80218E38 0220202D */ daddu $a0, $s1, $zero -/* 63E01C 80218E3C 3C014120 */ lui $at, 0x4120 -/* 63E020 80218E40 44811000 */ mtc1 $at, $f2 -/* 63E024 80218E44 0240282D */ daddu $a1, $s2, $zero -/* 63E028 80218E48 46020502 */ mul.s $f20, $f0, $f2 -/* 63E02C 80218E4C 00000000 */ nop -/* 63E030 80218E50 0C0B2026 */ jal set_variable -/* 63E034 80218E54 0000302D */ daddu $a2, $zero, $zero -/* 63E038 80218E58 0220202D */ daddu $a0, $s1, $zero -/* 63E03C 80218E5C 4600A10D */ trunc.w.s $f4, $f20 -/* 63E040 80218E60 44062000 */ mfc1 $a2, $f4 -/* 63E044 80218E64 0C0B2026 */ jal set_variable -/* 63E048 80218E68 0260282D */ daddu $a1, $s3, $zero -/* 63E04C 80218E6C 0220202D */ daddu $a0, $s1, $zero -/* 63E050 80218E70 0200282D */ daddu $a1, $s0, $zero -/* 63E054 80218E74 0C0B2026 */ jal set_variable -/* 63E058 80218E78 0000302D */ daddu $a2, $zero, $zero -/* 63E05C 80218E7C 8FBF0020 */ lw $ra, 0x20($sp) -/* 63E060 80218E80 8FB3001C */ lw $s3, 0x1c($sp) -/* 63E064 80218E84 8FB20018 */ lw $s2, 0x18($sp) -/* 63E068 80218E88 8FB10014 */ lw $s1, 0x14($sp) -/* 63E06C 80218E8C 8FB00010 */ lw $s0, 0x10($sp) -/* 63E070 80218E90 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 63E074 80218E94 24020002 */ addiu $v0, $zero, 2 -/* 63E078 80218E98 03E00008 */ jr $ra -/* 63E07C 80218E9C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/battle/area_sam2/63DD60/func_80219098_63E278.s b/ver/us/asm/nonmatchings/battle/area_sam2/63DD60/func_80219098_63E278.s deleted file mode 100644 index b13033143c..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_sam2/63DD60/func_80219098_63E278.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80219098_63E278 -/* 63E278 80219098 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 63E27C 8021909C 0000202D */ daddu $a0, $zero, $zero -/* 63E280 802190A0 AFBF0010 */ sw $ra, 0x10($sp) -/* 63E284 802190A4 0C01C49C */ jal func_80071270 -/* 63E288 802190A8 24050010 */ addiu $a1, $zero, 0x10 -/* 63E28C 802190AC 8FBF0010 */ lw $ra, 0x10($sp) -/* 63E290 802190B0 24020002 */ addiu $v0, $zero, 2 -/* 63E294 802190B4 03E00008 */ jr $ra -/* 63E298 802190B8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/area_sam2/63DD60/func_802190BC_63E29C.s b/ver/us/asm/nonmatchings/battle/area_sam2/63DD60/func_802190BC_63E29C.s deleted file mode 100644 index d23687250c..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_sam2/63DD60/func_802190BC_63E29C.s +++ /dev/null @@ -1,69 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802190BC_63E29C -/* 63E29C 802190BC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 63E2A0 802190C0 AFB10014 */ sw $s1, 0x14($sp) -/* 63E2A4 802190C4 0080882D */ daddu $s1, $a0, $zero -/* 63E2A8 802190C8 AFBF0020 */ sw $ra, 0x20($sp) -/* 63E2AC 802190CC AFB3001C */ sw $s3, 0x1c($sp) -/* 63E2B0 802190D0 AFB20018 */ sw $s2, 0x18($sp) -/* 63E2B4 802190D4 AFB00010 */ sw $s0, 0x10($sp) -/* 63E2B8 802190D8 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 63E2BC 802190DC 8E30000C */ lw $s0, 0xc($s1) -/* 63E2C0 802190E0 8E050000 */ lw $a1, ($s0) -/* 63E2C4 802190E4 0C0B1EAF */ jal get_variable -/* 63E2C8 802190E8 26100004 */ addiu $s0, $s0, 4 -/* 63E2CC 802190EC 3C036666 */ lui $v1, 0x6666 -/* 63E2D0 802190F0 34636667 */ ori $v1, $v1, 0x6667 -/* 63E2D4 802190F4 00430018 */ mult $v0, $v1 -/* 63E2D8 802190F8 000217C3 */ sra $v0, $v0, 0x1f -/* 63E2DC 802190FC 3C0140C9 */ lui $at, 0x40c9 -/* 63E2E0 80219100 34210FD0 */ ori $at, $at, 0xfd0 -/* 63E2E4 80219104 44810000 */ mtc1 $at, $f0 -/* 63E2E8 80219108 00003810 */ mfhi $a3 -/* 63E2EC 8021910C 00071883 */ sra $v1, $a3, 2 -/* 63E2F0 80219110 00621823 */ subu $v1, $v1, $v0 -/* 63E2F4 80219114 44836000 */ mtc1 $v1, $f12 -/* 63E2F8 80219118 00000000 */ nop -/* 63E2FC 8021911C 46806320 */ cvt.s.w $f12, $f12 -/* 63E300 80219120 46006302 */ mul.s $f12, $f12, $f0 -/* 63E304 80219124 00000000 */ nop -/* 63E308 80219128 3C0143B4 */ lui $at, 0x43b4 -/* 63E30C 8021912C 44810000 */ mtc1 $at, $f0 -/* 63E310 80219130 3C014100 */ lui $at, 0x4100 -/* 63E314 80219134 44811000 */ mtc1 $at, $f2 -/* 63E318 80219138 46006303 */ div.s $f12, $f12, $f0 -/* 63E31C 8021913C 46026302 */ mul.s $f12, $f12, $f2 -/* 63E320 80219140 00000000 */ nop -/* 63E324 80219144 8E120000 */ lw $s2, ($s0) -/* 63E328 80219148 26100004 */ addiu $s0, $s0, 4 -/* 63E32C 8021914C 8E130000 */ lw $s3, ($s0) -/* 63E330 80219150 0C00A85B */ jal sin_rad -/* 63E334 80219154 8E100004 */ lw $s0, 4($s0) -/* 63E338 80219158 0220202D */ daddu $a0, $s1, $zero -/* 63E33C 8021915C 3C014120 */ lui $at, 0x4120 -/* 63E340 80219160 44811000 */ mtc1 $at, $f2 -/* 63E344 80219164 0240282D */ daddu $a1, $s2, $zero -/* 63E348 80219168 46020502 */ mul.s $f20, $f0, $f2 -/* 63E34C 8021916C 00000000 */ nop -/* 63E350 80219170 0C0B2026 */ jal set_variable -/* 63E354 80219174 0000302D */ daddu $a2, $zero, $zero -/* 63E358 80219178 0220202D */ daddu $a0, $s1, $zero -/* 63E35C 8021917C 4600A10D */ trunc.w.s $f4, $f20 -/* 63E360 80219180 44062000 */ mfc1 $a2, $f4 -/* 63E364 80219184 0C0B2026 */ jal set_variable -/* 63E368 80219188 0260282D */ daddu $a1, $s3, $zero -/* 63E36C 8021918C 0220202D */ daddu $a0, $s1, $zero -/* 63E370 80219190 0200282D */ daddu $a1, $s0, $zero -/* 63E374 80219194 0C0B2026 */ jal set_variable -/* 63E378 80219198 0000302D */ daddu $a2, $zero, $zero -/* 63E37C 8021919C 8FBF0020 */ lw $ra, 0x20($sp) -/* 63E380 802191A0 8FB3001C */ lw $s3, 0x1c($sp) -/* 63E384 802191A4 8FB20018 */ lw $s2, 0x18($sp) -/* 63E388 802191A8 8FB10014 */ lw $s1, 0x14($sp) -/* 63E38C 802191AC 8FB00010 */ lw $s0, 0x10($sp) -/* 63E390 802191B0 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 63E394 802191B4 24020002 */ addiu $v0, $zero, 2 -/* 63E398 802191B8 03E00008 */ jr $ra -/* 63E39C 802191BC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/battle/area_sam2/63DD60/func_802193B8_63E598.s b/ver/us/asm/nonmatchings/battle/area_sam2/63DD60/func_802193B8_63E598.s deleted file mode 100644 index 13cfcdf996..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_sam2/63DD60/func_802193B8_63E598.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802193B8_63E598 -/* 63E598 802193B8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 63E59C 802193BC 0000202D */ daddu $a0, $zero, $zero -/* 63E5A0 802193C0 AFBF0010 */ sw $ra, 0x10($sp) -/* 63E5A4 802193C4 0C01C49C */ jal func_80071270 -/* 63E5A8 802193C8 24050010 */ addiu $a1, $zero, 0x10 -/* 63E5AC 802193CC 8FBF0010 */ lw $ra, 0x10($sp) -/* 63E5B0 802193D0 24020002 */ addiu $v0, $zero, 2 -/* 63E5B4 802193D4 03E00008 */ jr $ra -/* 63E5B8 802193D8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/area_sam2/63DD60/func_802193DC_63E5BC.s b/ver/us/asm/nonmatchings/battle/area_sam2/63DD60/func_802193DC_63E5BC.s deleted file mode 100644 index 36acbe8944..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_sam2/63DD60/func_802193DC_63E5BC.s +++ /dev/null @@ -1,69 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802193DC_63E5BC -/* 63E5BC 802193DC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 63E5C0 802193E0 AFB10014 */ sw $s1, 0x14($sp) -/* 63E5C4 802193E4 0080882D */ daddu $s1, $a0, $zero -/* 63E5C8 802193E8 AFBF0020 */ sw $ra, 0x20($sp) -/* 63E5CC 802193EC AFB3001C */ sw $s3, 0x1c($sp) -/* 63E5D0 802193F0 AFB20018 */ sw $s2, 0x18($sp) -/* 63E5D4 802193F4 AFB00010 */ sw $s0, 0x10($sp) -/* 63E5D8 802193F8 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 63E5DC 802193FC 8E30000C */ lw $s0, 0xc($s1) -/* 63E5E0 80219400 8E050000 */ lw $a1, ($s0) -/* 63E5E4 80219404 0C0B1EAF */ jal get_variable -/* 63E5E8 80219408 26100004 */ addiu $s0, $s0, 4 -/* 63E5EC 8021940C 3C036666 */ lui $v1, 0x6666 -/* 63E5F0 80219410 34636667 */ ori $v1, $v1, 0x6667 -/* 63E5F4 80219414 00430018 */ mult $v0, $v1 -/* 63E5F8 80219418 000217C3 */ sra $v0, $v0, 0x1f -/* 63E5FC 8021941C 3C0140C9 */ lui $at, 0x40c9 -/* 63E600 80219420 34210FD0 */ ori $at, $at, 0xfd0 -/* 63E604 80219424 44810000 */ mtc1 $at, $f0 -/* 63E608 80219428 00003810 */ mfhi $a3 -/* 63E60C 8021942C 00071883 */ sra $v1, $a3, 2 -/* 63E610 80219430 00621823 */ subu $v1, $v1, $v0 -/* 63E614 80219434 44836000 */ mtc1 $v1, $f12 -/* 63E618 80219438 00000000 */ nop -/* 63E61C 8021943C 46806320 */ cvt.s.w $f12, $f12 -/* 63E620 80219440 46006302 */ mul.s $f12, $f12, $f0 -/* 63E624 80219444 00000000 */ nop -/* 63E628 80219448 3C0143B4 */ lui $at, 0x43b4 -/* 63E62C 8021944C 44810000 */ mtc1 $at, $f0 -/* 63E630 80219450 3C014100 */ lui $at, 0x4100 -/* 63E634 80219454 44811000 */ mtc1 $at, $f2 -/* 63E638 80219458 46006303 */ div.s $f12, $f12, $f0 -/* 63E63C 8021945C 46026302 */ mul.s $f12, $f12, $f2 -/* 63E640 80219460 00000000 */ nop -/* 63E644 80219464 8E120000 */ lw $s2, ($s0) -/* 63E648 80219468 26100004 */ addiu $s0, $s0, 4 -/* 63E64C 8021946C 8E130000 */ lw $s3, ($s0) -/* 63E650 80219470 0C00A85B */ jal sin_rad -/* 63E654 80219474 8E100004 */ lw $s0, 4($s0) -/* 63E658 80219478 0220202D */ daddu $a0, $s1, $zero -/* 63E65C 8021947C 3C014120 */ lui $at, 0x4120 -/* 63E660 80219480 44811000 */ mtc1 $at, $f2 -/* 63E664 80219484 0240282D */ daddu $a1, $s2, $zero -/* 63E668 80219488 46020502 */ mul.s $f20, $f0, $f2 -/* 63E66C 8021948C 00000000 */ nop -/* 63E670 80219490 0C0B2026 */ jal set_variable -/* 63E674 80219494 0000302D */ daddu $a2, $zero, $zero -/* 63E678 80219498 0220202D */ daddu $a0, $s1, $zero -/* 63E67C 8021949C 4600A10D */ trunc.w.s $f4, $f20 -/* 63E680 802194A0 44062000 */ mfc1 $a2, $f4 -/* 63E684 802194A4 0C0B2026 */ jal set_variable -/* 63E688 802194A8 0260282D */ daddu $a1, $s3, $zero -/* 63E68C 802194AC 0220202D */ daddu $a0, $s1, $zero -/* 63E690 802194B0 0200282D */ daddu $a1, $s0, $zero -/* 63E694 802194B4 0C0B2026 */ jal set_variable -/* 63E698 802194B8 0000302D */ daddu $a2, $zero, $zero -/* 63E69C 802194BC 8FBF0020 */ lw $ra, 0x20($sp) -/* 63E6A0 802194C0 8FB3001C */ lw $s3, 0x1c($sp) -/* 63E6A4 802194C4 8FB20018 */ lw $s2, 0x18($sp) -/* 63E6A8 802194C8 8FB10014 */ lw $s1, 0x14($sp) -/* 63E6AC 802194CC 8FB00010 */ lw $s0, 0x10($sp) -/* 63E6B0 802194D0 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 63E6B4 802194D4 24020002 */ addiu $v0, $zero, 2 -/* 63E6B8 802194D8 03E00008 */ jr $ra -/* 63E6BC 802194DC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/battle/area_sam2/63DD60/func_802196D8_63E8B8.s b/ver/us/asm/nonmatchings/battle/area_sam2/63DD60/func_802196D8_63E8B8.s deleted file mode 100644 index a80de0c51b..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_sam2/63DD60/func_802196D8_63E8B8.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802196D8_63E8B8 -/* 63E8B8 802196D8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 63E8BC 802196DC 0000202D */ daddu $a0, $zero, $zero -/* 63E8C0 802196E0 AFBF0010 */ sw $ra, 0x10($sp) -/* 63E8C4 802196E4 0C01C49C */ jal func_80071270 -/* 63E8C8 802196E8 24050010 */ addiu $a1, $zero, 0x10 -/* 63E8CC 802196EC 8FBF0010 */ lw $ra, 0x10($sp) -/* 63E8D0 802196F0 24020002 */ addiu $v0, $zero, 2 -/* 63E8D4 802196F4 03E00008 */ jr $ra -/* 63E8D8 802196F8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/area_sam2/63DD60/func_802196FC_63E8DC.s b/ver/us/asm/nonmatchings/battle/area_sam2/63DD60/func_802196FC_63E8DC.s deleted file mode 100644 index 7ffbae76b1..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_sam2/63DD60/func_802196FC_63E8DC.s +++ /dev/null @@ -1,69 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802196FC_63E8DC -/* 63E8DC 802196FC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 63E8E0 80219700 AFB10014 */ sw $s1, 0x14($sp) -/* 63E8E4 80219704 0080882D */ daddu $s1, $a0, $zero -/* 63E8E8 80219708 AFBF0020 */ sw $ra, 0x20($sp) -/* 63E8EC 8021970C AFB3001C */ sw $s3, 0x1c($sp) -/* 63E8F0 80219710 AFB20018 */ sw $s2, 0x18($sp) -/* 63E8F4 80219714 AFB00010 */ sw $s0, 0x10($sp) -/* 63E8F8 80219718 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 63E8FC 8021971C 8E30000C */ lw $s0, 0xc($s1) -/* 63E900 80219720 8E050000 */ lw $a1, ($s0) -/* 63E904 80219724 0C0B1EAF */ jal get_variable -/* 63E908 80219728 26100004 */ addiu $s0, $s0, 4 -/* 63E90C 8021972C 3C036666 */ lui $v1, 0x6666 -/* 63E910 80219730 34636667 */ ori $v1, $v1, 0x6667 -/* 63E914 80219734 00430018 */ mult $v0, $v1 -/* 63E918 80219738 000217C3 */ sra $v0, $v0, 0x1f -/* 63E91C 8021973C 3C0140C9 */ lui $at, 0x40c9 -/* 63E920 80219740 34210FD0 */ ori $at, $at, 0xfd0 -/* 63E924 80219744 44810000 */ mtc1 $at, $f0 -/* 63E928 80219748 00003810 */ mfhi $a3 -/* 63E92C 8021974C 00071883 */ sra $v1, $a3, 2 -/* 63E930 80219750 00621823 */ subu $v1, $v1, $v0 -/* 63E934 80219754 44836000 */ mtc1 $v1, $f12 -/* 63E938 80219758 00000000 */ nop -/* 63E93C 8021975C 46806320 */ cvt.s.w $f12, $f12 -/* 63E940 80219760 46006302 */ mul.s $f12, $f12, $f0 -/* 63E944 80219764 00000000 */ nop -/* 63E948 80219768 3C0143B4 */ lui $at, 0x43b4 -/* 63E94C 8021976C 44810000 */ mtc1 $at, $f0 -/* 63E950 80219770 3C014100 */ lui $at, 0x4100 -/* 63E954 80219774 44811000 */ mtc1 $at, $f2 -/* 63E958 80219778 46006303 */ div.s $f12, $f12, $f0 -/* 63E95C 8021977C 46026302 */ mul.s $f12, $f12, $f2 -/* 63E960 80219780 00000000 */ nop -/* 63E964 80219784 8E120000 */ lw $s2, ($s0) -/* 63E968 80219788 26100004 */ addiu $s0, $s0, 4 -/* 63E96C 8021978C 8E130000 */ lw $s3, ($s0) -/* 63E970 80219790 0C00A85B */ jal sin_rad -/* 63E974 80219794 8E100004 */ lw $s0, 4($s0) -/* 63E978 80219798 0220202D */ daddu $a0, $s1, $zero -/* 63E97C 8021979C 3C014120 */ lui $at, 0x4120 -/* 63E980 802197A0 44811000 */ mtc1 $at, $f2 -/* 63E984 802197A4 0240282D */ daddu $a1, $s2, $zero -/* 63E988 802197A8 46020502 */ mul.s $f20, $f0, $f2 -/* 63E98C 802197AC 00000000 */ nop -/* 63E990 802197B0 0C0B2026 */ jal set_variable -/* 63E994 802197B4 0000302D */ daddu $a2, $zero, $zero -/* 63E998 802197B8 0220202D */ daddu $a0, $s1, $zero -/* 63E99C 802197BC 4600A10D */ trunc.w.s $f4, $f20 -/* 63E9A0 802197C0 44062000 */ mfc1 $a2, $f4 -/* 63E9A4 802197C4 0C0B2026 */ jal set_variable -/* 63E9A8 802197C8 0260282D */ daddu $a1, $s3, $zero -/* 63E9AC 802197CC 0220202D */ daddu $a0, $s1, $zero -/* 63E9B0 802197D0 0200282D */ daddu $a1, $s0, $zero -/* 63E9B4 802197D4 0C0B2026 */ jal set_variable -/* 63E9B8 802197D8 0000302D */ daddu $a2, $zero, $zero -/* 63E9BC 802197DC 8FBF0020 */ lw $ra, 0x20($sp) -/* 63E9C0 802197E0 8FB3001C */ lw $s3, 0x1c($sp) -/* 63E9C4 802197E4 8FB20018 */ lw $s2, 0x18($sp) -/* 63E9C8 802197E8 8FB10014 */ lw $s1, 0x14($sp) -/* 63E9CC 802197EC 8FB00010 */ lw $s0, 0x10($sp) -/* 63E9D0 802197F0 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 63E9D4 802197F4 24020002 */ addiu $v0, $zero, 2 -/* 63E9D8 802197F8 03E00008 */ jr $ra -/* 63E9DC 802197FC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/battle/area_sam2/63DD60/func_802199F8_63EBD8.s b/ver/us/asm/nonmatchings/battle/area_sam2/63DD60/func_802199F8_63EBD8.s deleted file mode 100644 index 8fa93f087c..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_sam2/63DD60/func_802199F8_63EBD8.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802199F8_63EBD8 -/* 63EBD8 802199F8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 63EBDC 802199FC 0000202D */ daddu $a0, $zero, $zero -/* 63EBE0 80219A00 AFBF0010 */ sw $ra, 0x10($sp) -/* 63EBE4 80219A04 0C01C49C */ jal func_80071270 -/* 63EBE8 80219A08 24050010 */ addiu $a1, $zero, 0x10 -/* 63EBEC 80219A0C 8FBF0010 */ lw $ra, 0x10($sp) -/* 63EBF0 80219A10 24020002 */ addiu $v0, $zero, 2 -/* 63EBF4 80219A14 03E00008 */ jr $ra -/* 63EBF8 80219A18 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/area_sam2/63DD60/func_80219A1C_63EBFC.s b/ver/us/asm/nonmatchings/battle/area_sam2/63DD60/func_80219A1C_63EBFC.s deleted file mode 100644 index 1b47eed5bb..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_sam2/63DD60/func_80219A1C_63EBFC.s +++ /dev/null @@ -1,69 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80219A1C_63EBFC -/* 63EBFC 80219A1C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 63EC00 80219A20 AFB10014 */ sw $s1, 0x14($sp) -/* 63EC04 80219A24 0080882D */ daddu $s1, $a0, $zero -/* 63EC08 80219A28 AFBF0020 */ sw $ra, 0x20($sp) -/* 63EC0C 80219A2C AFB3001C */ sw $s3, 0x1c($sp) -/* 63EC10 80219A30 AFB20018 */ sw $s2, 0x18($sp) -/* 63EC14 80219A34 AFB00010 */ sw $s0, 0x10($sp) -/* 63EC18 80219A38 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 63EC1C 80219A3C 8E30000C */ lw $s0, 0xc($s1) -/* 63EC20 80219A40 8E050000 */ lw $a1, ($s0) -/* 63EC24 80219A44 0C0B1EAF */ jal get_variable -/* 63EC28 80219A48 26100004 */ addiu $s0, $s0, 4 -/* 63EC2C 80219A4C 3C036666 */ lui $v1, 0x6666 -/* 63EC30 80219A50 34636667 */ ori $v1, $v1, 0x6667 -/* 63EC34 80219A54 00430018 */ mult $v0, $v1 -/* 63EC38 80219A58 000217C3 */ sra $v0, $v0, 0x1f -/* 63EC3C 80219A5C 3C0140C9 */ lui $at, 0x40c9 -/* 63EC40 80219A60 34210FD0 */ ori $at, $at, 0xfd0 -/* 63EC44 80219A64 44810000 */ mtc1 $at, $f0 -/* 63EC48 80219A68 00003810 */ mfhi $a3 -/* 63EC4C 80219A6C 00071883 */ sra $v1, $a3, 2 -/* 63EC50 80219A70 00621823 */ subu $v1, $v1, $v0 -/* 63EC54 80219A74 44836000 */ mtc1 $v1, $f12 -/* 63EC58 80219A78 00000000 */ nop -/* 63EC5C 80219A7C 46806320 */ cvt.s.w $f12, $f12 -/* 63EC60 80219A80 46006302 */ mul.s $f12, $f12, $f0 -/* 63EC64 80219A84 00000000 */ nop -/* 63EC68 80219A88 3C0143B4 */ lui $at, 0x43b4 -/* 63EC6C 80219A8C 44810000 */ mtc1 $at, $f0 -/* 63EC70 80219A90 3C014100 */ lui $at, 0x4100 -/* 63EC74 80219A94 44811000 */ mtc1 $at, $f2 -/* 63EC78 80219A98 46006303 */ div.s $f12, $f12, $f0 -/* 63EC7C 80219A9C 46026302 */ mul.s $f12, $f12, $f2 -/* 63EC80 80219AA0 00000000 */ nop -/* 63EC84 80219AA4 8E120000 */ lw $s2, ($s0) -/* 63EC88 80219AA8 26100004 */ addiu $s0, $s0, 4 -/* 63EC8C 80219AAC 8E130000 */ lw $s3, ($s0) -/* 63EC90 80219AB0 0C00A85B */ jal sin_rad -/* 63EC94 80219AB4 8E100004 */ lw $s0, 4($s0) -/* 63EC98 80219AB8 0220202D */ daddu $a0, $s1, $zero -/* 63EC9C 80219ABC 3C014120 */ lui $at, 0x4120 -/* 63ECA0 80219AC0 44811000 */ mtc1 $at, $f2 -/* 63ECA4 80219AC4 0240282D */ daddu $a1, $s2, $zero -/* 63ECA8 80219AC8 46020502 */ mul.s $f20, $f0, $f2 -/* 63ECAC 80219ACC 00000000 */ nop -/* 63ECB0 80219AD0 0C0B2026 */ jal set_variable -/* 63ECB4 80219AD4 0000302D */ daddu $a2, $zero, $zero -/* 63ECB8 80219AD8 0220202D */ daddu $a0, $s1, $zero -/* 63ECBC 80219ADC 4600A10D */ trunc.w.s $f4, $f20 -/* 63ECC0 80219AE0 44062000 */ mfc1 $a2, $f4 -/* 63ECC4 80219AE4 0C0B2026 */ jal set_variable -/* 63ECC8 80219AE8 0260282D */ daddu $a1, $s3, $zero -/* 63ECCC 80219AEC 0220202D */ daddu $a0, $s1, $zero -/* 63ECD0 80219AF0 0200282D */ daddu $a1, $s0, $zero -/* 63ECD4 80219AF4 0C0B2026 */ jal set_variable -/* 63ECD8 80219AF8 0000302D */ daddu $a2, $zero, $zero -/* 63ECDC 80219AFC 8FBF0020 */ lw $ra, 0x20($sp) -/* 63ECE0 80219B00 8FB3001C */ lw $s3, 0x1c($sp) -/* 63ECE4 80219B04 8FB20018 */ lw $s2, 0x18($sp) -/* 63ECE8 80219B08 8FB10014 */ lw $s1, 0x14($sp) -/* 63ECEC 80219B0C 8FB00010 */ lw $s0, 0x10($sp) -/* 63ECF0 80219B10 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 63ECF4 80219B14 24020002 */ addiu $v0, $zero, 2 -/* 63ECF8 80219B18 03E00008 */ jr $ra -/* 63ECFC 80219B1C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/battle/area_sam2/63DD60/func_80219D18_63EEF8.s b/ver/us/asm/nonmatchings/battle/area_sam2/63DD60/func_80219D18_63EEF8.s deleted file mode 100644 index 0ef626db35..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_sam2/63DD60/func_80219D18_63EEF8.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80219D18_63EEF8 -/* 63EEF8 80219D18 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 63EEFC 80219D1C 0000202D */ daddu $a0, $zero, $zero -/* 63EF00 80219D20 AFBF0010 */ sw $ra, 0x10($sp) -/* 63EF04 80219D24 0C01C49C */ jal func_80071270 -/* 63EF08 80219D28 24050010 */ addiu $a1, $zero, 0x10 -/* 63EF0C 80219D2C 8FBF0010 */ lw $ra, 0x10($sp) -/* 63EF10 80219D30 24020002 */ addiu $v0, $zero, 2 -/* 63EF14 80219D34 03E00008 */ jr $ra -/* 63EF18 80219D38 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/area_sam2/63DD60/func_80219D3C_63EF1C.s b/ver/us/asm/nonmatchings/battle/area_sam2/63DD60/func_80219D3C_63EF1C.s deleted file mode 100644 index 6a17391100..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_sam2/63DD60/func_80219D3C_63EF1C.s +++ /dev/null @@ -1,69 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80219D3C_63EF1C -/* 63EF1C 80219D3C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 63EF20 80219D40 AFB10014 */ sw $s1, 0x14($sp) -/* 63EF24 80219D44 0080882D */ daddu $s1, $a0, $zero -/* 63EF28 80219D48 AFBF0020 */ sw $ra, 0x20($sp) -/* 63EF2C 80219D4C AFB3001C */ sw $s3, 0x1c($sp) -/* 63EF30 80219D50 AFB20018 */ sw $s2, 0x18($sp) -/* 63EF34 80219D54 AFB00010 */ sw $s0, 0x10($sp) -/* 63EF38 80219D58 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 63EF3C 80219D5C 8E30000C */ lw $s0, 0xc($s1) -/* 63EF40 80219D60 8E050000 */ lw $a1, ($s0) -/* 63EF44 80219D64 0C0B1EAF */ jal get_variable -/* 63EF48 80219D68 26100004 */ addiu $s0, $s0, 4 -/* 63EF4C 80219D6C 3C036666 */ lui $v1, 0x6666 -/* 63EF50 80219D70 34636667 */ ori $v1, $v1, 0x6667 -/* 63EF54 80219D74 00430018 */ mult $v0, $v1 -/* 63EF58 80219D78 000217C3 */ sra $v0, $v0, 0x1f -/* 63EF5C 80219D7C 3C0140C9 */ lui $at, 0x40c9 -/* 63EF60 80219D80 34210FD0 */ ori $at, $at, 0xfd0 -/* 63EF64 80219D84 44810000 */ mtc1 $at, $f0 -/* 63EF68 80219D88 00003810 */ mfhi $a3 -/* 63EF6C 80219D8C 00071883 */ sra $v1, $a3, 2 -/* 63EF70 80219D90 00621823 */ subu $v1, $v1, $v0 -/* 63EF74 80219D94 44836000 */ mtc1 $v1, $f12 -/* 63EF78 80219D98 00000000 */ nop -/* 63EF7C 80219D9C 46806320 */ cvt.s.w $f12, $f12 -/* 63EF80 80219DA0 46006302 */ mul.s $f12, $f12, $f0 -/* 63EF84 80219DA4 00000000 */ nop -/* 63EF88 80219DA8 3C0143B4 */ lui $at, 0x43b4 -/* 63EF8C 80219DAC 44810000 */ mtc1 $at, $f0 -/* 63EF90 80219DB0 3C014100 */ lui $at, 0x4100 -/* 63EF94 80219DB4 44811000 */ mtc1 $at, $f2 -/* 63EF98 80219DB8 46006303 */ div.s $f12, $f12, $f0 -/* 63EF9C 80219DBC 46026302 */ mul.s $f12, $f12, $f2 -/* 63EFA0 80219DC0 00000000 */ nop -/* 63EFA4 80219DC4 8E120000 */ lw $s2, ($s0) -/* 63EFA8 80219DC8 26100004 */ addiu $s0, $s0, 4 -/* 63EFAC 80219DCC 8E130000 */ lw $s3, ($s0) -/* 63EFB0 80219DD0 0C00A85B */ jal sin_rad -/* 63EFB4 80219DD4 8E100004 */ lw $s0, 4($s0) -/* 63EFB8 80219DD8 0220202D */ daddu $a0, $s1, $zero -/* 63EFBC 80219DDC 3C014120 */ lui $at, 0x4120 -/* 63EFC0 80219DE0 44811000 */ mtc1 $at, $f2 -/* 63EFC4 80219DE4 0240282D */ daddu $a1, $s2, $zero -/* 63EFC8 80219DE8 46020502 */ mul.s $f20, $f0, $f2 -/* 63EFCC 80219DEC 00000000 */ nop -/* 63EFD0 80219DF0 0C0B2026 */ jal set_variable -/* 63EFD4 80219DF4 0000302D */ daddu $a2, $zero, $zero -/* 63EFD8 80219DF8 0220202D */ daddu $a0, $s1, $zero -/* 63EFDC 80219DFC 4600A10D */ trunc.w.s $f4, $f20 -/* 63EFE0 80219E00 44062000 */ mfc1 $a2, $f4 -/* 63EFE4 80219E04 0C0B2026 */ jal set_variable -/* 63EFE8 80219E08 0260282D */ daddu $a1, $s3, $zero -/* 63EFEC 80219E0C 0220202D */ daddu $a0, $s1, $zero -/* 63EFF0 80219E10 0200282D */ daddu $a1, $s0, $zero -/* 63EFF4 80219E14 0C0B2026 */ jal set_variable -/* 63EFF8 80219E18 0000302D */ daddu $a2, $zero, $zero -/* 63EFFC 80219E1C 8FBF0020 */ lw $ra, 0x20($sp) -/* 63F000 80219E20 8FB3001C */ lw $s3, 0x1c($sp) -/* 63F004 80219E24 8FB20018 */ lw $s2, 0x18($sp) -/* 63F008 80219E28 8FB10014 */ lw $s1, 0x14($sp) -/* 63F00C 80219E2C 8FB00010 */ lw $s0, 0x10($sp) -/* 63F010 80219E30 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 63F014 80219E34 24020002 */ addiu $v0, $zero, 2 -/* 63F018 80219E38 03E00008 */ jr $ra -/* 63F01C 80219E3C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/battle/area_trd_part_1/4A12C0/func_80218220_4A12C0.s b/ver/us/asm/nonmatchings/battle/area_trd_part_1/4A12C0/func_80218220_4A12C0.s deleted file mode 100644 index 0d4e16a1a0..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_trd_part_1/4A12C0/func_80218220_4A12C0.s +++ /dev/null @@ -1,164 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218220_4A12C0 -/* 4A12C0 80218220 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 4A12C4 80218224 AFB40020 */ sw $s4, 0x20($sp) -/* 4A12C8 80218228 0080A02D */ daddu $s4, $a0, $zero -/* 4A12CC 8021822C AFBF0024 */ sw $ra, 0x24($sp) -/* 4A12D0 80218230 AFB3001C */ sw $s3, 0x1c($sp) -/* 4A12D4 80218234 AFB20018 */ sw $s2, 0x18($sp) -/* 4A12D8 80218238 AFB10014 */ sw $s1, 0x14($sp) -/* 4A12DC 8021823C AFB00010 */ sw $s0, 0x10($sp) -/* 4A12E0 80218240 F7BE0050 */ sdc1 $f30, 0x50($sp) -/* 4A12E4 80218244 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* 4A12E8 80218248 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 4A12EC 8021824C F7B80038 */ sdc1 $f24, 0x38($sp) -/* 4A12F0 80218250 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 4A12F4 80218254 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 4A12F8 80218258 8E90000C */ lw $s0, 0xc($s4) -/* 4A12FC 8021825C 8E050000 */ lw $a1, ($s0) -/* 4A1300 80218260 0C0B1EAF */ jal get_variable -/* 4A1304 80218264 26100004 */ addiu $s0, $s0, 4 -/* 4A1308 80218268 44820000 */ mtc1 $v0, $f0 -/* 4A130C 8021826C 00000000 */ nop -/* 4A1310 80218270 46800021 */ cvt.d.w $f0, $f0 -/* 4A1314 80218274 8E110000 */ lw $s1, ($s0) -/* 4A1318 80218278 26100004 */ addiu $s0, $s0, 4 -/* 4A131C 8021827C 3C014024 */ lui $at, 0x4024 -/* 4A1320 80218280 44811800 */ mtc1 $at, $f3 -/* 4A1324 80218284 44801000 */ mtc1 $zero, $f2 -/* 4A1328 80218288 3C0140C9 */ lui $at, 0x40c9 -/* 4A132C 8021828C 34210FD0 */ ori $at, $at, 0xfd0 -/* 4A1330 80218290 4481A000 */ mtc1 $at, $f20 -/* 4A1334 80218294 8E130000 */ lw $s3, ($s0) -/* 4A1338 80218298 46220003 */ div.d $f0, $f0, $f2 -/* 4A133C 8021829C 462007A0 */ cvt.s.d $f30, $f0 -/* 4A1340 802182A0 4614F502 */ mul.s $f20, $f30, $f20 -/* 4A1344 802182A4 00000000 */ nop -/* 4A1348 802182A8 26100004 */ addiu $s0, $s0, 4 -/* 4A134C 802182AC 8E120000 */ lw $s2, ($s0) -/* 4A1350 802182B0 3C0143B4 */ lui $at, 0x43b4 -/* 4A1354 802182B4 44810000 */ mtc1 $at, $f0 -/* 4A1358 802182B8 8E100004 */ lw $s0, 4($s0) -/* 4A135C 802182BC 4600A503 */ div.s $f20, $f20, $f0 -/* 4A1360 802182C0 0C00A85B */ jal sin_rad -/* 4A1364 802182C4 4600A306 */ mov.s $f12, $f20 -/* 4A1368 802182C8 3C014100 */ lui $at, 0x4100 -/* 4A136C 802182CC 44816000 */ mtc1 $at, $f12 -/* 4A1370 802182D0 00000000 */ nop -/* 4A1374 802182D4 460CA302 */ mul.s $f12, $f20, $f12 -/* 4A1378 802182D8 00000000 */ nop -/* 4A137C 802182DC 3C014316 */ lui $at, 0x4316 -/* 4A1380 802182E0 4481E000 */ mtc1 $at, $f28 -/* 4A1384 802182E4 00000000 */ nop -/* 4A1388 802182E8 461C0582 */ mul.s $f22, $f0, $f28 -/* 4A138C 802182EC 00000000 */ nop -/* 4A1390 802182F0 4480D000 */ mtc1 $zero, $f26 -/* 4A1394 802182F4 0C00A85B */ jal sin_rad -/* 4A1398 802182F8 461AB580 */ add.s $f22, $f22, $f26 -/* 4A139C 802182FC 3C014120 */ lui $at, 0x4120 -/* 4A13A0 80218300 44811000 */ mtc1 $at, $f2 -/* 4A13A4 80218304 00000000 */ nop -/* 4A13A8 80218308 46020602 */ mul.s $f24, $f0, $f2 -/* 4A13AC 8021830C 00000000 */ nop -/* 4A13B0 80218310 4600A306 */ mov.s $f12, $f20 -/* 4A13B4 80218314 0C00A874 */ jal cos_rad -/* 4A13B8 80218318 461AC600 */ add.s $f24, $f24, $f26 -/* 4A13BC 8021831C 0280202D */ daddu $a0, $s4, $zero -/* 4A13C0 80218320 461C0502 */ mul.s $f20, $f0, $f28 -/* 4A13C4 80218324 00000000 */ nop -/* 4A13C8 80218328 0220282D */ daddu $a1, $s1, $zero -/* 4A13CC 8021832C 4406B000 */ mfc1 $a2, $f22 -/* 4A13D0 80218330 3C0141A0 */ lui $at, 0x41a0 -/* 4A13D4 80218334 44810000 */ mtc1 $at, $f0 -/* 4A13D8 80218338 3C01C248 */ lui $at, 0xc248 -/* 4A13DC 8021833C 44811000 */ mtc1 $at, $f2 -/* 4A13E0 80218340 4600A503 */ div.s $f20, $f20, $f0 -/* 4A13E4 80218344 0C0B2190 */ jal set_float_variable -/* 4A13E8 80218348 4602A500 */ add.s $f20, $f20, $f2 -/* 4A13EC 8021834C 0280202D */ daddu $a0, $s4, $zero -/* 4A13F0 80218350 4406C000 */ mfc1 $a2, $f24 -/* 4A13F4 80218354 0C0B2190 */ jal set_float_variable -/* 4A13F8 80218358 0260282D */ daddu $a1, $s3, $zero -/* 4A13FC 8021835C 0280202D */ daddu $a0, $s4, $zero -/* 4A1400 80218360 4406A000 */ mfc1 $a2, $f20 -/* 4A1404 80218364 0C0B2190 */ jal set_float_variable -/* 4A1408 80218368 0240282D */ daddu $a1, $s2, $zero -/* 4A140C 8021836C 3C0142B4 */ lui $at, 0x42b4 -/* 4A1410 80218370 44810000 */ mtc1 $at, $f0 -/* 4A1414 80218374 00000000 */ nop -/* 4A1418 80218378 461E003C */ c.lt.s $f0, $f30 -/* 4A141C 8021837C 00000000 */ nop -/* 4A1420 80218380 4500000B */ bc1f .L802183B0 -/* 4A1424 80218384 0000302D */ daddu $a2, $zero, $zero -/* 4A1428 80218388 3C014387 */ lui $at, 0x4387 -/* 4A142C 8021838C 44810000 */ mtc1 $at, $f0 -/* 4A1430 80218390 00000000 */ nop -/* 4A1434 80218394 4600F03C */ c.lt.s $f30, $f0 -/* 4A1438 80218398 00000000 */ nop -/* 4A143C 8021839C 45030001 */ bc1tl .L802183A4 -/* 4A1440 802183A0 240600B4 */ addiu $a2, $zero, 0xb4 -.L802183A4: -/* 4A1444 802183A4 3C0142B4 */ lui $at, 0x42b4 -/* 4A1448 802183A8 44810000 */ mtc1 $at, $f0 -/* 4A144C 802183AC 00000000 */ nop -.L802183B0: -/* 4A1450 802183B0 461E0001 */ sub.s $f0, $f0, $f30 -/* 4A1454 802183B4 46000005 */ abs.s $f0, $f0 -/* 4A1458 802183B8 4600010D */ trunc.w.s $f4, $f0 -/* 4A145C 802183BC 44022000 */ mfc1 $v0, $f4 -/* 4A1460 802183C0 00000000 */ nop -/* 4A1464 802183C4 2842002D */ slti $v0, $v0, 0x2d -/* 4A1468 802183C8 10400008 */ beqz $v0, .L802183EC -/* 4A146C 802183CC 00000000 */ nop -/* 4A1470 802183D0 3C014234 */ lui $at, 0x4234 -/* 4A1474 802183D4 44810000 */ mtc1 $at, $f0 -/* 4A1478 802183D8 00000000 */ nop -/* 4A147C 802183DC 4600F001 */ sub.s $f0, $f30, $f0 -/* 4A1480 802183E0 46000000 */ add.s $f0, $f0, $f0 -/* 4A1484 802183E4 4600010D */ trunc.w.s $f4, $f0 -/* 4A1488 802183E8 44062000 */ mfc1 $a2, $f4 -.L802183EC: -/* 4A148C 802183EC 3C014387 */ lui $at, 0x4387 -/* 4A1490 802183F0 44810000 */ mtc1 $at, $f0 -/* 4A1494 802183F4 00000000 */ nop -/* 4A1498 802183F8 461E0001 */ sub.s $f0, $f0, $f30 -/* 4A149C 802183FC 46000005 */ abs.s $f0, $f0 -/* 4A14A0 80218400 4600010D */ trunc.w.s $f4, $f0 -/* 4A14A4 80218404 44022000 */ mfc1 $v0, $f4 -/* 4A14A8 80218408 00000000 */ nop -/* 4A14AC 8021840C 2842002D */ slti $v0, $v0, 0x2d -/* 4A14B0 80218410 1040000C */ beqz $v0, .L80218444 -/* 4A14B4 80218414 0280202D */ daddu $a0, $s4, $zero -/* 4A14B8 80218418 3C014361 */ lui $at, 0x4361 -/* 4A14BC 8021841C 44810000 */ mtc1 $at, $f0 -/* 4A14C0 80218420 00000000 */ nop -/* 4A14C4 80218424 4600F001 */ sub.s $f0, $f30, $f0 -/* 4A14C8 80218428 46000000 */ add.s $f0, $f0, $f0 -/* 4A14CC 8021842C 3C014334 */ lui $at, 0x4334 -/* 4A14D0 80218430 44811000 */ mtc1 $at, $f2 -/* 4A14D4 80218434 00000000 */ nop -/* 4A14D8 80218438 46020000 */ add.s $f0, $f0, $f2 -/* 4A14DC 8021843C 4600010D */ trunc.w.s $f4, $f0 -/* 4A14E0 80218440 44062000 */ mfc1 $a2, $f4 -.L80218444: -/* 4A14E4 80218444 0C0B2026 */ jal set_variable -/* 4A14E8 80218448 0200282D */ daddu $a1, $s0, $zero -/* 4A14EC 8021844C 8FBF0024 */ lw $ra, 0x24($sp) -/* 4A14F0 80218450 8FB40020 */ lw $s4, 0x20($sp) -/* 4A14F4 80218454 8FB3001C */ lw $s3, 0x1c($sp) -/* 4A14F8 80218458 8FB20018 */ lw $s2, 0x18($sp) -/* 4A14FC 8021845C 8FB10014 */ lw $s1, 0x14($sp) -/* 4A1500 80218460 8FB00010 */ lw $s0, 0x10($sp) -/* 4A1504 80218464 D7BE0050 */ ldc1 $f30, 0x50($sp) -/* 4A1508 80218468 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* 4A150C 8021846C D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 4A1510 80218470 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 4A1514 80218474 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 4A1518 80218478 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 4A151C 8021847C 24020002 */ addiu $v0, $zero, 2 -/* 4A1520 80218480 03E00008 */ jr $ra -/* 4A1524 80218484 27BD0058 */ addiu $sp, $sp, 0x58 -/* 4A1528 80218488 00000000 */ nop -/* 4A152C 8021848C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/battle/area_trd_part_2/4B34D0/func_8021A2E0_4B34D0.s b/ver/us/asm/nonmatchings/battle/area_trd_part_2/4B34D0/func_8021A2E0_4B34D0.s deleted file mode 100644 index a7a11457af..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_trd_part_2/4B34D0/func_8021A2E0_4B34D0.s +++ /dev/null @@ -1,164 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8021A2E0_4B34D0 -/* 4B34D0 8021A2E0 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 4B34D4 8021A2E4 AFB40020 */ sw $s4, 0x20($sp) -/* 4B34D8 8021A2E8 0080A02D */ daddu $s4, $a0, $zero -/* 4B34DC 8021A2EC AFBF0024 */ sw $ra, 0x24($sp) -/* 4B34E0 8021A2F0 AFB3001C */ sw $s3, 0x1c($sp) -/* 4B34E4 8021A2F4 AFB20018 */ sw $s2, 0x18($sp) -/* 4B34E8 8021A2F8 AFB10014 */ sw $s1, 0x14($sp) -/* 4B34EC 8021A2FC AFB00010 */ sw $s0, 0x10($sp) -/* 4B34F0 8021A300 F7BE0050 */ sdc1 $f30, 0x50($sp) -/* 4B34F4 8021A304 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* 4B34F8 8021A308 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 4B34FC 8021A30C F7B80038 */ sdc1 $f24, 0x38($sp) -/* 4B3500 8021A310 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 4B3504 8021A314 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 4B3508 8021A318 8E90000C */ lw $s0, 0xc($s4) -/* 4B350C 8021A31C 8E050000 */ lw $a1, ($s0) -/* 4B3510 8021A320 0C0B1EAF */ jal get_variable -/* 4B3514 8021A324 26100004 */ addiu $s0, $s0, 4 -/* 4B3518 8021A328 44820000 */ mtc1 $v0, $f0 -/* 4B351C 8021A32C 00000000 */ nop -/* 4B3520 8021A330 46800021 */ cvt.d.w $f0, $f0 -/* 4B3524 8021A334 8E110000 */ lw $s1, ($s0) -/* 4B3528 8021A338 26100004 */ addiu $s0, $s0, 4 -/* 4B352C 8021A33C 3C014024 */ lui $at, 0x4024 -/* 4B3530 8021A340 44811800 */ mtc1 $at, $f3 -/* 4B3534 8021A344 44801000 */ mtc1 $zero, $f2 -/* 4B3538 8021A348 3C0140C9 */ lui $at, 0x40c9 -/* 4B353C 8021A34C 34210FD0 */ ori $at, $at, 0xfd0 -/* 4B3540 8021A350 4481A000 */ mtc1 $at, $f20 -/* 4B3544 8021A354 8E130000 */ lw $s3, ($s0) -/* 4B3548 8021A358 46220003 */ div.d $f0, $f0, $f2 -/* 4B354C 8021A35C 462007A0 */ cvt.s.d $f30, $f0 -/* 4B3550 8021A360 4614F502 */ mul.s $f20, $f30, $f20 -/* 4B3554 8021A364 00000000 */ nop -/* 4B3558 8021A368 26100004 */ addiu $s0, $s0, 4 -/* 4B355C 8021A36C 8E120000 */ lw $s2, ($s0) -/* 4B3560 8021A370 3C0143B4 */ lui $at, 0x43b4 -/* 4B3564 8021A374 44810000 */ mtc1 $at, $f0 -/* 4B3568 8021A378 8E100004 */ lw $s0, 4($s0) -/* 4B356C 8021A37C 4600A503 */ div.s $f20, $f20, $f0 -/* 4B3570 8021A380 0C00A85B */ jal sin_rad -/* 4B3574 8021A384 4600A306 */ mov.s $f12, $f20 -/* 4B3578 8021A388 3C014100 */ lui $at, 0x4100 -/* 4B357C 8021A38C 44816000 */ mtc1 $at, $f12 -/* 4B3580 8021A390 00000000 */ nop -/* 4B3584 8021A394 460CA302 */ mul.s $f12, $f20, $f12 -/* 4B3588 8021A398 00000000 */ nop -/* 4B358C 8021A39C 3C014316 */ lui $at, 0x4316 -/* 4B3590 8021A3A0 4481E000 */ mtc1 $at, $f28 -/* 4B3594 8021A3A4 00000000 */ nop -/* 4B3598 8021A3A8 461C0582 */ mul.s $f22, $f0, $f28 -/* 4B359C 8021A3AC 00000000 */ nop -/* 4B35A0 8021A3B0 4480D000 */ mtc1 $zero, $f26 -/* 4B35A4 8021A3B4 0C00A85B */ jal sin_rad -/* 4B35A8 8021A3B8 461AB580 */ add.s $f22, $f22, $f26 -/* 4B35AC 8021A3BC 3C014120 */ lui $at, 0x4120 -/* 4B35B0 8021A3C0 44811000 */ mtc1 $at, $f2 -/* 4B35B4 8021A3C4 00000000 */ nop -/* 4B35B8 8021A3C8 46020602 */ mul.s $f24, $f0, $f2 -/* 4B35BC 8021A3CC 00000000 */ nop -/* 4B35C0 8021A3D0 4600A306 */ mov.s $f12, $f20 -/* 4B35C4 8021A3D4 0C00A874 */ jal cos_rad -/* 4B35C8 8021A3D8 461AC600 */ add.s $f24, $f24, $f26 -/* 4B35CC 8021A3DC 0280202D */ daddu $a0, $s4, $zero -/* 4B35D0 8021A3E0 461C0502 */ mul.s $f20, $f0, $f28 -/* 4B35D4 8021A3E4 00000000 */ nop -/* 4B35D8 8021A3E8 0220282D */ daddu $a1, $s1, $zero -/* 4B35DC 8021A3EC 4406B000 */ mfc1 $a2, $f22 -/* 4B35E0 8021A3F0 3C0141A0 */ lui $at, 0x41a0 -/* 4B35E4 8021A3F4 44810000 */ mtc1 $at, $f0 -/* 4B35E8 8021A3F8 3C01C248 */ lui $at, 0xc248 -/* 4B35EC 8021A3FC 44811000 */ mtc1 $at, $f2 -/* 4B35F0 8021A400 4600A503 */ div.s $f20, $f20, $f0 -/* 4B35F4 8021A404 0C0B2190 */ jal set_float_variable -/* 4B35F8 8021A408 4602A500 */ add.s $f20, $f20, $f2 -/* 4B35FC 8021A40C 0280202D */ daddu $a0, $s4, $zero -/* 4B3600 8021A410 4406C000 */ mfc1 $a2, $f24 -/* 4B3604 8021A414 0C0B2190 */ jal set_float_variable -/* 4B3608 8021A418 0260282D */ daddu $a1, $s3, $zero -/* 4B360C 8021A41C 0280202D */ daddu $a0, $s4, $zero -/* 4B3610 8021A420 4406A000 */ mfc1 $a2, $f20 -/* 4B3614 8021A424 0C0B2190 */ jal set_float_variable -/* 4B3618 8021A428 0240282D */ daddu $a1, $s2, $zero -/* 4B361C 8021A42C 3C0142B4 */ lui $at, 0x42b4 -/* 4B3620 8021A430 44810000 */ mtc1 $at, $f0 -/* 4B3624 8021A434 00000000 */ nop -/* 4B3628 8021A438 461E003C */ c.lt.s $f0, $f30 -/* 4B362C 8021A43C 00000000 */ nop -/* 4B3630 8021A440 4500000B */ bc1f .L8021A470 -/* 4B3634 8021A444 0000302D */ daddu $a2, $zero, $zero -/* 4B3638 8021A448 3C014387 */ lui $at, 0x4387 -/* 4B363C 8021A44C 44810000 */ mtc1 $at, $f0 -/* 4B3640 8021A450 00000000 */ nop -/* 4B3644 8021A454 4600F03C */ c.lt.s $f30, $f0 -/* 4B3648 8021A458 00000000 */ nop -/* 4B364C 8021A45C 45030001 */ bc1tl .L8021A464 -/* 4B3650 8021A460 240600B4 */ addiu $a2, $zero, 0xb4 -.L8021A464: -/* 4B3654 8021A464 3C0142B4 */ lui $at, 0x42b4 -/* 4B3658 8021A468 44810000 */ mtc1 $at, $f0 -/* 4B365C 8021A46C 00000000 */ nop -.L8021A470: -/* 4B3660 8021A470 461E0001 */ sub.s $f0, $f0, $f30 -/* 4B3664 8021A474 46000005 */ abs.s $f0, $f0 -/* 4B3668 8021A478 4600010D */ trunc.w.s $f4, $f0 -/* 4B366C 8021A47C 44022000 */ mfc1 $v0, $f4 -/* 4B3670 8021A480 00000000 */ nop -/* 4B3674 8021A484 2842002D */ slti $v0, $v0, 0x2d -/* 4B3678 8021A488 10400008 */ beqz $v0, .L8021A4AC -/* 4B367C 8021A48C 00000000 */ nop -/* 4B3680 8021A490 3C014234 */ lui $at, 0x4234 -/* 4B3684 8021A494 44810000 */ mtc1 $at, $f0 -/* 4B3688 8021A498 00000000 */ nop -/* 4B368C 8021A49C 4600F001 */ sub.s $f0, $f30, $f0 -/* 4B3690 8021A4A0 46000000 */ add.s $f0, $f0, $f0 -/* 4B3694 8021A4A4 4600010D */ trunc.w.s $f4, $f0 -/* 4B3698 8021A4A8 44062000 */ mfc1 $a2, $f4 -.L8021A4AC: -/* 4B369C 8021A4AC 3C014387 */ lui $at, 0x4387 -/* 4B36A0 8021A4B0 44810000 */ mtc1 $at, $f0 -/* 4B36A4 8021A4B4 00000000 */ nop -/* 4B36A8 8021A4B8 461E0001 */ sub.s $f0, $f0, $f30 -/* 4B36AC 8021A4BC 46000005 */ abs.s $f0, $f0 -/* 4B36B0 8021A4C0 4600010D */ trunc.w.s $f4, $f0 -/* 4B36B4 8021A4C4 44022000 */ mfc1 $v0, $f4 -/* 4B36B8 8021A4C8 00000000 */ nop -/* 4B36BC 8021A4CC 2842002D */ slti $v0, $v0, 0x2d -/* 4B36C0 8021A4D0 1040000C */ beqz $v0, .L8021A504 -/* 4B36C4 8021A4D4 0280202D */ daddu $a0, $s4, $zero -/* 4B36C8 8021A4D8 3C014361 */ lui $at, 0x4361 -/* 4B36CC 8021A4DC 44810000 */ mtc1 $at, $f0 -/* 4B36D0 8021A4E0 00000000 */ nop -/* 4B36D4 8021A4E4 4600F001 */ sub.s $f0, $f30, $f0 -/* 4B36D8 8021A4E8 46000000 */ add.s $f0, $f0, $f0 -/* 4B36DC 8021A4EC 3C014334 */ lui $at, 0x4334 -/* 4B36E0 8021A4F0 44811000 */ mtc1 $at, $f2 -/* 4B36E4 8021A4F4 00000000 */ nop -/* 4B36E8 8021A4F8 46020000 */ add.s $f0, $f0, $f2 -/* 4B36EC 8021A4FC 4600010D */ trunc.w.s $f4, $f0 -/* 4B36F0 8021A500 44062000 */ mfc1 $a2, $f4 -.L8021A504: -/* 4B36F4 8021A504 0C0B2026 */ jal set_variable -/* 4B36F8 8021A508 0200282D */ daddu $a1, $s0, $zero -/* 4B36FC 8021A50C 8FBF0024 */ lw $ra, 0x24($sp) -/* 4B3700 8021A510 8FB40020 */ lw $s4, 0x20($sp) -/* 4B3704 8021A514 8FB3001C */ lw $s3, 0x1c($sp) -/* 4B3708 8021A518 8FB20018 */ lw $s2, 0x18($sp) -/* 4B370C 8021A51C 8FB10014 */ lw $s1, 0x14($sp) -/* 4B3710 8021A520 8FB00010 */ lw $s0, 0x10($sp) -/* 4B3714 8021A524 D7BE0050 */ ldc1 $f30, 0x50($sp) -/* 4B3718 8021A528 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* 4B371C 8021A52C D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 4B3720 8021A530 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 4B3724 8021A534 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 4B3728 8021A538 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 4B372C 8021A53C 24020002 */ addiu $v0, $zero, 2 -/* 4B3730 8021A540 03E00008 */ jr $ra -/* 4B3734 8021A544 27BD0058 */ addiu $sp, $sp, 0x58 -/* 4B3738 8021A548 00000000 */ nop -/* 4B373C 8021A54C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/battle/partner/watt_703AF0/func_80238E5C_70494C.s b/ver/us/asm/nonmatchings/battle/partner/watt_703AF0/func_80238E5C_70494C.s index 6233755ebf..06ec5e380b 100644 --- a/ver/us/asm/nonmatchings/battle/partner/watt_703AF0/func_80238E5C_70494C.s +++ b/ver/us/asm/nonmatchings/battle/partner/watt_703AF0/func_80238E5C_70494C.s @@ -83,3 +83,7 @@ glabel func_80238E5C_70494C /* 704A64 80238F74 8FB00010 */ lw $s0, 0x10($sp) /* 704A68 80238F78 24020002 */ addiu $v0, $zero, 2 /* 704A6C 80238F7C 03E00008 */ jr $ra +/* 704A70 80238F80 27BD0038 */ addiu $sp, $sp, 0x38 +nop +nop +nop diff --git a/ver/us/asm/nonmatchings/code_7900D0/func_802A14E8_7905B8.s b/ver/us/asm/nonmatchings/code_7900D0/func_802A14E8_7905B8.s deleted file mode 100644 index 4c5927b76a..0000000000 --- a/ver/us/asm/nonmatchings/code_7900D0/func_802A14E8_7905B8.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A14E8_7905B8 -/* 7905B8 802A14E8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7905BC 802A14EC AFBF0010 */ sw $ra, 0x10($sp) -/* 7905C0 802A14F0 0C00EABB */ jal get_npc_unsafe -/* 7905C4 802A14F4 24040064 */ addiu $a0, $zero, 0x64 -/* 7905C8 802A14F8 0040202D */ daddu $a0, $v0, $zero -/* 7905CC 802A14FC 24030020 */ addiu $v1, $zero, 0x20 -/* 7905D0 802A1500 A48300A8 */ sh $v1, 0xa8($a0) -/* 7905D4 802A1504 A48300A6 */ sh $v1, 0xa6($a0) -/* 7905D8 802A1508 8FBF0010 */ lw $ra, 0x10($sp) -/* 7905DC 802A150C 24020002 */ addiu $v0, $zero, 2 -/* 7905E0 802A1510 03E00008 */ jr $ra -/* 7905E4 802A1514 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/code_7900D0/func_802A1518_7905E8.s b/ver/us/asm/nonmatchings/code_7900D0/func_802A1518_7905E8.s deleted file mode 100644 index 1ff8d47390..0000000000 --- a/ver/us/asm/nonmatchings/code_7900D0/func_802A1518_7905E8.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1518_7905E8 -/* 7905E8 802A1518 3C01802A */ lui $at, %hi(D_802A2CC0) -/* 7905EC 802A151C AC202CC0 */ sw $zero, %lo(D_802A2CC0)($at) -/* 7905F0 802A1520 03E00008 */ jr $ra -/* 7905F4 802A1524 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/code_7900D0/func_802A1528_7905F8.s b/ver/us/asm/nonmatchings/code_7900D0/func_802A1528_7905F8.s deleted file mode 100644 index 78171a7722..0000000000 --- a/ver/us/asm/nonmatchings/code_7900D0/func_802A1528_7905F8.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1528_7905F8 -/* 7905F8 802A1528 3C02802A */ lui $v0, %hi(D_802A2CC0) -/* 7905FC 802A152C 8C422CC0 */ lw $v0, %lo(D_802A2CC0)($v0) -/* 790600 802A1530 AC820084 */ sw $v0, 0x84($a0) -/* 790604 802A1534 03E00008 */ jr $ra -/* 790608 802A1538 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_802407CC_97E29C.s b/ver/us/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_802407CC_97E29C.s deleted file mode 100644 index a999944d3f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_802407CC_97E29C.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407CC_97E29C -/* 97E29C 802407CC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 97E2A0 802407D0 AFB10014 */ sw $s1, 0x14($sp) -/* 97E2A4 802407D4 0080882D */ daddu $s1, $a0, $zero -/* 97E2A8 802407D8 AFBF001C */ sw $ra, 0x1c($sp) -/* 97E2AC 802407DC AFB20018 */ sw $s2, 0x18($sp) -/* 97E2B0 802407E0 AFB00010 */ sw $s0, 0x10($sp) -/* 97E2B4 802407E4 8E220148 */ lw $v0, 0x148($s1) -/* 97E2B8 802407E8 00A0902D */ daddu $s2, $a1, $zero -/* 97E2BC 802407EC 84440008 */ lh $a0, 8($v0) -/* 97E2C0 802407F0 0C00EABB */ jal get_npc_unsafe -/* 97E2C4 802407F4 00C0802D */ daddu $s0, $a2, $zero -/* 97E2C8 802407F8 0220202D */ daddu $a0, $s1, $zero -/* 97E2CC 802407FC 0240282D */ daddu $a1, $s2, $zero -/* 97E2D0 80240800 0200302D */ daddu $a2, $s0, $zero -/* 97E2D4 80240804 0C0127DF */ jal func_80049F7C -/* 97E2D8 80240808 0040802D */ daddu $s0, $v0, $zero -/* 97E2DC 8024080C 8E020000 */ lw $v0, ($s0) -/* 97E2E0 80240810 24040005 */ addiu $a0, $zero, 5 -/* 97E2E4 80240814 34420800 */ ori $v0, $v0, 0x800 -/* 97E2E8 80240818 0C00A67F */ jal rand_int -/* 97E2EC 8024081C AE020000 */ sw $v0, ($s0) -/* 97E2F0 80240820 44820000 */ mtc1 $v0, $f0 -/* 97E2F4 80240824 00000000 */ nop -/* 97E2F8 80240828 46800021 */ cvt.d.w $f0, $f0 -/* 97E2FC 8024082C 3C014024 */ lui $at, 0x4024 -/* 97E300 80240830 44811800 */ mtc1 $at, $f3 -/* 97E304 80240834 44801000 */ mtc1 $zero, $f2 -/* 97E308 80240838 3C013FC0 */ lui $at, 0x3fc0 -/* 97E30C 8024083C 44812000 */ mtc1 $at, $f4 -/* 97E310 80240840 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 97E314 80240844 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 97E318 80240848 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 97E31C 8024084C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 97E320 80240850 46220000 */ add.d $f0, $f0, $f2 -/* 97E324 80240854 E6040014 */ swc1 $f4, 0x14($s0) -/* 97E328 80240858 46200020 */ cvt.s.d $f0, $f0 -/* 97E32C 8024085C E600001C */ swc1 $f0, 0x1c($s0) -/* 97E330 80240860 8C460028 */ lw $a2, 0x28($v0) -/* 97E334 80240864 0C00A720 */ jal atan2 -/* 97E338 80240868 8C470030 */ lw $a3, 0x30($v0) -/* 97E33C 8024086C 0200202D */ daddu $a0, $s0, $zero -/* 97E340 80240870 3C05B000 */ lui $a1, 0xb000 -/* 97E344 80240874 34A50017 */ ori $a1, $a1, 0x17 -/* 97E348 80240878 0000302D */ daddu $a2, $zero, $zero -/* 97E34C 8024087C E480000C */ swc1 $f0, 0xc($a0) -/* 97E350 80240880 C6400018 */ lwc1 $f0, 0x18($s2) -/* 97E354 80240884 2402000D */ addiu $v0, $zero, 0xd -/* 97E358 80240888 E4800018 */ swc1 $f0, 0x18($a0) -/* 97E35C 8024088C 0C012530 */ jal func_800494C0 -/* 97E360 80240890 AE220070 */ sw $v0, 0x70($s1) -/* 97E364 80240894 8FBF001C */ lw $ra, 0x1c($sp) -/* 97E368 80240898 8FB20018 */ lw $s2, 0x18($sp) -/* 97E36C 8024089C 8FB10014 */ lw $s1, 0x14($sp) -/* 97E370 802408A0 8FB00010 */ lw $s0, 0x10($sp) -/* 97E374 802408A4 03E00008 */ jr $ra -/* 97E378 802408A8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240BF0_97E6C0.s b/ver/us/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240BF0_97E6C0.s index 40920cc4ae..c659bca666 100644 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240BF0_97E6C0.s +++ b/ver/us/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240BF0_97E6C0.s @@ -124,7 +124,7 @@ glabel L80240D9C_97E86C glabel L80240DB4_97E884 /* 97E884 80240DB4 0260202D */ daddu $a0, $s3, $zero /* 97E888 80240DB8 0280282D */ daddu $a1, $s4, $zero -/* 97E88C 80240DBC 0C0901F3 */ jal func_802407CC_97E29C +/* 97E88C 80240DBC 0C0901F3 */ jal isk_05_UnkNpcAIFunc15 /* 97E890 80240DC0 0200302D */ daddu $a2, $s0, $zero glabel L80240DC4_97E894 /* 97E894 80240DC4 0260202D */ daddu $a0, $s3, $zero diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_802407CC_98FFAC.s b/ver/us/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_802407CC_98FFAC.s deleted file mode 100644 index 4dfcb04855..0000000000 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_802407CC_98FFAC.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407CC_98FFAC -/* 98FFAC 802407CC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 98FFB0 802407D0 AFB10014 */ sw $s1, 0x14($sp) -/* 98FFB4 802407D4 0080882D */ daddu $s1, $a0, $zero -/* 98FFB8 802407D8 AFBF001C */ sw $ra, 0x1c($sp) -/* 98FFBC 802407DC AFB20018 */ sw $s2, 0x18($sp) -/* 98FFC0 802407E0 AFB00010 */ sw $s0, 0x10($sp) -/* 98FFC4 802407E4 8E220148 */ lw $v0, 0x148($s1) -/* 98FFC8 802407E8 00A0902D */ daddu $s2, $a1, $zero -/* 98FFCC 802407EC 84440008 */ lh $a0, 8($v0) -/* 98FFD0 802407F0 0C00EABB */ jal get_npc_unsafe -/* 98FFD4 802407F4 00C0802D */ daddu $s0, $a2, $zero -/* 98FFD8 802407F8 0220202D */ daddu $a0, $s1, $zero -/* 98FFDC 802407FC 0240282D */ daddu $a1, $s2, $zero -/* 98FFE0 80240800 0200302D */ daddu $a2, $s0, $zero -/* 98FFE4 80240804 0C0127DF */ jal func_80049F7C -/* 98FFE8 80240808 0040802D */ daddu $s0, $v0, $zero -/* 98FFEC 8024080C 8E020000 */ lw $v0, ($s0) -/* 98FFF0 80240810 24040005 */ addiu $a0, $zero, 5 -/* 98FFF4 80240814 34420800 */ ori $v0, $v0, 0x800 -/* 98FFF8 80240818 0C00A67F */ jal rand_int -/* 98FFFC 8024081C AE020000 */ sw $v0, ($s0) -/* 990000 80240820 44820000 */ mtc1 $v0, $f0 -/* 990004 80240824 00000000 */ nop -/* 990008 80240828 46800021 */ cvt.d.w $f0, $f0 -/* 99000C 8024082C 3C014024 */ lui $at, 0x4024 -/* 990010 80240830 44811800 */ mtc1 $at, $f3 -/* 990014 80240834 44801000 */ mtc1 $zero, $f2 -/* 990018 80240838 3C013FC0 */ lui $at, 0x3fc0 -/* 99001C 8024083C 44812000 */ mtc1 $at, $f4 -/* 990020 80240840 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 990024 80240844 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 990028 80240848 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 99002C 8024084C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 990030 80240850 46220000 */ add.d $f0, $f0, $f2 -/* 990034 80240854 E6040014 */ swc1 $f4, 0x14($s0) -/* 990038 80240858 46200020 */ cvt.s.d $f0, $f0 -/* 99003C 8024085C E600001C */ swc1 $f0, 0x1c($s0) -/* 990040 80240860 8C460028 */ lw $a2, 0x28($v0) -/* 990044 80240864 0C00A720 */ jal atan2 -/* 990048 80240868 8C470030 */ lw $a3, 0x30($v0) -/* 99004C 8024086C 0200202D */ daddu $a0, $s0, $zero -/* 990050 80240870 3C05B000 */ lui $a1, 0xb000 -/* 990054 80240874 34A50017 */ ori $a1, $a1, 0x17 -/* 990058 80240878 0000302D */ daddu $a2, $zero, $zero -/* 99005C 8024087C E480000C */ swc1 $f0, 0xc($a0) -/* 990060 80240880 C6400018 */ lwc1 $f0, 0x18($s2) -/* 990064 80240884 2402000D */ addiu $v0, $zero, 0xd -/* 990068 80240888 E4800018 */ swc1 $f0, 0x18($a0) -/* 99006C 8024088C 0C012530 */ jal func_800494C0 -/* 990070 80240890 AE220070 */ sw $v0, 0x70($s1) -/* 990074 80240894 8FBF001C */ lw $ra, 0x1c($sp) -/* 990078 80240898 8FB20018 */ lw $s2, 0x18($sp) -/* 99007C 8024089C 8FB10014 */ lw $s1, 0x14($sp) -/* 990080 802408A0 8FB00010 */ lw $s0, 0x10($sp) -/* 990084 802408A4 03E00008 */ jr $ra -/* 990088 802408A8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240BF0_9903D0.s b/ver/us/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240BF0_9903D0.s index 42d169050e..4d9c5a8e7e 100644 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240BF0_9903D0.s +++ b/ver/us/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240BF0_9903D0.s @@ -124,7 +124,7 @@ glabel L80240D9C_99057C glabel L80240DB4_990594 /* 990594 80240DB4 0260202D */ daddu $a0, $s3, $zero /* 990598 80240DB8 0280282D */ daddu $a1, $s4, $zero -/* 99059C 80240DBC 0C0901F3 */ jal func_802407CC_98FFAC +/* 99059C 80240DBC 0C0901F3 */ jal isk_13_UnkNpcAIFunc15 /* 9905A0 80240DC0 0200302D */ daddu $a2, $s0, $zero glabel L80240DC4_9905A4 /* 9905A4 80240DC4 0260202D */ daddu $a0, $s3, $zero diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_14/992730/func_802407CC_992EFC.s b/ver/us/asm/nonmatchings/world/area_isk/isk_14/992730/func_802407CC_992EFC.s deleted file mode 100644 index e7142c16ab..0000000000 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_14/992730/func_802407CC_992EFC.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407CC_992EFC -/* 992EFC 802407CC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 992F00 802407D0 AFB10014 */ sw $s1, 0x14($sp) -/* 992F04 802407D4 0080882D */ daddu $s1, $a0, $zero -/* 992F08 802407D8 AFBF001C */ sw $ra, 0x1c($sp) -/* 992F0C 802407DC AFB20018 */ sw $s2, 0x18($sp) -/* 992F10 802407E0 AFB00010 */ sw $s0, 0x10($sp) -/* 992F14 802407E4 8E220148 */ lw $v0, 0x148($s1) -/* 992F18 802407E8 00A0902D */ daddu $s2, $a1, $zero -/* 992F1C 802407EC 84440008 */ lh $a0, 8($v0) -/* 992F20 802407F0 0C00EABB */ jal get_npc_unsafe -/* 992F24 802407F4 00C0802D */ daddu $s0, $a2, $zero -/* 992F28 802407F8 0220202D */ daddu $a0, $s1, $zero -/* 992F2C 802407FC 0240282D */ daddu $a1, $s2, $zero -/* 992F30 80240800 0200302D */ daddu $a2, $s0, $zero -/* 992F34 80240804 0C0127DF */ jal func_80049F7C -/* 992F38 80240808 0040802D */ daddu $s0, $v0, $zero -/* 992F3C 8024080C 8E020000 */ lw $v0, ($s0) -/* 992F40 80240810 24040005 */ addiu $a0, $zero, 5 -/* 992F44 80240814 34420800 */ ori $v0, $v0, 0x800 -/* 992F48 80240818 0C00A67F */ jal rand_int -/* 992F4C 8024081C AE020000 */ sw $v0, ($s0) -/* 992F50 80240820 44820000 */ mtc1 $v0, $f0 -/* 992F54 80240824 00000000 */ nop -/* 992F58 80240828 46800021 */ cvt.d.w $f0, $f0 -/* 992F5C 8024082C 3C014024 */ lui $at, 0x4024 -/* 992F60 80240830 44811800 */ mtc1 $at, $f3 -/* 992F64 80240834 44801000 */ mtc1 $zero, $f2 -/* 992F68 80240838 3C013FC0 */ lui $at, 0x3fc0 -/* 992F6C 8024083C 44812000 */ mtc1 $at, $f4 -/* 992F70 80240840 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 992F74 80240844 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 992F78 80240848 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 992F7C 8024084C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 992F80 80240850 46220000 */ add.d $f0, $f0, $f2 -/* 992F84 80240854 E6040014 */ swc1 $f4, 0x14($s0) -/* 992F88 80240858 46200020 */ cvt.s.d $f0, $f0 -/* 992F8C 8024085C E600001C */ swc1 $f0, 0x1c($s0) -/* 992F90 80240860 8C460028 */ lw $a2, 0x28($v0) -/* 992F94 80240864 0C00A720 */ jal atan2 -/* 992F98 80240868 8C470030 */ lw $a3, 0x30($v0) -/* 992F9C 8024086C 0200202D */ daddu $a0, $s0, $zero -/* 992FA0 80240870 3C05B000 */ lui $a1, 0xb000 -/* 992FA4 80240874 34A50017 */ ori $a1, $a1, 0x17 -/* 992FA8 80240878 0000302D */ daddu $a2, $zero, $zero -/* 992FAC 8024087C E480000C */ swc1 $f0, 0xc($a0) -/* 992FB0 80240880 C6400018 */ lwc1 $f0, 0x18($s2) -/* 992FB4 80240884 2402000D */ addiu $v0, $zero, 0xd -/* 992FB8 80240888 E4800018 */ swc1 $f0, 0x18($a0) -/* 992FBC 8024088C 0C012530 */ jal func_800494C0 -/* 992FC0 80240890 AE220070 */ sw $v0, 0x70($s1) -/* 992FC4 80240894 8FBF001C */ lw $ra, 0x1c($sp) -/* 992FC8 80240898 8FB20018 */ lw $s2, 0x18($sp) -/* 992FCC 8024089C 8FB10014 */ lw $s1, 0x14($sp) -/* 992FD0 802408A0 8FB00010 */ lw $s0, 0x10($sp) -/* 992FD4 802408A4 03E00008 */ jr $ra -/* 992FD8 802408A8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240BF0_993320.s b/ver/us/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240BF0_993320.s index 8bfd79267f..66fa113730 100644 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240BF0_993320.s +++ b/ver/us/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240BF0_993320.s @@ -124,7 +124,7 @@ glabel L80240D9C_9934CC glabel L80240DB4_9934E4 /* 9934E4 80240DB4 0260202D */ daddu $a0, $s3, $zero /* 9934E8 80240DB8 0280282D */ daddu $a1, $s4, $zero -/* 9934EC 80240DBC 0C0901F3 */ jal func_802407CC_992EFC +/* 9934EC 80240DBC 0C0901F3 */ jal isk_14_UnkNpcAIFunc15 /* 9934F0 80240DC0 0200302D */ daddu $a2, $s0, $zero glabel L80240DC4_9934F4 /* 9934F4 80240DC4 0260202D */ daddu $a0, $s3, $zero diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240B0C_B28B3C.s b/ver/us/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240B0C_B28B3C.s deleted file mode 100644 index 1b211ce6b1..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240B0C_B28B3C.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B0C_B28B3C -/* B28B3C 80240B0C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B28B40 80240B10 AFB10014 */ sw $s1, 0x14($sp) -/* B28B44 80240B14 0080882D */ daddu $s1, $a0, $zero -/* B28B48 80240B18 AFBF001C */ sw $ra, 0x1c($sp) -/* B28B4C 80240B1C AFB20018 */ sw $s2, 0x18($sp) -/* B28B50 80240B20 AFB00010 */ sw $s0, 0x10($sp) -/* B28B54 80240B24 8E220148 */ lw $v0, 0x148($s1) -/* B28B58 80240B28 00A0902D */ daddu $s2, $a1, $zero -/* B28B5C 80240B2C 84440008 */ lh $a0, 8($v0) -/* B28B60 80240B30 0C00EABB */ jal get_npc_unsafe -/* B28B64 80240B34 00C0802D */ daddu $s0, $a2, $zero -/* B28B68 80240B38 0220202D */ daddu $a0, $s1, $zero -/* B28B6C 80240B3C 0240282D */ daddu $a1, $s2, $zero -/* B28B70 80240B40 0200302D */ daddu $a2, $s0, $zero -/* B28B74 80240B44 0C0127DF */ jal func_80049F7C -/* B28B78 80240B48 0040802D */ daddu $s0, $v0, $zero -/* B28B7C 80240B4C 8E020000 */ lw $v0, ($s0) -/* B28B80 80240B50 24040005 */ addiu $a0, $zero, 5 -/* B28B84 80240B54 34420800 */ ori $v0, $v0, 0x800 -/* B28B88 80240B58 0C00A67F */ jal rand_int -/* B28B8C 80240B5C AE020000 */ sw $v0, ($s0) -/* B28B90 80240B60 44820000 */ mtc1 $v0, $f0 -/* B28B94 80240B64 00000000 */ nop -/* B28B98 80240B68 46800021 */ cvt.d.w $f0, $f0 -/* B28B9C 80240B6C 3C014024 */ lui $at, 0x4024 -/* B28BA0 80240B70 44811800 */ mtc1 $at, $f3 -/* B28BA4 80240B74 44801000 */ mtc1 $zero, $f2 -/* B28BA8 80240B78 3C013FC0 */ lui $at, 0x3fc0 -/* B28BAC 80240B7C 44812000 */ mtc1 $at, $f4 -/* B28BB0 80240B80 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* B28BB4 80240B84 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* B28BB8 80240B88 C60C0038 */ lwc1 $f12, 0x38($s0) -/* B28BBC 80240B8C C60E0040 */ lwc1 $f14, 0x40($s0) -/* B28BC0 80240B90 46220000 */ add.d $f0, $f0, $f2 -/* B28BC4 80240B94 E6040014 */ swc1 $f4, 0x14($s0) -/* B28BC8 80240B98 46200020 */ cvt.s.d $f0, $f0 -/* B28BCC 80240B9C E600001C */ swc1 $f0, 0x1c($s0) -/* B28BD0 80240BA0 8C460028 */ lw $a2, 0x28($v0) -/* B28BD4 80240BA4 0C00A720 */ jal atan2 -/* B28BD8 80240BA8 8C470030 */ lw $a3, 0x30($v0) -/* B28BDC 80240BAC 0200202D */ daddu $a0, $s0, $zero -/* B28BE0 80240BB0 3C05B000 */ lui $a1, 0xb000 -/* B28BE4 80240BB4 34A50017 */ ori $a1, $a1, 0x17 -/* B28BE8 80240BB8 0000302D */ daddu $a2, $zero, $zero -/* B28BEC 80240BBC E480000C */ swc1 $f0, 0xc($a0) -/* B28BF0 80240BC0 C6400018 */ lwc1 $f0, 0x18($s2) -/* B28BF4 80240BC4 2402000D */ addiu $v0, $zero, 0xd -/* B28BF8 80240BC8 E4800018 */ swc1 $f0, 0x18($a0) -/* B28BFC 80240BCC 0C012530 */ jal func_800494C0 -/* B28C00 80240BD0 AE220070 */ sw $v0, 0x70($s1) -/* B28C04 80240BD4 8FBF001C */ lw $ra, 0x1c($sp) -/* B28C08 80240BD8 8FB20018 */ lw $s2, 0x18($sp) -/* B28C0C 80240BDC 8FB10014 */ lw $s1, 0x14($sp) -/* B28C10 80240BE0 8FB00010 */ lw $s0, 0x10($sp) -/* B28C14 80240BE4 03E00008 */ jr $ra -/* B28C18 80240BE8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240F30_B28F60.s b/ver/us/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240F30_B28F60.s index 8d723cbfd5..339f7a1475 100644 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240F30_B28F60.s +++ b/ver/us/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240F30_B28F60.s @@ -124,7 +124,7 @@ glabel L802410DC_B2910C glabel L802410F4_B29124 /* B29124 802410F4 0260202D */ daddu $a0, $s3, $zero /* B29128 802410F8 0280282D */ daddu $a1, $s4, $zero -/* B2912C 802410FC 0C0902C3 */ jal func_80240B0C_B28B3C +/* B2912C 802410FC 0C0902C3 */ jal jan_01_UnkNpcAIFunc15 /* B29130 80241100 0200302D */ daddu $a2, $s0, $zero glabel L80241104_B29134 /* B29134 80241104 0260202D */ daddu $a0, $s3, $zero diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241070_B4BAE0.s b/ver/us/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241070_B4BAE0.s deleted file mode 100644 index 52c7fb7461..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241070_B4BAE0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241070_B4BAE0 -/* B4BAE0 80241070 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B4BAE4 80241074 AFB10014 */ sw $s1, 0x14($sp) -/* B4BAE8 80241078 0080882D */ daddu $s1, $a0, $zero -/* B4BAEC 8024107C AFBF001C */ sw $ra, 0x1c($sp) -/* B4BAF0 80241080 AFB20018 */ sw $s2, 0x18($sp) -/* B4BAF4 80241084 AFB00010 */ sw $s0, 0x10($sp) -/* B4BAF8 80241088 8E220148 */ lw $v0, 0x148($s1) -/* B4BAFC 8024108C 00A0902D */ daddu $s2, $a1, $zero -/* B4BB00 80241090 84440008 */ lh $a0, 8($v0) -/* B4BB04 80241094 0C00EABB */ jal get_npc_unsafe -/* B4BB08 80241098 00C0802D */ daddu $s0, $a2, $zero -/* B4BB0C 8024109C 0220202D */ daddu $a0, $s1, $zero -/* B4BB10 802410A0 0240282D */ daddu $a1, $s2, $zero -/* B4BB14 802410A4 0200302D */ daddu $a2, $s0, $zero -/* B4BB18 802410A8 0C0127DF */ jal func_80049F7C -/* B4BB1C 802410AC 0040802D */ daddu $s0, $v0, $zero -/* B4BB20 802410B0 8E020000 */ lw $v0, ($s0) -/* B4BB24 802410B4 24040005 */ addiu $a0, $zero, 5 -/* B4BB28 802410B8 34420800 */ ori $v0, $v0, 0x800 -/* B4BB2C 802410BC 0C00A67F */ jal rand_int -/* B4BB30 802410C0 AE020000 */ sw $v0, ($s0) -/* B4BB34 802410C4 44820000 */ mtc1 $v0, $f0 -/* B4BB38 802410C8 00000000 */ nop -/* B4BB3C 802410CC 46800021 */ cvt.d.w $f0, $f0 -/* B4BB40 802410D0 3C014024 */ lui $at, 0x4024 -/* B4BB44 802410D4 44811800 */ mtc1 $at, $f3 -/* B4BB48 802410D8 44801000 */ mtc1 $zero, $f2 -/* B4BB4C 802410DC 3C013FC0 */ lui $at, 0x3fc0 -/* B4BB50 802410E0 44812000 */ mtc1 $at, $f4 -/* B4BB54 802410E4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* B4BB58 802410E8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* B4BB5C 802410EC C60C0038 */ lwc1 $f12, 0x38($s0) -/* B4BB60 802410F0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* B4BB64 802410F4 46220000 */ add.d $f0, $f0, $f2 -/* B4BB68 802410F8 E6040014 */ swc1 $f4, 0x14($s0) -/* B4BB6C 802410FC 46200020 */ cvt.s.d $f0, $f0 -/* B4BB70 80241100 E600001C */ swc1 $f0, 0x1c($s0) -/* B4BB74 80241104 8C460028 */ lw $a2, 0x28($v0) -/* B4BB78 80241108 0C00A720 */ jal atan2 -/* B4BB7C 8024110C 8C470030 */ lw $a3, 0x30($v0) -/* B4BB80 80241110 0200202D */ daddu $a0, $s0, $zero -/* B4BB84 80241114 3C05B000 */ lui $a1, 0xb000 -/* B4BB88 80241118 34A50017 */ ori $a1, $a1, 0x17 -/* B4BB8C 8024111C 0000302D */ daddu $a2, $zero, $zero -/* B4BB90 80241120 E480000C */ swc1 $f0, 0xc($a0) -/* B4BB94 80241124 C6400018 */ lwc1 $f0, 0x18($s2) -/* B4BB98 80241128 2402000D */ addiu $v0, $zero, 0xd -/* B4BB9C 8024112C E4800018 */ swc1 $f0, 0x18($a0) -/* B4BBA0 80241130 0C012530 */ jal func_800494C0 -/* B4BBA4 80241134 AE220070 */ sw $v0, 0x70($s1) -/* B4BBA8 80241138 8FBF001C */ lw $ra, 0x1c($sp) -/* B4BBAC 8024113C 8FB20018 */ lw $s2, 0x18($sp) -/* B4BBB0 80241140 8FB10014 */ lw $s1, 0x14($sp) -/* B4BBB4 80241144 8FB00010 */ lw $s0, 0x10($sp) -/* B4BBB8 80241148 03E00008 */ jr $ra -/* B4BBBC 8024114C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241494_B4BF04.s b/ver/us/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241494_B4BF04.s index 0f2288c410..23bc096aa0 100644 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241494_B4BF04.s +++ b/ver/us/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241494_B4BF04.s @@ -124,7 +124,7 @@ glabel L80241640_B4C0B0 glabel L80241658_B4C0C8 /* B4C0C8 80241658 0260202D */ daddu $a0, $s3, $zero /* B4C0CC 8024165C 0280282D */ daddu $a1, $s4, $zero -/* B4C0D0 80241660 0C09041C */ jal func_80241070_B4BAE0 +/* B4C0D0 80241660 0C09041C */ jal jan_05_UnkNpcAIFunc15 /* B4C0D4 80241664 0200302D */ daddu $a2, $s0, $zero glabel L80241668_B4C0D8 /* B4C0D8 80241668 0260202D */ daddu $a0, $s3, $zero diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80240F0C_B5373C.s b/ver/us/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80240F0C_B5373C.s deleted file mode 100644 index 843459ec1a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80240F0C_B5373C.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F0C_B5373C -/* B5373C 80240F0C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B53740 80240F10 AFB10014 */ sw $s1, 0x14($sp) -/* B53744 80240F14 0080882D */ daddu $s1, $a0, $zero -/* B53748 80240F18 AFBF001C */ sw $ra, 0x1c($sp) -/* B5374C 80240F1C AFB20018 */ sw $s2, 0x18($sp) -/* B53750 80240F20 AFB00010 */ sw $s0, 0x10($sp) -/* B53754 80240F24 8E220148 */ lw $v0, 0x148($s1) -/* B53758 80240F28 00A0902D */ daddu $s2, $a1, $zero -/* B5375C 80240F2C 84440008 */ lh $a0, 8($v0) -/* B53760 80240F30 0C00EABB */ jal get_npc_unsafe -/* B53764 80240F34 00C0802D */ daddu $s0, $a2, $zero -/* B53768 80240F38 0220202D */ daddu $a0, $s1, $zero -/* B5376C 80240F3C 0240282D */ daddu $a1, $s2, $zero -/* B53770 80240F40 0200302D */ daddu $a2, $s0, $zero -/* B53774 80240F44 0C0127DF */ jal func_80049F7C -/* B53778 80240F48 0040802D */ daddu $s0, $v0, $zero -/* B5377C 80240F4C 8E020000 */ lw $v0, ($s0) -/* B53780 80240F50 24040005 */ addiu $a0, $zero, 5 -/* B53784 80240F54 34420800 */ ori $v0, $v0, 0x800 -/* B53788 80240F58 0C00A67F */ jal rand_int -/* B5378C 80240F5C AE020000 */ sw $v0, ($s0) -/* B53790 80240F60 44820000 */ mtc1 $v0, $f0 -/* B53794 80240F64 00000000 */ nop -/* B53798 80240F68 46800021 */ cvt.d.w $f0, $f0 -/* B5379C 80240F6C 3C014024 */ lui $at, 0x4024 -/* B537A0 80240F70 44811800 */ mtc1 $at, $f3 -/* B537A4 80240F74 44801000 */ mtc1 $zero, $f2 -/* B537A8 80240F78 3C013FC0 */ lui $at, 0x3fc0 -/* B537AC 80240F7C 44812000 */ mtc1 $at, $f4 -/* B537B0 80240F80 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* B537B4 80240F84 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* B537B8 80240F88 C60C0038 */ lwc1 $f12, 0x38($s0) -/* B537BC 80240F8C C60E0040 */ lwc1 $f14, 0x40($s0) -/* B537C0 80240F90 46220000 */ add.d $f0, $f0, $f2 -/* B537C4 80240F94 E6040014 */ swc1 $f4, 0x14($s0) -/* B537C8 80240F98 46200020 */ cvt.s.d $f0, $f0 -/* B537CC 80240F9C E600001C */ swc1 $f0, 0x1c($s0) -/* B537D0 80240FA0 8C460028 */ lw $a2, 0x28($v0) -/* B537D4 80240FA4 0C00A720 */ jal atan2 -/* B537D8 80240FA8 8C470030 */ lw $a3, 0x30($v0) -/* B537DC 80240FAC 0200202D */ daddu $a0, $s0, $zero -/* B537E0 80240FB0 3C05B000 */ lui $a1, 0xb000 -/* B537E4 80240FB4 34A50017 */ ori $a1, $a1, 0x17 -/* B537E8 80240FB8 0000302D */ daddu $a2, $zero, $zero -/* B537EC 80240FBC E480000C */ swc1 $f0, 0xc($a0) -/* B537F0 80240FC0 C6400018 */ lwc1 $f0, 0x18($s2) -/* B537F4 80240FC4 2402000D */ addiu $v0, $zero, 0xd -/* B537F8 80240FC8 E4800018 */ swc1 $f0, 0x18($a0) -/* B537FC 80240FCC 0C012530 */ jal func_800494C0 -/* B53800 80240FD0 AE220070 */ sw $v0, 0x70($s1) -/* B53804 80240FD4 8FBF001C */ lw $ra, 0x1c($sp) -/* B53808 80240FD8 8FB20018 */ lw $s2, 0x18($sp) -/* B5380C 80240FDC 8FB10014 */ lw $s1, 0x14($sp) -/* B53810 80240FE0 8FB00010 */ lw $s0, 0x10($sp) -/* B53814 80240FE4 03E00008 */ jr $ra -/* B53818 80240FE8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241330_B53B60.s b/ver/us/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241330_B53B60.s index a18b8154ac..96f50410c6 100644 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241330_B53B60.s +++ b/ver/us/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241330_B53B60.s @@ -124,7 +124,7 @@ glabel L802414DC_B53D0C glabel L802414F4_B53D24 /* B53D24 802414F4 0260202D */ daddu $a0, $s3, $zero /* B53D28 802414F8 0280282D */ daddu $a1, $s4, $zero -/* B53D2C 802414FC 0C0903C3 */ jal func_80240F0C_B5373C +/* B53D2C 802414FC 0C0903C3 */ jal jan_06_UnkNpcAIFunc15 /* B53D30 80241500 0200302D */ daddu $a2, $s0, $zero glabel L80241504_B53D34 /* B53D34 80241504 0260202D */ daddu $a0, $s3, $zero diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240ADC_B6CE6C.s b/ver/us/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240ADC_B6CE6C.s deleted file mode 100644 index 8e55ca39c8..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240ADC_B6CE6C.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240ADC_B6CE6C -/* B6CE6C 80240ADC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B6CE70 80240AE0 AFB10014 */ sw $s1, 0x14($sp) -/* B6CE74 80240AE4 0080882D */ daddu $s1, $a0, $zero -/* B6CE78 80240AE8 AFBF001C */ sw $ra, 0x1c($sp) -/* B6CE7C 80240AEC AFB20018 */ sw $s2, 0x18($sp) -/* B6CE80 80240AF0 AFB00010 */ sw $s0, 0x10($sp) -/* B6CE84 80240AF4 8E220148 */ lw $v0, 0x148($s1) -/* B6CE88 80240AF8 00A0902D */ daddu $s2, $a1, $zero -/* B6CE8C 80240AFC 84440008 */ lh $a0, 8($v0) -/* B6CE90 80240B00 0C00EABB */ jal get_npc_unsafe -/* B6CE94 80240B04 00C0802D */ daddu $s0, $a2, $zero -/* B6CE98 80240B08 0220202D */ daddu $a0, $s1, $zero -/* B6CE9C 80240B0C 0240282D */ daddu $a1, $s2, $zero -/* B6CEA0 80240B10 0200302D */ daddu $a2, $s0, $zero -/* B6CEA4 80240B14 0C0127DF */ jal func_80049F7C -/* B6CEA8 80240B18 0040802D */ daddu $s0, $v0, $zero -/* B6CEAC 80240B1C 8E020000 */ lw $v0, ($s0) -/* B6CEB0 80240B20 24040005 */ addiu $a0, $zero, 5 -/* B6CEB4 80240B24 34420800 */ ori $v0, $v0, 0x800 -/* B6CEB8 80240B28 0C00A67F */ jal rand_int -/* B6CEBC 80240B2C AE020000 */ sw $v0, ($s0) -/* B6CEC0 80240B30 44820000 */ mtc1 $v0, $f0 -/* B6CEC4 80240B34 00000000 */ nop -/* B6CEC8 80240B38 46800021 */ cvt.d.w $f0, $f0 -/* B6CECC 80240B3C 3C014024 */ lui $at, 0x4024 -/* B6CED0 80240B40 44811800 */ mtc1 $at, $f3 -/* B6CED4 80240B44 44801000 */ mtc1 $zero, $f2 -/* B6CED8 80240B48 3C013FC0 */ lui $at, 0x3fc0 -/* B6CEDC 80240B4C 44812000 */ mtc1 $at, $f4 -/* B6CEE0 80240B50 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* B6CEE4 80240B54 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* B6CEE8 80240B58 C60C0038 */ lwc1 $f12, 0x38($s0) -/* B6CEEC 80240B5C C60E0040 */ lwc1 $f14, 0x40($s0) -/* B6CEF0 80240B60 46220000 */ add.d $f0, $f0, $f2 -/* B6CEF4 80240B64 E6040014 */ swc1 $f4, 0x14($s0) -/* B6CEF8 80240B68 46200020 */ cvt.s.d $f0, $f0 -/* B6CEFC 80240B6C E600001C */ swc1 $f0, 0x1c($s0) -/* B6CF00 80240B70 8C460028 */ lw $a2, 0x28($v0) -/* B6CF04 80240B74 0C00A720 */ jal atan2 -/* B6CF08 80240B78 8C470030 */ lw $a3, 0x30($v0) -/* B6CF0C 80240B7C 0200202D */ daddu $a0, $s0, $zero -/* B6CF10 80240B80 3C05B000 */ lui $a1, 0xb000 -/* B6CF14 80240B84 34A50017 */ ori $a1, $a1, 0x17 -/* B6CF18 80240B88 0000302D */ daddu $a2, $zero, $zero -/* B6CF1C 80240B8C E480000C */ swc1 $f0, 0xc($a0) -/* B6CF20 80240B90 C6400018 */ lwc1 $f0, 0x18($s2) -/* B6CF24 80240B94 2402000D */ addiu $v0, $zero, 0xd -/* B6CF28 80240B98 E4800018 */ swc1 $f0, 0x18($a0) -/* B6CF2C 80240B9C 0C012530 */ jal func_800494C0 -/* B6CF30 80240BA0 AE220070 */ sw $v0, 0x70($s1) -/* B6CF34 80240BA4 8FBF001C */ lw $ra, 0x1c($sp) -/* B6CF38 80240BA8 8FB20018 */ lw $s2, 0x18($sp) -/* B6CF3C 80240BAC 8FB10014 */ lw $s1, 0x14($sp) -/* B6CF40 80240BB0 8FB00010 */ lw $s0, 0x10($sp) -/* B6CF44 80240BB4 03E00008 */ jr $ra -/* B6CF48 80240BB8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240F00_B6D290.s b/ver/us/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240F00_B6D290.s index 25f68fe738..b15437e058 100644 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240F00_B6D290.s +++ b/ver/us/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240F00_B6D290.s @@ -124,7 +124,7 @@ glabel L802410AC_B6D43C glabel L802410C4_B6D454 /* B6D454 802410C4 0260202D */ daddu $a0, $s3, $zero /* B6D458 802410C8 0280282D */ daddu $a1, $s4, $zero -/* B6D45C 802410CC 0C0902B7 */ jal func_80240ADC_B6CE6C +/* B6D45C 802410CC 0C0902B7 */ jal jan_10_UnkNpcAIFunc15 /* B6D460 802410D0 0200302D */ daddu $a2, $s0, $zero glabel L802410D4_B6D464 /* B6D464 802410D4 0260202D */ daddu $a0, $s3, $zero diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_80240C8C_B7ACDC.s b/ver/us/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_80240C8C_B7ACDC.s deleted file mode 100644 index 58966a29f0..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_80240C8C_B7ACDC.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C8C_B7ACDC -/* B7ACDC 80240C8C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B7ACE0 80240C90 AFB10014 */ sw $s1, 0x14($sp) -/* B7ACE4 80240C94 0080882D */ daddu $s1, $a0, $zero -/* B7ACE8 80240C98 AFBF001C */ sw $ra, 0x1c($sp) -/* B7ACEC 80240C9C AFB20018 */ sw $s2, 0x18($sp) -/* B7ACF0 80240CA0 AFB00010 */ sw $s0, 0x10($sp) -/* B7ACF4 80240CA4 8E220148 */ lw $v0, 0x148($s1) -/* B7ACF8 80240CA8 00A0902D */ daddu $s2, $a1, $zero -/* B7ACFC 80240CAC 84440008 */ lh $a0, 8($v0) -/* B7AD00 80240CB0 0C00EABB */ jal get_npc_unsafe -/* B7AD04 80240CB4 00C0802D */ daddu $s0, $a2, $zero -/* B7AD08 80240CB8 0220202D */ daddu $a0, $s1, $zero -/* B7AD0C 80240CBC 0240282D */ daddu $a1, $s2, $zero -/* B7AD10 80240CC0 0200302D */ daddu $a2, $s0, $zero -/* B7AD14 80240CC4 0C0127DF */ jal func_80049F7C -/* B7AD18 80240CC8 0040802D */ daddu $s0, $v0, $zero -/* B7AD1C 80240CCC 8E020000 */ lw $v0, ($s0) -/* B7AD20 80240CD0 24040005 */ addiu $a0, $zero, 5 -/* B7AD24 80240CD4 34420800 */ ori $v0, $v0, 0x800 -/* B7AD28 80240CD8 0C00A67F */ jal rand_int -/* B7AD2C 80240CDC AE020000 */ sw $v0, ($s0) -/* B7AD30 80240CE0 44820000 */ mtc1 $v0, $f0 -/* B7AD34 80240CE4 00000000 */ nop -/* B7AD38 80240CE8 46800021 */ cvt.d.w $f0, $f0 -/* B7AD3C 80240CEC 3C014024 */ lui $at, 0x4024 -/* B7AD40 80240CF0 44811800 */ mtc1 $at, $f3 -/* B7AD44 80240CF4 44801000 */ mtc1 $zero, $f2 -/* B7AD48 80240CF8 3C013FC0 */ lui $at, 0x3fc0 -/* B7AD4C 80240CFC 44812000 */ mtc1 $at, $f4 -/* B7AD50 80240D00 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* B7AD54 80240D04 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* B7AD58 80240D08 C60C0038 */ lwc1 $f12, 0x38($s0) -/* B7AD5C 80240D0C C60E0040 */ lwc1 $f14, 0x40($s0) -/* B7AD60 80240D10 46220000 */ add.d $f0, $f0, $f2 -/* B7AD64 80240D14 E6040014 */ swc1 $f4, 0x14($s0) -/* B7AD68 80240D18 46200020 */ cvt.s.d $f0, $f0 -/* B7AD6C 80240D1C E600001C */ swc1 $f0, 0x1c($s0) -/* B7AD70 80240D20 8C460028 */ lw $a2, 0x28($v0) -/* B7AD74 80240D24 0C00A720 */ jal atan2 -/* B7AD78 80240D28 8C470030 */ lw $a3, 0x30($v0) -/* B7AD7C 80240D2C 0200202D */ daddu $a0, $s0, $zero -/* B7AD80 80240D30 3C05B000 */ lui $a1, 0xb000 -/* B7AD84 80240D34 34A50017 */ ori $a1, $a1, 0x17 -/* B7AD88 80240D38 0000302D */ daddu $a2, $zero, $zero -/* B7AD8C 80240D3C E480000C */ swc1 $f0, 0xc($a0) -/* B7AD90 80240D40 C6400018 */ lwc1 $f0, 0x18($s2) -/* B7AD94 80240D44 2402000D */ addiu $v0, $zero, 0xd -/* B7AD98 80240D48 E4800018 */ swc1 $f0, 0x18($a0) -/* B7AD9C 80240D4C 0C012530 */ jal func_800494C0 -/* B7ADA0 80240D50 AE220070 */ sw $v0, 0x70($s1) -/* B7ADA4 80240D54 8FBF001C */ lw $ra, 0x1c($sp) -/* B7ADA8 80240D58 8FB20018 */ lw $s2, 0x18($sp) -/* B7ADAC 80240D5C 8FB10014 */ lw $s1, 0x14($sp) -/* B7ADB0 80240D60 8FB00010 */ lw $s0, 0x10($sp) -/* B7ADB4 80240D64 03E00008 */ jr $ra -/* B7ADB8 80240D68 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_802410B0_B7B100.s b/ver/us/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_802410B0_B7B100.s index b86180a5fa..6d692d03e2 100644 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_802410B0_B7B100.s +++ b/ver/us/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_802410B0_B7B100.s @@ -124,7 +124,7 @@ glabel L8024125C_B7B2AC glabel L80241274_B7B2C4 /* B7B2C4 80241274 0260202D */ daddu $a0, $s3, $zero /* B7B2C8 80241278 0280282D */ daddu $a1, $s4, $zero -/* B7B2CC 8024127C 0C090323 */ jal func_80240C8C_B7ACDC +/* B7B2CC 8024127C 0C090323 */ jal jan_14_UnkNpcAIFunc15 /* B7B2D0 80241280 0200302D */ daddu $a2, $s0, $zero glabel L80241284_B7B2D4 /* B7B2D4 80241284 0260202D */ daddu $a0, $s3, $zero diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_134/AA94B0/func_80240564_AA9504.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_134/AA94B0/func_80240564_AA9504.s deleted file mode 100644 index 9b1f2abd84..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_134/AA94B0/func_80240564_AA9504.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240564_AA9504 -/* AA9504 80240564 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* AA9508 80240568 AFB10014 */ sw $s1, 0x14($sp) -/* AA950C 8024056C 0080882D */ daddu $s1, $a0, $zero -/* AA9510 80240570 AFBF0020 */ sw $ra, 0x20($sp) -/* AA9514 80240574 AFB3001C */ sw $s3, 0x1c($sp) -/* AA9518 80240578 AFB20018 */ sw $s2, 0x18($sp) -/* AA951C 8024057C AFB00010 */ sw $s0, 0x10($sp) -/* AA9520 80240580 8E30000C */ lw $s0, 0xc($s1) -/* AA9524 80240584 8E050000 */ lw $a1, ($s0) -/* AA9528 80240588 0C0B1EAF */ jal get_variable -/* AA952C 8024058C 26100004 */ addiu $s0, $s0, 4 -/* AA9530 80240590 8E050000 */ lw $a1, ($s0) -/* AA9534 80240594 26100004 */ addiu $s0, $s0, 4 -/* AA9538 80240598 0220202D */ daddu $a0, $s1, $zero -/* AA953C 8024059C 0C0B1EAF */ jal get_variable -/* AA9540 802405A0 0040982D */ daddu $s3, $v0, $zero -/* AA9544 802405A4 8E050000 */ lw $a1, ($s0) -/* AA9548 802405A8 26100004 */ addiu $s0, $s0, 4 -/* AA954C 802405AC 0220202D */ daddu $a0, $s1, $zero -/* AA9550 802405B0 0C0B1EAF */ jal get_variable -/* AA9554 802405B4 0040902D */ daddu $s2, $v0, $zero -/* AA9558 802405B8 0220202D */ daddu $a0, $s1, $zero -/* AA955C 802405BC 8E050000 */ lw $a1, ($s0) -/* AA9560 802405C0 0C0B1EAF */ jal get_variable -/* AA9564 802405C4 0040882D */ daddu $s1, $v0, $zero -/* AA9568 802405C8 0260202D */ daddu $a0, $s3, $zero -/* AA956C 802405CC 0C04417A */ jal get_entity_by_index -/* AA9570 802405D0 0040802D */ daddu $s0, $v0, $zero -/* AA9574 802405D4 0040182D */ daddu $v1, $v0, $zero -/* AA9578 802405D8 44920000 */ mtc1 $s2, $f0 -/* AA957C 802405DC 00000000 */ nop -/* AA9580 802405E0 46800020 */ cvt.s.w $f0, $f0 -/* AA9584 802405E4 E4600048 */ swc1 $f0, 0x48($v1) -/* AA9588 802405E8 44910000 */ mtc1 $s1, $f0 -/* AA958C 802405EC 00000000 */ nop -/* AA9590 802405F0 46800020 */ cvt.s.w $f0, $f0 -/* AA9594 802405F4 E460004C */ swc1 $f0, 0x4c($v1) -/* AA9598 802405F8 44900000 */ mtc1 $s0, $f0 -/* AA959C 802405FC 00000000 */ nop -/* AA95A0 80240600 46800020 */ cvt.s.w $f0, $f0 -/* AA95A4 80240604 E4600050 */ swc1 $f0, 0x50($v1) -/* AA95A8 80240608 8FBF0020 */ lw $ra, 0x20($sp) -/* AA95AC 8024060C 8FB3001C */ lw $s3, 0x1c($sp) -/* AA95B0 80240610 8FB20018 */ lw $s2, 0x18($sp) -/* AA95B4 80240614 8FB10014 */ lw $s1, 0x14($sp) -/* AA95B8 80240618 8FB00010 */ lw $s0, 0x10($sp) -/* AA95BC 8024061C 24020002 */ addiu $v0, $zero, 2 -/* AA95C0 80240620 03E00008 */ jr $ra -/* AA95C4 80240624 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_8024083C_B9843C.s b/ver/us/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_8024083C_B9843C.s deleted file mode 100644 index 7bb4d84aef..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_8024083C_B9843C.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024083C_B9843C -/* B9843C 8024083C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B98440 80240840 AFB10014 */ sw $s1, 0x14($sp) -/* B98444 80240844 0080882D */ daddu $s1, $a0, $zero -/* B98448 80240848 AFBF001C */ sw $ra, 0x1c($sp) -/* B9844C 8024084C AFB20018 */ sw $s2, 0x18($sp) -/* B98450 80240850 AFB00010 */ sw $s0, 0x10($sp) -/* B98454 80240854 8E220148 */ lw $v0, 0x148($s1) -/* B98458 80240858 00A0902D */ daddu $s2, $a1, $zero -/* B9845C 8024085C 84440008 */ lh $a0, 8($v0) -/* B98460 80240860 0C00EABB */ jal get_npc_unsafe -/* B98464 80240864 00C0802D */ daddu $s0, $a2, $zero -/* B98468 80240868 0220202D */ daddu $a0, $s1, $zero -/* B9846C 8024086C 0240282D */ daddu $a1, $s2, $zero -/* B98470 80240870 0200302D */ daddu $a2, $s0, $zero -/* B98474 80240874 0C0127DF */ jal func_80049F7C -/* B98478 80240878 0040802D */ daddu $s0, $v0, $zero -/* B9847C 8024087C 8E020000 */ lw $v0, ($s0) -/* B98480 80240880 24040005 */ addiu $a0, $zero, 5 -/* B98484 80240884 34420800 */ ori $v0, $v0, 0x800 -/* B98488 80240888 0C00A67F */ jal rand_int -/* B9848C 8024088C AE020000 */ sw $v0, ($s0) -/* B98490 80240890 44820000 */ mtc1 $v0, $f0 -/* B98494 80240894 00000000 */ nop -/* B98498 80240898 46800021 */ cvt.d.w $f0, $f0 -/* B9849C 8024089C 3C014024 */ lui $at, 0x4024 -/* B984A0 802408A0 44811800 */ mtc1 $at, $f3 -/* B984A4 802408A4 44801000 */ mtc1 $zero, $f2 -/* B984A8 802408A8 3C013FC0 */ lui $at, 0x3fc0 -/* B984AC 802408AC 44812000 */ mtc1 $at, $f4 -/* B984B0 802408B0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* B984B4 802408B4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* B984B8 802408B8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* B984BC 802408BC C60E0040 */ lwc1 $f14, 0x40($s0) -/* B984C0 802408C0 46220000 */ add.d $f0, $f0, $f2 -/* B984C4 802408C4 E6040014 */ swc1 $f4, 0x14($s0) -/* B984C8 802408C8 46200020 */ cvt.s.d $f0, $f0 -/* B984CC 802408CC E600001C */ swc1 $f0, 0x1c($s0) -/* B984D0 802408D0 8C460028 */ lw $a2, 0x28($v0) -/* B984D4 802408D4 0C00A720 */ jal atan2 -/* B984D8 802408D8 8C470030 */ lw $a3, 0x30($v0) -/* B984DC 802408DC 0200202D */ daddu $a0, $s0, $zero -/* B984E0 802408E0 3C05B000 */ lui $a1, 0xb000 -/* B984E4 802408E4 34A50017 */ ori $a1, $a1, 0x17 -/* B984E8 802408E8 0000302D */ daddu $a2, $zero, $zero -/* B984EC 802408EC E480000C */ swc1 $f0, 0xc($a0) -/* B984F0 802408F0 C6400018 */ lwc1 $f0, 0x18($s2) -/* B984F4 802408F4 2402000D */ addiu $v0, $zero, 0xd -/* B984F8 802408F8 E4800018 */ swc1 $f0, 0x18($a0) -/* B984FC 802408FC 0C012530 */ jal func_800494C0 -/* B98500 80240900 AE220070 */ sw $v0, 0x70($s1) -/* B98504 80240904 8FBF001C */ lw $ra, 0x1c($sp) -/* B98508 80240908 8FB20018 */ lw $s2, 0x18($sp) -/* B9850C 8024090C 8FB10014 */ lw $s1, 0x14($sp) -/* B98510 80240910 8FB00010 */ lw $s0, 0x10($sp) -/* B98514 80240914 03E00008 */ jr $ra -/* B98518 80240918 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240C60_B98860.s b/ver/us/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240C60_B98860.s index 50a7353ca9..5bc243d7b2 100644 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240C60_B98860.s +++ b/ver/us/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240C60_B98860.s @@ -124,7 +124,7 @@ glabel L80240E0C_B98A0C glabel L80240E24_B98A24 /* B98A24 80240E24 0260202D */ daddu $a0, $s3, $zero /* B98A28 80240E28 0280282D */ daddu $a1, $s4, $zero -/* B98A2C 80240E2C 0C09020F */ jal func_8024083C_B9843C +/* B98A2C 80240E2C 0C09020F */ jal mim_02_UnkNpcAIFunc15 /* B98A30 80240E30 0200302D */ daddu $a2, $s0, $zero glabel L80240E34_B98A34 /* B98A34 80240E34 0260202D */ daddu $a0, $s3, $zero diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_802409CC_B9E32C.s b/ver/us/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_802409CC_B9E32C.s deleted file mode 100644 index 4e78502c1c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_802409CC_B9E32C.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409CC_B9E32C -/* B9E32C 802409CC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B9E330 802409D0 AFB10014 */ sw $s1, 0x14($sp) -/* B9E334 802409D4 0080882D */ daddu $s1, $a0, $zero -/* B9E338 802409D8 AFBF001C */ sw $ra, 0x1c($sp) -/* B9E33C 802409DC AFB20018 */ sw $s2, 0x18($sp) -/* B9E340 802409E0 AFB00010 */ sw $s0, 0x10($sp) -/* B9E344 802409E4 8E220148 */ lw $v0, 0x148($s1) -/* B9E348 802409E8 00A0902D */ daddu $s2, $a1, $zero -/* B9E34C 802409EC 84440008 */ lh $a0, 8($v0) -/* B9E350 802409F0 0C00EABB */ jal get_npc_unsafe -/* B9E354 802409F4 00C0802D */ daddu $s0, $a2, $zero -/* B9E358 802409F8 0220202D */ daddu $a0, $s1, $zero -/* B9E35C 802409FC 0240282D */ daddu $a1, $s2, $zero -/* B9E360 80240A00 0200302D */ daddu $a2, $s0, $zero -/* B9E364 80240A04 0C0127DF */ jal func_80049F7C -/* B9E368 80240A08 0040802D */ daddu $s0, $v0, $zero -/* B9E36C 80240A0C 8E020000 */ lw $v0, ($s0) -/* B9E370 80240A10 24040005 */ addiu $a0, $zero, 5 -/* B9E374 80240A14 34420800 */ ori $v0, $v0, 0x800 -/* B9E378 80240A18 0C00A67F */ jal rand_int -/* B9E37C 80240A1C AE020000 */ sw $v0, ($s0) -/* B9E380 80240A20 44820000 */ mtc1 $v0, $f0 -/* B9E384 80240A24 00000000 */ nop -/* B9E388 80240A28 46800021 */ cvt.d.w $f0, $f0 -/* B9E38C 80240A2C 3C014024 */ lui $at, 0x4024 -/* B9E390 80240A30 44811800 */ mtc1 $at, $f3 -/* B9E394 80240A34 44801000 */ mtc1 $zero, $f2 -/* B9E398 80240A38 3C013FC0 */ lui $at, 0x3fc0 -/* B9E39C 80240A3C 44812000 */ mtc1 $at, $f4 -/* B9E3A0 80240A40 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* B9E3A4 80240A44 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* B9E3A8 80240A48 C60C0038 */ lwc1 $f12, 0x38($s0) -/* B9E3AC 80240A4C C60E0040 */ lwc1 $f14, 0x40($s0) -/* B9E3B0 80240A50 46220000 */ add.d $f0, $f0, $f2 -/* B9E3B4 80240A54 E6040014 */ swc1 $f4, 0x14($s0) -/* B9E3B8 80240A58 46200020 */ cvt.s.d $f0, $f0 -/* B9E3BC 80240A5C E600001C */ swc1 $f0, 0x1c($s0) -/* B9E3C0 80240A60 8C460028 */ lw $a2, 0x28($v0) -/* B9E3C4 80240A64 0C00A720 */ jal atan2 -/* B9E3C8 80240A68 8C470030 */ lw $a3, 0x30($v0) -/* B9E3CC 80240A6C 0200202D */ daddu $a0, $s0, $zero -/* B9E3D0 80240A70 3C05B000 */ lui $a1, 0xb000 -/* B9E3D4 80240A74 34A50017 */ ori $a1, $a1, 0x17 -/* B9E3D8 80240A78 0000302D */ daddu $a2, $zero, $zero -/* B9E3DC 80240A7C E480000C */ swc1 $f0, 0xc($a0) -/* B9E3E0 80240A80 C6400018 */ lwc1 $f0, 0x18($s2) -/* B9E3E4 80240A84 2402000D */ addiu $v0, $zero, 0xd -/* B9E3E8 80240A88 E4800018 */ swc1 $f0, 0x18($a0) -/* B9E3EC 80240A8C 0C012530 */ jal func_800494C0 -/* B9E3F0 80240A90 AE220070 */ sw $v0, 0x70($s1) -/* B9E3F4 80240A94 8FBF001C */ lw $ra, 0x1c($sp) -/* B9E3F8 80240A98 8FB20018 */ lw $s2, 0x18($sp) -/* B9E3FC 80240A9C 8FB10014 */ lw $s1, 0x14($sp) -/* B9E400 80240AA0 8FB00010 */ lw $s0, 0x10($sp) -/* B9E404 80240AA4 03E00008 */ jr $ra -/* B9E408 80240AA8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240DF0_B9E750.s b/ver/us/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240DF0_B9E750.s index 6317d735de..39cc89544e 100644 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240DF0_B9E750.s +++ b/ver/us/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240DF0_B9E750.s @@ -124,7 +124,7 @@ glabel L80240F9C_B9E8FC glabel L80240FB4_B9E914 /* B9E914 80240FB4 0260202D */ daddu $a0, $s3, $zero /* B9E918 80240FB8 0280282D */ daddu $a1, $s4, $zero -/* B9E91C 80240FBC 0C090273 */ jal func_802409CC_B9E32C +/* B9E91C 80240FBC 0C090273 */ jal mim_04_UnkNpcAIFunc15 /* B9E920 80240FC0 0200302D */ daddu $a2, $s0, $zero glabel L80240FC4_B9E924 /* B9E924 80240FC4 0260202D */ daddu $a0, $s3, $zero diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_802426E0_BA6E60.s b/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_802426E0_BA6E60.s deleted file mode 100644 index 253b28d2c0..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_802426E0_BA6E60.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802426E0_BA6E60 -/* BA6E60 802426E0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BA6E64 802426E4 AFB10014 */ sw $s1, 0x14($sp) -/* BA6E68 802426E8 0080882D */ daddu $s1, $a0, $zero -/* BA6E6C 802426EC AFBF001C */ sw $ra, 0x1c($sp) -/* BA6E70 802426F0 AFB20018 */ sw $s2, 0x18($sp) -/* BA6E74 802426F4 AFB00010 */ sw $s0, 0x10($sp) -/* BA6E78 802426F8 8E220148 */ lw $v0, 0x148($s1) -/* BA6E7C 802426FC 00A0902D */ daddu $s2, $a1, $zero -/* BA6E80 80242700 84440008 */ lh $a0, 8($v0) -/* BA6E84 80242704 0C00EABB */ jal get_npc_unsafe -/* BA6E88 80242708 00C0802D */ daddu $s0, $a2, $zero -/* BA6E8C 8024270C 0220202D */ daddu $a0, $s1, $zero -/* BA6E90 80242710 0240282D */ daddu $a1, $s2, $zero -/* BA6E94 80242714 0200302D */ daddu $a2, $s0, $zero -/* BA6E98 80242718 0C0127DF */ jal func_80049F7C -/* BA6E9C 8024271C 0040802D */ daddu $s0, $v0, $zero -/* BA6EA0 80242720 8E020000 */ lw $v0, ($s0) -/* BA6EA4 80242724 24040005 */ addiu $a0, $zero, 5 -/* BA6EA8 80242728 34420800 */ ori $v0, $v0, 0x800 -/* BA6EAC 8024272C 0C00A67F */ jal rand_int -/* BA6EB0 80242730 AE020000 */ sw $v0, ($s0) -/* BA6EB4 80242734 44820000 */ mtc1 $v0, $f0 -/* BA6EB8 80242738 00000000 */ nop -/* BA6EBC 8024273C 46800021 */ cvt.d.w $f0, $f0 -/* BA6EC0 80242740 3C014024 */ lui $at, 0x4024 -/* BA6EC4 80242744 44811800 */ mtc1 $at, $f3 -/* BA6EC8 80242748 44801000 */ mtc1 $zero, $f2 -/* BA6ECC 8024274C 3C013FC0 */ lui $at, 0x3fc0 -/* BA6ED0 80242750 44812000 */ mtc1 $at, $f4 -/* BA6ED4 80242754 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BA6ED8 80242758 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BA6EDC 8024275C C60C0038 */ lwc1 $f12, 0x38($s0) -/* BA6EE0 80242760 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BA6EE4 80242764 46220000 */ add.d $f0, $f0, $f2 -/* BA6EE8 80242768 E6040014 */ swc1 $f4, 0x14($s0) -/* BA6EEC 8024276C 46200020 */ cvt.s.d $f0, $f0 -/* BA6EF0 80242770 E600001C */ swc1 $f0, 0x1c($s0) -/* BA6EF4 80242774 8C460028 */ lw $a2, 0x28($v0) -/* BA6EF8 80242778 0C00A720 */ jal atan2 -/* BA6EFC 8024277C 8C470030 */ lw $a3, 0x30($v0) -/* BA6F00 80242780 0200202D */ daddu $a0, $s0, $zero -/* BA6F04 80242784 3C05B000 */ lui $a1, 0xb000 -/* BA6F08 80242788 34A50017 */ ori $a1, $a1, 0x17 -/* BA6F0C 8024278C 0000302D */ daddu $a2, $zero, $zero -/* BA6F10 80242790 E480000C */ swc1 $f0, 0xc($a0) -/* BA6F14 80242794 C6400018 */ lwc1 $f0, 0x18($s2) -/* BA6F18 80242798 2402000D */ addiu $v0, $zero, 0xd -/* BA6F1C 8024279C E4800018 */ swc1 $f0, 0x18($a0) -/* BA6F20 802427A0 0C012530 */ jal func_800494C0 -/* BA6F24 802427A4 AE220070 */ sw $v0, 0x70($s1) -/* BA6F28 802427A8 8FBF001C */ lw $ra, 0x1c($sp) -/* BA6F2C 802427AC 8FB20018 */ lw $s2, 0x18($sp) -/* BA6F30 802427B0 8FB10014 */ lw $s1, 0x14($sp) -/* BA6F34 802427B4 8FB00010 */ lw $s0, 0x10($sp) -/* BA6F38 802427B8 03E00008 */ jr $ra -/* BA6F3C 802427BC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80242B04_BA7284.s b/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80242B04_BA7284.s index 56880cbe8b..6cdc764bee 100644 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80242B04_BA7284.s +++ b/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80242B04_BA7284.s @@ -124,7 +124,7 @@ glabel L80242CB0_BA7430 glabel L80242CC8_BA7448 /* BA7448 80242CC8 0260202D */ daddu $a0, $s3, $zero /* BA744C 80242CCC 0280282D */ daddu $a1, $s4, $zero -/* BA7450 80242CD0 0C0909B8 */ jal func_802426E0_BA6E60 +/* BA7450 80242CD0 0C0909B8 */ jal mim_06_UnkNpcAIFunc15 /* BA7454 80242CD4 0200302D */ daddu $a2, $s0, $zero glabel L80242CD8_BA7458 /* BA7458 80242CD8 0260202D */ daddu $a0, $s3, $zero diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240A3C_BAAB7C.s b/ver/us/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240A3C_BAAB7C.s deleted file mode 100644 index 6c6d62d9a6..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240A3C_BAAB7C.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A3C_BAAB7C -/* BAAB7C 80240A3C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BAAB80 80240A40 AFB10014 */ sw $s1, 0x14($sp) -/* BAAB84 80240A44 0080882D */ daddu $s1, $a0, $zero -/* BAAB88 80240A48 AFBF001C */ sw $ra, 0x1c($sp) -/* BAAB8C 80240A4C AFB20018 */ sw $s2, 0x18($sp) -/* BAAB90 80240A50 AFB00010 */ sw $s0, 0x10($sp) -/* BAAB94 80240A54 8E220148 */ lw $v0, 0x148($s1) -/* BAAB98 80240A58 00A0902D */ daddu $s2, $a1, $zero -/* BAAB9C 80240A5C 84440008 */ lh $a0, 8($v0) -/* BAABA0 80240A60 0C00EABB */ jal get_npc_unsafe -/* BAABA4 80240A64 00C0802D */ daddu $s0, $a2, $zero -/* BAABA8 80240A68 0220202D */ daddu $a0, $s1, $zero -/* BAABAC 80240A6C 0240282D */ daddu $a1, $s2, $zero -/* BAABB0 80240A70 0200302D */ daddu $a2, $s0, $zero -/* BAABB4 80240A74 0C0127DF */ jal func_80049F7C -/* BAABB8 80240A78 0040802D */ daddu $s0, $v0, $zero -/* BAABBC 80240A7C 8E020000 */ lw $v0, ($s0) -/* BAABC0 80240A80 24040005 */ addiu $a0, $zero, 5 -/* BAABC4 80240A84 34420800 */ ori $v0, $v0, 0x800 -/* BAABC8 80240A88 0C00A67F */ jal rand_int -/* BAABCC 80240A8C AE020000 */ sw $v0, ($s0) -/* BAABD0 80240A90 44820000 */ mtc1 $v0, $f0 -/* BAABD4 80240A94 00000000 */ nop -/* BAABD8 80240A98 46800021 */ cvt.d.w $f0, $f0 -/* BAABDC 80240A9C 3C014024 */ lui $at, 0x4024 -/* BAABE0 80240AA0 44811800 */ mtc1 $at, $f3 -/* BAABE4 80240AA4 44801000 */ mtc1 $zero, $f2 -/* BAABE8 80240AA8 3C013FC0 */ lui $at, 0x3fc0 -/* BAABEC 80240AAC 44812000 */ mtc1 $at, $f4 -/* BAABF0 80240AB0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BAABF4 80240AB4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BAABF8 80240AB8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* BAABFC 80240ABC C60E0040 */ lwc1 $f14, 0x40($s0) -/* BAAC00 80240AC0 46220000 */ add.d $f0, $f0, $f2 -/* BAAC04 80240AC4 E6040014 */ swc1 $f4, 0x14($s0) -/* BAAC08 80240AC8 46200020 */ cvt.s.d $f0, $f0 -/* BAAC0C 80240ACC E600001C */ swc1 $f0, 0x1c($s0) -/* BAAC10 80240AD0 8C460028 */ lw $a2, 0x28($v0) -/* BAAC14 80240AD4 0C00A720 */ jal atan2 -/* BAAC18 80240AD8 8C470030 */ lw $a3, 0x30($v0) -/* BAAC1C 80240ADC 0200202D */ daddu $a0, $s0, $zero -/* BAAC20 80240AE0 3C05B000 */ lui $a1, 0xb000 -/* BAAC24 80240AE4 34A50017 */ ori $a1, $a1, 0x17 -/* BAAC28 80240AE8 0000302D */ daddu $a2, $zero, $zero -/* BAAC2C 80240AEC E480000C */ swc1 $f0, 0xc($a0) -/* BAAC30 80240AF0 C6400018 */ lwc1 $f0, 0x18($s2) -/* BAAC34 80240AF4 2402000D */ addiu $v0, $zero, 0xd -/* BAAC38 80240AF8 E4800018 */ swc1 $f0, 0x18($a0) -/* BAAC3C 80240AFC 0C012530 */ jal func_800494C0 -/* BAAC40 80240B00 AE220070 */ sw $v0, 0x70($s1) -/* BAAC44 80240B04 8FBF001C */ lw $ra, 0x1c($sp) -/* BAAC48 80240B08 8FB20018 */ lw $s2, 0x18($sp) -/* BAAC4C 80240B0C 8FB10014 */ lw $s1, 0x14($sp) -/* BAAC50 80240B10 8FB00010 */ lw $s0, 0x10($sp) -/* BAAC54 80240B14 03E00008 */ jr $ra -/* BAAC58 80240B18 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240E60_BAAFA0.s b/ver/us/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240E60_BAAFA0.s index 6a122323a2..cfc7c9a11f 100644 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240E60_BAAFA0.s +++ b/ver/us/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240E60_BAAFA0.s @@ -124,7 +124,7 @@ glabel L8024100C_BAB14C glabel L80241024_BAB164 /* BAB164 80241024 0260202D */ daddu $a0, $s3, $zero /* BAB168 80241028 0280282D */ daddu $a1, $s4, $zero -/* BAB16C 8024102C 0C09028F */ jal func_80240A3C_BAAB7C +/* BAB16C 8024102C 0C09028F */ jal mim_07_UnkNpcAIFunc15 /* BAB170 80241030 0200302D */ daddu $a2, $s0, $zero glabel L80241034_BAB174 /* BAB174 80241034 0260202D */ daddu $a0, $s3, $zero diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_8024086C_BB366C.s b/ver/us/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_8024086C_BB366C.s deleted file mode 100644 index f6587f014d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_8024086C_BB366C.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024086C_BB366C -/* BB366C 8024086C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BB3670 80240870 AFB10014 */ sw $s1, 0x14($sp) -/* BB3674 80240874 0080882D */ daddu $s1, $a0, $zero -/* BB3678 80240878 AFBF001C */ sw $ra, 0x1c($sp) -/* BB367C 8024087C AFB20018 */ sw $s2, 0x18($sp) -/* BB3680 80240880 AFB00010 */ sw $s0, 0x10($sp) -/* BB3684 80240884 8E220148 */ lw $v0, 0x148($s1) -/* BB3688 80240888 00A0902D */ daddu $s2, $a1, $zero -/* BB368C 8024088C 84440008 */ lh $a0, 8($v0) -/* BB3690 80240890 0C00EABB */ jal get_npc_unsafe -/* BB3694 80240894 00C0802D */ daddu $s0, $a2, $zero -/* BB3698 80240898 0220202D */ daddu $a0, $s1, $zero -/* BB369C 8024089C 0240282D */ daddu $a1, $s2, $zero -/* BB36A0 802408A0 0200302D */ daddu $a2, $s0, $zero -/* BB36A4 802408A4 0C0127DF */ jal func_80049F7C -/* BB36A8 802408A8 0040802D */ daddu $s0, $v0, $zero -/* BB36AC 802408AC 8E020000 */ lw $v0, ($s0) -/* BB36B0 802408B0 24040005 */ addiu $a0, $zero, 5 -/* BB36B4 802408B4 34420800 */ ori $v0, $v0, 0x800 -/* BB36B8 802408B8 0C00A67F */ jal rand_int -/* BB36BC 802408BC AE020000 */ sw $v0, ($s0) -/* BB36C0 802408C0 44820000 */ mtc1 $v0, $f0 -/* BB36C4 802408C4 00000000 */ nop -/* BB36C8 802408C8 46800021 */ cvt.d.w $f0, $f0 -/* BB36CC 802408CC 3C014024 */ lui $at, 0x4024 -/* BB36D0 802408D0 44811800 */ mtc1 $at, $f3 -/* BB36D4 802408D4 44801000 */ mtc1 $zero, $f2 -/* BB36D8 802408D8 3C013FC0 */ lui $at, 0x3fc0 -/* BB36DC 802408DC 44812000 */ mtc1 $at, $f4 -/* BB36E0 802408E0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BB36E4 802408E4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BB36E8 802408E8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* BB36EC 802408EC C60E0040 */ lwc1 $f14, 0x40($s0) -/* BB36F0 802408F0 46220000 */ add.d $f0, $f0, $f2 -/* BB36F4 802408F4 E6040014 */ swc1 $f4, 0x14($s0) -/* BB36F8 802408F8 46200020 */ cvt.s.d $f0, $f0 -/* BB36FC 802408FC E600001C */ swc1 $f0, 0x1c($s0) -/* BB3700 80240900 8C460028 */ lw $a2, 0x28($v0) -/* BB3704 80240904 0C00A720 */ jal atan2 -/* BB3708 80240908 8C470030 */ lw $a3, 0x30($v0) -/* BB370C 8024090C 0200202D */ daddu $a0, $s0, $zero -/* BB3710 80240910 3C05B000 */ lui $a1, 0xb000 -/* BB3714 80240914 34A50017 */ ori $a1, $a1, 0x17 -/* BB3718 80240918 0000302D */ daddu $a2, $zero, $zero -/* BB371C 8024091C E480000C */ swc1 $f0, 0xc($a0) -/* BB3720 80240920 C6400018 */ lwc1 $f0, 0x18($s2) -/* BB3724 80240924 2402000D */ addiu $v0, $zero, 0xd -/* BB3728 80240928 E4800018 */ swc1 $f0, 0x18($a0) -/* BB372C 8024092C 0C012530 */ jal func_800494C0 -/* BB3730 80240930 AE220070 */ sw $v0, 0x70($s1) -/* BB3734 80240934 8FBF001C */ lw $ra, 0x1c($sp) -/* BB3738 80240938 8FB20018 */ lw $s2, 0x18($sp) -/* BB373C 8024093C 8FB10014 */ lw $s1, 0x14($sp) -/* BB3740 80240940 8FB00010 */ lw $s0, 0x10($sp) -/* BB3744 80240944 03E00008 */ jr $ra -/* BB3748 80240948 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240C90_BB3A90.s b/ver/us/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240C90_BB3A90.s index bf5cfc3f4f..b22511efa4 100644 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240C90_BB3A90.s +++ b/ver/us/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240C90_BB3A90.s @@ -124,7 +124,7 @@ glabel L80240E3C_BB3C3C glabel L80240E54_BB3C54 /* BB3C54 80240E54 0260202D */ daddu $a0, $s3, $zero /* BB3C58 80240E58 0280282D */ daddu $a1, $s4, $zero -/* BB3C5C 80240E5C 0C09021B */ jal func_8024086C_BB366C +/* BB3C5C 80240E5C 0C09021B */ jal mim_09_UnkNpcAIFunc15 /* BB3C60 80240E60 0200302D */ daddu $a2, $s0, $zero glabel L80240E64_BB3C64 /* BB3C64 80240E64 0260202D */ daddu $a0, $s3, $zero diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_802407CC_9EBFBC.s b/ver/us/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_802407CC_9EBFBC.s deleted file mode 100644 index 81751fe796..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_802407CC_9EBFBC.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407CC_9EBFBC -/* 9EBFBC 802407CC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9EBFC0 802407D0 AFB10014 */ sw $s1, 0x14($sp) -/* 9EBFC4 802407D4 0080882D */ daddu $s1, $a0, $zero -/* 9EBFC8 802407D8 AFBF001C */ sw $ra, 0x1c($sp) -/* 9EBFCC 802407DC AFB20018 */ sw $s2, 0x18($sp) -/* 9EBFD0 802407E0 AFB00010 */ sw $s0, 0x10($sp) -/* 9EBFD4 802407E4 8E220148 */ lw $v0, 0x148($s1) -/* 9EBFD8 802407E8 00A0902D */ daddu $s2, $a1, $zero -/* 9EBFDC 802407EC 84440008 */ lh $a0, 8($v0) -/* 9EBFE0 802407F0 0C00EABB */ jal get_npc_unsafe -/* 9EBFE4 802407F4 00C0802D */ daddu $s0, $a2, $zero -/* 9EBFE8 802407F8 0220202D */ daddu $a0, $s1, $zero -/* 9EBFEC 802407FC 0240282D */ daddu $a1, $s2, $zero -/* 9EBFF0 80240800 0200302D */ daddu $a2, $s0, $zero -/* 9EBFF4 80240804 0C0127DF */ jal func_80049F7C -/* 9EBFF8 80240808 0040802D */ daddu $s0, $v0, $zero -/* 9EBFFC 8024080C 8E020000 */ lw $v0, ($s0) -/* 9EC000 80240810 24040005 */ addiu $a0, $zero, 5 -/* 9EC004 80240814 34420800 */ ori $v0, $v0, 0x800 -/* 9EC008 80240818 0C00A67F */ jal rand_int -/* 9EC00C 8024081C AE020000 */ sw $v0, ($s0) -/* 9EC010 80240820 44820000 */ mtc1 $v0, $f0 -/* 9EC014 80240824 00000000 */ nop -/* 9EC018 80240828 46800021 */ cvt.d.w $f0, $f0 -/* 9EC01C 8024082C 3C014024 */ lui $at, 0x4024 -/* 9EC020 80240830 44811800 */ mtc1 $at, $f3 -/* 9EC024 80240834 44801000 */ mtc1 $zero, $f2 -/* 9EC028 80240838 3C013FC0 */ lui $at, 0x3fc0 -/* 9EC02C 8024083C 44812000 */ mtc1 $at, $f4 -/* 9EC030 80240840 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9EC034 80240844 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9EC038 80240848 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9EC03C 8024084C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9EC040 80240850 46220000 */ add.d $f0, $f0, $f2 -/* 9EC044 80240854 E6040014 */ swc1 $f4, 0x14($s0) -/* 9EC048 80240858 46200020 */ cvt.s.d $f0, $f0 -/* 9EC04C 8024085C E600001C */ swc1 $f0, 0x1c($s0) -/* 9EC050 80240860 8C460028 */ lw $a2, 0x28($v0) -/* 9EC054 80240864 0C00A720 */ jal atan2 -/* 9EC058 80240868 8C470030 */ lw $a3, 0x30($v0) -/* 9EC05C 8024086C 0200202D */ daddu $a0, $s0, $zero -/* 9EC060 80240870 3C05B000 */ lui $a1, 0xb000 -/* 9EC064 80240874 34A50017 */ ori $a1, $a1, 0x17 -/* 9EC068 80240878 0000302D */ daddu $a2, $zero, $zero -/* 9EC06C 8024087C E480000C */ swc1 $f0, 0xc($a0) -/* 9EC070 80240880 C6400018 */ lwc1 $f0, 0x18($s2) -/* 9EC074 80240884 2402000D */ addiu $v0, $zero, 0xd -/* 9EC078 80240888 E4800018 */ swc1 $f0, 0x18($a0) -/* 9EC07C 8024088C 0C012530 */ jal func_800494C0 -/* 9EC080 80240890 AE220070 */ sw $v0, 0x70($s1) -/* 9EC084 80240894 8FBF001C */ lw $ra, 0x1c($sp) -/* 9EC088 80240898 8FB20018 */ lw $s2, 0x18($sp) -/* 9EC08C 8024089C 8FB10014 */ lw $s1, 0x14($sp) -/* 9EC090 802408A0 8FB00010 */ lw $s0, 0x10($sp) -/* 9EC094 802408A4 03E00008 */ jr $ra -/* 9EC098 802408A8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240BF0_9EC3E0.s b/ver/us/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240BF0_9EC3E0.s index 651623a3fc..1cd09d4a17 100644 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240BF0_9EC3E0.s +++ b/ver/us/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240BF0_9EC3E0.s @@ -124,7 +124,7 @@ glabel L80240D9C_9EC58C glabel L80240DB4_9EC5A4 /* 9EC5A4 80240DB4 0260202D */ daddu $a0, $s3, $zero /* 9EC5A8 80240DB8 0280282D */ daddu $a1, $s4, $zero -/* 9EC5AC 80240DBC 0C0901F3 */ jal func_802407CC_9EBFBC +/* 9EC5AC 80240DBC 0C0901F3 */ jal nok_03_UnkNpcAIFunc15 /* 9EC5B0 80240DC0 0200302D */ daddu $a2, $s0, $zero glabel L80240DC4_9EC5B4 /* 9EC5B4 80240DC4 0260202D */ daddu $a0, $s3, $zero diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FA970/func_80240224_9FAA14.s b/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FA970/func_80240224_9FAA14.s deleted file mode 100644 index f967c24ca5..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FA970/func_80240224_9FAA14.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240224_9FAA14 -/* 9FAA14 80240224 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9FAA18 80240228 AFB10014 */ sw $s1, 0x14($sp) -/* 9FAA1C 8024022C 0080882D */ daddu $s1, $a0, $zero -/* 9FAA20 80240230 AFBF0020 */ sw $ra, 0x20($sp) -/* 9FAA24 80240234 AFB3001C */ sw $s3, 0x1c($sp) -/* 9FAA28 80240238 AFB20018 */ sw $s2, 0x18($sp) -/* 9FAA2C 8024023C AFB00010 */ sw $s0, 0x10($sp) -/* 9FAA30 80240240 8E30000C */ lw $s0, 0xc($s1) -/* 9FAA34 80240244 8E050000 */ lw $a1, ($s0) -/* 9FAA38 80240248 0C0B1EAF */ jal get_variable -/* 9FAA3C 8024024C 26100004 */ addiu $s0, $s0, 4 -/* 9FAA40 80240250 8E050000 */ lw $a1, ($s0) -/* 9FAA44 80240254 26100004 */ addiu $s0, $s0, 4 -/* 9FAA48 80240258 0220202D */ daddu $a0, $s1, $zero -/* 9FAA4C 8024025C 0C0B1EAF */ jal get_variable -/* 9FAA50 80240260 0040982D */ daddu $s3, $v0, $zero -/* 9FAA54 80240264 8E050000 */ lw $a1, ($s0) -/* 9FAA58 80240268 26100004 */ addiu $s0, $s0, 4 -/* 9FAA5C 8024026C 0220202D */ daddu $a0, $s1, $zero -/* 9FAA60 80240270 0C0B1EAF */ jal get_variable -/* 9FAA64 80240274 0040902D */ daddu $s2, $v0, $zero -/* 9FAA68 80240278 0220202D */ daddu $a0, $s1, $zero -/* 9FAA6C 8024027C 8E050000 */ lw $a1, ($s0) -/* 9FAA70 80240280 0C0B1EAF */ jal get_variable -/* 9FAA74 80240284 0040882D */ daddu $s1, $v0, $zero -/* 9FAA78 80240288 0260202D */ daddu $a0, $s3, $zero -/* 9FAA7C 8024028C 0C04417A */ jal get_entity_by_index -/* 9FAA80 80240290 0040802D */ daddu $s0, $v0, $zero -/* 9FAA84 80240294 0040182D */ daddu $v1, $v0, $zero -/* 9FAA88 80240298 44920000 */ mtc1 $s2, $f0 -/* 9FAA8C 8024029C 00000000 */ nop -/* 9FAA90 802402A0 46800020 */ cvt.s.w $f0, $f0 -/* 9FAA94 802402A4 E4600048 */ swc1 $f0, 0x48($v1) -/* 9FAA98 802402A8 44910000 */ mtc1 $s1, $f0 -/* 9FAA9C 802402AC 00000000 */ nop -/* 9FAAA0 802402B0 46800020 */ cvt.s.w $f0, $f0 -/* 9FAAA4 802402B4 E460004C */ swc1 $f0, 0x4c($v1) -/* 9FAAA8 802402B8 44900000 */ mtc1 $s0, $f0 -/* 9FAAAC 802402BC 00000000 */ nop -/* 9FAAB0 802402C0 46800020 */ cvt.s.w $f0, $f0 -/* 9FAAB4 802402C4 E4600050 */ swc1 $f0, 0x50($v1) -/* 9FAAB8 802402C8 8FBF0020 */ lw $ra, 0x20($sp) -/* 9FAABC 802402CC 8FB3001C */ lw $s3, 0x1c($sp) -/* 9FAAC0 802402D0 8FB20018 */ lw $s2, 0x18($sp) -/* 9FAAC4 802402D4 8FB10014 */ lw $s1, 0x14($sp) -/* 9FAAC8 802402D8 8FB00010 */ lw $s0, 0x10($sp) -/* 9FAACC 802402DC 24020002 */ addiu $v0, $zero, 2 -/* 9FAAD0 802402E0 03E00008 */ jr $ra -/* 9FAAD4 802402E4 27BD0028 */ addiu $sp, $sp, 0x28 -/* 9FAAD8 802402E8 00000000 */ nop -/* 9FAADC 802402EC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_13/A00600/func_802407CC_A00DCC.s b/ver/us/asm/nonmatchings/world/area_nok/nok_13/A00600/func_802407CC_A00DCC.s deleted file mode 100644 index ca9fac346d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_13/A00600/func_802407CC_A00DCC.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407CC_A00DCC -/* A00DCC 802407CC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A00DD0 802407D0 AFB10014 */ sw $s1, 0x14($sp) -/* A00DD4 802407D4 0080882D */ daddu $s1, $a0, $zero -/* A00DD8 802407D8 AFBF001C */ sw $ra, 0x1c($sp) -/* A00DDC 802407DC AFB20018 */ sw $s2, 0x18($sp) -/* A00DE0 802407E0 AFB00010 */ sw $s0, 0x10($sp) -/* A00DE4 802407E4 8E220148 */ lw $v0, 0x148($s1) -/* A00DE8 802407E8 00A0902D */ daddu $s2, $a1, $zero -/* A00DEC 802407EC 84440008 */ lh $a0, 8($v0) -/* A00DF0 802407F0 0C00EABB */ jal get_npc_unsafe -/* A00DF4 802407F4 00C0802D */ daddu $s0, $a2, $zero -/* A00DF8 802407F8 0220202D */ daddu $a0, $s1, $zero -/* A00DFC 802407FC 0240282D */ daddu $a1, $s2, $zero -/* A00E00 80240800 0200302D */ daddu $a2, $s0, $zero -/* A00E04 80240804 0C0127DF */ jal func_80049F7C -/* A00E08 80240808 0040802D */ daddu $s0, $v0, $zero -/* A00E0C 8024080C 8E020000 */ lw $v0, ($s0) -/* A00E10 80240810 24040005 */ addiu $a0, $zero, 5 -/* A00E14 80240814 34420800 */ ori $v0, $v0, 0x800 -/* A00E18 80240818 0C00A67F */ jal rand_int -/* A00E1C 8024081C AE020000 */ sw $v0, ($s0) -/* A00E20 80240820 44820000 */ mtc1 $v0, $f0 -/* A00E24 80240824 00000000 */ nop -/* A00E28 80240828 46800021 */ cvt.d.w $f0, $f0 -/* A00E2C 8024082C 3C014024 */ lui $at, 0x4024 -/* A00E30 80240830 44811800 */ mtc1 $at, $f3 -/* A00E34 80240834 44801000 */ mtc1 $zero, $f2 -/* A00E38 80240838 3C013FC0 */ lui $at, 0x3fc0 -/* A00E3C 8024083C 44812000 */ mtc1 $at, $f4 -/* A00E40 80240840 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A00E44 80240844 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A00E48 80240848 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A00E4C 8024084C C60E0040 */ lwc1 $f14, 0x40($s0) -/* A00E50 80240850 46220000 */ add.d $f0, $f0, $f2 -/* A00E54 80240854 E6040014 */ swc1 $f4, 0x14($s0) -/* A00E58 80240858 46200020 */ cvt.s.d $f0, $f0 -/* A00E5C 8024085C E600001C */ swc1 $f0, 0x1c($s0) -/* A00E60 80240860 8C460028 */ lw $a2, 0x28($v0) -/* A00E64 80240864 0C00A720 */ jal atan2 -/* A00E68 80240868 8C470030 */ lw $a3, 0x30($v0) -/* A00E6C 8024086C 0200202D */ daddu $a0, $s0, $zero -/* A00E70 80240870 3C05B000 */ lui $a1, 0xb000 -/* A00E74 80240874 34A50017 */ ori $a1, $a1, 0x17 -/* A00E78 80240878 0000302D */ daddu $a2, $zero, $zero -/* A00E7C 8024087C E480000C */ swc1 $f0, 0xc($a0) -/* A00E80 80240880 C6400018 */ lwc1 $f0, 0x18($s2) -/* A00E84 80240884 2402000D */ addiu $v0, $zero, 0xd -/* A00E88 80240888 E4800018 */ swc1 $f0, 0x18($a0) -/* A00E8C 8024088C 0C012530 */ jal func_800494C0 -/* A00E90 80240890 AE220070 */ sw $v0, 0x70($s1) -/* A00E94 80240894 8FBF001C */ lw $ra, 0x1c($sp) -/* A00E98 80240898 8FB20018 */ lw $s2, 0x18($sp) -/* A00E9C 8024089C 8FB10014 */ lw $s1, 0x14($sp) -/* A00EA0 802408A0 8FB00010 */ lw $s0, 0x10($sp) -/* A00EA4 802408A4 03E00008 */ jr $ra -/* A00EA8 802408A8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240BF0_A011F0.s b/ver/us/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240BF0_A011F0.s index 1837507fa9..512229db06 100644 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240BF0_A011F0.s +++ b/ver/us/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240BF0_A011F0.s @@ -124,7 +124,7 @@ glabel L80240D9C_A0139C glabel L80240DB4_A013B4 /* A013B4 80240DB4 0260202D */ daddu $a0, $s3, $zero /* A013B8 80240DB8 0280282D */ daddu $a1, $s4, $zero -/* A013BC 80240DBC 0C0901F3 */ jal func_802407CC_A00DCC +/* A013BC 80240DBC 0C0901F3 */ jal nok_13_UnkNpcAIFunc15 /* A013C0 80240DC0 0200302D */ daddu $a2, $s0, $zero glabel L80240DC4_A013C4 /* A013C4 80240DC4 0260202D */ daddu $a0, $s3, $zero diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_01/869AA0/func_80240960_869E10.s b/ver/us/asm/nonmatchings/world/area_tik/tik_01/869AA0/func_80240960_869E10.s deleted file mode 100644 index 63c3c8b5bc..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_01/869AA0/func_80240960_869E10.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240960_869E10 -/* 869E10 80240960 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 869E14 80240964 AFB10014 */ sw $s1, 0x14($sp) -/* 869E18 80240968 0080882D */ daddu $s1, $a0, $zero -/* 869E1C 8024096C AFBF0020 */ sw $ra, 0x20($sp) -/* 869E20 80240970 AFB3001C */ sw $s3, 0x1c($sp) -/* 869E24 80240974 AFB20018 */ sw $s2, 0x18($sp) -/* 869E28 80240978 AFB00010 */ sw $s0, 0x10($sp) -/* 869E2C 8024097C 8E30000C */ lw $s0, 0xc($s1) -/* 869E30 80240980 8E050000 */ lw $a1, ($s0) -/* 869E34 80240984 0C0B1EAF */ jal get_variable -/* 869E38 80240988 26100004 */ addiu $s0, $s0, 4 -/* 869E3C 8024098C 8E050000 */ lw $a1, ($s0) -/* 869E40 80240990 26100004 */ addiu $s0, $s0, 4 -/* 869E44 80240994 0220202D */ daddu $a0, $s1, $zero -/* 869E48 80240998 0C0B1EAF */ jal get_variable -/* 869E4C 8024099C 0040982D */ daddu $s3, $v0, $zero -/* 869E50 802409A0 8E050000 */ lw $a1, ($s0) -/* 869E54 802409A4 26100004 */ addiu $s0, $s0, 4 -/* 869E58 802409A8 0220202D */ daddu $a0, $s1, $zero -/* 869E5C 802409AC 0C0B1EAF */ jal get_variable -/* 869E60 802409B0 0040902D */ daddu $s2, $v0, $zero -/* 869E64 802409B4 0220202D */ daddu $a0, $s1, $zero -/* 869E68 802409B8 8E050000 */ lw $a1, ($s0) -/* 869E6C 802409BC 0C0B1EAF */ jal get_variable -/* 869E70 802409C0 0040882D */ daddu $s1, $v0, $zero -/* 869E74 802409C4 0260202D */ daddu $a0, $s3, $zero -/* 869E78 802409C8 0C04417A */ jal get_entity_by_index -/* 869E7C 802409CC 0040802D */ daddu $s0, $v0, $zero -/* 869E80 802409D0 0040182D */ daddu $v1, $v0, $zero -/* 869E84 802409D4 44920000 */ mtc1 $s2, $f0 -/* 869E88 802409D8 00000000 */ nop -/* 869E8C 802409DC 46800020 */ cvt.s.w $f0, $f0 -/* 869E90 802409E0 E4600048 */ swc1 $f0, 0x48($v1) -/* 869E94 802409E4 44910000 */ mtc1 $s1, $f0 -/* 869E98 802409E8 00000000 */ nop -/* 869E9C 802409EC 46800020 */ cvt.s.w $f0, $f0 -/* 869EA0 802409F0 E460004C */ swc1 $f0, 0x4c($v1) -/* 869EA4 802409F4 44900000 */ mtc1 $s0, $f0 -/* 869EA8 802409F8 00000000 */ nop -/* 869EAC 802409FC 46800020 */ cvt.s.w $f0, $f0 -/* 869EB0 80240A00 E4600050 */ swc1 $f0, 0x50($v1) -/* 869EB4 80240A04 8FBF0020 */ lw $ra, 0x20($sp) -/* 869EB8 80240A08 8FB3001C */ lw $s3, 0x1c($sp) -/* 869EBC 80240A0C 8FB20018 */ lw $s2, 0x18($sp) -/* 869EC0 80240A10 8FB10014 */ lw $s1, 0x14($sp) -/* 869EC4 80240A14 8FB00010 */ lw $s0, 0x10($sp) -/* 869EC8 80240A18 24020002 */ addiu $v0, $zero, 2 -/* 869ECC 80240A1C 03E00008 */ jr $ra -/* 869ED0 80240A20 27BD0028 */ addiu $sp, $sp, 0x28 -/* 869ED4 80240A24 00000000 */ nop -/* 869ED8 80240A28 00000000 */ nop -/* 869EDC 80240A2C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_80240984_875744.s b/ver/us/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_80240984_875744.s deleted file mode 100644 index 31e47f9948..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_80240984_875744.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240984_875744 -/* 875744 80240984 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 875748 80240988 AFB10014 */ sw $s1, 0x14($sp) -/* 87574C 8024098C 0080882D */ daddu $s1, $a0, $zero -/* 875750 80240990 AFBF0020 */ sw $ra, 0x20($sp) -/* 875754 80240994 AFB3001C */ sw $s3, 0x1c($sp) -/* 875758 80240998 AFB20018 */ sw $s2, 0x18($sp) -/* 87575C 8024099C AFB00010 */ sw $s0, 0x10($sp) -/* 875760 802409A0 8E30000C */ lw $s0, 0xc($s1) -/* 875764 802409A4 8E050000 */ lw $a1, ($s0) -/* 875768 802409A8 0C0B1EAF */ jal get_variable -/* 87576C 802409AC 26100004 */ addiu $s0, $s0, 4 -/* 875770 802409B0 8E050000 */ lw $a1, ($s0) -/* 875774 802409B4 26100004 */ addiu $s0, $s0, 4 -/* 875778 802409B8 0220202D */ daddu $a0, $s1, $zero -/* 87577C 802409BC 0C0B1EAF */ jal get_variable -/* 875780 802409C0 0040982D */ daddu $s3, $v0, $zero -/* 875784 802409C4 8E050000 */ lw $a1, ($s0) -/* 875788 802409C8 26100004 */ addiu $s0, $s0, 4 -/* 87578C 802409CC 0220202D */ daddu $a0, $s1, $zero -/* 875790 802409D0 0C0B1EAF */ jal get_variable -/* 875794 802409D4 0040902D */ daddu $s2, $v0, $zero -/* 875798 802409D8 0220202D */ daddu $a0, $s1, $zero -/* 87579C 802409DC 8E050000 */ lw $a1, ($s0) -/* 8757A0 802409E0 0C0B1EAF */ jal get_variable -/* 8757A4 802409E4 0040882D */ daddu $s1, $v0, $zero -/* 8757A8 802409E8 0260202D */ daddu $a0, $s3, $zero -/* 8757AC 802409EC 0C04417A */ jal get_entity_by_index -/* 8757B0 802409F0 0040802D */ daddu $s0, $v0, $zero -/* 8757B4 802409F4 0040182D */ daddu $v1, $v0, $zero -/* 8757B8 802409F8 44920000 */ mtc1 $s2, $f0 -/* 8757BC 802409FC 00000000 */ nop -/* 8757C0 80240A00 46800020 */ cvt.s.w $f0, $f0 -/* 8757C4 80240A04 E4600048 */ swc1 $f0, 0x48($v1) -/* 8757C8 80240A08 44910000 */ mtc1 $s1, $f0 -/* 8757CC 80240A0C 00000000 */ nop -/* 8757D0 80240A10 46800020 */ cvt.s.w $f0, $f0 -/* 8757D4 80240A14 E460004C */ swc1 $f0, 0x4c($v1) -/* 8757D8 80240A18 44900000 */ mtc1 $s0, $f0 -/* 8757DC 80240A1C 00000000 */ nop -/* 8757E0 80240A20 46800020 */ cvt.s.w $f0, $f0 -/* 8757E4 80240A24 E4600050 */ swc1 $f0, 0x50($v1) -/* 8757E8 80240A28 8FBF0020 */ lw $ra, 0x20($sp) -/* 8757EC 80240A2C 8FB3001C */ lw $s3, 0x1c($sp) -/* 8757F0 80240A30 8FB20018 */ lw $s2, 0x18($sp) -/* 8757F4 80240A34 8FB10014 */ lw $s1, 0x14($sp) -/* 8757F8 80240A38 8FB00010 */ lw $s0, 0x10($sp) -/* 8757FC 80240A3C 24020002 */ addiu $v0, $zero, 2 -/* 875800 80240A40 03E00008 */ jr $ra -/* 875804 80240A44 27BD0028 */ addiu $sp, $sp, 0x28 -/* 875808 80240A48 00000000 */ nop -/* 87580C 80240A4C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_08/87F3E0/func_80240960_87F750.s b/ver/us/asm/nonmatchings/world/area_tik/tik_08/87F3E0/func_80240960_87F750.s deleted file mode 100644 index 4f07d728f9..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_08/87F3E0/func_80240960_87F750.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240960_87F750 -/* 87F750 80240960 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 87F754 80240964 AFB10014 */ sw $s1, 0x14($sp) -/* 87F758 80240968 0080882D */ daddu $s1, $a0, $zero -/* 87F75C 8024096C AFBF0020 */ sw $ra, 0x20($sp) -/* 87F760 80240970 AFB3001C */ sw $s3, 0x1c($sp) -/* 87F764 80240974 AFB20018 */ sw $s2, 0x18($sp) -/* 87F768 80240978 AFB00010 */ sw $s0, 0x10($sp) -/* 87F76C 8024097C 8E30000C */ lw $s0, 0xc($s1) -/* 87F770 80240980 8E050000 */ lw $a1, ($s0) -/* 87F774 80240984 0C0B1EAF */ jal get_variable -/* 87F778 80240988 26100004 */ addiu $s0, $s0, 4 -/* 87F77C 8024098C 8E050000 */ lw $a1, ($s0) -/* 87F780 80240990 26100004 */ addiu $s0, $s0, 4 -/* 87F784 80240994 0220202D */ daddu $a0, $s1, $zero -/* 87F788 80240998 0C0B1EAF */ jal get_variable -/* 87F78C 8024099C 0040982D */ daddu $s3, $v0, $zero -/* 87F790 802409A0 8E050000 */ lw $a1, ($s0) -/* 87F794 802409A4 26100004 */ addiu $s0, $s0, 4 -/* 87F798 802409A8 0220202D */ daddu $a0, $s1, $zero -/* 87F79C 802409AC 0C0B1EAF */ jal get_variable -/* 87F7A0 802409B0 0040902D */ daddu $s2, $v0, $zero -/* 87F7A4 802409B4 0220202D */ daddu $a0, $s1, $zero -/* 87F7A8 802409B8 8E050000 */ lw $a1, ($s0) -/* 87F7AC 802409BC 0C0B1EAF */ jal get_variable -/* 87F7B0 802409C0 0040882D */ daddu $s1, $v0, $zero -/* 87F7B4 802409C4 0260202D */ daddu $a0, $s3, $zero -/* 87F7B8 802409C8 0C04417A */ jal get_entity_by_index -/* 87F7BC 802409CC 0040802D */ daddu $s0, $v0, $zero -/* 87F7C0 802409D0 0040182D */ daddu $v1, $v0, $zero -/* 87F7C4 802409D4 44920000 */ mtc1 $s2, $f0 -/* 87F7C8 802409D8 00000000 */ nop -/* 87F7CC 802409DC 46800020 */ cvt.s.w $f0, $f0 -/* 87F7D0 802409E0 E4600048 */ swc1 $f0, 0x48($v1) -/* 87F7D4 802409E4 44910000 */ mtc1 $s1, $f0 -/* 87F7D8 802409E8 00000000 */ nop -/* 87F7DC 802409EC 46800020 */ cvt.s.w $f0, $f0 -/* 87F7E0 802409F0 E460004C */ swc1 $f0, 0x4c($v1) -/* 87F7E4 802409F4 44900000 */ mtc1 $s0, $f0 -/* 87F7E8 802409F8 00000000 */ nop -/* 87F7EC 802409FC 46800020 */ cvt.s.w $f0, $f0 -/* 87F7F0 80240A00 E4600050 */ swc1 $f0, 0x50($v1) -/* 87F7F4 80240A04 8FBF0020 */ lw $ra, 0x20($sp) -/* 87F7F8 80240A08 8FB3001C */ lw $s3, 0x1c($sp) -/* 87F7FC 80240A0C 8FB20018 */ lw $s2, 0x18($sp) -/* 87F800 80240A10 8FB10014 */ lw $s1, 0x14($sp) -/* 87F804 80240A14 8FB00010 */ lw $s0, 0x10($sp) -/* 87F808 80240A18 24020002 */ addiu $v0, $zero, 2 -/* 87F80C 80240A1C 03E00008 */ jr $ra -/* 87F810 80240A20 27BD0028 */ addiu $sp, $sp, 0x28 -/* 87F814 80240A24 00000000 */ nop -/* 87F818 80240A28 00000000 */ nop -/* 87F81C 80240A2C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_09/8827B0/func_80240960_882B20.s b/ver/us/asm/nonmatchings/world/area_tik/tik_09/8827B0/func_80240960_882B20.s deleted file mode 100644 index b7398672a0..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_09/8827B0/func_80240960_882B20.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240960_882B20 -/* 882B20 80240960 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 882B24 80240964 AFB10014 */ sw $s1, 0x14($sp) -/* 882B28 80240968 0080882D */ daddu $s1, $a0, $zero -/* 882B2C 8024096C AFBF0020 */ sw $ra, 0x20($sp) -/* 882B30 80240970 AFB3001C */ sw $s3, 0x1c($sp) -/* 882B34 80240974 AFB20018 */ sw $s2, 0x18($sp) -/* 882B38 80240978 AFB00010 */ sw $s0, 0x10($sp) -/* 882B3C 8024097C 8E30000C */ lw $s0, 0xc($s1) -/* 882B40 80240980 8E050000 */ lw $a1, ($s0) -/* 882B44 80240984 0C0B1EAF */ jal get_variable -/* 882B48 80240988 26100004 */ addiu $s0, $s0, 4 -/* 882B4C 8024098C 8E050000 */ lw $a1, ($s0) -/* 882B50 80240990 26100004 */ addiu $s0, $s0, 4 -/* 882B54 80240994 0220202D */ daddu $a0, $s1, $zero -/* 882B58 80240998 0C0B1EAF */ jal get_variable -/* 882B5C 8024099C 0040982D */ daddu $s3, $v0, $zero -/* 882B60 802409A0 8E050000 */ lw $a1, ($s0) -/* 882B64 802409A4 26100004 */ addiu $s0, $s0, 4 -/* 882B68 802409A8 0220202D */ daddu $a0, $s1, $zero -/* 882B6C 802409AC 0C0B1EAF */ jal get_variable -/* 882B70 802409B0 0040902D */ daddu $s2, $v0, $zero -/* 882B74 802409B4 0220202D */ daddu $a0, $s1, $zero -/* 882B78 802409B8 8E050000 */ lw $a1, ($s0) -/* 882B7C 802409BC 0C0B1EAF */ jal get_variable -/* 882B80 802409C0 0040882D */ daddu $s1, $v0, $zero -/* 882B84 802409C4 0260202D */ daddu $a0, $s3, $zero -/* 882B88 802409C8 0C04417A */ jal get_entity_by_index -/* 882B8C 802409CC 0040802D */ daddu $s0, $v0, $zero -/* 882B90 802409D0 0040182D */ daddu $v1, $v0, $zero -/* 882B94 802409D4 44920000 */ mtc1 $s2, $f0 -/* 882B98 802409D8 00000000 */ nop -/* 882B9C 802409DC 46800020 */ cvt.s.w $f0, $f0 -/* 882BA0 802409E0 E4600048 */ swc1 $f0, 0x48($v1) -/* 882BA4 802409E4 44910000 */ mtc1 $s1, $f0 -/* 882BA8 802409E8 00000000 */ nop -/* 882BAC 802409EC 46800020 */ cvt.s.w $f0, $f0 -/* 882BB0 802409F0 E460004C */ swc1 $f0, 0x4c($v1) -/* 882BB4 802409F4 44900000 */ mtc1 $s0, $f0 -/* 882BB8 802409F8 00000000 */ nop -/* 882BBC 802409FC 46800020 */ cvt.s.w $f0, $f0 -/* 882BC0 80240A00 E4600050 */ swc1 $f0, 0x50($v1) -/* 882BC4 80240A04 8FBF0020 */ lw $ra, 0x20($sp) -/* 882BC8 80240A08 8FB3001C */ lw $s3, 0x1c($sp) -/* 882BCC 80240A0C 8FB20018 */ lw $s2, 0x18($sp) -/* 882BD0 80240A10 8FB10014 */ lw $s1, 0x14($sp) -/* 882BD4 80240A14 8FB00010 */ lw $s0, 0x10($sp) -/* 882BD8 80240A18 24020002 */ addiu $v0, $zero, 2 -/* 882BDC 80240A1C 03E00008 */ jr $ra -/* 882BE0 80240A20 27BD0028 */ addiu $sp, $sp, 0x28 -/* 882BE4 80240A24 00000000 */ nop -/* 882BE8 80240A28 00000000 */ nop -/* 882BEC 80240A2C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_25/8A8600/func_802406AC_8A862C.s b/ver/us/asm/nonmatchings/world/area_tik/tik_25/8A8600/func_802406AC_8A862C.s deleted file mode 100644 index d5b4ddba22..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_25/8A8600/func_802406AC_8A862C.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406AC_8A862C -/* 8A862C 802406AC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8A8630 802406B0 AFB10014 */ sw $s1, 0x14($sp) -/* 8A8634 802406B4 0080882D */ daddu $s1, $a0, $zero -/* 8A8638 802406B8 AFBF0020 */ sw $ra, 0x20($sp) -/* 8A863C 802406BC AFB3001C */ sw $s3, 0x1c($sp) -/* 8A8640 802406C0 AFB20018 */ sw $s2, 0x18($sp) -/* 8A8644 802406C4 AFB00010 */ sw $s0, 0x10($sp) -/* 8A8648 802406C8 8E30000C */ lw $s0, 0xc($s1) -/* 8A864C 802406CC 8E050000 */ lw $a1, ($s0) -/* 8A8650 802406D0 0C0B1EAF */ jal get_variable -/* 8A8654 802406D4 26100004 */ addiu $s0, $s0, 4 -/* 8A8658 802406D8 8E050000 */ lw $a1, ($s0) -/* 8A865C 802406DC 26100004 */ addiu $s0, $s0, 4 -/* 8A8660 802406E0 0220202D */ daddu $a0, $s1, $zero -/* 8A8664 802406E4 0C0B1EAF */ jal get_variable -/* 8A8668 802406E8 0040982D */ daddu $s3, $v0, $zero -/* 8A866C 802406EC 8E050000 */ lw $a1, ($s0) -/* 8A8670 802406F0 26100004 */ addiu $s0, $s0, 4 -/* 8A8674 802406F4 0220202D */ daddu $a0, $s1, $zero -/* 8A8678 802406F8 0C0B1EAF */ jal get_variable -/* 8A867C 802406FC 0040902D */ daddu $s2, $v0, $zero -/* 8A8680 80240700 0220202D */ daddu $a0, $s1, $zero -/* 8A8684 80240704 8E050000 */ lw $a1, ($s0) -/* 8A8688 80240708 0C0B1EAF */ jal get_variable -/* 8A868C 8024070C 0040882D */ daddu $s1, $v0, $zero -/* 8A8690 80240710 0260202D */ daddu $a0, $s3, $zero -/* 8A8694 80240714 0C04417A */ jal get_entity_by_index -/* 8A8698 80240718 0040802D */ daddu $s0, $v0, $zero -/* 8A869C 8024071C 0040182D */ daddu $v1, $v0, $zero -/* 8A86A0 80240720 44920000 */ mtc1 $s2, $f0 -/* 8A86A4 80240724 00000000 */ nop -/* 8A86A8 80240728 46800020 */ cvt.s.w $f0, $f0 -/* 8A86AC 8024072C E4600048 */ swc1 $f0, 0x48($v1) -/* 8A86B0 80240730 44910000 */ mtc1 $s1, $f0 -/* 8A86B4 80240734 00000000 */ nop -/* 8A86B8 80240738 46800020 */ cvt.s.w $f0, $f0 -/* 8A86BC 8024073C E460004C */ swc1 $f0, 0x4c($v1) -/* 8A86C0 80240740 44900000 */ mtc1 $s0, $f0 -/* 8A86C4 80240744 00000000 */ nop -/* 8A86C8 80240748 46800020 */ cvt.s.w $f0, $f0 -/* 8A86CC 8024074C E4600050 */ swc1 $f0, 0x50($v1) -/* 8A86D0 80240750 8FBF0020 */ lw $ra, 0x20($sp) -/* 8A86D4 80240754 8FB3001C */ lw $s3, 0x1c($sp) -/* 8A86D8 80240758 8FB20018 */ lw $s2, 0x18($sp) -/* 8A86DC 8024075C 8FB10014 */ lw $s1, 0x14($sp) -/* 8A86E0 80240760 8FB00010 */ lw $s0, 0x10($sp) -/* 8A86E4 80240764 24020002 */ addiu $v0, $zero, 2 -/* 8A86E8 80240768 03E00008 */ jr $ra -/* 8A86EC 8024076C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml index f77d5e25e3..4b02fc6d3b 100644 --- a/ver/us/splat.yaml +++ b/ver/us/splat.yaml @@ -2135,7 +2135,7 @@ segments: overlay: True subsections: - [0x703AF0, c] - - [0x704A70, data] + - [0x704A80, data] - name: battle/partner/sushie type: code start: 0x707CA0 diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index 9d4642b074..2fffb14dad 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -5010,10 +5010,10 @@ func_8021840C_430DAC = 0x8021840C; // type:func rom:0x430DAC b_area_kmr_part_1_StartRumbleWithParams = 0x80218500; // type:func rom:0x430EA0 func_80218558_430EF8 = 0x80218558; // type:func rom:0x430EF8 func_802186E4_431084 = 0x802186E4; // type:func rom:0x431084 -func_802187E0_431180 = 0x802187E0; // type:func rom:0x431180 -func_80218A50_4313F0 = 0x80218A50; // type:func rom:0x4313F0 -func_80218CC0_431660 = 0x80218CC0; // type:func rom:0x431660 -func_80218F30_4318D0 = 0x80218F30; // type:func rom:0x4318D0 +dup2_b_area_kmr_part_1_UnkAngleFunc2 = 0x802187E0; // type:func rom:0x431180 +b_area_kmr_part_1_UnkAngleFunc2 = 0x80218A50; // type:func rom:0x4313F0 +dup3_b_area_kmr_part_1_UnkAngleFunc2 = 0x80218CC0; // type:func rom:0x431660 +dup_b_area_kmr_part_1_UnkAngleFunc2 = 0x80218F30; // type:func rom:0x4318D0 func_80219198_431B38 = 0x80219198; // type:func rom:0x431B38 formation0 = 0x802191E0; // type:data rom:0x431B80 formation1 = 0x802191FC; // type:data rom:0x431B9C @@ -5055,10 +5055,10 @@ func_80218A30_43A4C0 = 0x80218A30; // type:func rom:0x43A4C0 func_80218A60_43A4F0 = 0x80218A60; // type:func rom:0x43A4F0 b_area_kmr_part_2_SomeMatrixOperation = 0x80218B10; // type:func rom:0x43A5A0 b_area_kmr_part_2_SomeMatrixOperation2 = 0x80218B80; // type:func rom:0x43A610 -func_80218D50_43A7E0 = 0x80218D50; // type:func rom:0x43A7E0 -func_80218FC0_43AA50 = 0x80218FC0; // type:func rom:0x43AA50 -func_80219230_43ACC0 = 0x80219230; // type:func rom:0x43ACC0 -func_802194A0_43AF30 = 0x802194A0; // type:func rom:0x43AF30 +b_area_kmr_part_2_UnkAngleFunc2 = 0x80218D50; // type:func rom:0x43A7E0 +dup_b_area_kmr_part_2_UnkAngleFunc2 = 0x80218FC0; // type:func rom:0x43AA50 +dup2_b_area_kmr_part_2_UnkAngleFunc2 = 0x80219230; // type:func rom:0x43ACC0 +dup3_b_area_kmr_part_2_UnkAngleFunc2 = 0x802194A0; // type:func rom:0x43AF30 func_80219708_43B198 = 0x80219708; // type:func rom:0x43B198 D_8021A434_43BEC4 = 0x8021A434; // type:data rom:0x43BEC4 D_8021C244_43DCD4 = 0x8021C244; // type:data rom:0x43DCD4 @@ -5082,15 +5082,15 @@ func_80218D28_448168 = 0x80218D28; // type:func rom:0x448168 func_80218E1C_44825C = 0x80218E1C; // type:func rom:0x44825C func_80218F60_4483A0 = 0x80218F60; // type:func rom:0x4483A0 func_80218FA4_4483E4 = 0x80218FA4; // type:func rom:0x4483E4 -func_80218FE0_448420 = 0x80218FE0; // type:func rom:0x448420 -func_80219250_448690 = 0x80219250; // type:func rom:0x448690 -func_802194C0_448900 = 0x802194C0; // type:func rom:0x448900 -func_80219730_448B70 = 0x80219730; // type:func rom:0x448B70 +dup_b_area_kmr_part_3_UnkAngleFunc2 = 0x80218FE0; // type:func rom:0x448420 +dup2_b_area_kmr_part_3_UnkAngleFunc2 = 0x80219250; // type:func rom:0x448690 +dup3_b_area_kmr_part_3_UnkAngleFunc2 = 0x802194C0; // type:func rom:0x448900 +b_area_kmr_part_3_UnkAngleFunc2 = 0x80219730; // type:func rom:0x448B70 func_80219998_448DD8 = 0x80219998; // type:func rom:0x448DD8 func_802199E0_448E20 = 0x802199E0; // type:func rom:0x448E20 func_80219A40_448E80 = 0x80219A40; // type:func rom:0x448E80 -func_80219C38_449078 = 0x80219C38; // type:func rom:0x449078 -func_80219C5C_44909C = 0x80219C5C; // type:func rom:0x44909C +b_area_kmr_part_3_Set80071270_0_16 = 0x80219C38; // type:func rom:0x449078 +b_area_kmr_part_3_UnkFloatFunc2 = 0x80219C5C; // type:func rom:0x44909C func_80219D60_4491A0 = 0x80219D60; // type:func rom:0x4491A0 D_8021B030_44A470 = 0x8021B030; // type:data rom:0x44A470 D_8021E61C_44DA5C = 0x8021E61C; // type:data rom:0x44DA5C @@ -5179,7 +5179,7 @@ func_80218000_4A10A0 = 0x80218000; // type:func rom:0x4A10A0 b_area_trd_part_1_UnkBattleFunc1 = 0x80218020; // type:func rom:0x4A10C0 b_area_trd_part_1_StartRumbleWithParams = 0x802180F0; // type:func rom:0x4A1190 dup_b_area_trd_part_1_UnkBattleFunc1 = 0x80218148; // type:func rom:0x4A11E8 -func_80218220_4A12C0 = 0x80218220; // type:func rom:0x4A12C0 +b_area_trd_part_1_UnkAngleFunc2 = 0x80218220; // type:func rom:0x4A12C0 D_8021A4E8_4A3588 = 0x8021A4E8; // type:data rom:0x4A3588 dup2_b_area_trd_part_2_StartRumbleWithParams = 0x80218000; // type:func rom:0x4B11F0 func_80218058_4B1248 = 0x80218058; // type:func rom:0x4B1248 @@ -5206,7 +5206,7 @@ func_80219B78_4B2D68 = 0x80219B78; // type:func rom:0x4B2D68 func_80219C50_4B2E40 = 0x80219C50; // type:func rom:0x4B2E40 func_80219CF0_4B2EE0 = 0x80219CF0; // type:func rom:0x4B2EE0 func_8021A288_4B3478 = 0x8021A288; // type:func rom:0x4B3478 -func_8021A2E0_4B34D0 = 0x8021A2E0; // type:func rom:0x4B34D0 +b_area_trd_part_2_UnkAngleFunc2 = 0x8021A2E0; // type:func rom:0x4B34D0 func_80218000_4CF1B0 = 0x80218000; // type:func rom:0x4CF1B0 func_802180C8_4CF278 = 0x802180C8; // type:func rom:0x4CF278 func_802180E8_4CF298 = 0x802180E8; // type:func rom:0x4CF298 @@ -5569,23 +5569,23 @@ dup2_b_area_sam_UnkBattleFunc1 = 0x802199C4; // type:func rom:0x625564 b_area_sam_StartRumbleWithParams = 0x80219A90; // type:func rom:0x625630 func_80219AE8_625688 = 0x80219AE8; // type:func rom:0x625688 func_80219BB0_625750 = 0x80219BB0; // type:func rom:0x625750 -func_80219DA8_625948 = 0x80219DA8; // type:func rom:0x625948 -func_80219DCC_62596C = 0x80219DCC; // type:func rom:0x62596C +b_area_sam_Set80071270_0_16 = 0x80219DA8; // type:func rom:0x625948 +b_area_sam_UnkFloatFunc2 = 0x80219DCC; // type:func rom:0x62596C func_80219ED0_625A70 = 0x80219ED0; // type:func rom:0x625A70 -func_8021A0C8_625C68 = 0x8021A0C8; // type:func rom:0x625C68 -func_8021A0EC_625C8C = 0x8021A0EC; // type:func rom:0x625C8C +dup_b_area_sam_Set80071270_0_16 = 0x8021A0C8; // type:func rom:0x625C68 +dup_b_area_sam_UnkFloatFunc2 = 0x8021A0EC; // type:func rom:0x625C8C func_8021A1F0_625D90 = 0x8021A1F0; // type:func rom:0x625D90 -func_8021A3E8_625F88 = 0x8021A3E8; // type:func rom:0x625F88 -func_8021A40C_625FAC = 0x8021A40C; // type:func rom:0x625FAC +dup2_b_area_sam_Set80071270_0_16 = 0x8021A3E8; // type:func rom:0x625F88 +dup2_b_area_sam_UnkFloatFunc2 = 0x8021A40C; // type:func rom:0x625FAC func_8021A510_6260B0 = 0x8021A510; // type:func rom:0x6260B0 -func_8021A708_6262A8 = 0x8021A708; // type:func rom:0x6262A8 -func_8021A72C_6262CC = 0x8021A72C; // type:func rom:0x6262CC +dup3_b_area_sam_Set80071270_0_16 = 0x8021A708; // type:func rom:0x6262A8 +dup3_b_area_sam_UnkFloatFunc2 = 0x8021A72C; // type:func rom:0x6262CC func_8021A830_6263D0 = 0x8021A830; // type:func rom:0x6263D0 -func_8021AA28_6265C8 = 0x8021AA28; // type:func rom:0x6265C8 -func_8021AA4C_6265EC = 0x8021AA4C; // type:func rom:0x6265EC +dup4_b_area_sam_Set80071270_0_16 = 0x8021AA28; // type:func rom:0x6265C8 +dup4_b_area_sam_UnkFloatFunc2 = 0x8021AA4C; // type:func rom:0x6265EC func_8021AB50_6266F0 = 0x8021AB50; // type:func rom:0x6266F0 -func_8021AD48_6268E8 = 0x8021AD48; // type:func rom:0x6268E8 -func_8021AD6C_62690C = 0x8021AD6C; // type:func rom:0x62690C +dup5_b_area_sam_Set80071270_0_16 = 0x8021AD48; // type:func rom:0x6268E8 +dup5_b_area_sam_UnkFloatFunc2 = 0x8021AD6C; // type:func rom:0x62690C func_8021AE70_626A10 = 0x8021AE70; // type:func rom:0x626A10 D_8021E660_62A200 = 0x8021E660; // type:data rom:0x62A200 D_80220314_62BEB4 = 0x80220314; // type:data rom:0x62BEB4 @@ -5625,23 +5625,23 @@ b_area_sam2_UnkBattleFunc1 = 0x80218994; // type:func rom:0x63DB74 dup2_b_area_sam2_StartRumbleWithParams = 0x80218A60; // type:func rom:0x63DC40 func_80218AB8_63DC98 = 0x80218AB8; // type:func rom:0x63DC98 func_80218B80_63DD60 = 0x80218B80; // type:func rom:0x63DD60 -func_80218D78_63DF58 = 0x80218D78; // type:func rom:0x63DF58 -func_80218D9C_63DF7C = 0x80218D9C; // type:func rom:0x63DF7C +b_area_sam2_Set80071270_0_16 = 0x80218D78; // type:func rom:0x63DF58 +b_area_sam2_UnkFloatFunc2 = 0x80218D9C; // type:func rom:0x63DF7C func_80218EA0_63E080 = 0x80218EA0; // type:func rom:0x63E080 -func_80219098_63E278 = 0x80219098; // type:func rom:0x63E278 -func_802190BC_63E29C = 0x802190BC; // type:func rom:0x63E29C +dup_b_area_sam2_Set80071270_0_16 = 0x80219098; // type:func rom:0x63E278 +dup_b_area_sam2_UnkFloatFunc2 = 0x802190BC; // type:func rom:0x63E29C func_802191C0_63E3A0 = 0x802191C0; // type:func rom:0x63E3A0 -func_802193B8_63E598 = 0x802193B8; // type:func rom:0x63E598 -func_802193DC_63E5BC = 0x802193DC; // type:func rom:0x63E5BC +dup2_b_area_sam2_Set80071270_0_16 = 0x802193B8; // type:func rom:0x63E598 +dup2_b_area_sam2_UnkFloatFunc2 = 0x802193DC; // type:func rom:0x63E5BC func_802194E0_63E6C0 = 0x802194E0; // type:func rom:0x63E6C0 -func_802196D8_63E8B8 = 0x802196D8; // type:func rom:0x63E8B8 -func_802196FC_63E8DC = 0x802196FC; // type:func rom:0x63E8DC +dup3_b_area_sam2_Set80071270_0_16 = 0x802196D8; // type:func rom:0x63E8B8 +dup3_b_area_sam2_UnkFloatFunc2 = 0x802196FC; // type:func rom:0x63E8DC func_80219800_63E9E0 = 0x80219800; // type:func rom:0x63E9E0 -func_802199F8_63EBD8 = 0x802199F8; // type:func rom:0x63EBD8 -func_80219A1C_63EBFC = 0x80219A1C; // type:func rom:0x63EBFC +dup4_b_area_sam2_Set80071270_0_16 = 0x802199F8; // type:func rom:0x63EBD8 +dup4_b_area_sam2_UnkFloatFunc2 = 0x80219A1C; // type:func rom:0x63EBFC func_80219B20_63ED00 = 0x80219B20; // type:func rom:0x63ED00 -func_80219D18_63EEF8 = 0x80219D18; // type:func rom:0x63EEF8 -func_80219D3C_63EF1C = 0x80219D3C; // type:func rom:0x63EF1C +dup5_b_area_sam2_Set80071270_0_16 = 0x80219D18; // type:func rom:0x63EEF8 +dup5_b_area_sam2_UnkFloatFunc2 = 0x80219D3C; // type:func rom:0x63EF1C func_80219E40_63F020 = 0x80219E40; // type:func rom:0x63F020 D_8021A2B8_63F498 = 0x8021A2B8; // type:data rom:0x63F498 D_8021E2FC_6434DC = 0x8021E2FC; // type:data rom:0x6434DC @@ -5692,8 +5692,8 @@ func_802183A4_660AF4 = 0x802183A4; // type:func rom:0x660AF4 func_8021848C_660BDC = 0x8021848C; // type:func rom:0x660BDC func_802185D0_660D20 = 0x802185D0; // type:func rom:0x660D20 func_802186C0_660E10 = 0x802186C0; // type:func rom:0x660E10 -func_802188B8_661008 = 0x802188B8; // type:func rom:0x661008 -func_802188DC_66102C = 0x802188DC; // type:func rom:0x66102C +b_area_pra2_Set80071270_0_16 = 0x802188B8; // type:func rom:0x661008 +b_area_pra2_UnkFloatFunc2 = 0x802188DC; // type:func rom:0x66102C func_802189E0_661130 = 0x802189E0; // type:func rom:0x661130 D_802211E0_669930 = 0x802211E0; // type:data rom:0x669930 func_80218000_669D80 = 0x80218000; // type:func rom:0x669D80 @@ -7041,7 +7041,7 @@ tik_01_GetEntryPos = 0x802403FC; // type:func rom:0x8698AC tik_01_GetCurrentCameraYawClamped180 = 0x802404DC; // type:func rom:0x86998C tik_01_SomeXYZFunc2 = 0x80240548; // type:func rom:0x8699F8 func_802405F0_869AA0 = 0x802405F0; // type:func rom:0x869AA0 -func_80240960_869E10 = 0x80240960; // type:func rom:0x869E10 +tik_01_SetEntityPosition = 0x80240960; // type:func rom:0x869E10 func_80240A30_869EE0 = 0x80240A30; // type:func rom:0x869EE0 D_80242B7E_86C02E = 0x80242B7E; // type:data rom:0x86C02E tik_02_UnkTexturePanFunc = 0x80240000; // type:func rom:0x86C740 @@ -7089,7 +7089,7 @@ tik_05_GetItemName = 0x80240734; // type:func rom:0x8754F4 tik_05_SomeItemEntityFunc = 0x80240798; // type:func rom:0x875558 tik_05_CheckItemFlags40 = 0x802408E8; // type:func rom:0x8756A8 func_8024093C_8756FC = 0x8024093C; // type:func rom:0x8756FC -func_80240984_875744 = 0x80240984; // type:func rom:0x875744 +tik_05_SetEntityPosition = 0x80240984; // type:func rom:0x875744 D_80241800_8765C0 = 0x80241800; // type:data rom:0x8765C0 tik_06_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0x876EE0 tik_06_GetCurrentFloor = 0x80240020; // type:func rom:0x876F00 @@ -7155,7 +7155,7 @@ tik_08_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x87F02C tik_08_UnkTexturePanFunc = 0x802402E0; // type:func rom:0x87F0D0 tik_08_UnkTexturePanFunc2 = 0x80240404; // type:func rom:0x87F1F4 func_802405F0_87F3E0 = 0x802405F0; // type:func rom:0x87F3E0 -func_80240960_87F750 = 0x80240960; // type:func rom:0x87F750 +tik_08_SetEntityPosition = 0x80240960; // type:func rom:0x87F750 func_80240A30_87F820 = 0x80240A30; // type:func rom:0x87F820 func_80240A5C_87F84C = 0x80240A5C; // type:func rom:0x87F84C D_80242C0E_8819FE = 0x80242C0E; // type:data rom:0x8819FE @@ -7168,7 +7168,7 @@ tik_09_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x8823FC tik_09_UnkTexturePanFunc = 0x802402E0; // type:func rom:0x8824A0 tik_09_UnkTexturePanFunc2 = 0x80240404; // type:func rom:0x8825C4 func_802405F0_8827B0 = 0x802405F0; // type:func rom:0x8827B0 -func_80240960_882B20 = 0x80240960; // type:func rom:0x882B20 +tik_09_SetEntityPosition = 0x80240960; // type:func rom:0x882B20 tik_09_set_script_owner_npc_anim = 0x80240A30; // type:func rom:0x882BF0 func_80240AAC_882C6C = 0x80240AAC; // type:func rom:0x882C6C tik_09_UnkNpcAIFunc12 = 0x80240BE0; // type:func rom:0x882DA0 @@ -7402,7 +7402,7 @@ tik_25_UnkTexturePanFunc = 0x80240000; // type:func rom:0x8A7F80 tik_25_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0x8A80A4 func_8024030C_8A828C = 0x8024030C; // type:func rom:0x8A828C func_80240680_8A8600 = 0x80240680; // type:func rom:0x8A8600 -func_802406AC_8A862C = 0x802406AC; // type:func rom:0x8A862C +tik_25_SetEntityPosition = 0x802406AC; // type:func rom:0x8A862C func_80240770_8A86F0 = 0x80240770; // type:func rom:0x8A86F0 func_80240000_8A9A10 = 0x80240000; // type:func rom:0x8A9A10 func_80240160_8A9B70 = 0x80240160; // type:func rom:0x8A9B70 @@ -7673,7 +7673,7 @@ kmr_10_GetItemName = 0x802400B4; // type:func rom:0x8D8584 kmr_10_SomeItemEntityFunc = 0x80240118; // type:func rom:0x8D85E8 kmr_10_CheckItemFlags40 = 0x80240268; // type:func rom:0x8D8738 func_802402BC_8D878C = 0x802402BC; // type:func rom:0x8D878C -func_80240304_8D87D4 = 0x80240304; // type:func rom:0x8D87D4 +kmr_10_SetEntityPosition = 0x80240304; // type:func rom:0x8D87D4 kmr_10_SomeMatrixOperation = 0x802403D0; // type:func rom:0x8D88A0 kmr_10_SomeMatrixOperation2 = 0x80240440; // type:func rom:0x8D8910 D_80240C20_8D90F0 = 0x80240C20; // type:data rom:0x8D90F0 @@ -8448,7 +8448,7 @@ func_80240000_97DAD0 = 0x80240000; // type:func rom:0x97DAD0 func_80240230_97DD00 = 0x80240230; // type:func rom:0x97DD00 isk_05_UnkNpcAIFunc1 = 0x80240568; // type:func rom:0x97E038 func_80240628_97E0F8 = 0x80240628; // type:func rom:0x97E0F8 -func_802407CC_97E29C = 0x802407CC; // type:func rom:0x97E29C +isk_05_UnkNpcAIFunc15 = 0x802407CC; // type:func rom:0x97E29C func_802408AC_97E37C = 0x802408AC; // type:func rom:0x97E37C isk_05_UnkDurationCheck = 0x80240BAC; // type:func rom:0x97E67C func_80240BF0_97E6C0 = 0x80240BF0; // type:func rom:0x97E6C0 @@ -8523,7 +8523,7 @@ func_80240000_98F7E0 = 0x80240000; // type:func rom:0x98F7E0 func_80240230_98FA10 = 0x80240230; // type:func rom:0x98FA10 isk_13_UnkNpcAIFunc1 = 0x80240568; // type:func rom:0x98FD48 func_80240628_98FE08 = 0x80240628; // type:func rom:0x98FE08 -func_802407CC_98FFAC = 0x802407CC; // type:func rom:0x98FFAC +isk_13_UnkNpcAIFunc15 = 0x802407CC; // type:func rom:0x98FFAC func_802408AC_99008C = 0x802408AC; // type:func rom:0x99008C isk_13_UnkDurationCheck = 0x80240BAC; // type:func rom:0x99038C func_80240BF0_9903D0 = 0x80240BF0; // type:func rom:0x9903D0 @@ -8547,7 +8547,7 @@ func_80240000_992730 = 0x80240000; // type:func rom:0x992730 func_80240230_992960 = 0x80240230; // type:func rom:0x992960 isk_14_UnkNpcAIFunc1 = 0x80240568; // type:func rom:0x992C98 func_80240628_992D58 = 0x80240628; // type:func rom:0x992D58 -func_802407CC_992EFC = 0x802407CC; // type:func rom:0x992EFC +isk_14_UnkNpcAIFunc15 = 0x802407CC; // type:func rom:0x992EFC func_802408AC_992FDC = 0x802408AC; // type:func rom:0x992FDC isk_14_UnkDurationCheck = 0x80240BAC; // type:func rom:0x9932DC func_80240BF0_993320 = 0x80240BF0; // type:func rom:0x993320 @@ -8954,7 +8954,7 @@ func_80240000_9EB7F0 = 0x80240000; // type:func rom:0x9EB7F0 func_80240230_9EBA20 = 0x80240230; // type:func rom:0x9EBA20 nok_03_UnkNpcAIFunc1 = 0x80240568; // type:func rom:0x9EBD58 func_80240628_9EBE18 = 0x80240628; // type:func rom:0x9EBE18 -func_802407CC_9EBFBC = 0x802407CC; // type:func rom:0x9EBFBC +nok_03_UnkNpcAIFunc15 = 0x802407CC; // type:func rom:0x9EBFBC func_802408AC_9EC09C = 0x802408AC; // type:func rom:0x9EC09C nok_03_UnkDurationCheck = 0x80240BAC; // type:func rom:0x9EC39C func_80240BF0_9EC3E0 = 0x80240BF0; // type:func rom:0x9EC3E0 @@ -9013,7 +9013,7 @@ D_80245D58_9FA798 = 0x80245D58; // type:data rom:0x9FA798 D_80245D60_9FA7A0 = 0x80245D60; // type:data rom:0x9FA7A0 func_80240000_9FA7F0 = 0x80240000; // type:func rom:0x9FA7F0 func_80240180_9FA970 = 0x80240180; // type:func rom:0x9FA970 -func_80240224_9FAA14 = 0x80240224; // type:func rom:0x9FAA14 +nok_12_SetEntityPosition = 0x80240224; // type:func rom:0x9FAA14 func_802402F0_9FAAE0 = 0x802402F0; // type:func rom:0x9FAAE0 func_8024030C_9FAAFC = 0x8024030C; // type:func rom:0x9FAAFC nok_12_SomeMatrixOperation = 0x80240330; // type:func rom:0x9FAB20 @@ -9047,7 +9047,7 @@ func_80240000_A00600 = 0x80240000; // type:func rom:0xA00600 func_80240230_A00830 = 0x80240230; // type:func rom:0xA00830 nok_13_UnkNpcAIFunc1 = 0x80240568; // type:func rom:0xA00B68 func_80240628_A00C28 = 0x80240628; // type:func rom:0xA00C28 -func_802407CC_A00DCC = 0x802407CC; // type:func rom:0xA00DCC +nok_13_UnkNpcAIFunc15 = 0x802407CC; // type:func rom:0xA00DCC func_802408AC_A00EAC = 0x802408AC; // type:func rom:0xA00EAC nok_13_UnkDurationCheck = 0x80240BAC; // type:func rom:0xA011AC func_80240BF0_A011F0 = 0x80240BF0; // type:func rom:0xA011F0 @@ -10037,7 +10037,7 @@ func_8024033C_AA92DC = 0x8024033C; // type:func rom:0xAA92DC func_80240408_AA93A8 = 0x80240408; // type:func rom:0xAA93A8 func_80240434_AA93D4 = 0x80240434; // type:func rom:0xAA93D4 func_80240510_AA94B0 = 0x80240510; // type:func rom:0xAA94B0 -func_80240564_AA9504 = 0x80240564; // type:func rom:0xAA9504 +kpa_134_SetEntityPosition = 0x80240564; // type:func rom:0xAA9504 kpa_134_SetEntityFlags100000 = 0x80240628; // type:func rom:0xAA95C8 kpa_134_GetEntityPosition = 0x8024065C; // type:func rom:0xAA95FC osr_00_UnkTexturePanFunc = 0x80240000; // type:func rom:0xAAC830 @@ -10410,7 +10410,7 @@ func_80240340_B28370 = 0x80240340; // type:func rom:0xB28370 func_80240570_B285A0 = 0x80240570; // type:func rom:0xB285A0 jan_01_UnkNpcAIFunc1 = 0x802408A8; // type:func rom:0xB288D8 func_80240968_B28998 = 0x80240968; // type:func rom:0xB28998 -func_80240B0C_B28B3C = 0x80240B0C; // type:func rom:0xB28B3C +jan_01_UnkNpcAIFunc15 = 0x80240B0C; // type:func rom:0xB28B3C func_80240BEC_B28C1C = 0x80240BEC; // type:func rom:0xB28C1C jan_01_UnkDurationCheck = 0x80240EEC; // type:func rom:0xB28F1C func_80240F30_B28F60 = 0x80240F30; // type:func rom:0xB28F60 @@ -10597,7 +10597,7 @@ func_802408A4_B4B314 = 0x802408A4; // type:func rom:0xB4B314 func_80240AD4_B4B544 = 0x80240AD4; // type:func rom:0xB4B544 jan_05_UnkNpcAIFunc1 = 0x80240E0C; // type:func rom:0xB4B87C func_80240ECC_B4B93C = 0x80240ECC; // type:func rom:0xB4B93C -func_80241070_B4BAE0 = 0x80241070; // type:func rom:0xB4BAE0 +jan_05_UnkNpcAIFunc15 = 0x80241070; // type:func rom:0xB4BAE0 func_80241150_B4BBC0 = 0x80241150; // type:func rom:0xB4BBC0 jan_05_UnkDurationCheck = 0x80241450; // type:func rom:0xB4BEC0 func_80241494_B4BF04 = 0x80241494; // type:func rom:0xB4BF04 @@ -10627,7 +10627,7 @@ func_80240740_B52F70 = 0x80240740; // type:func rom:0xB52F70 func_80240970_B531A0 = 0x80240970; // type:func rom:0xB531A0 jan_06_UnkNpcAIFunc1 = 0x80240CA8; // type:func rom:0xB534D8 delete_player_actor_B53598 = 0x80240D68; // type:func rom:0xB53598 -func_80240F0C_B5373C = 0x80240F0C; // type:func rom:0xB5373C +jan_06_UnkNpcAIFunc15 = 0x80240F0C; // type:func rom:0xB5373C func_80240FEC_B5381C = 0x80240FEC; // type:func rom:0xB5381C jan_06_UnkDurationCheck = 0x802412EC; // type:func rom:0xB53B1C func_80241330_B53B60 = 0x80241330; // type:func rom:0xB53B60 @@ -10736,7 +10736,7 @@ func_80240310_B6C6A0 = 0x80240310; // type:func rom:0xB6C6A0 func_80240540_B6C8D0 = 0x80240540; // type:func rom:0xB6C8D0 jan_10_UnkNpcAIFunc1 = 0x80240878; // type:func rom:0xB6CC08 func_80240938_B6CCC8 = 0x80240938; // type:func rom:0xB6CCC8 -func_80240ADC_B6CE6C = 0x80240ADC; // type:func rom:0xB6CE6C +jan_10_UnkNpcAIFunc15 = 0x80240ADC; // type:func rom:0xB6CE6C delete_actor_B6CF4C = 0x80240BBC; // type:func rom:0xB6CF4C jan_10_UnkDurationCheck = 0x80240EBC; // type:func rom:0xB6D24C func_80240F00_B6D290 = 0x80240F00; // type:func rom:0xB6D290 @@ -10796,7 +10796,7 @@ func_802404C0_B7A510 = 0x802404C0; // type:func rom:0xB7A510 func_802406F0_B7A740 = 0x802406F0; // type:func rom:0xB7A740 jan_14_UnkNpcAIFunc1 = 0x80240A28; // type:func rom:0xB7AA78 func_80240AE8_B7AB38 = 0x80240AE8; // type:func rom:0xB7AB38 -func_80240C8C_B7ACDC = 0x80240C8C; // type:func rom:0xB7ACDC +jan_14_UnkNpcAIFunc15 = 0x80240C8C; // type:func rom:0xB7ACDC func_80240D6C_B7ADBC = 0x80240D6C; // type:func rom:0xB7ADBC jan_14_UnkDurationCheck = 0x8024106C; // type:func rom:0xB7B0BC func_802410B0_B7B100 = 0x802410B0; // type:func rom:0xB7B100 @@ -10872,7 +10872,7 @@ func_80240070_B97C70 = 0x80240070; // type:func rom:0xB97C70 func_802402A0_B97EA0 = 0x802402A0; // type:func rom:0xB97EA0 mim_02_UnkNpcAIFunc1 = 0x802405D8; // type:func rom:0xB981D8 func_80240698_B98298 = 0x80240698; // type:func rom:0xB98298 -func_8024083C_B9843C = 0x8024083C; // type:func rom:0xB9843C +mim_02_UnkNpcAIFunc15 = 0x8024083C; // type:func rom:0xB9843C func_8024091C_B9851C = 0x8024091C; // type:func rom:0xB9851C mim_02_UnkDurationCheck = 0x80240C1C; // type:func rom:0xB9881C func_80240C60_B98860 = 0x80240C60; // type:func rom:0xB98860 @@ -10895,7 +10895,7 @@ func_80240200_B9DB60 = 0x80240200; // type:func rom:0xB9DB60 func_80240430_B9DD90 = 0x80240430; // type:func rom:0xB9DD90 mim_04_UnkNpcAIFunc1 = 0x80240768; // type:func rom:0xB9E0C8 func_80240828_B9E188 = 0x80240828; // type:func rom:0xB9E188 -func_802409CC_B9E32C = 0x802409CC; // type:func rom:0xB9E32C +mim_04_UnkNpcAIFunc15 = 0x802409CC; // type:func rom:0xB9E32C func_80240AAC_B9E40C = 0x80240AAC; // type:func rom:0xB9E40C mim_04_UnkDurationCheck = 0x80240DAC; // type:func rom:0xB9E70C func_80240DF0_B9E750 = 0x80240DF0; // type:func rom:0xB9E750 @@ -10953,7 +10953,7 @@ func_80241F14_BA6694 = 0x80241F14; // type:func rom:0xBA6694 func_80242144_BA68C4 = 0x80242144; // type:func rom:0xBA68C4 mim_06_UnkNpcAIFunc1 = 0x8024247C; // type:func rom:0xBA6BFC func_8024253C_BA6CBC = 0x8024253C; // type:func rom:0xBA6CBC -func_802426E0_BA6E60 = 0x802426E0; // type:func rom:0xBA6E60 +mim_06_UnkNpcAIFunc15 = 0x802426E0; // type:func rom:0xBA6E60 func_802427C0_BA6F40 = 0x802427C0; // type:func rom:0xBA6F40 mim_06_UnkDurationCheck = 0x80242AC0; // type:func rom:0xBA7240 func_80242B04_BA7284 = 0x80242B04; // type:func rom:0xBA7284 @@ -10973,7 +10973,7 @@ func_80240270_BAA3B0 = 0x80240270; // type:func rom:0xBAA3B0 func_802404A0_BAA5E0 = 0x802404A0; // type:func rom:0xBAA5E0 mim_07_UnkNpcAIFunc1 = 0x802407D8; // type:func rom:0xBAA918 func_80240898_BAA9D8 = 0x80240898; // type:func rom:0xBAA9D8 -func_80240A3C_BAAB7C = 0x80240A3C; // type:func rom:0xBAAB7C +mim_07_UnkNpcAIFunc15 = 0x80240A3C; // type:func rom:0xBAAB7C func_80240B1C_BAAC5C = 0x80240B1C; // type:func rom:0xBAAC5C mim_07_UnkDurationCheck = 0x80240E1C; // type:func rom:0xBAAF5C func_80240E60_BAAFA0 = 0x80240E60; // type:func rom:0xBAAFA0 @@ -11027,7 +11027,7 @@ func_802400A0_BB2EA0 = 0x802400A0; // type:func rom:0xBB2EA0 func_802402D0_BB30D0 = 0x802402D0; // type:func rom:0xBB30D0 mim_09_UnkNpcAIFunc1 = 0x80240608; // type:func rom:0xBB3408 func_802406C8_BB34C8 = 0x802406C8; // type:func rom:0xBB34C8 -func_8024086C_BB366C = 0x8024086C; // type:func rom:0xBB366C +mim_09_UnkNpcAIFunc15 = 0x8024086C; // type:func rom:0xBB366C func_8024094C_BB374C = 0x8024094C; // type:func rom:0xBB374C mim_09_UnkDurationCheck = 0x80240C4C; // type:func rom:0xBB3A4C func_80240C90_BB3A90 = 0x80240C90; // type:func rom:0xBB3A90