From 1ca57773cf946a7c5b685143a97d071a0eeba4f3 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Wed, 30 Dec 2020 15:53:40 +0900 Subject: [PATCH] UnkBattleFunc1 --- .../area_dig/6DDDC0/func_80218000_6DDDC0.s | 56 -------- .../{6DDDC0 => 6DDE90}/func_802180D0_6DDE90.s | 0 .../{6DDDC0 => 6DDE90}/func_80218184_6DDF44.s | 0 .../area_dig/6DE000/func_80218240_6DE000.s | 56 -------- .../area_dig/6DE000/func_80218310_6DE0D0.s | 56 -------- .../{6DE000 => 6DE1A0}/func_802183E0_6DE1A0.s | 4 +- .../area_flo/5B14B0/func_80218000_5B14B0.s | 55 -------- .../area_flo/5B16A0/func_80218380_5B1830.s | 55 -------- .../area_flo/5B16A0/func_802186E4_5B1B94.s | 55 -------- .../area_flo/5B16A0/func_80218A54_5B1F04.s | 55 -------- .../area_flo/5B16A0/func_80218DC4_5B2274.s | 55 -------- .../area_flo/5B16A0/func_80219234_5B26E4.s | 55 -------- .../area_hos/47F0D0/func_802182D4_47F384.s | 55 -------- .../4E2740/func_80218000_4E2740.s | 56 -------- .../4E2740/func_802180D0_4E2810.s | 56 -------- .../4E2740/func_802181A0_4E28E0.s | 56 -------- .../{4E2740 => 4E29B0}/func_80218270_4E29B0.s | 0 .../{4E2740 => 4E29B0}/func_802183C0_4E2B00.s | 0 .../{4E2740 => 4E29B0}/func_80218458_4E2B98.s | 0 .../{4E2740 => 4E29B0}/func_802184CC_4E2C0C.s | 34 ++--- .../{4E2740 => 4E29B0}/func_802188B0_4E2FF0.s | 0 .../{4E2740 => 4E29B0}/func_80218944_4E3084.s | 0 .../{4E2740 => 4E29B0}/func_80218980_4E30C0.s | 0 .../{4E2740 => 4E29B0}/func_80218A10_4E3150.s | 0 .../4EF4A0/func_80218690_4EFB30.s | 55 -------- .../area_jan/573920/func_80218000_573920.s | 56 -------- .../area_jan/573920/func_802180D0_5739F0.s | 56 -------- .../{573920 => 573AC0}/func_802181A0_573AC0.s | 6 +- .../{573920 => 573AC0}/func_80218254_573B74.s | 0 .../area_jan/573C30/func_80218310_573C30.s | 55 -------- .../area_jan/573C30/func_802184F0_573E10.s | 56 -------- .../area_jan2/584940/func_80218000_584940.s | 55 -------- .../area_jan2/584B90/func_802183D4_584D14.s | 55 -------- .../area_kgr/56E2A0/func_80218000_56E2A0.s | 55 -------- .../447C80/func_80218840_447C80.s | 56 -------- .../447C80/func_80218910_447D50.s | 55 -------- .../447C80/func_80218AD0_447F10.s | 55 -------- .../{447C80 => 447D50}/func_802189DC_447E1C.s | 0 .../{447C80 => 447D50}/func_80218AA4_447EE4.s | 0 .../{447C80 => 447D50}/func_80218B9C_447FDC.s | 0 .../{447C80 => 447D50}/func_80218D28_448168.s | 0 .../{447C80 => 447D50}/func_80218E1C_44825C.s | 0 .../{447C80 => 447D50}/func_80218F60_4483A0.s | 0 .../{447C80 => 447D50}/func_80218FA4_4483E4.s | 0 .../{447C80 => 447D50}/func_80218FE0_448420.s | 0 .../area_kpa/684A30/func_80218000_684A30.s | 56 -------- .../area_kpa/684A30/func_802180D0_684B00.s | 55 -------- .../area_kpa/684C30/func_80218514_684F44.s | 55 -------- .../area_kpa3/6BBB90/func_80218000_6BBB90.s | 56 -------- .../area_kpa3/6BBB90/func_80218C44_6BC7D4.s | 55 -------- .../{6BBB90 => 6BBC60}/func_802180D0_6BBC60.s | 72 +++++------ .../{6BBB90 => 6BBC60}/func_80218960_6BC4F0.s | 0 .../{6BBB90 => 6BBC60}/func_80218AB4_6BC644.s | 0 .../{6BBB90 => 6BBC60}/func_80218B60_6BC6F0.s | 0 .../{6BBB90 => 6BBC60}/func_80218BC4_6BC754.s | 0 .../{6BBB90 => 6BBC60}/func_80218BFC_6BC78C.s | 0 .../{6BBB90 => 6BBC60}/func_80218D10_6BC8A0.s | 0 .../{6BBB90 => 6BBC60}/func_80218E34_6BC9C4.s | 0 .../{6BBB90 => 6BBC60}/func_80218F58_6BCAE8.s | 0 .../{6BBB90 => 6BBC60}/func_802193D4_6BCF64.s | 0 .../{6BBB90 => 6BBC60}/func_80219428_6BCFB8.s | 0 .../{6BBB90 => 6BBC60}/func_80219474_6BD004.s | 0 .../{6BBB90 => 6BBC60}/func_802194C0_6BD050.s | 0 .../{6BBB90 => 6BBC60}/func_8021950C_6BD09C.s | 0 .../{6BBB90 => 6BBC60}/func_80219550_6BD0E0.s | 0 .../{6BBB90 => 6BBC60}/func_80219588_6BD118.s | 0 .../{6BBB90 => 6BBC60}/func_802195F4_6BD184.s | 0 .../area_kpa4/6CC070/func_80218020_6CC090.s | 55 -------- .../area_kpa4/6CC1C0/func_80218464_6CC4D4.s | 55 -------- .../area_kzn/58C2F0/func_80218130_58C420.s | 55 -------- .../area_kzn/58C670/func_80218380_58C670.s | 56 -------- .../area_kzn/58C670/func_80218450_58C740.s | 55 -------- .../area_kzn/58C670/func_802187B4_58CAA4.s | 55 -------- .../area_kzn/58C670/func_80218B24_58CE14.s | 55 -------- .../{58C670 => 58C740}/func_8021851C_58C80C.s | 14 +- .../{58C670 => 58C740}/func_80218630_58C920.s | 0 .../{58C670 => 58C740}/func_80218788_58CA78.s | 0 .../{58C670 => 58C740}/func_802188D8_58CBC8.s | 0 .../{58C670 => 58C740}/func_802189A0_58CC90.s | 0 .../{58C670 => 58C740}/func_80218AF8_58CDE8.s | 0 .../{58C670 => 58C740}/func_80218C48_58CF38.s | 0 .../{58C670 => 58C740}/func_80218D0C_58CFFC.s | 0 .../{58C670 => 58C740}/func_80218D6C_58D05C.s | 0 .../area_mac/464490/func_80218000_464490.s | 56 -------- .../area_mac/464490/func_80218E74_465304.s | 55 -------- .../{464490 => 464560}/func_802180D0_464560.s | 0 .../{464490 => 464560}/func_80218100_464590.s | 0 .../{464490 => 464560}/func_80218300_464790.s | 0 .../{464490 => 464560}/func_80218B90_465020.s | 0 .../{464490 => 464560}/func_80218CE4_465174.s | 0 .../{464490 => 464560}/func_80218D90_465220.s | 0 .../{464490 => 464560}/func_80218DF4_465284.s | 0 .../{464490 => 464560}/func_80218E2C_4652BC.s | 0 .../{464490 => 464560}/func_80218F40_4653D0.s | 0 .../{464490 => 464560}/func_80219064_4654F4.s | 0 .../{464490 => 464560}/func_80219188_465618.s | 0 .../{464490 => 464560}/func_80219604_465A94.s | 0 .../{464490 => 464560}/func_80219658_465AE8.s | 0 .../{464490 => 464560}/func_802196A4_465B34.s | 0 .../{464490 => 464560}/func_802196F0_465B80.s | 0 .../{464490 => 464560}/func_8021973C_465BCC.s | 0 .../{464490 => 464560}/func_80219780_465C10.s | 0 .../{464490 => 464560}/func_802197B8_465C48.s | 0 .../{464490 => 464560}/func_80219824_465CB4.s | 0 .../area_mim/4F7D50/func_80218170_4F7D50.s | 55 -------- .../area_nok/48D700/func_802187E0_48D980.s | 56 -------- .../{48D700 => 48DA50}/func_802188B0_48DA50.s | 0 .../{48D700 => 48DA50}/func_80218964_48DB04.s | 0 .../area_nok/48DBC0/func_80218A78_48DC18.s | 58 --------- .../area_nok/48DCF0/func_80218BA8_48DD48.s | 55 -------- .../area_omo/5125D0/func_80218000_5125D0.s | 56 -------- .../area_omo/5125D0/func_802180D0_5126A0.s | 56 -------- .../area_omo/5125D0/func_802181A0_512770.s | 56 -------- .../area_omo/5125D0/func_80218270_512840.s | 56 -------- .../area_omo/5125D0/func_80218340_512910.s | 56 -------- .../area_omo/5125D0/func_80218410_5129E0.s | 56 -------- .../area_omo/5125D0/func_802184E0_512AB0.s | 55 -------- .../area_omo/5125D0/func_802186C0_512C90.s | 55 -------- .../{5125D0 => 512AB0}/func_802185AC_512B7C.s | 14 +- .../{5125D0 => 512AB0}/func_8021878C_512D5C.s | 0 .../{5125D0 => 512AB0}/func_80218880_512E50.s | 0 .../{5125D0 => 512AB0}/func_80218A98_513068.s | 0 .../{5125D0 => 512AB0}/func_80218B38_513108.s | 0 .../{5125D0 => 512AB0}/func_80218CF4_5132C4.s | 0 .../area_omo/513380/func_80218E08_5133D8.s | 58 --------- .../area_omo/5134B0/func_80218EE0_5134B0.s | 56 -------- .../{5134B0 => 513580}/func_80218FB0_513580.s | 14 +- .../area_omo2_2/5483E0/func_80231054_548434.s | 55 -------- .../area_omo3/557EC0/func_80218AE0_557EC0.s | 56 -------- .../area_omo3/557EC0/func_80218BB0_557F90.s | 55 -------- .../area_omo3/5580C0/func_80218CE0_5580C0.s | 56 -------- .../area_pra/648E10/func_80218000_648E10.s | 55 -------- .../area_pra/649050/func_80218484_649294.s | 55 -------- .../area_pra/649050/func_802187F4_649604.s | 55 -------- .../area_pra/649050/func_80218B64_649974.s | 55 -------- .../area_pra/649050/func_80218ED4_649CE4.s | 55 -------- .../area_pra/649050/func_80219244_64A054.s | 55 -------- .../area_pra3/669D80/func_80218B74_66A8F4.s | 55 -------- .../area_pra3/669D80/func_802195F0_66B370.s | 55 -------- .../area_pra3/66B5B0/func_802199B4_66B734.s | 55 -------- .../area_pra3/66B5B0/func_80219D24_66BAA4.s | 55 -------- .../area_sam/623BA0/func_80218B74_624714.s | 55 -------- .../area_sam/623BA0/func_802195F0_625190.s | 55 -------- .../area_sam/6253E0/func_802199C4_625564.s | 55 -------- .../area_sam2/63D9F0/func_80218994_63DB74.s | 55 -------- .../area_sbk/4DA5E0/func_80218000_4DA5E0.s | 56 -------- .../area_tik/5EC490/func_80218000_5EC490.s | 56 -------- .../area_tik/5EC490/func_80218128_5EC5B8.s | 58 --------- .../area_tik/5ECE70/func_802189E0_5ECE70.s | 56 -------- .../area_tik/5ECE70/func_80218AB0_5ECF40.s | 56 -------- .../{5ECE70 => 5ED010}/func_80218B80_5ED010.s | 120 +++++++++--------- .../area_tik3/6186F0/func_80218000_6186F0.s | 56 -------- .../area_tik3/6186F0/func_802180D0_6187C0.s | 55 -------- .../{6186F0 => 6187C0}/func_8021819C_61888C.s | 0 .../{6186F0 => 6187C0}/func_80218250_618940.s | 0 .../4A10A0/func_80218020_4A10C0.s | 56 -------- .../4A10A0/func_80218148_4A11E8.s | 58 --------- include/common_structs.h | 4 +- src/battle/area_dig/6DDDC0.c | 6 +- src/battle/area_dig/6DDE90.c | 7 + src/battle/area_dig/6DE000.c | 8 +- src/battle/area_dig/6DE060.c | 7 + src/battle/area_dig/6DE1A0.c | 5 + src/battle/area_flo/5B14B0.c | 2 +- src/battle/area_flo/5B16A0.c | 20 ++- src/battle/area_hos/47F0D0.c | 2 +- src/battle/area_isk_part_1/4E2740.c | 22 +--- src/battle/area_isk_part_1/4E2810.c | 7 + src/battle/area_isk_part_1/4E28E0.c | 7 + src/battle/area_isk_part_1/4E29B0.c | 19 +++ src/battle/area_isk_part_2/4EF4A0.c | 2 +- src/battle/area_jan/573920.c | 10 +- src/battle/area_jan/5739F0.c | 7 + src/battle/area_jan/573AC0.c | 7 + src/battle/area_jan/573C30.c | 6 +- src/battle/area_jan2/584940.c | 4 +- src/battle/area_jan2/584B90.c | 2 +- src/battle/area_kgr/56E2A0.c | 2 +- src/battle/area_kmr_part_3/447C80.c | 22 +--- src/battle/area_kmr_part_3/447D50.c | 27 ++++ src/battle/area_kpa/684A30.c | 6 +- src/battle/area_kpa/684B00.c | 9 ++ src/battle/area_kpa/684C30.c | 4 +- src/battle/area_kpa3/6BBB90.c | 38 +----- src/battle/area_kpa3/6BBC60.c | 41 ++++++ src/battle/area_kpa4/6CC070.c | 4 +- src/battle/area_kpa4/6CC1C0.c | 2 +- src/battle/area_kzn/58C2F0.c | 2 +- src/battle/area_kzn/58C670.c | 30 +---- src/battle/area_kzn/58C740.c | 39 ++++++ src/battle/area_mac/464490.c | 42 +----- src/battle/area_mac/464560.c | 45 +++++++ src/battle/area_mim/4F7D50.c | 2 +- src/battle/area_nok/48D700.c | 6 +- src/battle/area_nok/48DA50.c | 7 + src/battle/area_nok/48DBC0.c | 4 +- src/battle/area_nok/48DCF0.c | 4 +- src/battle/area_omo/5125D0.c | 30 +---- src/battle/area_omo/5126A0.c | 7 + src/battle/area_omo/512770.c | 7 + src/battle/area_omo/512840.c | 7 + src/battle/area_omo/512910.c | 7 + src/battle/area_omo/5129E0.c | 7 + src/battle/area_omo/512AB0.c | 25 ++++ src/battle/area_omo/513380.c | 4 +- src/battle/area_omo/5134B0.c | 6 +- src/battle/area_omo/513580.c | 5 + src/battle/area_omo2_2/5483E0.c | 2 +- src/battle/area_omo3/557EC0.c | 6 +- src/battle/area_omo3/557F90.c | 9 ++ src/battle/area_omo3/5580C0.c | 4 +- src/battle/area_pra/648E10.c | 2 +- src/battle/area_pra/649050.c | 20 ++- src/battle/area_pra3/669D80.c | 8 +- src/battle/area_pra3/66B5B0.c | 6 +- src/battle/area_sam/623BA0.c | 6 +- src/battle/area_sam/6253E0.c | 4 +- src/battle/area_sam2/63D9F0.c | 2 +- src/battle/area_sbk/4DA5E0.c | 2 +- src/battle/area_tik/5EC490.c | 6 +- src/battle/area_tik/5EC560.c | 9 ++ src/battle/area_tik/5ECE70.c | 8 +- src/battle/area_tik/5ECF40.c | 7 + src/battle/area_tik/5ED010.c | 5 + src/battle/area_tik3/6186F0.c | 8 +- src/battle/area_tik3/6187C0.c | 11 ++ src/battle/area_trd_part_1/4A10A0.c | 6 +- src/battle/area_trd_part_1/4A1190.c | 9 ++ src/common/UnkBattleFunc1.inc.c | 18 +++ tools/splat.yaml | 27 ++++ 230 files changed, 644 insertions(+), 4801 deletions(-) delete mode 100644 asm/nonmatchings/battle/area_dig/6DDDC0/func_80218000_6DDDC0.s rename asm/nonmatchings/battle/area_dig/{6DDDC0 => 6DDE90}/func_802180D0_6DDE90.s (100%) rename asm/nonmatchings/battle/area_dig/{6DDDC0 => 6DDE90}/func_80218184_6DDF44.s (100%) delete mode 100644 asm/nonmatchings/battle/area_dig/6DE000/func_80218240_6DE000.s delete mode 100644 asm/nonmatchings/battle/area_dig/6DE000/func_80218310_6DE0D0.s rename asm/nonmatchings/battle/area_dig/{6DE000 => 6DE1A0}/func_802183E0_6DE1A0.s (93%) delete mode 100644 asm/nonmatchings/battle/area_flo/5B14B0/func_80218000_5B14B0.s delete mode 100644 asm/nonmatchings/battle/area_flo/5B16A0/func_80218380_5B1830.s delete mode 100644 asm/nonmatchings/battle/area_flo/5B16A0/func_802186E4_5B1B94.s delete mode 100644 asm/nonmatchings/battle/area_flo/5B16A0/func_80218A54_5B1F04.s delete mode 100644 asm/nonmatchings/battle/area_flo/5B16A0/func_80218DC4_5B2274.s delete mode 100644 asm/nonmatchings/battle/area_flo/5B16A0/func_80219234_5B26E4.s delete mode 100644 asm/nonmatchings/battle/area_hos/47F0D0/func_802182D4_47F384.s delete mode 100644 asm/nonmatchings/battle/area_isk_part_1/4E2740/func_80218000_4E2740.s delete mode 100644 asm/nonmatchings/battle/area_isk_part_1/4E2740/func_802180D0_4E2810.s delete mode 100644 asm/nonmatchings/battle/area_isk_part_1/4E2740/func_802181A0_4E28E0.s rename asm/nonmatchings/battle/area_isk_part_1/{4E2740 => 4E29B0}/func_80218270_4E29B0.s (100%) rename asm/nonmatchings/battle/area_isk_part_1/{4E2740 => 4E29B0}/func_802183C0_4E2B00.s (100%) rename asm/nonmatchings/battle/area_isk_part_1/{4E2740 => 4E29B0}/func_80218458_4E2B98.s (100%) rename asm/nonmatchings/battle/area_isk_part_1/{4E2740 => 4E29B0}/func_802184CC_4E2C0C.s (94%) rename asm/nonmatchings/battle/area_isk_part_1/{4E2740 => 4E29B0}/func_802188B0_4E2FF0.s (100%) rename asm/nonmatchings/battle/area_isk_part_1/{4E2740 => 4E29B0}/func_80218944_4E3084.s (100%) rename asm/nonmatchings/battle/area_isk_part_1/{4E2740 => 4E29B0}/func_80218980_4E30C0.s (100%) rename asm/nonmatchings/battle/area_isk_part_1/{4E2740 => 4E29B0}/func_80218A10_4E3150.s (100%) delete mode 100644 asm/nonmatchings/battle/area_isk_part_2/4EF4A0/func_80218690_4EFB30.s delete mode 100644 asm/nonmatchings/battle/area_jan/573920/func_80218000_573920.s delete mode 100644 asm/nonmatchings/battle/area_jan/573920/func_802180D0_5739F0.s rename asm/nonmatchings/battle/area_jan/{573920 => 573AC0}/func_802181A0_573AC0.s (94%) rename asm/nonmatchings/battle/area_jan/{573920 => 573AC0}/func_80218254_573B74.s (100%) delete mode 100644 asm/nonmatchings/battle/area_jan/573C30/func_80218310_573C30.s delete mode 100644 asm/nonmatchings/battle/area_jan/573C30/func_802184F0_573E10.s delete mode 100644 asm/nonmatchings/battle/area_jan2/584940/func_80218000_584940.s delete mode 100644 asm/nonmatchings/battle/area_jan2/584B90/func_802183D4_584D14.s delete mode 100644 asm/nonmatchings/battle/area_kgr/56E2A0/func_80218000_56E2A0.s delete mode 100644 asm/nonmatchings/battle/area_kmr_part_3/447C80/func_80218840_447C80.s delete mode 100644 asm/nonmatchings/battle/area_kmr_part_3/447C80/func_80218910_447D50.s delete mode 100644 asm/nonmatchings/battle/area_kmr_part_3/447C80/func_80218AD0_447F10.s rename asm/nonmatchings/battle/area_kmr_part_3/{447C80 => 447D50}/func_802189DC_447E1C.s (100%) rename asm/nonmatchings/battle/area_kmr_part_3/{447C80 => 447D50}/func_80218AA4_447EE4.s (100%) rename asm/nonmatchings/battle/area_kmr_part_3/{447C80 => 447D50}/func_80218B9C_447FDC.s (100%) rename asm/nonmatchings/battle/area_kmr_part_3/{447C80 => 447D50}/func_80218D28_448168.s (100%) rename asm/nonmatchings/battle/area_kmr_part_3/{447C80 => 447D50}/func_80218E1C_44825C.s (100%) rename asm/nonmatchings/battle/area_kmr_part_3/{447C80 => 447D50}/func_80218F60_4483A0.s (100%) rename asm/nonmatchings/battle/area_kmr_part_3/{447C80 => 447D50}/func_80218FA4_4483E4.s (100%) rename asm/nonmatchings/battle/area_kmr_part_3/{447C80 => 447D50}/func_80218FE0_448420.s (100%) delete mode 100644 asm/nonmatchings/battle/area_kpa/684A30/func_80218000_684A30.s delete mode 100644 asm/nonmatchings/battle/area_kpa/684A30/func_802180D0_684B00.s delete mode 100644 asm/nonmatchings/battle/area_kpa/684C30/func_80218514_684F44.s delete mode 100644 asm/nonmatchings/battle/area_kpa3/6BBB90/func_80218000_6BBB90.s delete mode 100644 asm/nonmatchings/battle/area_kpa3/6BBB90/func_80218C44_6BC7D4.s rename asm/nonmatchings/battle/area_kpa3/{6BBB90 => 6BBC60}/func_802180D0_6BBC60.s (94%) rename asm/nonmatchings/battle/area_kpa3/{6BBB90 => 6BBC60}/func_80218960_6BC4F0.s (100%) rename asm/nonmatchings/battle/area_kpa3/{6BBB90 => 6BBC60}/func_80218AB4_6BC644.s (100%) rename asm/nonmatchings/battle/area_kpa3/{6BBB90 => 6BBC60}/func_80218B60_6BC6F0.s (100%) rename asm/nonmatchings/battle/area_kpa3/{6BBB90 => 6BBC60}/func_80218BC4_6BC754.s (100%) rename asm/nonmatchings/battle/area_kpa3/{6BBB90 => 6BBC60}/func_80218BFC_6BC78C.s (100%) rename asm/nonmatchings/battle/area_kpa3/{6BBB90 => 6BBC60}/func_80218D10_6BC8A0.s (100%) rename asm/nonmatchings/battle/area_kpa3/{6BBB90 => 6BBC60}/func_80218E34_6BC9C4.s (100%) rename asm/nonmatchings/battle/area_kpa3/{6BBB90 => 6BBC60}/func_80218F58_6BCAE8.s (100%) rename asm/nonmatchings/battle/area_kpa3/{6BBB90 => 6BBC60}/func_802193D4_6BCF64.s (100%) rename asm/nonmatchings/battle/area_kpa3/{6BBB90 => 6BBC60}/func_80219428_6BCFB8.s (100%) rename asm/nonmatchings/battle/area_kpa3/{6BBB90 => 6BBC60}/func_80219474_6BD004.s (100%) rename asm/nonmatchings/battle/area_kpa3/{6BBB90 => 6BBC60}/func_802194C0_6BD050.s (100%) rename asm/nonmatchings/battle/area_kpa3/{6BBB90 => 6BBC60}/func_8021950C_6BD09C.s (100%) rename asm/nonmatchings/battle/area_kpa3/{6BBB90 => 6BBC60}/func_80219550_6BD0E0.s (100%) rename asm/nonmatchings/battle/area_kpa3/{6BBB90 => 6BBC60}/func_80219588_6BD118.s (100%) rename asm/nonmatchings/battle/area_kpa3/{6BBB90 => 6BBC60}/func_802195F4_6BD184.s (100%) delete mode 100644 asm/nonmatchings/battle/area_kpa4/6CC070/func_80218020_6CC090.s delete mode 100644 asm/nonmatchings/battle/area_kpa4/6CC1C0/func_80218464_6CC4D4.s delete mode 100644 asm/nonmatchings/battle/area_kzn/58C2F0/func_80218130_58C420.s delete mode 100644 asm/nonmatchings/battle/area_kzn/58C670/func_80218380_58C670.s delete mode 100644 asm/nonmatchings/battle/area_kzn/58C670/func_80218450_58C740.s delete mode 100644 asm/nonmatchings/battle/area_kzn/58C670/func_802187B4_58CAA4.s delete mode 100644 asm/nonmatchings/battle/area_kzn/58C670/func_80218B24_58CE14.s rename asm/nonmatchings/battle/area_kzn/{58C670 => 58C740}/func_8021851C_58C80C.s (92%) rename asm/nonmatchings/battle/area_kzn/{58C670 => 58C740}/func_80218630_58C920.s (100%) rename asm/nonmatchings/battle/area_kzn/{58C670 => 58C740}/func_80218788_58CA78.s (100%) rename asm/nonmatchings/battle/area_kzn/{58C670 => 58C740}/func_802188D8_58CBC8.s (100%) rename asm/nonmatchings/battle/area_kzn/{58C670 => 58C740}/func_802189A0_58CC90.s (100%) rename asm/nonmatchings/battle/area_kzn/{58C670 => 58C740}/func_80218AF8_58CDE8.s (100%) rename asm/nonmatchings/battle/area_kzn/{58C670 => 58C740}/func_80218C48_58CF38.s (100%) rename asm/nonmatchings/battle/area_kzn/{58C670 => 58C740}/func_80218D0C_58CFFC.s (100%) rename asm/nonmatchings/battle/area_kzn/{58C670 => 58C740}/func_80218D6C_58D05C.s (100%) delete mode 100644 asm/nonmatchings/battle/area_mac/464490/func_80218000_464490.s delete mode 100644 asm/nonmatchings/battle/area_mac/464490/func_80218E74_465304.s rename asm/nonmatchings/battle/area_mac/{464490 => 464560}/func_802180D0_464560.s (100%) rename asm/nonmatchings/battle/area_mac/{464490 => 464560}/func_80218100_464590.s (100%) rename asm/nonmatchings/battle/area_mac/{464490 => 464560}/func_80218300_464790.s (100%) rename asm/nonmatchings/battle/area_mac/{464490 => 464560}/func_80218B90_465020.s (100%) rename asm/nonmatchings/battle/area_mac/{464490 => 464560}/func_80218CE4_465174.s (100%) rename asm/nonmatchings/battle/area_mac/{464490 => 464560}/func_80218D90_465220.s (100%) rename asm/nonmatchings/battle/area_mac/{464490 => 464560}/func_80218DF4_465284.s (100%) rename asm/nonmatchings/battle/area_mac/{464490 => 464560}/func_80218E2C_4652BC.s (100%) rename asm/nonmatchings/battle/area_mac/{464490 => 464560}/func_80218F40_4653D0.s (100%) rename asm/nonmatchings/battle/area_mac/{464490 => 464560}/func_80219064_4654F4.s (100%) rename asm/nonmatchings/battle/area_mac/{464490 => 464560}/func_80219188_465618.s (100%) rename asm/nonmatchings/battle/area_mac/{464490 => 464560}/func_80219604_465A94.s (100%) rename asm/nonmatchings/battle/area_mac/{464490 => 464560}/func_80219658_465AE8.s (100%) rename asm/nonmatchings/battle/area_mac/{464490 => 464560}/func_802196A4_465B34.s (100%) rename asm/nonmatchings/battle/area_mac/{464490 => 464560}/func_802196F0_465B80.s (100%) rename asm/nonmatchings/battle/area_mac/{464490 => 464560}/func_8021973C_465BCC.s (100%) rename asm/nonmatchings/battle/area_mac/{464490 => 464560}/func_80219780_465C10.s (100%) rename asm/nonmatchings/battle/area_mac/{464490 => 464560}/func_802197B8_465C48.s (100%) rename asm/nonmatchings/battle/area_mac/{464490 => 464560}/func_80219824_465CB4.s (100%) delete mode 100644 asm/nonmatchings/battle/area_mim/4F7D50/func_80218170_4F7D50.s delete mode 100644 asm/nonmatchings/battle/area_nok/48D700/func_802187E0_48D980.s rename asm/nonmatchings/battle/area_nok/{48D700 => 48DA50}/func_802188B0_48DA50.s (100%) rename asm/nonmatchings/battle/area_nok/{48D700 => 48DA50}/func_80218964_48DB04.s (100%) delete mode 100644 asm/nonmatchings/battle/area_nok/48DBC0/func_80218A78_48DC18.s delete mode 100644 asm/nonmatchings/battle/area_nok/48DCF0/func_80218BA8_48DD48.s delete mode 100644 asm/nonmatchings/battle/area_omo/5125D0/func_80218000_5125D0.s delete mode 100644 asm/nonmatchings/battle/area_omo/5125D0/func_802180D0_5126A0.s delete mode 100644 asm/nonmatchings/battle/area_omo/5125D0/func_802181A0_512770.s delete mode 100644 asm/nonmatchings/battle/area_omo/5125D0/func_80218270_512840.s delete mode 100644 asm/nonmatchings/battle/area_omo/5125D0/func_80218340_512910.s delete mode 100644 asm/nonmatchings/battle/area_omo/5125D0/func_80218410_5129E0.s delete mode 100644 asm/nonmatchings/battle/area_omo/5125D0/func_802184E0_512AB0.s delete mode 100644 asm/nonmatchings/battle/area_omo/5125D0/func_802186C0_512C90.s rename asm/nonmatchings/battle/area_omo/{5125D0 => 512AB0}/func_802185AC_512B7C.s (92%) rename asm/nonmatchings/battle/area_omo/{5125D0 => 512AB0}/func_8021878C_512D5C.s (100%) rename asm/nonmatchings/battle/area_omo/{5125D0 => 512AB0}/func_80218880_512E50.s (100%) rename asm/nonmatchings/battle/area_omo/{5125D0 => 512AB0}/func_80218A98_513068.s (100%) rename asm/nonmatchings/battle/area_omo/{5125D0 => 512AB0}/func_80218B38_513108.s (100%) rename asm/nonmatchings/battle/area_omo/{5125D0 => 512AB0}/func_80218CF4_5132C4.s (100%) delete mode 100644 asm/nonmatchings/battle/area_omo/513380/func_80218E08_5133D8.s delete mode 100644 asm/nonmatchings/battle/area_omo/5134B0/func_80218EE0_5134B0.s rename asm/nonmatchings/battle/area_omo/{5134B0 => 513580}/func_80218FB0_513580.s (95%) delete mode 100644 asm/nonmatchings/battle/area_omo2_2/5483E0/func_80231054_548434.s delete mode 100644 asm/nonmatchings/battle/area_omo3/557EC0/func_80218AE0_557EC0.s delete mode 100644 asm/nonmatchings/battle/area_omo3/557EC0/func_80218BB0_557F90.s delete mode 100644 asm/nonmatchings/battle/area_omo3/5580C0/func_80218CE0_5580C0.s delete mode 100644 asm/nonmatchings/battle/area_pra/648E10/func_80218000_648E10.s delete mode 100644 asm/nonmatchings/battle/area_pra/649050/func_80218484_649294.s delete mode 100644 asm/nonmatchings/battle/area_pra/649050/func_802187F4_649604.s delete mode 100644 asm/nonmatchings/battle/area_pra/649050/func_80218B64_649974.s delete mode 100644 asm/nonmatchings/battle/area_pra/649050/func_80218ED4_649CE4.s delete mode 100644 asm/nonmatchings/battle/area_pra/649050/func_80219244_64A054.s delete mode 100644 asm/nonmatchings/battle/area_pra3/669D80/func_80218B74_66A8F4.s delete mode 100644 asm/nonmatchings/battle/area_pra3/669D80/func_802195F0_66B370.s delete mode 100644 asm/nonmatchings/battle/area_pra3/66B5B0/func_802199B4_66B734.s delete mode 100644 asm/nonmatchings/battle/area_pra3/66B5B0/func_80219D24_66BAA4.s delete mode 100644 asm/nonmatchings/battle/area_sam/623BA0/func_80218B74_624714.s delete mode 100644 asm/nonmatchings/battle/area_sam/623BA0/func_802195F0_625190.s delete mode 100644 asm/nonmatchings/battle/area_sam/6253E0/func_802199C4_625564.s delete mode 100644 asm/nonmatchings/battle/area_sam2/63D9F0/func_80218994_63DB74.s delete mode 100644 asm/nonmatchings/battle/area_sbk/4DA5E0/func_80218000_4DA5E0.s delete mode 100644 asm/nonmatchings/battle/area_tik/5EC490/func_80218000_5EC490.s delete mode 100644 asm/nonmatchings/battle/area_tik/5EC490/func_80218128_5EC5B8.s delete mode 100644 asm/nonmatchings/battle/area_tik/5ECE70/func_802189E0_5ECE70.s delete mode 100644 asm/nonmatchings/battle/area_tik/5ECE70/func_80218AB0_5ECF40.s rename asm/nonmatchings/battle/area_tik/{5ECE70 => 5ED010}/func_80218B80_5ED010.s (83%) delete mode 100644 asm/nonmatchings/battle/area_tik3/6186F0/func_80218000_6186F0.s delete mode 100644 asm/nonmatchings/battle/area_tik3/6186F0/func_802180D0_6187C0.s rename asm/nonmatchings/battle/area_tik3/{6186F0 => 6187C0}/func_8021819C_61888C.s (100%) rename asm/nonmatchings/battle/area_tik3/{6186F0 => 6187C0}/func_80218250_618940.s (100%) delete mode 100644 asm/nonmatchings/battle/area_trd_part_1/4A10A0/func_80218020_4A10C0.s delete mode 100644 asm/nonmatchings/battle/area_trd_part_1/4A10A0/func_80218148_4A11E8.s create mode 100644 src/battle/area_dig/6DDE90.c create mode 100644 src/battle/area_dig/6DE060.c create mode 100644 src/battle/area_dig/6DE1A0.c create mode 100644 src/battle/area_isk_part_1/4E2810.c create mode 100644 src/battle/area_isk_part_1/4E28E0.c create mode 100644 src/battle/area_isk_part_1/4E29B0.c create mode 100644 src/battle/area_jan/5739F0.c create mode 100644 src/battle/area_jan/573AC0.c create mode 100644 src/battle/area_kmr_part_3/447D50.c create mode 100644 src/battle/area_kpa/684B00.c create mode 100644 src/battle/area_kpa3/6BBC60.c create mode 100644 src/battle/area_kzn/58C740.c create mode 100644 src/battle/area_mac/464560.c create mode 100644 src/battle/area_nok/48DA50.c create mode 100644 src/battle/area_omo/5126A0.c create mode 100644 src/battle/area_omo/512770.c create mode 100644 src/battle/area_omo/512840.c create mode 100644 src/battle/area_omo/512910.c create mode 100644 src/battle/area_omo/5129E0.c create mode 100644 src/battle/area_omo/512AB0.c create mode 100644 src/battle/area_omo/513580.c create mode 100644 src/battle/area_omo3/557F90.c create mode 100644 src/battle/area_tik/5EC560.c create mode 100644 src/battle/area_tik/5ECF40.c create mode 100644 src/battle/area_tik/5ED010.c create mode 100644 src/battle/area_tik3/6187C0.c create mode 100644 src/battle/area_trd_part_1/4A1190.c create mode 100644 src/common/UnkBattleFunc1.inc.c diff --git a/asm/nonmatchings/battle/area_dig/6DDDC0/func_80218000_6DDDC0.s b/asm/nonmatchings/battle/area_dig/6DDDC0/func_80218000_6DDDC0.s deleted file mode 100644 index df75169c16..0000000000 --- a/asm/nonmatchings/battle/area_dig/6DDDC0/func_80218000_6DDDC0.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218000_6DDDC0 -/* 6DDDC0 80218000 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 6DDDC4 80218004 AFB10014 */ sw $s1, 0x14($sp) -/* 6DDDC8 80218008 0080882D */ daddu $s1, $a0, $zero -/* 6DDDCC 8021800C AFBF0020 */ sw $ra, 0x20($sp) -/* 6DDDD0 80218010 AFB3001C */ sw $s3, 0x1c($sp) -/* 6DDDD4 80218014 AFB20018 */ sw $s2, 0x18($sp) -/* 6DDDD8 80218018 AFB00010 */ sw $s0, 0x10($sp) -/* 6DDDDC 8021801C 8E30000C */ lw $s0, 0xc($s1) -/* 6DDDE0 80218020 8E050000 */ lw $a1, ($s0) -/* 6DDDE4 80218024 0C0B1EAF */ jal get_variable -/* 6DDDE8 80218028 26100004 */ addiu $s0, $s0, 4 -/* 6DDDEC 8021802C 8E050000 */ lw $a1, ($s0) -/* 6DDDF0 80218030 26100004 */ addiu $s0, $s0, 4 -/* 6DDDF4 80218034 0220202D */ daddu $a0, $s1, $zero -/* 6DDDF8 80218038 0C0B1EAF */ jal get_variable -/* 6DDDFC 8021803C 0040982D */ daddu $s3, $v0, $zero -/* 6DDE00 80218040 8E050000 */ lw $a1, ($s0) -/* 6DDE04 80218044 26100004 */ addiu $s0, $s0, 4 -/* 6DDE08 80218048 0220202D */ daddu $a0, $s1, $zero -/* 6DDE0C 8021804C 0C0B1EAF */ jal get_variable -/* 6DDE10 80218050 0040902D */ daddu $s2, $v0, $zero -/* 6DDE14 80218054 0220202D */ daddu $a0, $s1, $zero -/* 6DDE18 80218058 8E050000 */ lw $a1, ($s0) -/* 6DDE1C 8021805C 0C0B1EAF */ jal get_variable -/* 6DDE20 80218060 0040802D */ daddu $s0, $v0, $zero -/* 6DDE24 80218064 8E240148 */ lw $a0, 0x148($s1) -/* 6DDE28 80218068 0C09A75B */ jal get_actor -/* 6DDE2C 8021806C 0040882D */ daddu $s1, $v0, $zero -/* 6DDE30 80218070 0040182D */ daddu $v1, $v0, $zero -/* 6DDE34 80218074 8C620008 */ lw $v0, 8($v1) -/* 6DDE38 80218078 90420024 */ lbu $v0, 0x24($v0) -/* 6DDE3C 8021807C 8C640008 */ lw $a0, 8($v1) -/* 6DDE40 80218080 02629823 */ subu $s3, $s3, $v0 -/* 6DDE44 80218084 A0730194 */ sb $s3, 0x194($v1) -/* 6DDE48 80218088 90820025 */ lbu $v0, 0x25($a0) -/* 6DDE4C 8021808C 02429023 */ subu $s2, $s2, $v0 -/* 6DDE50 80218090 A0720195 */ sb $s2, 0x195($v1) -/* 6DDE54 80218094 90820026 */ lbu $v0, 0x26($a0) -/* 6DDE58 80218098 02028023 */ subu $s0, $s0, $v0 -/* 6DDE5C 8021809C A0700196 */ sb $s0, 0x196($v1) -/* 6DDE60 802180A0 90840027 */ lbu $a0, 0x27($a0) -/* 6DDE64 802180A4 02248823 */ subu $s1, $s1, $a0 -/* 6DDE68 802180A8 A0710197 */ sb $s1, 0x197($v1) -/* 6DDE6C 802180AC 8FBF0020 */ lw $ra, 0x20($sp) -/* 6DDE70 802180B0 8FB3001C */ lw $s3, 0x1c($sp) -/* 6DDE74 802180B4 8FB20018 */ lw $s2, 0x18($sp) -/* 6DDE78 802180B8 8FB10014 */ lw $s1, 0x14($sp) -/* 6DDE7C 802180BC 8FB00010 */ lw $s0, 0x10($sp) -/* 6DDE80 802180C0 24020002 */ addiu $v0, $zero, 2 -/* 6DDE84 802180C4 03E00008 */ jr $ra -/* 6DDE88 802180C8 27BD0028 */ addiu $sp, $sp, 0x28 -/* 6DDE8C 802180CC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_dig/6DDDC0/func_802180D0_6DDE90.s b/asm/nonmatchings/battle/area_dig/6DDE90/func_802180D0_6DDE90.s similarity index 100% rename from asm/nonmatchings/battle/area_dig/6DDDC0/func_802180D0_6DDE90.s rename to asm/nonmatchings/battle/area_dig/6DDE90/func_802180D0_6DDE90.s diff --git a/asm/nonmatchings/battle/area_dig/6DDDC0/func_80218184_6DDF44.s b/asm/nonmatchings/battle/area_dig/6DDE90/func_80218184_6DDF44.s similarity index 100% rename from asm/nonmatchings/battle/area_dig/6DDDC0/func_80218184_6DDF44.s rename to asm/nonmatchings/battle/area_dig/6DDE90/func_80218184_6DDF44.s diff --git a/asm/nonmatchings/battle/area_dig/6DE000/func_80218240_6DE000.s b/asm/nonmatchings/battle/area_dig/6DE000/func_80218240_6DE000.s deleted file mode 100644 index 4d1e2d63df..0000000000 --- a/asm/nonmatchings/battle/area_dig/6DE000/func_80218240_6DE000.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218240_6DE000 -/* 6DE000 80218240 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 6DE004 80218244 AFB10014 */ sw $s1, 0x14($sp) -/* 6DE008 80218248 0080882D */ daddu $s1, $a0, $zero -/* 6DE00C 8021824C AFBF0020 */ sw $ra, 0x20($sp) -/* 6DE010 80218250 AFB3001C */ sw $s3, 0x1c($sp) -/* 6DE014 80218254 AFB20018 */ sw $s2, 0x18($sp) -/* 6DE018 80218258 AFB00010 */ sw $s0, 0x10($sp) -/* 6DE01C 8021825C 8E30000C */ lw $s0, 0xc($s1) -/* 6DE020 80218260 8E050000 */ lw $a1, ($s0) -/* 6DE024 80218264 0C0B1EAF */ jal get_variable -/* 6DE028 80218268 26100004 */ addiu $s0, $s0, 4 -/* 6DE02C 8021826C 8E050000 */ lw $a1, ($s0) -/* 6DE030 80218270 26100004 */ addiu $s0, $s0, 4 -/* 6DE034 80218274 0220202D */ daddu $a0, $s1, $zero -/* 6DE038 80218278 0C0B1EAF */ jal get_variable -/* 6DE03C 8021827C 0040982D */ daddu $s3, $v0, $zero -/* 6DE040 80218280 8E050000 */ lw $a1, ($s0) -/* 6DE044 80218284 26100004 */ addiu $s0, $s0, 4 -/* 6DE048 80218288 0220202D */ daddu $a0, $s1, $zero -/* 6DE04C 8021828C 0C0B1EAF */ jal get_variable -/* 6DE050 80218290 0040902D */ daddu $s2, $v0, $zero -/* 6DE054 80218294 0220202D */ daddu $a0, $s1, $zero -/* 6DE058 80218298 8E050000 */ lw $a1, ($s0) -/* 6DE05C 8021829C 0C0B1EAF */ jal get_variable -/* 6DE060 802182A0 0040802D */ daddu $s0, $v0, $zero -/* 6DE064 802182A4 8E240148 */ lw $a0, 0x148($s1) -/* 6DE068 802182A8 0C09A75B */ jal get_actor -/* 6DE06C 802182AC 0040882D */ daddu $s1, $v0, $zero -/* 6DE070 802182B0 0040182D */ daddu $v1, $v0, $zero -/* 6DE074 802182B4 8C620008 */ lw $v0, 8($v1) -/* 6DE078 802182B8 90420024 */ lbu $v0, 0x24($v0) -/* 6DE07C 802182BC 8C640008 */ lw $a0, 8($v1) -/* 6DE080 802182C0 02629823 */ subu $s3, $s3, $v0 -/* 6DE084 802182C4 A0730194 */ sb $s3, 0x194($v1) -/* 6DE088 802182C8 90820025 */ lbu $v0, 0x25($a0) -/* 6DE08C 802182CC 02429023 */ subu $s2, $s2, $v0 -/* 6DE090 802182D0 A0720195 */ sb $s2, 0x195($v1) -/* 6DE094 802182D4 90820026 */ lbu $v0, 0x26($a0) -/* 6DE098 802182D8 02028023 */ subu $s0, $s0, $v0 -/* 6DE09C 802182DC A0700196 */ sb $s0, 0x196($v1) -/* 6DE0A0 802182E0 90840027 */ lbu $a0, 0x27($a0) -/* 6DE0A4 802182E4 02248823 */ subu $s1, $s1, $a0 -/* 6DE0A8 802182E8 A0710197 */ sb $s1, 0x197($v1) -/* 6DE0AC 802182EC 8FBF0020 */ lw $ra, 0x20($sp) -/* 6DE0B0 802182F0 8FB3001C */ lw $s3, 0x1c($sp) -/* 6DE0B4 802182F4 8FB20018 */ lw $s2, 0x18($sp) -/* 6DE0B8 802182F8 8FB10014 */ lw $s1, 0x14($sp) -/* 6DE0BC 802182FC 8FB00010 */ lw $s0, 0x10($sp) -/* 6DE0C0 80218300 24020002 */ addiu $v0, $zero, 2 -/* 6DE0C4 80218304 03E00008 */ jr $ra -/* 6DE0C8 80218308 27BD0028 */ addiu $sp, $sp, 0x28 -/* 6DE0CC 8021830C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_dig/6DE000/func_80218310_6DE0D0.s b/asm/nonmatchings/battle/area_dig/6DE000/func_80218310_6DE0D0.s deleted file mode 100644 index 01182f17bb..0000000000 --- a/asm/nonmatchings/battle/area_dig/6DE000/func_80218310_6DE0D0.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218310_6DE0D0 -/* 6DE0D0 80218310 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 6DE0D4 80218314 AFB10014 */ sw $s1, 0x14($sp) -/* 6DE0D8 80218318 0080882D */ daddu $s1, $a0, $zero -/* 6DE0DC 8021831C AFBF0020 */ sw $ra, 0x20($sp) -/* 6DE0E0 80218320 AFB3001C */ sw $s3, 0x1c($sp) -/* 6DE0E4 80218324 AFB20018 */ sw $s2, 0x18($sp) -/* 6DE0E8 80218328 AFB00010 */ sw $s0, 0x10($sp) -/* 6DE0EC 8021832C 8E30000C */ lw $s0, 0xc($s1) -/* 6DE0F0 80218330 8E050000 */ lw $a1, ($s0) -/* 6DE0F4 80218334 0C0B1EAF */ jal get_variable -/* 6DE0F8 80218338 26100004 */ addiu $s0, $s0, 4 -/* 6DE0FC 8021833C 8E050000 */ lw $a1, ($s0) -/* 6DE100 80218340 26100004 */ addiu $s0, $s0, 4 -/* 6DE104 80218344 0220202D */ daddu $a0, $s1, $zero -/* 6DE108 80218348 0C0B1EAF */ jal get_variable -/* 6DE10C 8021834C 0040982D */ daddu $s3, $v0, $zero -/* 6DE110 80218350 8E050000 */ lw $a1, ($s0) -/* 6DE114 80218354 26100004 */ addiu $s0, $s0, 4 -/* 6DE118 80218358 0220202D */ daddu $a0, $s1, $zero -/* 6DE11C 8021835C 0C0B1EAF */ jal get_variable -/* 6DE120 80218360 0040902D */ daddu $s2, $v0, $zero -/* 6DE124 80218364 0220202D */ daddu $a0, $s1, $zero -/* 6DE128 80218368 8E050000 */ lw $a1, ($s0) -/* 6DE12C 8021836C 0C0B1EAF */ jal get_variable -/* 6DE130 80218370 0040802D */ daddu $s0, $v0, $zero -/* 6DE134 80218374 8E240148 */ lw $a0, 0x148($s1) -/* 6DE138 80218378 0C09A75B */ jal get_actor -/* 6DE13C 8021837C 0040882D */ daddu $s1, $v0, $zero -/* 6DE140 80218380 0040182D */ daddu $v1, $v0, $zero -/* 6DE144 80218384 8C620008 */ lw $v0, 8($v1) -/* 6DE148 80218388 90420024 */ lbu $v0, 0x24($v0) -/* 6DE14C 8021838C 8C640008 */ lw $a0, 8($v1) -/* 6DE150 80218390 02629823 */ subu $s3, $s3, $v0 -/* 6DE154 80218394 A0730194 */ sb $s3, 0x194($v1) -/* 6DE158 80218398 90820025 */ lbu $v0, 0x25($a0) -/* 6DE15C 8021839C 02429023 */ subu $s2, $s2, $v0 -/* 6DE160 802183A0 A0720195 */ sb $s2, 0x195($v1) -/* 6DE164 802183A4 90820026 */ lbu $v0, 0x26($a0) -/* 6DE168 802183A8 02028023 */ subu $s0, $s0, $v0 -/* 6DE16C 802183AC A0700196 */ sb $s0, 0x196($v1) -/* 6DE170 802183B0 90840027 */ lbu $a0, 0x27($a0) -/* 6DE174 802183B4 02248823 */ subu $s1, $s1, $a0 -/* 6DE178 802183B8 A0710197 */ sb $s1, 0x197($v1) -/* 6DE17C 802183BC 8FBF0020 */ lw $ra, 0x20($sp) -/* 6DE180 802183C0 8FB3001C */ lw $s3, 0x1c($sp) -/* 6DE184 802183C4 8FB20018 */ lw $s2, 0x18($sp) -/* 6DE188 802183C8 8FB10014 */ lw $s1, 0x14($sp) -/* 6DE18C 802183CC 8FB00010 */ lw $s0, 0x10($sp) -/* 6DE190 802183D0 24020002 */ addiu $v0, $zero, 2 -/* 6DE194 802183D4 03E00008 */ jr $ra -/* 6DE198 802183D8 27BD0028 */ addiu $sp, $sp, 0x28 -/* 6DE19C 802183DC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_dig/6DE000/func_802183E0_6DE1A0.s b/asm/nonmatchings/battle/area_dig/6DE1A0/func_802183E0_6DE1A0.s similarity index 93% rename from asm/nonmatchings/battle/area_dig/6DE000/func_802183E0_6DE1A0.s rename to asm/nonmatchings/battle/area_dig/6DE1A0/func_802183E0_6DE1A0.s index eae523b047..8a7ebcc656 100644 --- a/asm/nonmatchings/battle/area_dig/6DE000/func_802183E0_6DE1A0.s +++ b/asm/nonmatchings/battle/area_dig/6DE1A0/func_802183E0_6DE1A0.s @@ -21,5 +21,5 @@ glabel func_802183E0_6DE1A0 /* 6DE1DC 8021841C 24020002 */ addiu $v0, $zero, 2 /* 6DE1E0 80218420 03E00008 */ jr $ra /* 6DE1E4 80218424 27BD0018 */ addiu $sp, $sp, 0x18 -/* 6DE1E8 80218428 00000000 */ nop -/* 6DE1EC 8021842C 00000000 */ nop +/* 6DE1E8 80218428 00000000 */ nop +/* 6DE1EC 8021842C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_flo/5B14B0/func_80218000_5B14B0.s b/asm/nonmatchings/battle/area_flo/5B14B0/func_80218000_5B14B0.s deleted file mode 100644 index d43cabb425..0000000000 --- a/asm/nonmatchings/battle/area_flo/5B14B0/func_80218000_5B14B0.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218000_5B14B0 -/* 5B14B0 80218000 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 5B14B4 80218004 AFB10014 */ sw $s1, 0x14($sp) -/* 5B14B8 80218008 0080882D */ daddu $s1, $a0, $zero -/* 5B14BC 8021800C AFBF0020 */ sw $ra, 0x20($sp) -/* 5B14C0 80218010 AFB3001C */ sw $s3, 0x1c($sp) -/* 5B14C4 80218014 AFB20018 */ sw $s2, 0x18($sp) -/* 5B14C8 80218018 AFB00010 */ sw $s0, 0x10($sp) -/* 5B14CC 8021801C 8E30000C */ lw $s0, 0xc($s1) -/* 5B14D0 80218020 8E050000 */ lw $a1, ($s0) -/* 5B14D4 80218024 0C0B1EAF */ jal get_variable -/* 5B14D8 80218028 26100004 */ addiu $s0, $s0, 4 -/* 5B14DC 8021802C 8E050000 */ lw $a1, ($s0) -/* 5B14E0 80218030 26100004 */ addiu $s0, $s0, 4 -/* 5B14E4 80218034 0220202D */ daddu $a0, $s1, $zero -/* 5B14E8 80218038 0C0B1EAF */ jal get_variable -/* 5B14EC 8021803C 0040982D */ daddu $s3, $v0, $zero -/* 5B14F0 80218040 8E050000 */ lw $a1, ($s0) -/* 5B14F4 80218044 26100004 */ addiu $s0, $s0, 4 -/* 5B14F8 80218048 0220202D */ daddu $a0, $s1, $zero -/* 5B14FC 8021804C 0C0B1EAF */ jal get_variable -/* 5B1500 80218050 0040902D */ daddu $s2, $v0, $zero -/* 5B1504 80218054 0220202D */ daddu $a0, $s1, $zero -/* 5B1508 80218058 8E050000 */ lw $a1, ($s0) -/* 5B150C 8021805C 0C0B1EAF */ jal get_variable -/* 5B1510 80218060 0040802D */ daddu $s0, $v0, $zero -/* 5B1514 80218064 8E240148 */ lw $a0, 0x148($s1) -/* 5B1518 80218068 0C09A75B */ jal get_actor -/* 5B151C 8021806C 0040882D */ daddu $s1, $v0, $zero -/* 5B1520 80218070 0040182D */ daddu $v1, $v0, $zero -/* 5B1524 80218074 8C620008 */ lw $v0, 8($v1) -/* 5B1528 80218078 90420024 */ lbu $v0, 0x24($v0) -/* 5B152C 8021807C 8C640008 */ lw $a0, 8($v1) -/* 5B1530 80218080 02629823 */ subu $s3, $s3, $v0 -/* 5B1534 80218084 A0730194 */ sb $s3, 0x194($v1) -/* 5B1538 80218088 90820025 */ lbu $v0, 0x25($a0) -/* 5B153C 8021808C 02429023 */ subu $s2, $s2, $v0 -/* 5B1540 80218090 A0720195 */ sb $s2, 0x195($v1) -/* 5B1544 80218094 90820026 */ lbu $v0, 0x26($a0) -/* 5B1548 80218098 02028023 */ subu $s0, $s0, $v0 -/* 5B154C 8021809C A0700196 */ sb $s0, 0x196($v1) -/* 5B1550 802180A0 90840027 */ lbu $a0, 0x27($a0) -/* 5B1554 802180A4 02248823 */ subu $s1, $s1, $a0 -/* 5B1558 802180A8 A0710197 */ sb $s1, 0x197($v1) -/* 5B155C 802180AC 8FBF0020 */ lw $ra, 0x20($sp) -/* 5B1560 802180B0 8FB3001C */ lw $s3, 0x1c($sp) -/* 5B1564 802180B4 8FB20018 */ lw $s2, 0x18($sp) -/* 5B1568 802180B8 8FB10014 */ lw $s1, 0x14($sp) -/* 5B156C 802180BC 8FB00010 */ lw $s0, 0x10($sp) -/* 5B1570 802180C0 24020002 */ addiu $v0, $zero, 2 -/* 5B1574 802180C4 03E00008 */ jr $ra -/* 5B1578 802180C8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/battle/area_flo/5B16A0/func_80218380_5B1830.s b/asm/nonmatchings/battle/area_flo/5B16A0/func_80218380_5B1830.s deleted file mode 100644 index e1467b1a51..0000000000 --- a/asm/nonmatchings/battle/area_flo/5B16A0/func_80218380_5B1830.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218380_5B1830 -/* 5B1830 80218380 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 5B1834 80218384 AFB10014 */ sw $s1, 0x14($sp) -/* 5B1838 80218388 0080882D */ daddu $s1, $a0, $zero -/* 5B183C 8021838C AFBF0020 */ sw $ra, 0x20($sp) -/* 5B1840 80218390 AFB3001C */ sw $s3, 0x1c($sp) -/* 5B1844 80218394 AFB20018 */ sw $s2, 0x18($sp) -/* 5B1848 80218398 AFB00010 */ sw $s0, 0x10($sp) -/* 5B184C 8021839C 8E30000C */ lw $s0, 0xc($s1) -/* 5B1850 802183A0 8E050000 */ lw $a1, ($s0) -/* 5B1854 802183A4 0C0B1EAF */ jal get_variable -/* 5B1858 802183A8 26100004 */ addiu $s0, $s0, 4 -/* 5B185C 802183AC 8E050000 */ lw $a1, ($s0) -/* 5B1860 802183B0 26100004 */ addiu $s0, $s0, 4 -/* 5B1864 802183B4 0220202D */ daddu $a0, $s1, $zero -/* 5B1868 802183B8 0C0B1EAF */ jal get_variable -/* 5B186C 802183BC 0040982D */ daddu $s3, $v0, $zero -/* 5B1870 802183C0 8E050000 */ lw $a1, ($s0) -/* 5B1874 802183C4 26100004 */ addiu $s0, $s0, 4 -/* 5B1878 802183C8 0220202D */ daddu $a0, $s1, $zero -/* 5B187C 802183CC 0C0B1EAF */ jal get_variable -/* 5B1880 802183D0 0040902D */ daddu $s2, $v0, $zero -/* 5B1884 802183D4 0220202D */ daddu $a0, $s1, $zero -/* 5B1888 802183D8 8E050000 */ lw $a1, ($s0) -/* 5B188C 802183DC 0C0B1EAF */ jal get_variable -/* 5B1890 802183E0 0040802D */ daddu $s0, $v0, $zero -/* 5B1894 802183E4 8E240148 */ lw $a0, 0x148($s1) -/* 5B1898 802183E8 0C09A75B */ jal get_actor -/* 5B189C 802183EC 0040882D */ daddu $s1, $v0, $zero -/* 5B18A0 802183F0 0040182D */ daddu $v1, $v0, $zero -/* 5B18A4 802183F4 8C620008 */ lw $v0, 8($v1) -/* 5B18A8 802183F8 90420024 */ lbu $v0, 0x24($v0) -/* 5B18AC 802183FC 8C640008 */ lw $a0, 8($v1) -/* 5B18B0 80218400 02629823 */ subu $s3, $s3, $v0 -/* 5B18B4 80218404 A0730194 */ sb $s3, 0x194($v1) -/* 5B18B8 80218408 90820025 */ lbu $v0, 0x25($a0) -/* 5B18BC 8021840C 02429023 */ subu $s2, $s2, $v0 -/* 5B18C0 80218410 A0720195 */ sb $s2, 0x195($v1) -/* 5B18C4 80218414 90820026 */ lbu $v0, 0x26($a0) -/* 5B18C8 80218418 02028023 */ subu $s0, $s0, $v0 -/* 5B18CC 8021841C A0700196 */ sb $s0, 0x196($v1) -/* 5B18D0 80218420 90840027 */ lbu $a0, 0x27($a0) -/* 5B18D4 80218424 02248823 */ subu $s1, $s1, $a0 -/* 5B18D8 80218428 A0710197 */ sb $s1, 0x197($v1) -/* 5B18DC 8021842C 8FBF0020 */ lw $ra, 0x20($sp) -/* 5B18E0 80218430 8FB3001C */ lw $s3, 0x1c($sp) -/* 5B18E4 80218434 8FB20018 */ lw $s2, 0x18($sp) -/* 5B18E8 80218438 8FB10014 */ lw $s1, 0x14($sp) -/* 5B18EC 8021843C 8FB00010 */ lw $s0, 0x10($sp) -/* 5B18F0 80218440 24020002 */ addiu $v0, $zero, 2 -/* 5B18F4 80218444 03E00008 */ jr $ra -/* 5B18F8 80218448 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/battle/area_flo/5B16A0/func_802186E4_5B1B94.s b/asm/nonmatchings/battle/area_flo/5B16A0/func_802186E4_5B1B94.s deleted file mode 100644 index 4715c8e623..0000000000 --- a/asm/nonmatchings/battle/area_flo/5B16A0/func_802186E4_5B1B94.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802186E4_5B1B94 -/* 5B1B94 802186E4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 5B1B98 802186E8 AFB10014 */ sw $s1, 0x14($sp) -/* 5B1B9C 802186EC 0080882D */ daddu $s1, $a0, $zero -/* 5B1BA0 802186F0 AFBF0020 */ sw $ra, 0x20($sp) -/* 5B1BA4 802186F4 AFB3001C */ sw $s3, 0x1c($sp) -/* 5B1BA8 802186F8 AFB20018 */ sw $s2, 0x18($sp) -/* 5B1BAC 802186FC AFB00010 */ sw $s0, 0x10($sp) -/* 5B1BB0 80218700 8E30000C */ lw $s0, 0xc($s1) -/* 5B1BB4 80218704 8E050000 */ lw $a1, ($s0) -/* 5B1BB8 80218708 0C0B1EAF */ jal get_variable -/* 5B1BBC 8021870C 26100004 */ addiu $s0, $s0, 4 -/* 5B1BC0 80218710 8E050000 */ lw $a1, ($s0) -/* 5B1BC4 80218714 26100004 */ addiu $s0, $s0, 4 -/* 5B1BC8 80218718 0220202D */ daddu $a0, $s1, $zero -/* 5B1BCC 8021871C 0C0B1EAF */ jal get_variable -/* 5B1BD0 80218720 0040982D */ daddu $s3, $v0, $zero -/* 5B1BD4 80218724 8E050000 */ lw $a1, ($s0) -/* 5B1BD8 80218728 26100004 */ addiu $s0, $s0, 4 -/* 5B1BDC 8021872C 0220202D */ daddu $a0, $s1, $zero -/* 5B1BE0 80218730 0C0B1EAF */ jal get_variable -/* 5B1BE4 80218734 0040902D */ daddu $s2, $v0, $zero -/* 5B1BE8 80218738 0220202D */ daddu $a0, $s1, $zero -/* 5B1BEC 8021873C 8E050000 */ lw $a1, ($s0) -/* 5B1BF0 80218740 0C0B1EAF */ jal get_variable -/* 5B1BF4 80218744 0040802D */ daddu $s0, $v0, $zero -/* 5B1BF8 80218748 8E240148 */ lw $a0, 0x148($s1) -/* 5B1BFC 8021874C 0C09A75B */ jal get_actor -/* 5B1C00 80218750 0040882D */ daddu $s1, $v0, $zero -/* 5B1C04 80218754 0040182D */ daddu $v1, $v0, $zero -/* 5B1C08 80218758 8C620008 */ lw $v0, 8($v1) -/* 5B1C0C 8021875C 90420024 */ lbu $v0, 0x24($v0) -/* 5B1C10 80218760 8C640008 */ lw $a0, 8($v1) -/* 5B1C14 80218764 02629823 */ subu $s3, $s3, $v0 -/* 5B1C18 80218768 A0730194 */ sb $s3, 0x194($v1) -/* 5B1C1C 8021876C 90820025 */ lbu $v0, 0x25($a0) -/* 5B1C20 80218770 02429023 */ subu $s2, $s2, $v0 -/* 5B1C24 80218774 A0720195 */ sb $s2, 0x195($v1) -/* 5B1C28 80218778 90820026 */ lbu $v0, 0x26($a0) -/* 5B1C2C 8021877C 02028023 */ subu $s0, $s0, $v0 -/* 5B1C30 80218780 A0700196 */ sb $s0, 0x196($v1) -/* 5B1C34 80218784 90840027 */ lbu $a0, 0x27($a0) -/* 5B1C38 80218788 02248823 */ subu $s1, $s1, $a0 -/* 5B1C3C 8021878C A0710197 */ sb $s1, 0x197($v1) -/* 5B1C40 80218790 8FBF0020 */ lw $ra, 0x20($sp) -/* 5B1C44 80218794 8FB3001C */ lw $s3, 0x1c($sp) -/* 5B1C48 80218798 8FB20018 */ lw $s2, 0x18($sp) -/* 5B1C4C 8021879C 8FB10014 */ lw $s1, 0x14($sp) -/* 5B1C50 802187A0 8FB00010 */ lw $s0, 0x10($sp) -/* 5B1C54 802187A4 24020002 */ addiu $v0, $zero, 2 -/* 5B1C58 802187A8 03E00008 */ jr $ra -/* 5B1C5C 802187AC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/battle/area_flo/5B16A0/func_80218A54_5B1F04.s b/asm/nonmatchings/battle/area_flo/5B16A0/func_80218A54_5B1F04.s deleted file mode 100644 index 39908fee50..0000000000 --- a/asm/nonmatchings/battle/area_flo/5B16A0/func_80218A54_5B1F04.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218A54_5B1F04 -/* 5B1F04 80218A54 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 5B1F08 80218A58 AFB10014 */ sw $s1, 0x14($sp) -/* 5B1F0C 80218A5C 0080882D */ daddu $s1, $a0, $zero -/* 5B1F10 80218A60 AFBF0020 */ sw $ra, 0x20($sp) -/* 5B1F14 80218A64 AFB3001C */ sw $s3, 0x1c($sp) -/* 5B1F18 80218A68 AFB20018 */ sw $s2, 0x18($sp) -/* 5B1F1C 80218A6C AFB00010 */ sw $s0, 0x10($sp) -/* 5B1F20 80218A70 8E30000C */ lw $s0, 0xc($s1) -/* 5B1F24 80218A74 8E050000 */ lw $a1, ($s0) -/* 5B1F28 80218A78 0C0B1EAF */ jal get_variable -/* 5B1F2C 80218A7C 26100004 */ addiu $s0, $s0, 4 -/* 5B1F30 80218A80 8E050000 */ lw $a1, ($s0) -/* 5B1F34 80218A84 26100004 */ addiu $s0, $s0, 4 -/* 5B1F38 80218A88 0220202D */ daddu $a0, $s1, $zero -/* 5B1F3C 80218A8C 0C0B1EAF */ jal get_variable -/* 5B1F40 80218A90 0040982D */ daddu $s3, $v0, $zero -/* 5B1F44 80218A94 8E050000 */ lw $a1, ($s0) -/* 5B1F48 80218A98 26100004 */ addiu $s0, $s0, 4 -/* 5B1F4C 80218A9C 0220202D */ daddu $a0, $s1, $zero -/* 5B1F50 80218AA0 0C0B1EAF */ jal get_variable -/* 5B1F54 80218AA4 0040902D */ daddu $s2, $v0, $zero -/* 5B1F58 80218AA8 0220202D */ daddu $a0, $s1, $zero -/* 5B1F5C 80218AAC 8E050000 */ lw $a1, ($s0) -/* 5B1F60 80218AB0 0C0B1EAF */ jal get_variable -/* 5B1F64 80218AB4 0040802D */ daddu $s0, $v0, $zero -/* 5B1F68 80218AB8 8E240148 */ lw $a0, 0x148($s1) -/* 5B1F6C 80218ABC 0C09A75B */ jal get_actor -/* 5B1F70 80218AC0 0040882D */ daddu $s1, $v0, $zero -/* 5B1F74 80218AC4 0040182D */ daddu $v1, $v0, $zero -/* 5B1F78 80218AC8 8C620008 */ lw $v0, 8($v1) -/* 5B1F7C 80218ACC 90420024 */ lbu $v0, 0x24($v0) -/* 5B1F80 80218AD0 8C640008 */ lw $a0, 8($v1) -/* 5B1F84 80218AD4 02629823 */ subu $s3, $s3, $v0 -/* 5B1F88 80218AD8 A0730194 */ sb $s3, 0x194($v1) -/* 5B1F8C 80218ADC 90820025 */ lbu $v0, 0x25($a0) -/* 5B1F90 80218AE0 02429023 */ subu $s2, $s2, $v0 -/* 5B1F94 80218AE4 A0720195 */ sb $s2, 0x195($v1) -/* 5B1F98 80218AE8 90820026 */ lbu $v0, 0x26($a0) -/* 5B1F9C 80218AEC 02028023 */ subu $s0, $s0, $v0 -/* 5B1FA0 80218AF0 A0700196 */ sb $s0, 0x196($v1) -/* 5B1FA4 80218AF4 90840027 */ lbu $a0, 0x27($a0) -/* 5B1FA8 80218AF8 02248823 */ subu $s1, $s1, $a0 -/* 5B1FAC 80218AFC A0710197 */ sb $s1, 0x197($v1) -/* 5B1FB0 80218B00 8FBF0020 */ lw $ra, 0x20($sp) -/* 5B1FB4 80218B04 8FB3001C */ lw $s3, 0x1c($sp) -/* 5B1FB8 80218B08 8FB20018 */ lw $s2, 0x18($sp) -/* 5B1FBC 80218B0C 8FB10014 */ lw $s1, 0x14($sp) -/* 5B1FC0 80218B10 8FB00010 */ lw $s0, 0x10($sp) -/* 5B1FC4 80218B14 24020002 */ addiu $v0, $zero, 2 -/* 5B1FC8 80218B18 03E00008 */ jr $ra -/* 5B1FCC 80218B1C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/battle/area_flo/5B16A0/func_80218DC4_5B2274.s b/asm/nonmatchings/battle/area_flo/5B16A0/func_80218DC4_5B2274.s deleted file mode 100644 index fac9cca2a8..0000000000 --- a/asm/nonmatchings/battle/area_flo/5B16A0/func_80218DC4_5B2274.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218DC4_5B2274 -/* 5B2274 80218DC4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 5B2278 80218DC8 AFB10014 */ sw $s1, 0x14($sp) -/* 5B227C 80218DCC 0080882D */ daddu $s1, $a0, $zero -/* 5B2280 80218DD0 AFBF0020 */ sw $ra, 0x20($sp) -/* 5B2284 80218DD4 AFB3001C */ sw $s3, 0x1c($sp) -/* 5B2288 80218DD8 AFB20018 */ sw $s2, 0x18($sp) -/* 5B228C 80218DDC AFB00010 */ sw $s0, 0x10($sp) -/* 5B2290 80218DE0 8E30000C */ lw $s0, 0xc($s1) -/* 5B2294 80218DE4 8E050000 */ lw $a1, ($s0) -/* 5B2298 80218DE8 0C0B1EAF */ jal get_variable -/* 5B229C 80218DEC 26100004 */ addiu $s0, $s0, 4 -/* 5B22A0 80218DF0 8E050000 */ lw $a1, ($s0) -/* 5B22A4 80218DF4 26100004 */ addiu $s0, $s0, 4 -/* 5B22A8 80218DF8 0220202D */ daddu $a0, $s1, $zero -/* 5B22AC 80218DFC 0C0B1EAF */ jal get_variable -/* 5B22B0 80218E00 0040982D */ daddu $s3, $v0, $zero -/* 5B22B4 80218E04 8E050000 */ lw $a1, ($s0) -/* 5B22B8 80218E08 26100004 */ addiu $s0, $s0, 4 -/* 5B22BC 80218E0C 0220202D */ daddu $a0, $s1, $zero -/* 5B22C0 80218E10 0C0B1EAF */ jal get_variable -/* 5B22C4 80218E14 0040902D */ daddu $s2, $v0, $zero -/* 5B22C8 80218E18 0220202D */ daddu $a0, $s1, $zero -/* 5B22CC 80218E1C 8E050000 */ lw $a1, ($s0) -/* 5B22D0 80218E20 0C0B1EAF */ jal get_variable -/* 5B22D4 80218E24 0040802D */ daddu $s0, $v0, $zero -/* 5B22D8 80218E28 8E240148 */ lw $a0, 0x148($s1) -/* 5B22DC 80218E2C 0C09A75B */ jal get_actor -/* 5B22E0 80218E30 0040882D */ daddu $s1, $v0, $zero -/* 5B22E4 80218E34 0040182D */ daddu $v1, $v0, $zero -/* 5B22E8 80218E38 8C620008 */ lw $v0, 8($v1) -/* 5B22EC 80218E3C 90420024 */ lbu $v0, 0x24($v0) -/* 5B22F0 80218E40 8C640008 */ lw $a0, 8($v1) -/* 5B22F4 80218E44 02629823 */ subu $s3, $s3, $v0 -/* 5B22F8 80218E48 A0730194 */ sb $s3, 0x194($v1) -/* 5B22FC 80218E4C 90820025 */ lbu $v0, 0x25($a0) -/* 5B2300 80218E50 02429023 */ subu $s2, $s2, $v0 -/* 5B2304 80218E54 A0720195 */ sb $s2, 0x195($v1) -/* 5B2308 80218E58 90820026 */ lbu $v0, 0x26($a0) -/* 5B230C 80218E5C 02028023 */ subu $s0, $s0, $v0 -/* 5B2310 80218E60 A0700196 */ sb $s0, 0x196($v1) -/* 5B2314 80218E64 90840027 */ lbu $a0, 0x27($a0) -/* 5B2318 80218E68 02248823 */ subu $s1, $s1, $a0 -/* 5B231C 80218E6C A0710197 */ sb $s1, 0x197($v1) -/* 5B2320 80218E70 8FBF0020 */ lw $ra, 0x20($sp) -/* 5B2324 80218E74 8FB3001C */ lw $s3, 0x1c($sp) -/* 5B2328 80218E78 8FB20018 */ lw $s2, 0x18($sp) -/* 5B232C 80218E7C 8FB10014 */ lw $s1, 0x14($sp) -/* 5B2330 80218E80 8FB00010 */ lw $s0, 0x10($sp) -/* 5B2334 80218E84 24020002 */ addiu $v0, $zero, 2 -/* 5B2338 80218E88 03E00008 */ jr $ra -/* 5B233C 80218E8C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/battle/area_flo/5B16A0/func_80219234_5B26E4.s b/asm/nonmatchings/battle/area_flo/5B16A0/func_80219234_5B26E4.s deleted file mode 100644 index 5a2908b292..0000000000 --- a/asm/nonmatchings/battle/area_flo/5B16A0/func_80219234_5B26E4.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80219234_5B26E4 -/* 5B26E4 80219234 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 5B26E8 80219238 AFB10014 */ sw $s1, 0x14($sp) -/* 5B26EC 8021923C 0080882D */ daddu $s1, $a0, $zero -/* 5B26F0 80219240 AFBF0020 */ sw $ra, 0x20($sp) -/* 5B26F4 80219244 AFB3001C */ sw $s3, 0x1c($sp) -/* 5B26F8 80219248 AFB20018 */ sw $s2, 0x18($sp) -/* 5B26FC 8021924C AFB00010 */ sw $s0, 0x10($sp) -/* 5B2700 80219250 8E30000C */ lw $s0, 0xc($s1) -/* 5B2704 80219254 8E050000 */ lw $a1, ($s0) -/* 5B2708 80219258 0C0B1EAF */ jal get_variable -/* 5B270C 8021925C 26100004 */ addiu $s0, $s0, 4 -/* 5B2710 80219260 8E050000 */ lw $a1, ($s0) -/* 5B2714 80219264 26100004 */ addiu $s0, $s0, 4 -/* 5B2718 80219268 0220202D */ daddu $a0, $s1, $zero -/* 5B271C 8021926C 0C0B1EAF */ jal get_variable -/* 5B2720 80219270 0040982D */ daddu $s3, $v0, $zero -/* 5B2724 80219274 8E050000 */ lw $a1, ($s0) -/* 5B2728 80219278 26100004 */ addiu $s0, $s0, 4 -/* 5B272C 8021927C 0220202D */ daddu $a0, $s1, $zero -/* 5B2730 80219280 0C0B1EAF */ jal get_variable -/* 5B2734 80219284 0040902D */ daddu $s2, $v0, $zero -/* 5B2738 80219288 0220202D */ daddu $a0, $s1, $zero -/* 5B273C 8021928C 8E050000 */ lw $a1, ($s0) -/* 5B2740 80219290 0C0B1EAF */ jal get_variable -/* 5B2744 80219294 0040802D */ daddu $s0, $v0, $zero -/* 5B2748 80219298 8E240148 */ lw $a0, 0x148($s1) -/* 5B274C 8021929C 0C09A75B */ jal get_actor -/* 5B2750 802192A0 0040882D */ daddu $s1, $v0, $zero -/* 5B2754 802192A4 0040182D */ daddu $v1, $v0, $zero -/* 5B2758 802192A8 8C620008 */ lw $v0, 8($v1) -/* 5B275C 802192AC 90420024 */ lbu $v0, 0x24($v0) -/* 5B2760 802192B0 8C640008 */ lw $a0, 8($v1) -/* 5B2764 802192B4 02629823 */ subu $s3, $s3, $v0 -/* 5B2768 802192B8 A0730194 */ sb $s3, 0x194($v1) -/* 5B276C 802192BC 90820025 */ lbu $v0, 0x25($a0) -/* 5B2770 802192C0 02429023 */ subu $s2, $s2, $v0 -/* 5B2774 802192C4 A0720195 */ sb $s2, 0x195($v1) -/* 5B2778 802192C8 90820026 */ lbu $v0, 0x26($a0) -/* 5B277C 802192CC 02028023 */ subu $s0, $s0, $v0 -/* 5B2780 802192D0 A0700196 */ sb $s0, 0x196($v1) -/* 5B2784 802192D4 90840027 */ lbu $a0, 0x27($a0) -/* 5B2788 802192D8 02248823 */ subu $s1, $s1, $a0 -/* 5B278C 802192DC A0710197 */ sb $s1, 0x197($v1) -/* 5B2790 802192E0 8FBF0020 */ lw $ra, 0x20($sp) -/* 5B2794 802192E4 8FB3001C */ lw $s3, 0x1c($sp) -/* 5B2798 802192E8 8FB20018 */ lw $s2, 0x18($sp) -/* 5B279C 802192EC 8FB10014 */ lw $s1, 0x14($sp) -/* 5B27A0 802192F0 8FB00010 */ lw $s0, 0x10($sp) -/* 5B27A4 802192F4 24020002 */ addiu $v0, $zero, 2 -/* 5B27A8 802192F8 03E00008 */ jr $ra -/* 5B27AC 802192FC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/battle/area_hos/47F0D0/func_802182D4_47F384.s b/asm/nonmatchings/battle/area_hos/47F0D0/func_802182D4_47F384.s deleted file mode 100644 index 68799c36ac..0000000000 --- a/asm/nonmatchings/battle/area_hos/47F0D0/func_802182D4_47F384.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802182D4_47F384 -/* 47F384 802182D4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 47F388 802182D8 AFB10014 */ sw $s1, 0x14($sp) -/* 47F38C 802182DC 0080882D */ daddu $s1, $a0, $zero -/* 47F390 802182E0 AFBF0020 */ sw $ra, 0x20($sp) -/* 47F394 802182E4 AFB3001C */ sw $s3, 0x1c($sp) -/* 47F398 802182E8 AFB20018 */ sw $s2, 0x18($sp) -/* 47F39C 802182EC AFB00010 */ sw $s0, 0x10($sp) -/* 47F3A0 802182F0 8E30000C */ lw $s0, 0xc($s1) -/* 47F3A4 802182F4 8E050000 */ lw $a1, ($s0) -/* 47F3A8 802182F8 0C0B1EAF */ jal get_variable -/* 47F3AC 802182FC 26100004 */ addiu $s0, $s0, 4 -/* 47F3B0 80218300 8E050000 */ lw $a1, ($s0) -/* 47F3B4 80218304 26100004 */ addiu $s0, $s0, 4 -/* 47F3B8 80218308 0220202D */ daddu $a0, $s1, $zero -/* 47F3BC 8021830C 0C0B1EAF */ jal get_variable -/* 47F3C0 80218310 0040982D */ daddu $s3, $v0, $zero -/* 47F3C4 80218314 8E050000 */ lw $a1, ($s0) -/* 47F3C8 80218318 26100004 */ addiu $s0, $s0, 4 -/* 47F3CC 8021831C 0220202D */ daddu $a0, $s1, $zero -/* 47F3D0 80218320 0C0B1EAF */ jal get_variable -/* 47F3D4 80218324 0040902D */ daddu $s2, $v0, $zero -/* 47F3D8 80218328 0220202D */ daddu $a0, $s1, $zero -/* 47F3DC 8021832C 8E050000 */ lw $a1, ($s0) -/* 47F3E0 80218330 0C0B1EAF */ jal get_variable -/* 47F3E4 80218334 0040802D */ daddu $s0, $v0, $zero -/* 47F3E8 80218338 8E240148 */ lw $a0, 0x148($s1) -/* 47F3EC 8021833C 0C09A75B */ jal get_actor -/* 47F3F0 80218340 0040882D */ daddu $s1, $v0, $zero -/* 47F3F4 80218344 0040182D */ daddu $v1, $v0, $zero -/* 47F3F8 80218348 8C620008 */ lw $v0, 8($v1) -/* 47F3FC 8021834C 90420024 */ lbu $v0, 0x24($v0) -/* 47F400 80218350 8C640008 */ lw $a0, 8($v1) -/* 47F404 80218354 02629823 */ subu $s3, $s3, $v0 -/* 47F408 80218358 A0730194 */ sb $s3, 0x194($v1) -/* 47F40C 8021835C 90820025 */ lbu $v0, 0x25($a0) -/* 47F410 80218360 02429023 */ subu $s2, $s2, $v0 -/* 47F414 80218364 A0720195 */ sb $s2, 0x195($v1) -/* 47F418 80218368 90820026 */ lbu $v0, 0x26($a0) -/* 47F41C 8021836C 02028023 */ subu $s0, $s0, $v0 -/* 47F420 80218370 A0700196 */ sb $s0, 0x196($v1) -/* 47F424 80218374 90840027 */ lbu $a0, 0x27($a0) -/* 47F428 80218378 02248823 */ subu $s1, $s1, $a0 -/* 47F42C 8021837C A0710197 */ sb $s1, 0x197($v1) -/* 47F430 80218380 8FBF0020 */ lw $ra, 0x20($sp) -/* 47F434 80218384 8FB3001C */ lw $s3, 0x1c($sp) -/* 47F438 80218388 8FB20018 */ lw $s2, 0x18($sp) -/* 47F43C 8021838C 8FB10014 */ lw $s1, 0x14($sp) -/* 47F440 80218390 8FB00010 */ lw $s0, 0x10($sp) -/* 47F444 80218394 24020002 */ addiu $v0, $zero, 2 -/* 47F448 80218398 03E00008 */ jr $ra -/* 47F44C 8021839C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/battle/area_isk_part_1/4E2740/func_80218000_4E2740.s b/asm/nonmatchings/battle/area_isk_part_1/4E2740/func_80218000_4E2740.s deleted file mode 100644 index 6e9a0547ed..0000000000 --- a/asm/nonmatchings/battle/area_isk_part_1/4E2740/func_80218000_4E2740.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218000_4E2740 -/* 4E2740 80218000 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 4E2744 80218004 AFB10014 */ sw $s1, 0x14($sp) -/* 4E2748 80218008 0080882D */ daddu $s1, $a0, $zero -/* 4E274C 8021800C AFBF0020 */ sw $ra, 0x20($sp) -/* 4E2750 80218010 AFB3001C */ sw $s3, 0x1c($sp) -/* 4E2754 80218014 AFB20018 */ sw $s2, 0x18($sp) -/* 4E2758 80218018 AFB00010 */ sw $s0, 0x10($sp) -/* 4E275C 8021801C 8E30000C */ lw $s0, 0xc($s1) -/* 4E2760 80218020 8E050000 */ lw $a1, ($s0) -/* 4E2764 80218024 0C0B1EAF */ jal get_variable -/* 4E2768 80218028 26100004 */ addiu $s0, $s0, 4 -/* 4E276C 8021802C 8E050000 */ lw $a1, ($s0) -/* 4E2770 80218030 26100004 */ addiu $s0, $s0, 4 -/* 4E2774 80218034 0220202D */ daddu $a0, $s1, $zero -/* 4E2778 80218038 0C0B1EAF */ jal get_variable -/* 4E277C 8021803C 0040982D */ daddu $s3, $v0, $zero -/* 4E2780 80218040 8E050000 */ lw $a1, ($s0) -/* 4E2784 80218044 26100004 */ addiu $s0, $s0, 4 -/* 4E2788 80218048 0220202D */ daddu $a0, $s1, $zero -/* 4E278C 8021804C 0C0B1EAF */ jal get_variable -/* 4E2790 80218050 0040902D */ daddu $s2, $v0, $zero -/* 4E2794 80218054 0220202D */ daddu $a0, $s1, $zero -/* 4E2798 80218058 8E050000 */ lw $a1, ($s0) -/* 4E279C 8021805C 0C0B1EAF */ jal get_variable -/* 4E27A0 80218060 0040802D */ daddu $s0, $v0, $zero -/* 4E27A4 80218064 8E240148 */ lw $a0, 0x148($s1) -/* 4E27A8 80218068 0C09A75B */ jal get_actor -/* 4E27AC 8021806C 0040882D */ daddu $s1, $v0, $zero -/* 4E27B0 80218070 0040182D */ daddu $v1, $v0, $zero -/* 4E27B4 80218074 8C620008 */ lw $v0, 8($v1) -/* 4E27B8 80218078 90420024 */ lbu $v0, 0x24($v0) -/* 4E27BC 8021807C 8C640008 */ lw $a0, 8($v1) -/* 4E27C0 80218080 02629823 */ subu $s3, $s3, $v0 -/* 4E27C4 80218084 A0730194 */ sb $s3, 0x194($v1) -/* 4E27C8 80218088 90820025 */ lbu $v0, 0x25($a0) -/* 4E27CC 8021808C 02429023 */ subu $s2, $s2, $v0 -/* 4E27D0 80218090 A0720195 */ sb $s2, 0x195($v1) -/* 4E27D4 80218094 90820026 */ lbu $v0, 0x26($a0) -/* 4E27D8 80218098 02028023 */ subu $s0, $s0, $v0 -/* 4E27DC 8021809C A0700196 */ sb $s0, 0x196($v1) -/* 4E27E0 802180A0 90840027 */ lbu $a0, 0x27($a0) -/* 4E27E4 802180A4 02248823 */ subu $s1, $s1, $a0 -/* 4E27E8 802180A8 A0710197 */ sb $s1, 0x197($v1) -/* 4E27EC 802180AC 8FBF0020 */ lw $ra, 0x20($sp) -/* 4E27F0 802180B0 8FB3001C */ lw $s3, 0x1c($sp) -/* 4E27F4 802180B4 8FB20018 */ lw $s2, 0x18($sp) -/* 4E27F8 802180B8 8FB10014 */ lw $s1, 0x14($sp) -/* 4E27FC 802180BC 8FB00010 */ lw $s0, 0x10($sp) -/* 4E2800 802180C0 24020002 */ addiu $v0, $zero, 2 -/* 4E2804 802180C4 03E00008 */ jr $ra -/* 4E2808 802180C8 27BD0028 */ addiu $sp, $sp, 0x28 -/* 4E280C 802180CC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_isk_part_1/4E2740/func_802180D0_4E2810.s b/asm/nonmatchings/battle/area_isk_part_1/4E2740/func_802180D0_4E2810.s deleted file mode 100644 index a49448995d..0000000000 --- a/asm/nonmatchings/battle/area_isk_part_1/4E2740/func_802180D0_4E2810.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802180D0_4E2810 -/* 4E2810 802180D0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 4E2814 802180D4 AFB10014 */ sw $s1, 0x14($sp) -/* 4E2818 802180D8 0080882D */ daddu $s1, $a0, $zero -/* 4E281C 802180DC AFBF0020 */ sw $ra, 0x20($sp) -/* 4E2820 802180E0 AFB3001C */ sw $s3, 0x1c($sp) -/* 4E2824 802180E4 AFB20018 */ sw $s2, 0x18($sp) -/* 4E2828 802180E8 AFB00010 */ sw $s0, 0x10($sp) -/* 4E282C 802180EC 8E30000C */ lw $s0, 0xc($s1) -/* 4E2830 802180F0 8E050000 */ lw $a1, ($s0) -/* 4E2834 802180F4 0C0B1EAF */ jal get_variable -/* 4E2838 802180F8 26100004 */ addiu $s0, $s0, 4 -/* 4E283C 802180FC 8E050000 */ lw $a1, ($s0) -/* 4E2840 80218100 26100004 */ addiu $s0, $s0, 4 -/* 4E2844 80218104 0220202D */ daddu $a0, $s1, $zero -/* 4E2848 80218108 0C0B1EAF */ jal get_variable -/* 4E284C 8021810C 0040982D */ daddu $s3, $v0, $zero -/* 4E2850 80218110 8E050000 */ lw $a1, ($s0) -/* 4E2854 80218114 26100004 */ addiu $s0, $s0, 4 -/* 4E2858 80218118 0220202D */ daddu $a0, $s1, $zero -/* 4E285C 8021811C 0C0B1EAF */ jal get_variable -/* 4E2860 80218120 0040902D */ daddu $s2, $v0, $zero -/* 4E2864 80218124 0220202D */ daddu $a0, $s1, $zero -/* 4E2868 80218128 8E050000 */ lw $a1, ($s0) -/* 4E286C 8021812C 0C0B1EAF */ jal get_variable -/* 4E2870 80218130 0040802D */ daddu $s0, $v0, $zero -/* 4E2874 80218134 8E240148 */ lw $a0, 0x148($s1) -/* 4E2878 80218138 0C09A75B */ jal get_actor -/* 4E287C 8021813C 0040882D */ daddu $s1, $v0, $zero -/* 4E2880 80218140 0040182D */ daddu $v1, $v0, $zero -/* 4E2884 80218144 8C620008 */ lw $v0, 8($v1) -/* 4E2888 80218148 90420024 */ lbu $v0, 0x24($v0) -/* 4E288C 8021814C 8C640008 */ lw $a0, 8($v1) -/* 4E2890 80218150 02629823 */ subu $s3, $s3, $v0 -/* 4E2894 80218154 A0730194 */ sb $s3, 0x194($v1) -/* 4E2898 80218158 90820025 */ lbu $v0, 0x25($a0) -/* 4E289C 8021815C 02429023 */ subu $s2, $s2, $v0 -/* 4E28A0 80218160 A0720195 */ sb $s2, 0x195($v1) -/* 4E28A4 80218164 90820026 */ lbu $v0, 0x26($a0) -/* 4E28A8 80218168 02028023 */ subu $s0, $s0, $v0 -/* 4E28AC 8021816C A0700196 */ sb $s0, 0x196($v1) -/* 4E28B0 80218170 90840027 */ lbu $a0, 0x27($a0) -/* 4E28B4 80218174 02248823 */ subu $s1, $s1, $a0 -/* 4E28B8 80218178 A0710197 */ sb $s1, 0x197($v1) -/* 4E28BC 8021817C 8FBF0020 */ lw $ra, 0x20($sp) -/* 4E28C0 80218180 8FB3001C */ lw $s3, 0x1c($sp) -/* 4E28C4 80218184 8FB20018 */ lw $s2, 0x18($sp) -/* 4E28C8 80218188 8FB10014 */ lw $s1, 0x14($sp) -/* 4E28CC 8021818C 8FB00010 */ lw $s0, 0x10($sp) -/* 4E28D0 80218190 24020002 */ addiu $v0, $zero, 2 -/* 4E28D4 80218194 03E00008 */ jr $ra -/* 4E28D8 80218198 27BD0028 */ addiu $sp, $sp, 0x28 -/* 4E28DC 8021819C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_isk_part_1/4E2740/func_802181A0_4E28E0.s b/asm/nonmatchings/battle/area_isk_part_1/4E2740/func_802181A0_4E28E0.s deleted file mode 100644 index 769b18a511..0000000000 --- a/asm/nonmatchings/battle/area_isk_part_1/4E2740/func_802181A0_4E28E0.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802181A0_4E28E0 -/* 4E28E0 802181A0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 4E28E4 802181A4 AFB10014 */ sw $s1, 0x14($sp) -/* 4E28E8 802181A8 0080882D */ daddu $s1, $a0, $zero -/* 4E28EC 802181AC AFBF0020 */ sw $ra, 0x20($sp) -/* 4E28F0 802181B0 AFB3001C */ sw $s3, 0x1c($sp) -/* 4E28F4 802181B4 AFB20018 */ sw $s2, 0x18($sp) -/* 4E28F8 802181B8 AFB00010 */ sw $s0, 0x10($sp) -/* 4E28FC 802181BC 8E30000C */ lw $s0, 0xc($s1) -/* 4E2900 802181C0 8E050000 */ lw $a1, ($s0) -/* 4E2904 802181C4 0C0B1EAF */ jal get_variable -/* 4E2908 802181C8 26100004 */ addiu $s0, $s0, 4 -/* 4E290C 802181CC 8E050000 */ lw $a1, ($s0) -/* 4E2910 802181D0 26100004 */ addiu $s0, $s0, 4 -/* 4E2914 802181D4 0220202D */ daddu $a0, $s1, $zero -/* 4E2918 802181D8 0C0B1EAF */ jal get_variable -/* 4E291C 802181DC 0040982D */ daddu $s3, $v0, $zero -/* 4E2920 802181E0 8E050000 */ lw $a1, ($s0) -/* 4E2924 802181E4 26100004 */ addiu $s0, $s0, 4 -/* 4E2928 802181E8 0220202D */ daddu $a0, $s1, $zero -/* 4E292C 802181EC 0C0B1EAF */ jal get_variable -/* 4E2930 802181F0 0040902D */ daddu $s2, $v0, $zero -/* 4E2934 802181F4 0220202D */ daddu $a0, $s1, $zero -/* 4E2938 802181F8 8E050000 */ lw $a1, ($s0) -/* 4E293C 802181FC 0C0B1EAF */ jal get_variable -/* 4E2940 80218200 0040802D */ daddu $s0, $v0, $zero -/* 4E2944 80218204 8E240148 */ lw $a0, 0x148($s1) -/* 4E2948 80218208 0C09A75B */ jal get_actor -/* 4E294C 8021820C 0040882D */ daddu $s1, $v0, $zero -/* 4E2950 80218210 0040182D */ daddu $v1, $v0, $zero -/* 4E2954 80218214 8C620008 */ lw $v0, 8($v1) -/* 4E2958 80218218 90420024 */ lbu $v0, 0x24($v0) -/* 4E295C 8021821C 8C640008 */ lw $a0, 8($v1) -/* 4E2960 80218220 02629823 */ subu $s3, $s3, $v0 -/* 4E2964 80218224 A0730194 */ sb $s3, 0x194($v1) -/* 4E2968 80218228 90820025 */ lbu $v0, 0x25($a0) -/* 4E296C 8021822C 02429023 */ subu $s2, $s2, $v0 -/* 4E2970 80218230 A0720195 */ sb $s2, 0x195($v1) -/* 4E2974 80218234 90820026 */ lbu $v0, 0x26($a0) -/* 4E2978 80218238 02028023 */ subu $s0, $s0, $v0 -/* 4E297C 8021823C A0700196 */ sb $s0, 0x196($v1) -/* 4E2980 80218240 90840027 */ lbu $a0, 0x27($a0) -/* 4E2984 80218244 02248823 */ subu $s1, $s1, $a0 -/* 4E2988 80218248 A0710197 */ sb $s1, 0x197($v1) -/* 4E298C 8021824C 8FBF0020 */ lw $ra, 0x20($sp) -/* 4E2990 80218250 8FB3001C */ lw $s3, 0x1c($sp) -/* 4E2994 80218254 8FB20018 */ lw $s2, 0x18($sp) -/* 4E2998 80218258 8FB10014 */ lw $s1, 0x14($sp) -/* 4E299C 8021825C 8FB00010 */ lw $s0, 0x10($sp) -/* 4E29A0 80218260 24020002 */ addiu $v0, $zero, 2 -/* 4E29A4 80218264 03E00008 */ jr $ra -/* 4E29A8 80218268 27BD0028 */ addiu $sp, $sp, 0x28 -/* 4E29AC 8021826C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_isk_part_1/4E2740/func_80218270_4E29B0.s b/asm/nonmatchings/battle/area_isk_part_1/4E29B0/func_80218270_4E29B0.s similarity index 100% rename from asm/nonmatchings/battle/area_isk_part_1/4E2740/func_80218270_4E29B0.s rename to asm/nonmatchings/battle/area_isk_part_1/4E29B0/func_80218270_4E29B0.s diff --git a/asm/nonmatchings/battle/area_isk_part_1/4E2740/func_802183C0_4E2B00.s b/asm/nonmatchings/battle/area_isk_part_1/4E29B0/func_802183C0_4E2B00.s similarity index 100% rename from asm/nonmatchings/battle/area_isk_part_1/4E2740/func_802183C0_4E2B00.s rename to asm/nonmatchings/battle/area_isk_part_1/4E29B0/func_802183C0_4E2B00.s diff --git a/asm/nonmatchings/battle/area_isk_part_1/4E2740/func_80218458_4E2B98.s b/asm/nonmatchings/battle/area_isk_part_1/4E29B0/func_80218458_4E2B98.s similarity index 100% rename from asm/nonmatchings/battle/area_isk_part_1/4E2740/func_80218458_4E2B98.s rename to asm/nonmatchings/battle/area_isk_part_1/4E29B0/func_80218458_4E2B98.s diff --git a/asm/nonmatchings/battle/area_isk_part_1/4E2740/func_802184CC_4E2C0C.s b/asm/nonmatchings/battle/area_isk_part_1/4E29B0/func_802184CC_4E2C0C.s similarity index 94% rename from asm/nonmatchings/battle/area_isk_part_1/4E2740/func_802184CC_4E2C0C.s rename to asm/nonmatchings/battle/area_isk_part_1/4E29B0/func_802184CC_4E2C0C.s index 90c7cb4a02..b96421f8db 100644 --- a/asm/nonmatchings/battle/area_isk_part_1/4E2740/func_802184CC_4E2C0C.s +++ b/asm/nonmatchings/battle/area_isk_part_1/4E29B0/func_802184CC_4E2C0C.s @@ -82,13 +82,13 @@ glabel func_802184CC_4E2C0C /* 4E2D28 802185E8 46000007 */ neg.s $f0, $f0 /* 4E2D2C 802185EC 46000000 */ add.s $f0, $f0, $f0 /* 4E2D30 802185F0 4600103C */ c.lt.s $f2, $f0 -/* 4E2D34 802185F4 00000000 */ nop +/* 4E2D34 802185F4 00000000 */ nop /* 4E2D38 802185F8 4500000D */ bc1f .L80218630 /* 4E2D3C 802185FC E6020014 */ swc1 $f2, 0x14($s0) /* 4E2D40 80218600 E6000014 */ swc1 $f0, 0x14($s0) /* 4E2D44 80218604 8E2200A8 */ lw $v0, 0xa8($s1) /* 4E2D48 80218608 10400009 */ beqz $v0, .L80218630 -/* 4E2D4C 8021860C 00000000 */ nop +/* 4E2D4C 8021860C 00000000 */ nop /* 4E2D50 80218610 16600007 */ bnez $s3, .L80218630 /* 4E2D54 80218614 24042063 */ addiu $a0, $zero, 0x2063 /* 4E2D58 80218618 C620014C */ lwc1 $f0, 0x14c($s1) @@ -108,9 +108,9 @@ glabel func_802184CC_4E2C0C /* 4E2D8C 8021864C 3C014004 */ lui $at, 0x4004 /* 4E2D90 80218650 44811800 */ mtc1 $at, $f3 /* 4E2D94 80218654 44801000 */ mtc1 $zero, $f2 -/* 4E2D98 80218658 00000000 */ nop +/* 4E2D98 80218658 00000000 */ nop /* 4E2D9C 8021865C 4622003C */ c.lt.d $f0, $f2 -/* 4E2DA0 80218660 00000000 */ nop +/* 4E2DA0 80218660 00000000 */ nop /* 4E2DA4 80218664 45000012 */ bc1f .L802186B0 /* 4E2DA8 80218668 4600A306 */ mov.s $f12, $f20 /* 4E2DAC 8021866C 3C014020 */ lui $at, 0x4020 @@ -121,9 +121,9 @@ glabel func_802184CC_4E2C0C /* 4E2DBC 8021867C 3C014014 */ lui $at, 0x4014 /* 4E2DC0 80218680 44811800 */ mtc1 $at, $f3 /* 4E2DC4 80218684 44801000 */ mtc1 $zero, $f2 -/* 4E2DC8 80218688 00000000 */ nop +/* 4E2DC8 80218688 00000000 */ nop /* 4E2DCC 8021868C 4622003C */ c.lt.d $f0, $f2 -/* 4E2DD0 80218690 00000000 */ nop +/* 4E2DD0 80218690 00000000 */ nop /* 4E2DD4 80218694 45000006 */ bc1f .L802186B0 /* 4E2DD8 80218698 4600A306 */ mov.s $f12, $f20 /* 4E2DDC 8021869C 3C0140A0 */ lui $at, 0x40a0 @@ -145,7 +145,7 @@ glabel func_802184CC_4E2C0C /* 4E2E14 802186D4 46000506 */ mov.s $f20, $f0 /* 4E2E18 802186D8 C6020028 */ lwc1 $f2, 0x28($s0) /* 4E2E1C 802186DC 4614103E */ c.le.s $f2, $f20 -/* 4E2E20 802186E0 00000000 */ nop +/* 4E2E20 802186E0 00000000 */ nop /* 4E2E24 802186E4 45000012 */ bc1f .L80218730 /* 4E2E28 802186E8 46000586 */ mov.s $f22, $f0 /* 4E2E2C 802186EC 4602A081 */ sub.s $f2, $f20, $f2 @@ -159,7 +159,7 @@ glabel func_802184CC_4E2C0C /* 4E2E4C 8021870C 44801000 */ mtc1 $zero, $f2 /* 4E2E50 80218710 46000021 */ cvt.d.s $f0, $f0 /* 4E2E54 80218714 46220002 */ mul.d $f0, $f0, $f2 -/* 4E2E58 80218718 00000000 */ nop +/* 4E2E58 80218718 00000000 */ nop /* 4E2E5C 8021871C C6020014 */ lwc1 $f2, 0x14($s0) /* 4E2E60 80218720 460010A1 */ cvt.d.s $f2, $f2 /* 4E2E64 80218724 46201080 */ add.d $f2, $f2, $f0 @@ -168,14 +168,14 @@ glabel func_802184CC_4E2C0C .L80218730: /* 4E2E70 80218730 C6000024 */ lwc1 $f0, 0x24($s0) /* 4E2E74 80218734 4614003E */ c.le.s $f0, $f20 -/* 4E2E78 80218738 00000000 */ nop +/* 4E2E78 80218738 00000000 */ nop /* 4E2E7C 8021873C 4500000F */ bc1f .L8021877C -/* 4E2E80 80218740 00000000 */ nop +/* 4E2E80 80218740 00000000 */ nop /* 4E2E84 80218744 C6000020 */ lwc1 $f0, 0x20($s0) /* 4E2E88 80218748 4614003E */ c.le.s $f0, $f20 -/* 4E2E8C 8021874C 00000000 */ nop +/* 4E2E8C 8021874C 00000000 */ nop /* 4E2E90 80218750 45000003 */ bc1f .L80218760 -/* 4E2E94 80218754 00000000 */ nop +/* 4E2E94 80218754 00000000 */ nop /* 4E2E98 80218758 080861DC */ j .L80218770 /* 4E2E9C 8021875C 4600A001 */ sub.s $f0, $f20, $f0 .L80218760: @@ -186,14 +186,14 @@ glabel func_802184CC_4E2C0C .L80218770: /* 4E2EB0 80218770 44050000 */ mfc1 $a1, $f0 /* 4E2EB4 80218774 080861F2 */ j .L802187C8 -/* 4E2EB8 80218778 00000000 */ nop +/* 4E2EB8 80218778 00000000 */ nop .L8021877C: /* 4E2EBC 8021877C C602001C */ lwc1 $f2, 0x1c($s0) /* 4E2EC0 80218780 3C018022 */ lui $at, %hi(D_80224920) /* 4E2EC4 80218784 D4204920 */ ldc1 $f0, %lo(D_80224920)($at) /* 4E2EC8 80218788 460010A1 */ cvt.d.s $f2, $f2 /* 4E2ECC 8021878C 46201082 */ mul.d $f2, $f2, $f0 -/* 4E2ED0 80218790 00000000 */ nop +/* 4E2ED0 80218790 00000000 */ nop /* 4E2ED4 80218794 C6000018 */ lwc1 $f0, 0x18($s0) /* 4E2ED8 80218798 46000021 */ cvt.d.s $f0, $f0 /* 4E2EDC 8021879C 46220001 */ sub.d $f0, $f0, $f2 @@ -202,7 +202,7 @@ glabel func_802184CC_4E2C0C /* 4E2EE8 802187A8 46200020 */ cvt.s.d $f0, $f0 /* 4E2EEC 802187AC 460000A1 */ cvt.d.s $f2, $f0 /* 4E2EF0 802187B0 4624103C */ c.lt.d $f2, $f4 -/* 4E2EF4 802187B4 00000000 */ nop +/* 4E2EF4 802187B4 00000000 */ nop /* 4E2EF8 802187B8 45000002 */ bc1f .L802187C4 /* 4E2EFC 802187BC E6000018 */ swc1 $f0, 0x18($s0) /* 4E2F00 802187C0 AE000018 */ sw $zero, 0x18($s0) @@ -218,12 +218,12 @@ glabel func_802184CC_4E2C0C /* 4E2F20 802187E0 44801000 */ mtc1 $zero, $f2 /* 4E2F24 802187E4 46000021 */ cvt.d.s $f0, $f0 /* 4E2F28 802187E8 4620103C */ c.lt.d $f2, $f0 -/* 4E2F2C 802187EC 00000000 */ nop +/* 4E2F2C 802187EC 00000000 */ nop /* 4E2F30 802187F0 45000005 */ bc1f .L80218808 /* 4E2F34 802187F4 0220202D */ daddu $a0, $s1, $zero /* 4E2F38 802187F8 3C014080 */ lui $at, 0x4080 /* 4E2F3C 802187FC 44810000 */ mtc1 $at, $f0 -/* 4E2F40 80218800 00000000 */ nop +/* 4E2F40 80218800 00000000 */ nop /* 4E2F44 80218804 E6000018 */ swc1 $f0, 0x18($s0) .L80218808: /* 4E2F48 80218808 0C099117 */ jal get_actor_part diff --git a/asm/nonmatchings/battle/area_isk_part_1/4E2740/func_802188B0_4E2FF0.s b/asm/nonmatchings/battle/area_isk_part_1/4E29B0/func_802188B0_4E2FF0.s similarity index 100% rename from asm/nonmatchings/battle/area_isk_part_1/4E2740/func_802188B0_4E2FF0.s rename to asm/nonmatchings/battle/area_isk_part_1/4E29B0/func_802188B0_4E2FF0.s diff --git a/asm/nonmatchings/battle/area_isk_part_1/4E2740/func_80218944_4E3084.s b/asm/nonmatchings/battle/area_isk_part_1/4E29B0/func_80218944_4E3084.s similarity index 100% rename from asm/nonmatchings/battle/area_isk_part_1/4E2740/func_80218944_4E3084.s rename to asm/nonmatchings/battle/area_isk_part_1/4E29B0/func_80218944_4E3084.s diff --git a/asm/nonmatchings/battle/area_isk_part_1/4E2740/func_80218980_4E30C0.s b/asm/nonmatchings/battle/area_isk_part_1/4E29B0/func_80218980_4E30C0.s similarity index 100% rename from asm/nonmatchings/battle/area_isk_part_1/4E2740/func_80218980_4E30C0.s rename to asm/nonmatchings/battle/area_isk_part_1/4E29B0/func_80218980_4E30C0.s diff --git a/asm/nonmatchings/battle/area_isk_part_1/4E2740/func_80218A10_4E3150.s b/asm/nonmatchings/battle/area_isk_part_1/4E29B0/func_80218A10_4E3150.s similarity index 100% rename from asm/nonmatchings/battle/area_isk_part_1/4E2740/func_80218A10_4E3150.s rename to asm/nonmatchings/battle/area_isk_part_1/4E29B0/func_80218A10_4E3150.s diff --git a/asm/nonmatchings/battle/area_isk_part_2/4EF4A0/func_80218690_4EFB30.s b/asm/nonmatchings/battle/area_isk_part_2/4EF4A0/func_80218690_4EFB30.s deleted file mode 100644 index 75144acdc2..0000000000 --- a/asm/nonmatchings/battle/area_isk_part_2/4EF4A0/func_80218690_4EFB30.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218690_4EFB30 -/* 4EFB30 80218690 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 4EFB34 80218694 AFB10014 */ sw $s1, 0x14($sp) -/* 4EFB38 80218698 0080882D */ daddu $s1, $a0, $zero -/* 4EFB3C 8021869C AFBF0020 */ sw $ra, 0x20($sp) -/* 4EFB40 802186A0 AFB3001C */ sw $s3, 0x1c($sp) -/* 4EFB44 802186A4 AFB20018 */ sw $s2, 0x18($sp) -/* 4EFB48 802186A8 AFB00010 */ sw $s0, 0x10($sp) -/* 4EFB4C 802186AC 8E30000C */ lw $s0, 0xc($s1) -/* 4EFB50 802186B0 8E050000 */ lw $a1, ($s0) -/* 4EFB54 802186B4 0C0B1EAF */ jal get_variable -/* 4EFB58 802186B8 26100004 */ addiu $s0, $s0, 4 -/* 4EFB5C 802186BC 8E050000 */ lw $a1, ($s0) -/* 4EFB60 802186C0 26100004 */ addiu $s0, $s0, 4 -/* 4EFB64 802186C4 0220202D */ daddu $a0, $s1, $zero -/* 4EFB68 802186C8 0C0B1EAF */ jal get_variable -/* 4EFB6C 802186CC 0040982D */ daddu $s3, $v0, $zero -/* 4EFB70 802186D0 8E050000 */ lw $a1, ($s0) -/* 4EFB74 802186D4 26100004 */ addiu $s0, $s0, 4 -/* 4EFB78 802186D8 0220202D */ daddu $a0, $s1, $zero -/* 4EFB7C 802186DC 0C0B1EAF */ jal get_variable -/* 4EFB80 802186E0 0040902D */ daddu $s2, $v0, $zero -/* 4EFB84 802186E4 0220202D */ daddu $a0, $s1, $zero -/* 4EFB88 802186E8 8E050000 */ lw $a1, ($s0) -/* 4EFB8C 802186EC 0C0B1EAF */ jal get_variable -/* 4EFB90 802186F0 0040802D */ daddu $s0, $v0, $zero -/* 4EFB94 802186F4 8E240148 */ lw $a0, 0x148($s1) -/* 4EFB98 802186F8 0C09A75B */ jal get_actor -/* 4EFB9C 802186FC 0040882D */ daddu $s1, $v0, $zero -/* 4EFBA0 80218700 0040182D */ daddu $v1, $v0, $zero -/* 4EFBA4 80218704 8C620008 */ lw $v0, 8($v1) -/* 4EFBA8 80218708 90420024 */ lbu $v0, 0x24($v0) -/* 4EFBAC 8021870C 8C640008 */ lw $a0, 8($v1) -/* 4EFBB0 80218710 02629823 */ subu $s3, $s3, $v0 -/* 4EFBB4 80218714 A0730194 */ sb $s3, 0x194($v1) -/* 4EFBB8 80218718 90820025 */ lbu $v0, 0x25($a0) -/* 4EFBBC 8021871C 02429023 */ subu $s2, $s2, $v0 -/* 4EFBC0 80218720 A0720195 */ sb $s2, 0x195($v1) -/* 4EFBC4 80218724 90820026 */ lbu $v0, 0x26($a0) -/* 4EFBC8 80218728 02028023 */ subu $s0, $s0, $v0 -/* 4EFBCC 8021872C A0700196 */ sb $s0, 0x196($v1) -/* 4EFBD0 80218730 90840027 */ lbu $a0, 0x27($a0) -/* 4EFBD4 80218734 02248823 */ subu $s1, $s1, $a0 -/* 4EFBD8 80218738 A0710197 */ sb $s1, 0x197($v1) -/* 4EFBDC 8021873C 8FBF0020 */ lw $ra, 0x20($sp) -/* 4EFBE0 80218740 8FB3001C */ lw $s3, 0x1c($sp) -/* 4EFBE4 80218744 8FB20018 */ lw $s2, 0x18($sp) -/* 4EFBE8 80218748 8FB10014 */ lw $s1, 0x14($sp) -/* 4EFBEC 8021874C 8FB00010 */ lw $s0, 0x10($sp) -/* 4EFBF0 80218750 24020002 */ addiu $v0, $zero, 2 -/* 4EFBF4 80218754 03E00008 */ jr $ra -/* 4EFBF8 80218758 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/battle/area_jan/573920/func_80218000_573920.s b/asm/nonmatchings/battle/area_jan/573920/func_80218000_573920.s deleted file mode 100644 index 0f8874d268..0000000000 --- a/asm/nonmatchings/battle/area_jan/573920/func_80218000_573920.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218000_573920 -/* 573920 80218000 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 573924 80218004 AFB10014 */ sw $s1, 0x14($sp) -/* 573928 80218008 0080882D */ daddu $s1, $a0, $zero -/* 57392C 8021800C AFBF0020 */ sw $ra, 0x20($sp) -/* 573930 80218010 AFB3001C */ sw $s3, 0x1c($sp) -/* 573934 80218014 AFB20018 */ sw $s2, 0x18($sp) -/* 573938 80218018 AFB00010 */ sw $s0, 0x10($sp) -/* 57393C 8021801C 8E30000C */ lw $s0, 0xc($s1) -/* 573940 80218020 8E050000 */ lw $a1, ($s0) -/* 573944 80218024 0C0B1EAF */ jal get_variable -/* 573948 80218028 26100004 */ addiu $s0, $s0, 4 -/* 57394C 8021802C 8E050000 */ lw $a1, ($s0) -/* 573950 80218030 26100004 */ addiu $s0, $s0, 4 -/* 573954 80218034 0220202D */ daddu $a0, $s1, $zero -/* 573958 80218038 0C0B1EAF */ jal get_variable -/* 57395C 8021803C 0040982D */ daddu $s3, $v0, $zero -/* 573960 80218040 8E050000 */ lw $a1, ($s0) -/* 573964 80218044 26100004 */ addiu $s0, $s0, 4 -/* 573968 80218048 0220202D */ daddu $a0, $s1, $zero -/* 57396C 8021804C 0C0B1EAF */ jal get_variable -/* 573970 80218050 0040902D */ daddu $s2, $v0, $zero -/* 573974 80218054 0220202D */ daddu $a0, $s1, $zero -/* 573978 80218058 8E050000 */ lw $a1, ($s0) -/* 57397C 8021805C 0C0B1EAF */ jal get_variable -/* 573980 80218060 0040802D */ daddu $s0, $v0, $zero -/* 573984 80218064 8E240148 */ lw $a0, 0x148($s1) -/* 573988 80218068 0C09A75B */ jal get_actor -/* 57398C 8021806C 0040882D */ daddu $s1, $v0, $zero -/* 573990 80218070 0040182D */ daddu $v1, $v0, $zero -/* 573994 80218074 8C620008 */ lw $v0, 8($v1) -/* 573998 80218078 90420024 */ lbu $v0, 0x24($v0) -/* 57399C 8021807C 8C640008 */ lw $a0, 8($v1) -/* 5739A0 80218080 02629823 */ subu $s3, $s3, $v0 -/* 5739A4 80218084 A0730194 */ sb $s3, 0x194($v1) -/* 5739A8 80218088 90820025 */ lbu $v0, 0x25($a0) -/* 5739AC 8021808C 02429023 */ subu $s2, $s2, $v0 -/* 5739B0 80218090 A0720195 */ sb $s2, 0x195($v1) -/* 5739B4 80218094 90820026 */ lbu $v0, 0x26($a0) -/* 5739B8 80218098 02028023 */ subu $s0, $s0, $v0 -/* 5739BC 8021809C A0700196 */ sb $s0, 0x196($v1) -/* 5739C0 802180A0 90840027 */ lbu $a0, 0x27($a0) -/* 5739C4 802180A4 02248823 */ subu $s1, $s1, $a0 -/* 5739C8 802180A8 A0710197 */ sb $s1, 0x197($v1) -/* 5739CC 802180AC 8FBF0020 */ lw $ra, 0x20($sp) -/* 5739D0 802180B0 8FB3001C */ lw $s3, 0x1c($sp) -/* 5739D4 802180B4 8FB20018 */ lw $s2, 0x18($sp) -/* 5739D8 802180B8 8FB10014 */ lw $s1, 0x14($sp) -/* 5739DC 802180BC 8FB00010 */ lw $s0, 0x10($sp) -/* 5739E0 802180C0 24020002 */ addiu $v0, $zero, 2 -/* 5739E4 802180C4 03E00008 */ jr $ra -/* 5739E8 802180C8 27BD0028 */ addiu $sp, $sp, 0x28 -/* 5739EC 802180CC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_jan/573920/func_802180D0_5739F0.s b/asm/nonmatchings/battle/area_jan/573920/func_802180D0_5739F0.s deleted file mode 100644 index 0adbe31ba0..0000000000 --- a/asm/nonmatchings/battle/area_jan/573920/func_802180D0_5739F0.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802180D0_5739F0 -/* 5739F0 802180D0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 5739F4 802180D4 AFB10014 */ sw $s1, 0x14($sp) -/* 5739F8 802180D8 0080882D */ daddu $s1, $a0, $zero -/* 5739FC 802180DC AFBF0020 */ sw $ra, 0x20($sp) -/* 573A00 802180E0 AFB3001C */ sw $s3, 0x1c($sp) -/* 573A04 802180E4 AFB20018 */ sw $s2, 0x18($sp) -/* 573A08 802180E8 AFB00010 */ sw $s0, 0x10($sp) -/* 573A0C 802180EC 8E30000C */ lw $s0, 0xc($s1) -/* 573A10 802180F0 8E050000 */ lw $a1, ($s0) -/* 573A14 802180F4 0C0B1EAF */ jal get_variable -/* 573A18 802180F8 26100004 */ addiu $s0, $s0, 4 -/* 573A1C 802180FC 8E050000 */ lw $a1, ($s0) -/* 573A20 80218100 26100004 */ addiu $s0, $s0, 4 -/* 573A24 80218104 0220202D */ daddu $a0, $s1, $zero -/* 573A28 80218108 0C0B1EAF */ jal get_variable -/* 573A2C 8021810C 0040982D */ daddu $s3, $v0, $zero -/* 573A30 80218110 8E050000 */ lw $a1, ($s0) -/* 573A34 80218114 26100004 */ addiu $s0, $s0, 4 -/* 573A38 80218118 0220202D */ daddu $a0, $s1, $zero -/* 573A3C 8021811C 0C0B1EAF */ jal get_variable -/* 573A40 80218120 0040902D */ daddu $s2, $v0, $zero -/* 573A44 80218124 0220202D */ daddu $a0, $s1, $zero -/* 573A48 80218128 8E050000 */ lw $a1, ($s0) -/* 573A4C 8021812C 0C0B1EAF */ jal get_variable -/* 573A50 80218130 0040802D */ daddu $s0, $v0, $zero -/* 573A54 80218134 8E240148 */ lw $a0, 0x148($s1) -/* 573A58 80218138 0C09A75B */ jal get_actor -/* 573A5C 8021813C 0040882D */ daddu $s1, $v0, $zero -/* 573A60 80218140 0040182D */ daddu $v1, $v0, $zero -/* 573A64 80218144 8C620008 */ lw $v0, 8($v1) -/* 573A68 80218148 90420024 */ lbu $v0, 0x24($v0) -/* 573A6C 8021814C 8C640008 */ lw $a0, 8($v1) -/* 573A70 80218150 02629823 */ subu $s3, $s3, $v0 -/* 573A74 80218154 A0730194 */ sb $s3, 0x194($v1) -/* 573A78 80218158 90820025 */ lbu $v0, 0x25($a0) -/* 573A7C 8021815C 02429023 */ subu $s2, $s2, $v0 -/* 573A80 80218160 A0720195 */ sb $s2, 0x195($v1) -/* 573A84 80218164 90820026 */ lbu $v0, 0x26($a0) -/* 573A88 80218168 02028023 */ subu $s0, $s0, $v0 -/* 573A8C 8021816C A0700196 */ sb $s0, 0x196($v1) -/* 573A90 80218170 90840027 */ lbu $a0, 0x27($a0) -/* 573A94 80218174 02248823 */ subu $s1, $s1, $a0 -/* 573A98 80218178 A0710197 */ sb $s1, 0x197($v1) -/* 573A9C 8021817C 8FBF0020 */ lw $ra, 0x20($sp) -/* 573AA0 80218180 8FB3001C */ lw $s3, 0x1c($sp) -/* 573AA4 80218184 8FB20018 */ lw $s2, 0x18($sp) -/* 573AA8 80218188 8FB10014 */ lw $s1, 0x14($sp) -/* 573AAC 8021818C 8FB00010 */ lw $s0, 0x10($sp) -/* 573AB0 80218190 24020002 */ addiu $v0, $zero, 2 -/* 573AB4 80218194 03E00008 */ jr $ra -/* 573AB8 80218198 27BD0028 */ addiu $sp, $sp, 0x28 -/* 573ABC 8021819C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_jan/573920/func_802181A0_573AC0.s b/asm/nonmatchings/battle/area_jan/573AC0/func_802181A0_573AC0.s similarity index 94% rename from asm/nonmatchings/battle/area_jan/573920/func_802181A0_573AC0.s rename to asm/nonmatchings/battle/area_jan/573AC0/func_802181A0_573AC0.s index 7af5ffa097..739a0a8b33 100644 --- a/asm/nonmatchings/battle/area_jan/573920/func_802181A0_573AC0.s +++ b/asm/nonmatchings/battle/area_jan/573AC0/func_802181A0_573AC0.s @@ -28,13 +28,13 @@ glabel func_802181A0_573AC0 /* 573B1C 802181FC 0C0B1EAF */ jal get_variable /* 573B20 80218200 0040802D */ daddu $s0, $v0, $zero /* 573B24 80218204 44936000 */ mtc1 $s3, $f12 -/* 573B28 80218208 00000000 */ nop +/* 573B28 80218208 00000000 */ nop /* 573B2C 8021820C 46806320 */ cvt.s.w $f12, $f12 /* 573B30 80218210 44927000 */ mtc1 $s2, $f14 -/* 573B34 80218214 00000000 */ nop +/* 573B34 80218214 00000000 */ nop /* 573B38 80218218 468073A0 */ cvt.s.w $f14, $f14 /* 573B3C 8021821C 44900000 */ mtc1 $s0, $f0 -/* 573B40 80218220 00000000 */ nop +/* 573B40 80218220 00000000 */ nop /* 573B44 80218224 46800020 */ cvt.s.w $f0, $f0 /* 573B48 80218228 44060000 */ mfc1 $a2, $f0 /* 573B4C 8021822C 0C0B5D18 */ jal func_802D7460 diff --git a/asm/nonmatchings/battle/area_jan/573920/func_80218254_573B74.s b/asm/nonmatchings/battle/area_jan/573AC0/func_80218254_573B74.s similarity index 100% rename from asm/nonmatchings/battle/area_jan/573920/func_80218254_573B74.s rename to asm/nonmatchings/battle/area_jan/573AC0/func_80218254_573B74.s diff --git a/asm/nonmatchings/battle/area_jan/573C30/func_80218310_573C30.s b/asm/nonmatchings/battle/area_jan/573C30/func_80218310_573C30.s deleted file mode 100644 index 8ed60c162b..0000000000 --- a/asm/nonmatchings/battle/area_jan/573C30/func_80218310_573C30.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218310_573C30 -/* 573C30 80218310 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 573C34 80218314 AFB10014 */ sw $s1, 0x14($sp) -/* 573C38 80218318 0080882D */ daddu $s1, $a0, $zero -/* 573C3C 8021831C AFBF0020 */ sw $ra, 0x20($sp) -/* 573C40 80218320 AFB3001C */ sw $s3, 0x1c($sp) -/* 573C44 80218324 AFB20018 */ sw $s2, 0x18($sp) -/* 573C48 80218328 AFB00010 */ sw $s0, 0x10($sp) -/* 573C4C 8021832C 8E30000C */ lw $s0, 0xc($s1) -/* 573C50 80218330 8E050000 */ lw $a1, ($s0) -/* 573C54 80218334 0C0B1EAF */ jal get_variable -/* 573C58 80218338 26100004 */ addiu $s0, $s0, 4 -/* 573C5C 8021833C 8E050000 */ lw $a1, ($s0) -/* 573C60 80218340 26100004 */ addiu $s0, $s0, 4 -/* 573C64 80218344 0220202D */ daddu $a0, $s1, $zero -/* 573C68 80218348 0C0B1EAF */ jal get_variable -/* 573C6C 8021834C 0040982D */ daddu $s3, $v0, $zero -/* 573C70 80218350 8E050000 */ lw $a1, ($s0) -/* 573C74 80218354 26100004 */ addiu $s0, $s0, 4 -/* 573C78 80218358 0220202D */ daddu $a0, $s1, $zero -/* 573C7C 8021835C 0C0B1EAF */ jal get_variable -/* 573C80 80218360 0040902D */ daddu $s2, $v0, $zero -/* 573C84 80218364 0220202D */ daddu $a0, $s1, $zero -/* 573C88 80218368 8E050000 */ lw $a1, ($s0) -/* 573C8C 8021836C 0C0B1EAF */ jal get_variable -/* 573C90 80218370 0040802D */ daddu $s0, $v0, $zero -/* 573C94 80218374 8E240148 */ lw $a0, 0x148($s1) -/* 573C98 80218378 0C09A75B */ jal get_actor -/* 573C9C 8021837C 0040882D */ daddu $s1, $v0, $zero -/* 573CA0 80218380 0040182D */ daddu $v1, $v0, $zero -/* 573CA4 80218384 8C620008 */ lw $v0, 8($v1) -/* 573CA8 80218388 90420024 */ lbu $v0, 0x24($v0) -/* 573CAC 8021838C 8C640008 */ lw $a0, 8($v1) -/* 573CB0 80218390 02629823 */ subu $s3, $s3, $v0 -/* 573CB4 80218394 A0730194 */ sb $s3, 0x194($v1) -/* 573CB8 80218398 90820025 */ lbu $v0, 0x25($a0) -/* 573CBC 8021839C 02429023 */ subu $s2, $s2, $v0 -/* 573CC0 802183A0 A0720195 */ sb $s2, 0x195($v1) -/* 573CC4 802183A4 90820026 */ lbu $v0, 0x26($a0) -/* 573CC8 802183A8 02028023 */ subu $s0, $s0, $v0 -/* 573CCC 802183AC A0700196 */ sb $s0, 0x196($v1) -/* 573CD0 802183B0 90840027 */ lbu $a0, 0x27($a0) -/* 573CD4 802183B4 02248823 */ subu $s1, $s1, $a0 -/* 573CD8 802183B8 A0710197 */ sb $s1, 0x197($v1) -/* 573CDC 802183BC 8FBF0020 */ lw $ra, 0x20($sp) -/* 573CE0 802183C0 8FB3001C */ lw $s3, 0x1c($sp) -/* 573CE4 802183C4 8FB20018 */ lw $s2, 0x18($sp) -/* 573CE8 802183C8 8FB10014 */ lw $s1, 0x14($sp) -/* 573CEC 802183CC 8FB00010 */ lw $s0, 0x10($sp) -/* 573CF0 802183D0 24020002 */ addiu $v0, $zero, 2 -/* 573CF4 802183D4 03E00008 */ jr $ra -/* 573CF8 802183D8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/battle/area_jan/573C30/func_802184F0_573E10.s b/asm/nonmatchings/battle/area_jan/573C30/func_802184F0_573E10.s deleted file mode 100644 index abba682edc..0000000000 --- a/asm/nonmatchings/battle/area_jan/573C30/func_802184F0_573E10.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802184F0_573E10 -/* 573E10 802184F0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 573E14 802184F4 AFB10014 */ sw $s1, 0x14($sp) -/* 573E18 802184F8 0080882D */ daddu $s1, $a0, $zero -/* 573E1C 802184FC AFBF0020 */ sw $ra, 0x20($sp) -/* 573E20 80218500 AFB3001C */ sw $s3, 0x1c($sp) -/* 573E24 80218504 AFB20018 */ sw $s2, 0x18($sp) -/* 573E28 80218508 AFB00010 */ sw $s0, 0x10($sp) -/* 573E2C 8021850C 8E30000C */ lw $s0, 0xc($s1) -/* 573E30 80218510 8E050000 */ lw $a1, ($s0) -/* 573E34 80218514 0C0B1EAF */ jal get_variable -/* 573E38 80218518 26100004 */ addiu $s0, $s0, 4 -/* 573E3C 8021851C 8E050000 */ lw $a1, ($s0) -/* 573E40 80218520 26100004 */ addiu $s0, $s0, 4 -/* 573E44 80218524 0220202D */ daddu $a0, $s1, $zero -/* 573E48 80218528 0C0B1EAF */ jal get_variable -/* 573E4C 8021852C 0040982D */ daddu $s3, $v0, $zero -/* 573E50 80218530 8E050000 */ lw $a1, ($s0) -/* 573E54 80218534 26100004 */ addiu $s0, $s0, 4 -/* 573E58 80218538 0220202D */ daddu $a0, $s1, $zero -/* 573E5C 8021853C 0C0B1EAF */ jal get_variable -/* 573E60 80218540 0040902D */ daddu $s2, $v0, $zero -/* 573E64 80218544 0220202D */ daddu $a0, $s1, $zero -/* 573E68 80218548 8E050000 */ lw $a1, ($s0) -/* 573E6C 8021854C 0C0B1EAF */ jal get_variable -/* 573E70 80218550 0040802D */ daddu $s0, $v0, $zero -/* 573E74 80218554 8E240148 */ lw $a0, 0x148($s1) -/* 573E78 80218558 0C09A75B */ jal get_actor -/* 573E7C 8021855C 0040882D */ daddu $s1, $v0, $zero -/* 573E80 80218560 0040182D */ daddu $v1, $v0, $zero -/* 573E84 80218564 8C620008 */ lw $v0, 8($v1) -/* 573E88 80218568 90420024 */ lbu $v0, 0x24($v0) -/* 573E8C 8021856C 8C640008 */ lw $a0, 8($v1) -/* 573E90 80218570 02629823 */ subu $s3, $s3, $v0 -/* 573E94 80218574 A0730194 */ sb $s3, 0x194($v1) -/* 573E98 80218578 90820025 */ lbu $v0, 0x25($a0) -/* 573E9C 8021857C 02429023 */ subu $s2, $s2, $v0 -/* 573EA0 80218580 A0720195 */ sb $s2, 0x195($v1) -/* 573EA4 80218584 90820026 */ lbu $v0, 0x26($a0) -/* 573EA8 80218588 02028023 */ subu $s0, $s0, $v0 -/* 573EAC 8021858C A0700196 */ sb $s0, 0x196($v1) -/* 573EB0 80218590 90840027 */ lbu $a0, 0x27($a0) -/* 573EB4 80218594 02248823 */ subu $s1, $s1, $a0 -/* 573EB8 80218598 A0710197 */ sb $s1, 0x197($v1) -/* 573EBC 8021859C 8FBF0020 */ lw $ra, 0x20($sp) -/* 573EC0 802185A0 8FB3001C */ lw $s3, 0x1c($sp) -/* 573EC4 802185A4 8FB20018 */ lw $s2, 0x18($sp) -/* 573EC8 802185A8 8FB10014 */ lw $s1, 0x14($sp) -/* 573ECC 802185AC 8FB00010 */ lw $s0, 0x10($sp) -/* 573ED0 802185B0 24020002 */ addiu $v0, $zero, 2 -/* 573ED4 802185B4 03E00008 */ jr $ra -/* 573ED8 802185B8 27BD0028 */ addiu $sp, $sp, 0x28 -/* 573EDC 802185BC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_jan2/584940/func_80218000_584940.s b/asm/nonmatchings/battle/area_jan2/584940/func_80218000_584940.s deleted file mode 100644 index ab968eaf3e..0000000000 --- a/asm/nonmatchings/battle/area_jan2/584940/func_80218000_584940.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218000_584940 -/* 584940 80218000 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 584944 80218004 AFB10014 */ sw $s1, 0x14($sp) -/* 584948 80218008 0080882D */ daddu $s1, $a0, $zero -/* 58494C 8021800C AFBF0020 */ sw $ra, 0x20($sp) -/* 584950 80218010 AFB3001C */ sw $s3, 0x1c($sp) -/* 584954 80218014 AFB20018 */ sw $s2, 0x18($sp) -/* 584958 80218018 AFB00010 */ sw $s0, 0x10($sp) -/* 58495C 8021801C 8E30000C */ lw $s0, 0xc($s1) -/* 584960 80218020 8E050000 */ lw $a1, ($s0) -/* 584964 80218024 0C0B1EAF */ jal get_variable -/* 584968 80218028 26100004 */ addiu $s0, $s0, 4 -/* 58496C 8021802C 8E050000 */ lw $a1, ($s0) -/* 584970 80218030 26100004 */ addiu $s0, $s0, 4 -/* 584974 80218034 0220202D */ daddu $a0, $s1, $zero -/* 584978 80218038 0C0B1EAF */ jal get_variable -/* 58497C 8021803C 0040982D */ daddu $s3, $v0, $zero -/* 584980 80218040 8E050000 */ lw $a1, ($s0) -/* 584984 80218044 26100004 */ addiu $s0, $s0, 4 -/* 584988 80218048 0220202D */ daddu $a0, $s1, $zero -/* 58498C 8021804C 0C0B1EAF */ jal get_variable -/* 584990 80218050 0040902D */ daddu $s2, $v0, $zero -/* 584994 80218054 0220202D */ daddu $a0, $s1, $zero -/* 584998 80218058 8E050000 */ lw $a1, ($s0) -/* 58499C 8021805C 0C0B1EAF */ jal get_variable -/* 5849A0 80218060 0040802D */ daddu $s0, $v0, $zero -/* 5849A4 80218064 8E240148 */ lw $a0, 0x148($s1) -/* 5849A8 80218068 0C09A75B */ jal get_actor -/* 5849AC 8021806C 0040882D */ daddu $s1, $v0, $zero -/* 5849B0 80218070 0040182D */ daddu $v1, $v0, $zero -/* 5849B4 80218074 8C620008 */ lw $v0, 8($v1) -/* 5849B8 80218078 90420024 */ lbu $v0, 0x24($v0) -/* 5849BC 8021807C 8C640008 */ lw $a0, 8($v1) -/* 5849C0 80218080 02629823 */ subu $s3, $s3, $v0 -/* 5849C4 80218084 A0730194 */ sb $s3, 0x194($v1) -/* 5849C8 80218088 90820025 */ lbu $v0, 0x25($a0) -/* 5849CC 8021808C 02429023 */ subu $s2, $s2, $v0 -/* 5849D0 80218090 A0720195 */ sb $s2, 0x195($v1) -/* 5849D4 80218094 90820026 */ lbu $v0, 0x26($a0) -/* 5849D8 80218098 02028023 */ subu $s0, $s0, $v0 -/* 5849DC 8021809C A0700196 */ sb $s0, 0x196($v1) -/* 5849E0 802180A0 90840027 */ lbu $a0, 0x27($a0) -/* 5849E4 802180A4 02248823 */ subu $s1, $s1, $a0 -/* 5849E8 802180A8 A0710197 */ sb $s1, 0x197($v1) -/* 5849EC 802180AC 8FBF0020 */ lw $ra, 0x20($sp) -/* 5849F0 802180B0 8FB3001C */ lw $s3, 0x1c($sp) -/* 5849F4 802180B4 8FB20018 */ lw $s2, 0x18($sp) -/* 5849F8 802180B8 8FB10014 */ lw $s1, 0x14($sp) -/* 5849FC 802180BC 8FB00010 */ lw $s0, 0x10($sp) -/* 584A00 802180C0 24020002 */ addiu $v0, $zero, 2 -/* 584A04 802180C4 03E00008 */ jr $ra -/* 584A08 802180C8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/battle/area_jan2/584B90/func_802183D4_584D14.s b/asm/nonmatchings/battle/area_jan2/584B90/func_802183D4_584D14.s deleted file mode 100644 index 18e48ba9a1..0000000000 --- a/asm/nonmatchings/battle/area_jan2/584B90/func_802183D4_584D14.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802183D4_584D14 -/* 584D14 802183D4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 584D18 802183D8 AFB10014 */ sw $s1, 0x14($sp) -/* 584D1C 802183DC 0080882D */ daddu $s1, $a0, $zero -/* 584D20 802183E0 AFBF0020 */ sw $ra, 0x20($sp) -/* 584D24 802183E4 AFB3001C */ sw $s3, 0x1c($sp) -/* 584D28 802183E8 AFB20018 */ sw $s2, 0x18($sp) -/* 584D2C 802183EC AFB00010 */ sw $s0, 0x10($sp) -/* 584D30 802183F0 8E30000C */ lw $s0, 0xc($s1) -/* 584D34 802183F4 8E050000 */ lw $a1, ($s0) -/* 584D38 802183F8 0C0B1EAF */ jal get_variable -/* 584D3C 802183FC 26100004 */ addiu $s0, $s0, 4 -/* 584D40 80218400 8E050000 */ lw $a1, ($s0) -/* 584D44 80218404 26100004 */ addiu $s0, $s0, 4 -/* 584D48 80218408 0220202D */ daddu $a0, $s1, $zero -/* 584D4C 8021840C 0C0B1EAF */ jal get_variable -/* 584D50 80218410 0040982D */ daddu $s3, $v0, $zero -/* 584D54 80218414 8E050000 */ lw $a1, ($s0) -/* 584D58 80218418 26100004 */ addiu $s0, $s0, 4 -/* 584D5C 8021841C 0220202D */ daddu $a0, $s1, $zero -/* 584D60 80218420 0C0B1EAF */ jal get_variable -/* 584D64 80218424 0040902D */ daddu $s2, $v0, $zero -/* 584D68 80218428 0220202D */ daddu $a0, $s1, $zero -/* 584D6C 8021842C 8E050000 */ lw $a1, ($s0) -/* 584D70 80218430 0C0B1EAF */ jal get_variable -/* 584D74 80218434 0040802D */ daddu $s0, $v0, $zero -/* 584D78 80218438 8E240148 */ lw $a0, 0x148($s1) -/* 584D7C 8021843C 0C09A75B */ jal get_actor -/* 584D80 80218440 0040882D */ daddu $s1, $v0, $zero -/* 584D84 80218444 0040182D */ daddu $v1, $v0, $zero -/* 584D88 80218448 8C620008 */ lw $v0, 8($v1) -/* 584D8C 8021844C 90420024 */ lbu $v0, 0x24($v0) -/* 584D90 80218450 8C640008 */ lw $a0, 8($v1) -/* 584D94 80218454 02629823 */ subu $s3, $s3, $v0 -/* 584D98 80218458 A0730194 */ sb $s3, 0x194($v1) -/* 584D9C 8021845C 90820025 */ lbu $v0, 0x25($a0) -/* 584DA0 80218460 02429023 */ subu $s2, $s2, $v0 -/* 584DA4 80218464 A0720195 */ sb $s2, 0x195($v1) -/* 584DA8 80218468 90820026 */ lbu $v0, 0x26($a0) -/* 584DAC 8021846C 02028023 */ subu $s0, $s0, $v0 -/* 584DB0 80218470 A0700196 */ sb $s0, 0x196($v1) -/* 584DB4 80218474 90840027 */ lbu $a0, 0x27($a0) -/* 584DB8 80218478 02248823 */ subu $s1, $s1, $a0 -/* 584DBC 8021847C A0710197 */ sb $s1, 0x197($v1) -/* 584DC0 80218480 8FBF0020 */ lw $ra, 0x20($sp) -/* 584DC4 80218484 8FB3001C */ lw $s3, 0x1c($sp) -/* 584DC8 80218488 8FB20018 */ lw $s2, 0x18($sp) -/* 584DCC 8021848C 8FB10014 */ lw $s1, 0x14($sp) -/* 584DD0 80218490 8FB00010 */ lw $s0, 0x10($sp) -/* 584DD4 80218494 24020002 */ addiu $v0, $zero, 2 -/* 584DD8 80218498 03E00008 */ jr $ra -/* 584DDC 8021849C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/battle/area_kgr/56E2A0/func_80218000_56E2A0.s b/asm/nonmatchings/battle/area_kgr/56E2A0/func_80218000_56E2A0.s deleted file mode 100644 index ee31a019ad..0000000000 --- a/asm/nonmatchings/battle/area_kgr/56E2A0/func_80218000_56E2A0.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218000_56E2A0 -/* 56E2A0 80218000 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 56E2A4 80218004 AFB10014 */ sw $s1, 0x14($sp) -/* 56E2A8 80218008 0080882D */ daddu $s1, $a0, $zero -/* 56E2AC 8021800C AFBF0020 */ sw $ra, 0x20($sp) -/* 56E2B0 80218010 AFB3001C */ sw $s3, 0x1c($sp) -/* 56E2B4 80218014 AFB20018 */ sw $s2, 0x18($sp) -/* 56E2B8 80218018 AFB00010 */ sw $s0, 0x10($sp) -/* 56E2BC 8021801C 8E30000C */ lw $s0, 0xc($s1) -/* 56E2C0 80218020 8E050000 */ lw $a1, ($s0) -/* 56E2C4 80218024 0C0B1EAF */ jal get_variable -/* 56E2C8 80218028 26100004 */ addiu $s0, $s0, 4 -/* 56E2CC 8021802C 8E050000 */ lw $a1, ($s0) -/* 56E2D0 80218030 26100004 */ addiu $s0, $s0, 4 -/* 56E2D4 80218034 0220202D */ daddu $a0, $s1, $zero -/* 56E2D8 80218038 0C0B1EAF */ jal get_variable -/* 56E2DC 8021803C 0040982D */ daddu $s3, $v0, $zero -/* 56E2E0 80218040 8E050000 */ lw $a1, ($s0) -/* 56E2E4 80218044 26100004 */ addiu $s0, $s0, 4 -/* 56E2E8 80218048 0220202D */ daddu $a0, $s1, $zero -/* 56E2EC 8021804C 0C0B1EAF */ jal get_variable -/* 56E2F0 80218050 0040902D */ daddu $s2, $v0, $zero -/* 56E2F4 80218054 0220202D */ daddu $a0, $s1, $zero -/* 56E2F8 80218058 8E050000 */ lw $a1, ($s0) -/* 56E2FC 8021805C 0C0B1EAF */ jal get_variable -/* 56E300 80218060 0040802D */ daddu $s0, $v0, $zero -/* 56E304 80218064 8E240148 */ lw $a0, 0x148($s1) -/* 56E308 80218068 0C09A75B */ jal get_actor -/* 56E30C 8021806C 0040882D */ daddu $s1, $v0, $zero -/* 56E310 80218070 0040182D */ daddu $v1, $v0, $zero -/* 56E314 80218074 8C620008 */ lw $v0, 8($v1) -/* 56E318 80218078 90420024 */ lbu $v0, 0x24($v0) -/* 56E31C 8021807C 8C640008 */ lw $a0, 8($v1) -/* 56E320 80218080 02629823 */ subu $s3, $s3, $v0 -/* 56E324 80218084 A0730194 */ sb $s3, 0x194($v1) -/* 56E328 80218088 90820025 */ lbu $v0, 0x25($a0) -/* 56E32C 8021808C 02429023 */ subu $s2, $s2, $v0 -/* 56E330 80218090 A0720195 */ sb $s2, 0x195($v1) -/* 56E334 80218094 90820026 */ lbu $v0, 0x26($a0) -/* 56E338 80218098 02028023 */ subu $s0, $s0, $v0 -/* 56E33C 8021809C A0700196 */ sb $s0, 0x196($v1) -/* 56E340 802180A0 90840027 */ lbu $a0, 0x27($a0) -/* 56E344 802180A4 02248823 */ subu $s1, $s1, $a0 -/* 56E348 802180A8 A0710197 */ sb $s1, 0x197($v1) -/* 56E34C 802180AC 8FBF0020 */ lw $ra, 0x20($sp) -/* 56E350 802180B0 8FB3001C */ lw $s3, 0x1c($sp) -/* 56E354 802180B4 8FB20018 */ lw $s2, 0x18($sp) -/* 56E358 802180B8 8FB10014 */ lw $s1, 0x14($sp) -/* 56E35C 802180BC 8FB00010 */ lw $s0, 0x10($sp) -/* 56E360 802180C0 24020002 */ addiu $v0, $zero, 2 -/* 56E364 802180C4 03E00008 */ jr $ra -/* 56E368 802180C8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/battle/area_kmr_part_3/447C80/func_80218840_447C80.s b/asm/nonmatchings/battle/area_kmr_part_3/447C80/func_80218840_447C80.s deleted file mode 100644 index e384fe8662..0000000000 --- a/asm/nonmatchings/battle/area_kmr_part_3/447C80/func_80218840_447C80.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218840_447C80 -/* 447C80 80218840 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 447C84 80218844 AFB10014 */ sw $s1, 0x14($sp) -/* 447C88 80218848 0080882D */ daddu $s1, $a0, $zero -/* 447C8C 8021884C AFBF0020 */ sw $ra, 0x20($sp) -/* 447C90 80218850 AFB3001C */ sw $s3, 0x1c($sp) -/* 447C94 80218854 AFB20018 */ sw $s2, 0x18($sp) -/* 447C98 80218858 AFB00010 */ sw $s0, 0x10($sp) -/* 447C9C 8021885C 8E30000C */ lw $s0, 0xc($s1) -/* 447CA0 80218860 8E050000 */ lw $a1, ($s0) -/* 447CA4 80218864 0C0B1EAF */ jal get_variable -/* 447CA8 80218868 26100004 */ addiu $s0, $s0, 4 -/* 447CAC 8021886C 8E050000 */ lw $a1, ($s0) -/* 447CB0 80218870 26100004 */ addiu $s0, $s0, 4 -/* 447CB4 80218874 0220202D */ daddu $a0, $s1, $zero -/* 447CB8 80218878 0C0B1EAF */ jal get_variable -/* 447CBC 8021887C 0040982D */ daddu $s3, $v0, $zero -/* 447CC0 80218880 8E050000 */ lw $a1, ($s0) -/* 447CC4 80218884 26100004 */ addiu $s0, $s0, 4 -/* 447CC8 80218888 0220202D */ daddu $a0, $s1, $zero -/* 447CCC 8021888C 0C0B1EAF */ jal get_variable -/* 447CD0 80218890 0040902D */ daddu $s2, $v0, $zero -/* 447CD4 80218894 0220202D */ daddu $a0, $s1, $zero -/* 447CD8 80218898 8E050000 */ lw $a1, ($s0) -/* 447CDC 8021889C 0C0B1EAF */ jal get_variable -/* 447CE0 802188A0 0040802D */ daddu $s0, $v0, $zero -/* 447CE4 802188A4 8E240148 */ lw $a0, 0x148($s1) -/* 447CE8 802188A8 0C09A75B */ jal get_actor -/* 447CEC 802188AC 0040882D */ daddu $s1, $v0, $zero -/* 447CF0 802188B0 0040182D */ daddu $v1, $v0, $zero -/* 447CF4 802188B4 8C620008 */ lw $v0, 8($v1) -/* 447CF8 802188B8 90420024 */ lbu $v0, 0x24($v0) -/* 447CFC 802188BC 8C640008 */ lw $a0, 8($v1) -/* 447D00 802188C0 02629823 */ subu $s3, $s3, $v0 -/* 447D04 802188C4 A0730194 */ sb $s3, 0x194($v1) -/* 447D08 802188C8 90820025 */ lbu $v0, 0x25($a0) -/* 447D0C 802188CC 02429023 */ subu $s2, $s2, $v0 -/* 447D10 802188D0 A0720195 */ sb $s2, 0x195($v1) -/* 447D14 802188D4 90820026 */ lbu $v0, 0x26($a0) -/* 447D18 802188D8 02028023 */ subu $s0, $s0, $v0 -/* 447D1C 802188DC A0700196 */ sb $s0, 0x196($v1) -/* 447D20 802188E0 90840027 */ lbu $a0, 0x27($a0) -/* 447D24 802188E4 02248823 */ subu $s1, $s1, $a0 -/* 447D28 802188E8 A0710197 */ sb $s1, 0x197($v1) -/* 447D2C 802188EC 8FBF0020 */ lw $ra, 0x20($sp) -/* 447D30 802188F0 8FB3001C */ lw $s3, 0x1c($sp) -/* 447D34 802188F4 8FB20018 */ lw $s2, 0x18($sp) -/* 447D38 802188F8 8FB10014 */ lw $s1, 0x14($sp) -/* 447D3C 802188FC 8FB00010 */ lw $s0, 0x10($sp) -/* 447D40 80218900 24020002 */ addiu $v0, $zero, 2 -/* 447D44 80218904 03E00008 */ jr $ra -/* 447D48 80218908 27BD0028 */ addiu $sp, $sp, 0x28 -/* 447D4C 8021890C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_kmr_part_3/447C80/func_80218910_447D50.s b/asm/nonmatchings/battle/area_kmr_part_3/447C80/func_80218910_447D50.s deleted file mode 100644 index d6a23d0a28..0000000000 --- a/asm/nonmatchings/battle/area_kmr_part_3/447C80/func_80218910_447D50.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218910_447D50 -/* 447D50 80218910 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 447D54 80218914 AFB10014 */ sw $s1, 0x14($sp) -/* 447D58 80218918 0080882D */ daddu $s1, $a0, $zero -/* 447D5C 8021891C AFBF0020 */ sw $ra, 0x20($sp) -/* 447D60 80218920 AFB3001C */ sw $s3, 0x1c($sp) -/* 447D64 80218924 AFB20018 */ sw $s2, 0x18($sp) -/* 447D68 80218928 AFB00010 */ sw $s0, 0x10($sp) -/* 447D6C 8021892C 8E30000C */ lw $s0, 0xc($s1) -/* 447D70 80218930 8E050000 */ lw $a1, ($s0) -/* 447D74 80218934 0C0B1EAF */ jal get_variable -/* 447D78 80218938 26100004 */ addiu $s0, $s0, 4 -/* 447D7C 8021893C 8E050000 */ lw $a1, ($s0) -/* 447D80 80218940 26100004 */ addiu $s0, $s0, 4 -/* 447D84 80218944 0220202D */ daddu $a0, $s1, $zero -/* 447D88 80218948 0C0B1EAF */ jal get_variable -/* 447D8C 8021894C 0040982D */ daddu $s3, $v0, $zero -/* 447D90 80218950 8E050000 */ lw $a1, ($s0) -/* 447D94 80218954 26100004 */ addiu $s0, $s0, 4 -/* 447D98 80218958 0220202D */ daddu $a0, $s1, $zero -/* 447D9C 8021895C 0C0B1EAF */ jal get_variable -/* 447DA0 80218960 0040902D */ daddu $s2, $v0, $zero -/* 447DA4 80218964 0220202D */ daddu $a0, $s1, $zero -/* 447DA8 80218968 8E050000 */ lw $a1, ($s0) -/* 447DAC 8021896C 0C0B1EAF */ jal get_variable -/* 447DB0 80218970 0040802D */ daddu $s0, $v0, $zero -/* 447DB4 80218974 8E240148 */ lw $a0, 0x148($s1) -/* 447DB8 80218978 0C09A75B */ jal get_actor -/* 447DBC 8021897C 0040882D */ daddu $s1, $v0, $zero -/* 447DC0 80218980 0040182D */ daddu $v1, $v0, $zero -/* 447DC4 80218984 8C620008 */ lw $v0, 8($v1) -/* 447DC8 80218988 90420024 */ lbu $v0, 0x24($v0) -/* 447DCC 8021898C 8C640008 */ lw $a0, 8($v1) -/* 447DD0 80218990 02629823 */ subu $s3, $s3, $v0 -/* 447DD4 80218994 A0730194 */ sb $s3, 0x194($v1) -/* 447DD8 80218998 90820025 */ lbu $v0, 0x25($a0) -/* 447DDC 8021899C 02429023 */ subu $s2, $s2, $v0 -/* 447DE0 802189A0 A0720195 */ sb $s2, 0x195($v1) -/* 447DE4 802189A4 90820026 */ lbu $v0, 0x26($a0) -/* 447DE8 802189A8 02028023 */ subu $s0, $s0, $v0 -/* 447DEC 802189AC A0700196 */ sb $s0, 0x196($v1) -/* 447DF0 802189B0 90840027 */ lbu $a0, 0x27($a0) -/* 447DF4 802189B4 02248823 */ subu $s1, $s1, $a0 -/* 447DF8 802189B8 A0710197 */ sb $s1, 0x197($v1) -/* 447DFC 802189BC 8FBF0020 */ lw $ra, 0x20($sp) -/* 447E00 802189C0 8FB3001C */ lw $s3, 0x1c($sp) -/* 447E04 802189C4 8FB20018 */ lw $s2, 0x18($sp) -/* 447E08 802189C8 8FB10014 */ lw $s1, 0x14($sp) -/* 447E0C 802189CC 8FB00010 */ lw $s0, 0x10($sp) -/* 447E10 802189D0 24020002 */ addiu $v0, $zero, 2 -/* 447E14 802189D4 03E00008 */ jr $ra -/* 447E18 802189D8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/battle/area_kmr_part_3/447C80/func_80218AD0_447F10.s b/asm/nonmatchings/battle/area_kmr_part_3/447C80/func_80218AD0_447F10.s deleted file mode 100644 index c922c3f183..0000000000 --- a/asm/nonmatchings/battle/area_kmr_part_3/447C80/func_80218AD0_447F10.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218AD0_447F10 -/* 447F10 80218AD0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 447F14 80218AD4 AFB10014 */ sw $s1, 0x14($sp) -/* 447F18 80218AD8 0080882D */ daddu $s1, $a0, $zero -/* 447F1C 80218ADC AFBF0020 */ sw $ra, 0x20($sp) -/* 447F20 80218AE0 AFB3001C */ sw $s3, 0x1c($sp) -/* 447F24 80218AE4 AFB20018 */ sw $s2, 0x18($sp) -/* 447F28 80218AE8 AFB00010 */ sw $s0, 0x10($sp) -/* 447F2C 80218AEC 8E30000C */ lw $s0, 0xc($s1) -/* 447F30 80218AF0 8E050000 */ lw $a1, ($s0) -/* 447F34 80218AF4 0C0B1EAF */ jal get_variable -/* 447F38 80218AF8 26100004 */ addiu $s0, $s0, 4 -/* 447F3C 80218AFC 8E050000 */ lw $a1, ($s0) -/* 447F40 80218B00 26100004 */ addiu $s0, $s0, 4 -/* 447F44 80218B04 0220202D */ daddu $a0, $s1, $zero -/* 447F48 80218B08 0C0B1EAF */ jal get_variable -/* 447F4C 80218B0C 0040982D */ daddu $s3, $v0, $zero -/* 447F50 80218B10 8E050000 */ lw $a1, ($s0) -/* 447F54 80218B14 26100004 */ addiu $s0, $s0, 4 -/* 447F58 80218B18 0220202D */ daddu $a0, $s1, $zero -/* 447F5C 80218B1C 0C0B1EAF */ jal get_variable -/* 447F60 80218B20 0040902D */ daddu $s2, $v0, $zero -/* 447F64 80218B24 0220202D */ daddu $a0, $s1, $zero -/* 447F68 80218B28 8E050000 */ lw $a1, ($s0) -/* 447F6C 80218B2C 0C0B1EAF */ jal get_variable -/* 447F70 80218B30 0040802D */ daddu $s0, $v0, $zero -/* 447F74 80218B34 8E240148 */ lw $a0, 0x148($s1) -/* 447F78 80218B38 0C09A75B */ jal get_actor -/* 447F7C 80218B3C 0040882D */ daddu $s1, $v0, $zero -/* 447F80 80218B40 0040182D */ daddu $v1, $v0, $zero -/* 447F84 80218B44 8C620008 */ lw $v0, 8($v1) -/* 447F88 80218B48 90420024 */ lbu $v0, 0x24($v0) -/* 447F8C 80218B4C 8C640008 */ lw $a0, 8($v1) -/* 447F90 80218B50 02629823 */ subu $s3, $s3, $v0 -/* 447F94 80218B54 A0730194 */ sb $s3, 0x194($v1) -/* 447F98 80218B58 90820025 */ lbu $v0, 0x25($a0) -/* 447F9C 80218B5C 02429023 */ subu $s2, $s2, $v0 -/* 447FA0 80218B60 A0720195 */ sb $s2, 0x195($v1) -/* 447FA4 80218B64 90820026 */ lbu $v0, 0x26($a0) -/* 447FA8 80218B68 02028023 */ subu $s0, $s0, $v0 -/* 447FAC 80218B6C A0700196 */ sb $s0, 0x196($v1) -/* 447FB0 80218B70 90840027 */ lbu $a0, 0x27($a0) -/* 447FB4 80218B74 02248823 */ subu $s1, $s1, $a0 -/* 447FB8 80218B78 A0710197 */ sb $s1, 0x197($v1) -/* 447FBC 80218B7C 8FBF0020 */ lw $ra, 0x20($sp) -/* 447FC0 80218B80 8FB3001C */ lw $s3, 0x1c($sp) -/* 447FC4 80218B84 8FB20018 */ lw $s2, 0x18($sp) -/* 447FC8 80218B88 8FB10014 */ lw $s1, 0x14($sp) -/* 447FCC 80218B8C 8FB00010 */ lw $s0, 0x10($sp) -/* 447FD0 80218B90 24020002 */ addiu $v0, $zero, 2 -/* 447FD4 80218B94 03E00008 */ jr $ra -/* 447FD8 80218B98 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/battle/area_kmr_part_3/447C80/func_802189DC_447E1C.s b/asm/nonmatchings/battle/area_kmr_part_3/447D50/func_802189DC_447E1C.s similarity index 100% rename from asm/nonmatchings/battle/area_kmr_part_3/447C80/func_802189DC_447E1C.s rename to asm/nonmatchings/battle/area_kmr_part_3/447D50/func_802189DC_447E1C.s diff --git a/asm/nonmatchings/battle/area_kmr_part_3/447C80/func_80218AA4_447EE4.s b/asm/nonmatchings/battle/area_kmr_part_3/447D50/func_80218AA4_447EE4.s similarity index 100% rename from asm/nonmatchings/battle/area_kmr_part_3/447C80/func_80218AA4_447EE4.s rename to asm/nonmatchings/battle/area_kmr_part_3/447D50/func_80218AA4_447EE4.s diff --git a/asm/nonmatchings/battle/area_kmr_part_3/447C80/func_80218B9C_447FDC.s b/asm/nonmatchings/battle/area_kmr_part_3/447D50/func_80218B9C_447FDC.s similarity index 100% rename from asm/nonmatchings/battle/area_kmr_part_3/447C80/func_80218B9C_447FDC.s rename to asm/nonmatchings/battle/area_kmr_part_3/447D50/func_80218B9C_447FDC.s diff --git a/asm/nonmatchings/battle/area_kmr_part_3/447C80/func_80218D28_448168.s b/asm/nonmatchings/battle/area_kmr_part_3/447D50/func_80218D28_448168.s similarity index 100% rename from asm/nonmatchings/battle/area_kmr_part_3/447C80/func_80218D28_448168.s rename to asm/nonmatchings/battle/area_kmr_part_3/447D50/func_80218D28_448168.s diff --git a/asm/nonmatchings/battle/area_kmr_part_3/447C80/func_80218E1C_44825C.s b/asm/nonmatchings/battle/area_kmr_part_3/447D50/func_80218E1C_44825C.s similarity index 100% rename from asm/nonmatchings/battle/area_kmr_part_3/447C80/func_80218E1C_44825C.s rename to asm/nonmatchings/battle/area_kmr_part_3/447D50/func_80218E1C_44825C.s diff --git a/asm/nonmatchings/battle/area_kmr_part_3/447C80/func_80218F60_4483A0.s b/asm/nonmatchings/battle/area_kmr_part_3/447D50/func_80218F60_4483A0.s similarity index 100% rename from asm/nonmatchings/battle/area_kmr_part_3/447C80/func_80218F60_4483A0.s rename to asm/nonmatchings/battle/area_kmr_part_3/447D50/func_80218F60_4483A0.s diff --git a/asm/nonmatchings/battle/area_kmr_part_3/447C80/func_80218FA4_4483E4.s b/asm/nonmatchings/battle/area_kmr_part_3/447D50/func_80218FA4_4483E4.s similarity index 100% rename from asm/nonmatchings/battle/area_kmr_part_3/447C80/func_80218FA4_4483E4.s rename to asm/nonmatchings/battle/area_kmr_part_3/447D50/func_80218FA4_4483E4.s diff --git a/asm/nonmatchings/battle/area_kmr_part_3/447C80/func_80218FE0_448420.s b/asm/nonmatchings/battle/area_kmr_part_3/447D50/func_80218FE0_448420.s similarity index 100% rename from asm/nonmatchings/battle/area_kmr_part_3/447C80/func_80218FE0_448420.s rename to asm/nonmatchings/battle/area_kmr_part_3/447D50/func_80218FE0_448420.s diff --git a/asm/nonmatchings/battle/area_kpa/684A30/func_80218000_684A30.s b/asm/nonmatchings/battle/area_kpa/684A30/func_80218000_684A30.s deleted file mode 100644 index b7d25b5851..0000000000 --- a/asm/nonmatchings/battle/area_kpa/684A30/func_80218000_684A30.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218000_684A30 -/* 684A30 80218000 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 684A34 80218004 AFB10014 */ sw $s1, 0x14($sp) -/* 684A38 80218008 0080882D */ daddu $s1, $a0, $zero -/* 684A3C 8021800C AFBF0020 */ sw $ra, 0x20($sp) -/* 684A40 80218010 AFB3001C */ sw $s3, 0x1c($sp) -/* 684A44 80218014 AFB20018 */ sw $s2, 0x18($sp) -/* 684A48 80218018 AFB00010 */ sw $s0, 0x10($sp) -/* 684A4C 8021801C 8E30000C */ lw $s0, 0xc($s1) -/* 684A50 80218020 8E050000 */ lw $a1, ($s0) -/* 684A54 80218024 0C0B1EAF */ jal get_variable -/* 684A58 80218028 26100004 */ addiu $s0, $s0, 4 -/* 684A5C 8021802C 8E050000 */ lw $a1, ($s0) -/* 684A60 80218030 26100004 */ addiu $s0, $s0, 4 -/* 684A64 80218034 0220202D */ daddu $a0, $s1, $zero -/* 684A68 80218038 0C0B1EAF */ jal get_variable -/* 684A6C 8021803C 0040982D */ daddu $s3, $v0, $zero -/* 684A70 80218040 8E050000 */ lw $a1, ($s0) -/* 684A74 80218044 26100004 */ addiu $s0, $s0, 4 -/* 684A78 80218048 0220202D */ daddu $a0, $s1, $zero -/* 684A7C 8021804C 0C0B1EAF */ jal get_variable -/* 684A80 80218050 0040902D */ daddu $s2, $v0, $zero -/* 684A84 80218054 0220202D */ daddu $a0, $s1, $zero -/* 684A88 80218058 8E050000 */ lw $a1, ($s0) -/* 684A8C 8021805C 0C0B1EAF */ jal get_variable -/* 684A90 80218060 0040802D */ daddu $s0, $v0, $zero -/* 684A94 80218064 8E240148 */ lw $a0, 0x148($s1) -/* 684A98 80218068 0C09A75B */ jal get_actor -/* 684A9C 8021806C 0040882D */ daddu $s1, $v0, $zero -/* 684AA0 80218070 0040182D */ daddu $v1, $v0, $zero -/* 684AA4 80218074 8C620008 */ lw $v0, 8($v1) -/* 684AA8 80218078 90420024 */ lbu $v0, 0x24($v0) -/* 684AAC 8021807C 8C640008 */ lw $a0, 8($v1) -/* 684AB0 80218080 02629823 */ subu $s3, $s3, $v0 -/* 684AB4 80218084 A0730194 */ sb $s3, 0x194($v1) -/* 684AB8 80218088 90820025 */ lbu $v0, 0x25($a0) -/* 684ABC 8021808C 02429023 */ subu $s2, $s2, $v0 -/* 684AC0 80218090 A0720195 */ sb $s2, 0x195($v1) -/* 684AC4 80218094 90820026 */ lbu $v0, 0x26($a0) -/* 684AC8 80218098 02028023 */ subu $s0, $s0, $v0 -/* 684ACC 8021809C A0700196 */ sb $s0, 0x196($v1) -/* 684AD0 802180A0 90840027 */ lbu $a0, 0x27($a0) -/* 684AD4 802180A4 02248823 */ subu $s1, $s1, $a0 -/* 684AD8 802180A8 A0710197 */ sb $s1, 0x197($v1) -/* 684ADC 802180AC 8FBF0020 */ lw $ra, 0x20($sp) -/* 684AE0 802180B0 8FB3001C */ lw $s3, 0x1c($sp) -/* 684AE4 802180B4 8FB20018 */ lw $s2, 0x18($sp) -/* 684AE8 802180B8 8FB10014 */ lw $s1, 0x14($sp) -/* 684AEC 802180BC 8FB00010 */ lw $s0, 0x10($sp) -/* 684AF0 802180C0 24020002 */ addiu $v0, $zero, 2 -/* 684AF4 802180C4 03E00008 */ jr $ra -/* 684AF8 802180C8 27BD0028 */ addiu $sp, $sp, 0x28 -/* 684AFC 802180CC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_kpa/684A30/func_802180D0_684B00.s b/asm/nonmatchings/battle/area_kpa/684A30/func_802180D0_684B00.s deleted file mode 100644 index 1fcaa30c1b..0000000000 --- a/asm/nonmatchings/battle/area_kpa/684A30/func_802180D0_684B00.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802180D0_684B00 -/* 684B00 802180D0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 684B04 802180D4 AFB10014 */ sw $s1, 0x14($sp) -/* 684B08 802180D8 0080882D */ daddu $s1, $a0, $zero -/* 684B0C 802180DC AFBF0020 */ sw $ra, 0x20($sp) -/* 684B10 802180E0 AFB3001C */ sw $s3, 0x1c($sp) -/* 684B14 802180E4 AFB20018 */ sw $s2, 0x18($sp) -/* 684B18 802180E8 AFB00010 */ sw $s0, 0x10($sp) -/* 684B1C 802180EC 8E30000C */ lw $s0, 0xc($s1) -/* 684B20 802180F0 8E050000 */ lw $a1, ($s0) -/* 684B24 802180F4 0C0B1EAF */ jal get_variable -/* 684B28 802180F8 26100004 */ addiu $s0, $s0, 4 -/* 684B2C 802180FC 8E050000 */ lw $a1, ($s0) -/* 684B30 80218100 26100004 */ addiu $s0, $s0, 4 -/* 684B34 80218104 0220202D */ daddu $a0, $s1, $zero -/* 684B38 80218108 0C0B1EAF */ jal get_variable -/* 684B3C 8021810C 0040982D */ daddu $s3, $v0, $zero -/* 684B40 80218110 8E050000 */ lw $a1, ($s0) -/* 684B44 80218114 26100004 */ addiu $s0, $s0, 4 -/* 684B48 80218118 0220202D */ daddu $a0, $s1, $zero -/* 684B4C 8021811C 0C0B1EAF */ jal get_variable -/* 684B50 80218120 0040902D */ daddu $s2, $v0, $zero -/* 684B54 80218124 0220202D */ daddu $a0, $s1, $zero -/* 684B58 80218128 8E050000 */ lw $a1, ($s0) -/* 684B5C 8021812C 0C0B1EAF */ jal get_variable -/* 684B60 80218130 0040802D */ daddu $s0, $v0, $zero -/* 684B64 80218134 8E240148 */ lw $a0, 0x148($s1) -/* 684B68 80218138 0C09A75B */ jal get_actor -/* 684B6C 8021813C 0040882D */ daddu $s1, $v0, $zero -/* 684B70 80218140 0040182D */ daddu $v1, $v0, $zero -/* 684B74 80218144 8C620008 */ lw $v0, 8($v1) -/* 684B78 80218148 90420024 */ lbu $v0, 0x24($v0) -/* 684B7C 8021814C 8C640008 */ lw $a0, 8($v1) -/* 684B80 80218150 02629823 */ subu $s3, $s3, $v0 -/* 684B84 80218154 A0730194 */ sb $s3, 0x194($v1) -/* 684B88 80218158 90820025 */ lbu $v0, 0x25($a0) -/* 684B8C 8021815C 02429023 */ subu $s2, $s2, $v0 -/* 684B90 80218160 A0720195 */ sb $s2, 0x195($v1) -/* 684B94 80218164 90820026 */ lbu $v0, 0x26($a0) -/* 684B98 80218168 02028023 */ subu $s0, $s0, $v0 -/* 684B9C 8021816C A0700196 */ sb $s0, 0x196($v1) -/* 684BA0 80218170 90840027 */ lbu $a0, 0x27($a0) -/* 684BA4 80218174 02248823 */ subu $s1, $s1, $a0 -/* 684BA8 80218178 A0710197 */ sb $s1, 0x197($v1) -/* 684BAC 8021817C 8FBF0020 */ lw $ra, 0x20($sp) -/* 684BB0 80218180 8FB3001C */ lw $s3, 0x1c($sp) -/* 684BB4 80218184 8FB20018 */ lw $s2, 0x18($sp) -/* 684BB8 80218188 8FB10014 */ lw $s1, 0x14($sp) -/* 684BBC 8021818C 8FB00010 */ lw $s0, 0x10($sp) -/* 684BC0 80218190 24020002 */ addiu $v0, $zero, 2 -/* 684BC4 80218194 03E00008 */ jr $ra -/* 684BC8 80218198 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/battle/area_kpa/684C30/func_80218514_684F44.s b/asm/nonmatchings/battle/area_kpa/684C30/func_80218514_684F44.s deleted file mode 100644 index 1e36e24ca7..0000000000 --- a/asm/nonmatchings/battle/area_kpa/684C30/func_80218514_684F44.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218514_684F44 -/* 684F44 80218514 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 684F48 80218518 AFB10014 */ sw $s1, 0x14($sp) -/* 684F4C 8021851C 0080882D */ daddu $s1, $a0, $zero -/* 684F50 80218520 AFBF0020 */ sw $ra, 0x20($sp) -/* 684F54 80218524 AFB3001C */ sw $s3, 0x1c($sp) -/* 684F58 80218528 AFB20018 */ sw $s2, 0x18($sp) -/* 684F5C 8021852C AFB00010 */ sw $s0, 0x10($sp) -/* 684F60 80218530 8E30000C */ lw $s0, 0xc($s1) -/* 684F64 80218534 8E050000 */ lw $a1, ($s0) -/* 684F68 80218538 0C0B1EAF */ jal get_variable -/* 684F6C 8021853C 26100004 */ addiu $s0, $s0, 4 -/* 684F70 80218540 8E050000 */ lw $a1, ($s0) -/* 684F74 80218544 26100004 */ addiu $s0, $s0, 4 -/* 684F78 80218548 0220202D */ daddu $a0, $s1, $zero -/* 684F7C 8021854C 0C0B1EAF */ jal get_variable -/* 684F80 80218550 0040982D */ daddu $s3, $v0, $zero -/* 684F84 80218554 8E050000 */ lw $a1, ($s0) -/* 684F88 80218558 26100004 */ addiu $s0, $s0, 4 -/* 684F8C 8021855C 0220202D */ daddu $a0, $s1, $zero -/* 684F90 80218560 0C0B1EAF */ jal get_variable -/* 684F94 80218564 0040902D */ daddu $s2, $v0, $zero -/* 684F98 80218568 0220202D */ daddu $a0, $s1, $zero -/* 684F9C 8021856C 8E050000 */ lw $a1, ($s0) -/* 684FA0 80218570 0C0B1EAF */ jal get_variable -/* 684FA4 80218574 0040802D */ daddu $s0, $v0, $zero -/* 684FA8 80218578 8E240148 */ lw $a0, 0x148($s1) -/* 684FAC 8021857C 0C09A75B */ jal get_actor -/* 684FB0 80218580 0040882D */ daddu $s1, $v0, $zero -/* 684FB4 80218584 0040182D */ daddu $v1, $v0, $zero -/* 684FB8 80218588 8C620008 */ lw $v0, 8($v1) -/* 684FBC 8021858C 90420024 */ lbu $v0, 0x24($v0) -/* 684FC0 80218590 8C640008 */ lw $a0, 8($v1) -/* 684FC4 80218594 02629823 */ subu $s3, $s3, $v0 -/* 684FC8 80218598 A0730194 */ sb $s3, 0x194($v1) -/* 684FCC 8021859C 90820025 */ lbu $v0, 0x25($a0) -/* 684FD0 802185A0 02429023 */ subu $s2, $s2, $v0 -/* 684FD4 802185A4 A0720195 */ sb $s2, 0x195($v1) -/* 684FD8 802185A8 90820026 */ lbu $v0, 0x26($a0) -/* 684FDC 802185AC 02028023 */ subu $s0, $s0, $v0 -/* 684FE0 802185B0 A0700196 */ sb $s0, 0x196($v1) -/* 684FE4 802185B4 90840027 */ lbu $a0, 0x27($a0) -/* 684FE8 802185B8 02248823 */ subu $s1, $s1, $a0 -/* 684FEC 802185BC A0710197 */ sb $s1, 0x197($v1) -/* 684FF0 802185C0 8FBF0020 */ lw $ra, 0x20($sp) -/* 684FF4 802185C4 8FB3001C */ lw $s3, 0x1c($sp) -/* 684FF8 802185C8 8FB20018 */ lw $s2, 0x18($sp) -/* 684FFC 802185CC 8FB10014 */ lw $s1, 0x14($sp) -/* 685000 802185D0 8FB00010 */ lw $s0, 0x10($sp) -/* 685004 802185D4 24020002 */ addiu $v0, $zero, 2 -/* 685008 802185D8 03E00008 */ jr $ra -/* 68500C 802185DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/battle/area_kpa3/6BBB90/func_80218000_6BBB90.s b/asm/nonmatchings/battle/area_kpa3/6BBB90/func_80218000_6BBB90.s deleted file mode 100644 index a8aa4b9e86..0000000000 --- a/asm/nonmatchings/battle/area_kpa3/6BBB90/func_80218000_6BBB90.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218000_6BBB90 -/* 6BBB90 80218000 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 6BBB94 80218004 AFB10014 */ sw $s1, 0x14($sp) -/* 6BBB98 80218008 0080882D */ daddu $s1, $a0, $zero -/* 6BBB9C 8021800C AFBF0020 */ sw $ra, 0x20($sp) -/* 6BBBA0 80218010 AFB3001C */ sw $s3, 0x1c($sp) -/* 6BBBA4 80218014 AFB20018 */ sw $s2, 0x18($sp) -/* 6BBBA8 80218018 AFB00010 */ sw $s0, 0x10($sp) -/* 6BBBAC 8021801C 8E30000C */ lw $s0, 0xc($s1) -/* 6BBBB0 80218020 8E050000 */ lw $a1, ($s0) -/* 6BBBB4 80218024 0C0B1EAF */ jal get_variable -/* 6BBBB8 80218028 26100004 */ addiu $s0, $s0, 4 -/* 6BBBBC 8021802C 8E050000 */ lw $a1, ($s0) -/* 6BBBC0 80218030 26100004 */ addiu $s0, $s0, 4 -/* 6BBBC4 80218034 0220202D */ daddu $a0, $s1, $zero -/* 6BBBC8 80218038 0C0B1EAF */ jal get_variable -/* 6BBBCC 8021803C 0040982D */ daddu $s3, $v0, $zero -/* 6BBBD0 80218040 8E050000 */ lw $a1, ($s0) -/* 6BBBD4 80218044 26100004 */ addiu $s0, $s0, 4 -/* 6BBBD8 80218048 0220202D */ daddu $a0, $s1, $zero -/* 6BBBDC 8021804C 0C0B1EAF */ jal get_variable -/* 6BBBE0 80218050 0040902D */ daddu $s2, $v0, $zero -/* 6BBBE4 80218054 0220202D */ daddu $a0, $s1, $zero -/* 6BBBE8 80218058 8E050000 */ lw $a1, ($s0) -/* 6BBBEC 8021805C 0C0B1EAF */ jal get_variable -/* 6BBBF0 80218060 0040802D */ daddu $s0, $v0, $zero -/* 6BBBF4 80218064 8E240148 */ lw $a0, 0x148($s1) -/* 6BBBF8 80218068 0C09A75B */ jal get_actor -/* 6BBBFC 8021806C 0040882D */ daddu $s1, $v0, $zero -/* 6BBC00 80218070 0040182D */ daddu $v1, $v0, $zero -/* 6BBC04 80218074 8C620008 */ lw $v0, 8($v1) -/* 6BBC08 80218078 90420024 */ lbu $v0, 0x24($v0) -/* 6BBC0C 8021807C 8C640008 */ lw $a0, 8($v1) -/* 6BBC10 80218080 02629823 */ subu $s3, $s3, $v0 -/* 6BBC14 80218084 A0730194 */ sb $s3, 0x194($v1) -/* 6BBC18 80218088 90820025 */ lbu $v0, 0x25($a0) -/* 6BBC1C 8021808C 02429023 */ subu $s2, $s2, $v0 -/* 6BBC20 80218090 A0720195 */ sb $s2, 0x195($v1) -/* 6BBC24 80218094 90820026 */ lbu $v0, 0x26($a0) -/* 6BBC28 80218098 02028023 */ subu $s0, $s0, $v0 -/* 6BBC2C 8021809C A0700196 */ sb $s0, 0x196($v1) -/* 6BBC30 802180A0 90840027 */ lbu $a0, 0x27($a0) -/* 6BBC34 802180A4 02248823 */ subu $s1, $s1, $a0 -/* 6BBC38 802180A8 A0710197 */ sb $s1, 0x197($v1) -/* 6BBC3C 802180AC 8FBF0020 */ lw $ra, 0x20($sp) -/* 6BBC40 802180B0 8FB3001C */ lw $s3, 0x1c($sp) -/* 6BBC44 802180B4 8FB20018 */ lw $s2, 0x18($sp) -/* 6BBC48 802180B8 8FB10014 */ lw $s1, 0x14($sp) -/* 6BBC4C 802180BC 8FB00010 */ lw $s0, 0x10($sp) -/* 6BBC50 802180C0 24020002 */ addiu $v0, $zero, 2 -/* 6BBC54 802180C4 03E00008 */ jr $ra -/* 6BBC58 802180C8 27BD0028 */ addiu $sp, $sp, 0x28 -/* 6BBC5C 802180CC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_kpa3/6BBB90/func_80218C44_6BC7D4.s b/asm/nonmatchings/battle/area_kpa3/6BBB90/func_80218C44_6BC7D4.s deleted file mode 100644 index 3dfa09f414..0000000000 --- a/asm/nonmatchings/battle/area_kpa3/6BBB90/func_80218C44_6BC7D4.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218C44_6BC7D4 -/* 6BC7D4 80218C44 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 6BC7D8 80218C48 AFB10014 */ sw $s1, 0x14($sp) -/* 6BC7DC 80218C4C 0080882D */ daddu $s1, $a0, $zero -/* 6BC7E0 80218C50 AFBF0020 */ sw $ra, 0x20($sp) -/* 6BC7E4 80218C54 AFB3001C */ sw $s3, 0x1c($sp) -/* 6BC7E8 80218C58 AFB20018 */ sw $s2, 0x18($sp) -/* 6BC7EC 80218C5C AFB00010 */ sw $s0, 0x10($sp) -/* 6BC7F0 80218C60 8E30000C */ lw $s0, 0xc($s1) -/* 6BC7F4 80218C64 8E050000 */ lw $a1, ($s0) -/* 6BC7F8 80218C68 0C0B1EAF */ jal get_variable -/* 6BC7FC 80218C6C 26100004 */ addiu $s0, $s0, 4 -/* 6BC800 80218C70 8E050000 */ lw $a1, ($s0) -/* 6BC804 80218C74 26100004 */ addiu $s0, $s0, 4 -/* 6BC808 80218C78 0220202D */ daddu $a0, $s1, $zero -/* 6BC80C 80218C7C 0C0B1EAF */ jal get_variable -/* 6BC810 80218C80 0040982D */ daddu $s3, $v0, $zero -/* 6BC814 80218C84 8E050000 */ lw $a1, ($s0) -/* 6BC818 80218C88 26100004 */ addiu $s0, $s0, 4 -/* 6BC81C 80218C8C 0220202D */ daddu $a0, $s1, $zero -/* 6BC820 80218C90 0C0B1EAF */ jal get_variable -/* 6BC824 80218C94 0040902D */ daddu $s2, $v0, $zero -/* 6BC828 80218C98 0220202D */ daddu $a0, $s1, $zero -/* 6BC82C 80218C9C 8E050000 */ lw $a1, ($s0) -/* 6BC830 80218CA0 0C0B1EAF */ jal get_variable -/* 6BC834 80218CA4 0040802D */ daddu $s0, $v0, $zero -/* 6BC838 80218CA8 8E240148 */ lw $a0, 0x148($s1) -/* 6BC83C 80218CAC 0C09A75B */ jal get_actor -/* 6BC840 80218CB0 0040882D */ daddu $s1, $v0, $zero -/* 6BC844 80218CB4 0040182D */ daddu $v1, $v0, $zero -/* 6BC848 80218CB8 8C620008 */ lw $v0, 8($v1) -/* 6BC84C 80218CBC 90420024 */ lbu $v0, 0x24($v0) -/* 6BC850 80218CC0 8C640008 */ lw $a0, 8($v1) -/* 6BC854 80218CC4 02629823 */ subu $s3, $s3, $v0 -/* 6BC858 80218CC8 A0730194 */ sb $s3, 0x194($v1) -/* 6BC85C 80218CCC 90820025 */ lbu $v0, 0x25($a0) -/* 6BC860 80218CD0 02429023 */ subu $s2, $s2, $v0 -/* 6BC864 80218CD4 A0720195 */ sb $s2, 0x195($v1) -/* 6BC868 80218CD8 90820026 */ lbu $v0, 0x26($a0) -/* 6BC86C 80218CDC 02028023 */ subu $s0, $s0, $v0 -/* 6BC870 80218CE0 A0700196 */ sb $s0, 0x196($v1) -/* 6BC874 80218CE4 90840027 */ lbu $a0, 0x27($a0) -/* 6BC878 80218CE8 02248823 */ subu $s1, $s1, $a0 -/* 6BC87C 80218CEC A0710197 */ sb $s1, 0x197($v1) -/* 6BC880 80218CF0 8FBF0020 */ lw $ra, 0x20($sp) -/* 6BC884 80218CF4 8FB3001C */ lw $s3, 0x1c($sp) -/* 6BC888 80218CF8 8FB20018 */ lw $s2, 0x18($sp) -/* 6BC88C 80218CFC 8FB10014 */ lw $s1, 0x14($sp) -/* 6BC890 80218D00 8FB00010 */ lw $s0, 0x10($sp) -/* 6BC894 80218D04 24020002 */ addiu $v0, $zero, 2 -/* 6BC898 80218D08 03E00008 */ jr $ra -/* 6BC89C 80218D0C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/battle/area_kpa3/6BBB90/func_802180D0_6BBC60.s b/asm/nonmatchings/battle/area_kpa3/6BBC60/func_802180D0_6BBC60.s similarity index 94% rename from asm/nonmatchings/battle/area_kpa3/6BBB90/func_802180D0_6BBC60.s rename to asm/nonmatchings/battle/area_kpa3/6BBC60/func_802180D0_6BBC60.s index ecbdd07ac5..b15693c97b 100644 --- a/asm/nonmatchings/battle/area_kpa3/6BBB90/func_802180D0_6BBC60.s +++ b/asm/nonmatchings/battle/area_kpa3/6BBC60/func_802180D0_6BBC60.s @@ -40,7 +40,7 @@ glabel func_802180D0_6BBC60 .L8021815C: /* 6BBCEC 8021815C 8E820070 */ lw $v0, 0x70($s4) /* 6BBCF0 80218160 144000F7 */ bnez $v0, .L80218540 -/* 6BBCF4 80218164 00000000 */ nop +/* 6BBCF4 80218164 00000000 */ nop /* 6BBCF8 80218168 C6600144 */ lwc1 $f0, 0x144($s3) /* 6BBCFC 8021816C C638000C */ lwc1 $f24, 0xc($s1) /* 6BBD00 80218170 C63A0014 */ lwc1 $f26, 0x14($s1) @@ -70,29 +70,29 @@ glabel func_802180D0_6BBC60 /* 6BBD60 802181D0 46002003 */ div.s $f0, $f4, $f0 /* 6BBD64 802181D4 4600028D */ trunc.w.s $f10, $f0 /* 6BBD68 802181D8 44035000 */ mfc1 $v1, $f10 -/* 6BBD6C 802181DC 00000000 */ nop +/* 6BBD6C 802181DC 00000000 */ nop /* 6BBD70 802181E0 00031400 */ sll $v0, $v1, 0x10 /* 6BBD74 802181E4 00021403 */ sra $v0, $v0, 0x10 /* 6BBD78 802181E8 44820000 */ mtc1 $v0, $f0 -/* 6BBD7C 802181EC 00000000 */ nop +/* 6BBD7C 802181EC 00000000 */ nop /* 6BBD80 802181F0 46800020 */ cvt.s.w $f0, $f0 /* 6BBD84 802181F4 46020002 */ mul.s $f0, $f0, $f2 -/* 6BBD88 802181F8 00000000 */ nop +/* 6BBD88 802181F8 00000000 */ nop /* 6BBD8C 802181FC 46002086 */ mov.s $f2, $f4 /* 6BBD90 80218200 A6230064 */ sh $v1, 0x64($s1) /* 6BBD94 80218204 08086090 */ j .L80218240 /* 6BBD98 80218208 46001201 */ sub.s $f8, $f2, $f0 .L8021820C: /* 6BBD9C 8021820C 44821000 */ mtc1 $v0, $f2 -/* 6BBDA0 80218210 00000000 */ nop +/* 6BBDA0 80218210 00000000 */ nop /* 6BBDA4 80218214 468010A0 */ cvt.s.w $f2, $f2 /* 6BBDA8 80218218 86220064 */ lh $v0, 0x64($s1) /* 6BBDAC 8021821C 46022083 */ div.s $f2, $f4, $f2 /* 6BBDB0 80218220 44820000 */ mtc1 $v0, $f0 -/* 6BBDB4 80218224 00000000 */ nop +/* 6BBDB4 80218224 00000000 */ nop /* 6BBDB8 80218228 46800020 */ cvt.s.w $f0, $f0 /* 6BBDBC 8021822C 46020002 */ mul.s $f0, $f0, $f2 -/* 6BBDC0 80218230 00000000 */ nop +/* 6BBDC0 80218230 00000000 */ nop /* 6BBDC4 80218234 C624004C */ lwc1 $f4, 0x4c($s1) /* 6BBDC8 80218238 E6220040 */ swc1 $f2, 0x40($s1) /* 6BBDCC 8021823C 46002201 */ sub.s $f8, $f4, $f0 @@ -107,13 +107,13 @@ glabel func_802180D0_6BBC60 /* 6BBDEC 8021825C 44810000 */ mtc1 $at, $f0 /* 6BBDF0 80218260 C6240000 */ lwc1 $f4, ($s1) /* 6BBDF4 80218264 44823000 */ mtc1 $v0, $f6 -/* 6BBDF8 80218268 00000000 */ nop +/* 6BBDF8 80218268 00000000 */ nop /* 6BBDFC 8021826C 468031A0 */ cvt.s.w $f6, $f6 /* 6BBE00 80218270 46060003 */ div.s $f0, $f0, $f6 /* 6BBE04 80218274 46041081 */ sub.s $f2, $f2, $f4 /* 6BBE08 80218278 E620003C */ swc1 $f0, 0x3c($s1) /* 6BBE0C 8021827C 44830000 */ mtc1 $v1, $f0 -/* 6BBE10 80218280 00000000 */ nop +/* 6BBE10 80218280 00000000 */ nop /* 6BBE14 80218284 46800020 */ cvt.s.w $f0, $f0 /* 6BBE18 80218288 46001083 */ div.s $f2, $f2, $f0 /* 6BBE1C 8021828C C6200010 */ lwc1 $f0, 0x10($s1) @@ -147,7 +147,7 @@ glabel func_802180D0_6BBC60 /* 6BBE88 802182F8 14410004 */ bne $v0, $at, .L8021830C /* 6BBE8C 802182FC 3C018000 */ lui $at, 0x8000 /* 6BBE90 80218300 14610002 */ bne $v1, $at, .L8021830C -/* 6BBE94 80218304 00000000 */ nop +/* 6BBE94 80218304 00000000 */ nop /* 6BBE98 80218308 0006000D */ break 6 .L8021830C: /* 6BBE9C 8021830C 00001812 */ mflo $v1 @@ -172,7 +172,7 @@ glabel func_802180D0_6BBC60 /* 6BBEE8 80218358 44811000 */ mtc1 $at, $f2 /* 6BBEEC 8021835C 46200220 */ cvt.s.d $f8, $f0 /* 6BBEF0 80218360 44830000 */ mtc1 $v1, $f0 -/* 6BBEF4 80218364 00000000 */ nop +/* 6BBEF4 80218364 00000000 */ nop /* 6BBEF8 80218368 46800020 */ cvt.s.w $f0, $f0 /* 6BBEFC 8021836C 86230066 */ lh $v1, 0x66($s1) /* 6BBF00 80218370 24020002 */ addiu $v0, $zero, 2 @@ -184,7 +184,7 @@ glabel func_802180D0_6BBC60 /* 6BBF18 80218388 D4228408 */ ldc1 $f2, %lo(D_80228408)($at) /* 6BBF1C 8021838C 46004021 */ cvt.d.s $f0, $f8 /* 6BBF20 80218390 46220002 */ mul.d $f0, $f0, $f2 -/* 6BBF24 80218394 00000000 */ nop +/* 6BBF24 80218394 00000000 */ nop /* 6BBF28 80218398 46200020 */ cvt.s.d $f0, $f0 /* 6BBF2C 8021839C E6200050 */ swc1 $f0, 0x50($s1) .L802183A0: @@ -196,7 +196,7 @@ glabel func_802180D0_6BBC60 /* 6BBF44 802183B4 C636003C */ lwc1 $f22, 0x3c($s1) /* 6BBF48 802183B8 AE200018 */ sw $zero, 0x18($s1) /* 6BBF4C 802183BC 46006302 */ mul.s $f12, $f12, $f0 -/* 6BBF50 802183C0 00000000 */ nop +/* 6BBF50 802183C0 00000000 */ nop /* 6BBF54 802183C4 AE20001C */ sw $zero, 0x1c($s1) /* 6BBF58 802183C8 4600A521 */ cvt.d.s $f20, $f20 /* 6BBF5C 802183CC 3C0143B4 */ lui $at, 0x43b4 @@ -219,7 +219,7 @@ glabel func_802180D0_6BBC60 /* 6BBF98 80218408 14410004 */ bne $v0, $at, .L8021841C /* 6BBF9C 8021840C 3C018000 */ lui $at, 0x8000 /* 6BBFA0 80218410 14610002 */ bne $v1, $at, .L8021841C -/* 6BBFA4 80218414 00000000 */ nop +/* 6BBFA4 80218414 00000000 */ nop /* 6BBFA8 80218418 0006000D */ break 6 .L8021841C: /* 6BBFAC 8021841C 00001812 */ mflo $v1 @@ -244,7 +244,7 @@ glabel func_802180D0_6BBC60 /* 6BBFF8 80218468 44811000 */ mtc1 $at, $f2 /* 6BBFFC 8021846C 46200220 */ cvt.s.d $f8, $f0 /* 6BC000 80218470 44830000 */ mtc1 $v1, $f0 -/* 6BC004 80218474 00000000 */ nop +/* 6BC004 80218474 00000000 */ nop /* 6BC008 80218478 46800020 */ cvt.s.w $f0, $f0 /* 6BC00C 8021847C 86230066 */ lh $v1, 0x66($s1) /* 6BC010 80218480 24020004 */ addiu $v0, $zero, 4 @@ -257,7 +257,7 @@ glabel func_802180D0_6BBC60 /* 6BC02C 8021849C 44801000 */ mtc1 $zero, $f2 /* 6BC030 802184A0 46004021 */ cvt.d.s $f0, $f8 /* 6BC034 802184A4 46220002 */ mul.d $f0, $f0, $f2 -/* 6BC038 802184A8 00000000 */ nop +/* 6BC038 802184A8 00000000 */ nop /* 6BC03C 802184AC 46200020 */ cvt.s.d $f0, $f0 /* 6BC040 802184B0 E6200050 */ swc1 $f0, 0x50($s1) .L802184B4: @@ -269,7 +269,7 @@ glabel func_802180D0_6BBC60 /* 6BC058 802184C8 C636003C */ lwc1 $f22, 0x3c($s1) /* 6BC05C 802184CC AE200018 */ sw $zero, 0x18($s1) /* 6BC060 802184D0 46006302 */ mul.s $f12, $f12, $f0 -/* 6BC064 802184D4 00000000 */ nop +/* 6BC064 802184D4 00000000 */ nop /* 6BC068 802184D8 AE20001C */ sw $zero, 0x1c($s1) /* 6BC06C 802184DC 4600A521 */ cvt.d.s $f20, $f20 /* 6BC070 802184E0 3C0143B4 */ lui $at, 0x43b4 @@ -282,9 +282,9 @@ glabel func_802180D0_6BBC60 /* 6BC08C 802184FC 46000021 */ cvt.d.s $f0, $f0 .L80218500: /* 6BC090 80218500 46220002 */ mul.d $f0, $f0, $f2 -/* 6BC094 80218504 00000000 */ nop +/* 6BC094 80218504 00000000 */ nop /* 6BC098 80218508 46360002 */ mul.d $f0, $f0, $f22 -/* 6BC09C 8021850C 00000000 */ nop +/* 6BC09C 8021850C 00000000 */ nop /* 6BC0A0 80218510 46360000 */ add.d $f0, $f0, $f22 /* 6BC0A4 80218514 4620A500 */ add.d $f20, $f20, $f0 /* 6BC0A8 80218518 4620A520 */ cvt.s.d $f20, $f20 @@ -308,21 +308,21 @@ glabel func_802180D0_6BBC60 /* 6BC0EC 8021855C 10620008 */ beq $v1, $v0, .L80218580 /* 6BC0F0 80218560 0000102D */ daddu $v0, $zero, $zero /* 6BC0F4 80218564 0808624C */ j .L80218930 -/* 6BC0F8 80218568 00000000 */ nop +/* 6BC0F8 80218568 00000000 */ nop .L8021856C: /* 6BC0FC 8021856C 24020003 */ addiu $v0, $zero, 3 /* 6BC100 80218570 106200BA */ beq $v1, $v0, .L8021885C /* 6BC104 80218574 0000102D */ daddu $v0, $zero, $zero /* 6BC108 80218578 0808624C */ j .L80218930 -/* 6BC10C 8021857C 00000000 */ nop +/* 6BC10C 8021857C 00000000 */ nop .L80218580: /* 6BC110 80218580 C6220044 */ lwc1 $f2, 0x44($s1) /* 6BC114 80218584 3C013FC9 */ lui $at, 0x3fc9 /* 6BC118 80218588 34210FD0 */ ori $at, $at, 0xfd0 /* 6BC11C 8021858C 44810000 */ mtc1 $at, $f0 -/* 6BC120 80218590 00000000 */ nop +/* 6BC120 80218590 00000000 */ nop /* 6BC124 80218594 4602003C */ c.lt.s $f0, $f2 -/* 6BC128 80218598 00000000 */ nop +/* 6BC128 80218598 00000000 */ nop /* 6BC12C 8021859C 45000004 */ bc1f .L802185B0 /* 6BC130 802185A0 2404FF81 */ addiu $a0, $zero, -0x7f /* 6BC134 802185A4 8E26005C */ lw $a2, 0x5c($s1) @@ -351,7 +351,7 @@ glabel func_802180D0_6BBC60 /* 6BC18C 802185FC C62C0044 */ lwc1 $f12, 0x44($s1) /* 6BC190 80218600 C6220050 */ lwc1 $f2, 0x50($s1) /* 6BC194 80218604 46001082 */ mul.s $f2, $f2, $f0 -/* 6BC198 80218608 00000000 */ nop +/* 6BC198 80218608 00000000 */ nop /* 6BC19C 8021860C C6200004 */ lwc1 $f0, 4($s1) /* 6BC1A0 80218610 46020000 */ add.s $f0, $f0, $f2 /* 6BC1A4 80218614 E6600148 */ swc1 $f0, 0x148($s3) @@ -360,7 +360,7 @@ glabel func_802180D0_6BBC60 /* 6BC1B0 80218620 C6220010 */ lwc1 $f2, 0x10($s1) /* 6BC1B4 80218624 C6600148 */ lwc1 $f0, 0x148($s3) /* 6BC1B8 80218628 4602003C */ c.lt.s $f0, $f2 -/* 6BC1BC 8021862C 00000000 */ nop +/* 6BC1BC 8021862C 00000000 */ nop /* 6BC1C0 80218630 45000007 */ bc1f .L80218650 /* 6BC1C4 80218634 4600B306 */ mov.s $f12, $f22 /* 6BC1C8 80218638 86220064 */ lh $v0, 0x64($s1) @@ -389,7 +389,7 @@ glabel func_802180D0_6BBC60 /* 6BC21C 8021868C 44810000 */ mtc1 $at, $f0 /* 6BC220 80218690 C6340044 */ lwc1 $f20, 0x44($s1) /* 6BC224 80218694 46006302 */ mul.s $f12, $f12, $f0 -/* 6BC228 80218698 00000000 */ nop +/* 6BC228 80218698 00000000 */ nop /* 6BC22C 8021869C C636003C */ lwc1 $f22, 0x3c($s1) /* 6BC230 802186A0 4600A521 */ cvt.d.s $f20, $f20 /* 6BC234 802186A4 3C0143B4 */ lui $at, 0x43b4 @@ -408,7 +408,7 @@ glabel func_802180D0_6BBC60 /* 6BC264 802186D4 44810000 */ mtc1 $at, $f0 /* 6BC268 802186D8 C6340044 */ lwc1 $f20, 0x44($s1) /* 6BC26C 802186DC 46006302 */ mul.s $f12, $f12, $f0 -/* 6BC270 802186E0 00000000 */ nop +/* 6BC270 802186E0 00000000 */ nop /* 6BC274 802186E4 C636003C */ lwc1 $f22, 0x3c($s1) /* 6BC278 802186E8 4600A521 */ cvt.d.s $f20, $f20 /* 6BC27C 802186EC 3C0143B4 */ lui $at, 0x43b4 @@ -421,9 +421,9 @@ glabel func_802180D0_6BBC60 /* 6BC298 80218708 46000021 */ cvt.d.s $f0, $f0 .L8021870C: /* 6BC29C 8021870C 46220002 */ mul.d $f0, $f0, $f2 -/* 6BC2A0 80218710 00000000 */ nop +/* 6BC2A0 80218710 00000000 */ nop /* 6BC2A4 80218714 46360002 */ mul.d $f0, $f0, $f22 -/* 6BC2A8 80218718 00000000 */ nop +/* 6BC2A8 80218718 00000000 */ nop /* 6BC2AC 8021871C 46360000 */ add.d $f0, $f0, $f22 /* 6BC2B0 80218720 4620A500 */ add.d $f20, $f20, $f0 /* 6BC2B4 80218724 4620A520 */ cvt.s.d $f20, $f20 @@ -469,7 +469,7 @@ glabel func_802180D0_6BBC60 /* 6BC34C 802187BC 14410004 */ bne $v0, $at, .L802187D0 /* 6BC350 802187C0 3C018000 */ lui $at, 0x8000 /* 6BC354 802187C4 14610002 */ bne $v1, $at, .L802187D0 -/* 6BC358 802187C8 00000000 */ nop +/* 6BC358 802187C8 00000000 */ nop /* 6BC35C 802187CC 0006000D */ break 6 .L802187D0: /* 6BC360 802187D0 00001812 */ mflo $v1 @@ -496,7 +496,7 @@ glabel func_802180D0_6BBC60 /* 6BC3B4 80218824 46200020 */ cvt.s.d $f0, $f0 /* 6BC3B8 80218828 E6200050 */ swc1 $f0, 0x50($s1) /* 6BC3BC 8021882C 44830000 */ mtc1 $v1, $f0 -/* 6BC3C0 80218830 00000000 */ nop +/* 6BC3C0 80218830 00000000 */ nop /* 6BC3C4 80218834 46800020 */ cvt.s.w $f0, $f0 /* 6BC3C8 80218838 E6200028 */ swc1 $f0, 0x28($s1) /* 6BC3CC 8021883C C6600144 */ lwc1 $f0, 0x144($s3) @@ -512,9 +512,9 @@ glabel func_802180D0_6BBC60 /* 6BC3F0 80218860 3C0140C9 */ lui $at, 0x40c9 /* 6BC3F4 80218864 34210FD0 */ ori $at, $at, 0xfd0 /* 6BC3F8 80218868 4481B000 */ mtc1 $at, $f22 -/* 6BC3FC 8021886C 00000000 */ nop +/* 6BC3FC 8021886C 00000000 */ nop /* 6BC400 80218870 46166302 */ mul.s $f12, $f12, $f22 -/* 6BC404 80218874 00000000 */ nop +/* 6BC404 80218874 00000000 */ nop /* 6BC408 80218878 C6340000 */ lwc1 $f20, ($s1) /* 6BC40C 8021887C 3C0143B4 */ lui $at, 0x43b4 /* 6BC410 80218880 4481C000 */ mtc1 $at, $f24 @@ -523,10 +523,10 @@ glabel func_802180D0_6BBC60 /* 6BC41C 8021888C 46186303 */ div.s $f12, $f12, $f24 /* 6BC420 80218890 C6220050 */ lwc1 $f2, 0x50($s1) /* 6BC424 80218894 46001082 */ mul.s $f2, $f2, $f0 -/* 6BC428 80218898 00000000 */ nop +/* 6BC428 80218898 00000000 */ nop /* 6BC42C 8021889C C62C0024 */ lwc1 $f12, 0x24($s1) /* 6BC430 802188A0 46166302 */ mul.s $f12, $f12, $f22 -/* 6BC434 802188A4 00000000 */ nop +/* 6BC434 802188A4 00000000 */ nop /* 6BC438 802188A8 3C018023 */ lui $at, %hi(D_80228440) /* 6BC43C 802188AC D4208440 */ ldc1 $f0, %lo(D_80228440)($at) /* 6BC440 802188B0 460010A1 */ cvt.d.s $f2, $f2 @@ -538,7 +538,7 @@ glabel func_802180D0_6BBC60 /* 6BC458 802188C8 E6340000 */ swc1 $f20, ($s1) /* 6BC45C 802188CC C6220050 */ lwc1 $f2, 0x50($s1) /* 6BC460 802188D0 46001082 */ mul.s $f2, $f2, $f0 -/* 6BC464 802188D4 00000000 */ nop +/* 6BC464 802188D4 00000000 */ nop /* 6BC468 802188D8 C62C0024 */ lwc1 $f12, 0x24($s1) /* 6BC46C 802188DC C6200028 */ lwc1 $f0, 0x28($s1) /* 6BC470 802188E0 46006300 */ add.s $f12, $f12, $f0 diff --git a/asm/nonmatchings/battle/area_kpa3/6BBB90/func_80218960_6BC4F0.s b/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80218960_6BC4F0.s similarity index 100% rename from asm/nonmatchings/battle/area_kpa3/6BBB90/func_80218960_6BC4F0.s rename to asm/nonmatchings/battle/area_kpa3/6BBC60/func_80218960_6BC4F0.s diff --git a/asm/nonmatchings/battle/area_kpa3/6BBB90/func_80218AB4_6BC644.s b/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80218AB4_6BC644.s similarity index 100% rename from asm/nonmatchings/battle/area_kpa3/6BBB90/func_80218AB4_6BC644.s rename to asm/nonmatchings/battle/area_kpa3/6BBC60/func_80218AB4_6BC644.s diff --git a/asm/nonmatchings/battle/area_kpa3/6BBB90/func_80218B60_6BC6F0.s b/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80218B60_6BC6F0.s similarity index 100% rename from asm/nonmatchings/battle/area_kpa3/6BBB90/func_80218B60_6BC6F0.s rename to asm/nonmatchings/battle/area_kpa3/6BBC60/func_80218B60_6BC6F0.s diff --git a/asm/nonmatchings/battle/area_kpa3/6BBB90/func_80218BC4_6BC754.s b/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80218BC4_6BC754.s similarity index 100% rename from asm/nonmatchings/battle/area_kpa3/6BBB90/func_80218BC4_6BC754.s rename to asm/nonmatchings/battle/area_kpa3/6BBC60/func_80218BC4_6BC754.s diff --git a/asm/nonmatchings/battle/area_kpa3/6BBB90/func_80218BFC_6BC78C.s b/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80218BFC_6BC78C.s similarity index 100% rename from asm/nonmatchings/battle/area_kpa3/6BBB90/func_80218BFC_6BC78C.s rename to asm/nonmatchings/battle/area_kpa3/6BBC60/func_80218BFC_6BC78C.s diff --git a/asm/nonmatchings/battle/area_kpa3/6BBB90/func_80218D10_6BC8A0.s b/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80218D10_6BC8A0.s similarity index 100% rename from asm/nonmatchings/battle/area_kpa3/6BBB90/func_80218D10_6BC8A0.s rename to asm/nonmatchings/battle/area_kpa3/6BBC60/func_80218D10_6BC8A0.s diff --git a/asm/nonmatchings/battle/area_kpa3/6BBB90/func_80218E34_6BC9C4.s b/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80218E34_6BC9C4.s similarity index 100% rename from asm/nonmatchings/battle/area_kpa3/6BBB90/func_80218E34_6BC9C4.s rename to asm/nonmatchings/battle/area_kpa3/6BBC60/func_80218E34_6BC9C4.s diff --git a/asm/nonmatchings/battle/area_kpa3/6BBB90/func_80218F58_6BCAE8.s b/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80218F58_6BCAE8.s similarity index 100% rename from asm/nonmatchings/battle/area_kpa3/6BBB90/func_80218F58_6BCAE8.s rename to asm/nonmatchings/battle/area_kpa3/6BBC60/func_80218F58_6BCAE8.s diff --git a/asm/nonmatchings/battle/area_kpa3/6BBB90/func_802193D4_6BCF64.s b/asm/nonmatchings/battle/area_kpa3/6BBC60/func_802193D4_6BCF64.s similarity index 100% rename from asm/nonmatchings/battle/area_kpa3/6BBB90/func_802193D4_6BCF64.s rename to asm/nonmatchings/battle/area_kpa3/6BBC60/func_802193D4_6BCF64.s diff --git a/asm/nonmatchings/battle/area_kpa3/6BBB90/func_80219428_6BCFB8.s b/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80219428_6BCFB8.s similarity index 100% rename from asm/nonmatchings/battle/area_kpa3/6BBB90/func_80219428_6BCFB8.s rename to asm/nonmatchings/battle/area_kpa3/6BBC60/func_80219428_6BCFB8.s diff --git a/asm/nonmatchings/battle/area_kpa3/6BBB90/func_80219474_6BD004.s b/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80219474_6BD004.s similarity index 100% rename from asm/nonmatchings/battle/area_kpa3/6BBB90/func_80219474_6BD004.s rename to asm/nonmatchings/battle/area_kpa3/6BBC60/func_80219474_6BD004.s diff --git a/asm/nonmatchings/battle/area_kpa3/6BBB90/func_802194C0_6BD050.s b/asm/nonmatchings/battle/area_kpa3/6BBC60/func_802194C0_6BD050.s similarity index 100% rename from asm/nonmatchings/battle/area_kpa3/6BBB90/func_802194C0_6BD050.s rename to asm/nonmatchings/battle/area_kpa3/6BBC60/func_802194C0_6BD050.s diff --git a/asm/nonmatchings/battle/area_kpa3/6BBB90/func_8021950C_6BD09C.s b/asm/nonmatchings/battle/area_kpa3/6BBC60/func_8021950C_6BD09C.s similarity index 100% rename from asm/nonmatchings/battle/area_kpa3/6BBB90/func_8021950C_6BD09C.s rename to asm/nonmatchings/battle/area_kpa3/6BBC60/func_8021950C_6BD09C.s diff --git a/asm/nonmatchings/battle/area_kpa3/6BBB90/func_80219550_6BD0E0.s b/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80219550_6BD0E0.s similarity index 100% rename from asm/nonmatchings/battle/area_kpa3/6BBB90/func_80219550_6BD0E0.s rename to asm/nonmatchings/battle/area_kpa3/6BBC60/func_80219550_6BD0E0.s diff --git a/asm/nonmatchings/battle/area_kpa3/6BBB90/func_80219588_6BD118.s b/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80219588_6BD118.s similarity index 100% rename from asm/nonmatchings/battle/area_kpa3/6BBB90/func_80219588_6BD118.s rename to asm/nonmatchings/battle/area_kpa3/6BBC60/func_80219588_6BD118.s diff --git a/asm/nonmatchings/battle/area_kpa3/6BBB90/func_802195F4_6BD184.s b/asm/nonmatchings/battle/area_kpa3/6BBC60/func_802195F4_6BD184.s similarity index 100% rename from asm/nonmatchings/battle/area_kpa3/6BBB90/func_802195F4_6BD184.s rename to asm/nonmatchings/battle/area_kpa3/6BBC60/func_802195F4_6BD184.s diff --git a/asm/nonmatchings/battle/area_kpa4/6CC070/func_80218020_6CC090.s b/asm/nonmatchings/battle/area_kpa4/6CC070/func_80218020_6CC090.s deleted file mode 100644 index 513d347e2c..0000000000 --- a/asm/nonmatchings/battle/area_kpa4/6CC070/func_80218020_6CC090.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218020_6CC090 -/* 6CC090 80218020 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 6CC094 80218024 AFB10014 */ sw $s1, 0x14($sp) -/* 6CC098 80218028 0080882D */ daddu $s1, $a0, $zero -/* 6CC09C 8021802C AFBF0020 */ sw $ra, 0x20($sp) -/* 6CC0A0 80218030 AFB3001C */ sw $s3, 0x1c($sp) -/* 6CC0A4 80218034 AFB20018 */ sw $s2, 0x18($sp) -/* 6CC0A8 80218038 AFB00010 */ sw $s0, 0x10($sp) -/* 6CC0AC 8021803C 8E30000C */ lw $s0, 0xc($s1) -/* 6CC0B0 80218040 8E050000 */ lw $a1, ($s0) -/* 6CC0B4 80218044 0C0B1EAF */ jal get_variable -/* 6CC0B8 80218048 26100004 */ addiu $s0, $s0, 4 -/* 6CC0BC 8021804C 8E050000 */ lw $a1, ($s0) -/* 6CC0C0 80218050 26100004 */ addiu $s0, $s0, 4 -/* 6CC0C4 80218054 0220202D */ daddu $a0, $s1, $zero -/* 6CC0C8 80218058 0C0B1EAF */ jal get_variable -/* 6CC0CC 8021805C 0040982D */ daddu $s3, $v0, $zero -/* 6CC0D0 80218060 8E050000 */ lw $a1, ($s0) -/* 6CC0D4 80218064 26100004 */ addiu $s0, $s0, 4 -/* 6CC0D8 80218068 0220202D */ daddu $a0, $s1, $zero -/* 6CC0DC 8021806C 0C0B1EAF */ jal get_variable -/* 6CC0E0 80218070 0040902D */ daddu $s2, $v0, $zero -/* 6CC0E4 80218074 0220202D */ daddu $a0, $s1, $zero -/* 6CC0E8 80218078 8E050000 */ lw $a1, ($s0) -/* 6CC0EC 8021807C 0C0B1EAF */ jal get_variable -/* 6CC0F0 80218080 0040802D */ daddu $s0, $v0, $zero -/* 6CC0F4 80218084 8E240148 */ lw $a0, 0x148($s1) -/* 6CC0F8 80218088 0C09A75B */ jal get_actor -/* 6CC0FC 8021808C 0040882D */ daddu $s1, $v0, $zero -/* 6CC100 80218090 0040182D */ daddu $v1, $v0, $zero -/* 6CC104 80218094 8C620008 */ lw $v0, 8($v1) -/* 6CC108 80218098 90420024 */ lbu $v0, 0x24($v0) -/* 6CC10C 8021809C 8C640008 */ lw $a0, 8($v1) -/* 6CC110 802180A0 02629823 */ subu $s3, $s3, $v0 -/* 6CC114 802180A4 A0730194 */ sb $s3, 0x194($v1) -/* 6CC118 802180A8 90820025 */ lbu $v0, 0x25($a0) -/* 6CC11C 802180AC 02429023 */ subu $s2, $s2, $v0 -/* 6CC120 802180B0 A0720195 */ sb $s2, 0x195($v1) -/* 6CC124 802180B4 90820026 */ lbu $v0, 0x26($a0) -/* 6CC128 802180B8 02028023 */ subu $s0, $s0, $v0 -/* 6CC12C 802180BC A0700196 */ sb $s0, 0x196($v1) -/* 6CC130 802180C0 90840027 */ lbu $a0, 0x27($a0) -/* 6CC134 802180C4 02248823 */ subu $s1, $s1, $a0 -/* 6CC138 802180C8 A0710197 */ sb $s1, 0x197($v1) -/* 6CC13C 802180CC 8FBF0020 */ lw $ra, 0x20($sp) -/* 6CC140 802180D0 8FB3001C */ lw $s3, 0x1c($sp) -/* 6CC144 802180D4 8FB20018 */ lw $s2, 0x18($sp) -/* 6CC148 802180D8 8FB10014 */ lw $s1, 0x14($sp) -/* 6CC14C 802180DC 8FB00010 */ lw $s0, 0x10($sp) -/* 6CC150 802180E0 24020002 */ addiu $v0, $zero, 2 -/* 6CC154 802180E4 03E00008 */ jr $ra -/* 6CC158 802180E8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/battle/area_kpa4/6CC1C0/func_80218464_6CC4D4.s b/asm/nonmatchings/battle/area_kpa4/6CC1C0/func_80218464_6CC4D4.s deleted file mode 100644 index 113fac46f3..0000000000 --- a/asm/nonmatchings/battle/area_kpa4/6CC1C0/func_80218464_6CC4D4.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218464_6CC4D4 -/* 6CC4D4 80218464 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 6CC4D8 80218468 AFB10014 */ sw $s1, 0x14($sp) -/* 6CC4DC 8021846C 0080882D */ daddu $s1, $a0, $zero -/* 6CC4E0 80218470 AFBF0020 */ sw $ra, 0x20($sp) -/* 6CC4E4 80218474 AFB3001C */ sw $s3, 0x1c($sp) -/* 6CC4E8 80218478 AFB20018 */ sw $s2, 0x18($sp) -/* 6CC4EC 8021847C AFB00010 */ sw $s0, 0x10($sp) -/* 6CC4F0 80218480 8E30000C */ lw $s0, 0xc($s1) -/* 6CC4F4 80218484 8E050000 */ lw $a1, ($s0) -/* 6CC4F8 80218488 0C0B1EAF */ jal get_variable -/* 6CC4FC 8021848C 26100004 */ addiu $s0, $s0, 4 -/* 6CC500 80218490 8E050000 */ lw $a1, ($s0) -/* 6CC504 80218494 26100004 */ addiu $s0, $s0, 4 -/* 6CC508 80218498 0220202D */ daddu $a0, $s1, $zero -/* 6CC50C 8021849C 0C0B1EAF */ jal get_variable -/* 6CC510 802184A0 0040982D */ daddu $s3, $v0, $zero -/* 6CC514 802184A4 8E050000 */ lw $a1, ($s0) -/* 6CC518 802184A8 26100004 */ addiu $s0, $s0, 4 -/* 6CC51C 802184AC 0220202D */ daddu $a0, $s1, $zero -/* 6CC520 802184B0 0C0B1EAF */ jal get_variable -/* 6CC524 802184B4 0040902D */ daddu $s2, $v0, $zero -/* 6CC528 802184B8 0220202D */ daddu $a0, $s1, $zero -/* 6CC52C 802184BC 8E050000 */ lw $a1, ($s0) -/* 6CC530 802184C0 0C0B1EAF */ jal get_variable -/* 6CC534 802184C4 0040802D */ daddu $s0, $v0, $zero -/* 6CC538 802184C8 8E240148 */ lw $a0, 0x148($s1) -/* 6CC53C 802184CC 0C09A75B */ jal get_actor -/* 6CC540 802184D0 0040882D */ daddu $s1, $v0, $zero -/* 6CC544 802184D4 0040182D */ daddu $v1, $v0, $zero -/* 6CC548 802184D8 8C620008 */ lw $v0, 8($v1) -/* 6CC54C 802184DC 90420024 */ lbu $v0, 0x24($v0) -/* 6CC550 802184E0 8C640008 */ lw $a0, 8($v1) -/* 6CC554 802184E4 02629823 */ subu $s3, $s3, $v0 -/* 6CC558 802184E8 A0730194 */ sb $s3, 0x194($v1) -/* 6CC55C 802184EC 90820025 */ lbu $v0, 0x25($a0) -/* 6CC560 802184F0 02429023 */ subu $s2, $s2, $v0 -/* 6CC564 802184F4 A0720195 */ sb $s2, 0x195($v1) -/* 6CC568 802184F8 90820026 */ lbu $v0, 0x26($a0) -/* 6CC56C 802184FC 02028023 */ subu $s0, $s0, $v0 -/* 6CC570 80218500 A0700196 */ sb $s0, 0x196($v1) -/* 6CC574 80218504 90840027 */ lbu $a0, 0x27($a0) -/* 6CC578 80218508 02248823 */ subu $s1, $s1, $a0 -/* 6CC57C 8021850C A0710197 */ sb $s1, 0x197($v1) -/* 6CC580 80218510 8FBF0020 */ lw $ra, 0x20($sp) -/* 6CC584 80218514 8FB3001C */ lw $s3, 0x1c($sp) -/* 6CC588 80218518 8FB20018 */ lw $s2, 0x18($sp) -/* 6CC58C 8021851C 8FB10014 */ lw $s1, 0x14($sp) -/* 6CC590 80218520 8FB00010 */ lw $s0, 0x10($sp) -/* 6CC594 80218524 24020002 */ addiu $v0, $zero, 2 -/* 6CC598 80218528 03E00008 */ jr $ra -/* 6CC59C 8021852C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/battle/area_kzn/58C2F0/func_80218130_58C420.s b/asm/nonmatchings/battle/area_kzn/58C2F0/func_80218130_58C420.s deleted file mode 100644 index f5eda14520..0000000000 --- a/asm/nonmatchings/battle/area_kzn/58C2F0/func_80218130_58C420.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218130_58C420 -/* 58C420 80218130 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 58C424 80218134 AFB10014 */ sw $s1, 0x14($sp) -/* 58C428 80218138 0080882D */ daddu $s1, $a0, $zero -/* 58C42C 8021813C AFBF0020 */ sw $ra, 0x20($sp) -/* 58C430 80218140 AFB3001C */ sw $s3, 0x1c($sp) -/* 58C434 80218144 AFB20018 */ sw $s2, 0x18($sp) -/* 58C438 80218148 AFB00010 */ sw $s0, 0x10($sp) -/* 58C43C 8021814C 8E30000C */ lw $s0, 0xc($s1) -/* 58C440 80218150 8E050000 */ lw $a1, ($s0) -/* 58C444 80218154 0C0B1EAF */ jal get_variable -/* 58C448 80218158 26100004 */ addiu $s0, $s0, 4 -/* 58C44C 8021815C 8E050000 */ lw $a1, ($s0) -/* 58C450 80218160 26100004 */ addiu $s0, $s0, 4 -/* 58C454 80218164 0220202D */ daddu $a0, $s1, $zero -/* 58C458 80218168 0C0B1EAF */ jal get_variable -/* 58C45C 8021816C 0040982D */ daddu $s3, $v0, $zero -/* 58C460 80218170 8E050000 */ lw $a1, ($s0) -/* 58C464 80218174 26100004 */ addiu $s0, $s0, 4 -/* 58C468 80218178 0220202D */ daddu $a0, $s1, $zero -/* 58C46C 8021817C 0C0B1EAF */ jal get_variable -/* 58C470 80218180 0040902D */ daddu $s2, $v0, $zero -/* 58C474 80218184 0220202D */ daddu $a0, $s1, $zero -/* 58C478 80218188 8E050000 */ lw $a1, ($s0) -/* 58C47C 8021818C 0C0B1EAF */ jal get_variable -/* 58C480 80218190 0040802D */ daddu $s0, $v0, $zero -/* 58C484 80218194 8E240148 */ lw $a0, 0x148($s1) -/* 58C488 80218198 0C09A75B */ jal get_actor -/* 58C48C 8021819C 0040882D */ daddu $s1, $v0, $zero -/* 58C490 802181A0 0040182D */ daddu $v1, $v0, $zero -/* 58C494 802181A4 8C620008 */ lw $v0, 8($v1) -/* 58C498 802181A8 90420024 */ lbu $v0, 0x24($v0) -/* 58C49C 802181AC 8C640008 */ lw $a0, 8($v1) -/* 58C4A0 802181B0 02629823 */ subu $s3, $s3, $v0 -/* 58C4A4 802181B4 A0730194 */ sb $s3, 0x194($v1) -/* 58C4A8 802181B8 90820025 */ lbu $v0, 0x25($a0) -/* 58C4AC 802181BC 02429023 */ subu $s2, $s2, $v0 -/* 58C4B0 802181C0 A0720195 */ sb $s2, 0x195($v1) -/* 58C4B4 802181C4 90820026 */ lbu $v0, 0x26($a0) -/* 58C4B8 802181C8 02028023 */ subu $s0, $s0, $v0 -/* 58C4BC 802181CC A0700196 */ sb $s0, 0x196($v1) -/* 58C4C0 802181D0 90840027 */ lbu $a0, 0x27($a0) -/* 58C4C4 802181D4 02248823 */ subu $s1, $s1, $a0 -/* 58C4C8 802181D8 A0710197 */ sb $s1, 0x197($v1) -/* 58C4CC 802181DC 8FBF0020 */ lw $ra, 0x20($sp) -/* 58C4D0 802181E0 8FB3001C */ lw $s3, 0x1c($sp) -/* 58C4D4 802181E4 8FB20018 */ lw $s2, 0x18($sp) -/* 58C4D8 802181E8 8FB10014 */ lw $s1, 0x14($sp) -/* 58C4DC 802181EC 8FB00010 */ lw $s0, 0x10($sp) -/* 58C4E0 802181F0 24020002 */ addiu $v0, $zero, 2 -/* 58C4E4 802181F4 03E00008 */ jr $ra -/* 58C4E8 802181F8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/battle/area_kzn/58C670/func_80218380_58C670.s b/asm/nonmatchings/battle/area_kzn/58C670/func_80218380_58C670.s deleted file mode 100644 index 73c1bba7e3..0000000000 --- a/asm/nonmatchings/battle/area_kzn/58C670/func_80218380_58C670.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218380_58C670 -/* 58C670 80218380 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 58C674 80218384 AFB10014 */ sw $s1, 0x14($sp) -/* 58C678 80218388 0080882D */ daddu $s1, $a0, $zero -/* 58C67C 8021838C AFBF0020 */ sw $ra, 0x20($sp) -/* 58C680 80218390 AFB3001C */ sw $s3, 0x1c($sp) -/* 58C684 80218394 AFB20018 */ sw $s2, 0x18($sp) -/* 58C688 80218398 AFB00010 */ sw $s0, 0x10($sp) -/* 58C68C 8021839C 8E30000C */ lw $s0, 0xc($s1) -/* 58C690 802183A0 8E050000 */ lw $a1, ($s0) -/* 58C694 802183A4 0C0B1EAF */ jal get_variable -/* 58C698 802183A8 26100004 */ addiu $s0, $s0, 4 -/* 58C69C 802183AC 8E050000 */ lw $a1, ($s0) -/* 58C6A0 802183B0 26100004 */ addiu $s0, $s0, 4 -/* 58C6A4 802183B4 0220202D */ daddu $a0, $s1, $zero -/* 58C6A8 802183B8 0C0B1EAF */ jal get_variable -/* 58C6AC 802183BC 0040982D */ daddu $s3, $v0, $zero -/* 58C6B0 802183C0 8E050000 */ lw $a1, ($s0) -/* 58C6B4 802183C4 26100004 */ addiu $s0, $s0, 4 -/* 58C6B8 802183C8 0220202D */ daddu $a0, $s1, $zero -/* 58C6BC 802183CC 0C0B1EAF */ jal get_variable -/* 58C6C0 802183D0 0040902D */ daddu $s2, $v0, $zero -/* 58C6C4 802183D4 0220202D */ daddu $a0, $s1, $zero -/* 58C6C8 802183D8 8E050000 */ lw $a1, ($s0) -/* 58C6CC 802183DC 0C0B1EAF */ jal get_variable -/* 58C6D0 802183E0 0040802D */ daddu $s0, $v0, $zero -/* 58C6D4 802183E4 8E240148 */ lw $a0, 0x148($s1) -/* 58C6D8 802183E8 0C09A75B */ jal get_actor -/* 58C6DC 802183EC 0040882D */ daddu $s1, $v0, $zero -/* 58C6E0 802183F0 0040182D */ daddu $v1, $v0, $zero -/* 58C6E4 802183F4 8C620008 */ lw $v0, 8($v1) -/* 58C6E8 802183F8 90420024 */ lbu $v0, 0x24($v0) -/* 58C6EC 802183FC 8C640008 */ lw $a0, 8($v1) -/* 58C6F0 80218400 02629823 */ subu $s3, $s3, $v0 -/* 58C6F4 80218404 A0730194 */ sb $s3, 0x194($v1) -/* 58C6F8 80218408 90820025 */ lbu $v0, 0x25($a0) -/* 58C6FC 8021840C 02429023 */ subu $s2, $s2, $v0 -/* 58C700 80218410 A0720195 */ sb $s2, 0x195($v1) -/* 58C704 80218414 90820026 */ lbu $v0, 0x26($a0) -/* 58C708 80218418 02028023 */ subu $s0, $s0, $v0 -/* 58C70C 8021841C A0700196 */ sb $s0, 0x196($v1) -/* 58C710 80218420 90840027 */ lbu $a0, 0x27($a0) -/* 58C714 80218424 02248823 */ subu $s1, $s1, $a0 -/* 58C718 80218428 A0710197 */ sb $s1, 0x197($v1) -/* 58C71C 8021842C 8FBF0020 */ lw $ra, 0x20($sp) -/* 58C720 80218430 8FB3001C */ lw $s3, 0x1c($sp) -/* 58C724 80218434 8FB20018 */ lw $s2, 0x18($sp) -/* 58C728 80218438 8FB10014 */ lw $s1, 0x14($sp) -/* 58C72C 8021843C 8FB00010 */ lw $s0, 0x10($sp) -/* 58C730 80218440 24020002 */ addiu $v0, $zero, 2 -/* 58C734 80218444 03E00008 */ jr $ra -/* 58C738 80218448 27BD0028 */ addiu $sp, $sp, 0x28 -/* 58C73C 8021844C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_kzn/58C670/func_80218450_58C740.s b/asm/nonmatchings/battle/area_kzn/58C670/func_80218450_58C740.s deleted file mode 100644 index 176df980c2..0000000000 --- a/asm/nonmatchings/battle/area_kzn/58C670/func_80218450_58C740.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218450_58C740 -/* 58C740 80218450 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 58C744 80218454 AFB10014 */ sw $s1, 0x14($sp) -/* 58C748 80218458 0080882D */ daddu $s1, $a0, $zero -/* 58C74C 8021845C AFBF0020 */ sw $ra, 0x20($sp) -/* 58C750 80218460 AFB3001C */ sw $s3, 0x1c($sp) -/* 58C754 80218464 AFB20018 */ sw $s2, 0x18($sp) -/* 58C758 80218468 AFB00010 */ sw $s0, 0x10($sp) -/* 58C75C 8021846C 8E30000C */ lw $s0, 0xc($s1) -/* 58C760 80218470 8E050000 */ lw $a1, ($s0) -/* 58C764 80218474 0C0B1EAF */ jal get_variable -/* 58C768 80218478 26100004 */ addiu $s0, $s0, 4 -/* 58C76C 8021847C 8E050000 */ lw $a1, ($s0) -/* 58C770 80218480 26100004 */ addiu $s0, $s0, 4 -/* 58C774 80218484 0220202D */ daddu $a0, $s1, $zero -/* 58C778 80218488 0C0B1EAF */ jal get_variable -/* 58C77C 8021848C 0040982D */ daddu $s3, $v0, $zero -/* 58C780 80218490 8E050000 */ lw $a1, ($s0) -/* 58C784 80218494 26100004 */ addiu $s0, $s0, 4 -/* 58C788 80218498 0220202D */ daddu $a0, $s1, $zero -/* 58C78C 8021849C 0C0B1EAF */ jal get_variable -/* 58C790 802184A0 0040902D */ daddu $s2, $v0, $zero -/* 58C794 802184A4 0220202D */ daddu $a0, $s1, $zero -/* 58C798 802184A8 8E050000 */ lw $a1, ($s0) -/* 58C79C 802184AC 0C0B1EAF */ jal get_variable -/* 58C7A0 802184B0 0040802D */ daddu $s0, $v0, $zero -/* 58C7A4 802184B4 8E240148 */ lw $a0, 0x148($s1) -/* 58C7A8 802184B8 0C09A75B */ jal get_actor -/* 58C7AC 802184BC 0040882D */ daddu $s1, $v0, $zero -/* 58C7B0 802184C0 0040182D */ daddu $v1, $v0, $zero -/* 58C7B4 802184C4 8C620008 */ lw $v0, 8($v1) -/* 58C7B8 802184C8 90420024 */ lbu $v0, 0x24($v0) -/* 58C7BC 802184CC 8C640008 */ lw $a0, 8($v1) -/* 58C7C0 802184D0 02629823 */ subu $s3, $s3, $v0 -/* 58C7C4 802184D4 A0730194 */ sb $s3, 0x194($v1) -/* 58C7C8 802184D8 90820025 */ lbu $v0, 0x25($a0) -/* 58C7CC 802184DC 02429023 */ subu $s2, $s2, $v0 -/* 58C7D0 802184E0 A0720195 */ sb $s2, 0x195($v1) -/* 58C7D4 802184E4 90820026 */ lbu $v0, 0x26($a0) -/* 58C7D8 802184E8 02028023 */ subu $s0, $s0, $v0 -/* 58C7DC 802184EC A0700196 */ sb $s0, 0x196($v1) -/* 58C7E0 802184F0 90840027 */ lbu $a0, 0x27($a0) -/* 58C7E4 802184F4 02248823 */ subu $s1, $s1, $a0 -/* 58C7E8 802184F8 A0710197 */ sb $s1, 0x197($v1) -/* 58C7EC 802184FC 8FBF0020 */ lw $ra, 0x20($sp) -/* 58C7F0 80218500 8FB3001C */ lw $s3, 0x1c($sp) -/* 58C7F4 80218504 8FB20018 */ lw $s2, 0x18($sp) -/* 58C7F8 80218508 8FB10014 */ lw $s1, 0x14($sp) -/* 58C7FC 8021850C 8FB00010 */ lw $s0, 0x10($sp) -/* 58C800 80218510 24020002 */ addiu $v0, $zero, 2 -/* 58C804 80218514 03E00008 */ jr $ra -/* 58C808 80218518 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/battle/area_kzn/58C670/func_802187B4_58CAA4.s b/asm/nonmatchings/battle/area_kzn/58C670/func_802187B4_58CAA4.s deleted file mode 100644 index f7eefeb95e..0000000000 --- a/asm/nonmatchings/battle/area_kzn/58C670/func_802187B4_58CAA4.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802187B4_58CAA4 -/* 58CAA4 802187B4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 58CAA8 802187B8 AFB10014 */ sw $s1, 0x14($sp) -/* 58CAAC 802187BC 0080882D */ daddu $s1, $a0, $zero -/* 58CAB0 802187C0 AFBF0020 */ sw $ra, 0x20($sp) -/* 58CAB4 802187C4 AFB3001C */ sw $s3, 0x1c($sp) -/* 58CAB8 802187C8 AFB20018 */ sw $s2, 0x18($sp) -/* 58CABC 802187CC AFB00010 */ sw $s0, 0x10($sp) -/* 58CAC0 802187D0 8E30000C */ lw $s0, 0xc($s1) -/* 58CAC4 802187D4 8E050000 */ lw $a1, ($s0) -/* 58CAC8 802187D8 0C0B1EAF */ jal get_variable -/* 58CACC 802187DC 26100004 */ addiu $s0, $s0, 4 -/* 58CAD0 802187E0 8E050000 */ lw $a1, ($s0) -/* 58CAD4 802187E4 26100004 */ addiu $s0, $s0, 4 -/* 58CAD8 802187E8 0220202D */ daddu $a0, $s1, $zero -/* 58CADC 802187EC 0C0B1EAF */ jal get_variable -/* 58CAE0 802187F0 0040982D */ daddu $s3, $v0, $zero -/* 58CAE4 802187F4 8E050000 */ lw $a1, ($s0) -/* 58CAE8 802187F8 26100004 */ addiu $s0, $s0, 4 -/* 58CAEC 802187FC 0220202D */ daddu $a0, $s1, $zero -/* 58CAF0 80218800 0C0B1EAF */ jal get_variable -/* 58CAF4 80218804 0040902D */ daddu $s2, $v0, $zero -/* 58CAF8 80218808 0220202D */ daddu $a0, $s1, $zero -/* 58CAFC 8021880C 8E050000 */ lw $a1, ($s0) -/* 58CB00 80218810 0C0B1EAF */ jal get_variable -/* 58CB04 80218814 0040802D */ daddu $s0, $v0, $zero -/* 58CB08 80218818 8E240148 */ lw $a0, 0x148($s1) -/* 58CB0C 8021881C 0C09A75B */ jal get_actor -/* 58CB10 80218820 0040882D */ daddu $s1, $v0, $zero -/* 58CB14 80218824 0040182D */ daddu $v1, $v0, $zero -/* 58CB18 80218828 8C620008 */ lw $v0, 8($v1) -/* 58CB1C 8021882C 90420024 */ lbu $v0, 0x24($v0) -/* 58CB20 80218830 8C640008 */ lw $a0, 8($v1) -/* 58CB24 80218834 02629823 */ subu $s3, $s3, $v0 -/* 58CB28 80218838 A0730194 */ sb $s3, 0x194($v1) -/* 58CB2C 8021883C 90820025 */ lbu $v0, 0x25($a0) -/* 58CB30 80218840 02429023 */ subu $s2, $s2, $v0 -/* 58CB34 80218844 A0720195 */ sb $s2, 0x195($v1) -/* 58CB38 80218848 90820026 */ lbu $v0, 0x26($a0) -/* 58CB3C 8021884C 02028023 */ subu $s0, $s0, $v0 -/* 58CB40 80218850 A0700196 */ sb $s0, 0x196($v1) -/* 58CB44 80218854 90840027 */ lbu $a0, 0x27($a0) -/* 58CB48 80218858 02248823 */ subu $s1, $s1, $a0 -/* 58CB4C 8021885C A0710197 */ sb $s1, 0x197($v1) -/* 58CB50 80218860 8FBF0020 */ lw $ra, 0x20($sp) -/* 58CB54 80218864 8FB3001C */ lw $s3, 0x1c($sp) -/* 58CB58 80218868 8FB20018 */ lw $s2, 0x18($sp) -/* 58CB5C 8021886C 8FB10014 */ lw $s1, 0x14($sp) -/* 58CB60 80218870 8FB00010 */ lw $s0, 0x10($sp) -/* 58CB64 80218874 24020002 */ addiu $v0, $zero, 2 -/* 58CB68 80218878 03E00008 */ jr $ra -/* 58CB6C 8021887C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/battle/area_kzn/58C670/func_80218B24_58CE14.s b/asm/nonmatchings/battle/area_kzn/58C670/func_80218B24_58CE14.s deleted file mode 100644 index 5d8bdbc34b..0000000000 --- a/asm/nonmatchings/battle/area_kzn/58C670/func_80218B24_58CE14.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218B24_58CE14 -/* 58CE14 80218B24 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 58CE18 80218B28 AFB10014 */ sw $s1, 0x14($sp) -/* 58CE1C 80218B2C 0080882D */ daddu $s1, $a0, $zero -/* 58CE20 80218B30 AFBF0020 */ sw $ra, 0x20($sp) -/* 58CE24 80218B34 AFB3001C */ sw $s3, 0x1c($sp) -/* 58CE28 80218B38 AFB20018 */ sw $s2, 0x18($sp) -/* 58CE2C 80218B3C AFB00010 */ sw $s0, 0x10($sp) -/* 58CE30 80218B40 8E30000C */ lw $s0, 0xc($s1) -/* 58CE34 80218B44 8E050000 */ lw $a1, ($s0) -/* 58CE38 80218B48 0C0B1EAF */ jal get_variable -/* 58CE3C 80218B4C 26100004 */ addiu $s0, $s0, 4 -/* 58CE40 80218B50 8E050000 */ lw $a1, ($s0) -/* 58CE44 80218B54 26100004 */ addiu $s0, $s0, 4 -/* 58CE48 80218B58 0220202D */ daddu $a0, $s1, $zero -/* 58CE4C 80218B5C 0C0B1EAF */ jal get_variable -/* 58CE50 80218B60 0040982D */ daddu $s3, $v0, $zero -/* 58CE54 80218B64 8E050000 */ lw $a1, ($s0) -/* 58CE58 80218B68 26100004 */ addiu $s0, $s0, 4 -/* 58CE5C 80218B6C 0220202D */ daddu $a0, $s1, $zero -/* 58CE60 80218B70 0C0B1EAF */ jal get_variable -/* 58CE64 80218B74 0040902D */ daddu $s2, $v0, $zero -/* 58CE68 80218B78 0220202D */ daddu $a0, $s1, $zero -/* 58CE6C 80218B7C 8E050000 */ lw $a1, ($s0) -/* 58CE70 80218B80 0C0B1EAF */ jal get_variable -/* 58CE74 80218B84 0040802D */ daddu $s0, $v0, $zero -/* 58CE78 80218B88 8E240148 */ lw $a0, 0x148($s1) -/* 58CE7C 80218B8C 0C09A75B */ jal get_actor -/* 58CE80 80218B90 0040882D */ daddu $s1, $v0, $zero -/* 58CE84 80218B94 0040182D */ daddu $v1, $v0, $zero -/* 58CE88 80218B98 8C620008 */ lw $v0, 8($v1) -/* 58CE8C 80218B9C 90420024 */ lbu $v0, 0x24($v0) -/* 58CE90 80218BA0 8C640008 */ lw $a0, 8($v1) -/* 58CE94 80218BA4 02629823 */ subu $s3, $s3, $v0 -/* 58CE98 80218BA8 A0730194 */ sb $s3, 0x194($v1) -/* 58CE9C 80218BAC 90820025 */ lbu $v0, 0x25($a0) -/* 58CEA0 80218BB0 02429023 */ subu $s2, $s2, $v0 -/* 58CEA4 80218BB4 A0720195 */ sb $s2, 0x195($v1) -/* 58CEA8 80218BB8 90820026 */ lbu $v0, 0x26($a0) -/* 58CEAC 80218BBC 02028023 */ subu $s0, $s0, $v0 -/* 58CEB0 80218BC0 A0700196 */ sb $s0, 0x196($v1) -/* 58CEB4 80218BC4 90840027 */ lbu $a0, 0x27($a0) -/* 58CEB8 80218BC8 02248823 */ subu $s1, $s1, $a0 -/* 58CEBC 80218BCC A0710197 */ sb $s1, 0x197($v1) -/* 58CEC0 80218BD0 8FBF0020 */ lw $ra, 0x20($sp) -/* 58CEC4 80218BD4 8FB3001C */ lw $s3, 0x1c($sp) -/* 58CEC8 80218BD8 8FB20018 */ lw $s2, 0x18($sp) -/* 58CECC 80218BDC 8FB10014 */ lw $s1, 0x14($sp) -/* 58CED0 80218BE0 8FB00010 */ lw $s0, 0x10($sp) -/* 58CED4 80218BE4 24020002 */ addiu $v0, $zero, 2 -/* 58CED8 80218BE8 03E00008 */ jr $ra -/* 58CEDC 80218BEC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/battle/area_kzn/58C670/func_8021851C_58C80C.s b/asm/nonmatchings/battle/area_kzn/58C740/func_8021851C_58C80C.s similarity index 92% rename from asm/nonmatchings/battle/area_kzn/58C670/func_8021851C_58C80C.s rename to asm/nonmatchings/battle/area_kzn/58C740/func_8021851C_58C80C.s index 8c0b59bd97..d8dd35d906 100644 --- a/asm/nonmatchings/battle/area_kzn/58C670/func_8021851C_58C80C.s +++ b/asm/nonmatchings/battle/area_kzn/58C740/func_8021851C_58C80C.s @@ -35,26 +35,26 @@ glabel func_8021851C_58C80C /* 58C884 80218594 34210FD8 */ ori $at, $at, 0xfd8 /* 58C888 80218598 44814000 */ mtc1 $at, $f8 /* 58C88C 8021859C 44922000 */ mtc1 $s2, $f4 -/* 58C890 802185A0 00000000 */ nop +/* 58C890 802185A0 00000000 */ nop /* 58C894 802185A4 46802120 */ cvt.s.w $f4, $f4 /* 58C898 802185A8 46082202 */ mul.s $f8, $f4, $f8 -/* 58C89C 802185AC 00000000 */ nop +/* 58C89C 802185AC 00000000 */ nop /* 58C8A0 802185B0 44903000 */ mtc1 $s0, $f6 -/* 58C8A4 802185B4 00000000 */ nop +/* 58C8A4 802185B4 00000000 */ nop /* 58C8A8 802185B8 468031A0 */ cvt.s.w $f6, $f6 /* 58C8AC 802185BC 3C013F80 */ lui $at, 0x3f80 /* 58C8B0 802185C0 44811000 */ mtc1 $at, $f2 /* 58C8B4 802185C4 46062103 */ div.s $f4, $f4, $f6 /* 58C8B8 802185C8 46041081 */ sub.s $f2, $f2, $f4 /* 58C8BC 802185CC 46020502 */ mul.s $f20, $f0, $f2 -/* 58C8C0 802185D0 00000000 */ nop +/* 58C8C0 802185D0 00000000 */ nop /* 58C8C4 802185D4 44936000 */ mtc1 $s3, $f12 -/* 58C8C8 802185D8 00000000 */ nop +/* 58C8C8 802185D8 00000000 */ nop /* 58C8CC 802185DC 46806320 */ cvt.s.w $f12, $f12 /* 58C8D0 802185E0 0C00A874 */ jal cos_rad /* 58C8D4 802185E4 460C4303 */ div.s $f12, $f8, $f12 /* 58C8D8 802185E8 4600A502 */ mul.s $f20, $f20, $f0 -/* 58C8DC 802185EC 00000000 */ nop +/* 58C8DC 802185EC 00000000 */ nop /* 58C8E0 802185F0 0220202D */ daddu $a0, $s1, $zero /* 58C8E4 802185F4 4600A28D */ trunc.w.s $f10, $f20 /* 58C8E8 802185F8 44065000 */ mfc1 $a2, $f10 @@ -70,4 +70,4 @@ glabel func_8021851C_58C80C /* 58C910 80218620 24020002 */ addiu $v0, $zero, 2 /* 58C914 80218624 03E00008 */ jr $ra /* 58C918 80218628 27BD0030 */ addiu $sp, $sp, 0x30 -/* 58C91C 8021862C 00000000 */ nop +/* 58C91C 8021862C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_kzn/58C670/func_80218630_58C920.s b/asm/nonmatchings/battle/area_kzn/58C740/func_80218630_58C920.s similarity index 100% rename from asm/nonmatchings/battle/area_kzn/58C670/func_80218630_58C920.s rename to asm/nonmatchings/battle/area_kzn/58C740/func_80218630_58C920.s diff --git a/asm/nonmatchings/battle/area_kzn/58C670/func_80218788_58CA78.s b/asm/nonmatchings/battle/area_kzn/58C740/func_80218788_58CA78.s similarity index 100% rename from asm/nonmatchings/battle/area_kzn/58C670/func_80218788_58CA78.s rename to asm/nonmatchings/battle/area_kzn/58C740/func_80218788_58CA78.s diff --git a/asm/nonmatchings/battle/area_kzn/58C670/func_802188D8_58CBC8.s b/asm/nonmatchings/battle/area_kzn/58C740/func_802188D8_58CBC8.s similarity index 100% rename from asm/nonmatchings/battle/area_kzn/58C670/func_802188D8_58CBC8.s rename to asm/nonmatchings/battle/area_kzn/58C740/func_802188D8_58CBC8.s diff --git a/asm/nonmatchings/battle/area_kzn/58C670/func_802189A0_58CC90.s b/asm/nonmatchings/battle/area_kzn/58C740/func_802189A0_58CC90.s similarity index 100% rename from asm/nonmatchings/battle/area_kzn/58C670/func_802189A0_58CC90.s rename to asm/nonmatchings/battle/area_kzn/58C740/func_802189A0_58CC90.s diff --git a/asm/nonmatchings/battle/area_kzn/58C670/func_80218AF8_58CDE8.s b/asm/nonmatchings/battle/area_kzn/58C740/func_80218AF8_58CDE8.s similarity index 100% rename from asm/nonmatchings/battle/area_kzn/58C670/func_80218AF8_58CDE8.s rename to asm/nonmatchings/battle/area_kzn/58C740/func_80218AF8_58CDE8.s diff --git a/asm/nonmatchings/battle/area_kzn/58C670/func_80218C48_58CF38.s b/asm/nonmatchings/battle/area_kzn/58C740/func_80218C48_58CF38.s similarity index 100% rename from asm/nonmatchings/battle/area_kzn/58C670/func_80218C48_58CF38.s rename to asm/nonmatchings/battle/area_kzn/58C740/func_80218C48_58CF38.s diff --git a/asm/nonmatchings/battle/area_kzn/58C670/func_80218D0C_58CFFC.s b/asm/nonmatchings/battle/area_kzn/58C740/func_80218D0C_58CFFC.s similarity index 100% rename from asm/nonmatchings/battle/area_kzn/58C670/func_80218D0C_58CFFC.s rename to asm/nonmatchings/battle/area_kzn/58C740/func_80218D0C_58CFFC.s diff --git a/asm/nonmatchings/battle/area_kzn/58C670/func_80218D6C_58D05C.s b/asm/nonmatchings/battle/area_kzn/58C740/func_80218D6C_58D05C.s similarity index 100% rename from asm/nonmatchings/battle/area_kzn/58C670/func_80218D6C_58D05C.s rename to asm/nonmatchings/battle/area_kzn/58C740/func_80218D6C_58D05C.s diff --git a/asm/nonmatchings/battle/area_mac/464490/func_80218000_464490.s b/asm/nonmatchings/battle/area_mac/464490/func_80218000_464490.s deleted file mode 100644 index 2f081fa794..0000000000 --- a/asm/nonmatchings/battle/area_mac/464490/func_80218000_464490.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218000_464490 -/* 464490 80218000 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 464494 80218004 AFB10014 */ sw $s1, 0x14($sp) -/* 464498 80218008 0080882D */ daddu $s1, $a0, $zero -/* 46449C 8021800C AFBF0020 */ sw $ra, 0x20($sp) -/* 4644A0 80218010 AFB3001C */ sw $s3, 0x1c($sp) -/* 4644A4 80218014 AFB20018 */ sw $s2, 0x18($sp) -/* 4644A8 80218018 AFB00010 */ sw $s0, 0x10($sp) -/* 4644AC 8021801C 8E30000C */ lw $s0, 0xc($s1) -/* 4644B0 80218020 8E050000 */ lw $a1, ($s0) -/* 4644B4 80218024 0C0B1EAF */ jal get_variable -/* 4644B8 80218028 26100004 */ addiu $s0, $s0, 4 -/* 4644BC 8021802C 8E050000 */ lw $a1, ($s0) -/* 4644C0 80218030 26100004 */ addiu $s0, $s0, 4 -/* 4644C4 80218034 0220202D */ daddu $a0, $s1, $zero -/* 4644C8 80218038 0C0B1EAF */ jal get_variable -/* 4644CC 8021803C 0040982D */ daddu $s3, $v0, $zero -/* 4644D0 80218040 8E050000 */ lw $a1, ($s0) -/* 4644D4 80218044 26100004 */ addiu $s0, $s0, 4 -/* 4644D8 80218048 0220202D */ daddu $a0, $s1, $zero -/* 4644DC 8021804C 0C0B1EAF */ jal get_variable -/* 4644E0 80218050 0040902D */ daddu $s2, $v0, $zero -/* 4644E4 80218054 0220202D */ daddu $a0, $s1, $zero -/* 4644E8 80218058 8E050000 */ lw $a1, ($s0) -/* 4644EC 8021805C 0C0B1EAF */ jal get_variable -/* 4644F0 80218060 0040802D */ daddu $s0, $v0, $zero -/* 4644F4 80218064 8E240148 */ lw $a0, 0x148($s1) -/* 4644F8 80218068 0C09A75B */ jal get_actor -/* 4644FC 8021806C 0040882D */ daddu $s1, $v0, $zero -/* 464500 80218070 0040182D */ daddu $v1, $v0, $zero -/* 464504 80218074 8C620008 */ lw $v0, 8($v1) -/* 464508 80218078 90420024 */ lbu $v0, 0x24($v0) -/* 46450C 8021807C 8C640008 */ lw $a0, 8($v1) -/* 464510 80218080 02629823 */ subu $s3, $s3, $v0 -/* 464514 80218084 A0730194 */ sb $s3, 0x194($v1) -/* 464518 80218088 90820025 */ lbu $v0, 0x25($a0) -/* 46451C 8021808C 02429023 */ subu $s2, $s2, $v0 -/* 464520 80218090 A0720195 */ sb $s2, 0x195($v1) -/* 464524 80218094 90820026 */ lbu $v0, 0x26($a0) -/* 464528 80218098 02028023 */ subu $s0, $s0, $v0 -/* 46452C 8021809C A0700196 */ sb $s0, 0x196($v1) -/* 464530 802180A0 90840027 */ lbu $a0, 0x27($a0) -/* 464534 802180A4 02248823 */ subu $s1, $s1, $a0 -/* 464538 802180A8 A0710197 */ sb $s1, 0x197($v1) -/* 46453C 802180AC 8FBF0020 */ lw $ra, 0x20($sp) -/* 464540 802180B0 8FB3001C */ lw $s3, 0x1c($sp) -/* 464544 802180B4 8FB20018 */ lw $s2, 0x18($sp) -/* 464548 802180B8 8FB10014 */ lw $s1, 0x14($sp) -/* 46454C 802180BC 8FB00010 */ lw $s0, 0x10($sp) -/* 464550 802180C0 24020002 */ addiu $v0, $zero, 2 -/* 464554 802180C4 03E00008 */ jr $ra -/* 464558 802180C8 27BD0028 */ addiu $sp, $sp, 0x28 -/* 46455C 802180CC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_mac/464490/func_80218E74_465304.s b/asm/nonmatchings/battle/area_mac/464490/func_80218E74_465304.s deleted file mode 100644 index b8ef91d3aa..0000000000 --- a/asm/nonmatchings/battle/area_mac/464490/func_80218E74_465304.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218E74_465304 -/* 465304 80218E74 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 465308 80218E78 AFB10014 */ sw $s1, 0x14($sp) -/* 46530C 80218E7C 0080882D */ daddu $s1, $a0, $zero -/* 465310 80218E80 AFBF0020 */ sw $ra, 0x20($sp) -/* 465314 80218E84 AFB3001C */ sw $s3, 0x1c($sp) -/* 465318 80218E88 AFB20018 */ sw $s2, 0x18($sp) -/* 46531C 80218E8C AFB00010 */ sw $s0, 0x10($sp) -/* 465320 80218E90 8E30000C */ lw $s0, 0xc($s1) -/* 465324 80218E94 8E050000 */ lw $a1, ($s0) -/* 465328 80218E98 0C0B1EAF */ jal get_variable -/* 46532C 80218E9C 26100004 */ addiu $s0, $s0, 4 -/* 465330 80218EA0 8E050000 */ lw $a1, ($s0) -/* 465334 80218EA4 26100004 */ addiu $s0, $s0, 4 -/* 465338 80218EA8 0220202D */ daddu $a0, $s1, $zero -/* 46533C 80218EAC 0C0B1EAF */ jal get_variable -/* 465340 80218EB0 0040982D */ daddu $s3, $v0, $zero -/* 465344 80218EB4 8E050000 */ lw $a1, ($s0) -/* 465348 80218EB8 26100004 */ addiu $s0, $s0, 4 -/* 46534C 80218EBC 0220202D */ daddu $a0, $s1, $zero -/* 465350 80218EC0 0C0B1EAF */ jal get_variable -/* 465354 80218EC4 0040902D */ daddu $s2, $v0, $zero -/* 465358 80218EC8 0220202D */ daddu $a0, $s1, $zero -/* 46535C 80218ECC 8E050000 */ lw $a1, ($s0) -/* 465360 80218ED0 0C0B1EAF */ jal get_variable -/* 465364 80218ED4 0040802D */ daddu $s0, $v0, $zero -/* 465368 80218ED8 8E240148 */ lw $a0, 0x148($s1) -/* 46536C 80218EDC 0C09A75B */ jal get_actor -/* 465370 80218EE0 0040882D */ daddu $s1, $v0, $zero -/* 465374 80218EE4 0040182D */ daddu $v1, $v0, $zero -/* 465378 80218EE8 8C620008 */ lw $v0, 8($v1) -/* 46537C 80218EEC 90420024 */ lbu $v0, 0x24($v0) -/* 465380 80218EF0 8C640008 */ lw $a0, 8($v1) -/* 465384 80218EF4 02629823 */ subu $s3, $s3, $v0 -/* 465388 80218EF8 A0730194 */ sb $s3, 0x194($v1) -/* 46538C 80218EFC 90820025 */ lbu $v0, 0x25($a0) -/* 465390 80218F00 02429023 */ subu $s2, $s2, $v0 -/* 465394 80218F04 A0720195 */ sb $s2, 0x195($v1) -/* 465398 80218F08 90820026 */ lbu $v0, 0x26($a0) -/* 46539C 80218F0C 02028023 */ subu $s0, $s0, $v0 -/* 4653A0 80218F10 A0700196 */ sb $s0, 0x196($v1) -/* 4653A4 80218F14 90840027 */ lbu $a0, 0x27($a0) -/* 4653A8 80218F18 02248823 */ subu $s1, $s1, $a0 -/* 4653AC 80218F1C A0710197 */ sb $s1, 0x197($v1) -/* 4653B0 80218F20 8FBF0020 */ lw $ra, 0x20($sp) -/* 4653B4 80218F24 8FB3001C */ lw $s3, 0x1c($sp) -/* 4653B8 80218F28 8FB20018 */ lw $s2, 0x18($sp) -/* 4653BC 80218F2C 8FB10014 */ lw $s1, 0x14($sp) -/* 4653C0 80218F30 8FB00010 */ lw $s0, 0x10($sp) -/* 4653C4 80218F34 24020002 */ addiu $v0, $zero, 2 -/* 4653C8 80218F38 03E00008 */ jr $ra -/* 4653CC 80218F3C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/battle/area_mac/464490/func_802180D0_464560.s b/asm/nonmatchings/battle/area_mac/464560/func_802180D0_464560.s similarity index 100% rename from asm/nonmatchings/battle/area_mac/464490/func_802180D0_464560.s rename to asm/nonmatchings/battle/area_mac/464560/func_802180D0_464560.s diff --git a/asm/nonmatchings/battle/area_mac/464490/func_80218100_464590.s b/asm/nonmatchings/battle/area_mac/464560/func_80218100_464590.s similarity index 100% rename from asm/nonmatchings/battle/area_mac/464490/func_80218100_464590.s rename to asm/nonmatchings/battle/area_mac/464560/func_80218100_464590.s diff --git a/asm/nonmatchings/battle/area_mac/464490/func_80218300_464790.s b/asm/nonmatchings/battle/area_mac/464560/func_80218300_464790.s similarity index 100% rename from asm/nonmatchings/battle/area_mac/464490/func_80218300_464790.s rename to asm/nonmatchings/battle/area_mac/464560/func_80218300_464790.s diff --git a/asm/nonmatchings/battle/area_mac/464490/func_80218B90_465020.s b/asm/nonmatchings/battle/area_mac/464560/func_80218B90_465020.s similarity index 100% rename from asm/nonmatchings/battle/area_mac/464490/func_80218B90_465020.s rename to asm/nonmatchings/battle/area_mac/464560/func_80218B90_465020.s diff --git a/asm/nonmatchings/battle/area_mac/464490/func_80218CE4_465174.s b/asm/nonmatchings/battle/area_mac/464560/func_80218CE4_465174.s similarity index 100% rename from asm/nonmatchings/battle/area_mac/464490/func_80218CE4_465174.s rename to asm/nonmatchings/battle/area_mac/464560/func_80218CE4_465174.s diff --git a/asm/nonmatchings/battle/area_mac/464490/func_80218D90_465220.s b/asm/nonmatchings/battle/area_mac/464560/func_80218D90_465220.s similarity index 100% rename from asm/nonmatchings/battle/area_mac/464490/func_80218D90_465220.s rename to asm/nonmatchings/battle/area_mac/464560/func_80218D90_465220.s diff --git a/asm/nonmatchings/battle/area_mac/464490/func_80218DF4_465284.s b/asm/nonmatchings/battle/area_mac/464560/func_80218DF4_465284.s similarity index 100% rename from asm/nonmatchings/battle/area_mac/464490/func_80218DF4_465284.s rename to asm/nonmatchings/battle/area_mac/464560/func_80218DF4_465284.s diff --git a/asm/nonmatchings/battle/area_mac/464490/func_80218E2C_4652BC.s b/asm/nonmatchings/battle/area_mac/464560/func_80218E2C_4652BC.s similarity index 100% rename from asm/nonmatchings/battle/area_mac/464490/func_80218E2C_4652BC.s rename to asm/nonmatchings/battle/area_mac/464560/func_80218E2C_4652BC.s diff --git a/asm/nonmatchings/battle/area_mac/464490/func_80218F40_4653D0.s b/asm/nonmatchings/battle/area_mac/464560/func_80218F40_4653D0.s similarity index 100% rename from asm/nonmatchings/battle/area_mac/464490/func_80218F40_4653D0.s rename to asm/nonmatchings/battle/area_mac/464560/func_80218F40_4653D0.s diff --git a/asm/nonmatchings/battle/area_mac/464490/func_80219064_4654F4.s b/asm/nonmatchings/battle/area_mac/464560/func_80219064_4654F4.s similarity index 100% rename from asm/nonmatchings/battle/area_mac/464490/func_80219064_4654F4.s rename to asm/nonmatchings/battle/area_mac/464560/func_80219064_4654F4.s diff --git a/asm/nonmatchings/battle/area_mac/464490/func_80219188_465618.s b/asm/nonmatchings/battle/area_mac/464560/func_80219188_465618.s similarity index 100% rename from asm/nonmatchings/battle/area_mac/464490/func_80219188_465618.s rename to asm/nonmatchings/battle/area_mac/464560/func_80219188_465618.s diff --git a/asm/nonmatchings/battle/area_mac/464490/func_80219604_465A94.s b/asm/nonmatchings/battle/area_mac/464560/func_80219604_465A94.s similarity index 100% rename from asm/nonmatchings/battle/area_mac/464490/func_80219604_465A94.s rename to asm/nonmatchings/battle/area_mac/464560/func_80219604_465A94.s diff --git a/asm/nonmatchings/battle/area_mac/464490/func_80219658_465AE8.s b/asm/nonmatchings/battle/area_mac/464560/func_80219658_465AE8.s similarity index 100% rename from asm/nonmatchings/battle/area_mac/464490/func_80219658_465AE8.s rename to asm/nonmatchings/battle/area_mac/464560/func_80219658_465AE8.s diff --git a/asm/nonmatchings/battle/area_mac/464490/func_802196A4_465B34.s b/asm/nonmatchings/battle/area_mac/464560/func_802196A4_465B34.s similarity index 100% rename from asm/nonmatchings/battle/area_mac/464490/func_802196A4_465B34.s rename to asm/nonmatchings/battle/area_mac/464560/func_802196A4_465B34.s diff --git a/asm/nonmatchings/battle/area_mac/464490/func_802196F0_465B80.s b/asm/nonmatchings/battle/area_mac/464560/func_802196F0_465B80.s similarity index 100% rename from asm/nonmatchings/battle/area_mac/464490/func_802196F0_465B80.s rename to asm/nonmatchings/battle/area_mac/464560/func_802196F0_465B80.s diff --git a/asm/nonmatchings/battle/area_mac/464490/func_8021973C_465BCC.s b/asm/nonmatchings/battle/area_mac/464560/func_8021973C_465BCC.s similarity index 100% rename from asm/nonmatchings/battle/area_mac/464490/func_8021973C_465BCC.s rename to asm/nonmatchings/battle/area_mac/464560/func_8021973C_465BCC.s diff --git a/asm/nonmatchings/battle/area_mac/464490/func_80219780_465C10.s b/asm/nonmatchings/battle/area_mac/464560/func_80219780_465C10.s similarity index 100% rename from asm/nonmatchings/battle/area_mac/464490/func_80219780_465C10.s rename to asm/nonmatchings/battle/area_mac/464560/func_80219780_465C10.s diff --git a/asm/nonmatchings/battle/area_mac/464490/func_802197B8_465C48.s b/asm/nonmatchings/battle/area_mac/464560/func_802197B8_465C48.s similarity index 100% rename from asm/nonmatchings/battle/area_mac/464490/func_802197B8_465C48.s rename to asm/nonmatchings/battle/area_mac/464560/func_802197B8_465C48.s diff --git a/asm/nonmatchings/battle/area_mac/464490/func_80219824_465CB4.s b/asm/nonmatchings/battle/area_mac/464560/func_80219824_465CB4.s similarity index 100% rename from asm/nonmatchings/battle/area_mac/464490/func_80219824_465CB4.s rename to asm/nonmatchings/battle/area_mac/464560/func_80219824_465CB4.s diff --git a/asm/nonmatchings/battle/area_mim/4F7D50/func_80218170_4F7D50.s b/asm/nonmatchings/battle/area_mim/4F7D50/func_80218170_4F7D50.s deleted file mode 100644 index ad475da38c..0000000000 --- a/asm/nonmatchings/battle/area_mim/4F7D50/func_80218170_4F7D50.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218170_4F7D50 -/* 4F7D50 80218170 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 4F7D54 80218174 AFB10014 */ sw $s1, 0x14($sp) -/* 4F7D58 80218178 0080882D */ daddu $s1, $a0, $zero -/* 4F7D5C 8021817C AFBF0020 */ sw $ra, 0x20($sp) -/* 4F7D60 80218180 AFB3001C */ sw $s3, 0x1c($sp) -/* 4F7D64 80218184 AFB20018 */ sw $s2, 0x18($sp) -/* 4F7D68 80218188 AFB00010 */ sw $s0, 0x10($sp) -/* 4F7D6C 8021818C 8E30000C */ lw $s0, 0xc($s1) -/* 4F7D70 80218190 8E050000 */ lw $a1, ($s0) -/* 4F7D74 80218194 0C0B1EAF */ jal get_variable -/* 4F7D78 80218198 26100004 */ addiu $s0, $s0, 4 -/* 4F7D7C 8021819C 8E050000 */ lw $a1, ($s0) -/* 4F7D80 802181A0 26100004 */ addiu $s0, $s0, 4 -/* 4F7D84 802181A4 0220202D */ daddu $a0, $s1, $zero -/* 4F7D88 802181A8 0C0B1EAF */ jal get_variable -/* 4F7D8C 802181AC 0040982D */ daddu $s3, $v0, $zero -/* 4F7D90 802181B0 8E050000 */ lw $a1, ($s0) -/* 4F7D94 802181B4 26100004 */ addiu $s0, $s0, 4 -/* 4F7D98 802181B8 0220202D */ daddu $a0, $s1, $zero -/* 4F7D9C 802181BC 0C0B1EAF */ jal get_variable -/* 4F7DA0 802181C0 0040902D */ daddu $s2, $v0, $zero -/* 4F7DA4 802181C4 0220202D */ daddu $a0, $s1, $zero -/* 4F7DA8 802181C8 8E050000 */ lw $a1, ($s0) -/* 4F7DAC 802181CC 0C0B1EAF */ jal get_variable -/* 4F7DB0 802181D0 0040802D */ daddu $s0, $v0, $zero -/* 4F7DB4 802181D4 8E240148 */ lw $a0, 0x148($s1) -/* 4F7DB8 802181D8 0C09A75B */ jal get_actor -/* 4F7DBC 802181DC 0040882D */ daddu $s1, $v0, $zero -/* 4F7DC0 802181E0 0040182D */ daddu $v1, $v0, $zero -/* 4F7DC4 802181E4 8C620008 */ lw $v0, 8($v1) -/* 4F7DC8 802181E8 90420024 */ lbu $v0, 0x24($v0) -/* 4F7DCC 802181EC 8C640008 */ lw $a0, 8($v1) -/* 4F7DD0 802181F0 02629823 */ subu $s3, $s3, $v0 -/* 4F7DD4 802181F4 A0730194 */ sb $s3, 0x194($v1) -/* 4F7DD8 802181F8 90820025 */ lbu $v0, 0x25($a0) -/* 4F7DDC 802181FC 02429023 */ subu $s2, $s2, $v0 -/* 4F7DE0 80218200 A0720195 */ sb $s2, 0x195($v1) -/* 4F7DE4 80218204 90820026 */ lbu $v0, 0x26($a0) -/* 4F7DE8 80218208 02028023 */ subu $s0, $s0, $v0 -/* 4F7DEC 8021820C A0700196 */ sb $s0, 0x196($v1) -/* 4F7DF0 80218210 90840027 */ lbu $a0, 0x27($a0) -/* 4F7DF4 80218214 02248823 */ subu $s1, $s1, $a0 -/* 4F7DF8 80218218 A0710197 */ sb $s1, 0x197($v1) -/* 4F7DFC 8021821C 8FBF0020 */ lw $ra, 0x20($sp) -/* 4F7E00 80218220 8FB3001C */ lw $s3, 0x1c($sp) -/* 4F7E04 80218224 8FB20018 */ lw $s2, 0x18($sp) -/* 4F7E08 80218228 8FB10014 */ lw $s1, 0x14($sp) -/* 4F7E0C 8021822C 8FB00010 */ lw $s0, 0x10($sp) -/* 4F7E10 80218230 24020002 */ addiu $v0, $zero, 2 -/* 4F7E14 80218234 03E00008 */ jr $ra -/* 4F7E18 80218238 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/battle/area_nok/48D700/func_802187E0_48D980.s b/asm/nonmatchings/battle/area_nok/48D700/func_802187E0_48D980.s deleted file mode 100644 index 7e20781931..0000000000 --- a/asm/nonmatchings/battle/area_nok/48D700/func_802187E0_48D980.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802187E0_48D980 -/* 48D980 802187E0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 48D984 802187E4 AFB10014 */ sw $s1, 0x14($sp) -/* 48D988 802187E8 0080882D */ daddu $s1, $a0, $zero -/* 48D98C 802187EC AFBF0020 */ sw $ra, 0x20($sp) -/* 48D990 802187F0 AFB3001C */ sw $s3, 0x1c($sp) -/* 48D994 802187F4 AFB20018 */ sw $s2, 0x18($sp) -/* 48D998 802187F8 AFB00010 */ sw $s0, 0x10($sp) -/* 48D99C 802187FC 8E30000C */ lw $s0, 0xc($s1) -/* 48D9A0 80218800 8E050000 */ lw $a1, ($s0) -/* 48D9A4 80218804 0C0B1EAF */ jal get_variable -/* 48D9A8 80218808 26100004 */ addiu $s0, $s0, 4 -/* 48D9AC 8021880C 8E050000 */ lw $a1, ($s0) -/* 48D9B0 80218810 26100004 */ addiu $s0, $s0, 4 -/* 48D9B4 80218814 0220202D */ daddu $a0, $s1, $zero -/* 48D9B8 80218818 0C0B1EAF */ jal get_variable -/* 48D9BC 8021881C 0040982D */ daddu $s3, $v0, $zero -/* 48D9C0 80218820 8E050000 */ lw $a1, ($s0) -/* 48D9C4 80218824 26100004 */ addiu $s0, $s0, 4 -/* 48D9C8 80218828 0220202D */ daddu $a0, $s1, $zero -/* 48D9CC 8021882C 0C0B1EAF */ jal get_variable -/* 48D9D0 80218830 0040902D */ daddu $s2, $v0, $zero -/* 48D9D4 80218834 0220202D */ daddu $a0, $s1, $zero -/* 48D9D8 80218838 8E050000 */ lw $a1, ($s0) -/* 48D9DC 8021883C 0C0B1EAF */ jal get_variable -/* 48D9E0 80218840 0040802D */ daddu $s0, $v0, $zero -/* 48D9E4 80218844 8E240148 */ lw $a0, 0x148($s1) -/* 48D9E8 80218848 0C09A75B */ jal get_actor -/* 48D9EC 8021884C 0040882D */ daddu $s1, $v0, $zero -/* 48D9F0 80218850 0040182D */ daddu $v1, $v0, $zero -/* 48D9F4 80218854 8C620008 */ lw $v0, 8($v1) -/* 48D9F8 80218858 90420024 */ lbu $v0, 0x24($v0) -/* 48D9FC 8021885C 8C640008 */ lw $a0, 8($v1) -/* 48DA00 80218860 02629823 */ subu $s3, $s3, $v0 -/* 48DA04 80218864 A0730194 */ sb $s3, 0x194($v1) -/* 48DA08 80218868 90820025 */ lbu $v0, 0x25($a0) -/* 48DA0C 8021886C 02429023 */ subu $s2, $s2, $v0 -/* 48DA10 80218870 A0720195 */ sb $s2, 0x195($v1) -/* 48DA14 80218874 90820026 */ lbu $v0, 0x26($a0) -/* 48DA18 80218878 02028023 */ subu $s0, $s0, $v0 -/* 48DA1C 8021887C A0700196 */ sb $s0, 0x196($v1) -/* 48DA20 80218880 90840027 */ lbu $a0, 0x27($a0) -/* 48DA24 80218884 02248823 */ subu $s1, $s1, $a0 -/* 48DA28 80218888 A0710197 */ sb $s1, 0x197($v1) -/* 48DA2C 8021888C 8FBF0020 */ lw $ra, 0x20($sp) -/* 48DA30 80218890 8FB3001C */ lw $s3, 0x1c($sp) -/* 48DA34 80218894 8FB20018 */ lw $s2, 0x18($sp) -/* 48DA38 80218898 8FB10014 */ lw $s1, 0x14($sp) -/* 48DA3C 8021889C 8FB00010 */ lw $s0, 0x10($sp) -/* 48DA40 802188A0 24020002 */ addiu $v0, $zero, 2 -/* 48DA44 802188A4 03E00008 */ jr $ra -/* 48DA48 802188A8 27BD0028 */ addiu $sp, $sp, 0x28 -/* 48DA4C 802188AC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_nok/48D700/func_802188B0_48DA50.s b/asm/nonmatchings/battle/area_nok/48DA50/func_802188B0_48DA50.s similarity index 100% rename from asm/nonmatchings/battle/area_nok/48D700/func_802188B0_48DA50.s rename to asm/nonmatchings/battle/area_nok/48DA50/func_802188B0_48DA50.s diff --git a/asm/nonmatchings/battle/area_nok/48D700/func_80218964_48DB04.s b/asm/nonmatchings/battle/area_nok/48DA50/func_80218964_48DB04.s similarity index 100% rename from asm/nonmatchings/battle/area_nok/48D700/func_80218964_48DB04.s rename to asm/nonmatchings/battle/area_nok/48DA50/func_80218964_48DB04.s diff --git a/asm/nonmatchings/battle/area_nok/48DBC0/func_80218A78_48DC18.s b/asm/nonmatchings/battle/area_nok/48DBC0/func_80218A78_48DC18.s deleted file mode 100644 index 696773825c..0000000000 --- a/asm/nonmatchings/battle/area_nok/48DBC0/func_80218A78_48DC18.s +++ /dev/null @@ -1,58 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218A78_48DC18 -/* 48DC18 80218A78 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 48DC1C 80218A7C AFB10014 */ sw $s1, 0x14($sp) -/* 48DC20 80218A80 0080882D */ daddu $s1, $a0, $zero -/* 48DC24 80218A84 AFBF0020 */ sw $ra, 0x20($sp) -/* 48DC28 80218A88 AFB3001C */ sw $s3, 0x1c($sp) -/* 48DC2C 80218A8C AFB20018 */ sw $s2, 0x18($sp) -/* 48DC30 80218A90 AFB00010 */ sw $s0, 0x10($sp) -/* 48DC34 80218A94 8E30000C */ lw $s0, 0xc($s1) -/* 48DC38 80218A98 8E050000 */ lw $a1, ($s0) -/* 48DC3C 80218A9C 0C0B1EAF */ jal get_variable -/* 48DC40 80218AA0 26100004 */ addiu $s0, $s0, 4 -/* 48DC44 80218AA4 8E050000 */ lw $a1, ($s0) -/* 48DC48 80218AA8 26100004 */ addiu $s0, $s0, 4 -/* 48DC4C 80218AAC 0220202D */ daddu $a0, $s1, $zero -/* 48DC50 80218AB0 0C0B1EAF */ jal get_variable -/* 48DC54 80218AB4 0040982D */ daddu $s3, $v0, $zero -/* 48DC58 80218AB8 8E050000 */ lw $a1, ($s0) -/* 48DC5C 80218ABC 26100004 */ addiu $s0, $s0, 4 -/* 48DC60 80218AC0 0220202D */ daddu $a0, $s1, $zero -/* 48DC64 80218AC4 0C0B1EAF */ jal get_variable -/* 48DC68 80218AC8 0040902D */ daddu $s2, $v0, $zero -/* 48DC6C 80218ACC 0220202D */ daddu $a0, $s1, $zero -/* 48DC70 80218AD0 8E050000 */ lw $a1, ($s0) -/* 48DC74 80218AD4 0C0B1EAF */ jal get_variable -/* 48DC78 80218AD8 0040802D */ daddu $s0, $v0, $zero -/* 48DC7C 80218ADC 8E240148 */ lw $a0, 0x148($s1) -/* 48DC80 80218AE0 0C09A75B */ jal get_actor -/* 48DC84 80218AE4 0040882D */ daddu $s1, $v0, $zero -/* 48DC88 80218AE8 0040182D */ daddu $v1, $v0, $zero -/* 48DC8C 80218AEC 8C620008 */ lw $v0, 8($v1) -/* 48DC90 80218AF0 90420024 */ lbu $v0, 0x24($v0) -/* 48DC94 80218AF4 8C640008 */ lw $a0, 8($v1) -/* 48DC98 80218AF8 02629823 */ subu $s3, $s3, $v0 -/* 48DC9C 80218AFC A0730194 */ sb $s3, 0x194($v1) -/* 48DCA0 80218B00 90820025 */ lbu $v0, 0x25($a0) -/* 48DCA4 80218B04 02429023 */ subu $s2, $s2, $v0 -/* 48DCA8 80218B08 A0720195 */ sb $s2, 0x195($v1) -/* 48DCAC 80218B0C 90820026 */ lbu $v0, 0x26($a0) -/* 48DCB0 80218B10 02028023 */ subu $s0, $s0, $v0 -/* 48DCB4 80218B14 A0700196 */ sb $s0, 0x196($v1) -/* 48DCB8 80218B18 90840027 */ lbu $a0, 0x27($a0) -/* 48DCBC 80218B1C 02248823 */ subu $s1, $s1, $a0 -/* 48DCC0 80218B20 A0710197 */ sb $s1, 0x197($v1) -/* 48DCC4 80218B24 8FBF0020 */ lw $ra, 0x20($sp) -/* 48DCC8 80218B28 8FB3001C */ lw $s3, 0x1c($sp) -/* 48DCCC 80218B2C 8FB20018 */ lw $s2, 0x18($sp) -/* 48DCD0 80218B30 8FB10014 */ lw $s1, 0x14($sp) -/* 48DCD4 80218B34 8FB00010 */ lw $s0, 0x10($sp) -/* 48DCD8 80218B38 24020002 */ addiu $v0, $zero, 2 -/* 48DCDC 80218B3C 03E00008 */ jr $ra -/* 48DCE0 80218B40 27BD0028 */ addiu $sp, $sp, 0x28 -/* 48DCE4 80218B44 00000000 */ nop -/* 48DCE8 80218B48 00000000 */ nop -/* 48DCEC 80218B4C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_nok/48DCF0/func_80218BA8_48DD48.s b/asm/nonmatchings/battle/area_nok/48DCF0/func_80218BA8_48DD48.s deleted file mode 100644 index 6ebf9be5da..0000000000 --- a/asm/nonmatchings/battle/area_nok/48DCF0/func_80218BA8_48DD48.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218BA8_48DD48 -/* 48DD48 80218BA8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 48DD4C 80218BAC AFB10014 */ sw $s1, 0x14($sp) -/* 48DD50 80218BB0 0080882D */ daddu $s1, $a0, $zero -/* 48DD54 80218BB4 AFBF0020 */ sw $ra, 0x20($sp) -/* 48DD58 80218BB8 AFB3001C */ sw $s3, 0x1c($sp) -/* 48DD5C 80218BBC AFB20018 */ sw $s2, 0x18($sp) -/* 48DD60 80218BC0 AFB00010 */ sw $s0, 0x10($sp) -/* 48DD64 80218BC4 8E30000C */ lw $s0, 0xc($s1) -/* 48DD68 80218BC8 8E050000 */ lw $a1, ($s0) -/* 48DD6C 80218BCC 0C0B1EAF */ jal get_variable -/* 48DD70 80218BD0 26100004 */ addiu $s0, $s0, 4 -/* 48DD74 80218BD4 8E050000 */ lw $a1, ($s0) -/* 48DD78 80218BD8 26100004 */ addiu $s0, $s0, 4 -/* 48DD7C 80218BDC 0220202D */ daddu $a0, $s1, $zero -/* 48DD80 80218BE0 0C0B1EAF */ jal get_variable -/* 48DD84 80218BE4 0040982D */ daddu $s3, $v0, $zero -/* 48DD88 80218BE8 8E050000 */ lw $a1, ($s0) -/* 48DD8C 80218BEC 26100004 */ addiu $s0, $s0, 4 -/* 48DD90 80218BF0 0220202D */ daddu $a0, $s1, $zero -/* 48DD94 80218BF4 0C0B1EAF */ jal get_variable -/* 48DD98 80218BF8 0040902D */ daddu $s2, $v0, $zero -/* 48DD9C 80218BFC 0220202D */ daddu $a0, $s1, $zero -/* 48DDA0 80218C00 8E050000 */ lw $a1, ($s0) -/* 48DDA4 80218C04 0C0B1EAF */ jal get_variable -/* 48DDA8 80218C08 0040802D */ daddu $s0, $v0, $zero -/* 48DDAC 80218C0C 8E240148 */ lw $a0, 0x148($s1) -/* 48DDB0 80218C10 0C09A75B */ jal get_actor -/* 48DDB4 80218C14 0040882D */ daddu $s1, $v0, $zero -/* 48DDB8 80218C18 0040182D */ daddu $v1, $v0, $zero -/* 48DDBC 80218C1C 8C620008 */ lw $v0, 8($v1) -/* 48DDC0 80218C20 90420024 */ lbu $v0, 0x24($v0) -/* 48DDC4 80218C24 8C640008 */ lw $a0, 8($v1) -/* 48DDC8 80218C28 02629823 */ subu $s3, $s3, $v0 -/* 48DDCC 80218C2C A0730194 */ sb $s3, 0x194($v1) -/* 48DDD0 80218C30 90820025 */ lbu $v0, 0x25($a0) -/* 48DDD4 80218C34 02429023 */ subu $s2, $s2, $v0 -/* 48DDD8 80218C38 A0720195 */ sb $s2, 0x195($v1) -/* 48DDDC 80218C3C 90820026 */ lbu $v0, 0x26($a0) -/* 48DDE0 80218C40 02028023 */ subu $s0, $s0, $v0 -/* 48DDE4 80218C44 A0700196 */ sb $s0, 0x196($v1) -/* 48DDE8 80218C48 90840027 */ lbu $a0, 0x27($a0) -/* 48DDEC 80218C4C 02248823 */ subu $s1, $s1, $a0 -/* 48DDF0 80218C50 A0710197 */ sb $s1, 0x197($v1) -/* 48DDF4 80218C54 8FBF0020 */ lw $ra, 0x20($sp) -/* 48DDF8 80218C58 8FB3001C */ lw $s3, 0x1c($sp) -/* 48DDFC 80218C5C 8FB20018 */ lw $s2, 0x18($sp) -/* 48DE00 80218C60 8FB10014 */ lw $s1, 0x14($sp) -/* 48DE04 80218C64 8FB00010 */ lw $s0, 0x10($sp) -/* 48DE08 80218C68 24020002 */ addiu $v0, $zero, 2 -/* 48DE0C 80218C6C 03E00008 */ jr $ra -/* 48DE10 80218C70 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/battle/area_omo/5125D0/func_80218000_5125D0.s b/asm/nonmatchings/battle/area_omo/5125D0/func_80218000_5125D0.s deleted file mode 100644 index 84970e30a5..0000000000 --- a/asm/nonmatchings/battle/area_omo/5125D0/func_80218000_5125D0.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218000_5125D0 -/* 5125D0 80218000 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 5125D4 80218004 AFB10014 */ sw $s1, 0x14($sp) -/* 5125D8 80218008 0080882D */ daddu $s1, $a0, $zero -/* 5125DC 8021800C AFBF0020 */ sw $ra, 0x20($sp) -/* 5125E0 80218010 AFB3001C */ sw $s3, 0x1c($sp) -/* 5125E4 80218014 AFB20018 */ sw $s2, 0x18($sp) -/* 5125E8 80218018 AFB00010 */ sw $s0, 0x10($sp) -/* 5125EC 8021801C 8E30000C */ lw $s0, 0xc($s1) -/* 5125F0 80218020 8E050000 */ lw $a1, ($s0) -/* 5125F4 80218024 0C0B1EAF */ jal get_variable -/* 5125F8 80218028 26100004 */ addiu $s0, $s0, 4 -/* 5125FC 8021802C 8E050000 */ lw $a1, ($s0) -/* 512600 80218030 26100004 */ addiu $s0, $s0, 4 -/* 512604 80218034 0220202D */ daddu $a0, $s1, $zero -/* 512608 80218038 0C0B1EAF */ jal get_variable -/* 51260C 8021803C 0040982D */ daddu $s3, $v0, $zero -/* 512610 80218040 8E050000 */ lw $a1, ($s0) -/* 512614 80218044 26100004 */ addiu $s0, $s0, 4 -/* 512618 80218048 0220202D */ daddu $a0, $s1, $zero -/* 51261C 8021804C 0C0B1EAF */ jal get_variable -/* 512620 80218050 0040902D */ daddu $s2, $v0, $zero -/* 512624 80218054 0220202D */ daddu $a0, $s1, $zero -/* 512628 80218058 8E050000 */ lw $a1, ($s0) -/* 51262C 8021805C 0C0B1EAF */ jal get_variable -/* 512630 80218060 0040802D */ daddu $s0, $v0, $zero -/* 512634 80218064 8E240148 */ lw $a0, 0x148($s1) -/* 512638 80218068 0C09A75B */ jal get_actor -/* 51263C 8021806C 0040882D */ daddu $s1, $v0, $zero -/* 512640 80218070 0040182D */ daddu $v1, $v0, $zero -/* 512644 80218074 8C620008 */ lw $v0, 8($v1) -/* 512648 80218078 90420024 */ lbu $v0, 0x24($v0) -/* 51264C 8021807C 8C640008 */ lw $a0, 8($v1) -/* 512650 80218080 02629823 */ subu $s3, $s3, $v0 -/* 512654 80218084 A0730194 */ sb $s3, 0x194($v1) -/* 512658 80218088 90820025 */ lbu $v0, 0x25($a0) -/* 51265C 8021808C 02429023 */ subu $s2, $s2, $v0 -/* 512660 80218090 A0720195 */ sb $s2, 0x195($v1) -/* 512664 80218094 90820026 */ lbu $v0, 0x26($a0) -/* 512668 80218098 02028023 */ subu $s0, $s0, $v0 -/* 51266C 8021809C A0700196 */ sb $s0, 0x196($v1) -/* 512670 802180A0 90840027 */ lbu $a0, 0x27($a0) -/* 512674 802180A4 02248823 */ subu $s1, $s1, $a0 -/* 512678 802180A8 A0710197 */ sb $s1, 0x197($v1) -/* 51267C 802180AC 8FBF0020 */ lw $ra, 0x20($sp) -/* 512680 802180B0 8FB3001C */ lw $s3, 0x1c($sp) -/* 512684 802180B4 8FB20018 */ lw $s2, 0x18($sp) -/* 512688 802180B8 8FB10014 */ lw $s1, 0x14($sp) -/* 51268C 802180BC 8FB00010 */ lw $s0, 0x10($sp) -/* 512690 802180C0 24020002 */ addiu $v0, $zero, 2 -/* 512694 802180C4 03E00008 */ jr $ra -/* 512698 802180C8 27BD0028 */ addiu $sp, $sp, 0x28 -/* 51269C 802180CC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_omo/5125D0/func_802180D0_5126A0.s b/asm/nonmatchings/battle/area_omo/5125D0/func_802180D0_5126A0.s deleted file mode 100644 index 69cb1f54e7..0000000000 --- a/asm/nonmatchings/battle/area_omo/5125D0/func_802180D0_5126A0.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802180D0_5126A0 -/* 5126A0 802180D0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 5126A4 802180D4 AFB10014 */ sw $s1, 0x14($sp) -/* 5126A8 802180D8 0080882D */ daddu $s1, $a0, $zero -/* 5126AC 802180DC AFBF0020 */ sw $ra, 0x20($sp) -/* 5126B0 802180E0 AFB3001C */ sw $s3, 0x1c($sp) -/* 5126B4 802180E4 AFB20018 */ sw $s2, 0x18($sp) -/* 5126B8 802180E8 AFB00010 */ sw $s0, 0x10($sp) -/* 5126BC 802180EC 8E30000C */ lw $s0, 0xc($s1) -/* 5126C0 802180F0 8E050000 */ lw $a1, ($s0) -/* 5126C4 802180F4 0C0B1EAF */ jal get_variable -/* 5126C8 802180F8 26100004 */ addiu $s0, $s0, 4 -/* 5126CC 802180FC 8E050000 */ lw $a1, ($s0) -/* 5126D0 80218100 26100004 */ addiu $s0, $s0, 4 -/* 5126D4 80218104 0220202D */ daddu $a0, $s1, $zero -/* 5126D8 80218108 0C0B1EAF */ jal get_variable -/* 5126DC 8021810C 0040982D */ daddu $s3, $v0, $zero -/* 5126E0 80218110 8E050000 */ lw $a1, ($s0) -/* 5126E4 80218114 26100004 */ addiu $s0, $s0, 4 -/* 5126E8 80218118 0220202D */ daddu $a0, $s1, $zero -/* 5126EC 8021811C 0C0B1EAF */ jal get_variable -/* 5126F0 80218120 0040902D */ daddu $s2, $v0, $zero -/* 5126F4 80218124 0220202D */ daddu $a0, $s1, $zero -/* 5126F8 80218128 8E050000 */ lw $a1, ($s0) -/* 5126FC 8021812C 0C0B1EAF */ jal get_variable -/* 512700 80218130 0040802D */ daddu $s0, $v0, $zero -/* 512704 80218134 8E240148 */ lw $a0, 0x148($s1) -/* 512708 80218138 0C09A75B */ jal get_actor -/* 51270C 8021813C 0040882D */ daddu $s1, $v0, $zero -/* 512710 80218140 0040182D */ daddu $v1, $v0, $zero -/* 512714 80218144 8C620008 */ lw $v0, 8($v1) -/* 512718 80218148 90420024 */ lbu $v0, 0x24($v0) -/* 51271C 8021814C 8C640008 */ lw $a0, 8($v1) -/* 512720 80218150 02629823 */ subu $s3, $s3, $v0 -/* 512724 80218154 A0730194 */ sb $s3, 0x194($v1) -/* 512728 80218158 90820025 */ lbu $v0, 0x25($a0) -/* 51272C 8021815C 02429023 */ subu $s2, $s2, $v0 -/* 512730 80218160 A0720195 */ sb $s2, 0x195($v1) -/* 512734 80218164 90820026 */ lbu $v0, 0x26($a0) -/* 512738 80218168 02028023 */ subu $s0, $s0, $v0 -/* 51273C 8021816C A0700196 */ sb $s0, 0x196($v1) -/* 512740 80218170 90840027 */ lbu $a0, 0x27($a0) -/* 512744 80218174 02248823 */ subu $s1, $s1, $a0 -/* 512748 80218178 A0710197 */ sb $s1, 0x197($v1) -/* 51274C 8021817C 8FBF0020 */ lw $ra, 0x20($sp) -/* 512750 80218180 8FB3001C */ lw $s3, 0x1c($sp) -/* 512754 80218184 8FB20018 */ lw $s2, 0x18($sp) -/* 512758 80218188 8FB10014 */ lw $s1, 0x14($sp) -/* 51275C 8021818C 8FB00010 */ lw $s0, 0x10($sp) -/* 512760 80218190 24020002 */ addiu $v0, $zero, 2 -/* 512764 80218194 03E00008 */ jr $ra -/* 512768 80218198 27BD0028 */ addiu $sp, $sp, 0x28 -/* 51276C 8021819C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_omo/5125D0/func_802181A0_512770.s b/asm/nonmatchings/battle/area_omo/5125D0/func_802181A0_512770.s deleted file mode 100644 index ad4f60b0e8..0000000000 --- a/asm/nonmatchings/battle/area_omo/5125D0/func_802181A0_512770.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802181A0_512770 -/* 512770 802181A0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 512774 802181A4 AFB10014 */ sw $s1, 0x14($sp) -/* 512778 802181A8 0080882D */ daddu $s1, $a0, $zero -/* 51277C 802181AC AFBF0020 */ sw $ra, 0x20($sp) -/* 512780 802181B0 AFB3001C */ sw $s3, 0x1c($sp) -/* 512784 802181B4 AFB20018 */ sw $s2, 0x18($sp) -/* 512788 802181B8 AFB00010 */ sw $s0, 0x10($sp) -/* 51278C 802181BC 8E30000C */ lw $s0, 0xc($s1) -/* 512790 802181C0 8E050000 */ lw $a1, ($s0) -/* 512794 802181C4 0C0B1EAF */ jal get_variable -/* 512798 802181C8 26100004 */ addiu $s0, $s0, 4 -/* 51279C 802181CC 8E050000 */ lw $a1, ($s0) -/* 5127A0 802181D0 26100004 */ addiu $s0, $s0, 4 -/* 5127A4 802181D4 0220202D */ daddu $a0, $s1, $zero -/* 5127A8 802181D8 0C0B1EAF */ jal get_variable -/* 5127AC 802181DC 0040982D */ daddu $s3, $v0, $zero -/* 5127B0 802181E0 8E050000 */ lw $a1, ($s0) -/* 5127B4 802181E4 26100004 */ addiu $s0, $s0, 4 -/* 5127B8 802181E8 0220202D */ daddu $a0, $s1, $zero -/* 5127BC 802181EC 0C0B1EAF */ jal get_variable -/* 5127C0 802181F0 0040902D */ daddu $s2, $v0, $zero -/* 5127C4 802181F4 0220202D */ daddu $a0, $s1, $zero -/* 5127C8 802181F8 8E050000 */ lw $a1, ($s0) -/* 5127CC 802181FC 0C0B1EAF */ jal get_variable -/* 5127D0 80218200 0040802D */ daddu $s0, $v0, $zero -/* 5127D4 80218204 8E240148 */ lw $a0, 0x148($s1) -/* 5127D8 80218208 0C09A75B */ jal get_actor -/* 5127DC 8021820C 0040882D */ daddu $s1, $v0, $zero -/* 5127E0 80218210 0040182D */ daddu $v1, $v0, $zero -/* 5127E4 80218214 8C620008 */ lw $v0, 8($v1) -/* 5127E8 80218218 90420024 */ lbu $v0, 0x24($v0) -/* 5127EC 8021821C 8C640008 */ lw $a0, 8($v1) -/* 5127F0 80218220 02629823 */ subu $s3, $s3, $v0 -/* 5127F4 80218224 A0730194 */ sb $s3, 0x194($v1) -/* 5127F8 80218228 90820025 */ lbu $v0, 0x25($a0) -/* 5127FC 8021822C 02429023 */ subu $s2, $s2, $v0 -/* 512800 80218230 A0720195 */ sb $s2, 0x195($v1) -/* 512804 80218234 90820026 */ lbu $v0, 0x26($a0) -/* 512808 80218238 02028023 */ subu $s0, $s0, $v0 -/* 51280C 8021823C A0700196 */ sb $s0, 0x196($v1) -/* 512810 80218240 90840027 */ lbu $a0, 0x27($a0) -/* 512814 80218244 02248823 */ subu $s1, $s1, $a0 -/* 512818 80218248 A0710197 */ sb $s1, 0x197($v1) -/* 51281C 8021824C 8FBF0020 */ lw $ra, 0x20($sp) -/* 512820 80218250 8FB3001C */ lw $s3, 0x1c($sp) -/* 512824 80218254 8FB20018 */ lw $s2, 0x18($sp) -/* 512828 80218258 8FB10014 */ lw $s1, 0x14($sp) -/* 51282C 8021825C 8FB00010 */ lw $s0, 0x10($sp) -/* 512830 80218260 24020002 */ addiu $v0, $zero, 2 -/* 512834 80218264 03E00008 */ jr $ra -/* 512838 80218268 27BD0028 */ addiu $sp, $sp, 0x28 -/* 51283C 8021826C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_omo/5125D0/func_80218270_512840.s b/asm/nonmatchings/battle/area_omo/5125D0/func_80218270_512840.s deleted file mode 100644 index 3f3e8ea3b4..0000000000 --- a/asm/nonmatchings/battle/area_omo/5125D0/func_80218270_512840.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218270_512840 -/* 512840 80218270 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 512844 80218274 AFB10014 */ sw $s1, 0x14($sp) -/* 512848 80218278 0080882D */ daddu $s1, $a0, $zero -/* 51284C 8021827C AFBF0020 */ sw $ra, 0x20($sp) -/* 512850 80218280 AFB3001C */ sw $s3, 0x1c($sp) -/* 512854 80218284 AFB20018 */ sw $s2, 0x18($sp) -/* 512858 80218288 AFB00010 */ sw $s0, 0x10($sp) -/* 51285C 8021828C 8E30000C */ lw $s0, 0xc($s1) -/* 512860 80218290 8E050000 */ lw $a1, ($s0) -/* 512864 80218294 0C0B1EAF */ jal get_variable -/* 512868 80218298 26100004 */ addiu $s0, $s0, 4 -/* 51286C 8021829C 8E050000 */ lw $a1, ($s0) -/* 512870 802182A0 26100004 */ addiu $s0, $s0, 4 -/* 512874 802182A4 0220202D */ daddu $a0, $s1, $zero -/* 512878 802182A8 0C0B1EAF */ jal get_variable -/* 51287C 802182AC 0040982D */ daddu $s3, $v0, $zero -/* 512880 802182B0 8E050000 */ lw $a1, ($s0) -/* 512884 802182B4 26100004 */ addiu $s0, $s0, 4 -/* 512888 802182B8 0220202D */ daddu $a0, $s1, $zero -/* 51288C 802182BC 0C0B1EAF */ jal get_variable -/* 512890 802182C0 0040902D */ daddu $s2, $v0, $zero -/* 512894 802182C4 0220202D */ daddu $a0, $s1, $zero -/* 512898 802182C8 8E050000 */ lw $a1, ($s0) -/* 51289C 802182CC 0C0B1EAF */ jal get_variable -/* 5128A0 802182D0 0040802D */ daddu $s0, $v0, $zero -/* 5128A4 802182D4 8E240148 */ lw $a0, 0x148($s1) -/* 5128A8 802182D8 0C09A75B */ jal get_actor -/* 5128AC 802182DC 0040882D */ daddu $s1, $v0, $zero -/* 5128B0 802182E0 0040182D */ daddu $v1, $v0, $zero -/* 5128B4 802182E4 8C620008 */ lw $v0, 8($v1) -/* 5128B8 802182E8 90420024 */ lbu $v0, 0x24($v0) -/* 5128BC 802182EC 8C640008 */ lw $a0, 8($v1) -/* 5128C0 802182F0 02629823 */ subu $s3, $s3, $v0 -/* 5128C4 802182F4 A0730194 */ sb $s3, 0x194($v1) -/* 5128C8 802182F8 90820025 */ lbu $v0, 0x25($a0) -/* 5128CC 802182FC 02429023 */ subu $s2, $s2, $v0 -/* 5128D0 80218300 A0720195 */ sb $s2, 0x195($v1) -/* 5128D4 80218304 90820026 */ lbu $v0, 0x26($a0) -/* 5128D8 80218308 02028023 */ subu $s0, $s0, $v0 -/* 5128DC 8021830C A0700196 */ sb $s0, 0x196($v1) -/* 5128E0 80218310 90840027 */ lbu $a0, 0x27($a0) -/* 5128E4 80218314 02248823 */ subu $s1, $s1, $a0 -/* 5128E8 80218318 A0710197 */ sb $s1, 0x197($v1) -/* 5128EC 8021831C 8FBF0020 */ lw $ra, 0x20($sp) -/* 5128F0 80218320 8FB3001C */ lw $s3, 0x1c($sp) -/* 5128F4 80218324 8FB20018 */ lw $s2, 0x18($sp) -/* 5128F8 80218328 8FB10014 */ lw $s1, 0x14($sp) -/* 5128FC 8021832C 8FB00010 */ lw $s0, 0x10($sp) -/* 512900 80218330 24020002 */ addiu $v0, $zero, 2 -/* 512904 80218334 03E00008 */ jr $ra -/* 512908 80218338 27BD0028 */ addiu $sp, $sp, 0x28 -/* 51290C 8021833C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_omo/5125D0/func_80218340_512910.s b/asm/nonmatchings/battle/area_omo/5125D0/func_80218340_512910.s deleted file mode 100644 index e36e40cbe3..0000000000 --- a/asm/nonmatchings/battle/area_omo/5125D0/func_80218340_512910.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218340_512910 -/* 512910 80218340 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 512914 80218344 AFB10014 */ sw $s1, 0x14($sp) -/* 512918 80218348 0080882D */ daddu $s1, $a0, $zero -/* 51291C 8021834C AFBF0020 */ sw $ra, 0x20($sp) -/* 512920 80218350 AFB3001C */ sw $s3, 0x1c($sp) -/* 512924 80218354 AFB20018 */ sw $s2, 0x18($sp) -/* 512928 80218358 AFB00010 */ sw $s0, 0x10($sp) -/* 51292C 8021835C 8E30000C */ lw $s0, 0xc($s1) -/* 512930 80218360 8E050000 */ lw $a1, ($s0) -/* 512934 80218364 0C0B1EAF */ jal get_variable -/* 512938 80218368 26100004 */ addiu $s0, $s0, 4 -/* 51293C 8021836C 8E050000 */ lw $a1, ($s0) -/* 512940 80218370 26100004 */ addiu $s0, $s0, 4 -/* 512944 80218374 0220202D */ daddu $a0, $s1, $zero -/* 512948 80218378 0C0B1EAF */ jal get_variable -/* 51294C 8021837C 0040982D */ daddu $s3, $v0, $zero -/* 512950 80218380 8E050000 */ lw $a1, ($s0) -/* 512954 80218384 26100004 */ addiu $s0, $s0, 4 -/* 512958 80218388 0220202D */ daddu $a0, $s1, $zero -/* 51295C 8021838C 0C0B1EAF */ jal get_variable -/* 512960 80218390 0040902D */ daddu $s2, $v0, $zero -/* 512964 80218394 0220202D */ daddu $a0, $s1, $zero -/* 512968 80218398 8E050000 */ lw $a1, ($s0) -/* 51296C 8021839C 0C0B1EAF */ jal get_variable -/* 512970 802183A0 0040802D */ daddu $s0, $v0, $zero -/* 512974 802183A4 8E240148 */ lw $a0, 0x148($s1) -/* 512978 802183A8 0C09A75B */ jal get_actor -/* 51297C 802183AC 0040882D */ daddu $s1, $v0, $zero -/* 512980 802183B0 0040182D */ daddu $v1, $v0, $zero -/* 512984 802183B4 8C620008 */ lw $v0, 8($v1) -/* 512988 802183B8 90420024 */ lbu $v0, 0x24($v0) -/* 51298C 802183BC 8C640008 */ lw $a0, 8($v1) -/* 512990 802183C0 02629823 */ subu $s3, $s3, $v0 -/* 512994 802183C4 A0730194 */ sb $s3, 0x194($v1) -/* 512998 802183C8 90820025 */ lbu $v0, 0x25($a0) -/* 51299C 802183CC 02429023 */ subu $s2, $s2, $v0 -/* 5129A0 802183D0 A0720195 */ sb $s2, 0x195($v1) -/* 5129A4 802183D4 90820026 */ lbu $v0, 0x26($a0) -/* 5129A8 802183D8 02028023 */ subu $s0, $s0, $v0 -/* 5129AC 802183DC A0700196 */ sb $s0, 0x196($v1) -/* 5129B0 802183E0 90840027 */ lbu $a0, 0x27($a0) -/* 5129B4 802183E4 02248823 */ subu $s1, $s1, $a0 -/* 5129B8 802183E8 A0710197 */ sb $s1, 0x197($v1) -/* 5129BC 802183EC 8FBF0020 */ lw $ra, 0x20($sp) -/* 5129C0 802183F0 8FB3001C */ lw $s3, 0x1c($sp) -/* 5129C4 802183F4 8FB20018 */ lw $s2, 0x18($sp) -/* 5129C8 802183F8 8FB10014 */ lw $s1, 0x14($sp) -/* 5129CC 802183FC 8FB00010 */ lw $s0, 0x10($sp) -/* 5129D0 80218400 24020002 */ addiu $v0, $zero, 2 -/* 5129D4 80218404 03E00008 */ jr $ra -/* 5129D8 80218408 27BD0028 */ addiu $sp, $sp, 0x28 -/* 5129DC 8021840C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_omo/5125D0/func_80218410_5129E0.s b/asm/nonmatchings/battle/area_omo/5125D0/func_80218410_5129E0.s deleted file mode 100644 index e71d1f44e5..0000000000 --- a/asm/nonmatchings/battle/area_omo/5125D0/func_80218410_5129E0.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218410_5129E0 -/* 5129E0 80218410 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 5129E4 80218414 AFB10014 */ sw $s1, 0x14($sp) -/* 5129E8 80218418 0080882D */ daddu $s1, $a0, $zero -/* 5129EC 8021841C AFBF0020 */ sw $ra, 0x20($sp) -/* 5129F0 80218420 AFB3001C */ sw $s3, 0x1c($sp) -/* 5129F4 80218424 AFB20018 */ sw $s2, 0x18($sp) -/* 5129F8 80218428 AFB00010 */ sw $s0, 0x10($sp) -/* 5129FC 8021842C 8E30000C */ lw $s0, 0xc($s1) -/* 512A00 80218430 8E050000 */ lw $a1, ($s0) -/* 512A04 80218434 0C0B1EAF */ jal get_variable -/* 512A08 80218438 26100004 */ addiu $s0, $s0, 4 -/* 512A0C 8021843C 8E050000 */ lw $a1, ($s0) -/* 512A10 80218440 26100004 */ addiu $s0, $s0, 4 -/* 512A14 80218444 0220202D */ daddu $a0, $s1, $zero -/* 512A18 80218448 0C0B1EAF */ jal get_variable -/* 512A1C 8021844C 0040982D */ daddu $s3, $v0, $zero -/* 512A20 80218450 8E050000 */ lw $a1, ($s0) -/* 512A24 80218454 26100004 */ addiu $s0, $s0, 4 -/* 512A28 80218458 0220202D */ daddu $a0, $s1, $zero -/* 512A2C 8021845C 0C0B1EAF */ jal get_variable -/* 512A30 80218460 0040902D */ daddu $s2, $v0, $zero -/* 512A34 80218464 0220202D */ daddu $a0, $s1, $zero -/* 512A38 80218468 8E050000 */ lw $a1, ($s0) -/* 512A3C 8021846C 0C0B1EAF */ jal get_variable -/* 512A40 80218470 0040802D */ daddu $s0, $v0, $zero -/* 512A44 80218474 8E240148 */ lw $a0, 0x148($s1) -/* 512A48 80218478 0C09A75B */ jal get_actor -/* 512A4C 8021847C 0040882D */ daddu $s1, $v0, $zero -/* 512A50 80218480 0040182D */ daddu $v1, $v0, $zero -/* 512A54 80218484 8C620008 */ lw $v0, 8($v1) -/* 512A58 80218488 90420024 */ lbu $v0, 0x24($v0) -/* 512A5C 8021848C 8C640008 */ lw $a0, 8($v1) -/* 512A60 80218490 02629823 */ subu $s3, $s3, $v0 -/* 512A64 80218494 A0730194 */ sb $s3, 0x194($v1) -/* 512A68 80218498 90820025 */ lbu $v0, 0x25($a0) -/* 512A6C 8021849C 02429023 */ subu $s2, $s2, $v0 -/* 512A70 802184A0 A0720195 */ sb $s2, 0x195($v1) -/* 512A74 802184A4 90820026 */ lbu $v0, 0x26($a0) -/* 512A78 802184A8 02028023 */ subu $s0, $s0, $v0 -/* 512A7C 802184AC A0700196 */ sb $s0, 0x196($v1) -/* 512A80 802184B0 90840027 */ lbu $a0, 0x27($a0) -/* 512A84 802184B4 02248823 */ subu $s1, $s1, $a0 -/* 512A88 802184B8 A0710197 */ sb $s1, 0x197($v1) -/* 512A8C 802184BC 8FBF0020 */ lw $ra, 0x20($sp) -/* 512A90 802184C0 8FB3001C */ lw $s3, 0x1c($sp) -/* 512A94 802184C4 8FB20018 */ lw $s2, 0x18($sp) -/* 512A98 802184C8 8FB10014 */ lw $s1, 0x14($sp) -/* 512A9C 802184CC 8FB00010 */ lw $s0, 0x10($sp) -/* 512AA0 802184D0 24020002 */ addiu $v0, $zero, 2 -/* 512AA4 802184D4 03E00008 */ jr $ra -/* 512AA8 802184D8 27BD0028 */ addiu $sp, $sp, 0x28 -/* 512AAC 802184DC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_omo/5125D0/func_802184E0_512AB0.s b/asm/nonmatchings/battle/area_omo/5125D0/func_802184E0_512AB0.s deleted file mode 100644 index 5e3cae7b03..0000000000 --- a/asm/nonmatchings/battle/area_omo/5125D0/func_802184E0_512AB0.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802184E0_512AB0 -/* 512AB0 802184E0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 512AB4 802184E4 AFB10014 */ sw $s1, 0x14($sp) -/* 512AB8 802184E8 0080882D */ daddu $s1, $a0, $zero -/* 512ABC 802184EC AFBF0020 */ sw $ra, 0x20($sp) -/* 512AC0 802184F0 AFB3001C */ sw $s3, 0x1c($sp) -/* 512AC4 802184F4 AFB20018 */ sw $s2, 0x18($sp) -/* 512AC8 802184F8 AFB00010 */ sw $s0, 0x10($sp) -/* 512ACC 802184FC 8E30000C */ lw $s0, 0xc($s1) -/* 512AD0 80218500 8E050000 */ lw $a1, ($s0) -/* 512AD4 80218504 0C0B1EAF */ jal get_variable -/* 512AD8 80218508 26100004 */ addiu $s0, $s0, 4 -/* 512ADC 8021850C 8E050000 */ lw $a1, ($s0) -/* 512AE0 80218510 26100004 */ addiu $s0, $s0, 4 -/* 512AE4 80218514 0220202D */ daddu $a0, $s1, $zero -/* 512AE8 80218518 0C0B1EAF */ jal get_variable -/* 512AEC 8021851C 0040982D */ daddu $s3, $v0, $zero -/* 512AF0 80218520 8E050000 */ lw $a1, ($s0) -/* 512AF4 80218524 26100004 */ addiu $s0, $s0, 4 -/* 512AF8 80218528 0220202D */ daddu $a0, $s1, $zero -/* 512AFC 8021852C 0C0B1EAF */ jal get_variable -/* 512B00 80218530 0040902D */ daddu $s2, $v0, $zero -/* 512B04 80218534 0220202D */ daddu $a0, $s1, $zero -/* 512B08 80218538 8E050000 */ lw $a1, ($s0) -/* 512B0C 8021853C 0C0B1EAF */ jal get_variable -/* 512B10 80218540 0040802D */ daddu $s0, $v0, $zero -/* 512B14 80218544 8E240148 */ lw $a0, 0x148($s1) -/* 512B18 80218548 0C09A75B */ jal get_actor -/* 512B1C 8021854C 0040882D */ daddu $s1, $v0, $zero -/* 512B20 80218550 0040182D */ daddu $v1, $v0, $zero -/* 512B24 80218554 8C620008 */ lw $v0, 8($v1) -/* 512B28 80218558 90420024 */ lbu $v0, 0x24($v0) -/* 512B2C 8021855C 8C640008 */ lw $a0, 8($v1) -/* 512B30 80218560 02629823 */ subu $s3, $s3, $v0 -/* 512B34 80218564 A0730194 */ sb $s3, 0x194($v1) -/* 512B38 80218568 90820025 */ lbu $v0, 0x25($a0) -/* 512B3C 8021856C 02429023 */ subu $s2, $s2, $v0 -/* 512B40 80218570 A0720195 */ sb $s2, 0x195($v1) -/* 512B44 80218574 90820026 */ lbu $v0, 0x26($a0) -/* 512B48 80218578 02028023 */ subu $s0, $s0, $v0 -/* 512B4C 8021857C A0700196 */ sb $s0, 0x196($v1) -/* 512B50 80218580 90840027 */ lbu $a0, 0x27($a0) -/* 512B54 80218584 02248823 */ subu $s1, $s1, $a0 -/* 512B58 80218588 A0710197 */ sb $s1, 0x197($v1) -/* 512B5C 8021858C 8FBF0020 */ lw $ra, 0x20($sp) -/* 512B60 80218590 8FB3001C */ lw $s3, 0x1c($sp) -/* 512B64 80218594 8FB20018 */ lw $s2, 0x18($sp) -/* 512B68 80218598 8FB10014 */ lw $s1, 0x14($sp) -/* 512B6C 8021859C 8FB00010 */ lw $s0, 0x10($sp) -/* 512B70 802185A0 24020002 */ addiu $v0, $zero, 2 -/* 512B74 802185A4 03E00008 */ jr $ra -/* 512B78 802185A8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/battle/area_omo/5125D0/func_802186C0_512C90.s b/asm/nonmatchings/battle/area_omo/5125D0/func_802186C0_512C90.s deleted file mode 100644 index e2d62e5bb4..0000000000 --- a/asm/nonmatchings/battle/area_omo/5125D0/func_802186C0_512C90.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802186C0_512C90 -/* 512C90 802186C0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 512C94 802186C4 AFB10014 */ sw $s1, 0x14($sp) -/* 512C98 802186C8 0080882D */ daddu $s1, $a0, $zero -/* 512C9C 802186CC AFBF0020 */ sw $ra, 0x20($sp) -/* 512CA0 802186D0 AFB3001C */ sw $s3, 0x1c($sp) -/* 512CA4 802186D4 AFB20018 */ sw $s2, 0x18($sp) -/* 512CA8 802186D8 AFB00010 */ sw $s0, 0x10($sp) -/* 512CAC 802186DC 8E30000C */ lw $s0, 0xc($s1) -/* 512CB0 802186E0 8E050000 */ lw $a1, ($s0) -/* 512CB4 802186E4 0C0B1EAF */ jal get_variable -/* 512CB8 802186E8 26100004 */ addiu $s0, $s0, 4 -/* 512CBC 802186EC 8E050000 */ lw $a1, ($s0) -/* 512CC0 802186F0 26100004 */ addiu $s0, $s0, 4 -/* 512CC4 802186F4 0220202D */ daddu $a0, $s1, $zero -/* 512CC8 802186F8 0C0B1EAF */ jal get_variable -/* 512CCC 802186FC 0040982D */ daddu $s3, $v0, $zero -/* 512CD0 80218700 8E050000 */ lw $a1, ($s0) -/* 512CD4 80218704 26100004 */ addiu $s0, $s0, 4 -/* 512CD8 80218708 0220202D */ daddu $a0, $s1, $zero -/* 512CDC 8021870C 0C0B1EAF */ jal get_variable -/* 512CE0 80218710 0040902D */ daddu $s2, $v0, $zero -/* 512CE4 80218714 0220202D */ daddu $a0, $s1, $zero -/* 512CE8 80218718 8E050000 */ lw $a1, ($s0) -/* 512CEC 8021871C 0C0B1EAF */ jal get_variable -/* 512CF0 80218720 0040802D */ daddu $s0, $v0, $zero -/* 512CF4 80218724 8E240148 */ lw $a0, 0x148($s1) -/* 512CF8 80218728 0C09A75B */ jal get_actor -/* 512CFC 8021872C 0040882D */ daddu $s1, $v0, $zero -/* 512D00 80218730 0040182D */ daddu $v1, $v0, $zero -/* 512D04 80218734 8C620008 */ lw $v0, 8($v1) -/* 512D08 80218738 90420024 */ lbu $v0, 0x24($v0) -/* 512D0C 8021873C 8C640008 */ lw $a0, 8($v1) -/* 512D10 80218740 02629823 */ subu $s3, $s3, $v0 -/* 512D14 80218744 A0730194 */ sb $s3, 0x194($v1) -/* 512D18 80218748 90820025 */ lbu $v0, 0x25($a0) -/* 512D1C 8021874C 02429023 */ subu $s2, $s2, $v0 -/* 512D20 80218750 A0720195 */ sb $s2, 0x195($v1) -/* 512D24 80218754 90820026 */ lbu $v0, 0x26($a0) -/* 512D28 80218758 02028023 */ subu $s0, $s0, $v0 -/* 512D2C 8021875C A0700196 */ sb $s0, 0x196($v1) -/* 512D30 80218760 90840027 */ lbu $a0, 0x27($a0) -/* 512D34 80218764 02248823 */ subu $s1, $s1, $a0 -/* 512D38 80218768 A0710197 */ sb $s1, 0x197($v1) -/* 512D3C 8021876C 8FBF0020 */ lw $ra, 0x20($sp) -/* 512D40 80218770 8FB3001C */ lw $s3, 0x1c($sp) -/* 512D44 80218774 8FB20018 */ lw $s2, 0x18($sp) -/* 512D48 80218778 8FB10014 */ lw $s1, 0x14($sp) -/* 512D4C 8021877C 8FB00010 */ lw $s0, 0x10($sp) -/* 512D50 80218780 24020002 */ addiu $v0, $zero, 2 -/* 512D54 80218784 03E00008 */ jr $ra -/* 512D58 80218788 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/battle/area_omo/5125D0/func_802185AC_512B7C.s b/asm/nonmatchings/battle/area_omo/512AB0/func_802185AC_512B7C.s similarity index 92% rename from asm/nonmatchings/battle/area_omo/5125D0/func_802185AC_512B7C.s rename to asm/nonmatchings/battle/area_omo/512AB0/func_802185AC_512B7C.s index 679bab8fcb..1fb08b26bb 100644 --- a/asm/nonmatchings/battle/area_omo/5125D0/func_802185AC_512B7C.s +++ b/asm/nonmatchings/battle/area_omo/512AB0/func_802185AC_512B7C.s @@ -35,26 +35,26 @@ glabel func_802185AC_512B7C /* 512BF4 80218624 34210FD8 */ ori $at, $at, 0xfd8 /* 512BF8 80218628 44814000 */ mtc1 $at, $f8 /* 512BFC 8021862C 44922000 */ mtc1 $s2, $f4 -/* 512C00 80218630 00000000 */ nop +/* 512C00 80218630 00000000 */ nop /* 512C04 80218634 46802120 */ cvt.s.w $f4, $f4 /* 512C08 80218638 46082202 */ mul.s $f8, $f4, $f8 -/* 512C0C 8021863C 00000000 */ nop +/* 512C0C 8021863C 00000000 */ nop /* 512C10 80218640 44903000 */ mtc1 $s0, $f6 -/* 512C14 80218644 00000000 */ nop +/* 512C14 80218644 00000000 */ nop /* 512C18 80218648 468031A0 */ cvt.s.w $f6, $f6 /* 512C1C 8021864C 3C013F80 */ lui $at, 0x3f80 /* 512C20 80218650 44811000 */ mtc1 $at, $f2 /* 512C24 80218654 46062103 */ div.s $f4, $f4, $f6 /* 512C28 80218658 46041081 */ sub.s $f2, $f2, $f4 /* 512C2C 8021865C 46020502 */ mul.s $f20, $f0, $f2 -/* 512C30 80218660 00000000 */ nop +/* 512C30 80218660 00000000 */ nop /* 512C34 80218664 44936000 */ mtc1 $s3, $f12 -/* 512C38 80218668 00000000 */ nop +/* 512C38 80218668 00000000 */ nop /* 512C3C 8021866C 46806320 */ cvt.s.w $f12, $f12 /* 512C40 80218670 0C00A874 */ jal cos_rad /* 512C44 80218674 460C4303 */ div.s $f12, $f8, $f12 /* 512C48 80218678 4600A502 */ mul.s $f20, $f20, $f0 -/* 512C4C 8021867C 00000000 */ nop +/* 512C4C 8021867C 00000000 */ nop /* 512C50 80218680 0220202D */ daddu $a0, $s1, $zero /* 512C54 80218684 4600A28D */ trunc.w.s $f10, $f20 /* 512C58 80218688 44065000 */ mfc1 $a2, $f10 @@ -70,4 +70,4 @@ glabel func_802185AC_512B7C /* 512C80 802186B0 24020002 */ addiu $v0, $zero, 2 /* 512C84 802186B4 03E00008 */ jr $ra /* 512C88 802186B8 27BD0030 */ addiu $sp, $sp, 0x30 -/* 512C8C 802186BC 00000000 */ nop +/* 512C8C 802186BC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_omo/5125D0/func_8021878C_512D5C.s b/asm/nonmatchings/battle/area_omo/512AB0/func_8021878C_512D5C.s similarity index 100% rename from asm/nonmatchings/battle/area_omo/5125D0/func_8021878C_512D5C.s rename to asm/nonmatchings/battle/area_omo/512AB0/func_8021878C_512D5C.s diff --git a/asm/nonmatchings/battle/area_omo/5125D0/func_80218880_512E50.s b/asm/nonmatchings/battle/area_omo/512AB0/func_80218880_512E50.s similarity index 100% rename from asm/nonmatchings/battle/area_omo/5125D0/func_80218880_512E50.s rename to asm/nonmatchings/battle/area_omo/512AB0/func_80218880_512E50.s diff --git a/asm/nonmatchings/battle/area_omo/5125D0/func_80218A98_513068.s b/asm/nonmatchings/battle/area_omo/512AB0/func_80218A98_513068.s similarity index 100% rename from asm/nonmatchings/battle/area_omo/5125D0/func_80218A98_513068.s rename to asm/nonmatchings/battle/area_omo/512AB0/func_80218A98_513068.s diff --git a/asm/nonmatchings/battle/area_omo/5125D0/func_80218B38_513108.s b/asm/nonmatchings/battle/area_omo/512AB0/func_80218B38_513108.s similarity index 100% rename from asm/nonmatchings/battle/area_omo/5125D0/func_80218B38_513108.s rename to asm/nonmatchings/battle/area_omo/512AB0/func_80218B38_513108.s diff --git a/asm/nonmatchings/battle/area_omo/5125D0/func_80218CF4_5132C4.s b/asm/nonmatchings/battle/area_omo/512AB0/func_80218CF4_5132C4.s similarity index 100% rename from asm/nonmatchings/battle/area_omo/5125D0/func_80218CF4_5132C4.s rename to asm/nonmatchings/battle/area_omo/512AB0/func_80218CF4_5132C4.s diff --git a/asm/nonmatchings/battle/area_omo/513380/func_80218E08_5133D8.s b/asm/nonmatchings/battle/area_omo/513380/func_80218E08_5133D8.s deleted file mode 100644 index 3a9710a1a2..0000000000 --- a/asm/nonmatchings/battle/area_omo/513380/func_80218E08_5133D8.s +++ /dev/null @@ -1,58 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218E08_5133D8 -/* 5133D8 80218E08 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 5133DC 80218E0C AFB10014 */ sw $s1, 0x14($sp) -/* 5133E0 80218E10 0080882D */ daddu $s1, $a0, $zero -/* 5133E4 80218E14 AFBF0020 */ sw $ra, 0x20($sp) -/* 5133E8 80218E18 AFB3001C */ sw $s3, 0x1c($sp) -/* 5133EC 80218E1C AFB20018 */ sw $s2, 0x18($sp) -/* 5133F0 80218E20 AFB00010 */ sw $s0, 0x10($sp) -/* 5133F4 80218E24 8E30000C */ lw $s0, 0xc($s1) -/* 5133F8 80218E28 8E050000 */ lw $a1, ($s0) -/* 5133FC 80218E2C 0C0B1EAF */ jal get_variable -/* 513400 80218E30 26100004 */ addiu $s0, $s0, 4 -/* 513404 80218E34 8E050000 */ lw $a1, ($s0) -/* 513408 80218E38 26100004 */ addiu $s0, $s0, 4 -/* 51340C 80218E3C 0220202D */ daddu $a0, $s1, $zero -/* 513410 80218E40 0C0B1EAF */ jal get_variable -/* 513414 80218E44 0040982D */ daddu $s3, $v0, $zero -/* 513418 80218E48 8E050000 */ lw $a1, ($s0) -/* 51341C 80218E4C 26100004 */ addiu $s0, $s0, 4 -/* 513420 80218E50 0220202D */ daddu $a0, $s1, $zero -/* 513424 80218E54 0C0B1EAF */ jal get_variable -/* 513428 80218E58 0040902D */ daddu $s2, $v0, $zero -/* 51342C 80218E5C 0220202D */ daddu $a0, $s1, $zero -/* 513430 80218E60 8E050000 */ lw $a1, ($s0) -/* 513434 80218E64 0C0B1EAF */ jal get_variable -/* 513438 80218E68 0040802D */ daddu $s0, $v0, $zero -/* 51343C 80218E6C 8E240148 */ lw $a0, 0x148($s1) -/* 513440 80218E70 0C09A75B */ jal get_actor -/* 513444 80218E74 0040882D */ daddu $s1, $v0, $zero -/* 513448 80218E78 0040182D */ daddu $v1, $v0, $zero -/* 51344C 80218E7C 8C620008 */ lw $v0, 8($v1) -/* 513450 80218E80 90420024 */ lbu $v0, 0x24($v0) -/* 513454 80218E84 8C640008 */ lw $a0, 8($v1) -/* 513458 80218E88 02629823 */ subu $s3, $s3, $v0 -/* 51345C 80218E8C A0730194 */ sb $s3, 0x194($v1) -/* 513460 80218E90 90820025 */ lbu $v0, 0x25($a0) -/* 513464 80218E94 02429023 */ subu $s2, $s2, $v0 -/* 513468 80218E98 A0720195 */ sb $s2, 0x195($v1) -/* 51346C 80218E9C 90820026 */ lbu $v0, 0x26($a0) -/* 513470 80218EA0 02028023 */ subu $s0, $s0, $v0 -/* 513474 80218EA4 A0700196 */ sb $s0, 0x196($v1) -/* 513478 80218EA8 90840027 */ lbu $a0, 0x27($a0) -/* 51347C 80218EAC 02248823 */ subu $s1, $s1, $a0 -/* 513480 80218EB0 A0710197 */ sb $s1, 0x197($v1) -/* 513484 80218EB4 8FBF0020 */ lw $ra, 0x20($sp) -/* 513488 80218EB8 8FB3001C */ lw $s3, 0x1c($sp) -/* 51348C 80218EBC 8FB20018 */ lw $s2, 0x18($sp) -/* 513490 80218EC0 8FB10014 */ lw $s1, 0x14($sp) -/* 513494 80218EC4 8FB00010 */ lw $s0, 0x10($sp) -/* 513498 80218EC8 24020002 */ addiu $v0, $zero, 2 -/* 51349C 80218ECC 03E00008 */ jr $ra -/* 5134A0 80218ED0 27BD0028 */ addiu $sp, $sp, 0x28 -/* 5134A4 80218ED4 00000000 */ nop -/* 5134A8 80218ED8 00000000 */ nop -/* 5134AC 80218EDC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_omo/5134B0/func_80218EE0_5134B0.s b/asm/nonmatchings/battle/area_omo/5134B0/func_80218EE0_5134B0.s deleted file mode 100644 index 806fd6db57..0000000000 --- a/asm/nonmatchings/battle/area_omo/5134B0/func_80218EE0_5134B0.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218EE0_5134B0 -/* 5134B0 80218EE0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 5134B4 80218EE4 AFB10014 */ sw $s1, 0x14($sp) -/* 5134B8 80218EE8 0080882D */ daddu $s1, $a0, $zero -/* 5134BC 80218EEC AFBF0020 */ sw $ra, 0x20($sp) -/* 5134C0 80218EF0 AFB3001C */ sw $s3, 0x1c($sp) -/* 5134C4 80218EF4 AFB20018 */ sw $s2, 0x18($sp) -/* 5134C8 80218EF8 AFB00010 */ sw $s0, 0x10($sp) -/* 5134CC 80218EFC 8E30000C */ lw $s0, 0xc($s1) -/* 5134D0 80218F00 8E050000 */ lw $a1, ($s0) -/* 5134D4 80218F04 0C0B1EAF */ jal get_variable -/* 5134D8 80218F08 26100004 */ addiu $s0, $s0, 4 -/* 5134DC 80218F0C 8E050000 */ lw $a1, ($s0) -/* 5134E0 80218F10 26100004 */ addiu $s0, $s0, 4 -/* 5134E4 80218F14 0220202D */ daddu $a0, $s1, $zero -/* 5134E8 80218F18 0C0B1EAF */ jal get_variable -/* 5134EC 80218F1C 0040982D */ daddu $s3, $v0, $zero -/* 5134F0 80218F20 8E050000 */ lw $a1, ($s0) -/* 5134F4 80218F24 26100004 */ addiu $s0, $s0, 4 -/* 5134F8 80218F28 0220202D */ daddu $a0, $s1, $zero -/* 5134FC 80218F2C 0C0B1EAF */ jal get_variable -/* 513500 80218F30 0040902D */ daddu $s2, $v0, $zero -/* 513504 80218F34 0220202D */ daddu $a0, $s1, $zero -/* 513508 80218F38 8E050000 */ lw $a1, ($s0) -/* 51350C 80218F3C 0C0B1EAF */ jal get_variable -/* 513510 80218F40 0040802D */ daddu $s0, $v0, $zero -/* 513514 80218F44 8E240148 */ lw $a0, 0x148($s1) -/* 513518 80218F48 0C09A75B */ jal get_actor -/* 51351C 80218F4C 0040882D */ daddu $s1, $v0, $zero -/* 513520 80218F50 0040182D */ daddu $v1, $v0, $zero -/* 513524 80218F54 8C620008 */ lw $v0, 8($v1) -/* 513528 80218F58 90420024 */ lbu $v0, 0x24($v0) -/* 51352C 80218F5C 8C640008 */ lw $a0, 8($v1) -/* 513530 80218F60 02629823 */ subu $s3, $s3, $v0 -/* 513534 80218F64 A0730194 */ sb $s3, 0x194($v1) -/* 513538 80218F68 90820025 */ lbu $v0, 0x25($a0) -/* 51353C 80218F6C 02429023 */ subu $s2, $s2, $v0 -/* 513540 80218F70 A0720195 */ sb $s2, 0x195($v1) -/* 513544 80218F74 90820026 */ lbu $v0, 0x26($a0) -/* 513548 80218F78 02028023 */ subu $s0, $s0, $v0 -/* 51354C 80218F7C A0700196 */ sb $s0, 0x196($v1) -/* 513550 80218F80 90840027 */ lbu $a0, 0x27($a0) -/* 513554 80218F84 02248823 */ subu $s1, $s1, $a0 -/* 513558 80218F88 A0710197 */ sb $s1, 0x197($v1) -/* 51355C 80218F8C 8FBF0020 */ lw $ra, 0x20($sp) -/* 513560 80218F90 8FB3001C */ lw $s3, 0x1c($sp) -/* 513564 80218F94 8FB20018 */ lw $s2, 0x18($sp) -/* 513568 80218F98 8FB10014 */ lw $s1, 0x14($sp) -/* 51356C 80218F9C 8FB00010 */ lw $s0, 0x10($sp) -/* 513570 80218FA0 24020002 */ addiu $v0, $zero, 2 -/* 513574 80218FA4 03E00008 */ jr $ra -/* 513578 80218FA8 27BD0028 */ addiu $sp, $sp, 0x28 -/* 51357C 80218FAC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_omo/5134B0/func_80218FB0_513580.s b/asm/nonmatchings/battle/area_omo/513580/func_80218FB0_513580.s similarity index 95% rename from asm/nonmatchings/battle/area_omo/5134B0/func_80218FB0_513580.s rename to asm/nonmatchings/battle/area_omo/513580/func_80218FB0_513580.s index 6c9ec34db9..72a8b230b8 100644 --- a/asm/nonmatchings/battle/area_omo/5134B0/func_80218FB0_513580.s +++ b/asm/nonmatchings/battle/area_omo/513580/func_80218FB0_513580.s @@ -61,9 +61,9 @@ glabel func_80218FB0_513580 /* 513654 80219084 3C014048 */ lui $at, 0x4048 /* 513658 80219088 3421F5C3 */ ori $at, $at, 0xf5c3 /* 51365C 8021908C 44816000 */ mtc1 $at, $f12 -/* 513660 80219090 00000000 */ nop +/* 513660 80219090 00000000 */ nop /* 513664 80219094 460C0302 */ mul.s $f12, $f0, $f12 -/* 513668 80219098 00000000 */ nop +/* 513668 80219098 00000000 */ nop /* 51366C 8021909C 3C014334 */ lui $at, 0x4334 /* 513670 802190A0 44811000 */ mtc1 $at, $f2 /* 513674 802190A4 E6200008 */ swc1 $f0, 8($s1) @@ -71,11 +71,11 @@ glabel func_80218FB0_513580 /* 51367C 802190AC 46026303 */ div.s $f12, $f12, $f2 /* 513680 802190B0 3C0141A0 */ lui $at, 0x41a0 /* 513684 802190B4 44811000 */ mtc1 $at, $f2 -/* 513688 802190B8 00000000 */ nop +/* 513688 802190B8 00000000 */ nop /* 51368C 802190BC 46020502 */ mul.s $f20, $f0, $f2 -/* 513690 802190C0 00000000 */ nop +/* 513690 802190C0 00000000 */ nop /* 513694 802190C4 4614A582 */ mul.s $f22, $f20, $f20 -/* 513698 802190C8 00000000 */ nop +/* 513698 802190C8 00000000 */ nop /* 51369C 802190CC 26940001 */ addiu $s4, $s4, 1 /* 5136A0 802190D0 3C0142B4 */ lui $at, 0x42b4 /* 5136A4 802190D4 44810000 */ mtc1 $at, $f0 @@ -135,5 +135,5 @@ glabel func_80218FB0_513580 /* 51377C 802191AC D7B400B8 */ ldc1 $f20, 0xb8($sp) /* 513780 802191B0 03E00008 */ jr $ra /* 513784 802191B4 27BD00D0 */ addiu $sp, $sp, 0xd0 -/* 513788 802191B8 00000000 */ nop -/* 51378C 802191BC 00000000 */ nop +/* 513788 802191B8 00000000 */ nop +/* 51378C 802191BC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_omo2_2/5483E0/func_80231054_548434.s b/asm/nonmatchings/battle/area_omo2_2/5483E0/func_80231054_548434.s deleted file mode 100644 index 5f7dafaeda..0000000000 --- a/asm/nonmatchings/battle/area_omo2_2/5483E0/func_80231054_548434.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80231054_548434 -/* 548434 80231054 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 548438 80231058 AFB10014 */ sw $s1, 0x14($sp) -/* 54843C 8023105C 0080882D */ daddu $s1, $a0, $zero -/* 548440 80231060 AFBF0020 */ sw $ra, 0x20($sp) -/* 548444 80231064 AFB3001C */ sw $s3, 0x1c($sp) -/* 548448 80231068 AFB20018 */ sw $s2, 0x18($sp) -/* 54844C 8023106C AFB00010 */ sw $s0, 0x10($sp) -/* 548450 80231070 8E30000C */ lw $s0, 0xc($s1) -/* 548454 80231074 8E050000 */ lw $a1, ($s0) -/* 548458 80231078 0C0B1EAF */ jal get_variable -/* 54845C 8023107C 26100004 */ addiu $s0, $s0, 4 -/* 548460 80231080 8E050000 */ lw $a1, ($s0) -/* 548464 80231084 26100004 */ addiu $s0, $s0, 4 -/* 548468 80231088 0220202D */ daddu $a0, $s1, $zero -/* 54846C 8023108C 0C0B1EAF */ jal get_variable -/* 548470 80231090 0040982D */ daddu $s3, $v0, $zero -/* 548474 80231094 8E050000 */ lw $a1, ($s0) -/* 548478 80231098 26100004 */ addiu $s0, $s0, 4 -/* 54847C 8023109C 0220202D */ daddu $a0, $s1, $zero -/* 548480 802310A0 0C0B1EAF */ jal get_variable -/* 548484 802310A4 0040902D */ daddu $s2, $v0, $zero -/* 548488 802310A8 0220202D */ daddu $a0, $s1, $zero -/* 54848C 802310AC 8E050000 */ lw $a1, ($s0) -/* 548490 802310B0 0C0B1EAF */ jal get_variable -/* 548494 802310B4 0040802D */ daddu $s0, $v0, $zero -/* 548498 802310B8 8E240148 */ lw $a0, 0x148($s1) -/* 54849C 802310BC 0C09A75B */ jal get_actor -/* 5484A0 802310C0 0040882D */ daddu $s1, $v0, $zero -/* 5484A4 802310C4 0040182D */ daddu $v1, $v0, $zero -/* 5484A8 802310C8 8C620008 */ lw $v0, 8($v1) -/* 5484AC 802310CC 90420024 */ lbu $v0, 0x24($v0) -/* 5484B0 802310D0 8C640008 */ lw $a0, 8($v1) -/* 5484B4 802310D4 02629823 */ subu $s3, $s3, $v0 -/* 5484B8 802310D8 A0730194 */ sb $s3, 0x194($v1) -/* 5484BC 802310DC 90820025 */ lbu $v0, 0x25($a0) -/* 5484C0 802310E0 02429023 */ subu $s2, $s2, $v0 -/* 5484C4 802310E4 A0720195 */ sb $s2, 0x195($v1) -/* 5484C8 802310E8 90820026 */ lbu $v0, 0x26($a0) -/* 5484CC 802310EC 02028023 */ subu $s0, $s0, $v0 -/* 5484D0 802310F0 A0700196 */ sb $s0, 0x196($v1) -/* 5484D4 802310F4 90840027 */ lbu $a0, 0x27($a0) -/* 5484D8 802310F8 02248823 */ subu $s1, $s1, $a0 -/* 5484DC 802310FC A0710197 */ sb $s1, 0x197($v1) -/* 5484E0 80231100 8FBF0020 */ lw $ra, 0x20($sp) -/* 5484E4 80231104 8FB3001C */ lw $s3, 0x1c($sp) -/* 5484E8 80231108 8FB20018 */ lw $s2, 0x18($sp) -/* 5484EC 8023110C 8FB10014 */ lw $s1, 0x14($sp) -/* 5484F0 80231110 8FB00010 */ lw $s0, 0x10($sp) -/* 5484F4 80231114 24020002 */ addiu $v0, $zero, 2 -/* 5484F8 80231118 03E00008 */ jr $ra -/* 5484FC 8023111C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/battle/area_omo3/557EC0/func_80218AE0_557EC0.s b/asm/nonmatchings/battle/area_omo3/557EC0/func_80218AE0_557EC0.s deleted file mode 100644 index 34897aa74c..0000000000 --- a/asm/nonmatchings/battle/area_omo3/557EC0/func_80218AE0_557EC0.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218AE0_557EC0 -/* 557EC0 80218AE0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 557EC4 80218AE4 AFB10014 */ sw $s1, 0x14($sp) -/* 557EC8 80218AE8 0080882D */ daddu $s1, $a0, $zero -/* 557ECC 80218AEC AFBF0020 */ sw $ra, 0x20($sp) -/* 557ED0 80218AF0 AFB3001C */ sw $s3, 0x1c($sp) -/* 557ED4 80218AF4 AFB20018 */ sw $s2, 0x18($sp) -/* 557ED8 80218AF8 AFB00010 */ sw $s0, 0x10($sp) -/* 557EDC 80218AFC 8E30000C */ lw $s0, 0xc($s1) -/* 557EE0 80218B00 8E050000 */ lw $a1, ($s0) -/* 557EE4 80218B04 0C0B1EAF */ jal get_variable -/* 557EE8 80218B08 26100004 */ addiu $s0, $s0, 4 -/* 557EEC 80218B0C 8E050000 */ lw $a1, ($s0) -/* 557EF0 80218B10 26100004 */ addiu $s0, $s0, 4 -/* 557EF4 80218B14 0220202D */ daddu $a0, $s1, $zero -/* 557EF8 80218B18 0C0B1EAF */ jal get_variable -/* 557EFC 80218B1C 0040982D */ daddu $s3, $v0, $zero -/* 557F00 80218B20 8E050000 */ lw $a1, ($s0) -/* 557F04 80218B24 26100004 */ addiu $s0, $s0, 4 -/* 557F08 80218B28 0220202D */ daddu $a0, $s1, $zero -/* 557F0C 80218B2C 0C0B1EAF */ jal get_variable -/* 557F10 80218B30 0040902D */ daddu $s2, $v0, $zero -/* 557F14 80218B34 0220202D */ daddu $a0, $s1, $zero -/* 557F18 80218B38 8E050000 */ lw $a1, ($s0) -/* 557F1C 80218B3C 0C0B1EAF */ jal get_variable -/* 557F20 80218B40 0040802D */ daddu $s0, $v0, $zero -/* 557F24 80218B44 8E240148 */ lw $a0, 0x148($s1) -/* 557F28 80218B48 0C09A75B */ jal get_actor -/* 557F2C 80218B4C 0040882D */ daddu $s1, $v0, $zero -/* 557F30 80218B50 0040182D */ daddu $v1, $v0, $zero -/* 557F34 80218B54 8C620008 */ lw $v0, 8($v1) -/* 557F38 80218B58 90420024 */ lbu $v0, 0x24($v0) -/* 557F3C 80218B5C 8C640008 */ lw $a0, 8($v1) -/* 557F40 80218B60 02629823 */ subu $s3, $s3, $v0 -/* 557F44 80218B64 A0730194 */ sb $s3, 0x194($v1) -/* 557F48 80218B68 90820025 */ lbu $v0, 0x25($a0) -/* 557F4C 80218B6C 02429023 */ subu $s2, $s2, $v0 -/* 557F50 80218B70 A0720195 */ sb $s2, 0x195($v1) -/* 557F54 80218B74 90820026 */ lbu $v0, 0x26($a0) -/* 557F58 80218B78 02028023 */ subu $s0, $s0, $v0 -/* 557F5C 80218B7C A0700196 */ sb $s0, 0x196($v1) -/* 557F60 80218B80 90840027 */ lbu $a0, 0x27($a0) -/* 557F64 80218B84 02248823 */ subu $s1, $s1, $a0 -/* 557F68 80218B88 A0710197 */ sb $s1, 0x197($v1) -/* 557F6C 80218B8C 8FBF0020 */ lw $ra, 0x20($sp) -/* 557F70 80218B90 8FB3001C */ lw $s3, 0x1c($sp) -/* 557F74 80218B94 8FB20018 */ lw $s2, 0x18($sp) -/* 557F78 80218B98 8FB10014 */ lw $s1, 0x14($sp) -/* 557F7C 80218B9C 8FB00010 */ lw $s0, 0x10($sp) -/* 557F80 80218BA0 24020002 */ addiu $v0, $zero, 2 -/* 557F84 80218BA4 03E00008 */ jr $ra -/* 557F88 80218BA8 27BD0028 */ addiu $sp, $sp, 0x28 -/* 557F8C 80218BAC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_omo3/557EC0/func_80218BB0_557F90.s b/asm/nonmatchings/battle/area_omo3/557EC0/func_80218BB0_557F90.s deleted file mode 100644 index a99cf5c0dd..0000000000 --- a/asm/nonmatchings/battle/area_omo3/557EC0/func_80218BB0_557F90.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218BB0_557F90 -/* 557F90 80218BB0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 557F94 80218BB4 AFB10014 */ sw $s1, 0x14($sp) -/* 557F98 80218BB8 0080882D */ daddu $s1, $a0, $zero -/* 557F9C 80218BBC AFBF0020 */ sw $ra, 0x20($sp) -/* 557FA0 80218BC0 AFB3001C */ sw $s3, 0x1c($sp) -/* 557FA4 80218BC4 AFB20018 */ sw $s2, 0x18($sp) -/* 557FA8 80218BC8 AFB00010 */ sw $s0, 0x10($sp) -/* 557FAC 80218BCC 8E30000C */ lw $s0, 0xc($s1) -/* 557FB0 80218BD0 8E050000 */ lw $a1, ($s0) -/* 557FB4 80218BD4 0C0B1EAF */ jal get_variable -/* 557FB8 80218BD8 26100004 */ addiu $s0, $s0, 4 -/* 557FBC 80218BDC 8E050000 */ lw $a1, ($s0) -/* 557FC0 80218BE0 26100004 */ addiu $s0, $s0, 4 -/* 557FC4 80218BE4 0220202D */ daddu $a0, $s1, $zero -/* 557FC8 80218BE8 0C0B1EAF */ jal get_variable -/* 557FCC 80218BEC 0040982D */ daddu $s3, $v0, $zero -/* 557FD0 80218BF0 8E050000 */ lw $a1, ($s0) -/* 557FD4 80218BF4 26100004 */ addiu $s0, $s0, 4 -/* 557FD8 80218BF8 0220202D */ daddu $a0, $s1, $zero -/* 557FDC 80218BFC 0C0B1EAF */ jal get_variable -/* 557FE0 80218C00 0040902D */ daddu $s2, $v0, $zero -/* 557FE4 80218C04 0220202D */ daddu $a0, $s1, $zero -/* 557FE8 80218C08 8E050000 */ lw $a1, ($s0) -/* 557FEC 80218C0C 0C0B1EAF */ jal get_variable -/* 557FF0 80218C10 0040802D */ daddu $s0, $v0, $zero -/* 557FF4 80218C14 8E240148 */ lw $a0, 0x148($s1) -/* 557FF8 80218C18 0C09A75B */ jal get_actor -/* 557FFC 80218C1C 0040882D */ daddu $s1, $v0, $zero -/* 558000 80218C20 0040182D */ daddu $v1, $v0, $zero -/* 558004 80218C24 8C620008 */ lw $v0, 8($v1) -/* 558008 80218C28 90420024 */ lbu $v0, 0x24($v0) -/* 55800C 80218C2C 8C640008 */ lw $a0, 8($v1) -/* 558010 80218C30 02629823 */ subu $s3, $s3, $v0 -/* 558014 80218C34 A0730194 */ sb $s3, 0x194($v1) -/* 558018 80218C38 90820025 */ lbu $v0, 0x25($a0) -/* 55801C 80218C3C 02429023 */ subu $s2, $s2, $v0 -/* 558020 80218C40 A0720195 */ sb $s2, 0x195($v1) -/* 558024 80218C44 90820026 */ lbu $v0, 0x26($a0) -/* 558028 80218C48 02028023 */ subu $s0, $s0, $v0 -/* 55802C 80218C4C A0700196 */ sb $s0, 0x196($v1) -/* 558030 80218C50 90840027 */ lbu $a0, 0x27($a0) -/* 558034 80218C54 02248823 */ subu $s1, $s1, $a0 -/* 558038 80218C58 A0710197 */ sb $s1, 0x197($v1) -/* 55803C 80218C5C 8FBF0020 */ lw $ra, 0x20($sp) -/* 558040 80218C60 8FB3001C */ lw $s3, 0x1c($sp) -/* 558044 80218C64 8FB20018 */ lw $s2, 0x18($sp) -/* 558048 80218C68 8FB10014 */ lw $s1, 0x14($sp) -/* 55804C 80218C6C 8FB00010 */ lw $s0, 0x10($sp) -/* 558050 80218C70 24020002 */ addiu $v0, $zero, 2 -/* 558054 80218C74 03E00008 */ jr $ra -/* 558058 80218C78 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/battle/area_omo3/5580C0/func_80218CE0_5580C0.s b/asm/nonmatchings/battle/area_omo3/5580C0/func_80218CE0_5580C0.s deleted file mode 100644 index 3d6edbcf43..0000000000 --- a/asm/nonmatchings/battle/area_omo3/5580C0/func_80218CE0_5580C0.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218CE0_5580C0 -/* 5580C0 80218CE0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 5580C4 80218CE4 AFB10014 */ sw $s1, 0x14($sp) -/* 5580C8 80218CE8 0080882D */ daddu $s1, $a0, $zero -/* 5580CC 80218CEC AFBF0020 */ sw $ra, 0x20($sp) -/* 5580D0 80218CF0 AFB3001C */ sw $s3, 0x1c($sp) -/* 5580D4 80218CF4 AFB20018 */ sw $s2, 0x18($sp) -/* 5580D8 80218CF8 AFB00010 */ sw $s0, 0x10($sp) -/* 5580DC 80218CFC 8E30000C */ lw $s0, 0xc($s1) -/* 5580E0 80218D00 8E050000 */ lw $a1, ($s0) -/* 5580E4 80218D04 0C0B1EAF */ jal get_variable -/* 5580E8 80218D08 26100004 */ addiu $s0, $s0, 4 -/* 5580EC 80218D0C 8E050000 */ lw $a1, ($s0) -/* 5580F0 80218D10 26100004 */ addiu $s0, $s0, 4 -/* 5580F4 80218D14 0220202D */ daddu $a0, $s1, $zero -/* 5580F8 80218D18 0C0B1EAF */ jal get_variable -/* 5580FC 80218D1C 0040982D */ daddu $s3, $v0, $zero -/* 558100 80218D20 8E050000 */ lw $a1, ($s0) -/* 558104 80218D24 26100004 */ addiu $s0, $s0, 4 -/* 558108 80218D28 0220202D */ daddu $a0, $s1, $zero -/* 55810C 80218D2C 0C0B1EAF */ jal get_variable -/* 558110 80218D30 0040902D */ daddu $s2, $v0, $zero -/* 558114 80218D34 0220202D */ daddu $a0, $s1, $zero -/* 558118 80218D38 8E050000 */ lw $a1, ($s0) -/* 55811C 80218D3C 0C0B1EAF */ jal get_variable -/* 558120 80218D40 0040802D */ daddu $s0, $v0, $zero -/* 558124 80218D44 8E240148 */ lw $a0, 0x148($s1) -/* 558128 80218D48 0C09A75B */ jal get_actor -/* 55812C 80218D4C 0040882D */ daddu $s1, $v0, $zero -/* 558130 80218D50 0040182D */ daddu $v1, $v0, $zero -/* 558134 80218D54 8C620008 */ lw $v0, 8($v1) -/* 558138 80218D58 90420024 */ lbu $v0, 0x24($v0) -/* 55813C 80218D5C 8C640008 */ lw $a0, 8($v1) -/* 558140 80218D60 02629823 */ subu $s3, $s3, $v0 -/* 558144 80218D64 A0730194 */ sb $s3, 0x194($v1) -/* 558148 80218D68 90820025 */ lbu $v0, 0x25($a0) -/* 55814C 80218D6C 02429023 */ subu $s2, $s2, $v0 -/* 558150 80218D70 A0720195 */ sb $s2, 0x195($v1) -/* 558154 80218D74 90820026 */ lbu $v0, 0x26($a0) -/* 558158 80218D78 02028023 */ subu $s0, $s0, $v0 -/* 55815C 80218D7C A0700196 */ sb $s0, 0x196($v1) -/* 558160 80218D80 90840027 */ lbu $a0, 0x27($a0) -/* 558164 80218D84 02248823 */ subu $s1, $s1, $a0 -/* 558168 80218D88 A0710197 */ sb $s1, 0x197($v1) -/* 55816C 80218D8C 8FBF0020 */ lw $ra, 0x20($sp) -/* 558170 80218D90 8FB3001C */ lw $s3, 0x1c($sp) -/* 558174 80218D94 8FB20018 */ lw $s2, 0x18($sp) -/* 558178 80218D98 8FB10014 */ lw $s1, 0x14($sp) -/* 55817C 80218D9C 8FB00010 */ lw $s0, 0x10($sp) -/* 558180 80218DA0 24020002 */ addiu $v0, $zero, 2 -/* 558184 80218DA4 03E00008 */ jr $ra -/* 558188 80218DA8 27BD0028 */ addiu $sp, $sp, 0x28 -/* 55818C 80218DAC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_pra/648E10/func_80218000_648E10.s b/asm/nonmatchings/battle/area_pra/648E10/func_80218000_648E10.s deleted file mode 100644 index 8d26f0eab7..0000000000 --- a/asm/nonmatchings/battle/area_pra/648E10/func_80218000_648E10.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218000_648E10 -/* 648E10 80218000 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 648E14 80218004 AFB10014 */ sw $s1, 0x14($sp) -/* 648E18 80218008 0080882D */ daddu $s1, $a0, $zero -/* 648E1C 8021800C AFBF0020 */ sw $ra, 0x20($sp) -/* 648E20 80218010 AFB3001C */ sw $s3, 0x1c($sp) -/* 648E24 80218014 AFB20018 */ sw $s2, 0x18($sp) -/* 648E28 80218018 AFB00010 */ sw $s0, 0x10($sp) -/* 648E2C 8021801C 8E30000C */ lw $s0, 0xc($s1) -/* 648E30 80218020 8E050000 */ lw $a1, ($s0) -/* 648E34 80218024 0C0B1EAF */ jal get_variable -/* 648E38 80218028 26100004 */ addiu $s0, $s0, 4 -/* 648E3C 8021802C 8E050000 */ lw $a1, ($s0) -/* 648E40 80218030 26100004 */ addiu $s0, $s0, 4 -/* 648E44 80218034 0220202D */ daddu $a0, $s1, $zero -/* 648E48 80218038 0C0B1EAF */ jal get_variable -/* 648E4C 8021803C 0040982D */ daddu $s3, $v0, $zero -/* 648E50 80218040 8E050000 */ lw $a1, ($s0) -/* 648E54 80218044 26100004 */ addiu $s0, $s0, 4 -/* 648E58 80218048 0220202D */ daddu $a0, $s1, $zero -/* 648E5C 8021804C 0C0B1EAF */ jal get_variable -/* 648E60 80218050 0040902D */ daddu $s2, $v0, $zero -/* 648E64 80218054 0220202D */ daddu $a0, $s1, $zero -/* 648E68 80218058 8E050000 */ lw $a1, ($s0) -/* 648E6C 8021805C 0C0B1EAF */ jal get_variable -/* 648E70 80218060 0040802D */ daddu $s0, $v0, $zero -/* 648E74 80218064 8E240148 */ lw $a0, 0x148($s1) -/* 648E78 80218068 0C09A75B */ jal get_actor -/* 648E7C 8021806C 0040882D */ daddu $s1, $v0, $zero -/* 648E80 80218070 0040182D */ daddu $v1, $v0, $zero -/* 648E84 80218074 8C620008 */ lw $v0, 8($v1) -/* 648E88 80218078 90420024 */ lbu $v0, 0x24($v0) -/* 648E8C 8021807C 8C640008 */ lw $a0, 8($v1) -/* 648E90 80218080 02629823 */ subu $s3, $s3, $v0 -/* 648E94 80218084 A0730194 */ sb $s3, 0x194($v1) -/* 648E98 80218088 90820025 */ lbu $v0, 0x25($a0) -/* 648E9C 8021808C 02429023 */ subu $s2, $s2, $v0 -/* 648EA0 80218090 A0720195 */ sb $s2, 0x195($v1) -/* 648EA4 80218094 90820026 */ lbu $v0, 0x26($a0) -/* 648EA8 80218098 02028023 */ subu $s0, $s0, $v0 -/* 648EAC 8021809C A0700196 */ sb $s0, 0x196($v1) -/* 648EB0 802180A0 90840027 */ lbu $a0, 0x27($a0) -/* 648EB4 802180A4 02248823 */ subu $s1, $s1, $a0 -/* 648EB8 802180A8 A0710197 */ sb $s1, 0x197($v1) -/* 648EBC 802180AC 8FBF0020 */ lw $ra, 0x20($sp) -/* 648EC0 802180B0 8FB3001C */ lw $s3, 0x1c($sp) -/* 648EC4 802180B4 8FB20018 */ lw $s2, 0x18($sp) -/* 648EC8 802180B8 8FB10014 */ lw $s1, 0x14($sp) -/* 648ECC 802180BC 8FB00010 */ lw $s0, 0x10($sp) -/* 648ED0 802180C0 24020002 */ addiu $v0, $zero, 2 -/* 648ED4 802180C4 03E00008 */ jr $ra -/* 648ED8 802180C8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/battle/area_pra/649050/func_80218484_649294.s b/asm/nonmatchings/battle/area_pra/649050/func_80218484_649294.s deleted file mode 100644 index d47dd4ba37..0000000000 --- a/asm/nonmatchings/battle/area_pra/649050/func_80218484_649294.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218484_649294 -/* 649294 80218484 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 649298 80218488 AFB10014 */ sw $s1, 0x14($sp) -/* 64929C 8021848C 0080882D */ daddu $s1, $a0, $zero -/* 6492A0 80218490 AFBF0020 */ sw $ra, 0x20($sp) -/* 6492A4 80218494 AFB3001C */ sw $s3, 0x1c($sp) -/* 6492A8 80218498 AFB20018 */ sw $s2, 0x18($sp) -/* 6492AC 8021849C AFB00010 */ sw $s0, 0x10($sp) -/* 6492B0 802184A0 8E30000C */ lw $s0, 0xc($s1) -/* 6492B4 802184A4 8E050000 */ lw $a1, ($s0) -/* 6492B8 802184A8 0C0B1EAF */ jal get_variable -/* 6492BC 802184AC 26100004 */ addiu $s0, $s0, 4 -/* 6492C0 802184B0 8E050000 */ lw $a1, ($s0) -/* 6492C4 802184B4 26100004 */ addiu $s0, $s0, 4 -/* 6492C8 802184B8 0220202D */ daddu $a0, $s1, $zero -/* 6492CC 802184BC 0C0B1EAF */ jal get_variable -/* 6492D0 802184C0 0040982D */ daddu $s3, $v0, $zero -/* 6492D4 802184C4 8E050000 */ lw $a1, ($s0) -/* 6492D8 802184C8 26100004 */ addiu $s0, $s0, 4 -/* 6492DC 802184CC 0220202D */ daddu $a0, $s1, $zero -/* 6492E0 802184D0 0C0B1EAF */ jal get_variable -/* 6492E4 802184D4 0040902D */ daddu $s2, $v0, $zero -/* 6492E8 802184D8 0220202D */ daddu $a0, $s1, $zero -/* 6492EC 802184DC 8E050000 */ lw $a1, ($s0) -/* 6492F0 802184E0 0C0B1EAF */ jal get_variable -/* 6492F4 802184E4 0040802D */ daddu $s0, $v0, $zero -/* 6492F8 802184E8 8E240148 */ lw $a0, 0x148($s1) -/* 6492FC 802184EC 0C09A75B */ jal get_actor -/* 649300 802184F0 0040882D */ daddu $s1, $v0, $zero -/* 649304 802184F4 0040182D */ daddu $v1, $v0, $zero -/* 649308 802184F8 8C620008 */ lw $v0, 8($v1) -/* 64930C 802184FC 90420024 */ lbu $v0, 0x24($v0) -/* 649310 80218500 8C640008 */ lw $a0, 8($v1) -/* 649314 80218504 02629823 */ subu $s3, $s3, $v0 -/* 649318 80218508 A0730194 */ sb $s3, 0x194($v1) -/* 64931C 8021850C 90820025 */ lbu $v0, 0x25($a0) -/* 649320 80218510 02429023 */ subu $s2, $s2, $v0 -/* 649324 80218514 A0720195 */ sb $s2, 0x195($v1) -/* 649328 80218518 90820026 */ lbu $v0, 0x26($a0) -/* 64932C 8021851C 02028023 */ subu $s0, $s0, $v0 -/* 649330 80218520 A0700196 */ sb $s0, 0x196($v1) -/* 649334 80218524 90840027 */ lbu $a0, 0x27($a0) -/* 649338 80218528 02248823 */ subu $s1, $s1, $a0 -/* 64933C 8021852C A0710197 */ sb $s1, 0x197($v1) -/* 649340 80218530 8FBF0020 */ lw $ra, 0x20($sp) -/* 649344 80218534 8FB3001C */ lw $s3, 0x1c($sp) -/* 649348 80218538 8FB20018 */ lw $s2, 0x18($sp) -/* 64934C 8021853C 8FB10014 */ lw $s1, 0x14($sp) -/* 649350 80218540 8FB00010 */ lw $s0, 0x10($sp) -/* 649354 80218544 24020002 */ addiu $v0, $zero, 2 -/* 649358 80218548 03E00008 */ jr $ra -/* 64935C 8021854C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/battle/area_pra/649050/func_802187F4_649604.s b/asm/nonmatchings/battle/area_pra/649050/func_802187F4_649604.s deleted file mode 100644 index 30f5698c3a..0000000000 --- a/asm/nonmatchings/battle/area_pra/649050/func_802187F4_649604.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802187F4_649604 -/* 649604 802187F4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 649608 802187F8 AFB10014 */ sw $s1, 0x14($sp) -/* 64960C 802187FC 0080882D */ daddu $s1, $a0, $zero -/* 649610 80218800 AFBF0020 */ sw $ra, 0x20($sp) -/* 649614 80218804 AFB3001C */ sw $s3, 0x1c($sp) -/* 649618 80218808 AFB20018 */ sw $s2, 0x18($sp) -/* 64961C 8021880C AFB00010 */ sw $s0, 0x10($sp) -/* 649620 80218810 8E30000C */ lw $s0, 0xc($s1) -/* 649624 80218814 8E050000 */ lw $a1, ($s0) -/* 649628 80218818 0C0B1EAF */ jal get_variable -/* 64962C 8021881C 26100004 */ addiu $s0, $s0, 4 -/* 649630 80218820 8E050000 */ lw $a1, ($s0) -/* 649634 80218824 26100004 */ addiu $s0, $s0, 4 -/* 649638 80218828 0220202D */ daddu $a0, $s1, $zero -/* 64963C 8021882C 0C0B1EAF */ jal get_variable -/* 649640 80218830 0040982D */ daddu $s3, $v0, $zero -/* 649644 80218834 8E050000 */ lw $a1, ($s0) -/* 649648 80218838 26100004 */ addiu $s0, $s0, 4 -/* 64964C 8021883C 0220202D */ daddu $a0, $s1, $zero -/* 649650 80218840 0C0B1EAF */ jal get_variable -/* 649654 80218844 0040902D */ daddu $s2, $v0, $zero -/* 649658 80218848 0220202D */ daddu $a0, $s1, $zero -/* 64965C 8021884C 8E050000 */ lw $a1, ($s0) -/* 649660 80218850 0C0B1EAF */ jal get_variable -/* 649664 80218854 0040802D */ daddu $s0, $v0, $zero -/* 649668 80218858 8E240148 */ lw $a0, 0x148($s1) -/* 64966C 8021885C 0C09A75B */ jal get_actor -/* 649670 80218860 0040882D */ daddu $s1, $v0, $zero -/* 649674 80218864 0040182D */ daddu $v1, $v0, $zero -/* 649678 80218868 8C620008 */ lw $v0, 8($v1) -/* 64967C 8021886C 90420024 */ lbu $v0, 0x24($v0) -/* 649680 80218870 8C640008 */ lw $a0, 8($v1) -/* 649684 80218874 02629823 */ subu $s3, $s3, $v0 -/* 649688 80218878 A0730194 */ sb $s3, 0x194($v1) -/* 64968C 8021887C 90820025 */ lbu $v0, 0x25($a0) -/* 649690 80218880 02429023 */ subu $s2, $s2, $v0 -/* 649694 80218884 A0720195 */ sb $s2, 0x195($v1) -/* 649698 80218888 90820026 */ lbu $v0, 0x26($a0) -/* 64969C 8021888C 02028023 */ subu $s0, $s0, $v0 -/* 6496A0 80218890 A0700196 */ sb $s0, 0x196($v1) -/* 6496A4 80218894 90840027 */ lbu $a0, 0x27($a0) -/* 6496A8 80218898 02248823 */ subu $s1, $s1, $a0 -/* 6496AC 8021889C A0710197 */ sb $s1, 0x197($v1) -/* 6496B0 802188A0 8FBF0020 */ lw $ra, 0x20($sp) -/* 6496B4 802188A4 8FB3001C */ lw $s3, 0x1c($sp) -/* 6496B8 802188A8 8FB20018 */ lw $s2, 0x18($sp) -/* 6496BC 802188AC 8FB10014 */ lw $s1, 0x14($sp) -/* 6496C0 802188B0 8FB00010 */ lw $s0, 0x10($sp) -/* 6496C4 802188B4 24020002 */ addiu $v0, $zero, 2 -/* 6496C8 802188B8 03E00008 */ jr $ra -/* 6496CC 802188BC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/battle/area_pra/649050/func_80218B64_649974.s b/asm/nonmatchings/battle/area_pra/649050/func_80218B64_649974.s deleted file mode 100644 index 142f7a5fae..0000000000 --- a/asm/nonmatchings/battle/area_pra/649050/func_80218B64_649974.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218B64_649974 -/* 649974 80218B64 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 649978 80218B68 AFB10014 */ sw $s1, 0x14($sp) -/* 64997C 80218B6C 0080882D */ daddu $s1, $a0, $zero -/* 649980 80218B70 AFBF0020 */ sw $ra, 0x20($sp) -/* 649984 80218B74 AFB3001C */ sw $s3, 0x1c($sp) -/* 649988 80218B78 AFB20018 */ sw $s2, 0x18($sp) -/* 64998C 80218B7C AFB00010 */ sw $s0, 0x10($sp) -/* 649990 80218B80 8E30000C */ lw $s0, 0xc($s1) -/* 649994 80218B84 8E050000 */ lw $a1, ($s0) -/* 649998 80218B88 0C0B1EAF */ jal get_variable -/* 64999C 80218B8C 26100004 */ addiu $s0, $s0, 4 -/* 6499A0 80218B90 8E050000 */ lw $a1, ($s0) -/* 6499A4 80218B94 26100004 */ addiu $s0, $s0, 4 -/* 6499A8 80218B98 0220202D */ daddu $a0, $s1, $zero -/* 6499AC 80218B9C 0C0B1EAF */ jal get_variable -/* 6499B0 80218BA0 0040982D */ daddu $s3, $v0, $zero -/* 6499B4 80218BA4 8E050000 */ lw $a1, ($s0) -/* 6499B8 80218BA8 26100004 */ addiu $s0, $s0, 4 -/* 6499BC 80218BAC 0220202D */ daddu $a0, $s1, $zero -/* 6499C0 80218BB0 0C0B1EAF */ jal get_variable -/* 6499C4 80218BB4 0040902D */ daddu $s2, $v0, $zero -/* 6499C8 80218BB8 0220202D */ daddu $a0, $s1, $zero -/* 6499CC 80218BBC 8E050000 */ lw $a1, ($s0) -/* 6499D0 80218BC0 0C0B1EAF */ jal get_variable -/* 6499D4 80218BC4 0040802D */ daddu $s0, $v0, $zero -/* 6499D8 80218BC8 8E240148 */ lw $a0, 0x148($s1) -/* 6499DC 80218BCC 0C09A75B */ jal get_actor -/* 6499E0 80218BD0 0040882D */ daddu $s1, $v0, $zero -/* 6499E4 80218BD4 0040182D */ daddu $v1, $v0, $zero -/* 6499E8 80218BD8 8C620008 */ lw $v0, 8($v1) -/* 6499EC 80218BDC 90420024 */ lbu $v0, 0x24($v0) -/* 6499F0 80218BE0 8C640008 */ lw $a0, 8($v1) -/* 6499F4 80218BE4 02629823 */ subu $s3, $s3, $v0 -/* 6499F8 80218BE8 A0730194 */ sb $s3, 0x194($v1) -/* 6499FC 80218BEC 90820025 */ lbu $v0, 0x25($a0) -/* 649A00 80218BF0 02429023 */ subu $s2, $s2, $v0 -/* 649A04 80218BF4 A0720195 */ sb $s2, 0x195($v1) -/* 649A08 80218BF8 90820026 */ lbu $v0, 0x26($a0) -/* 649A0C 80218BFC 02028023 */ subu $s0, $s0, $v0 -/* 649A10 80218C00 A0700196 */ sb $s0, 0x196($v1) -/* 649A14 80218C04 90840027 */ lbu $a0, 0x27($a0) -/* 649A18 80218C08 02248823 */ subu $s1, $s1, $a0 -/* 649A1C 80218C0C A0710197 */ sb $s1, 0x197($v1) -/* 649A20 80218C10 8FBF0020 */ lw $ra, 0x20($sp) -/* 649A24 80218C14 8FB3001C */ lw $s3, 0x1c($sp) -/* 649A28 80218C18 8FB20018 */ lw $s2, 0x18($sp) -/* 649A2C 80218C1C 8FB10014 */ lw $s1, 0x14($sp) -/* 649A30 80218C20 8FB00010 */ lw $s0, 0x10($sp) -/* 649A34 80218C24 24020002 */ addiu $v0, $zero, 2 -/* 649A38 80218C28 03E00008 */ jr $ra -/* 649A3C 80218C2C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/battle/area_pra/649050/func_80218ED4_649CE4.s b/asm/nonmatchings/battle/area_pra/649050/func_80218ED4_649CE4.s deleted file mode 100644 index 78cf3967d9..0000000000 --- a/asm/nonmatchings/battle/area_pra/649050/func_80218ED4_649CE4.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218ED4_649CE4 -/* 649CE4 80218ED4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 649CE8 80218ED8 AFB10014 */ sw $s1, 0x14($sp) -/* 649CEC 80218EDC 0080882D */ daddu $s1, $a0, $zero -/* 649CF0 80218EE0 AFBF0020 */ sw $ra, 0x20($sp) -/* 649CF4 80218EE4 AFB3001C */ sw $s3, 0x1c($sp) -/* 649CF8 80218EE8 AFB20018 */ sw $s2, 0x18($sp) -/* 649CFC 80218EEC AFB00010 */ sw $s0, 0x10($sp) -/* 649D00 80218EF0 8E30000C */ lw $s0, 0xc($s1) -/* 649D04 80218EF4 8E050000 */ lw $a1, ($s0) -/* 649D08 80218EF8 0C0B1EAF */ jal get_variable -/* 649D0C 80218EFC 26100004 */ addiu $s0, $s0, 4 -/* 649D10 80218F00 8E050000 */ lw $a1, ($s0) -/* 649D14 80218F04 26100004 */ addiu $s0, $s0, 4 -/* 649D18 80218F08 0220202D */ daddu $a0, $s1, $zero -/* 649D1C 80218F0C 0C0B1EAF */ jal get_variable -/* 649D20 80218F10 0040982D */ daddu $s3, $v0, $zero -/* 649D24 80218F14 8E050000 */ lw $a1, ($s0) -/* 649D28 80218F18 26100004 */ addiu $s0, $s0, 4 -/* 649D2C 80218F1C 0220202D */ daddu $a0, $s1, $zero -/* 649D30 80218F20 0C0B1EAF */ jal get_variable -/* 649D34 80218F24 0040902D */ daddu $s2, $v0, $zero -/* 649D38 80218F28 0220202D */ daddu $a0, $s1, $zero -/* 649D3C 80218F2C 8E050000 */ lw $a1, ($s0) -/* 649D40 80218F30 0C0B1EAF */ jal get_variable -/* 649D44 80218F34 0040802D */ daddu $s0, $v0, $zero -/* 649D48 80218F38 8E240148 */ lw $a0, 0x148($s1) -/* 649D4C 80218F3C 0C09A75B */ jal get_actor -/* 649D50 80218F40 0040882D */ daddu $s1, $v0, $zero -/* 649D54 80218F44 0040182D */ daddu $v1, $v0, $zero -/* 649D58 80218F48 8C620008 */ lw $v0, 8($v1) -/* 649D5C 80218F4C 90420024 */ lbu $v0, 0x24($v0) -/* 649D60 80218F50 8C640008 */ lw $a0, 8($v1) -/* 649D64 80218F54 02629823 */ subu $s3, $s3, $v0 -/* 649D68 80218F58 A0730194 */ sb $s3, 0x194($v1) -/* 649D6C 80218F5C 90820025 */ lbu $v0, 0x25($a0) -/* 649D70 80218F60 02429023 */ subu $s2, $s2, $v0 -/* 649D74 80218F64 A0720195 */ sb $s2, 0x195($v1) -/* 649D78 80218F68 90820026 */ lbu $v0, 0x26($a0) -/* 649D7C 80218F6C 02028023 */ subu $s0, $s0, $v0 -/* 649D80 80218F70 A0700196 */ sb $s0, 0x196($v1) -/* 649D84 80218F74 90840027 */ lbu $a0, 0x27($a0) -/* 649D88 80218F78 02248823 */ subu $s1, $s1, $a0 -/* 649D8C 80218F7C A0710197 */ sb $s1, 0x197($v1) -/* 649D90 80218F80 8FBF0020 */ lw $ra, 0x20($sp) -/* 649D94 80218F84 8FB3001C */ lw $s3, 0x1c($sp) -/* 649D98 80218F88 8FB20018 */ lw $s2, 0x18($sp) -/* 649D9C 80218F8C 8FB10014 */ lw $s1, 0x14($sp) -/* 649DA0 80218F90 8FB00010 */ lw $s0, 0x10($sp) -/* 649DA4 80218F94 24020002 */ addiu $v0, $zero, 2 -/* 649DA8 80218F98 03E00008 */ jr $ra -/* 649DAC 80218F9C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/battle/area_pra/649050/func_80219244_64A054.s b/asm/nonmatchings/battle/area_pra/649050/func_80219244_64A054.s deleted file mode 100644 index 15cf65a0bf..0000000000 --- a/asm/nonmatchings/battle/area_pra/649050/func_80219244_64A054.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80219244_64A054 -/* 64A054 80219244 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 64A058 80219248 AFB10014 */ sw $s1, 0x14($sp) -/* 64A05C 8021924C 0080882D */ daddu $s1, $a0, $zero -/* 64A060 80219250 AFBF0020 */ sw $ra, 0x20($sp) -/* 64A064 80219254 AFB3001C */ sw $s3, 0x1c($sp) -/* 64A068 80219258 AFB20018 */ sw $s2, 0x18($sp) -/* 64A06C 8021925C AFB00010 */ sw $s0, 0x10($sp) -/* 64A070 80219260 8E30000C */ lw $s0, 0xc($s1) -/* 64A074 80219264 8E050000 */ lw $a1, ($s0) -/* 64A078 80219268 0C0B1EAF */ jal get_variable -/* 64A07C 8021926C 26100004 */ addiu $s0, $s0, 4 -/* 64A080 80219270 8E050000 */ lw $a1, ($s0) -/* 64A084 80219274 26100004 */ addiu $s0, $s0, 4 -/* 64A088 80219278 0220202D */ daddu $a0, $s1, $zero -/* 64A08C 8021927C 0C0B1EAF */ jal get_variable -/* 64A090 80219280 0040982D */ daddu $s3, $v0, $zero -/* 64A094 80219284 8E050000 */ lw $a1, ($s0) -/* 64A098 80219288 26100004 */ addiu $s0, $s0, 4 -/* 64A09C 8021928C 0220202D */ daddu $a0, $s1, $zero -/* 64A0A0 80219290 0C0B1EAF */ jal get_variable -/* 64A0A4 80219294 0040902D */ daddu $s2, $v0, $zero -/* 64A0A8 80219298 0220202D */ daddu $a0, $s1, $zero -/* 64A0AC 8021929C 8E050000 */ lw $a1, ($s0) -/* 64A0B0 802192A0 0C0B1EAF */ jal get_variable -/* 64A0B4 802192A4 0040802D */ daddu $s0, $v0, $zero -/* 64A0B8 802192A8 8E240148 */ lw $a0, 0x148($s1) -/* 64A0BC 802192AC 0C09A75B */ jal get_actor -/* 64A0C0 802192B0 0040882D */ daddu $s1, $v0, $zero -/* 64A0C4 802192B4 0040182D */ daddu $v1, $v0, $zero -/* 64A0C8 802192B8 8C620008 */ lw $v0, 8($v1) -/* 64A0CC 802192BC 90420024 */ lbu $v0, 0x24($v0) -/* 64A0D0 802192C0 8C640008 */ lw $a0, 8($v1) -/* 64A0D4 802192C4 02629823 */ subu $s3, $s3, $v0 -/* 64A0D8 802192C8 A0730194 */ sb $s3, 0x194($v1) -/* 64A0DC 802192CC 90820025 */ lbu $v0, 0x25($a0) -/* 64A0E0 802192D0 02429023 */ subu $s2, $s2, $v0 -/* 64A0E4 802192D4 A0720195 */ sb $s2, 0x195($v1) -/* 64A0E8 802192D8 90820026 */ lbu $v0, 0x26($a0) -/* 64A0EC 802192DC 02028023 */ subu $s0, $s0, $v0 -/* 64A0F0 802192E0 A0700196 */ sb $s0, 0x196($v1) -/* 64A0F4 802192E4 90840027 */ lbu $a0, 0x27($a0) -/* 64A0F8 802192E8 02248823 */ subu $s1, $s1, $a0 -/* 64A0FC 802192EC A0710197 */ sb $s1, 0x197($v1) -/* 64A100 802192F0 8FBF0020 */ lw $ra, 0x20($sp) -/* 64A104 802192F4 8FB3001C */ lw $s3, 0x1c($sp) -/* 64A108 802192F8 8FB20018 */ lw $s2, 0x18($sp) -/* 64A10C 802192FC 8FB10014 */ lw $s1, 0x14($sp) -/* 64A110 80219300 8FB00010 */ lw $s0, 0x10($sp) -/* 64A114 80219304 24020002 */ addiu $v0, $zero, 2 -/* 64A118 80219308 03E00008 */ jr $ra -/* 64A11C 8021930C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/battle/area_pra3/669D80/func_80218B74_66A8F4.s b/asm/nonmatchings/battle/area_pra3/669D80/func_80218B74_66A8F4.s deleted file mode 100644 index a75248e5de..0000000000 --- a/asm/nonmatchings/battle/area_pra3/669D80/func_80218B74_66A8F4.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218B74_66A8F4 -/* 66A8F4 80218B74 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 66A8F8 80218B78 AFB10014 */ sw $s1, 0x14($sp) -/* 66A8FC 80218B7C 0080882D */ daddu $s1, $a0, $zero -/* 66A900 80218B80 AFBF0020 */ sw $ra, 0x20($sp) -/* 66A904 80218B84 AFB3001C */ sw $s3, 0x1c($sp) -/* 66A908 80218B88 AFB20018 */ sw $s2, 0x18($sp) -/* 66A90C 80218B8C AFB00010 */ sw $s0, 0x10($sp) -/* 66A910 80218B90 8E30000C */ lw $s0, 0xc($s1) -/* 66A914 80218B94 8E050000 */ lw $a1, ($s0) -/* 66A918 80218B98 0C0B1EAF */ jal get_variable -/* 66A91C 80218B9C 26100004 */ addiu $s0, $s0, 4 -/* 66A920 80218BA0 8E050000 */ lw $a1, ($s0) -/* 66A924 80218BA4 26100004 */ addiu $s0, $s0, 4 -/* 66A928 80218BA8 0220202D */ daddu $a0, $s1, $zero -/* 66A92C 80218BAC 0C0B1EAF */ jal get_variable -/* 66A930 80218BB0 0040982D */ daddu $s3, $v0, $zero -/* 66A934 80218BB4 8E050000 */ lw $a1, ($s0) -/* 66A938 80218BB8 26100004 */ addiu $s0, $s0, 4 -/* 66A93C 80218BBC 0220202D */ daddu $a0, $s1, $zero -/* 66A940 80218BC0 0C0B1EAF */ jal get_variable -/* 66A944 80218BC4 0040902D */ daddu $s2, $v0, $zero -/* 66A948 80218BC8 0220202D */ daddu $a0, $s1, $zero -/* 66A94C 80218BCC 8E050000 */ lw $a1, ($s0) -/* 66A950 80218BD0 0C0B1EAF */ jal get_variable -/* 66A954 80218BD4 0040802D */ daddu $s0, $v0, $zero -/* 66A958 80218BD8 8E240148 */ lw $a0, 0x148($s1) -/* 66A95C 80218BDC 0C09A75B */ jal get_actor -/* 66A960 80218BE0 0040882D */ daddu $s1, $v0, $zero -/* 66A964 80218BE4 0040182D */ daddu $v1, $v0, $zero -/* 66A968 80218BE8 8C620008 */ lw $v0, 8($v1) -/* 66A96C 80218BEC 90420024 */ lbu $v0, 0x24($v0) -/* 66A970 80218BF0 8C640008 */ lw $a0, 8($v1) -/* 66A974 80218BF4 02629823 */ subu $s3, $s3, $v0 -/* 66A978 80218BF8 A0730194 */ sb $s3, 0x194($v1) -/* 66A97C 80218BFC 90820025 */ lbu $v0, 0x25($a0) -/* 66A980 80218C00 02429023 */ subu $s2, $s2, $v0 -/* 66A984 80218C04 A0720195 */ sb $s2, 0x195($v1) -/* 66A988 80218C08 90820026 */ lbu $v0, 0x26($a0) -/* 66A98C 80218C0C 02028023 */ subu $s0, $s0, $v0 -/* 66A990 80218C10 A0700196 */ sb $s0, 0x196($v1) -/* 66A994 80218C14 90840027 */ lbu $a0, 0x27($a0) -/* 66A998 80218C18 02248823 */ subu $s1, $s1, $a0 -/* 66A99C 80218C1C A0710197 */ sb $s1, 0x197($v1) -/* 66A9A0 80218C20 8FBF0020 */ lw $ra, 0x20($sp) -/* 66A9A4 80218C24 8FB3001C */ lw $s3, 0x1c($sp) -/* 66A9A8 80218C28 8FB20018 */ lw $s2, 0x18($sp) -/* 66A9AC 80218C2C 8FB10014 */ lw $s1, 0x14($sp) -/* 66A9B0 80218C30 8FB00010 */ lw $s0, 0x10($sp) -/* 66A9B4 80218C34 24020002 */ addiu $v0, $zero, 2 -/* 66A9B8 80218C38 03E00008 */ jr $ra -/* 66A9BC 80218C3C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/battle/area_pra3/669D80/func_802195F0_66B370.s b/asm/nonmatchings/battle/area_pra3/669D80/func_802195F0_66B370.s deleted file mode 100644 index 0b95eef18b..0000000000 --- a/asm/nonmatchings/battle/area_pra3/669D80/func_802195F0_66B370.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802195F0_66B370 -/* 66B370 802195F0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 66B374 802195F4 AFB10014 */ sw $s1, 0x14($sp) -/* 66B378 802195F8 0080882D */ daddu $s1, $a0, $zero -/* 66B37C 802195FC AFBF0020 */ sw $ra, 0x20($sp) -/* 66B380 80219600 AFB3001C */ sw $s3, 0x1c($sp) -/* 66B384 80219604 AFB20018 */ sw $s2, 0x18($sp) -/* 66B388 80219608 AFB00010 */ sw $s0, 0x10($sp) -/* 66B38C 8021960C 8E30000C */ lw $s0, 0xc($s1) -/* 66B390 80219610 8E050000 */ lw $a1, ($s0) -/* 66B394 80219614 0C0B1EAF */ jal get_variable -/* 66B398 80219618 26100004 */ addiu $s0, $s0, 4 -/* 66B39C 8021961C 8E050000 */ lw $a1, ($s0) -/* 66B3A0 80219620 26100004 */ addiu $s0, $s0, 4 -/* 66B3A4 80219624 0220202D */ daddu $a0, $s1, $zero -/* 66B3A8 80219628 0C0B1EAF */ jal get_variable -/* 66B3AC 8021962C 0040982D */ daddu $s3, $v0, $zero -/* 66B3B0 80219630 8E050000 */ lw $a1, ($s0) -/* 66B3B4 80219634 26100004 */ addiu $s0, $s0, 4 -/* 66B3B8 80219638 0220202D */ daddu $a0, $s1, $zero -/* 66B3BC 8021963C 0C0B1EAF */ jal get_variable -/* 66B3C0 80219640 0040902D */ daddu $s2, $v0, $zero -/* 66B3C4 80219644 0220202D */ daddu $a0, $s1, $zero -/* 66B3C8 80219648 8E050000 */ lw $a1, ($s0) -/* 66B3CC 8021964C 0C0B1EAF */ jal get_variable -/* 66B3D0 80219650 0040802D */ daddu $s0, $v0, $zero -/* 66B3D4 80219654 8E240148 */ lw $a0, 0x148($s1) -/* 66B3D8 80219658 0C09A75B */ jal get_actor -/* 66B3DC 8021965C 0040882D */ daddu $s1, $v0, $zero -/* 66B3E0 80219660 0040182D */ daddu $v1, $v0, $zero -/* 66B3E4 80219664 8C620008 */ lw $v0, 8($v1) -/* 66B3E8 80219668 90420024 */ lbu $v0, 0x24($v0) -/* 66B3EC 8021966C 8C640008 */ lw $a0, 8($v1) -/* 66B3F0 80219670 02629823 */ subu $s3, $s3, $v0 -/* 66B3F4 80219674 A0730194 */ sb $s3, 0x194($v1) -/* 66B3F8 80219678 90820025 */ lbu $v0, 0x25($a0) -/* 66B3FC 8021967C 02429023 */ subu $s2, $s2, $v0 -/* 66B400 80219680 A0720195 */ sb $s2, 0x195($v1) -/* 66B404 80219684 90820026 */ lbu $v0, 0x26($a0) -/* 66B408 80219688 02028023 */ subu $s0, $s0, $v0 -/* 66B40C 8021968C A0700196 */ sb $s0, 0x196($v1) -/* 66B410 80219690 90840027 */ lbu $a0, 0x27($a0) -/* 66B414 80219694 02248823 */ subu $s1, $s1, $a0 -/* 66B418 80219698 A0710197 */ sb $s1, 0x197($v1) -/* 66B41C 8021969C 8FBF0020 */ lw $ra, 0x20($sp) -/* 66B420 802196A0 8FB3001C */ lw $s3, 0x1c($sp) -/* 66B424 802196A4 8FB20018 */ lw $s2, 0x18($sp) -/* 66B428 802196A8 8FB10014 */ lw $s1, 0x14($sp) -/* 66B42C 802196AC 8FB00010 */ lw $s0, 0x10($sp) -/* 66B430 802196B0 24020002 */ addiu $v0, $zero, 2 -/* 66B434 802196B4 03E00008 */ jr $ra -/* 66B438 802196B8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/battle/area_pra3/66B5B0/func_802199B4_66B734.s b/asm/nonmatchings/battle/area_pra3/66B5B0/func_802199B4_66B734.s deleted file mode 100644 index 2da291848b..0000000000 --- a/asm/nonmatchings/battle/area_pra3/66B5B0/func_802199B4_66B734.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802199B4_66B734 -/* 66B734 802199B4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 66B738 802199B8 AFB10014 */ sw $s1, 0x14($sp) -/* 66B73C 802199BC 0080882D */ daddu $s1, $a0, $zero -/* 66B740 802199C0 AFBF0020 */ sw $ra, 0x20($sp) -/* 66B744 802199C4 AFB3001C */ sw $s3, 0x1c($sp) -/* 66B748 802199C8 AFB20018 */ sw $s2, 0x18($sp) -/* 66B74C 802199CC AFB00010 */ sw $s0, 0x10($sp) -/* 66B750 802199D0 8E30000C */ lw $s0, 0xc($s1) -/* 66B754 802199D4 8E050000 */ lw $a1, ($s0) -/* 66B758 802199D8 0C0B1EAF */ jal get_variable -/* 66B75C 802199DC 26100004 */ addiu $s0, $s0, 4 -/* 66B760 802199E0 8E050000 */ lw $a1, ($s0) -/* 66B764 802199E4 26100004 */ addiu $s0, $s0, 4 -/* 66B768 802199E8 0220202D */ daddu $a0, $s1, $zero -/* 66B76C 802199EC 0C0B1EAF */ jal get_variable -/* 66B770 802199F0 0040982D */ daddu $s3, $v0, $zero -/* 66B774 802199F4 8E050000 */ lw $a1, ($s0) -/* 66B778 802199F8 26100004 */ addiu $s0, $s0, 4 -/* 66B77C 802199FC 0220202D */ daddu $a0, $s1, $zero -/* 66B780 80219A00 0C0B1EAF */ jal get_variable -/* 66B784 80219A04 0040902D */ daddu $s2, $v0, $zero -/* 66B788 80219A08 0220202D */ daddu $a0, $s1, $zero -/* 66B78C 80219A0C 8E050000 */ lw $a1, ($s0) -/* 66B790 80219A10 0C0B1EAF */ jal get_variable -/* 66B794 80219A14 0040802D */ daddu $s0, $v0, $zero -/* 66B798 80219A18 8E240148 */ lw $a0, 0x148($s1) -/* 66B79C 80219A1C 0C09A75B */ jal get_actor -/* 66B7A0 80219A20 0040882D */ daddu $s1, $v0, $zero -/* 66B7A4 80219A24 0040182D */ daddu $v1, $v0, $zero -/* 66B7A8 80219A28 8C620008 */ lw $v0, 8($v1) -/* 66B7AC 80219A2C 90420024 */ lbu $v0, 0x24($v0) -/* 66B7B0 80219A30 8C640008 */ lw $a0, 8($v1) -/* 66B7B4 80219A34 02629823 */ subu $s3, $s3, $v0 -/* 66B7B8 80219A38 A0730194 */ sb $s3, 0x194($v1) -/* 66B7BC 80219A3C 90820025 */ lbu $v0, 0x25($a0) -/* 66B7C0 80219A40 02429023 */ subu $s2, $s2, $v0 -/* 66B7C4 80219A44 A0720195 */ sb $s2, 0x195($v1) -/* 66B7C8 80219A48 90820026 */ lbu $v0, 0x26($a0) -/* 66B7CC 80219A4C 02028023 */ subu $s0, $s0, $v0 -/* 66B7D0 80219A50 A0700196 */ sb $s0, 0x196($v1) -/* 66B7D4 80219A54 90840027 */ lbu $a0, 0x27($a0) -/* 66B7D8 80219A58 02248823 */ subu $s1, $s1, $a0 -/* 66B7DC 80219A5C A0710197 */ sb $s1, 0x197($v1) -/* 66B7E0 80219A60 8FBF0020 */ lw $ra, 0x20($sp) -/* 66B7E4 80219A64 8FB3001C */ lw $s3, 0x1c($sp) -/* 66B7E8 80219A68 8FB20018 */ lw $s2, 0x18($sp) -/* 66B7EC 80219A6C 8FB10014 */ lw $s1, 0x14($sp) -/* 66B7F0 80219A70 8FB00010 */ lw $s0, 0x10($sp) -/* 66B7F4 80219A74 24020002 */ addiu $v0, $zero, 2 -/* 66B7F8 80219A78 03E00008 */ jr $ra -/* 66B7FC 80219A7C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/battle/area_pra3/66B5B0/func_80219D24_66BAA4.s b/asm/nonmatchings/battle/area_pra3/66B5B0/func_80219D24_66BAA4.s deleted file mode 100644 index 8889584940..0000000000 --- a/asm/nonmatchings/battle/area_pra3/66B5B0/func_80219D24_66BAA4.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80219D24_66BAA4 -/* 66BAA4 80219D24 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 66BAA8 80219D28 AFB10014 */ sw $s1, 0x14($sp) -/* 66BAAC 80219D2C 0080882D */ daddu $s1, $a0, $zero -/* 66BAB0 80219D30 AFBF0020 */ sw $ra, 0x20($sp) -/* 66BAB4 80219D34 AFB3001C */ sw $s3, 0x1c($sp) -/* 66BAB8 80219D38 AFB20018 */ sw $s2, 0x18($sp) -/* 66BABC 80219D3C AFB00010 */ sw $s0, 0x10($sp) -/* 66BAC0 80219D40 8E30000C */ lw $s0, 0xc($s1) -/* 66BAC4 80219D44 8E050000 */ lw $a1, ($s0) -/* 66BAC8 80219D48 0C0B1EAF */ jal get_variable -/* 66BACC 80219D4C 26100004 */ addiu $s0, $s0, 4 -/* 66BAD0 80219D50 8E050000 */ lw $a1, ($s0) -/* 66BAD4 80219D54 26100004 */ addiu $s0, $s0, 4 -/* 66BAD8 80219D58 0220202D */ daddu $a0, $s1, $zero -/* 66BADC 80219D5C 0C0B1EAF */ jal get_variable -/* 66BAE0 80219D60 0040982D */ daddu $s3, $v0, $zero -/* 66BAE4 80219D64 8E050000 */ lw $a1, ($s0) -/* 66BAE8 80219D68 26100004 */ addiu $s0, $s0, 4 -/* 66BAEC 80219D6C 0220202D */ daddu $a0, $s1, $zero -/* 66BAF0 80219D70 0C0B1EAF */ jal get_variable -/* 66BAF4 80219D74 0040902D */ daddu $s2, $v0, $zero -/* 66BAF8 80219D78 0220202D */ daddu $a0, $s1, $zero -/* 66BAFC 80219D7C 8E050000 */ lw $a1, ($s0) -/* 66BB00 80219D80 0C0B1EAF */ jal get_variable -/* 66BB04 80219D84 0040802D */ daddu $s0, $v0, $zero -/* 66BB08 80219D88 8E240148 */ lw $a0, 0x148($s1) -/* 66BB0C 80219D8C 0C09A75B */ jal get_actor -/* 66BB10 80219D90 0040882D */ daddu $s1, $v0, $zero -/* 66BB14 80219D94 0040182D */ daddu $v1, $v0, $zero -/* 66BB18 80219D98 8C620008 */ lw $v0, 8($v1) -/* 66BB1C 80219D9C 90420024 */ lbu $v0, 0x24($v0) -/* 66BB20 80219DA0 8C640008 */ lw $a0, 8($v1) -/* 66BB24 80219DA4 02629823 */ subu $s3, $s3, $v0 -/* 66BB28 80219DA8 A0730194 */ sb $s3, 0x194($v1) -/* 66BB2C 80219DAC 90820025 */ lbu $v0, 0x25($a0) -/* 66BB30 80219DB0 02429023 */ subu $s2, $s2, $v0 -/* 66BB34 80219DB4 A0720195 */ sb $s2, 0x195($v1) -/* 66BB38 80219DB8 90820026 */ lbu $v0, 0x26($a0) -/* 66BB3C 80219DBC 02028023 */ subu $s0, $s0, $v0 -/* 66BB40 80219DC0 A0700196 */ sb $s0, 0x196($v1) -/* 66BB44 80219DC4 90840027 */ lbu $a0, 0x27($a0) -/* 66BB48 80219DC8 02248823 */ subu $s1, $s1, $a0 -/* 66BB4C 80219DCC A0710197 */ sb $s1, 0x197($v1) -/* 66BB50 80219DD0 8FBF0020 */ lw $ra, 0x20($sp) -/* 66BB54 80219DD4 8FB3001C */ lw $s3, 0x1c($sp) -/* 66BB58 80219DD8 8FB20018 */ lw $s2, 0x18($sp) -/* 66BB5C 80219DDC 8FB10014 */ lw $s1, 0x14($sp) -/* 66BB60 80219DE0 8FB00010 */ lw $s0, 0x10($sp) -/* 66BB64 80219DE4 24020002 */ addiu $v0, $zero, 2 -/* 66BB68 80219DE8 03E00008 */ jr $ra -/* 66BB6C 80219DEC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/battle/area_sam/623BA0/func_80218B74_624714.s b/asm/nonmatchings/battle/area_sam/623BA0/func_80218B74_624714.s deleted file mode 100644 index 55918170c2..0000000000 --- a/asm/nonmatchings/battle/area_sam/623BA0/func_80218B74_624714.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218B74_624714 -/* 624714 80218B74 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 624718 80218B78 AFB10014 */ sw $s1, 0x14($sp) -/* 62471C 80218B7C 0080882D */ daddu $s1, $a0, $zero -/* 624720 80218B80 AFBF0020 */ sw $ra, 0x20($sp) -/* 624724 80218B84 AFB3001C */ sw $s3, 0x1c($sp) -/* 624728 80218B88 AFB20018 */ sw $s2, 0x18($sp) -/* 62472C 80218B8C AFB00010 */ sw $s0, 0x10($sp) -/* 624730 80218B90 8E30000C */ lw $s0, 0xc($s1) -/* 624734 80218B94 8E050000 */ lw $a1, ($s0) -/* 624738 80218B98 0C0B1EAF */ jal get_variable -/* 62473C 80218B9C 26100004 */ addiu $s0, $s0, 4 -/* 624740 80218BA0 8E050000 */ lw $a1, ($s0) -/* 624744 80218BA4 26100004 */ addiu $s0, $s0, 4 -/* 624748 80218BA8 0220202D */ daddu $a0, $s1, $zero -/* 62474C 80218BAC 0C0B1EAF */ jal get_variable -/* 624750 80218BB0 0040982D */ daddu $s3, $v0, $zero -/* 624754 80218BB4 8E050000 */ lw $a1, ($s0) -/* 624758 80218BB8 26100004 */ addiu $s0, $s0, 4 -/* 62475C 80218BBC 0220202D */ daddu $a0, $s1, $zero -/* 624760 80218BC0 0C0B1EAF */ jal get_variable -/* 624764 80218BC4 0040902D */ daddu $s2, $v0, $zero -/* 624768 80218BC8 0220202D */ daddu $a0, $s1, $zero -/* 62476C 80218BCC 8E050000 */ lw $a1, ($s0) -/* 624770 80218BD0 0C0B1EAF */ jal get_variable -/* 624774 80218BD4 0040802D */ daddu $s0, $v0, $zero -/* 624778 80218BD8 8E240148 */ lw $a0, 0x148($s1) -/* 62477C 80218BDC 0C09A75B */ jal get_actor -/* 624780 80218BE0 0040882D */ daddu $s1, $v0, $zero -/* 624784 80218BE4 0040182D */ daddu $v1, $v0, $zero -/* 624788 80218BE8 8C620008 */ lw $v0, 8($v1) -/* 62478C 80218BEC 90420024 */ lbu $v0, 0x24($v0) -/* 624790 80218BF0 8C640008 */ lw $a0, 8($v1) -/* 624794 80218BF4 02629823 */ subu $s3, $s3, $v0 -/* 624798 80218BF8 A0730194 */ sb $s3, 0x194($v1) -/* 62479C 80218BFC 90820025 */ lbu $v0, 0x25($a0) -/* 6247A0 80218C00 02429023 */ subu $s2, $s2, $v0 -/* 6247A4 80218C04 A0720195 */ sb $s2, 0x195($v1) -/* 6247A8 80218C08 90820026 */ lbu $v0, 0x26($a0) -/* 6247AC 80218C0C 02028023 */ subu $s0, $s0, $v0 -/* 6247B0 80218C10 A0700196 */ sb $s0, 0x196($v1) -/* 6247B4 80218C14 90840027 */ lbu $a0, 0x27($a0) -/* 6247B8 80218C18 02248823 */ subu $s1, $s1, $a0 -/* 6247BC 80218C1C A0710197 */ sb $s1, 0x197($v1) -/* 6247C0 80218C20 8FBF0020 */ lw $ra, 0x20($sp) -/* 6247C4 80218C24 8FB3001C */ lw $s3, 0x1c($sp) -/* 6247C8 80218C28 8FB20018 */ lw $s2, 0x18($sp) -/* 6247CC 80218C2C 8FB10014 */ lw $s1, 0x14($sp) -/* 6247D0 80218C30 8FB00010 */ lw $s0, 0x10($sp) -/* 6247D4 80218C34 24020002 */ addiu $v0, $zero, 2 -/* 6247D8 80218C38 03E00008 */ jr $ra -/* 6247DC 80218C3C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/battle/area_sam/623BA0/func_802195F0_625190.s b/asm/nonmatchings/battle/area_sam/623BA0/func_802195F0_625190.s deleted file mode 100644 index 5c022737fb..0000000000 --- a/asm/nonmatchings/battle/area_sam/623BA0/func_802195F0_625190.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802195F0_625190 -/* 625190 802195F0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 625194 802195F4 AFB10014 */ sw $s1, 0x14($sp) -/* 625198 802195F8 0080882D */ daddu $s1, $a0, $zero -/* 62519C 802195FC AFBF0020 */ sw $ra, 0x20($sp) -/* 6251A0 80219600 AFB3001C */ sw $s3, 0x1c($sp) -/* 6251A4 80219604 AFB20018 */ sw $s2, 0x18($sp) -/* 6251A8 80219608 AFB00010 */ sw $s0, 0x10($sp) -/* 6251AC 8021960C 8E30000C */ lw $s0, 0xc($s1) -/* 6251B0 80219610 8E050000 */ lw $a1, ($s0) -/* 6251B4 80219614 0C0B1EAF */ jal get_variable -/* 6251B8 80219618 26100004 */ addiu $s0, $s0, 4 -/* 6251BC 8021961C 8E050000 */ lw $a1, ($s0) -/* 6251C0 80219620 26100004 */ addiu $s0, $s0, 4 -/* 6251C4 80219624 0220202D */ daddu $a0, $s1, $zero -/* 6251C8 80219628 0C0B1EAF */ jal get_variable -/* 6251CC 8021962C 0040982D */ daddu $s3, $v0, $zero -/* 6251D0 80219630 8E050000 */ lw $a1, ($s0) -/* 6251D4 80219634 26100004 */ addiu $s0, $s0, 4 -/* 6251D8 80219638 0220202D */ daddu $a0, $s1, $zero -/* 6251DC 8021963C 0C0B1EAF */ jal get_variable -/* 6251E0 80219640 0040902D */ daddu $s2, $v0, $zero -/* 6251E4 80219644 0220202D */ daddu $a0, $s1, $zero -/* 6251E8 80219648 8E050000 */ lw $a1, ($s0) -/* 6251EC 8021964C 0C0B1EAF */ jal get_variable -/* 6251F0 80219650 0040802D */ daddu $s0, $v0, $zero -/* 6251F4 80219654 8E240148 */ lw $a0, 0x148($s1) -/* 6251F8 80219658 0C09A75B */ jal get_actor -/* 6251FC 8021965C 0040882D */ daddu $s1, $v0, $zero -/* 625200 80219660 0040182D */ daddu $v1, $v0, $zero -/* 625204 80219664 8C620008 */ lw $v0, 8($v1) -/* 625208 80219668 90420024 */ lbu $v0, 0x24($v0) -/* 62520C 8021966C 8C640008 */ lw $a0, 8($v1) -/* 625210 80219670 02629823 */ subu $s3, $s3, $v0 -/* 625214 80219674 A0730194 */ sb $s3, 0x194($v1) -/* 625218 80219678 90820025 */ lbu $v0, 0x25($a0) -/* 62521C 8021967C 02429023 */ subu $s2, $s2, $v0 -/* 625220 80219680 A0720195 */ sb $s2, 0x195($v1) -/* 625224 80219684 90820026 */ lbu $v0, 0x26($a0) -/* 625228 80219688 02028023 */ subu $s0, $s0, $v0 -/* 62522C 8021968C A0700196 */ sb $s0, 0x196($v1) -/* 625230 80219690 90840027 */ lbu $a0, 0x27($a0) -/* 625234 80219694 02248823 */ subu $s1, $s1, $a0 -/* 625238 80219698 A0710197 */ sb $s1, 0x197($v1) -/* 62523C 8021969C 8FBF0020 */ lw $ra, 0x20($sp) -/* 625240 802196A0 8FB3001C */ lw $s3, 0x1c($sp) -/* 625244 802196A4 8FB20018 */ lw $s2, 0x18($sp) -/* 625248 802196A8 8FB10014 */ lw $s1, 0x14($sp) -/* 62524C 802196AC 8FB00010 */ lw $s0, 0x10($sp) -/* 625250 802196B0 24020002 */ addiu $v0, $zero, 2 -/* 625254 802196B4 03E00008 */ jr $ra -/* 625258 802196B8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/battle/area_sam/6253E0/func_802199C4_625564.s b/asm/nonmatchings/battle/area_sam/6253E0/func_802199C4_625564.s deleted file mode 100644 index 87344e5b36..0000000000 --- a/asm/nonmatchings/battle/area_sam/6253E0/func_802199C4_625564.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802199C4_625564 -/* 625564 802199C4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 625568 802199C8 AFB10014 */ sw $s1, 0x14($sp) -/* 62556C 802199CC 0080882D */ daddu $s1, $a0, $zero -/* 625570 802199D0 AFBF0020 */ sw $ra, 0x20($sp) -/* 625574 802199D4 AFB3001C */ sw $s3, 0x1c($sp) -/* 625578 802199D8 AFB20018 */ sw $s2, 0x18($sp) -/* 62557C 802199DC AFB00010 */ sw $s0, 0x10($sp) -/* 625580 802199E0 8E30000C */ lw $s0, 0xc($s1) -/* 625584 802199E4 8E050000 */ lw $a1, ($s0) -/* 625588 802199E8 0C0B1EAF */ jal get_variable -/* 62558C 802199EC 26100004 */ addiu $s0, $s0, 4 -/* 625590 802199F0 8E050000 */ lw $a1, ($s0) -/* 625594 802199F4 26100004 */ addiu $s0, $s0, 4 -/* 625598 802199F8 0220202D */ daddu $a0, $s1, $zero -/* 62559C 802199FC 0C0B1EAF */ jal get_variable -/* 6255A0 80219A00 0040982D */ daddu $s3, $v0, $zero -/* 6255A4 80219A04 8E050000 */ lw $a1, ($s0) -/* 6255A8 80219A08 26100004 */ addiu $s0, $s0, 4 -/* 6255AC 80219A0C 0220202D */ daddu $a0, $s1, $zero -/* 6255B0 80219A10 0C0B1EAF */ jal get_variable -/* 6255B4 80219A14 0040902D */ daddu $s2, $v0, $zero -/* 6255B8 80219A18 0220202D */ daddu $a0, $s1, $zero -/* 6255BC 80219A1C 8E050000 */ lw $a1, ($s0) -/* 6255C0 80219A20 0C0B1EAF */ jal get_variable -/* 6255C4 80219A24 0040802D */ daddu $s0, $v0, $zero -/* 6255C8 80219A28 8E240148 */ lw $a0, 0x148($s1) -/* 6255CC 80219A2C 0C09A75B */ jal get_actor -/* 6255D0 80219A30 0040882D */ daddu $s1, $v0, $zero -/* 6255D4 80219A34 0040182D */ daddu $v1, $v0, $zero -/* 6255D8 80219A38 8C620008 */ lw $v0, 8($v1) -/* 6255DC 80219A3C 90420024 */ lbu $v0, 0x24($v0) -/* 6255E0 80219A40 8C640008 */ lw $a0, 8($v1) -/* 6255E4 80219A44 02629823 */ subu $s3, $s3, $v0 -/* 6255E8 80219A48 A0730194 */ sb $s3, 0x194($v1) -/* 6255EC 80219A4C 90820025 */ lbu $v0, 0x25($a0) -/* 6255F0 80219A50 02429023 */ subu $s2, $s2, $v0 -/* 6255F4 80219A54 A0720195 */ sb $s2, 0x195($v1) -/* 6255F8 80219A58 90820026 */ lbu $v0, 0x26($a0) -/* 6255FC 80219A5C 02028023 */ subu $s0, $s0, $v0 -/* 625600 80219A60 A0700196 */ sb $s0, 0x196($v1) -/* 625604 80219A64 90840027 */ lbu $a0, 0x27($a0) -/* 625608 80219A68 02248823 */ subu $s1, $s1, $a0 -/* 62560C 80219A6C A0710197 */ sb $s1, 0x197($v1) -/* 625610 80219A70 8FBF0020 */ lw $ra, 0x20($sp) -/* 625614 80219A74 8FB3001C */ lw $s3, 0x1c($sp) -/* 625618 80219A78 8FB20018 */ lw $s2, 0x18($sp) -/* 62561C 80219A7C 8FB10014 */ lw $s1, 0x14($sp) -/* 625620 80219A80 8FB00010 */ lw $s0, 0x10($sp) -/* 625624 80219A84 24020002 */ addiu $v0, $zero, 2 -/* 625628 80219A88 03E00008 */ jr $ra -/* 62562C 80219A8C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/battle/area_sam2/63D9F0/func_80218994_63DB74.s b/asm/nonmatchings/battle/area_sam2/63D9F0/func_80218994_63DB74.s deleted file mode 100644 index eca9857076..0000000000 --- a/asm/nonmatchings/battle/area_sam2/63D9F0/func_80218994_63DB74.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218994_63DB74 -/* 63DB74 80218994 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 63DB78 80218998 AFB10014 */ sw $s1, 0x14($sp) -/* 63DB7C 8021899C 0080882D */ daddu $s1, $a0, $zero -/* 63DB80 802189A0 AFBF0020 */ sw $ra, 0x20($sp) -/* 63DB84 802189A4 AFB3001C */ sw $s3, 0x1c($sp) -/* 63DB88 802189A8 AFB20018 */ sw $s2, 0x18($sp) -/* 63DB8C 802189AC AFB00010 */ sw $s0, 0x10($sp) -/* 63DB90 802189B0 8E30000C */ lw $s0, 0xc($s1) -/* 63DB94 802189B4 8E050000 */ lw $a1, ($s0) -/* 63DB98 802189B8 0C0B1EAF */ jal get_variable -/* 63DB9C 802189BC 26100004 */ addiu $s0, $s0, 4 -/* 63DBA0 802189C0 8E050000 */ lw $a1, ($s0) -/* 63DBA4 802189C4 26100004 */ addiu $s0, $s0, 4 -/* 63DBA8 802189C8 0220202D */ daddu $a0, $s1, $zero -/* 63DBAC 802189CC 0C0B1EAF */ jal get_variable -/* 63DBB0 802189D0 0040982D */ daddu $s3, $v0, $zero -/* 63DBB4 802189D4 8E050000 */ lw $a1, ($s0) -/* 63DBB8 802189D8 26100004 */ addiu $s0, $s0, 4 -/* 63DBBC 802189DC 0220202D */ daddu $a0, $s1, $zero -/* 63DBC0 802189E0 0C0B1EAF */ jal get_variable -/* 63DBC4 802189E4 0040902D */ daddu $s2, $v0, $zero -/* 63DBC8 802189E8 0220202D */ daddu $a0, $s1, $zero -/* 63DBCC 802189EC 8E050000 */ lw $a1, ($s0) -/* 63DBD0 802189F0 0C0B1EAF */ jal get_variable -/* 63DBD4 802189F4 0040802D */ daddu $s0, $v0, $zero -/* 63DBD8 802189F8 8E240148 */ lw $a0, 0x148($s1) -/* 63DBDC 802189FC 0C09A75B */ jal get_actor -/* 63DBE0 80218A00 0040882D */ daddu $s1, $v0, $zero -/* 63DBE4 80218A04 0040182D */ daddu $v1, $v0, $zero -/* 63DBE8 80218A08 8C620008 */ lw $v0, 8($v1) -/* 63DBEC 80218A0C 90420024 */ lbu $v0, 0x24($v0) -/* 63DBF0 80218A10 8C640008 */ lw $a0, 8($v1) -/* 63DBF4 80218A14 02629823 */ subu $s3, $s3, $v0 -/* 63DBF8 80218A18 A0730194 */ sb $s3, 0x194($v1) -/* 63DBFC 80218A1C 90820025 */ lbu $v0, 0x25($a0) -/* 63DC00 80218A20 02429023 */ subu $s2, $s2, $v0 -/* 63DC04 80218A24 A0720195 */ sb $s2, 0x195($v1) -/* 63DC08 80218A28 90820026 */ lbu $v0, 0x26($a0) -/* 63DC0C 80218A2C 02028023 */ subu $s0, $s0, $v0 -/* 63DC10 80218A30 A0700196 */ sb $s0, 0x196($v1) -/* 63DC14 80218A34 90840027 */ lbu $a0, 0x27($a0) -/* 63DC18 80218A38 02248823 */ subu $s1, $s1, $a0 -/* 63DC1C 80218A3C A0710197 */ sb $s1, 0x197($v1) -/* 63DC20 80218A40 8FBF0020 */ lw $ra, 0x20($sp) -/* 63DC24 80218A44 8FB3001C */ lw $s3, 0x1c($sp) -/* 63DC28 80218A48 8FB20018 */ lw $s2, 0x18($sp) -/* 63DC2C 80218A4C 8FB10014 */ lw $s1, 0x14($sp) -/* 63DC30 80218A50 8FB00010 */ lw $s0, 0x10($sp) -/* 63DC34 80218A54 24020002 */ addiu $v0, $zero, 2 -/* 63DC38 80218A58 03E00008 */ jr $ra -/* 63DC3C 80218A5C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/battle/area_sbk/4DA5E0/func_80218000_4DA5E0.s b/asm/nonmatchings/battle/area_sbk/4DA5E0/func_80218000_4DA5E0.s deleted file mode 100644 index def353f554..0000000000 --- a/asm/nonmatchings/battle/area_sbk/4DA5E0/func_80218000_4DA5E0.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218000_4DA5E0 -/* 4DA5E0 80218000 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 4DA5E4 80218004 AFB10014 */ sw $s1, 0x14($sp) -/* 4DA5E8 80218008 0080882D */ daddu $s1, $a0, $zero -/* 4DA5EC 8021800C AFBF0020 */ sw $ra, 0x20($sp) -/* 4DA5F0 80218010 AFB3001C */ sw $s3, 0x1c($sp) -/* 4DA5F4 80218014 AFB20018 */ sw $s2, 0x18($sp) -/* 4DA5F8 80218018 AFB00010 */ sw $s0, 0x10($sp) -/* 4DA5FC 8021801C 8E30000C */ lw $s0, 0xc($s1) -/* 4DA600 80218020 8E050000 */ lw $a1, ($s0) -/* 4DA604 80218024 0C0B1EAF */ jal get_variable -/* 4DA608 80218028 26100004 */ addiu $s0, $s0, 4 -/* 4DA60C 8021802C 8E050000 */ lw $a1, ($s0) -/* 4DA610 80218030 26100004 */ addiu $s0, $s0, 4 -/* 4DA614 80218034 0220202D */ daddu $a0, $s1, $zero -/* 4DA618 80218038 0C0B1EAF */ jal get_variable -/* 4DA61C 8021803C 0040982D */ daddu $s3, $v0, $zero -/* 4DA620 80218040 8E050000 */ lw $a1, ($s0) -/* 4DA624 80218044 26100004 */ addiu $s0, $s0, 4 -/* 4DA628 80218048 0220202D */ daddu $a0, $s1, $zero -/* 4DA62C 8021804C 0C0B1EAF */ jal get_variable -/* 4DA630 80218050 0040902D */ daddu $s2, $v0, $zero -/* 4DA634 80218054 0220202D */ daddu $a0, $s1, $zero -/* 4DA638 80218058 8E050000 */ lw $a1, ($s0) -/* 4DA63C 8021805C 0C0B1EAF */ jal get_variable -/* 4DA640 80218060 0040802D */ daddu $s0, $v0, $zero -/* 4DA644 80218064 8E240148 */ lw $a0, 0x148($s1) -/* 4DA648 80218068 0C09A75B */ jal get_actor -/* 4DA64C 8021806C 0040882D */ daddu $s1, $v0, $zero -/* 4DA650 80218070 0040182D */ daddu $v1, $v0, $zero -/* 4DA654 80218074 8C620008 */ lw $v0, 8($v1) -/* 4DA658 80218078 90420024 */ lbu $v0, 0x24($v0) -/* 4DA65C 8021807C 8C640008 */ lw $a0, 8($v1) -/* 4DA660 80218080 02629823 */ subu $s3, $s3, $v0 -/* 4DA664 80218084 A0730194 */ sb $s3, 0x194($v1) -/* 4DA668 80218088 90820025 */ lbu $v0, 0x25($a0) -/* 4DA66C 8021808C 02429023 */ subu $s2, $s2, $v0 -/* 4DA670 80218090 A0720195 */ sb $s2, 0x195($v1) -/* 4DA674 80218094 90820026 */ lbu $v0, 0x26($a0) -/* 4DA678 80218098 02028023 */ subu $s0, $s0, $v0 -/* 4DA67C 8021809C A0700196 */ sb $s0, 0x196($v1) -/* 4DA680 802180A0 90840027 */ lbu $a0, 0x27($a0) -/* 4DA684 802180A4 02248823 */ subu $s1, $s1, $a0 -/* 4DA688 802180A8 A0710197 */ sb $s1, 0x197($v1) -/* 4DA68C 802180AC 8FBF0020 */ lw $ra, 0x20($sp) -/* 4DA690 802180B0 8FB3001C */ lw $s3, 0x1c($sp) -/* 4DA694 802180B4 8FB20018 */ lw $s2, 0x18($sp) -/* 4DA698 802180B8 8FB10014 */ lw $s1, 0x14($sp) -/* 4DA69C 802180BC 8FB00010 */ lw $s0, 0x10($sp) -/* 4DA6A0 802180C0 24020002 */ addiu $v0, $zero, 2 -/* 4DA6A4 802180C4 03E00008 */ jr $ra -/* 4DA6A8 802180C8 27BD0028 */ addiu $sp, $sp, 0x28 -/* 4DA6AC 802180CC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_tik/5EC490/func_80218000_5EC490.s b/asm/nonmatchings/battle/area_tik/5EC490/func_80218000_5EC490.s deleted file mode 100644 index 1c5291f051..0000000000 --- a/asm/nonmatchings/battle/area_tik/5EC490/func_80218000_5EC490.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218000_5EC490 -/* 5EC490 80218000 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 5EC494 80218004 AFB10014 */ sw $s1, 0x14($sp) -/* 5EC498 80218008 0080882D */ daddu $s1, $a0, $zero -/* 5EC49C 8021800C AFBF0020 */ sw $ra, 0x20($sp) -/* 5EC4A0 80218010 AFB3001C */ sw $s3, 0x1c($sp) -/* 5EC4A4 80218014 AFB20018 */ sw $s2, 0x18($sp) -/* 5EC4A8 80218018 AFB00010 */ sw $s0, 0x10($sp) -/* 5EC4AC 8021801C 8E30000C */ lw $s0, 0xc($s1) -/* 5EC4B0 80218020 8E050000 */ lw $a1, ($s0) -/* 5EC4B4 80218024 0C0B1EAF */ jal get_variable -/* 5EC4B8 80218028 26100004 */ addiu $s0, $s0, 4 -/* 5EC4BC 8021802C 8E050000 */ lw $a1, ($s0) -/* 5EC4C0 80218030 26100004 */ addiu $s0, $s0, 4 -/* 5EC4C4 80218034 0220202D */ daddu $a0, $s1, $zero -/* 5EC4C8 80218038 0C0B1EAF */ jal get_variable -/* 5EC4CC 8021803C 0040982D */ daddu $s3, $v0, $zero -/* 5EC4D0 80218040 8E050000 */ lw $a1, ($s0) -/* 5EC4D4 80218044 26100004 */ addiu $s0, $s0, 4 -/* 5EC4D8 80218048 0220202D */ daddu $a0, $s1, $zero -/* 5EC4DC 8021804C 0C0B1EAF */ jal get_variable -/* 5EC4E0 80218050 0040902D */ daddu $s2, $v0, $zero -/* 5EC4E4 80218054 0220202D */ daddu $a0, $s1, $zero -/* 5EC4E8 80218058 8E050000 */ lw $a1, ($s0) -/* 5EC4EC 8021805C 0C0B1EAF */ jal get_variable -/* 5EC4F0 80218060 0040802D */ daddu $s0, $v0, $zero -/* 5EC4F4 80218064 8E240148 */ lw $a0, 0x148($s1) -/* 5EC4F8 80218068 0C09A75B */ jal get_actor -/* 5EC4FC 8021806C 0040882D */ daddu $s1, $v0, $zero -/* 5EC500 80218070 0040182D */ daddu $v1, $v0, $zero -/* 5EC504 80218074 8C620008 */ lw $v0, 8($v1) -/* 5EC508 80218078 90420024 */ lbu $v0, 0x24($v0) -/* 5EC50C 8021807C 8C640008 */ lw $a0, 8($v1) -/* 5EC510 80218080 02629823 */ subu $s3, $s3, $v0 -/* 5EC514 80218084 A0730194 */ sb $s3, 0x194($v1) -/* 5EC518 80218088 90820025 */ lbu $v0, 0x25($a0) -/* 5EC51C 8021808C 02429023 */ subu $s2, $s2, $v0 -/* 5EC520 80218090 A0720195 */ sb $s2, 0x195($v1) -/* 5EC524 80218094 90820026 */ lbu $v0, 0x26($a0) -/* 5EC528 80218098 02028023 */ subu $s0, $s0, $v0 -/* 5EC52C 8021809C A0700196 */ sb $s0, 0x196($v1) -/* 5EC530 802180A0 90840027 */ lbu $a0, 0x27($a0) -/* 5EC534 802180A4 02248823 */ subu $s1, $s1, $a0 -/* 5EC538 802180A8 A0710197 */ sb $s1, 0x197($v1) -/* 5EC53C 802180AC 8FBF0020 */ lw $ra, 0x20($sp) -/* 5EC540 802180B0 8FB3001C */ lw $s3, 0x1c($sp) -/* 5EC544 802180B4 8FB20018 */ lw $s2, 0x18($sp) -/* 5EC548 802180B8 8FB10014 */ lw $s1, 0x14($sp) -/* 5EC54C 802180BC 8FB00010 */ lw $s0, 0x10($sp) -/* 5EC550 802180C0 24020002 */ addiu $v0, $zero, 2 -/* 5EC554 802180C4 03E00008 */ jr $ra -/* 5EC558 802180C8 27BD0028 */ addiu $sp, $sp, 0x28 -/* 5EC55C 802180CC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_tik/5EC490/func_80218128_5EC5B8.s b/asm/nonmatchings/battle/area_tik/5EC490/func_80218128_5EC5B8.s deleted file mode 100644 index 0169df9163..0000000000 --- a/asm/nonmatchings/battle/area_tik/5EC490/func_80218128_5EC5B8.s +++ /dev/null @@ -1,58 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218128_5EC5B8 -/* 5EC5B8 80218128 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 5EC5BC 8021812C AFB10014 */ sw $s1, 0x14($sp) -/* 5EC5C0 80218130 0080882D */ daddu $s1, $a0, $zero -/* 5EC5C4 80218134 AFBF0020 */ sw $ra, 0x20($sp) -/* 5EC5C8 80218138 AFB3001C */ sw $s3, 0x1c($sp) -/* 5EC5CC 8021813C AFB20018 */ sw $s2, 0x18($sp) -/* 5EC5D0 80218140 AFB00010 */ sw $s0, 0x10($sp) -/* 5EC5D4 80218144 8E30000C */ lw $s0, 0xc($s1) -/* 5EC5D8 80218148 8E050000 */ lw $a1, ($s0) -/* 5EC5DC 8021814C 0C0B1EAF */ jal get_variable -/* 5EC5E0 80218150 26100004 */ addiu $s0, $s0, 4 -/* 5EC5E4 80218154 8E050000 */ lw $a1, ($s0) -/* 5EC5E8 80218158 26100004 */ addiu $s0, $s0, 4 -/* 5EC5EC 8021815C 0220202D */ daddu $a0, $s1, $zero -/* 5EC5F0 80218160 0C0B1EAF */ jal get_variable -/* 5EC5F4 80218164 0040982D */ daddu $s3, $v0, $zero -/* 5EC5F8 80218168 8E050000 */ lw $a1, ($s0) -/* 5EC5FC 8021816C 26100004 */ addiu $s0, $s0, 4 -/* 5EC600 80218170 0220202D */ daddu $a0, $s1, $zero -/* 5EC604 80218174 0C0B1EAF */ jal get_variable -/* 5EC608 80218178 0040902D */ daddu $s2, $v0, $zero -/* 5EC60C 8021817C 0220202D */ daddu $a0, $s1, $zero -/* 5EC610 80218180 8E050000 */ lw $a1, ($s0) -/* 5EC614 80218184 0C0B1EAF */ jal get_variable -/* 5EC618 80218188 0040802D */ daddu $s0, $v0, $zero -/* 5EC61C 8021818C 8E240148 */ lw $a0, 0x148($s1) -/* 5EC620 80218190 0C09A75B */ jal get_actor -/* 5EC624 80218194 0040882D */ daddu $s1, $v0, $zero -/* 5EC628 80218198 0040182D */ daddu $v1, $v0, $zero -/* 5EC62C 8021819C 8C620008 */ lw $v0, 8($v1) -/* 5EC630 802181A0 90420024 */ lbu $v0, 0x24($v0) -/* 5EC634 802181A4 8C640008 */ lw $a0, 8($v1) -/* 5EC638 802181A8 02629823 */ subu $s3, $s3, $v0 -/* 5EC63C 802181AC A0730194 */ sb $s3, 0x194($v1) -/* 5EC640 802181B0 90820025 */ lbu $v0, 0x25($a0) -/* 5EC644 802181B4 02429023 */ subu $s2, $s2, $v0 -/* 5EC648 802181B8 A0720195 */ sb $s2, 0x195($v1) -/* 5EC64C 802181BC 90820026 */ lbu $v0, 0x26($a0) -/* 5EC650 802181C0 02028023 */ subu $s0, $s0, $v0 -/* 5EC654 802181C4 A0700196 */ sb $s0, 0x196($v1) -/* 5EC658 802181C8 90840027 */ lbu $a0, 0x27($a0) -/* 5EC65C 802181CC 02248823 */ subu $s1, $s1, $a0 -/* 5EC660 802181D0 A0710197 */ sb $s1, 0x197($v1) -/* 5EC664 802181D4 8FBF0020 */ lw $ra, 0x20($sp) -/* 5EC668 802181D8 8FB3001C */ lw $s3, 0x1c($sp) -/* 5EC66C 802181DC 8FB20018 */ lw $s2, 0x18($sp) -/* 5EC670 802181E0 8FB10014 */ lw $s1, 0x14($sp) -/* 5EC674 802181E4 8FB00010 */ lw $s0, 0x10($sp) -/* 5EC678 802181E8 24020002 */ addiu $v0, $zero, 2 -/* 5EC67C 802181EC 03E00008 */ jr $ra -/* 5EC680 802181F0 27BD0028 */ addiu $sp, $sp, 0x28 -/* 5EC684 802181F4 00000000 */ nop -/* 5EC688 802181F8 00000000 */ nop -/* 5EC68C 802181FC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_tik/5ECE70/func_802189E0_5ECE70.s b/asm/nonmatchings/battle/area_tik/5ECE70/func_802189E0_5ECE70.s deleted file mode 100644 index 9fdd1a9e84..0000000000 --- a/asm/nonmatchings/battle/area_tik/5ECE70/func_802189E0_5ECE70.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802189E0_5ECE70 -/* 5ECE70 802189E0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 5ECE74 802189E4 AFB10014 */ sw $s1, 0x14($sp) -/* 5ECE78 802189E8 0080882D */ daddu $s1, $a0, $zero -/* 5ECE7C 802189EC AFBF0020 */ sw $ra, 0x20($sp) -/* 5ECE80 802189F0 AFB3001C */ sw $s3, 0x1c($sp) -/* 5ECE84 802189F4 AFB20018 */ sw $s2, 0x18($sp) -/* 5ECE88 802189F8 AFB00010 */ sw $s0, 0x10($sp) -/* 5ECE8C 802189FC 8E30000C */ lw $s0, 0xc($s1) -/* 5ECE90 80218A00 8E050000 */ lw $a1, ($s0) -/* 5ECE94 80218A04 0C0B1EAF */ jal get_variable -/* 5ECE98 80218A08 26100004 */ addiu $s0, $s0, 4 -/* 5ECE9C 80218A0C 8E050000 */ lw $a1, ($s0) -/* 5ECEA0 80218A10 26100004 */ addiu $s0, $s0, 4 -/* 5ECEA4 80218A14 0220202D */ daddu $a0, $s1, $zero -/* 5ECEA8 80218A18 0C0B1EAF */ jal get_variable -/* 5ECEAC 80218A1C 0040982D */ daddu $s3, $v0, $zero -/* 5ECEB0 80218A20 8E050000 */ lw $a1, ($s0) -/* 5ECEB4 80218A24 26100004 */ addiu $s0, $s0, 4 -/* 5ECEB8 80218A28 0220202D */ daddu $a0, $s1, $zero -/* 5ECEBC 80218A2C 0C0B1EAF */ jal get_variable -/* 5ECEC0 80218A30 0040902D */ daddu $s2, $v0, $zero -/* 5ECEC4 80218A34 0220202D */ daddu $a0, $s1, $zero -/* 5ECEC8 80218A38 8E050000 */ lw $a1, ($s0) -/* 5ECECC 80218A3C 0C0B1EAF */ jal get_variable -/* 5ECED0 80218A40 0040802D */ daddu $s0, $v0, $zero -/* 5ECED4 80218A44 8E240148 */ lw $a0, 0x148($s1) -/* 5ECED8 80218A48 0C09A75B */ jal get_actor -/* 5ECEDC 80218A4C 0040882D */ daddu $s1, $v0, $zero -/* 5ECEE0 80218A50 0040182D */ daddu $v1, $v0, $zero -/* 5ECEE4 80218A54 8C620008 */ lw $v0, 8($v1) -/* 5ECEE8 80218A58 90420024 */ lbu $v0, 0x24($v0) -/* 5ECEEC 80218A5C 8C640008 */ lw $a0, 8($v1) -/* 5ECEF0 80218A60 02629823 */ subu $s3, $s3, $v0 -/* 5ECEF4 80218A64 A0730194 */ sb $s3, 0x194($v1) -/* 5ECEF8 80218A68 90820025 */ lbu $v0, 0x25($a0) -/* 5ECEFC 80218A6C 02429023 */ subu $s2, $s2, $v0 -/* 5ECF00 80218A70 A0720195 */ sb $s2, 0x195($v1) -/* 5ECF04 80218A74 90820026 */ lbu $v0, 0x26($a0) -/* 5ECF08 80218A78 02028023 */ subu $s0, $s0, $v0 -/* 5ECF0C 80218A7C A0700196 */ sb $s0, 0x196($v1) -/* 5ECF10 80218A80 90840027 */ lbu $a0, 0x27($a0) -/* 5ECF14 80218A84 02248823 */ subu $s1, $s1, $a0 -/* 5ECF18 80218A88 A0710197 */ sb $s1, 0x197($v1) -/* 5ECF1C 80218A8C 8FBF0020 */ lw $ra, 0x20($sp) -/* 5ECF20 80218A90 8FB3001C */ lw $s3, 0x1c($sp) -/* 5ECF24 80218A94 8FB20018 */ lw $s2, 0x18($sp) -/* 5ECF28 80218A98 8FB10014 */ lw $s1, 0x14($sp) -/* 5ECF2C 80218A9C 8FB00010 */ lw $s0, 0x10($sp) -/* 5ECF30 80218AA0 24020002 */ addiu $v0, $zero, 2 -/* 5ECF34 80218AA4 03E00008 */ jr $ra -/* 5ECF38 80218AA8 27BD0028 */ addiu $sp, $sp, 0x28 -/* 5ECF3C 80218AAC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_tik/5ECE70/func_80218AB0_5ECF40.s b/asm/nonmatchings/battle/area_tik/5ECE70/func_80218AB0_5ECF40.s deleted file mode 100644 index 22d09159ac..0000000000 --- a/asm/nonmatchings/battle/area_tik/5ECE70/func_80218AB0_5ECF40.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218AB0_5ECF40 -/* 5ECF40 80218AB0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 5ECF44 80218AB4 AFB10014 */ sw $s1, 0x14($sp) -/* 5ECF48 80218AB8 0080882D */ daddu $s1, $a0, $zero -/* 5ECF4C 80218ABC AFBF0020 */ sw $ra, 0x20($sp) -/* 5ECF50 80218AC0 AFB3001C */ sw $s3, 0x1c($sp) -/* 5ECF54 80218AC4 AFB20018 */ sw $s2, 0x18($sp) -/* 5ECF58 80218AC8 AFB00010 */ sw $s0, 0x10($sp) -/* 5ECF5C 80218ACC 8E30000C */ lw $s0, 0xc($s1) -/* 5ECF60 80218AD0 8E050000 */ lw $a1, ($s0) -/* 5ECF64 80218AD4 0C0B1EAF */ jal get_variable -/* 5ECF68 80218AD8 26100004 */ addiu $s0, $s0, 4 -/* 5ECF6C 80218ADC 8E050000 */ lw $a1, ($s0) -/* 5ECF70 80218AE0 26100004 */ addiu $s0, $s0, 4 -/* 5ECF74 80218AE4 0220202D */ daddu $a0, $s1, $zero -/* 5ECF78 80218AE8 0C0B1EAF */ jal get_variable -/* 5ECF7C 80218AEC 0040982D */ daddu $s3, $v0, $zero -/* 5ECF80 80218AF0 8E050000 */ lw $a1, ($s0) -/* 5ECF84 80218AF4 26100004 */ addiu $s0, $s0, 4 -/* 5ECF88 80218AF8 0220202D */ daddu $a0, $s1, $zero -/* 5ECF8C 80218AFC 0C0B1EAF */ jal get_variable -/* 5ECF90 80218B00 0040902D */ daddu $s2, $v0, $zero -/* 5ECF94 80218B04 0220202D */ daddu $a0, $s1, $zero -/* 5ECF98 80218B08 8E050000 */ lw $a1, ($s0) -/* 5ECF9C 80218B0C 0C0B1EAF */ jal get_variable -/* 5ECFA0 80218B10 0040802D */ daddu $s0, $v0, $zero -/* 5ECFA4 80218B14 8E240148 */ lw $a0, 0x148($s1) -/* 5ECFA8 80218B18 0C09A75B */ jal get_actor -/* 5ECFAC 80218B1C 0040882D */ daddu $s1, $v0, $zero -/* 5ECFB0 80218B20 0040182D */ daddu $v1, $v0, $zero -/* 5ECFB4 80218B24 8C620008 */ lw $v0, 8($v1) -/* 5ECFB8 80218B28 90420024 */ lbu $v0, 0x24($v0) -/* 5ECFBC 80218B2C 8C640008 */ lw $a0, 8($v1) -/* 5ECFC0 80218B30 02629823 */ subu $s3, $s3, $v0 -/* 5ECFC4 80218B34 A0730194 */ sb $s3, 0x194($v1) -/* 5ECFC8 80218B38 90820025 */ lbu $v0, 0x25($a0) -/* 5ECFCC 80218B3C 02429023 */ subu $s2, $s2, $v0 -/* 5ECFD0 80218B40 A0720195 */ sb $s2, 0x195($v1) -/* 5ECFD4 80218B44 90820026 */ lbu $v0, 0x26($a0) -/* 5ECFD8 80218B48 02028023 */ subu $s0, $s0, $v0 -/* 5ECFDC 80218B4C A0700196 */ sb $s0, 0x196($v1) -/* 5ECFE0 80218B50 90840027 */ lbu $a0, 0x27($a0) -/* 5ECFE4 80218B54 02248823 */ subu $s1, $s1, $a0 -/* 5ECFE8 80218B58 A0710197 */ sb $s1, 0x197($v1) -/* 5ECFEC 80218B5C 8FBF0020 */ lw $ra, 0x20($sp) -/* 5ECFF0 80218B60 8FB3001C */ lw $s3, 0x1c($sp) -/* 5ECFF4 80218B64 8FB20018 */ lw $s2, 0x18($sp) -/* 5ECFF8 80218B68 8FB10014 */ lw $s1, 0x14($sp) -/* 5ECFFC 80218B6C 8FB00010 */ lw $s0, 0x10($sp) -/* 5ED000 80218B70 24020002 */ addiu $v0, $zero, 2 -/* 5ED004 80218B74 03E00008 */ jr $ra -/* 5ED008 80218B78 27BD0028 */ addiu $sp, $sp, 0x28 -/* 5ED00C 80218B7C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_tik/5ECE70/func_80218B80_5ED010.s b/asm/nonmatchings/battle/area_tik/5ED010/func_80218B80_5ED010.s similarity index 83% rename from asm/nonmatchings/battle/area_tik/5ECE70/func_80218B80_5ED010.s rename to asm/nonmatchings/battle/area_tik/5ED010/func_80218B80_5ED010.s index c7dc2fd3e3..d1a8c7d962 100644 --- a/asm/nonmatchings/battle/area_tik/5ECE70/func_80218B80_5ED010.s +++ b/asm/nonmatchings/battle/area_tik/5ED010/func_80218B80_5ED010.s @@ -32,58 +32,58 @@ glabel func_80218B80_5ED010 /* 5ED07C 80218BEC C6200098 */ lwc1 $f0, 0x98($s1) /* 5ED080 80218BF0 46001081 */ sub.s $f2, $f2, $f0 /* 5ED084 80218BF4 46021182 */ mul.s $f6, $f2, $f2 -/* 5ED088 80218BF8 00000000 */ nop +/* 5ED088 80218BF8 00000000 */ nop /* 5ED08C 80218BFC C62000A0 */ lwc1 $f0, 0xa0($s1) /* 5ED090 80218C00 C602014C */ lwc1 $f2, 0x14c($s0) /* 5ED094 80218C04 46001081 */ sub.s $f2, $f2, $f0 /* 5ED098 80218C08 46021102 */ mul.s $f4, $f2, $f2 -/* 5ED09C 80218C0C 00000000 */ nop +/* 5ED09C 80218C0C 00000000 */ nop /* 5ED0A0 80218C10 92020191 */ lbu $v0, 0x191($s0) /* 5ED0A4 80218C14 C6020148 */ lwc1 $f2, 0x148($s0) /* 5ED0A8 80218C18 44820000 */ mtc1 $v0, $f0 -/* 5ED0AC 80218C1C 00000000 */ nop +/* 5ED0AC 80218C1C 00000000 */ nop /* 5ED0B0 80218C20 46800020 */ cvt.s.w $f0, $f0 /* 5ED0B4 80218C24 46001080 */ add.s $f2, $f2, $f0 /* 5ED0B8 80218C28 3C013FC0 */ lui $at, 0x3fc0 /* 5ED0BC 80218C2C 44810000 */ mtc1 $at, $f0 -/* 5ED0C0 80218C30 00000000 */ nop +/* 5ED0C0 80218C30 00000000 */ nop /* 5ED0C4 80218C34 46001081 */ sub.s $f2, $f2, $f0 /* 5ED0C8 80218C38 46043300 */ add.s $f12, $f6, $f4 /* 5ED0CC 80218C3C C620009C */ lwc1 $f0, 0x9c($s1) /* 5ED0D0 80218C40 46001501 */ sub.s $f20, $f2, $f0 /* 5ED0D4 80218C44 46006084 */ sqrt.s $f2, $f12 /* 5ED0D8 80218C48 46021032 */ c.eq.s $f2, $f2 -/* 5ED0DC 80218C4C 00000000 */ nop +/* 5ED0DC 80218C4C 00000000 */ nop /* 5ED0E0 80218C50 45010004 */ bc1t .L80218C64 -/* 5ED0E4 80218C54 00000000 */ nop +/* 5ED0E4 80218C54 00000000 */ nop /* 5ED0E8 80218C58 0C0187BC */ jal sqrtf -/* 5ED0EC 80218C5C 00000000 */ nop +/* 5ED0EC 80218C5C 00000000 */ nop /* 5ED0F0 80218C60 46000086 */ mov.s $f2, $f0 .L80218C64: /* 5ED0F4 80218C64 44800000 */ mtc1 $zero, $f0 -/* 5ED0F8 80218C68 00000000 */ nop +/* 5ED0F8 80218C68 00000000 */ nop /* 5ED0FC 80218C6C 4614003C */ c.lt.s $f0, $f20 -/* 5ED100 80218C70 00000000 */ nop +/* 5ED100 80218C70 00000000 */ nop /* 5ED104 80218C74 45000017 */ bc1f .L80218CD4 /* 5ED108 80218C78 46001106 */ mov.s $f4, $f2 /* 5ED10C 80218C7C 92020191 */ lbu $v0, 0x191($s0) /* 5ED110 80218C80 44820000 */ mtc1 $v0, $f0 -/* 5ED114 80218C84 00000000 */ nop +/* 5ED114 80218C84 00000000 */ nop /* 5ED118 80218C88 46800020 */ cvt.s.w $f0, $f0 /* 5ED11C 80218C8C 4600A03C */ c.lt.s $f20, $f0 -/* 5ED120 80218C90 00000000 */ nop +/* 5ED120 80218C90 00000000 */ nop /* 5ED124 80218C94 4500000F */ bc1f .L80218CD4 -/* 5ED128 80218C98 00000000 */ nop +/* 5ED128 80218C98 00000000 */ nop /* 5ED12C 80218C9C 92020190 */ lbu $v0, 0x190($s0) /* 5ED130 80218CA0 3C013F00 */ lui $at, 0x3f00 /* 5ED134 80218CA4 44811000 */ mtc1 $at, $f2 /* 5ED138 80218CA8 44820000 */ mtc1 $v0, $f0 -/* 5ED13C 80218CAC 00000000 */ nop +/* 5ED13C 80218CAC 00000000 */ nop /* 5ED140 80218CB0 46800020 */ cvt.s.w $f0, $f0 /* 5ED144 80218CB4 46020002 */ mul.s $f0, $f0, $f2 -/* 5ED148 80218CB8 00000000 */ nop +/* 5ED148 80218CB8 00000000 */ nop /* 5ED14C 80218CBC 4600203C */ c.lt.s $f4, $f0 -/* 5ED150 80218CC0 00000000 */ nop +/* 5ED150 80218CC0 00000000 */ nop /* 5ED154 80218CC4 45000003 */ bc1f .L80218CD4 /* 5ED158 80218CC8 24020001 */ addiu $v0, $zero, 1 /* 5ED15C 80218CCC 080863F7 */ j .L80218FDC @@ -96,58 +96,58 @@ glabel func_80218B80_5ED010 /* 5ED174 80218CE4 C6200098 */ lwc1 $f0, 0x98($s1) /* 5ED178 80218CE8 46001081 */ sub.s $f2, $f2, $f0 /* 5ED17C 80218CEC 46021182 */ mul.s $f6, $f2, $f2 -/* 5ED180 80218CF0 00000000 */ nop +/* 5ED180 80218CF0 00000000 */ nop /* 5ED184 80218CF4 C62000A0 */ lwc1 $f0, 0xa0($s1) /* 5ED188 80218CF8 C602014C */ lwc1 $f2, 0x14c($s0) /* 5ED18C 80218CFC 46001081 */ sub.s $f2, $f2, $f0 /* 5ED190 80218D00 46021102 */ mul.s $f4, $f2, $f2 -/* 5ED194 80218D04 00000000 */ nop +/* 5ED194 80218D04 00000000 */ nop /* 5ED198 80218D08 92020191 */ lbu $v0, 0x191($s0) /* 5ED19C 80218D0C C6020148 */ lwc1 $f2, 0x148($s0) /* 5ED1A0 80218D10 44820000 */ mtc1 $v0, $f0 -/* 5ED1A4 80218D14 00000000 */ nop +/* 5ED1A4 80218D14 00000000 */ nop /* 5ED1A8 80218D18 46800020 */ cvt.s.w $f0, $f0 /* 5ED1AC 80218D1C 46001080 */ add.s $f2, $f2, $f0 /* 5ED1B0 80218D20 3C013FC0 */ lui $at, 0x3fc0 /* 5ED1B4 80218D24 44810000 */ mtc1 $at, $f0 -/* 5ED1B8 80218D28 00000000 */ nop +/* 5ED1B8 80218D28 00000000 */ nop /* 5ED1BC 80218D2C 46001081 */ sub.s $f2, $f2, $f0 /* 5ED1C0 80218D30 46043300 */ add.s $f12, $f6, $f4 /* 5ED1C4 80218D34 C620009C */ lwc1 $f0, 0x9c($s1) /* 5ED1C8 80218D38 46001501 */ sub.s $f20, $f2, $f0 /* 5ED1CC 80218D3C 46006084 */ sqrt.s $f2, $f12 /* 5ED1D0 80218D40 46021032 */ c.eq.s $f2, $f2 -/* 5ED1D4 80218D44 00000000 */ nop +/* 5ED1D4 80218D44 00000000 */ nop /* 5ED1D8 80218D48 45010004 */ bc1t .L80218D5C -/* 5ED1DC 80218D4C 00000000 */ nop +/* 5ED1DC 80218D4C 00000000 */ nop /* 5ED1E0 80218D50 0C0187BC */ jal sqrtf -/* 5ED1E4 80218D54 00000000 */ nop +/* 5ED1E4 80218D54 00000000 */ nop /* 5ED1E8 80218D58 46000086 */ mov.s $f2, $f0 .L80218D5C: /* 5ED1EC 80218D5C 44800000 */ mtc1 $zero, $f0 -/* 5ED1F0 80218D60 00000000 */ nop +/* 5ED1F0 80218D60 00000000 */ nop /* 5ED1F4 80218D64 4614003C */ c.lt.s $f0, $f20 -/* 5ED1F8 80218D68 00000000 */ nop +/* 5ED1F8 80218D68 00000000 */ nop /* 5ED1FC 80218D6C 4500001B */ bc1f .L80218DDC /* 5ED200 80218D70 46001106 */ mov.s $f4, $f2 /* 5ED204 80218D74 92020191 */ lbu $v0, 0x191($s0) /* 5ED208 80218D78 44820000 */ mtc1 $v0, $f0 -/* 5ED20C 80218D7C 00000000 */ nop +/* 5ED20C 80218D7C 00000000 */ nop /* 5ED210 80218D80 46800020 */ cvt.s.w $f0, $f0 /* 5ED214 80218D84 4600A03C */ c.lt.s $f20, $f0 -/* 5ED218 80218D88 00000000 */ nop +/* 5ED218 80218D88 00000000 */ nop /* 5ED21C 80218D8C 45000014 */ bc1f .L80218DE0 /* 5ED220 80218D90 0000982D */ daddu $s3, $zero, $zero /* 5ED224 80218D94 92020190 */ lbu $v0, 0x190($s0) /* 5ED228 80218D98 3C013F00 */ lui $at, 0x3f00 /* 5ED22C 80218D9C 44811000 */ mtc1 $at, $f2 /* 5ED230 80218DA0 44820000 */ mtc1 $v0, $f0 -/* 5ED234 80218DA4 00000000 */ nop +/* 5ED234 80218DA4 00000000 */ nop /* 5ED238 80218DA8 46800020 */ cvt.s.w $f0, $f0 /* 5ED23C 80218DAC 46020002 */ mul.s $f0, $f0, $f2 -/* 5ED240 80218DB0 00000000 */ nop +/* 5ED240 80218DB0 00000000 */ nop /* 5ED244 80218DB4 4600203C */ c.lt.s $f4, $f0 -/* 5ED248 80218DB8 00000000 */ nop +/* 5ED248 80218DB8 00000000 */ nop /* 5ED24C 80218DBC 45000008 */ bc1f .L80218DE0 /* 5ED250 80218DC0 24020001 */ addiu $v0, $zero, 1 /* 5ED254 80218DC4 080863F7 */ j .L80218FDC @@ -179,16 +179,16 @@ glabel func_80218B80_5ED010 /* 5ED2A8 80218E18 C6200098 */ lwc1 $f0, 0x98($s1) /* 5ED2AC 80218E1C 46001081 */ sub.s $f2, $f2, $f0 /* 5ED2B0 80218E20 46021182 */ mul.s $f6, $f2, $f2 -/* 5ED2B4 80218E24 00000000 */ nop +/* 5ED2B4 80218E24 00000000 */ nop /* 5ED2B8 80218E28 C62000A0 */ lwc1 $f0, 0xa0($s1) /* 5ED2BC 80218E2C C602014C */ lwc1 $f2, 0x14c($s0) /* 5ED2C0 80218E30 46001081 */ sub.s $f2, $f2, $f0 /* 5ED2C4 80218E34 46021102 */ mul.s $f4, $f2, $f2 -/* 5ED2C8 80218E38 00000000 */ nop +/* 5ED2C8 80218E38 00000000 */ nop /* 5ED2CC 80218E3C 92020191 */ lbu $v0, 0x191($s0) /* 5ED2D0 80218E40 C6020148 */ lwc1 $f2, 0x148($s0) /* 5ED2D4 80218E44 44820000 */ mtc1 $v0, $f0 -/* 5ED2D8 80218E48 00000000 */ nop +/* 5ED2D8 80218E48 00000000 */ nop /* 5ED2DC 80218E4C 46800020 */ cvt.s.w $f0, $f0 /* 5ED2E0 80218E50 46001080 */ add.s $f2, $f2, $f0 /* 5ED2E4 80218E54 461A1081 */ sub.s $f2, $f2, $f26 @@ -197,32 +197,32 @@ glabel func_80218B80_5ED010 /* 5ED2F0 80218E60 46001501 */ sub.s $f20, $f2, $f0 /* 5ED2F4 80218E64 46006004 */ sqrt.s $f0, $f12 /* 5ED2F8 80218E68 46000032 */ c.eq.s $f0, $f0 -/* 5ED2FC 80218E6C 00000000 */ nop +/* 5ED2FC 80218E6C 00000000 */ nop /* 5ED300 80218E70 45010003 */ bc1t .L80218E80 -/* 5ED304 80218E74 00000000 */ nop +/* 5ED304 80218E74 00000000 */ nop /* 5ED308 80218E78 0C0187BC */ jal sqrtf -/* 5ED30C 80218E7C 00000000 */ nop +/* 5ED30C 80218E7C 00000000 */ nop .L80218E80: /* 5ED310 80218E80 4614C03C */ c.lt.s $f24, $f20 -/* 5ED314 80218E84 00000000 */ nop +/* 5ED314 80218E84 00000000 */ nop /* 5ED318 80218E88 45000013 */ bc1f .L80218ED8 /* 5ED31C 80218E8C 46000106 */ mov.s $f4, $f0 /* 5ED320 80218E90 92020191 */ lbu $v0, 0x191($s0) /* 5ED324 80218E94 44820000 */ mtc1 $v0, $f0 -/* 5ED328 80218E98 00000000 */ nop +/* 5ED328 80218E98 00000000 */ nop /* 5ED32C 80218E9C 46800020 */ cvt.s.w $f0, $f0 /* 5ED330 80218EA0 4600A03C */ c.lt.s $f20, $f0 -/* 5ED334 80218EA4 00000000 */ nop +/* 5ED334 80218EA4 00000000 */ nop /* 5ED338 80218EA8 4500000B */ bc1f .L80218ED8 -/* 5ED33C 80218EAC 00000000 */ nop +/* 5ED33C 80218EAC 00000000 */ nop /* 5ED340 80218EB0 92020190 */ lbu $v0, 0x190($s0) /* 5ED344 80218EB4 44820000 */ mtc1 $v0, $f0 -/* 5ED348 80218EB8 00000000 */ nop +/* 5ED348 80218EB8 00000000 */ nop /* 5ED34C 80218EBC 46800020 */ cvt.s.w $f0, $f0 /* 5ED350 80218EC0 46160002 */ mul.s $f0, $f0, $f22 -/* 5ED354 80218EC4 00000000 */ nop +/* 5ED354 80218EC4 00000000 */ nop /* 5ED358 80218EC8 4600203C */ c.lt.s $f4, $f0 -/* 5ED35C 80218ECC 00000000 */ nop +/* 5ED35C 80218ECC 00000000 */ nop /* 5ED360 80218ED0 4501FFBE */ bc1t .L80218DCC /* 5ED364 80218ED4 24020001 */ addiu $v0, $zero, 1 .L80218ED8: @@ -235,21 +235,21 @@ glabel func_80218B80_5ED010 /* 5ED37C 80218EEC 14400034 */ bnez $v0, .L80218FC0 /* 5ED380 80218EF0 00751024 */ and $v0, $v1, $s5 /* 5ED384 80218EF4 10400032 */ beqz $v0, .L80218FC0 -/* 5ED388 80218EF8 00000000 */ nop +/* 5ED388 80218EF8 00000000 */ nop /* 5ED38C 80218EFC C6020058 */ lwc1 $f2, 0x58($s0) /* 5ED390 80218F00 C6200098 */ lwc1 $f0, 0x98($s1) /* 5ED394 80218F04 46001081 */ sub.s $f2, $f2, $f0 /* 5ED398 80218F08 46021182 */ mul.s $f6, $f2, $f2 -/* 5ED39C 80218F0C 00000000 */ nop +/* 5ED39C 80218F0C 00000000 */ nop /* 5ED3A0 80218F10 C62000A0 */ lwc1 $f0, 0xa0($s1) /* 5ED3A4 80218F14 C6020060 */ lwc1 $f2, 0x60($s0) /* 5ED3A8 80218F18 46001081 */ sub.s $f2, $f2, $f0 /* 5ED3AC 80218F1C 46021102 */ mul.s $f4, $f2, $f2 -/* 5ED3B0 80218F20 00000000 */ nop +/* 5ED3B0 80218F20 00000000 */ nop /* 5ED3B4 80218F24 92020073 */ lbu $v0, 0x73($s0) /* 5ED3B8 80218F28 C600005C */ lwc1 $f0, 0x5c($s0) /* 5ED3BC 80218F2C 44821000 */ mtc1 $v0, $f2 -/* 5ED3C0 80218F30 00000000 */ nop +/* 5ED3C0 80218F30 00000000 */ nop /* 5ED3C4 80218F34 468010A0 */ cvt.s.w $f2, $f2 /* 5ED3C8 80218F38 46020000 */ add.s $f0, $f0, $f2 /* 5ED3CC 80218F3C 461A0001 */ sub.s $f0, $f0, $f26 @@ -258,38 +258,38 @@ glabel func_80218B80_5ED010 /* 5ED3D8 80218F48 46020501 */ sub.s $f20, $f0, $f2 /* 5ED3DC 80218F4C 46006004 */ sqrt.s $f0, $f12 /* 5ED3E0 80218F50 46000032 */ c.eq.s $f0, $f0 -/* 5ED3E4 80218F54 00000000 */ nop +/* 5ED3E4 80218F54 00000000 */ nop /* 5ED3E8 80218F58 45010003 */ bc1t .L80218F68 -/* 5ED3EC 80218F5C 00000000 */ nop +/* 5ED3EC 80218F5C 00000000 */ nop /* 5ED3F0 80218F60 0C0187BC */ jal sqrtf -/* 5ED3F4 80218F64 00000000 */ nop +/* 5ED3F4 80218F64 00000000 */ nop .L80218F68: /* 5ED3F8 80218F68 4614C03C */ c.lt.s $f24, $f20 -/* 5ED3FC 80218F6C 00000000 */ nop +/* 5ED3FC 80218F6C 00000000 */ nop /* 5ED400 80218F70 45000013 */ bc1f .L80218FC0 /* 5ED404 80218F74 46000106 */ mov.s $f4, $f0 /* 5ED408 80218F78 92020073 */ lbu $v0, 0x73($s0) /* 5ED40C 80218F7C 44820000 */ mtc1 $v0, $f0 -/* 5ED410 80218F80 00000000 */ nop +/* 5ED410 80218F80 00000000 */ nop /* 5ED414 80218F84 46800020 */ cvt.s.w $f0, $f0 /* 5ED418 80218F88 4600A03C */ c.lt.s $f20, $f0 -/* 5ED41C 80218F8C 00000000 */ nop +/* 5ED41C 80218F8C 00000000 */ nop /* 5ED420 80218F90 4500000B */ bc1f .L80218FC0 -/* 5ED424 80218F94 00000000 */ nop +/* 5ED424 80218F94 00000000 */ nop /* 5ED428 80218F98 92020072 */ lbu $v0, 0x72($s0) /* 5ED42C 80218F9C 44820000 */ mtc1 $v0, $f0 -/* 5ED430 80218FA0 00000000 */ nop +/* 5ED430 80218FA0 00000000 */ nop /* 5ED434 80218FA4 46800020 */ cvt.s.w $f0, $f0 /* 5ED438 80218FA8 46160002 */ mul.s $f0, $f0, $f22 -/* 5ED43C 80218FAC 00000000 */ nop +/* 5ED43C 80218FAC 00000000 */ nop /* 5ED440 80218FB0 4600203C */ c.lt.s $f4, $f0 -/* 5ED444 80218FB4 00000000 */ nop +/* 5ED444 80218FB4 00000000 */ nop /* 5ED448 80218FB8 4501FF86 */ bc1t .L80218DD4 /* 5ED44C 80218FBC 24020001 */ addiu $v0, $zero, 1 .L80218FC0: /* 5ED450 80218FC0 8E10000C */ lw $s0, 0xc($s0) /* 5ED454 80218FC4 1600FFC7 */ bnez $s0, .L80218EE4 -/* 5ED458 80218FC8 00000000 */ nop +/* 5ED458 80218FC8 00000000 */ nop /* 5ED45C 80218FCC 26730001 */ addiu $s3, $s3, 1 .L80218FD0: /* 5ED460 80218FD0 2A620018 */ slti $v0, $s3, 0x18 @@ -310,6 +310,6 @@ glabel func_80218B80_5ED010 /* 5ED498 80219008 D7B40030 */ ldc1 $f20, 0x30($sp) /* 5ED49C 8021900C 03E00008 */ jr $ra /* 5ED4A0 80219010 27BD0050 */ addiu $sp, $sp, 0x50 -/* 5ED4A4 80219014 00000000 */ nop -/* 5ED4A8 80219018 00000000 */ nop -/* 5ED4AC 8021901C 00000000 */ nop +/* 5ED4A4 80219014 00000000 */ nop +/* 5ED4A8 80219018 00000000 */ nop +/* 5ED4AC 8021901C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_tik3/6186F0/func_80218000_6186F0.s b/asm/nonmatchings/battle/area_tik3/6186F0/func_80218000_6186F0.s deleted file mode 100644 index aadb98cfdb..0000000000 --- a/asm/nonmatchings/battle/area_tik3/6186F0/func_80218000_6186F0.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218000_6186F0 -/* 6186F0 80218000 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 6186F4 80218004 AFB10014 */ sw $s1, 0x14($sp) -/* 6186F8 80218008 0080882D */ daddu $s1, $a0, $zero -/* 6186FC 8021800C AFBF0020 */ sw $ra, 0x20($sp) -/* 618700 80218010 AFB3001C */ sw $s3, 0x1c($sp) -/* 618704 80218014 AFB20018 */ sw $s2, 0x18($sp) -/* 618708 80218018 AFB00010 */ sw $s0, 0x10($sp) -/* 61870C 8021801C 8E30000C */ lw $s0, 0xc($s1) -/* 618710 80218020 8E050000 */ lw $a1, ($s0) -/* 618714 80218024 0C0B1EAF */ jal get_variable -/* 618718 80218028 26100004 */ addiu $s0, $s0, 4 -/* 61871C 8021802C 8E050000 */ lw $a1, ($s0) -/* 618720 80218030 26100004 */ addiu $s0, $s0, 4 -/* 618724 80218034 0220202D */ daddu $a0, $s1, $zero -/* 618728 80218038 0C0B1EAF */ jal get_variable -/* 61872C 8021803C 0040982D */ daddu $s3, $v0, $zero -/* 618730 80218040 8E050000 */ lw $a1, ($s0) -/* 618734 80218044 26100004 */ addiu $s0, $s0, 4 -/* 618738 80218048 0220202D */ daddu $a0, $s1, $zero -/* 61873C 8021804C 0C0B1EAF */ jal get_variable -/* 618740 80218050 0040902D */ daddu $s2, $v0, $zero -/* 618744 80218054 0220202D */ daddu $a0, $s1, $zero -/* 618748 80218058 8E050000 */ lw $a1, ($s0) -/* 61874C 8021805C 0C0B1EAF */ jal get_variable -/* 618750 80218060 0040802D */ daddu $s0, $v0, $zero -/* 618754 80218064 8E240148 */ lw $a0, 0x148($s1) -/* 618758 80218068 0C09A75B */ jal get_actor -/* 61875C 8021806C 0040882D */ daddu $s1, $v0, $zero -/* 618760 80218070 0040182D */ daddu $v1, $v0, $zero -/* 618764 80218074 8C620008 */ lw $v0, 8($v1) -/* 618768 80218078 90420024 */ lbu $v0, 0x24($v0) -/* 61876C 8021807C 8C640008 */ lw $a0, 8($v1) -/* 618770 80218080 02629823 */ subu $s3, $s3, $v0 -/* 618774 80218084 A0730194 */ sb $s3, 0x194($v1) -/* 618778 80218088 90820025 */ lbu $v0, 0x25($a0) -/* 61877C 8021808C 02429023 */ subu $s2, $s2, $v0 -/* 618780 80218090 A0720195 */ sb $s2, 0x195($v1) -/* 618784 80218094 90820026 */ lbu $v0, 0x26($a0) -/* 618788 80218098 02028023 */ subu $s0, $s0, $v0 -/* 61878C 8021809C A0700196 */ sb $s0, 0x196($v1) -/* 618790 802180A0 90840027 */ lbu $a0, 0x27($a0) -/* 618794 802180A4 02248823 */ subu $s1, $s1, $a0 -/* 618798 802180A8 A0710197 */ sb $s1, 0x197($v1) -/* 61879C 802180AC 8FBF0020 */ lw $ra, 0x20($sp) -/* 6187A0 802180B0 8FB3001C */ lw $s3, 0x1c($sp) -/* 6187A4 802180B4 8FB20018 */ lw $s2, 0x18($sp) -/* 6187A8 802180B8 8FB10014 */ lw $s1, 0x14($sp) -/* 6187AC 802180BC 8FB00010 */ lw $s0, 0x10($sp) -/* 6187B0 802180C0 24020002 */ addiu $v0, $zero, 2 -/* 6187B4 802180C4 03E00008 */ jr $ra -/* 6187B8 802180C8 27BD0028 */ addiu $sp, $sp, 0x28 -/* 6187BC 802180CC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_tik3/6186F0/func_802180D0_6187C0.s b/asm/nonmatchings/battle/area_tik3/6186F0/func_802180D0_6187C0.s deleted file mode 100644 index cfbdb5bd86..0000000000 --- a/asm/nonmatchings/battle/area_tik3/6186F0/func_802180D0_6187C0.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802180D0_6187C0 -/* 6187C0 802180D0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 6187C4 802180D4 AFB10014 */ sw $s1, 0x14($sp) -/* 6187C8 802180D8 0080882D */ daddu $s1, $a0, $zero -/* 6187CC 802180DC AFBF0020 */ sw $ra, 0x20($sp) -/* 6187D0 802180E0 AFB3001C */ sw $s3, 0x1c($sp) -/* 6187D4 802180E4 AFB20018 */ sw $s2, 0x18($sp) -/* 6187D8 802180E8 AFB00010 */ sw $s0, 0x10($sp) -/* 6187DC 802180EC 8E30000C */ lw $s0, 0xc($s1) -/* 6187E0 802180F0 8E050000 */ lw $a1, ($s0) -/* 6187E4 802180F4 0C0B1EAF */ jal get_variable -/* 6187E8 802180F8 26100004 */ addiu $s0, $s0, 4 -/* 6187EC 802180FC 8E050000 */ lw $a1, ($s0) -/* 6187F0 80218100 26100004 */ addiu $s0, $s0, 4 -/* 6187F4 80218104 0220202D */ daddu $a0, $s1, $zero -/* 6187F8 80218108 0C0B1EAF */ jal get_variable -/* 6187FC 8021810C 0040982D */ daddu $s3, $v0, $zero -/* 618800 80218110 8E050000 */ lw $a1, ($s0) -/* 618804 80218114 26100004 */ addiu $s0, $s0, 4 -/* 618808 80218118 0220202D */ daddu $a0, $s1, $zero -/* 61880C 8021811C 0C0B1EAF */ jal get_variable -/* 618810 80218120 0040902D */ daddu $s2, $v0, $zero -/* 618814 80218124 0220202D */ daddu $a0, $s1, $zero -/* 618818 80218128 8E050000 */ lw $a1, ($s0) -/* 61881C 8021812C 0C0B1EAF */ jal get_variable -/* 618820 80218130 0040802D */ daddu $s0, $v0, $zero -/* 618824 80218134 8E240148 */ lw $a0, 0x148($s1) -/* 618828 80218138 0C09A75B */ jal get_actor -/* 61882C 8021813C 0040882D */ daddu $s1, $v0, $zero -/* 618830 80218140 0040182D */ daddu $v1, $v0, $zero -/* 618834 80218144 8C620008 */ lw $v0, 8($v1) -/* 618838 80218148 90420024 */ lbu $v0, 0x24($v0) -/* 61883C 8021814C 8C640008 */ lw $a0, 8($v1) -/* 618840 80218150 02629823 */ subu $s3, $s3, $v0 -/* 618844 80218154 A0730194 */ sb $s3, 0x194($v1) -/* 618848 80218158 90820025 */ lbu $v0, 0x25($a0) -/* 61884C 8021815C 02429023 */ subu $s2, $s2, $v0 -/* 618850 80218160 A0720195 */ sb $s2, 0x195($v1) -/* 618854 80218164 90820026 */ lbu $v0, 0x26($a0) -/* 618858 80218168 02028023 */ subu $s0, $s0, $v0 -/* 61885C 8021816C A0700196 */ sb $s0, 0x196($v1) -/* 618860 80218170 90840027 */ lbu $a0, 0x27($a0) -/* 618864 80218174 02248823 */ subu $s1, $s1, $a0 -/* 618868 80218178 A0710197 */ sb $s1, 0x197($v1) -/* 61886C 8021817C 8FBF0020 */ lw $ra, 0x20($sp) -/* 618870 80218180 8FB3001C */ lw $s3, 0x1c($sp) -/* 618874 80218184 8FB20018 */ lw $s2, 0x18($sp) -/* 618878 80218188 8FB10014 */ lw $s1, 0x14($sp) -/* 61887C 8021818C 8FB00010 */ lw $s0, 0x10($sp) -/* 618880 80218190 24020002 */ addiu $v0, $zero, 2 -/* 618884 80218194 03E00008 */ jr $ra -/* 618888 80218198 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/battle/area_tik3/6186F0/func_8021819C_61888C.s b/asm/nonmatchings/battle/area_tik3/6187C0/func_8021819C_61888C.s similarity index 100% rename from asm/nonmatchings/battle/area_tik3/6186F0/func_8021819C_61888C.s rename to asm/nonmatchings/battle/area_tik3/6187C0/func_8021819C_61888C.s diff --git a/asm/nonmatchings/battle/area_tik3/6186F0/func_80218250_618940.s b/asm/nonmatchings/battle/area_tik3/6187C0/func_80218250_618940.s similarity index 100% rename from asm/nonmatchings/battle/area_tik3/6186F0/func_80218250_618940.s rename to asm/nonmatchings/battle/area_tik3/6187C0/func_80218250_618940.s diff --git a/asm/nonmatchings/battle/area_trd_part_1/4A10A0/func_80218020_4A10C0.s b/asm/nonmatchings/battle/area_trd_part_1/4A10A0/func_80218020_4A10C0.s deleted file mode 100644 index 4c35e27fff..0000000000 --- a/asm/nonmatchings/battle/area_trd_part_1/4A10A0/func_80218020_4A10C0.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218020_4A10C0 -/* 4A10C0 80218020 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 4A10C4 80218024 AFB10014 */ sw $s1, 0x14($sp) -/* 4A10C8 80218028 0080882D */ daddu $s1, $a0, $zero -/* 4A10CC 8021802C AFBF0020 */ sw $ra, 0x20($sp) -/* 4A10D0 80218030 AFB3001C */ sw $s3, 0x1c($sp) -/* 4A10D4 80218034 AFB20018 */ sw $s2, 0x18($sp) -/* 4A10D8 80218038 AFB00010 */ sw $s0, 0x10($sp) -/* 4A10DC 8021803C 8E30000C */ lw $s0, 0xc($s1) -/* 4A10E0 80218040 8E050000 */ lw $a1, ($s0) -/* 4A10E4 80218044 0C0B1EAF */ jal get_variable -/* 4A10E8 80218048 26100004 */ addiu $s0, $s0, 4 -/* 4A10EC 8021804C 8E050000 */ lw $a1, ($s0) -/* 4A10F0 80218050 26100004 */ addiu $s0, $s0, 4 -/* 4A10F4 80218054 0220202D */ daddu $a0, $s1, $zero -/* 4A10F8 80218058 0C0B1EAF */ jal get_variable -/* 4A10FC 8021805C 0040982D */ daddu $s3, $v0, $zero -/* 4A1100 80218060 8E050000 */ lw $a1, ($s0) -/* 4A1104 80218064 26100004 */ addiu $s0, $s0, 4 -/* 4A1108 80218068 0220202D */ daddu $a0, $s1, $zero -/* 4A110C 8021806C 0C0B1EAF */ jal get_variable -/* 4A1110 80218070 0040902D */ daddu $s2, $v0, $zero -/* 4A1114 80218074 0220202D */ daddu $a0, $s1, $zero -/* 4A1118 80218078 8E050000 */ lw $a1, ($s0) -/* 4A111C 8021807C 0C0B1EAF */ jal get_variable -/* 4A1120 80218080 0040802D */ daddu $s0, $v0, $zero -/* 4A1124 80218084 8E240148 */ lw $a0, 0x148($s1) -/* 4A1128 80218088 0C09A75B */ jal get_actor -/* 4A112C 8021808C 0040882D */ daddu $s1, $v0, $zero -/* 4A1130 80218090 0040182D */ daddu $v1, $v0, $zero -/* 4A1134 80218094 8C620008 */ lw $v0, 8($v1) -/* 4A1138 80218098 90420024 */ lbu $v0, 0x24($v0) -/* 4A113C 8021809C 8C640008 */ lw $a0, 8($v1) -/* 4A1140 802180A0 02629823 */ subu $s3, $s3, $v0 -/* 4A1144 802180A4 A0730194 */ sb $s3, 0x194($v1) -/* 4A1148 802180A8 90820025 */ lbu $v0, 0x25($a0) -/* 4A114C 802180AC 02429023 */ subu $s2, $s2, $v0 -/* 4A1150 802180B0 A0720195 */ sb $s2, 0x195($v1) -/* 4A1154 802180B4 90820026 */ lbu $v0, 0x26($a0) -/* 4A1158 802180B8 02028023 */ subu $s0, $s0, $v0 -/* 4A115C 802180BC A0700196 */ sb $s0, 0x196($v1) -/* 4A1160 802180C0 90840027 */ lbu $a0, 0x27($a0) -/* 4A1164 802180C4 02248823 */ subu $s1, $s1, $a0 -/* 4A1168 802180C8 A0710197 */ sb $s1, 0x197($v1) -/* 4A116C 802180CC 8FBF0020 */ lw $ra, 0x20($sp) -/* 4A1170 802180D0 8FB3001C */ lw $s3, 0x1c($sp) -/* 4A1174 802180D4 8FB20018 */ lw $s2, 0x18($sp) -/* 4A1178 802180D8 8FB10014 */ lw $s1, 0x14($sp) -/* 4A117C 802180DC 8FB00010 */ lw $s0, 0x10($sp) -/* 4A1180 802180E0 24020002 */ addiu $v0, $zero, 2 -/* 4A1184 802180E4 03E00008 */ jr $ra -/* 4A1188 802180E8 27BD0028 */ addiu $sp, $sp, 0x28 -/* 4A118C 802180EC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_trd_part_1/4A10A0/func_80218148_4A11E8.s b/asm/nonmatchings/battle/area_trd_part_1/4A10A0/func_80218148_4A11E8.s deleted file mode 100644 index 73ddc803c5..0000000000 --- a/asm/nonmatchings/battle/area_trd_part_1/4A10A0/func_80218148_4A11E8.s +++ /dev/null @@ -1,58 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218148_4A11E8 -/* 4A11E8 80218148 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 4A11EC 8021814C AFB10014 */ sw $s1, 0x14($sp) -/* 4A11F0 80218150 0080882D */ daddu $s1, $a0, $zero -/* 4A11F4 80218154 AFBF0020 */ sw $ra, 0x20($sp) -/* 4A11F8 80218158 AFB3001C */ sw $s3, 0x1c($sp) -/* 4A11FC 8021815C AFB20018 */ sw $s2, 0x18($sp) -/* 4A1200 80218160 AFB00010 */ sw $s0, 0x10($sp) -/* 4A1204 80218164 8E30000C */ lw $s0, 0xc($s1) -/* 4A1208 80218168 8E050000 */ lw $a1, ($s0) -/* 4A120C 8021816C 0C0B1EAF */ jal get_variable -/* 4A1210 80218170 26100004 */ addiu $s0, $s0, 4 -/* 4A1214 80218174 8E050000 */ lw $a1, ($s0) -/* 4A1218 80218178 26100004 */ addiu $s0, $s0, 4 -/* 4A121C 8021817C 0220202D */ daddu $a0, $s1, $zero -/* 4A1220 80218180 0C0B1EAF */ jal get_variable -/* 4A1224 80218184 0040982D */ daddu $s3, $v0, $zero -/* 4A1228 80218188 8E050000 */ lw $a1, ($s0) -/* 4A122C 8021818C 26100004 */ addiu $s0, $s0, 4 -/* 4A1230 80218190 0220202D */ daddu $a0, $s1, $zero -/* 4A1234 80218194 0C0B1EAF */ jal get_variable -/* 4A1238 80218198 0040902D */ daddu $s2, $v0, $zero -/* 4A123C 8021819C 0220202D */ daddu $a0, $s1, $zero -/* 4A1240 802181A0 8E050000 */ lw $a1, ($s0) -/* 4A1244 802181A4 0C0B1EAF */ jal get_variable -/* 4A1248 802181A8 0040802D */ daddu $s0, $v0, $zero -/* 4A124C 802181AC 8E240148 */ lw $a0, 0x148($s1) -/* 4A1250 802181B0 0C09A75B */ jal get_actor -/* 4A1254 802181B4 0040882D */ daddu $s1, $v0, $zero -/* 4A1258 802181B8 0040182D */ daddu $v1, $v0, $zero -/* 4A125C 802181BC 8C620008 */ lw $v0, 8($v1) -/* 4A1260 802181C0 90420024 */ lbu $v0, 0x24($v0) -/* 4A1264 802181C4 8C640008 */ lw $a0, 8($v1) -/* 4A1268 802181C8 02629823 */ subu $s3, $s3, $v0 -/* 4A126C 802181CC A0730194 */ sb $s3, 0x194($v1) -/* 4A1270 802181D0 90820025 */ lbu $v0, 0x25($a0) -/* 4A1274 802181D4 02429023 */ subu $s2, $s2, $v0 -/* 4A1278 802181D8 A0720195 */ sb $s2, 0x195($v1) -/* 4A127C 802181DC 90820026 */ lbu $v0, 0x26($a0) -/* 4A1280 802181E0 02028023 */ subu $s0, $s0, $v0 -/* 4A1284 802181E4 A0700196 */ sb $s0, 0x196($v1) -/* 4A1288 802181E8 90840027 */ lbu $a0, 0x27($a0) -/* 4A128C 802181EC 02248823 */ subu $s1, $s1, $a0 -/* 4A1290 802181F0 A0710197 */ sb $s1, 0x197($v1) -/* 4A1294 802181F4 8FBF0020 */ lw $ra, 0x20($sp) -/* 4A1298 802181F8 8FB3001C */ lw $s3, 0x1c($sp) -/* 4A129C 802181FC 8FB20018 */ lw $s2, 0x18($sp) -/* 4A12A0 80218200 8FB10014 */ lw $s1, 0x14($sp) -/* 4A12A4 80218204 8FB00010 */ lw $s0, 0x10($sp) -/* 4A12A8 80218208 24020002 */ addiu $v0, $zero, 2 -/* 4A12AC 8021820C 03E00008 */ jr $ra -/* 4A12B0 80218210 27BD0028 */ addiu $sp, $sp, 0x28 -/* 4A12B4 80218214 00000000 */ nop -/* 4A12B8 80218218 00000000 */ nop -/* 4A12BC 8021821C 00000000 */ nop diff --git a/include/common_structs.h b/include/common_structs.h index 7be497ac8f..5b50a9a254 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -679,8 +679,8 @@ typedef struct StaticActorData { /* 0x1F */ u8 coinReward; /* 0x20 */ u8 size[2]; /* 0x22 */ Vec2b hpBarOffset; - /* 0x24 */ u8 statusIconOffset[2]; - /* 0x26 */ u8 statusMessageOffset[2]; + /* 0x24 */ Vec2b statusIconOffset; + /* 0x26 */ Vec2b statusMessageOffset; } StaticActorData; // size = 0x28 typedef struct StaticMove { diff --git a/src/battle/area_dig/6DDDC0.c b/src/battle/area_dig/6DDDC0.c index aca6ffadf0..f73e59e44b 100644 --- a/src/battle/area_dig/6DDDC0.c +++ b/src/battle/area_dig/6DDDC0.c @@ -2,8 +2,4 @@ #define NAMESPACE b_area_dig -INCLUDE_ASM(s32, "battle/area_dig/6DDDC0", func_80218000_6DDDC0); - -INCLUDE_ASM(s32, "battle/area_dig/6DDDC0", func_802180D0_6DDE90); - -INCLUDE_ASM(s32, "battle/area_dig/6DDDC0", func_80218184_6DDF44); +#include "common/UnkBattleFunc1.inc.c" diff --git a/src/battle/area_dig/6DDE90.c b/src/battle/area_dig/6DDE90.c new file mode 100644 index 0000000000..2241a32b77 --- /dev/null +++ b/src/battle/area_dig/6DDE90.c @@ -0,0 +1,7 @@ +#include "common.h" + +#define NAMESPACE b_area_dig + +INCLUDE_ASM(s32, "battle/area_dig/6DDE90", func_802180D0_6DDE90); + +INCLUDE_ASM(s32, "battle/area_dig/6DDE90", func_80218184_6DDF44); diff --git a/src/battle/area_dig/6DE000.c b/src/battle/area_dig/6DE000.c index a4ffa57353..07f1598bac 100644 --- a/src/battle/area_dig/6DE000.c +++ b/src/battle/area_dig/6DE000.c @@ -2,8 +2,6 @@ #define NAMESPACE b_area_dig -INCLUDE_ASM(s32, "battle/area_dig/6DE000", func_80218240_6DE000); - -INCLUDE_ASM(s32, "battle/area_dig/6DE000", func_80218310_6DE0D0); - -INCLUDE_ASM(s32, "battle/area_dig/6DE000", func_802183E0_6DE1A0); +#define NAMESPACE dup_b_area_dig +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_dig diff --git a/src/battle/area_dig/6DE060.c b/src/battle/area_dig/6DE060.c new file mode 100644 index 0000000000..649a6d2e5b --- /dev/null +++ b/src/battle/area_dig/6DE060.c @@ -0,0 +1,7 @@ +#include "common.h" + +#define NAMESPACE b_area_dig + +#define NAMESPACE dup2_b_area_dig +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_dig diff --git a/src/battle/area_dig/6DE1A0.c b/src/battle/area_dig/6DE1A0.c new file mode 100644 index 0000000000..a4684ab51f --- /dev/null +++ b/src/battle/area_dig/6DE1A0.c @@ -0,0 +1,5 @@ +#include "common.h" + +#define NAMESPACE b_area_dig + +INCLUDE_ASM(s32, "battle/area_dig/6DE1A0", func_802183E0_6DE1A0); diff --git a/src/battle/area_flo/5B14B0.c b/src/battle/area_flo/5B14B0.c index 1df6b51df2..28183b1883 100644 --- a/src/battle/area_flo/5B14B0.c +++ b/src/battle/area_flo/5B14B0.c @@ -2,6 +2,6 @@ #define NAMESPACE b_area_flo -INCLUDE_ASM(s32, "battle/area_flo/5B14B0", func_80218000_5B14B0); +#include "common/UnkBattleFunc1.inc.c" INCLUDE_ASM(s32, "battle/area_flo/5B14B0", func_802180CC_5B157C); diff --git a/src/battle/area_flo/5B16A0.c b/src/battle/area_flo/5B16A0.c index 9a2c1ae381..79ae449679 100644 --- a/src/battle/area_flo/5B16A0.c +++ b/src/battle/area_flo/5B16A0.c @@ -4,7 +4,9 @@ INCLUDE_ASM(s32, "battle/area_flo/5B16A0", func_802181F0_5B16A0); -INCLUDE_ASM(s32, "battle/area_flo/5B16A0", func_80218380_5B1830); +#define NAMESPACE dup_b_area_flo +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_flo INCLUDE_ASM(s32, "battle/area_flo/5B16A0", func_8021844C_5B18FC); @@ -12,7 +14,9 @@ INCLUDE_ASM(s32, "battle/area_flo/5B16A0", func_80218560_5B1A10); INCLUDE_ASM(s32, "battle/area_flo/5B16A0", func_802186B8_5B1B68); -INCLUDE_ASM(s32, "battle/area_flo/5B16A0", func_802186E4_5B1B94); +#define NAMESPACE dup2_b_area_flo +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_flo #include "common/StartRumbleWithParams.inc.c" @@ -22,7 +26,9 @@ INCLUDE_ASM(s32, "battle/area_flo/5B16A0", func_802188D0_5B1D80); INCLUDE_ASM(s32, "battle/area_flo/5B16A0", func_80218A28_5B1ED8); -INCLUDE_ASM(s32, "battle/area_flo/5B16A0", func_80218A54_5B1F04); +#define NAMESPACE dup3_b_area_flo +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_flo #define NAMESPACE dup_b_area_flo #include "common/StartRumbleWithParams.inc.c" @@ -34,7 +40,9 @@ INCLUDE_ASM(s32, "battle/area_flo/5B16A0", func_80218C40_5B20F0); INCLUDE_ASM(s32, "battle/area_flo/5B16A0", func_80218D98_5B2248); -INCLUDE_ASM(s32, "battle/area_flo/5B16A0", func_80218DC4_5B2274); +#define NAMESPACE dup4_b_area_flo +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_flo #define NAMESPACE dup2_b_area_flo #include "common/StartRumbleWithParams.inc.c" @@ -50,7 +58,9 @@ INCLUDE_ASM(s32, "battle/area_flo/5B16A0", func_802190B0_5B2560); INCLUDE_ASM(s32, "battle/area_flo/5B16A0", func_80219208_5B26B8); -INCLUDE_ASM(s32, "battle/area_flo/5B16A0", func_80219234_5B26E4); +#define NAMESPACE dup5_b_area_flo +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_flo #define NAMESPACE dup3_b_area_flo #include "common/StartRumbleWithParams.inc.c" diff --git a/src/battle/area_hos/47F0D0.c b/src/battle/area_hos/47F0D0.c index c8054e63d6..31ebf3dc54 100644 --- a/src/battle/area_hos/47F0D0.c +++ b/src/battle/area_hos/47F0D0.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "battle/area_hos/47F0D0", func_80218150_47F200); INCLUDE_ASM(s32, "battle/area_hos/47F0D0", func_802182A8_47F358); -INCLUDE_ASM(s32, "battle/area_hos/47F0D0", func_802182D4_47F384); +#include "common/UnkBattleFunc1.inc.c" #include "common/StartRumbleWithParams.inc.c" diff --git a/src/battle/area_isk_part_1/4E2740.c b/src/battle/area_isk_part_1/4E2740.c index fe1a16b35e..c965d91299 100644 --- a/src/battle/area_isk_part_1/4E2740.c +++ b/src/battle/area_isk_part_1/4E2740.c @@ -2,24 +2,4 @@ #define NAMESPACE b_area_isk_part_1 -INCLUDE_ASM(s32, "battle/area_isk_part_1/4E2740", func_80218000_4E2740); - -INCLUDE_ASM(s32, "battle/area_isk_part_1/4E2740", func_802180D0_4E2810); - -INCLUDE_ASM(s32, "battle/area_isk_part_1/4E2740", func_802181A0_4E28E0); - -INCLUDE_ASM(s32, "battle/area_isk_part_1/4E2740", func_80218270_4E29B0); - -INCLUDE_ASM(s32, "battle/area_isk_part_1/4E2740", func_802183C0_4E2B00); - -INCLUDE_ASM(s32, "battle/area_isk_part_1/4E2740", func_80218458_4E2B98); - -INCLUDE_ASM(s32, "battle/area_isk_part_1/4E2740", func_802184CC_4E2C0C); - -INCLUDE_ASM(s32, "battle/area_isk_part_1/4E2740", func_802188B0_4E2FF0); - -INCLUDE_ASM(s32, "battle/area_isk_part_1/4E2740", func_80218944_4E3084); - -INCLUDE_ASM(s32, "battle/area_isk_part_1/4E2740", func_80218980_4E30C0); - -INCLUDE_ASM(s32, "battle/area_isk_part_1/4E2740", func_80218A10_4E3150); +#include "common/UnkBattleFunc1.inc.c" diff --git a/src/battle/area_isk_part_1/4E2810.c b/src/battle/area_isk_part_1/4E2810.c new file mode 100644 index 0000000000..a0bf1cc7a9 --- /dev/null +++ b/src/battle/area_isk_part_1/4E2810.c @@ -0,0 +1,7 @@ +#include "common.h" + +#define NAMESPACE b_area_isk_part_1 + +#define NAMESPACE dup_b_area_isk_part_1 +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_isk_part_1 diff --git a/src/battle/area_isk_part_1/4E28E0.c b/src/battle/area_isk_part_1/4E28E0.c new file mode 100644 index 0000000000..9b942a337c --- /dev/null +++ b/src/battle/area_isk_part_1/4E28E0.c @@ -0,0 +1,7 @@ +#include "common.h" + +#define NAMESPACE b_area_isk_part_1 + +#define NAMESPACE dup2_b_area_isk_part_1 +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_isk_part_1 diff --git a/src/battle/area_isk_part_1/4E29B0.c b/src/battle/area_isk_part_1/4E29B0.c new file mode 100644 index 0000000000..d301a61cba --- /dev/null +++ b/src/battle/area_isk_part_1/4E29B0.c @@ -0,0 +1,19 @@ +#include "common.h" + +#define NAMESPACE b_area_isk_part_1 + +INCLUDE_ASM(s32, "battle/area_isk_part_1/4E29B0", func_80218270_4E29B0); + +INCLUDE_ASM(s32, "battle/area_isk_part_1/4E29B0", func_802183C0_4E2B00); + +INCLUDE_ASM(s32, "battle/area_isk_part_1/4E29B0", func_80218458_4E2B98); + +INCLUDE_ASM(s32, "battle/area_isk_part_1/4E29B0", func_802184CC_4E2C0C); + +INCLUDE_ASM(s32, "battle/area_isk_part_1/4E29B0", func_802188B0_4E2FF0); + +INCLUDE_ASM(s32, "battle/area_isk_part_1/4E29B0", func_80218944_4E3084); + +INCLUDE_ASM(s32, "battle/area_isk_part_1/4E29B0", func_80218980_4E30C0); + +INCLUDE_ASM(s32, "battle/area_isk_part_1/4E29B0", func_80218A10_4E3150); diff --git a/src/battle/area_isk_part_2/4EF4A0.c b/src/battle/area_isk_part_2/4EF4A0.c index 1a5c2ff97a..674686cf3b 100644 --- a/src/battle/area_isk_part_2/4EF4A0.c +++ b/src/battle/area_isk_part_2/4EF4A0.c @@ -12,6 +12,6 @@ INCLUDE_ASM(s32, "battle/area_isk_part_2/4EF4A0", func_8021825C_4EF6FC); INCLUDE_ASM(s32, "battle/area_isk_part_2/4EF4A0", func_8021866C_4EFB0C); -INCLUDE_ASM(s32, "battle/area_isk_part_2/4EF4A0", func_80218690_4EFB30); +#include "common/UnkBattleFunc1.inc.c" INCLUDE_ASM(s32, "battle/area_isk_part_2/4EF4A0", func_8021875C_4EFBFC); diff --git a/src/battle/area_jan/573920.c b/src/battle/area_jan/573920.c index 7d97393e07..7cea18f3e5 100644 --- a/src/battle/area_jan/573920.c +++ b/src/battle/area_jan/573920.c @@ -2,10 +2,6 @@ #define NAMESPACE b_area_jan -INCLUDE_ASM(s32, "battle/area_jan/573920", func_80218000_573920); - -INCLUDE_ASM(s32, "battle/area_jan/573920", func_802180D0_5739F0); - -INCLUDE_ASM(s32, "battle/area_jan/573920", func_802181A0_573AC0); - -INCLUDE_ASM(s32, "battle/area_jan/573920", func_80218254_573B74); +#define NAMESPACE dup2_b_area_jan +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_jan diff --git a/src/battle/area_jan/5739F0.c b/src/battle/area_jan/5739F0.c new file mode 100644 index 0000000000..da305fb8d3 --- /dev/null +++ b/src/battle/area_jan/5739F0.c @@ -0,0 +1,7 @@ +#include "common.h" + +#define NAMESPACE b_area_jan + +#define NAMESPACE dup3_b_area_jan +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_jan diff --git a/src/battle/area_jan/573AC0.c b/src/battle/area_jan/573AC0.c new file mode 100644 index 0000000000..9ffeed3eeb --- /dev/null +++ b/src/battle/area_jan/573AC0.c @@ -0,0 +1,7 @@ +#include "common.h" + +#define NAMESPACE b_area_jan + +INCLUDE_ASM(s32, "battle/area_jan/573AC0", func_802181A0_573AC0); + +INCLUDE_ASM(s32, "battle/area_jan/573AC0", func_80218254_573B74); diff --git a/src/battle/area_jan/573C30.c b/src/battle/area_jan/573C30.c index bf37bd2795..ef3a9e55b3 100644 --- a/src/battle/area_jan/573C30.c +++ b/src/battle/area_jan/573C30.c @@ -2,8 +2,10 @@ #define NAMESPACE b_area_jan -INCLUDE_ASM(s32, "battle/area_jan/573C30", func_80218310_573C30); +#include "common/UnkBattleFunc1.inc.c" INCLUDE_ASM(s32, "battle/area_jan/573C30", func_802183DC_573CFC); -INCLUDE_ASM(s32, "battle/area_jan/573C30", func_802184F0_573E10); +#define NAMESPACE dup_b_area_jan +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_jan diff --git a/src/battle/area_jan2/584940.c b/src/battle/area_jan2/584940.c index 07e8ac2369..9e1b6b02a7 100644 --- a/src/battle/area_jan2/584940.c +++ b/src/battle/area_jan2/584940.c @@ -2,6 +2,8 @@ #define NAMESPACE b_area_jan2 -INCLUDE_ASM(s32, "battle/area_jan2/584940", func_80218000_584940); +#define NAMESPACE dup_b_area_jan2 +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_jan2 INCLUDE_ASM(s32, "battle/area_jan2/584940", func_802180CC_584A0C); diff --git a/src/battle/area_jan2/584B90.c b/src/battle/area_jan2/584B90.c index 989d14e08b..636317199c 100644 --- a/src/battle/area_jan2/584B90.c +++ b/src/battle/area_jan2/584B90.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "battle/area_jan2/584B90", func_80218250_584B90); INCLUDE_ASM(s32, "battle/area_jan2/584B90", func_802183A8_584CE8); -INCLUDE_ASM(s32, "battle/area_jan2/584B90", func_802183D4_584D14); +#include "common/UnkBattleFunc1.inc.c" #include "common/StartRumbleWithParams.inc.c" diff --git a/src/battle/area_kgr/56E2A0.c b/src/battle/area_kgr/56E2A0.c index a9f87b5b56..113ce0eb85 100644 --- a/src/battle/area_kgr/56E2A0.c +++ b/src/battle/area_kgr/56E2A0.c @@ -2,7 +2,7 @@ #define NAMESPACE b_area_kgr -INCLUDE_ASM(s32, "battle/area_kgr/56E2A0", func_80218000_56E2A0); +#include "common/UnkBattleFunc1.inc.c" INCLUDE_ASM(s32, "battle/area_kgr/56E2A0", func_802180CC_56E36C); diff --git a/src/battle/area_kmr_part_3/447C80.c b/src/battle/area_kmr_part_3/447C80.c index f47b71039f..5402b02a56 100644 --- a/src/battle/area_kmr_part_3/447C80.c +++ b/src/battle/area_kmr_part_3/447C80.c @@ -2,24 +2,4 @@ #define NAMESPACE b_area_kmr_part_3 -INCLUDE_ASM(s32, "battle/area_kmr_part_3/447C80", func_80218840_447C80); - -INCLUDE_ASM(s32, "battle/area_kmr_part_3/447C80", func_80218910_447D50); - -INCLUDE_ASM(s32, "battle/area_kmr_part_3/447C80", func_802189DC_447E1C); - -INCLUDE_ASM(s32, "battle/area_kmr_part_3/447C80", func_80218AA4_447EE4); - -INCLUDE_ASM(s32, "battle/area_kmr_part_3/447C80", func_80218AD0_447F10); - -INCLUDE_ASM(s32, "battle/area_kmr_part_3/447C80", func_80218B9C_447FDC); - -INCLUDE_ASM(s32, "battle/area_kmr_part_3/447C80", func_80218D28_448168); - -INCLUDE_ASM(s32, "battle/area_kmr_part_3/447C80", func_80218E1C_44825C); - -INCLUDE_ASM(s32, "battle/area_kmr_part_3/447C80", func_80218F60_4483A0); - -INCLUDE_ASM(s32, "battle/area_kmr_part_3/447C80", func_80218FA4_4483E4); - -INCLUDE_ASM(s32, "battle/area_kmr_part_3/447C80", func_80218FE0_448420); +#include "common/UnkBattleFunc1.inc.c" diff --git a/src/battle/area_kmr_part_3/447D50.c b/src/battle/area_kmr_part_3/447D50.c new file mode 100644 index 0000000000..fa1c9f9b5b --- /dev/null +++ b/src/battle/area_kmr_part_3/447D50.c @@ -0,0 +1,27 @@ +#include "common.h" + +#define NAMESPACE b_area_kmr_part_3 + +#define NAMESPACE dup_b_area_kmr_part_3 +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_kmr_part_3 + +INCLUDE_ASM(s32, "battle/area_kmr_part_3/447D50", func_802189DC_447E1C); + +INCLUDE_ASM(s32, "battle/area_kmr_part_3/447D50", func_80218AA4_447EE4); + +#define NAMESPACE dup2_b_area_kmr_part_3 +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_kmr_part_3 + +INCLUDE_ASM(s32, "battle/area_kmr_part_3/447D50", func_80218B9C_447FDC); + +INCLUDE_ASM(s32, "battle/area_kmr_part_3/447D50", func_80218D28_448168); + +INCLUDE_ASM(s32, "battle/area_kmr_part_3/447D50", func_80218E1C_44825C); + +INCLUDE_ASM(s32, "battle/area_kmr_part_3/447D50", func_80218F60_4483A0); + +INCLUDE_ASM(s32, "battle/area_kmr_part_3/447D50", func_80218FA4_4483E4); + +INCLUDE_ASM(s32, "battle/area_kmr_part_3/447D50", func_80218FE0_448420); diff --git a/src/battle/area_kpa/684A30.c b/src/battle/area_kpa/684A30.c index c5dfde87c7..4cc8496fcc 100644 --- a/src/battle/area_kpa/684A30.c +++ b/src/battle/area_kpa/684A30.c @@ -2,8 +2,4 @@ #define NAMESPACE b_area_kpa -INCLUDE_ASM(s32, "battle/area_kpa/684A30", func_80218000_684A30); - -INCLUDE_ASM(s32, "battle/area_kpa/684A30", func_802180D0_684B00); - -#include "common/StartRumbleWithParams.inc.c" +#include "common/UnkBattleFunc1.inc.c" diff --git a/src/battle/area_kpa/684B00.c b/src/battle/area_kpa/684B00.c new file mode 100644 index 0000000000..76081f3792 --- /dev/null +++ b/src/battle/area_kpa/684B00.c @@ -0,0 +1,9 @@ +#include "common.h" + +#define NAMESPACE b_area_kpa + +#define NAMESPACE dup_b_area_kpa +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_kpa + +#include "common/StartRumbleWithParams.inc.c" diff --git a/src/battle/area_kpa/684C30.c b/src/battle/area_kpa/684C30.c index 6f3f920ffa..5496278331 100644 --- a/src/battle/area_kpa/684C30.c +++ b/src/battle/area_kpa/684C30.c @@ -8,7 +8,9 @@ INCLUDE_ASM(s32, "battle/area_kpa/684C30", func_80218358_684D88); INCLUDE_ASM(s32, "battle/area_kpa/684C30", func_802184E8_684F18); -INCLUDE_ASM(s32, "battle/area_kpa/684C30", func_80218514_684F44); +#define NAMESPACE dup2_b_area_kpa +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_kpa #define NAMESPACE dup_b_area_kpa #include "common/StartRumbleWithParams.inc.c" diff --git a/src/battle/area_kpa3/6BBB90.c b/src/battle/area_kpa3/6BBB90.c index aa10a94915..dbe12886f1 100644 --- a/src/battle/area_kpa3/6BBB90.c +++ b/src/battle/area_kpa3/6BBB90.c @@ -2,40 +2,4 @@ #define NAMESPACE b_area_kpa3 -INCLUDE_ASM(s32, "battle/area_kpa3/6BBB90", func_80218000_6BBB90); - -INCLUDE_ASM(s32, "battle/area_kpa3/6BBB90", func_802180D0_6BBC60); - -INCLUDE_ASM(s32, "battle/area_kpa3/6BBB90", func_80218960_6BC4F0); - -INCLUDE_ASM(s32, "battle/area_kpa3/6BBB90", func_80218AB4_6BC644); - -INCLUDE_ASM(s32, "battle/area_kpa3/6BBB90", func_80218B60_6BC6F0); - -INCLUDE_ASM(s32, "battle/area_kpa3/6BBB90", func_80218BC4_6BC754); - -INCLUDE_ASM(s32, "battle/area_kpa3/6BBB90", func_80218BFC_6BC78C); - -INCLUDE_ASM(s32, "battle/area_kpa3/6BBB90", func_80218C44_6BC7D4); - -INCLUDE_ASM(s32, "battle/area_kpa3/6BBB90", func_80218D10_6BC8A0); - -INCLUDE_ASM(s32, "battle/area_kpa3/6BBB90", func_80218E34_6BC9C4); - -INCLUDE_ASM(s32, "battle/area_kpa3/6BBB90", func_80218F58_6BCAE8); - -INCLUDE_ASM(s32, "battle/area_kpa3/6BBB90", func_802193D4_6BCF64); - -INCLUDE_ASM(s32, "battle/area_kpa3/6BBB90", func_80219428_6BCFB8); - -INCLUDE_ASM(s32, "battle/area_kpa3/6BBB90", func_80219474_6BD004); - -INCLUDE_ASM(s32, "battle/area_kpa3/6BBB90", func_802194C0_6BD050); - -INCLUDE_ASM(s32, "battle/area_kpa3/6BBB90", func_8021950C_6BD09C); - -INCLUDE_ASM(s32, "battle/area_kpa3/6BBB90", func_80219550_6BD0E0); - -INCLUDE_ASM(s32, "battle/area_kpa3/6BBB90", func_80219588_6BD118); - -INCLUDE_ASM(s32, "battle/area_kpa3/6BBB90", func_802195F4_6BD184); +#include "common/UnkBattleFunc1.inc.c" diff --git a/src/battle/area_kpa3/6BBC60.c b/src/battle/area_kpa3/6BBC60.c new file mode 100644 index 0000000000..f2f0850d8d --- /dev/null +++ b/src/battle/area_kpa3/6BBC60.c @@ -0,0 +1,41 @@ +#include "common.h" + +#define NAMESPACE b_area_kpa3 + +INCLUDE_ASM(s32, "battle/area_kpa3/6BBC60", func_802180D0_6BBC60); + +INCLUDE_ASM(s32, "battle/area_kpa3/6BBC60", func_80218960_6BC4F0); + +INCLUDE_ASM(s32, "battle/area_kpa3/6BBC60", func_80218AB4_6BC644); + +INCLUDE_ASM(s32, "battle/area_kpa3/6BBC60", func_80218B60_6BC6F0); + +INCLUDE_ASM(s32, "battle/area_kpa3/6BBC60", func_80218BC4_6BC754); + +INCLUDE_ASM(s32, "battle/area_kpa3/6BBC60", func_80218BFC_6BC78C); + +#define NAMESPACE dup_b_area_kpa3 +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_kpa3 + +INCLUDE_ASM(s32, "battle/area_kpa3/6BBC60", func_80218D10_6BC8A0); + +INCLUDE_ASM(s32, "battle/area_kpa3/6BBC60", func_80218E34_6BC9C4); + +INCLUDE_ASM(s32, "battle/area_kpa3/6BBC60", func_80218F58_6BCAE8); + +INCLUDE_ASM(s32, "battle/area_kpa3/6BBC60", func_802193D4_6BCF64); + +INCLUDE_ASM(s32, "battle/area_kpa3/6BBC60", func_80219428_6BCFB8); + +INCLUDE_ASM(s32, "battle/area_kpa3/6BBC60", func_80219474_6BD004); + +INCLUDE_ASM(s32, "battle/area_kpa3/6BBC60", func_802194C0_6BD050); + +INCLUDE_ASM(s32, "battle/area_kpa3/6BBC60", func_8021950C_6BD09C); + +INCLUDE_ASM(s32, "battle/area_kpa3/6BBC60", func_80219550_6BD0E0); + +INCLUDE_ASM(s32, "battle/area_kpa3/6BBC60", func_80219588_6BD118); + +INCLUDE_ASM(s32, "battle/area_kpa3/6BBC60", func_802195F4_6BD184); diff --git a/src/battle/area_kpa4/6CC070.c b/src/battle/area_kpa4/6CC070.c index 90c23821ef..b89c37ba9c 100644 --- a/src/battle/area_kpa4/6CC070.c +++ b/src/battle/area_kpa4/6CC070.c @@ -4,7 +4,9 @@ INCLUDE_ASM(s32, "battle/area_kpa4/6CC070", func_80218000_6CC070); -INCLUDE_ASM(s32, "battle/area_kpa4/6CC070", func_80218020_6CC090); +#define NAMESPACE dup_b_area_kpa4 +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_kpa4 #define NAMESPACE dup_p_area_kpa4 #include "common/StartRumbleWithParams.inc.c" diff --git a/src/battle/area_kpa4/6CC1C0.c b/src/battle/area_kpa4/6CC1C0.c index f4ab8897f2..51fe5dfa37 100644 --- a/src/battle/area_kpa4/6CC1C0.c +++ b/src/battle/area_kpa4/6CC1C0.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "battle/area_kpa4/6CC1C0", func_802182A8_6CC318); INCLUDE_ASM(s32, "battle/area_kpa4/6CC1C0", func_80218438_6CC4A8); -INCLUDE_ASM(s32, "battle/area_kpa4/6CC1C0", func_80218464_6CC4D4); +#include "common/UnkBattleFunc1.inc.c" #include "common/StartRumbleWithParams.inc.c" diff --git a/src/battle/area_kzn/58C2F0.c b/src/battle/area_kzn/58C2F0.c index 1825877139..54db20297d 100644 --- a/src/battle/area_kzn/58C2F0.c +++ b/src/battle/area_kzn/58C2F0.c @@ -4,6 +4,6 @@ INCLUDE_ASM(s32, "battle/area_kzn/58C2F0", func_80218000_58C2F0); -INCLUDE_ASM(s32, "battle/area_kzn/58C2F0", func_80218130_58C420); +#include "common/UnkBattleFunc1.inc.c" INCLUDE_ASM(s32, "battle/area_kzn/58C2F0", func_802181FC_58C4EC); diff --git a/src/battle/area_kzn/58C670.c b/src/battle/area_kzn/58C670.c index 6de40bdac3..11e90ef521 100644 --- a/src/battle/area_kzn/58C670.c +++ b/src/battle/area_kzn/58C670.c @@ -2,34 +2,6 @@ #define NAMESPACE b_area_kzn -INCLUDE_ASM(s32, "battle/area_kzn/58C670", func_80218380_58C670); - -INCLUDE_ASM(s32, "battle/area_kzn/58C670", func_80218450_58C740); - -INCLUDE_ASM(s32, "battle/area_kzn/58C670", func_8021851C_58C80C); - -INCLUDE_ASM(s32, "battle/area_kzn/58C670", func_80218630_58C920); - -INCLUDE_ASM(s32, "battle/area_kzn/58C670", func_80218788_58CA78); - -INCLUDE_ASM(s32, "battle/area_kzn/58C670", func_802187B4_58CAA4); - -#include "common/StartRumbleWithParams.inc.c" - -INCLUDE_ASM(s32, "battle/area_kzn/58C670", func_802188D8_58CBC8); - -INCLUDE_ASM(s32, "battle/area_kzn/58C670", func_802189A0_58CC90); - -INCLUDE_ASM(s32, "battle/area_kzn/58C670", func_80218AF8_58CDE8); - -INCLUDE_ASM(s32, "battle/area_kzn/58C670", func_80218B24_58CE14); - #define NAMESPACE dup_b_area_kzn -#include "common/StartRumbleWithParams.inc.c" +#include "common/UnkBattleFunc1.inc.c" #define NAMESPACE b_area_kzn - -INCLUDE_ASM(s32, "battle/area_kzn/58C670", func_80218C48_58CF38); - -INCLUDE_ASM(s32, "battle/area_kzn/58C670", func_80218D0C_58CFFC); - -INCLUDE_ASM(s32, "battle/area_kzn/58C670", func_80218D6C_58D05C); diff --git a/src/battle/area_kzn/58C740.c b/src/battle/area_kzn/58C740.c new file mode 100644 index 0000000000..c396572c0d --- /dev/null +++ b/src/battle/area_kzn/58C740.c @@ -0,0 +1,39 @@ +#include "common.h" + +#define NAMESPACE b_area_kzn + +#define NAMESPACE dup2_b_area_kzn +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_kzn + +INCLUDE_ASM(s32, "battle/area_kzn/58C740", func_8021851C_58C80C); + +INCLUDE_ASM(s32, "battle/area_kzn/58C740", func_80218630_58C920); + +INCLUDE_ASM(s32, "battle/area_kzn/58C740", func_80218788_58CA78); + +#define NAMESPACE dup3_b_area_kzn +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_kzn + +#include "common/StartRumbleWithParams.inc.c" + +INCLUDE_ASM(s32, "battle/area_kzn/58C740", func_802188D8_58CBC8); + +INCLUDE_ASM(s32, "battle/area_kzn/58C740", func_802189A0_58CC90); + +INCLUDE_ASM(s32, "battle/area_kzn/58C740", func_80218AF8_58CDE8); + +#define NAMESPACE dup4_b_area_kzn +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_kzn + +#define NAMESPACE dup_b_area_kzn +#include "common/StartRumbleWithParams.inc.c" +#define NAMESPACE b_area_kzn + +INCLUDE_ASM(s32, "battle/area_kzn/58C740", func_80218C48_58CF38); + +INCLUDE_ASM(s32, "battle/area_kzn/58C740", func_80218D0C_58CFFC); + +INCLUDE_ASM(s32, "battle/area_kzn/58C740", func_80218D6C_58D05C); diff --git a/src/battle/area_mac/464490.c b/src/battle/area_mac/464490.c index 83f8347581..fe2582e1c5 100644 --- a/src/battle/area_mac/464490.c +++ b/src/battle/area_mac/464490.c @@ -2,44 +2,4 @@ #define NAMESPACE b_area_mac -INCLUDE_ASM(s32, "battle/area_mac/464490", func_80218000_464490); - -INCLUDE_ASM(s32, "battle/area_mac/464490", func_802180D0_464560); - -INCLUDE_ASM(s32, "battle/area_mac/464490", func_80218100_464590); - -INCLUDE_ASM(s32, "battle/area_mac/464490", func_80218300_464790); - -INCLUDE_ASM(s32, "battle/area_mac/464490", func_80218B90_465020); - -INCLUDE_ASM(s32, "battle/area_mac/464490", func_80218CE4_465174); - -INCLUDE_ASM(s32, "battle/area_mac/464490", func_80218D90_465220); - -INCLUDE_ASM(s32, "battle/area_mac/464490", func_80218DF4_465284); - -INCLUDE_ASM(s32, "battle/area_mac/464490", func_80218E2C_4652BC); - -INCLUDE_ASM(s32, "battle/area_mac/464490", func_80218E74_465304); - -INCLUDE_ASM(s32, "battle/area_mac/464490", func_80218F40_4653D0); - -INCLUDE_ASM(s32, "battle/area_mac/464490", func_80219064_4654F4); - -INCLUDE_ASM(s32, "battle/area_mac/464490", func_80219188_465618); - -INCLUDE_ASM(s32, "battle/area_mac/464490", func_80219604_465A94); - -INCLUDE_ASM(s32, "battle/area_mac/464490", func_80219658_465AE8); - -INCLUDE_ASM(s32, "battle/area_mac/464490", func_802196A4_465B34); - -INCLUDE_ASM(s32, "battle/area_mac/464490", func_802196F0_465B80); - -INCLUDE_ASM(s32, "battle/area_mac/464490", func_8021973C_465BCC); - -INCLUDE_ASM(s32, "battle/area_mac/464490", func_80219780_465C10); - -INCLUDE_ASM(s32, "battle/area_mac/464490", func_802197B8_465C48); - -INCLUDE_ASM(s32, "battle/area_mac/464490", func_80219824_465CB4); +#include "common/UnkBattleFunc1.inc.c" diff --git a/src/battle/area_mac/464560.c b/src/battle/area_mac/464560.c new file mode 100644 index 0000000000..e8cd0ecccd --- /dev/null +++ b/src/battle/area_mac/464560.c @@ -0,0 +1,45 @@ +#include "common.h" + +#define NAMESPACE b_area_mac + +INCLUDE_ASM(s32, "battle/area_mac/464560", func_802180D0_464560); + +INCLUDE_ASM(s32, "battle/area_mac/464560", func_80218100_464590); + +INCLUDE_ASM(s32, "battle/area_mac/464560", func_80218300_464790); + +INCLUDE_ASM(s32, "battle/area_mac/464560", func_80218B90_465020); + +INCLUDE_ASM(s32, "battle/area_mac/464560", func_80218CE4_465174); + +INCLUDE_ASM(s32, "battle/area_mac/464560", func_80218D90_465220); + +INCLUDE_ASM(s32, "battle/area_mac/464560", func_80218DF4_465284); + +INCLUDE_ASM(s32, "battle/area_mac/464560", func_80218E2C_4652BC); + +#define NAMESPACE dup_b_area_mac +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_mac + +INCLUDE_ASM(s32, "battle/area_mac/464560", func_80218F40_4653D0); + +INCLUDE_ASM(s32, "battle/area_mac/464560", func_80219064_4654F4); + +INCLUDE_ASM(s32, "battle/area_mac/464560", func_80219188_465618); + +INCLUDE_ASM(s32, "battle/area_mac/464560", func_80219604_465A94); + +INCLUDE_ASM(s32, "battle/area_mac/464560", func_80219658_465AE8); + +INCLUDE_ASM(s32, "battle/area_mac/464560", func_802196A4_465B34); + +INCLUDE_ASM(s32, "battle/area_mac/464560", func_802196F0_465B80); + +INCLUDE_ASM(s32, "battle/area_mac/464560", func_8021973C_465BCC); + +INCLUDE_ASM(s32, "battle/area_mac/464560", func_80219780_465C10); + +INCLUDE_ASM(s32, "battle/area_mac/464560", func_802197B8_465C48); + +INCLUDE_ASM(s32, "battle/area_mac/464560", func_80219824_465CB4); diff --git a/src/battle/area_mim/4F7D50.c b/src/battle/area_mim/4F7D50.c index dd38b1aa03..580a6228c8 100644 --- a/src/battle/area_mim/4F7D50.c +++ b/src/battle/area_mim/4F7D50.c @@ -2,6 +2,6 @@ #define NAMESPACE b_area_mim -INCLUDE_ASM(s32, "battle/area_mim/4F7D50", func_80218170_4F7D50); +#include "common/UnkBattleFunc1.inc.c" INCLUDE_ASM(s32, "battle/area_mim/4F7D50", func_8021823C_4F7E1C); diff --git a/src/battle/area_nok/48D700.c b/src/battle/area_nok/48D700.c index cb01734210..48beb238e8 100644 --- a/src/battle/area_nok/48D700.c +++ b/src/battle/area_nok/48D700.c @@ -6,8 +6,4 @@ INCLUDE_ASM(s32, "battle/area_nok/48D700", func_80218560_48D700); INCLUDE_ASM(s32, "battle/area_nok/48D700", func_802186EC_48D88C); -INCLUDE_ASM(s32, "battle/area_nok/48D700", func_802187E0_48D980); - -INCLUDE_ASM(s32, "battle/area_nok/48D700", func_802188B0_48DA50); - -INCLUDE_ASM(s32, "battle/area_nok/48D700", func_80218964_48DB04); +#include "common/UnkBattleFunc1.inc.c" diff --git a/src/battle/area_nok/48DA50.c b/src/battle/area_nok/48DA50.c new file mode 100644 index 0000000000..51319efcd2 --- /dev/null +++ b/src/battle/area_nok/48DA50.c @@ -0,0 +1,7 @@ +#include "common.h" + +#define NAMESPACE b_area_nok + +INCLUDE_ASM(s32, "battle/area_nok/48DA50", func_802188B0_48DA50); + +INCLUDE_ASM(s32, "battle/area_nok/48DA50", func_80218964_48DB04); diff --git a/src/battle/area_nok/48DBC0.c b/src/battle/area_nok/48DBC0.c index 5264764468..a863226853 100644 --- a/src/battle/area_nok/48DBC0.c +++ b/src/battle/area_nok/48DBC0.c @@ -6,4 +6,6 @@ #include "common/StartRumbleWithParams.inc.c" #define NAMESPACE b_area_nok -INCLUDE_ASM(s32, "battle/area_nok/48DBC0", func_80218A78_48DC18); +#define NAMESPACE dup_b_area_nok +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_nok diff --git a/src/battle/area_nok/48DCF0.c b/src/battle/area_nok/48DCF0.c index d442d2a952..d9af0438b7 100644 --- a/src/battle/area_nok/48DCF0.c +++ b/src/battle/area_nok/48DCF0.c @@ -6,7 +6,9 @@ #include "common/StartRumbleWithParams.inc.c" #define NAMESPACE b_area_nok -INCLUDE_ASM(s32, "battle/area_nok/48DCF0", func_80218BA8_48DD48); +#define NAMESPACE dup2_b_area_nok +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_nok INCLUDE_ASM(s32, "battle/area_nok/48DCF0", func_80218C74_48DE14); diff --git a/src/battle/area_omo/5125D0.c b/src/battle/area_omo/5125D0.c index f219c7c545..f2cfb344c3 100644 --- a/src/battle/area_omo/5125D0.c +++ b/src/battle/area_omo/5125D0.c @@ -2,32 +2,4 @@ #define NAMESPACE b_area_omo -INCLUDE_ASM(s32, "battle/area_omo/5125D0", func_80218000_5125D0); - -INCLUDE_ASM(s32, "battle/area_omo/5125D0", func_802180D0_5126A0); - -INCLUDE_ASM(s32, "battle/area_omo/5125D0", func_802181A0_512770); - -INCLUDE_ASM(s32, "battle/area_omo/5125D0", func_80218270_512840); - -INCLUDE_ASM(s32, "battle/area_omo/5125D0", func_80218340_512910); - -INCLUDE_ASM(s32, "battle/area_omo/5125D0", func_80218410_5129E0); - -INCLUDE_ASM(s32, "battle/area_omo/5125D0", func_802184E0_512AB0); - -INCLUDE_ASM(s32, "battle/area_omo/5125D0", func_802185AC_512B7C); - -INCLUDE_ASM(s32, "battle/area_omo/5125D0", func_802186C0_512C90); - -INCLUDE_ASM(s32, "battle/area_omo/5125D0", func_8021878C_512D5C); - -INCLUDE_ASM(s32, "battle/area_omo/5125D0", func_80218880_512E50); - -INCLUDE_ASM(s32, "battle/area_omo/5125D0", func_80218A98_513068); - -INCLUDE_ASM(s32, "battle/area_omo/5125D0", func_80218B38_513108); - -INCLUDE_ASM(s32, "battle/area_omo/5125D0", func_80218CF4_5132C4); - -#include "common/StartRumbleWithParams.inc.c" +#include "common/UnkBattleFunc1.inc.c" diff --git a/src/battle/area_omo/5126A0.c b/src/battle/area_omo/5126A0.c new file mode 100644 index 0000000000..bbfff9b6b8 --- /dev/null +++ b/src/battle/area_omo/5126A0.c @@ -0,0 +1,7 @@ +#include "common.h" + +#define NAMESPACE b_area_omo + +#define NAMESPACE dup_b_area_omo +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_omo diff --git a/src/battle/area_omo/512770.c b/src/battle/area_omo/512770.c new file mode 100644 index 0000000000..8056ac6710 --- /dev/null +++ b/src/battle/area_omo/512770.c @@ -0,0 +1,7 @@ +#include "common.h" + +#define NAMESPACE b_area_omo + +#define NAMESPACE dup2_b_area_omo +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_omo diff --git a/src/battle/area_omo/512840.c b/src/battle/area_omo/512840.c new file mode 100644 index 0000000000..bba042de02 --- /dev/null +++ b/src/battle/area_omo/512840.c @@ -0,0 +1,7 @@ +#include "common.h" + +#define NAMESPACE b_area_omo + +#define NAMESPACE dup3_b_area_omo +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_omo diff --git a/src/battle/area_omo/512910.c b/src/battle/area_omo/512910.c new file mode 100644 index 0000000000..c787fabc3c --- /dev/null +++ b/src/battle/area_omo/512910.c @@ -0,0 +1,7 @@ +#include "common.h" + +#define NAMESPACE b_area_omo + +#define NAMESPACE dup4_b_area_omo +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_omo diff --git a/src/battle/area_omo/5129E0.c b/src/battle/area_omo/5129E0.c new file mode 100644 index 0000000000..85f3f5d41e --- /dev/null +++ b/src/battle/area_omo/5129E0.c @@ -0,0 +1,7 @@ +#include "common.h" + +#define NAMESPACE b_area_omo + +#define NAMESPACE dup5_b_area_omo +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_omo diff --git a/src/battle/area_omo/512AB0.c b/src/battle/area_omo/512AB0.c new file mode 100644 index 0000000000..7434c40936 --- /dev/null +++ b/src/battle/area_omo/512AB0.c @@ -0,0 +1,25 @@ +#include "common.h" + +#define NAMESPACE b_area_omo + +#define NAMESPACE dup6_b_area_omo +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_omo + +INCLUDE_ASM(s32, "battle/area_omo/512AB0", func_802185AC_512B7C); + +#define NAMESPACE dup7_b_area_omo +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_omo + +INCLUDE_ASM(s32, "battle/area_omo/512AB0", func_8021878C_512D5C); + +INCLUDE_ASM(s32, "battle/area_omo/512AB0", func_80218880_512E50); + +INCLUDE_ASM(s32, "battle/area_omo/512AB0", func_80218A98_513068); + +INCLUDE_ASM(s32, "battle/area_omo/512AB0", func_80218B38_513108); + +INCLUDE_ASM(s32, "battle/area_omo/512AB0", func_80218CF4_5132C4); + +#include "common/StartRumbleWithParams.inc.c" diff --git a/src/battle/area_omo/513380.c b/src/battle/area_omo/513380.c index da4484ff95..f8b705c5fa 100644 --- a/src/battle/area_omo/513380.c +++ b/src/battle/area_omo/513380.c @@ -6,4 +6,6 @@ #include "common/StartRumbleWithParams.inc.c" #define NAMESPACE b_area_omo -INCLUDE_ASM(s32, "battle/area_omo/513380", func_80218E08_5133D8); +#define NAMESPACE dup9_b_area_omo +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_omo diff --git a/src/battle/area_omo/5134B0.c b/src/battle/area_omo/5134B0.c index adbbe5bfff..17d9922b75 100644 --- a/src/battle/area_omo/5134B0.c +++ b/src/battle/area_omo/5134B0.c @@ -2,6 +2,6 @@ #define NAMESPACE b_area_omo -INCLUDE_ASM(s32, "battle/area_omo/5134B0", func_80218EE0_5134B0); - -INCLUDE_ASM(s32, "battle/area_omo/5134B0", func_80218FB0_513580); +#define NAMESPACE dup8_b_area_omo +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_omo diff --git a/src/battle/area_omo/513580.c b/src/battle/area_omo/513580.c new file mode 100644 index 0000000000..52b984dfcd --- /dev/null +++ b/src/battle/area_omo/513580.c @@ -0,0 +1,5 @@ +#include "common.h" + +#define NAMESPACE b_area_omo + +INCLUDE_ASM(s32, "battle/area_omo/513580", func_80218FB0_513580); diff --git a/src/battle/area_omo2_2/5483E0.c b/src/battle/area_omo2_2/5483E0.c index e38db54840..3bf94849fc 100644 --- a/src/battle/area_omo2_2/5483E0.c +++ b/src/battle/area_omo2_2/5483E0.c @@ -6,4 +6,4 @@ INCLUDE_ASM(s32, "battle/area_omo2_2/5483E0", func_80231000_5483E0); INCLUDE_ASM(s32, "battle/area_omo2_2/5483E0", func_8023102C_54840C); -INCLUDE_ASM(s32, "battle/area_omo2_2/5483E0", func_80231054_548434); +#include "common/UnkBattleFunc1.inc.c" diff --git a/src/battle/area_omo3/557EC0.c b/src/battle/area_omo3/557EC0.c index e2e7112a96..1fb1670c34 100644 --- a/src/battle/area_omo3/557EC0.c +++ b/src/battle/area_omo3/557EC0.c @@ -2,8 +2,4 @@ #define NAMESPACE b_area_omo3 -INCLUDE_ASM(s32, "battle/area_omo3/557EC0", func_80218AE0_557EC0); - -INCLUDE_ASM(s32, "battle/area_omo3/557EC0", func_80218BB0_557F90); - -#include "common/StartRumbleWithParams.inc.c" +#include "common/UnkBattleFunc1.inc.c" diff --git a/src/battle/area_omo3/557F90.c b/src/battle/area_omo3/557F90.c new file mode 100644 index 0000000000..3c97824d55 --- /dev/null +++ b/src/battle/area_omo3/557F90.c @@ -0,0 +1,9 @@ +#include "common.h" + +#define NAMESPACE b_area_omo3 + +#define NAMESPACE dup_b_area_omo3 +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_omo3 + +#include "common/StartRumbleWithParams.inc.c" diff --git a/src/battle/area_omo3/5580C0.c b/src/battle/area_omo3/5580C0.c index 1dfc2370b3..3a316f152c 100644 --- a/src/battle/area_omo3/5580C0.c +++ b/src/battle/area_omo3/5580C0.c @@ -2,4 +2,6 @@ #define NAMESPACE b_area_omo3 -INCLUDE_ASM(s32, "battle/area_omo3/5580C0", func_80218CE0_5580C0); +#define NAMESPACE dup2_b_area_omo3 +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_omo3 diff --git a/src/battle/area_pra/648E10.c b/src/battle/area_pra/648E10.c index 8ef84b5927..d3878d6568 100644 --- a/src/battle/area_pra/648E10.c +++ b/src/battle/area_pra/648E10.c @@ -2,7 +2,7 @@ #define NAMESPACE b_area_pra -INCLUDE_ASM(s32, "battle/area_pra/648E10", func_80218000_648E10); +#include "common/UnkBattleFunc1.inc.c" INCLUDE_ASM(s32, "battle/area_pra/648E10", func_802180CC_648EDC); diff --git a/src/battle/area_pra/649050.c b/src/battle/area_pra/649050.c index 25c16f35ff..4467579bcf 100644 --- a/src/battle/area_pra/649050.c +++ b/src/battle/area_pra/649050.c @@ -8,7 +8,9 @@ INCLUDE_ASM(s32, "battle/area_pra/649050", func_80218300_649110); INCLUDE_ASM(s32, "battle/area_pra/649050", func_80218458_649268); -INCLUDE_ASM(s32, "battle/area_pra/649050", func_80218484_649294); +#define NAMESPACE dup_b_area_pra +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_pra #include "common/StartRumbleWithParams.inc.c" @@ -18,7 +20,9 @@ INCLUDE_ASM(s32, "battle/area_pra/649050", func_80218670_649480); INCLUDE_ASM(s32, "battle/area_pra/649050", func_802187C8_6495D8); -INCLUDE_ASM(s32, "battle/area_pra/649050", func_802187F4_649604); +#define NAMESPACE dup2_b_area_pra +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_pra #define NAMESPACE dup_b_area_pra #include "common/StartRumbleWithParams.inc.c" @@ -30,7 +34,9 @@ INCLUDE_ASM(s32, "battle/area_pra/649050", func_802189E0_6497F0); INCLUDE_ASM(s32, "battle/area_pra/649050", func_80218B38_649948); -INCLUDE_ASM(s32, "battle/area_pra/649050", func_80218B64_649974); +#define NAMESPACE dup3_b_area_pra +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_pra #define NAMESPACE dup2_b_area_pra #include "common/StartRumbleWithParams.inc.c" @@ -42,7 +48,9 @@ INCLUDE_ASM(s32, "battle/area_pra/649050", func_80218D50_649B60); INCLUDE_ASM(s32, "battle/area_pra/649050", func_80218EA8_649CB8); -INCLUDE_ASM(s32, "battle/area_pra/649050", func_80218ED4_649CE4); +#define NAMESPACE dup4_b_area_pra +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_pra #define NAMESPACE dup3_b_area_pra #include "common/StartRumbleWithParams.inc.c" @@ -54,7 +62,9 @@ INCLUDE_ASM(s32, "battle/area_pra/649050", func_802190C0_649ED0); INCLUDE_ASM(s32, "battle/area_pra/649050", func_80219218_64A028); -INCLUDE_ASM(s32, "battle/area_pra/649050", func_80219244_64A054); +#define NAMESPACE dup5_b_area_pra +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_pra #define NAMESPACE dup4_b_area_pra #include "common/StartRumbleWithParams.inc.c" diff --git a/src/battle/area_pra3/669D80.c b/src/battle/area_pra3/669D80.c index 3707acacd4..8187cf6e9c 100644 --- a/src/battle/area_pra3/669D80.c +++ b/src/battle/area_pra3/669D80.c @@ -14,7 +14,9 @@ INCLUDE_ASM(s32, "battle/area_pra3/669D80", func_80218AF4_66A874); INCLUDE_ASM(s32, "battle/area_pra3/669D80", func_80218B2C_66A8AC); -INCLUDE_ASM(s32, "battle/area_pra3/669D80", func_80218B74_66A8F4); +#define NAMESPACE dup2_b_area_pra3 +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_pra3 INCLUDE_ASM(s32, "battle/area_pra3/669D80", func_80218C40_66A9C0); @@ -38,7 +40,9 @@ INCLUDE_ASM(s32, "battle/area_pra3/669D80", func_802194B8_66B238); INCLUDE_ASM(s32, "battle/area_pra3/669D80", func_80219524_66B2A4); -INCLUDE_ASM(s32, "battle/area_pra3/669D80", func_802195F0_66B370); +#define NAMESPACE dup3_b_area_pra3 +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_pra3 INCLUDE_ASM(s32, "battle/area_pra3/669D80", func_802196BC_66B43C); diff --git a/src/battle/area_pra3/66B5B0.c b/src/battle/area_pra3/66B5B0.c index 8edf57e699..0ecafd93cb 100644 --- a/src/battle/area_pra3/66B5B0.c +++ b/src/battle/area_pra3/66B5B0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "battle/area_pra3/66B5B0", func_80219830_66B5B0); INCLUDE_ASM(s32, "battle/area_pra3/66B5B0", func_80219988_66B708); -INCLUDE_ASM(s32, "battle/area_pra3/66B5B0", func_802199B4_66B734); +#include "common/UnkBattleFunc1.inc.c" #include "common/StartRumbleWithParams.inc.c" @@ -16,7 +16,9 @@ INCLUDE_ASM(s32, "battle/area_pra3/66B5B0", func_80219BA0_66B920); INCLUDE_ASM(s32, "battle/area_pra3/66B5B0", func_80219CF8_66BA78); -INCLUDE_ASM(s32, "battle/area_pra3/66B5B0", func_80219D24_66BAA4); +#define NAMESPACE dup_b_area_pra3 +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_pra3 #define NAMESPACE dup_b_area_pra3 #include "common/StartRumbleWithParams.inc.c" diff --git a/src/battle/area_sam/623BA0.c b/src/battle/area_sam/623BA0.c index 723512c5d3..2f7940d4b8 100644 --- a/src/battle/area_sam/623BA0.c +++ b/src/battle/area_sam/623BA0.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "battle/area_sam/623BA0", func_80218AF4_624694); INCLUDE_ASM(s32, "battle/area_sam/623BA0", func_80218B2C_6246CC); -INCLUDE_ASM(s32, "battle/area_sam/623BA0", func_80218B74_624714); +#include "common/UnkBattleFunc1.inc.c" INCLUDE_ASM(s32, "battle/area_sam/623BA0", func_80218C40_6247E0); @@ -38,6 +38,8 @@ INCLUDE_ASM(s32, "battle/area_sam/623BA0", func_802194B8_625058); INCLUDE_ASM(s32, "battle/area_sam/623BA0", func_80219524_6250C4); -INCLUDE_ASM(s32, "battle/area_sam/623BA0", func_802195F0_625190); +#define NAMESPACE dup_b_area_sam +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_sam INCLUDE_ASM(s32, "battle/area_sam/623BA0", func_802196BC_62525C); diff --git a/src/battle/area_sam/6253E0.c b/src/battle/area_sam/6253E0.c index 26d5cad1dd..58a66d85cf 100644 --- a/src/battle/area_sam/6253E0.c +++ b/src/battle/area_sam/6253E0.c @@ -6,7 +6,9 @@ INCLUDE_ASM(s32, "battle/area_sam/6253E0", func_80219840_6253E0); INCLUDE_ASM(s32, "battle/area_sam/6253E0", func_80219998_625538); -INCLUDE_ASM(s32, "battle/area_sam/6253E0", func_802199C4_625564); +#define NAMESPACE dup2_b_area_sam +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_sam #include "common/StartRumbleWithParams.inc.c" diff --git a/src/battle/area_sam2/63D9F0.c b/src/battle/area_sam2/63D9F0.c index dc3e33be29..18d4247fbc 100644 --- a/src/battle/area_sam2/63D9F0.c +++ b/src/battle/area_sam2/63D9F0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "battle/area_sam2/63D9F0", func_80218810_63D9F0); INCLUDE_ASM(s32, "battle/area_sam2/63D9F0", func_80218968_63DB48); -INCLUDE_ASM(s32, "battle/area_sam2/63D9F0", func_80218994_63DB74); +#include "common/UnkBattleFunc1.inc.c" #define NAMESPACE dup2_b_area_sam2 #include "common/StartRumbleWithParams.inc.c" diff --git a/src/battle/area_sbk/4DA5E0.c b/src/battle/area_sbk/4DA5E0.c index d1df37df37..cfa7d9c929 100644 --- a/src/battle/area_sbk/4DA5E0.c +++ b/src/battle/area_sbk/4DA5E0.c @@ -2,4 +2,4 @@ #define NAMESPACE b_area_sbk -INCLUDE_ASM(s32, "battle/area_sbk/4DA5E0", func_80218000_4DA5E0); +#include "common/UnkBattleFunc1.inc.c" diff --git a/src/battle/area_tik/5EC490.c b/src/battle/area_tik/5EC490.c index 71456708bc..0691019bc7 100644 --- a/src/battle/area_tik/5EC490.c +++ b/src/battle/area_tik/5EC490.c @@ -2,8 +2,4 @@ #define NAMESPACE b_area_tik -INCLUDE_ASM(s32, "battle/area_tik/5EC490", func_80218000_5EC490); - -#include "common/StartRumbleWithParams.inc.c" - -INCLUDE_ASM(s32, "battle/area_tik/5EC490", func_80218128_5EC5B8); +#include "common/UnkBattleFunc1.inc.c" diff --git a/src/battle/area_tik/5EC560.c b/src/battle/area_tik/5EC560.c new file mode 100644 index 0000000000..bd6c4e157e --- /dev/null +++ b/src/battle/area_tik/5EC560.c @@ -0,0 +1,9 @@ +#include "common.h" + +#define NAMESPACE b_area_tik + +#include "common/StartRumbleWithParams.inc.c" + +#define NAMESPACE dup_b_area_tik +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_tik diff --git a/src/battle/area_tik/5ECE70.c b/src/battle/area_tik/5ECE70.c index 2c9bbd343b..99b6407f18 100644 --- a/src/battle/area_tik/5ECE70.c +++ b/src/battle/area_tik/5ECE70.c @@ -2,8 +2,6 @@ #define NAMESPACE b_area_tik -INCLUDE_ASM(s32, "battle/area_tik/5ECE70", func_802189E0_5ECE70); - -INCLUDE_ASM(s32, "battle/area_tik/5ECE70", func_80218AB0_5ECF40); - -INCLUDE_ASM(s32, "battle/area_tik/5ECE70", func_80218B80_5ED010); +#define NAMESPACE dup2_b_area_tik +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_tik diff --git a/src/battle/area_tik/5ECF40.c b/src/battle/area_tik/5ECF40.c new file mode 100644 index 0000000000..887b5ab143 --- /dev/null +++ b/src/battle/area_tik/5ECF40.c @@ -0,0 +1,7 @@ +#include "common.h" + +#define NAMESPACE b_area_tik + +#define NAMESPACE dup3_b_area_tik +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_tik diff --git a/src/battle/area_tik/5ED010.c b/src/battle/area_tik/5ED010.c new file mode 100644 index 0000000000..370933ba99 --- /dev/null +++ b/src/battle/area_tik/5ED010.c @@ -0,0 +1,5 @@ +#include "common.h" + +#define NAMESPACE b_area_tik + +INCLUDE_ASM(s32, "battle/area_tik/5ED010", func_80218B80_5ED010); diff --git a/src/battle/area_tik3/6186F0.c b/src/battle/area_tik3/6186F0.c index 2e7a9c168a..cfa33040b0 100644 --- a/src/battle/area_tik3/6186F0.c +++ b/src/battle/area_tik3/6186F0.c @@ -2,10 +2,4 @@ #define NAMESPACE b_area_tik3 -INCLUDE_ASM(s32, "battle/area_tik3/6186F0", func_80218000_6186F0); - -INCLUDE_ASM(s32, "battle/area_tik3/6186F0", func_802180D0_6187C0); - -INCLUDE_ASM(s32, "battle/area_tik3/6186F0", func_8021819C_61888C); - -INCLUDE_ASM(s32, "battle/area_tik3/6186F0", func_80218250_618940); +#include "common/UnkBattleFunc1.inc.c" diff --git a/src/battle/area_tik3/6187C0.c b/src/battle/area_tik3/6187C0.c new file mode 100644 index 0000000000..08412b15fb --- /dev/null +++ b/src/battle/area_tik3/6187C0.c @@ -0,0 +1,11 @@ +#include "common.h" + +#define NAMESPACE b_area_tik3 + +#define NAMESPACE dup_b_area_tik3 +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_tik3 + +INCLUDE_ASM(s32, "battle/area_tik3/6187C0", func_8021819C_61888C); + +INCLUDE_ASM(s32, "battle/area_tik3/6187C0", func_80218250_618940); diff --git a/src/battle/area_trd_part_1/4A10A0.c b/src/battle/area_trd_part_1/4A10A0.c index 021bd6f77d..67a84d3bf1 100644 --- a/src/battle/area_trd_part_1/4A10A0.c +++ b/src/battle/area_trd_part_1/4A10A0.c @@ -4,8 +4,4 @@ INCLUDE_ASM(s32, "battle/area_trd_part_1/4A10A0", func_80218000_4A10A0); -INCLUDE_ASM(s32, "battle/area_trd_part_1/4A10A0", func_80218020_4A10C0); - -#include "common/StartRumbleWithParams.inc.c" - -INCLUDE_ASM(s32, "battle/area_trd_part_1/4A10A0", func_80218148_4A11E8); +#include "common/UnkBattleFunc1.inc.c" diff --git a/src/battle/area_trd_part_1/4A1190.c b/src/battle/area_trd_part_1/4A1190.c new file mode 100644 index 0000000000..2c0cb3b70d --- /dev/null +++ b/src/battle/area_trd_part_1/4A1190.c @@ -0,0 +1,9 @@ +#include "common.h" + +#define NAMESPACE b_area_trd_part_1 + +#include "common/StartRumbleWithParams.inc.c" + +#define NAMESPACE dup_b_area_trd_part_1 +#include "common/UnkBattleFunc1.inc.c" +#define NAMESPACE b_area_trd_part_1 diff --git a/src/common/UnkBattleFunc1.inc.c b/src/common/UnkBattleFunc1.inc.c new file mode 100644 index 0000000000..551b12c27f --- /dev/null +++ b/src/common/UnkBattleFunc1.inc.c @@ -0,0 +1,18 @@ +#include "common.h" +#include "map.h" + +ApiStatus N(UnkBattleFunc1)(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 var0 = get_variable(script, *args++); + s32 var1 = get_variable(script, *args++); + s32 var2 = get_variable(script, *args++); + s32 var3 = get_variable(script, *args++); + Actor* actor = get_actor(script->owner1.actorID); + + actor->unk_194 = (s8) (var0 - actor->staticActorData->statusIconOffset.x); + actor->unk_195 = (s8) (var1 - actor->staticActorData->statusIconOffset.y); + actor->unk_196 = (s8) (var2 - actor->staticActorData->statusMessageOffset.x); + actor->unk_197 = (s8) (var3 - actor->staticActorData->statusMessageOffset.y); + + return ApiStatus_DONE2; +} diff --git a/tools/splat.yaml b/tools/splat.yaml index f7eeffa3ca..4091fe5888 100644 --- a/tools/splat.yaml +++ b/tools/splat.yaml @@ -962,6 +962,7 @@ segments: - [0x447440, c] - [0x4479A0, c] - [0x447C80, c] + - [0x447D50, c] - [0x448690, c] - [0x448900, c] - [0x448B70, c] @@ -974,6 +975,7 @@ segments: overlay: True files: - [0x464490, c] + - [0x464560, c] - [0x465D90, c] - [0x4661E0, bin] - name: battle/area_hos/ @@ -993,6 +995,7 @@ segments: files: - [0x48D1A0, c] - [0x48D700, c] + - [0x48DA50, c] - [0x48DBC0, c] - [0x48DCF0, c] - [0x48DFC0, bin] @@ -1003,6 +1006,7 @@ segments: overlay: True files: - [0x4A10A0, c] + - [0x4A1190, c] - [0x4A12C0, c] - [0x4A1530, bin] - name: battle/area_trd_part_2/ @@ -1055,6 +1059,9 @@ segments: overlay: True files: - [0x4E2740, c] + - [0x4E2810, c] + - [0x4E28E0, c] + - [0x4E29B0, c] - [0x4E3190, c] - [0x4E3350, bin] - name: battle/area_isk_part_2/ @@ -1102,8 +1109,15 @@ segments: overlay: True files: - [0x5125D0, c] + - [0x5126A0, c] + - [0x512770, c] + - [0x512840, c] + - [0x512910, c] + - [0x5129E0, c] + - [0x512AB0, c] - [0x513380, c] - [0x5134B0, c] + - [0x513580, c] - [0x513790, c] - [0x5137E0, bin] - name: battle/area_omo2/ @@ -1170,6 +1184,7 @@ segments: - [0x557A80, c] - [0x557AD0, c] - [0x557EC0, c] + - [0x557F90, c] - [0x5580C0, c] - [0x558190, bin] - name: battle/area_kgr/ @@ -1188,6 +1203,8 @@ segments: overlay: True files: - [0x573920, c] + - [0x5739F0, c] + - [0x573AC0, c] - [0x573C30, c] - [0x573EE0, bin] - name: battle/area_jan2/ @@ -1207,6 +1224,7 @@ segments: files: - [0x58C2F0, c] - [0x58C670, c] + - [0x58C740, c] - [0x58D100, bin] - name: battle/area_kzn2/ type: code @@ -1242,8 +1260,11 @@ segments: overlay: True files: - [0x5EC490, c] + - [0x5EC560, c] - [0x5EC690, c] - [0x5ECE70, c] + - [0x5ECF40, c] + - [0x5ED010, c] - [0x5ED4B0, c] - [0x5ED950, c] - [0x5EDDF0, c] @@ -1267,6 +1288,7 @@ segments: overlay: True files: - [0x6186F0, c] + - [0x6187C0, c] - [0x618A00, c] - [0x618EA0, c] - [0x619340, c] @@ -1324,6 +1346,7 @@ segments: overlay: True files: - [0x684A30, c] + - [0x684B00, c] - [0x684C30, c] - [0x685260, bin] - name: battle/area_kpa2/ @@ -1343,6 +1366,7 @@ segments: overlay: True files: - [0x6BBB90, c] + - [0x6BBC60, c] - [0x6BD250, bin] - name: battle/area_kpa4/ type: code @@ -1369,7 +1393,10 @@ segments: overlay: True files: - [0x6DDDC0, c] + - [0x6DDE90, c] - [0x6DE000, c] + - [0x6DE060, c] + - [0x6DE1A0, c] - [0x6DE1F0, c] - [0x6DE3A0, c] - [0x6DE3F0, c]