From ccd3b17322ae8cf19c01d03aef4f3fcdd577c9d3 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Thu, 6 Jan 2022 08:40:01 -0500 Subject: [PATCH] World Decomp & Dedupe (#604) * two new funcs * UnkFunc53 * more cleanup & dedupe * UnkEffect0FFuncs * tst funcs * anotha one * UnkNpcAIFunc42 * UnkNpcAIFunc43 * UnkNpcAIFunc44 * UnkNpcAIFunc45 * UnkNpcAIMainFunc4 * UnkNpcAIMainFunc5 * UnkNpcAIMainFunc6 * warnings --- include/functions.h | 4 +- include/macros.h | 2 + src/EF2680.c | 2 +- src/common/UnkEffect0FFuncs.inc.c | 119 ++++++ src/state_demo.c | 6 +- src/world/area_dgb/dgb_10/C4C390.c | 19 +- src/world/area_dgb/dgb_10/dgb_10.h | 2 +- src/world/area_end/end_00/DF6A20.c | 9 +- src/world/area_flo/flo_13/CC3850.c | 358 +----------------- src/world/area_flo/flo_13/flo_13.h | 2 +- src/world/area_flo/flo_17/CD7350.c | 358 +----------------- src/world/area_flo/flo_17/flo_17.h | 2 +- src/world/area_flo/flo_23/CEE2A0.c | 138 +------ src/world/area_flo/flo_23/flo_23.h | 2 +- src/world/area_gv/gv_01/E1E460.c | 38 +- src/world/area_hos/hos_00/A0BCF0.c | 9 +- src/world/area_hos/hos_00/A0BD40.c | 9 +- src/world/area_hos/hos_01/A10880.c | 12 +- src/world/area_isk/isk_04/97B670.c | 8 +- src/world/area_isk/isk_05/97DAD0.c | 11 +- src/world/area_isk/isk_08/984E30.c | 2 +- src/world/area_isk/isk_13/98F7E0.c | 10 +- src/world/area_isk/isk_14/992730.c | 10 +- src/world/area_isk/isk_18/997F70.c | 2 +- src/world/area_kmr/kmr_02/8B0070.c | 10 +- src/world/area_kmr/kmr_07/8D3DC0.c | 10 +- src/world/area_kmr/kmr_11/8DA3A0.c | 10 +- src/world/area_kpa/kpa_01/A470C0.c | 2 +- src/world/area_kpa/kpa_03/A48720.c | 2 +- src/world/area_kpa/kpa_102/A93A50.c | 2 +- src/world/area_kpa/kpa_11/A52BD0.c | 2 +- src/world/area_kpa/kpa_113/A9CC70.c | 2 +- src/world/area_kpa/kpa_50/A609D0.c | 2 +- src/world/area_kpa/kpa_51/A640E0.c | 2 +- src/world/area_kpa/kpa_61/A6E6F0.c | 2 +- src/world/area_kpa/kpa_70/A74B80.c | 2 +- src/world/area_kzn/kzn_03/C61020.c | 2 +- src/world/area_kzn/kzn_09/C77D00.c | 2 +- src/world/area_kzn/kzn_17/C85DC0.c | 2 +- src/world/area_nok/nok_01/9C53E0.c | 10 +- src/world/area_nok/nok_11/9F4A40.c | 2 +- src/world/area_nok/nok_12/9FAD60.c | 2 +- src/world/area_nok/nok_14/A02A00.c | 2 +- src/world/area_nok/nok_15/A06F00.c | 2 +- src/world/area_omo/omo_02/D9D510.c | 10 +- src/world/area_sbk/sbk_30/93F5B0.c | 10 +- src/world/area_tik/tik_09/882BF0.c | 2 +- src/world/area_tik/tik_12/88A530.c | 2 +- src/world/area_tik/tik_20/89ACB0.c | 2 +- src/world/area_tik/tik_23/8A2D30.c | 2 +- src/world/area_tik/tik_24/8A5DE0.c | 2 +- src/world/area_trd/trd_01/99CD80.c | 25 +- src/world/area_trd/trd_02/9A10C0.c | 2 +- src/world/area_trd/trd_03/9A46F0.c | 2 +- src/world/area_trd/trd_04/9A88A0.c | 2 +- src/world/area_trd/trd_07/9B6C90.c | 2 +- src/world/area_tst/tst_04/B1B570.c | 66 ++-- src/world/area_tst/tst_11/B1CA50.c | 45 ++- src/world/area_tst/tst_13/B1D760.c | 40 +- src/world/common/NpcJumpFunc3.inc.c | 2 +- src/world/common/UnkDistFunc2.inc.c | 18 + src/world/common/UnkFunc52.inc.c | 1 - src/world/common/UnkFunc53.inc.c | 40 ++ src/world/common/UnkNpcAIFunc10.inc.c | 2 +- src/world/common/UnkNpcAIFunc13_2.inc.c | 2 +- src/world/common/UnkNpcAIFunc39.inc.c | 4 +- src/world/common/UnkNpcAIFunc40.inc.c | 18 + src/world/common/UnkNpcAIFunc42.inc.c | 16 + src/world/common/UnkNpcAIFunc43.inc.c | 20 + src/world/common/UnkNpcAIFunc44.inc.c | 22 ++ src/world/common/UnkNpcAIFunc45.inc.c | 41 ++ src/world/common/UnkNpcAIMainFunc2.inc.c | 2 +- src/world/common/UnkNpcAIMainFunc3.inc.c | 55 +++ src/world/common/UnkNpcAIMainFunc4.inc.c | 75 ++++ src/world/common/UnkNpcAIMainFunc5.inc.c | 135 +++++++ src/world/common/UnkNpcAIMainFunc6.inc.c | 216 +++++++++++ .../data/world/area_end/end_00/E052C0.data.s | 6 - .../data/world/area_flo/flo_17/CDB2B0.data.s | 2 +- .../data/world/area_flo/flo_23/CEF540.data.s | 2 +- .../data/world/area_hos/hos_00/A0CA00.data.s | 2 +- .../data/world/area_hos/hos_01/A11760.data.s | 4 +- .../data/world/area_isk/isk_04/97CB60.data.s | 8 +- .../data/world/area_isk/isk_05/97FE50.data.s | 4 +- .../data/world/area_isk/isk_08/985B00.data.s | 8 +- .../data/world/area_isk/isk_13/991A90.data.s | 4 +- .../data/world/area_isk/isk_14/994860.data.s | 4 +- .../data/world/area_isk/isk_18/998B90.data.s | 8 +- .../data/world/area_kmr/kmr_02/8B5640.data.s | 4 +- .../data/world/area_kmr/kmr_07/8D49A0.data.s | 2 +- .../data/world/area_kmr/kmr_11/8DE400.data.s | 2 +- .../data/world/area_kpa/kpa_01/A47D70.data.s | 8 +- .../data/world/area_kpa/kpa_03/A4A750.data.s | 10 +- .../data/world/area_kpa/kpa_102/A97690.data.s | 2 +- .../data/world/area_kpa/kpa_11/A53E30.data.s | 2 +- .../data/world/area_kpa/kpa_113/A9DD00.data.s | 8 +- .../data/world/area_kpa/kpa_50/A624D0.data.s | 2 +- .../data/world/area_kpa/kpa_51/A660E0.data.s | 2 +- .../data/world/area_kpa/kpa_61/A70FE0.data.s | 2 +- .../data/world/area_kpa/kpa_70/A75B70.data.s | 2 +- .../data/world/area_kzn/kzn_03/C647B0.data.s | 8 +- .../data/world/area_kzn/kzn_09/C7B0D0.data.s | 8 +- .../data/world/area_kzn/kzn_17/C89450.data.s | 8 +- .../data/world/area_nok/nok_11/9F7180.data.s | 2 +- .../data/world/area_nok/nok_12/9FE000.data.s | 2 +- .../data/world/area_nok/nok_14/A06110.data.s | 2 +- .../data/world/area_nok/nok_15/A0AB90.data.s | 2 +- .../data/world/area_omo/omo_02/DA1CD0.data.s | 2 +- .../data/world/area_tik/tik_09/885A80.data.s | 2 +- .../data/world/area_tik/tik_12/88C810.data.s | 8 +- .../data/world/area_tik/tik_20/89D200.data.s | 2 +- .../data/world/area_tik/tik_23/8A5340.data.s | 2 +- .../data/world/area_tik/tik_24/8A7A20.data.s | 2 +- .../data/world/area_trd/trd_01/99FD80.data.s | 4 +- .../data/world/area_trd/trd_02/9A3AB0.data.s | 2 +- .../data/world/area_trd/trd_03/9A60F0.data.s | 2 +- .../data/world/area_trd/trd_04/9AD960.data.s | 2 +- .../data/world/area_trd/trd_07/9B9760.data.s | 2 +- .../data/world/area_tst/tst_13/B1DB20.data.s | 2 +- .../end_00/DF6A20/func_80241B34_DF8534.s | 26 +- .../gv_01/E1E460/func_80240688_E1EAE8.s | 82 ---- .../hos_00/A0BCF0/func_80240000_A0BCF0.s | 32 -- .../hos_00/A0BD40/func_80240050_A0BD40.s | 76 ---- .../hos_00/A0BD40/func_80240170_A0BE60.s | 138 ------- .../hos_00/A0BD40/func_8024036C_A0C05C.s | 146 ------- .../hos_00/A0BD40/func_80240584_A0C274.s | 155 -------- .../hos_01/A10880/func_80240000_A10880.s | 76 ---- .../hos_01/A10880/func_80240120_A109A0.s | 138 ------- .../hos_01/A10880/func_8024031C_A10B9C.s | 146 ------- .../hos_01/A10880/func_80240534_A10DB4.s | 153 -------- .../isk_04/97B670/func_802403D4_97BA04.s | 309 --------------- .../isk_05/97DAD0/func_80240E14_97E8E4.s | 41 -- .../isk_05/97DAD0/func_80240EA8_97E978.s | 41 -- .../isk_05/97DAD0/func_80240F3C_97EA0C.s | 135 ------- .../isk_05/97DAD0/func_80241108_97EBD8.s | 65 ---- .../isk_08/984E30/func_80240394_9851C4.s | 309 --------------- .../isk_13/98F7E0/func_80240E14_9905F4.s | 41 -- .../isk_13/98F7E0/func_80240EA8_990688.s | 41 -- .../isk_13/98F7E0/func_80240F3C_99071C.s | 135 ------- .../isk_13/98F7E0/func_80241108_9908E8.s | 65 ---- .../isk_14/992730/func_80240E14_993544.s | 41 -- .../isk_14/992730/func_80240EA8_9935D8.s | 41 -- .../isk_14/992730/func_80240F3C_99366C.s | 135 ------- .../isk_14/992730/func_80241108_993838.s | 65 ---- .../isk_18/997F70/func_80240394_998304.s | 309 --------------- .../kmr_02/8B0070/func_80241424_8B1494.s | 59 --- .../kmr_02/8B0070/func_802414D8_8B1548.s | 78 ---- .../kmr_02/8B0070/func_80241964_8B19D4.s | 59 --- .../kmr_02/8B0070/func_80241A10_8B1A80.s | 140 ------- .../kmr_02/8B0070/func_80241C18_8B1C88.s | 185 --------- .../kmr_07/8D3DC0/func_80240000_8D3DC0.s | 59 --- .../kmr_07/8D3DC0/func_802400B4_8D3E74.s | 78 ---- .../kmr_07/8D3DC0/func_80240540_8D4300.s | 59 --- .../kmr_07/8D3DC0/func_802405EC_8D43AC.s | 140 ------- .../kmr_07/8D3DC0/func_802407F4_8D45B4.s | 185 --------- .../kmr_11/8DA3A0/func_80240370_8DA470.s | 59 --- .../kmr_11/8DA3A0/func_80240424_8DA524.s | 78 ---- .../kmr_11/8DA3A0/func_802408B0_8DA9B0.s | 59 --- .../kmr_11/8DA3A0/func_8024095C_8DAA5C.s | 140 ------- .../kmr_11/8DA3A0/func_80240B64_8DAC64.s | 185 --------- .../kmr_21/8FEE90/func_80240010_8FEE90.s | 4 +- .../kmr_21/8FEE90/func_80240210_8FF090.s | 4 +- .../kpa_01/A470C0/func_802404F4_A47454.s | 309 --------------- .../kpa_03/A48720/func_802404F4_A48AB4.s | 309 --------------- .../kpa_102/A93A50/func_802418F0_A95030.s | 309 --------------- .../kpa_11/A52BD0/func_802406A4_A52F64.s | 312 --------------- .../kpa_113/A9CC70/func_80240544_A9D174.s | 309 --------------- .../kpa_50/A609D0/func_802415E0_A61FB0.s | 309 --------------- .../kpa_51/A640E0/func_802417E0_A65870.s | 309 --------------- .../kpa_61/A6E6F0/func_802406A4_A6EA84.s | 309 --------------- .../kpa_70/A74B80/func_802406A4_A74F14.s | 312 --------------- .../kzn_03/C61020/func_802406A4_C613B4.s | 309 --------------- .../kzn_09/C77D00/func_80242D58_C79A38.s | 309 --------------- .../kzn_17/C85DC0/func_80242048_C87AF8.s | 309 --------------- .../nok_01/9C53E0/func_80240000_9C53E0.s | 59 --- .../nok_01/9C53E0/func_802400B4_9C5494.s | 78 ---- .../nok_01/9C53E0/func_80240540_9C5920.s | 59 --- .../nok_01/9C53E0/func_802405EC_9C59CC.s | 140 ------- .../nok_01/9C53E0/func_802407F4_9C5BD4.s | 185 --------- .../nok_11/9F4A40/func_80240394_9F4DD4.s | 309 --------------- .../nok_12/9FAD60/func_80240904_9FB0F4.s | 309 --------------- .../nok_14/A02A00/func_80240554_A02D94.s | 309 --------------- .../nok_15/A06F00/func_80240674_A07574.s | 309 --------------- .../omo_02/D9D510/func_80240EDC_D9E3AC.s | 59 --- .../omo_02/D9D510/func_80240F90_D9E460.s | 78 ---- .../omo_02/D9D510/func_8024141C_D9E8EC.s | 59 --- .../omo_02/D9D510/func_802414C8_D9E998.s | 140 ------- .../omo_02/D9D510/func_802416D0_D9EBA0.s | 185 --------- .../sbk_30/93F5B0/func_80240370_93F920.s | 59 --- .../sbk_30/93F5B0/func_80240424_93F9D4.s | 78 ---- .../sbk_30/93F5B0/func_802408B0_93FE60.s | 59 --- .../sbk_30/93F5B0/func_8024095C_93FF0C.s | 140 ------- .../sbk_30/93F5B0/func_80240B64_940114.s | 185 --------- .../tik_09/882BF0/func_80240DC4_882F84.s | 309 --------------- .../tik_12/88A530/func_80241CF4_88A8C4.s | 309 --------------- .../tik_20/89ACB0/func_80240CF4_89B044.s | 312 --------------- .../tik_23/8A2D30/func_80240CF4_8A30C4.s | 312 --------------- .../tik_24/8A5DE0/func_80240A64_8A64E4.s | 312 --------------- .../trd_01/99CD80/func_80240784_99D114.s | 309 --------------- .../trd_01/99CD80/func_80240BC4_99D554.s | 59 --- .../trd_01/99CD80/func_80240C78_99D608.s | 78 ---- .../trd_01/99CD80/func_80241104_99DA94.s | 59 --- .../trd_01/99CD80/func_802411B0_99DB40.s | 140 ------- .../trd_01/99CD80/func_802413B8_99DD48.s | 185 --------- .../trd_01/99CD80/func_80241630_99DFC0.s | 40 -- .../trd_02/9A10C0/func_80240474_9A1454.s | 309 --------------- .../trd_03/9A46F0/func_80240434_9A4A84.s | 312 --------------- .../trd_04/9A88A0/func_80240844_9A8C34.s | 309 --------------- .../trd_07/9B6C90/func_802406A4_9B7024.s | 309 --------------- .../tst_11/B1CA50/func_802403B8_B1CE08.s | 203 ---------- .../tst_13/B1D760/func_802400A0_B1D800.s | 45 --- .../tst_13/B1D760/func_8024013C_B1D89C.s | 172 --------- ver/us/splat.yaml | 3 +- 212 files changed, 1157 insertions(+), 16205 deletions(-) create mode 100644 src/common/UnkEffect0FFuncs.inc.c create mode 100644 src/world/common/UnkDistFunc2.inc.c create mode 100644 src/world/common/UnkFunc53.inc.c create mode 100644 src/world/common/UnkNpcAIFunc40.inc.c create mode 100644 src/world/common/UnkNpcAIFunc42.inc.c create mode 100644 src/world/common/UnkNpcAIFunc43.inc.c create mode 100644 src/world/common/UnkNpcAIFunc44.inc.c create mode 100644 src/world/common/UnkNpcAIFunc45.inc.c create mode 100644 src/world/common/UnkNpcAIMainFunc3.inc.c create mode 100644 src/world/common/UnkNpcAIMainFunc4.inc.c create mode 100644 src/world/common/UnkNpcAIMainFunc5.inc.c create mode 100644 src/world/common/UnkNpcAIMainFunc6.inc.c delete mode 100644 ver/us/asm/data/world/area_end/end_00/E052C0.data.s delete mode 100644 ver/us/asm/nonmatchings/world/area_gv/gv_01/E1E460/func_80240688_E1EAE8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_00/A0BCF0/func_80240000_A0BCF0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_00/A0BD40/func_80240050_A0BD40.s delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_00/A0BD40/func_80240170_A0BE60.s delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_00/A0BD40/func_8024036C_A0C05C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_00/A0BD40/func_80240584_A0C274.s delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_01/A10880/func_80240000_A10880.s delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_01/A10880/func_80240120_A109A0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_01/A10880/func_8024031C_A10B9C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_01/A10880/func_80240534_A10DB4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802403D4_97BA04.s delete mode 100644 ver/us/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240E14_97E8E4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240EA8_97E978.s delete mode 100644 ver/us/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240F3C_97EA0C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241108_97EBD8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_isk/isk_08/984E30/func_80240394_9851C4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240E14_9905F4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240EA8_990688.s delete mode 100644 ver/us/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240F3C_99071C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241108_9908E8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240E14_993544.s delete mode 100644 ver/us/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240EA8_9935D8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240F3C_99366C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241108_993838.s delete mode 100644 ver/us/asm/nonmatchings/world/area_isk/isk_18/997F70/func_80240394_998304.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241424_8B1494.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802414D8_8B1548.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241964_8B19D4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241A10_8B1A80.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241C18_8B1C88.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_80240000_8D3DC0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802400B4_8D3E74.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_80240540_8D4300.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802405EC_8D43AC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802407F4_8D45B4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240370_8DA470.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240424_8DA524.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_802408B0_8DA9B0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_8024095C_8DAA5C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240B64_8DAC64.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802404F4_A47454.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802404F4_A48AB4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802418F0_A95030.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_11/A52BD0/func_802406A4_A52F64.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_80240544_A9D174.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802415E0_A61FB0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802417E0_A65870.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802406A4_A6EA84.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_70/A74B80/func_802406A4_A74F14.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_802406A4_C613B4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242D58_C79A38.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242048_C87AF8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240000_9C53E0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802400B4_9C5494.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240540_9C5920.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802405EC_9C59CC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802407F4_9C5BD4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80240394_9F4DD4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240904_9FB0F4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240554_A02D94.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240674_A07574.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240EDC_D9E3AC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240F90_D9E460.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024141C_D9E8EC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802414C8_D9E998.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802416D0_D9EBA0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240370_93F920.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240424_93F9D4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_802408B0_93FE60.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_8024095C_93FF0C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240B64_940114.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240DC4_882F84.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241CF4_88A8C4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_80240CF4_89B044.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_23/8A2D30/func_80240CF4_8A30C4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240A64_8A64E4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240784_99D114.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240BC4_99D554.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240C78_99D608.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80241104_99DA94.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802411B0_99DB40.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802413B8_99DD48.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80241630_99DFC0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240474_9A1454.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_80240434_9A4A84.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240844_9A8C34.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802406A4_9B7024.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_802403B8_B1CE08.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tst/tst_13/B1D760/func_802400A0_B1D800.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tst/tst_13/B1D760/func_8024013C_B1D89C.s diff --git a/include/functions.h b/include/functions.h index 27f489fb6e..a573dba61b 100644 --- a/include/functions.h +++ b/include/functions.h @@ -100,6 +100,7 @@ void func_80266684(void); void func_802667F0(s32, Actor*, f32, f32, f32); void func_802591EC(s32, ActorPart*, s32, Matrix4f*, s32); +HeapNode* general_heap_create(void); void* general_heap_malloc(s32 size); s32 general_heap_free(void* data); @@ -534,7 +535,7 @@ void func_8004A73C(Evt* script); typedef union { void (*func1)(Evt*, s32); void (*func2)(void); -} WorldArgs __attribute__ ((__transparent_union__)); +} WorldArgs TRANSPARENT_UNION; s32 create_generic_entity_world(WorldArgs, WorldArgs); @@ -557,6 +558,7 @@ s32 is_actor_hp_bar_visible(Actor*); void sin_cos_rad(f32 rad, f32* outSinTheta, f32* outCosTheta); +void load_font(s32 font); void* load_asset_by_name(const char* assetName, u32* decompressedSize); diff --git a/include/macros.h b/include/macros.h index d233b7ed21..f50c557cf0 100644 --- a/include/macros.h +++ b/include/macros.h @@ -6,8 +6,10 @@ #ifndef M2CTX #define BSS __attribute__ ((section (".bss"))) +#define TRANSPARENT_UNION __attribute__ ((__transparent_union__)) #else #define BSS static +#define TRANSPARENT_UNION #endif #define ALIGN16(val) (((val) + 0xF) & ~0xF) diff --git a/src/EF2680.c b/src/EF2680.c index 7f1487e796..27543d77e3 100644 --- a/src/EF2680.c +++ b/src/EF2680.c @@ -190,7 +190,7 @@ INCLUDE_ASM(s32, "EF2680", func_80241C90_EF42A0); INCLUDE_ASM(s32, "EF2680", func_80242530_EF4B40); -// This should be roughly like this and is a copy from CD7350 (func_80242918_CD9BF8), but with the little extra block +// This should be roughly like this and is a copy from CD7350 (UnkNpcAIMainFunc6), but with the little extra block // at the beginning. I have to assume that is has to roughly look like below, but I can't get it to match. #ifdef NON_EQUIVALENT ApiStatus func_8024299C_EF4FAC(Evt* script, s32 isInitialCall) { diff --git a/src/common/UnkEffect0FFuncs.inc.c b/src/common/UnkEffect0FFuncs.inc.c new file mode 100644 index 0000000000..335c815846 --- /dev/null +++ b/src/common/UnkEffect0FFuncs.inc.c @@ -0,0 +1,119 @@ +#include "battle/battle.h" +#include "effects.h" + +ApiStatus N(UnkEffect0FFunc2)(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + f32 var0 = evt_get_float_variable(script, *args++); + f32 var1 = evt_get_float_variable(script, *args++); + f32 var2 = evt_get_float_variable(script, *args++); + f32 var3 = evt_get_float_variable(script, *args++); + f32 var4 = evt_get_float_variable(script, *args++); + f32 var5 = evt_get_float_variable(script, *args++); + f32 var6 = evt_get_float_variable(script, *args++); + f32 var7 = evt_get_float_variable(script, *args++); + + playFX_0F(var0, var1, var2, var3, var4, var5, var6, var7); + return ApiStatus_DONE2; +} + +ApiStatus N(UnkEffect0FFunc)(Evt* script, s32 isInitialCall) { + PlayerStatus* playerStatus = &gPlayerStatus; + f32 yaw = gCameras[0].currentYaw / 180.0f * PI; + f32 yawPlus = yaw + 1.570796; + f32 yawMinus = yaw - 1.570796; + f32 temp_f30; + f32 var1; + f32 var2; + f32 rand1 = rand_int(500) - 250; + f32 rand2 = rand_int(500) - 250; + f32 rand3 = rand_int(100) + 600; + f32 var3; + f32 var4; + f32 var5; + f32 var6; + + temp_f30 = playerStatus->position.x + (rand3 * sin_rad(yaw)); + var1 = temp_f30 + (rand1 * sin_rad(yawPlus)); + var2 = playerStatus->position.y + 200.0f; + var3 = playerStatus->position.z - (rand3 * cos_rad(yaw)); + var3 = var3 - (rand1 * cos_rad(yawPlus)); + var4 = playerStatus->position.x + (rand3 * sin_rad(yaw)); + var4 = var4 + (rand2 * sin_rad(yawMinus)); + var5 = playerStatus->position.y; + var6 = playerStatus->position.z - (rand3 * cos_rad(yaw)); + var6 = var6 - (rand2 * cos_rad(yawMinus)); + playFX_0F(0, var1, var2, var3, var4, var5, var6, rand_int(10) + 10); + return ApiStatus_DONE2; +} + + +ApiStatus N(UnkEffect0FFunc3)(Evt* script, s32 isInitialCall) { + PlayerStatus* playerStatus = &gPlayerStatus; + f32 yaw = gCameras[0].currentYaw / 180.0f * PI; + f32 yawPlus = yaw + 1.570796; + f32 yawMinus = yaw - 1.570796; + f32 temp_f30; + f32 var1; + f32 var2; + f32 rand1 = rand_int(300) - 150; + f32 rand2 = rand_int(300) - 150; + f32 rand3 = rand_int(100) + 50; + f32 var3; + f32 var4; + f32 var5; + f32 var6; + + if ((playerStatus->position.y >= 250.0f)) { + return ApiStatus_DONE2; + } + + temp_f30 = playerStatus->position.x - (rand3 * sin_rad(yaw)); + var1 = temp_f30 + (rand1 * sin_rad(yawPlus)); + var2 = playerStatus->position.y + 200.0f; + var3 = playerStatus->position.z + (rand3 * cos_rad(yaw)); + var3 = var3 - (rand1 * cos_rad(yawPlus)); + var4 = playerStatus->position.x - (rand3 * sin_rad(yaw)); + var4 = var4 + (rand2 * sin_rad(yawMinus)); + var5 = playerStatus->position.y; + var6 = playerStatus->position.z + (rand3 * cos_rad(yaw)); + var6 = var6 - (rand2 * cos_rad(yawMinus)); + playFX_0F(1, var1, var2, var3, var4, var5, var6, rand_int(10) + 10); + return ApiStatus_DONE2; +} + +ApiStatus N(UnkEffect0FFunc4)(Evt* script, s32 isInitialCall) { + PlayerStatus* playerStatus = &gPlayerStatus; + f32 yaw = gCameras[0].currentYaw / 180.0f * PI; + f32 yawPlus = yaw + 1.570796; + f32 yawMinus = yaw - 1.570796; + f32 temp_f30; + f32 var1; + f32 var2; + f32 rand1 = rand_int(150); + f32 rand2 = rand_int(150); + f32 rand3 = rand_int(100) - 50; + f32 var3; + f32 var4; + f32 var5; + f32 var6; + + if ((playerStatus->position.z < 200.0f)) { + return ApiStatus_DONE2; + } + + temp_f30 = playerStatus->position.x - (rand3 * sin_rad(yaw)); + var1 = temp_f30 + (rand1 * sin_rad(yawPlus)); + var2 = playerStatus->position.y + 200.0f; + var3 = playerStatus->position.z + (rand3 * cos_rad(yaw)); + var3 = var3 - (rand1 * cos_rad(yawPlus)); + script->varTable[1] = var1; + script->varTable[2] = var2; + script->varTable[3] = var3; + var4 = playerStatus->position.x - (rand3 * sin_rad(yaw)); + var4 = var4 + (rand2 * sin_rad(yawMinus)); + var5 = playerStatus->position.y; + var6 = playerStatus->position.z + (rand3 * cos_rad(yaw)); + var6 = var6 - (rand2 * cos_rad(yawMinus)); + playFX_0F(2, var1, var2, var3, var4, var5, var6, rand_int(4) + 10); + return ApiStatus_DONE2; +} diff --git a/src/state_demo.c b/src/state_demo.c index 8824292e05..3fbd4277ab 100644 --- a/src/state_demo.c +++ b/src/state_demo.c @@ -93,12 +93,12 @@ void state_step_demo(void) { gGameStatusPtr->demoState = 0; gGameStatusPtr->peachFlags = 0; func_80056204(); - gGameStatusPtr->isBattle = 0; + gGameStatusPtr->isBattle = FALSE; gGameStatusPtr->unk_76 = 0; gGameStatusPtr->disableScripts = 0; gGameStatusPtr->keepUsingPartnerOnMapChange = 0; - gOverrideFlags &= -9; - general_heap_create(&gOverrideFlags); + gOverrideFlags &= ~0x8; + general_heap_create(); clear_render_tasks(); clear_generic_entity_list(); clear_script_list(); diff --git a/src/world/area_dgb/dgb_10/C4C390.c b/src/world/area_dgb/dgb_10/C4C390.c index c037bf56e3..faa8a2dce7 100644 --- a/src/world/area_dgb/dgb_10/C4C390.c +++ b/src/world/area_dgb/dgb_10/C4C390.c @@ -167,7 +167,7 @@ EvtSource N(80240860) = { EVT_IF_NE(EVT_VAR(2), EVT_ARRAY(3)) EVT_GOTO(2) EVT_END_IF - EVT_CALL(N(func_802400A0_C4C430)) + EVT_CALL(N(UnkDistFunc2)) EVT_IF_EQ(EVT_VAR(0), 1) EVT_EXEC_WAIT(N(80240AF4)) EVT_END_IF @@ -313,22 +313,7 @@ ApiStatus N(func_80240000_C4C390)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(func_802400A0_C4C430)(Evt* script, s32 isInitialCall) { - PlayerStatus* playerStatus = &gPlayerStatus; - f32 distance; - s32* array = script->array; - - distance = dist2D(playerStatus->position.x, playerStatus->position.z, array[2], array[4]); - script->varTable[0] = 0; - if (distance < 112.5f) { - script->varTable[0] = 2; - } - if (distance < 37.5f) { - script->varTable[0] = 1; - } - - return ApiStatus_DONE2; -} +#include "world/common/UnkDistFunc2.inc.c" ApiStatus N(func_8024013C_C4C4CC)(Evt* script, s32 isInitialCall) { PlayerStatus* playerStatus = &gPlayerStatus; diff --git a/src/world/area_dgb/dgb_10/dgb_10.h b/src/world/area_dgb/dgb_10/dgb_10.h index b59655db4c..f3d27f4c17 100644 --- a/src/world/area_dgb/dgb_10/dgb_10.h +++ b/src/world/area_dgb/dgb_10/dgb_10.h @@ -7,7 +7,7 @@ #define NAMESPACE dgb_10 ApiStatus N(func_80240000_C4C390)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802400A0_C4C430)(Evt* script, s32 isInitialCall); +ApiStatus N(UnkDistFunc2)(Evt* script, s32 isInitialCall); ApiStatus N(func_8024013C_C4C4CC)(Evt* script, s32 isInitialCall); ApiStatus N(func_802401C0_C4C550)(Evt* script, s32 isInitialCall); diff --git a/src/world/area_end/end_00/DF6A20.c b/src/world/area_end/end_00/DF6A20.c index 73f66f281a..9541f23d8f 100644 --- a/src/world/area_end/end_00/DF6A20.c +++ b/src/world/area_end/end_00/DF6A20.c @@ -67,12 +67,9 @@ ApiStatus func_802427D8_DF91D8(Evt* script, s32 isInitialCall) { } ApiStatus N(SetNpcShadowScale)(Evt* script, s32 isInitialCall) { - s32 npcID; - f32 newShadowScale; - Bytecode* args = script->ptrReadPos; - npcID = evt_get_variable(script, *args++); - newShadowScale = evt_get_float_variable(script, *args++); + s32 npcID = evt_get_variable(script, *args++); + f32 newShadowScale = evt_get_float_variable(script, *args++); resolve_npc(script, npcID)->shadowScale = newShadowScale; return ApiStatus_DONE2; @@ -80,7 +77,7 @@ ApiStatus N(SetNpcShadowScale)(Evt* script, s32 isInitialCall) { ApiStatus func_80242898_DF9298(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - Npc** npc = &script->functionTemp[1]; + Npc** npc = (Npc**)&script->functionTemp[1]; if (isInitialCall) { *npc = get_npc_unsafe(evt_get_variable(script, *args++)); diff --git a/src/world/area_flo/flo_13/CC3850.c b/src/world/area_flo/flo_13/CC3850.c index c1b06d1782..65db57fcef 100644 --- a/src/world/area_flo/flo_13/CC3850.c +++ b/src/world/area_flo/flo_13/CC3850.c @@ -286,7 +286,7 @@ EvtSource N(npcAI_80244240) = { EVT_CALL(SetSelfVar, 3, 18) EVT_CALL(SetSelfVar, 5, 3) EVT_CALL(SetSelfVar, 7, 4) - EVT_CALL(N(func_80242A6C_CC627C), EVT_PTR(N(npcAISettings_80244210))) + EVT_CALL(N(UnkNpcAIMainFunc6), EVT_PTR(N(npcAISettings_80244210))) EVT_RETURN EVT_END }; @@ -1594,361 +1594,9 @@ INCLUDE_ASM(ApiStatus, "world/area_flo/flo_13/CC3850", flo_13_func_80241DB8_CC55 #include "world/common/set_script_owner_npc_col_height.inc.c" -ApiStatus N(func_8024262C_CC5E3C)(Evt* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - Bytecode* args = script->ptrReadPos; - EnemyTerritoryThing territory; - EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = (NpcAISettings*) evt_get_variable(script, *args); - s32 var; +#include "world/common/UnkNpcAIMainFunc5.inc.c" - territory.unk_00 = 0; - territory.shape = enemy->territory->wander.detectShape; - territory.pointX = enemy->territory->wander.detect.x; - territory.pointZ = enemy->territory->wander.detect.z; - territory.sizeX = enemy->territory->wander.detectSizeX; - territory.sizeZ = enemy->territory->wander.detectSizeZ; - territory.unk_18 = 100.0f; - territory.unk_1C = 0; - - if (isInitialCall) { - enemy->varTable[6] = npc->collisionHeight; - enemy->varTable[8] = 0; - enemy->unk_B5 = 0; - enemy->unk_B0 |= 8; - } - - if (isInitialCall || (enemy->unk_B0 & 4)) { - script->functionTemp[0] = 0; - npc->duration = 0; - enemy->unk_07 = 0; - npc->currentAnim.w = enemy->animList[0]; - npc->flags &= ~0x800; - npc->collisionHeight = enemy->varTable[6]; - enemy->varTable[9] = 0; - if (!enemy->territory->wander.isFlying) { - npc->flags = (npc->flags | 0x200) & ~8; - } else { - npc->flags = (npc->flags & ~0x200) | 8; - } - if (enemy->unk_B0 & 4) { - script->functionTemp[0] = 99; - script->functionTemp[1] = 0; - fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0x28, &var); - enemy->unk_B0 &= ~4; - } else if (enemy->flags & ENEMY_FLAGS_40000000) { - script->functionTemp[0] = 12; - enemy->flags &= ~ENEMY_FLAGS_40000000; - } - } - - if (enemy->varTable[9] > 0) { - enemy->varTable[9]--; - if (enemy->varTable[9] == 0) { - if ((npc->currentAnim.w + 0xFFAAFFD2) < 2) { - npc->currentAnim.w = 0x55000C; - } - } else { - return ApiStatus_BLOCK; - } - } - - switch (script->functionTemp[0]) { - case 0: - func_800495A0(script, aiSettings, territoryPtr); - npc->collisionHeight = enemy->varTable[6]; - - case 1: - func_800496B8(script, aiSettings, territoryPtr); - break; - - case 2: - base_UnkNpcAIFunc1(script, aiSettings, territoryPtr); - if (enemy->varTable[7] == 6) { - if (rand_int(100) < 0x21) { - if (enemy->varTable[8] != 0) { - enemy->varTable[8] = 0; - enemy->unk_B5 = 0; - npc->currentAnim.w = 0x55002F; - } else { - enemy->varTable[8] = 1; - enemy->unk_B5 = 1; - npc->currentAnim.w = 0x55002E; - } - enemy->varTable[9] = 7; - return ApiStatus_BLOCK; - } - } - - case 3: - func_80049C04(script, aiSettings, territoryPtr); - break; - - case 12: - N(set_script_owner_npc_anim)(script, aiSettings, territoryPtr); - - case 13: - N(UnkDistFunc)(script, aiSettings, territoryPtr); - break; - - case 14: - N(UnkNpcAIFunc12)(script, aiSettings, territoryPtr); - break; - - case 15: - N(set_script_owner_npc_col_height)(script, aiSettings, territoryPtr); - break; - - case 99: - func_8004A73C(script); - break; - - } - - if (enemy->varTable[7] == 6) { - if (enemy->varTable[8] != 0) { - enemy->unk_B5 = 1; - } else { - enemy->unk_B5 = 0; - } - if (enemy->varTable[8] != 0) { - switch (npc->currentAnim.w + 0xFFAAFFFC) { - case 0: - case 8: - case 10: - case 12: - case 14: - case 18: - case 20: - npc->currentAnim.w++; - break; - } - } - } - - return ApiStatus_BLOCK; -} - -ApiStatus N(func_80242A6C_CC627C)(Evt* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - Bytecode* args = script->ptrReadPos; - EnemyTerritoryThing territory; - EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = (NpcAISettings*) evt_get_variable(script, *args); - s32 var; - u32 x, y, z; - f32 x2, y2, z2, w2; - Npc* npc2; - - territory.unk_00 = 0; - territory.shape = enemy->territory->wander.detectShape; - territory.pointX = enemy->territory->wander.detect.x; - territory.pointZ = enemy->territory->wander.detect.z; - territory.sizeX = enemy->territory->wander.detectSizeX; - territory.sizeZ = enemy->territory->wander.detectSizeZ; - territory.unk_18 = 65.0f; - territory.unk_1C = 0; - - if (isInitialCall) { - enemy->varTable[6] = npc->collisionHeight; - enemy->unk_B0 |= 8; - } - - if (isInitialCall || (enemy->varTable[10] == 100)) { - script->functionTemp[0] = 100; - npc->duration = 0; - npc->currentAnim.w = enemy->animList[0]; - npc->flags &= ~0x800; - enemy->flags |= ENEMY_FLAGS_200000; - npc->flags = (npc->flags & ~0x200) | 8; - enemy->varTable[10] = 0; - enemy->varTable[11] = -1; - npc->pos.x = 0.0f; - npc->pos.y = -1000.0f; - npc->pos.z = 0.0f; - } - - if (enemy->unk_B0 & 4) { - npc->duration = 0; - npc->collisionHeight = enemy->varTable[6]; - enemy->unk_B0 &= ~4; - if (npc->flags & 0x800) { - npc->currentAnim.w = 0x4A0018; - npc->moveSpeed = 0.0f; - npc->jumpVelocity = 0.0f; - npc->jumpScale = 1.0f; - script->functionTemp[0] = 102; - } else { - fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0x28, &var); - npc->currentAnim.w = enemy->animList[0]; - script->functionTemp[1] = 0; - script->functionTemp[0] = 200; - } - } - get_screen_coords(0, npc->pos.x, npc->pos.y, npc->pos.z, &x, &y, &z); - if ((script->functionTemp[0] < 100) && ((x + 50) >= 421)) { - script->functionTemp[0] = 110; - } - - switch (script->functionTemp[0]) { - case 0: - func_800495A0(script, aiSettings, territoryPtr); - npc->collisionHeight = enemy->varTable[6]; - if (enemy->varTable[13] != 0) { - if (npc->pos.y <= 0.0) { - npc->flags = (npc->flags & ~0x200) | 8; - } else { - npc->flags = (npc->flags | 0x200) & ~8; - } - } - func_800496B8(script, aiSettings, territoryPtr); - break; - - case 1: - func_800496B8(script, aiSettings, territoryPtr); - break; - - case 2: - base_UnkNpcAIFunc1(script, aiSettings, territoryPtr); - - case 3: - func_80049C04(script, aiSettings, territoryPtr); - break; - - case 12: - N(set_script_owner_npc_anim)(script, aiSettings, territoryPtr); - - case 13: - N(UnkDistFunc)(script, aiSettings, territoryPtr); - npc->collisionHeight = enemy->varTable[6]; - break; - - case 14: - N(UnkNpcAIFunc12)(script, aiSettings, territoryPtr); - break; - - case 15: - N(set_script_owner_npc_col_height)(script, aiSettings, territoryPtr); - break; - - case 100: - if (enemy->varTable[10] != 2) { - break; - } - npc2 = get_npc_unsafe(get_enemy(enemy->varTable[11])->npcID); - if (npc2->yaw < 180.0) { - npc->pos.x = npc2->pos.x + 12.0; - } else { - npc->pos.x = npc2->pos.x - 12.0; - } - npc->pos.y = npc2->pos.y + 25.0; - npc->pos.z = npc2->pos.z + 1.0; - npc->rotation.y = 0.0f; - npc->flags |= 8; - npc->flags &= ~2; - npc->flags &= ~0x200; - npc->renderYaw = 0.0f; - npc->currentAnim.w = 0x4A0018; - script->functionTemp[0] = 101; - - case 101: - if (enemy->varTable[10] != 3) { - break; - } - enemy->varTable[10] = 4; - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - npc->moveSpeed = 2.5f; - npc->jumpVelocity = 8.0f; - npc->jumpScale = 0.8f; - npc->flags |= 0x800; - script->functionTemp[0] = 102; - - case 102: - if (npc->moveSpeed > 0.0) { - x2 = npc->pos.x; - y2 = npc->pos.y; - z2 = npc->pos.z; - if (npc_test_move_simple_with_slipping(npc->collisionChannel, &x2, &y2, &z2, npc->moveSpeed, npc->yaw, npc->collisionHeight, - npc->collisionRadius) == 0) { - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - } else { - npc->moveSpeed = 0.0f; - } - } - - - if (npc->jumpVelocity < 0.0) { - x2 = npc->pos.x; - y2 = npc->pos.y + 13.0; - z2 = npc->pos.z; - w2 = fabsf(npc->jumpVelocity) + 16.0; - if ((npc_raycast_down_sides(npc->collisionChannel, &x2, &y2, &z2, &w2) != 0) && (w2 <= (fabsf(npc->jumpVelocity) + 13.0))) { - npc->pos.y = y2; - enemy->territory->wander.point.x = npc->pos.x; - enemy->territory->wander.point.y = npc->pos.y; - enemy->territory->wander.point.z = npc->pos.z; - enemy->territory->wander.detect.x = npc->pos.x; - enemy->territory->wander.detect.y = npc->pos.y; - enemy->territory->wander.detect.z = npc->pos.z; - enemy->varTable[10] = 5; - if (enemy->varTable[13] != 0) { - if (npc->pos.y <= 0.0) { - npc->flags = (npc->flags & ~0x200) | 8; - } else { - npc->flags = (npc->flags | 0x200) & ~8; - } - } else if (!enemy->territory->wander.isFlying) { - npc->flags = (npc->flags | 0x200) & ~8; - } else { - npc->flags = (npc->flags & ~0x200) | 8; - } - npc->flags = (npc->flags | 0x40000) & ~0x800; - npc->jumpVelocity = 0.0f; - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - npc->currentAnim.w = 0x4A001A; - npc->duration = 3; - script->functionTemp[0] = 103; - break; - } - } - npc->pos.y += npc->jumpVelocity; - npc->jumpVelocity -= npc->jumpScale; - break; - - case 103: - npc->duration--; - if (npc->duration <= 0) { - npc->flags &= 0xFFFBFFFF; - npc->currentAnim.w = 0x4A0001; - script->functionTemp[0] = 0; - } - break; - - case 110: - npc->duration = 30; - npc->pos.x = 0.0f; - npc->pos.z = 0.0f; - npc->pos.y = -1000.0f; - npc->flags = (npc->flags | 0xA) & ~0x200; - script->functionTemp[0] = 111; - - case 111: - npc->duration--; - if (npc->duration <= 0) { - enemy->varTable[10] = 0; - script->functionTemp[0] = 100; - } - break; - - case 200: - func_8004A73C(script); - break; - - } - return ApiStatus_BLOCK; -} +#include "world/common/UnkNpcAIMainFunc6.inc.c" #include "world/common/UnkFunc42.inc.c" diff --git a/src/world/area_flo/flo_13/flo_13.h b/src/world/area_flo/flo_13/flo_13.h index 00da9a2305..0b30897cdb 100644 --- a/src/world/area_flo/flo_13/flo_13.h +++ b/src/world/area_flo/flo_13/flo_13.h @@ -9,7 +9,7 @@ ApiStatus N(func_80240000_CC3810)(Evt* script, s32 isInitialCall); ApiStatus N(UnkFunc41)(Evt* script, s32 isInitialCall); ApiStatus N(func_80241DB8_CC55C8)(Evt* script, s32 isInitialCall); -ApiStatus N(func_80242A6C_CC627C)(Evt* script, s32 isInitialCall); +ApiStatus N(UnkNpcAIMainFunc6)(Evt* script, s32 isInitialCall); ApiStatus N(UnkFunc42)(Evt* script, s32 isInitialCall); ApiStatus N(func_802433C0_CC6BD0)(Evt* script, s32 isInitialCall); ApiStatus N(func_802434D4_CC6CE4)(Evt* script, s32 isInitialCall); diff --git a/src/world/area_flo/flo_17/CD7350.c b/src/world/area_flo/flo_17/CD7350.c index 2fb6c49d34..812dc1acd7 100644 --- a/src/world/area_flo/flo_17/CD7350.c +++ b/src/world/area_flo/flo_17/CD7350.c @@ -366,7 +366,7 @@ EvtSource N(npcAI_80244520) = { EVT_CALL(SetSelfVar, 3, 18) EVT_CALL(SetSelfVar, 5, 3) EVT_CALL(SetSelfVar, 7, 4) - EVT_CALL(N(func_80242918_CD9BF8), EVT_PTR(N(npcAISettings_802444F0))) + EVT_CALL(N(UnkNpcAIMainFunc6), EVT_PTR(N(npcAISettings_802444F0))) EVT_RETURN EVT_END }; @@ -998,358 +998,6 @@ INCLUDE_ASM(ApiStatus, "world/area_flo/flo_17/CD7350", flo_17_func_80241C64_CD8F #include "world/common/set_script_owner_npc_col_height.inc.c" -ApiStatus N(func_802424D8_CD97B8)(Evt* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - Bytecode* args = script->ptrReadPos; - EnemyTerritoryThing territory; - EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = (NpcAISettings*) evt_get_variable(script, *args); - s32 var; +#include "world/common/UnkNpcAIMainFunc5.inc.c" - territory.unk_00 = 0; - territory.shape = enemy->territory->wander.detectShape; - territory.pointX = enemy->territory->wander.detect.x; - territory.pointZ = enemy->territory->wander.detect.z; - territory.sizeX = enemy->territory->wander.detectSizeX; - territory.sizeZ = enemy->territory->wander.detectSizeZ; - territory.unk_18 = 100.0f; - territory.unk_1C = 0; - - if (isInitialCall) { - enemy->varTable[6] = npc->collisionHeight; - enemy->varTable[8] = 0; - enemy->unk_B5 = 0; - enemy->unk_B0 |= 8; - } - - if (isInitialCall || (enemy->unk_B0 & 4)) { - script->functionTemp[0] = 0; - npc->duration = 0; - enemy->unk_07 = 0; - npc->currentAnim.w = enemy->animList[0]; - npc->flags &= ~0x800; - npc->collisionHeight = enemy->varTable[6]; - enemy->varTable[9] = 0; - if (!enemy->territory->wander.isFlying) { - npc->flags = (npc->flags | 0x200) & ~8; - } else { - npc->flags = (npc->flags & ~0x200) | 8; - } - if (enemy->unk_B0 & 4) { - script->functionTemp[0] = 99; - script->functionTemp[1] = 0; - fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0x28, &var); - enemy->unk_B0 &= ~4; - } else if (enemy->flags & ENEMY_FLAGS_40000000) { - script->functionTemp[0] = 12; - enemy->flags &= ~ENEMY_FLAGS_40000000; - } - } - - if (enemy->varTable[9] > 0) { - enemy->varTable[9]--; - if (enemy->varTable[9] == 0) { - if ((npc->currentAnim.w + 0xFFAAFFD2) < 2) { - npc->currentAnim.w = 0x55000C; - } - } else { - return ApiStatus_BLOCK; - } - } - - switch (script->functionTemp[0]) { - case 0: - func_800495A0(script, aiSettings, territoryPtr); - npc->collisionHeight = enemy->varTable[6]; - - case 1: - func_800496B8(script, aiSettings, territoryPtr); - break; - - case 2: - base_UnkNpcAIFunc1(script, aiSettings, territoryPtr); - if (enemy->varTable[7] == 6) { - if (rand_int(100) < 0x21) { - if (enemy->varTable[8] != 0) { - enemy->varTable[8] = 0; - enemy->unk_B5 = 0; - npc->currentAnim.w = 0x55002F; - } else { - enemy->varTable[8] = 1; - enemy->unk_B5 = 1; - npc->currentAnim.w = 0x55002E; - } - enemy->varTable[9] = 7; - return ApiStatus_BLOCK; - } - } - - case 3: - func_80049C04(script, aiSettings, territoryPtr); - break; - - case 12: - N(set_script_owner_npc_anim)(script, aiSettings, territoryPtr); - - case 13: - N(UnkDistFunc)(script, aiSettings, territoryPtr); - break; - - case 14: - N(UnkNpcAIFunc12)(script, aiSettings, territoryPtr); - break; - - case 15: - N(set_script_owner_npc_col_height)(script, aiSettings, territoryPtr); - break; - - case 99: - func_8004A73C(script); - break; - - } - - if (enemy->varTable[7] == 6) { - if (enemy->varTable[8] != 0) { - enemy->unk_B5 = 1; - } else { - enemy->unk_B5 = 0; - } - if (enemy->varTable[8] != 0) { - switch (npc->currentAnim.w + 0xFFAAFFFC) { - case 0: - case 8: - case 10: - case 12: - case 14: - case 18: - case 20: - npc->currentAnim.w++; - break; - } - } - } - - return ApiStatus_BLOCK; -} - -ApiStatus N(func_80242918_CD9BF8)(Evt* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - Bytecode* args = script->ptrReadPos; - EnemyTerritoryThing territory; - EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = (NpcAISettings*) evt_get_variable(script, *args); - s32 var; - u32 x, y, z; - f32 x2, y2, z2, w2; - Npc* npc2; - - territory.unk_00 = 0; - territory.shape = enemy->territory->wander.detectShape; - territory.pointX = enemy->territory->wander.detect.x; - territory.pointZ = enemy->territory->wander.detect.z; - territory.sizeX = enemy->territory->wander.detectSizeX; - territory.sizeZ = enemy->territory->wander.detectSizeZ; - territory.unk_18 = 65.0f; - territory.unk_1C = 0; - - if (isInitialCall) { - enemy->varTable[6] = npc->collisionHeight; - enemy->unk_B0 |= 8; - } - - if (isInitialCall || (enemy->varTable[10] == 100)) { - script->functionTemp[0] = 100; - npc->duration = 0; - npc->currentAnim.w = enemy->animList[0]; - npc->flags &= ~0x800; - enemy->flags |= ENEMY_FLAGS_200000; - npc->flags = (npc->flags & ~0x200) | 8; - enemy->varTable[10] = 0; - enemy->varTable[11] = -1; - npc->pos.x = 0.0f; - npc->pos.y = -1000.0f; - npc->pos.z = 0.0f; - } - - if (enemy->unk_B0 & 4) { - npc->duration = 0; - npc->collisionHeight = enemy->varTable[6]; - enemy->unk_B0 &= ~4; - if (npc->flags & 0x800) { - npc->currentAnim.w = 0x4A0018; - npc->moveSpeed = 0.0f; - npc->jumpVelocity = 0.0f; - npc->jumpScale = 1.0f; - script->functionTemp[0] = 102; - } else { - fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0x28, &var); - npc->currentAnim.w = enemy->animList[0]; - script->functionTemp[1] = 0; - script->functionTemp[0] = 200; - } - } - get_screen_coords(0, npc->pos.x, npc->pos.y, npc->pos.z, &x, &y, &z); - if ((script->functionTemp[0] < 100) && ((x + 50) >= 421)) { - script->functionTemp[0] = 110; - } - - switch (script->functionTemp[0]) { - case 0: - func_800495A0(script, aiSettings, territoryPtr); - npc->collisionHeight = enemy->varTable[6]; - if (enemy->varTable[13] != 0) { - if (npc->pos.y <= 0.0) { - npc->flags = (npc->flags & ~0x200) | 8; - } else { - npc->flags = (npc->flags | 0x200) & ~8; - } - } - func_800496B8(script, aiSettings, territoryPtr); - break; - - case 1: - func_800496B8(script, aiSettings, territoryPtr); - break; - - case 2: - base_UnkNpcAIFunc1(script, aiSettings, territoryPtr); - - case 3: - func_80049C04(script, aiSettings, territoryPtr); - break; - - case 12: - N(set_script_owner_npc_anim)(script, aiSettings, territoryPtr); - - case 13: - N(UnkDistFunc)(script, aiSettings, territoryPtr); - npc->collisionHeight = enemy->varTable[6]; - break; - - case 14: - N(UnkNpcAIFunc12)(script, aiSettings, territoryPtr); - break; - - case 15: - N(set_script_owner_npc_col_height)(script, aiSettings, territoryPtr); - break; - - case 100: - if (enemy->varTable[10] != 2) { - break; - } - npc2 = get_npc_unsafe(get_enemy(enemy->varTable[11])->npcID); - if (npc2->yaw < 180.0) { - npc->pos.x = npc2->pos.x + 12.0; - } else { - npc->pos.x = npc2->pos.x - 12.0; - } - npc->pos.y = npc2->pos.y + 25.0; - npc->pos.z = npc2->pos.z + 1.0; - npc->rotation.y = 0.0f; - npc->flags |= 8; - npc->flags &= ~2; - npc->flags &= ~0x200; - npc->renderYaw = 0.0f; - npc->currentAnim.w = 0x4A0018; - script->functionTemp[0] = 101; - - case 101: - if (enemy->varTable[10] != 3) { - break; - } - enemy->varTable[10] = 4; - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - npc->moveSpeed = 2.5f; - npc->jumpVelocity = 8.0f; - npc->jumpScale = 0.8f; - npc->flags |= 0x800; - script->functionTemp[0] = 102; - - case 102: - if (npc->moveSpeed > 0.0) { - x2 = npc->pos.x; - y2 = npc->pos.y; - z2 = npc->pos.z; - if (npc_test_move_simple_with_slipping(npc->collisionChannel, &x2, &y2, &z2, npc->moveSpeed, npc->yaw, npc->collisionHeight, - npc->collisionRadius) == 0) { - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - } else { - npc->moveSpeed = 0.0f; - } - } - - - if (npc->jumpVelocity < 0.0) { - x2 = npc->pos.x; - y2 = npc->pos.y + 13.0; - z2 = npc->pos.z; - w2 = fabsf(npc->jumpVelocity) + 16.0; - if ((npc_raycast_down_sides(npc->collisionChannel, &x2, &y2, &z2, &w2) != 0) && (w2 <= (fabsf(npc->jumpVelocity) + 13.0))) { - npc->pos.y = y2; - enemy->territory->wander.point.x = npc->pos.x; - enemy->territory->wander.point.y = npc->pos.y; - enemy->territory->wander.point.z = npc->pos.z; - enemy->territory->wander.detect.x = npc->pos.x; - enemy->territory->wander.detect.y = npc->pos.y; - enemy->territory->wander.detect.z = npc->pos.z; - enemy->varTable[10] = 5; - if (enemy->varTable[13] != 0) { - if (npc->pos.y <= 0.0) { - npc->flags = (npc->flags & ~0x200) | 8; - } else { - npc->flags = (npc->flags | 0x200) & ~8; - } - } else if (!enemy->territory->wander.isFlying) { - npc->flags = (npc->flags | 0x200) & ~8; - } else { - npc->flags = (npc->flags & ~0x200) | 8; - } - npc->flags = (npc->flags | 0x40000) & ~0x800; - npc->jumpVelocity = 0.0f; - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - npc->currentAnim.w = 0x4A001A; - npc->duration = 3; - script->functionTemp[0] = 103; - break; - } - } - npc->pos.y += npc->jumpVelocity; - npc->jumpVelocity -= npc->jumpScale; - break; - - case 103: - npc->duration--; - if (npc->duration <= 0) { - npc->flags &= 0xFFFBFFFF; - npc->currentAnim.w = 0x4A0001; - script->functionTemp[0] = 0; - } - break; - - case 110: - npc->duration = 30; - npc->pos.x = 0.0f; - npc->pos.z = 0.0f; - npc->pos.y = -1000.0f; - npc->flags = (npc->flags | 0xA) & ~0x200; - script->functionTemp[0] = 111; - - case 111: - npc->duration--; - if (npc->duration <= 0) { - enemy->varTable[10] = 0; - script->functionTemp[0] = 100; - } - break; - - case 200: - func_8004A73C(script); - break; - - } - return ApiStatus_BLOCK; -} +#include "world/common/UnkNpcAIMainFunc6.inc.c" diff --git a/src/world/area_flo/flo_17/flo_17.h b/src/world/area_flo/flo_17/flo_17.h index 3257f3cf9f..9c7385aab3 100644 --- a/src/world/area_flo/flo_17/flo_17.h +++ b/src/world/area_flo/flo_17/flo_17.h @@ -8,7 +8,7 @@ ApiStatus N(func_80240000_CD72E0)(Evt* script, s32 isInitialCall); ApiStatus N(func_80241C64_CD8F44)(Evt* script, s32 isInitialCall); -ApiStatus N(func_80242918_CD9BF8)(Evt* script, s32 isInitialCall); +ApiStatus N(UnkNpcAIMainFunc6)(Evt* script, s32 isInitialCall); ApiStatus N(func_80240040_CD7320)(Evt *script, s32 isInitialCall); extern NpcGroupList N(npcGroupList_80245228); diff --git a/src/world/area_flo/flo_23/CEE2A0.c b/src/world/area_flo/flo_23/CEE2A0.c index d2c36bdaa3..69be3fa38d 100644 --- a/src/world/area_flo/flo_23/CEE2A0.c +++ b/src/world/area_flo/flo_23/CEE2A0.c @@ -186,7 +186,7 @@ EvtSource N(npcAI_802414C8) = { EVT_CALL(SetSelfVar, 3, 18) EVT_CALL(SetSelfVar, 5, 3) EVT_CALL(SetSelfVar, 7, 4) - EVT_CALL(N(func_80240728_CEE988), EVT_PTR(N(npcAISettings_80241498))) + EVT_CALL(N(UnkNpcAIMainFunc5), EVT_PTR(N(npcAISettings_80241498))) EVT_RETURN EVT_END }; @@ -520,141 +520,7 @@ ApiStatus N(func_802402F8_CEE558)(Evt* script, s32 isInitialCall) { #include "world/common/set_script_owner_npc_col_height.inc.c" -ApiStatus N(func_80240728_CEE988)(Evt* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - Bytecode* args = script->ptrReadPos; - EnemyTerritoryThing territory; - EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = (NpcAISettings*) evt_get_variable(script, *args); - s32 var; - - territory.unk_00 = 0; - territory.shape = enemy->territory->wander.detectShape; - territory.pointX = enemy->territory->wander.detect.x; - territory.pointZ = enemy->territory->wander.detect.z; - territory.sizeX = enemy->territory->wander.detectSizeX; - territory.sizeZ = enemy->territory->wander.detectSizeZ; - territory.unk_18 = 100.0f; - territory.unk_1C = 0; - - if (isInitialCall) { - enemy->varTable[6] = npc->collisionHeight; - enemy->varTable[8] = 0; - enemy->unk_B5 = 0; - enemy->unk_B0 |= 8; - } - - if (isInitialCall || (enemy->unk_B0 & 4)) { - script->functionTemp[0] = 0; - npc->duration = 0; - enemy->unk_07 = 0; - npc->currentAnim.w = enemy->animList[0]; - npc->flags &= ~0x800; - npc->collisionHeight = enemy->varTable[6]; - enemy->varTable[9] = 0; - if (!enemy->territory->wander.isFlying) { - npc->flags = (npc->flags | 0x200) & ~8; - } else { - npc->flags = (npc->flags & ~0x200) | 8; - } - if (enemy->unk_B0 & 4) { - script->functionTemp[0] = 99; - script->functionTemp[1] = 0; - fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0x28, &var); - enemy->unk_B0 &= ~4; - } else if (enemy->flags & ENEMY_FLAGS_40000000) { - script->functionTemp[0] = 12; - enemy->flags &= ~ENEMY_FLAGS_40000000; - } - } - - if (enemy->varTable[9] > 0) { - enemy->varTable[9]--; - if (enemy->varTable[9] == 0) { - if ((npc->currentAnim.w + 0xFFAAFFD2) < 2) { - npc->currentAnim.w = 0x55000C; - } - } else { - return ApiStatus_BLOCK; - } - } - - switch (script->functionTemp[0]) { - case 0: - func_800495A0(script, aiSettings, territoryPtr); - npc->collisionHeight = enemy->varTable[6]; - - case 1: - func_800496B8(script, aiSettings, territoryPtr); - break; - - case 2: - base_UnkNpcAIFunc1(script, aiSettings, territoryPtr); - if (enemy->varTable[7] == 6) { - if (rand_int(100) < 0x21) { - if (enemy->varTable[8] != 0) { - enemy->varTable[8] = 0; - enemy->unk_B5 = 0; - npc->currentAnim.w = 0x55002F; - } else { - enemy->varTable[8] = 1; - enemy->unk_B5 = 1; - npc->currentAnim.w = 0x55002E; - } - enemy->varTable[9] = 7; - return ApiStatus_BLOCK; - } - } - - case 3: - func_80049C04(script, aiSettings, territoryPtr); - break; - - case 12: - N(set_script_owner_npc_anim)(script, aiSettings, territoryPtr); - - case 13: - N(UnkDistFunc)(script, aiSettings, territoryPtr); - break; - - case 14: - N(UnkNpcAIFunc12)(script, aiSettings, territoryPtr); - break; - - case 15: - N(set_script_owner_npc_col_height)(script, aiSettings, territoryPtr); - break; - - case 99: - func_8004A73C(script); - break; - - } - - if (enemy->varTable[7] == 6) { - if (enemy->varTable[8] != 0) { - enemy->unk_B5 = 1; - } else { - enemy->unk_B5 = 0; - } - if (enemy->varTable[8] != 0) { - switch (npc->currentAnim.w + 0xFFAAFFFC) { - case 0: - case 8: - case 10: - case 12: - case 14: - case 18: - case 20: - npc->currentAnim.w++; - break; - } - } - } - - return ApiStatus_BLOCK; -} +#include "world/common/UnkNpcAIMainFunc5.inc.c" ApiStatus N(func_80240B68_CEEDC8)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; diff --git a/src/world/area_flo/flo_23/flo_23.h b/src/world/area_flo/flo_23/flo_23.h index 87884bc6a9..adc33843cc 100644 --- a/src/world/area_flo/flo_23/flo_23.h +++ b/src/world/area_flo/flo_23/flo_23.h @@ -13,7 +13,7 @@ ApiStatus N(func_80240000_CEE260)(Evt* script, s32 isInitialCall); ApiStatus N(func_8024026C_CEE4CC)(Evt* script, s32 isInitialCall); ApiStatus N(func_802402C0_CEE520)(Evt* script, s32 isInitialCall); ApiStatus N(func_802402F8_CEE558)(Evt* script, s32 isInitialCall); -ApiStatus N(func_80240728_CEE988)(Evt* script, s32 isInitialCall); +ApiStatus N(UnkNpcAIMainFunc5)(Evt* script, s32 isInitialCall); ApiStatus N(func_80240B68_CEEDC8)(Evt* script, s32 isInitialCall); ApiStatus N(func_80240C2C_CEEE8C)(Evt* script, s32 isInitialCall); ApiStatus N(func_80240C9C_CEEEFC)(Evt* script, s32 isInitialCall); diff --git a/src/world/area_gv/gv_01/E1E460.c b/src/world/area_gv/gv_01/E1E460.c index 78ba10d771..22d6f3cdaa 100644 --- a/src/world/area_gv/gv_01/E1E460.c +++ b/src/world/area_gv/gv_01/E1E460.c @@ -1,4 +1,5 @@ #include "gv_01.h" +#include "sprite.h" #include "world/common/SetPlayerStatusAnimFlags100000.inc.c" @@ -34,4 +35,39 @@ ApiStatus func_802405EC_E1EA4C(Evt* script, s32 isInitialCall) { return script->functionTemp[0] == 255; } -INCLUDE_ASM(s32, "world/area_gv/gv_01/E1E460", func_80240688_E1EAE8); +ApiStatus func_80240688_E1EAE8(Evt* script, s32 isInitialCall) { + gGameStatusPtr->isBattle = FALSE; + gGameStatusPtr->unk_76 = 0; + gGameStatusPtr->disableScripts = 0; + gGameStatusPtr->keepUsingPartnerOnMapChange = 0; + gOverrideFlags &= ~0x8; + general_heap_create(); + clear_render_tasks(); + clear_generic_entity_list(); + clear_script_list(); + create_cameras_a(); + spr_init_sprites(0); + clear_entity_models(); + clear_animator_list(); + clear_model_data(); + clear_sprite_shading_data(); + reset_background_settings(); + clear_hud_element_cache(); + clear_trigger_data(); + clear_printers(); + clear_entity_data(0); + clear_screen_overlays(); + clear_player_status(); + clear_npcs(); + clear_player_data(); + reset_battle_status(); + init_encounter_status(); + clear_effect_data(); + clear_item_entity_data(); + clear_saved_variables(); + initialize_collision(); + intro_logos_set_fade_alpha(255); + intro_logos_set_fade_color(208); + set_game_mode(2); + return ApiStatus_FINISH; +} diff --git a/src/world/area_hos/hos_00/A0BCF0.c b/src/world/area_hos/hos_00/A0BCF0.c index 497b2b1585..ca93a462d3 100644 --- a/src/world/area_hos/hos_00/A0BCF0.c +++ b/src/world/area_hos/hos_00/A0BCF0.c @@ -1,3 +1,10 @@ #include "hos_00.h" -INCLUDE_ASM(s32, "world/area_hos/hos_00/A0BCF0", func_80240000_A0BCF0); +extern char D_800D9668[]; + +ApiStatus func_80240000_A0BCF0(Evt* script, s32 isInitialCall) { + if (gGameStatusPtr->entryID == 3) { + sprintf(&D_800D9668, "hos_bg\0\0\0\0\0\0\0\0\0"); + } + return ApiStatus_BLOCK; +} diff --git a/src/world/area_hos/hos_00/A0BD40.c b/src/world/area_hos/hos_00/A0BD40.c index b5b53d0c91..065e67a37e 100644 --- a/src/world/area_hos/hos_00/A0BD40.c +++ b/src/world/area_hos/hos_00/A0BD40.c @@ -1,12 +1,7 @@ #include "hos_00.h" +#include "effects.h" -INCLUDE_ASM(s32, "world/area_hos/hos_00/A0BD40", func_80240050_A0BD40); - -INCLUDE_ASM(s32, "world/area_hos/hos_00/A0BD40", func_80240170_A0BE60); - -INCLUDE_ASM(s32, "world/area_hos/hos_00/A0BD40", func_8024036C_A0C05C); - -INCLUDE_ASM(s32, "world/area_hos/hos_00/A0BD40", func_80240584_A0C274); +#include "common/UnkEffect0FFuncs.inc.c" static char* N(exit_str_0) = "osr_00"; static char* N(exit_str_1) = "osr_01"; diff --git a/src/world/area_hos/hos_01/A10880.c b/src/world/area_hos/hos_01/A10880.c index 30d85c0227..98f185270f 100644 --- a/src/world/area_hos/hos_01/A10880.c +++ b/src/world/area_hos/hos_01/A10880.c @@ -1,11 +1,9 @@ #include "hos_01.h" -INCLUDE_ASM(s32, "world/area_hos/hos_01/A10880", func_80240000_A10880); - -INCLUDE_ASM(s32, "world/area_hos/hos_01/A10880", func_80240120_A109A0); - -INCLUDE_ASM(s32, "world/area_hos/hos_01/A10880", func_8024031C_A10B9C); - -INCLUDE_ASM(s32, "world/area_hos/hos_01/A10880", func_80240534_A10DB4); +#include "common/UnkEffect0FFuncs.inc.c" #include "world/common/GetFloorCollider.inc.c" + +static char* N(exit_str_0) = "kmr_24"; +static char* N(exit_str_1) = "hos_00"; +static char* N(exit_str_2) = "hos_02"; diff --git a/src/world/area_isk/isk_04/97B670.c b/src/world/area_isk/isk_04/97B670.c index 65a9f3279e..54b6beeac0 100644 --- a/src/world/area_isk/isk_04/97B670.c +++ b/src/world/area_isk/isk_04/97B670.c @@ -8,8 +8,10 @@ #include "world/common/set_script_owner_npc_col_height.inc.c" -INCLUDE_ASM(s32, "world/area_isk/isk_04/97B670", func_802403D4_97BA04); - -static char* N(exit_str_0) = "isk_04"; +#include "world/common/UnkNpcAIMainFunc5.inc.c" #include "world/common/AwaitPlayerNearNpc.inc.c" + +static const f32 padding = 0.0f; + +static char* N(exit_str_0) = "isk_04"; diff --git a/src/world/area_isk/isk_05/97DAD0.c b/src/world/area_isk/isk_05/97DAD0.c index cd13d55770..cb5ad6ec34 100644 --- a/src/world/area_isk/isk_05/97DAD0.c +++ b/src/world/area_isk/isk_05/97DAD0.c @@ -19,15 +19,11 @@ static char* N(exit_str_1) = ""; #include "world/common/UnkNpcAIMainFunc2.inc.c" -static const f32 padding = 0.0f; // remove when all functions here are decompiled +#include "world/common/UnkNpcAIFunc40.inc.c" -INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_80240E14_97E8E4); +#include "world/common/UnkNpcAIMainFunc3.inc.c" -INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_80240EA8_97E978); - -INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_80240F3C_97EA0C); - -INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_80241108_97EBD8); +#include "world/common/UnkFunc53.inc.c" INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_802411F8_97ECC8); @@ -46,4 +42,3 @@ INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_80241D44_97F814); INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_80241DF8_97F8C8); INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_80241E24_97F8F4); - \ No newline at end of file diff --git a/src/world/area_isk/isk_08/984E30.c b/src/world/area_isk/isk_08/984E30.c index 49d1d98854..d35b9f5a7a 100644 --- a/src/world/area_isk/isk_08/984E30.c +++ b/src/world/area_isk/isk_08/984E30.c @@ -13,6 +13,6 @@ static char* N(exit_str_3) = "isk_11"; #include "world/common/set_script_owner_npc_col_height.inc.c" -INCLUDE_ASM(s32, "world/area_isk/isk_08/984E30", func_80240394_9851C4); +#include "world/common/UnkNpcAIMainFunc5.inc.c" #include "world/common/AwaitPlayerNearNpc.inc.c" diff --git a/src/world/area_isk/isk_13/98F7E0.c b/src/world/area_isk/isk_13/98F7E0.c index 83e392d57b..b90f5caea7 100644 --- a/src/world/area_isk/isk_13/98F7E0.c +++ b/src/world/area_isk/isk_13/98F7E0.c @@ -19,15 +19,11 @@ static char* N(exit_str_1) = ""; #include "world/common/UnkNpcAIMainFunc2.inc.c" -static const f32 padding = 0.0f; // remove when all functions here are decompiled +#include "world/common/UnkNpcAIFunc40.inc.c" -INCLUDE_ASM(s32, "world/area_isk/isk_13/98F7E0", func_80240E14_9905F4); +#include "world/common/UnkNpcAIMainFunc3.inc.c" -INCLUDE_ASM(s32, "world/area_isk/isk_13/98F7E0", func_80240EA8_990688); - -INCLUDE_ASM(s32, "world/area_isk/isk_13/98F7E0", func_80240F3C_99071C); - -INCLUDE_ASM(s32, "world/area_isk/isk_13/98F7E0", func_80241108_9908E8); +#include "world/common/UnkFunc53.inc.c" INCLUDE_ASM(s32, "world/area_isk/isk_13/98F7E0", func_802411F8_9909D8); diff --git a/src/world/area_isk/isk_14/992730.c b/src/world/area_isk/isk_14/992730.c index f6ab99072b..ffbddb8a90 100644 --- a/src/world/area_isk/isk_14/992730.c +++ b/src/world/area_isk/isk_14/992730.c @@ -19,15 +19,11 @@ static char* N(exit_str_1) = ""; #include "world/common/UnkNpcAIMainFunc2.inc.c" -static const f32 padding = 0.0f; // remove when all functions here are decompiled +#include "world/common/UnkNpcAIFunc40.inc.c" -INCLUDE_ASM(s32, "world/area_isk/isk_14/992730", func_80240E14_993544); +#include "world/common/UnkNpcAIMainFunc3.inc.c" -INCLUDE_ASM(s32, "world/area_isk/isk_14/992730", func_80240EA8_9935D8); - -INCLUDE_ASM(s32, "world/area_isk/isk_14/992730", func_80240F3C_99366C); - -INCLUDE_ASM(s32, "world/area_isk/isk_14/992730", func_80241108_993838); +#include "world/common/UnkFunc53.inc.c" INCLUDE_ASM(s32, "world/area_isk/isk_14/992730", func_802411F8_993928); diff --git a/src/world/area_isk/isk_18/997F70.c b/src/world/area_isk/isk_18/997F70.c index 694bb39730..b534603b06 100644 --- a/src/world/area_isk/isk_18/997F70.c +++ b/src/world/area_isk/isk_18/997F70.c @@ -11,6 +11,6 @@ static char* N(exit_str_1) = "isk_12"; #include "world/common/set_script_owner_npc_col_height.inc.c" -INCLUDE_ASM(s32, "world/area_isk/isk_18/997F70", func_80240394_998304); +#include "world/common/UnkNpcAIMainFunc5.inc.c" #include "world/common/AwaitPlayerNearNpc.inc.c" diff --git a/src/world/area_kmr/kmr_02/8B0070.c b/src/world/area_kmr/kmr_02/8B0070.c index f9681f1334..392cf8d13e 100644 --- a/src/world/area_kmr/kmr_02/8B0070.c +++ b/src/world/area_kmr/kmr_02/8B0070.c @@ -65,9 +65,9 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80241388_8B13F8); INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802413F4_8B1464); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80241424_8B1494); +#include "world/common/UnkNpcAIFunc43.inc.c" -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802414D8_8B1548); +#include "world/common/UnkNpcAIFunc44.inc.c" #include "world/common/NpcJumpFunc3.inc.c" @@ -79,11 +79,11 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802414D8_8B1548); #include "world/common/UnkNpcAIFunc10.inc.c" -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80241964_8B19D4); +#include "world/common/UnkNpcAIFunc42.inc.c" -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80241A10_8B1A80); +#include "world/common/UnkNpcAIFunc45.inc.c" -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80241C18_8B1C88); +#include "world/common/UnkNpcAIMainFunc4.inc.c" static char* N(exit_str_4) = "nok_02"; static char* N(exit_str_5) = "kmr_03"; diff --git a/src/world/area_kmr/kmr_07/8D3DC0.c b/src/world/area_kmr/kmr_07/8D3DC0.c index 9b3d8c5c01..6dcebb68ee 100644 --- a/src/world/area_kmr/kmr_07/8D3DC0.c +++ b/src/world/area_kmr/kmr_07/8D3DC0.c @@ -3,9 +3,9 @@ static char* N(exit_str_0) = "kmr_06"; static char* N(exit_str_1) = "kmr_12"; -INCLUDE_ASM(s32, "world/area_kmr/kmr_07/8D3DC0", func_80240000_8D3DC0); +#include "world/common/UnkNpcAIFunc43.inc.c" -INCLUDE_ASM(s32, "world/area_kmr/kmr_07/8D3DC0", func_802400B4_8D3E74); +#include "world/common/UnkNpcAIFunc44.inc.c" #include "world/common/NpcJumpFunc3.inc.c" @@ -17,11 +17,11 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_07/8D3DC0", func_802400B4_8D3E74); #include "world/common/UnkNpcAIFunc10.inc.c" -INCLUDE_ASM(s32, "world/area_kmr/kmr_07/8D3DC0", func_80240540_8D4300); +#include "world/common/UnkNpcAIFunc42.inc.c" -INCLUDE_ASM(s32, "world/area_kmr/kmr_07/8D3DC0", func_802405EC_8D43AC); +#include "world/common/UnkNpcAIFunc45.inc.c" -INCLUDE_ASM(s32, "world/area_kmr/kmr_07/8D3DC0", func_802407F4_8D45B4); +#include "world/common/UnkNpcAIMainFunc4.inc.c" // see func_802402BC_8D878C #ifdef NON_MATCHING diff --git a/src/world/area_kmr/kmr_11/8DA3A0.c b/src/world/area_kmr/kmr_11/8DA3A0.c index c665873518..a6612c3e65 100644 --- a/src/world/area_kmr/kmr_11/8DA3A0.c +++ b/src/world/area_kmr/kmr_11/8DA3A0.c @@ -4,9 +4,9 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_802402A0_8DA3A0); INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_80240344_8DA444); -INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_80240370_8DA470); +#include "world/common/UnkNpcAIFunc43.inc.c" -INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_80240424_8DA524); +#include "world/common/UnkNpcAIFunc44.inc.c" #include "world/common/NpcJumpFunc3.inc.c" @@ -18,10 +18,10 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_80240424_8DA524); #include "world/common/UnkNpcAIFunc10.inc.c" -INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_802408B0_8DA9B0); +#include "world/common/UnkNpcAIFunc42.inc.c" -INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_8024095C_8DAA5C); +#include "world/common/UnkNpcAIFunc45.inc.c" -INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_80240B64_8DAC64); +#include "world/common/UnkNpcAIMainFunc4.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_80240DDC_8DAEDC); diff --git a/src/world/area_kpa/kpa_01/A470C0.c b/src/world/area_kpa/kpa_01/A470C0.c index 7bcb039284..3827976419 100644 --- a/src/world/area_kpa/kpa_01/A470C0.c +++ b/src/world/area_kpa/kpa_01/A470C0.c @@ -8,6 +8,6 @@ #include "world/common/set_script_owner_npc_col_height.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_01/A470C0", func_802404F4_A47454); +#include "world/common/UnkNpcAIMainFunc5.inc.c" #include "world/common/AwaitPlayerNearNpc.inc.c" diff --git a/src/world/area_kpa/kpa_03/A48720.c b/src/world/area_kpa/kpa_03/A48720.c index 4e26633d13..3db38a354e 100644 --- a/src/world/area_kpa/kpa_03/A48720.c +++ b/src/world/area_kpa/kpa_03/A48720.c @@ -8,7 +8,7 @@ #include "world/common/set_script_owner_npc_col_height.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_802404F4_A48AB4); +#include "world/common/UnkNpcAIMainFunc5.inc.c" #include "world/common/AwaitPlayerNearNpc.inc.c" diff --git a/src/world/area_kpa/kpa_102/A93A50.c b/src/world/area_kpa/kpa_102/A93A50.c index 57a6ca21f0..04ec22e7ab 100644 --- a/src/world/area_kpa/kpa_102/A93A50.c +++ b/src/world/area_kpa/kpa_102/A93A50.c @@ -28,7 +28,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80241204_A94944); #include "world/common/set_script_owner_npc_col_height.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_802418F0_A95030); +#include "world/common/UnkNpcAIMainFunc5.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80241D30_A95470); diff --git a/src/world/area_kpa/kpa_11/A52BD0.c b/src/world/area_kpa/kpa_11/A52BD0.c index b99ffbb341..cd257def81 100644 --- a/src/world/area_kpa/kpa_11/A52BD0.c +++ b/src/world/area_kpa/kpa_11/A52BD0.c @@ -8,4 +8,4 @@ #include "world/common/set_script_owner_npc_col_height.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_11/A52BD0", func_802406A4_A52F64); +#include "world/common/UnkNpcAIMainFunc5.inc.c" diff --git a/src/world/area_kpa/kpa_113/A9CC70.c b/src/world/area_kpa/kpa_113/A9CC70.c index e42ef3376c..0aaa24f123 100644 --- a/src/world/area_kpa/kpa_113/A9CC70.c +++ b/src/world/area_kpa/kpa_113/A9CC70.c @@ -12,6 +12,6 @@ #include "world/common/set_script_owner_npc_col_height.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_113/A9CC70", func_80240544_A9D174); +#include "world/common/UnkNpcAIMainFunc5.inc.c" #include "world/common/AwaitPlayerNearNpc.inc.c" diff --git a/src/world/area_kpa/kpa_50/A609D0.c b/src/world/area_kpa/kpa_50/A609D0.c index b81d8236f1..505b3f1815 100644 --- a/src/world/area_kpa/kpa_50/A609D0.c +++ b/src/world/area_kpa/kpa_50/A609D0.c @@ -31,4 +31,4 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_80240EF4_A618C4); #include "world/common/set_script_owner_npc_col_height.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_802415E0_A61FB0); +#include "world/common/UnkNpcAIMainFunc5.inc.c" diff --git a/src/world/area_kpa/kpa_51/A640E0.c b/src/world/area_kpa/kpa_51/A640E0.c index 644a03bc74..2e7b36b331 100644 --- a/src/world/area_kpa/kpa_51/A640E0.c +++ b/src/world/area_kpa/kpa_51/A640E0.c @@ -44,4 +44,4 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_80241404_A65494); #include "world/common/set_script_owner_npc_col_height.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_802417E0_A65870); +#include "world/common/UnkNpcAIMainFunc5.inc.c" diff --git a/src/world/area_kpa/kpa_61/A6E6F0.c b/src/world/area_kpa/kpa_61/A6E6F0.c index 66b35f1dce..904680eab3 100644 --- a/src/world/area_kpa/kpa_61/A6E6F0.c +++ b/src/world/area_kpa/kpa_61/A6E6F0.c @@ -8,7 +8,7 @@ #include "world/common/set_script_owner_npc_col_height.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_61/A6E6F0", func_802406A4_A6EA84); +#include "world/common/UnkNpcAIMainFunc5.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_61/A6E6F0", func_80240AE4_A6EEC4); diff --git a/src/world/area_kpa/kpa_70/A74B80.c b/src/world/area_kpa/kpa_70/A74B80.c index f54f230298..810e26a643 100644 --- a/src/world/area_kpa/kpa_70/A74B80.c +++ b/src/world/area_kpa/kpa_70/A74B80.c @@ -8,4 +8,4 @@ #include "world/common/set_script_owner_npc_col_height.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_70/A74B80", func_802406A4_A74F14); +#include "world/common/UnkNpcAIMainFunc5.inc.c" diff --git a/src/world/area_kzn/kzn_03/C61020.c b/src/world/area_kzn/kzn_03/C61020.c index 18a09d47e2..d4f5adeb31 100644 --- a/src/world/area_kzn/kzn_03/C61020.c +++ b/src/world/area_kzn/kzn_03/C61020.c @@ -8,7 +8,7 @@ #include "world/common/set_script_owner_npc_col_height.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_802406A4_C613B4); +#include "world/common/UnkNpcAIMainFunc5.inc.c" #include "world/common/AwaitPlayerNearNpc.inc.c" diff --git a/src/world/area_kzn/kzn_09/C77D00.c b/src/world/area_kzn/kzn_09/C77D00.c index f5036554ab..7f6fc62974 100644 --- a/src/world/area_kzn/kzn_09/C77D00.c +++ b/src/world/area_kzn/kzn_09/C77D00.c @@ -38,7 +38,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80242774_C79454); #include "world/common/set_script_owner_npc_col_height.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80242D58_C79A38); +#include "world/common/UnkNpcAIMainFunc5.inc.c" #include "world/common/AwaitPlayerNearNpc.inc.c" diff --git a/src/world/area_kzn/kzn_17/C85DC0.c b/src/world/area_kzn/kzn_17/C85DC0.c index 8a9cc51b7c..89dfbe1d86 100644 --- a/src/world/area_kzn/kzn_17/C85DC0.c +++ b/src/world/area_kzn/kzn_17/C85DC0.c @@ -38,7 +38,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80241A64_C87514); #include "world/common/set_script_owner_npc_col_height.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80242048_C87AF8); +#include "world/common/UnkNpcAIMainFunc5.inc.c" #include "world/common/AwaitPlayerNearNpc.inc.c" diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c index 85ad2f15f6..278717a84f 100644 --- a/src/world/area_nok/nok_01/9C53E0.c +++ b/src/world/area_nok/nok_01/9C53E0.c @@ -5,9 +5,9 @@ static char* N(exit_str_1) = "nok_02"; #define UNK_ALPHA_FUNC_NPC 15 -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240000_9C53E0); +#include "world/common/UnkNpcAIFunc43.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802400B4_9C5494); +#include "world/common/UnkNpcAIFunc44.inc.c" #include "world/common/NpcJumpFunc3.inc.c" @@ -19,11 +19,11 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802400B4_9C5494); #include "world/common/UnkNpcAIFunc10.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240540_9C5920); +#include "world/common/UnkNpcAIFunc42.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802405EC_9C59CC); +#include "world/common/UnkNpcAIFunc45.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802407F4_9C5BD4); +#include "world/common/UnkNpcAIMainFunc4.inc.c" #include "world/common/Call800E9894.inc.c" diff --git a/src/world/area_nok/nok_11/9F4A40.c b/src/world/area_nok/nok_11/9F4A40.c index f16b88cb50..d67f88e097 100644 --- a/src/world/area_nok/nok_11/9F4A40.c +++ b/src/world/area_nok/nok_11/9F4A40.c @@ -11,7 +11,7 @@ static char* N(exit_str_1) = "nok_12"; #include "world/common/set_script_owner_npc_col_height.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_80240394_9F4DD4); +#include "world/common/UnkNpcAIMainFunc5.inc.c" #include "world/common/UnkNpcAIFunc23.inc.c" diff --git a/src/world/area_nok/nok_12/9FAD60.c b/src/world/area_nok/nok_12/9FAD60.c index 77a61211d6..97135a0133 100644 --- a/src/world/area_nok/nok_12/9FAD60.c +++ b/src/world/area_nok/nok_12/9FAD60.c @@ -8,7 +8,7 @@ #include "world/common/set_script_owner_npc_col_height.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_80240904_9FB0F4); +#include "world/common/UnkNpcAIMainFunc5.inc.c" #include "world/common/UnkNpcAIFunc24.inc.c" diff --git a/src/world/area_nok/nok_14/A02A00.c b/src/world/area_nok/nok_14/A02A00.c index c1b01f3703..9958cff392 100644 --- a/src/world/area_nok/nok_14/A02A00.c +++ b/src/world/area_nok/nok_14/A02A00.c @@ -8,7 +8,7 @@ #include "world/common/set_script_owner_npc_col_height.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_80240554_A02D94); +#include "world/common/UnkNpcAIMainFunc5.inc.c" #include "world/common/UnkNpcAIFunc23.inc.c" diff --git a/src/world/area_nok/nok_15/A06F00.c b/src/world/area_nok/nok_15/A06F00.c index a5c2e606b4..77b568b12c 100644 --- a/src/world/area_nok/nok_15/A06F00.c +++ b/src/world/area_nok/nok_15/A06F00.c @@ -25,7 +25,7 @@ static char* N(exit_str_3) = ""; #include "world/common/set_script_owner_npc_col_height.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_80240674_A07574); +#include "world/common/UnkNpcAIMainFunc5.inc.c" #include "world/common/UnkNpcAIFunc23.inc.c" diff --git a/src/world/area_omo/omo_02/D9D510.c b/src/world/area_omo/omo_02/D9D510.c index 35cc122fd1..c8cb2cbf38 100644 --- a/src/world/area_omo/omo_02/D9D510.c +++ b/src/world/area_omo/omo_02/D9D510.c @@ -16,9 +16,9 @@ INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80240AB0_D9DF80); INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80240BA8_D9E078); -INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80240EDC_D9E3AC); +#include "world/common/UnkNpcAIFunc43.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80240F90_D9E460); +#include "world/common/UnkNpcAIFunc44.inc.c" #include "world/common/NpcJumpFunc3.inc.c" @@ -30,11 +30,11 @@ INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80240F90_D9E460); #include "world/common/UnkNpcAIFunc10.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_8024141C_D9E8EC); +#include "world/common/UnkNpcAIFunc42.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_802414C8_D9E998); +#include "world/common/UnkNpcAIFunc45.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_802416D0_D9EBA0); +#include "world/common/UnkNpcAIMainFunc4.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80241948_D9EE18); diff --git a/src/world/area_sbk/sbk_30/93F5B0.c b/src/world/area_sbk/sbk_30/93F5B0.c index 30aa13e21c..cb2fbb239e 100644 --- a/src/world/area_sbk/sbk_30/93F5B0.c +++ b/src/world/area_sbk/sbk_30/93F5B0.c @@ -15,9 +15,9 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80240000_93F5B0); #include "world/common/SpawnSunEffect.inc.c" -INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80240370_93F920); +#include "world/common/UnkNpcAIFunc43.inc.c" -INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80240424_93F9D4); +#include "world/common/UnkNpcAIFunc44.inc.c" #include "world/common/NpcJumpFunc3.inc.c" @@ -29,11 +29,11 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80240424_93F9D4); #include "world/common/UnkNpcAIFunc10.inc.c" -INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_802408B0_93FE60); +#include "world/common/UnkNpcAIFunc42.inc.c" -INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_8024095C_93FF0C); +#include "world/common/UnkNpcAIFunc45.inc.c" -INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80240B64_940114); +#include "world/common/UnkNpcAIMainFunc4.inc.c" INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80240DDC_94038C); diff --git a/src/world/area_tik/tik_09/882BF0.c b/src/world/area_tik/tik_09/882BF0.c index 09c0cd2fc4..877b3ac198 100644 --- a/src/world/area_tik/tik_09/882BF0.c +++ b/src/world/area_tik/tik_09/882BF0.c @@ -8,6 +8,6 @@ #include "world/common/set_script_owner_npc_col_height.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_09/882BF0", func_80240DC4_882F84); +#include "world/common/UnkNpcAIMainFunc5.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_09/882BF0", func_80241204_8833C4); diff --git a/src/world/area_tik/tik_12/88A530.c b/src/world/area_tik/tik_12/88A530.c index 93ab0fc10d..e48fa77191 100644 --- a/src/world/area_tik/tik_12/88A530.c +++ b/src/world/area_tik/tik_12/88A530.c @@ -8,6 +8,6 @@ #include "world/common/set_script_owner_npc_col_height.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_12/88A530", func_80241CF4_88A8C4); +#include "world/common/UnkNpcAIMainFunc5.inc.c" #include "world/common/AwaitPlayerNearNpc.inc.c" diff --git a/src/world/area_tik/tik_20/89ACB0.c b/src/world/area_tik/tik_20/89ACB0.c index fb8a927aa0..4da5c83035 100644 --- a/src/world/area_tik/tik_20/89ACB0.c +++ b/src/world/area_tik/tik_20/89ACB0.c @@ -8,4 +8,4 @@ #include "world/common/set_script_owner_npc_col_height.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_20/89ACB0", func_80240CF4_89B044); +#include "world/common/UnkNpcAIMainFunc5.inc.c" diff --git a/src/world/area_tik/tik_23/8A2D30.c b/src/world/area_tik/tik_23/8A2D30.c index 21a19216cc..8c78e569f6 100644 --- a/src/world/area_tik/tik_23/8A2D30.c +++ b/src/world/area_tik/tik_23/8A2D30.c @@ -8,4 +8,4 @@ #include "world/common/set_script_owner_npc_col_height.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_23/8A2D30", func_80240CF4_8A30C4); +#include "world/common/UnkNpcAIMainFunc5.inc.c" diff --git a/src/world/area_tik/tik_24/8A5DE0.c b/src/world/area_tik/tik_24/8A5DE0.c index a742b65a6d..44db909c7f 100644 --- a/src/world/area_tik/tik_24/8A5DE0.c +++ b/src/world/area_tik/tik_24/8A5DE0.c @@ -10,4 +10,4 @@ #include "world/common/set_script_owner_npc_col_height.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_24/8A5DE0", func_80240A64_8A64E4); +#include "world/common/UnkNpcAIMainFunc5.inc.c" diff --git a/src/world/area_trd/trd_01/99CD80.c b/src/world/area_trd/trd_01/99CD80.c index e7d1c22b23..930c2c0c27 100644 --- a/src/world/area_trd/trd_01/99CD80.c +++ b/src/world/area_trd/trd_01/99CD80.c @@ -8,11 +8,11 @@ #include "world/common/set_script_owner_npc_col_height.inc.c" -INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_80240784_99D114); +#include "world/common/UnkNpcAIMainFunc5.inc.c" -INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_80240BC4_99D554); +#include "world/common/UnkNpcAIFunc43.inc.c" -INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_80240C78_99D608); +#include "world/common/UnkNpcAIFunc44.inc.c" #include "world/common/NpcJumpFunc3.inc.c" @@ -24,10 +24,21 @@ INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_80240C78_99D608); #include "world/common/UnkNpcAIFunc10.inc.c" -INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_80241104_99DA94); +#include "world/common/UnkNpcAIFunc42.inc.c" -INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_802411B0_99DB40); +#include "world/common/UnkNpcAIFunc45.inc.c" -INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_802413B8_99DD48); +#include "world/common/UnkNpcAIMainFunc4.inc.c" -INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_80241630_99DFC0); +ApiStatus func_80241630_99DFC0(Evt* script, s32 isInitialCall) { + Enemy* owner1 = script->owner1.enemy; + Npc* npc = get_npc_safe(script->owner2.npcID); + + owner1->territory->wander.point.x = npc->pos.x; + owner1->territory->wander.point.y = npc->pos.y; + owner1->territory->wander.point.z = npc->pos.z; + owner1->territory->wander.detect.x = npc->pos.x; + owner1->territory->wander.detect.y = npc->pos.y; + owner1->territory->wander.detect.z = npc->pos.z; + return ApiStatus_DONE2; +} diff --git a/src/world/area_trd/trd_02/9A10C0.c b/src/world/area_trd/trd_02/9A10C0.c index 06f4685a34..4ca62b4e88 100644 --- a/src/world/area_trd/trd_02/9A10C0.c +++ b/src/world/area_trd/trd_02/9A10C0.c @@ -8,7 +8,7 @@ #include "world/common/set_script_owner_npc_col_height.inc.c" -INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_80240474_9A1454); +#include "world/common/UnkNpcAIMainFunc5.inc.c" #include "world/common/UnkNpcAIFunc24.inc.c" diff --git a/src/world/area_trd/trd_03/9A46F0.c b/src/world/area_trd/trd_03/9A46F0.c index 474ab6b420..411351fcf5 100644 --- a/src/world/area_trd/trd_03/9A46F0.c +++ b/src/world/area_trd/trd_03/9A46F0.c @@ -8,4 +8,4 @@ #include "world/common/set_script_owner_npc_col_height.inc.c" -INCLUDE_ASM(s32, "world/area_trd/trd_03/9A46F0", func_80240434_9A4A84); +#include "world/common/UnkNpcAIMainFunc5.inc.c" diff --git a/src/world/area_trd/trd_04/9A88A0.c b/src/world/area_trd/trd_04/9A88A0.c index 72b179828f..5c8c8bf540 100644 --- a/src/world/area_trd/trd_04/9A88A0.c +++ b/src/world/area_trd/trd_04/9A88A0.c @@ -8,7 +8,7 @@ #include "world/common/set_script_owner_npc_col_height.inc.c" -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80240844_9A8C34); +#include "world/common/UnkNpcAIMainFunc5.inc.c" #include "world/common/UnkNpcAIFunc24.inc.c" diff --git a/src/world/area_trd/trd_07/9B6C90.c b/src/world/area_trd/trd_07/9B6C90.c index 0dcddf0bf6..5e06469250 100644 --- a/src/world/area_trd/trd_07/9B6C90.c +++ b/src/world/area_trd/trd_07/9B6C90.c @@ -8,7 +8,7 @@ #include "world/common/set_script_owner_npc_col_height.inc.c" -INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_802406A4_9B7024); +#include "world/common/UnkNpcAIMainFunc5.inc.c" #include "world/common/UnkNpcAIFunc23.inc.c" diff --git a/src/world/area_tst/tst_04/B1B570.c b/src/world/area_tst/tst_04/B1B570.c index 36c3f1ca8d..4d6e0ba06e 100644 --- a/src/world/area_tst/tst_04/B1B570.c +++ b/src/world/area_tst/tst_04/B1B570.c @@ -1,11 +1,12 @@ #include "tst_04.h" #include "sprite.h" +#include "model.h" static char* N(exit_str_0) = "tst_03"; static char* N(exit_str_1) = ""; void func_8024029C_B1B80C(void); -void func_80240360_B1B8D0(PlayerStatus* playerStatus); +void func_80240360_B1B8D0(void* data); void func_80240574_B1BAE4(void); // BSS @@ -34,36 +35,38 @@ ApiStatus func_80240000_B1B570(Evt* script, s32 isInitialCall) { // float shenanigans #ifdef NON_EQUIVALENT -ApiStatus func_802400FC_B1B66C(Evt* script, s32 isInitialCall) { +ApiStatus func_802400FC_B1B66C(Evt* script, s32 isInitialCall) { Npc* npc = get_npc_safe(NPC_PARTNER); + f32 angle; + f32 dist; + f32 product1; + f32 product2; + f32 cos1; + f32 sin1; + f32 sin2; + f32 cos2; + f32 var1; - if (npc != NULL) { - f32 dist = dist2D(npc->pos.x, npc->pos.z, -250.0f, -100.0f); - f32 sinTemp; - f32 cosTemp; - f32 theta1; - f32 sin1; - f32 cos1; - f32 theta2; - f32 sin2; - f32 cos2; - - theta1 = (evt_get_variable(script, EVT_VAR(0)) - 1) * TAU / 360.0f; - sinTemp = sin_rad(theta1); - cosTemp = cos_rad(theta1); - - sin1 = -sinTemp * dist; - cos1 = cosTemp * dist; - - theta2 = (evt_get_variable(script, EVT_VAR(0)) * TAU) / 360.0f; - sin2 = sin_rad(theta2); - cos2 = cos_rad(theta2); - - npc->pos.x += (dist * cos2) - cos1; - npc->pos.z += (dist * -sin2) - sin1; - + if (npc == NULL) { return ApiStatus_DONE2; } + + dist = dist2D(npc->pos.x, npc->pos.z, -250.0f, -100.0f); + + var1 = evt_get_variable(script, 0 - 30000000) - 1; + angle = var1 * TAU / 360.0f; + sin1 = sin_rad(angle); + cos1 = cos_rad(angle); + product1 = dist * cos1; + product2 = dist * -sin1; + + var1 = evt_get_variable(script, EVT_VAR(0)); + angle = (var1 * TAU) / 360.0f; + sin2 = sin_rad(angle); + cos2 = cos_rad(angle); + npc->pos.x += (dist * cos2) - product1; + npc->pos.z += (dist * -sin2) - product2; + return ApiStatus_DONE2; } #else @@ -99,7 +102,8 @@ void func_8024029C_B1B80C(void) { } } -void func_80240360_B1B8D0(PlayerStatus* playerStatus) { +void func_80240360_B1B8D0(void* data) { + PlayerStatus* playerStatus = data; f32 yaw = -gCameras[gCurrentCamID].currentYaw; Matrix4f main; Matrix4f translation; @@ -154,11 +158,11 @@ void func_802405D4_B1BB44(void) { Matrix4f m1; Matrix4f m2; Matrix4f m3; - Matrix4f m4; + Mtx m4; guTranslateF(m1, -484.0f, 25.0f, -40.0f); - guMtxF2L(m1, m4); - render_animated_model(B_80240FD0_tst_04, m4); + guMtxF2L(m1, &m4); + render_animated_model(B_80240FD0_tst_04, &m4); } ApiStatus func_80240628_B1BB98(Evt* script, s32 isInitialCall) { diff --git a/src/world/area_tst/tst_11/B1CA50.c b/src/world/area_tst/tst_11/B1CA50.c index cb12366202..ec7fddcb15 100644 --- a/src/world/area_tst/tst_11/B1CA50.c +++ b/src/world/area_tst/tst_11/B1CA50.c @@ -2,9 +2,9 @@ #include "sprite.h" void func_8024003C_B1CA8C(void); -void func_80240100_B1CB50(PlayerStatus*); +void func_80240100_B1CB50(void*); void func_802402F4_B1CD44(void); -void func_802403B8_B1CE08(RenderTask*); +void func_802403B8_B1CE08(void*); void N(SetPartnerFlagsA0000)(void); ApiStatus func_80240000_B1CA50(Evt* script, s32 isInitialCall) { @@ -36,7 +36,8 @@ void func_8024003C_B1CA8C(void) { } } -void func_80240100_B1CB50(PlayerStatus* playerStatus) { +void func_80240100_B1CB50(void* data) { + PlayerStatus* playerStatus = data; f32 yaw = -gCameras[gCurrentCamID].currentYaw; Matrix4f main; Matrix4f translation; @@ -87,7 +88,43 @@ void func_802402F4_B1CD44(void) { } } -INCLUDE_ASM(void, "world/area_tst/tst_11/B1CA50", func_802403B8_B1CE08, RenderTask* arg0); +void func_802403B8_B1CE08(void* data) { + PlayerStatus* playerStatus = data; + f32 yaw = -gCameras[gCurrentCamID].currentYaw; + s32 trueAnimation; + Matrix4f sp20; + Matrix4f sp60; + Matrix4f spA0; + Matrix4f spE0; + + guRotateF(spA0, yaw, 0.0f, -1.0f, 0.0f); + guRotateF(sp20, clamp_angle(playerStatus->unk_8C), 0.0f, 0.0f, 1.0f); + guMtxCatF(spA0, sp20, sp20); + guRotateF(spA0, yaw, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp20, spA0, sp20); + guRotateF(spA0, playerStatus->spriteFacingAngle, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp20, spA0, sp20); + guScaleF(spE0, SPRITE_PIXEL_SCALE, -SPRITE_PIXEL_SCALE, SPRITE_PIXEL_SCALE); + guMtxCatF(sp20, spE0, sp20); + guTranslateF(sp60, playerStatus->position.x, -playerStatus->position.y, playerStatus->position.z); + guMtxCatF(sp20, sp60, sp20); + spr_draw_player_sprite(1, 0, 0, 0, sp20); + guRotateF(spA0, yaw, 0.0f, -1.0f, 0.0f); + guRotateF(sp20, clamp_angle(playerStatus->unk_8C), 0.0f, 0.0f, 1.0f); + guMtxCatF(spA0, sp20, sp20); + guRotateF(spA0, yaw, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp20, spA0, sp20); + guRotateF(spA0, playerStatus->spriteFacingAngle, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp20, spA0, sp20); + guScaleF(spE0, SPRITE_PIXEL_SCALE, SPRITE_PIXEL_SCALE, SPRITE_PIXEL_SCALE); + guMtxCatF(sp20, spE0, sp20); + guTranslateF(sp60, playerStatus->position.x, playerStatus->position.y, 0.0f); + guMtxCatF(sp20, sp60, sp20); + trueAnimation = playerStatus->trueAnimation; + func_802DDFF8(trueAnimation, 7, 0xFF, 0xFF, 0xFF, 0x14, 0); + spr_draw_player_sprite(1, 0, 0, 0, sp20); + func_802DDFF8(trueAnimation, 0, 0, 0, 0, 0, 0); +} ApiStatus func_802406D4_B1D124(Evt* script, s32 isInitialCall) { Npc* npc; diff --git a/src/world/area_tst/tst_13/B1D760.c b/src/world/area_tst/tst_13/B1D760.c index bef55f7781..59feeb60a9 100644 --- a/src/world/area_tst/tst_13/B1D760.c +++ b/src/world/area_tst/tst_13/B1D760.c @@ -1,21 +1,49 @@ #include "tst_13.h" +extern Gfx D_80242860_B1FFC0[]; +extern s32 D_80242BF8_B20358; + ApiStatus func_80240000_B1D760(Evt* script, s32 isInitialCall) { PlayerStatus* playerStatus = &gPlayerStatus; - s32* array = script->array; - f32 distance = dist2D(playerStatus->position.x, playerStatus->position.z, array[2], array[3]); + f32 dist = dist2D(playerStatus->position.x, playerStatus->position.z, script->array[2], script->array[3]); script->varTable[0] = 1; - if ((playerStatus->actionState != 14) && (playerStatus->actionState != 16)) { + if (playerStatus->actionState != ACTION_STATE_GROUND_POUND && playerStatus->actionState != ACTION_STATE_ULTRA_POUND) { script->varTable[0] = 0; } - if (script->array[4] <= distance) { + if (script->array[4] <= dist) { script->varTable[0] = 0; } return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "world/area_tst/tst_13/B1D760", func_802400A0_B1D800); +#include "world/common/UnkDistFunc2.inc.c" -INCLUDE_ASM(s32, "world/area_tst/tst_13/B1D760", func_8024013C_B1D89C); +void func_8024013C_B1D89C(void) { + Matrix4f sp10; + Matrix4f sp50; + f32 x; + f32 y; + f32 z; + + D_80242BF8_B20358 += 1; + guTranslateF(sp10, gPlayerStatus.position.x, 0.0f, gPlayerStatus.position.z); + + x = (sin_rad(D_80242BF8_B20358 / 50.0f) * 0.5) + 0.5; + y = SQ(cos_rad(D_80242BF8_B20358 / 50.0f)) + 0.1; + z = (sin_rad(D_80242BF8_B20358 / 50.0f) * 0.5) + 0.5; + + guScaleF(sp50, x, y, z); + guMtxCatF(sp50, sp10, sp10); + guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); + mdl_project_tex_coords(1, D_80242860_B1FFC0, &sp10, NULL); + + gDPPipeSync(gMasterGfxPos++); + gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE); + gDPSetRenderMode(gMasterGfxPos++, G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2); + mdl_draw_hidden_panel_surface(&gMasterGfxPos, 1); + gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(gMasterGfxPos++, D_80242860_B1FFC0); + gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); +} diff --git a/src/world/common/NpcJumpFunc3.inc.c b/src/world/common/NpcJumpFunc3.inc.c index c2c395eb74..4da7ada3e9 100644 --- a/src/world/common/NpcJumpFunc3.inc.c +++ b/src/world/common/NpcJumpFunc3.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "npc.h" -void N(NpcJumpFunc3)(Evt* script) { +void N(NpcJumpFunc3)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); npc->jumpVelocity = 10.0f; diff --git a/src/world/common/UnkDistFunc2.inc.c b/src/world/common/UnkDistFunc2.inc.c new file mode 100644 index 0000000000..9853b37051 --- /dev/null +++ b/src/world/common/UnkDistFunc2.inc.c @@ -0,0 +1,18 @@ +#include "common.h" + +ApiStatus N(UnkDistFunc2)(Evt* script, s32 isInitialCall) { + PlayerStatus* playerStatus = &gPlayerStatus; + f32 distance; + s32* array = script->array; + + distance = dist2D(playerStatus->position.x, playerStatus->position.z, array[2], array[4]); + script->varTable[0] = 0; + if (distance < 112.5f) { + script->varTable[0] = 2; + } + if (distance < 37.5f) { + script->varTable[0] = 1; + } + + return ApiStatus_DONE2; +} diff --git a/src/world/common/UnkFunc52.inc.c b/src/world/common/UnkFunc52.inc.c index e5805c915d..e04244eb89 100644 --- a/src/world/common/UnkFunc52.inc.c +++ b/src/world/common/UnkFunc52.inc.c @@ -1,7 +1,6 @@ #include "common.h" #include "battle/battle.h" - ApiStatus N(UnkFunc52)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; Actor* actor; diff --git a/src/world/common/UnkFunc53.inc.c b/src/world/common/UnkFunc53.inc.c new file mode 100644 index 0000000000..a70946f723 --- /dev/null +++ b/src/world/common/UnkFunc53.inc.c @@ -0,0 +1,40 @@ +#include "common.h" +#include "battle/battle.h" + +typedef struct UnkNPC { + /* 0x00 */ Npc* unk_00; + /* 0x04 */ s32 unk_04; + /* 0x08 */ s32 unk_08; + /* 0x0C */ s32 unk_0C; +} UnkNPC; // size = 0x10; + +ApiStatus N(UnkFunc53)(Evt* script, s32 isInitialCall) { + NpcBlueprint bp; + NpcBlueprint* bpPtr = &bp; + UnkNPC* unkIt; + Npc* npc; + Npc* newNpc; + s32 i; + + npc = get_npc_safe(script->owner2.npcID); + npc->blurBuf = unkIt = heap_malloc(8 * sizeof(*unkIt)); + + bp.flags = 0x8000 | 0x100 | 0x40 | 0x8 | 0x2; + bp.initialAnim = 0x350002; + bp.onUpdate = NULL; + bp.onRender = NULL; + + for (i = 0; i < 8; i++, unkIt++) { + unkIt->unk_00 = newNpc = get_npc_by_index(_create_npc_basic(bpPtr)); + newNpc->pos.x = npc->pos.x; + newNpc->pos.y = npc->pos.y; + newNpc->pos.z = npc->pos.z; + newNpc->yaw = npc->yaw; + newNpc->unk_AB = 3; + disable_npc_shadow(newNpc); + unkIt->unk_04 = 0; + unkIt->unk_08 = 0; + unkIt->unk_0C = 0; + } + return ApiStatus_DONE2; +} diff --git a/src/world/common/UnkNpcAIFunc10.inc.c b/src/world/common/UnkNpcAIFunc10.inc.c index 622976be78..a5b21abc62 100644 --- a/src/world/common/UnkNpcAIFunc10.inc.c +++ b/src/world/common/UnkNpcAIFunc10.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "npc.h" -void N(UnkNpcAIFunc10)(Evt* script) { +void N(UnkNpcAIFunc10)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); npc->duration--; diff --git a/src/world/common/UnkNpcAIFunc13_2.inc.c b/src/world/common/UnkNpcAIFunc13_2.inc.c index 44df9d7937..d926965bb9 100644 --- a/src/world/common/UnkNpcAIFunc13_2.inc.c +++ b/src/world/common/UnkNpcAIFunc13_2.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "npc.h" -void N(UnkNpcAIFunc13_2)(Evt* script, NpcAISettings* aiSettings, s32 arg2) { +void N(UnkNpcAIFunc13_2)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); f32 tempAngle; diff --git a/src/world/common/UnkNpcAIFunc39.inc.c b/src/world/common/UnkNpcAIFunc39.inc.c index 20fc870cc7..9a9309a198 100644 --- a/src/world/common/UnkNpcAIFunc39.inc.c +++ b/src/world/common/UnkNpcAIFunc39.inc.c @@ -12,8 +12,8 @@ void N(UnkNpcAIFunc39)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThi posX = npc->pos.x; posY = npc->pos.y; posZ = npc->pos.z; - if (npc_test_move_simple_with_slipping(npc->collisionChannel, &posX, &posY, &posZ, npc->moveSpeed, npc->yaw, - npc->collisionHeight, npc->collisionRadius)) + if (npc_test_move_simple_with_slipping(npc->collisionChannel, &posX, &posY, &posZ, npc->moveSpeed, npc->yaw, + npc->collisionHeight, npc->collisionRadius)) { npc->moveSpeed = 0.0f; } else { diff --git a/src/world/common/UnkNpcAIFunc40.inc.c b/src/world/common/UnkNpcAIFunc40.inc.c new file mode 100644 index 0000000000..690ee1f177 --- /dev/null +++ b/src/world/common/UnkNpcAIFunc40.inc.c @@ -0,0 +1,18 @@ +#include "common.h" +#include "npc.h" + +void N(UnkNpcAIFunc40)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { + Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); + + func_800495A0(script, aiSettings, territory); + npc->jumpVelocity = rand_int(5) + 8.0; + npc->jumpScale = 1.5f; +} + +void N(UnkNpcAIFunc41)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { + Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); + + func_80049F7C(script, aiSettings, territory); + npc->jumpVelocity = rand_int(5) + 5.0; + npc->jumpScale = 1.5f; +} diff --git a/src/world/common/UnkNpcAIFunc42.inc.c b/src/world/common/UnkNpcAIFunc42.inc.c new file mode 100644 index 0000000000..734f35f69d --- /dev/null +++ b/src/world/common/UnkNpcAIFunc42.inc.c @@ -0,0 +1,16 @@ +#include "common.h" +#include "npc.h" + +void N(UnkNpcAIFunc42)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->currentAnim.w = enemy->animList[1]; + if (enemy->territory->wander.moveSpeedOverride < 0) { + npc->moveSpeed = aiSettings->alertRadius * 0.3; + } else { + npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; + } + script->functionTemp[1] = 0; + script->functionTemp[0] = 16; +} diff --git a/src/world/common/UnkNpcAIFunc43.inc.c b/src/world/common/UnkNpcAIFunc43.inc.c new file mode 100644 index 0000000000..5e0d045c3c --- /dev/null +++ b/src/world/common/UnkNpcAIFunc43.inc.c @@ -0,0 +1,20 @@ +#include "common.h" +#include "npc.h" + +void N(UnkNpcAIFunc43)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->currentAnim.w = enemy->animList[0]; + script->functionTemp[0] = 1; + + if (enemy->flags & ENEMY_FLAGS_100000) { + npc->yaw = enemy->varTable[0]; + } + + if (enemy->territory->wander.moveSpeedOverride <= 0) { + npc->moveSpeed = aiSettings->alertRadius; + } else { + npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; + } +} diff --git a/src/world/common/UnkNpcAIFunc44.inc.c b/src/world/common/UnkNpcAIFunc44.inc.c new file mode 100644 index 0000000000..3dc733ab3c --- /dev/null +++ b/src/world/common/UnkNpcAIFunc44.inc.c @@ -0,0 +1,22 @@ +#include "common.h" +#include "npc.h" +#include "effects.h" + +void N(UnkNpcAIFunc44)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + if (aiSettings->waitTime >= 0 && (func_800490B4(territory, enemy, aiSettings->chaseSpeed, aiSettings->unk_1C.f, 0) != 0)) { + s32 emoteTemp; + + fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &emoteTemp); + ai_enemy_play_sound(npc, 0x2F4, 0x200000); + npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + + if (!(enemy->npcSettings->unk_2A & 1)) { + script->functionTemp[0] = 12; + } else { + script->functionTemp[0] = 10; + } + } +} diff --git a/src/world/common/UnkNpcAIFunc45.inc.c b/src/world/common/UnkNpcAIFunc45.inc.c new file mode 100644 index 0000000000..f87212fecd --- /dev/null +++ b/src/world/common/UnkNpcAIFunc45.inc.c @@ -0,0 +1,41 @@ +#include "common.h" +#include "npc.h" +#include "effects.h" + +void N(UnkNpcAIFunc45)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + if (aiSettings->waitTime >= 0) { + if (script->functionTemp[1] <= 0) { + script->functionTemp[1] = aiSettings->waitTime; + if (func_800490B4(territory, enemy, aiSettings->chaseSpeed, aiSettings->unk_1C.f, 0) != 0) { + s32 emoteTemp; + + fx_emote(0, npc, 0.0f, (f32) npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &emoteTemp); + ai_enemy_play_sound(npc, 0x2F4, 0x200000); + npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + if (enemy->npcSettings->unk_2A & 1) { + script->functionTemp[0] = 10; + } else { + script->functionTemp[0] = 12; + } + return; + } + } + script->functionTemp[1]--; + } + + if (dist2D(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z) < npc->moveSpeed) { + npc->pos.x = enemy->territory->wander.point.x; + npc->pos.z = enemy->territory->wander.point.z; + npc->yaw = enemy->territory->wander.wanderSizeX; + script->functionTemp[0] = 0; + } + + if (npc->turnAroundYawAdjustment == 0) { + npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + } +} + diff --git a/src/world/common/UnkNpcAIMainFunc2.inc.c b/src/world/common/UnkNpcAIMainFunc2.inc.c index 251f080a8f..c058cebebb 100644 --- a/src/world/common/UnkNpcAIMainFunc2.inc.c +++ b/src/world/common/UnkNpcAIMainFunc2.inc.c @@ -8,7 +8,7 @@ ApiStatus N(UnkNpcAIMainFunc2)(Evt* script, s32 isInitialCall) { NpcAISettings* aiSettings = (NpcAISettings*)evt_get_variable(script, *args++); EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr; - + enemy->varTable[10] = evt_get_variable(script, *args++); territory.unk_00 = 0; territory.shape = enemy->territory->wander.detectShape; diff --git a/src/world/common/UnkNpcAIMainFunc3.inc.c b/src/world/common/UnkNpcAIMainFunc3.inc.c new file mode 100644 index 0000000000..1847d3df31 --- /dev/null +++ b/src/world/common/UnkNpcAIMainFunc3.inc.c @@ -0,0 +1,55 @@ +#include "common.h" +#include "npc.h" + +ApiStatus N(UnkNpcAIMainFunc3)(Evt* script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Bytecode* args = script->ptrReadPos; + Npc* npc = get_npc_unsafe(enemy->npcID); + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* aiSettings = (NpcAISettings*)evt_get_variable(script, *args); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_18 = 100.0f; + territory.unk_1C = 0; + + if (isInitialCall) { + npc->duration = 0; + npc->flags &= ~NPC_FLAG_NO_Y_MOVEMENT; + npc->flags &= ~NPC_FLAG_GRAVITY; + npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; + script->functionTemp[1] = 0; + script->functionTemp[0] = 0; + if (enemy->flags & ENEMY_FLAGS_40000000) { + script->functionTemp[0] = 12; + enemy->flags &= ~ENEMY_FLAGS_40000000; + } + } + + switch (script->functionTemp[0]) { + case 0: + N(UnkNpcAIFunc40)(script, aiSettings, territoryPtr); + case 1: + N(UnkNpcAIFunc37)(script, aiSettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); + case 3: + N(UnkNpcAIFunc38)(script, aiSettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc41)(script, aiSettings, territoryPtr); + case 13: + N(UnkNpcAIFunc39)(script, aiSettings, territoryPtr); + break; + case 14: + N(UnkDurationCheck)(script, aiSettings, territoryPtr); + break; + } + return 0; +} diff --git a/src/world/common/UnkNpcAIMainFunc4.inc.c b/src/world/common/UnkNpcAIMainFunc4.inc.c new file mode 100644 index 0000000000..afe7768a5f --- /dev/null +++ b/src/world/common/UnkNpcAIMainFunc4.inc.c @@ -0,0 +1,75 @@ +#include "common.h" +#include "npc.h" + +ApiStatus N(UnkNpcAIMainFunc4)(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* aiSettings = (NpcAISettings*)evt_get_variable(script, *args++); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_18 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || (enemy->unk_B0 & 4)) { + script->functionTemp[0] = 0; + npc->duration = 0; + enemy->varTable[0] = npc->yaw; + npc->currentAnim.w = enemy->animList[0]; + npc->flags &= ~NPC_FLAG_NO_Y_MOVEMENT; + + if (!(enemy->territory->wander.isFlying)) { + npc->flags |= NPC_FLAG_GRAVITY; + npc->flags &= ~NPC_FLAG_ENABLE_HIT_SCRIPT; + } else { + npc->flags &= ~NPC_FLAG_GRAVITY; + npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; + } + + if (enemy->unk_B0 & 4) { + script->functionTemp[0] = 99; + script->functionTemp[1] = 15; + enemy->unk_B0 &= ~4; + } else if (enemy->flags & ENEMY_FLAGS_40000000) { + script->functionTemp[0] = 12; + enemy->flags &= ~ENEMY_FLAGS_40000000; + } + } + + switch (script->functionTemp[0]) { + case 0: + N(UnkNpcAIFunc43)(script, aiSettings, territoryPtr); + case 1: + N(UnkNpcAIFunc44)(script, aiSettings, territoryPtr); + break; + case 10: + N(NpcJumpFunc3)(script, aiSettings, territoryPtr); + case 11: + N(NpcJumpFunc)(script, aiSettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc13_2)(script, aiSettings, territoryPtr); + case 13: + N(UnkNpcAIFunc11)(script, aiSettings, territoryPtr); + break; + case 14: + N(UnkNpcAIFunc10)(script, aiSettings, territoryPtr); + break; + case 15: + N(UnkNpcAIFunc42)(script, aiSettings, territoryPtr); + case 16: + N(UnkNpcAIFunc45)(script, aiSettings, territoryPtr); + break; + case 99: + func_8004A73C(script); + break; + } + return ApiStatus_BLOCK; +} diff --git a/src/world/common/UnkNpcAIMainFunc5.inc.c b/src/world/common/UnkNpcAIMainFunc5.inc.c new file mode 100644 index 0000000000..62deb319d4 --- /dev/null +++ b/src/world/common/UnkNpcAIMainFunc5.inc.c @@ -0,0 +1,135 @@ +#include "common.h" +#include "npc.h" +#include "effects.h" + +ApiStatus N(UnkNpcAIMainFunc5)(Evt* script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* aiSettings = (NpcAISettings*)evt_get_variable(script, *args++); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_18 = 100.0f; + territory.unk_1C = 0; + + if (isInitialCall) { + enemy->varTable[6] = npc->collisionHeight; + enemy->varTable[8] = 0; + enemy->unk_B5 = 0; + enemy->unk_B0 |= 8; + } + + if (isInitialCall || (enemy->unk_B0 & 4)) { + script->functionTemp[0] = 0; + npc->duration = 0; + enemy->unk_07 = 0; + npc->currentAnim.w = enemy->animList[0]; + npc->flags &= ~NPC_FLAG_NO_Y_MOVEMENT; + npc->collisionHeight = enemy->varTable[6]; + enemy->varTable[9] = 0; + + if (!enemy->territory->wander.isFlying) { + npc->flags |= NPC_FLAG_GRAVITY; + npc->flags &= ~NPC_FLAG_ENABLE_HIT_SCRIPT; + } else { + npc->flags &= ~NPC_FLAG_GRAVITY; + npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; + } + + if (enemy->unk_B0 & 4) { + s32 emoteTemp; + + script->functionTemp[0] = 99; + script->functionTemp[1] = 0; + fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0x28, &emoteTemp); + enemy->unk_B0 &= ~4; + } else if (enemy->flags & ENEMY_FLAGS_40000000) { + script->functionTemp[0] = 12; + enemy->flags &= ~ENEMY_FLAGS_40000000; + } + } + + if (enemy->varTable[9] > 0) { + enemy->varTable[9]--; + if (enemy->varTable[9] == 0) { + if (npc->currentAnim.w == 0x55002E || npc->currentAnim.w == 0x55002F) { + npc->currentAnim.w = 0x55000C; + } + } else { + return ApiStatus_BLOCK; + } + } + + switch (script->functionTemp[0]) { + case 0: + func_800495A0(script, aiSettings, territoryPtr); + npc->collisionHeight = enemy->varTable[6]; + case 1: + func_800496B8(script, aiSettings, territoryPtr); + break; + case 2: + base_UnkNpcAIFunc1(script, aiSettings, territoryPtr); + if (enemy->varTable[7] == 6) { + if (rand_int(100) < 33) { + if (enemy->varTable[8] != 0) { + enemy->varTable[8] = 0; + enemy->unk_B5 = 0; + npc->currentAnim.w = 0x55002F; + } else { + enemy->varTable[8] = 1; + enemy->unk_B5 = 1; + npc->currentAnim.w = 0x55002E; + } + enemy->varTable[9] = 7; + return ApiStatus_BLOCK; + } + } + case 3: + func_80049C04(script, aiSettings, territoryPtr); + break; + case 12: + N(set_script_owner_npc_anim)(script, aiSettings, territoryPtr); + case 13: + N(UnkDistFunc)(script, aiSettings, territoryPtr); + break; + case 14: + N(UnkNpcAIFunc12)(script, aiSettings, territoryPtr); + break; + case 15: + N(set_script_owner_npc_col_height)(script, aiSettings, territoryPtr); + break; + case 99: + func_8004A73C(script); + break; + } + + if (enemy->varTable[7] == 6) { + if (enemy->varTable[8] != 0) { + enemy->unk_B5 = 1; + } else { + enemy->unk_B5 = 0; + } + if (enemy->varTable[8] != 0) { + switch (npc->currentAnim.w - 0x550004) { + case 0: + case 8: + case 10: + case 12: + case 14: + case 18: + case 20: + npc->currentAnim.w++; + break; + } + } + } + + return ApiStatus_BLOCK; +} diff --git a/src/world/common/UnkNpcAIMainFunc6.inc.c b/src/world/common/UnkNpcAIMainFunc6.inc.c new file mode 100644 index 0000000000..c9e3974219 --- /dev/null +++ b/src/world/common/UnkNpcAIMainFunc6.inc.c @@ -0,0 +1,216 @@ +#include "common.h" +#include "npc.h" +#include "effects.h" + +ApiStatus N(UnkNpcAIMainFunc6)(Evt* script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* aiSettings = (NpcAISettings*)evt_get_variable(script, *args); + u32 x, y, z; + f32 x2, y2, z2, w2; + Npc* npc2; + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_18 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall) { + enemy->varTable[6] = npc->collisionHeight; + enemy->unk_B0 |= 8; + } + + if (isInitialCall || (enemy->varTable[10] == 100)) { + script->functionTemp[0] = 100; + npc->duration = 0; + npc->currentAnim.w = enemy->animList[0]; + npc->flags &= ~NPC_FLAG_NO_Y_MOVEMENT; + enemy->flags |= ENEMY_FLAGS_200000; + npc->flags &= ~NPC_FLAG_GRAVITY; + npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; + enemy->varTable[10] = 0; + enemy->varTable[11] = -1; + npc->pos.x = 0.0f; + npc->pos.y = -1000.0f; + npc->pos.z = 0.0f; + } + + if (enemy->unk_B0 & 4) { + npc->duration = 0; + npc->collisionHeight = enemy->varTable[6]; + enemy->unk_B0 &= ~4; + if (npc->flags & NPC_FLAG_NO_Y_MOVEMENT) { + npc->currentAnim.w = 0x4A0018; + npc->moveSpeed = 0.0f; + npc->jumpVelocity = 0.0f; + npc->jumpScale = 1.0f; + script->functionTemp[0] = 102; + } else { + s32 emoteTemp; + + fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0x28, &emoteTemp); + npc->currentAnim.w = enemy->animList[0]; + script->functionTemp[1] = 0; + script->functionTemp[0] = 200; + } + } + get_screen_coords(0, npc->pos.x, npc->pos.y, npc->pos.z, &x, &y, &z); + if (script->functionTemp[0] < 100 && x + 50 >= 421) { + script->functionTemp[0] = 110; + } + + switch (script->functionTemp[0]) { + case 0: + func_800495A0(script, aiSettings, territoryPtr); + npc->collisionHeight = enemy->varTable[6]; + if (enemy->varTable[13] != 0) { + if (npc->pos.y <= 0.0) { + npc->flags &= ~NPC_FLAG_GRAVITY; + npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; + } else { + npc->flags |= NPC_FLAG_GRAVITY; + npc->flags &= ~NPC_FLAG_ENABLE_HIT_SCRIPT; + } + } + func_800496B8(script, aiSettings, territoryPtr); + break; + case 1: + func_800496B8(script, aiSettings, territoryPtr); + break; + case 2: + base_UnkNpcAIFunc1(script, aiSettings, territoryPtr); + case 3: + func_80049C04(script, aiSettings, territoryPtr); + break; + case 12: + N(set_script_owner_npc_anim)(script, aiSettings, territoryPtr); + case 13: + N(UnkDistFunc)(script, aiSettings, territoryPtr); + npc->collisionHeight = enemy->varTable[6]; + break; + case 14: + N(UnkNpcAIFunc12)(script, aiSettings, territoryPtr); + break; + case 15: + N(set_script_owner_npc_col_height)(script, aiSettings, territoryPtr); + break; + case 100: + if (enemy->varTable[10] != 2) { + break; + } + npc2 = get_npc_unsafe(get_enemy(enemy->varTable[11])->npcID); + if (npc2->yaw < 180.0) { + npc->pos.x = npc2->pos.x + 12.0; + } else { + npc->pos.x = npc2->pos.x - 12.0; + } + npc->pos.y = npc2->pos.y + 25.0; + npc->pos.z = npc2->pos.z + 1.0; + npc->rotation.y = 0.0f; + npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; + npc->flags &= ~NPC_FLAG_2; + npc->flags &= ~NPC_FLAG_GRAVITY; + npc->renderYaw = 0.0f; + npc->currentAnim.w = 0x4A0018; + script->functionTemp[0] = 101; + case 101: + if (enemy->varTable[10] != 3) { + break; + } + enemy->varTable[10] = 4; + npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + npc->moveSpeed = 2.5f; + npc->jumpVelocity = 8.0f; + npc->jumpScale = 0.8f; + npc->flags |= NPC_FLAG_NO_Y_MOVEMENT; + script->functionTemp[0] = 102; + case 102: + if (npc->moveSpeed > 0.0) { + x2 = npc->pos.x; + y2 = npc->pos.y; + z2 = npc->pos.z; + if (npc_test_move_simple_with_slipping(npc->collisionChannel, &x2, &y2, &z2, npc->moveSpeed, npc->yaw, npc->collisionHeight, + npc->collisionRadius) == 0) { + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + } else { + npc->moveSpeed = 0.0f; + } + } + if (npc->jumpVelocity < 0.0) { + x2 = npc->pos.x; + y2 = npc->pos.y + 13.0; + z2 = npc->pos.z; + w2 = fabsf(npc->jumpVelocity) + 16.0; + if ((npc_raycast_down_sides(npc->collisionChannel, &x2, &y2, &z2, &w2) != 0) && (w2 <= (fabsf(npc->jumpVelocity) + 13.0))) { + npc->pos.y = y2; + enemy->territory->wander.point.x = npc->pos.x; + enemy->territory->wander.point.y = npc->pos.y; + enemy->territory->wander.point.z = npc->pos.z; + enemy->territory->wander.detect.x = npc->pos.x; + enemy->territory->wander.detect.y = npc->pos.y; + enemy->territory->wander.detect.z = npc->pos.z; + enemy->varTable[10] = 5; + if (enemy->varTable[13] != 0) { + if (npc->pos.y <= 0.0) { + npc->flags &= ~NPC_FLAG_GRAVITY; + npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; + } else { + npc->flags |= NPC_FLAG_GRAVITY; + npc->flags &= ~NPC_FLAG_ENABLE_HIT_SCRIPT; + } + } else if (!enemy->territory->wander.isFlying) { + npc->flags |= NPC_FLAG_GRAVITY; + npc->flags &= ~NPC_FLAG_ENABLE_HIT_SCRIPT; + } else { + npc->flags &= ~NPC_FLAG_GRAVITY; + npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; + } + npc->flags |= NPC_FLAG_40000; + npc->flags &= ~NPC_FLAG_NO_Y_MOVEMENT; + npc->jumpVelocity = 0.0f; + npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + npc->currentAnim.w = 0x4A001A; + npc->duration = 3; + script->functionTemp[0] = 103; + break; + } + } + npc->pos.y += npc->jumpVelocity; + npc->jumpVelocity -= npc->jumpScale; + break; + case 103: + npc->duration--; + if (npc->duration <= 0) { + npc->flags &= ~NPC_FLAG_40000; + npc->currentAnim.w = 0x4A0001; + script->functionTemp[0] = 0; + } + break; + case 110: + npc->duration = 30; + npc->pos.x = 0.0f; + npc->pos.z = 0.0f; + npc->pos.y = -1000.0f; + npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_2; + npc->flags &= ~NPC_FLAG_GRAVITY; + script->functionTemp[0] = 111; + case 111: + npc->duration--; + if (npc->duration <= 0) { + enemy->varTable[10] = 0; + script->functionTemp[0] = 100; + } + break; + case 200: + func_8004A73C(script); + break; + } + return ApiStatus_BLOCK; +} diff --git a/ver/us/asm/data/world/area_end/end_00/E052C0.data.s b/ver/us/asm/data/world/area_end/end_00/E052C0.data.s deleted file mode 100644 index b9c743e116..0000000000 --- a/ver/us/asm/data/world/area_end/end_00/E052C0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_8024E8C0_E052C0 -.word 0x80241C14, 0x80241C44, 0x80241C44, 0x80241C08, 0x80241C08, 0x80241C08, 0x80241C44, 0x80241C44, 0x80241C44, 0x80241C44, 0x80241C44, 0x80241C44, 0x80241C44, 0x80241C14, 0x80241C44, 0x80241C1C diff --git a/ver/us/asm/data/world/area_flo/flo_17/CDB2B0.data.s b/ver/us/asm/data/world/area_flo/flo_17/CDB2B0.data.s index 1070c43a6c..85a5357445 100644 --- a/ver/us/asm/data/world/area_flo/flo_17/CDB2B0.data.s +++ b/ver/us/asm/data/world/area_flo/flo_17/CDB2B0.data.s @@ -21,7 +21,7 @@ dlabel D_802444F0_CDB7D0 .word 0x3FC00000, 0x0000001E, 0x00000032, 0x42700000, 0x41F00000, 0x00000003, 0x40C00000, 0x00000000, 0x00000000, 0x42C80000, 0x41F00000, 0x00000003 dlabel D_80244520_CDB800 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000012, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000004, 0x00000043, 0x00000002, func_80242918_CD9BF8, D_802444F0_CDB7D0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000012, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000004, 0x00000043, 0x00000002, flo_17_UnkNpcAIMainFunc6, D_802444F0_CDB7D0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244590_CDB870 .word 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0x00000064, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_23/CEF540.data.s b/ver/us/asm/data/world/area_flo/flo_23/CEF540.data.s index 376e3afe70..b59f00c302 100644 --- a/ver/us/asm/data/world/area_flo/flo_23/CEF540.data.s +++ b/ver/us/asm/data/world/area_flo/flo_23/CEF540.data.s @@ -21,7 +21,7 @@ dlabel D_80241498_CEF6F8 .word 0x3FC00000, 0x0000001E, 0x00000032, 0x42700000, 0x41F00000, 0x00000003, 0x40C00000, 0x00000000, 0x00000000, 0x42C80000, 0x41F00000, 0x00000003 dlabel D_802414C8_CEF728 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000012, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000004, 0x00000043, 0x00000002, func_80240728_CEE988, D_80241498_CEF6F8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000012, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000004, 0x00000043, 0x00000002, flo_23_UnkNpcAIMainFunc5, D_80241498_CEF6F8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241538_CEF798 .word 0x00000000, 0x00150016, 0x00000000, 0x00000000, D_802414C8_CEF728, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00130000 diff --git a/ver/us/asm/data/world/area_hos/hos_00/A0CA00.data.s b/ver/us/asm/data/world/area_hos/hos_00/A0CA00.data.s index 9e31b841c1..067b7edfb5 100644 --- a/ver/us/asm/data/world/area_hos/hos_00/A0CA00.data.s +++ b/ver/us/asm/data/world/area_hos/hos_00/A0CA00.data.s @@ -15,7 +15,7 @@ dlabel D_8024101C_A0CD0C .word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000062, 0x00000000, 0x00000008, 0x00000012, 0x00000000, 0x00000044, 0x00000001, D_80240E04_A0CAF4, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000046, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802410B0_A0CDA0 -.word 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000000C, 0x00000002, 0xFE363C81, 0xFFFFFFCE, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x000003E8, 0x00000028, 0x00000002, 0xFE363C88, 0xFE363C81, 0x0000002A, 0x00000002, 0xFE363C88, 0x0000000A, 0x0000000C, 0x00000002, 0xFE363C88, 0x00000014, 0x00000024, 0x00000002, 0xFE363C88, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, RandInt, 0x00000190, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C8B, 0x000000C8, 0x00000043, 0x00000003, RandInt, 0x00000190, 0xFE363C8C, 0x00000028, 0x00000002, 0xFE363C8C, 0x000000C8, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C8C, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000043, 0x00000003, RandInt, 0x00000064, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000032, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C83, 0x00000043, 0x00000003, RandInt, 0x00000004, 0xFE363C87, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000014, 0x00000001, 0xFE363C83, 0x00000018, 0x00000001, 0xFFFFFEDE, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000018, 0x00000001, 0x00000028, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x0000001B, 0x00000001, 0x00000028, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000023, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C8E, 0x00000002, 0x00000043, 0x00000006, PlaySoundAt, 0xB0000015, 0x00000000, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C8E, 0x00000001, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0xFE363C88, 0x0000000D, 0x00000002, 0xFE363C8D, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000009, func_80240050_A0BD40, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000008, 0x00000001, 0xFE363C88, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000000B, 0x00000056, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x00000032, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000001, func_80240170_A0BE60, 0x00000008, 0x00000001, 0xFE363C80, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000003, RandInt, 0x00000032, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000001, func_8024036C_A0C05C, 0x00000008, 0x00000001, 0xFE363C80, 0x00000004, 0x00000001, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000003, RandInt, 0x00000032, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000001, func_80240584_A0C274, 0x00000043, 0x00000006, PlaySoundAt, 0xB0000015, 0x00000000, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0xFE363C80, 0x00000004, 0x00000001, 0x00000002, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000000C, 0x00000002, 0xFE363C81, 0xFFFFFFCE, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x000003E8, 0x00000028, 0x00000002, 0xFE363C88, 0xFE363C81, 0x0000002A, 0x00000002, 0xFE363C88, 0x0000000A, 0x0000000C, 0x00000002, 0xFE363C88, 0x00000014, 0x00000024, 0x00000002, 0xFE363C88, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, RandInt, 0x00000190, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C8B, 0x000000C8, 0x00000043, 0x00000003, RandInt, 0x00000190, 0xFE363C8C, 0x00000028, 0x00000002, 0xFE363C8C, 0x000000C8, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C8C, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000043, 0x00000003, RandInt, 0x00000064, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000032, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C83, 0x00000043, 0x00000003, RandInt, 0x00000004, 0xFE363C87, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000014, 0x00000001, 0xFE363C83, 0x00000018, 0x00000001, 0xFFFFFEDE, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000018, 0x00000001, 0x00000028, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x0000001B, 0x00000001, 0x00000028, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000023, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C8E, 0x00000002, 0x00000043, 0x00000006, PlaySoundAt, 0xB0000015, 0x00000000, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C8E, 0x00000001, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0xFE363C88, 0x0000000D, 0x00000002, 0xFE363C8D, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000009, hos_00_UnkEffect0FFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000008, 0x00000001, 0xFE363C88, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000000B, 0x00000056, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x00000032, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000001, hos_00_UnkEffect0FFunc, 0x00000008, 0x00000001, 0xFE363C80, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000003, RandInt, 0x00000032, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000001, hos_00_UnkEffect0FFunc3, 0x00000008, 0x00000001, 0xFE363C80, 0x00000004, 0x00000001, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000003, RandInt, 0x00000032, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000001, hos_00_UnkEffect0FFunc4, 0x00000043, 0x00000006, PlaySoundAt, 0xB0000015, 0x00000000, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0xFE363C80, 0x00000004, 0x00000001, 0x00000002, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241554_A0D244 .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000021, 0x00000002, 0xFFFFFF81, 0x0000005F, 0x00000043, 0x00000003, GotoMap, 0x80244B60, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x80244B58, 0x00000001, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_hos/hos_01/A11760.data.s b/ver/us/asm/data/world/area_hos/hos_01/A11760.data.s index 0ba6b0b8d0..e2c309f062 100644 --- a/ver/us/asm/data/world/area_hos/hos_01/A11760.data.s +++ b/ver/us/asm/data/world/area_hos/hos_01/A11760.data.s @@ -3,10 +3,10 @@ .section .data dlabel D_80240EE0_A11760 -.word 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000000C, 0x00000002, 0xFE363C81, 0xFFFFFFCE, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x000003E8, 0x00000028, 0x00000002, 0xFE363C88, 0xFE363C81, 0x0000002A, 0x00000002, 0xFE363C88, 0x0000000A, 0x0000000C, 0x00000002, 0xFE363C88, 0x00000014, 0x00000024, 0x00000002, 0xFE363C88, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, RandInt, 0x00000190, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C8B, 0x000000C8, 0x00000043, 0x00000003, RandInt, 0x00000190, 0xFE363C8C, 0x00000028, 0x00000002, 0xFE363C8C, 0x000000C8, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C8C, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000043, 0x00000003, RandInt, 0x00000064, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000032, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C83, 0x00000043, 0x00000003, RandInt, 0x00000004, 0xFE363C87, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000014, 0x00000001, 0xFE363C83, 0x00000018, 0x00000001, 0xFFFFFEDE, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000018, 0x00000001, 0x00000028, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x0000001B, 0x00000001, 0x00000028, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000023, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C8E, 0x00000002, 0x00000043, 0x00000006, PlaySoundAt, 0xB0000015, 0x00000000, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C8E, 0x00000001, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0xFE363C88, 0x0000000D, 0x00000002, 0xFE363C8D, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000009, func_80240000_A10880, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000008, 0x00000001, 0xFE363C88, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000000C, 0x00000002, 0xFE363C81, 0xFFFFFFCE, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x000003E8, 0x00000028, 0x00000002, 0xFE363C88, 0xFE363C81, 0x0000002A, 0x00000002, 0xFE363C88, 0x0000000A, 0x0000000C, 0x00000002, 0xFE363C88, 0x00000014, 0x00000024, 0x00000002, 0xFE363C88, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, RandInt, 0x00000190, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C8B, 0x000000C8, 0x00000043, 0x00000003, RandInt, 0x00000190, 0xFE363C8C, 0x00000028, 0x00000002, 0xFE363C8C, 0x000000C8, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C8C, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000043, 0x00000003, RandInt, 0x00000064, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000032, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C83, 0x00000043, 0x00000003, RandInt, 0x00000004, 0xFE363C87, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000014, 0x00000001, 0xFE363C83, 0x00000018, 0x00000001, 0xFFFFFEDE, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000018, 0x00000001, 0x00000028, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x0000001B, 0x00000001, 0x00000028, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000023, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C8E, 0x00000002, 0x00000043, 0x00000006, PlaySoundAt, 0xB0000015, 0x00000000, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C8E, 0x00000001, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0xFE363C88, 0x0000000D, 0x00000002, 0xFE363C8D, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000009, hos_01_UnkEffect0FFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000008, 0x00000001, 0xFE363C88, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024121C_A11A9C -.word 0x0000004D, 0x00000001, 0x0000000B, 0x00000056, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x00000032, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000001, func_80240120_A109A0, 0x00000008, 0x00000001, 0xFE363C80, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000003, RandInt, 0x00000032, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000001, func_8024031C_A10B9C, 0x00000008, 0x00000001, 0xFE363C80, 0x00000004, 0x00000001, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000003, RandInt, 0x00000032, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000001, func_80240534_A10DB4, 0x00000043, 0x00000006, PlaySoundAt, 0xB0000015, 0x00000000, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0xFE363C80, 0x00000004, 0x00000001, 0x00000002, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x0000000B, 0x00000056, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x00000032, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000001, hos_01_UnkEffect0FFunc, 0x00000008, 0x00000001, 0xFE363C80, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000003, RandInt, 0x00000032, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000001, hos_01_UnkEffect0FFunc3, 0x00000008, 0x00000001, 0xFE363C80, 0x00000004, 0x00000001, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000003, RandInt, 0x00000032, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000001, hos_01_UnkEffect0FFunc4, 0x00000043, 0x00000006, PlaySoundAt, 0xB0000015, 0x00000000, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0xFE363C80, 0x00000004, 0x00000001, 0x00000002, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241384_A11C04 .word 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000005DC, 0x00000043, 0x00000004, GotoMapSpecial, 0x80245988, 0x00000000, 0x0000000B, 0x00000008, 0x00000001, 0x00000064 diff --git a/ver/us/asm/data/world/area_isk/isk_04/97CB60.data.s b/ver/us/asm/data/world/area_isk/isk_04/97CB60.data.s index 0d46ae78ad..4a21e15fd8 100644 --- a/ver/us/asm/data/world/area_isk/isk_04/97CB60.data.s +++ b/ver/us/asm/data/world/area_isk/isk_04/97CB60.data.s @@ -6,22 +6,22 @@ dlabel D_80241530_97CB60 .word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40900000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 dlabel D_80241560_97CB90 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, func_802403D4_97BA04, D_80241530_97CB60, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, isk_04_UnkNpcAIMainFunc5, D_80241530_97CB60, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802415D0_97CC00 .word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40E00000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 dlabel D_80241600_97CC30 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000003, 0x00000043, 0x00000002, func_802403D4_97BA04, D_802415D0_97CC00, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000003, 0x00000043, 0x00000002, isk_04_UnkNpcAIMainFunc5, D_802415D0_97CC00, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241670_97CCA0 .word 0x3F800000, 0x00000014, 0x00000005, 0x42F00000, 0x00000000, 0x00000003, 0x40C00000, 0x00000000, 0x00000000, 0x43160000, 0x00000000, 0x00000001 dlabel D_802416A0_97CCD0 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000006, 0x00000043, 0x00000002, func_802403D4_97BA04, D_80241670_97CCA0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000006, 0x00000043, 0x00000002, isk_04_UnkNpcAIMainFunc5, D_80241670_97CCA0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241710_97CD40 -.word 0x00000043, 0x00000001, isk_04_func_80240814_97BE44, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, isk_04_AwaitPlayerNearNpc, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, isk_04_func_802408B4_97BEE4, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, func_802403D4_97BA04, D_80241530_97CB60, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, isk_04_func_80240814_97BE44, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, isk_04_AwaitPlayerNearNpc, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, isk_04_func_802408B4_97BEE4, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, isk_04_UnkNpcAIMainFunc5, D_80241530_97CB60, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241804_97CE34 .word 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80241560_97CB90, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80241710_97CD40, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80241600_97CC30, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, D_802416A0_97CCD0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000 diff --git a/ver/us/asm/data/world/area_isk/isk_05/97FE50.data.s b/ver/us/asm/data/world/area_isk/isk_05/97FE50.data.s index d799ef146f..52937499dd 100644 --- a/ver/us/asm/data/world/area_isk/isk_05/97FE50.data.s +++ b/ver/us/asm/data/world/area_isk/isk_05/97FE50.data.s @@ -3,13 +3,13 @@ .section .data dlabel D_80242380_97FE50 -.word 0x00000043, 0x00000001, func_80241108_97EBD8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, isk_05_UnkFunc53, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024239C_97FE6C .word 0x40000000, 0x0000001E, 0x0000001E, 0x42C80000, 0x00000000, 0x0000000A, 0x40A9999A, 0x00000046, 0x0000000A, 0x43FA0000, 0x00000000, 0x00000001 dlabel D_802423CC_97FE9C -.word 0x00000058, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802411F8_97ECC8, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, func_80240F3C_97EA0C, D_8024239C_97FE6C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000058, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802411F8_97ECC8, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, isk_05_UnkNpcAIMainFunc3, D_8024239C_97FE6C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024243C_97FF0C .word 0x00000043, 0x00000002, SetBattleMusic, 0x00000003, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000016, 0x00000001, 0x00000003, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_800458CC, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000028, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0x00000000, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_08/985B00.data.s b/ver/us/asm/data/world/area_isk/isk_08/985B00.data.s index 28e933c2f9..da45df8d39 100644 --- a/ver/us/asm/data/world/area_isk/isk_08/985B00.data.s +++ b/ver/us/asm/data/world/area_isk/isk_08/985B00.data.s @@ -6,22 +6,22 @@ dlabel D_80240CD0_985B00 .word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40900000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 dlabel D_80240D00_985B30 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, func_80240394_9851C4, D_80240CD0_985B00, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, isk_08_UnkNpcAIMainFunc5, D_80240CD0_985B00, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240D70_985BA0 .word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40E00000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 dlabel D_80240DA0_985BD0 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000003, 0x00000043, 0x00000002, func_80240394_9851C4, D_80240D70_985BA0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000003, 0x00000043, 0x00000002, isk_08_UnkNpcAIMainFunc5, D_80240D70_985BA0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240E10_985C40 .word 0x3F800000, 0x00000014, 0x00000005, 0x42F00000, 0x00000000, 0x00000003, 0x40C00000, 0x00000000, 0x00000000, 0x43160000, 0x00000000, 0x00000001 dlabel D_80240E40_985C70 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000006, 0x00000043, 0x00000002, func_80240394_9851C4, D_80240E10_985C40, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000006, 0x00000043, 0x00000002, isk_08_UnkNpcAIMainFunc5, D_80240E10_985C40, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240EB0_985CE0 -.word 0x00000043, 0x00000001, isk_08_func_80240814_97BE44, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, isk_08_AwaitPlayerNearNpc, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, isk_08_func_802408B4_97BEE4, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, func_80240394_9851C4, D_80240CD0_985B00, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, isk_08_func_80240814_97BE44, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, isk_08_AwaitPlayerNearNpc, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, isk_08_func_802408B4_97BEE4, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, isk_08_UnkNpcAIMainFunc5, D_80240CD0_985B00, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240FA4_985DD4 .word 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80240D00_985B30, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80240EB0_985CE0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80240DA0_985BD0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, D_80240E40_985C70, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000 diff --git a/ver/us/asm/data/world/area_isk/isk_13/991A90.data.s b/ver/us/asm/data/world/area_isk/isk_13/991A90.data.s index d487fbe0e0..3ae13fbc90 100644 --- a/ver/us/asm/data/world/area_isk/isk_13/991A90.data.s +++ b/ver/us/asm/data/world/area_isk/isk_13/991A90.data.s @@ -6,13 +6,13 @@ dlabel D_802422B0_991A90 .word 0x00000024, 0x00000002, 0xF8405F02, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000015, 0x000001CC, 0xFFFFFDC8, 0xFFFFFEAA, 0x00000000, 0xF8405EF1, 0x0000000A, 0x00000002, 0xF8405F02, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA1C0, 0x00000238, 0xFFFFFD76, 0xFFFFFED2, 0x00000019, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802422B0_991A90, 0x00000013, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x0000019F, 0xFFFFFE3B, 0xFFFFFEDD, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x0000019F, 0xFFFFFDB9, 0xFFFFFEDD, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x000001E9, 0xFFFFFE3B, 0xFFFFFF7D, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x000001E9, 0xFFFFFDB9, 0xFFFFFF7D, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242460_991C40 -.word 0x00000043, 0x00000001, func_80241108_9908E8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, isk_13_UnkFunc53, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024247C_991C5C .word 0x40000000, 0x0000001E, 0x0000001E, 0x42C80000, 0x00000000, 0x0000000A, 0x40A9999A, 0x00000046, 0x0000000A, 0x43FA0000, 0x00000000, 0x00000001 dlabel D_802424AC_991C8C -.word 0x00000058, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802411F8_9909D8, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, func_80240F3C_99071C, D_8024247C_991C5C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000058, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802411F8_9909D8, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, isk_13_UnkNpcAIMainFunc3, D_8024247C_991C5C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024251C_991CFC .word 0x00000043, 0x00000002, SetBattleMusic, 0x00000003, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000016, 0x00000001, 0x00000003, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_800458CC, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000028, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0x00000000, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_14/994860.data.s b/ver/us/asm/data/world/area_isk/isk_14/994860.data.s index a820325c04..27d7f0552d 100644 --- a/ver/us/asm/data/world/area_isk/isk_14/994860.data.s +++ b/ver/us/asm/data/world/area_isk/isk_14/994860.data.s @@ -3,13 +3,13 @@ .section .data dlabel D_80242130_994860 -.word 0x00000043, 0x00000001, func_80241108_993838, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, isk_14_UnkFunc53, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024214C_99487C .word 0x40000000, 0x0000001E, 0x0000001E, 0x42C80000, 0x00000000, 0x0000000A, 0x40A9999A, 0x00000046, 0x0000000A, 0x43FA0000, 0x00000000, 0x00000001 dlabel D_8024217C_9948AC -.word 0x00000058, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802411F8_993928, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, func_80240F3C_99366C, D_8024214C_99487C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000058, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802411F8_993928, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, isk_14_UnkNpcAIMainFunc3, D_8024214C_99487C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802421EC_99491C .word 0x00000043, 0x00000002, SetBattleMusic, 0x00000003, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000016, 0x00000001, 0x00000003, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_800458CC, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000028, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0x00000000, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_18/998B90.data.s b/ver/us/asm/data/world/area_isk/isk_18/998B90.data.s index 201b23825b..7ce62135e9 100644 --- a/ver/us/asm/data/world/area_isk/isk_18/998B90.data.s +++ b/ver/us/asm/data/world/area_isk/isk_18/998B90.data.s @@ -6,22 +6,22 @@ dlabel D_80240C20_998B90 .word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40900000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 dlabel D_80240C50_998BC0 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, func_80240394_998304, D_80240C20_998B90, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, isk_18_UnkNpcAIMainFunc5, D_80240C20_998B90, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240CC0_998C30 .word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40E00000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 dlabel D_80240CF0_998C60 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000003, 0x00000043, 0x00000002, func_80240394_998304, D_80240CC0_998C30, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000003, 0x00000043, 0x00000002, isk_18_UnkNpcAIMainFunc5, D_80240CC0_998C30, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240D60_998CD0 .word 0x3F800000, 0x00000014, 0x00000005, 0x42F00000, 0x00000000, 0x00000003, 0x40C00000, 0x00000000, 0x00000000, 0x43160000, 0x00000000, 0x00000001 dlabel D_80240D90_998D00 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000006, 0x00000043, 0x00000002, func_80240394_998304, D_80240D60_998CD0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000006, 0x00000043, 0x00000002, isk_18_UnkNpcAIMainFunc5, D_80240D60_998CD0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240E00_998D70 -.word 0x00000043, 0x00000001, isk_18_func_80240814_97BE44, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, isk_18_AwaitPlayerNearNpc, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, isk_18_func_802408B4_97BEE4, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, func_80240394_998304, D_80240C20_998B90, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, isk_18_func_80240814_97BE44, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, isk_18_AwaitPlayerNearNpc, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, isk_18_func_802408B4_97BEE4, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, isk_18_UnkNpcAIMainFunc5, D_80240C20_998B90, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240EF4_998E64 .word 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80240C50_998BC0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_02/8B5640.data.s b/ver/us/asm/data/world/area_kmr/kmr_02/8B5640.data.s index 97a3344eff..790d8114aa 100644 --- a/ver/us/asm/data/world/area_kmr/kmr_02/8B5640.data.s +++ b/ver/us/asm/data/world/area_kmr/kmr_02/8B5640.data.s @@ -78,7 +78,7 @@ dlabel D_80247BF8_8B7C68 .word 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x43960000, 0x00000000, 0x0000001E dlabel D_80247C1C_8B7C8C -.word 0x00000043, 0x00000002, func_80241C18_8B1C88, D_80247BF8_8B7C68, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, kmr_02_UnkNpcAIMainFunc4, D_80247BF8_8B7C68, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80247C3C_8B7CAC .word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, D_80247C1C_8B7C8C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00170013, 0x00000000, 0x00000000, D_80247C1C_8B7C8C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 @@ -99,7 +99,7 @@ dlabel D_80247D3C_8B7DAC .word 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x43960000, 0x00000000, 0x0000001E dlabel D_80247D60_8B7DD0 -.word 0x00000043, 0x00000002, func_80241C18_8B1C88, D_80247D3C_8B7DAC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, kmr_02_UnkNpcAIMainFunc4, D_80247D3C_8B7DAC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80247D80_8B7DF0 .word 0x00000000, 0x0028001E, 0x00000000, 0x00000000, D_80247D60_8B7DD0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x001A0000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_07/8D49A0.data.s b/ver/us/asm/data/world/area_kmr/kmr_07/8D49A0.data.s index 631df7c385..7bd7952be1 100644 --- a/ver/us/asm/data/world/area_kmr/kmr_07/8D49A0.data.s +++ b/ver/us/asm/data/world/area_kmr/kmr_07/8D49A0.data.s @@ -18,7 +18,7 @@ dlabel D_80240E90_8D4C50 .word 0x43020000, 0x00000000, 0x00000001, 0x40200000, 0x000000B4, 0x00000003, 0x43160000, 0x00000000, 0x00000001 dlabel D_80240EB4_8D4C74 -.word 0x00000043, 0x00000002, func_802407F4_8D45B4, D_80240E90_8D4C50, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, kmr_07_UnkNpcAIMainFunc4, D_80240E90_8D4C50, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240ED4_8D4C94 .word 0x00000000, 0x00140017, 0x00000000, 0x00000000, D_80240EB4_8D4C74, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00050000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_11/8DE400.data.s b/ver/us/asm/data/world/area_kmr/kmr_11/8DE400.data.s index ed8851be2f..f3403d238d 100644 --- a/ver/us/asm/data/world/area_kmr/kmr_11/8DE400.data.s +++ b/ver/us/asm/data/world/area_kmr/kmr_11/8DE400.data.s @@ -6,7 +6,7 @@ dlabel D_80244300_8DE400 .word 0x43020000, 0x00000000, 0x00000001, 0x40200000, 0x000000B4, 0x00000003, 0x43160000, 0x00000000, 0x00000001 dlabel D_80244324_8DE424 -.word 0x00000043, 0x00000002, func_80240B64_8DAC64, D_80244300_8DE400, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, kmr_11_UnkNpcAIMainFunc4, D_80244300_8DE400, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244344_8DE444 .word 0x00000000, 0x00140017, 0x00000000, 0x00000000, D_80244324_8DE424, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00050000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_01/A47D70.data.s b/ver/us/asm/data/world/area_kpa/kpa_01/A47D70.data.s index 43939330bf..3cdf398858 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_01/A47D70.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_01/A47D70.data.s @@ -6,22 +6,22 @@ dlabel D_80240E10_A47D70 .word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40900000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 dlabel D_80240E40_A47DA0 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, func_802404F4_A47454, D_80240E10_A47D70, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, kpa_01_UnkNpcAIMainFunc5, D_80240E10_A47D70, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240EB0_A47E10 .word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40E00000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 dlabel D_80240EE0_A47E40 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000003, 0x00000043, 0x00000002, func_802404F4_A47454, D_80240EB0_A47E10, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000003, 0x00000043, 0x00000002, kpa_01_UnkNpcAIMainFunc5, D_80240EB0_A47E10, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240F50_A47EB0 .word 0x3F800000, 0x00000014, 0x00000005, 0x42F00000, 0x00000000, 0x00000003, 0x40C00000, 0x00000000, 0x00000000, 0x43160000, 0x00000000, 0x00000001 dlabel D_80240F80_A47EE0 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000006, 0x00000043, 0x00000002, func_802404F4_A47454, D_80240F50_A47EB0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000006, 0x00000043, 0x00000002, kpa_01_UnkNpcAIMainFunc5, D_80240F50_A47EB0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240FF0_A47F50 -.word 0x00000043, 0x00000001, kpa_01_func_80240814_97BE44, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, kpa_01_AwaitPlayerNearNpc, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, kpa_01_func_802408B4_97BEE4, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, func_802404F4_A47454, D_80240E10_A47D70, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80240E40_A47DA0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80240FF0_A47F50, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80240EE0_A47E40, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000 +.word 0x00000043, 0x00000001, kpa_01_func_80240814_97BE44, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, kpa_01_AwaitPlayerNearNpc, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, kpa_01_func_802408B4_97BEE4, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, kpa_01_UnkNpcAIMainFunc5, D_80240E10_A47D70, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80240E40_A47DA0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80240FF0_A47F50, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80240EE0_A47E40, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000 dlabel D_80241168_A480C8 .word 0x00000000, 0x00180018, 0x00000000, 0x00000000, D_80240F80_A47EE0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_03/A4A750.data.s b/ver/us/asm/data/world/area_kpa/kpa_03/A4A750.data.s index af3d3b6798..72cf2def9f 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_03/A4A750.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_03/A4A750.data.s @@ -6,7 +6,7 @@ dlabel D_80242190_A4A750 .word 0x3F800000, 0x0000001E, 0x00000032, 0x42B40000, 0x42200000, 0x00000002, 0x41300000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 dlabel D_802421C0_A4A780 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000005, 0x00000043, 0x00000002, func_802404F4_A48AB4, D_80242190_A4A750, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000005, 0x00000043, 0x00000002, kpa_03_UnkNpcAIMainFunc5, D_80242190_A4A750, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242230_A4A7F0 .word 0x00000000, 0x00280018, 0x00000000, 0x00000000, D_802421C0_A4A780, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000 @@ -15,22 +15,22 @@ dlabel D_8024225C_A4A81C .word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40900000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 dlabel D_8024228C_A4A84C -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, func_802404F4_A48AB4, D_8024225C_A4A81C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, kpa_03_UnkNpcAIMainFunc5, D_8024225C_A4A81C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802422FC_A4A8BC .word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40E00000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 dlabel D_8024232C_A4A8EC -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000003, 0x00000043, 0x00000002, func_802404F4_A48AB4, D_802422FC_A4A8BC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000003, 0x00000043, 0x00000002, kpa_03_UnkNpcAIMainFunc5, D_802422FC_A4A8BC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024239C_A4A95C .word 0x3F800000, 0x00000014, 0x00000005, 0x42F00000, 0x00000000, 0x00000003, 0x40C00000, 0x00000000, 0x00000000, 0x43160000, 0x00000000, 0x00000001 dlabel D_802423CC_A4A98C -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000006, 0x00000043, 0x00000002, func_802404F4_A48AB4, D_8024239C_A4A95C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000006, 0x00000043, 0x00000002, kpa_03_UnkNpcAIMainFunc5, D_8024239C_A4A95C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024243C_A4A9FC -.word 0x00000043, 0x00000001, kpa_03_func_80240814_97BE44, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, kpa_03_AwaitPlayerNearNpc, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, kpa_03_func_802408B4_97BEE4, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, func_802404F4_A48AB4, D_8024225C_A4A81C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_8024228C_A4A84C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_8024243C_A4A9FC, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_8024232C_A4A8EC, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000 +.word 0x00000043, 0x00000001, kpa_03_func_80240814_97BE44, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, kpa_03_AwaitPlayerNearNpc, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, kpa_03_func_802408B4_97BEE4, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, kpa_03_UnkNpcAIMainFunc5, D_8024225C_A4A81C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_8024228C_A4A84C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_8024243C_A4A9FC, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_8024232C_A4A8EC, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000 dlabel D_802425B4_A4AB74 .word 0x00000000, 0x00180018, 0x00000000, 0x00000000, D_802423CC_A4A98C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_102/A97690.data.s b/ver/us/asm/data/world/area_kpa/kpa_102/A97690.data.s index 133d7eb20e..3fb0df1a3c 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_102/A97690.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_102/A97690.data.s @@ -36,7 +36,7 @@ dlabel D_80244384_A97AC4 .word 0x3F800000, 0x0000001E, 0x00000032, 0x42B40000, 0x42200000, 0x00000002, 0x41300000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 dlabel D_802443B4_A97AF4 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000005, 0x00000043, 0x00000002, func_802418F0_A95030, D_80244384_A97AC4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000005, 0x00000043, 0x00000002, kpa_102_UnkNpcAIMainFunc5, D_80244384_A97AC4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244424_A97B64 .word 0x00000000, 0x00280018, 0x00000000, 0x00000000, D_802443B4_A97AF4, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_11/A53E30.data.s b/ver/us/asm/data/world/area_kpa/kpa_11/A53E30.data.s index dff0ec207b..99709065d5 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_11/A53E30.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_11/A53E30.data.s @@ -6,7 +6,7 @@ dlabel D_80241570_A53E30 .word 0x3F800000, 0x0000001E, 0x00000032, 0x42B40000, 0x42200000, 0x00000002, 0x41300000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 dlabel D_802415A0_A53E60 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000005, 0x00000043, 0x00000002, func_802406A4_A52F64, D_80241570_A53E30, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000005, 0x00000043, 0x00000002, kpa_11_UnkNpcAIMainFunc5, D_80241570_A53E30, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241610_A53ED0 .word 0x00000000, 0x00280018, 0x00000000, 0x00000000, D_802415A0_A53E60, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_113/A9DD00.data.s b/ver/us/asm/data/world/area_kpa/kpa_113/A9DD00.data.s index eed8049a9d..8d806e6fe9 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_113/A9DD00.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_113/A9DD00.data.s @@ -15,22 +15,22 @@ dlabel D_80241740_A9E370 .word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40900000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 dlabel D_80241770_A9E3A0 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, func_80240544_A9D174, D_80241740_A9E370, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, kpa_113_UnkNpcAIMainFunc5, D_80241740_A9E370, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802417E0_A9E410 .word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40E00000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 dlabel D_80241810_A9E440 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000003, 0x00000043, 0x00000002, func_80240544_A9D174, D_802417E0_A9E410, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000003, 0x00000043, 0x00000002, kpa_113_UnkNpcAIMainFunc5, D_802417E0_A9E410, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241880_A9E4B0 .word 0x3F800000, 0x00000014, 0x00000005, 0x42F00000, 0x00000000, 0x00000003, 0x40C00000, 0x00000000, 0x00000000, 0x43160000, 0x00000000, 0x00000001 dlabel D_802418B0_A9E4E0 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000006, 0x00000043, 0x00000002, func_80240544_A9D174, D_80241880_A9E4B0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000006, 0x00000043, 0x00000002, kpa_113_UnkNpcAIMainFunc5, D_80241880_A9E4B0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241920_A9E550 -.word 0x00000043, 0x00000001, kpa_113_func_80240814_97BE44, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, kpa_113_AwaitPlayerNearNpc, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, kpa_113_func_802408B4_97BEE4, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, func_80240544_A9D174, D_80241740_A9E370, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80241770_A9E3A0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80241920_A9E550, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80241810_A9E440, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000 +.word 0x00000043, 0x00000001, kpa_113_func_80240814_97BE44, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, kpa_113_AwaitPlayerNearNpc, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, kpa_113_func_802408B4_97BEE4, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, kpa_113_UnkNpcAIMainFunc5, D_80241740_A9E370, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80241770_A9E3A0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80241920_A9E550, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80241810_A9E440, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000 dlabel D_80241A98_A9E6C8 .word 0x00000000, 0x00180018, 0x00000000, 0x00000000, D_802418B0_A9E4E0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_50/A624D0.data.s b/ver/us/asm/data/world/area_kpa/kpa_50/A624D0.data.s index b18d06d3ad..0802d99469 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_50/A624D0.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_50/A624D0.data.s @@ -48,7 +48,7 @@ dlabel D_80242224_A62BF4 .word 0x3F800000, 0x0000001E, 0x00000032, 0x42B40000, 0x42200000, 0x00000002, 0x41300000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 dlabel D_80242254_A62C24 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000005, 0x00000043, 0x00000002, func_802415E0_A61FB0, D_80242224_A62BF4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000005, 0x00000043, 0x00000002, kpa_50_UnkNpcAIMainFunc5, D_80242224_A62BF4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802422C4_A62C94 .word 0x00000000, 0x00280018, 0x00000000, 0x00000000, D_80242254_A62C24, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_51/A660E0.data.s b/ver/us/asm/data/world/area_kpa/kpa_51/A660E0.data.s index 1933c96d57..81f8f1c7a4 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_51/A660E0.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_51/A660E0.data.s @@ -51,7 +51,7 @@ dlabel D_80242470_A66500 .word 0x3F800000, 0x0000001E, 0x00000032, 0x42B40000, 0x42200000, 0x00000002, 0x41300000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 dlabel D_802424A0_A66530 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000005, 0x00000043, 0x00000002, func_802417E0_A65870, D_80242470_A66500, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000005, 0x00000043, 0x00000002, kpa_51_UnkNpcAIMainFunc5, D_80242470_A66500, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242510_A665A0 .word 0x00000000, 0x00280018, 0x00000000, 0x00000000, D_802424A0_A66530, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_61/A70FE0.data.s b/ver/us/asm/data/world/area_kpa/kpa_61/A70FE0.data.s index 12c25c191b..52681526be 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_61/A70FE0.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_61/A70FE0.data.s @@ -6,7 +6,7 @@ dlabel D_80242C00_A70FE0 .word 0x3F800000, 0x0000001E, 0x00000032, 0x42B40000, 0x42200000, 0x00000002, 0x41300000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 dlabel D_80242C30_A71010 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000005, 0x00000043, 0x00000002, func_802406A4_A6EA84, D_80242C00_A70FE0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000005, 0x00000043, 0x00000002, kpa_61_UnkNpcAIMainFunc5, D_80242C00_A70FE0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242CA0_A71080 .word 0x00000000, 0x00280018, 0x00000000, 0x00000000, D_80242C30_A71010, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_70/A75B70.data.s b/ver/us/asm/data/world/area_kpa/kpa_70/A75B70.data.s index b90968fb5c..e55ec7ccc0 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_70/A75B70.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_70/A75B70.data.s @@ -6,7 +6,7 @@ dlabel D_80241300_A75B70 .word 0x3F800000, 0x0000001E, 0x00000032, 0x42B40000, 0x42200000, 0x00000002, 0x41300000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 dlabel D_80241330_A75BA0 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000005, 0x00000043, 0x00000002, func_802406A4_A74F14, D_80241300_A75B70, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000005, 0x00000043, 0x00000002, kpa_70_UnkNpcAIMainFunc5, D_80241300_A75B70, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802413A0_A75C10 .word 0x00000000, 0x00280018, 0x00000000, 0x00000000, D_80241330_A75BA0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000 diff --git a/ver/us/asm/data/world/area_kzn/kzn_03/C647B0.data.s b/ver/us/asm/data/world/area_kzn/kzn_03/C647B0.data.s index 7929328cc2..562492cbb6 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_03/C647B0.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_03/C647B0.data.s @@ -6,22 +6,22 @@ dlabel D_80243AA0_C647B0 .word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40900000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 dlabel D_80243AD0_C647E0 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, func_802406A4_C613B4, D_80243AA0_C647B0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, kzn_03_UnkNpcAIMainFunc5, D_80243AA0_C647B0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243B40_C64850 .word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40E00000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 dlabel D_80243B70_C64880 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000003, 0x00000043, 0x00000002, func_802406A4_C613B4, D_80243B40_C64850, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000003, 0x00000043, 0x00000002, kzn_03_UnkNpcAIMainFunc5, D_80243B40_C64850, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243BE0_C648F0 .word 0x3F800000, 0x00000014, 0x00000005, 0x42F00000, 0x00000000, 0x00000003, 0x40C00000, 0x00000000, 0x00000000, 0x43160000, 0x00000000, 0x00000001 dlabel D_80243C10_C64920 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000006, 0x00000043, 0x00000002, func_802406A4_C613B4, D_80243BE0_C648F0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000006, 0x00000043, 0x00000002, kzn_03_UnkNpcAIMainFunc5, D_80243BE0_C648F0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243C80_C64990 -.word 0x00000043, 0x00000001, kzn_03_func_80240814_97BE44, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, kzn_03_AwaitPlayerNearNpc, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, kzn_03_func_802408B4_97BEE4, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, func_802406A4_C613B4, D_80243AA0_C647B0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80243AD0_C647E0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80243C80_C64990, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000 +.word 0x00000043, 0x00000001, kzn_03_func_80240814_97BE44, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, kzn_03_AwaitPlayerNearNpc, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, kzn_03_func_802408B4_97BEE4, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, kzn_03_UnkNpcAIMainFunc5, D_80243AA0_C647B0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80243AD0_C647E0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80243C80_C64990, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000 dlabel D_80243DCC_C64ADC .word 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80243B70_C64880, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, D_80243C10_C64920, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000 diff --git a/ver/us/asm/data/world/area_kzn/kzn_09/C7B0D0.data.s b/ver/us/asm/data/world/area_kzn/kzn_09/C7B0D0.data.s index aab3481e58..939516cc77 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_09/C7B0D0.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_09/C7B0D0.data.s @@ -36,22 +36,22 @@ dlabel D_80244EA0_C7BB80 .word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40900000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 dlabel D_80244ED0_C7BBB0 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, func_80242D58_C79A38, D_80244EA0_C7BB80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, kzn_09_UnkNpcAIMainFunc5, D_80244EA0_C7BB80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244F40_C7BC20 .word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40E00000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 dlabel D_80244F70_C7BC50 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000003, 0x00000043, 0x00000002, func_80242D58_C79A38, D_80244F40_C7BC20, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000003, 0x00000043, 0x00000002, kzn_09_UnkNpcAIMainFunc5, D_80244F40_C7BC20, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244FE0_C7BCC0 .word 0x3F800000, 0x00000014, 0x00000005, 0x42F00000, 0x00000000, 0x00000003, 0x40C00000, 0x00000000, 0x00000000, 0x43160000, 0x00000000, 0x00000001 dlabel D_80245010_C7BCF0 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000006, 0x00000043, 0x00000002, func_80242D58_C79A38, D_80244FE0_C7BCC0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000006, 0x00000043, 0x00000002, kzn_09_UnkNpcAIMainFunc5, D_80244FE0_C7BCC0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80245080_C7BD60 -.word 0x00000043, 0x00000001, kzn_09_func_80240814_97BE44, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, kzn_09_AwaitPlayerNearNpc, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, kzn_09_func_802408B4_97BEE4, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, func_80242D58_C79A38, D_80244EA0_C7BB80, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80244ED0_C7BBB0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80245080_C7BD60, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000 +.word 0x00000043, 0x00000001, kzn_09_func_80240814_97BE44, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, kzn_09_AwaitPlayerNearNpc, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, kzn_09_func_802408B4_97BEE4, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, kzn_09_UnkNpcAIMainFunc5, D_80244EA0_C7BB80, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80244ED0_C7BBB0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80245080_C7BD60, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000 dlabel D_802451CC_C7BEAC .word 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80244F70_C7BC50, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, D_80245010_C7BCF0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000 diff --git a/ver/us/asm/data/world/area_kzn/kzn_17/C89450.data.s b/ver/us/asm/data/world/area_kzn/kzn_17/C89450.data.s index 03f6b30ff9..385614f114 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_17/C89450.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_17/C89450.data.s @@ -27,22 +27,22 @@ dlabel D_80243CF0_C897A0 .word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40900000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 dlabel D_80243D20_C897D0 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, func_80242048_C87AF8, D_80243CF0_C897A0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, kzn_17_UnkNpcAIMainFunc5, D_80243CF0_C897A0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243D90_C89840 .word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40E00000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 dlabel D_80243DC0_C89870 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000003, 0x00000043, 0x00000002, func_80242048_C87AF8, D_80243D90_C89840, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000003, 0x00000043, 0x00000002, kzn_17_UnkNpcAIMainFunc5, D_80243D90_C89840, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243E30_C898E0 .word 0x3F800000, 0x00000014, 0x00000005, 0x42F00000, 0x00000000, 0x00000003, 0x40C00000, 0x00000000, 0x00000000, 0x43160000, 0x00000000, 0x00000001 dlabel D_80243E60_C89910 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000006, 0x00000043, 0x00000002, func_80242048_C87AF8, D_80243E30_C898E0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000006, 0x00000043, 0x00000002, kzn_17_UnkNpcAIMainFunc5, D_80243E30_C898E0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243ED0_C89980 -.word 0x00000043, 0x00000001, kzn_17_func_80240814_97BE44, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, kzn_17_AwaitPlayerNearNpc, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, kzn_17_func_802408B4_97BEE4, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, func_80242048_C87AF8, D_80243CF0_C897A0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80243D20_C897D0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80243ED0_C89980, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000 +.word 0x00000043, 0x00000001, kzn_17_func_80240814_97BE44, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, kzn_17_AwaitPlayerNearNpc, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, kzn_17_func_802408B4_97BEE4, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, kzn_17_UnkNpcAIMainFunc5, D_80243CF0_C897A0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80243D20_C897D0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80243ED0_C89980, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000 dlabel D_8024401C_C89ACC .word 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80243DC0_C89870, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, D_80243E60_C89910, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000 diff --git a/ver/us/asm/data/world/area_nok/nok_11/9F7180.data.s b/ver/us/asm/data/world/area_nok/nok_11/9F7180.data.s index 29f83f5933..e694498bcd 100644 --- a/ver/us/asm/data/world/area_nok/nok_11/9F7180.data.s +++ b/ver/us/asm/data/world/area_nok/nok_11/9F7180.data.s @@ -12,7 +12,7 @@ dlabel D_802427BC_9F71FC .word 0x3FC00000, 0x0000002D, 0x00000014, 0x428C0000, 0x42480000, 0x0000000A, 0x40F00000, 0x00000000, 0x00000000, 0x42A00000, 0x42700000, 0x00000001 dlabel D_802427EC_9F722C -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000002, func_80240394_9F4DD4, D_802427BC_9F71FC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000002, nok_11_UnkNpcAIMainFunc5, D_802427BC_9F71FC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024285C_9F729C .word 0x00000000, 0x00230018, 0x00000000, 0x00000000, D_802427EC_9F722C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 diff --git a/ver/us/asm/data/world/area_nok/nok_12/9FE000.data.s b/ver/us/asm/data/world/area_nok/nok_12/9FE000.data.s index 79b0d96207..a3dd703fe0 100644 --- a/ver/us/asm/data/world/area_nok/nok_12/9FE000.data.s +++ b/ver/us/asm/data/world/area_nok/nok_12/9FE000.data.s @@ -24,7 +24,7 @@ dlabel D_80244200_9FE9F0 .word 0x3FC00000, 0x0000002D, 0x00000014, 0x428C0000, 0x42480000, 0x0000000A, 0x40F00000, 0x00000000, 0x00000000, 0x42A00000, 0x42700000, 0x00000001 dlabel D_80244230_9FEA20 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000002, func_80240904_9FB0F4, D_80244200_9FE9F0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000002, nok_12_UnkNpcAIMainFunc5, D_80244200_9FE9F0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802442A0_9FEA90 .word 0x00000000, 0x00230018, 0x00000000, 0x00000000, D_80244230_9FEA20, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 diff --git a/ver/us/asm/data/world/area_nok/nok_14/A06110.data.s b/ver/us/asm/data/world/area_nok/nok_14/A06110.data.s index 712074359e..4f19b46444 100644 --- a/ver/us/asm/data/world/area_nok/nok_14/A06110.data.s +++ b/ver/us/asm/data/world/area_nok/nok_14/A06110.data.s @@ -6,7 +6,7 @@ dlabel D_802438D0_A06110 .word 0x3FC00000, 0x0000002D, 0x00000014, 0x428C0000, 0x42480000, 0x0000000A, 0x40F00000, 0x00000000, 0x00000000, 0x42A00000, 0x42700000, 0x00000001 dlabel D_80243900_A06140 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000002, func_80240554_A02D94, D_802438D0_A06110, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000002, nok_14_UnkNpcAIMainFunc5, D_802438D0_A06110, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243970_A061B0 .word 0x00000000, 0x00230018, 0x00000000, 0x00000000, D_80243900_A06140, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 diff --git a/ver/us/asm/data/world/area_nok/nok_15/A0AB90.data.s b/ver/us/asm/data/world/area_nok/nok_15/A0AB90.data.s index 9db5a695e0..17ea7403b9 100644 --- a/ver/us/asm/data/world/area_nok/nok_15/A0AB90.data.s +++ b/ver/us/asm/data/world/area_nok/nok_15/A0AB90.data.s @@ -6,7 +6,7 @@ dlabel D_80243C90_A0AB90 .word 0x3FC00000, 0x0000002D, 0x00000014, 0x428C0000, 0x42480000, 0x0000000A, 0x40F00000, 0x00000000, 0x00000000, 0x42A00000, 0x42700000, 0x00000001 dlabel D_80243CC0_A0ABC0 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000002, func_80240674_A07574, D_80243C90_A0AB90, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000002, nok_15_UnkNpcAIMainFunc5, D_80243C90_A0AB90, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243D30_A0AC30 .word 0x00000000, 0x00230018, 0x00000000, 0x00000000, D_80243CC0_A0ABC0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 diff --git a/ver/us/asm/data/world/area_omo/omo_02/DA1CD0.data.s b/ver/us/asm/data/world/area_omo/omo_02/DA1CD0.data.s index ba6df2e422..19126e368d 100644 --- a/ver/us/asm/data/world/area_omo/omo_02/DA1CD0.data.s +++ b/ver/us/asm/data/world/area_omo/omo_02/DA1CD0.data.s @@ -12,7 +12,7 @@ dlabel D_8024487C_DA1D4C .word 0x42C80000, 0x41F00000, 0x00000004, 0x40800000, 0x00000006, 0x00000001, 0x43200000, 0x42480000, 0x00000001 dlabel D_802448A0_DA1D70 -.word 0x00000043, 0x00000002, func_802416D0_D9EBA0, D_8024487C_DA1D4C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00170016, 0x00000000, 0x00000000, D_802448A0_DA1D70, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0001 +.word 0x00000043, 0x00000002, omo_02_UnkNpcAIMainFunc4, D_8024487C_DA1D4C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00170016, 0x00000000, 0x00000000, D_802448A0_DA1D70, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0001 dlabel D_802448EC_DA1DBC .word 0x00000000, 0x00170016, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0001 diff --git a/ver/us/asm/data/world/area_tik/tik_09/885A80.data.s b/ver/us/asm/data/world/area_tik/tik_09/885A80.data.s index 731ef08523..87b2123694 100644 --- a/ver/us/asm/data/world/area_tik/tik_09/885A80.data.s +++ b/ver/us/asm/data/world/area_tik/tik_09/885A80.data.s @@ -6,7 +6,7 @@ dlabel D_802438C0_885A80 .word 0x40000000, 0x0000003C, 0x00000005, 0x42A00000, 0x42700000, 0x00000003, 0x41100000, 0x00000000, 0x00000000, 0x42B40000, 0x428C0000, 0x00000001 dlabel D_802438F0_885AB0 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000D, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000001, 0x00000043, 0x00000002, func_80240DC4_882F84, D_802438C0_885A80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000D, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000001, 0x00000043, 0x00000002, tik_09_UnkNpcAIMainFunc5, D_802438C0_885A80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243960_885B20 .word 0x00000000, 0x00230018, 0x00000000, 0x00000000, D_802438F0_885AB0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00120000 diff --git a/ver/us/asm/data/world/area_tik/tik_12/88C810.data.s b/ver/us/asm/data/world/area_tik/tik_12/88C810.data.s index 43d227590d..57ff9c0015 100644 --- a/ver/us/asm/data/world/area_tik/tik_12/88C810.data.s +++ b/ver/us/asm/data/world/area_tik/tik_12/88C810.data.s @@ -33,22 +33,22 @@ dlabel D_80244430_88D000 .word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40900000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 dlabel D_80244460_88D030 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, func_80241CF4_88A8C4, D_80244430_88D000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, tik_12_UnkNpcAIMainFunc5, D_80244430_88D000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802444D0_88D0A0 .word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40E00000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 dlabel D_80244500_88D0D0 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000003, 0x00000043, 0x00000002, func_80241CF4_88A8C4, D_802444D0_88D0A0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000003, 0x00000043, 0x00000002, tik_12_UnkNpcAIMainFunc5, D_802444D0_88D0A0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244570_88D140 .word 0x3F800000, 0x00000014, 0x00000005, 0x42F00000, 0x00000000, 0x00000003, 0x40C00000, 0x00000000, 0x00000000, 0x43160000, 0x00000000, 0x00000001 dlabel D_802445A0_88D170 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000006, 0x00000043, 0x00000002, func_80241CF4_88A8C4, D_80244570_88D140, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000006, 0x00000043, 0x00000002, tik_12_UnkNpcAIMainFunc5, D_80244570_88D140, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244610_88D1E0 -.word 0x00000043, 0x00000001, tik_12_func_80240814_97BE44, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, tik_12_AwaitPlayerNearNpc, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, tik_12_func_802408B4_97BEE4, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, func_80241CF4_88A8C4, D_80244430_88D000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, tik_12_func_80240814_97BE44, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, tik_12_AwaitPlayerNearNpc, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, tik_12_func_802408B4_97BEE4, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, tik_12_UnkNpcAIMainFunc5, D_80244430_88D000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244704_88D2D4 .word 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80244460_88D030, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80244610_88D1E0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80244500_88D0D0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, D_802445A0_88D170, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000 diff --git a/ver/us/asm/data/world/area_tik/tik_20/89D200.data.s b/ver/us/asm/data/world/area_tik/tik_20/89D200.data.s index 11b9e3e007..41ab2e5886 100644 --- a/ver/us/asm/data/world/area_tik/tik_20/89D200.data.s +++ b/ver/us/asm/data/world/area_tik/tik_20/89D200.data.s @@ -6,7 +6,7 @@ dlabel D_80242EB0_89D200 .word 0x40000000, 0x0000003C, 0x00000005, 0x42A00000, 0x42700000, 0x00000003, 0x41100000, 0x00000000, 0x00000000, 0x42B40000, 0x428C0000, 0x00000001 dlabel D_80242EE0_89D230 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000D, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000001, 0x00000043, 0x00000002, func_80240CF4_89B044, D_80242EB0_89D200, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000D, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000001, 0x00000043, 0x00000002, tik_20_UnkNpcAIMainFunc5, D_80242EB0_89D200, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242F50_89D2A0 .word 0x00000000, 0x00230018, 0x00000000, 0x00000000, D_80242EE0_89D230, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00120000 diff --git a/ver/us/asm/data/world/area_tik/tik_23/8A5340.data.s b/ver/us/asm/data/world/area_tik/tik_23/8A5340.data.s index cbdad858a8..a4f55c7525 100644 --- a/ver/us/asm/data/world/area_tik/tik_23/8A5340.data.s +++ b/ver/us/asm/data/world/area_tik/tik_23/8A5340.data.s @@ -6,7 +6,7 @@ dlabel D_80242F70_8A5340 .word 0x3FC00000, 0x0000001E, 0x00000032, 0x42700000, 0x41F00000, 0x00000003, 0x40C00000, 0x00000000, 0x00000000, 0x42C80000, 0x41F00000, 0x00000003 dlabel D_80242FA0_8A5370 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000012, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000004, 0x00000043, 0x00000002, func_80240CF4_8A30C4, D_80242F70_8A5340, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000012, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000004, 0x00000043, 0x00000002, tik_23_UnkNpcAIMainFunc5, D_80242F70_8A5340, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243010_8A53E0 .word 0x00000000, 0x00150016, 0x00000000, 0x00000000, D_80242FA0_8A5370, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00130000 diff --git a/ver/us/asm/data/world/area_tik/tik_24/8A7A20.data.s b/ver/us/asm/data/world/area_tik/tik_24/8A7A20.data.s index 0fceb354ce..c13001ea9c 100644 --- a/ver/us/asm/data/world/area_tik/tik_24/8A7A20.data.s +++ b/ver/us/asm/data/world/area_tik/tik_24/8A7A20.data.s @@ -6,7 +6,7 @@ dlabel D_80241FA0_8A7A20 .word 0x40000000, 0x0000003C, 0x00000005, 0x42A00000, 0x42700000, 0x00000003, 0x41100000, 0x00000000, 0x00000000, 0x42B40000, 0x428C0000, 0x00000001 dlabel D_80241FD0_8A7A50 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000D, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000001, 0x00000043, 0x00000002, func_80240A64_8A64E4, D_80241FA0_8A7A20, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000D, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000001, 0x00000043, 0x00000002, tik_24_UnkNpcAIMainFunc5, D_80241FA0_8A7A20, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242040_8A7AC0 .word 0x00000000, 0x00230018, 0x00000000, 0x00000000, D_80241FD0_8A7A50, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00120000 diff --git a/ver/us/asm/data/world/area_trd/trd_01/99FD80.data.s b/ver/us/asm/data/world/area_trd/trd_01/99FD80.data.s index 9667557810..6d884e349d 100644 --- a/ver/us/asm/data/world/area_trd/trd_01/99FD80.data.s +++ b/ver/us/asm/data/world/area_trd/trd_01/99FD80.data.s @@ -6,7 +6,7 @@ dlabel D_802433F0_99FD80 .word 0x3FC00000, 0x0000002D, 0x00000014, 0x428C0000, 0x42480000, 0x0000000A, 0x40F00000, 0x00000000, 0x00000000, 0x42A00000, 0x42700000, 0x00000001 dlabel D_80243420_99FDB0 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000002, func_80240784_99D114, D_802433F0_99FD80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000002, trd_01_UnkNpcAIMainFunc5, D_802433F0_99FD80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243490_99FE20 .word 0x00000000, 0x00230018, 0x00000000, 0x00000000, D_80243420_99FDB0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 @@ -15,7 +15,7 @@ dlabel D_802434BC_99FE4C .word 0x42DC0000, 0x42820000, 0x00000008, 0x4059999A, 0x00000078, 0x00000002, 0x42DC0000, 0x42820000, 0x00000001 dlabel D_802434E0_99FE70 -.word 0x00000043, 0x00000002, func_802413B8_99DD48, D_802434BC_99FE4C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, trd_01_UnkNpcAIMainFunc4, D_802434BC_99FE4C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243500_99FE90 .word 0x00000000, 0x00170014, 0x00000000, 0x00000000, D_802434E0_99FE70, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 diff --git a/ver/us/asm/data/world/area_trd/trd_02/9A3AB0.data.s b/ver/us/asm/data/world/area_trd/trd_02/9A3AB0.data.s index e42462693a..94984afb28 100644 --- a/ver/us/asm/data/world/area_trd/trd_02/9A3AB0.data.s +++ b/ver/us/asm/data/world/area_trd/trd_02/9A3AB0.data.s @@ -15,7 +15,7 @@ dlabel D_80242B4C_9A3B2C .word 0x3FC00000, 0x0000002D, 0x00000014, 0x428C0000, 0x42480000, 0x0000000A, 0x40F00000, 0x00000000, 0x00000000, 0x42A00000, 0x42700000, 0x00000001 dlabel D_80242B7C_9A3B5C -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000002, func_80240474_9A1454, D_80242B4C_9A3B2C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00230018, 0x00000000, 0x00000000, D_80242B7C_9A3B5C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000002, trd_02_UnkNpcAIMainFunc5, D_80242B4C_9A3B2C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00230018, 0x00000000, 0x00000000, D_80242B7C_9A3B5C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 dlabel D_80242C18_9A3BF8 .word 0x3FC00000, 0x00000019, 0x00000014, 0x428C0000, 0x42480000, 0x0000000A, 0x40E00000, 0x00000000, 0x00000000, 0x42A00000, 0x42700000, 0x00000001 diff --git a/ver/us/asm/data/world/area_trd/trd_03/9A60F0.data.s b/ver/us/asm/data/world/area_trd/trd_03/9A60F0.data.s index c8f1d6d9d1..cc896bae29 100644 --- a/ver/us/asm/data/world/area_trd/trd_03/9A60F0.data.s +++ b/ver/us/asm/data/world/area_trd/trd_03/9A60F0.data.s @@ -6,7 +6,7 @@ dlabel D_80241AA0_9A60F0 .word 0x3FC00000, 0x0000002D, 0x00000014, 0x428C0000, 0x42480000, 0x0000000A, 0x40F00000, 0x00000000, 0x00000000, 0x42A00000, 0x42700000, 0x00000001 dlabel D_80241AD0_9A6120 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000002, func_80240434_9A4A84, D_80241AA0_9A60F0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000002, trd_03_UnkNpcAIMainFunc5, D_80241AA0_9A60F0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241B40_9A6190 .word 0x00000000, 0x00230018, 0x00000000, 0x00000000, D_80241AD0_9A6120, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 diff --git a/ver/us/asm/data/world/area_trd/trd_04/9AD960.data.s b/ver/us/asm/data/world/area_trd/trd_04/9AD960.data.s index 667a0957be..393e8c9a23 100644 --- a/ver/us/asm/data/world/area_trd/trd_04/9AD960.data.s +++ b/ver/us/asm/data/world/area_trd/trd_04/9AD960.data.s @@ -6,7 +6,7 @@ dlabel D_80245570_9AD960 .word 0x3FC00000, 0x0000002D, 0x00000014, 0x428C0000, 0x42480000, 0x0000000A, 0x40F00000, 0x00000000, 0x00000000, 0x42A00000, 0x42700000, 0x00000001 dlabel D_802455A0_9AD990 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000002, func_80240844_9A8C34, D_80245570_9AD960, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000002, trd_04_UnkNpcAIMainFunc5, D_80245570_9AD960, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80245610_9ADA00 .word 0x00000000, 0x00230018, 0x00000000, 0x00000000, D_802455A0_9AD990, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 diff --git a/ver/us/asm/data/world/area_trd/trd_07/9B9760.data.s b/ver/us/asm/data/world/area_trd/trd_07/9B9760.data.s index 4d17dbe90d..4a2a4871fe 100644 --- a/ver/us/asm/data/world/area_trd/trd_07/9B9760.data.s +++ b/ver/us/asm/data/world/area_trd/trd_07/9B9760.data.s @@ -6,7 +6,7 @@ dlabel D_80242DE0_9B9760 .word 0x3FC00000, 0x0000002D, 0x00000014, 0x428C0000, 0x42480000, 0x0000000A, 0x40F00000, 0x00000000, 0x00000000, 0x42A00000, 0x42700000, 0x00000001 dlabel D_80242E10_9B9790 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000002, func_802406A4_9B7024, D_80242DE0_9B9760, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000002, trd_07_UnkNpcAIMainFunc5, D_80242DE0_9B9760, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242E80_9B9800 .word 0x00000000, 0x00230018, 0x00000000, 0x00000000, D_80242E10_9B9790, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 diff --git a/ver/us/asm/data/world/area_tst/tst_13/B1DB20.data.s b/ver/us/asm/data/world/area_tst/tst_13/B1DB20.data.s index 4d7f6bc8e9..28d76758f2 100644 --- a/ver/us/asm/data/world/area_tst/tst_13/B1DB20.data.s +++ b/ver/us/asm/data/world/area_tst/tst_13/B1DB20.data.s @@ -9,7 +9,7 @@ dlabel D_80240510_B1DC70 .word 0x0000003C, 0x00000001, 0xFE363C80, 0x00000043, 0x00000001, func_80240000_B1D760, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xF4ACD480, 0x7FFFFE00, 0x00000043, 0x00000003, EnableModel, 0xF4ACD481, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xF4ACD480, 0x7FFFFE00, 0x00000043, 0x00000003, EnableModel, 0xF4ACD481, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x0000000B, 0x00000002, 0xF4ACD485, 0x00000000, 0x00000046, 0x00000001, 0xF4ACD485, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240600_B1DD60 -.word 0x00000030, 0x00000001, 0xFE363C80, 0x0000003E, 0x00000002, 0x00000006, 0xFE363C89, 0x00000031, 0x00000001, 0xFE363C81, 0x00000024, 0x00000002, 0xF4ACD480, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C81, 0x00000024, 0x00000002, 0xF4ACD481, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C81, 0x00000024, 0x00000002, 0xF4ACD482, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C81, 0x00000024, 0x00000002, 0xF4ACD483, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C81, 0x00000024, 0x00000002, 0xF4ACD484, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C81, 0x00000024, 0x00000002, 0xF4ACD485, 0xFE363C81, 0x00000043, 0x00000003, ParentColliderToModel, 0xF4ACD481, 0xF4ACD480, 0x00000003, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x0000000D, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0x0000000F, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C82, 0xF4ACD483, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802400A0_B1D800, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000046, 0x00000001, D_80240894_B1DFF4, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000046, 0x00000001, D_80240A58_B1E1B8, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000000D, 0x00000004, 0x00000001, 0x00000003, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000000F, 0x00000004, 0x00000001, 0x00000003, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000030, 0x00000001, 0xFE363C80, 0x0000003E, 0x00000002, 0x00000006, 0xFE363C89, 0x00000031, 0x00000001, 0xFE363C81, 0x00000024, 0x00000002, 0xF4ACD480, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C81, 0x00000024, 0x00000002, 0xF4ACD481, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C81, 0x00000024, 0x00000002, 0xF4ACD482, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C81, 0x00000024, 0x00000002, 0xF4ACD483, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C81, 0x00000024, 0x00000002, 0xF4ACD484, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C81, 0x00000024, 0x00000002, 0xF4ACD485, 0xFE363C81, 0x00000043, 0x00000003, ParentColliderToModel, 0xF4ACD481, 0xF4ACD480, 0x00000003, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x0000000D, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0x0000000F, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C82, 0xF4ACD483, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tst_13_UnkDistFunc2, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000046, 0x00000001, D_80240894_B1DFF4, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000046, 0x00000001, D_80240A58_B1E1B8, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000000D, 0x00000004, 0x00000001, 0x00000003, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000000F, 0x00000004, 0x00000001, 0x00000003, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240894_B1DFF4 .word 0x0000003C, 0x00000001, 0xFE363C89, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000005, 0x00000003, 0x00000001, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD480, 0x00000000, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C85, 0xFE363C80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C82, 0xFE363C85, 0xFE363C84, 0x00000043, 0x00000002, UpdateColliderTransform, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000005, 0x00000000, 0x00000003, 0x00000001, 0x00000003, 0x00000001, 0x00000003, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD480, 0x00000000, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C85, 0xFE363C80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C82, 0xFE363C85, 0xFE363C84, 0x00000043, 0x00000002, UpdateColliderTransform, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000003, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80241B34_DF8534.s b/ver/us/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80241B34_DF8534.s index 1864a1b9a0..1e82dc4093 100644 --- a/ver/us/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80241B34_DF8534.s +++ b/ver/us/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80241B34_DF8534.s @@ -3,10 +3,13 @@ .section .rodata -dlabel jtbl_8024E900_E05300 +dlabel jtbl_8024E8C0 +.word .L80241C14_DF8614, .L80241C44_DF8644, .L80241C44_DF8644, .L80241C08_DF8608, .L80241C08_DF8608, .L80241C08_DF8608, .L80241C44_DF8644, .L80241C44_DF8644, .L80241C44_DF8644, .L80241C44_DF8644, .L80241C44_DF8644, .L80241C44_DF8644, .L80241C44_DF8644, .L80241C14_DF8614, .L80241C44_DF8644, .L80241C1C_DF861C + +dlabel jtbl_8024E900 .word .L80241DE4_DF87E4, .L80241E18_DF8818, .L80241E18_DF8818, .L80241DD8_DF87D8, .L80241DD8_DF87D8, .L80241DD8_DF87D8, .L80241E18_DF8818, .L80241E18_DF8818, .L80241E18_DF8818, .L80241E18_DF8818, .L80241E18_DF8818, .L80241E18_DF8818, .L80241E18_DF8818, .L80241DE4_DF87E4, .L80241E18_DF8818, .L80241DF0_DF87F0 -dlabel jtbl_8024E940_E05340 +dlabel jtbl_8024E940 .word .L80241F28_DF8928, .L80241ED8_DF88D8, .L80241EEC_DF88EC, .L80241F00_DF8900, .L80241F14_DF8914, .L80241F28_DF8928 .section .text @@ -58,20 +61,23 @@ glabel func_80241B34_DF8534 /* DF85D8 80241BD8 90550000 */ lbu $s5, ($v0) /* DF85DC 80241BDC 2684FF10 */ addiu $a0, $s4, -0xf0 /* DF85E0 80241BE0 2C830010 */ sltiu $v1, $a0, 0x10 -/* DF85E4 80241BE4 10600017 */ beqz $v1, .L80241C44 +/* DF85E4 80241BE4 10600017 */ beqz $v1, .L80241C44_DF8644 /* DF85E8 80241BE8 0000B02D */ daddu $s6, $zero, $zero /* DF85EC 80241BEC 00041080 */ sll $v0, $a0, 2 -/* DF85F0 80241BF0 3C098025 */ lui $t1, %hi(D_8024E8C0_E052C0) -/* DF85F4 80241BF4 2529E8C0 */ addiu $t1, $t1, %lo(D_8024E8C0_E052C0) +/* DF85F0 80241BF0 3C098025 */ lui $t1, %hi(jtbl_8024E8C0) +/* DF85F4 80241BF4 2529E8C0 */ addiu $t1, $t1, %lo(jtbl_8024E8C0) /* DF85F8 80241BF8 00491021 */ addu $v0, $v0, $t1 /* DF85FC 80241BFC 8C420000 */ lw $v0, ($v0) /* DF8600 80241C00 00400008 */ jr $v0 /* DF8604 80241C04 00000000 */ nop +.L80241C08_DF8608: /* DF8608 80241C08 2682FF0D */ addiu $v0, $s4, -0xf3 /* DF860C 80241C0C 08090743 */ j .L80241D0C /* DF8610 80241C10 AE020008 */ sw $v0, 8($s0) +.L80241C14_DF8614: /* DF8614 80241C14 08090743 */ j .L80241D0C /* DF8618 80241C18 24160001 */ addiu $s6, $zero, 1 +.L80241C1C_DF861C: /* DF861C 80241C1C 8E630000 */ lw $v1, ($s3) /* DF8620 80241C20 00711021 */ addu $v0, $v1, $s1 /* DF8624 80241C24 90420000 */ lbu $v0, ($v0) @@ -82,7 +88,7 @@ glabel func_80241B34_DF8534 /* DF8638 80241C38 26310001 */ addiu $s1, $s1, 1 /* DF863C 80241C3C 08090743 */ j .L80241D0C /* DF8640 80241C40 AE020004 */ sw $v0, 4($s0) -.L80241C44: +.L80241C44_DF8644: /* DF8644 80241C44 24020001 */ addiu $v0, $zero, 1 /* DF8648 80241C48 329200FF */ andi $s2, $s4, 0xff /* DF864C 80241C4C AFA00010 */ sw $zero, 0x10($sp) @@ -189,9 +195,9 @@ glabel func_80241B34_DF8534 /* DF87B8 80241DB8 2C830010 */ sltiu $v1, $a0, 0x10 /* DF87BC 80241DBC 10600016 */ beqz $v1, .L80241E18_DF8818 /* DF87C0 80241DC0 00041080 */ sll $v0, $a0, 2 -/* DF87C4 80241DC4 3C018025 */ lui $at, %hi(jtbl_8024E900_E05300) +/* DF87C4 80241DC4 3C018025 */ lui $at, %hi(jtbl_8024E900) /* DF87C8 80241DC8 00220821 */ addu $at, $at, $v0 -/* DF87CC 80241DCC 8C22E900 */ lw $v0, %lo(jtbl_8024E900_E05300)($at) +/* DF87CC 80241DCC 8C22E900 */ lw $v0, %lo(jtbl_8024E900)($at) /* DF87D0 80241DD0 00400008 */ jr $v0 /* DF87D4 80241DD4 00000000 */ nop .L80241DD8_DF87D8: @@ -261,9 +267,9 @@ glabel func_80241B34_DF8534 /* DF88B8 80241EB8 2C620006 */ sltiu $v0, $v1, 6 /* DF88BC 80241EBC 1040005B */ beqz $v0, .L8024202C /* DF88C0 80241EC0 00031080 */ sll $v0, $v1, 2 -/* DF88C4 80241EC4 3C018025 */ lui $at, %hi(jtbl_8024E940_E05340) +/* DF88C4 80241EC4 3C018025 */ lui $at, %hi(jtbl_8024E940) /* DF88C8 80241EC8 00220821 */ addu $at, $at, $v0 -/* DF88CC 80241ECC 8C22E940 */ lw $v0, %lo(jtbl_8024E940_E05340)($at) +/* DF88CC 80241ECC 8C22E940 */ lw $v0, %lo(jtbl_8024E940)($at) /* DF88D0 80241ED0 00400008 */ jr $v0 /* DF88D4 80241ED4 00000000 */ nop .L80241ED8_DF88D8: diff --git a/ver/us/asm/nonmatchings/world/area_gv/gv_01/E1E460/func_80240688_E1EAE8.s b/ver/us/asm/nonmatchings/world/area_gv/gv_01/E1E460/func_80240688_E1EAE8.s deleted file mode 100644 index 1fc2786445..0000000000 --- a/ver/us/asm/nonmatchings/world/area_gv/gv_01/E1E460/func_80240688_E1EAE8.s +++ /dev/null @@ -1,82 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240688_E1EAE8 -/* E1EAE8 80240688 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E1EAEC 8024068C 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* E1EAF0 80240690 2463419C */ addiu $v1, $v1, %lo(gGameStatusPtr) -/* E1EAF4 80240694 AFBF0010 */ sw $ra, 0x10($sp) -/* E1EAF8 80240698 8C620000 */ lw $v0, ($v1) -/* E1EAFC 8024069C A0400070 */ sb $zero, 0x70($v0) -/* E1EB00 802406A0 8C620000 */ lw $v0, ($v1) -/* E1EB04 802406A4 A0400076 */ sb $zero, 0x76($v0) -/* E1EB08 802406A8 8C620000 */ lw $v0, ($v1) -/* E1EB0C 802406AC A0400078 */ sb $zero, 0x78($v0) -/* E1EB10 802406B0 8C620000 */ lw $v0, ($v1) -/* E1EB14 802406B4 3C04800A */ lui $a0, %hi(gOverrideFlags) -/* E1EB18 802406B8 2484A650 */ addiu $a0, $a0, %lo(gOverrideFlags) -/* E1EB1C 802406BC A040007D */ sb $zero, 0x7d($v0) -/* E1EB20 802406C0 8C820000 */ lw $v0, ($a0) -/* E1EB24 802406C4 2403FFF7 */ addiu $v1, $zero, -9 -/* E1EB28 802406C8 00431024 */ and $v0, $v0, $v1 -/* E1EB2C 802406CC 0C00AB00 */ jal general_heap_create -/* E1EB30 802406D0 AC820000 */ sw $v0, ($a0) -/* E1EB34 802406D4 0C047624 */ jal clear_render_tasks -/* E1EB38 802406D8 00000000 */ nop -/* E1EB3C 802406DC 0C048C2E */ jal clear_generic_entity_list -/* E1EB40 802406E0 00000000 */ nop -/* E1EB44 802406E4 0C0B0C77 */ jal clear_script_list -/* E1EB48 802406E8 00000000 */ nop -/* E1EB4C 802406EC 0C00B7BD */ jal create_cameras_a -/* E1EB50 802406F0 00000000 */ nop -/* E1EB54 802406F4 0C0B763E */ jal spr_init_sprites -/* E1EB58 802406F8 0000202D */ daddu $a0, $zero, $zero -/* E1EB5C 802406FC 0C0482EC */ jal clear_entity_models -/* E1EB60 80240700 00000000 */ nop -/* E1EB64 80240704 0C047889 */ jal clear_animator_list -/* E1EB68 80240708 00000000 */ nop -/* E1EB6C 8024070C 0C045751 */ jal clear_model_data -/* E1EB70 80240710 00000000 */ nop -/* E1EB74 80240714 0C052010 */ jal clear_sprite_shading_data -/* E1EB78 80240718 00000000 */ nop -/* E1EB7C 8024071C 0C05177E */ jal reset_background_settings -/* E1EB80 80240720 00000000 */ nop -/* E1EB84 80240724 0C050440 */ jal clear_hud_element_cache -/* E1EB88 80240728 00000000 */ nop -/* E1EB8C 8024072C 0C0515A0 */ jal clear_trigger_data -/* E1EB90 80240730 00000000 */ nop -/* E1EB94 80240734 0C048D9D */ jal clear_printers -/* E1EB98 80240738 00000000 */ nop -/* E1EB9C 8024073C 0C04432E */ jal clear_entity_data -/* E1EBA0 80240740 0000202D */ daddu $a0, $zero, $zero -/* E1EBA4 80240744 0C04E042 */ jal clear_screen_overlays -/* E1EBA8 80240748 00000000 */ nop -/* E1EBAC 8024074C 0C037F14 */ jal clear_player_status -/* E1EBB0 80240750 00000000 */ nop -/* E1EBB4 80240754 0C00E12F */ jal clear_npcs -/* E1EBB8 80240758 00000000 */ nop -/* E1EBBC 8024075C 0C039CE8 */ jal clear_player_data -/* E1EBC0 80240760 00000000 */ nop -/* E1EBC4 80240764 0C01CACC */ jal reset_battle_status -/* E1EBC8 80240768 00000000 */ nop -/* E1EBCC 8024076C 0C00F8CE */ jal init_encounter_status -/* E1EBD0 80240770 00000000 */ nop -/* E1EBD4 80240774 0C016727 */ jal clear_effect_data -/* E1EBD8 80240778 00000000 */ nop -/* E1EBDC 8024077C 0C04C3FC */ jal clear_item_entity_data -/* E1EBE0 80240780 00000000 */ nop -/* E1EBE4 80240784 0C0514C8 */ jal clear_saved_variables -/* E1EBE8 80240788 00000000 */ nop -/* E1EBEC 8024078C 0C016BE5 */ jal initialize_collision -/* E1EBF0 80240790 00000000 */ nop -/* E1EBF4 80240794 0C00CDF4 */ jal intro_logos_set_fade_alpha -/* E1EBF8 80240798 240400FF */ addiu $a0, $zero, 0xff -/* E1EBFC 8024079C 0C00CDF8 */ jal intro_logos_set_fade_color -/* E1EC00 802407A0 240400D0 */ addiu $a0, $zero, 0xd0 -/* E1EC04 802407A4 0C00CD3C */ jal set_game_mode -/* E1EC08 802407A8 24040002 */ addiu $a0, $zero, 2 -/* E1EC0C 802407AC 8FBF0010 */ lw $ra, 0x10($sp) -/* E1EC10 802407B0 240200FF */ addiu $v0, $zero, 0xff -/* E1EC14 802407B4 03E00008 */ jr $ra -/* E1EC18 802407B8 27BD0018 */ addiu $sp, $sp, 0x18 -/* E1EC1C 802407BC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_00/A0BCF0/func_80240000_A0BCF0.s b/ver/us/asm/nonmatchings/world/area_hos/hos_00/A0BCF0/func_80240000_A0BCF0.s deleted file mode 100644 index c2d6060424..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_00/A0BCF0/func_80240000_A0BCF0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80244B30_A10820 -.ascii "hos_bg\0\0\0\0\0\0\0\0\0\0" - -.section .text - -glabel func_80240000_A0BCF0 -/* A0BCF0 80240000 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* A0BCF4 80240004 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* A0BCF8 80240008 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A0BCFC 8024000C AFBF0010 */ sw $ra, 0x10($sp) -/* A0BD00 80240010 8443008E */ lh $v1, 0x8e($v0) -/* A0BD04 80240014 24020003 */ addiu $v0, $zero, 3 -/* A0BD08 80240018 14620006 */ bne $v1, $v0, .L80240034 -/* A0BD0C 8024001C 00000000 */ nop -/* A0BD10 80240020 3C04800E */ lui $a0, %hi(D_800D9668) -/* A0BD14 80240024 24849668 */ addiu $a0, $a0, %lo(D_800D9668) -/* A0BD18 80240028 3C058024 */ lui $a1, %hi(D_80244B30_A10820) -/* A0BD1C 8024002C 0C01953C */ jal sprintf -/* A0BD20 80240030 24A54B30 */ addiu $a1, $a1, %lo(D_80244B30_A10820) -.L80240034: -/* A0BD24 80240034 8FBF0010 */ lw $ra, 0x10($sp) -/* A0BD28 80240038 0000102D */ daddu $v0, $zero, $zero -/* A0BD2C 8024003C 03E00008 */ jr $ra -/* A0BD30 80240040 27BD0018 */ addiu $sp, $sp, 0x18 -/* A0BD34 80240044 00000000 */ nop -/* A0BD38 80240048 00000000 */ nop -/* A0BD3C 8024004C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_00/A0BD40/func_80240050_A0BD40.s b/ver/us/asm/nonmatchings/world/area_hos/hos_00/A0BD40/func_80240050_A0BD40.s deleted file mode 100644 index 053c6b6482..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_00/A0BD40/func_80240050_A0BD40.s +++ /dev/null @@ -1,76 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240050_A0BD40 -/* A0BD40 80240050 27BDFF98 */ addiu $sp, $sp, -0x68 -/* A0BD44 80240054 AFB1002C */ sw $s1, 0x2c($sp) -/* A0BD48 80240058 0080882D */ daddu $s1, $a0, $zero -/* A0BD4C 8024005C AFBF0030 */ sw $ra, 0x30($sp) -/* A0BD50 80240060 AFB00028 */ sw $s0, 0x28($sp) -/* A0BD54 80240064 F7BE0060 */ sdc1 $f30, 0x60($sp) -/* A0BD58 80240068 F7BC0058 */ sdc1 $f28, 0x58($sp) -/* A0BD5C 8024006C F7BA0050 */ sdc1 $f26, 0x50($sp) -/* A0BD60 80240070 F7B80048 */ sdc1 $f24, 0x48($sp) -/* A0BD64 80240074 F7B60040 */ sdc1 $f22, 0x40($sp) -/* A0BD68 80240078 F7B40038 */ sdc1 $f20, 0x38($sp) -/* A0BD6C 8024007C 8E30000C */ lw $s0, 0xc($s1) -/* A0BD70 80240080 8E050000 */ lw $a1, ($s0) -/* A0BD74 80240084 0C0B210B */ jal evt_get_float_variable -/* A0BD78 80240088 26100004 */ addiu $s0, $s0, 4 -/* A0BD7C 8024008C 8E050000 */ lw $a1, ($s0) -/* A0BD80 80240090 26100004 */ addiu $s0, $s0, 4 -/* A0BD84 80240094 0220202D */ daddu $a0, $s1, $zero -/* A0BD88 80240098 0C0B210B */ jal evt_get_float_variable -/* A0BD8C 8024009C E7A00020 */ swc1 $f0, 0x20($sp) -/* A0BD90 802400A0 8E050000 */ lw $a1, ($s0) -/* A0BD94 802400A4 26100004 */ addiu $s0, $s0, 4 -/* A0BD98 802400A8 0220202D */ daddu $a0, $s1, $zero -/* A0BD9C 802400AC 0C0B210B */ jal evt_get_float_variable -/* A0BDA0 802400B0 46000786 */ mov.s $f30, $f0 -/* A0BDA4 802400B4 8E050000 */ lw $a1, ($s0) -/* A0BDA8 802400B8 26100004 */ addiu $s0, $s0, 4 -/* A0BDAC 802400BC 0220202D */ daddu $a0, $s1, $zero -/* A0BDB0 802400C0 0C0B210B */ jal evt_get_float_variable -/* A0BDB4 802400C4 46000706 */ mov.s $f28, $f0 -/* A0BDB8 802400C8 8E050000 */ lw $a1, ($s0) -/* A0BDBC 802400CC 26100004 */ addiu $s0, $s0, 4 -/* A0BDC0 802400D0 0220202D */ daddu $a0, $s1, $zero -/* A0BDC4 802400D4 0C0B210B */ jal evt_get_float_variable -/* A0BDC8 802400D8 46000686 */ mov.s $f26, $f0 -/* A0BDCC 802400DC 8E050000 */ lw $a1, ($s0) -/* A0BDD0 802400E0 26100004 */ addiu $s0, $s0, 4 -/* A0BDD4 802400E4 0220202D */ daddu $a0, $s1, $zero -/* A0BDD8 802400E8 0C0B210B */ jal evt_get_float_variable -/* A0BDDC 802400EC 46000606 */ mov.s $f24, $f0 -/* A0BDE0 802400F0 8E050000 */ lw $a1, ($s0) -/* A0BDE4 802400F4 26100004 */ addiu $s0, $s0, 4 -/* A0BDE8 802400F8 0220202D */ daddu $a0, $s1, $zero -/* A0BDEC 802400FC 0C0B210B */ jal evt_get_float_variable -/* A0BDF0 80240100 46000586 */ mov.s $f22, $f0 -/* A0BDF4 80240104 0220202D */ daddu $a0, $s1, $zero -/* A0BDF8 80240108 8E050000 */ lw $a1, ($s0) -/* A0BDFC 8024010C 0C0B210B */ jal evt_get_float_variable -/* A0BE00 80240110 46000506 */ mov.s $f20, $f0 -/* A0BE04 80240114 4405F000 */ mfc1 $a1, $f30 -/* A0BE08 80240118 4406E000 */ mfc1 $a2, $f28 -/* A0BE0C 8024011C 4407D000 */ mfc1 $a3, $f26 -/* A0BE10 80240120 C7A20020 */ lwc1 $f2, 0x20($sp) -/* A0BE14 80240124 E7B80010 */ swc1 $f24, 0x10($sp) -/* A0BE18 80240128 E7B60014 */ swc1 $f22, 0x14($sp) -/* A0BE1C 8024012C E7B40018 */ swc1 $f20, 0x18($sp) -/* A0BE20 80240130 4600108D */ trunc.w.s $f2, $f2 -/* A0BE24 80240134 44041000 */ mfc1 $a0, $f2 -/* A0BE28 80240138 0C01BF8C */ jal playFX_0F -/* A0BE2C 8024013C E7A0001C */ swc1 $f0, 0x1c($sp) -/* A0BE30 80240140 8FBF0030 */ lw $ra, 0x30($sp) -/* A0BE34 80240144 8FB1002C */ lw $s1, 0x2c($sp) -/* A0BE38 80240148 8FB00028 */ lw $s0, 0x28($sp) -/* A0BE3C 8024014C D7BE0060 */ ldc1 $f30, 0x60($sp) -/* A0BE40 80240150 D7BC0058 */ ldc1 $f28, 0x58($sp) -/* A0BE44 80240154 D7BA0050 */ ldc1 $f26, 0x50($sp) -/* A0BE48 80240158 D7B80048 */ ldc1 $f24, 0x48($sp) -/* A0BE4C 8024015C D7B60040 */ ldc1 $f22, 0x40($sp) -/* A0BE50 80240160 D7B40038 */ ldc1 $f20, 0x38($sp) -/* A0BE54 80240164 24020002 */ addiu $v0, $zero, 2 -/* A0BE58 80240168 03E00008 */ jr $ra -/* A0BE5C 8024016C 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_00/A0BD40/func_80240170_A0BE60.s b/ver/us/asm/nonmatchings/world/area_hos/hos_00/A0BD40/func_80240170_A0BE60.s deleted file mode 100644 index 3eb263989c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_00/A0BD40/func_80240170_A0BE60.s +++ /dev/null @@ -1,138 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80244B40_A10830 -.double 1.570796 - -.section .text - -glabel func_80240170_A0BE60 -/* A0BE60 80240170 27BDFF98 */ addiu $sp, $sp, -0x68 -/* A0BE64 80240174 F7BA0050 */ sdc1 $f26, 0x50($sp) -/* A0BE68 80240178 3C01800B */ lui $at, %hi(gCameras+0x6C) -/* A0BE6C 8024017C C43A1DEC */ lwc1 $f26, %lo(gCameras+0x6C)($at) -/* A0BE70 80240180 3C014334 */ lui $at, 0x4334 -/* A0BE74 80240184 44810000 */ mtc1 $at, $f0 -/* A0BE78 80240188 3C014049 */ lui $at, 0x4049 -/* A0BE7C 8024018C 34210FD8 */ ori $at, $at, 0xfd8 -/* A0BE80 80240190 44811000 */ mtc1 $at, $f2 -/* A0BE84 80240194 240401F4 */ addiu $a0, $zero, 0x1f4 -/* A0BE88 80240198 AFBF0034 */ sw $ra, 0x34($sp) -/* A0BE8C 8024019C 4600D683 */ div.s $f26, $f26, $f0 -/* A0BE90 802401A0 4602D682 */ mul.s $f26, $f26, $f2 -/* A0BE94 802401A4 00000000 */ nop -/* A0BE98 802401A8 AFB00030 */ sw $s0, 0x30($sp) -/* A0BE9C 802401AC F7B60040 */ sdc1 $f22, 0x40($sp) -/* A0BEA0 802401B0 F7B40038 */ sdc1 $f20, 0x38($sp) -/* A0BEA4 802401B4 3C018024 */ lui $at, %hi(D_80244B40_A10830) -/* A0BEA8 802401B8 D4204B40 */ ldc1 $f0, %lo(D_80244B40_A10830)($at) -/* A0BEAC 802401BC 4600D521 */ cvt.d.s $f20, $f26 -/* A0BEB0 802401C0 4620A580 */ add.d $f22, $f20, $f0 -/* A0BEB4 802401C4 F7BE0060 */ sdc1 $f30, 0x60($sp) -/* A0BEB8 802401C8 F7BC0058 */ sdc1 $f28, 0x58($sp) -/* A0BEBC 802401CC 4620A501 */ sub.d $f20, $f20, $f0 -/* A0BEC0 802401D0 F7B80048 */ sdc1 $f24, 0x48($sp) -/* A0BEC4 802401D4 4620B5A0 */ cvt.s.d $f22, $f22 -/* A0BEC8 802401D8 0C00A67F */ jal rand_int -/* A0BECC 802401DC 4620A520 */ cvt.s.d $f20, $f20 -/* A0BED0 802401E0 2442FF06 */ addiu $v0, $v0, -0xfa -/* A0BED4 802401E4 4482C000 */ mtc1 $v0, $f24 -/* A0BED8 802401E8 00000000 */ nop -/* A0BEDC 802401EC 4680C620 */ cvt.s.w $f24, $f24 -/* A0BEE0 802401F0 0C00A67F */ jal rand_int -/* A0BEE4 802401F4 240401F4 */ addiu $a0, $zero, 0x1f4 -/* A0BEE8 802401F8 24040064 */ addiu $a0, $zero, 0x64 -/* A0BEEC 802401FC 2442FF06 */ addiu $v0, $v0, -0xfa -/* A0BEF0 80240200 44822000 */ mtc1 $v0, $f4 -/* A0BEF4 80240204 00000000 */ nop -/* A0BEF8 80240208 46802120 */ cvt.s.w $f4, $f4 -/* A0BEFC 8024020C 0C00A67F */ jal rand_int -/* A0BF00 80240210 E7A40028 */ swc1 $f4, 0x28($sp) -/* A0BF04 80240214 24420258 */ addiu $v0, $v0, 0x258 -/* A0BF08 80240218 4482E000 */ mtc1 $v0, $f28 -/* A0BF0C 8024021C 00000000 */ nop -/* A0BF10 80240220 4680E720 */ cvt.s.w $f28, $f28 -/* A0BF14 80240224 0C00A85B */ jal sin_rad -/* A0BF18 80240228 4600D306 */ mov.s $f12, $f26 -/* A0BF1C 8024022C 4600E002 */ mul.s $f0, $f28, $f0 -/* A0BF20 80240230 00000000 */ nop -/* A0BF24 80240234 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* A0BF28 80240238 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* A0BF2C 8024023C C6020028 */ lwc1 $f2, 0x28($s0) -/* A0BF30 80240240 46001780 */ add.s $f30, $f2, $f0 -/* A0BF34 80240244 0C00A85B */ jal sin_rad -/* A0BF38 80240248 4600B306 */ mov.s $f12, $f22 -/* A0BF3C 8024024C 4600C002 */ mul.s $f0, $f24, $f0 -/* A0BF40 80240250 00000000 */ nop -/* A0BF44 80240254 C602002C */ lwc1 $f2, 0x2c($s0) -/* A0BF48 80240258 4600F780 */ add.s $f30, $f30, $f0 -/* A0BF4C 8024025C 3C014348 */ lui $at, 0x4348 -/* A0BF50 80240260 44810000 */ mtc1 $at, $f0 -/* A0BF54 80240264 00000000 */ nop -/* A0BF58 80240268 46001080 */ add.s $f2, $f2, $f0 -/* A0BF5C 8024026C 4600D306 */ mov.s $f12, $f26 -/* A0BF60 80240270 E7BE0020 */ swc1 $f30, 0x20($sp) -/* A0BF64 80240274 0C00A874 */ jal cos_rad -/* A0BF68 80240278 E7A20024 */ swc1 $f2, 0x24($sp) -/* A0BF6C 8024027C 4600E002 */ mul.s $f0, $f28, $f0 -/* A0BF70 80240280 00000000 */ nop -/* A0BF74 80240284 C61E0030 */ lwc1 $f30, 0x30($s0) -/* A0BF78 80240288 4600F781 */ sub.s $f30, $f30, $f0 -/* A0BF7C 8024028C 0C00A874 */ jal cos_rad -/* A0BF80 80240290 4600B306 */ mov.s $f12, $f22 -/* A0BF84 80240294 4600C602 */ mul.s $f24, $f24, $f0 -/* A0BF88 80240298 00000000 */ nop -/* A0BF8C 8024029C 4618F781 */ sub.s $f30, $f30, $f24 -/* A0BF90 802402A0 0C00A85B */ jal sin_rad -/* A0BF94 802402A4 4600D306 */ mov.s $f12, $f26 -/* A0BF98 802402A8 4600E002 */ mul.s $f0, $f28, $f0 -/* A0BF9C 802402AC 00000000 */ nop -/* A0BFA0 802402B0 C6180028 */ lwc1 $f24, 0x28($s0) -/* A0BFA4 802402B4 4600A306 */ mov.s $f12, $f20 -/* A0BFA8 802402B8 0C00A85B */ jal sin_rad -/* A0BFAC 802402BC 4600C600 */ add.s $f24, $f24, $f0 -/* A0BFB0 802402C0 C7A40028 */ lwc1 $f4, 0x28($sp) -/* A0BFB4 802402C4 46002002 */ mul.s $f0, $f4, $f0 -/* A0BFB8 802402C8 00000000 */ nop -/* A0BFBC 802402CC 4600D306 */ mov.s $f12, $f26 -/* A0BFC0 802402D0 C61A002C */ lwc1 $f26, 0x2c($s0) -/* A0BFC4 802402D4 0C00A874 */ jal cos_rad -/* A0BFC8 802402D8 4600C600 */ add.s $f24, $f24, $f0 -/* A0BFCC 802402DC 4600E702 */ mul.s $f28, $f28, $f0 -/* A0BFD0 802402E0 00000000 */ nop -/* A0BFD4 802402E4 C6160030 */ lwc1 $f22, 0x30($s0) -/* A0BFD8 802402E8 4600A306 */ mov.s $f12, $f20 -/* A0BFDC 802402EC 0C00A874 */ jal cos_rad -/* A0BFE0 802402F0 461CB581 */ sub.s $f22, $f22, $f28 -/* A0BFE4 802402F4 C7A40028 */ lwc1 $f4, 0x28($sp) -/* A0BFE8 802402F8 46002002 */ mul.s $f0, $f4, $f0 -/* A0BFEC 802402FC 00000000 */ nop -/* A0BFF0 80240300 2404000A */ addiu $a0, $zero, 0xa -/* A0BFF4 80240304 0C00A67F */ jal rand_int -/* A0BFF8 80240308 4600B581 */ sub.s $f22, $f22, $f0 -/* A0BFFC 8024030C 0000202D */ daddu $a0, $zero, $zero -/* A0C000 80240310 2442000A */ addiu $v0, $v0, 0xa -/* A0C004 80240314 8FA50020 */ lw $a1, 0x20($sp) -/* A0C008 80240318 8FA60024 */ lw $a2, 0x24($sp) -/* A0C00C 8024031C 4407F000 */ mfc1 $a3, $f30 -/* A0C010 80240320 44820000 */ mtc1 $v0, $f0 -/* A0C014 80240324 00000000 */ nop -/* A0C018 80240328 46800020 */ cvt.s.w $f0, $f0 -/* A0C01C 8024032C E7B80010 */ swc1 $f24, 0x10($sp) -/* A0C020 80240330 E7BA0014 */ swc1 $f26, 0x14($sp) -/* A0C024 80240334 E7A0001C */ swc1 $f0, 0x1c($sp) -/* A0C028 80240338 0C01BF8C */ jal playFX_0F -/* A0C02C 8024033C E7B60018 */ swc1 $f22, 0x18($sp) -/* A0C030 80240340 8FBF0034 */ lw $ra, 0x34($sp) -/* A0C034 80240344 8FB00030 */ lw $s0, 0x30($sp) -/* A0C038 80240348 D7BE0060 */ ldc1 $f30, 0x60($sp) -/* A0C03C 8024034C D7BC0058 */ ldc1 $f28, 0x58($sp) -/* A0C040 80240350 D7BA0050 */ ldc1 $f26, 0x50($sp) -/* A0C044 80240354 D7B80048 */ ldc1 $f24, 0x48($sp) -/* A0C048 80240358 D7B60040 */ ldc1 $f22, 0x40($sp) -/* A0C04C 8024035C D7B40038 */ ldc1 $f20, 0x38($sp) -/* A0C050 80240360 24020002 */ addiu $v0, $zero, 2 -/* A0C054 80240364 03E00008 */ jr $ra -/* A0C058 80240368 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_00/A0BD40/func_8024036C_A0C05C.s b/ver/us/asm/nonmatchings/world/area_hos/hos_00/A0BD40/func_8024036C_A0C05C.s deleted file mode 100644 index 49cebfa21c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_00/A0BD40/func_8024036C_A0C05C.s +++ /dev/null @@ -1,146 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80244B48_A10838 -.double 1.570796 - -.section .text - -glabel func_8024036C_A0C05C -/* A0C05C 8024036C 27BDFF98 */ addiu $sp, $sp, -0x68 -/* A0C060 80240370 3C01800B */ lui $at, %hi(gCameras+0x6C) -/* A0C064 80240374 C4201DEC */ lwc1 $f0, %lo(gCameras+0x6C)($at) -/* A0C068 80240378 3C014334 */ lui $at, 0x4334 -/* A0C06C 8024037C 44811000 */ mtc1 $at, $f2 -/* A0C070 80240380 3C014049 */ lui $at, 0x4049 -/* A0C074 80240384 34210FD8 */ ori $at, $at, 0xfd8 -/* A0C078 80240388 44812000 */ mtc1 $at, $f4 -/* A0C07C 8024038C 2404012C */ addiu $a0, $zero, 0x12c -/* A0C080 80240390 AFBF0034 */ sw $ra, 0x34($sp) -/* A0C084 80240394 F7BE0060 */ sdc1 $f30, 0x60($sp) -/* A0C088 80240398 46020003 */ div.s $f0, $f0, $f2 -/* A0C08C 8024039C 46040782 */ mul.s $f30, $f0, $f4 -/* A0C090 802403A0 00000000 */ nop -/* A0C094 802403A4 AFB00030 */ sw $s0, 0x30($sp) -/* A0C098 802403A8 F7BC0058 */ sdc1 $f28, 0x58($sp) -/* A0C09C 802403AC F7BA0050 */ sdc1 $f26, 0x50($sp) -/* A0C0A0 802403B0 3C018024 */ lui $at, %hi(D_80244B48_A10838) -/* A0C0A4 802403B4 D4224B48 */ ldc1 $f2, %lo(D_80244B48_A10838)($at) -/* A0C0A8 802403B8 4600F021 */ cvt.d.s $f0, $f30 -/* A0C0AC 802403BC 46220100 */ add.d $f4, $f0, $f2 -/* A0C0B0 802403C0 F7B80048 */ sdc1 $f24, 0x48($sp) -/* A0C0B4 802403C4 F7B60040 */ sdc1 $f22, 0x40($sp) -/* A0C0B8 802403C8 46220001 */ sub.d $f0, $f0, $f2 -/* A0C0BC 802403CC F7B40038 */ sdc1 $f20, 0x38($sp) -/* A0C0C0 802403D0 46202120 */ cvt.s.d $f4, $f4 -/* A0C0C4 802403D4 46200020 */ cvt.s.d $f0, $f0 -/* A0C0C8 802403D8 E7A40020 */ swc1 $f4, 0x20($sp) -/* A0C0CC 802403DC 0C00A67F */ jal rand_int -/* A0C0D0 802403E0 E7A00024 */ swc1 $f0, 0x24($sp) -/* A0C0D4 802403E4 2442FF6A */ addiu $v0, $v0, -0x96 -/* A0C0D8 802403E8 4482B000 */ mtc1 $v0, $f22 -/* A0C0DC 802403EC 00000000 */ nop -/* A0C0E0 802403F0 4680B5A0 */ cvt.s.w $f22, $f22 -/* A0C0E4 802403F4 0C00A67F */ jal rand_int -/* A0C0E8 802403F8 2404012C */ addiu $a0, $zero, 0x12c -/* A0C0EC 802403FC 24040064 */ addiu $a0, $zero, 0x64 -/* A0C0F0 80240400 2442FF6A */ addiu $v0, $v0, -0x96 -/* A0C0F4 80240404 44823000 */ mtc1 $v0, $f6 -/* A0C0F8 80240408 00000000 */ nop -/* A0C0FC 8024040C 468031A0 */ cvt.s.w $f6, $f6 -/* A0C100 80240410 0C00A67F */ jal rand_int -/* A0C104 80240414 E7A60028 */ swc1 $f6, 0x28($sp) -/* A0C108 80240418 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* A0C10C 8024041C 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* A0C110 80240420 24420032 */ addiu $v0, $v0, 0x32 -/* A0C114 80240424 C602002C */ lwc1 $f2, 0x2c($s0) -/* A0C118 80240428 3C01437A */ lui $at, 0x437a -/* A0C11C 8024042C 44810000 */ mtc1 $at, $f0 -/* A0C120 80240430 4482A000 */ mtc1 $v0, $f20 -/* A0C124 80240434 00000000 */ nop -/* A0C128 80240438 4680A520 */ cvt.s.w $f20, $f20 -/* A0C12C 8024043C 4602003E */ c.le.s $f0, $f2 -/* A0C130 80240440 00000000 */ nop -/* A0C134 80240444 45010045 */ bc1t .L8024055C -/* A0C138 80240448 24020002 */ addiu $v0, $zero, 2 -/* A0C13C 8024044C 0C00A85B */ jal sin_rad -/* A0C140 80240450 4600F306 */ mov.s $f12, $f30 -/* A0C144 80240454 4600A002 */ mul.s $f0, $f20, $f0 -/* A0C148 80240458 00000000 */ nop -/* A0C14C 8024045C C61A0028 */ lwc1 $f26, 0x28($s0) -/* A0C150 80240460 C7AC0020 */ lwc1 $f12, 0x20($sp) -/* A0C154 80240464 0C00A85B */ jal sin_rad -/* A0C158 80240468 4600D681 */ sub.s $f26, $f26, $f0 -/* A0C15C 8024046C 4600B002 */ mul.s $f0, $f22, $f0 -/* A0C160 80240470 00000000 */ nop -/* A0C164 80240474 C61C002C */ lwc1 $f28, 0x2c($s0) -/* A0C168 80240478 4600D680 */ add.s $f26, $f26, $f0 -/* A0C16C 8024047C 3C014348 */ lui $at, 0x4348 -/* A0C170 80240480 44810000 */ mtc1 $at, $f0 -/* A0C174 80240484 00000000 */ nop -/* A0C178 80240488 4600E700 */ add.s $f28, $f28, $f0 -/* A0C17C 8024048C 0C00A874 */ jal cos_rad -/* A0C180 80240490 4600F306 */ mov.s $f12, $f30 -/* A0C184 80240494 4600A002 */ mul.s $f0, $f20, $f0 -/* A0C188 80240498 00000000 */ nop -/* A0C18C 8024049C C6180030 */ lwc1 $f24, 0x30($s0) -/* A0C190 802404A0 C7AC0020 */ lwc1 $f12, 0x20($sp) -/* A0C194 802404A4 0C00A874 */ jal cos_rad -/* A0C198 802404A8 4600C600 */ add.s $f24, $f24, $f0 -/* A0C19C 802404AC 4600B002 */ mul.s $f0, $f22, $f0 -/* A0C1A0 802404B0 00000000 */ nop -/* A0C1A4 802404B4 4600C601 */ sub.s $f24, $f24, $f0 -/* A0C1A8 802404B8 0C00A85B */ jal sin_rad -/* A0C1AC 802404BC 4600F306 */ mov.s $f12, $f30 -/* A0C1B0 802404C0 4600A002 */ mul.s $f0, $f20, $f0 -/* A0C1B4 802404C4 00000000 */ nop -/* A0C1B8 802404C8 C6160028 */ lwc1 $f22, 0x28($s0) -/* A0C1BC 802404CC C7AC0024 */ lwc1 $f12, 0x24($sp) -/* A0C1C0 802404D0 0C00A85B */ jal sin_rad -/* A0C1C4 802404D4 4600B581 */ sub.s $f22, $f22, $f0 -/* A0C1C8 802404D8 C7A60028 */ lwc1 $f6, 0x28($sp) -/* A0C1CC 802404DC 46003002 */ mul.s $f0, $f6, $f0 -/* A0C1D0 802404E0 00000000 */ nop -/* A0C1D4 802404E4 4600F306 */ mov.s $f12, $f30 -/* A0C1D8 802404E8 C61E002C */ lwc1 $f30, 0x2c($s0) -/* A0C1DC 802404EC 0C00A874 */ jal cos_rad -/* A0C1E0 802404F0 4600B580 */ add.s $f22, $f22, $f0 -/* A0C1E4 802404F4 4600A002 */ mul.s $f0, $f20, $f0 -/* A0C1E8 802404F8 00000000 */ nop -/* A0C1EC 802404FC C6140030 */ lwc1 $f20, 0x30($s0) -/* A0C1F0 80240500 C7AC0024 */ lwc1 $f12, 0x24($sp) -/* A0C1F4 80240504 0C00A874 */ jal cos_rad -/* A0C1F8 80240508 4600A500 */ add.s $f20, $f20, $f0 -/* A0C1FC 8024050C C7A60028 */ lwc1 $f6, 0x28($sp) -/* A0C200 80240510 46003002 */ mul.s $f0, $f6, $f0 -/* A0C204 80240514 00000000 */ nop -/* A0C208 80240518 2404000A */ addiu $a0, $zero, 0xa -/* A0C20C 8024051C 0C00A67F */ jal rand_int -/* A0C210 80240520 4600A501 */ sub.s $f20, $f20, $f0 -/* A0C214 80240524 24040001 */ addiu $a0, $zero, 1 -/* A0C218 80240528 2442000A */ addiu $v0, $v0, 0xa -/* A0C21C 8024052C 4405D000 */ mfc1 $a1, $f26 -/* A0C220 80240530 4406E000 */ mfc1 $a2, $f28 -/* A0C224 80240534 4407C000 */ mfc1 $a3, $f24 -/* A0C228 80240538 44820000 */ mtc1 $v0, $f0 -/* A0C22C 8024053C 00000000 */ nop -/* A0C230 80240540 46800020 */ cvt.s.w $f0, $f0 -/* A0C234 80240544 E7B60010 */ swc1 $f22, 0x10($sp) -/* A0C238 80240548 E7BE0014 */ swc1 $f30, 0x14($sp) -/* A0C23C 8024054C E7A0001C */ swc1 $f0, 0x1c($sp) -/* A0C240 80240550 0C01BF8C */ jal playFX_0F -/* A0C244 80240554 E7B40018 */ swc1 $f20, 0x18($sp) -/* A0C248 80240558 24020002 */ addiu $v0, $zero, 2 -.L8024055C: -/* A0C24C 8024055C 8FBF0034 */ lw $ra, 0x34($sp) -/* A0C250 80240560 8FB00030 */ lw $s0, 0x30($sp) -/* A0C254 80240564 D7BE0060 */ ldc1 $f30, 0x60($sp) -/* A0C258 80240568 D7BC0058 */ ldc1 $f28, 0x58($sp) -/* A0C25C 8024056C D7BA0050 */ ldc1 $f26, 0x50($sp) -/* A0C260 80240570 D7B80048 */ ldc1 $f24, 0x48($sp) -/* A0C264 80240574 D7B60040 */ ldc1 $f22, 0x40($sp) -/* A0C268 80240578 D7B40038 */ ldc1 $f20, 0x38($sp) -/* A0C26C 8024057C 03E00008 */ jr $ra -/* A0C270 80240580 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_00/A0BD40/func_80240584_A0C274.s b/ver/us/asm/nonmatchings/world/area_hos/hos_00/A0BD40/func_80240584_A0C274.s deleted file mode 100644 index 1182d2c978..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_00/A0BD40/func_80240584_A0C274.s +++ /dev/null @@ -1,155 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80244B50_A10840 -.double 1.570796 - -.section .text - -glabel func_80240584_A0C274 -/* A0C274 80240584 27BDFF90 */ addiu $sp, $sp, -0x70 -/* A0C278 80240588 AFB10034 */ sw $s1, 0x34($sp) -/* A0C27C 8024058C 0080882D */ daddu $s1, $a0, $zero -/* A0C280 80240590 3C01800B */ lui $at, %hi(gCameras+0x6C) -/* A0C284 80240594 C4201DEC */ lwc1 $f0, %lo(gCameras+0x6C)($at) -/* A0C288 80240598 3C014334 */ lui $at, 0x4334 -/* A0C28C 8024059C 44811000 */ mtc1 $at, $f2 -/* A0C290 802405A0 3C014049 */ lui $at, 0x4049 -/* A0C294 802405A4 34210FD8 */ ori $at, $at, 0xfd8 -/* A0C298 802405A8 44812000 */ mtc1 $at, $f4 -/* A0C29C 802405AC 24040096 */ addiu $a0, $zero, 0x96 -/* A0C2A0 802405B0 AFBF0038 */ sw $ra, 0x38($sp) -/* A0C2A4 802405B4 F7BE0068 */ sdc1 $f30, 0x68($sp) -/* A0C2A8 802405B8 46020003 */ div.s $f0, $f0, $f2 -/* A0C2AC 802405BC 46040782 */ mul.s $f30, $f0, $f4 -/* A0C2B0 802405C0 00000000 */ nop -/* A0C2B4 802405C4 AFB00030 */ sw $s0, 0x30($sp) -/* A0C2B8 802405C8 F7BC0060 */ sdc1 $f28, 0x60($sp) -/* A0C2BC 802405CC F7BA0058 */ sdc1 $f26, 0x58($sp) -/* A0C2C0 802405D0 3C018024 */ lui $at, %hi(D_80244B50_A10840) -/* A0C2C4 802405D4 D4224B50 */ ldc1 $f2, %lo(D_80244B50_A10840)($at) -/* A0C2C8 802405D8 4600F021 */ cvt.d.s $f0, $f30 -/* A0C2CC 802405DC 46220100 */ add.d $f4, $f0, $f2 -/* A0C2D0 802405E0 F7B80050 */ sdc1 $f24, 0x50($sp) -/* A0C2D4 802405E4 F7B60048 */ sdc1 $f22, 0x48($sp) -/* A0C2D8 802405E8 46220001 */ sub.d $f0, $f0, $f2 -/* A0C2DC 802405EC F7B40040 */ sdc1 $f20, 0x40($sp) -/* A0C2E0 802405F0 46202120 */ cvt.s.d $f4, $f4 -/* A0C2E4 802405F4 46200020 */ cvt.s.d $f0, $f0 -/* A0C2E8 802405F8 E7A40020 */ swc1 $f4, 0x20($sp) -/* A0C2EC 802405FC 0C00A67F */ jal rand_int -/* A0C2F0 80240600 E7A00024 */ swc1 $f0, 0x24($sp) -/* A0C2F4 80240604 24040096 */ addiu $a0, $zero, 0x96 -/* A0C2F8 80240608 44823000 */ mtc1 $v0, $f6 -/* A0C2FC 8024060C 00000000 */ nop -/* A0C300 80240610 468031A0 */ cvt.s.w $f6, $f6 -/* A0C304 80240614 0C00A67F */ jal rand_int -/* A0C308 80240618 E7A60028 */ swc1 $f6, 0x28($sp) -/* A0C30C 8024061C 24040064 */ addiu $a0, $zero, 0x64 -/* A0C310 80240620 44823000 */ mtc1 $v0, $f6 -/* A0C314 80240624 00000000 */ nop -/* A0C318 80240628 468031A0 */ cvt.s.w $f6, $f6 -/* A0C31C 8024062C 0C00A67F */ jal rand_int -/* A0C320 80240630 E7A6002C */ swc1 $f6, 0x2c($sp) -/* A0C324 80240634 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* A0C328 80240638 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* A0C32C 8024063C 2442FFCE */ addiu $v0, $v0, -0x32 -/* A0C330 80240640 C6000030 */ lwc1 $f0, 0x30($s0) -/* A0C334 80240644 3C014348 */ lui $at, 0x4348 -/* A0C338 80240648 4481B000 */ mtc1 $at, $f22 -/* A0C33C 8024064C 4482A000 */ mtc1 $v0, $f20 -/* A0C340 80240650 00000000 */ nop -/* A0C344 80240654 4680A520 */ cvt.s.w $f20, $f20 -/* A0C348 80240658 4616003C */ c.lt.s $f0, $f22 -/* A0C34C 8024065C 00000000 */ nop -/* A0C350 80240660 4501004A */ bc1t .L8024078C -/* A0C354 80240664 24020002 */ addiu $v0, $zero, 2 -/* A0C358 80240668 0C00A85B */ jal sin_rad -/* A0C35C 8024066C 4600F306 */ mov.s $f12, $f30 -/* A0C360 80240670 4600A002 */ mul.s $f0, $f20, $f0 -/* A0C364 80240674 00000000 */ nop -/* A0C368 80240678 C61A0028 */ lwc1 $f26, 0x28($s0) -/* A0C36C 8024067C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* A0C370 80240680 0C00A85B */ jal sin_rad -/* A0C374 80240684 4600D681 */ sub.s $f26, $f26, $f0 -/* A0C378 80240688 C7A60028 */ lwc1 $f6, 0x28($sp) -/* A0C37C 8024068C 46003002 */ mul.s $f0, $f6, $f0 -/* A0C380 80240690 00000000 */ nop -/* A0C384 80240694 C61C002C */ lwc1 $f28, 0x2c($s0) -/* A0C388 80240698 4616E700 */ add.s $f28, $f28, $f22 -/* A0C38C 8024069C 4600D680 */ add.s $f26, $f26, $f0 -/* A0C390 802406A0 0C00A874 */ jal cos_rad -/* A0C394 802406A4 4600F306 */ mov.s $f12, $f30 -/* A0C398 802406A8 4600A002 */ mul.s $f0, $f20, $f0 -/* A0C39C 802406AC 00000000 */ nop -/* A0C3A0 802406B0 C6180030 */ lwc1 $f24, 0x30($s0) -/* A0C3A4 802406B4 C7AC0020 */ lwc1 $f12, 0x20($sp) -/* A0C3A8 802406B8 0C00A874 */ jal cos_rad -/* A0C3AC 802406BC 4600C600 */ add.s $f24, $f24, $f0 -/* A0C3B0 802406C0 C7A60028 */ lwc1 $f6, 0x28($sp) -/* A0C3B4 802406C4 46003002 */ mul.s $f0, $f6, $f0 -/* A0C3B8 802406C8 00000000 */ nop -/* A0C3BC 802406CC 4600C601 */ sub.s $f24, $f24, $f0 -/* A0C3C0 802406D0 4600D18D */ trunc.w.s $f6, $f26 -/* A0C3C4 802406D4 E6260088 */ swc1 $f6, 0x88($s1) -/* A0C3C8 802406D8 4600E18D */ trunc.w.s $f6, $f28 -/* A0C3CC 802406DC E626008C */ swc1 $f6, 0x8c($s1) -/* A0C3D0 802406E0 4600C18D */ trunc.w.s $f6, $f24 -/* A0C3D4 802406E4 E6260090 */ swc1 $f6, 0x90($s1) -/* A0C3D8 802406E8 0C00A85B */ jal sin_rad -/* A0C3DC 802406EC 4600F306 */ mov.s $f12, $f30 -/* A0C3E0 802406F0 4600A002 */ mul.s $f0, $f20, $f0 -/* A0C3E4 802406F4 00000000 */ nop -/* A0C3E8 802406F8 C6160028 */ lwc1 $f22, 0x28($s0) -/* A0C3EC 802406FC C7AC0024 */ lwc1 $f12, 0x24($sp) -/* A0C3F0 80240700 0C00A85B */ jal sin_rad -/* A0C3F4 80240704 4600B581 */ sub.s $f22, $f22, $f0 -/* A0C3F8 80240708 C7A6002C */ lwc1 $f6, 0x2c($sp) -/* A0C3FC 8024070C 46003002 */ mul.s $f0, $f6, $f0 -/* A0C400 80240710 00000000 */ nop -/* A0C404 80240714 4600F306 */ mov.s $f12, $f30 -/* A0C408 80240718 C61E002C */ lwc1 $f30, 0x2c($s0) -/* A0C40C 8024071C 0C00A874 */ jal cos_rad -/* A0C410 80240720 4600B580 */ add.s $f22, $f22, $f0 -/* A0C414 80240724 4600A002 */ mul.s $f0, $f20, $f0 -/* A0C418 80240728 00000000 */ nop -/* A0C41C 8024072C C6140030 */ lwc1 $f20, 0x30($s0) -/* A0C420 80240730 C7AC0024 */ lwc1 $f12, 0x24($sp) -/* A0C424 80240734 0C00A874 */ jal cos_rad -/* A0C428 80240738 4600A500 */ add.s $f20, $f20, $f0 -/* A0C42C 8024073C C7A6002C */ lwc1 $f6, 0x2c($sp) -/* A0C430 80240740 46003002 */ mul.s $f0, $f6, $f0 -/* A0C434 80240744 00000000 */ nop -/* A0C438 80240748 24040004 */ addiu $a0, $zero, 4 -/* A0C43C 8024074C 0C00A67F */ jal rand_int -/* A0C440 80240750 4600A501 */ sub.s $f20, $f20, $f0 -/* A0C444 80240754 24040002 */ addiu $a0, $zero, 2 -/* A0C448 80240758 2442000A */ addiu $v0, $v0, 0xa -/* A0C44C 8024075C 4405D000 */ mfc1 $a1, $f26 -/* A0C450 80240760 4406E000 */ mfc1 $a2, $f28 -/* A0C454 80240764 4407C000 */ mfc1 $a3, $f24 -/* A0C458 80240768 44820000 */ mtc1 $v0, $f0 -/* A0C45C 8024076C 00000000 */ nop -/* A0C460 80240770 46800020 */ cvt.s.w $f0, $f0 -/* A0C464 80240774 E7B60010 */ swc1 $f22, 0x10($sp) -/* A0C468 80240778 E7BE0014 */ swc1 $f30, 0x14($sp) -/* A0C46C 8024077C E7A0001C */ swc1 $f0, 0x1c($sp) -/* A0C470 80240780 0C01BF8C */ jal playFX_0F -/* A0C474 80240784 E7B40018 */ swc1 $f20, 0x18($sp) -/* A0C478 80240788 24020002 */ addiu $v0, $zero, 2 -.L8024078C: -/* A0C47C 8024078C 8FBF0038 */ lw $ra, 0x38($sp) -/* A0C480 80240790 8FB10034 */ lw $s1, 0x34($sp) -/* A0C484 80240794 8FB00030 */ lw $s0, 0x30($sp) -/* A0C488 80240798 D7BE0068 */ ldc1 $f30, 0x68($sp) -/* A0C48C 8024079C D7BC0060 */ ldc1 $f28, 0x60($sp) -/* A0C490 802407A0 D7BA0058 */ ldc1 $f26, 0x58($sp) -/* A0C494 802407A4 D7B80050 */ ldc1 $f24, 0x50($sp) -/* A0C498 802407A8 D7B60048 */ ldc1 $f22, 0x48($sp) -/* A0C49C 802407AC D7B40040 */ ldc1 $f20, 0x40($sp) -/* A0C4A0 802407B0 03E00008 */ jr $ra -/* A0C4A4 802407B4 27BD0070 */ addiu $sp, $sp, 0x70 -/* A0C4A8 802407B8 00000000 */ nop -/* A0C4AC 802407BC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_01/A10880/func_80240000_A10880.s b/ver/us/asm/nonmatchings/world/area_hos/hos_01/A10880/func_80240000_A10880.s deleted file mode 100644 index e52ed8b696..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_01/A10880/func_80240000_A10880.s +++ /dev/null @@ -1,76 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_A10880 -/* A10880 80240000 27BDFF98 */ addiu $sp, $sp, -0x68 -/* A10884 80240004 AFB1002C */ sw $s1, 0x2c($sp) -/* A10888 80240008 0080882D */ daddu $s1, $a0, $zero -/* A1088C 8024000C AFBF0030 */ sw $ra, 0x30($sp) -/* A10890 80240010 AFB00028 */ sw $s0, 0x28($sp) -/* A10894 80240014 F7BE0060 */ sdc1 $f30, 0x60($sp) -/* A10898 80240018 F7BC0058 */ sdc1 $f28, 0x58($sp) -/* A1089C 8024001C F7BA0050 */ sdc1 $f26, 0x50($sp) -/* A108A0 80240020 F7B80048 */ sdc1 $f24, 0x48($sp) -/* A108A4 80240024 F7B60040 */ sdc1 $f22, 0x40($sp) -/* A108A8 80240028 F7B40038 */ sdc1 $f20, 0x38($sp) -/* A108AC 8024002C 8E30000C */ lw $s0, 0xc($s1) -/* A108B0 80240030 8E050000 */ lw $a1, ($s0) -/* A108B4 80240034 0C0B210B */ jal evt_get_float_variable -/* A108B8 80240038 26100004 */ addiu $s0, $s0, 4 -/* A108BC 8024003C 8E050000 */ lw $a1, ($s0) -/* A108C0 80240040 26100004 */ addiu $s0, $s0, 4 -/* A108C4 80240044 0220202D */ daddu $a0, $s1, $zero -/* A108C8 80240048 0C0B210B */ jal evt_get_float_variable -/* A108CC 8024004C E7A00020 */ swc1 $f0, 0x20($sp) -/* A108D0 80240050 8E050000 */ lw $a1, ($s0) -/* A108D4 80240054 26100004 */ addiu $s0, $s0, 4 -/* A108D8 80240058 0220202D */ daddu $a0, $s1, $zero -/* A108DC 8024005C 0C0B210B */ jal evt_get_float_variable -/* A108E0 80240060 46000786 */ mov.s $f30, $f0 -/* A108E4 80240064 8E050000 */ lw $a1, ($s0) -/* A108E8 80240068 26100004 */ addiu $s0, $s0, 4 -/* A108EC 8024006C 0220202D */ daddu $a0, $s1, $zero -/* A108F0 80240070 0C0B210B */ jal evt_get_float_variable -/* A108F4 80240074 46000706 */ mov.s $f28, $f0 -/* A108F8 80240078 8E050000 */ lw $a1, ($s0) -/* A108FC 8024007C 26100004 */ addiu $s0, $s0, 4 -/* A10900 80240080 0220202D */ daddu $a0, $s1, $zero -/* A10904 80240084 0C0B210B */ jal evt_get_float_variable -/* A10908 80240088 46000686 */ mov.s $f26, $f0 -/* A1090C 8024008C 8E050000 */ lw $a1, ($s0) -/* A10910 80240090 26100004 */ addiu $s0, $s0, 4 -/* A10914 80240094 0220202D */ daddu $a0, $s1, $zero -/* A10918 80240098 0C0B210B */ jal evt_get_float_variable -/* A1091C 8024009C 46000606 */ mov.s $f24, $f0 -/* A10920 802400A0 8E050000 */ lw $a1, ($s0) -/* A10924 802400A4 26100004 */ addiu $s0, $s0, 4 -/* A10928 802400A8 0220202D */ daddu $a0, $s1, $zero -/* A1092C 802400AC 0C0B210B */ jal evt_get_float_variable -/* A10930 802400B0 46000586 */ mov.s $f22, $f0 -/* A10934 802400B4 0220202D */ daddu $a0, $s1, $zero -/* A10938 802400B8 8E050000 */ lw $a1, ($s0) -/* A1093C 802400BC 0C0B210B */ jal evt_get_float_variable -/* A10940 802400C0 46000506 */ mov.s $f20, $f0 -/* A10944 802400C4 4405F000 */ mfc1 $a1, $f30 -/* A10948 802400C8 4406E000 */ mfc1 $a2, $f28 -/* A1094C 802400CC 4407D000 */ mfc1 $a3, $f26 -/* A10950 802400D0 C7A20020 */ lwc1 $f2, 0x20($sp) -/* A10954 802400D4 E7B80010 */ swc1 $f24, 0x10($sp) -/* A10958 802400D8 E7B60014 */ swc1 $f22, 0x14($sp) -/* A1095C 802400DC E7B40018 */ swc1 $f20, 0x18($sp) -/* A10960 802400E0 4600108D */ trunc.w.s $f2, $f2 -/* A10964 802400E4 44041000 */ mfc1 $a0, $f2 -/* A10968 802400E8 0C01BF8C */ jal playFX_0F -/* A1096C 802400EC E7A0001C */ swc1 $f0, 0x1c($sp) -/* A10970 802400F0 8FBF0030 */ lw $ra, 0x30($sp) -/* A10974 802400F4 8FB1002C */ lw $s1, 0x2c($sp) -/* A10978 802400F8 8FB00028 */ lw $s0, 0x28($sp) -/* A1097C 802400FC D7BE0060 */ ldc1 $f30, 0x60($sp) -/* A10980 80240100 D7BC0058 */ ldc1 $f28, 0x58($sp) -/* A10984 80240104 D7BA0050 */ ldc1 $f26, 0x50($sp) -/* A10988 80240108 D7B80048 */ ldc1 $f24, 0x48($sp) -/* A1098C 8024010C D7B60040 */ ldc1 $f22, 0x40($sp) -/* A10990 80240110 D7B40038 */ ldc1 $f20, 0x38($sp) -/* A10994 80240114 24020002 */ addiu $v0, $zero, 2 -/* A10998 80240118 03E00008 */ jr $ra -/* A1099C 8024011C 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_01/A10880/func_80240120_A109A0.s b/ver/us/asm/nonmatchings/world/area_hos/hos_01/A10880/func_80240120_A109A0.s deleted file mode 100644 index 6e5b8e7d5d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_01/A10880/func_80240120_A109A0.s +++ /dev/null @@ -1,138 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80245970_A161F0 -.double 1.570796 - -.section .text - -glabel func_80240120_A109A0 -/* A109A0 80240120 27BDFF98 */ addiu $sp, $sp, -0x68 -/* A109A4 80240124 F7BA0050 */ sdc1 $f26, 0x50($sp) -/* A109A8 80240128 3C01800B */ lui $at, %hi(gCameras+0x6C) -/* A109AC 8024012C C43A1DEC */ lwc1 $f26, %lo(gCameras+0x6C)($at) -/* A109B0 80240130 3C014334 */ lui $at, 0x4334 -/* A109B4 80240134 44810000 */ mtc1 $at, $f0 -/* A109B8 80240138 3C014049 */ lui $at, 0x4049 -/* A109BC 8024013C 34210FD8 */ ori $at, $at, 0xfd8 -/* A109C0 80240140 44811000 */ mtc1 $at, $f2 -/* A109C4 80240144 240401F4 */ addiu $a0, $zero, 0x1f4 -/* A109C8 80240148 AFBF0034 */ sw $ra, 0x34($sp) -/* A109CC 8024014C 4600D683 */ div.s $f26, $f26, $f0 -/* A109D0 80240150 4602D682 */ mul.s $f26, $f26, $f2 -/* A109D4 80240154 00000000 */ nop -/* A109D8 80240158 AFB00030 */ sw $s0, 0x30($sp) -/* A109DC 8024015C F7B60040 */ sdc1 $f22, 0x40($sp) -/* A109E0 80240160 F7B40038 */ sdc1 $f20, 0x38($sp) -/* A109E4 80240164 3C018024 */ lui $at, %hi(D_80245970_A161F0) -/* A109E8 80240168 D4205970 */ ldc1 $f0, %lo(D_80245970_A161F0)($at) -/* A109EC 8024016C 4600D521 */ cvt.d.s $f20, $f26 -/* A109F0 80240170 4620A580 */ add.d $f22, $f20, $f0 -/* A109F4 80240174 F7BE0060 */ sdc1 $f30, 0x60($sp) -/* A109F8 80240178 F7BC0058 */ sdc1 $f28, 0x58($sp) -/* A109FC 8024017C 4620A501 */ sub.d $f20, $f20, $f0 -/* A10A00 80240180 F7B80048 */ sdc1 $f24, 0x48($sp) -/* A10A04 80240184 4620B5A0 */ cvt.s.d $f22, $f22 -/* A10A08 80240188 0C00A67F */ jal rand_int -/* A10A0C 8024018C 4620A520 */ cvt.s.d $f20, $f20 -/* A10A10 80240190 2442FF06 */ addiu $v0, $v0, -0xfa -/* A10A14 80240194 4482C000 */ mtc1 $v0, $f24 -/* A10A18 80240198 00000000 */ nop -/* A10A1C 8024019C 4680C620 */ cvt.s.w $f24, $f24 -/* A10A20 802401A0 0C00A67F */ jal rand_int -/* A10A24 802401A4 240401F4 */ addiu $a0, $zero, 0x1f4 -/* A10A28 802401A8 24040064 */ addiu $a0, $zero, 0x64 -/* A10A2C 802401AC 2442FF06 */ addiu $v0, $v0, -0xfa -/* A10A30 802401B0 44822000 */ mtc1 $v0, $f4 -/* A10A34 802401B4 00000000 */ nop -/* A10A38 802401B8 46802120 */ cvt.s.w $f4, $f4 -/* A10A3C 802401BC 0C00A67F */ jal rand_int -/* A10A40 802401C0 E7A40028 */ swc1 $f4, 0x28($sp) -/* A10A44 802401C4 24420258 */ addiu $v0, $v0, 0x258 -/* A10A48 802401C8 4482E000 */ mtc1 $v0, $f28 -/* A10A4C 802401CC 00000000 */ nop -/* A10A50 802401D0 4680E720 */ cvt.s.w $f28, $f28 -/* A10A54 802401D4 0C00A85B */ jal sin_rad -/* A10A58 802401D8 4600D306 */ mov.s $f12, $f26 -/* A10A5C 802401DC 4600E002 */ mul.s $f0, $f28, $f0 -/* A10A60 802401E0 00000000 */ nop -/* A10A64 802401E4 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* A10A68 802401E8 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* A10A6C 802401EC C6020028 */ lwc1 $f2, 0x28($s0) -/* A10A70 802401F0 46001780 */ add.s $f30, $f2, $f0 -/* A10A74 802401F4 0C00A85B */ jal sin_rad -/* A10A78 802401F8 4600B306 */ mov.s $f12, $f22 -/* A10A7C 802401FC 4600C002 */ mul.s $f0, $f24, $f0 -/* A10A80 80240200 00000000 */ nop -/* A10A84 80240204 C602002C */ lwc1 $f2, 0x2c($s0) -/* A10A88 80240208 4600F780 */ add.s $f30, $f30, $f0 -/* A10A8C 8024020C 3C014348 */ lui $at, 0x4348 -/* A10A90 80240210 44810000 */ mtc1 $at, $f0 -/* A10A94 80240214 00000000 */ nop -/* A10A98 80240218 46001080 */ add.s $f2, $f2, $f0 -/* A10A9C 8024021C 4600D306 */ mov.s $f12, $f26 -/* A10AA0 80240220 E7BE0020 */ swc1 $f30, 0x20($sp) -/* A10AA4 80240224 0C00A874 */ jal cos_rad -/* A10AA8 80240228 E7A20024 */ swc1 $f2, 0x24($sp) -/* A10AAC 8024022C 4600E002 */ mul.s $f0, $f28, $f0 -/* A10AB0 80240230 00000000 */ nop -/* A10AB4 80240234 C61E0030 */ lwc1 $f30, 0x30($s0) -/* A10AB8 80240238 4600F781 */ sub.s $f30, $f30, $f0 -/* A10ABC 8024023C 0C00A874 */ jal cos_rad -/* A10AC0 80240240 4600B306 */ mov.s $f12, $f22 -/* A10AC4 80240244 4600C602 */ mul.s $f24, $f24, $f0 -/* A10AC8 80240248 00000000 */ nop -/* A10ACC 8024024C 4618F781 */ sub.s $f30, $f30, $f24 -/* A10AD0 80240250 0C00A85B */ jal sin_rad -/* A10AD4 80240254 4600D306 */ mov.s $f12, $f26 -/* A10AD8 80240258 4600E002 */ mul.s $f0, $f28, $f0 -/* A10ADC 8024025C 00000000 */ nop -/* A10AE0 80240260 C6180028 */ lwc1 $f24, 0x28($s0) -/* A10AE4 80240264 4600A306 */ mov.s $f12, $f20 -/* A10AE8 80240268 0C00A85B */ jal sin_rad -/* A10AEC 8024026C 4600C600 */ add.s $f24, $f24, $f0 -/* A10AF0 80240270 C7A40028 */ lwc1 $f4, 0x28($sp) -/* A10AF4 80240274 46002002 */ mul.s $f0, $f4, $f0 -/* A10AF8 80240278 00000000 */ nop -/* A10AFC 8024027C 4600D306 */ mov.s $f12, $f26 -/* A10B00 80240280 C61A002C */ lwc1 $f26, 0x2c($s0) -/* A10B04 80240284 0C00A874 */ jal cos_rad -/* A10B08 80240288 4600C600 */ add.s $f24, $f24, $f0 -/* A10B0C 8024028C 4600E702 */ mul.s $f28, $f28, $f0 -/* A10B10 80240290 00000000 */ nop -/* A10B14 80240294 C6160030 */ lwc1 $f22, 0x30($s0) -/* A10B18 80240298 4600A306 */ mov.s $f12, $f20 -/* A10B1C 8024029C 0C00A874 */ jal cos_rad -/* A10B20 802402A0 461CB581 */ sub.s $f22, $f22, $f28 -/* A10B24 802402A4 C7A40028 */ lwc1 $f4, 0x28($sp) -/* A10B28 802402A8 46002002 */ mul.s $f0, $f4, $f0 -/* A10B2C 802402AC 00000000 */ nop -/* A10B30 802402B0 2404000A */ addiu $a0, $zero, 0xa -/* A10B34 802402B4 0C00A67F */ jal rand_int -/* A10B38 802402B8 4600B581 */ sub.s $f22, $f22, $f0 -/* A10B3C 802402BC 0000202D */ daddu $a0, $zero, $zero -/* A10B40 802402C0 2442000A */ addiu $v0, $v0, 0xa -/* A10B44 802402C4 8FA50020 */ lw $a1, 0x20($sp) -/* A10B48 802402C8 8FA60024 */ lw $a2, 0x24($sp) -/* A10B4C 802402CC 4407F000 */ mfc1 $a3, $f30 -/* A10B50 802402D0 44820000 */ mtc1 $v0, $f0 -/* A10B54 802402D4 00000000 */ nop -/* A10B58 802402D8 46800020 */ cvt.s.w $f0, $f0 -/* A10B5C 802402DC E7B80010 */ swc1 $f24, 0x10($sp) -/* A10B60 802402E0 E7BA0014 */ swc1 $f26, 0x14($sp) -/* A10B64 802402E4 E7A0001C */ swc1 $f0, 0x1c($sp) -/* A10B68 802402E8 0C01BF8C */ jal playFX_0F -/* A10B6C 802402EC E7B60018 */ swc1 $f22, 0x18($sp) -/* A10B70 802402F0 8FBF0034 */ lw $ra, 0x34($sp) -/* A10B74 802402F4 8FB00030 */ lw $s0, 0x30($sp) -/* A10B78 802402F8 D7BE0060 */ ldc1 $f30, 0x60($sp) -/* A10B7C 802402FC D7BC0058 */ ldc1 $f28, 0x58($sp) -/* A10B80 80240300 D7BA0050 */ ldc1 $f26, 0x50($sp) -/* A10B84 80240304 D7B80048 */ ldc1 $f24, 0x48($sp) -/* A10B88 80240308 D7B60040 */ ldc1 $f22, 0x40($sp) -/* A10B8C 8024030C D7B40038 */ ldc1 $f20, 0x38($sp) -/* A10B90 80240310 24020002 */ addiu $v0, $zero, 2 -/* A10B94 80240314 03E00008 */ jr $ra -/* A10B98 80240318 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_01/A10880/func_8024031C_A10B9C.s b/ver/us/asm/nonmatchings/world/area_hos/hos_01/A10880/func_8024031C_A10B9C.s deleted file mode 100644 index 368c1b70e2..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_01/A10880/func_8024031C_A10B9C.s +++ /dev/null @@ -1,146 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80245978_A161F8 -.double 1.570796 - -.section .text - -glabel func_8024031C_A10B9C -/* A10B9C 8024031C 27BDFF98 */ addiu $sp, $sp, -0x68 -/* A10BA0 80240320 3C01800B */ lui $at, %hi(gCameras+0x6C) -/* A10BA4 80240324 C4201DEC */ lwc1 $f0, %lo(gCameras+0x6C)($at) -/* A10BA8 80240328 3C014334 */ lui $at, 0x4334 -/* A10BAC 8024032C 44811000 */ mtc1 $at, $f2 -/* A10BB0 80240330 3C014049 */ lui $at, 0x4049 -/* A10BB4 80240334 34210FD8 */ ori $at, $at, 0xfd8 -/* A10BB8 80240338 44812000 */ mtc1 $at, $f4 -/* A10BBC 8024033C 2404012C */ addiu $a0, $zero, 0x12c -/* A10BC0 80240340 AFBF0034 */ sw $ra, 0x34($sp) -/* A10BC4 80240344 F7BE0060 */ sdc1 $f30, 0x60($sp) -/* A10BC8 80240348 46020003 */ div.s $f0, $f0, $f2 -/* A10BCC 8024034C 46040782 */ mul.s $f30, $f0, $f4 -/* A10BD0 80240350 00000000 */ nop -/* A10BD4 80240354 AFB00030 */ sw $s0, 0x30($sp) -/* A10BD8 80240358 F7BC0058 */ sdc1 $f28, 0x58($sp) -/* A10BDC 8024035C F7BA0050 */ sdc1 $f26, 0x50($sp) -/* A10BE0 80240360 3C018024 */ lui $at, %hi(D_80245978_A161F8) -/* A10BE4 80240364 D4225978 */ ldc1 $f2, %lo(D_80245978_A161F8)($at) -/* A10BE8 80240368 4600F021 */ cvt.d.s $f0, $f30 -/* A10BEC 8024036C 46220100 */ add.d $f4, $f0, $f2 -/* A10BF0 80240370 F7B80048 */ sdc1 $f24, 0x48($sp) -/* A10BF4 80240374 F7B60040 */ sdc1 $f22, 0x40($sp) -/* A10BF8 80240378 46220001 */ sub.d $f0, $f0, $f2 -/* A10BFC 8024037C F7B40038 */ sdc1 $f20, 0x38($sp) -/* A10C00 80240380 46202120 */ cvt.s.d $f4, $f4 -/* A10C04 80240384 46200020 */ cvt.s.d $f0, $f0 -/* A10C08 80240388 E7A40020 */ swc1 $f4, 0x20($sp) -/* A10C0C 8024038C 0C00A67F */ jal rand_int -/* A10C10 80240390 E7A00024 */ swc1 $f0, 0x24($sp) -/* A10C14 80240394 2442FF6A */ addiu $v0, $v0, -0x96 -/* A10C18 80240398 4482B000 */ mtc1 $v0, $f22 -/* A10C1C 8024039C 00000000 */ nop -/* A10C20 802403A0 4680B5A0 */ cvt.s.w $f22, $f22 -/* A10C24 802403A4 0C00A67F */ jal rand_int -/* A10C28 802403A8 2404012C */ addiu $a0, $zero, 0x12c -/* A10C2C 802403AC 24040064 */ addiu $a0, $zero, 0x64 -/* A10C30 802403B0 2442FF6A */ addiu $v0, $v0, -0x96 -/* A10C34 802403B4 44823000 */ mtc1 $v0, $f6 -/* A10C38 802403B8 00000000 */ nop -/* A10C3C 802403BC 468031A0 */ cvt.s.w $f6, $f6 -/* A10C40 802403C0 0C00A67F */ jal rand_int -/* A10C44 802403C4 E7A60028 */ swc1 $f6, 0x28($sp) -/* A10C48 802403C8 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* A10C4C 802403CC 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* A10C50 802403D0 24420032 */ addiu $v0, $v0, 0x32 -/* A10C54 802403D4 C602002C */ lwc1 $f2, 0x2c($s0) -/* A10C58 802403D8 3C01437A */ lui $at, 0x437a -/* A10C5C 802403DC 44810000 */ mtc1 $at, $f0 -/* A10C60 802403E0 4482A000 */ mtc1 $v0, $f20 -/* A10C64 802403E4 00000000 */ nop -/* A10C68 802403E8 4680A520 */ cvt.s.w $f20, $f20 -/* A10C6C 802403EC 4602003E */ c.le.s $f0, $f2 -/* A10C70 802403F0 00000000 */ nop -/* A10C74 802403F4 45010045 */ bc1t .L8024050C -/* A10C78 802403F8 24020002 */ addiu $v0, $zero, 2 -/* A10C7C 802403FC 0C00A85B */ jal sin_rad -/* A10C80 80240400 4600F306 */ mov.s $f12, $f30 -/* A10C84 80240404 4600A002 */ mul.s $f0, $f20, $f0 -/* A10C88 80240408 00000000 */ nop -/* A10C8C 8024040C C61A0028 */ lwc1 $f26, 0x28($s0) -/* A10C90 80240410 C7AC0020 */ lwc1 $f12, 0x20($sp) -/* A10C94 80240414 0C00A85B */ jal sin_rad -/* A10C98 80240418 4600D681 */ sub.s $f26, $f26, $f0 -/* A10C9C 8024041C 4600B002 */ mul.s $f0, $f22, $f0 -/* A10CA0 80240420 00000000 */ nop -/* A10CA4 80240424 C61C002C */ lwc1 $f28, 0x2c($s0) -/* A10CA8 80240428 4600D680 */ add.s $f26, $f26, $f0 -/* A10CAC 8024042C 3C014348 */ lui $at, 0x4348 -/* A10CB0 80240430 44810000 */ mtc1 $at, $f0 -/* A10CB4 80240434 00000000 */ nop -/* A10CB8 80240438 4600E700 */ add.s $f28, $f28, $f0 -/* A10CBC 8024043C 0C00A874 */ jal cos_rad -/* A10CC0 80240440 4600F306 */ mov.s $f12, $f30 -/* A10CC4 80240444 4600A002 */ mul.s $f0, $f20, $f0 -/* A10CC8 80240448 00000000 */ nop -/* A10CCC 8024044C C6180030 */ lwc1 $f24, 0x30($s0) -/* A10CD0 80240450 C7AC0020 */ lwc1 $f12, 0x20($sp) -/* A10CD4 80240454 0C00A874 */ jal cos_rad -/* A10CD8 80240458 4600C600 */ add.s $f24, $f24, $f0 -/* A10CDC 8024045C 4600B002 */ mul.s $f0, $f22, $f0 -/* A10CE0 80240460 00000000 */ nop -/* A10CE4 80240464 4600C601 */ sub.s $f24, $f24, $f0 -/* A10CE8 80240468 0C00A85B */ jal sin_rad -/* A10CEC 8024046C 4600F306 */ mov.s $f12, $f30 -/* A10CF0 80240470 4600A002 */ mul.s $f0, $f20, $f0 -/* A10CF4 80240474 00000000 */ nop -/* A10CF8 80240478 C6160028 */ lwc1 $f22, 0x28($s0) -/* A10CFC 8024047C C7AC0024 */ lwc1 $f12, 0x24($sp) -/* A10D00 80240480 0C00A85B */ jal sin_rad -/* A10D04 80240484 4600B581 */ sub.s $f22, $f22, $f0 -/* A10D08 80240488 C7A60028 */ lwc1 $f6, 0x28($sp) -/* A10D0C 8024048C 46003002 */ mul.s $f0, $f6, $f0 -/* A10D10 80240490 00000000 */ nop -/* A10D14 80240494 4600F306 */ mov.s $f12, $f30 -/* A10D18 80240498 C61E002C */ lwc1 $f30, 0x2c($s0) -/* A10D1C 8024049C 0C00A874 */ jal cos_rad -/* A10D20 802404A0 4600B580 */ add.s $f22, $f22, $f0 -/* A10D24 802404A4 4600A002 */ mul.s $f0, $f20, $f0 -/* A10D28 802404A8 00000000 */ nop -/* A10D2C 802404AC C6140030 */ lwc1 $f20, 0x30($s0) -/* A10D30 802404B0 C7AC0024 */ lwc1 $f12, 0x24($sp) -/* A10D34 802404B4 0C00A874 */ jal cos_rad -/* A10D38 802404B8 4600A500 */ add.s $f20, $f20, $f0 -/* A10D3C 802404BC C7A60028 */ lwc1 $f6, 0x28($sp) -/* A10D40 802404C0 46003002 */ mul.s $f0, $f6, $f0 -/* A10D44 802404C4 00000000 */ nop -/* A10D48 802404C8 2404000A */ addiu $a0, $zero, 0xa -/* A10D4C 802404CC 0C00A67F */ jal rand_int -/* A10D50 802404D0 4600A501 */ sub.s $f20, $f20, $f0 -/* A10D54 802404D4 24040001 */ addiu $a0, $zero, 1 -/* A10D58 802404D8 2442000A */ addiu $v0, $v0, 0xa -/* A10D5C 802404DC 4405D000 */ mfc1 $a1, $f26 -/* A10D60 802404E0 4406E000 */ mfc1 $a2, $f28 -/* A10D64 802404E4 4407C000 */ mfc1 $a3, $f24 -/* A10D68 802404E8 44820000 */ mtc1 $v0, $f0 -/* A10D6C 802404EC 00000000 */ nop -/* A10D70 802404F0 46800020 */ cvt.s.w $f0, $f0 -/* A10D74 802404F4 E7B60010 */ swc1 $f22, 0x10($sp) -/* A10D78 802404F8 E7BE0014 */ swc1 $f30, 0x14($sp) -/* A10D7C 802404FC E7A0001C */ swc1 $f0, 0x1c($sp) -/* A10D80 80240500 0C01BF8C */ jal playFX_0F -/* A10D84 80240504 E7B40018 */ swc1 $f20, 0x18($sp) -/* A10D88 80240508 24020002 */ addiu $v0, $zero, 2 -.L8024050C: -/* A10D8C 8024050C 8FBF0034 */ lw $ra, 0x34($sp) -/* A10D90 80240510 8FB00030 */ lw $s0, 0x30($sp) -/* A10D94 80240514 D7BE0060 */ ldc1 $f30, 0x60($sp) -/* A10D98 80240518 D7BC0058 */ ldc1 $f28, 0x58($sp) -/* A10D9C 8024051C D7BA0050 */ ldc1 $f26, 0x50($sp) -/* A10DA0 80240520 D7B80048 */ ldc1 $f24, 0x48($sp) -/* A10DA4 80240524 D7B60040 */ ldc1 $f22, 0x40($sp) -/* A10DA8 80240528 D7B40038 */ ldc1 $f20, 0x38($sp) -/* A10DAC 8024052C 03E00008 */ jr $ra -/* A10DB0 80240530 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_01/A10880/func_80240534_A10DB4.s b/ver/us/asm/nonmatchings/world/area_hos/hos_01/A10880/func_80240534_A10DB4.s deleted file mode 100644 index b7a334e152..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_01/A10880/func_80240534_A10DB4.s +++ /dev/null @@ -1,153 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80245980_A16200 -.double 1.570796, 3.025273167335323e+209, 1.1479345581362125e+195, 1.1479345581532089e+195 - -.section .text - -glabel func_80240534_A10DB4 -/* A10DB4 80240534 27BDFF90 */ addiu $sp, $sp, -0x70 -/* A10DB8 80240538 AFB10034 */ sw $s1, 0x34($sp) -/* A10DBC 8024053C 0080882D */ daddu $s1, $a0, $zero -/* A10DC0 80240540 3C01800B */ lui $at, %hi(gCameras+0x6C) -/* A10DC4 80240544 C4201DEC */ lwc1 $f0, %lo(gCameras+0x6C)($at) -/* A10DC8 80240548 3C014334 */ lui $at, 0x4334 -/* A10DCC 8024054C 44811000 */ mtc1 $at, $f2 -/* A10DD0 80240550 3C014049 */ lui $at, 0x4049 -/* A10DD4 80240554 34210FD8 */ ori $at, $at, 0xfd8 -/* A10DD8 80240558 44812000 */ mtc1 $at, $f4 -/* A10DDC 8024055C 24040096 */ addiu $a0, $zero, 0x96 -/* A10DE0 80240560 AFBF0038 */ sw $ra, 0x38($sp) -/* A10DE4 80240564 F7BE0068 */ sdc1 $f30, 0x68($sp) -/* A10DE8 80240568 46020003 */ div.s $f0, $f0, $f2 -/* A10DEC 8024056C 46040782 */ mul.s $f30, $f0, $f4 -/* A10DF0 80240570 00000000 */ nop -/* A10DF4 80240574 AFB00030 */ sw $s0, 0x30($sp) -/* A10DF8 80240578 F7BC0060 */ sdc1 $f28, 0x60($sp) -/* A10DFC 8024057C F7BA0058 */ sdc1 $f26, 0x58($sp) -/* A10E00 80240580 3C018024 */ lui $at, %hi(D_80245980_A16200) -/* A10E04 80240584 D4225980 */ ldc1 $f2, %lo(D_80245980_A16200)($at) -/* A10E08 80240588 4600F021 */ cvt.d.s $f0, $f30 -/* A10E0C 8024058C 46220100 */ add.d $f4, $f0, $f2 -/* A10E10 80240590 F7B80050 */ sdc1 $f24, 0x50($sp) -/* A10E14 80240594 F7B60048 */ sdc1 $f22, 0x48($sp) -/* A10E18 80240598 46220001 */ sub.d $f0, $f0, $f2 -/* A10E1C 8024059C F7B40040 */ sdc1 $f20, 0x40($sp) -/* A10E20 802405A0 46202120 */ cvt.s.d $f4, $f4 -/* A10E24 802405A4 46200020 */ cvt.s.d $f0, $f0 -/* A10E28 802405A8 E7A40020 */ swc1 $f4, 0x20($sp) -/* A10E2C 802405AC 0C00A67F */ jal rand_int -/* A10E30 802405B0 E7A00024 */ swc1 $f0, 0x24($sp) -/* A10E34 802405B4 24040096 */ addiu $a0, $zero, 0x96 -/* A10E38 802405B8 44823000 */ mtc1 $v0, $f6 -/* A10E3C 802405BC 00000000 */ nop -/* A10E40 802405C0 468031A0 */ cvt.s.w $f6, $f6 -/* A10E44 802405C4 0C00A67F */ jal rand_int -/* A10E48 802405C8 E7A60028 */ swc1 $f6, 0x28($sp) -/* A10E4C 802405CC 24040064 */ addiu $a0, $zero, 0x64 -/* A10E50 802405D0 44823000 */ mtc1 $v0, $f6 -/* A10E54 802405D4 00000000 */ nop -/* A10E58 802405D8 468031A0 */ cvt.s.w $f6, $f6 -/* A10E5C 802405DC 0C00A67F */ jal rand_int -/* A10E60 802405E0 E7A6002C */ swc1 $f6, 0x2c($sp) -/* A10E64 802405E4 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* A10E68 802405E8 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* A10E6C 802405EC 2442FFCE */ addiu $v0, $v0, -0x32 -/* A10E70 802405F0 C6000030 */ lwc1 $f0, 0x30($s0) -/* A10E74 802405F4 3C014348 */ lui $at, 0x4348 -/* A10E78 802405F8 4481B000 */ mtc1 $at, $f22 -/* A10E7C 802405FC 4482A000 */ mtc1 $v0, $f20 -/* A10E80 80240600 00000000 */ nop -/* A10E84 80240604 4680A520 */ cvt.s.w $f20, $f20 -/* A10E88 80240608 4616003C */ c.lt.s $f0, $f22 -/* A10E8C 8024060C 00000000 */ nop -/* A10E90 80240610 4501004A */ bc1t .L8024073C -/* A10E94 80240614 24020002 */ addiu $v0, $zero, 2 -/* A10E98 80240618 0C00A85B */ jal sin_rad -/* A10E9C 8024061C 4600F306 */ mov.s $f12, $f30 -/* A10EA0 80240620 4600A002 */ mul.s $f0, $f20, $f0 -/* A10EA4 80240624 00000000 */ nop -/* A10EA8 80240628 C61A0028 */ lwc1 $f26, 0x28($s0) -/* A10EAC 8024062C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* A10EB0 80240630 0C00A85B */ jal sin_rad -/* A10EB4 80240634 4600D681 */ sub.s $f26, $f26, $f0 -/* A10EB8 80240638 C7A60028 */ lwc1 $f6, 0x28($sp) -/* A10EBC 8024063C 46003002 */ mul.s $f0, $f6, $f0 -/* A10EC0 80240640 00000000 */ nop -/* A10EC4 80240644 C61C002C */ lwc1 $f28, 0x2c($s0) -/* A10EC8 80240648 4616E700 */ add.s $f28, $f28, $f22 -/* A10ECC 8024064C 4600D680 */ add.s $f26, $f26, $f0 -/* A10ED0 80240650 0C00A874 */ jal cos_rad -/* A10ED4 80240654 4600F306 */ mov.s $f12, $f30 -/* A10ED8 80240658 4600A002 */ mul.s $f0, $f20, $f0 -/* A10EDC 8024065C 00000000 */ nop -/* A10EE0 80240660 C6180030 */ lwc1 $f24, 0x30($s0) -/* A10EE4 80240664 C7AC0020 */ lwc1 $f12, 0x20($sp) -/* A10EE8 80240668 0C00A874 */ jal cos_rad -/* A10EEC 8024066C 4600C600 */ add.s $f24, $f24, $f0 -/* A10EF0 80240670 C7A60028 */ lwc1 $f6, 0x28($sp) -/* A10EF4 80240674 46003002 */ mul.s $f0, $f6, $f0 -/* A10EF8 80240678 00000000 */ nop -/* A10EFC 8024067C 4600C601 */ sub.s $f24, $f24, $f0 -/* A10F00 80240680 4600D18D */ trunc.w.s $f6, $f26 -/* A10F04 80240684 E6260088 */ swc1 $f6, 0x88($s1) -/* A10F08 80240688 4600E18D */ trunc.w.s $f6, $f28 -/* A10F0C 8024068C E626008C */ swc1 $f6, 0x8c($s1) -/* A10F10 80240690 4600C18D */ trunc.w.s $f6, $f24 -/* A10F14 80240694 E6260090 */ swc1 $f6, 0x90($s1) -/* A10F18 80240698 0C00A85B */ jal sin_rad -/* A10F1C 8024069C 4600F306 */ mov.s $f12, $f30 -/* A10F20 802406A0 4600A002 */ mul.s $f0, $f20, $f0 -/* A10F24 802406A4 00000000 */ nop -/* A10F28 802406A8 C6160028 */ lwc1 $f22, 0x28($s0) -/* A10F2C 802406AC C7AC0024 */ lwc1 $f12, 0x24($sp) -/* A10F30 802406B0 0C00A85B */ jal sin_rad -/* A10F34 802406B4 4600B581 */ sub.s $f22, $f22, $f0 -/* A10F38 802406B8 C7A6002C */ lwc1 $f6, 0x2c($sp) -/* A10F3C 802406BC 46003002 */ mul.s $f0, $f6, $f0 -/* A10F40 802406C0 00000000 */ nop -/* A10F44 802406C4 4600F306 */ mov.s $f12, $f30 -/* A10F48 802406C8 C61E002C */ lwc1 $f30, 0x2c($s0) -/* A10F4C 802406CC 0C00A874 */ jal cos_rad -/* A10F50 802406D0 4600B580 */ add.s $f22, $f22, $f0 -/* A10F54 802406D4 4600A002 */ mul.s $f0, $f20, $f0 -/* A10F58 802406D8 00000000 */ nop -/* A10F5C 802406DC C6140030 */ lwc1 $f20, 0x30($s0) -/* A10F60 802406E0 C7AC0024 */ lwc1 $f12, 0x24($sp) -/* A10F64 802406E4 0C00A874 */ jal cos_rad -/* A10F68 802406E8 4600A500 */ add.s $f20, $f20, $f0 -/* A10F6C 802406EC C7A6002C */ lwc1 $f6, 0x2c($sp) -/* A10F70 802406F0 46003002 */ mul.s $f0, $f6, $f0 -/* A10F74 802406F4 00000000 */ nop -/* A10F78 802406F8 24040004 */ addiu $a0, $zero, 4 -/* A10F7C 802406FC 0C00A67F */ jal rand_int -/* A10F80 80240700 4600A501 */ sub.s $f20, $f20, $f0 -/* A10F84 80240704 24040002 */ addiu $a0, $zero, 2 -/* A10F88 80240708 2442000A */ addiu $v0, $v0, 0xa -/* A10F8C 8024070C 4405D000 */ mfc1 $a1, $f26 -/* A10F90 80240710 4406E000 */ mfc1 $a2, $f28 -/* A10F94 80240714 4407C000 */ mfc1 $a3, $f24 -/* A10F98 80240718 44820000 */ mtc1 $v0, $f0 -/* A10F9C 8024071C 00000000 */ nop -/* A10FA0 80240720 46800020 */ cvt.s.w $f0, $f0 -/* A10FA4 80240724 E7B60010 */ swc1 $f22, 0x10($sp) -/* A10FA8 80240728 E7BE0014 */ swc1 $f30, 0x14($sp) -/* A10FAC 8024072C E7A0001C */ swc1 $f0, 0x1c($sp) -/* A10FB0 80240730 0C01BF8C */ jal playFX_0F -/* A10FB4 80240734 E7B40018 */ swc1 $f20, 0x18($sp) -/* A10FB8 80240738 24020002 */ addiu $v0, $zero, 2 -.L8024073C: -/* A10FBC 8024073C 8FBF0038 */ lw $ra, 0x38($sp) -/* A10FC0 80240740 8FB10034 */ lw $s1, 0x34($sp) -/* A10FC4 80240744 8FB00030 */ lw $s0, 0x30($sp) -/* A10FC8 80240748 D7BE0068 */ ldc1 $f30, 0x68($sp) -/* A10FCC 8024074C D7BC0060 */ ldc1 $f28, 0x60($sp) -/* A10FD0 80240750 D7BA0058 */ ldc1 $f26, 0x58($sp) -/* A10FD4 80240754 D7B80050 */ ldc1 $f24, 0x50($sp) -/* A10FD8 80240758 D7B60048 */ ldc1 $f22, 0x48($sp) -/* A10FDC 8024075C D7B40040 */ ldc1 $f20, 0x40($sp) -/* A10FE0 80240760 03E00008 */ jr $ra -/* A10FE4 80240764 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802403D4_97BA04.s b/ver/us/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802403D4_97BA04.s deleted file mode 100644 index 0bad9ea001..0000000000 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802403D4_97BA04.s +++ /dev/null @@ -1,309 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80242438_97DA68 -.word .L802407E0_97BE10, .L802407EC_97BE1C, .L802407EC_97BE1C, .L802407EC_97BE1C, .L802407EC_97BE1C, .L802407EC_97BE1C, .L802407EC_97BE1C, .L802407EC_97BE1C, .L802407E0_97BE10, .L802407EC_97BE1C, .L802407E0_97BE10, .L802407EC_97BE1C, .L802407E0_97BE10, .L802407EC_97BE1C, .L802407E0_97BE10, .L802407EC_97BE1C, .L802407EC_97BE1C, .L802407EC_97BE1C, .L802407E0_97BE10, .L802407EC_97BE1C, .L802407E0_97BE10, 0 - -.section .text - -glabel func_802403D4_97BA04 -/* 97BA04 802403D4 27BDFF90 */ addiu $sp, $sp, -0x70 -/* 97BA08 802403D8 AFB3005C */ sw $s3, 0x5c($sp) -/* 97BA0C 802403DC 0080982D */ daddu $s3, $a0, $zero -/* 97BA10 802403E0 AFBF0068 */ sw $ra, 0x68($sp) -/* 97BA14 802403E4 AFB50064 */ sw $s5, 0x64($sp) -/* 97BA18 802403E8 AFB40060 */ sw $s4, 0x60($sp) -/* 97BA1C 802403EC AFB20058 */ sw $s2, 0x58($sp) -/* 97BA20 802403F0 AFB10054 */ sw $s1, 0x54($sp) -/* 97BA24 802403F4 AFB00050 */ sw $s0, 0x50($sp) -/* 97BA28 802403F8 8E710148 */ lw $s1, 0x148($s3) -/* 97BA2C 802403FC 86240008 */ lh $a0, 8($s1) -/* 97BA30 80240400 0C00EABB */ jal get_npc_unsafe -/* 97BA34 80240404 00A0802D */ daddu $s0, $a1, $zero -/* 97BA38 80240408 8E63000C */ lw $v1, 0xc($s3) -/* 97BA3C 8024040C 0260202D */ daddu $a0, $s3, $zero -/* 97BA40 80240410 8C650000 */ lw $a1, ($v1) -/* 97BA44 80240414 0C0B1EAF */ jal evt_get_variable -/* 97BA48 80240418 0040902D */ daddu $s2, $v0, $zero -/* 97BA4C 8024041C AFA00028 */ sw $zero, 0x28($sp) -/* 97BA50 80240420 8E2300D0 */ lw $v1, 0xd0($s1) -/* 97BA54 80240424 8C630030 */ lw $v1, 0x30($v1) -/* 97BA58 80240428 AFA3002C */ sw $v1, 0x2c($sp) -/* 97BA5C 8024042C 8E2300D0 */ lw $v1, 0xd0($s1) -/* 97BA60 80240430 8C63001C */ lw $v1, 0x1c($v1) -/* 97BA64 80240434 AFA30030 */ sw $v1, 0x30($sp) -/* 97BA68 80240438 8E2300D0 */ lw $v1, 0xd0($s1) -/* 97BA6C 8024043C 8C630024 */ lw $v1, 0x24($v1) -/* 97BA70 80240440 AFA30034 */ sw $v1, 0x34($sp) -/* 97BA74 80240444 8E2300D0 */ lw $v1, 0xd0($s1) -/* 97BA78 80240448 8C630028 */ lw $v1, 0x28($v1) -/* 97BA7C 8024044C 27B50028 */ addiu $s5, $sp, 0x28 -/* 97BA80 80240450 AFA30038 */ sw $v1, 0x38($sp) -/* 97BA84 80240454 8E2300D0 */ lw $v1, 0xd0($s1) -/* 97BA88 80240458 3C0142C8 */ lui $at, 0x42c8 -/* 97BA8C 8024045C 44810000 */ mtc1 $at, $f0 -/* 97BA90 80240460 8C63002C */ lw $v1, 0x2c($v1) -/* 97BA94 80240464 0040A02D */ daddu $s4, $v0, $zero -/* 97BA98 80240468 E7A00040 */ swc1 $f0, 0x40($sp) -/* 97BA9C 8024046C A7A00044 */ sh $zero, 0x44($sp) -/* 97BAA0 80240470 12000009 */ beqz $s0, .L80240498 -/* 97BAA4 80240474 AFA3003C */ sw $v1, 0x3c($sp) -/* 97BAA8 80240478 864300A8 */ lh $v1, 0xa8($s2) -/* 97BAAC 8024047C 8E2200B0 */ lw $v0, 0xb0($s1) -/* 97BAB0 80240480 AE20008C */ sw $zero, 0x8c($s1) -/* 97BAB4 80240484 A22000B5 */ sb $zero, 0xb5($s1) -/* 97BAB8 80240488 34420008 */ ori $v0, $v0, 8 -/* 97BABC 8024048C AE230084 */ sw $v1, 0x84($s1) -/* 97BAC0 80240490 0809012A */ j .L802404A8 -/* 97BAC4 80240494 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240498: -/* 97BAC8 80240498 8E2200B0 */ lw $v0, 0xb0($s1) -/* 97BACC 8024049C 30420004 */ andi $v0, $v0, 4 -/* 97BAD0 802404A0 10400047 */ beqz $v0, .L802405C0 -/* 97BAD4 802404A4 00000000 */ nop -.L802404A8: -/* 97BAD8 802404A8 AE600070 */ sw $zero, 0x70($s3) -/* 97BADC 802404AC A640008E */ sh $zero, 0x8e($s2) -/* 97BAE0 802404B0 8E2300CC */ lw $v1, 0xcc($s1) -/* 97BAE4 802404B4 2404F7FF */ addiu $a0, $zero, -0x801 -/* 97BAE8 802404B8 A2200007 */ sb $zero, 7($s1) -/* 97BAEC 802404BC 8E420000 */ lw $v0, ($s2) -/* 97BAF0 802404C0 8C630000 */ lw $v1, ($v1) -/* 97BAF4 802404C4 00441024 */ and $v0, $v0, $a0 -/* 97BAF8 802404C8 AE420000 */ sw $v0, ($s2) -/* 97BAFC 802404CC AE430028 */ sw $v1, 0x28($s2) -/* 97BB00 802404D0 96220086 */ lhu $v0, 0x86($s1) -/* 97BB04 802404D4 A64200A8 */ sh $v0, 0xa8($s2) -/* 97BB08 802404D8 8E2200D0 */ lw $v0, 0xd0($s1) -/* 97BB0C 802404DC AE200090 */ sw $zero, 0x90($s1) -/* 97BB10 802404E0 8C420034 */ lw $v0, 0x34($v0) -/* 97BB14 802404E4 14400006 */ bnez $v0, .L80240500 -/* 97BB18 802404E8 2403FDFF */ addiu $v1, $zero, -0x201 -/* 97BB1C 802404EC 8E420000 */ lw $v0, ($s2) -/* 97BB20 802404F0 2403FFF7 */ addiu $v1, $zero, -9 -/* 97BB24 802404F4 34420200 */ ori $v0, $v0, 0x200 -/* 97BB28 802404F8 08090143 */ j .L8024050C -/* 97BB2C 802404FC 00431024 */ and $v0, $v0, $v1 -.L80240500: -/* 97BB30 80240500 8E420000 */ lw $v0, ($s2) -/* 97BB34 80240504 00431024 */ and $v0, $v0, $v1 -/* 97BB38 80240508 34420008 */ ori $v0, $v0, 8 -.L8024050C: -/* 97BB3C 8024050C AE420000 */ sw $v0, ($s2) -/* 97BB40 80240510 8E2200B0 */ lw $v0, 0xb0($s1) -/* 97BB44 80240514 30420004 */ andi $v0, $v0, 4 -/* 97BB48 80240518 1040001E */ beqz $v0, .L80240594 -/* 97BB4C 8024051C 24040002 */ addiu $a0, $zero, 2 -/* 97BB50 80240520 0240282D */ daddu $a1, $s2, $zero -/* 97BB54 80240524 0000302D */ daddu $a2, $zero, $zero -/* 97BB58 80240528 24020063 */ addiu $v0, $zero, 0x63 -/* 97BB5C 8024052C AE620070 */ sw $v0, 0x70($s3) -/* 97BB60 80240530 AE600074 */ sw $zero, 0x74($s3) -/* 97BB64 80240534 864300A8 */ lh $v1, 0xa8($s2) -/* 97BB68 80240538 3C013F80 */ lui $at, 0x3f80 -/* 97BB6C 8024053C 44810000 */ mtc1 $at, $f0 -/* 97BB70 80240540 3C014000 */ lui $at, 0x4000 -/* 97BB74 80240544 44811000 */ mtc1 $at, $f2 -/* 97BB78 80240548 3C01C1A0 */ lui $at, 0xc1a0 -/* 97BB7C 8024054C 44812000 */ mtc1 $at, $f4 -/* 97BB80 80240550 24020028 */ addiu $v0, $zero, 0x28 -/* 97BB84 80240554 AFA2001C */ sw $v0, 0x1c($sp) -/* 97BB88 80240558 44833000 */ mtc1 $v1, $f6 -/* 97BB8C 8024055C 00000000 */ nop -/* 97BB90 80240560 468031A0 */ cvt.s.w $f6, $f6 -/* 97BB94 80240564 44073000 */ mfc1 $a3, $f6 -/* 97BB98 80240568 27A20048 */ addiu $v0, $sp, 0x48 -/* 97BB9C 8024056C AFA20020 */ sw $v0, 0x20($sp) -/* 97BBA0 80240570 E7A00010 */ swc1 $f0, 0x10($sp) -/* 97BBA4 80240574 E7A20014 */ swc1 $f2, 0x14($sp) -/* 97BBA8 80240578 0C01BFA4 */ jal fx_emote -/* 97BBAC 8024057C E7A40018 */ swc1 $f4, 0x18($sp) -/* 97BBB0 80240580 8E2200B0 */ lw $v0, 0xb0($s1) -/* 97BBB4 80240584 2403FFFB */ addiu $v1, $zero, -5 -/* 97BBB8 80240588 00431024 */ and $v0, $v0, $v1 -/* 97BBBC 8024058C 08090170 */ j .L802405C0 -/* 97BBC0 80240590 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240594: -/* 97BBC4 80240594 8E220000 */ lw $v0, ($s1) -/* 97BBC8 80240598 3C034000 */ lui $v1, 0x4000 -/* 97BBCC 8024059C 00431024 */ and $v0, $v0, $v1 -/* 97BBD0 802405A0 10400007 */ beqz $v0, .L802405C0 -/* 97BBD4 802405A4 3C03BFFF */ lui $v1, 0xbfff -/* 97BBD8 802405A8 2402000C */ addiu $v0, $zero, 0xc -/* 97BBDC 802405AC AE620070 */ sw $v0, 0x70($s3) -/* 97BBE0 802405B0 8E220000 */ lw $v0, ($s1) -/* 97BBE4 802405B4 3463FFFF */ ori $v1, $v1, 0xffff -/* 97BBE8 802405B8 00431024 */ and $v0, $v0, $v1 -/* 97BBEC 802405BC AE220000 */ sw $v0, ($s1) -.L802405C0: -/* 97BBF0 802405C0 8E220090 */ lw $v0, 0x90($s1) -/* 97BBF4 802405C4 1840000C */ blez $v0, .L802405F8 -/* 97BBF8 802405C8 2442FFFF */ addiu $v0, $v0, -1 -/* 97BBFC 802405CC 14400087 */ bnez $v0, .L802407EC_97BE1C -/* 97BC00 802405D0 AE220090 */ sw $v0, 0x90($s1) -/* 97BC04 802405D4 3C03FFAA */ lui $v1, 0xffaa -/* 97BC08 802405D8 8E420028 */ lw $v0, 0x28($s2) -/* 97BC0C 802405DC 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* 97BC10 802405E0 00431021 */ addu $v0, $v0, $v1 -/* 97BC14 802405E4 2C420002 */ sltiu $v0, $v0, 2 -/* 97BC18 802405E8 10400003 */ beqz $v0, .L802405F8 -/* 97BC1C 802405EC 3C020055 */ lui $v0, 0x55 -/* 97BC20 802405F0 3442000C */ ori $v0, $v0, 0xc -/* 97BC24 802405F4 AE420028 */ sw $v0, 0x28($s2) -.L802405F8: -/* 97BC28 802405F8 8E630070 */ lw $v1, 0x70($s3) -/* 97BC2C 802405FC 2402000C */ addiu $v0, $zero, 0xc -/* 97BC30 80240600 10620048 */ beq $v1, $v0, .L80240724 -/* 97BC34 80240604 2862000D */ slti $v0, $v1, 0xd -/* 97BC38 80240608 1040000F */ beqz $v0, .L80240648 -/* 97BC3C 8024060C 24100001 */ addiu $s0, $zero, 1 -/* 97BC40 80240610 1070001E */ beq $v1, $s0, .L8024068C -/* 97BC44 80240614 28620002 */ slti $v0, $v1, 2 -/* 97BC48 80240618 10400005 */ beqz $v0, .L80240630 -/* 97BC4C 8024061C 24020002 */ addiu $v0, $zero, 2 -/* 97BC50 80240620 10600015 */ beqz $v1, .L80240678 -/* 97BC54 80240624 0260202D */ daddu $a0, $s3, $zero -/* 97BC58 80240628 080901E0 */ j .L80240780 -/* 97BC5C 8024062C 00000000 */ nop -.L80240630: -/* 97BC60 80240630 1062001C */ beq $v1, $v0, .L802406A4 -/* 97BC64 80240634 24020003 */ addiu $v0, $zero, 3 -/* 97BC68 80240638 10620035 */ beq $v1, $v0, .L80240710 -/* 97BC6C 8024063C 0260202D */ daddu $a0, $s3, $zero -/* 97BC70 80240640 080901E0 */ j .L80240780 -/* 97BC74 80240644 00000000 */ nop -.L80240648: -/* 97BC78 80240648 2402000E */ addiu $v0, $zero, 0xe -/* 97BC7C 8024064C 1062003F */ beq $v1, $v0, .L8024074C -/* 97BC80 80240650 0062102A */ slt $v0, $v1, $v0 -/* 97BC84 80240654 14400038 */ bnez $v0, .L80240738 -/* 97BC88 80240658 0260202D */ daddu $a0, $s3, $zero -/* 97BC8C 8024065C 2402000F */ addiu $v0, $zero, 0xf -/* 97BC90 80240660 10620040 */ beq $v1, $v0, .L80240764 -/* 97BC94 80240664 24020063 */ addiu $v0, $zero, 0x63 -/* 97BC98 80240668 10620043 */ beq $v1, $v0, .L80240778 -/* 97BC9C 8024066C 00000000 */ nop -/* 97BCA0 80240670 080901E0 */ j .L80240780 -/* 97BCA4 80240674 00000000 */ nop -.L80240678: -/* 97BCA8 80240678 0280282D */ daddu $a1, $s4, $zero -/* 97BCAC 8024067C 0C012568 */ jal func_800495A0 -/* 97BCB0 80240680 02A0302D */ daddu $a2, $s5, $zero -/* 97BCB4 80240684 96220086 */ lhu $v0, 0x86($s1) -/* 97BCB8 80240688 A64200A8 */ sh $v0, 0xa8($s2) -.L8024068C: -/* 97BCBC 8024068C 0260202D */ daddu $a0, $s3, $zero -/* 97BCC0 80240690 0280282D */ daddu $a1, $s4, $zero -/* 97BCC4 80240694 0C0125AE */ jal func_800496B8 -/* 97BCC8 80240698 02A0302D */ daddu $a2, $s5, $zero -/* 97BCCC 8024069C 080901E0 */ j .L80240780 -/* 97BCD0 802406A0 00000000 */ nop -.L802406A4: -/* 97BCD4 802406A4 0260202D */ daddu $a0, $s3, $zero -/* 97BCD8 802406A8 0280282D */ daddu $a1, $s4, $zero -/* 97BCDC 802406AC 0C0126D1 */ jal base_UnkNpcAIFunc1 -/* 97BCE0 802406B0 02A0302D */ daddu $a2, $s5, $zero -/* 97BCE4 802406B4 8E230088 */ lw $v1, 0x88($s1) -/* 97BCE8 802406B8 24020006 */ addiu $v0, $zero, 6 -/* 97BCEC 802406BC 14620014 */ bne $v1, $v0, .L80240710 -/* 97BCF0 802406C0 0260202D */ daddu $a0, $s3, $zero -/* 97BCF4 802406C4 0C00A67F */ jal rand_int -/* 97BCF8 802406C8 24040064 */ addiu $a0, $zero, 0x64 -/* 97BCFC 802406CC 28420021 */ slti $v0, $v0, 0x21 -/* 97BD00 802406D0 5040000F */ beql $v0, $zero, .L80240710 -/* 97BD04 802406D4 0260202D */ daddu $a0, $s3, $zero -/* 97BD08 802406D8 8E22008C */ lw $v0, 0x8c($s1) -/* 97BD0C 802406DC 10400005 */ beqz $v0, .L802406F4 -/* 97BD10 802406E0 3C020055 */ lui $v0, 0x55 -/* 97BD14 802406E4 3442002F */ ori $v0, $v0, 0x2f -/* 97BD18 802406E8 AE20008C */ sw $zero, 0x8c($s1) -/* 97BD1C 802406EC 080901C0 */ j .L80240700 -/* 97BD20 802406F0 A22000B5 */ sb $zero, 0xb5($s1) -.L802406F4: -/* 97BD24 802406F4 3442002E */ ori $v0, $v0, 0x2e -/* 97BD28 802406F8 AE30008C */ sw $s0, 0x8c($s1) -/* 97BD2C 802406FC A23000B5 */ sb $s0, 0xb5($s1) -.L80240700: -/* 97BD30 80240700 AE420028 */ sw $v0, 0x28($s2) -/* 97BD34 80240704 24020007 */ addiu $v0, $zero, 7 -/* 97BD38 80240708 080901FB */ j .L802407EC_97BE1C -/* 97BD3C 8024070C AE220090 */ sw $v0, 0x90($s1) -.L80240710: -/* 97BD40 80240710 0280282D */ daddu $a1, $s4, $zero -/* 97BD44 80240714 0C012701 */ jal func_80049C04 -/* 97BD48 80240718 02A0302D */ daddu $a2, $s5, $zero -/* 97BD4C 8024071C 080901E0 */ j .L80240780 -/* 97BD50 80240720 00000000 */ nop -.L80240724: -/* 97BD54 80240724 0260202D */ daddu $a0, $s3, $zero -/* 97BD58 80240728 0280282D */ daddu $a1, $s4, $zero -/* 97BD5C 8024072C 0C090010 */ jal isk_04_set_script_owner_npc_anim -/* 97BD60 80240730 02A0302D */ daddu $a2, $s5, $zero -/* 97BD64 80240734 0260202D */ daddu $a0, $s3, $zero -.L80240738: -/* 97BD68 80240738 0280282D */ daddu $a1, $s4, $zero -/* 97BD6C 8024073C 0C09002F */ jal isk_04_UnkDistFunc -/* 97BD70 80240740 02A0302D */ daddu $a2, $s5, $zero -/* 97BD74 80240744 080901E0 */ j .L80240780 -/* 97BD78 80240748 00000000 */ nop -.L8024074C: -/* 97BD7C 8024074C 0260202D */ daddu $a0, $s3, $zero -/* 97BD80 80240750 0280282D */ daddu $a1, $s4, $zero -/* 97BD84 80240754 0C09007C */ jal isk_04_UnkNpcAIFunc12 -/* 97BD88 80240758 02A0302D */ daddu $a2, $s5, $zero -/* 97BD8C 8024075C 080901E0 */ j .L80240780 -/* 97BD90 80240760 00000000 */ nop -.L80240764: -/* 97BD94 80240764 0280282D */ daddu $a1, $s4, $zero -/* 97BD98 80240768 0C0900D5 */ jal isk_04_set_script_owner_npc_col_height -/* 97BD9C 8024076C 02A0302D */ daddu $a2, $s5, $zero -/* 97BDA0 80240770 080901E0 */ j .L80240780 -/* 97BDA4 80240774 00000000 */ nop -.L80240778: -/* 97BDA8 80240778 0C0129CF */ jal func_8004A73C -/* 97BDAC 8024077C 0260202D */ daddu $a0, $s3, $zero -.L80240780: -/* 97BDB0 80240780 8E230088 */ lw $v1, 0x88($s1) -/* 97BDB4 80240784 24020006 */ addiu $v0, $zero, 6 -/* 97BDB8 80240788 14620019 */ bne $v1, $v0, .L802407F0 -/* 97BDBC 8024078C 0000102D */ daddu $v0, $zero, $zero -/* 97BDC0 80240790 8E22008C */ lw $v0, 0x8c($s1) -/* 97BDC4 80240794 10400003 */ beqz $v0, .L802407A4 -/* 97BDC8 80240798 24020001 */ addiu $v0, $zero, 1 -/* 97BDCC 8024079C 080901EA */ j .L802407A8 -/* 97BDD0 802407A0 A22200B5 */ sb $v0, 0xb5($s1) -.L802407A4: -/* 97BDD4 802407A4 A22000B5 */ sb $zero, 0xb5($s1) -.L802407A8: -/* 97BDD8 802407A8 8E22008C */ lw $v0, 0x8c($s1) -/* 97BDDC 802407AC 1040000F */ beqz $v0, .L802407EC_97BE1C -/* 97BDE0 802407B0 3C03FFAA */ lui $v1, 0xffaa -/* 97BDE4 802407B4 8E420028 */ lw $v0, 0x28($s2) -/* 97BDE8 802407B8 3463FFFC */ ori $v1, $v1, 0xfffc -/* 97BDEC 802407BC 00431821 */ addu $v1, $v0, $v1 -/* 97BDF0 802407C0 2C620015 */ sltiu $v0, $v1, 0x15 -/* 97BDF4 802407C4 10400009 */ beqz $v0, .L802407EC_97BE1C -/* 97BDF8 802407C8 00031080 */ sll $v0, $v1, 2 -/* 97BDFC 802407CC 3C018024 */ lui $at, %hi(jtbl_80242438_97DA68) -/* 97BE00 802407D0 00220821 */ addu $at, $at, $v0 -/* 97BE04 802407D4 8C222438 */ lw $v0, %lo(jtbl_80242438_97DA68)($at) -/* 97BE08 802407D8 00400008 */ jr $v0 -/* 97BE0C 802407DC 00000000 */ nop -.L802407E0_97BE10: -/* 97BE10 802407E0 8E420028 */ lw $v0, 0x28($s2) -/* 97BE14 802407E4 24420001 */ addiu $v0, $v0, 1 -/* 97BE18 802407E8 AE420028 */ sw $v0, 0x28($s2) -.L802407EC_97BE1C: -/* 97BE1C 802407EC 0000102D */ daddu $v0, $zero, $zero -.L802407F0: -/* 97BE20 802407F0 8FBF0068 */ lw $ra, 0x68($sp) -/* 97BE24 802407F4 8FB50064 */ lw $s5, 0x64($sp) -/* 97BE28 802407F8 8FB40060 */ lw $s4, 0x60($sp) -/* 97BE2C 802407FC 8FB3005C */ lw $s3, 0x5c($sp) -/* 97BE30 80240800 8FB20058 */ lw $s2, 0x58($sp) -/* 97BE34 80240804 8FB10054 */ lw $s1, 0x54($sp) -/* 97BE38 80240808 8FB00050 */ lw $s0, 0x50($sp) -/* 97BE3C 8024080C 03E00008 */ jr $ra -/* 97BE40 80240810 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240E14_97E8E4.s b/ver/us/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240E14_97E8E4.s deleted file mode 100644 index 3e911bbc6c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240E14_97E8E4.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E14_97E8E4 -/* 97E8E4 80240E14 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 97E8E8 80240E18 AFB00010 */ sw $s0, 0x10($sp) -/* 97E8EC 80240E1C 0080802D */ daddu $s0, $a0, $zero -/* 97E8F0 80240E20 AFBF001C */ sw $ra, 0x1c($sp) -/* 97E8F4 80240E24 AFB20018 */ sw $s2, 0x18($sp) -/* 97E8F8 80240E28 AFB10014 */ sw $s1, 0x14($sp) -/* 97E8FC 80240E2C 8E020148 */ lw $v0, 0x148($s0) -/* 97E900 80240E30 00A0882D */ daddu $s1, $a1, $zero -/* 97E904 80240E34 84440008 */ lh $a0, 8($v0) -/* 97E908 80240E38 0C00EABB */ jal get_npc_unsafe -/* 97E90C 80240E3C 00C0902D */ daddu $s2, $a2, $zero -/* 97E910 80240E40 0200202D */ daddu $a0, $s0, $zero -/* 97E914 80240E44 0040802D */ daddu $s0, $v0, $zero -/* 97E918 80240E48 0220282D */ daddu $a1, $s1, $zero -/* 97E91C 80240E4C 0C012568 */ jal func_800495A0 -/* 97E920 80240E50 0240302D */ daddu $a2, $s2, $zero -/* 97E924 80240E54 0C00A67F */ jal rand_int -/* 97E928 80240E58 24040005 */ addiu $a0, $zero, 5 -/* 97E92C 80240E5C 3C014020 */ lui $at, 0x4020 -/* 97E930 80240E60 44811800 */ mtc1 $at, $f3 -/* 97E934 80240E64 44801000 */ mtc1 $zero, $f2 -/* 97E938 80240E68 44820000 */ mtc1 $v0, $f0 -/* 97E93C 80240E6C 00000000 */ nop -/* 97E940 80240E70 46800021 */ cvt.d.w $f0, $f0 -/* 97E944 80240E74 46220000 */ add.d $f0, $f0, $f2 -/* 97E948 80240E78 3C013FC0 */ lui $at, 0x3fc0 -/* 97E94C 80240E7C 44811000 */ mtc1 $at, $f2 -/* 97E950 80240E80 00000000 */ nop -/* 97E954 80240E84 E6020014 */ swc1 $f2, 0x14($s0) -/* 97E958 80240E88 46200020 */ cvt.s.d $f0, $f0 -/* 97E95C 80240E8C E600001C */ swc1 $f0, 0x1c($s0) -/* 97E960 80240E90 8FBF001C */ lw $ra, 0x1c($sp) -/* 97E964 80240E94 8FB20018 */ lw $s2, 0x18($sp) -/* 97E968 80240E98 8FB10014 */ lw $s1, 0x14($sp) -/* 97E96C 80240E9C 8FB00010 */ lw $s0, 0x10($sp) -/* 97E970 80240EA0 03E00008 */ jr $ra -/* 97E974 80240EA4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240EA8_97E978.s b/ver/us/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240EA8_97E978.s deleted file mode 100644 index 5f2f7052b9..0000000000 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240EA8_97E978.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EA8_97E978 -/* 97E978 80240EA8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 97E97C 80240EAC AFB00010 */ sw $s0, 0x10($sp) -/* 97E980 80240EB0 0080802D */ daddu $s0, $a0, $zero -/* 97E984 80240EB4 AFBF001C */ sw $ra, 0x1c($sp) -/* 97E988 80240EB8 AFB20018 */ sw $s2, 0x18($sp) -/* 97E98C 80240EBC AFB10014 */ sw $s1, 0x14($sp) -/* 97E990 80240EC0 8E020148 */ lw $v0, 0x148($s0) -/* 97E994 80240EC4 00A0882D */ daddu $s1, $a1, $zero -/* 97E998 80240EC8 84440008 */ lh $a0, 8($v0) -/* 97E99C 80240ECC 0C00EABB */ jal get_npc_unsafe -/* 97E9A0 80240ED0 00C0902D */ daddu $s2, $a2, $zero -/* 97E9A4 80240ED4 0200202D */ daddu $a0, $s0, $zero -/* 97E9A8 80240ED8 0040802D */ daddu $s0, $v0, $zero -/* 97E9AC 80240EDC 0220282D */ daddu $a1, $s1, $zero -/* 97E9B0 80240EE0 0C0127DF */ jal func_80049F7C -/* 97E9B4 80240EE4 0240302D */ daddu $a2, $s2, $zero -/* 97E9B8 80240EE8 0C00A67F */ jal rand_int -/* 97E9BC 80240EEC 24040005 */ addiu $a0, $zero, 5 -/* 97E9C0 80240EF0 3C014014 */ lui $at, 0x4014 -/* 97E9C4 80240EF4 44811800 */ mtc1 $at, $f3 -/* 97E9C8 80240EF8 44801000 */ mtc1 $zero, $f2 -/* 97E9CC 80240EFC 44820000 */ mtc1 $v0, $f0 -/* 97E9D0 80240F00 00000000 */ nop -/* 97E9D4 80240F04 46800021 */ cvt.d.w $f0, $f0 -/* 97E9D8 80240F08 46220000 */ add.d $f0, $f0, $f2 -/* 97E9DC 80240F0C 3C013FC0 */ lui $at, 0x3fc0 -/* 97E9E0 80240F10 44811000 */ mtc1 $at, $f2 -/* 97E9E4 80240F14 00000000 */ nop -/* 97E9E8 80240F18 E6020014 */ swc1 $f2, 0x14($s0) -/* 97E9EC 80240F1C 46200020 */ cvt.s.d $f0, $f0 -/* 97E9F0 80240F20 E600001C */ swc1 $f0, 0x1c($s0) -/* 97E9F4 80240F24 8FBF001C */ lw $ra, 0x1c($sp) -/* 97E9F8 80240F28 8FB20018 */ lw $s2, 0x18($sp) -/* 97E9FC 80240F2C 8FB10014 */ lw $s1, 0x14($sp) -/* 97EA00 80240F30 8FB00010 */ lw $s0, 0x10($sp) -/* 97EA04 80240F34 03E00008 */ jr $ra -/* 97EA08 80240F38 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240F3C_97EA0C.s b/ver/us/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240F3C_97EA0C.s deleted file mode 100644 index 7841f5c7fd..0000000000 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240F3C_97EA0C.s +++ /dev/null @@ -1,135 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80242EF8_9809C8 -.word .L80241058_97EB28, .L80241068_97EB38, .L80241080_97EB50, .L80241090_97EB60, .L802410E0_97EBB0, .L802410E0_97EBB0, .L802410E0_97EBB0, .L802410E0_97EBB0, .L802410E0_97EBB0, .L802410E0_97EBB0, .L802410E0_97EBB0, .L802410E0_97EBB0, .L802410A8_97EB78, .L802410B8_97EB88, .L802410D0_97EBA0, 0 - -.section .text - -glabel func_80240F3C_97EA0C -/* 97EA0C 80240F3C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 97EA10 80240F40 AFB40040 */ sw $s4, 0x40($sp) -/* 97EA14 80240F44 0080A02D */ daddu $s4, $a0, $zero -/* 97EA18 80240F48 AFBF0048 */ sw $ra, 0x48($sp) -/* 97EA1C 80240F4C AFB50044 */ sw $s5, 0x44($sp) -/* 97EA20 80240F50 AFB3003C */ sw $s3, 0x3c($sp) -/* 97EA24 80240F54 AFB20038 */ sw $s2, 0x38($sp) -/* 97EA28 80240F58 AFB10034 */ sw $s1, 0x34($sp) -/* 97EA2C 80240F5C AFB00030 */ sw $s0, 0x30($sp) -/* 97EA30 80240F60 8E920148 */ lw $s2, 0x148($s4) -/* 97EA34 80240F64 86440008 */ lh $a0, 8($s2) -/* 97EA38 80240F68 8E90000C */ lw $s0, 0xc($s4) -/* 97EA3C 80240F6C 0C00EABB */ jal get_npc_unsafe -/* 97EA40 80240F70 00A0882D */ daddu $s1, $a1, $zero -/* 97EA44 80240F74 0280202D */ daddu $a0, $s4, $zero -/* 97EA48 80240F78 8E050000 */ lw $a1, ($s0) -/* 97EA4C 80240F7C 0C0B1EAF */ jal evt_get_variable -/* 97EA50 80240F80 0040A82D */ daddu $s5, $v0, $zero -/* 97EA54 80240F84 AFA00010 */ sw $zero, 0x10($sp) -/* 97EA58 80240F88 8E4300D0 */ lw $v1, 0xd0($s2) -/* 97EA5C 80240F8C 8C630030 */ lw $v1, 0x30($v1) -/* 97EA60 80240F90 AFA30014 */ sw $v1, 0x14($sp) -/* 97EA64 80240F94 8E4300D0 */ lw $v1, 0xd0($s2) -/* 97EA68 80240F98 8C63001C */ lw $v1, 0x1c($v1) -/* 97EA6C 80240F9C AFA30018 */ sw $v1, 0x18($sp) -/* 97EA70 80240FA0 8E4300D0 */ lw $v1, 0xd0($s2) -/* 97EA74 80240FA4 8C630024 */ lw $v1, 0x24($v1) -/* 97EA78 80240FA8 AFA3001C */ sw $v1, 0x1c($sp) -/* 97EA7C 80240FAC 8E4300D0 */ lw $v1, 0xd0($s2) -/* 97EA80 80240FB0 8C630028 */ lw $v1, 0x28($v1) -/* 97EA84 80240FB4 27B30010 */ addiu $s3, $sp, 0x10 -/* 97EA88 80240FB8 AFA30020 */ sw $v1, 0x20($sp) -/* 97EA8C 80240FBC 8E4300D0 */ lw $v1, 0xd0($s2) -/* 97EA90 80240FC0 3C0142C8 */ lui $at, 0x42c8 -/* 97EA94 80240FC4 44810000 */ mtc1 $at, $f0 -/* 97EA98 80240FC8 8C63002C */ lw $v1, 0x2c($v1) -/* 97EA9C 80240FCC 0040802D */ daddu $s0, $v0, $zero -/* 97EAA0 80240FD0 E7A00028 */ swc1 $f0, 0x28($sp) -/* 97EAA4 80240FD4 A7A0002C */ sh $zero, 0x2c($sp) -/* 97EAA8 80240FD8 12200016 */ beqz $s1, .L80241034 -/* 97EAAC 80240FDC AFA30024 */ sw $v1, 0x24($sp) -/* 97EAB0 80240FE0 8EA20000 */ lw $v0, ($s5) -/* 97EAB4 80240FE4 2403F7FF */ addiu $v1, $zero, -0x801 -/* 97EAB8 80240FE8 A6A0008E */ sh $zero, 0x8e($s5) -/* 97EABC 80240FEC 00431024 */ and $v0, $v0, $v1 -/* 97EAC0 80240FF0 2403FDFF */ addiu $v1, $zero, -0x201 -/* 97EAC4 80240FF4 00431024 */ and $v0, $v0, $v1 -/* 97EAC8 80240FF8 34420008 */ ori $v0, $v0, 8 -/* 97EACC 80240FFC AEA20000 */ sw $v0, ($s5) -/* 97EAD0 80241000 AE800074 */ sw $zero, 0x74($s4) -/* 97EAD4 80241004 AE800070 */ sw $zero, 0x70($s4) -/* 97EAD8 80241008 8E420000 */ lw $v0, ($s2) -/* 97EADC 8024100C 3C034000 */ lui $v1, 0x4000 -/* 97EAE0 80241010 00431024 */ and $v0, $v0, $v1 -/* 97EAE4 80241014 10400007 */ beqz $v0, .L80241034 -/* 97EAE8 80241018 3C03BFFF */ lui $v1, 0xbfff -/* 97EAEC 8024101C 2402000C */ addiu $v0, $zero, 0xc -/* 97EAF0 80241020 AE820070 */ sw $v0, 0x70($s4) -/* 97EAF4 80241024 8E420000 */ lw $v0, ($s2) -/* 97EAF8 80241028 3463FFFF */ ori $v1, $v1, 0xffff -/* 97EAFC 8024102C 00431024 */ and $v0, $v0, $v1 -/* 97EB00 80241030 AE420000 */ sw $v0, ($s2) -.L80241034: -/* 97EB04 80241034 8E830070 */ lw $v1, 0x70($s4) -/* 97EB08 80241038 2C62000F */ sltiu $v0, $v1, 0xf -/* 97EB0C 8024103C 10400028 */ beqz $v0, .L802410E0_97EBB0 -/* 97EB10 80241040 00031080 */ sll $v0, $v1, 2 -/* 97EB14 80241044 3C018024 */ lui $at, %hi(jtbl_80242EF8_9809C8) -/* 97EB18 80241048 00220821 */ addu $at, $at, $v0 -/* 97EB1C 8024104C 8C222EF8 */ lw $v0, %lo(jtbl_80242EF8_9809C8)($at) -/* 97EB20 80241050 00400008 */ jr $v0 -/* 97EB24 80241054 00000000 */ nop -.L80241058_97EB28: -/* 97EB28 80241058 0280202D */ daddu $a0, $s4, $zero -/* 97EB2C 8024105C 0200282D */ daddu $a1, $s0, $zero -/* 97EB30 80241060 0C090385 */ jal func_80240E14_97E8E4 -/* 97EB34 80241064 0260302D */ daddu $a2, $s3, $zero -.L80241068_97EB38: -/* 97EB38 80241068 0280202D */ daddu $a0, $s4, $zero -/* 97EB3C 8024106C 0200282D */ daddu $a1, $s0, $zero -/* 97EB40 80241070 0C09008C */ jal isk_05_UnkNpcAIFunc37 -/* 97EB44 80241074 0260302D */ daddu $a2, $s3, $zero -/* 97EB48 80241078 08090438 */ j .L802410E0_97EBB0 -/* 97EB4C 8024107C 00000000 */ nop -.L80241080_97EB50: -/* 97EB50 80241080 0280202D */ daddu $a0, $s4, $zero -/* 97EB54 80241084 0200282D */ daddu $a1, $s0, $zero -/* 97EB58 80241088 0C09015A */ jal isk_05_UnkNpcAIFunc1 -/* 97EB5C 8024108C 0260302D */ daddu $a2, $s3, $zero -.L80241090_97EB60: -/* 97EB60 80241090 0280202D */ daddu $a0, $s4, $zero -/* 97EB64 80241094 0200282D */ daddu $a1, $s0, $zero -/* 97EB68 80241098 0C09018A */ jal isk_05_UnkNpcAIFunc38 -/* 97EB6C 8024109C 0260302D */ daddu $a2, $s3, $zero -/* 97EB70 802410A0 08090438 */ j .L802410E0_97EBB0 -/* 97EB74 802410A4 00000000 */ nop -.L802410A8_97EB78: -/* 97EB78 802410A8 0280202D */ daddu $a0, $s4, $zero -/* 97EB7C 802410AC 0200282D */ daddu $a1, $s0, $zero -/* 97EB80 802410B0 0C0903AA */ jal func_80240EA8_97E978 -/* 97EB84 802410B4 0260302D */ daddu $a2, $s3, $zero -.L802410B8_97EB88: -/* 97EB88 802410B8 0280202D */ daddu $a0, $s4, $zero -/* 97EB8C 802410BC 0200282D */ daddu $a1, $s0, $zero -/* 97EB90 802410C0 0C09022B */ jal isk_05_UnkNpcAIFunc39 -/* 97EB94 802410C4 0260302D */ daddu $a2, $s3, $zero -/* 97EB98 802410C8 08090438 */ j .L802410E0_97EBB0 -/* 97EB9C 802410CC 00000000 */ nop -.L802410D0_97EBA0: -/* 97EBA0 802410D0 0280202D */ daddu $a0, $s4, $zero -/* 97EBA4 802410D4 0200282D */ daddu $a1, $s0, $zero -/* 97EBA8 802410D8 0C0902EB */ jal isk_05_UnkDurationCheck -/* 97EBAC 802410DC 0260302D */ daddu $a2, $s3, $zero -.L802410E0_97EBB0: -/* 97EBB0 802410E0 8FBF0048 */ lw $ra, 0x48($sp) -/* 97EBB4 802410E4 8FB50044 */ lw $s5, 0x44($sp) -/* 97EBB8 802410E8 8FB40040 */ lw $s4, 0x40($sp) -/* 97EBBC 802410EC 8FB3003C */ lw $s3, 0x3c($sp) -/* 97EBC0 802410F0 8FB20038 */ lw $s2, 0x38($sp) -/* 97EBC4 802410F4 8FB10034 */ lw $s1, 0x34($sp) -/* 97EBC8 802410F8 8FB00030 */ lw $s0, 0x30($sp) -/* 97EBCC 802410FC 0000102D */ daddu $v0, $zero, $zero -/* 97EBD0 80241100 03E00008 */ jr $ra -/* 97EBD4 80241104 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241108_97EBD8.s b/ver/us/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241108_97EBD8.s deleted file mode 100644 index 50a678ecd4..0000000000 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241108_97EBD8.s +++ /dev/null @@ -1,65 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241108_97EBD8 -/* 97EBD8 80241108 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 97EBDC 8024110C AFB40030 */ sw $s4, 0x30($sp) -/* 97EBE0 80241110 27B40010 */ addiu $s4, $sp, 0x10 -/* 97EBE4 80241114 AFB3002C */ sw $s3, 0x2c($sp) -/* 97EBE8 80241118 0000982D */ daddu $s3, $zero, $zero -/* 97EBEC 8024111C AFBF0038 */ sw $ra, 0x38($sp) -/* 97EBF0 80241120 AFB50034 */ sw $s5, 0x34($sp) -/* 97EBF4 80241124 AFB20028 */ sw $s2, 0x28($sp) -/* 97EBF8 80241128 AFB10024 */ sw $s1, 0x24($sp) -/* 97EBFC 8024112C AFB00020 */ sw $s0, 0x20($sp) -/* 97EC00 80241130 8C84014C */ lw $a0, 0x14c($a0) -/* 97EC04 80241134 0C00EAD2 */ jal get_npc_safe -/* 97EC08 80241138 24150003 */ addiu $s5, $zero, 3 -/* 97EC0C 8024113C 24040080 */ addiu $a0, $zero, 0x80 -/* 97EC10 80241140 0C00AB39 */ jal heap_malloc -/* 97EC14 80241144 0040882D */ daddu $s1, $v0, $zero -/* 97EC18 80241148 0040902D */ daddu $s2, $v0, $zero -/* 97EC1C 8024114C 3C030035 */ lui $v1, 0x35 -/* 97EC20 80241150 34630002 */ ori $v1, $v1, 2 -/* 97EC24 80241154 2650000C */ addiu $s0, $s2, 0xc -/* 97EC28 80241158 3402814A */ ori $v0, $zero, 0x814a -/* 97EC2C 8024115C AE320020 */ sw $s2, 0x20($s1) -/* 97EC30 80241160 AFA20010 */ sw $v0, 0x10($sp) -/* 97EC34 80241164 AFA30014 */ sw $v1, 0x14($sp) -/* 97EC38 80241168 AFA00018 */ sw $zero, 0x18($sp) -/* 97EC3C 8024116C AFA0001C */ sw $zero, 0x1c($sp) -.L80241170: -/* 97EC40 80241170 0C00E211 */ jal _create_npc_basic -/* 97EC44 80241174 0280202D */ daddu $a0, $s4, $zero -/* 97EC48 80241178 0C00E2B7 */ jal get_npc_by_index -/* 97EC4C 8024117C 0040202D */ daddu $a0, $v0, $zero -/* 97EC50 80241180 AE420000 */ sw $v0, ($s2) -/* 97EC54 80241184 C6200038 */ lwc1 $f0, 0x38($s1) -/* 97EC58 80241188 E4400038 */ swc1 $f0, 0x38($v0) -/* 97EC5C 8024118C C620003C */ lwc1 $f0, 0x3c($s1) -/* 97EC60 80241190 0040202D */ daddu $a0, $v0, $zero -/* 97EC64 80241194 E480003C */ swc1 $f0, 0x3c($a0) -/* 97EC68 80241198 C6200040 */ lwc1 $f0, 0x40($s1) -/* 97EC6C 8024119C 26730001 */ addiu $s3, $s3, 1 -/* 97EC70 802411A0 E4800040 */ swc1 $f0, 0x40($a0) -/* 97EC74 802411A4 C620000C */ lwc1 $f0, 0xc($s1) -/* 97EC78 802411A8 26520010 */ addiu $s2, $s2, 0x10 -/* 97EC7C 802411AC A09500AB */ sb $s5, 0xab($a0) -/* 97EC80 802411B0 0C00EAFF */ jal disable_npc_shadow -/* 97EC84 802411B4 E480000C */ swc1 $f0, 0xc($a0) -/* 97EC88 802411B8 AE00FFF8 */ sw $zero, -8($s0) -/* 97EC8C 802411BC AE00FFFC */ sw $zero, -4($s0) -/* 97EC90 802411C0 AE000000 */ sw $zero, ($s0) -/* 97EC94 802411C4 2A620008 */ slti $v0, $s3, 8 -/* 97EC98 802411C8 1440FFE9 */ bnez $v0, .L80241170 -/* 97EC9C 802411CC 26100010 */ addiu $s0, $s0, 0x10 -/* 97ECA0 802411D0 8FBF0038 */ lw $ra, 0x38($sp) -/* 97ECA4 802411D4 8FB50034 */ lw $s5, 0x34($sp) -/* 97ECA8 802411D8 8FB40030 */ lw $s4, 0x30($sp) -/* 97ECAC 802411DC 8FB3002C */ lw $s3, 0x2c($sp) -/* 97ECB0 802411E0 8FB20028 */ lw $s2, 0x28($sp) -/* 97ECB4 802411E4 8FB10024 */ lw $s1, 0x24($sp) -/* 97ECB8 802411E8 8FB00020 */ lw $s0, 0x20($sp) -/* 97ECBC 802411EC 24020002 */ addiu $v0, $zero, 2 -/* 97ECC0 802411F0 03E00008 */ jr $ra -/* 97ECC4 802411F4 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_08/984E30/func_80240394_9851C4.s b/ver/us/asm/nonmatchings/world/area_isk/isk_08/984E30/func_80240394_9851C4.s deleted file mode 100644 index 3d78542c75..0000000000 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_08/984E30/func_80240394_9851C4.s +++ /dev/null @@ -1,309 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80241658_986488 -.word .L802407A0_9855D0, .L802407AC_9855DC, .L802407AC_9855DC, .L802407AC_9855DC, .L802407AC_9855DC, .L802407AC_9855DC, .L802407AC_9855DC, .L802407AC_9855DC, .L802407A0_9855D0, .L802407AC_9855DC, .L802407A0_9855D0, .L802407AC_9855DC, .L802407A0_9855D0, .L802407AC_9855DC, .L802407A0_9855D0, .L802407AC_9855DC, .L802407AC_9855DC, .L802407AC_9855DC, .L802407A0_9855D0, .L802407AC_9855DC, .L802407A0_9855D0, 0 - -.section .text - -glabel func_80240394_9851C4 -/* 9851C4 80240394 27BDFF90 */ addiu $sp, $sp, -0x70 -/* 9851C8 80240398 AFB3005C */ sw $s3, 0x5c($sp) -/* 9851CC 8024039C 0080982D */ daddu $s3, $a0, $zero -/* 9851D0 802403A0 AFBF0068 */ sw $ra, 0x68($sp) -/* 9851D4 802403A4 AFB50064 */ sw $s5, 0x64($sp) -/* 9851D8 802403A8 AFB40060 */ sw $s4, 0x60($sp) -/* 9851DC 802403AC AFB20058 */ sw $s2, 0x58($sp) -/* 9851E0 802403B0 AFB10054 */ sw $s1, 0x54($sp) -/* 9851E4 802403B4 AFB00050 */ sw $s0, 0x50($sp) -/* 9851E8 802403B8 8E710148 */ lw $s1, 0x148($s3) -/* 9851EC 802403BC 86240008 */ lh $a0, 8($s1) -/* 9851F0 802403C0 0C00EABB */ jal get_npc_unsafe -/* 9851F4 802403C4 00A0802D */ daddu $s0, $a1, $zero -/* 9851F8 802403C8 8E63000C */ lw $v1, 0xc($s3) -/* 9851FC 802403CC 0260202D */ daddu $a0, $s3, $zero -/* 985200 802403D0 8C650000 */ lw $a1, ($v1) -/* 985204 802403D4 0C0B1EAF */ jal evt_get_variable -/* 985208 802403D8 0040902D */ daddu $s2, $v0, $zero -/* 98520C 802403DC AFA00028 */ sw $zero, 0x28($sp) -/* 985210 802403E0 8E2300D0 */ lw $v1, 0xd0($s1) -/* 985214 802403E4 8C630030 */ lw $v1, 0x30($v1) -/* 985218 802403E8 AFA3002C */ sw $v1, 0x2c($sp) -/* 98521C 802403EC 8E2300D0 */ lw $v1, 0xd0($s1) -/* 985220 802403F0 8C63001C */ lw $v1, 0x1c($v1) -/* 985224 802403F4 AFA30030 */ sw $v1, 0x30($sp) -/* 985228 802403F8 8E2300D0 */ lw $v1, 0xd0($s1) -/* 98522C 802403FC 8C630024 */ lw $v1, 0x24($v1) -/* 985230 80240400 AFA30034 */ sw $v1, 0x34($sp) -/* 985234 80240404 8E2300D0 */ lw $v1, 0xd0($s1) -/* 985238 80240408 8C630028 */ lw $v1, 0x28($v1) -/* 98523C 8024040C 27B50028 */ addiu $s5, $sp, 0x28 -/* 985240 80240410 AFA30038 */ sw $v1, 0x38($sp) -/* 985244 80240414 8E2300D0 */ lw $v1, 0xd0($s1) -/* 985248 80240418 3C0142C8 */ lui $at, 0x42c8 -/* 98524C 8024041C 44810000 */ mtc1 $at, $f0 -/* 985250 80240420 8C63002C */ lw $v1, 0x2c($v1) -/* 985254 80240424 0040A02D */ daddu $s4, $v0, $zero -/* 985258 80240428 E7A00040 */ swc1 $f0, 0x40($sp) -/* 98525C 8024042C A7A00044 */ sh $zero, 0x44($sp) -/* 985260 80240430 12000009 */ beqz $s0, .L80240458 -/* 985264 80240434 AFA3003C */ sw $v1, 0x3c($sp) -/* 985268 80240438 864300A8 */ lh $v1, 0xa8($s2) -/* 98526C 8024043C 8E2200B0 */ lw $v0, 0xb0($s1) -/* 985270 80240440 AE20008C */ sw $zero, 0x8c($s1) -/* 985274 80240444 A22000B5 */ sb $zero, 0xb5($s1) -/* 985278 80240448 34420008 */ ori $v0, $v0, 8 -/* 98527C 8024044C AE230084 */ sw $v1, 0x84($s1) -/* 985280 80240450 0809011A */ j .L80240468 -/* 985284 80240454 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240458: -/* 985288 80240458 8E2200B0 */ lw $v0, 0xb0($s1) -/* 98528C 8024045C 30420004 */ andi $v0, $v0, 4 -/* 985290 80240460 10400047 */ beqz $v0, .L80240580 -/* 985294 80240464 00000000 */ nop -.L80240468: -/* 985298 80240468 AE600070 */ sw $zero, 0x70($s3) -/* 98529C 8024046C A640008E */ sh $zero, 0x8e($s2) -/* 9852A0 80240470 8E2300CC */ lw $v1, 0xcc($s1) -/* 9852A4 80240474 2404F7FF */ addiu $a0, $zero, -0x801 -/* 9852A8 80240478 A2200007 */ sb $zero, 7($s1) -/* 9852AC 8024047C 8E420000 */ lw $v0, ($s2) -/* 9852B0 80240480 8C630000 */ lw $v1, ($v1) -/* 9852B4 80240484 00441024 */ and $v0, $v0, $a0 -/* 9852B8 80240488 AE420000 */ sw $v0, ($s2) -/* 9852BC 8024048C AE430028 */ sw $v1, 0x28($s2) -/* 9852C0 80240490 96220086 */ lhu $v0, 0x86($s1) -/* 9852C4 80240494 A64200A8 */ sh $v0, 0xa8($s2) -/* 9852C8 80240498 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9852CC 8024049C AE200090 */ sw $zero, 0x90($s1) -/* 9852D0 802404A0 8C420034 */ lw $v0, 0x34($v0) -/* 9852D4 802404A4 14400006 */ bnez $v0, .L802404C0 -/* 9852D8 802404A8 2403FDFF */ addiu $v1, $zero, -0x201 -/* 9852DC 802404AC 8E420000 */ lw $v0, ($s2) -/* 9852E0 802404B0 2403FFF7 */ addiu $v1, $zero, -9 -/* 9852E4 802404B4 34420200 */ ori $v0, $v0, 0x200 -/* 9852E8 802404B8 08090133 */ j .L802404CC -/* 9852EC 802404BC 00431024 */ and $v0, $v0, $v1 -.L802404C0: -/* 9852F0 802404C0 8E420000 */ lw $v0, ($s2) -/* 9852F4 802404C4 00431024 */ and $v0, $v0, $v1 -/* 9852F8 802404C8 34420008 */ ori $v0, $v0, 8 -.L802404CC: -/* 9852FC 802404CC AE420000 */ sw $v0, ($s2) -/* 985300 802404D0 8E2200B0 */ lw $v0, 0xb0($s1) -/* 985304 802404D4 30420004 */ andi $v0, $v0, 4 -/* 985308 802404D8 1040001E */ beqz $v0, .L80240554 -/* 98530C 802404DC 24040002 */ addiu $a0, $zero, 2 -/* 985310 802404E0 0240282D */ daddu $a1, $s2, $zero -/* 985314 802404E4 0000302D */ daddu $a2, $zero, $zero -/* 985318 802404E8 24020063 */ addiu $v0, $zero, 0x63 -/* 98531C 802404EC AE620070 */ sw $v0, 0x70($s3) -/* 985320 802404F0 AE600074 */ sw $zero, 0x74($s3) -/* 985324 802404F4 864300A8 */ lh $v1, 0xa8($s2) -/* 985328 802404F8 3C013F80 */ lui $at, 0x3f80 -/* 98532C 802404FC 44810000 */ mtc1 $at, $f0 -/* 985330 80240500 3C014000 */ lui $at, 0x4000 -/* 985334 80240504 44811000 */ mtc1 $at, $f2 -/* 985338 80240508 3C01C1A0 */ lui $at, 0xc1a0 -/* 98533C 8024050C 44812000 */ mtc1 $at, $f4 -/* 985340 80240510 24020028 */ addiu $v0, $zero, 0x28 -/* 985344 80240514 AFA2001C */ sw $v0, 0x1c($sp) -/* 985348 80240518 44833000 */ mtc1 $v1, $f6 -/* 98534C 8024051C 00000000 */ nop -/* 985350 80240520 468031A0 */ cvt.s.w $f6, $f6 -/* 985354 80240524 44073000 */ mfc1 $a3, $f6 -/* 985358 80240528 27A20048 */ addiu $v0, $sp, 0x48 -/* 98535C 8024052C AFA20020 */ sw $v0, 0x20($sp) -/* 985360 80240530 E7A00010 */ swc1 $f0, 0x10($sp) -/* 985364 80240534 E7A20014 */ swc1 $f2, 0x14($sp) -/* 985368 80240538 0C01BFA4 */ jal fx_emote -/* 98536C 8024053C E7A40018 */ swc1 $f4, 0x18($sp) -/* 985370 80240540 8E2200B0 */ lw $v0, 0xb0($s1) -/* 985374 80240544 2403FFFB */ addiu $v1, $zero, -5 -/* 985378 80240548 00431024 */ and $v0, $v0, $v1 -/* 98537C 8024054C 08090160 */ j .L80240580 -/* 985380 80240550 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240554: -/* 985384 80240554 8E220000 */ lw $v0, ($s1) -/* 985388 80240558 3C034000 */ lui $v1, 0x4000 -/* 98538C 8024055C 00431024 */ and $v0, $v0, $v1 -/* 985390 80240560 10400007 */ beqz $v0, .L80240580 -/* 985394 80240564 3C03BFFF */ lui $v1, 0xbfff -/* 985398 80240568 2402000C */ addiu $v0, $zero, 0xc -/* 98539C 8024056C AE620070 */ sw $v0, 0x70($s3) -/* 9853A0 80240570 8E220000 */ lw $v0, ($s1) -/* 9853A4 80240574 3463FFFF */ ori $v1, $v1, 0xffff -/* 9853A8 80240578 00431024 */ and $v0, $v0, $v1 -/* 9853AC 8024057C AE220000 */ sw $v0, ($s1) -.L80240580: -/* 9853B0 80240580 8E220090 */ lw $v0, 0x90($s1) -/* 9853B4 80240584 1840000C */ blez $v0, .L802405B8 -/* 9853B8 80240588 2442FFFF */ addiu $v0, $v0, -1 -/* 9853BC 8024058C 14400087 */ bnez $v0, .L802407AC_9855DC -/* 9853C0 80240590 AE220090 */ sw $v0, 0x90($s1) -/* 9853C4 80240594 3C03FFAA */ lui $v1, 0xffaa -/* 9853C8 80240598 8E420028 */ lw $v0, 0x28($s2) -/* 9853CC 8024059C 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* 9853D0 802405A0 00431021 */ addu $v0, $v0, $v1 -/* 9853D4 802405A4 2C420002 */ sltiu $v0, $v0, 2 -/* 9853D8 802405A8 10400003 */ beqz $v0, .L802405B8 -/* 9853DC 802405AC 3C020055 */ lui $v0, 0x55 -/* 9853E0 802405B0 3442000C */ ori $v0, $v0, 0xc -/* 9853E4 802405B4 AE420028 */ sw $v0, 0x28($s2) -.L802405B8: -/* 9853E8 802405B8 8E630070 */ lw $v1, 0x70($s3) -/* 9853EC 802405BC 2402000C */ addiu $v0, $zero, 0xc -/* 9853F0 802405C0 10620048 */ beq $v1, $v0, .L802406E4 -/* 9853F4 802405C4 2862000D */ slti $v0, $v1, 0xd -/* 9853F8 802405C8 1040000F */ beqz $v0, .L80240608 -/* 9853FC 802405CC 24100001 */ addiu $s0, $zero, 1 -/* 985400 802405D0 1070001E */ beq $v1, $s0, .L8024064C -/* 985404 802405D4 28620002 */ slti $v0, $v1, 2 -/* 985408 802405D8 10400005 */ beqz $v0, .L802405F0 -/* 98540C 802405DC 24020002 */ addiu $v0, $zero, 2 -/* 985410 802405E0 10600015 */ beqz $v1, .L80240638 -/* 985414 802405E4 0260202D */ daddu $a0, $s3, $zero -/* 985418 802405E8 080901D0 */ j .L80240740 -/* 98541C 802405EC 00000000 */ nop -.L802405F0: -/* 985420 802405F0 1062001C */ beq $v1, $v0, .L80240664 -/* 985424 802405F4 24020003 */ addiu $v0, $zero, 3 -/* 985428 802405F8 10620035 */ beq $v1, $v0, .L802406D0 -/* 98542C 802405FC 0260202D */ daddu $a0, $s3, $zero -/* 985430 80240600 080901D0 */ j .L80240740 -/* 985434 80240604 00000000 */ nop -.L80240608: -/* 985438 80240608 2402000E */ addiu $v0, $zero, 0xe -/* 98543C 8024060C 1062003F */ beq $v1, $v0, .L8024070C -/* 985440 80240610 0062102A */ slt $v0, $v1, $v0 -/* 985444 80240614 14400038 */ bnez $v0, .L802406F8 -/* 985448 80240618 0260202D */ daddu $a0, $s3, $zero -/* 98544C 8024061C 2402000F */ addiu $v0, $zero, 0xf -/* 985450 80240620 10620040 */ beq $v1, $v0, .L80240724 -/* 985454 80240624 24020063 */ addiu $v0, $zero, 0x63 -/* 985458 80240628 10620043 */ beq $v1, $v0, .L80240738 -/* 98545C 8024062C 00000000 */ nop -/* 985460 80240630 080901D0 */ j .L80240740 -/* 985464 80240634 00000000 */ nop -.L80240638: -/* 985468 80240638 0280282D */ daddu $a1, $s4, $zero -/* 98546C 8024063C 0C012568 */ jal func_800495A0 -/* 985470 80240640 02A0302D */ daddu $a2, $s5, $zero -/* 985474 80240644 96220086 */ lhu $v0, 0x86($s1) -/* 985478 80240648 A64200A8 */ sh $v0, 0xa8($s2) -.L8024064C: -/* 98547C 8024064C 0260202D */ daddu $a0, $s3, $zero -/* 985480 80240650 0280282D */ daddu $a1, $s4, $zero -/* 985484 80240654 0C0125AE */ jal func_800496B8 -/* 985488 80240658 02A0302D */ daddu $a2, $s5, $zero -/* 98548C 8024065C 080901D0 */ j .L80240740 -/* 985490 80240660 00000000 */ nop -.L80240664: -/* 985494 80240664 0260202D */ daddu $a0, $s3, $zero -/* 985498 80240668 0280282D */ daddu $a1, $s4, $zero -/* 98549C 8024066C 0C0126D1 */ jal base_UnkNpcAIFunc1 -/* 9854A0 80240670 02A0302D */ daddu $a2, $s5, $zero -/* 9854A4 80240674 8E230088 */ lw $v1, 0x88($s1) -/* 9854A8 80240678 24020006 */ addiu $v0, $zero, 6 -/* 9854AC 8024067C 14620014 */ bne $v1, $v0, .L802406D0 -/* 9854B0 80240680 0260202D */ daddu $a0, $s3, $zero -/* 9854B4 80240684 0C00A67F */ jal rand_int -/* 9854B8 80240688 24040064 */ addiu $a0, $zero, 0x64 -/* 9854BC 8024068C 28420021 */ slti $v0, $v0, 0x21 -/* 9854C0 80240690 5040000F */ beql $v0, $zero, .L802406D0 -/* 9854C4 80240694 0260202D */ daddu $a0, $s3, $zero -/* 9854C8 80240698 8E22008C */ lw $v0, 0x8c($s1) -/* 9854CC 8024069C 10400005 */ beqz $v0, .L802406B4 -/* 9854D0 802406A0 3C020055 */ lui $v0, 0x55 -/* 9854D4 802406A4 3442002F */ ori $v0, $v0, 0x2f -/* 9854D8 802406A8 AE20008C */ sw $zero, 0x8c($s1) -/* 9854DC 802406AC 080901B0 */ j .L802406C0 -/* 9854E0 802406B0 A22000B5 */ sb $zero, 0xb5($s1) -.L802406B4: -/* 9854E4 802406B4 3442002E */ ori $v0, $v0, 0x2e -/* 9854E8 802406B8 AE30008C */ sw $s0, 0x8c($s1) -/* 9854EC 802406BC A23000B5 */ sb $s0, 0xb5($s1) -.L802406C0: -/* 9854F0 802406C0 AE420028 */ sw $v0, 0x28($s2) -/* 9854F4 802406C4 24020007 */ addiu $v0, $zero, 7 -/* 9854F8 802406C8 080901EB */ j .L802407AC_9855DC -/* 9854FC 802406CC AE220090 */ sw $v0, 0x90($s1) -.L802406D0: -/* 985500 802406D0 0280282D */ daddu $a1, $s4, $zero -/* 985504 802406D4 0C012701 */ jal func_80049C04 -/* 985508 802406D8 02A0302D */ daddu $a2, $s5, $zero -/* 98550C 802406DC 080901D0 */ j .L80240740 -/* 985510 802406E0 00000000 */ nop -.L802406E4: -/* 985514 802406E4 0260202D */ daddu $a0, $s3, $zero -/* 985518 802406E8 0280282D */ daddu $a1, $s4, $zero -/* 98551C 802406EC 0C090000 */ jal isk_08_set_script_owner_npc_anim -/* 985520 802406F0 02A0302D */ daddu $a2, $s5, $zero -/* 985524 802406F4 0260202D */ daddu $a0, $s3, $zero -.L802406F8: -/* 985528 802406F8 0280282D */ daddu $a1, $s4, $zero -/* 98552C 802406FC 0C09001F */ jal isk_08_UnkDistFunc -/* 985530 80240700 02A0302D */ daddu $a2, $s5, $zero -/* 985534 80240704 080901D0 */ j .L80240740 -/* 985538 80240708 00000000 */ nop -.L8024070C: -/* 98553C 8024070C 0260202D */ daddu $a0, $s3, $zero -/* 985540 80240710 0280282D */ daddu $a1, $s4, $zero -/* 985544 80240714 0C09006C */ jal isk_08_UnkNpcAIFunc12 -/* 985548 80240718 02A0302D */ daddu $a2, $s5, $zero -/* 98554C 8024071C 080901D0 */ j .L80240740 -/* 985550 80240720 00000000 */ nop -.L80240724: -/* 985554 80240724 0280282D */ daddu $a1, $s4, $zero -/* 985558 80240728 0C0900C5 */ jal isk_08_set_script_owner_npc_col_height -/* 98555C 8024072C 02A0302D */ daddu $a2, $s5, $zero -/* 985560 80240730 080901D0 */ j .L80240740 -/* 985564 80240734 00000000 */ nop -.L80240738: -/* 985568 80240738 0C0129CF */ jal func_8004A73C -/* 98556C 8024073C 0260202D */ daddu $a0, $s3, $zero -.L80240740: -/* 985570 80240740 8E230088 */ lw $v1, 0x88($s1) -/* 985574 80240744 24020006 */ addiu $v0, $zero, 6 -/* 985578 80240748 14620019 */ bne $v1, $v0, .L802407B0 -/* 98557C 8024074C 0000102D */ daddu $v0, $zero, $zero -/* 985580 80240750 8E22008C */ lw $v0, 0x8c($s1) -/* 985584 80240754 10400003 */ beqz $v0, .L80240764 -/* 985588 80240758 24020001 */ addiu $v0, $zero, 1 -/* 98558C 8024075C 080901DA */ j .L80240768 -/* 985590 80240760 A22200B5 */ sb $v0, 0xb5($s1) -.L80240764: -/* 985594 80240764 A22000B5 */ sb $zero, 0xb5($s1) -.L80240768: -/* 985598 80240768 8E22008C */ lw $v0, 0x8c($s1) -/* 98559C 8024076C 1040000F */ beqz $v0, .L802407AC_9855DC -/* 9855A0 80240770 3C03FFAA */ lui $v1, 0xffaa -/* 9855A4 80240774 8E420028 */ lw $v0, 0x28($s2) -/* 9855A8 80240778 3463FFFC */ ori $v1, $v1, 0xfffc -/* 9855AC 8024077C 00431821 */ addu $v1, $v0, $v1 -/* 9855B0 80240780 2C620015 */ sltiu $v0, $v1, 0x15 -/* 9855B4 80240784 10400009 */ beqz $v0, .L802407AC_9855DC -/* 9855B8 80240788 00031080 */ sll $v0, $v1, 2 -/* 9855BC 8024078C 3C018024 */ lui $at, %hi(jtbl_80241658_986488) -/* 9855C0 80240790 00220821 */ addu $at, $at, $v0 -/* 9855C4 80240794 8C221658 */ lw $v0, %lo(jtbl_80241658_986488)($at) -/* 9855C8 80240798 00400008 */ jr $v0 -/* 9855CC 8024079C 00000000 */ nop -.L802407A0_9855D0: -/* 9855D0 802407A0 8E420028 */ lw $v0, 0x28($s2) -/* 9855D4 802407A4 24420001 */ addiu $v0, $v0, 1 -/* 9855D8 802407A8 AE420028 */ sw $v0, 0x28($s2) -.L802407AC_9855DC: -/* 9855DC 802407AC 0000102D */ daddu $v0, $zero, $zero -.L802407B0: -/* 9855E0 802407B0 8FBF0068 */ lw $ra, 0x68($sp) -/* 9855E4 802407B4 8FB50064 */ lw $s5, 0x64($sp) -/* 9855E8 802407B8 8FB40060 */ lw $s4, 0x60($sp) -/* 9855EC 802407BC 8FB3005C */ lw $s3, 0x5c($sp) -/* 9855F0 802407C0 8FB20058 */ lw $s2, 0x58($sp) -/* 9855F4 802407C4 8FB10054 */ lw $s1, 0x54($sp) -/* 9855F8 802407C8 8FB00050 */ lw $s0, 0x50($sp) -/* 9855FC 802407CC 03E00008 */ jr $ra -/* 985600 802407D0 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240E14_9905F4.s b/ver/us/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240E14_9905F4.s deleted file mode 100644 index 1330bd4ff0..0000000000 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240E14_9905F4.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E14_9905F4 -/* 9905F4 80240E14 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9905F8 80240E18 AFB00010 */ sw $s0, 0x10($sp) -/* 9905FC 80240E1C 0080802D */ daddu $s0, $a0, $zero -/* 990600 80240E20 AFBF001C */ sw $ra, 0x1c($sp) -/* 990604 80240E24 AFB20018 */ sw $s2, 0x18($sp) -/* 990608 80240E28 AFB10014 */ sw $s1, 0x14($sp) -/* 99060C 80240E2C 8E020148 */ lw $v0, 0x148($s0) -/* 990610 80240E30 00A0882D */ daddu $s1, $a1, $zero -/* 990614 80240E34 84440008 */ lh $a0, 8($v0) -/* 990618 80240E38 0C00EABB */ jal get_npc_unsafe -/* 99061C 80240E3C 00C0902D */ daddu $s2, $a2, $zero -/* 990620 80240E40 0200202D */ daddu $a0, $s0, $zero -/* 990624 80240E44 0040802D */ daddu $s0, $v0, $zero -/* 990628 80240E48 0220282D */ daddu $a1, $s1, $zero -/* 99062C 80240E4C 0C012568 */ jal func_800495A0 -/* 990630 80240E50 0240302D */ daddu $a2, $s2, $zero -/* 990634 80240E54 0C00A67F */ jal rand_int -/* 990638 80240E58 24040005 */ addiu $a0, $zero, 5 -/* 99063C 80240E5C 3C014020 */ lui $at, 0x4020 -/* 990640 80240E60 44811800 */ mtc1 $at, $f3 -/* 990644 80240E64 44801000 */ mtc1 $zero, $f2 -/* 990648 80240E68 44820000 */ mtc1 $v0, $f0 -/* 99064C 80240E6C 00000000 */ nop -/* 990650 80240E70 46800021 */ cvt.d.w $f0, $f0 -/* 990654 80240E74 46220000 */ add.d $f0, $f0, $f2 -/* 990658 80240E78 3C013FC0 */ lui $at, 0x3fc0 -/* 99065C 80240E7C 44811000 */ mtc1 $at, $f2 -/* 990660 80240E80 00000000 */ nop -/* 990664 80240E84 E6020014 */ swc1 $f2, 0x14($s0) -/* 990668 80240E88 46200020 */ cvt.s.d $f0, $f0 -/* 99066C 80240E8C E600001C */ swc1 $f0, 0x1c($s0) -/* 990670 80240E90 8FBF001C */ lw $ra, 0x1c($sp) -/* 990674 80240E94 8FB20018 */ lw $s2, 0x18($sp) -/* 990678 80240E98 8FB10014 */ lw $s1, 0x14($sp) -/* 99067C 80240E9C 8FB00010 */ lw $s0, 0x10($sp) -/* 990680 80240EA0 03E00008 */ jr $ra -/* 990684 80240EA4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240EA8_990688.s b/ver/us/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240EA8_990688.s deleted file mode 100644 index aa000c8301..0000000000 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240EA8_990688.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EA8_990688 -/* 990688 80240EA8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 99068C 80240EAC AFB00010 */ sw $s0, 0x10($sp) -/* 990690 80240EB0 0080802D */ daddu $s0, $a0, $zero -/* 990694 80240EB4 AFBF001C */ sw $ra, 0x1c($sp) -/* 990698 80240EB8 AFB20018 */ sw $s2, 0x18($sp) -/* 99069C 80240EBC AFB10014 */ sw $s1, 0x14($sp) -/* 9906A0 80240EC0 8E020148 */ lw $v0, 0x148($s0) -/* 9906A4 80240EC4 00A0882D */ daddu $s1, $a1, $zero -/* 9906A8 80240EC8 84440008 */ lh $a0, 8($v0) -/* 9906AC 80240ECC 0C00EABB */ jal get_npc_unsafe -/* 9906B0 80240ED0 00C0902D */ daddu $s2, $a2, $zero -/* 9906B4 80240ED4 0200202D */ daddu $a0, $s0, $zero -/* 9906B8 80240ED8 0040802D */ daddu $s0, $v0, $zero -/* 9906BC 80240EDC 0220282D */ daddu $a1, $s1, $zero -/* 9906C0 80240EE0 0C0127DF */ jal func_80049F7C -/* 9906C4 80240EE4 0240302D */ daddu $a2, $s2, $zero -/* 9906C8 80240EE8 0C00A67F */ jal rand_int -/* 9906CC 80240EEC 24040005 */ addiu $a0, $zero, 5 -/* 9906D0 80240EF0 3C014014 */ lui $at, 0x4014 -/* 9906D4 80240EF4 44811800 */ mtc1 $at, $f3 -/* 9906D8 80240EF8 44801000 */ mtc1 $zero, $f2 -/* 9906DC 80240EFC 44820000 */ mtc1 $v0, $f0 -/* 9906E0 80240F00 00000000 */ nop -/* 9906E4 80240F04 46800021 */ cvt.d.w $f0, $f0 -/* 9906E8 80240F08 46220000 */ add.d $f0, $f0, $f2 -/* 9906EC 80240F0C 3C013FC0 */ lui $at, 0x3fc0 -/* 9906F0 80240F10 44811000 */ mtc1 $at, $f2 -/* 9906F4 80240F14 00000000 */ nop -/* 9906F8 80240F18 E6020014 */ swc1 $f2, 0x14($s0) -/* 9906FC 80240F1C 46200020 */ cvt.s.d $f0, $f0 -/* 990700 80240F20 E600001C */ swc1 $f0, 0x1c($s0) -/* 990704 80240F24 8FBF001C */ lw $ra, 0x1c($sp) -/* 990708 80240F28 8FB20018 */ lw $s2, 0x18($sp) -/* 99070C 80240F2C 8FB10014 */ lw $s1, 0x14($sp) -/* 990710 80240F30 8FB00010 */ lw $s0, 0x10($sp) -/* 990714 80240F34 03E00008 */ jr $ra -/* 990718 80240F38 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240F3C_99071C.s b/ver/us/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240F3C_99071C.s deleted file mode 100644 index 8bd880c08f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240F3C_99071C.s +++ /dev/null @@ -1,135 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80242EF8_9926D8 -.word .L80241058_990838, .L80241068_990848, .L80241080_990860, .L80241090_990870, .L802410E0_9908C0, .L802410E0_9908C0, .L802410E0_9908C0, .L802410E0_9908C0, .L802410E0_9908C0, .L802410E0_9908C0, .L802410E0_9908C0, .L802410E0_9908C0, .L802410A8_990888, .L802410B8_990898, .L802410D0_9908B0, 0 - -.section .text - -glabel func_80240F3C_99071C -/* 99071C 80240F3C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 990720 80240F40 AFB40040 */ sw $s4, 0x40($sp) -/* 990724 80240F44 0080A02D */ daddu $s4, $a0, $zero -/* 990728 80240F48 AFBF0048 */ sw $ra, 0x48($sp) -/* 99072C 80240F4C AFB50044 */ sw $s5, 0x44($sp) -/* 990730 80240F50 AFB3003C */ sw $s3, 0x3c($sp) -/* 990734 80240F54 AFB20038 */ sw $s2, 0x38($sp) -/* 990738 80240F58 AFB10034 */ sw $s1, 0x34($sp) -/* 99073C 80240F5C AFB00030 */ sw $s0, 0x30($sp) -/* 990740 80240F60 8E920148 */ lw $s2, 0x148($s4) -/* 990744 80240F64 86440008 */ lh $a0, 8($s2) -/* 990748 80240F68 8E90000C */ lw $s0, 0xc($s4) -/* 99074C 80240F6C 0C00EABB */ jal get_npc_unsafe -/* 990750 80240F70 00A0882D */ daddu $s1, $a1, $zero -/* 990754 80240F74 0280202D */ daddu $a0, $s4, $zero -/* 990758 80240F78 8E050000 */ lw $a1, ($s0) -/* 99075C 80240F7C 0C0B1EAF */ jal evt_get_variable -/* 990760 80240F80 0040A82D */ daddu $s5, $v0, $zero -/* 990764 80240F84 AFA00010 */ sw $zero, 0x10($sp) -/* 990768 80240F88 8E4300D0 */ lw $v1, 0xd0($s2) -/* 99076C 80240F8C 8C630030 */ lw $v1, 0x30($v1) -/* 990770 80240F90 AFA30014 */ sw $v1, 0x14($sp) -/* 990774 80240F94 8E4300D0 */ lw $v1, 0xd0($s2) -/* 990778 80240F98 8C63001C */ lw $v1, 0x1c($v1) -/* 99077C 80240F9C AFA30018 */ sw $v1, 0x18($sp) -/* 990780 80240FA0 8E4300D0 */ lw $v1, 0xd0($s2) -/* 990784 80240FA4 8C630024 */ lw $v1, 0x24($v1) -/* 990788 80240FA8 AFA3001C */ sw $v1, 0x1c($sp) -/* 99078C 80240FAC 8E4300D0 */ lw $v1, 0xd0($s2) -/* 990790 80240FB0 8C630028 */ lw $v1, 0x28($v1) -/* 990794 80240FB4 27B30010 */ addiu $s3, $sp, 0x10 -/* 990798 80240FB8 AFA30020 */ sw $v1, 0x20($sp) -/* 99079C 80240FBC 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9907A0 80240FC0 3C0142C8 */ lui $at, 0x42c8 -/* 9907A4 80240FC4 44810000 */ mtc1 $at, $f0 -/* 9907A8 80240FC8 8C63002C */ lw $v1, 0x2c($v1) -/* 9907AC 80240FCC 0040802D */ daddu $s0, $v0, $zero -/* 9907B0 80240FD0 E7A00028 */ swc1 $f0, 0x28($sp) -/* 9907B4 80240FD4 A7A0002C */ sh $zero, 0x2c($sp) -/* 9907B8 80240FD8 12200016 */ beqz $s1, .L80241034 -/* 9907BC 80240FDC AFA30024 */ sw $v1, 0x24($sp) -/* 9907C0 80240FE0 8EA20000 */ lw $v0, ($s5) -/* 9907C4 80240FE4 2403F7FF */ addiu $v1, $zero, -0x801 -/* 9907C8 80240FE8 A6A0008E */ sh $zero, 0x8e($s5) -/* 9907CC 80240FEC 00431024 */ and $v0, $v0, $v1 -/* 9907D0 80240FF0 2403FDFF */ addiu $v1, $zero, -0x201 -/* 9907D4 80240FF4 00431024 */ and $v0, $v0, $v1 -/* 9907D8 80240FF8 34420008 */ ori $v0, $v0, 8 -/* 9907DC 80240FFC AEA20000 */ sw $v0, ($s5) -/* 9907E0 80241000 AE800074 */ sw $zero, 0x74($s4) -/* 9907E4 80241004 AE800070 */ sw $zero, 0x70($s4) -/* 9907E8 80241008 8E420000 */ lw $v0, ($s2) -/* 9907EC 8024100C 3C034000 */ lui $v1, 0x4000 -/* 9907F0 80241010 00431024 */ and $v0, $v0, $v1 -/* 9907F4 80241014 10400007 */ beqz $v0, .L80241034 -/* 9907F8 80241018 3C03BFFF */ lui $v1, 0xbfff -/* 9907FC 8024101C 2402000C */ addiu $v0, $zero, 0xc -/* 990800 80241020 AE820070 */ sw $v0, 0x70($s4) -/* 990804 80241024 8E420000 */ lw $v0, ($s2) -/* 990808 80241028 3463FFFF */ ori $v1, $v1, 0xffff -/* 99080C 8024102C 00431024 */ and $v0, $v0, $v1 -/* 990810 80241030 AE420000 */ sw $v0, ($s2) -.L80241034: -/* 990814 80241034 8E830070 */ lw $v1, 0x70($s4) -/* 990818 80241038 2C62000F */ sltiu $v0, $v1, 0xf -/* 99081C 8024103C 10400028 */ beqz $v0, .L802410E0_9908C0 -/* 990820 80241040 00031080 */ sll $v0, $v1, 2 -/* 990824 80241044 3C018024 */ lui $at, %hi(jtbl_80242EF8_9926D8) -/* 990828 80241048 00220821 */ addu $at, $at, $v0 -/* 99082C 8024104C 8C222EF8 */ lw $v0, %lo(jtbl_80242EF8_9926D8)($at) -/* 990830 80241050 00400008 */ jr $v0 -/* 990834 80241054 00000000 */ nop -.L80241058_990838: -/* 990838 80241058 0280202D */ daddu $a0, $s4, $zero -/* 99083C 8024105C 0200282D */ daddu $a1, $s0, $zero -/* 990840 80241060 0C090385 */ jal func_80240E14_9905F4 -/* 990844 80241064 0260302D */ daddu $a2, $s3, $zero -.L80241068_990848: -/* 990848 80241068 0280202D */ daddu $a0, $s4, $zero -/* 99084C 8024106C 0200282D */ daddu $a1, $s0, $zero -/* 990850 80241070 0C09008C */ jal isk_13_UnkNpcAIFunc37 -/* 990854 80241074 0260302D */ daddu $a2, $s3, $zero -/* 990858 80241078 08090438 */ j .L802410E0_9908C0 -/* 99085C 8024107C 00000000 */ nop -.L80241080_990860: -/* 990860 80241080 0280202D */ daddu $a0, $s4, $zero -/* 990864 80241084 0200282D */ daddu $a1, $s0, $zero -/* 990868 80241088 0C09015A */ jal isk_13_UnkNpcAIFunc1 -/* 99086C 8024108C 0260302D */ daddu $a2, $s3, $zero -.L80241090_990870: -/* 990870 80241090 0280202D */ daddu $a0, $s4, $zero -/* 990874 80241094 0200282D */ daddu $a1, $s0, $zero -/* 990878 80241098 0C09018A */ jal isk_13_UnkNpcAIFunc38 -/* 99087C 8024109C 0260302D */ daddu $a2, $s3, $zero -/* 990880 802410A0 08090438 */ j .L802410E0_9908C0 -/* 990884 802410A4 00000000 */ nop -.L802410A8_990888: -/* 990888 802410A8 0280202D */ daddu $a0, $s4, $zero -/* 99088C 802410AC 0200282D */ daddu $a1, $s0, $zero -/* 990890 802410B0 0C0903AA */ jal func_80240EA8_990688 -/* 990894 802410B4 0260302D */ daddu $a2, $s3, $zero -.L802410B8_990898: -/* 990898 802410B8 0280202D */ daddu $a0, $s4, $zero -/* 99089C 802410BC 0200282D */ daddu $a1, $s0, $zero -/* 9908A0 802410C0 0C09022B */ jal isk_13_UnkNpcAIFunc39 -/* 9908A4 802410C4 0260302D */ daddu $a2, $s3, $zero -/* 9908A8 802410C8 08090438 */ j .L802410E0_9908C0 -/* 9908AC 802410CC 00000000 */ nop -.L802410D0_9908B0: -/* 9908B0 802410D0 0280202D */ daddu $a0, $s4, $zero -/* 9908B4 802410D4 0200282D */ daddu $a1, $s0, $zero -/* 9908B8 802410D8 0C0902EB */ jal isk_13_UnkDurationCheck -/* 9908BC 802410DC 0260302D */ daddu $a2, $s3, $zero -.L802410E0_9908C0: -/* 9908C0 802410E0 8FBF0048 */ lw $ra, 0x48($sp) -/* 9908C4 802410E4 8FB50044 */ lw $s5, 0x44($sp) -/* 9908C8 802410E8 8FB40040 */ lw $s4, 0x40($sp) -/* 9908CC 802410EC 8FB3003C */ lw $s3, 0x3c($sp) -/* 9908D0 802410F0 8FB20038 */ lw $s2, 0x38($sp) -/* 9908D4 802410F4 8FB10034 */ lw $s1, 0x34($sp) -/* 9908D8 802410F8 8FB00030 */ lw $s0, 0x30($sp) -/* 9908DC 802410FC 0000102D */ daddu $v0, $zero, $zero -/* 9908E0 80241100 03E00008 */ jr $ra -/* 9908E4 80241104 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241108_9908E8.s b/ver/us/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241108_9908E8.s deleted file mode 100644 index 33cfdae189..0000000000 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241108_9908E8.s +++ /dev/null @@ -1,65 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241108_9908E8 -/* 9908E8 80241108 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 9908EC 8024110C AFB40030 */ sw $s4, 0x30($sp) -/* 9908F0 80241110 27B40010 */ addiu $s4, $sp, 0x10 -/* 9908F4 80241114 AFB3002C */ sw $s3, 0x2c($sp) -/* 9908F8 80241118 0000982D */ daddu $s3, $zero, $zero -/* 9908FC 8024111C AFBF0038 */ sw $ra, 0x38($sp) -/* 990900 80241120 AFB50034 */ sw $s5, 0x34($sp) -/* 990904 80241124 AFB20028 */ sw $s2, 0x28($sp) -/* 990908 80241128 AFB10024 */ sw $s1, 0x24($sp) -/* 99090C 8024112C AFB00020 */ sw $s0, 0x20($sp) -/* 990910 80241130 8C84014C */ lw $a0, 0x14c($a0) -/* 990914 80241134 0C00EAD2 */ jal get_npc_safe -/* 990918 80241138 24150003 */ addiu $s5, $zero, 3 -/* 99091C 8024113C 24040080 */ addiu $a0, $zero, 0x80 -/* 990920 80241140 0C00AB39 */ jal heap_malloc -/* 990924 80241144 0040882D */ daddu $s1, $v0, $zero -/* 990928 80241148 0040902D */ daddu $s2, $v0, $zero -/* 99092C 8024114C 3C030035 */ lui $v1, 0x35 -/* 990930 80241150 34630002 */ ori $v1, $v1, 2 -/* 990934 80241154 2650000C */ addiu $s0, $s2, 0xc -/* 990938 80241158 3402814A */ ori $v0, $zero, 0x814a -/* 99093C 8024115C AE320020 */ sw $s2, 0x20($s1) -/* 990940 80241160 AFA20010 */ sw $v0, 0x10($sp) -/* 990944 80241164 AFA30014 */ sw $v1, 0x14($sp) -/* 990948 80241168 AFA00018 */ sw $zero, 0x18($sp) -/* 99094C 8024116C AFA0001C */ sw $zero, 0x1c($sp) -.L80241170: -/* 990950 80241170 0C00E211 */ jal _create_npc_basic -/* 990954 80241174 0280202D */ daddu $a0, $s4, $zero -/* 990958 80241178 0C00E2B7 */ jal get_npc_by_index -/* 99095C 8024117C 0040202D */ daddu $a0, $v0, $zero -/* 990960 80241180 AE420000 */ sw $v0, ($s2) -/* 990964 80241184 C6200038 */ lwc1 $f0, 0x38($s1) -/* 990968 80241188 E4400038 */ swc1 $f0, 0x38($v0) -/* 99096C 8024118C C620003C */ lwc1 $f0, 0x3c($s1) -/* 990970 80241190 0040202D */ daddu $a0, $v0, $zero -/* 990974 80241194 E480003C */ swc1 $f0, 0x3c($a0) -/* 990978 80241198 C6200040 */ lwc1 $f0, 0x40($s1) -/* 99097C 8024119C 26730001 */ addiu $s3, $s3, 1 -/* 990980 802411A0 E4800040 */ swc1 $f0, 0x40($a0) -/* 990984 802411A4 C620000C */ lwc1 $f0, 0xc($s1) -/* 990988 802411A8 26520010 */ addiu $s2, $s2, 0x10 -/* 99098C 802411AC A09500AB */ sb $s5, 0xab($a0) -/* 990990 802411B0 0C00EAFF */ jal disable_npc_shadow -/* 990994 802411B4 E480000C */ swc1 $f0, 0xc($a0) -/* 990998 802411B8 AE00FFF8 */ sw $zero, -8($s0) -/* 99099C 802411BC AE00FFFC */ sw $zero, -4($s0) -/* 9909A0 802411C0 AE000000 */ sw $zero, ($s0) -/* 9909A4 802411C4 2A620008 */ slti $v0, $s3, 8 -/* 9909A8 802411C8 1440FFE9 */ bnez $v0, .L80241170 -/* 9909AC 802411CC 26100010 */ addiu $s0, $s0, 0x10 -/* 9909B0 802411D0 8FBF0038 */ lw $ra, 0x38($sp) -/* 9909B4 802411D4 8FB50034 */ lw $s5, 0x34($sp) -/* 9909B8 802411D8 8FB40030 */ lw $s4, 0x30($sp) -/* 9909BC 802411DC 8FB3002C */ lw $s3, 0x2c($sp) -/* 9909C0 802411E0 8FB20028 */ lw $s2, 0x28($sp) -/* 9909C4 802411E4 8FB10024 */ lw $s1, 0x24($sp) -/* 9909C8 802411E8 8FB00020 */ lw $s0, 0x20($sp) -/* 9909CC 802411EC 24020002 */ addiu $v0, $zero, 2 -/* 9909D0 802411F0 03E00008 */ jr $ra -/* 9909D4 802411F4 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240E14_993544.s b/ver/us/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240E14_993544.s deleted file mode 100644 index 3b9e0f9ebd..0000000000 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240E14_993544.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E14_993544 -/* 993544 80240E14 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 993548 80240E18 AFB00010 */ sw $s0, 0x10($sp) -/* 99354C 80240E1C 0080802D */ daddu $s0, $a0, $zero -/* 993550 80240E20 AFBF001C */ sw $ra, 0x1c($sp) -/* 993554 80240E24 AFB20018 */ sw $s2, 0x18($sp) -/* 993558 80240E28 AFB10014 */ sw $s1, 0x14($sp) -/* 99355C 80240E2C 8E020148 */ lw $v0, 0x148($s0) -/* 993560 80240E30 00A0882D */ daddu $s1, $a1, $zero -/* 993564 80240E34 84440008 */ lh $a0, 8($v0) -/* 993568 80240E38 0C00EABB */ jal get_npc_unsafe -/* 99356C 80240E3C 00C0902D */ daddu $s2, $a2, $zero -/* 993570 80240E40 0200202D */ daddu $a0, $s0, $zero -/* 993574 80240E44 0040802D */ daddu $s0, $v0, $zero -/* 993578 80240E48 0220282D */ daddu $a1, $s1, $zero -/* 99357C 80240E4C 0C012568 */ jal func_800495A0 -/* 993580 80240E50 0240302D */ daddu $a2, $s2, $zero -/* 993584 80240E54 0C00A67F */ jal rand_int -/* 993588 80240E58 24040005 */ addiu $a0, $zero, 5 -/* 99358C 80240E5C 3C014020 */ lui $at, 0x4020 -/* 993590 80240E60 44811800 */ mtc1 $at, $f3 -/* 993594 80240E64 44801000 */ mtc1 $zero, $f2 -/* 993598 80240E68 44820000 */ mtc1 $v0, $f0 -/* 99359C 80240E6C 00000000 */ nop -/* 9935A0 80240E70 46800021 */ cvt.d.w $f0, $f0 -/* 9935A4 80240E74 46220000 */ add.d $f0, $f0, $f2 -/* 9935A8 80240E78 3C013FC0 */ lui $at, 0x3fc0 -/* 9935AC 80240E7C 44811000 */ mtc1 $at, $f2 -/* 9935B0 80240E80 00000000 */ nop -/* 9935B4 80240E84 E6020014 */ swc1 $f2, 0x14($s0) -/* 9935B8 80240E88 46200020 */ cvt.s.d $f0, $f0 -/* 9935BC 80240E8C E600001C */ swc1 $f0, 0x1c($s0) -/* 9935C0 80240E90 8FBF001C */ lw $ra, 0x1c($sp) -/* 9935C4 80240E94 8FB20018 */ lw $s2, 0x18($sp) -/* 9935C8 80240E98 8FB10014 */ lw $s1, 0x14($sp) -/* 9935CC 80240E9C 8FB00010 */ lw $s0, 0x10($sp) -/* 9935D0 80240EA0 03E00008 */ jr $ra -/* 9935D4 80240EA4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240EA8_9935D8.s b/ver/us/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240EA8_9935D8.s deleted file mode 100644 index cbef652096..0000000000 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240EA8_9935D8.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EA8_9935D8 -/* 9935D8 80240EA8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9935DC 80240EAC AFB00010 */ sw $s0, 0x10($sp) -/* 9935E0 80240EB0 0080802D */ daddu $s0, $a0, $zero -/* 9935E4 80240EB4 AFBF001C */ sw $ra, 0x1c($sp) -/* 9935E8 80240EB8 AFB20018 */ sw $s2, 0x18($sp) -/* 9935EC 80240EBC AFB10014 */ sw $s1, 0x14($sp) -/* 9935F0 80240EC0 8E020148 */ lw $v0, 0x148($s0) -/* 9935F4 80240EC4 00A0882D */ daddu $s1, $a1, $zero -/* 9935F8 80240EC8 84440008 */ lh $a0, 8($v0) -/* 9935FC 80240ECC 0C00EABB */ jal get_npc_unsafe -/* 993600 80240ED0 00C0902D */ daddu $s2, $a2, $zero -/* 993604 80240ED4 0200202D */ daddu $a0, $s0, $zero -/* 993608 80240ED8 0040802D */ daddu $s0, $v0, $zero -/* 99360C 80240EDC 0220282D */ daddu $a1, $s1, $zero -/* 993610 80240EE0 0C0127DF */ jal func_80049F7C -/* 993614 80240EE4 0240302D */ daddu $a2, $s2, $zero -/* 993618 80240EE8 0C00A67F */ jal rand_int -/* 99361C 80240EEC 24040005 */ addiu $a0, $zero, 5 -/* 993620 80240EF0 3C014014 */ lui $at, 0x4014 -/* 993624 80240EF4 44811800 */ mtc1 $at, $f3 -/* 993628 80240EF8 44801000 */ mtc1 $zero, $f2 -/* 99362C 80240EFC 44820000 */ mtc1 $v0, $f0 -/* 993630 80240F00 00000000 */ nop -/* 993634 80240F04 46800021 */ cvt.d.w $f0, $f0 -/* 993638 80240F08 46220000 */ add.d $f0, $f0, $f2 -/* 99363C 80240F0C 3C013FC0 */ lui $at, 0x3fc0 -/* 993640 80240F10 44811000 */ mtc1 $at, $f2 -/* 993644 80240F14 00000000 */ nop -/* 993648 80240F18 E6020014 */ swc1 $f2, 0x14($s0) -/* 99364C 80240F1C 46200020 */ cvt.s.d $f0, $f0 -/* 993650 80240F20 E600001C */ swc1 $f0, 0x1c($s0) -/* 993654 80240F24 8FBF001C */ lw $ra, 0x1c($sp) -/* 993658 80240F28 8FB20018 */ lw $s2, 0x18($sp) -/* 99365C 80240F2C 8FB10014 */ lw $s1, 0x14($sp) -/* 993660 80240F30 8FB00010 */ lw $s0, 0x10($sp) -/* 993664 80240F34 03E00008 */ jr $ra -/* 993668 80240F38 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240F3C_99366C.s b/ver/us/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240F3C_99366C.s deleted file mode 100644 index f0b2f45f9b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240F3C_99366C.s +++ /dev/null @@ -1,135 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80242A78_9951A8 -.word .L80241058_993788, .L80241068_993798, .L80241080_9937B0, .L80241090_9937C0, .L802410E0_993810, .L802410E0_993810, .L802410E0_993810, .L802410E0_993810, .L802410E0_993810, .L802410E0_993810, .L802410E0_993810, .L802410E0_993810, .L802410A8_9937D8, .L802410B8_9937E8, .L802410D0_993800, 0, 0, 0 - -.section .text - -glabel func_80240F3C_99366C -/* 99366C 80240F3C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 993670 80240F40 AFB40040 */ sw $s4, 0x40($sp) -/* 993674 80240F44 0080A02D */ daddu $s4, $a0, $zero -/* 993678 80240F48 AFBF0048 */ sw $ra, 0x48($sp) -/* 99367C 80240F4C AFB50044 */ sw $s5, 0x44($sp) -/* 993680 80240F50 AFB3003C */ sw $s3, 0x3c($sp) -/* 993684 80240F54 AFB20038 */ sw $s2, 0x38($sp) -/* 993688 80240F58 AFB10034 */ sw $s1, 0x34($sp) -/* 99368C 80240F5C AFB00030 */ sw $s0, 0x30($sp) -/* 993690 80240F60 8E920148 */ lw $s2, 0x148($s4) -/* 993694 80240F64 86440008 */ lh $a0, 8($s2) -/* 993698 80240F68 8E90000C */ lw $s0, 0xc($s4) -/* 99369C 80240F6C 0C00EABB */ jal get_npc_unsafe -/* 9936A0 80240F70 00A0882D */ daddu $s1, $a1, $zero -/* 9936A4 80240F74 0280202D */ daddu $a0, $s4, $zero -/* 9936A8 80240F78 8E050000 */ lw $a1, ($s0) -/* 9936AC 80240F7C 0C0B1EAF */ jal evt_get_variable -/* 9936B0 80240F80 0040A82D */ daddu $s5, $v0, $zero -/* 9936B4 80240F84 AFA00010 */ sw $zero, 0x10($sp) -/* 9936B8 80240F88 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9936BC 80240F8C 8C630030 */ lw $v1, 0x30($v1) -/* 9936C0 80240F90 AFA30014 */ sw $v1, 0x14($sp) -/* 9936C4 80240F94 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9936C8 80240F98 8C63001C */ lw $v1, 0x1c($v1) -/* 9936CC 80240F9C AFA30018 */ sw $v1, 0x18($sp) -/* 9936D0 80240FA0 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9936D4 80240FA4 8C630024 */ lw $v1, 0x24($v1) -/* 9936D8 80240FA8 AFA3001C */ sw $v1, 0x1c($sp) -/* 9936DC 80240FAC 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9936E0 80240FB0 8C630028 */ lw $v1, 0x28($v1) -/* 9936E4 80240FB4 27B30010 */ addiu $s3, $sp, 0x10 -/* 9936E8 80240FB8 AFA30020 */ sw $v1, 0x20($sp) -/* 9936EC 80240FBC 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9936F0 80240FC0 3C0142C8 */ lui $at, 0x42c8 -/* 9936F4 80240FC4 44810000 */ mtc1 $at, $f0 -/* 9936F8 80240FC8 8C63002C */ lw $v1, 0x2c($v1) -/* 9936FC 80240FCC 0040802D */ daddu $s0, $v0, $zero -/* 993700 80240FD0 E7A00028 */ swc1 $f0, 0x28($sp) -/* 993704 80240FD4 A7A0002C */ sh $zero, 0x2c($sp) -/* 993708 80240FD8 12200016 */ beqz $s1, .L80241034 -/* 99370C 80240FDC AFA30024 */ sw $v1, 0x24($sp) -/* 993710 80240FE0 8EA20000 */ lw $v0, ($s5) -/* 993714 80240FE4 2403F7FF */ addiu $v1, $zero, -0x801 -/* 993718 80240FE8 A6A0008E */ sh $zero, 0x8e($s5) -/* 99371C 80240FEC 00431024 */ and $v0, $v0, $v1 -/* 993720 80240FF0 2403FDFF */ addiu $v1, $zero, -0x201 -/* 993724 80240FF4 00431024 */ and $v0, $v0, $v1 -/* 993728 80240FF8 34420008 */ ori $v0, $v0, 8 -/* 99372C 80240FFC AEA20000 */ sw $v0, ($s5) -/* 993730 80241000 AE800074 */ sw $zero, 0x74($s4) -/* 993734 80241004 AE800070 */ sw $zero, 0x70($s4) -/* 993738 80241008 8E420000 */ lw $v0, ($s2) -/* 99373C 8024100C 3C034000 */ lui $v1, 0x4000 -/* 993740 80241010 00431024 */ and $v0, $v0, $v1 -/* 993744 80241014 10400007 */ beqz $v0, .L80241034 -/* 993748 80241018 3C03BFFF */ lui $v1, 0xbfff -/* 99374C 8024101C 2402000C */ addiu $v0, $zero, 0xc -/* 993750 80241020 AE820070 */ sw $v0, 0x70($s4) -/* 993754 80241024 8E420000 */ lw $v0, ($s2) -/* 993758 80241028 3463FFFF */ ori $v1, $v1, 0xffff -/* 99375C 8024102C 00431024 */ and $v0, $v0, $v1 -/* 993760 80241030 AE420000 */ sw $v0, ($s2) -.L80241034: -/* 993764 80241034 8E830070 */ lw $v1, 0x70($s4) -/* 993768 80241038 2C62000F */ sltiu $v0, $v1, 0xf -/* 99376C 8024103C 10400028 */ beqz $v0, .L802410E0_993810 -/* 993770 80241040 00031080 */ sll $v0, $v1, 2 -/* 993774 80241044 3C018024 */ lui $at, %hi(jtbl_80242A78_9951A8) -/* 993778 80241048 00220821 */ addu $at, $at, $v0 -/* 99377C 8024104C 8C222A78 */ lw $v0, %lo(jtbl_80242A78_9951A8)($at) -/* 993780 80241050 00400008 */ jr $v0 -/* 993784 80241054 00000000 */ nop -.L80241058_993788: -/* 993788 80241058 0280202D */ daddu $a0, $s4, $zero -/* 99378C 8024105C 0200282D */ daddu $a1, $s0, $zero -/* 993790 80241060 0C090385 */ jal func_80240E14_993544 -/* 993794 80241064 0260302D */ daddu $a2, $s3, $zero -.L80241068_993798: -/* 993798 80241068 0280202D */ daddu $a0, $s4, $zero -/* 99379C 8024106C 0200282D */ daddu $a1, $s0, $zero -/* 9937A0 80241070 0C09008C */ jal isk_14_UnkNpcAIFunc37 -/* 9937A4 80241074 0260302D */ daddu $a2, $s3, $zero -/* 9937A8 80241078 08090438 */ j .L802410E0_993810 -/* 9937AC 8024107C 00000000 */ nop -.L80241080_9937B0: -/* 9937B0 80241080 0280202D */ daddu $a0, $s4, $zero -/* 9937B4 80241084 0200282D */ daddu $a1, $s0, $zero -/* 9937B8 80241088 0C09015A */ jal isk_14_UnkNpcAIFunc1 -/* 9937BC 8024108C 0260302D */ daddu $a2, $s3, $zero -.L80241090_9937C0: -/* 9937C0 80241090 0280202D */ daddu $a0, $s4, $zero -/* 9937C4 80241094 0200282D */ daddu $a1, $s0, $zero -/* 9937C8 80241098 0C09018A */ jal isk_14_UnkNpcAIFunc38 -/* 9937CC 8024109C 0260302D */ daddu $a2, $s3, $zero -/* 9937D0 802410A0 08090438 */ j .L802410E0_993810 -/* 9937D4 802410A4 00000000 */ nop -.L802410A8_9937D8: -/* 9937D8 802410A8 0280202D */ daddu $a0, $s4, $zero -/* 9937DC 802410AC 0200282D */ daddu $a1, $s0, $zero -/* 9937E0 802410B0 0C0903AA */ jal func_80240EA8_9935D8 -/* 9937E4 802410B4 0260302D */ daddu $a2, $s3, $zero -.L802410B8_9937E8: -/* 9937E8 802410B8 0280202D */ daddu $a0, $s4, $zero -/* 9937EC 802410BC 0200282D */ daddu $a1, $s0, $zero -/* 9937F0 802410C0 0C09022B */ jal isk_14_UnkNpcAIFunc39 -/* 9937F4 802410C4 0260302D */ daddu $a2, $s3, $zero -/* 9937F8 802410C8 08090438 */ j .L802410E0_993810 -/* 9937FC 802410CC 00000000 */ nop -.L802410D0_993800: -/* 993800 802410D0 0280202D */ daddu $a0, $s4, $zero -/* 993804 802410D4 0200282D */ daddu $a1, $s0, $zero -/* 993808 802410D8 0C0902EB */ jal isk_14_UnkDurationCheck -/* 99380C 802410DC 0260302D */ daddu $a2, $s3, $zero -.L802410E0_993810: -/* 993810 802410E0 8FBF0048 */ lw $ra, 0x48($sp) -/* 993814 802410E4 8FB50044 */ lw $s5, 0x44($sp) -/* 993818 802410E8 8FB40040 */ lw $s4, 0x40($sp) -/* 99381C 802410EC 8FB3003C */ lw $s3, 0x3c($sp) -/* 993820 802410F0 8FB20038 */ lw $s2, 0x38($sp) -/* 993824 802410F4 8FB10034 */ lw $s1, 0x34($sp) -/* 993828 802410F8 8FB00030 */ lw $s0, 0x30($sp) -/* 99382C 802410FC 0000102D */ daddu $v0, $zero, $zero -/* 993830 80241100 03E00008 */ jr $ra -/* 993834 80241104 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241108_993838.s b/ver/us/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241108_993838.s deleted file mode 100644 index 57f8e09d7f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241108_993838.s +++ /dev/null @@ -1,65 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241108_993838 -/* 993838 80241108 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 99383C 8024110C AFB40030 */ sw $s4, 0x30($sp) -/* 993840 80241110 27B40010 */ addiu $s4, $sp, 0x10 -/* 993844 80241114 AFB3002C */ sw $s3, 0x2c($sp) -/* 993848 80241118 0000982D */ daddu $s3, $zero, $zero -/* 99384C 8024111C AFBF0038 */ sw $ra, 0x38($sp) -/* 993850 80241120 AFB50034 */ sw $s5, 0x34($sp) -/* 993854 80241124 AFB20028 */ sw $s2, 0x28($sp) -/* 993858 80241128 AFB10024 */ sw $s1, 0x24($sp) -/* 99385C 8024112C AFB00020 */ sw $s0, 0x20($sp) -/* 993860 80241130 8C84014C */ lw $a0, 0x14c($a0) -/* 993864 80241134 0C00EAD2 */ jal get_npc_safe -/* 993868 80241138 24150003 */ addiu $s5, $zero, 3 -/* 99386C 8024113C 24040080 */ addiu $a0, $zero, 0x80 -/* 993870 80241140 0C00AB39 */ jal heap_malloc -/* 993874 80241144 0040882D */ daddu $s1, $v0, $zero -/* 993878 80241148 0040902D */ daddu $s2, $v0, $zero -/* 99387C 8024114C 3C030035 */ lui $v1, 0x35 -/* 993880 80241150 34630002 */ ori $v1, $v1, 2 -/* 993884 80241154 2650000C */ addiu $s0, $s2, 0xc -/* 993888 80241158 3402814A */ ori $v0, $zero, 0x814a -/* 99388C 8024115C AE320020 */ sw $s2, 0x20($s1) -/* 993890 80241160 AFA20010 */ sw $v0, 0x10($sp) -/* 993894 80241164 AFA30014 */ sw $v1, 0x14($sp) -/* 993898 80241168 AFA00018 */ sw $zero, 0x18($sp) -/* 99389C 8024116C AFA0001C */ sw $zero, 0x1c($sp) -.L80241170: -/* 9938A0 80241170 0C00E211 */ jal _create_npc_basic -/* 9938A4 80241174 0280202D */ daddu $a0, $s4, $zero -/* 9938A8 80241178 0C00E2B7 */ jal get_npc_by_index -/* 9938AC 8024117C 0040202D */ daddu $a0, $v0, $zero -/* 9938B0 80241180 AE420000 */ sw $v0, ($s2) -/* 9938B4 80241184 C6200038 */ lwc1 $f0, 0x38($s1) -/* 9938B8 80241188 E4400038 */ swc1 $f0, 0x38($v0) -/* 9938BC 8024118C C620003C */ lwc1 $f0, 0x3c($s1) -/* 9938C0 80241190 0040202D */ daddu $a0, $v0, $zero -/* 9938C4 80241194 E480003C */ swc1 $f0, 0x3c($a0) -/* 9938C8 80241198 C6200040 */ lwc1 $f0, 0x40($s1) -/* 9938CC 8024119C 26730001 */ addiu $s3, $s3, 1 -/* 9938D0 802411A0 E4800040 */ swc1 $f0, 0x40($a0) -/* 9938D4 802411A4 C620000C */ lwc1 $f0, 0xc($s1) -/* 9938D8 802411A8 26520010 */ addiu $s2, $s2, 0x10 -/* 9938DC 802411AC A09500AB */ sb $s5, 0xab($a0) -/* 9938E0 802411B0 0C00EAFF */ jal disable_npc_shadow -/* 9938E4 802411B4 E480000C */ swc1 $f0, 0xc($a0) -/* 9938E8 802411B8 AE00FFF8 */ sw $zero, -8($s0) -/* 9938EC 802411BC AE00FFFC */ sw $zero, -4($s0) -/* 9938F0 802411C0 AE000000 */ sw $zero, ($s0) -/* 9938F4 802411C4 2A620008 */ slti $v0, $s3, 8 -/* 9938F8 802411C8 1440FFE9 */ bnez $v0, .L80241170 -/* 9938FC 802411CC 26100010 */ addiu $s0, $s0, 0x10 -/* 993900 802411D0 8FBF0038 */ lw $ra, 0x38($sp) -/* 993904 802411D4 8FB50034 */ lw $s5, 0x34($sp) -/* 993908 802411D8 8FB40030 */ lw $s4, 0x30($sp) -/* 99390C 802411DC 8FB3002C */ lw $s3, 0x2c($sp) -/* 993910 802411E0 8FB20028 */ lw $s2, 0x28($sp) -/* 993914 802411E4 8FB10024 */ lw $s1, 0x24($sp) -/* 993918 802411E8 8FB00020 */ lw $s0, 0x20($sp) -/* 99391C 802411EC 24020002 */ addiu $v0, $zero, 2 -/* 993920 802411F0 03E00008 */ jr $ra -/* 993924 802411F4 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_18/997F70/func_80240394_998304.s b/ver/us/asm/nonmatchings/world/area_isk/isk_18/997F70/func_80240394_998304.s deleted file mode 100644 index e9ff67421f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_18/997F70/func_80240394_998304.s +++ /dev/null @@ -1,309 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80241778_9996E8 -.word .L802407A0_998710, .L802407AC_99871C, .L802407AC_99871C, .L802407AC_99871C, .L802407AC_99871C, .L802407AC_99871C, .L802407AC_99871C, .L802407AC_99871C, .L802407A0_998710, .L802407AC_99871C, .L802407A0_998710, .L802407AC_99871C, .L802407A0_998710, .L802407AC_99871C, .L802407A0_998710, .L802407AC_99871C, .L802407AC_99871C, .L802407AC_99871C, .L802407A0_998710, .L802407AC_99871C, .L802407A0_998710, 0 - -.section .text - -glabel func_80240394_998304 -/* 998304 80240394 27BDFF90 */ addiu $sp, $sp, -0x70 -/* 998308 80240398 AFB3005C */ sw $s3, 0x5c($sp) -/* 99830C 8024039C 0080982D */ daddu $s3, $a0, $zero -/* 998310 802403A0 AFBF0068 */ sw $ra, 0x68($sp) -/* 998314 802403A4 AFB50064 */ sw $s5, 0x64($sp) -/* 998318 802403A8 AFB40060 */ sw $s4, 0x60($sp) -/* 99831C 802403AC AFB20058 */ sw $s2, 0x58($sp) -/* 998320 802403B0 AFB10054 */ sw $s1, 0x54($sp) -/* 998324 802403B4 AFB00050 */ sw $s0, 0x50($sp) -/* 998328 802403B8 8E710148 */ lw $s1, 0x148($s3) -/* 99832C 802403BC 86240008 */ lh $a0, 8($s1) -/* 998330 802403C0 0C00EABB */ jal get_npc_unsafe -/* 998334 802403C4 00A0802D */ daddu $s0, $a1, $zero -/* 998338 802403C8 8E63000C */ lw $v1, 0xc($s3) -/* 99833C 802403CC 0260202D */ daddu $a0, $s3, $zero -/* 998340 802403D0 8C650000 */ lw $a1, ($v1) -/* 998344 802403D4 0C0B1EAF */ jal evt_get_variable -/* 998348 802403D8 0040902D */ daddu $s2, $v0, $zero -/* 99834C 802403DC AFA00028 */ sw $zero, 0x28($sp) -/* 998350 802403E0 8E2300D0 */ lw $v1, 0xd0($s1) -/* 998354 802403E4 8C630030 */ lw $v1, 0x30($v1) -/* 998358 802403E8 AFA3002C */ sw $v1, 0x2c($sp) -/* 99835C 802403EC 8E2300D0 */ lw $v1, 0xd0($s1) -/* 998360 802403F0 8C63001C */ lw $v1, 0x1c($v1) -/* 998364 802403F4 AFA30030 */ sw $v1, 0x30($sp) -/* 998368 802403F8 8E2300D0 */ lw $v1, 0xd0($s1) -/* 99836C 802403FC 8C630024 */ lw $v1, 0x24($v1) -/* 998370 80240400 AFA30034 */ sw $v1, 0x34($sp) -/* 998374 80240404 8E2300D0 */ lw $v1, 0xd0($s1) -/* 998378 80240408 8C630028 */ lw $v1, 0x28($v1) -/* 99837C 8024040C 27B50028 */ addiu $s5, $sp, 0x28 -/* 998380 80240410 AFA30038 */ sw $v1, 0x38($sp) -/* 998384 80240414 8E2300D0 */ lw $v1, 0xd0($s1) -/* 998388 80240418 3C0142C8 */ lui $at, 0x42c8 -/* 99838C 8024041C 44810000 */ mtc1 $at, $f0 -/* 998390 80240420 8C63002C */ lw $v1, 0x2c($v1) -/* 998394 80240424 0040A02D */ daddu $s4, $v0, $zero -/* 998398 80240428 E7A00040 */ swc1 $f0, 0x40($sp) -/* 99839C 8024042C A7A00044 */ sh $zero, 0x44($sp) -/* 9983A0 80240430 12000009 */ beqz $s0, .L80240458 -/* 9983A4 80240434 AFA3003C */ sw $v1, 0x3c($sp) -/* 9983A8 80240438 864300A8 */ lh $v1, 0xa8($s2) -/* 9983AC 8024043C 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9983B0 80240440 AE20008C */ sw $zero, 0x8c($s1) -/* 9983B4 80240444 A22000B5 */ sb $zero, 0xb5($s1) -/* 9983B8 80240448 34420008 */ ori $v0, $v0, 8 -/* 9983BC 8024044C AE230084 */ sw $v1, 0x84($s1) -/* 9983C0 80240450 0809011A */ j .L80240468 -/* 9983C4 80240454 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240458: -/* 9983C8 80240458 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9983CC 8024045C 30420004 */ andi $v0, $v0, 4 -/* 9983D0 80240460 10400047 */ beqz $v0, .L80240580 -/* 9983D4 80240464 00000000 */ nop -.L80240468: -/* 9983D8 80240468 AE600070 */ sw $zero, 0x70($s3) -/* 9983DC 8024046C A640008E */ sh $zero, 0x8e($s2) -/* 9983E0 80240470 8E2300CC */ lw $v1, 0xcc($s1) -/* 9983E4 80240474 2404F7FF */ addiu $a0, $zero, -0x801 -/* 9983E8 80240478 A2200007 */ sb $zero, 7($s1) -/* 9983EC 8024047C 8E420000 */ lw $v0, ($s2) -/* 9983F0 80240480 8C630000 */ lw $v1, ($v1) -/* 9983F4 80240484 00441024 */ and $v0, $v0, $a0 -/* 9983F8 80240488 AE420000 */ sw $v0, ($s2) -/* 9983FC 8024048C AE430028 */ sw $v1, 0x28($s2) -/* 998400 80240490 96220086 */ lhu $v0, 0x86($s1) -/* 998404 80240494 A64200A8 */ sh $v0, 0xa8($s2) -/* 998408 80240498 8E2200D0 */ lw $v0, 0xd0($s1) -/* 99840C 8024049C AE200090 */ sw $zero, 0x90($s1) -/* 998410 802404A0 8C420034 */ lw $v0, 0x34($v0) -/* 998414 802404A4 14400006 */ bnez $v0, .L802404C0 -/* 998418 802404A8 2403FDFF */ addiu $v1, $zero, -0x201 -/* 99841C 802404AC 8E420000 */ lw $v0, ($s2) -/* 998420 802404B0 2403FFF7 */ addiu $v1, $zero, -9 -/* 998424 802404B4 34420200 */ ori $v0, $v0, 0x200 -/* 998428 802404B8 08090133 */ j .L802404CC -/* 99842C 802404BC 00431024 */ and $v0, $v0, $v1 -.L802404C0: -/* 998430 802404C0 8E420000 */ lw $v0, ($s2) -/* 998434 802404C4 00431024 */ and $v0, $v0, $v1 -/* 998438 802404C8 34420008 */ ori $v0, $v0, 8 -.L802404CC: -/* 99843C 802404CC AE420000 */ sw $v0, ($s2) -/* 998440 802404D0 8E2200B0 */ lw $v0, 0xb0($s1) -/* 998444 802404D4 30420004 */ andi $v0, $v0, 4 -/* 998448 802404D8 1040001E */ beqz $v0, .L80240554 -/* 99844C 802404DC 24040002 */ addiu $a0, $zero, 2 -/* 998450 802404E0 0240282D */ daddu $a1, $s2, $zero -/* 998454 802404E4 0000302D */ daddu $a2, $zero, $zero -/* 998458 802404E8 24020063 */ addiu $v0, $zero, 0x63 -/* 99845C 802404EC AE620070 */ sw $v0, 0x70($s3) -/* 998460 802404F0 AE600074 */ sw $zero, 0x74($s3) -/* 998464 802404F4 864300A8 */ lh $v1, 0xa8($s2) -/* 998468 802404F8 3C013F80 */ lui $at, 0x3f80 -/* 99846C 802404FC 44810000 */ mtc1 $at, $f0 -/* 998470 80240500 3C014000 */ lui $at, 0x4000 -/* 998474 80240504 44811000 */ mtc1 $at, $f2 -/* 998478 80240508 3C01C1A0 */ lui $at, 0xc1a0 -/* 99847C 8024050C 44812000 */ mtc1 $at, $f4 -/* 998480 80240510 24020028 */ addiu $v0, $zero, 0x28 -/* 998484 80240514 AFA2001C */ sw $v0, 0x1c($sp) -/* 998488 80240518 44833000 */ mtc1 $v1, $f6 -/* 99848C 8024051C 00000000 */ nop -/* 998490 80240520 468031A0 */ cvt.s.w $f6, $f6 -/* 998494 80240524 44073000 */ mfc1 $a3, $f6 -/* 998498 80240528 27A20048 */ addiu $v0, $sp, 0x48 -/* 99849C 8024052C AFA20020 */ sw $v0, 0x20($sp) -/* 9984A0 80240530 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9984A4 80240534 E7A20014 */ swc1 $f2, 0x14($sp) -/* 9984A8 80240538 0C01BFA4 */ jal fx_emote -/* 9984AC 8024053C E7A40018 */ swc1 $f4, 0x18($sp) -/* 9984B0 80240540 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9984B4 80240544 2403FFFB */ addiu $v1, $zero, -5 -/* 9984B8 80240548 00431024 */ and $v0, $v0, $v1 -/* 9984BC 8024054C 08090160 */ j .L80240580 -/* 9984C0 80240550 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240554: -/* 9984C4 80240554 8E220000 */ lw $v0, ($s1) -/* 9984C8 80240558 3C034000 */ lui $v1, 0x4000 -/* 9984CC 8024055C 00431024 */ and $v0, $v0, $v1 -/* 9984D0 80240560 10400007 */ beqz $v0, .L80240580 -/* 9984D4 80240564 3C03BFFF */ lui $v1, 0xbfff -/* 9984D8 80240568 2402000C */ addiu $v0, $zero, 0xc -/* 9984DC 8024056C AE620070 */ sw $v0, 0x70($s3) -/* 9984E0 80240570 8E220000 */ lw $v0, ($s1) -/* 9984E4 80240574 3463FFFF */ ori $v1, $v1, 0xffff -/* 9984E8 80240578 00431024 */ and $v0, $v0, $v1 -/* 9984EC 8024057C AE220000 */ sw $v0, ($s1) -.L80240580: -/* 9984F0 80240580 8E220090 */ lw $v0, 0x90($s1) -/* 9984F4 80240584 1840000C */ blez $v0, .L802405B8 -/* 9984F8 80240588 2442FFFF */ addiu $v0, $v0, -1 -/* 9984FC 8024058C 14400087 */ bnez $v0, .L802407AC_99871C -/* 998500 80240590 AE220090 */ sw $v0, 0x90($s1) -/* 998504 80240594 3C03FFAA */ lui $v1, 0xffaa -/* 998508 80240598 8E420028 */ lw $v0, 0x28($s2) -/* 99850C 8024059C 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* 998510 802405A0 00431021 */ addu $v0, $v0, $v1 -/* 998514 802405A4 2C420002 */ sltiu $v0, $v0, 2 -/* 998518 802405A8 10400003 */ beqz $v0, .L802405B8 -/* 99851C 802405AC 3C020055 */ lui $v0, 0x55 -/* 998520 802405B0 3442000C */ ori $v0, $v0, 0xc -/* 998524 802405B4 AE420028 */ sw $v0, 0x28($s2) -.L802405B8: -/* 998528 802405B8 8E630070 */ lw $v1, 0x70($s3) -/* 99852C 802405BC 2402000C */ addiu $v0, $zero, 0xc -/* 998530 802405C0 10620048 */ beq $v1, $v0, .L802406E4 -/* 998534 802405C4 2862000D */ slti $v0, $v1, 0xd -/* 998538 802405C8 1040000F */ beqz $v0, .L80240608 -/* 99853C 802405CC 24100001 */ addiu $s0, $zero, 1 -/* 998540 802405D0 1070001E */ beq $v1, $s0, .L8024064C -/* 998544 802405D4 28620002 */ slti $v0, $v1, 2 -/* 998548 802405D8 10400005 */ beqz $v0, .L802405F0 -/* 99854C 802405DC 24020002 */ addiu $v0, $zero, 2 -/* 998550 802405E0 10600015 */ beqz $v1, .L80240638 -/* 998554 802405E4 0260202D */ daddu $a0, $s3, $zero -/* 998558 802405E8 080901D0 */ j .L80240740 -/* 99855C 802405EC 00000000 */ nop -.L802405F0: -/* 998560 802405F0 1062001C */ beq $v1, $v0, .L80240664 -/* 998564 802405F4 24020003 */ addiu $v0, $zero, 3 -/* 998568 802405F8 10620035 */ beq $v1, $v0, .L802406D0 -/* 99856C 802405FC 0260202D */ daddu $a0, $s3, $zero -/* 998570 80240600 080901D0 */ j .L80240740 -/* 998574 80240604 00000000 */ nop -.L80240608: -/* 998578 80240608 2402000E */ addiu $v0, $zero, 0xe -/* 99857C 8024060C 1062003F */ beq $v1, $v0, .L8024070C -/* 998580 80240610 0062102A */ slt $v0, $v1, $v0 -/* 998584 80240614 14400038 */ bnez $v0, .L802406F8 -/* 998588 80240618 0260202D */ daddu $a0, $s3, $zero -/* 99858C 8024061C 2402000F */ addiu $v0, $zero, 0xf -/* 998590 80240620 10620040 */ beq $v1, $v0, .L80240724 -/* 998594 80240624 24020063 */ addiu $v0, $zero, 0x63 -/* 998598 80240628 10620043 */ beq $v1, $v0, .L80240738 -/* 99859C 8024062C 00000000 */ nop -/* 9985A0 80240630 080901D0 */ j .L80240740 -/* 9985A4 80240634 00000000 */ nop -.L80240638: -/* 9985A8 80240638 0280282D */ daddu $a1, $s4, $zero -/* 9985AC 8024063C 0C012568 */ jal func_800495A0 -/* 9985B0 80240640 02A0302D */ daddu $a2, $s5, $zero -/* 9985B4 80240644 96220086 */ lhu $v0, 0x86($s1) -/* 9985B8 80240648 A64200A8 */ sh $v0, 0xa8($s2) -.L8024064C: -/* 9985BC 8024064C 0260202D */ daddu $a0, $s3, $zero -/* 9985C0 80240650 0280282D */ daddu $a1, $s4, $zero -/* 9985C4 80240654 0C0125AE */ jal func_800496B8 -/* 9985C8 80240658 02A0302D */ daddu $a2, $s5, $zero -/* 9985CC 8024065C 080901D0 */ j .L80240740 -/* 9985D0 80240660 00000000 */ nop -.L80240664: -/* 9985D4 80240664 0260202D */ daddu $a0, $s3, $zero -/* 9985D8 80240668 0280282D */ daddu $a1, $s4, $zero -/* 9985DC 8024066C 0C0126D1 */ jal base_UnkNpcAIFunc1 -/* 9985E0 80240670 02A0302D */ daddu $a2, $s5, $zero -/* 9985E4 80240674 8E230088 */ lw $v1, 0x88($s1) -/* 9985E8 80240678 24020006 */ addiu $v0, $zero, 6 -/* 9985EC 8024067C 14620014 */ bne $v1, $v0, .L802406D0 -/* 9985F0 80240680 0260202D */ daddu $a0, $s3, $zero -/* 9985F4 80240684 0C00A67F */ jal rand_int -/* 9985F8 80240688 24040064 */ addiu $a0, $zero, 0x64 -/* 9985FC 8024068C 28420021 */ slti $v0, $v0, 0x21 -/* 998600 80240690 5040000F */ beql $v0, $zero, .L802406D0 -/* 998604 80240694 0260202D */ daddu $a0, $s3, $zero -/* 998608 80240698 8E22008C */ lw $v0, 0x8c($s1) -/* 99860C 8024069C 10400005 */ beqz $v0, .L802406B4 -/* 998610 802406A0 3C020055 */ lui $v0, 0x55 -/* 998614 802406A4 3442002F */ ori $v0, $v0, 0x2f -/* 998618 802406A8 AE20008C */ sw $zero, 0x8c($s1) -/* 99861C 802406AC 080901B0 */ j .L802406C0 -/* 998620 802406B0 A22000B5 */ sb $zero, 0xb5($s1) -.L802406B4: -/* 998624 802406B4 3442002E */ ori $v0, $v0, 0x2e -/* 998628 802406B8 AE30008C */ sw $s0, 0x8c($s1) -/* 99862C 802406BC A23000B5 */ sb $s0, 0xb5($s1) -.L802406C0: -/* 998630 802406C0 AE420028 */ sw $v0, 0x28($s2) -/* 998634 802406C4 24020007 */ addiu $v0, $zero, 7 -/* 998638 802406C8 080901EB */ j .L802407AC_99871C -/* 99863C 802406CC AE220090 */ sw $v0, 0x90($s1) -.L802406D0: -/* 998640 802406D0 0280282D */ daddu $a1, $s4, $zero -/* 998644 802406D4 0C012701 */ jal func_80049C04 -/* 998648 802406D8 02A0302D */ daddu $a2, $s5, $zero -/* 99864C 802406DC 080901D0 */ j .L80240740 -/* 998650 802406E0 00000000 */ nop -.L802406E4: -/* 998654 802406E4 0260202D */ daddu $a0, $s3, $zero -/* 998658 802406E8 0280282D */ daddu $a1, $s4, $zero -/* 99865C 802406EC 0C090000 */ jal isk_18_set_script_owner_npc_anim -/* 998660 802406F0 02A0302D */ daddu $a2, $s5, $zero -/* 998664 802406F4 0260202D */ daddu $a0, $s3, $zero -.L802406F8: -/* 998668 802406F8 0280282D */ daddu $a1, $s4, $zero -/* 99866C 802406FC 0C09001F */ jal isk_18_UnkDistFunc -/* 998670 80240700 02A0302D */ daddu $a2, $s5, $zero -/* 998674 80240704 080901D0 */ j .L80240740 -/* 998678 80240708 00000000 */ nop -.L8024070C: -/* 99867C 8024070C 0260202D */ daddu $a0, $s3, $zero -/* 998680 80240710 0280282D */ daddu $a1, $s4, $zero -/* 998684 80240714 0C09006C */ jal isk_18_UnkNpcAIFunc12 -/* 998688 80240718 02A0302D */ daddu $a2, $s5, $zero -/* 99868C 8024071C 080901D0 */ j .L80240740 -/* 998690 80240720 00000000 */ nop -.L80240724: -/* 998694 80240724 0280282D */ daddu $a1, $s4, $zero -/* 998698 80240728 0C0900C5 */ jal isk_18_set_script_owner_npc_col_height -/* 99869C 8024072C 02A0302D */ daddu $a2, $s5, $zero -/* 9986A0 80240730 080901D0 */ j .L80240740 -/* 9986A4 80240734 00000000 */ nop -.L80240738: -/* 9986A8 80240738 0C0129CF */ jal func_8004A73C -/* 9986AC 8024073C 0260202D */ daddu $a0, $s3, $zero -.L80240740: -/* 9986B0 80240740 8E230088 */ lw $v1, 0x88($s1) -/* 9986B4 80240744 24020006 */ addiu $v0, $zero, 6 -/* 9986B8 80240748 14620019 */ bne $v1, $v0, .L802407B0 -/* 9986BC 8024074C 0000102D */ daddu $v0, $zero, $zero -/* 9986C0 80240750 8E22008C */ lw $v0, 0x8c($s1) -/* 9986C4 80240754 10400003 */ beqz $v0, .L80240764 -/* 9986C8 80240758 24020001 */ addiu $v0, $zero, 1 -/* 9986CC 8024075C 080901DA */ j .L80240768 -/* 9986D0 80240760 A22200B5 */ sb $v0, 0xb5($s1) -.L80240764: -/* 9986D4 80240764 A22000B5 */ sb $zero, 0xb5($s1) -.L80240768: -/* 9986D8 80240768 8E22008C */ lw $v0, 0x8c($s1) -/* 9986DC 8024076C 1040000F */ beqz $v0, .L802407AC_99871C -/* 9986E0 80240770 3C03FFAA */ lui $v1, 0xffaa -/* 9986E4 80240774 8E420028 */ lw $v0, 0x28($s2) -/* 9986E8 80240778 3463FFFC */ ori $v1, $v1, 0xfffc -/* 9986EC 8024077C 00431821 */ addu $v1, $v0, $v1 -/* 9986F0 80240780 2C620015 */ sltiu $v0, $v1, 0x15 -/* 9986F4 80240784 10400009 */ beqz $v0, .L802407AC_99871C -/* 9986F8 80240788 00031080 */ sll $v0, $v1, 2 -/* 9986FC 8024078C 3C018024 */ lui $at, %hi(jtbl_80241778_9996E8) -/* 998700 80240790 00220821 */ addu $at, $at, $v0 -/* 998704 80240794 8C221778 */ lw $v0, %lo(jtbl_80241778_9996E8)($at) -/* 998708 80240798 00400008 */ jr $v0 -/* 99870C 8024079C 00000000 */ nop -.L802407A0_998710: -/* 998710 802407A0 8E420028 */ lw $v0, 0x28($s2) -/* 998714 802407A4 24420001 */ addiu $v0, $v0, 1 -/* 998718 802407A8 AE420028 */ sw $v0, 0x28($s2) -.L802407AC_99871C: -/* 99871C 802407AC 0000102D */ daddu $v0, $zero, $zero -.L802407B0: -/* 998720 802407B0 8FBF0068 */ lw $ra, 0x68($sp) -/* 998724 802407B4 8FB50064 */ lw $s5, 0x64($sp) -/* 998728 802407B8 8FB40060 */ lw $s4, 0x60($sp) -/* 99872C 802407BC 8FB3005C */ lw $s3, 0x5c($sp) -/* 998730 802407C0 8FB20058 */ lw $s2, 0x58($sp) -/* 998734 802407C4 8FB10054 */ lw $s1, 0x54($sp) -/* 998738 802407C8 8FB00050 */ lw $s0, 0x50($sp) -/* 99873C 802407CC 03E00008 */ jr $ra -/* 998740 802407D0 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241424_8B1494.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241424_8B1494.s deleted file mode 100644 index f497fe028b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241424_8B1494.s +++ /dev/null @@ -1,59 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80257D40_8C7DB0 -.double 32767.0 - -.section .text - -glabel func_80241424_8B1494 -/* 8B1494 80241424 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8B1498 80241428 AFB00010 */ sw $s0, 0x10($sp) -/* 8B149C 8024142C 0080802D */ daddu $s0, $a0, $zero -/* 8B14A0 80241430 AFBF001C */ sw $ra, 0x1c($sp) -/* 8B14A4 80241434 AFB20018 */ sw $s2, 0x18($sp) -/* 8B14A8 80241438 AFB10014 */ sw $s1, 0x14($sp) -/* 8B14AC 8024143C 8E110148 */ lw $s1, 0x148($s0) -/* 8B14B0 80241440 86240008 */ lh $a0, 8($s1) -/* 8B14B4 80241444 0C00EABB */ jal get_npc_unsafe -/* 8B14B8 80241448 00A0902D */ daddu $s2, $a1, $zero -/* 8B14BC 8024144C 8E2300CC */ lw $v1, 0xcc($s1) -/* 8B14C0 80241450 0040202D */ daddu $a0, $v0, $zero -/* 8B14C4 80241454 8C630000 */ lw $v1, ($v1) -/* 8B14C8 80241458 24020001 */ addiu $v0, $zero, 1 -/* 8B14CC 8024145C AC830028 */ sw $v1, 0x28($a0) -/* 8B14D0 80241460 AE020070 */ sw $v0, 0x70($s0) -/* 8B14D4 80241464 8E220000 */ lw $v0, ($s1) -/* 8B14D8 80241468 3C030010 */ lui $v1, 0x10 -/* 8B14DC 8024146C 00431024 */ and $v0, $v0, $v1 -/* 8B14E0 80241470 10400004 */ beqz $v0, .L80241484 -/* 8B14E4 80241474 00000000 */ nop -/* 8B14E8 80241478 C620006C */ lwc1 $f0, 0x6c($s1) -/* 8B14EC 8024147C 46800020 */ cvt.s.w $f0, $f0 -/* 8B14F0 80241480 E480000C */ swc1 $f0, 0xc($a0) -.L80241484: -/* 8B14F4 80241484 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8B14F8 80241488 8C420014 */ lw $v0, 0x14($v0) -/* 8B14FC 8024148C 1C400004 */ bgtz $v0, .L802414A0 -/* 8B1500 80241490 00000000 */ nop -/* 8B1504 80241494 C640000C */ lwc1 $f0, 0xc($s2) -/* 8B1508 80241498 08090530 */ j .L802414C0 -/* 8B150C 8024149C E4800018 */ swc1 $f0, 0x18($a0) -.L802414A0: -/* 8B1510 802414A0 3C018025 */ lui $at, %hi(D_80257D40_8C7DB0) -/* 8B1514 802414A4 D4227D40 */ ldc1 $f2, %lo(D_80257D40_8C7DB0)($at) -/* 8B1518 802414A8 44820000 */ mtc1 $v0, $f0 -/* 8B151C 802414AC 00000000 */ nop -/* 8B1520 802414B0 46800021 */ cvt.d.w $f0, $f0 -/* 8B1524 802414B4 46220003 */ div.d $f0, $f0, $f2 -/* 8B1528 802414B8 46200020 */ cvt.s.d $f0, $f0 -/* 8B152C 802414BC E4800018 */ swc1 $f0, 0x18($a0) -.L802414C0: -/* 8B1530 802414C0 8FBF001C */ lw $ra, 0x1c($sp) -/* 8B1534 802414C4 8FB20018 */ lw $s2, 0x18($sp) -/* 8B1538 802414C8 8FB10014 */ lw $s1, 0x14($sp) -/* 8B153C 802414CC 8FB00010 */ lw $s0, 0x10($sp) -/* 8B1540 802414D0 03E00008 */ jr $ra -/* 8B1544 802414D4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802414D8_8B1548.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802414D8_8B1548.s deleted file mode 100644 index 4e19f60240..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802414D8_8B1548.s +++ /dev/null @@ -1,78 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802414D8_8B1548 -/* 8B1548 802414D8 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 8B154C 802414DC AFB40040 */ sw $s4, 0x40($sp) -/* 8B1550 802414E0 0080A02D */ daddu $s4, $a0, $zero -/* 8B1554 802414E4 AFBF0044 */ sw $ra, 0x44($sp) -/* 8B1558 802414E8 AFB3003C */ sw $s3, 0x3c($sp) -/* 8B155C 802414EC AFB20038 */ sw $s2, 0x38($sp) -/* 8B1560 802414F0 AFB10034 */ sw $s1, 0x34($sp) -/* 8B1564 802414F4 AFB00030 */ sw $s0, 0x30($sp) -/* 8B1568 802414F8 8E920148 */ lw $s2, 0x148($s4) -/* 8B156C 802414FC 00A0802D */ daddu $s0, $a1, $zero -/* 8B1570 80241500 86440008 */ lh $a0, 8($s2) -/* 8B1574 80241504 0C00EABB */ jal get_npc_unsafe -/* 8B1578 80241508 00C0982D */ daddu $s3, $a2, $zero -/* 8B157C 8024150C 8E030008 */ lw $v1, 8($s0) -/* 8B1580 80241510 04600031 */ bltz $v1, .L802415D8 -/* 8B1584 80241514 0040882D */ daddu $s1, $v0, $zero -/* 8B1588 80241518 0260202D */ daddu $a0, $s3, $zero -/* 8B158C 8024151C AFA00010 */ sw $zero, 0x10($sp) -/* 8B1590 80241520 8E060018 */ lw $a2, 0x18($s0) -/* 8B1594 80241524 8E07001C */ lw $a3, 0x1c($s0) -/* 8B1598 80241528 0C01242D */ jal func_800490B4 -/* 8B159C 8024152C 0240282D */ daddu $a1, $s2, $zero -/* 8B15A0 80241530 10400029 */ beqz $v0, .L802415D8 -/* 8B15A4 80241534 0000202D */ daddu $a0, $zero, $zero -/* 8B15A8 80241538 0220282D */ daddu $a1, $s1, $zero -/* 8B15AC 8024153C 0000302D */ daddu $a2, $zero, $zero -/* 8B15B0 80241540 862300A8 */ lh $v1, 0xa8($s1) -/* 8B15B4 80241544 3C013F80 */ lui $at, 0x3f80 -/* 8B15B8 80241548 44810000 */ mtc1 $at, $f0 -/* 8B15BC 8024154C 3C014000 */ lui $at, 0x4000 -/* 8B15C0 80241550 44811000 */ mtc1 $at, $f2 -/* 8B15C4 80241554 3C01C1A0 */ lui $at, 0xc1a0 -/* 8B15C8 80241558 44812000 */ mtc1 $at, $f4 -/* 8B15CC 8024155C 2402000F */ addiu $v0, $zero, 0xf -/* 8B15D0 80241560 AFA2001C */ sw $v0, 0x1c($sp) -/* 8B15D4 80241564 44833000 */ mtc1 $v1, $f6 -/* 8B15D8 80241568 00000000 */ nop -/* 8B15DC 8024156C 468031A0 */ cvt.s.w $f6, $f6 -/* 8B15E0 80241570 44073000 */ mfc1 $a3, $f6 -/* 8B15E4 80241574 27A20028 */ addiu $v0, $sp, 0x28 -/* 8B15E8 80241578 AFA20020 */ sw $v0, 0x20($sp) -/* 8B15EC 8024157C E7A00010 */ swc1 $f0, 0x10($sp) -/* 8B15F0 80241580 E7A20014 */ swc1 $f2, 0x14($sp) -/* 8B15F4 80241584 0C01BFA4 */ jal fx_emote -/* 8B15F8 80241588 E7A40018 */ swc1 $f4, 0x18($sp) -/* 8B15FC 8024158C 0220202D */ daddu $a0, $s1, $zero -/* 8B1600 80241590 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 8B1604 80241594 0C012530 */ jal ai_enemy_play_sound -/* 8B1608 80241598 3C060020 */ lui $a2, 0x20 -/* 8B160C 8024159C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8B1610 802415A0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8B1614 802415A4 C62C0038 */ lwc1 $f12, 0x38($s1) -/* 8B1618 802415A8 C62E0040 */ lwc1 $f14, 0x40($s1) -/* 8B161C 802415AC 8C460028 */ lw $a2, 0x28($v0) -/* 8B1620 802415B0 0C00A720 */ jal atan2 -/* 8B1624 802415B4 8C470030 */ lw $a3, 0x30($v0) -/* 8B1628 802415B8 E620000C */ swc1 $f0, 0xc($s1) -/* 8B162C 802415BC 8E420018 */ lw $v0, 0x18($s2) -/* 8B1630 802415C0 9442002A */ lhu $v0, 0x2a($v0) -/* 8B1634 802415C4 30420001 */ andi $v0, $v0, 1 -/* 8B1638 802415C8 14400002 */ bnez $v0, .L802415D4 -/* 8B163C 802415CC 2402000A */ addiu $v0, $zero, 0xa -/* 8B1640 802415D0 2402000C */ addiu $v0, $zero, 0xc -.L802415D4: -/* 8B1644 802415D4 AE820070 */ sw $v0, 0x70($s4) -.L802415D8: -/* 8B1648 802415D8 8FBF0044 */ lw $ra, 0x44($sp) -/* 8B164C 802415DC 8FB40040 */ lw $s4, 0x40($sp) -/* 8B1650 802415E0 8FB3003C */ lw $s3, 0x3c($sp) -/* 8B1654 802415E4 8FB20038 */ lw $s2, 0x38($sp) -/* 8B1658 802415E8 8FB10034 */ lw $s1, 0x34($sp) -/* 8B165C 802415EC 8FB00030 */ lw $s0, 0x30($sp) -/* 8B1660 802415F0 03E00008 */ jr $ra -/* 8B1664 802415F4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241964_8B19D4.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241964_8B19D4.s deleted file mode 100644 index ac9217a0a6..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241964_8B19D4.s +++ /dev/null @@ -1,59 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80257D48_8C7DB8 -.double 0.3 - -dlabel D_80257D50_8C7DC0 -.double 32767.0 - -.section .text - -glabel func_80241964_8B19D4 -/* 8B19D4 80241964 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8B19D8 80241968 AFB10014 */ sw $s1, 0x14($sp) -/* 8B19DC 8024196C 0080882D */ daddu $s1, $a0, $zero -/* 8B19E0 80241970 AFBF001C */ sw $ra, 0x1c($sp) -/* 8B19E4 80241974 AFB20018 */ sw $s2, 0x18($sp) -/* 8B19E8 80241978 AFB00010 */ sw $s0, 0x10($sp) -/* 8B19EC 8024197C 8E300148 */ lw $s0, 0x148($s1) -/* 8B19F0 80241980 86040008 */ lh $a0, 8($s0) -/* 8B19F4 80241984 0C00EABB */ jal get_npc_unsafe -/* 8B19F8 80241988 00A0902D */ daddu $s2, $a1, $zero -/* 8B19FC 8024198C 8E0300CC */ lw $v1, 0xcc($s0) -/* 8B1A00 80241990 8C630004 */ lw $v1, 4($v1) -/* 8B1A04 80241994 0040202D */ daddu $a0, $v0, $zero -/* 8B1A08 80241998 AC830028 */ sw $v1, 0x28($a0) -/* 8B1A0C 8024199C 8E0200D0 */ lw $v0, 0xd0($s0) -/* 8B1A10 802419A0 8C420014 */ lw $v0, 0x14($v0) -/* 8B1A14 802419A4 04410009 */ bgez $v0, .L802419CC -/* 8B1A18 802419A8 00000000 */ nop -/* 8B1A1C 802419AC C640000C */ lwc1 $f0, 0xc($s2) -/* 8B1A20 802419B0 3C018025 */ lui $at, %hi(D_80257D48_8C7DB8) -/* 8B1A24 802419B4 D4227D48 */ ldc1 $f2, %lo(D_80257D48_8C7DB8)($at) -/* 8B1A28 802419B8 46000021 */ cvt.d.s $f0, $f0 -/* 8B1A2C 802419BC 46220002 */ mul.d $f0, $f0, $f2 -/* 8B1A30 802419C0 00000000 */ nop -/* 8B1A34 802419C4 0809067A */ j .L802419E8 -/* 8B1A38 802419C8 46200020 */ cvt.s.d $f0, $f0 -.L802419CC: -/* 8B1A3C 802419CC 3C018025 */ lui $at, %hi(D_80257D50_8C7DC0) -/* 8B1A40 802419D0 D4227D50 */ ldc1 $f2, %lo(D_80257D50_8C7DC0)($at) -/* 8B1A44 802419D4 44820000 */ mtc1 $v0, $f0 -/* 8B1A48 802419D8 00000000 */ nop -/* 8B1A4C 802419DC 46800021 */ cvt.d.w $f0, $f0 -/* 8B1A50 802419E0 46220003 */ div.d $f0, $f0, $f2 -/* 8B1A54 802419E4 46200020 */ cvt.s.d $f0, $f0 -.L802419E8: -/* 8B1A58 802419E8 E4800018 */ swc1 $f0, 0x18($a0) -/* 8B1A5C 802419EC 24020010 */ addiu $v0, $zero, 0x10 -/* 8B1A60 802419F0 AE200074 */ sw $zero, 0x74($s1) -/* 8B1A64 802419F4 AE220070 */ sw $v0, 0x70($s1) -/* 8B1A68 802419F8 8FBF001C */ lw $ra, 0x1c($sp) -/* 8B1A6C 802419FC 8FB20018 */ lw $s2, 0x18($sp) -/* 8B1A70 80241A00 8FB10014 */ lw $s1, 0x14($sp) -/* 8B1A74 80241A04 8FB00010 */ lw $s0, 0x10($sp) -/* 8B1A78 80241A08 03E00008 */ jr $ra -/* 8B1A7C 80241A0C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241A10_8B1A80.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241A10_8B1A80.s deleted file mode 100644 index d0b79f7851..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241A10_8B1A80.s +++ /dev/null @@ -1,140 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A10_8B1A80 -/* 8B1A80 80241A10 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 8B1A84 80241A14 AFB3003C */ sw $s3, 0x3c($sp) -/* 8B1A88 80241A18 0080982D */ daddu $s3, $a0, $zero -/* 8B1A8C 80241A1C AFBF0044 */ sw $ra, 0x44($sp) -/* 8B1A90 80241A20 AFB40040 */ sw $s4, 0x40($sp) -/* 8B1A94 80241A24 AFB20038 */ sw $s2, 0x38($sp) -/* 8B1A98 80241A28 AFB10034 */ sw $s1, 0x34($sp) -/* 8B1A9C 80241A2C AFB00030 */ sw $s0, 0x30($sp) -/* 8B1AA0 80241A30 8E710148 */ lw $s1, 0x148($s3) -/* 8B1AA4 80241A34 00A0902D */ daddu $s2, $a1, $zero -/* 8B1AA8 80241A38 86240008 */ lh $a0, 8($s1) -/* 8B1AAC 80241A3C 0C00EABB */ jal get_npc_unsafe -/* 8B1AB0 80241A40 00C0A02D */ daddu $s4, $a2, $zero -/* 8B1AB4 80241A44 8E430008 */ lw $v1, 8($s2) -/* 8B1AB8 80241A48 0460003B */ bltz $v1, .L80241B38 -/* 8B1ABC 80241A4C 0040802D */ daddu $s0, $v0, $zero -/* 8B1AC0 80241A50 8E620074 */ lw $v0, 0x74($s3) -/* 8B1AC4 80241A54 1C400037 */ bgtz $v0, .L80241B34 -/* 8B1AC8 80241A58 2442FFFF */ addiu $v0, $v0, -1 -/* 8B1ACC 80241A5C 0280202D */ daddu $a0, $s4, $zero -/* 8B1AD0 80241A60 AE630074 */ sw $v1, 0x74($s3) -/* 8B1AD4 80241A64 AFA00010 */ sw $zero, 0x10($sp) -/* 8B1AD8 80241A68 8E460018 */ lw $a2, 0x18($s2) -/* 8B1ADC 80241A6C 8E47001C */ lw $a3, 0x1c($s2) -/* 8B1AE0 80241A70 0C01242D */ jal func_800490B4 -/* 8B1AE4 80241A74 0220282D */ daddu $a1, $s1, $zero -/* 8B1AE8 80241A78 1040002C */ beqz $v0, .L80241B2C -/* 8B1AEC 80241A7C 0000202D */ daddu $a0, $zero, $zero -/* 8B1AF0 80241A80 0200282D */ daddu $a1, $s0, $zero -/* 8B1AF4 80241A84 0000302D */ daddu $a2, $zero, $zero -/* 8B1AF8 80241A88 860300A8 */ lh $v1, 0xa8($s0) -/* 8B1AFC 80241A8C 3C013F80 */ lui $at, 0x3f80 -/* 8B1B00 80241A90 44810000 */ mtc1 $at, $f0 -/* 8B1B04 80241A94 3C014000 */ lui $at, 0x4000 -/* 8B1B08 80241A98 44811000 */ mtc1 $at, $f2 -/* 8B1B0C 80241A9C 3C01C1A0 */ lui $at, 0xc1a0 -/* 8B1B10 80241AA0 44812000 */ mtc1 $at, $f4 -/* 8B1B14 80241AA4 2402000F */ addiu $v0, $zero, 0xf -/* 8B1B18 80241AA8 AFA2001C */ sw $v0, 0x1c($sp) -/* 8B1B1C 80241AAC 44833000 */ mtc1 $v1, $f6 -/* 8B1B20 80241AB0 00000000 */ nop -/* 8B1B24 80241AB4 468031A0 */ cvt.s.w $f6, $f6 -/* 8B1B28 80241AB8 44073000 */ mfc1 $a3, $f6 -/* 8B1B2C 80241ABC 27A20028 */ addiu $v0, $sp, 0x28 -/* 8B1B30 80241AC0 AFA20020 */ sw $v0, 0x20($sp) -/* 8B1B34 80241AC4 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8B1B38 80241AC8 E7A20014 */ swc1 $f2, 0x14($sp) -/* 8B1B3C 80241ACC 0C01BFA4 */ jal fx_emote -/* 8B1B40 80241AD0 E7A40018 */ swc1 $f4, 0x18($sp) -/* 8B1B44 80241AD4 0200202D */ daddu $a0, $s0, $zero -/* 8B1B48 80241AD8 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 8B1B4C 80241ADC 0C012530 */ jal ai_enemy_play_sound -/* 8B1B50 80241AE0 3C060020 */ lui $a2, 0x20 -/* 8B1B54 80241AE4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 8B1B58 80241AE8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8B1B5C 80241AEC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8B1B60 80241AF0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 8B1B64 80241AF4 8C460028 */ lw $a2, 0x28($v0) -/* 8B1B68 80241AF8 0C00A720 */ jal atan2 -/* 8B1B6C 80241AFC 8C470030 */ lw $a3, 0x30($v0) -/* 8B1B70 80241B00 E600000C */ swc1 $f0, 0xc($s0) -/* 8B1B74 80241B04 8E220018 */ lw $v0, 0x18($s1) -/* 8B1B78 80241B08 9442002A */ lhu $v0, 0x2a($v0) -/* 8B1B7C 80241B0C 30420001 */ andi $v0, $v0, 1 -/* 8B1B80 80241B10 10400003 */ beqz $v0, .L80241B20 -/* 8B1B84 80241B14 2402000A */ addiu $v0, $zero, 0xa -/* 8B1B88 80241B18 080906FE */ j .L80241BF8 -/* 8B1B8C 80241B1C AE620070 */ sw $v0, 0x70($s3) -.L80241B20: -/* 8B1B90 80241B20 2402000C */ addiu $v0, $zero, 0xc -/* 8B1B94 80241B24 080906FE */ j .L80241BF8 -/* 8B1B98 80241B28 AE620070 */ sw $v0, 0x70($s3) -.L80241B2C: -/* 8B1B9C 80241B2C 8E620074 */ lw $v0, 0x74($s3) -/* 8B1BA0 80241B30 2442FFFF */ addiu $v0, $v0, -1 -.L80241B34: -/* 8B1BA4 80241B34 AE620074 */ sw $v0, 0x74($s3) -.L80241B38: -/* 8B1BA8 80241B38 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 8B1BAC 80241B3C 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8B1BB0 80241B40 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 8B1BB4 80241B44 C4460000 */ lwc1 $f6, ($v0) -/* 8B1BB8 80241B48 468031A0 */ cvt.s.w $f6, $f6 -/* 8B1BBC 80241B4C 44063000 */ mfc1 $a2, $f6 -/* 8B1BC0 80241B50 C4460008 */ lwc1 $f6, 8($v0) -/* 8B1BC4 80241B54 468031A0 */ cvt.s.w $f6, $f6 -/* 8B1BC8 80241B58 44073000 */ mfc1 $a3, $f6 -/* 8B1BCC 80241B5C 0C00A7B5 */ jal dist2D -/* 8B1BD0 80241B60 00000000 */ nop -/* 8B1BD4 80241B64 C6020018 */ lwc1 $f2, 0x18($s0) -/* 8B1BD8 80241B68 4602003C */ c.lt.s $f0, $f2 -/* 8B1BDC 80241B6C 00000000 */ nop -/* 8B1BE0 80241B70 4500000E */ bc1f .L80241BAC -/* 8B1BE4 80241B74 00000000 */ nop -/* 8B1BE8 80241B78 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8B1BEC 80241B7C C4400000 */ lwc1 $f0, ($v0) -/* 8B1BF0 80241B80 46800020 */ cvt.s.w $f0, $f0 -/* 8B1BF4 80241B84 E6000038 */ swc1 $f0, 0x38($s0) -/* 8B1BF8 80241B88 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8B1BFC 80241B8C C4400008 */ lwc1 $f0, 8($v0) -/* 8B1C00 80241B90 46800020 */ cvt.s.w $f0, $f0 -/* 8B1C04 80241B94 E6000040 */ swc1 $f0, 0x40($s0) -/* 8B1C08 80241B98 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8B1C0C 80241B9C C440000C */ lwc1 $f0, 0xc($v0) -/* 8B1C10 80241BA0 46800020 */ cvt.s.w $f0, $f0 -/* 8B1C14 80241BA4 E600000C */ swc1 $f0, 0xc($s0) -/* 8B1C18 80241BA8 AE600070 */ sw $zero, 0x70($s3) -.L80241BAC: -/* 8B1C1C 80241BAC 8602008C */ lh $v0, 0x8c($s0) -/* 8B1C20 80241BB0 14400011 */ bnez $v0, .L80241BF8 -/* 8B1C24 80241BB4 00000000 */ nop -/* 8B1C28 80241BB8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 8B1C2C 80241BBC 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8B1C30 80241BC0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 8B1C34 80241BC4 C4460000 */ lwc1 $f6, ($v0) -/* 8B1C38 80241BC8 468031A0 */ cvt.s.w $f6, $f6 -/* 8B1C3C 80241BCC 44063000 */ mfc1 $a2, $f6 -/* 8B1C40 80241BD0 C4460008 */ lwc1 $f6, 8($v0) -/* 8B1C44 80241BD4 468031A0 */ cvt.s.w $f6, $f6 -/* 8B1C48 80241BD8 44073000 */ mfc1 $a3, $f6 -/* 8B1C4C 80241BDC 0C00A720 */ jal atan2 -/* 8B1C50 80241BE0 00000000 */ nop -/* 8B1C54 80241BE4 8E050018 */ lw $a1, 0x18($s0) -/* 8B1C58 80241BE8 44060000 */ mfc1 $a2, $f0 -/* 8B1C5C 80241BEC 0200202D */ daddu $a0, $s0, $zero -/* 8B1C60 80241BF0 0C00EA95 */ jal npc_move_heading -/* 8B1C64 80241BF4 AC86000C */ sw $a2, 0xc($a0) -.L80241BF8: -/* 8B1C68 80241BF8 8FBF0044 */ lw $ra, 0x44($sp) -/* 8B1C6C 80241BFC 8FB40040 */ lw $s4, 0x40($sp) -/* 8B1C70 80241C00 8FB3003C */ lw $s3, 0x3c($sp) -/* 8B1C74 80241C04 8FB20038 */ lw $s2, 0x38($sp) -/* 8B1C78 80241C08 8FB10034 */ lw $s1, 0x34($sp) -/* 8B1C7C 80241C0C 8FB00030 */ lw $s0, 0x30($sp) -/* 8B1C80 80241C10 03E00008 */ jr $ra -/* 8B1C84 80241C14 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241C18_8B1C88.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241C18_8B1C88.s deleted file mode 100644 index 8427fe998f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241C18_8B1C88.s +++ /dev/null @@ -1,185 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80257D58_8C7DC8 -.word .L80241DA8_8B1E18, .L80241DB8_8B1E28, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241DD0_8B1E40, .L80241DE0_8B1E50, .L80241DF8_8B1E68, .L80241E08_8B1E78, .L80241E20_8B1E90, .L80241E38_8B1EA8, .L80241E48_8B1EB8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E68_8B1ED8, .L80241E60_8B1ED0 - -.section .text - -glabel func_80241C18_8B1C88 -/* 8B1C88 80241C18 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 8B1C8C 80241C1C AFB40040 */ sw $s4, 0x40($sp) -/* 8B1C90 80241C20 0080A02D */ daddu $s4, $a0, $zero -/* 8B1C94 80241C24 AFBF0048 */ sw $ra, 0x48($sp) -/* 8B1C98 80241C28 AFB50044 */ sw $s5, 0x44($sp) -/* 8B1C9C 80241C2C AFB3003C */ sw $s3, 0x3c($sp) -/* 8B1CA0 80241C30 AFB20038 */ sw $s2, 0x38($sp) -/* 8B1CA4 80241C34 AFB10034 */ sw $s1, 0x34($sp) -/* 8B1CA8 80241C38 AFB00030 */ sw $s0, 0x30($sp) -/* 8B1CAC 80241C3C 8E920148 */ lw $s2, 0x148($s4) -/* 8B1CB0 80241C40 86440008 */ lh $a0, 8($s2) -/* 8B1CB4 80241C44 8E90000C */ lw $s0, 0xc($s4) -/* 8B1CB8 80241C48 0C00EABB */ jal get_npc_unsafe -/* 8B1CBC 80241C4C 00A0882D */ daddu $s1, $a1, $zero -/* 8B1CC0 80241C50 0280202D */ daddu $a0, $s4, $zero -/* 8B1CC4 80241C54 8E050000 */ lw $a1, ($s0) -/* 8B1CC8 80241C58 0C0B1EAF */ jal evt_get_variable -/* 8B1CCC 80241C5C 0040802D */ daddu $s0, $v0, $zero -/* 8B1CD0 80241C60 AFA00010 */ sw $zero, 0x10($sp) -/* 8B1CD4 80241C64 8E4300D0 */ lw $v1, 0xd0($s2) -/* 8B1CD8 80241C68 8C630030 */ lw $v1, 0x30($v1) -/* 8B1CDC 80241C6C AFA30014 */ sw $v1, 0x14($sp) -/* 8B1CE0 80241C70 8E4300D0 */ lw $v1, 0xd0($s2) -/* 8B1CE4 80241C74 8C63001C */ lw $v1, 0x1c($v1) -/* 8B1CE8 80241C78 AFA30018 */ sw $v1, 0x18($sp) -/* 8B1CEC 80241C7C 8E4300D0 */ lw $v1, 0xd0($s2) -/* 8B1CF0 80241C80 8C630024 */ lw $v1, 0x24($v1) -/* 8B1CF4 80241C84 AFA3001C */ sw $v1, 0x1c($sp) -/* 8B1CF8 80241C88 8E4300D0 */ lw $v1, 0xd0($s2) -/* 8B1CFC 80241C8C 8C630028 */ lw $v1, 0x28($v1) -/* 8B1D00 80241C90 27B50010 */ addiu $s5, $sp, 0x10 -/* 8B1D04 80241C94 AFA30020 */ sw $v1, 0x20($sp) -/* 8B1D08 80241C98 8E4300D0 */ lw $v1, 0xd0($s2) -/* 8B1D0C 80241C9C 3C014282 */ lui $at, 0x4282 -/* 8B1D10 80241CA0 44810000 */ mtc1 $at, $f0 -/* 8B1D14 80241CA4 8C63002C */ lw $v1, 0x2c($v1) -/* 8B1D18 80241CA8 0040982D */ daddu $s3, $v0, $zero -/* 8B1D1C 80241CAC E7A00028 */ swc1 $f0, 0x28($sp) -/* 8B1D20 80241CB0 A7A0002C */ sh $zero, 0x2c($sp) -/* 8B1D24 80241CB4 16200005 */ bnez $s1, .L80241CCC -/* 8B1D28 80241CB8 AFA30024 */ sw $v1, 0x24($sp) -/* 8B1D2C 80241CBC 8E4200B0 */ lw $v0, 0xb0($s2) -/* 8B1D30 80241CC0 30420004 */ andi $v0, $v0, 4 -/* 8B1D34 80241CC4 1040002F */ beqz $v0, .L80241D84 -/* 8B1D38 80241CC8 00000000 */ nop -.L80241CCC: -/* 8B1D3C 80241CCC AE800070 */ sw $zero, 0x70($s4) -/* 8B1D40 80241CD0 C600000C */ lwc1 $f0, 0xc($s0) -/* 8B1D44 80241CD4 A600008E */ sh $zero, 0x8e($s0) -/* 8B1D48 80241CD8 8E4200CC */ lw $v0, 0xcc($s2) -/* 8B1D4C 80241CDC 4600008D */ trunc.w.s $f2, $f0 -/* 8B1D50 80241CE0 E642006C */ swc1 $f2, 0x6c($s2) -/* 8B1D54 80241CE4 8C420000 */ lw $v0, ($v0) -/* 8B1D58 80241CE8 8E030000 */ lw $v1, ($s0) -/* 8B1D5C 80241CEC AE020028 */ sw $v0, 0x28($s0) -/* 8B1D60 80241CF0 2402F7FF */ addiu $v0, $zero, -0x801 -/* 8B1D64 80241CF4 00621824 */ and $v1, $v1, $v0 -/* 8B1D68 80241CF8 AE030000 */ sw $v1, ($s0) -/* 8B1D6C 80241CFC 8E4200D0 */ lw $v0, 0xd0($s2) -/* 8B1D70 80241D00 8C420034 */ lw $v0, 0x34($v0) -/* 8B1D74 80241D04 54400005 */ bnel $v0, $zero, .L80241D1C -/* 8B1D78 80241D08 2402FDFF */ addiu $v0, $zero, -0x201 -/* 8B1D7C 80241D0C 34620200 */ ori $v0, $v1, 0x200 -/* 8B1D80 80241D10 2403FFF7 */ addiu $v1, $zero, -9 -/* 8B1D84 80241D14 08090749 */ j .L80241D24 -/* 8B1D88 80241D18 00431024 */ and $v0, $v0, $v1 -.L80241D1C: -/* 8B1D8C 80241D1C 00621024 */ and $v0, $v1, $v0 -/* 8B1D90 80241D20 34420008 */ ori $v0, $v0, 8 -.L80241D24: -/* 8B1D94 80241D24 AE020000 */ sw $v0, ($s0) -/* 8B1D98 80241D28 8E4200B0 */ lw $v0, 0xb0($s2) -/* 8B1D9C 80241D2C 30420004 */ andi $v0, $v0, 4 -/* 8B1DA0 80241D30 10400009 */ beqz $v0, .L80241D58 -/* 8B1DA4 80241D34 24020063 */ addiu $v0, $zero, 0x63 -/* 8B1DA8 80241D38 AE820070 */ sw $v0, 0x70($s4) -/* 8B1DAC 80241D3C 2402000F */ addiu $v0, $zero, 0xf -/* 8B1DB0 80241D40 AE820074 */ sw $v0, 0x74($s4) -/* 8B1DB4 80241D44 8E4200B0 */ lw $v0, 0xb0($s2) -/* 8B1DB8 80241D48 2403FFFB */ addiu $v1, $zero, -5 -/* 8B1DBC 80241D4C 00431024 */ and $v0, $v0, $v1 -/* 8B1DC0 80241D50 08090761 */ j .L80241D84 -/* 8B1DC4 80241D54 AE4200B0 */ sw $v0, 0xb0($s2) -.L80241D58: -/* 8B1DC8 80241D58 8E420000 */ lw $v0, ($s2) -/* 8B1DCC 80241D5C 3C034000 */ lui $v1, 0x4000 -/* 8B1DD0 80241D60 00431024 */ and $v0, $v0, $v1 -/* 8B1DD4 80241D64 10400007 */ beqz $v0, .L80241D84 -/* 8B1DD8 80241D68 3C03BFFF */ lui $v1, 0xbfff -/* 8B1DDC 80241D6C 2402000C */ addiu $v0, $zero, 0xc -/* 8B1DE0 80241D70 AE820070 */ sw $v0, 0x70($s4) -/* 8B1DE4 80241D74 8E420000 */ lw $v0, ($s2) -/* 8B1DE8 80241D78 3463FFFF */ ori $v1, $v1, 0xffff -/* 8B1DEC 80241D7C 00431024 */ and $v0, $v0, $v1 -/* 8B1DF0 80241D80 AE420000 */ sw $v0, ($s2) -.L80241D84: -/* 8B1DF4 80241D84 8E830070 */ lw $v1, 0x70($s4) -/* 8B1DF8 80241D88 2C620064 */ sltiu $v0, $v1, 0x64 -/* 8B1DFC 80241D8C 10400036 */ beqz $v0, .L80241E68_8B1ED8 -/* 8B1E00 80241D90 00031080 */ sll $v0, $v1, 2 -/* 8B1E04 80241D94 3C018025 */ lui $at, %hi(jtbl_80257D58_8C7DC8) -/* 8B1E08 80241D98 00220821 */ addu $at, $at, $v0 -/* 8B1E0C 80241D9C 8C227D58 */ lw $v0, %lo(jtbl_80257D58_8C7DC8)($at) -/* 8B1E10 80241DA0 00400008 */ jr $v0 -/* 8B1E14 80241DA4 00000000 */ nop -.L80241DA8_8B1E18: -/* 8B1E18 80241DA8 0280202D */ daddu $a0, $s4, $zero -/* 8B1E1C 80241DAC 0260282D */ daddu $a1, $s3, $zero -/* 8B1E20 80241DB0 0C090509 */ jal func_80241424_8B1494 -/* 8B1E24 80241DB4 02A0302D */ daddu $a2, $s5, $zero -.L80241DB8_8B1E28: -/* 8B1E28 80241DB8 0280202D */ daddu $a0, $s4, $zero -/* 8B1E2C 80241DBC 0260282D */ daddu $a1, $s3, $zero -/* 8B1E30 80241DC0 0C090536 */ jal func_802414D8_8B1548 -/* 8B1E34 80241DC4 02A0302D */ daddu $a2, $s5, $zero -/* 8B1E38 80241DC8 0809079A */ j .L80241E68_8B1ED8 -/* 8B1E3C 80241DCC 00000000 */ nop -.L80241DD0_8B1E40: -/* 8B1E40 80241DD0 0280202D */ daddu $a0, $s4, $zero -/* 8B1E44 80241DD4 0260282D */ daddu $a1, $s3, $zero -/* 8B1E48 80241DD8 0C09057E */ jal kmr_02_NpcJumpFunc3 -/* 8B1E4C 80241DDC 02A0302D */ daddu $a2, $s5, $zero -.L80241DE0_8B1E50: -/* 8B1E50 80241DE0 0280202D */ daddu $a0, $s4, $zero -/* 8B1E54 80241DE4 0260282D */ daddu $a1, $s3, $zero -/* 8B1E58 80241DE8 0C090596 */ jal kmr_02_NpcJumpFunc -/* 8B1E5C 80241DEC 02A0302D */ daddu $a2, $s5, $zero -/* 8B1E60 80241DF0 0809079A */ j .L80241E68_8B1ED8 -/* 8B1E64 80241DF4 00000000 */ nop -.L80241DF8_8B1E68: -/* 8B1E68 80241DF8 0280202D */ daddu $a0, $s4, $zero -/* 8B1E6C 80241DFC 0260282D */ daddu $a1, $s3, $zero -/* 8B1E70 80241E00 0C0905B4 */ jal kmr_02_UnkNpcAIFunc13_2 -/* 8B1E74 80241E04 02A0302D */ daddu $a2, $s5, $zero -.L80241E08_8B1E78: -/* 8B1E78 80241E08 0280202D */ daddu $a0, $s4, $zero -/* 8B1E7C 80241E0C 0260282D */ daddu $a1, $s3, $zero -/* 8B1E80 80241E10 0C090600 */ jal kmr_02_UnkNpcAIFunc11 -/* 8B1E84 80241E14 02A0302D */ daddu $a2, $s5, $zero -/* 8B1E88 80241E18 0809079A */ j .L80241E68_8B1ED8 -/* 8B1E8C 80241E1C 00000000 */ nop -.L80241E20_8B1E90: -/* 8B1E90 80241E20 0280202D */ daddu $a0, $s4, $zero -/* 8B1E94 80241E24 0260282D */ daddu $a1, $s3, $zero -/* 8B1E98 80241E28 0C090647 */ jal kmr_02_UnkNpcAIFunc10 -/* 8B1E9C 80241E2C 02A0302D */ daddu $a2, $s5, $zero -/* 8B1EA0 80241E30 0809079A */ j .L80241E68_8B1ED8 -/* 8B1EA4 80241E34 00000000 */ nop -.L80241E38_8B1EA8: -/* 8B1EA8 80241E38 0280202D */ daddu $a0, $s4, $zero -/* 8B1EAC 80241E3C 0260282D */ daddu $a1, $s3, $zero -/* 8B1EB0 80241E40 0C090659 */ jal func_80241964_8B19D4 -/* 8B1EB4 80241E44 02A0302D */ daddu $a2, $s5, $zero -.L80241E48_8B1EB8: -/* 8B1EB8 80241E48 0280202D */ daddu $a0, $s4, $zero -/* 8B1EBC 80241E4C 0260282D */ daddu $a1, $s3, $zero -/* 8B1EC0 80241E50 0C090684 */ jal func_80241A10_8B1A80 -/* 8B1EC4 80241E54 02A0302D */ daddu $a2, $s5, $zero -/* 8B1EC8 80241E58 0809079A */ j .L80241E68_8B1ED8 -/* 8B1ECC 80241E5C 00000000 */ nop -.L80241E60_8B1ED0: -/* 8B1ED0 80241E60 0C0129CF */ jal func_8004A73C -/* 8B1ED4 80241E64 0280202D */ daddu $a0, $s4, $zero -.L80241E68_8B1ED8: -/* 8B1ED8 80241E68 8FBF0048 */ lw $ra, 0x48($sp) -/* 8B1EDC 80241E6C 8FB50044 */ lw $s5, 0x44($sp) -/* 8B1EE0 80241E70 8FB40040 */ lw $s4, 0x40($sp) -/* 8B1EE4 80241E74 8FB3003C */ lw $s3, 0x3c($sp) -/* 8B1EE8 80241E78 8FB20038 */ lw $s2, 0x38($sp) -/* 8B1EEC 80241E7C 8FB10034 */ lw $s1, 0x34($sp) -/* 8B1EF0 80241E80 8FB00030 */ lw $s0, 0x30($sp) -/* 8B1EF4 80241E84 0000102D */ daddu $v0, $zero, $zero -/* 8B1EF8 80241E88 03E00008 */ jr $ra -/* 8B1EFC 80241E8C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_80240000_8D3DC0.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_80240000_8D3DC0.s deleted file mode 100644 index 8cf82e2b55..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_80240000_8D3DC0.s +++ /dev/null @@ -1,59 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80241E90_8D5C50 -.double 32767.0 - -.section .text - -glabel func_80240000_8D3DC0 -/* 8D3DC0 80240000 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8D3DC4 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* 8D3DC8 80240008 0080802D */ daddu $s0, $a0, $zero -/* 8D3DCC 8024000C AFBF001C */ sw $ra, 0x1c($sp) -/* 8D3DD0 80240010 AFB20018 */ sw $s2, 0x18($sp) -/* 8D3DD4 80240014 AFB10014 */ sw $s1, 0x14($sp) -/* 8D3DD8 80240018 8E110148 */ lw $s1, 0x148($s0) -/* 8D3DDC 8024001C 86240008 */ lh $a0, 8($s1) -/* 8D3DE0 80240020 0C00EABB */ jal get_npc_unsafe -/* 8D3DE4 80240024 00A0902D */ daddu $s2, $a1, $zero -/* 8D3DE8 80240028 8E2300CC */ lw $v1, 0xcc($s1) -/* 8D3DEC 8024002C 0040202D */ daddu $a0, $v0, $zero -/* 8D3DF0 80240030 8C630000 */ lw $v1, ($v1) -/* 8D3DF4 80240034 24020001 */ addiu $v0, $zero, 1 -/* 8D3DF8 80240038 AC830028 */ sw $v1, 0x28($a0) -/* 8D3DFC 8024003C AE020070 */ sw $v0, 0x70($s0) -/* 8D3E00 80240040 8E220000 */ lw $v0, ($s1) -/* 8D3E04 80240044 3C030010 */ lui $v1, 0x10 -/* 8D3E08 80240048 00431024 */ and $v0, $v0, $v1 -/* 8D3E0C 8024004C 10400004 */ beqz $v0, .L80240060 -/* 8D3E10 80240050 00000000 */ nop -/* 8D3E14 80240054 C620006C */ lwc1 $f0, 0x6c($s1) -/* 8D3E18 80240058 46800020 */ cvt.s.w $f0, $f0 -/* 8D3E1C 8024005C E480000C */ swc1 $f0, 0xc($a0) -.L80240060: -/* 8D3E20 80240060 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8D3E24 80240064 8C420014 */ lw $v0, 0x14($v0) -/* 8D3E28 80240068 1C400004 */ bgtz $v0, .L8024007C -/* 8D3E2C 8024006C 00000000 */ nop -/* 8D3E30 80240070 C640000C */ lwc1 $f0, 0xc($s2) -/* 8D3E34 80240074 08090027 */ j .L8024009C -/* 8D3E38 80240078 E4800018 */ swc1 $f0, 0x18($a0) -.L8024007C: -/* 8D3E3C 8024007C 3C018024 */ lui $at, %hi(D_80241E90_8D5C50) -/* 8D3E40 80240080 D4221E90 */ ldc1 $f2, %lo(D_80241E90_8D5C50)($at) -/* 8D3E44 80240084 44820000 */ mtc1 $v0, $f0 -/* 8D3E48 80240088 00000000 */ nop -/* 8D3E4C 8024008C 46800021 */ cvt.d.w $f0, $f0 -/* 8D3E50 80240090 46220003 */ div.d $f0, $f0, $f2 -/* 8D3E54 80240094 46200020 */ cvt.s.d $f0, $f0 -/* 8D3E58 80240098 E4800018 */ swc1 $f0, 0x18($a0) -.L8024009C: -/* 8D3E5C 8024009C 8FBF001C */ lw $ra, 0x1c($sp) -/* 8D3E60 802400A0 8FB20018 */ lw $s2, 0x18($sp) -/* 8D3E64 802400A4 8FB10014 */ lw $s1, 0x14($sp) -/* 8D3E68 802400A8 8FB00010 */ lw $s0, 0x10($sp) -/* 8D3E6C 802400AC 03E00008 */ jr $ra -/* 8D3E70 802400B0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802400B4_8D3E74.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802400B4_8D3E74.s deleted file mode 100644 index f2cc24c83d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802400B4_8D3E74.s +++ /dev/null @@ -1,78 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400B4_8D3E74 -/* 8D3E74 802400B4 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 8D3E78 802400B8 AFB40040 */ sw $s4, 0x40($sp) -/* 8D3E7C 802400BC 0080A02D */ daddu $s4, $a0, $zero -/* 8D3E80 802400C0 AFBF0044 */ sw $ra, 0x44($sp) -/* 8D3E84 802400C4 AFB3003C */ sw $s3, 0x3c($sp) -/* 8D3E88 802400C8 AFB20038 */ sw $s2, 0x38($sp) -/* 8D3E8C 802400CC AFB10034 */ sw $s1, 0x34($sp) -/* 8D3E90 802400D0 AFB00030 */ sw $s0, 0x30($sp) -/* 8D3E94 802400D4 8E920148 */ lw $s2, 0x148($s4) -/* 8D3E98 802400D8 00A0802D */ daddu $s0, $a1, $zero -/* 8D3E9C 802400DC 86440008 */ lh $a0, 8($s2) -/* 8D3EA0 802400E0 0C00EABB */ jal get_npc_unsafe -/* 8D3EA4 802400E4 00C0982D */ daddu $s3, $a2, $zero -/* 8D3EA8 802400E8 8E030008 */ lw $v1, 8($s0) -/* 8D3EAC 802400EC 04600031 */ bltz $v1, .L802401B4 -/* 8D3EB0 802400F0 0040882D */ daddu $s1, $v0, $zero -/* 8D3EB4 802400F4 0260202D */ daddu $a0, $s3, $zero -/* 8D3EB8 802400F8 AFA00010 */ sw $zero, 0x10($sp) -/* 8D3EBC 802400FC 8E060018 */ lw $a2, 0x18($s0) -/* 8D3EC0 80240100 8E07001C */ lw $a3, 0x1c($s0) -/* 8D3EC4 80240104 0C01242D */ jal func_800490B4 -/* 8D3EC8 80240108 0240282D */ daddu $a1, $s2, $zero -/* 8D3ECC 8024010C 10400029 */ beqz $v0, .L802401B4 -/* 8D3ED0 80240110 0000202D */ daddu $a0, $zero, $zero -/* 8D3ED4 80240114 0220282D */ daddu $a1, $s1, $zero -/* 8D3ED8 80240118 0000302D */ daddu $a2, $zero, $zero -/* 8D3EDC 8024011C 862300A8 */ lh $v1, 0xa8($s1) -/* 8D3EE0 80240120 3C013F80 */ lui $at, 0x3f80 -/* 8D3EE4 80240124 44810000 */ mtc1 $at, $f0 -/* 8D3EE8 80240128 3C014000 */ lui $at, 0x4000 -/* 8D3EEC 8024012C 44811000 */ mtc1 $at, $f2 -/* 8D3EF0 80240130 3C01C1A0 */ lui $at, 0xc1a0 -/* 8D3EF4 80240134 44812000 */ mtc1 $at, $f4 -/* 8D3EF8 80240138 2402000F */ addiu $v0, $zero, 0xf -/* 8D3EFC 8024013C AFA2001C */ sw $v0, 0x1c($sp) -/* 8D3F00 80240140 44833000 */ mtc1 $v1, $f6 -/* 8D3F04 80240144 00000000 */ nop -/* 8D3F08 80240148 468031A0 */ cvt.s.w $f6, $f6 -/* 8D3F0C 8024014C 44073000 */ mfc1 $a3, $f6 -/* 8D3F10 80240150 27A20028 */ addiu $v0, $sp, 0x28 -/* 8D3F14 80240154 AFA20020 */ sw $v0, 0x20($sp) -/* 8D3F18 80240158 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8D3F1C 8024015C E7A20014 */ swc1 $f2, 0x14($sp) -/* 8D3F20 80240160 0C01BFA4 */ jal fx_emote -/* 8D3F24 80240164 E7A40018 */ swc1 $f4, 0x18($sp) -/* 8D3F28 80240168 0220202D */ daddu $a0, $s1, $zero -/* 8D3F2C 8024016C 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 8D3F30 80240170 0C012530 */ jal ai_enemy_play_sound -/* 8D3F34 80240174 3C060020 */ lui $a2, 0x20 -/* 8D3F38 80240178 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8D3F3C 8024017C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8D3F40 80240180 C62C0038 */ lwc1 $f12, 0x38($s1) -/* 8D3F44 80240184 C62E0040 */ lwc1 $f14, 0x40($s1) -/* 8D3F48 80240188 8C460028 */ lw $a2, 0x28($v0) -/* 8D3F4C 8024018C 0C00A720 */ jal atan2 -/* 8D3F50 80240190 8C470030 */ lw $a3, 0x30($v0) -/* 8D3F54 80240194 E620000C */ swc1 $f0, 0xc($s1) -/* 8D3F58 80240198 8E420018 */ lw $v0, 0x18($s2) -/* 8D3F5C 8024019C 9442002A */ lhu $v0, 0x2a($v0) -/* 8D3F60 802401A0 30420001 */ andi $v0, $v0, 1 -/* 8D3F64 802401A4 14400002 */ bnez $v0, .L802401B0 -/* 8D3F68 802401A8 2402000A */ addiu $v0, $zero, 0xa -/* 8D3F6C 802401AC 2402000C */ addiu $v0, $zero, 0xc -.L802401B0: -/* 8D3F70 802401B0 AE820070 */ sw $v0, 0x70($s4) -.L802401B4: -/* 8D3F74 802401B4 8FBF0044 */ lw $ra, 0x44($sp) -/* 8D3F78 802401B8 8FB40040 */ lw $s4, 0x40($sp) -/* 8D3F7C 802401BC 8FB3003C */ lw $s3, 0x3c($sp) -/* 8D3F80 802401C0 8FB20038 */ lw $s2, 0x38($sp) -/* 8D3F84 802401C4 8FB10034 */ lw $s1, 0x34($sp) -/* 8D3F88 802401C8 8FB00030 */ lw $s0, 0x30($sp) -/* 8D3F8C 802401CC 03E00008 */ jr $ra -/* 8D3F90 802401D0 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_80240540_8D4300.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_80240540_8D4300.s deleted file mode 100644 index e94c235cbf..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_80240540_8D4300.s +++ /dev/null @@ -1,59 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80241E98_8D5C58 -.double 0.3 - -dlabel D_80241EA0_8D5C60 -.double 32767.0 - -.section .text - -glabel func_80240540_8D4300 -/* 8D4300 80240540 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8D4304 80240544 AFB10014 */ sw $s1, 0x14($sp) -/* 8D4308 80240548 0080882D */ daddu $s1, $a0, $zero -/* 8D430C 8024054C AFBF001C */ sw $ra, 0x1c($sp) -/* 8D4310 80240550 AFB20018 */ sw $s2, 0x18($sp) -/* 8D4314 80240554 AFB00010 */ sw $s0, 0x10($sp) -/* 8D4318 80240558 8E300148 */ lw $s0, 0x148($s1) -/* 8D431C 8024055C 86040008 */ lh $a0, 8($s0) -/* 8D4320 80240560 0C00EABB */ jal get_npc_unsafe -/* 8D4324 80240564 00A0902D */ daddu $s2, $a1, $zero -/* 8D4328 80240568 8E0300CC */ lw $v1, 0xcc($s0) -/* 8D432C 8024056C 8C630004 */ lw $v1, 4($v1) -/* 8D4330 80240570 0040202D */ daddu $a0, $v0, $zero -/* 8D4334 80240574 AC830028 */ sw $v1, 0x28($a0) -/* 8D4338 80240578 8E0200D0 */ lw $v0, 0xd0($s0) -/* 8D433C 8024057C 8C420014 */ lw $v0, 0x14($v0) -/* 8D4340 80240580 04410009 */ bgez $v0, .L802405A8 -/* 8D4344 80240584 00000000 */ nop -/* 8D4348 80240588 C640000C */ lwc1 $f0, 0xc($s2) -/* 8D434C 8024058C 3C018024 */ lui $at, %hi(D_80241E98_8D5C58) -/* 8D4350 80240590 D4221E98 */ ldc1 $f2, %lo(D_80241E98_8D5C58)($at) -/* 8D4354 80240594 46000021 */ cvt.d.s $f0, $f0 -/* 8D4358 80240598 46220002 */ mul.d $f0, $f0, $f2 -/* 8D435C 8024059C 00000000 */ nop -/* 8D4360 802405A0 08090171 */ j .L802405C4 -/* 8D4364 802405A4 46200020 */ cvt.s.d $f0, $f0 -.L802405A8: -/* 8D4368 802405A8 3C018024 */ lui $at, %hi(D_80241EA0_8D5C60) -/* 8D436C 802405AC D4221EA0 */ ldc1 $f2, %lo(D_80241EA0_8D5C60)($at) -/* 8D4370 802405B0 44820000 */ mtc1 $v0, $f0 -/* 8D4374 802405B4 00000000 */ nop -/* 8D4378 802405B8 46800021 */ cvt.d.w $f0, $f0 -/* 8D437C 802405BC 46220003 */ div.d $f0, $f0, $f2 -/* 8D4380 802405C0 46200020 */ cvt.s.d $f0, $f0 -.L802405C4: -/* 8D4384 802405C4 E4800018 */ swc1 $f0, 0x18($a0) -/* 8D4388 802405C8 24020010 */ addiu $v0, $zero, 0x10 -/* 8D438C 802405CC AE200074 */ sw $zero, 0x74($s1) -/* 8D4390 802405D0 AE220070 */ sw $v0, 0x70($s1) -/* 8D4394 802405D4 8FBF001C */ lw $ra, 0x1c($sp) -/* 8D4398 802405D8 8FB20018 */ lw $s2, 0x18($sp) -/* 8D439C 802405DC 8FB10014 */ lw $s1, 0x14($sp) -/* 8D43A0 802405E0 8FB00010 */ lw $s0, 0x10($sp) -/* 8D43A4 802405E4 03E00008 */ jr $ra -/* 8D43A8 802405E8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802405EC_8D43AC.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802405EC_8D43AC.s deleted file mode 100644 index b8f50b7b95..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802405EC_8D43AC.s +++ /dev/null @@ -1,140 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405EC_8D43AC -/* 8D43AC 802405EC 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 8D43B0 802405F0 AFB3003C */ sw $s3, 0x3c($sp) -/* 8D43B4 802405F4 0080982D */ daddu $s3, $a0, $zero -/* 8D43B8 802405F8 AFBF0044 */ sw $ra, 0x44($sp) -/* 8D43BC 802405FC AFB40040 */ sw $s4, 0x40($sp) -/* 8D43C0 80240600 AFB20038 */ sw $s2, 0x38($sp) -/* 8D43C4 80240604 AFB10034 */ sw $s1, 0x34($sp) -/* 8D43C8 80240608 AFB00030 */ sw $s0, 0x30($sp) -/* 8D43CC 8024060C 8E710148 */ lw $s1, 0x148($s3) -/* 8D43D0 80240610 00A0902D */ daddu $s2, $a1, $zero -/* 8D43D4 80240614 86240008 */ lh $a0, 8($s1) -/* 8D43D8 80240618 0C00EABB */ jal get_npc_unsafe -/* 8D43DC 8024061C 00C0A02D */ daddu $s4, $a2, $zero -/* 8D43E0 80240620 8E430008 */ lw $v1, 8($s2) -/* 8D43E4 80240624 0460003B */ bltz $v1, .L80240714 -/* 8D43E8 80240628 0040802D */ daddu $s0, $v0, $zero -/* 8D43EC 8024062C 8E620074 */ lw $v0, 0x74($s3) -/* 8D43F0 80240630 1C400037 */ bgtz $v0, .L80240710 -/* 8D43F4 80240634 2442FFFF */ addiu $v0, $v0, -1 -/* 8D43F8 80240638 0280202D */ daddu $a0, $s4, $zero -/* 8D43FC 8024063C AE630074 */ sw $v1, 0x74($s3) -/* 8D4400 80240640 AFA00010 */ sw $zero, 0x10($sp) -/* 8D4404 80240644 8E460018 */ lw $a2, 0x18($s2) -/* 8D4408 80240648 8E47001C */ lw $a3, 0x1c($s2) -/* 8D440C 8024064C 0C01242D */ jal func_800490B4 -/* 8D4410 80240650 0220282D */ daddu $a1, $s1, $zero -/* 8D4414 80240654 1040002C */ beqz $v0, .L80240708 -/* 8D4418 80240658 0000202D */ daddu $a0, $zero, $zero -/* 8D441C 8024065C 0200282D */ daddu $a1, $s0, $zero -/* 8D4420 80240660 0000302D */ daddu $a2, $zero, $zero -/* 8D4424 80240664 860300A8 */ lh $v1, 0xa8($s0) -/* 8D4428 80240668 3C013F80 */ lui $at, 0x3f80 -/* 8D442C 8024066C 44810000 */ mtc1 $at, $f0 -/* 8D4430 80240670 3C014000 */ lui $at, 0x4000 -/* 8D4434 80240674 44811000 */ mtc1 $at, $f2 -/* 8D4438 80240678 3C01C1A0 */ lui $at, 0xc1a0 -/* 8D443C 8024067C 44812000 */ mtc1 $at, $f4 -/* 8D4440 80240680 2402000F */ addiu $v0, $zero, 0xf -/* 8D4444 80240684 AFA2001C */ sw $v0, 0x1c($sp) -/* 8D4448 80240688 44833000 */ mtc1 $v1, $f6 -/* 8D444C 8024068C 00000000 */ nop -/* 8D4450 80240690 468031A0 */ cvt.s.w $f6, $f6 -/* 8D4454 80240694 44073000 */ mfc1 $a3, $f6 -/* 8D4458 80240698 27A20028 */ addiu $v0, $sp, 0x28 -/* 8D445C 8024069C AFA20020 */ sw $v0, 0x20($sp) -/* 8D4460 802406A0 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8D4464 802406A4 E7A20014 */ swc1 $f2, 0x14($sp) -/* 8D4468 802406A8 0C01BFA4 */ jal fx_emote -/* 8D446C 802406AC E7A40018 */ swc1 $f4, 0x18($sp) -/* 8D4470 802406B0 0200202D */ daddu $a0, $s0, $zero -/* 8D4474 802406B4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 8D4478 802406B8 0C012530 */ jal ai_enemy_play_sound -/* 8D447C 802406BC 3C060020 */ lui $a2, 0x20 -/* 8D4480 802406C0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 8D4484 802406C4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8D4488 802406C8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8D448C 802406CC C60E0040 */ lwc1 $f14, 0x40($s0) -/* 8D4490 802406D0 8C460028 */ lw $a2, 0x28($v0) -/* 8D4494 802406D4 0C00A720 */ jal atan2 -/* 8D4498 802406D8 8C470030 */ lw $a3, 0x30($v0) -/* 8D449C 802406DC E600000C */ swc1 $f0, 0xc($s0) -/* 8D44A0 802406E0 8E220018 */ lw $v0, 0x18($s1) -/* 8D44A4 802406E4 9442002A */ lhu $v0, 0x2a($v0) -/* 8D44A8 802406E8 30420001 */ andi $v0, $v0, 1 -/* 8D44AC 802406EC 10400003 */ beqz $v0, .L802406FC -/* 8D44B0 802406F0 2402000A */ addiu $v0, $zero, 0xa -/* 8D44B4 802406F4 080901F5 */ j .L802407D4 -/* 8D44B8 802406F8 AE620070 */ sw $v0, 0x70($s3) -.L802406FC: -/* 8D44BC 802406FC 2402000C */ addiu $v0, $zero, 0xc -/* 8D44C0 80240700 080901F5 */ j .L802407D4 -/* 8D44C4 80240704 AE620070 */ sw $v0, 0x70($s3) -.L80240708: -/* 8D44C8 80240708 8E620074 */ lw $v0, 0x74($s3) -/* 8D44CC 8024070C 2442FFFF */ addiu $v0, $v0, -1 -.L80240710: -/* 8D44D0 80240710 AE620074 */ sw $v0, 0x74($s3) -.L80240714: -/* 8D44D4 80240714 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 8D44D8 80240718 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8D44DC 8024071C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 8D44E0 80240720 C4460000 */ lwc1 $f6, ($v0) -/* 8D44E4 80240724 468031A0 */ cvt.s.w $f6, $f6 -/* 8D44E8 80240728 44063000 */ mfc1 $a2, $f6 -/* 8D44EC 8024072C C4460008 */ lwc1 $f6, 8($v0) -/* 8D44F0 80240730 468031A0 */ cvt.s.w $f6, $f6 -/* 8D44F4 80240734 44073000 */ mfc1 $a3, $f6 -/* 8D44F8 80240738 0C00A7B5 */ jal dist2D -/* 8D44FC 8024073C 00000000 */ nop -/* 8D4500 80240740 C6020018 */ lwc1 $f2, 0x18($s0) -/* 8D4504 80240744 4602003C */ c.lt.s $f0, $f2 -/* 8D4508 80240748 00000000 */ nop -/* 8D450C 8024074C 4500000E */ bc1f .L80240788 -/* 8D4510 80240750 00000000 */ nop -/* 8D4514 80240754 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8D4518 80240758 C4400000 */ lwc1 $f0, ($v0) -/* 8D451C 8024075C 46800020 */ cvt.s.w $f0, $f0 -/* 8D4520 80240760 E6000038 */ swc1 $f0, 0x38($s0) -/* 8D4524 80240764 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8D4528 80240768 C4400008 */ lwc1 $f0, 8($v0) -/* 8D452C 8024076C 46800020 */ cvt.s.w $f0, $f0 -/* 8D4530 80240770 E6000040 */ swc1 $f0, 0x40($s0) -/* 8D4534 80240774 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8D4538 80240778 C440000C */ lwc1 $f0, 0xc($v0) -/* 8D453C 8024077C 46800020 */ cvt.s.w $f0, $f0 -/* 8D4540 80240780 E600000C */ swc1 $f0, 0xc($s0) -/* 8D4544 80240784 AE600070 */ sw $zero, 0x70($s3) -.L80240788: -/* 8D4548 80240788 8602008C */ lh $v0, 0x8c($s0) -/* 8D454C 8024078C 14400011 */ bnez $v0, .L802407D4 -/* 8D4550 80240790 00000000 */ nop -/* 8D4554 80240794 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 8D4558 80240798 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8D455C 8024079C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 8D4560 802407A0 C4460000 */ lwc1 $f6, ($v0) -/* 8D4564 802407A4 468031A0 */ cvt.s.w $f6, $f6 -/* 8D4568 802407A8 44063000 */ mfc1 $a2, $f6 -/* 8D456C 802407AC C4460008 */ lwc1 $f6, 8($v0) -/* 8D4570 802407B0 468031A0 */ cvt.s.w $f6, $f6 -/* 8D4574 802407B4 44073000 */ mfc1 $a3, $f6 -/* 8D4578 802407B8 0C00A720 */ jal atan2 -/* 8D457C 802407BC 00000000 */ nop -/* 8D4580 802407C0 8E050018 */ lw $a1, 0x18($s0) -/* 8D4584 802407C4 44060000 */ mfc1 $a2, $f0 -/* 8D4588 802407C8 0200202D */ daddu $a0, $s0, $zero -/* 8D458C 802407CC 0C00EA95 */ jal npc_move_heading -/* 8D4590 802407D0 AC86000C */ sw $a2, 0xc($a0) -.L802407D4: -/* 8D4594 802407D4 8FBF0044 */ lw $ra, 0x44($sp) -/* 8D4598 802407D8 8FB40040 */ lw $s4, 0x40($sp) -/* 8D459C 802407DC 8FB3003C */ lw $s3, 0x3c($sp) -/* 8D45A0 802407E0 8FB20038 */ lw $s2, 0x38($sp) -/* 8D45A4 802407E4 8FB10034 */ lw $s1, 0x34($sp) -/* 8D45A8 802407E8 8FB00030 */ lw $s0, 0x30($sp) -/* 8D45AC 802407EC 03E00008 */ jr $ra -/* 8D45B0 802407F0 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802407F4_8D45B4.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802407F4_8D45B4.s deleted file mode 100644 index 9753bab742..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802407F4_8D45B4.s +++ /dev/null @@ -1,185 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80241EA8_8D5C68 -.word .L80240984_8D4744, .L80240994_8D4754, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L802409AC_8D476C, .L802409BC_8D477C, .L802409D4_8D4794, .L802409E4_8D47A4, .L802409FC_8D47BC, .L80240A14_8D47D4, .L80240A24_8D47E4, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A44_8D4804, .L80240A3C_8D47FC, 0, 0 - -.section .text - -glabel func_802407F4_8D45B4 -/* 8D45B4 802407F4 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 8D45B8 802407F8 AFB40040 */ sw $s4, 0x40($sp) -/* 8D45BC 802407FC 0080A02D */ daddu $s4, $a0, $zero -/* 8D45C0 80240800 AFBF0048 */ sw $ra, 0x48($sp) -/* 8D45C4 80240804 AFB50044 */ sw $s5, 0x44($sp) -/* 8D45C8 80240808 AFB3003C */ sw $s3, 0x3c($sp) -/* 8D45CC 8024080C AFB20038 */ sw $s2, 0x38($sp) -/* 8D45D0 80240810 AFB10034 */ sw $s1, 0x34($sp) -/* 8D45D4 80240814 AFB00030 */ sw $s0, 0x30($sp) -/* 8D45D8 80240818 8E920148 */ lw $s2, 0x148($s4) -/* 8D45DC 8024081C 86440008 */ lh $a0, 8($s2) -/* 8D45E0 80240820 8E90000C */ lw $s0, 0xc($s4) -/* 8D45E4 80240824 0C00EABB */ jal get_npc_unsafe -/* 8D45E8 80240828 00A0882D */ daddu $s1, $a1, $zero -/* 8D45EC 8024082C 0280202D */ daddu $a0, $s4, $zero -/* 8D45F0 80240830 8E050000 */ lw $a1, ($s0) -/* 8D45F4 80240834 0C0B1EAF */ jal evt_get_variable -/* 8D45F8 80240838 0040802D */ daddu $s0, $v0, $zero -/* 8D45FC 8024083C AFA00010 */ sw $zero, 0x10($sp) -/* 8D4600 80240840 8E4300D0 */ lw $v1, 0xd0($s2) -/* 8D4604 80240844 8C630030 */ lw $v1, 0x30($v1) -/* 8D4608 80240848 AFA30014 */ sw $v1, 0x14($sp) -/* 8D460C 8024084C 8E4300D0 */ lw $v1, 0xd0($s2) -/* 8D4610 80240850 8C63001C */ lw $v1, 0x1c($v1) -/* 8D4614 80240854 AFA30018 */ sw $v1, 0x18($sp) -/* 8D4618 80240858 8E4300D0 */ lw $v1, 0xd0($s2) -/* 8D461C 8024085C 8C630024 */ lw $v1, 0x24($v1) -/* 8D4620 80240860 AFA3001C */ sw $v1, 0x1c($sp) -/* 8D4624 80240864 8E4300D0 */ lw $v1, 0xd0($s2) -/* 8D4628 80240868 8C630028 */ lw $v1, 0x28($v1) -/* 8D462C 8024086C 27B50010 */ addiu $s5, $sp, 0x10 -/* 8D4630 80240870 AFA30020 */ sw $v1, 0x20($sp) -/* 8D4634 80240874 8E4300D0 */ lw $v1, 0xd0($s2) -/* 8D4638 80240878 3C014282 */ lui $at, 0x4282 -/* 8D463C 8024087C 44810000 */ mtc1 $at, $f0 -/* 8D4640 80240880 8C63002C */ lw $v1, 0x2c($v1) -/* 8D4644 80240884 0040982D */ daddu $s3, $v0, $zero -/* 8D4648 80240888 E7A00028 */ swc1 $f0, 0x28($sp) -/* 8D464C 8024088C A7A0002C */ sh $zero, 0x2c($sp) -/* 8D4650 80240890 16200005 */ bnez $s1, .L802408A8 -/* 8D4654 80240894 AFA30024 */ sw $v1, 0x24($sp) -/* 8D4658 80240898 8E4200B0 */ lw $v0, 0xb0($s2) -/* 8D465C 8024089C 30420004 */ andi $v0, $v0, 4 -/* 8D4660 802408A0 1040002F */ beqz $v0, .L80240960 -/* 8D4664 802408A4 00000000 */ nop -.L802408A8: -/* 8D4668 802408A8 AE800070 */ sw $zero, 0x70($s4) -/* 8D466C 802408AC C600000C */ lwc1 $f0, 0xc($s0) -/* 8D4670 802408B0 A600008E */ sh $zero, 0x8e($s0) -/* 8D4674 802408B4 8E4200CC */ lw $v0, 0xcc($s2) -/* 8D4678 802408B8 4600008D */ trunc.w.s $f2, $f0 -/* 8D467C 802408BC E642006C */ swc1 $f2, 0x6c($s2) -/* 8D4680 802408C0 8C420000 */ lw $v0, ($v0) -/* 8D4684 802408C4 8E030000 */ lw $v1, ($s0) -/* 8D4688 802408C8 AE020028 */ sw $v0, 0x28($s0) -/* 8D468C 802408CC 2402F7FF */ addiu $v0, $zero, -0x801 -/* 8D4690 802408D0 00621824 */ and $v1, $v1, $v0 -/* 8D4694 802408D4 AE030000 */ sw $v1, ($s0) -/* 8D4698 802408D8 8E4200D0 */ lw $v0, 0xd0($s2) -/* 8D469C 802408DC 8C420034 */ lw $v0, 0x34($v0) -/* 8D46A0 802408E0 54400005 */ bnel $v0, $zero, .L802408F8 -/* 8D46A4 802408E4 2402FDFF */ addiu $v0, $zero, -0x201 -/* 8D46A8 802408E8 34620200 */ ori $v0, $v1, 0x200 -/* 8D46AC 802408EC 2403FFF7 */ addiu $v1, $zero, -9 -/* 8D46B0 802408F0 08090240 */ j .L80240900 -/* 8D46B4 802408F4 00431024 */ and $v0, $v0, $v1 -.L802408F8: -/* 8D46B8 802408F8 00621024 */ and $v0, $v1, $v0 -/* 8D46BC 802408FC 34420008 */ ori $v0, $v0, 8 -.L80240900: -/* 8D46C0 80240900 AE020000 */ sw $v0, ($s0) -/* 8D46C4 80240904 8E4200B0 */ lw $v0, 0xb0($s2) -/* 8D46C8 80240908 30420004 */ andi $v0, $v0, 4 -/* 8D46CC 8024090C 10400009 */ beqz $v0, .L80240934 -/* 8D46D0 80240910 24020063 */ addiu $v0, $zero, 0x63 -/* 8D46D4 80240914 AE820070 */ sw $v0, 0x70($s4) -/* 8D46D8 80240918 2402000F */ addiu $v0, $zero, 0xf -/* 8D46DC 8024091C AE820074 */ sw $v0, 0x74($s4) -/* 8D46E0 80240920 8E4200B0 */ lw $v0, 0xb0($s2) -/* 8D46E4 80240924 2403FFFB */ addiu $v1, $zero, -5 -/* 8D46E8 80240928 00431024 */ and $v0, $v0, $v1 -/* 8D46EC 8024092C 08090258 */ j .L80240960 -/* 8D46F0 80240930 AE4200B0 */ sw $v0, 0xb0($s2) -.L80240934: -/* 8D46F4 80240934 8E420000 */ lw $v0, ($s2) -/* 8D46F8 80240938 3C034000 */ lui $v1, 0x4000 -/* 8D46FC 8024093C 00431024 */ and $v0, $v0, $v1 -/* 8D4700 80240940 10400007 */ beqz $v0, .L80240960 -/* 8D4704 80240944 3C03BFFF */ lui $v1, 0xbfff -/* 8D4708 80240948 2402000C */ addiu $v0, $zero, 0xc -/* 8D470C 8024094C AE820070 */ sw $v0, 0x70($s4) -/* 8D4710 80240950 8E420000 */ lw $v0, ($s2) -/* 8D4714 80240954 3463FFFF */ ori $v1, $v1, 0xffff -/* 8D4718 80240958 00431024 */ and $v0, $v0, $v1 -/* 8D471C 8024095C AE420000 */ sw $v0, ($s2) -.L80240960: -/* 8D4720 80240960 8E830070 */ lw $v1, 0x70($s4) -/* 8D4724 80240964 2C620064 */ sltiu $v0, $v1, 0x64 -/* 8D4728 80240968 10400036 */ beqz $v0, .L80240A44_8D4804 -/* 8D472C 8024096C 00031080 */ sll $v0, $v1, 2 -/* 8D4730 80240970 3C018024 */ lui $at, %hi(jtbl_80241EA8_8D5C68) -/* 8D4734 80240974 00220821 */ addu $at, $at, $v0 -/* 8D4738 80240978 8C221EA8 */ lw $v0, %lo(jtbl_80241EA8_8D5C68)($at) -/* 8D473C 8024097C 00400008 */ jr $v0 -/* 8D4740 80240980 00000000 */ nop -.L80240984_8D4744: -/* 8D4744 80240984 0280202D */ daddu $a0, $s4, $zero -/* 8D4748 80240988 0260282D */ daddu $a1, $s3, $zero -/* 8D474C 8024098C 0C090000 */ jal func_80240000_8D3DC0 -/* 8D4750 80240990 02A0302D */ daddu $a2, $s5, $zero -.L80240994_8D4754: -/* 8D4754 80240994 0280202D */ daddu $a0, $s4, $zero -/* 8D4758 80240998 0260282D */ daddu $a1, $s3, $zero -/* 8D475C 8024099C 0C09002D */ jal func_802400B4_8D3E74 -/* 8D4760 802409A0 02A0302D */ daddu $a2, $s5, $zero -/* 8D4764 802409A4 08090291 */ j .L80240A44_8D4804 -/* 8D4768 802409A8 00000000 */ nop -.L802409AC_8D476C: -/* 8D476C 802409AC 0280202D */ daddu $a0, $s4, $zero -/* 8D4770 802409B0 0260282D */ daddu $a1, $s3, $zero -/* 8D4774 802409B4 0C090075 */ jal kmr_07_NpcJumpFunc3 -/* 8D4778 802409B8 02A0302D */ daddu $a2, $s5, $zero -.L802409BC_8D477C: -/* 8D477C 802409BC 0280202D */ daddu $a0, $s4, $zero -/* 8D4780 802409C0 0260282D */ daddu $a1, $s3, $zero -/* 8D4784 802409C4 0C09008D */ jal kmr_07_NpcJumpFunc -/* 8D4788 802409C8 02A0302D */ daddu $a2, $s5, $zero -/* 8D478C 802409CC 08090291 */ j .L80240A44_8D4804 -/* 8D4790 802409D0 00000000 */ nop -.L802409D4_8D4794: -/* 8D4794 802409D4 0280202D */ daddu $a0, $s4, $zero -/* 8D4798 802409D8 0260282D */ daddu $a1, $s3, $zero -/* 8D479C 802409DC 0C0900AB */ jal kmr_07_UnkNpcAIFunc13_2 -/* 8D47A0 802409E0 02A0302D */ daddu $a2, $s5, $zero -.L802409E4_8D47A4: -/* 8D47A4 802409E4 0280202D */ daddu $a0, $s4, $zero -/* 8D47A8 802409E8 0260282D */ daddu $a1, $s3, $zero -/* 8D47AC 802409EC 0C0900F7 */ jal kmr_07_UnkNpcAIFunc11 -/* 8D47B0 802409F0 02A0302D */ daddu $a2, $s5, $zero -/* 8D47B4 802409F4 08090291 */ j .L80240A44_8D4804 -/* 8D47B8 802409F8 00000000 */ nop -.L802409FC_8D47BC: -/* 8D47BC 802409FC 0280202D */ daddu $a0, $s4, $zero -/* 8D47C0 80240A00 0260282D */ daddu $a1, $s3, $zero -/* 8D47C4 80240A04 0C09013E */ jal kmr_07_UnkNpcAIFunc10 -/* 8D47C8 80240A08 02A0302D */ daddu $a2, $s5, $zero -/* 8D47CC 80240A0C 08090291 */ j .L80240A44_8D4804 -/* 8D47D0 80240A10 00000000 */ nop -.L80240A14_8D47D4: -/* 8D47D4 80240A14 0280202D */ daddu $a0, $s4, $zero -/* 8D47D8 80240A18 0260282D */ daddu $a1, $s3, $zero -/* 8D47DC 80240A1C 0C090150 */ jal func_80240540_8D4300 -/* 8D47E0 80240A20 02A0302D */ daddu $a2, $s5, $zero -.L80240A24_8D47E4: -/* 8D47E4 80240A24 0280202D */ daddu $a0, $s4, $zero -/* 8D47E8 80240A28 0260282D */ daddu $a1, $s3, $zero -/* 8D47EC 80240A2C 0C09017B */ jal func_802405EC_8D43AC -/* 8D47F0 80240A30 02A0302D */ daddu $a2, $s5, $zero -/* 8D47F4 80240A34 08090291 */ j .L80240A44_8D4804 -/* 8D47F8 80240A38 00000000 */ nop -.L80240A3C_8D47FC: -/* 8D47FC 80240A3C 0C0129CF */ jal func_8004A73C -/* 8D4800 80240A40 0280202D */ daddu $a0, $s4, $zero -.L80240A44_8D4804: -/* 8D4804 80240A44 8FBF0048 */ lw $ra, 0x48($sp) -/* 8D4808 80240A48 8FB50044 */ lw $s5, 0x44($sp) -/* 8D480C 80240A4C 8FB40040 */ lw $s4, 0x40($sp) -/* 8D4810 80240A50 8FB3003C */ lw $s3, 0x3c($sp) -/* 8D4814 80240A54 8FB20038 */ lw $s2, 0x38($sp) -/* 8D4818 80240A58 8FB10034 */ lw $s1, 0x34($sp) -/* 8D481C 80240A5C 8FB00030 */ lw $s0, 0x30($sp) -/* 8D4820 80240A60 0000102D */ daddu $v0, $zero, $zero -/* 8D4824 80240A64 03E00008 */ jr $ra -/* 8D4828 80240A68 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240370_8DA470.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240370_8DA470.s deleted file mode 100644 index a129d1a929..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240370_8DA470.s +++ /dev/null @@ -1,59 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_802510B0_8EB1B0 -.double 32767.0 - -.section .text - -glabel func_80240370_8DA470 -/* 8DA470 80240370 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8DA474 80240374 AFB00010 */ sw $s0, 0x10($sp) -/* 8DA478 80240378 0080802D */ daddu $s0, $a0, $zero -/* 8DA47C 8024037C AFBF001C */ sw $ra, 0x1c($sp) -/* 8DA480 80240380 AFB20018 */ sw $s2, 0x18($sp) -/* 8DA484 80240384 AFB10014 */ sw $s1, 0x14($sp) -/* 8DA488 80240388 8E110148 */ lw $s1, 0x148($s0) -/* 8DA48C 8024038C 86240008 */ lh $a0, 8($s1) -/* 8DA490 80240390 0C00EABB */ jal get_npc_unsafe -/* 8DA494 80240394 00A0902D */ daddu $s2, $a1, $zero -/* 8DA498 80240398 8E2300CC */ lw $v1, 0xcc($s1) -/* 8DA49C 8024039C 0040202D */ daddu $a0, $v0, $zero -/* 8DA4A0 802403A0 8C630000 */ lw $v1, ($v1) -/* 8DA4A4 802403A4 24020001 */ addiu $v0, $zero, 1 -/* 8DA4A8 802403A8 AC830028 */ sw $v1, 0x28($a0) -/* 8DA4AC 802403AC AE020070 */ sw $v0, 0x70($s0) -/* 8DA4B0 802403B0 8E220000 */ lw $v0, ($s1) -/* 8DA4B4 802403B4 3C030010 */ lui $v1, 0x10 -/* 8DA4B8 802403B8 00431024 */ and $v0, $v0, $v1 -/* 8DA4BC 802403BC 10400004 */ beqz $v0, .L802403D0 -/* 8DA4C0 802403C0 00000000 */ nop -/* 8DA4C4 802403C4 C620006C */ lwc1 $f0, 0x6c($s1) -/* 8DA4C8 802403C8 46800020 */ cvt.s.w $f0, $f0 -/* 8DA4CC 802403CC E480000C */ swc1 $f0, 0xc($a0) -.L802403D0: -/* 8DA4D0 802403D0 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8DA4D4 802403D4 8C420014 */ lw $v0, 0x14($v0) -/* 8DA4D8 802403D8 1C400004 */ bgtz $v0, .L802403EC -/* 8DA4DC 802403DC 00000000 */ nop -/* 8DA4E0 802403E0 C640000C */ lwc1 $f0, 0xc($s2) -/* 8DA4E4 802403E4 08090103 */ j .L8024040C -/* 8DA4E8 802403E8 E4800018 */ swc1 $f0, 0x18($a0) -.L802403EC: -/* 8DA4EC 802403EC 3C018025 */ lui $at, %hi(D_802510B0_8EB1B0) -/* 8DA4F0 802403F0 D42210B0 */ ldc1 $f2, %lo(D_802510B0_8EB1B0)($at) -/* 8DA4F4 802403F4 44820000 */ mtc1 $v0, $f0 -/* 8DA4F8 802403F8 00000000 */ nop -/* 8DA4FC 802403FC 46800021 */ cvt.d.w $f0, $f0 -/* 8DA500 80240400 46220003 */ div.d $f0, $f0, $f2 -/* 8DA504 80240404 46200020 */ cvt.s.d $f0, $f0 -/* 8DA508 80240408 E4800018 */ swc1 $f0, 0x18($a0) -.L8024040C: -/* 8DA50C 8024040C 8FBF001C */ lw $ra, 0x1c($sp) -/* 8DA510 80240410 8FB20018 */ lw $s2, 0x18($sp) -/* 8DA514 80240414 8FB10014 */ lw $s1, 0x14($sp) -/* 8DA518 80240418 8FB00010 */ lw $s0, 0x10($sp) -/* 8DA51C 8024041C 03E00008 */ jr $ra -/* 8DA520 80240420 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240424_8DA524.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240424_8DA524.s deleted file mode 100644 index 64a08d44e6..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240424_8DA524.s +++ /dev/null @@ -1,78 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240424_8DA524 -/* 8DA524 80240424 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 8DA528 80240428 AFB40040 */ sw $s4, 0x40($sp) -/* 8DA52C 8024042C 0080A02D */ daddu $s4, $a0, $zero -/* 8DA530 80240430 AFBF0044 */ sw $ra, 0x44($sp) -/* 8DA534 80240434 AFB3003C */ sw $s3, 0x3c($sp) -/* 8DA538 80240438 AFB20038 */ sw $s2, 0x38($sp) -/* 8DA53C 8024043C AFB10034 */ sw $s1, 0x34($sp) -/* 8DA540 80240440 AFB00030 */ sw $s0, 0x30($sp) -/* 8DA544 80240444 8E920148 */ lw $s2, 0x148($s4) -/* 8DA548 80240448 00A0802D */ daddu $s0, $a1, $zero -/* 8DA54C 8024044C 86440008 */ lh $a0, 8($s2) -/* 8DA550 80240450 0C00EABB */ jal get_npc_unsafe -/* 8DA554 80240454 00C0982D */ daddu $s3, $a2, $zero -/* 8DA558 80240458 8E030008 */ lw $v1, 8($s0) -/* 8DA55C 8024045C 04600031 */ bltz $v1, .L80240524 -/* 8DA560 80240460 0040882D */ daddu $s1, $v0, $zero -/* 8DA564 80240464 0260202D */ daddu $a0, $s3, $zero -/* 8DA568 80240468 AFA00010 */ sw $zero, 0x10($sp) -/* 8DA56C 8024046C 8E060018 */ lw $a2, 0x18($s0) -/* 8DA570 80240470 8E07001C */ lw $a3, 0x1c($s0) -/* 8DA574 80240474 0C01242D */ jal func_800490B4 -/* 8DA578 80240478 0240282D */ daddu $a1, $s2, $zero -/* 8DA57C 8024047C 10400029 */ beqz $v0, .L80240524 -/* 8DA580 80240480 0000202D */ daddu $a0, $zero, $zero -/* 8DA584 80240484 0220282D */ daddu $a1, $s1, $zero -/* 8DA588 80240488 0000302D */ daddu $a2, $zero, $zero -/* 8DA58C 8024048C 862300A8 */ lh $v1, 0xa8($s1) -/* 8DA590 80240490 3C013F80 */ lui $at, 0x3f80 -/* 8DA594 80240494 44810000 */ mtc1 $at, $f0 -/* 8DA598 80240498 3C014000 */ lui $at, 0x4000 -/* 8DA59C 8024049C 44811000 */ mtc1 $at, $f2 -/* 8DA5A0 802404A0 3C01C1A0 */ lui $at, 0xc1a0 -/* 8DA5A4 802404A4 44812000 */ mtc1 $at, $f4 -/* 8DA5A8 802404A8 2402000F */ addiu $v0, $zero, 0xf -/* 8DA5AC 802404AC AFA2001C */ sw $v0, 0x1c($sp) -/* 8DA5B0 802404B0 44833000 */ mtc1 $v1, $f6 -/* 8DA5B4 802404B4 00000000 */ nop -/* 8DA5B8 802404B8 468031A0 */ cvt.s.w $f6, $f6 -/* 8DA5BC 802404BC 44073000 */ mfc1 $a3, $f6 -/* 8DA5C0 802404C0 27A20028 */ addiu $v0, $sp, 0x28 -/* 8DA5C4 802404C4 AFA20020 */ sw $v0, 0x20($sp) -/* 8DA5C8 802404C8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8DA5CC 802404CC E7A20014 */ swc1 $f2, 0x14($sp) -/* 8DA5D0 802404D0 0C01BFA4 */ jal fx_emote -/* 8DA5D4 802404D4 E7A40018 */ swc1 $f4, 0x18($sp) -/* 8DA5D8 802404D8 0220202D */ daddu $a0, $s1, $zero -/* 8DA5DC 802404DC 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 8DA5E0 802404E0 0C012530 */ jal ai_enemy_play_sound -/* 8DA5E4 802404E4 3C060020 */ lui $a2, 0x20 -/* 8DA5E8 802404E8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8DA5EC 802404EC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8DA5F0 802404F0 C62C0038 */ lwc1 $f12, 0x38($s1) -/* 8DA5F4 802404F4 C62E0040 */ lwc1 $f14, 0x40($s1) -/* 8DA5F8 802404F8 8C460028 */ lw $a2, 0x28($v0) -/* 8DA5FC 802404FC 0C00A720 */ jal atan2 -/* 8DA600 80240500 8C470030 */ lw $a3, 0x30($v0) -/* 8DA604 80240504 E620000C */ swc1 $f0, 0xc($s1) -/* 8DA608 80240508 8E420018 */ lw $v0, 0x18($s2) -/* 8DA60C 8024050C 9442002A */ lhu $v0, 0x2a($v0) -/* 8DA610 80240510 30420001 */ andi $v0, $v0, 1 -/* 8DA614 80240514 14400002 */ bnez $v0, .L80240520 -/* 8DA618 80240518 2402000A */ addiu $v0, $zero, 0xa -/* 8DA61C 8024051C 2402000C */ addiu $v0, $zero, 0xc -.L80240520: -/* 8DA620 80240520 AE820070 */ sw $v0, 0x70($s4) -.L80240524: -/* 8DA624 80240524 8FBF0044 */ lw $ra, 0x44($sp) -/* 8DA628 80240528 8FB40040 */ lw $s4, 0x40($sp) -/* 8DA62C 8024052C 8FB3003C */ lw $s3, 0x3c($sp) -/* 8DA630 80240530 8FB20038 */ lw $s2, 0x38($sp) -/* 8DA634 80240534 8FB10034 */ lw $s1, 0x34($sp) -/* 8DA638 80240538 8FB00030 */ lw $s0, 0x30($sp) -/* 8DA63C 8024053C 03E00008 */ jr $ra -/* 8DA640 80240540 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_802408B0_8DA9B0.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_802408B0_8DA9B0.s deleted file mode 100644 index fa1ca25b3a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_802408B0_8DA9B0.s +++ /dev/null @@ -1,59 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_802510B8_8EB1B8 -.double 0.3 - -dlabel D_802510C0_8EB1C0 -.double 32767.0 - -.section .text - -glabel func_802408B0_8DA9B0 -/* 8DA9B0 802408B0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8DA9B4 802408B4 AFB10014 */ sw $s1, 0x14($sp) -/* 8DA9B8 802408B8 0080882D */ daddu $s1, $a0, $zero -/* 8DA9BC 802408BC AFBF001C */ sw $ra, 0x1c($sp) -/* 8DA9C0 802408C0 AFB20018 */ sw $s2, 0x18($sp) -/* 8DA9C4 802408C4 AFB00010 */ sw $s0, 0x10($sp) -/* 8DA9C8 802408C8 8E300148 */ lw $s0, 0x148($s1) -/* 8DA9CC 802408CC 86040008 */ lh $a0, 8($s0) -/* 8DA9D0 802408D0 0C00EABB */ jal get_npc_unsafe -/* 8DA9D4 802408D4 00A0902D */ daddu $s2, $a1, $zero -/* 8DA9D8 802408D8 8E0300CC */ lw $v1, 0xcc($s0) -/* 8DA9DC 802408DC 8C630004 */ lw $v1, 4($v1) -/* 8DA9E0 802408E0 0040202D */ daddu $a0, $v0, $zero -/* 8DA9E4 802408E4 AC830028 */ sw $v1, 0x28($a0) -/* 8DA9E8 802408E8 8E0200D0 */ lw $v0, 0xd0($s0) -/* 8DA9EC 802408EC 8C420014 */ lw $v0, 0x14($v0) -/* 8DA9F0 802408F0 04410009 */ bgez $v0, .L80240918 -/* 8DA9F4 802408F4 00000000 */ nop -/* 8DA9F8 802408F8 C640000C */ lwc1 $f0, 0xc($s2) -/* 8DA9FC 802408FC 3C018025 */ lui $at, %hi(D_802510B8_8EB1B8) -/* 8DAA00 80240900 D42210B8 */ ldc1 $f2, %lo(D_802510B8_8EB1B8)($at) -/* 8DAA04 80240904 46000021 */ cvt.d.s $f0, $f0 -/* 8DAA08 80240908 46220002 */ mul.d $f0, $f0, $f2 -/* 8DAA0C 8024090C 00000000 */ nop -/* 8DAA10 80240910 0809024D */ j .L80240934 -/* 8DAA14 80240914 46200020 */ cvt.s.d $f0, $f0 -.L80240918: -/* 8DAA18 80240918 3C018025 */ lui $at, %hi(D_802510C0_8EB1C0) -/* 8DAA1C 8024091C D42210C0 */ ldc1 $f2, %lo(D_802510C0_8EB1C0)($at) -/* 8DAA20 80240920 44820000 */ mtc1 $v0, $f0 -/* 8DAA24 80240924 00000000 */ nop -/* 8DAA28 80240928 46800021 */ cvt.d.w $f0, $f0 -/* 8DAA2C 8024092C 46220003 */ div.d $f0, $f0, $f2 -/* 8DAA30 80240930 46200020 */ cvt.s.d $f0, $f0 -.L80240934: -/* 8DAA34 80240934 E4800018 */ swc1 $f0, 0x18($a0) -/* 8DAA38 80240938 24020010 */ addiu $v0, $zero, 0x10 -/* 8DAA3C 8024093C AE200074 */ sw $zero, 0x74($s1) -/* 8DAA40 80240940 AE220070 */ sw $v0, 0x70($s1) -/* 8DAA44 80240944 8FBF001C */ lw $ra, 0x1c($sp) -/* 8DAA48 80240948 8FB20018 */ lw $s2, 0x18($sp) -/* 8DAA4C 8024094C 8FB10014 */ lw $s1, 0x14($sp) -/* 8DAA50 80240950 8FB00010 */ lw $s0, 0x10($sp) -/* 8DAA54 80240954 03E00008 */ jr $ra -/* 8DAA58 80240958 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_8024095C_8DAA5C.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_8024095C_8DAA5C.s deleted file mode 100644 index 21fd79670f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_8024095C_8DAA5C.s +++ /dev/null @@ -1,140 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024095C_8DAA5C -/* 8DAA5C 8024095C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 8DAA60 80240960 AFB3003C */ sw $s3, 0x3c($sp) -/* 8DAA64 80240964 0080982D */ daddu $s3, $a0, $zero -/* 8DAA68 80240968 AFBF0044 */ sw $ra, 0x44($sp) -/* 8DAA6C 8024096C AFB40040 */ sw $s4, 0x40($sp) -/* 8DAA70 80240970 AFB20038 */ sw $s2, 0x38($sp) -/* 8DAA74 80240974 AFB10034 */ sw $s1, 0x34($sp) -/* 8DAA78 80240978 AFB00030 */ sw $s0, 0x30($sp) -/* 8DAA7C 8024097C 8E710148 */ lw $s1, 0x148($s3) -/* 8DAA80 80240980 00A0902D */ daddu $s2, $a1, $zero -/* 8DAA84 80240984 86240008 */ lh $a0, 8($s1) -/* 8DAA88 80240988 0C00EABB */ jal get_npc_unsafe -/* 8DAA8C 8024098C 00C0A02D */ daddu $s4, $a2, $zero -/* 8DAA90 80240990 8E430008 */ lw $v1, 8($s2) -/* 8DAA94 80240994 0460003B */ bltz $v1, .L80240A84 -/* 8DAA98 80240998 0040802D */ daddu $s0, $v0, $zero -/* 8DAA9C 8024099C 8E620074 */ lw $v0, 0x74($s3) -/* 8DAAA0 802409A0 1C400037 */ bgtz $v0, .L80240A80 -/* 8DAAA4 802409A4 2442FFFF */ addiu $v0, $v0, -1 -/* 8DAAA8 802409A8 0280202D */ daddu $a0, $s4, $zero -/* 8DAAAC 802409AC AE630074 */ sw $v1, 0x74($s3) -/* 8DAAB0 802409B0 AFA00010 */ sw $zero, 0x10($sp) -/* 8DAAB4 802409B4 8E460018 */ lw $a2, 0x18($s2) -/* 8DAAB8 802409B8 8E47001C */ lw $a3, 0x1c($s2) -/* 8DAABC 802409BC 0C01242D */ jal func_800490B4 -/* 8DAAC0 802409C0 0220282D */ daddu $a1, $s1, $zero -/* 8DAAC4 802409C4 1040002C */ beqz $v0, .L80240A78 -/* 8DAAC8 802409C8 0000202D */ daddu $a0, $zero, $zero -/* 8DAACC 802409CC 0200282D */ daddu $a1, $s0, $zero -/* 8DAAD0 802409D0 0000302D */ daddu $a2, $zero, $zero -/* 8DAAD4 802409D4 860300A8 */ lh $v1, 0xa8($s0) -/* 8DAAD8 802409D8 3C013F80 */ lui $at, 0x3f80 -/* 8DAADC 802409DC 44810000 */ mtc1 $at, $f0 -/* 8DAAE0 802409E0 3C014000 */ lui $at, 0x4000 -/* 8DAAE4 802409E4 44811000 */ mtc1 $at, $f2 -/* 8DAAE8 802409E8 3C01C1A0 */ lui $at, 0xc1a0 -/* 8DAAEC 802409EC 44812000 */ mtc1 $at, $f4 -/* 8DAAF0 802409F0 2402000F */ addiu $v0, $zero, 0xf -/* 8DAAF4 802409F4 AFA2001C */ sw $v0, 0x1c($sp) -/* 8DAAF8 802409F8 44833000 */ mtc1 $v1, $f6 -/* 8DAAFC 802409FC 00000000 */ nop -/* 8DAB00 80240A00 468031A0 */ cvt.s.w $f6, $f6 -/* 8DAB04 80240A04 44073000 */ mfc1 $a3, $f6 -/* 8DAB08 80240A08 27A20028 */ addiu $v0, $sp, 0x28 -/* 8DAB0C 80240A0C AFA20020 */ sw $v0, 0x20($sp) -/* 8DAB10 80240A10 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8DAB14 80240A14 E7A20014 */ swc1 $f2, 0x14($sp) -/* 8DAB18 80240A18 0C01BFA4 */ jal fx_emote -/* 8DAB1C 80240A1C E7A40018 */ swc1 $f4, 0x18($sp) -/* 8DAB20 80240A20 0200202D */ daddu $a0, $s0, $zero -/* 8DAB24 80240A24 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 8DAB28 80240A28 0C012530 */ jal ai_enemy_play_sound -/* 8DAB2C 80240A2C 3C060020 */ lui $a2, 0x20 -/* 8DAB30 80240A30 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 8DAB34 80240A34 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8DAB38 80240A38 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8DAB3C 80240A3C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 8DAB40 80240A40 8C460028 */ lw $a2, 0x28($v0) -/* 8DAB44 80240A44 0C00A720 */ jal atan2 -/* 8DAB48 80240A48 8C470030 */ lw $a3, 0x30($v0) -/* 8DAB4C 80240A4C E600000C */ swc1 $f0, 0xc($s0) -/* 8DAB50 80240A50 8E220018 */ lw $v0, 0x18($s1) -/* 8DAB54 80240A54 9442002A */ lhu $v0, 0x2a($v0) -/* 8DAB58 80240A58 30420001 */ andi $v0, $v0, 1 -/* 8DAB5C 80240A5C 10400003 */ beqz $v0, .L80240A6C -/* 8DAB60 80240A60 2402000A */ addiu $v0, $zero, 0xa -/* 8DAB64 80240A64 080902D1 */ j .L80240B44 -/* 8DAB68 80240A68 AE620070 */ sw $v0, 0x70($s3) -.L80240A6C: -/* 8DAB6C 80240A6C 2402000C */ addiu $v0, $zero, 0xc -/* 8DAB70 80240A70 080902D1 */ j .L80240B44 -/* 8DAB74 80240A74 AE620070 */ sw $v0, 0x70($s3) -.L80240A78: -/* 8DAB78 80240A78 8E620074 */ lw $v0, 0x74($s3) -/* 8DAB7C 80240A7C 2442FFFF */ addiu $v0, $v0, -1 -.L80240A80: -/* 8DAB80 80240A80 AE620074 */ sw $v0, 0x74($s3) -.L80240A84: -/* 8DAB84 80240A84 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 8DAB88 80240A88 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8DAB8C 80240A8C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 8DAB90 80240A90 C4460000 */ lwc1 $f6, ($v0) -/* 8DAB94 80240A94 468031A0 */ cvt.s.w $f6, $f6 -/* 8DAB98 80240A98 44063000 */ mfc1 $a2, $f6 -/* 8DAB9C 80240A9C C4460008 */ lwc1 $f6, 8($v0) -/* 8DABA0 80240AA0 468031A0 */ cvt.s.w $f6, $f6 -/* 8DABA4 80240AA4 44073000 */ mfc1 $a3, $f6 -/* 8DABA8 80240AA8 0C00A7B5 */ jal dist2D -/* 8DABAC 80240AAC 00000000 */ nop -/* 8DABB0 80240AB0 C6020018 */ lwc1 $f2, 0x18($s0) -/* 8DABB4 80240AB4 4602003C */ c.lt.s $f0, $f2 -/* 8DABB8 80240AB8 00000000 */ nop -/* 8DABBC 80240ABC 4500000E */ bc1f .L80240AF8 -/* 8DABC0 80240AC0 00000000 */ nop -/* 8DABC4 80240AC4 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8DABC8 80240AC8 C4400000 */ lwc1 $f0, ($v0) -/* 8DABCC 80240ACC 46800020 */ cvt.s.w $f0, $f0 -/* 8DABD0 80240AD0 E6000038 */ swc1 $f0, 0x38($s0) -/* 8DABD4 80240AD4 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8DABD8 80240AD8 C4400008 */ lwc1 $f0, 8($v0) -/* 8DABDC 80240ADC 46800020 */ cvt.s.w $f0, $f0 -/* 8DABE0 80240AE0 E6000040 */ swc1 $f0, 0x40($s0) -/* 8DABE4 80240AE4 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8DABE8 80240AE8 C440000C */ lwc1 $f0, 0xc($v0) -/* 8DABEC 80240AEC 46800020 */ cvt.s.w $f0, $f0 -/* 8DABF0 80240AF0 E600000C */ swc1 $f0, 0xc($s0) -/* 8DABF4 80240AF4 AE600070 */ sw $zero, 0x70($s3) -.L80240AF8: -/* 8DABF8 80240AF8 8602008C */ lh $v0, 0x8c($s0) -/* 8DABFC 80240AFC 14400011 */ bnez $v0, .L80240B44 -/* 8DAC00 80240B00 00000000 */ nop -/* 8DAC04 80240B04 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 8DAC08 80240B08 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8DAC0C 80240B0C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 8DAC10 80240B10 C4460000 */ lwc1 $f6, ($v0) -/* 8DAC14 80240B14 468031A0 */ cvt.s.w $f6, $f6 -/* 8DAC18 80240B18 44063000 */ mfc1 $a2, $f6 -/* 8DAC1C 80240B1C C4460008 */ lwc1 $f6, 8($v0) -/* 8DAC20 80240B20 468031A0 */ cvt.s.w $f6, $f6 -/* 8DAC24 80240B24 44073000 */ mfc1 $a3, $f6 -/* 8DAC28 80240B28 0C00A720 */ jal atan2 -/* 8DAC2C 80240B2C 00000000 */ nop -/* 8DAC30 80240B30 8E050018 */ lw $a1, 0x18($s0) -/* 8DAC34 80240B34 44060000 */ mfc1 $a2, $f0 -/* 8DAC38 80240B38 0200202D */ daddu $a0, $s0, $zero -/* 8DAC3C 80240B3C 0C00EA95 */ jal npc_move_heading -/* 8DAC40 80240B40 AC86000C */ sw $a2, 0xc($a0) -.L80240B44: -/* 8DAC44 80240B44 8FBF0044 */ lw $ra, 0x44($sp) -/* 8DAC48 80240B48 8FB40040 */ lw $s4, 0x40($sp) -/* 8DAC4C 80240B4C 8FB3003C */ lw $s3, 0x3c($sp) -/* 8DAC50 80240B50 8FB20038 */ lw $s2, 0x38($sp) -/* 8DAC54 80240B54 8FB10034 */ lw $s1, 0x34($sp) -/* 8DAC58 80240B58 8FB00030 */ lw $s0, 0x30($sp) -/* 8DAC5C 80240B5C 03E00008 */ jr $ra -/* 8DAC60 80240B60 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240B64_8DAC64.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240B64_8DAC64.s deleted file mode 100644 index 0c6d3be307..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240B64_8DAC64.s +++ /dev/null @@ -1,185 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_802510C8_8EB1C8 -.word .L80240CF4_8DADF4, .L80240D04_8DAE04, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240D1C_8DAE1C, .L80240D2C_8DAE2C, .L80240D44_8DAE44, .L80240D54_8DAE54, .L80240D6C_8DAE6C, .L80240D84_8DAE84, .L80240D94_8DAE94, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DB4_8DAEB4, .L80240DAC_8DAEAC, 0, 0 - -.section .text - -glabel func_80240B64_8DAC64 -/* 8DAC64 80240B64 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 8DAC68 80240B68 AFB40040 */ sw $s4, 0x40($sp) -/* 8DAC6C 80240B6C 0080A02D */ daddu $s4, $a0, $zero -/* 8DAC70 80240B70 AFBF0048 */ sw $ra, 0x48($sp) -/* 8DAC74 80240B74 AFB50044 */ sw $s5, 0x44($sp) -/* 8DAC78 80240B78 AFB3003C */ sw $s3, 0x3c($sp) -/* 8DAC7C 80240B7C AFB20038 */ sw $s2, 0x38($sp) -/* 8DAC80 80240B80 AFB10034 */ sw $s1, 0x34($sp) -/* 8DAC84 80240B84 AFB00030 */ sw $s0, 0x30($sp) -/* 8DAC88 80240B88 8E920148 */ lw $s2, 0x148($s4) -/* 8DAC8C 80240B8C 86440008 */ lh $a0, 8($s2) -/* 8DAC90 80240B90 8E90000C */ lw $s0, 0xc($s4) -/* 8DAC94 80240B94 0C00EABB */ jal get_npc_unsafe -/* 8DAC98 80240B98 00A0882D */ daddu $s1, $a1, $zero -/* 8DAC9C 80240B9C 0280202D */ daddu $a0, $s4, $zero -/* 8DACA0 80240BA0 8E050000 */ lw $a1, ($s0) -/* 8DACA4 80240BA4 0C0B1EAF */ jal evt_get_variable -/* 8DACA8 80240BA8 0040802D */ daddu $s0, $v0, $zero -/* 8DACAC 80240BAC AFA00010 */ sw $zero, 0x10($sp) -/* 8DACB0 80240BB0 8E4300D0 */ lw $v1, 0xd0($s2) -/* 8DACB4 80240BB4 8C630030 */ lw $v1, 0x30($v1) -/* 8DACB8 80240BB8 AFA30014 */ sw $v1, 0x14($sp) -/* 8DACBC 80240BBC 8E4300D0 */ lw $v1, 0xd0($s2) -/* 8DACC0 80240BC0 8C63001C */ lw $v1, 0x1c($v1) -/* 8DACC4 80240BC4 AFA30018 */ sw $v1, 0x18($sp) -/* 8DACC8 80240BC8 8E4300D0 */ lw $v1, 0xd0($s2) -/* 8DACCC 80240BCC 8C630024 */ lw $v1, 0x24($v1) -/* 8DACD0 80240BD0 AFA3001C */ sw $v1, 0x1c($sp) -/* 8DACD4 80240BD4 8E4300D0 */ lw $v1, 0xd0($s2) -/* 8DACD8 80240BD8 8C630028 */ lw $v1, 0x28($v1) -/* 8DACDC 80240BDC 27B50010 */ addiu $s5, $sp, 0x10 -/* 8DACE0 80240BE0 AFA30020 */ sw $v1, 0x20($sp) -/* 8DACE4 80240BE4 8E4300D0 */ lw $v1, 0xd0($s2) -/* 8DACE8 80240BE8 3C014282 */ lui $at, 0x4282 -/* 8DACEC 80240BEC 44810000 */ mtc1 $at, $f0 -/* 8DACF0 80240BF0 8C63002C */ lw $v1, 0x2c($v1) -/* 8DACF4 80240BF4 0040982D */ daddu $s3, $v0, $zero -/* 8DACF8 80240BF8 E7A00028 */ swc1 $f0, 0x28($sp) -/* 8DACFC 80240BFC A7A0002C */ sh $zero, 0x2c($sp) -/* 8DAD00 80240C00 16200005 */ bnez $s1, .L80240C18 -/* 8DAD04 80240C04 AFA30024 */ sw $v1, 0x24($sp) -/* 8DAD08 80240C08 8E4200B0 */ lw $v0, 0xb0($s2) -/* 8DAD0C 80240C0C 30420004 */ andi $v0, $v0, 4 -/* 8DAD10 80240C10 1040002F */ beqz $v0, .L80240CD0 -/* 8DAD14 80240C14 00000000 */ nop -.L80240C18: -/* 8DAD18 80240C18 AE800070 */ sw $zero, 0x70($s4) -/* 8DAD1C 80240C1C C600000C */ lwc1 $f0, 0xc($s0) -/* 8DAD20 80240C20 A600008E */ sh $zero, 0x8e($s0) -/* 8DAD24 80240C24 8E4200CC */ lw $v0, 0xcc($s2) -/* 8DAD28 80240C28 4600008D */ trunc.w.s $f2, $f0 -/* 8DAD2C 80240C2C E642006C */ swc1 $f2, 0x6c($s2) -/* 8DAD30 80240C30 8C420000 */ lw $v0, ($v0) -/* 8DAD34 80240C34 8E030000 */ lw $v1, ($s0) -/* 8DAD38 80240C38 AE020028 */ sw $v0, 0x28($s0) -/* 8DAD3C 80240C3C 2402F7FF */ addiu $v0, $zero, -0x801 -/* 8DAD40 80240C40 00621824 */ and $v1, $v1, $v0 -/* 8DAD44 80240C44 AE030000 */ sw $v1, ($s0) -/* 8DAD48 80240C48 8E4200D0 */ lw $v0, 0xd0($s2) -/* 8DAD4C 80240C4C 8C420034 */ lw $v0, 0x34($v0) -/* 8DAD50 80240C50 54400005 */ bnel $v0, $zero, .L80240C68 -/* 8DAD54 80240C54 2402FDFF */ addiu $v0, $zero, -0x201 -/* 8DAD58 80240C58 34620200 */ ori $v0, $v1, 0x200 -/* 8DAD5C 80240C5C 2403FFF7 */ addiu $v1, $zero, -9 -/* 8DAD60 80240C60 0809031C */ j .L80240C70 -/* 8DAD64 80240C64 00431024 */ and $v0, $v0, $v1 -.L80240C68: -/* 8DAD68 80240C68 00621024 */ and $v0, $v1, $v0 -/* 8DAD6C 80240C6C 34420008 */ ori $v0, $v0, 8 -.L80240C70: -/* 8DAD70 80240C70 AE020000 */ sw $v0, ($s0) -/* 8DAD74 80240C74 8E4200B0 */ lw $v0, 0xb0($s2) -/* 8DAD78 80240C78 30420004 */ andi $v0, $v0, 4 -/* 8DAD7C 80240C7C 10400009 */ beqz $v0, .L80240CA4 -/* 8DAD80 80240C80 24020063 */ addiu $v0, $zero, 0x63 -/* 8DAD84 80240C84 AE820070 */ sw $v0, 0x70($s4) -/* 8DAD88 80240C88 2402000F */ addiu $v0, $zero, 0xf -/* 8DAD8C 80240C8C AE820074 */ sw $v0, 0x74($s4) -/* 8DAD90 80240C90 8E4200B0 */ lw $v0, 0xb0($s2) -/* 8DAD94 80240C94 2403FFFB */ addiu $v1, $zero, -5 -/* 8DAD98 80240C98 00431024 */ and $v0, $v0, $v1 -/* 8DAD9C 80240C9C 08090334 */ j .L80240CD0 -/* 8DADA0 80240CA0 AE4200B0 */ sw $v0, 0xb0($s2) -.L80240CA4: -/* 8DADA4 80240CA4 8E420000 */ lw $v0, ($s2) -/* 8DADA8 80240CA8 3C034000 */ lui $v1, 0x4000 -/* 8DADAC 80240CAC 00431024 */ and $v0, $v0, $v1 -/* 8DADB0 80240CB0 10400007 */ beqz $v0, .L80240CD0 -/* 8DADB4 80240CB4 3C03BFFF */ lui $v1, 0xbfff -/* 8DADB8 80240CB8 2402000C */ addiu $v0, $zero, 0xc -/* 8DADBC 80240CBC AE820070 */ sw $v0, 0x70($s4) -/* 8DADC0 80240CC0 8E420000 */ lw $v0, ($s2) -/* 8DADC4 80240CC4 3463FFFF */ ori $v1, $v1, 0xffff -/* 8DADC8 80240CC8 00431024 */ and $v0, $v0, $v1 -/* 8DADCC 80240CCC AE420000 */ sw $v0, ($s2) -.L80240CD0: -/* 8DADD0 80240CD0 8E830070 */ lw $v1, 0x70($s4) -/* 8DADD4 80240CD4 2C620064 */ sltiu $v0, $v1, 0x64 -/* 8DADD8 80240CD8 10400036 */ beqz $v0, .L80240DB4_8DAEB4 -/* 8DADDC 80240CDC 00031080 */ sll $v0, $v1, 2 -/* 8DADE0 80240CE0 3C018025 */ lui $at, %hi(jtbl_802510C8_8EB1C8) -/* 8DADE4 80240CE4 00220821 */ addu $at, $at, $v0 -/* 8DADE8 80240CE8 8C2210C8 */ lw $v0, %lo(jtbl_802510C8_8EB1C8)($at) -/* 8DADEC 80240CEC 00400008 */ jr $v0 -/* 8DADF0 80240CF0 00000000 */ nop -.L80240CF4_8DADF4: -/* 8DADF4 80240CF4 0280202D */ daddu $a0, $s4, $zero -/* 8DADF8 80240CF8 0260282D */ daddu $a1, $s3, $zero -/* 8DADFC 80240CFC 0C0900DC */ jal func_80240370_8DA470 -/* 8DAE00 80240D00 02A0302D */ daddu $a2, $s5, $zero -.L80240D04_8DAE04: -/* 8DAE04 80240D04 0280202D */ daddu $a0, $s4, $zero -/* 8DAE08 80240D08 0260282D */ daddu $a1, $s3, $zero -/* 8DAE0C 80240D0C 0C090109 */ jal func_80240424_8DA524 -/* 8DAE10 80240D10 02A0302D */ daddu $a2, $s5, $zero -/* 8DAE14 80240D14 0809036D */ j .L80240DB4_8DAEB4 -/* 8DAE18 80240D18 00000000 */ nop -.L80240D1C_8DAE1C: -/* 8DAE1C 80240D1C 0280202D */ daddu $a0, $s4, $zero -/* 8DAE20 80240D20 0260282D */ daddu $a1, $s3, $zero -/* 8DAE24 80240D24 0C090151 */ jal kmr_11_NpcJumpFunc3 -/* 8DAE28 80240D28 02A0302D */ daddu $a2, $s5, $zero -.L80240D2C_8DAE2C: -/* 8DAE2C 80240D2C 0280202D */ daddu $a0, $s4, $zero -/* 8DAE30 80240D30 0260282D */ daddu $a1, $s3, $zero -/* 8DAE34 80240D34 0C090169 */ jal kmr_11_NpcJumpFunc -/* 8DAE38 80240D38 02A0302D */ daddu $a2, $s5, $zero -/* 8DAE3C 80240D3C 0809036D */ j .L80240DB4_8DAEB4 -/* 8DAE40 80240D40 00000000 */ nop -.L80240D44_8DAE44: -/* 8DAE44 80240D44 0280202D */ daddu $a0, $s4, $zero -/* 8DAE48 80240D48 0260282D */ daddu $a1, $s3, $zero -/* 8DAE4C 80240D4C 0C090187 */ jal kmr_11_UnkNpcAIFunc13_2 -/* 8DAE50 80240D50 02A0302D */ daddu $a2, $s5, $zero -.L80240D54_8DAE54: -/* 8DAE54 80240D54 0280202D */ daddu $a0, $s4, $zero -/* 8DAE58 80240D58 0260282D */ daddu $a1, $s3, $zero -/* 8DAE5C 80240D5C 0C0901D3 */ jal kmr_11_UnkNpcAIFunc11 -/* 8DAE60 80240D60 02A0302D */ daddu $a2, $s5, $zero -/* 8DAE64 80240D64 0809036D */ j .L80240DB4_8DAEB4 -/* 8DAE68 80240D68 00000000 */ nop -.L80240D6C_8DAE6C: -/* 8DAE6C 80240D6C 0280202D */ daddu $a0, $s4, $zero -/* 8DAE70 80240D70 0260282D */ daddu $a1, $s3, $zero -/* 8DAE74 80240D74 0C09021A */ jal kmr_11_UnkNpcAIFunc10 -/* 8DAE78 80240D78 02A0302D */ daddu $a2, $s5, $zero -/* 8DAE7C 80240D7C 0809036D */ j .L80240DB4_8DAEB4 -/* 8DAE80 80240D80 00000000 */ nop -.L80240D84_8DAE84: -/* 8DAE84 80240D84 0280202D */ daddu $a0, $s4, $zero -/* 8DAE88 80240D88 0260282D */ daddu $a1, $s3, $zero -/* 8DAE8C 80240D8C 0C09022C */ jal func_802408B0_8DA9B0 -/* 8DAE90 80240D90 02A0302D */ daddu $a2, $s5, $zero -.L80240D94_8DAE94: -/* 8DAE94 80240D94 0280202D */ daddu $a0, $s4, $zero -/* 8DAE98 80240D98 0260282D */ daddu $a1, $s3, $zero -/* 8DAE9C 80240D9C 0C090257 */ jal func_8024095C_8DAA5C -/* 8DAEA0 80240DA0 02A0302D */ daddu $a2, $s5, $zero -/* 8DAEA4 80240DA4 0809036D */ j .L80240DB4_8DAEB4 -/* 8DAEA8 80240DA8 00000000 */ nop -.L80240DAC_8DAEAC: -/* 8DAEAC 80240DAC 0C0129CF */ jal func_8004A73C -/* 8DAEB0 80240DB0 0280202D */ daddu $a0, $s4, $zero -.L80240DB4_8DAEB4: -/* 8DAEB4 80240DB4 8FBF0048 */ lw $ra, 0x48($sp) -/* 8DAEB8 80240DB8 8FB50044 */ lw $s5, 0x44($sp) -/* 8DAEBC 80240DBC 8FB40040 */ lw $s4, 0x40($sp) -/* 8DAEC0 80240DC0 8FB3003C */ lw $s3, 0x3c($sp) -/* 8DAEC4 80240DC4 8FB20038 */ lw $s2, 0x38($sp) -/* 8DAEC8 80240DC8 8FB10034 */ lw $s1, 0x34($sp) -/* 8DAECC 80240DCC 8FB00030 */ lw $s0, 0x30($sp) -/* 8DAED0 80240DD0 0000102D */ daddu $v0, $zero, $zero -/* 8DAED4 80240DD4 03E00008 */ jr $ra -/* 8DAED8 80240DD8 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240010_8FEE90.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240010_8FEE90.s index c9de0a2f31..485c50fac6 100644 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240010_8FEE90.s +++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240010_8FEE90.s @@ -10,8 +10,8 @@ glabel func_80240010_8FEE90 /* 8FEEA4 80240024 3C0EFD18 */ lui $t6, 0xfd18 /* 8FEEA8 80240028 35CE00C7 */ ori $t6, $t6, 0xc7 /* 8FEEAC 8024002C AFB3000C */ sw $s3, 0xc($sp) -/* 8FEEB0 80240030 3C138024 */ lui $s3, %hi(func_802407F4_8D45B4) -/* 8FEEB4 80240034 267307F4 */ addiu $s3, $s3, %lo(func_802407F4_8D45B4) +/* 8FEEB0 80240030 3C138024 */ lui $s3, %hi(kmr_07_UnkNpcAIMainFunc4) +/* 8FEEB4 80240034 267307F4 */ addiu $s3, $s3, %lo(kmr_07_UnkNpcAIMainFunc4) /* 8FEEB8 80240038 3C0BF518 */ lui $t3, 0xf518 /* 8FEEBC 8024003C 356B6400 */ ori $t3, $t3, 0x6400 /* 8FEEC0 80240040 AFB20008 */ sw $s2, 8($sp) diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240210_8FF090.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240210_8FF090.s index 4bcef807aa..bf427734ee 100644 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240210_8FF090.s +++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240210_8FF090.s @@ -33,8 +33,8 @@ glabel func_80240210_8FF090 /* 8FF0E4 80240264 3C058024 */ lui $a1, %hi(func_80240010_8FEE90) /* 8FF0E8 80240268 24A50010 */ addiu $a1, $a1, %lo(func_80240010_8FEE90) /* 8FF0EC 8024026C 00431021 */ addu $v0, $v0, $v1 -/* 8FF0F0 80240270 3C018024 */ lui $at, %hi(func_802407F4_8D45B4) -/* 8FF0F4 80240274 AC2207F4 */ sw $v0, %lo(func_802407F4_8D45B4)($at) +/* 8FF0F0 80240270 3C018024 */ lui $at, %hi(kmr_07_UnkNpcAIMainFunc4) +/* 8FF0F4 80240274 AC2207F4 */ sw $v0, %lo(kmr_07_UnkNpcAIMainFunc4)($at) /* 8FF0F8 80240278 0C048C8F */ jal create_generic_entity_frontUI /* 8FF0FC 8024027C 0000202D */ daddu $a0, $zero, $zero /* 8FF100 80240280 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802404F4_A47454.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802404F4_A47454.s deleted file mode 100644 index 29b5fe37b6..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802404F4_A47454.s +++ /dev/null @@ -1,309 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80241608_A48568 -.word .L80240900_A47860, .L8024090C_A4786C, .L8024090C_A4786C, .L8024090C_A4786C, .L8024090C_A4786C, .L8024090C_A4786C, .L8024090C_A4786C, .L8024090C_A4786C, .L80240900_A47860, .L8024090C_A4786C, .L80240900_A47860, .L8024090C_A4786C, .L80240900_A47860, .L8024090C_A4786C, .L80240900_A47860, .L8024090C_A4786C, .L8024090C_A4786C, .L8024090C_A4786C, .L80240900_A47860, .L8024090C_A4786C, .L80240900_A47860, 0 - -.section .text - -glabel func_802404F4_A47454 -/* A47454 802404F4 27BDFF90 */ addiu $sp, $sp, -0x70 -/* A47458 802404F8 AFB3005C */ sw $s3, 0x5c($sp) -/* A4745C 802404FC 0080982D */ daddu $s3, $a0, $zero -/* A47460 80240500 AFBF0068 */ sw $ra, 0x68($sp) -/* A47464 80240504 AFB50064 */ sw $s5, 0x64($sp) -/* A47468 80240508 AFB40060 */ sw $s4, 0x60($sp) -/* A4746C 8024050C AFB20058 */ sw $s2, 0x58($sp) -/* A47470 80240510 AFB10054 */ sw $s1, 0x54($sp) -/* A47474 80240514 AFB00050 */ sw $s0, 0x50($sp) -/* A47478 80240518 8E710148 */ lw $s1, 0x148($s3) -/* A4747C 8024051C 86240008 */ lh $a0, 8($s1) -/* A47480 80240520 0C00EABB */ jal get_npc_unsafe -/* A47484 80240524 00A0802D */ daddu $s0, $a1, $zero -/* A47488 80240528 8E63000C */ lw $v1, 0xc($s3) -/* A4748C 8024052C 0260202D */ daddu $a0, $s3, $zero -/* A47490 80240530 8C650000 */ lw $a1, ($v1) -/* A47494 80240534 0C0B1EAF */ jal evt_get_variable -/* A47498 80240538 0040902D */ daddu $s2, $v0, $zero -/* A4749C 8024053C AFA00028 */ sw $zero, 0x28($sp) -/* A474A0 80240540 8E2300D0 */ lw $v1, 0xd0($s1) -/* A474A4 80240544 8C630030 */ lw $v1, 0x30($v1) -/* A474A8 80240548 AFA3002C */ sw $v1, 0x2c($sp) -/* A474AC 8024054C 8E2300D0 */ lw $v1, 0xd0($s1) -/* A474B0 80240550 8C63001C */ lw $v1, 0x1c($v1) -/* A474B4 80240554 AFA30030 */ sw $v1, 0x30($sp) -/* A474B8 80240558 8E2300D0 */ lw $v1, 0xd0($s1) -/* A474BC 8024055C 8C630024 */ lw $v1, 0x24($v1) -/* A474C0 80240560 AFA30034 */ sw $v1, 0x34($sp) -/* A474C4 80240564 8E2300D0 */ lw $v1, 0xd0($s1) -/* A474C8 80240568 8C630028 */ lw $v1, 0x28($v1) -/* A474CC 8024056C 27B50028 */ addiu $s5, $sp, 0x28 -/* A474D0 80240570 AFA30038 */ sw $v1, 0x38($sp) -/* A474D4 80240574 8E2300D0 */ lw $v1, 0xd0($s1) -/* A474D8 80240578 3C0142C8 */ lui $at, 0x42c8 -/* A474DC 8024057C 44810000 */ mtc1 $at, $f0 -/* A474E0 80240580 8C63002C */ lw $v1, 0x2c($v1) -/* A474E4 80240584 0040A02D */ daddu $s4, $v0, $zero -/* A474E8 80240588 E7A00040 */ swc1 $f0, 0x40($sp) -/* A474EC 8024058C A7A00044 */ sh $zero, 0x44($sp) -/* A474F0 80240590 12000009 */ beqz $s0, .L802405B8 -/* A474F4 80240594 AFA3003C */ sw $v1, 0x3c($sp) -/* A474F8 80240598 864300A8 */ lh $v1, 0xa8($s2) -/* A474FC 8024059C 8E2200B0 */ lw $v0, 0xb0($s1) -/* A47500 802405A0 AE20008C */ sw $zero, 0x8c($s1) -/* A47504 802405A4 A22000B5 */ sb $zero, 0xb5($s1) -/* A47508 802405A8 34420008 */ ori $v0, $v0, 8 -/* A4750C 802405AC AE230084 */ sw $v1, 0x84($s1) -/* A47510 802405B0 08090172 */ j .L802405C8 -/* A47514 802405B4 AE2200B0 */ sw $v0, 0xb0($s1) -.L802405B8: -/* A47518 802405B8 8E2200B0 */ lw $v0, 0xb0($s1) -/* A4751C 802405BC 30420004 */ andi $v0, $v0, 4 -/* A47520 802405C0 10400047 */ beqz $v0, .L802406E0 -/* A47524 802405C4 00000000 */ nop -.L802405C8: -/* A47528 802405C8 AE600070 */ sw $zero, 0x70($s3) -/* A4752C 802405CC A640008E */ sh $zero, 0x8e($s2) -/* A47530 802405D0 8E2300CC */ lw $v1, 0xcc($s1) -/* A47534 802405D4 2404F7FF */ addiu $a0, $zero, -0x801 -/* A47538 802405D8 A2200007 */ sb $zero, 7($s1) -/* A4753C 802405DC 8E420000 */ lw $v0, ($s2) -/* A47540 802405E0 8C630000 */ lw $v1, ($v1) -/* A47544 802405E4 00441024 */ and $v0, $v0, $a0 -/* A47548 802405E8 AE420000 */ sw $v0, ($s2) -/* A4754C 802405EC AE430028 */ sw $v1, 0x28($s2) -/* A47550 802405F0 96220086 */ lhu $v0, 0x86($s1) -/* A47554 802405F4 A64200A8 */ sh $v0, 0xa8($s2) -/* A47558 802405F8 8E2200D0 */ lw $v0, 0xd0($s1) -/* A4755C 802405FC AE200090 */ sw $zero, 0x90($s1) -/* A47560 80240600 8C420034 */ lw $v0, 0x34($v0) -/* A47564 80240604 14400006 */ bnez $v0, .L80240620 -/* A47568 80240608 2403FDFF */ addiu $v1, $zero, -0x201 -/* A4756C 8024060C 8E420000 */ lw $v0, ($s2) -/* A47570 80240610 2403FFF7 */ addiu $v1, $zero, -9 -/* A47574 80240614 34420200 */ ori $v0, $v0, 0x200 -/* A47578 80240618 0809018B */ j .L8024062C -/* A4757C 8024061C 00431024 */ and $v0, $v0, $v1 -.L80240620: -/* A47580 80240620 8E420000 */ lw $v0, ($s2) -/* A47584 80240624 00431024 */ and $v0, $v0, $v1 -/* A47588 80240628 34420008 */ ori $v0, $v0, 8 -.L8024062C: -/* A4758C 8024062C AE420000 */ sw $v0, ($s2) -/* A47590 80240630 8E2200B0 */ lw $v0, 0xb0($s1) -/* A47594 80240634 30420004 */ andi $v0, $v0, 4 -/* A47598 80240638 1040001E */ beqz $v0, .L802406B4 -/* A4759C 8024063C 24040002 */ addiu $a0, $zero, 2 -/* A475A0 80240640 0240282D */ daddu $a1, $s2, $zero -/* A475A4 80240644 0000302D */ daddu $a2, $zero, $zero -/* A475A8 80240648 24020063 */ addiu $v0, $zero, 0x63 -/* A475AC 8024064C AE620070 */ sw $v0, 0x70($s3) -/* A475B0 80240650 AE600074 */ sw $zero, 0x74($s3) -/* A475B4 80240654 864300A8 */ lh $v1, 0xa8($s2) -/* A475B8 80240658 3C013F80 */ lui $at, 0x3f80 -/* A475BC 8024065C 44810000 */ mtc1 $at, $f0 -/* A475C0 80240660 3C014000 */ lui $at, 0x4000 -/* A475C4 80240664 44811000 */ mtc1 $at, $f2 -/* A475C8 80240668 3C01C1A0 */ lui $at, 0xc1a0 -/* A475CC 8024066C 44812000 */ mtc1 $at, $f4 -/* A475D0 80240670 24020028 */ addiu $v0, $zero, 0x28 -/* A475D4 80240674 AFA2001C */ sw $v0, 0x1c($sp) -/* A475D8 80240678 44833000 */ mtc1 $v1, $f6 -/* A475DC 8024067C 00000000 */ nop -/* A475E0 80240680 468031A0 */ cvt.s.w $f6, $f6 -/* A475E4 80240684 44073000 */ mfc1 $a3, $f6 -/* A475E8 80240688 27A20048 */ addiu $v0, $sp, 0x48 -/* A475EC 8024068C AFA20020 */ sw $v0, 0x20($sp) -/* A475F0 80240690 E7A00010 */ swc1 $f0, 0x10($sp) -/* A475F4 80240694 E7A20014 */ swc1 $f2, 0x14($sp) -/* A475F8 80240698 0C01BFA4 */ jal fx_emote -/* A475FC 8024069C E7A40018 */ swc1 $f4, 0x18($sp) -/* A47600 802406A0 8E2200B0 */ lw $v0, 0xb0($s1) -/* A47604 802406A4 2403FFFB */ addiu $v1, $zero, -5 -/* A47608 802406A8 00431024 */ and $v0, $v0, $v1 -/* A4760C 802406AC 080901B8 */ j .L802406E0 -/* A47610 802406B0 AE2200B0 */ sw $v0, 0xb0($s1) -.L802406B4: -/* A47614 802406B4 8E220000 */ lw $v0, ($s1) -/* A47618 802406B8 3C034000 */ lui $v1, 0x4000 -/* A4761C 802406BC 00431024 */ and $v0, $v0, $v1 -/* A47620 802406C0 10400007 */ beqz $v0, .L802406E0 -/* A47624 802406C4 3C03BFFF */ lui $v1, 0xbfff -/* A47628 802406C8 2402000C */ addiu $v0, $zero, 0xc -/* A4762C 802406CC AE620070 */ sw $v0, 0x70($s3) -/* A47630 802406D0 8E220000 */ lw $v0, ($s1) -/* A47634 802406D4 3463FFFF */ ori $v1, $v1, 0xffff -/* A47638 802406D8 00431024 */ and $v0, $v0, $v1 -/* A4763C 802406DC AE220000 */ sw $v0, ($s1) -.L802406E0: -/* A47640 802406E0 8E220090 */ lw $v0, 0x90($s1) -/* A47644 802406E4 1840000C */ blez $v0, .L80240718 -/* A47648 802406E8 2442FFFF */ addiu $v0, $v0, -1 -/* A4764C 802406EC 14400087 */ bnez $v0, .L8024090C_A4786C -/* A47650 802406F0 AE220090 */ sw $v0, 0x90($s1) -/* A47654 802406F4 3C03FFAA */ lui $v1, 0xffaa -/* A47658 802406F8 8E420028 */ lw $v0, 0x28($s2) -/* A4765C 802406FC 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* A47660 80240700 00431021 */ addu $v0, $v0, $v1 -/* A47664 80240704 2C420002 */ sltiu $v0, $v0, 2 -/* A47668 80240708 10400003 */ beqz $v0, .L80240718 -/* A4766C 8024070C 3C020055 */ lui $v0, 0x55 -/* A47670 80240710 3442000C */ ori $v0, $v0, 0xc -/* A47674 80240714 AE420028 */ sw $v0, 0x28($s2) -.L80240718: -/* A47678 80240718 8E630070 */ lw $v1, 0x70($s3) -/* A4767C 8024071C 2402000C */ addiu $v0, $zero, 0xc -/* A47680 80240720 10620048 */ beq $v1, $v0, .L80240844 -/* A47684 80240724 2862000D */ slti $v0, $v1, 0xd -/* A47688 80240728 1040000F */ beqz $v0, .L80240768 -/* A4768C 8024072C 24100001 */ addiu $s0, $zero, 1 -/* A47690 80240730 1070001E */ beq $v1, $s0, .L802407AC -/* A47694 80240734 28620002 */ slti $v0, $v1, 2 -/* A47698 80240738 10400005 */ beqz $v0, .L80240750 -/* A4769C 8024073C 24020002 */ addiu $v0, $zero, 2 -/* A476A0 80240740 10600015 */ beqz $v1, .L80240798 -/* A476A4 80240744 0260202D */ daddu $a0, $s3, $zero -/* A476A8 80240748 08090228 */ j .L802408A0 -/* A476AC 8024074C 00000000 */ nop -.L80240750: -/* A476B0 80240750 1062001C */ beq $v1, $v0, .L802407C4 -/* A476B4 80240754 24020003 */ addiu $v0, $zero, 3 -/* A476B8 80240758 10620035 */ beq $v1, $v0, .L80240830 -/* A476BC 8024075C 0260202D */ daddu $a0, $s3, $zero -/* A476C0 80240760 08090228 */ j .L802408A0 -/* A476C4 80240764 00000000 */ nop -.L80240768: -/* A476C8 80240768 2402000E */ addiu $v0, $zero, 0xe -/* A476CC 8024076C 1062003F */ beq $v1, $v0, .L8024086C -/* A476D0 80240770 0062102A */ slt $v0, $v1, $v0 -/* A476D4 80240774 14400038 */ bnez $v0, .L80240858 -/* A476D8 80240778 0260202D */ daddu $a0, $s3, $zero -/* A476DC 8024077C 2402000F */ addiu $v0, $zero, 0xf -/* A476E0 80240780 10620040 */ beq $v1, $v0, .L80240884 -/* A476E4 80240784 24020063 */ addiu $v0, $zero, 0x63 -/* A476E8 80240788 10620043 */ beq $v1, $v0, .L80240898 -/* A476EC 8024078C 00000000 */ nop -/* A476F0 80240790 08090228 */ j .L802408A0 -/* A476F4 80240794 00000000 */ nop -.L80240798: -/* A476F8 80240798 0280282D */ daddu $a1, $s4, $zero -/* A476FC 8024079C 0C012568 */ jal func_800495A0 -/* A47700 802407A0 02A0302D */ daddu $a2, $s5, $zero -/* A47704 802407A4 96220086 */ lhu $v0, 0x86($s1) -/* A47708 802407A8 A64200A8 */ sh $v0, 0xa8($s2) -.L802407AC: -/* A4770C 802407AC 0260202D */ daddu $a0, $s3, $zero -/* A47710 802407B0 0280282D */ daddu $a1, $s4, $zero -/* A47714 802407B4 0C0125AE */ jal func_800496B8 -/* A47718 802407B8 02A0302D */ daddu $a2, $s5, $zero -/* A4771C 802407BC 08090228 */ j .L802408A0 -/* A47720 802407C0 00000000 */ nop -.L802407C4: -/* A47724 802407C4 0260202D */ daddu $a0, $s3, $zero -/* A47728 802407C8 0280282D */ daddu $a1, $s4, $zero -/* A4772C 802407CC 0C0126D1 */ jal base_UnkNpcAIFunc1 -/* A47730 802407D0 02A0302D */ daddu $a2, $s5, $zero -/* A47734 802407D4 8E230088 */ lw $v1, 0x88($s1) -/* A47738 802407D8 24020006 */ addiu $v0, $zero, 6 -/* A4773C 802407DC 14620014 */ bne $v1, $v0, .L80240830 -/* A47740 802407E0 0260202D */ daddu $a0, $s3, $zero -/* A47744 802407E4 0C00A67F */ jal rand_int -/* A47748 802407E8 24040064 */ addiu $a0, $zero, 0x64 -/* A4774C 802407EC 28420021 */ slti $v0, $v0, 0x21 -/* A47750 802407F0 5040000F */ beql $v0, $zero, .L80240830 -/* A47754 802407F4 0260202D */ daddu $a0, $s3, $zero -/* A47758 802407F8 8E22008C */ lw $v0, 0x8c($s1) -/* A4775C 802407FC 10400005 */ beqz $v0, .L80240814 -/* A47760 80240800 3C020055 */ lui $v0, 0x55 -/* A47764 80240804 3442002F */ ori $v0, $v0, 0x2f -/* A47768 80240808 AE20008C */ sw $zero, 0x8c($s1) -/* A4776C 8024080C 08090208 */ j .L80240820 -/* A47770 80240810 A22000B5 */ sb $zero, 0xb5($s1) -.L80240814: -/* A47774 80240814 3442002E */ ori $v0, $v0, 0x2e -/* A47778 80240818 AE30008C */ sw $s0, 0x8c($s1) -/* A4777C 8024081C A23000B5 */ sb $s0, 0xb5($s1) -.L80240820: -/* A47780 80240820 AE420028 */ sw $v0, 0x28($s2) -/* A47784 80240824 24020007 */ addiu $v0, $zero, 7 -/* A47788 80240828 08090243 */ j .L8024090C_A4786C -/* A4778C 8024082C AE220090 */ sw $v0, 0x90($s1) -.L80240830: -/* A47790 80240830 0280282D */ daddu $a1, $s4, $zero -/* A47794 80240834 0C012701 */ jal func_80049C04 -/* A47798 80240838 02A0302D */ daddu $a2, $s5, $zero -/* A4779C 8024083C 08090228 */ j .L802408A0 -/* A477A0 80240840 00000000 */ nop -.L80240844: -/* A477A4 80240844 0260202D */ daddu $a0, $s3, $zero -/* A477A8 80240848 0280282D */ daddu $a1, $s4, $zero -/* A477AC 8024084C 0C090058 */ jal kpa_01_set_script_owner_npc_anim -/* A477B0 80240850 02A0302D */ daddu $a2, $s5, $zero -/* A477B4 80240854 0260202D */ daddu $a0, $s3, $zero -.L80240858: -/* A477B8 80240858 0280282D */ daddu $a1, $s4, $zero -/* A477BC 8024085C 0C090077 */ jal kpa_01_UnkDistFunc -/* A477C0 80240860 02A0302D */ daddu $a2, $s5, $zero -/* A477C4 80240864 08090228 */ j .L802408A0 -/* A477C8 80240868 00000000 */ nop -.L8024086C: -/* A477CC 8024086C 0260202D */ daddu $a0, $s3, $zero -/* A477D0 80240870 0280282D */ daddu $a1, $s4, $zero -/* A477D4 80240874 0C0900C4 */ jal kpa_01_UnkNpcAIFunc12 -/* A477D8 80240878 02A0302D */ daddu $a2, $s5, $zero -/* A477DC 8024087C 08090228 */ j .L802408A0 -/* A477E0 80240880 00000000 */ nop -.L80240884: -/* A477E4 80240884 0280282D */ daddu $a1, $s4, $zero -/* A477E8 80240888 0C09011D */ jal kpa_01_set_script_owner_npc_col_height -/* A477EC 8024088C 02A0302D */ daddu $a2, $s5, $zero -/* A477F0 80240890 08090228 */ j .L802408A0 -/* A477F4 80240894 00000000 */ nop -.L80240898: -/* A477F8 80240898 0C0129CF */ jal func_8004A73C -/* A477FC 8024089C 0260202D */ daddu $a0, $s3, $zero -.L802408A0: -/* A47800 802408A0 8E230088 */ lw $v1, 0x88($s1) -/* A47804 802408A4 24020006 */ addiu $v0, $zero, 6 -/* A47808 802408A8 14620019 */ bne $v1, $v0, .L80240910 -/* A4780C 802408AC 0000102D */ daddu $v0, $zero, $zero -/* A47810 802408B0 8E22008C */ lw $v0, 0x8c($s1) -/* A47814 802408B4 10400003 */ beqz $v0, .L802408C4 -/* A47818 802408B8 24020001 */ addiu $v0, $zero, 1 -/* A4781C 802408BC 08090232 */ j .L802408C8 -/* A47820 802408C0 A22200B5 */ sb $v0, 0xb5($s1) -.L802408C4: -/* A47824 802408C4 A22000B5 */ sb $zero, 0xb5($s1) -.L802408C8: -/* A47828 802408C8 8E22008C */ lw $v0, 0x8c($s1) -/* A4782C 802408CC 1040000F */ beqz $v0, .L8024090C_A4786C -/* A47830 802408D0 3C03FFAA */ lui $v1, 0xffaa -/* A47834 802408D4 8E420028 */ lw $v0, 0x28($s2) -/* A47838 802408D8 3463FFFC */ ori $v1, $v1, 0xfffc -/* A4783C 802408DC 00431821 */ addu $v1, $v0, $v1 -/* A47840 802408E0 2C620015 */ sltiu $v0, $v1, 0x15 -/* A47844 802408E4 10400009 */ beqz $v0, .L8024090C_A4786C -/* A47848 802408E8 00031080 */ sll $v0, $v1, 2 -/* A4784C 802408EC 3C018024 */ lui $at, %hi(jtbl_80241608_A48568) -/* A47850 802408F0 00220821 */ addu $at, $at, $v0 -/* A47854 802408F4 8C221608 */ lw $v0, %lo(jtbl_80241608_A48568)($at) -/* A47858 802408F8 00400008 */ jr $v0 -/* A4785C 802408FC 00000000 */ nop -.L80240900_A47860: -/* A47860 80240900 8E420028 */ lw $v0, 0x28($s2) -/* A47864 80240904 24420001 */ addiu $v0, $v0, 1 -/* A47868 80240908 AE420028 */ sw $v0, 0x28($s2) -.L8024090C_A4786C: -/* A4786C 8024090C 0000102D */ daddu $v0, $zero, $zero -.L80240910: -/* A47870 80240910 8FBF0068 */ lw $ra, 0x68($sp) -/* A47874 80240914 8FB50064 */ lw $s5, 0x64($sp) -/* A47878 80240918 8FB40060 */ lw $s4, 0x60($sp) -/* A4787C 8024091C 8FB3005C */ lw $s3, 0x5c($sp) -/* A47880 80240920 8FB20058 */ lw $s2, 0x58($sp) -/* A47884 80240924 8FB10054 */ lw $s1, 0x54($sp) -/* A47888 80240928 8FB00050 */ lw $s0, 0x50($sp) -/* A4788C 8024092C 03E00008 */ jr $ra -/* A47890 80240930 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802404F4_A48AB4.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802404F4_A48AB4.s deleted file mode 100644 index ecef5a99bc..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802404F4_A48AB4.s +++ /dev/null @@ -1,309 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80243888_A4BE48 -.word .L80240900_A48EC0, .L8024090C_A48ECC, .L8024090C_A48ECC, .L8024090C_A48ECC, .L8024090C_A48ECC, .L8024090C_A48ECC, .L8024090C_A48ECC, .L8024090C_A48ECC, .L80240900_A48EC0, .L8024090C_A48ECC, .L80240900_A48EC0, .L8024090C_A48ECC, .L80240900_A48EC0, .L8024090C_A48ECC, .L80240900_A48EC0, .L8024090C_A48ECC, .L8024090C_A48ECC, .L8024090C_A48ECC, .L80240900_A48EC0, .L8024090C_A48ECC, .L80240900_A48EC0, 0 - -.section .text - -glabel func_802404F4_A48AB4 -/* A48AB4 802404F4 27BDFF90 */ addiu $sp, $sp, -0x70 -/* A48AB8 802404F8 AFB3005C */ sw $s3, 0x5c($sp) -/* A48ABC 802404FC 0080982D */ daddu $s3, $a0, $zero -/* A48AC0 80240500 AFBF0068 */ sw $ra, 0x68($sp) -/* A48AC4 80240504 AFB50064 */ sw $s5, 0x64($sp) -/* A48AC8 80240508 AFB40060 */ sw $s4, 0x60($sp) -/* A48ACC 8024050C AFB20058 */ sw $s2, 0x58($sp) -/* A48AD0 80240510 AFB10054 */ sw $s1, 0x54($sp) -/* A48AD4 80240514 AFB00050 */ sw $s0, 0x50($sp) -/* A48AD8 80240518 8E710148 */ lw $s1, 0x148($s3) -/* A48ADC 8024051C 86240008 */ lh $a0, 8($s1) -/* A48AE0 80240520 0C00EABB */ jal get_npc_unsafe -/* A48AE4 80240524 00A0802D */ daddu $s0, $a1, $zero -/* A48AE8 80240528 8E63000C */ lw $v1, 0xc($s3) -/* A48AEC 8024052C 0260202D */ daddu $a0, $s3, $zero -/* A48AF0 80240530 8C650000 */ lw $a1, ($v1) -/* A48AF4 80240534 0C0B1EAF */ jal evt_get_variable -/* A48AF8 80240538 0040902D */ daddu $s2, $v0, $zero -/* A48AFC 8024053C AFA00028 */ sw $zero, 0x28($sp) -/* A48B00 80240540 8E2300D0 */ lw $v1, 0xd0($s1) -/* A48B04 80240544 8C630030 */ lw $v1, 0x30($v1) -/* A48B08 80240548 AFA3002C */ sw $v1, 0x2c($sp) -/* A48B0C 8024054C 8E2300D0 */ lw $v1, 0xd0($s1) -/* A48B10 80240550 8C63001C */ lw $v1, 0x1c($v1) -/* A48B14 80240554 AFA30030 */ sw $v1, 0x30($sp) -/* A48B18 80240558 8E2300D0 */ lw $v1, 0xd0($s1) -/* A48B1C 8024055C 8C630024 */ lw $v1, 0x24($v1) -/* A48B20 80240560 AFA30034 */ sw $v1, 0x34($sp) -/* A48B24 80240564 8E2300D0 */ lw $v1, 0xd0($s1) -/* A48B28 80240568 8C630028 */ lw $v1, 0x28($v1) -/* A48B2C 8024056C 27B50028 */ addiu $s5, $sp, 0x28 -/* A48B30 80240570 AFA30038 */ sw $v1, 0x38($sp) -/* A48B34 80240574 8E2300D0 */ lw $v1, 0xd0($s1) -/* A48B38 80240578 3C0142C8 */ lui $at, 0x42c8 -/* A48B3C 8024057C 44810000 */ mtc1 $at, $f0 -/* A48B40 80240580 8C63002C */ lw $v1, 0x2c($v1) -/* A48B44 80240584 0040A02D */ daddu $s4, $v0, $zero -/* A48B48 80240588 E7A00040 */ swc1 $f0, 0x40($sp) -/* A48B4C 8024058C A7A00044 */ sh $zero, 0x44($sp) -/* A48B50 80240590 12000009 */ beqz $s0, .L802405B8 -/* A48B54 80240594 AFA3003C */ sw $v1, 0x3c($sp) -/* A48B58 80240598 864300A8 */ lh $v1, 0xa8($s2) -/* A48B5C 8024059C 8E2200B0 */ lw $v0, 0xb0($s1) -/* A48B60 802405A0 AE20008C */ sw $zero, 0x8c($s1) -/* A48B64 802405A4 A22000B5 */ sb $zero, 0xb5($s1) -/* A48B68 802405A8 34420008 */ ori $v0, $v0, 8 -/* A48B6C 802405AC AE230084 */ sw $v1, 0x84($s1) -/* A48B70 802405B0 08090172 */ j .L802405C8 -/* A48B74 802405B4 AE2200B0 */ sw $v0, 0xb0($s1) -.L802405B8: -/* A48B78 802405B8 8E2200B0 */ lw $v0, 0xb0($s1) -/* A48B7C 802405BC 30420004 */ andi $v0, $v0, 4 -/* A48B80 802405C0 10400047 */ beqz $v0, .L802406E0 -/* A48B84 802405C4 00000000 */ nop -.L802405C8: -/* A48B88 802405C8 AE600070 */ sw $zero, 0x70($s3) -/* A48B8C 802405CC A640008E */ sh $zero, 0x8e($s2) -/* A48B90 802405D0 8E2300CC */ lw $v1, 0xcc($s1) -/* A48B94 802405D4 2404F7FF */ addiu $a0, $zero, -0x801 -/* A48B98 802405D8 A2200007 */ sb $zero, 7($s1) -/* A48B9C 802405DC 8E420000 */ lw $v0, ($s2) -/* A48BA0 802405E0 8C630000 */ lw $v1, ($v1) -/* A48BA4 802405E4 00441024 */ and $v0, $v0, $a0 -/* A48BA8 802405E8 AE420000 */ sw $v0, ($s2) -/* A48BAC 802405EC AE430028 */ sw $v1, 0x28($s2) -/* A48BB0 802405F0 96220086 */ lhu $v0, 0x86($s1) -/* A48BB4 802405F4 A64200A8 */ sh $v0, 0xa8($s2) -/* A48BB8 802405F8 8E2200D0 */ lw $v0, 0xd0($s1) -/* A48BBC 802405FC AE200090 */ sw $zero, 0x90($s1) -/* A48BC0 80240600 8C420034 */ lw $v0, 0x34($v0) -/* A48BC4 80240604 14400006 */ bnez $v0, .L80240620 -/* A48BC8 80240608 2403FDFF */ addiu $v1, $zero, -0x201 -/* A48BCC 8024060C 8E420000 */ lw $v0, ($s2) -/* A48BD0 80240610 2403FFF7 */ addiu $v1, $zero, -9 -/* A48BD4 80240614 34420200 */ ori $v0, $v0, 0x200 -/* A48BD8 80240618 0809018B */ j .L8024062C -/* A48BDC 8024061C 00431024 */ and $v0, $v0, $v1 -.L80240620: -/* A48BE0 80240620 8E420000 */ lw $v0, ($s2) -/* A48BE4 80240624 00431024 */ and $v0, $v0, $v1 -/* A48BE8 80240628 34420008 */ ori $v0, $v0, 8 -.L8024062C: -/* A48BEC 8024062C AE420000 */ sw $v0, ($s2) -/* A48BF0 80240630 8E2200B0 */ lw $v0, 0xb0($s1) -/* A48BF4 80240634 30420004 */ andi $v0, $v0, 4 -/* A48BF8 80240638 1040001E */ beqz $v0, .L802406B4 -/* A48BFC 8024063C 24040002 */ addiu $a0, $zero, 2 -/* A48C00 80240640 0240282D */ daddu $a1, $s2, $zero -/* A48C04 80240644 0000302D */ daddu $a2, $zero, $zero -/* A48C08 80240648 24020063 */ addiu $v0, $zero, 0x63 -/* A48C0C 8024064C AE620070 */ sw $v0, 0x70($s3) -/* A48C10 80240650 AE600074 */ sw $zero, 0x74($s3) -/* A48C14 80240654 864300A8 */ lh $v1, 0xa8($s2) -/* A48C18 80240658 3C013F80 */ lui $at, 0x3f80 -/* A48C1C 8024065C 44810000 */ mtc1 $at, $f0 -/* A48C20 80240660 3C014000 */ lui $at, 0x4000 -/* A48C24 80240664 44811000 */ mtc1 $at, $f2 -/* A48C28 80240668 3C01C1A0 */ lui $at, 0xc1a0 -/* A48C2C 8024066C 44812000 */ mtc1 $at, $f4 -/* A48C30 80240670 24020028 */ addiu $v0, $zero, 0x28 -/* A48C34 80240674 AFA2001C */ sw $v0, 0x1c($sp) -/* A48C38 80240678 44833000 */ mtc1 $v1, $f6 -/* A48C3C 8024067C 00000000 */ nop -/* A48C40 80240680 468031A0 */ cvt.s.w $f6, $f6 -/* A48C44 80240684 44073000 */ mfc1 $a3, $f6 -/* A48C48 80240688 27A20048 */ addiu $v0, $sp, 0x48 -/* A48C4C 8024068C AFA20020 */ sw $v0, 0x20($sp) -/* A48C50 80240690 E7A00010 */ swc1 $f0, 0x10($sp) -/* A48C54 80240694 E7A20014 */ swc1 $f2, 0x14($sp) -/* A48C58 80240698 0C01BFA4 */ jal fx_emote -/* A48C5C 8024069C E7A40018 */ swc1 $f4, 0x18($sp) -/* A48C60 802406A0 8E2200B0 */ lw $v0, 0xb0($s1) -/* A48C64 802406A4 2403FFFB */ addiu $v1, $zero, -5 -/* A48C68 802406A8 00431024 */ and $v0, $v0, $v1 -/* A48C6C 802406AC 080901B8 */ j .L802406E0 -/* A48C70 802406B0 AE2200B0 */ sw $v0, 0xb0($s1) -.L802406B4: -/* A48C74 802406B4 8E220000 */ lw $v0, ($s1) -/* A48C78 802406B8 3C034000 */ lui $v1, 0x4000 -/* A48C7C 802406BC 00431024 */ and $v0, $v0, $v1 -/* A48C80 802406C0 10400007 */ beqz $v0, .L802406E0 -/* A48C84 802406C4 3C03BFFF */ lui $v1, 0xbfff -/* A48C88 802406C8 2402000C */ addiu $v0, $zero, 0xc -/* A48C8C 802406CC AE620070 */ sw $v0, 0x70($s3) -/* A48C90 802406D0 8E220000 */ lw $v0, ($s1) -/* A48C94 802406D4 3463FFFF */ ori $v1, $v1, 0xffff -/* A48C98 802406D8 00431024 */ and $v0, $v0, $v1 -/* A48C9C 802406DC AE220000 */ sw $v0, ($s1) -.L802406E0: -/* A48CA0 802406E0 8E220090 */ lw $v0, 0x90($s1) -/* A48CA4 802406E4 1840000C */ blez $v0, .L80240718 -/* A48CA8 802406E8 2442FFFF */ addiu $v0, $v0, -1 -/* A48CAC 802406EC 14400087 */ bnez $v0, .L8024090C_A48ECC -/* A48CB0 802406F0 AE220090 */ sw $v0, 0x90($s1) -/* A48CB4 802406F4 3C03FFAA */ lui $v1, 0xffaa -/* A48CB8 802406F8 8E420028 */ lw $v0, 0x28($s2) -/* A48CBC 802406FC 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* A48CC0 80240700 00431021 */ addu $v0, $v0, $v1 -/* A48CC4 80240704 2C420002 */ sltiu $v0, $v0, 2 -/* A48CC8 80240708 10400003 */ beqz $v0, .L80240718 -/* A48CCC 8024070C 3C020055 */ lui $v0, 0x55 -/* A48CD0 80240710 3442000C */ ori $v0, $v0, 0xc -/* A48CD4 80240714 AE420028 */ sw $v0, 0x28($s2) -.L80240718: -/* A48CD8 80240718 8E630070 */ lw $v1, 0x70($s3) -/* A48CDC 8024071C 2402000C */ addiu $v0, $zero, 0xc -/* A48CE0 80240720 10620048 */ beq $v1, $v0, .L80240844 -/* A48CE4 80240724 2862000D */ slti $v0, $v1, 0xd -/* A48CE8 80240728 1040000F */ beqz $v0, .L80240768 -/* A48CEC 8024072C 24100001 */ addiu $s0, $zero, 1 -/* A48CF0 80240730 1070001E */ beq $v1, $s0, .L802407AC -/* A48CF4 80240734 28620002 */ slti $v0, $v1, 2 -/* A48CF8 80240738 10400005 */ beqz $v0, .L80240750 -/* A48CFC 8024073C 24020002 */ addiu $v0, $zero, 2 -/* A48D00 80240740 10600015 */ beqz $v1, .L80240798 -/* A48D04 80240744 0260202D */ daddu $a0, $s3, $zero -/* A48D08 80240748 08090228 */ j .L802408A0 -/* A48D0C 8024074C 00000000 */ nop -.L80240750: -/* A48D10 80240750 1062001C */ beq $v1, $v0, .L802407C4 -/* A48D14 80240754 24020003 */ addiu $v0, $zero, 3 -/* A48D18 80240758 10620035 */ beq $v1, $v0, .L80240830 -/* A48D1C 8024075C 0260202D */ daddu $a0, $s3, $zero -/* A48D20 80240760 08090228 */ j .L802408A0 -/* A48D24 80240764 00000000 */ nop -.L80240768: -/* A48D28 80240768 2402000E */ addiu $v0, $zero, 0xe -/* A48D2C 8024076C 1062003F */ beq $v1, $v0, .L8024086C -/* A48D30 80240770 0062102A */ slt $v0, $v1, $v0 -/* A48D34 80240774 14400038 */ bnez $v0, .L80240858 -/* A48D38 80240778 0260202D */ daddu $a0, $s3, $zero -/* A48D3C 8024077C 2402000F */ addiu $v0, $zero, 0xf -/* A48D40 80240780 10620040 */ beq $v1, $v0, .L80240884 -/* A48D44 80240784 24020063 */ addiu $v0, $zero, 0x63 -/* A48D48 80240788 10620043 */ beq $v1, $v0, .L80240898 -/* A48D4C 8024078C 00000000 */ nop -/* A48D50 80240790 08090228 */ j .L802408A0 -/* A48D54 80240794 00000000 */ nop -.L80240798: -/* A48D58 80240798 0280282D */ daddu $a1, $s4, $zero -/* A48D5C 8024079C 0C012568 */ jal func_800495A0 -/* A48D60 802407A0 02A0302D */ daddu $a2, $s5, $zero -/* A48D64 802407A4 96220086 */ lhu $v0, 0x86($s1) -/* A48D68 802407A8 A64200A8 */ sh $v0, 0xa8($s2) -.L802407AC: -/* A48D6C 802407AC 0260202D */ daddu $a0, $s3, $zero -/* A48D70 802407B0 0280282D */ daddu $a1, $s4, $zero -/* A48D74 802407B4 0C0125AE */ jal func_800496B8 -/* A48D78 802407B8 02A0302D */ daddu $a2, $s5, $zero -/* A48D7C 802407BC 08090228 */ j .L802408A0 -/* A48D80 802407C0 00000000 */ nop -.L802407C4: -/* A48D84 802407C4 0260202D */ daddu $a0, $s3, $zero -/* A48D88 802407C8 0280282D */ daddu $a1, $s4, $zero -/* A48D8C 802407CC 0C0126D1 */ jal base_UnkNpcAIFunc1 -/* A48D90 802407D0 02A0302D */ daddu $a2, $s5, $zero -/* A48D94 802407D4 8E230088 */ lw $v1, 0x88($s1) -/* A48D98 802407D8 24020006 */ addiu $v0, $zero, 6 -/* A48D9C 802407DC 14620014 */ bne $v1, $v0, .L80240830 -/* A48DA0 802407E0 0260202D */ daddu $a0, $s3, $zero -/* A48DA4 802407E4 0C00A67F */ jal rand_int -/* A48DA8 802407E8 24040064 */ addiu $a0, $zero, 0x64 -/* A48DAC 802407EC 28420021 */ slti $v0, $v0, 0x21 -/* A48DB0 802407F0 5040000F */ beql $v0, $zero, .L80240830 -/* A48DB4 802407F4 0260202D */ daddu $a0, $s3, $zero -/* A48DB8 802407F8 8E22008C */ lw $v0, 0x8c($s1) -/* A48DBC 802407FC 10400005 */ beqz $v0, .L80240814 -/* A48DC0 80240800 3C020055 */ lui $v0, 0x55 -/* A48DC4 80240804 3442002F */ ori $v0, $v0, 0x2f -/* A48DC8 80240808 AE20008C */ sw $zero, 0x8c($s1) -/* A48DCC 8024080C 08090208 */ j .L80240820 -/* A48DD0 80240810 A22000B5 */ sb $zero, 0xb5($s1) -.L80240814: -/* A48DD4 80240814 3442002E */ ori $v0, $v0, 0x2e -/* A48DD8 80240818 AE30008C */ sw $s0, 0x8c($s1) -/* A48DDC 8024081C A23000B5 */ sb $s0, 0xb5($s1) -.L80240820: -/* A48DE0 80240820 AE420028 */ sw $v0, 0x28($s2) -/* A48DE4 80240824 24020007 */ addiu $v0, $zero, 7 -/* A48DE8 80240828 08090243 */ j .L8024090C_A48ECC -/* A48DEC 8024082C AE220090 */ sw $v0, 0x90($s1) -.L80240830: -/* A48DF0 80240830 0280282D */ daddu $a1, $s4, $zero -/* A48DF4 80240834 0C012701 */ jal func_80049C04 -/* A48DF8 80240838 02A0302D */ daddu $a2, $s5, $zero -/* A48DFC 8024083C 08090228 */ j .L802408A0 -/* A48E00 80240840 00000000 */ nop -.L80240844: -/* A48E04 80240844 0260202D */ daddu $a0, $s3, $zero -/* A48E08 80240848 0280282D */ daddu $a1, $s4, $zero -/* A48E0C 8024084C 0C090058 */ jal kpa_03_set_script_owner_npc_anim -/* A48E10 80240850 02A0302D */ daddu $a2, $s5, $zero -/* A48E14 80240854 0260202D */ daddu $a0, $s3, $zero -.L80240858: -/* A48E18 80240858 0280282D */ daddu $a1, $s4, $zero -/* A48E1C 8024085C 0C090077 */ jal kpa_03_UnkDistFunc -/* A48E20 80240860 02A0302D */ daddu $a2, $s5, $zero -/* A48E24 80240864 08090228 */ j .L802408A0 -/* A48E28 80240868 00000000 */ nop -.L8024086C: -/* A48E2C 8024086C 0260202D */ daddu $a0, $s3, $zero -/* A48E30 80240870 0280282D */ daddu $a1, $s4, $zero -/* A48E34 80240874 0C0900C4 */ jal kpa_03_UnkNpcAIFunc12 -/* A48E38 80240878 02A0302D */ daddu $a2, $s5, $zero -/* A48E3C 8024087C 08090228 */ j .L802408A0 -/* A48E40 80240880 00000000 */ nop -.L80240884: -/* A48E44 80240884 0280282D */ daddu $a1, $s4, $zero -/* A48E48 80240888 0C09011D */ jal kpa_03_set_script_owner_npc_col_height -/* A48E4C 8024088C 02A0302D */ daddu $a2, $s5, $zero -/* A48E50 80240890 08090228 */ j .L802408A0 -/* A48E54 80240894 00000000 */ nop -.L80240898: -/* A48E58 80240898 0C0129CF */ jal func_8004A73C -/* A48E5C 8024089C 0260202D */ daddu $a0, $s3, $zero -.L802408A0: -/* A48E60 802408A0 8E230088 */ lw $v1, 0x88($s1) -/* A48E64 802408A4 24020006 */ addiu $v0, $zero, 6 -/* A48E68 802408A8 14620019 */ bne $v1, $v0, .L80240910 -/* A48E6C 802408AC 0000102D */ daddu $v0, $zero, $zero -/* A48E70 802408B0 8E22008C */ lw $v0, 0x8c($s1) -/* A48E74 802408B4 10400003 */ beqz $v0, .L802408C4 -/* A48E78 802408B8 24020001 */ addiu $v0, $zero, 1 -/* A48E7C 802408BC 08090232 */ j .L802408C8 -/* A48E80 802408C0 A22200B5 */ sb $v0, 0xb5($s1) -.L802408C4: -/* A48E84 802408C4 A22000B5 */ sb $zero, 0xb5($s1) -.L802408C8: -/* A48E88 802408C8 8E22008C */ lw $v0, 0x8c($s1) -/* A48E8C 802408CC 1040000F */ beqz $v0, .L8024090C_A48ECC -/* A48E90 802408D0 3C03FFAA */ lui $v1, 0xffaa -/* A48E94 802408D4 8E420028 */ lw $v0, 0x28($s2) -/* A48E98 802408D8 3463FFFC */ ori $v1, $v1, 0xfffc -/* A48E9C 802408DC 00431821 */ addu $v1, $v0, $v1 -/* A48EA0 802408E0 2C620015 */ sltiu $v0, $v1, 0x15 -/* A48EA4 802408E4 10400009 */ beqz $v0, .L8024090C_A48ECC -/* A48EA8 802408E8 00031080 */ sll $v0, $v1, 2 -/* A48EAC 802408EC 3C018024 */ lui $at, %hi(jtbl_80243888_A4BE48) -/* A48EB0 802408F0 00220821 */ addu $at, $at, $v0 -/* A48EB4 802408F4 8C223888 */ lw $v0, %lo(jtbl_80243888_A4BE48)($at) -/* A48EB8 802408F8 00400008 */ jr $v0 -/* A48EBC 802408FC 00000000 */ nop -.L80240900_A48EC0: -/* A48EC0 80240900 8E420028 */ lw $v0, 0x28($s2) -/* A48EC4 80240904 24420001 */ addiu $v0, $v0, 1 -/* A48EC8 80240908 AE420028 */ sw $v0, 0x28($s2) -.L8024090C_A48ECC: -/* A48ECC 8024090C 0000102D */ daddu $v0, $zero, $zero -.L80240910: -/* A48ED0 80240910 8FBF0068 */ lw $ra, 0x68($sp) -/* A48ED4 80240914 8FB50064 */ lw $s5, 0x64($sp) -/* A48ED8 80240918 8FB40060 */ lw $s4, 0x60($sp) -/* A48EDC 8024091C 8FB3005C */ lw $s3, 0x5c($sp) -/* A48EE0 80240920 8FB20058 */ lw $s2, 0x58($sp) -/* A48EE4 80240924 8FB10054 */ lw $s1, 0x54($sp) -/* A48EE8 80240928 8FB00050 */ lw $s0, 0x50($sp) -/* A48EEC 8024092C 03E00008 */ jr $ra -/* A48EF0 80240930 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802418F0_A95030.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802418F0_A95030.s deleted file mode 100644 index 4dc3754024..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802418F0_A95030.s +++ /dev/null @@ -1,309 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80245CE0_A99420 -.word .L80241CFC_A9543C, .L80241D08_A95448, .L80241D08_A95448, .L80241D08_A95448, .L80241D08_A95448, .L80241D08_A95448, .L80241D08_A95448, .L80241D08_A95448, .L80241CFC_A9543C, .L80241D08_A95448, .L80241CFC_A9543C, .L80241D08_A95448, .L80241CFC_A9543C, .L80241D08_A95448, .L80241CFC_A9543C, .L80241D08_A95448, .L80241D08_A95448, .L80241D08_A95448, .L80241CFC_A9543C, .L80241D08_A95448, .L80241CFC_A9543C, 0 - -.section .text - -glabel func_802418F0_A95030 -/* A95030 802418F0 27BDFF90 */ addiu $sp, $sp, -0x70 -/* A95034 802418F4 AFB3005C */ sw $s3, 0x5c($sp) -/* A95038 802418F8 0080982D */ daddu $s3, $a0, $zero -/* A9503C 802418FC AFBF0068 */ sw $ra, 0x68($sp) -/* A95040 80241900 AFB50064 */ sw $s5, 0x64($sp) -/* A95044 80241904 AFB40060 */ sw $s4, 0x60($sp) -/* A95048 80241908 AFB20058 */ sw $s2, 0x58($sp) -/* A9504C 8024190C AFB10054 */ sw $s1, 0x54($sp) -/* A95050 80241910 AFB00050 */ sw $s0, 0x50($sp) -/* A95054 80241914 8E710148 */ lw $s1, 0x148($s3) -/* A95058 80241918 86240008 */ lh $a0, 8($s1) -/* A9505C 8024191C 0C00EABB */ jal get_npc_unsafe -/* A95060 80241920 00A0802D */ daddu $s0, $a1, $zero -/* A95064 80241924 8E63000C */ lw $v1, 0xc($s3) -/* A95068 80241928 0260202D */ daddu $a0, $s3, $zero -/* A9506C 8024192C 8C650000 */ lw $a1, ($v1) -/* A95070 80241930 0C0B1EAF */ jal evt_get_variable -/* A95074 80241934 0040902D */ daddu $s2, $v0, $zero -/* A95078 80241938 AFA00028 */ sw $zero, 0x28($sp) -/* A9507C 8024193C 8E2300D0 */ lw $v1, 0xd0($s1) -/* A95080 80241940 8C630030 */ lw $v1, 0x30($v1) -/* A95084 80241944 AFA3002C */ sw $v1, 0x2c($sp) -/* A95088 80241948 8E2300D0 */ lw $v1, 0xd0($s1) -/* A9508C 8024194C 8C63001C */ lw $v1, 0x1c($v1) -/* A95090 80241950 AFA30030 */ sw $v1, 0x30($sp) -/* A95094 80241954 8E2300D0 */ lw $v1, 0xd0($s1) -/* A95098 80241958 8C630024 */ lw $v1, 0x24($v1) -/* A9509C 8024195C AFA30034 */ sw $v1, 0x34($sp) -/* A950A0 80241960 8E2300D0 */ lw $v1, 0xd0($s1) -/* A950A4 80241964 8C630028 */ lw $v1, 0x28($v1) -/* A950A8 80241968 27B50028 */ addiu $s5, $sp, 0x28 -/* A950AC 8024196C AFA30038 */ sw $v1, 0x38($sp) -/* A950B0 80241970 8E2300D0 */ lw $v1, 0xd0($s1) -/* A950B4 80241974 3C0142C8 */ lui $at, 0x42c8 -/* A950B8 80241978 44810000 */ mtc1 $at, $f0 -/* A950BC 8024197C 8C63002C */ lw $v1, 0x2c($v1) -/* A950C0 80241980 0040A02D */ daddu $s4, $v0, $zero -/* A950C4 80241984 E7A00040 */ swc1 $f0, 0x40($sp) -/* A950C8 80241988 A7A00044 */ sh $zero, 0x44($sp) -/* A950CC 8024198C 12000009 */ beqz $s0, .L802419B4 -/* A950D0 80241990 AFA3003C */ sw $v1, 0x3c($sp) -/* A950D4 80241994 864300A8 */ lh $v1, 0xa8($s2) -/* A950D8 80241998 8E2200B0 */ lw $v0, 0xb0($s1) -/* A950DC 8024199C AE20008C */ sw $zero, 0x8c($s1) -/* A950E0 802419A0 A22000B5 */ sb $zero, 0xb5($s1) -/* A950E4 802419A4 34420008 */ ori $v0, $v0, 8 -/* A950E8 802419A8 AE230084 */ sw $v1, 0x84($s1) -/* A950EC 802419AC 08090671 */ j .L802419C4 -/* A950F0 802419B0 AE2200B0 */ sw $v0, 0xb0($s1) -.L802419B4: -/* A950F4 802419B4 8E2200B0 */ lw $v0, 0xb0($s1) -/* A950F8 802419B8 30420004 */ andi $v0, $v0, 4 -/* A950FC 802419BC 10400047 */ beqz $v0, .L80241ADC -/* A95100 802419C0 00000000 */ nop -.L802419C4: -/* A95104 802419C4 AE600070 */ sw $zero, 0x70($s3) -/* A95108 802419C8 A640008E */ sh $zero, 0x8e($s2) -/* A9510C 802419CC 8E2300CC */ lw $v1, 0xcc($s1) -/* A95110 802419D0 2404F7FF */ addiu $a0, $zero, -0x801 -/* A95114 802419D4 A2200007 */ sb $zero, 7($s1) -/* A95118 802419D8 8E420000 */ lw $v0, ($s2) -/* A9511C 802419DC 8C630000 */ lw $v1, ($v1) -/* A95120 802419E0 00441024 */ and $v0, $v0, $a0 -/* A95124 802419E4 AE420000 */ sw $v0, ($s2) -/* A95128 802419E8 AE430028 */ sw $v1, 0x28($s2) -/* A9512C 802419EC 96220086 */ lhu $v0, 0x86($s1) -/* A95130 802419F0 A64200A8 */ sh $v0, 0xa8($s2) -/* A95134 802419F4 8E2200D0 */ lw $v0, 0xd0($s1) -/* A95138 802419F8 AE200090 */ sw $zero, 0x90($s1) -/* A9513C 802419FC 8C420034 */ lw $v0, 0x34($v0) -/* A95140 80241A00 14400006 */ bnez $v0, .L80241A1C -/* A95144 80241A04 2403FDFF */ addiu $v1, $zero, -0x201 -/* A95148 80241A08 8E420000 */ lw $v0, ($s2) -/* A9514C 80241A0C 2403FFF7 */ addiu $v1, $zero, -9 -/* A95150 80241A10 34420200 */ ori $v0, $v0, 0x200 -/* A95154 80241A14 0809068A */ j .L80241A28 -/* A95158 80241A18 00431024 */ and $v0, $v0, $v1 -.L80241A1C: -/* A9515C 80241A1C 8E420000 */ lw $v0, ($s2) -/* A95160 80241A20 00431024 */ and $v0, $v0, $v1 -/* A95164 80241A24 34420008 */ ori $v0, $v0, 8 -.L80241A28: -/* A95168 80241A28 AE420000 */ sw $v0, ($s2) -/* A9516C 80241A2C 8E2200B0 */ lw $v0, 0xb0($s1) -/* A95170 80241A30 30420004 */ andi $v0, $v0, 4 -/* A95174 80241A34 1040001E */ beqz $v0, .L80241AB0 -/* A95178 80241A38 24040002 */ addiu $a0, $zero, 2 -/* A9517C 80241A3C 0240282D */ daddu $a1, $s2, $zero -/* A95180 80241A40 0000302D */ daddu $a2, $zero, $zero -/* A95184 80241A44 24020063 */ addiu $v0, $zero, 0x63 -/* A95188 80241A48 AE620070 */ sw $v0, 0x70($s3) -/* A9518C 80241A4C AE600074 */ sw $zero, 0x74($s3) -/* A95190 80241A50 864300A8 */ lh $v1, 0xa8($s2) -/* A95194 80241A54 3C013F80 */ lui $at, 0x3f80 -/* A95198 80241A58 44810000 */ mtc1 $at, $f0 -/* A9519C 80241A5C 3C014000 */ lui $at, 0x4000 -/* A951A0 80241A60 44811000 */ mtc1 $at, $f2 -/* A951A4 80241A64 3C01C1A0 */ lui $at, 0xc1a0 -/* A951A8 80241A68 44812000 */ mtc1 $at, $f4 -/* A951AC 80241A6C 24020028 */ addiu $v0, $zero, 0x28 -/* A951B0 80241A70 AFA2001C */ sw $v0, 0x1c($sp) -/* A951B4 80241A74 44833000 */ mtc1 $v1, $f6 -/* A951B8 80241A78 00000000 */ nop -/* A951BC 80241A7C 468031A0 */ cvt.s.w $f6, $f6 -/* A951C0 80241A80 44073000 */ mfc1 $a3, $f6 -/* A951C4 80241A84 27A20048 */ addiu $v0, $sp, 0x48 -/* A951C8 80241A88 AFA20020 */ sw $v0, 0x20($sp) -/* A951CC 80241A8C E7A00010 */ swc1 $f0, 0x10($sp) -/* A951D0 80241A90 E7A20014 */ swc1 $f2, 0x14($sp) -/* A951D4 80241A94 0C01BFA4 */ jal fx_emote -/* A951D8 80241A98 E7A40018 */ swc1 $f4, 0x18($sp) -/* A951DC 80241A9C 8E2200B0 */ lw $v0, 0xb0($s1) -/* A951E0 80241AA0 2403FFFB */ addiu $v1, $zero, -5 -/* A951E4 80241AA4 00431024 */ and $v0, $v0, $v1 -/* A951E8 80241AA8 080906B7 */ j .L80241ADC -/* A951EC 80241AAC AE2200B0 */ sw $v0, 0xb0($s1) -.L80241AB0: -/* A951F0 80241AB0 8E220000 */ lw $v0, ($s1) -/* A951F4 80241AB4 3C034000 */ lui $v1, 0x4000 -/* A951F8 80241AB8 00431024 */ and $v0, $v0, $v1 -/* A951FC 80241ABC 10400007 */ beqz $v0, .L80241ADC -/* A95200 80241AC0 3C03BFFF */ lui $v1, 0xbfff -/* A95204 80241AC4 2402000C */ addiu $v0, $zero, 0xc -/* A95208 80241AC8 AE620070 */ sw $v0, 0x70($s3) -/* A9520C 80241ACC 8E220000 */ lw $v0, ($s1) -/* A95210 80241AD0 3463FFFF */ ori $v1, $v1, 0xffff -/* A95214 80241AD4 00431024 */ and $v0, $v0, $v1 -/* A95218 80241AD8 AE220000 */ sw $v0, ($s1) -.L80241ADC: -/* A9521C 80241ADC 8E220090 */ lw $v0, 0x90($s1) -/* A95220 80241AE0 1840000C */ blez $v0, .L80241B14 -/* A95224 80241AE4 2442FFFF */ addiu $v0, $v0, -1 -/* A95228 80241AE8 14400087 */ bnez $v0, .L80241D08_A95448 -/* A9522C 80241AEC AE220090 */ sw $v0, 0x90($s1) -/* A95230 80241AF0 3C03FFAA */ lui $v1, 0xffaa -/* A95234 80241AF4 8E420028 */ lw $v0, 0x28($s2) -/* A95238 80241AF8 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* A9523C 80241AFC 00431021 */ addu $v0, $v0, $v1 -/* A95240 80241B00 2C420002 */ sltiu $v0, $v0, 2 -/* A95244 80241B04 10400003 */ beqz $v0, .L80241B14 -/* A95248 80241B08 3C020055 */ lui $v0, 0x55 -/* A9524C 80241B0C 3442000C */ ori $v0, $v0, 0xc -/* A95250 80241B10 AE420028 */ sw $v0, 0x28($s2) -.L80241B14: -/* A95254 80241B14 8E630070 */ lw $v1, 0x70($s3) -/* A95258 80241B18 2402000C */ addiu $v0, $zero, 0xc -/* A9525C 80241B1C 10620048 */ beq $v1, $v0, .L80241C40 -/* A95260 80241B20 2862000D */ slti $v0, $v1, 0xd -/* A95264 80241B24 1040000F */ beqz $v0, .L80241B64 -/* A95268 80241B28 24100001 */ addiu $s0, $zero, 1 -/* A9526C 80241B2C 1070001E */ beq $v1, $s0, .L80241BA8 -/* A95270 80241B30 28620002 */ slti $v0, $v1, 2 -/* A95274 80241B34 10400005 */ beqz $v0, .L80241B4C -/* A95278 80241B38 24020002 */ addiu $v0, $zero, 2 -/* A9527C 80241B3C 10600015 */ beqz $v1, .L80241B94 -/* A95280 80241B40 0260202D */ daddu $a0, $s3, $zero -/* A95284 80241B44 08090727 */ j .L80241C9C -/* A95288 80241B48 00000000 */ nop -.L80241B4C: -/* A9528C 80241B4C 1062001C */ beq $v1, $v0, .L80241BC0 -/* A95290 80241B50 24020003 */ addiu $v0, $zero, 3 -/* A95294 80241B54 10620035 */ beq $v1, $v0, .L80241C2C -/* A95298 80241B58 0260202D */ daddu $a0, $s3, $zero -/* A9529C 80241B5C 08090727 */ j .L80241C9C -/* A952A0 80241B60 00000000 */ nop -.L80241B64: -/* A952A4 80241B64 2402000E */ addiu $v0, $zero, 0xe -/* A952A8 80241B68 1062003F */ beq $v1, $v0, .L80241C68 -/* A952AC 80241B6C 0062102A */ slt $v0, $v1, $v0 -/* A952B0 80241B70 14400038 */ bnez $v0, .L80241C54 -/* A952B4 80241B74 0260202D */ daddu $a0, $s3, $zero -/* A952B8 80241B78 2402000F */ addiu $v0, $zero, 0xf -/* A952BC 80241B7C 10620040 */ beq $v1, $v0, .L80241C80 -/* A952C0 80241B80 24020063 */ addiu $v0, $zero, 0x63 -/* A952C4 80241B84 10620043 */ beq $v1, $v0, .L80241C94 -/* A952C8 80241B88 00000000 */ nop -/* A952CC 80241B8C 08090727 */ j .L80241C9C -/* A952D0 80241B90 00000000 */ nop -.L80241B94: -/* A952D4 80241B94 0280282D */ daddu $a1, $s4, $zero -/* A952D8 80241B98 0C012568 */ jal func_800495A0 -/* A952DC 80241B9C 02A0302D */ daddu $a2, $s5, $zero -/* A952E0 80241BA0 96220086 */ lhu $v0, 0x86($s1) -/* A952E4 80241BA4 A64200A8 */ sh $v0, 0xa8($s2) -.L80241BA8: -/* A952E8 80241BA8 0260202D */ daddu $a0, $s3, $zero -/* A952EC 80241BAC 0280282D */ daddu $a1, $s4, $zero -/* A952F0 80241BB0 0C0125AE */ jal func_800496B8 -/* A952F4 80241BB4 02A0302D */ daddu $a2, $s5, $zero -/* A952F8 80241BB8 08090727 */ j .L80241C9C -/* A952FC 80241BBC 00000000 */ nop -.L80241BC0: -/* A95300 80241BC0 0260202D */ daddu $a0, $s3, $zero -/* A95304 80241BC4 0280282D */ daddu $a1, $s4, $zero -/* A95308 80241BC8 0C0126D1 */ jal base_UnkNpcAIFunc1 -/* A9530C 80241BCC 02A0302D */ daddu $a2, $s5, $zero -/* A95310 80241BD0 8E230088 */ lw $v1, 0x88($s1) -/* A95314 80241BD4 24020006 */ addiu $v0, $zero, 6 -/* A95318 80241BD8 14620014 */ bne $v1, $v0, .L80241C2C -/* A9531C 80241BDC 0260202D */ daddu $a0, $s3, $zero -/* A95320 80241BE0 0C00A67F */ jal rand_int -/* A95324 80241BE4 24040064 */ addiu $a0, $zero, 0x64 -/* A95328 80241BE8 28420021 */ slti $v0, $v0, 0x21 -/* A9532C 80241BEC 5040000F */ beql $v0, $zero, .L80241C2C -/* A95330 80241BF0 0260202D */ daddu $a0, $s3, $zero -/* A95334 80241BF4 8E22008C */ lw $v0, 0x8c($s1) -/* A95338 80241BF8 10400005 */ beqz $v0, .L80241C10 -/* A9533C 80241BFC 3C020055 */ lui $v0, 0x55 -/* A95340 80241C00 3442002F */ ori $v0, $v0, 0x2f -/* A95344 80241C04 AE20008C */ sw $zero, 0x8c($s1) -/* A95348 80241C08 08090707 */ j .L80241C1C -/* A9534C 80241C0C A22000B5 */ sb $zero, 0xb5($s1) -.L80241C10: -/* A95350 80241C10 3442002E */ ori $v0, $v0, 0x2e -/* A95354 80241C14 AE30008C */ sw $s0, 0x8c($s1) -/* A95358 80241C18 A23000B5 */ sb $s0, 0xb5($s1) -.L80241C1C: -/* A9535C 80241C1C AE420028 */ sw $v0, 0x28($s2) -/* A95360 80241C20 24020007 */ addiu $v0, $zero, 7 -/* A95364 80241C24 08090742 */ j .L80241D08_A95448 -/* A95368 80241C28 AE220090 */ sw $v0, 0x90($s1) -.L80241C2C: -/* A9536C 80241C2C 0280282D */ daddu $a1, $s4, $zero -/* A95370 80241C30 0C012701 */ jal func_80049C04 -/* A95374 80241C34 02A0302D */ daddu $a2, $s5, $zero -/* A95378 80241C38 08090727 */ j .L80241C9C -/* A9537C 80241C3C 00000000 */ nop -.L80241C40: -/* A95380 80241C40 0260202D */ daddu $a0, $s3, $zero -/* A95384 80241C44 0280282D */ daddu $a1, $s4, $zero -/* A95388 80241C48 0C090557 */ jal kpa_102_set_script_owner_npc_anim -/* A9538C 80241C4C 02A0302D */ daddu $a2, $s5, $zero -/* A95390 80241C50 0260202D */ daddu $a0, $s3, $zero -.L80241C54: -/* A95394 80241C54 0280282D */ daddu $a1, $s4, $zero -/* A95398 80241C58 0C090576 */ jal kpa_102_UnkDistFunc -/* A9539C 80241C5C 02A0302D */ daddu $a2, $s5, $zero -/* A953A0 80241C60 08090727 */ j .L80241C9C -/* A953A4 80241C64 00000000 */ nop -.L80241C68: -/* A953A8 80241C68 0260202D */ daddu $a0, $s3, $zero -/* A953AC 80241C6C 0280282D */ daddu $a1, $s4, $zero -/* A953B0 80241C70 0C0905C3 */ jal kpa_102_UnkNpcAIFunc12 -/* A953B4 80241C74 02A0302D */ daddu $a2, $s5, $zero -/* A953B8 80241C78 08090727 */ j .L80241C9C -/* A953BC 80241C7C 00000000 */ nop -.L80241C80: -/* A953C0 80241C80 0280282D */ daddu $a1, $s4, $zero -/* A953C4 80241C84 0C09061C */ jal kpa_102_set_script_owner_npc_col_height -/* A953C8 80241C88 02A0302D */ daddu $a2, $s5, $zero -/* A953CC 80241C8C 08090727 */ j .L80241C9C -/* A953D0 80241C90 00000000 */ nop -.L80241C94: -/* A953D4 80241C94 0C0129CF */ jal func_8004A73C -/* A953D8 80241C98 0260202D */ daddu $a0, $s3, $zero -.L80241C9C: -/* A953DC 80241C9C 8E230088 */ lw $v1, 0x88($s1) -/* A953E0 80241CA0 24020006 */ addiu $v0, $zero, 6 -/* A953E4 80241CA4 14620019 */ bne $v1, $v0, .L80241D0C -/* A953E8 80241CA8 0000102D */ daddu $v0, $zero, $zero -/* A953EC 80241CAC 8E22008C */ lw $v0, 0x8c($s1) -/* A953F0 80241CB0 10400003 */ beqz $v0, .L80241CC0 -/* A953F4 80241CB4 24020001 */ addiu $v0, $zero, 1 -/* A953F8 80241CB8 08090731 */ j .L80241CC4 -/* A953FC 80241CBC A22200B5 */ sb $v0, 0xb5($s1) -.L80241CC0: -/* A95400 80241CC0 A22000B5 */ sb $zero, 0xb5($s1) -.L80241CC4: -/* A95404 80241CC4 8E22008C */ lw $v0, 0x8c($s1) -/* A95408 80241CC8 1040000F */ beqz $v0, .L80241D08_A95448 -/* A9540C 80241CCC 3C03FFAA */ lui $v1, 0xffaa -/* A95410 80241CD0 8E420028 */ lw $v0, 0x28($s2) -/* A95414 80241CD4 3463FFFC */ ori $v1, $v1, 0xfffc -/* A95418 80241CD8 00431821 */ addu $v1, $v0, $v1 -/* A9541C 80241CDC 2C620015 */ sltiu $v0, $v1, 0x15 -/* A95420 80241CE0 10400009 */ beqz $v0, .L80241D08_A95448 -/* A95424 80241CE4 00031080 */ sll $v0, $v1, 2 -/* A95428 80241CE8 3C018024 */ lui $at, %hi(jtbl_80245CE0_A99420) -/* A9542C 80241CEC 00220821 */ addu $at, $at, $v0 -/* A95430 80241CF0 8C225CE0 */ lw $v0, %lo(jtbl_80245CE0_A99420)($at) -/* A95434 80241CF4 00400008 */ jr $v0 -/* A95438 80241CF8 00000000 */ nop -.L80241CFC_A9543C: -/* A9543C 80241CFC 8E420028 */ lw $v0, 0x28($s2) -/* A95440 80241D00 24420001 */ addiu $v0, $v0, 1 -/* A95444 80241D04 AE420028 */ sw $v0, 0x28($s2) -.L80241D08_A95448: -/* A95448 80241D08 0000102D */ daddu $v0, $zero, $zero -.L80241D0C: -/* A9544C 80241D0C 8FBF0068 */ lw $ra, 0x68($sp) -/* A95450 80241D10 8FB50064 */ lw $s5, 0x64($sp) -/* A95454 80241D14 8FB40060 */ lw $s4, 0x60($sp) -/* A95458 80241D18 8FB3005C */ lw $s3, 0x5c($sp) -/* A9545C 80241D1C 8FB20058 */ lw $s2, 0x58($sp) -/* A95460 80241D20 8FB10054 */ lw $s1, 0x54($sp) -/* A95464 80241D24 8FB00050 */ lw $s0, 0x50($sp) -/* A95468 80241D28 03E00008 */ jr $ra -/* A9546C 80241D2C 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_11/A52BD0/func_802406A4_A52F64.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_11/A52BD0/func_802406A4_A52F64.s deleted file mode 100644 index 0e38eee4f5..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_11/A52BD0/func_802406A4_A52F64.s +++ /dev/null @@ -1,312 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80242038_A548F8 -.word .L80240AB0_A53370, .L80240ABC_A5337C, .L80240ABC_A5337C, .L80240ABC_A5337C, .L80240ABC_A5337C, .L80240ABC_A5337C, .L80240ABC_A5337C, .L80240ABC_A5337C, .L80240AB0_A53370, .L80240ABC_A5337C, .L80240AB0_A53370, .L80240ABC_A5337C, .L80240AB0_A53370, .L80240ABC_A5337C, .L80240AB0_A53370, .L80240ABC_A5337C, .L80240ABC_A5337C, .L80240ABC_A5337C, .L80240AB0_A53370, .L80240ABC_A5337C, .L80240AB0_A53370, 0 - -.section .text - -glabel func_802406A4_A52F64 -/* A52F64 802406A4 27BDFF90 */ addiu $sp, $sp, -0x70 -/* A52F68 802406A8 AFB3005C */ sw $s3, 0x5c($sp) -/* A52F6C 802406AC 0080982D */ daddu $s3, $a0, $zero -/* A52F70 802406B0 AFBF0068 */ sw $ra, 0x68($sp) -/* A52F74 802406B4 AFB50064 */ sw $s5, 0x64($sp) -/* A52F78 802406B8 AFB40060 */ sw $s4, 0x60($sp) -/* A52F7C 802406BC AFB20058 */ sw $s2, 0x58($sp) -/* A52F80 802406C0 AFB10054 */ sw $s1, 0x54($sp) -/* A52F84 802406C4 AFB00050 */ sw $s0, 0x50($sp) -/* A52F88 802406C8 8E710148 */ lw $s1, 0x148($s3) -/* A52F8C 802406CC 86240008 */ lh $a0, 8($s1) -/* A52F90 802406D0 0C00EABB */ jal get_npc_unsafe -/* A52F94 802406D4 00A0802D */ daddu $s0, $a1, $zero -/* A52F98 802406D8 8E63000C */ lw $v1, 0xc($s3) -/* A52F9C 802406DC 0260202D */ daddu $a0, $s3, $zero -/* A52FA0 802406E0 8C650000 */ lw $a1, ($v1) -/* A52FA4 802406E4 0C0B1EAF */ jal evt_get_variable -/* A52FA8 802406E8 0040902D */ daddu $s2, $v0, $zero -/* A52FAC 802406EC AFA00028 */ sw $zero, 0x28($sp) -/* A52FB0 802406F0 8E2300D0 */ lw $v1, 0xd0($s1) -/* A52FB4 802406F4 8C630030 */ lw $v1, 0x30($v1) -/* A52FB8 802406F8 AFA3002C */ sw $v1, 0x2c($sp) -/* A52FBC 802406FC 8E2300D0 */ lw $v1, 0xd0($s1) -/* A52FC0 80240700 8C63001C */ lw $v1, 0x1c($v1) -/* A52FC4 80240704 AFA30030 */ sw $v1, 0x30($sp) -/* A52FC8 80240708 8E2300D0 */ lw $v1, 0xd0($s1) -/* A52FCC 8024070C 8C630024 */ lw $v1, 0x24($v1) -/* A52FD0 80240710 AFA30034 */ sw $v1, 0x34($sp) -/* A52FD4 80240714 8E2300D0 */ lw $v1, 0xd0($s1) -/* A52FD8 80240718 8C630028 */ lw $v1, 0x28($v1) -/* A52FDC 8024071C 27B50028 */ addiu $s5, $sp, 0x28 -/* A52FE0 80240720 AFA30038 */ sw $v1, 0x38($sp) -/* A52FE4 80240724 8E2300D0 */ lw $v1, 0xd0($s1) -/* A52FE8 80240728 3C0142C8 */ lui $at, 0x42c8 -/* A52FEC 8024072C 44810000 */ mtc1 $at, $f0 -/* A52FF0 80240730 8C63002C */ lw $v1, 0x2c($v1) -/* A52FF4 80240734 0040A02D */ daddu $s4, $v0, $zero -/* A52FF8 80240738 E7A00040 */ swc1 $f0, 0x40($sp) -/* A52FFC 8024073C A7A00044 */ sh $zero, 0x44($sp) -/* A53000 80240740 12000009 */ beqz $s0, .L80240768 -/* A53004 80240744 AFA3003C */ sw $v1, 0x3c($sp) -/* A53008 80240748 864300A8 */ lh $v1, 0xa8($s2) -/* A5300C 8024074C 8E2200B0 */ lw $v0, 0xb0($s1) -/* A53010 80240750 AE20008C */ sw $zero, 0x8c($s1) -/* A53014 80240754 A22000B5 */ sb $zero, 0xb5($s1) -/* A53018 80240758 34420008 */ ori $v0, $v0, 8 -/* A5301C 8024075C AE230084 */ sw $v1, 0x84($s1) -/* A53020 80240760 080901DE */ j .L80240778 -/* A53024 80240764 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240768: -/* A53028 80240768 8E2200B0 */ lw $v0, 0xb0($s1) -/* A5302C 8024076C 30420004 */ andi $v0, $v0, 4 -/* A53030 80240770 10400047 */ beqz $v0, .L80240890 -/* A53034 80240774 00000000 */ nop -.L80240778: -/* A53038 80240778 AE600070 */ sw $zero, 0x70($s3) -/* A5303C 8024077C A640008E */ sh $zero, 0x8e($s2) -/* A53040 80240780 8E2300CC */ lw $v1, 0xcc($s1) -/* A53044 80240784 2404F7FF */ addiu $a0, $zero, -0x801 -/* A53048 80240788 A2200007 */ sb $zero, 7($s1) -/* A5304C 8024078C 8E420000 */ lw $v0, ($s2) -/* A53050 80240790 8C630000 */ lw $v1, ($v1) -/* A53054 80240794 00441024 */ and $v0, $v0, $a0 -/* A53058 80240798 AE420000 */ sw $v0, ($s2) -/* A5305C 8024079C AE430028 */ sw $v1, 0x28($s2) -/* A53060 802407A0 96220086 */ lhu $v0, 0x86($s1) -/* A53064 802407A4 A64200A8 */ sh $v0, 0xa8($s2) -/* A53068 802407A8 8E2200D0 */ lw $v0, 0xd0($s1) -/* A5306C 802407AC AE200090 */ sw $zero, 0x90($s1) -/* A53070 802407B0 8C420034 */ lw $v0, 0x34($v0) -/* A53074 802407B4 14400006 */ bnez $v0, .L802407D0 -/* A53078 802407B8 2403FDFF */ addiu $v1, $zero, -0x201 -/* A5307C 802407BC 8E420000 */ lw $v0, ($s2) -/* A53080 802407C0 2403FFF7 */ addiu $v1, $zero, -9 -/* A53084 802407C4 34420200 */ ori $v0, $v0, 0x200 -/* A53088 802407C8 080901F7 */ j .L802407DC -/* A5308C 802407CC 00431024 */ and $v0, $v0, $v1 -.L802407D0: -/* A53090 802407D0 8E420000 */ lw $v0, ($s2) -/* A53094 802407D4 00431024 */ and $v0, $v0, $v1 -/* A53098 802407D8 34420008 */ ori $v0, $v0, 8 -.L802407DC: -/* A5309C 802407DC AE420000 */ sw $v0, ($s2) -/* A530A0 802407E0 8E2200B0 */ lw $v0, 0xb0($s1) -/* A530A4 802407E4 30420004 */ andi $v0, $v0, 4 -/* A530A8 802407E8 1040001E */ beqz $v0, .L80240864 -/* A530AC 802407EC 24040002 */ addiu $a0, $zero, 2 -/* A530B0 802407F0 0240282D */ daddu $a1, $s2, $zero -/* A530B4 802407F4 0000302D */ daddu $a2, $zero, $zero -/* A530B8 802407F8 24020063 */ addiu $v0, $zero, 0x63 -/* A530BC 802407FC AE620070 */ sw $v0, 0x70($s3) -/* A530C0 80240800 AE600074 */ sw $zero, 0x74($s3) -/* A530C4 80240804 864300A8 */ lh $v1, 0xa8($s2) -/* A530C8 80240808 3C013F80 */ lui $at, 0x3f80 -/* A530CC 8024080C 44810000 */ mtc1 $at, $f0 -/* A530D0 80240810 3C014000 */ lui $at, 0x4000 -/* A530D4 80240814 44811000 */ mtc1 $at, $f2 -/* A530D8 80240818 3C01C1A0 */ lui $at, 0xc1a0 -/* A530DC 8024081C 44812000 */ mtc1 $at, $f4 -/* A530E0 80240820 24020028 */ addiu $v0, $zero, 0x28 -/* A530E4 80240824 AFA2001C */ sw $v0, 0x1c($sp) -/* A530E8 80240828 44833000 */ mtc1 $v1, $f6 -/* A530EC 8024082C 00000000 */ nop -/* A530F0 80240830 468031A0 */ cvt.s.w $f6, $f6 -/* A530F4 80240834 44073000 */ mfc1 $a3, $f6 -/* A530F8 80240838 27A20048 */ addiu $v0, $sp, 0x48 -/* A530FC 8024083C AFA20020 */ sw $v0, 0x20($sp) -/* A53100 80240840 E7A00010 */ swc1 $f0, 0x10($sp) -/* A53104 80240844 E7A20014 */ swc1 $f2, 0x14($sp) -/* A53108 80240848 0C01BFA4 */ jal fx_emote -/* A5310C 8024084C E7A40018 */ swc1 $f4, 0x18($sp) -/* A53110 80240850 8E2200B0 */ lw $v0, 0xb0($s1) -/* A53114 80240854 2403FFFB */ addiu $v1, $zero, -5 -/* A53118 80240858 00431024 */ and $v0, $v0, $v1 -/* A5311C 8024085C 08090224 */ j .L80240890 -/* A53120 80240860 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240864: -/* A53124 80240864 8E220000 */ lw $v0, ($s1) -/* A53128 80240868 3C034000 */ lui $v1, 0x4000 -/* A5312C 8024086C 00431024 */ and $v0, $v0, $v1 -/* A53130 80240870 10400007 */ beqz $v0, .L80240890 -/* A53134 80240874 3C03BFFF */ lui $v1, 0xbfff -/* A53138 80240878 2402000C */ addiu $v0, $zero, 0xc -/* A5313C 8024087C AE620070 */ sw $v0, 0x70($s3) -/* A53140 80240880 8E220000 */ lw $v0, ($s1) -/* A53144 80240884 3463FFFF */ ori $v1, $v1, 0xffff -/* A53148 80240888 00431024 */ and $v0, $v0, $v1 -/* A5314C 8024088C AE220000 */ sw $v0, ($s1) -.L80240890: -/* A53150 80240890 8E220090 */ lw $v0, 0x90($s1) -/* A53154 80240894 1840000C */ blez $v0, .L802408C8 -/* A53158 80240898 2442FFFF */ addiu $v0, $v0, -1 -/* A5315C 8024089C 14400087 */ bnez $v0, .L80240ABC_A5337C -/* A53160 802408A0 AE220090 */ sw $v0, 0x90($s1) -/* A53164 802408A4 3C03FFAA */ lui $v1, 0xffaa -/* A53168 802408A8 8E420028 */ lw $v0, 0x28($s2) -/* A5316C 802408AC 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* A53170 802408B0 00431021 */ addu $v0, $v0, $v1 -/* A53174 802408B4 2C420002 */ sltiu $v0, $v0, 2 -/* A53178 802408B8 10400003 */ beqz $v0, .L802408C8 -/* A5317C 802408BC 3C020055 */ lui $v0, 0x55 -/* A53180 802408C0 3442000C */ ori $v0, $v0, 0xc -/* A53184 802408C4 AE420028 */ sw $v0, 0x28($s2) -.L802408C8: -/* A53188 802408C8 8E630070 */ lw $v1, 0x70($s3) -/* A5318C 802408CC 2402000C */ addiu $v0, $zero, 0xc -/* A53190 802408D0 10620048 */ beq $v1, $v0, .L802409F4 -/* A53194 802408D4 2862000D */ slti $v0, $v1, 0xd -/* A53198 802408D8 1040000F */ beqz $v0, .L80240918 -/* A5319C 802408DC 24100001 */ addiu $s0, $zero, 1 -/* A531A0 802408E0 1070001E */ beq $v1, $s0, .L8024095C -/* A531A4 802408E4 28620002 */ slti $v0, $v1, 2 -/* A531A8 802408E8 10400005 */ beqz $v0, .L80240900 -/* A531AC 802408EC 24020002 */ addiu $v0, $zero, 2 -/* A531B0 802408F0 10600015 */ beqz $v1, .L80240948 -/* A531B4 802408F4 0260202D */ daddu $a0, $s3, $zero -/* A531B8 802408F8 08090294 */ j .L80240A50 -/* A531BC 802408FC 00000000 */ nop -.L80240900: -/* A531C0 80240900 1062001C */ beq $v1, $v0, .L80240974 -/* A531C4 80240904 24020003 */ addiu $v0, $zero, 3 -/* A531C8 80240908 10620035 */ beq $v1, $v0, .L802409E0 -/* A531CC 8024090C 0260202D */ daddu $a0, $s3, $zero -/* A531D0 80240910 08090294 */ j .L80240A50 -/* A531D4 80240914 00000000 */ nop -.L80240918: -/* A531D8 80240918 2402000E */ addiu $v0, $zero, 0xe -/* A531DC 8024091C 1062003F */ beq $v1, $v0, .L80240A1C -/* A531E0 80240920 0062102A */ slt $v0, $v1, $v0 -/* A531E4 80240924 14400038 */ bnez $v0, .L80240A08 -/* A531E8 80240928 0260202D */ daddu $a0, $s3, $zero -/* A531EC 8024092C 2402000F */ addiu $v0, $zero, 0xf -/* A531F0 80240930 10620040 */ beq $v1, $v0, .L80240A34 -/* A531F4 80240934 24020063 */ addiu $v0, $zero, 0x63 -/* A531F8 80240938 10620043 */ beq $v1, $v0, .L80240A48 -/* A531FC 8024093C 00000000 */ nop -/* A53200 80240940 08090294 */ j .L80240A50 -/* A53204 80240944 00000000 */ nop -.L80240948: -/* A53208 80240948 0280282D */ daddu $a1, $s4, $zero -/* A5320C 8024094C 0C012568 */ jal func_800495A0 -/* A53210 80240950 02A0302D */ daddu $a2, $s5, $zero -/* A53214 80240954 96220086 */ lhu $v0, 0x86($s1) -/* A53218 80240958 A64200A8 */ sh $v0, 0xa8($s2) -.L8024095C: -/* A5321C 8024095C 0260202D */ daddu $a0, $s3, $zero -/* A53220 80240960 0280282D */ daddu $a1, $s4, $zero -/* A53224 80240964 0C0125AE */ jal func_800496B8 -/* A53228 80240968 02A0302D */ daddu $a2, $s5, $zero -/* A5322C 8024096C 08090294 */ j .L80240A50 -/* A53230 80240970 00000000 */ nop -.L80240974: -/* A53234 80240974 0260202D */ daddu $a0, $s3, $zero -/* A53238 80240978 0280282D */ daddu $a1, $s4, $zero -/* A5323C 8024097C 0C0126D1 */ jal base_UnkNpcAIFunc1 -/* A53240 80240980 02A0302D */ daddu $a2, $s5, $zero -/* A53244 80240984 8E230088 */ lw $v1, 0x88($s1) -/* A53248 80240988 24020006 */ addiu $v0, $zero, 6 -/* A5324C 8024098C 14620014 */ bne $v1, $v0, .L802409E0 -/* A53250 80240990 0260202D */ daddu $a0, $s3, $zero -/* A53254 80240994 0C00A67F */ jal rand_int -/* A53258 80240998 24040064 */ addiu $a0, $zero, 0x64 -/* A5325C 8024099C 28420021 */ slti $v0, $v0, 0x21 -/* A53260 802409A0 5040000F */ beql $v0, $zero, .L802409E0 -/* A53264 802409A4 0260202D */ daddu $a0, $s3, $zero -/* A53268 802409A8 8E22008C */ lw $v0, 0x8c($s1) -/* A5326C 802409AC 10400005 */ beqz $v0, .L802409C4 -/* A53270 802409B0 3C020055 */ lui $v0, 0x55 -/* A53274 802409B4 3442002F */ ori $v0, $v0, 0x2f -/* A53278 802409B8 AE20008C */ sw $zero, 0x8c($s1) -/* A5327C 802409BC 08090274 */ j .L802409D0 -/* A53280 802409C0 A22000B5 */ sb $zero, 0xb5($s1) -.L802409C4: -/* A53284 802409C4 3442002E */ ori $v0, $v0, 0x2e -/* A53288 802409C8 AE30008C */ sw $s0, 0x8c($s1) -/* A5328C 802409CC A23000B5 */ sb $s0, 0xb5($s1) -.L802409D0: -/* A53290 802409D0 AE420028 */ sw $v0, 0x28($s2) -/* A53294 802409D4 24020007 */ addiu $v0, $zero, 7 -/* A53298 802409D8 080902AF */ j .L80240ABC_A5337C -/* A5329C 802409DC AE220090 */ sw $v0, 0x90($s1) -.L802409E0: -/* A532A0 802409E0 0280282D */ daddu $a1, $s4, $zero -/* A532A4 802409E4 0C012701 */ jal func_80049C04 -/* A532A8 802409E8 02A0302D */ daddu $a2, $s5, $zero -/* A532AC 802409EC 08090294 */ j .L80240A50 -/* A532B0 802409F0 00000000 */ nop -.L802409F4: -/* A532B4 802409F4 0260202D */ daddu $a0, $s3, $zero -/* A532B8 802409F8 0280282D */ daddu $a1, $s4, $zero -/* A532BC 802409FC 0C0900C4 */ jal kpa_11_set_script_owner_npc_anim -/* A532C0 80240A00 02A0302D */ daddu $a2, $s5, $zero -/* A532C4 80240A04 0260202D */ daddu $a0, $s3, $zero -.L80240A08: -/* A532C8 80240A08 0280282D */ daddu $a1, $s4, $zero -/* A532CC 80240A0C 0C0900E3 */ jal kpa_11_UnkDistFunc -/* A532D0 80240A10 02A0302D */ daddu $a2, $s5, $zero -/* A532D4 80240A14 08090294 */ j .L80240A50 -/* A532D8 80240A18 00000000 */ nop -.L80240A1C: -/* A532DC 80240A1C 0260202D */ daddu $a0, $s3, $zero -/* A532E0 80240A20 0280282D */ daddu $a1, $s4, $zero -/* A532E4 80240A24 0C090130 */ jal kpa_11_UnkNpcAIFunc12 -/* A532E8 80240A28 02A0302D */ daddu $a2, $s5, $zero -/* A532EC 80240A2C 08090294 */ j .L80240A50 -/* A532F0 80240A30 00000000 */ nop -.L80240A34: -/* A532F4 80240A34 0280282D */ daddu $a1, $s4, $zero -/* A532F8 80240A38 0C090189 */ jal kpa_11_set_script_owner_npc_col_height -/* A532FC 80240A3C 02A0302D */ daddu $a2, $s5, $zero -/* A53300 80240A40 08090294 */ j .L80240A50 -/* A53304 80240A44 00000000 */ nop -.L80240A48: -/* A53308 80240A48 0C0129CF */ jal func_8004A73C -/* A5330C 80240A4C 0260202D */ daddu $a0, $s3, $zero -.L80240A50: -/* A53310 80240A50 8E230088 */ lw $v1, 0x88($s1) -/* A53314 80240A54 24020006 */ addiu $v0, $zero, 6 -/* A53318 80240A58 14620019 */ bne $v1, $v0, .L80240AC0 -/* A5331C 80240A5C 0000102D */ daddu $v0, $zero, $zero -/* A53320 80240A60 8E22008C */ lw $v0, 0x8c($s1) -/* A53324 80240A64 10400003 */ beqz $v0, .L80240A74 -/* A53328 80240A68 24020001 */ addiu $v0, $zero, 1 -/* A5332C 80240A6C 0809029E */ j .L80240A78 -/* A53330 80240A70 A22200B5 */ sb $v0, 0xb5($s1) -.L80240A74: -/* A53334 80240A74 A22000B5 */ sb $zero, 0xb5($s1) -.L80240A78: -/* A53338 80240A78 8E22008C */ lw $v0, 0x8c($s1) -/* A5333C 80240A7C 1040000F */ beqz $v0, .L80240ABC_A5337C -/* A53340 80240A80 3C03FFAA */ lui $v1, 0xffaa -/* A53344 80240A84 8E420028 */ lw $v0, 0x28($s2) -/* A53348 80240A88 3463FFFC */ ori $v1, $v1, 0xfffc -/* A5334C 80240A8C 00431821 */ addu $v1, $v0, $v1 -/* A53350 80240A90 2C620015 */ sltiu $v0, $v1, 0x15 -/* A53354 80240A94 10400009 */ beqz $v0, .L80240ABC_A5337C -/* A53358 80240A98 00031080 */ sll $v0, $v1, 2 -/* A5335C 80240A9C 3C018024 */ lui $at, %hi(jtbl_80242038_A548F8) -/* A53360 80240AA0 00220821 */ addu $at, $at, $v0 -/* A53364 80240AA4 8C222038 */ lw $v0, %lo(jtbl_80242038_A548F8)($at) -/* A53368 80240AA8 00400008 */ jr $v0 -/* A5336C 80240AAC 00000000 */ nop -.L80240AB0_A53370: -/* A53370 80240AB0 8E420028 */ lw $v0, 0x28($s2) -/* A53374 80240AB4 24420001 */ addiu $v0, $v0, 1 -/* A53378 80240AB8 AE420028 */ sw $v0, 0x28($s2) -.L80240ABC_A5337C: -/* A5337C 80240ABC 0000102D */ daddu $v0, $zero, $zero -.L80240AC0: -/* A53380 80240AC0 8FBF0068 */ lw $ra, 0x68($sp) -/* A53384 80240AC4 8FB50064 */ lw $s5, 0x64($sp) -/* A53388 80240AC8 8FB40060 */ lw $s4, 0x60($sp) -/* A5338C 80240ACC 8FB3005C */ lw $s3, 0x5c($sp) -/* A53390 80240AD0 8FB20058 */ lw $s2, 0x58($sp) -/* A53394 80240AD4 8FB10054 */ lw $s1, 0x54($sp) -/* A53398 80240AD8 8FB00050 */ lw $s0, 0x50($sp) -/* A5339C 80240ADC 03E00008 */ jr $ra -/* A533A0 80240AE0 27BD0070 */ addiu $sp, $sp, 0x70 -/* A533A4 80240AE4 00000000 */ nop -/* A533A8 80240AE8 00000000 */ nop -/* A533AC 80240AEC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_80240544_A9D174.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_80240544_A9D174.s deleted file mode 100644 index d4a75fa0fb..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_80240544_A9D174.s +++ /dev/null @@ -1,309 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80241CF8_A9E928 -.word .L80240950_A9D580, .L8024095C_A9D58C, .L8024095C_A9D58C, .L8024095C_A9D58C, .L8024095C_A9D58C, .L8024095C_A9D58C, .L8024095C_A9D58C, .L8024095C_A9D58C, .L80240950_A9D580, .L8024095C_A9D58C, .L80240950_A9D580, .L8024095C_A9D58C, .L80240950_A9D580, .L8024095C_A9D58C, .L80240950_A9D580, .L8024095C_A9D58C, .L8024095C_A9D58C, .L8024095C_A9D58C, .L80240950_A9D580, .L8024095C_A9D58C, .L80240950_A9D580, 0 - -.section .text - -glabel func_80240544_A9D174 -/* A9D174 80240544 27BDFF90 */ addiu $sp, $sp, -0x70 -/* A9D178 80240548 AFB3005C */ sw $s3, 0x5c($sp) -/* A9D17C 8024054C 0080982D */ daddu $s3, $a0, $zero -/* A9D180 80240550 AFBF0068 */ sw $ra, 0x68($sp) -/* A9D184 80240554 AFB50064 */ sw $s5, 0x64($sp) -/* A9D188 80240558 AFB40060 */ sw $s4, 0x60($sp) -/* A9D18C 8024055C AFB20058 */ sw $s2, 0x58($sp) -/* A9D190 80240560 AFB10054 */ sw $s1, 0x54($sp) -/* A9D194 80240564 AFB00050 */ sw $s0, 0x50($sp) -/* A9D198 80240568 8E710148 */ lw $s1, 0x148($s3) -/* A9D19C 8024056C 86240008 */ lh $a0, 8($s1) -/* A9D1A0 80240570 0C00EABB */ jal get_npc_unsafe -/* A9D1A4 80240574 00A0802D */ daddu $s0, $a1, $zero -/* A9D1A8 80240578 8E63000C */ lw $v1, 0xc($s3) -/* A9D1AC 8024057C 0260202D */ daddu $a0, $s3, $zero -/* A9D1B0 80240580 8C650000 */ lw $a1, ($v1) -/* A9D1B4 80240584 0C0B1EAF */ jal evt_get_variable -/* A9D1B8 80240588 0040902D */ daddu $s2, $v0, $zero -/* A9D1BC 8024058C AFA00028 */ sw $zero, 0x28($sp) -/* A9D1C0 80240590 8E2300D0 */ lw $v1, 0xd0($s1) -/* A9D1C4 80240594 8C630030 */ lw $v1, 0x30($v1) -/* A9D1C8 80240598 AFA3002C */ sw $v1, 0x2c($sp) -/* A9D1CC 8024059C 8E2300D0 */ lw $v1, 0xd0($s1) -/* A9D1D0 802405A0 8C63001C */ lw $v1, 0x1c($v1) -/* A9D1D4 802405A4 AFA30030 */ sw $v1, 0x30($sp) -/* A9D1D8 802405A8 8E2300D0 */ lw $v1, 0xd0($s1) -/* A9D1DC 802405AC 8C630024 */ lw $v1, 0x24($v1) -/* A9D1E0 802405B0 AFA30034 */ sw $v1, 0x34($sp) -/* A9D1E4 802405B4 8E2300D0 */ lw $v1, 0xd0($s1) -/* A9D1E8 802405B8 8C630028 */ lw $v1, 0x28($v1) -/* A9D1EC 802405BC 27B50028 */ addiu $s5, $sp, 0x28 -/* A9D1F0 802405C0 AFA30038 */ sw $v1, 0x38($sp) -/* A9D1F4 802405C4 8E2300D0 */ lw $v1, 0xd0($s1) -/* A9D1F8 802405C8 3C0142C8 */ lui $at, 0x42c8 -/* A9D1FC 802405CC 44810000 */ mtc1 $at, $f0 -/* A9D200 802405D0 8C63002C */ lw $v1, 0x2c($v1) -/* A9D204 802405D4 0040A02D */ daddu $s4, $v0, $zero -/* A9D208 802405D8 E7A00040 */ swc1 $f0, 0x40($sp) -/* A9D20C 802405DC A7A00044 */ sh $zero, 0x44($sp) -/* A9D210 802405E0 12000009 */ beqz $s0, .L80240608 -/* A9D214 802405E4 AFA3003C */ sw $v1, 0x3c($sp) -/* A9D218 802405E8 864300A8 */ lh $v1, 0xa8($s2) -/* A9D21C 802405EC 8E2200B0 */ lw $v0, 0xb0($s1) -/* A9D220 802405F0 AE20008C */ sw $zero, 0x8c($s1) -/* A9D224 802405F4 A22000B5 */ sb $zero, 0xb5($s1) -/* A9D228 802405F8 34420008 */ ori $v0, $v0, 8 -/* A9D22C 802405FC AE230084 */ sw $v1, 0x84($s1) -/* A9D230 80240600 08090186 */ j .L80240618 -/* A9D234 80240604 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240608: -/* A9D238 80240608 8E2200B0 */ lw $v0, 0xb0($s1) -/* A9D23C 8024060C 30420004 */ andi $v0, $v0, 4 -/* A9D240 80240610 10400047 */ beqz $v0, .L80240730 -/* A9D244 80240614 00000000 */ nop -.L80240618: -/* A9D248 80240618 AE600070 */ sw $zero, 0x70($s3) -/* A9D24C 8024061C A640008E */ sh $zero, 0x8e($s2) -/* A9D250 80240620 8E2300CC */ lw $v1, 0xcc($s1) -/* A9D254 80240624 2404F7FF */ addiu $a0, $zero, -0x801 -/* A9D258 80240628 A2200007 */ sb $zero, 7($s1) -/* A9D25C 8024062C 8E420000 */ lw $v0, ($s2) -/* A9D260 80240630 8C630000 */ lw $v1, ($v1) -/* A9D264 80240634 00441024 */ and $v0, $v0, $a0 -/* A9D268 80240638 AE420000 */ sw $v0, ($s2) -/* A9D26C 8024063C AE430028 */ sw $v1, 0x28($s2) -/* A9D270 80240640 96220086 */ lhu $v0, 0x86($s1) -/* A9D274 80240644 A64200A8 */ sh $v0, 0xa8($s2) -/* A9D278 80240648 8E2200D0 */ lw $v0, 0xd0($s1) -/* A9D27C 8024064C AE200090 */ sw $zero, 0x90($s1) -/* A9D280 80240650 8C420034 */ lw $v0, 0x34($v0) -/* A9D284 80240654 14400006 */ bnez $v0, .L80240670 -/* A9D288 80240658 2403FDFF */ addiu $v1, $zero, -0x201 -/* A9D28C 8024065C 8E420000 */ lw $v0, ($s2) -/* A9D290 80240660 2403FFF7 */ addiu $v1, $zero, -9 -/* A9D294 80240664 34420200 */ ori $v0, $v0, 0x200 -/* A9D298 80240668 0809019F */ j .L8024067C -/* A9D29C 8024066C 00431024 */ and $v0, $v0, $v1 -.L80240670: -/* A9D2A0 80240670 8E420000 */ lw $v0, ($s2) -/* A9D2A4 80240674 00431024 */ and $v0, $v0, $v1 -/* A9D2A8 80240678 34420008 */ ori $v0, $v0, 8 -.L8024067C: -/* A9D2AC 8024067C AE420000 */ sw $v0, ($s2) -/* A9D2B0 80240680 8E2200B0 */ lw $v0, 0xb0($s1) -/* A9D2B4 80240684 30420004 */ andi $v0, $v0, 4 -/* A9D2B8 80240688 1040001E */ beqz $v0, .L80240704 -/* A9D2BC 8024068C 24040002 */ addiu $a0, $zero, 2 -/* A9D2C0 80240690 0240282D */ daddu $a1, $s2, $zero -/* A9D2C4 80240694 0000302D */ daddu $a2, $zero, $zero -/* A9D2C8 80240698 24020063 */ addiu $v0, $zero, 0x63 -/* A9D2CC 8024069C AE620070 */ sw $v0, 0x70($s3) -/* A9D2D0 802406A0 AE600074 */ sw $zero, 0x74($s3) -/* A9D2D4 802406A4 864300A8 */ lh $v1, 0xa8($s2) -/* A9D2D8 802406A8 3C013F80 */ lui $at, 0x3f80 -/* A9D2DC 802406AC 44810000 */ mtc1 $at, $f0 -/* A9D2E0 802406B0 3C014000 */ lui $at, 0x4000 -/* A9D2E4 802406B4 44811000 */ mtc1 $at, $f2 -/* A9D2E8 802406B8 3C01C1A0 */ lui $at, 0xc1a0 -/* A9D2EC 802406BC 44812000 */ mtc1 $at, $f4 -/* A9D2F0 802406C0 24020028 */ addiu $v0, $zero, 0x28 -/* A9D2F4 802406C4 AFA2001C */ sw $v0, 0x1c($sp) -/* A9D2F8 802406C8 44833000 */ mtc1 $v1, $f6 -/* A9D2FC 802406CC 00000000 */ nop -/* A9D300 802406D0 468031A0 */ cvt.s.w $f6, $f6 -/* A9D304 802406D4 44073000 */ mfc1 $a3, $f6 -/* A9D308 802406D8 27A20048 */ addiu $v0, $sp, 0x48 -/* A9D30C 802406DC AFA20020 */ sw $v0, 0x20($sp) -/* A9D310 802406E0 E7A00010 */ swc1 $f0, 0x10($sp) -/* A9D314 802406E4 E7A20014 */ swc1 $f2, 0x14($sp) -/* A9D318 802406E8 0C01BFA4 */ jal fx_emote -/* A9D31C 802406EC E7A40018 */ swc1 $f4, 0x18($sp) -/* A9D320 802406F0 8E2200B0 */ lw $v0, 0xb0($s1) -/* A9D324 802406F4 2403FFFB */ addiu $v1, $zero, -5 -/* A9D328 802406F8 00431024 */ and $v0, $v0, $v1 -/* A9D32C 802406FC 080901CC */ j .L80240730 -/* A9D330 80240700 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240704: -/* A9D334 80240704 8E220000 */ lw $v0, ($s1) -/* A9D338 80240708 3C034000 */ lui $v1, 0x4000 -/* A9D33C 8024070C 00431024 */ and $v0, $v0, $v1 -/* A9D340 80240710 10400007 */ beqz $v0, .L80240730 -/* A9D344 80240714 3C03BFFF */ lui $v1, 0xbfff -/* A9D348 80240718 2402000C */ addiu $v0, $zero, 0xc -/* A9D34C 8024071C AE620070 */ sw $v0, 0x70($s3) -/* A9D350 80240720 8E220000 */ lw $v0, ($s1) -/* A9D354 80240724 3463FFFF */ ori $v1, $v1, 0xffff -/* A9D358 80240728 00431024 */ and $v0, $v0, $v1 -/* A9D35C 8024072C AE220000 */ sw $v0, ($s1) -.L80240730: -/* A9D360 80240730 8E220090 */ lw $v0, 0x90($s1) -/* A9D364 80240734 1840000C */ blez $v0, .L80240768 -/* A9D368 80240738 2442FFFF */ addiu $v0, $v0, -1 -/* A9D36C 8024073C 14400087 */ bnez $v0, .L8024095C_A9D58C -/* A9D370 80240740 AE220090 */ sw $v0, 0x90($s1) -/* A9D374 80240744 3C03FFAA */ lui $v1, 0xffaa -/* A9D378 80240748 8E420028 */ lw $v0, 0x28($s2) -/* A9D37C 8024074C 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* A9D380 80240750 00431021 */ addu $v0, $v0, $v1 -/* A9D384 80240754 2C420002 */ sltiu $v0, $v0, 2 -/* A9D388 80240758 10400003 */ beqz $v0, .L80240768 -/* A9D38C 8024075C 3C020055 */ lui $v0, 0x55 -/* A9D390 80240760 3442000C */ ori $v0, $v0, 0xc -/* A9D394 80240764 AE420028 */ sw $v0, 0x28($s2) -.L80240768: -/* A9D398 80240768 8E630070 */ lw $v1, 0x70($s3) -/* A9D39C 8024076C 2402000C */ addiu $v0, $zero, 0xc -/* A9D3A0 80240770 10620048 */ beq $v1, $v0, .L80240894 -/* A9D3A4 80240774 2862000D */ slti $v0, $v1, 0xd -/* A9D3A8 80240778 1040000F */ beqz $v0, .L802407B8 -/* A9D3AC 8024077C 24100001 */ addiu $s0, $zero, 1 -/* A9D3B0 80240780 1070001E */ beq $v1, $s0, .L802407FC -/* A9D3B4 80240784 28620002 */ slti $v0, $v1, 2 -/* A9D3B8 80240788 10400005 */ beqz $v0, .L802407A0 -/* A9D3BC 8024078C 24020002 */ addiu $v0, $zero, 2 -/* A9D3C0 80240790 10600015 */ beqz $v1, .L802407E8 -/* A9D3C4 80240794 0260202D */ daddu $a0, $s3, $zero -/* A9D3C8 80240798 0809023C */ j .L802408F0 -/* A9D3CC 8024079C 00000000 */ nop -.L802407A0: -/* A9D3D0 802407A0 1062001C */ beq $v1, $v0, .L80240814 -/* A9D3D4 802407A4 24020003 */ addiu $v0, $zero, 3 -/* A9D3D8 802407A8 10620035 */ beq $v1, $v0, .L80240880 -/* A9D3DC 802407AC 0260202D */ daddu $a0, $s3, $zero -/* A9D3E0 802407B0 0809023C */ j .L802408F0 -/* A9D3E4 802407B4 00000000 */ nop -.L802407B8: -/* A9D3E8 802407B8 2402000E */ addiu $v0, $zero, 0xe -/* A9D3EC 802407BC 1062003F */ beq $v1, $v0, .L802408BC -/* A9D3F0 802407C0 0062102A */ slt $v0, $v1, $v0 -/* A9D3F4 802407C4 14400038 */ bnez $v0, .L802408A8 -/* A9D3F8 802407C8 0260202D */ daddu $a0, $s3, $zero -/* A9D3FC 802407CC 2402000F */ addiu $v0, $zero, 0xf -/* A9D400 802407D0 10620040 */ beq $v1, $v0, .L802408D4 -/* A9D404 802407D4 24020063 */ addiu $v0, $zero, 0x63 -/* A9D408 802407D8 10620043 */ beq $v1, $v0, .L802408E8 -/* A9D40C 802407DC 00000000 */ nop -/* A9D410 802407E0 0809023C */ j .L802408F0 -/* A9D414 802407E4 00000000 */ nop -.L802407E8: -/* A9D418 802407E8 0280282D */ daddu $a1, $s4, $zero -/* A9D41C 802407EC 0C012568 */ jal func_800495A0 -/* A9D420 802407F0 02A0302D */ daddu $a2, $s5, $zero -/* A9D424 802407F4 96220086 */ lhu $v0, 0x86($s1) -/* A9D428 802407F8 A64200A8 */ sh $v0, 0xa8($s2) -.L802407FC: -/* A9D42C 802407FC 0260202D */ daddu $a0, $s3, $zero -/* A9D430 80240800 0280282D */ daddu $a1, $s4, $zero -/* A9D434 80240804 0C0125AE */ jal func_800496B8 -/* A9D438 80240808 02A0302D */ daddu $a2, $s5, $zero -/* A9D43C 8024080C 0809023C */ j .L802408F0 -/* A9D440 80240810 00000000 */ nop -.L80240814: -/* A9D444 80240814 0260202D */ daddu $a0, $s3, $zero -/* A9D448 80240818 0280282D */ daddu $a1, $s4, $zero -/* A9D44C 8024081C 0C0126D1 */ jal base_UnkNpcAIFunc1 -/* A9D450 80240820 02A0302D */ daddu $a2, $s5, $zero -/* A9D454 80240824 8E230088 */ lw $v1, 0x88($s1) -/* A9D458 80240828 24020006 */ addiu $v0, $zero, 6 -/* A9D45C 8024082C 14620014 */ bne $v1, $v0, .L80240880 -/* A9D460 80240830 0260202D */ daddu $a0, $s3, $zero -/* A9D464 80240834 0C00A67F */ jal rand_int -/* A9D468 80240838 24040064 */ addiu $a0, $zero, 0x64 -/* A9D46C 8024083C 28420021 */ slti $v0, $v0, 0x21 -/* A9D470 80240840 5040000F */ beql $v0, $zero, .L80240880 -/* A9D474 80240844 0260202D */ daddu $a0, $s3, $zero -/* A9D478 80240848 8E22008C */ lw $v0, 0x8c($s1) -/* A9D47C 8024084C 10400005 */ beqz $v0, .L80240864 -/* A9D480 80240850 3C020055 */ lui $v0, 0x55 -/* A9D484 80240854 3442002F */ ori $v0, $v0, 0x2f -/* A9D488 80240858 AE20008C */ sw $zero, 0x8c($s1) -/* A9D48C 8024085C 0809021C */ j .L80240870 -/* A9D490 80240860 A22000B5 */ sb $zero, 0xb5($s1) -.L80240864: -/* A9D494 80240864 3442002E */ ori $v0, $v0, 0x2e -/* A9D498 80240868 AE30008C */ sw $s0, 0x8c($s1) -/* A9D49C 8024086C A23000B5 */ sb $s0, 0xb5($s1) -.L80240870: -/* A9D4A0 80240870 AE420028 */ sw $v0, 0x28($s2) -/* A9D4A4 80240874 24020007 */ addiu $v0, $zero, 7 -/* A9D4A8 80240878 08090257 */ j .L8024095C_A9D58C -/* A9D4AC 8024087C AE220090 */ sw $v0, 0x90($s1) -.L80240880: -/* A9D4B0 80240880 0280282D */ daddu $a1, $s4, $zero -/* A9D4B4 80240884 0C012701 */ jal func_80049C04 -/* A9D4B8 80240888 02A0302D */ daddu $a2, $s5, $zero -/* A9D4BC 8024088C 0809023C */ j .L802408F0 -/* A9D4C0 80240890 00000000 */ nop -.L80240894: -/* A9D4C4 80240894 0260202D */ daddu $a0, $s3, $zero -/* A9D4C8 80240898 0280282D */ daddu $a1, $s4, $zero -/* A9D4CC 8024089C 0C09006C */ jal kpa_113_set_script_owner_npc_anim -/* A9D4D0 802408A0 02A0302D */ daddu $a2, $s5, $zero -/* A9D4D4 802408A4 0260202D */ daddu $a0, $s3, $zero -.L802408A8: -/* A9D4D8 802408A8 0280282D */ daddu $a1, $s4, $zero -/* A9D4DC 802408AC 0C09008B */ jal kpa_113_UnkDistFunc -/* A9D4E0 802408B0 02A0302D */ daddu $a2, $s5, $zero -/* A9D4E4 802408B4 0809023C */ j .L802408F0 -/* A9D4E8 802408B8 00000000 */ nop -.L802408BC: -/* A9D4EC 802408BC 0260202D */ daddu $a0, $s3, $zero -/* A9D4F0 802408C0 0280282D */ daddu $a1, $s4, $zero -/* A9D4F4 802408C4 0C0900D8 */ jal kpa_113_UnkNpcAIFunc12 -/* A9D4F8 802408C8 02A0302D */ daddu $a2, $s5, $zero -/* A9D4FC 802408CC 0809023C */ j .L802408F0 -/* A9D500 802408D0 00000000 */ nop -.L802408D4: -/* A9D504 802408D4 0280282D */ daddu $a1, $s4, $zero -/* A9D508 802408D8 0C090131 */ jal kpa_113_set_script_owner_npc_col_height -/* A9D50C 802408DC 02A0302D */ daddu $a2, $s5, $zero -/* A9D510 802408E0 0809023C */ j .L802408F0 -/* A9D514 802408E4 00000000 */ nop -.L802408E8: -/* A9D518 802408E8 0C0129CF */ jal func_8004A73C -/* A9D51C 802408EC 0260202D */ daddu $a0, $s3, $zero -.L802408F0: -/* A9D520 802408F0 8E230088 */ lw $v1, 0x88($s1) -/* A9D524 802408F4 24020006 */ addiu $v0, $zero, 6 -/* A9D528 802408F8 14620019 */ bne $v1, $v0, .L80240960 -/* A9D52C 802408FC 0000102D */ daddu $v0, $zero, $zero -/* A9D530 80240900 8E22008C */ lw $v0, 0x8c($s1) -/* A9D534 80240904 10400003 */ beqz $v0, .L80240914 -/* A9D538 80240908 24020001 */ addiu $v0, $zero, 1 -/* A9D53C 8024090C 08090246 */ j .L80240918 -/* A9D540 80240910 A22200B5 */ sb $v0, 0xb5($s1) -.L80240914: -/* A9D544 80240914 A22000B5 */ sb $zero, 0xb5($s1) -.L80240918: -/* A9D548 80240918 8E22008C */ lw $v0, 0x8c($s1) -/* A9D54C 8024091C 1040000F */ beqz $v0, .L8024095C_A9D58C -/* A9D550 80240920 3C03FFAA */ lui $v1, 0xffaa -/* A9D554 80240924 8E420028 */ lw $v0, 0x28($s2) -/* A9D558 80240928 3463FFFC */ ori $v1, $v1, 0xfffc -/* A9D55C 8024092C 00431821 */ addu $v1, $v0, $v1 -/* A9D560 80240930 2C620015 */ sltiu $v0, $v1, 0x15 -/* A9D564 80240934 10400009 */ beqz $v0, .L8024095C_A9D58C -/* A9D568 80240938 00031080 */ sll $v0, $v1, 2 -/* A9D56C 8024093C 3C018024 */ lui $at, %hi(jtbl_80241CF8_A9E928) -/* A9D570 80240940 00220821 */ addu $at, $at, $v0 -/* A9D574 80240944 8C221CF8 */ lw $v0, %lo(jtbl_80241CF8_A9E928)($at) -/* A9D578 80240948 00400008 */ jr $v0 -/* A9D57C 8024094C 00000000 */ nop -.L80240950_A9D580: -/* A9D580 80240950 8E420028 */ lw $v0, 0x28($s2) -/* A9D584 80240954 24420001 */ addiu $v0, $v0, 1 -/* A9D588 80240958 AE420028 */ sw $v0, 0x28($s2) -.L8024095C_A9D58C: -/* A9D58C 8024095C 0000102D */ daddu $v0, $zero, $zero -.L80240960: -/* A9D590 80240960 8FBF0068 */ lw $ra, 0x68($sp) -/* A9D594 80240964 8FB50064 */ lw $s5, 0x64($sp) -/* A9D598 80240968 8FB40060 */ lw $s4, 0x60($sp) -/* A9D59C 8024096C 8FB3005C */ lw $s3, 0x5c($sp) -/* A9D5A0 80240970 8FB20058 */ lw $s2, 0x58($sp) -/* A9D5A4 80240974 8FB10054 */ lw $s1, 0x54($sp) -/* A9D5A8 80240978 8FB00050 */ lw $s0, 0x50($sp) -/* A9D5AC 8024097C 03E00008 */ jr $ra -/* A9D5B0 80240980 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802415E0_A61FB0.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802415E0_A61FB0.s deleted file mode 100644 index 81345e4f38..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802415E0_A61FB0.s +++ /dev/null @@ -1,309 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80243660_A64030 -.word .L802419EC_A623BC, .L802419F8_A623C8, .L802419F8_A623C8, .L802419F8_A623C8, .L802419F8_A623C8, .L802419F8_A623C8, .L802419F8_A623C8, .L802419F8_A623C8, .L802419EC_A623BC, .L802419F8_A623C8, .L802419EC_A623BC, .L802419F8_A623C8, .L802419EC_A623BC, .L802419F8_A623C8, .L802419EC_A623BC, .L802419F8_A623C8, .L802419F8_A623C8, .L802419F8_A623C8, .L802419EC_A623BC, .L802419F8_A623C8, .L802419EC_A623BC, 0, 0, 0 - -.section .text - -glabel func_802415E0_A61FB0 -/* A61FB0 802415E0 27BDFF90 */ addiu $sp, $sp, -0x70 -/* A61FB4 802415E4 AFB3005C */ sw $s3, 0x5c($sp) -/* A61FB8 802415E8 0080982D */ daddu $s3, $a0, $zero -/* A61FBC 802415EC AFBF0068 */ sw $ra, 0x68($sp) -/* A61FC0 802415F0 AFB50064 */ sw $s5, 0x64($sp) -/* A61FC4 802415F4 AFB40060 */ sw $s4, 0x60($sp) -/* A61FC8 802415F8 AFB20058 */ sw $s2, 0x58($sp) -/* A61FCC 802415FC AFB10054 */ sw $s1, 0x54($sp) -/* A61FD0 80241600 AFB00050 */ sw $s0, 0x50($sp) -/* A61FD4 80241604 8E710148 */ lw $s1, 0x148($s3) -/* A61FD8 80241608 86240008 */ lh $a0, 8($s1) -/* A61FDC 8024160C 0C00EABB */ jal get_npc_unsafe -/* A61FE0 80241610 00A0802D */ daddu $s0, $a1, $zero -/* A61FE4 80241614 8E63000C */ lw $v1, 0xc($s3) -/* A61FE8 80241618 0260202D */ daddu $a0, $s3, $zero -/* A61FEC 8024161C 8C650000 */ lw $a1, ($v1) -/* A61FF0 80241620 0C0B1EAF */ jal evt_get_variable -/* A61FF4 80241624 0040902D */ daddu $s2, $v0, $zero -/* A61FF8 80241628 AFA00028 */ sw $zero, 0x28($sp) -/* A61FFC 8024162C 8E2300D0 */ lw $v1, 0xd0($s1) -/* A62000 80241630 8C630030 */ lw $v1, 0x30($v1) -/* A62004 80241634 AFA3002C */ sw $v1, 0x2c($sp) -/* A62008 80241638 8E2300D0 */ lw $v1, 0xd0($s1) -/* A6200C 8024163C 8C63001C */ lw $v1, 0x1c($v1) -/* A62010 80241640 AFA30030 */ sw $v1, 0x30($sp) -/* A62014 80241644 8E2300D0 */ lw $v1, 0xd0($s1) -/* A62018 80241648 8C630024 */ lw $v1, 0x24($v1) -/* A6201C 8024164C AFA30034 */ sw $v1, 0x34($sp) -/* A62020 80241650 8E2300D0 */ lw $v1, 0xd0($s1) -/* A62024 80241654 8C630028 */ lw $v1, 0x28($v1) -/* A62028 80241658 27B50028 */ addiu $s5, $sp, 0x28 -/* A6202C 8024165C AFA30038 */ sw $v1, 0x38($sp) -/* A62030 80241660 8E2300D0 */ lw $v1, 0xd0($s1) -/* A62034 80241664 3C0142C8 */ lui $at, 0x42c8 -/* A62038 80241668 44810000 */ mtc1 $at, $f0 -/* A6203C 8024166C 8C63002C */ lw $v1, 0x2c($v1) -/* A62040 80241670 0040A02D */ daddu $s4, $v0, $zero -/* A62044 80241674 E7A00040 */ swc1 $f0, 0x40($sp) -/* A62048 80241678 A7A00044 */ sh $zero, 0x44($sp) -/* A6204C 8024167C 12000009 */ beqz $s0, .L802416A4 -/* A62050 80241680 AFA3003C */ sw $v1, 0x3c($sp) -/* A62054 80241684 864300A8 */ lh $v1, 0xa8($s2) -/* A62058 80241688 8E2200B0 */ lw $v0, 0xb0($s1) -/* A6205C 8024168C AE20008C */ sw $zero, 0x8c($s1) -/* A62060 80241690 A22000B5 */ sb $zero, 0xb5($s1) -/* A62064 80241694 34420008 */ ori $v0, $v0, 8 -/* A62068 80241698 AE230084 */ sw $v1, 0x84($s1) -/* A6206C 8024169C 080905AD */ j .L802416B4 -/* A62070 802416A0 AE2200B0 */ sw $v0, 0xb0($s1) -.L802416A4: -/* A62074 802416A4 8E2200B0 */ lw $v0, 0xb0($s1) -/* A62078 802416A8 30420004 */ andi $v0, $v0, 4 -/* A6207C 802416AC 10400047 */ beqz $v0, .L802417CC -/* A62080 802416B0 00000000 */ nop -.L802416B4: -/* A62084 802416B4 AE600070 */ sw $zero, 0x70($s3) -/* A62088 802416B8 A640008E */ sh $zero, 0x8e($s2) -/* A6208C 802416BC 8E2300CC */ lw $v1, 0xcc($s1) -/* A62090 802416C0 2404F7FF */ addiu $a0, $zero, -0x801 -/* A62094 802416C4 A2200007 */ sb $zero, 7($s1) -/* A62098 802416C8 8E420000 */ lw $v0, ($s2) -/* A6209C 802416CC 8C630000 */ lw $v1, ($v1) -/* A620A0 802416D0 00441024 */ and $v0, $v0, $a0 -/* A620A4 802416D4 AE420000 */ sw $v0, ($s2) -/* A620A8 802416D8 AE430028 */ sw $v1, 0x28($s2) -/* A620AC 802416DC 96220086 */ lhu $v0, 0x86($s1) -/* A620B0 802416E0 A64200A8 */ sh $v0, 0xa8($s2) -/* A620B4 802416E4 8E2200D0 */ lw $v0, 0xd0($s1) -/* A620B8 802416E8 AE200090 */ sw $zero, 0x90($s1) -/* A620BC 802416EC 8C420034 */ lw $v0, 0x34($v0) -/* A620C0 802416F0 14400006 */ bnez $v0, .L8024170C -/* A620C4 802416F4 2403FDFF */ addiu $v1, $zero, -0x201 -/* A620C8 802416F8 8E420000 */ lw $v0, ($s2) -/* A620CC 802416FC 2403FFF7 */ addiu $v1, $zero, -9 -/* A620D0 80241700 34420200 */ ori $v0, $v0, 0x200 -/* A620D4 80241704 080905C6 */ j .L80241718 -/* A620D8 80241708 00431024 */ and $v0, $v0, $v1 -.L8024170C: -/* A620DC 8024170C 8E420000 */ lw $v0, ($s2) -/* A620E0 80241710 00431024 */ and $v0, $v0, $v1 -/* A620E4 80241714 34420008 */ ori $v0, $v0, 8 -.L80241718: -/* A620E8 80241718 AE420000 */ sw $v0, ($s2) -/* A620EC 8024171C 8E2200B0 */ lw $v0, 0xb0($s1) -/* A620F0 80241720 30420004 */ andi $v0, $v0, 4 -/* A620F4 80241724 1040001E */ beqz $v0, .L802417A0 -/* A620F8 80241728 24040002 */ addiu $a0, $zero, 2 -/* A620FC 8024172C 0240282D */ daddu $a1, $s2, $zero -/* A62100 80241730 0000302D */ daddu $a2, $zero, $zero -/* A62104 80241734 24020063 */ addiu $v0, $zero, 0x63 -/* A62108 80241738 AE620070 */ sw $v0, 0x70($s3) -/* A6210C 8024173C AE600074 */ sw $zero, 0x74($s3) -/* A62110 80241740 864300A8 */ lh $v1, 0xa8($s2) -/* A62114 80241744 3C013F80 */ lui $at, 0x3f80 -/* A62118 80241748 44810000 */ mtc1 $at, $f0 -/* A6211C 8024174C 3C014000 */ lui $at, 0x4000 -/* A62120 80241750 44811000 */ mtc1 $at, $f2 -/* A62124 80241754 3C01C1A0 */ lui $at, 0xc1a0 -/* A62128 80241758 44812000 */ mtc1 $at, $f4 -/* A6212C 8024175C 24020028 */ addiu $v0, $zero, 0x28 -/* A62130 80241760 AFA2001C */ sw $v0, 0x1c($sp) -/* A62134 80241764 44833000 */ mtc1 $v1, $f6 -/* A62138 80241768 00000000 */ nop -/* A6213C 8024176C 468031A0 */ cvt.s.w $f6, $f6 -/* A62140 80241770 44073000 */ mfc1 $a3, $f6 -/* A62144 80241774 27A20048 */ addiu $v0, $sp, 0x48 -/* A62148 80241778 AFA20020 */ sw $v0, 0x20($sp) -/* A6214C 8024177C E7A00010 */ swc1 $f0, 0x10($sp) -/* A62150 80241780 E7A20014 */ swc1 $f2, 0x14($sp) -/* A62154 80241784 0C01BFA4 */ jal fx_emote -/* A62158 80241788 E7A40018 */ swc1 $f4, 0x18($sp) -/* A6215C 8024178C 8E2200B0 */ lw $v0, 0xb0($s1) -/* A62160 80241790 2403FFFB */ addiu $v1, $zero, -5 -/* A62164 80241794 00431024 */ and $v0, $v0, $v1 -/* A62168 80241798 080905F3 */ j .L802417CC -/* A6216C 8024179C AE2200B0 */ sw $v0, 0xb0($s1) -.L802417A0: -/* A62170 802417A0 8E220000 */ lw $v0, ($s1) -/* A62174 802417A4 3C034000 */ lui $v1, 0x4000 -/* A62178 802417A8 00431024 */ and $v0, $v0, $v1 -/* A6217C 802417AC 10400007 */ beqz $v0, .L802417CC -/* A62180 802417B0 3C03BFFF */ lui $v1, 0xbfff -/* A62184 802417B4 2402000C */ addiu $v0, $zero, 0xc -/* A62188 802417B8 AE620070 */ sw $v0, 0x70($s3) -/* A6218C 802417BC 8E220000 */ lw $v0, ($s1) -/* A62190 802417C0 3463FFFF */ ori $v1, $v1, 0xffff -/* A62194 802417C4 00431024 */ and $v0, $v0, $v1 -/* A62198 802417C8 AE220000 */ sw $v0, ($s1) -.L802417CC: -/* A6219C 802417CC 8E220090 */ lw $v0, 0x90($s1) -/* A621A0 802417D0 1840000C */ blez $v0, .L80241804 -/* A621A4 802417D4 2442FFFF */ addiu $v0, $v0, -1 -/* A621A8 802417D8 14400087 */ bnez $v0, .L802419F8_A623C8 -/* A621AC 802417DC AE220090 */ sw $v0, 0x90($s1) -/* A621B0 802417E0 3C03FFAA */ lui $v1, 0xffaa -/* A621B4 802417E4 8E420028 */ lw $v0, 0x28($s2) -/* A621B8 802417E8 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* A621BC 802417EC 00431021 */ addu $v0, $v0, $v1 -/* A621C0 802417F0 2C420002 */ sltiu $v0, $v0, 2 -/* A621C4 802417F4 10400003 */ beqz $v0, .L80241804 -/* A621C8 802417F8 3C020055 */ lui $v0, 0x55 -/* A621CC 802417FC 3442000C */ ori $v0, $v0, 0xc -/* A621D0 80241800 AE420028 */ sw $v0, 0x28($s2) -.L80241804: -/* A621D4 80241804 8E630070 */ lw $v1, 0x70($s3) -/* A621D8 80241808 2402000C */ addiu $v0, $zero, 0xc -/* A621DC 8024180C 10620048 */ beq $v1, $v0, .L80241930 -/* A621E0 80241810 2862000D */ slti $v0, $v1, 0xd -/* A621E4 80241814 1040000F */ beqz $v0, .L80241854 -/* A621E8 80241818 24100001 */ addiu $s0, $zero, 1 -/* A621EC 8024181C 1070001E */ beq $v1, $s0, .L80241898 -/* A621F0 80241820 28620002 */ slti $v0, $v1, 2 -/* A621F4 80241824 10400005 */ beqz $v0, .L8024183C -/* A621F8 80241828 24020002 */ addiu $v0, $zero, 2 -/* A621FC 8024182C 10600015 */ beqz $v1, .L80241884 -/* A62200 80241830 0260202D */ daddu $a0, $s3, $zero -/* A62204 80241834 08090663 */ j .L8024198C -/* A62208 80241838 00000000 */ nop -.L8024183C: -/* A6220C 8024183C 1062001C */ beq $v1, $v0, .L802418B0 -/* A62210 80241840 24020003 */ addiu $v0, $zero, 3 -/* A62214 80241844 10620035 */ beq $v1, $v0, .L8024191C -/* A62218 80241848 0260202D */ daddu $a0, $s3, $zero -/* A6221C 8024184C 08090663 */ j .L8024198C -/* A62220 80241850 00000000 */ nop -.L80241854: -/* A62224 80241854 2402000E */ addiu $v0, $zero, 0xe -/* A62228 80241858 1062003F */ beq $v1, $v0, .L80241958 -/* A6222C 8024185C 0062102A */ slt $v0, $v1, $v0 -/* A62230 80241860 14400038 */ bnez $v0, .L80241944 -/* A62234 80241864 0260202D */ daddu $a0, $s3, $zero -/* A62238 80241868 2402000F */ addiu $v0, $zero, 0xf -/* A6223C 8024186C 10620040 */ beq $v1, $v0, .L80241970 -/* A62240 80241870 24020063 */ addiu $v0, $zero, 0x63 -/* A62244 80241874 10620043 */ beq $v1, $v0, .L80241984 -/* A62248 80241878 00000000 */ nop -/* A6224C 8024187C 08090663 */ j .L8024198C -/* A62250 80241880 00000000 */ nop -.L80241884: -/* A62254 80241884 0280282D */ daddu $a1, $s4, $zero -/* A62258 80241888 0C012568 */ jal func_800495A0 -/* A6225C 8024188C 02A0302D */ daddu $a2, $s5, $zero -/* A62260 80241890 96220086 */ lhu $v0, 0x86($s1) -/* A62264 80241894 A64200A8 */ sh $v0, 0xa8($s2) -.L80241898: -/* A62268 80241898 0260202D */ daddu $a0, $s3, $zero -/* A6226C 8024189C 0280282D */ daddu $a1, $s4, $zero -/* A62270 802418A0 0C0125AE */ jal func_800496B8 -/* A62274 802418A4 02A0302D */ daddu $a2, $s5, $zero -/* A62278 802418A8 08090663 */ j .L8024198C -/* A6227C 802418AC 00000000 */ nop -.L802418B0: -/* A62280 802418B0 0260202D */ daddu $a0, $s3, $zero -/* A62284 802418B4 0280282D */ daddu $a1, $s4, $zero -/* A62288 802418B8 0C0126D1 */ jal base_UnkNpcAIFunc1 -/* A6228C 802418BC 02A0302D */ daddu $a2, $s5, $zero -/* A62290 802418C0 8E230088 */ lw $v1, 0x88($s1) -/* A62294 802418C4 24020006 */ addiu $v0, $zero, 6 -/* A62298 802418C8 14620014 */ bne $v1, $v0, .L8024191C -/* A6229C 802418CC 0260202D */ daddu $a0, $s3, $zero -/* A622A0 802418D0 0C00A67F */ jal rand_int -/* A622A4 802418D4 24040064 */ addiu $a0, $zero, 0x64 -/* A622A8 802418D8 28420021 */ slti $v0, $v0, 0x21 -/* A622AC 802418DC 5040000F */ beql $v0, $zero, .L8024191C -/* A622B0 802418E0 0260202D */ daddu $a0, $s3, $zero -/* A622B4 802418E4 8E22008C */ lw $v0, 0x8c($s1) -/* A622B8 802418E8 10400005 */ beqz $v0, .L80241900 -/* A622BC 802418EC 3C020055 */ lui $v0, 0x55 -/* A622C0 802418F0 3442002F */ ori $v0, $v0, 0x2f -/* A622C4 802418F4 AE20008C */ sw $zero, 0x8c($s1) -/* A622C8 802418F8 08090643 */ j .L8024190C -/* A622CC 802418FC A22000B5 */ sb $zero, 0xb5($s1) -.L80241900: -/* A622D0 80241900 3442002E */ ori $v0, $v0, 0x2e -/* A622D4 80241904 AE30008C */ sw $s0, 0x8c($s1) -/* A622D8 80241908 A23000B5 */ sb $s0, 0xb5($s1) -.L8024190C: -/* A622DC 8024190C AE420028 */ sw $v0, 0x28($s2) -/* A622E0 80241910 24020007 */ addiu $v0, $zero, 7 -/* A622E4 80241914 0809067E */ j .L802419F8_A623C8 -/* A622E8 80241918 AE220090 */ sw $v0, 0x90($s1) -.L8024191C: -/* A622EC 8024191C 0280282D */ daddu $a1, $s4, $zero -/* A622F0 80241920 0C012701 */ jal func_80049C04 -/* A622F4 80241924 02A0302D */ daddu $a2, $s5, $zero -/* A622F8 80241928 08090663 */ j .L8024198C -/* A622FC 8024192C 00000000 */ nop -.L80241930: -/* A62300 80241930 0260202D */ daddu $a0, $s3, $zero -/* A62304 80241934 0280282D */ daddu $a1, $s4, $zero -/* A62308 80241938 0C090493 */ jal kpa_50_set_script_owner_npc_anim -/* A6230C 8024193C 02A0302D */ daddu $a2, $s5, $zero -/* A62310 80241940 0260202D */ daddu $a0, $s3, $zero -.L80241944: -/* A62314 80241944 0280282D */ daddu $a1, $s4, $zero -/* A62318 80241948 0C0904B2 */ jal kpa_50_UnkDistFunc -/* A6231C 8024194C 02A0302D */ daddu $a2, $s5, $zero -/* A62320 80241950 08090663 */ j .L8024198C -/* A62324 80241954 00000000 */ nop -.L80241958: -/* A62328 80241958 0260202D */ daddu $a0, $s3, $zero -/* A6232C 8024195C 0280282D */ daddu $a1, $s4, $zero -/* A62330 80241960 0C0904FF */ jal kpa_50_UnkNpcAIFunc12 -/* A62334 80241964 02A0302D */ daddu $a2, $s5, $zero -/* A62338 80241968 08090663 */ j .L8024198C -/* A6233C 8024196C 00000000 */ nop -.L80241970: -/* A62340 80241970 0280282D */ daddu $a1, $s4, $zero -/* A62344 80241974 0C090558 */ jal kpa_50_set_script_owner_npc_col_height -/* A62348 80241978 02A0302D */ daddu $a2, $s5, $zero -/* A6234C 8024197C 08090663 */ j .L8024198C -/* A62350 80241980 00000000 */ nop -.L80241984: -/* A62354 80241984 0C0129CF */ jal func_8004A73C -/* A62358 80241988 0260202D */ daddu $a0, $s3, $zero -.L8024198C: -/* A6235C 8024198C 8E230088 */ lw $v1, 0x88($s1) -/* A62360 80241990 24020006 */ addiu $v0, $zero, 6 -/* A62364 80241994 14620019 */ bne $v1, $v0, .L802419FC -/* A62368 80241998 0000102D */ daddu $v0, $zero, $zero -/* A6236C 8024199C 8E22008C */ lw $v0, 0x8c($s1) -/* A62370 802419A0 10400003 */ beqz $v0, .L802419B0 -/* A62374 802419A4 24020001 */ addiu $v0, $zero, 1 -/* A62378 802419A8 0809066D */ j .L802419B4 -/* A6237C 802419AC A22200B5 */ sb $v0, 0xb5($s1) -.L802419B0: -/* A62380 802419B0 A22000B5 */ sb $zero, 0xb5($s1) -.L802419B4: -/* A62384 802419B4 8E22008C */ lw $v0, 0x8c($s1) -/* A62388 802419B8 1040000F */ beqz $v0, .L802419F8_A623C8 -/* A6238C 802419BC 3C03FFAA */ lui $v1, 0xffaa -/* A62390 802419C0 8E420028 */ lw $v0, 0x28($s2) -/* A62394 802419C4 3463FFFC */ ori $v1, $v1, 0xfffc -/* A62398 802419C8 00431821 */ addu $v1, $v0, $v1 -/* A6239C 802419CC 2C620015 */ sltiu $v0, $v1, 0x15 -/* A623A0 802419D0 10400009 */ beqz $v0, .L802419F8_A623C8 -/* A623A4 802419D4 00031080 */ sll $v0, $v1, 2 -/* A623A8 802419D8 3C018024 */ lui $at, %hi(jtbl_80243660_A64030) -/* A623AC 802419DC 00220821 */ addu $at, $at, $v0 -/* A623B0 802419E0 8C223660 */ lw $v0, %lo(jtbl_80243660_A64030)($at) -/* A623B4 802419E4 00400008 */ jr $v0 -/* A623B8 802419E8 00000000 */ nop -.L802419EC_A623BC: -/* A623BC 802419EC 8E420028 */ lw $v0, 0x28($s2) -/* A623C0 802419F0 24420001 */ addiu $v0, $v0, 1 -/* A623C4 802419F4 AE420028 */ sw $v0, 0x28($s2) -.L802419F8_A623C8: -/* A623C8 802419F8 0000102D */ daddu $v0, $zero, $zero -.L802419FC: -/* A623CC 802419FC 8FBF0068 */ lw $ra, 0x68($sp) -/* A623D0 80241A00 8FB50064 */ lw $s5, 0x64($sp) -/* A623D4 80241A04 8FB40060 */ lw $s4, 0x60($sp) -/* A623D8 80241A08 8FB3005C */ lw $s3, 0x5c($sp) -/* A623DC 80241A0C 8FB20058 */ lw $s2, 0x58($sp) -/* A623E0 80241A10 8FB10054 */ lw $s1, 0x54($sp) -/* A623E4 80241A14 8FB00050 */ lw $s0, 0x50($sp) -/* A623E8 80241A18 03E00008 */ jr $ra -/* A623EC 80241A1C 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802417E0_A65870.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802417E0_A65870.s deleted file mode 100644 index d192a468ed..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802417E0_A65870.s +++ /dev/null @@ -1,309 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80243010_A670A0 -.word .L80241BEC_A65C7C, .L80241BF8_A65C88, .L80241BF8_A65C88, .L80241BF8_A65C88, .L80241BF8_A65C88, .L80241BF8_A65C88, .L80241BF8_A65C88, .L80241BF8_A65C88, .L80241BEC_A65C7C, .L80241BF8_A65C88, .L80241BEC_A65C7C, .L80241BF8_A65C88, .L80241BEC_A65C7C, .L80241BF8_A65C88, .L80241BEC_A65C7C, .L80241BF8_A65C88, .L80241BF8_A65C88, .L80241BF8_A65C88, .L80241BEC_A65C7C, .L80241BF8_A65C88, .L80241BEC_A65C7C, 0, 0, 0 - -.section .text - -glabel func_802417E0_A65870 -/* A65870 802417E0 27BDFF90 */ addiu $sp, $sp, -0x70 -/* A65874 802417E4 AFB3005C */ sw $s3, 0x5c($sp) -/* A65878 802417E8 0080982D */ daddu $s3, $a0, $zero -/* A6587C 802417EC AFBF0068 */ sw $ra, 0x68($sp) -/* A65880 802417F0 AFB50064 */ sw $s5, 0x64($sp) -/* A65884 802417F4 AFB40060 */ sw $s4, 0x60($sp) -/* A65888 802417F8 AFB20058 */ sw $s2, 0x58($sp) -/* A6588C 802417FC AFB10054 */ sw $s1, 0x54($sp) -/* A65890 80241800 AFB00050 */ sw $s0, 0x50($sp) -/* A65894 80241804 8E710148 */ lw $s1, 0x148($s3) -/* A65898 80241808 86240008 */ lh $a0, 8($s1) -/* A6589C 8024180C 0C00EABB */ jal get_npc_unsafe -/* A658A0 80241810 00A0802D */ daddu $s0, $a1, $zero -/* A658A4 80241814 8E63000C */ lw $v1, 0xc($s3) -/* A658A8 80241818 0260202D */ daddu $a0, $s3, $zero -/* A658AC 8024181C 8C650000 */ lw $a1, ($v1) -/* A658B0 80241820 0C0B1EAF */ jal evt_get_variable -/* A658B4 80241824 0040902D */ daddu $s2, $v0, $zero -/* A658B8 80241828 AFA00028 */ sw $zero, 0x28($sp) -/* A658BC 8024182C 8E2300D0 */ lw $v1, 0xd0($s1) -/* A658C0 80241830 8C630030 */ lw $v1, 0x30($v1) -/* A658C4 80241834 AFA3002C */ sw $v1, 0x2c($sp) -/* A658C8 80241838 8E2300D0 */ lw $v1, 0xd0($s1) -/* A658CC 8024183C 8C63001C */ lw $v1, 0x1c($v1) -/* A658D0 80241840 AFA30030 */ sw $v1, 0x30($sp) -/* A658D4 80241844 8E2300D0 */ lw $v1, 0xd0($s1) -/* A658D8 80241848 8C630024 */ lw $v1, 0x24($v1) -/* A658DC 8024184C AFA30034 */ sw $v1, 0x34($sp) -/* A658E0 80241850 8E2300D0 */ lw $v1, 0xd0($s1) -/* A658E4 80241854 8C630028 */ lw $v1, 0x28($v1) -/* A658E8 80241858 27B50028 */ addiu $s5, $sp, 0x28 -/* A658EC 8024185C AFA30038 */ sw $v1, 0x38($sp) -/* A658F0 80241860 8E2300D0 */ lw $v1, 0xd0($s1) -/* A658F4 80241864 3C0142C8 */ lui $at, 0x42c8 -/* A658F8 80241868 44810000 */ mtc1 $at, $f0 -/* A658FC 8024186C 8C63002C */ lw $v1, 0x2c($v1) -/* A65900 80241870 0040A02D */ daddu $s4, $v0, $zero -/* A65904 80241874 E7A00040 */ swc1 $f0, 0x40($sp) -/* A65908 80241878 A7A00044 */ sh $zero, 0x44($sp) -/* A6590C 8024187C 12000009 */ beqz $s0, .L802418A4 -/* A65910 80241880 AFA3003C */ sw $v1, 0x3c($sp) -/* A65914 80241884 864300A8 */ lh $v1, 0xa8($s2) -/* A65918 80241888 8E2200B0 */ lw $v0, 0xb0($s1) -/* A6591C 8024188C AE20008C */ sw $zero, 0x8c($s1) -/* A65920 80241890 A22000B5 */ sb $zero, 0xb5($s1) -/* A65924 80241894 34420008 */ ori $v0, $v0, 8 -/* A65928 80241898 AE230084 */ sw $v1, 0x84($s1) -/* A6592C 8024189C 0809062D */ j .L802418B4 -/* A65930 802418A0 AE2200B0 */ sw $v0, 0xb0($s1) -.L802418A4: -/* A65934 802418A4 8E2200B0 */ lw $v0, 0xb0($s1) -/* A65938 802418A8 30420004 */ andi $v0, $v0, 4 -/* A6593C 802418AC 10400047 */ beqz $v0, .L802419CC -/* A65940 802418B0 00000000 */ nop -.L802418B4: -/* A65944 802418B4 AE600070 */ sw $zero, 0x70($s3) -/* A65948 802418B8 A640008E */ sh $zero, 0x8e($s2) -/* A6594C 802418BC 8E2300CC */ lw $v1, 0xcc($s1) -/* A65950 802418C0 2404F7FF */ addiu $a0, $zero, -0x801 -/* A65954 802418C4 A2200007 */ sb $zero, 7($s1) -/* A65958 802418C8 8E420000 */ lw $v0, ($s2) -/* A6595C 802418CC 8C630000 */ lw $v1, ($v1) -/* A65960 802418D0 00441024 */ and $v0, $v0, $a0 -/* A65964 802418D4 AE420000 */ sw $v0, ($s2) -/* A65968 802418D8 AE430028 */ sw $v1, 0x28($s2) -/* A6596C 802418DC 96220086 */ lhu $v0, 0x86($s1) -/* A65970 802418E0 A64200A8 */ sh $v0, 0xa8($s2) -/* A65974 802418E4 8E2200D0 */ lw $v0, 0xd0($s1) -/* A65978 802418E8 AE200090 */ sw $zero, 0x90($s1) -/* A6597C 802418EC 8C420034 */ lw $v0, 0x34($v0) -/* A65980 802418F0 14400006 */ bnez $v0, .L8024190C -/* A65984 802418F4 2403FDFF */ addiu $v1, $zero, -0x201 -/* A65988 802418F8 8E420000 */ lw $v0, ($s2) -/* A6598C 802418FC 2403FFF7 */ addiu $v1, $zero, -9 -/* A65990 80241900 34420200 */ ori $v0, $v0, 0x200 -/* A65994 80241904 08090646 */ j .L80241918 -/* A65998 80241908 00431024 */ and $v0, $v0, $v1 -.L8024190C: -/* A6599C 8024190C 8E420000 */ lw $v0, ($s2) -/* A659A0 80241910 00431024 */ and $v0, $v0, $v1 -/* A659A4 80241914 34420008 */ ori $v0, $v0, 8 -.L80241918: -/* A659A8 80241918 AE420000 */ sw $v0, ($s2) -/* A659AC 8024191C 8E2200B0 */ lw $v0, 0xb0($s1) -/* A659B0 80241920 30420004 */ andi $v0, $v0, 4 -/* A659B4 80241924 1040001E */ beqz $v0, .L802419A0 -/* A659B8 80241928 24040002 */ addiu $a0, $zero, 2 -/* A659BC 8024192C 0240282D */ daddu $a1, $s2, $zero -/* A659C0 80241930 0000302D */ daddu $a2, $zero, $zero -/* A659C4 80241934 24020063 */ addiu $v0, $zero, 0x63 -/* A659C8 80241938 AE620070 */ sw $v0, 0x70($s3) -/* A659CC 8024193C AE600074 */ sw $zero, 0x74($s3) -/* A659D0 80241940 864300A8 */ lh $v1, 0xa8($s2) -/* A659D4 80241944 3C013F80 */ lui $at, 0x3f80 -/* A659D8 80241948 44810000 */ mtc1 $at, $f0 -/* A659DC 8024194C 3C014000 */ lui $at, 0x4000 -/* A659E0 80241950 44811000 */ mtc1 $at, $f2 -/* A659E4 80241954 3C01C1A0 */ lui $at, 0xc1a0 -/* A659E8 80241958 44812000 */ mtc1 $at, $f4 -/* A659EC 8024195C 24020028 */ addiu $v0, $zero, 0x28 -/* A659F0 80241960 AFA2001C */ sw $v0, 0x1c($sp) -/* A659F4 80241964 44833000 */ mtc1 $v1, $f6 -/* A659F8 80241968 00000000 */ nop -/* A659FC 8024196C 468031A0 */ cvt.s.w $f6, $f6 -/* A65A00 80241970 44073000 */ mfc1 $a3, $f6 -/* A65A04 80241974 27A20048 */ addiu $v0, $sp, 0x48 -/* A65A08 80241978 AFA20020 */ sw $v0, 0x20($sp) -/* A65A0C 8024197C E7A00010 */ swc1 $f0, 0x10($sp) -/* A65A10 80241980 E7A20014 */ swc1 $f2, 0x14($sp) -/* A65A14 80241984 0C01BFA4 */ jal fx_emote -/* A65A18 80241988 E7A40018 */ swc1 $f4, 0x18($sp) -/* A65A1C 8024198C 8E2200B0 */ lw $v0, 0xb0($s1) -/* A65A20 80241990 2403FFFB */ addiu $v1, $zero, -5 -/* A65A24 80241994 00431024 */ and $v0, $v0, $v1 -/* A65A28 80241998 08090673 */ j .L802419CC -/* A65A2C 8024199C AE2200B0 */ sw $v0, 0xb0($s1) -.L802419A0: -/* A65A30 802419A0 8E220000 */ lw $v0, ($s1) -/* A65A34 802419A4 3C034000 */ lui $v1, 0x4000 -/* A65A38 802419A8 00431024 */ and $v0, $v0, $v1 -/* A65A3C 802419AC 10400007 */ beqz $v0, .L802419CC -/* A65A40 802419B0 3C03BFFF */ lui $v1, 0xbfff -/* A65A44 802419B4 2402000C */ addiu $v0, $zero, 0xc -/* A65A48 802419B8 AE620070 */ sw $v0, 0x70($s3) -/* A65A4C 802419BC 8E220000 */ lw $v0, ($s1) -/* A65A50 802419C0 3463FFFF */ ori $v1, $v1, 0xffff -/* A65A54 802419C4 00431024 */ and $v0, $v0, $v1 -/* A65A58 802419C8 AE220000 */ sw $v0, ($s1) -.L802419CC: -/* A65A5C 802419CC 8E220090 */ lw $v0, 0x90($s1) -/* A65A60 802419D0 1840000C */ blez $v0, .L80241A04 -/* A65A64 802419D4 2442FFFF */ addiu $v0, $v0, -1 -/* A65A68 802419D8 14400087 */ bnez $v0, .L80241BF8_A65C88 -/* A65A6C 802419DC AE220090 */ sw $v0, 0x90($s1) -/* A65A70 802419E0 3C03FFAA */ lui $v1, 0xffaa -/* A65A74 802419E4 8E420028 */ lw $v0, 0x28($s2) -/* A65A78 802419E8 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* A65A7C 802419EC 00431021 */ addu $v0, $v0, $v1 -/* A65A80 802419F0 2C420002 */ sltiu $v0, $v0, 2 -/* A65A84 802419F4 10400003 */ beqz $v0, .L80241A04 -/* A65A88 802419F8 3C020055 */ lui $v0, 0x55 -/* A65A8C 802419FC 3442000C */ ori $v0, $v0, 0xc -/* A65A90 80241A00 AE420028 */ sw $v0, 0x28($s2) -.L80241A04: -/* A65A94 80241A04 8E630070 */ lw $v1, 0x70($s3) -/* A65A98 80241A08 2402000C */ addiu $v0, $zero, 0xc -/* A65A9C 80241A0C 10620048 */ beq $v1, $v0, .L80241B30 -/* A65AA0 80241A10 2862000D */ slti $v0, $v1, 0xd -/* A65AA4 80241A14 1040000F */ beqz $v0, .L80241A54 -/* A65AA8 80241A18 24100001 */ addiu $s0, $zero, 1 -/* A65AAC 80241A1C 1070001E */ beq $v1, $s0, .L80241A98 -/* A65AB0 80241A20 28620002 */ slti $v0, $v1, 2 -/* A65AB4 80241A24 10400005 */ beqz $v0, .L80241A3C -/* A65AB8 80241A28 24020002 */ addiu $v0, $zero, 2 -/* A65ABC 80241A2C 10600015 */ beqz $v1, .L80241A84 -/* A65AC0 80241A30 0260202D */ daddu $a0, $s3, $zero -/* A65AC4 80241A34 080906E3 */ j .L80241B8C -/* A65AC8 80241A38 00000000 */ nop -.L80241A3C: -/* A65ACC 80241A3C 1062001C */ beq $v1, $v0, .L80241AB0 -/* A65AD0 80241A40 24020003 */ addiu $v0, $zero, 3 -/* A65AD4 80241A44 10620035 */ beq $v1, $v0, .L80241B1C -/* A65AD8 80241A48 0260202D */ daddu $a0, $s3, $zero -/* A65ADC 80241A4C 080906E3 */ j .L80241B8C -/* A65AE0 80241A50 00000000 */ nop -.L80241A54: -/* A65AE4 80241A54 2402000E */ addiu $v0, $zero, 0xe -/* A65AE8 80241A58 1062003F */ beq $v1, $v0, .L80241B58 -/* A65AEC 80241A5C 0062102A */ slt $v0, $v1, $v0 -/* A65AF0 80241A60 14400038 */ bnez $v0, .L80241B44 -/* A65AF4 80241A64 0260202D */ daddu $a0, $s3, $zero -/* A65AF8 80241A68 2402000F */ addiu $v0, $zero, 0xf -/* A65AFC 80241A6C 10620040 */ beq $v1, $v0, .L80241B70 -/* A65B00 80241A70 24020063 */ addiu $v0, $zero, 0x63 -/* A65B04 80241A74 10620043 */ beq $v1, $v0, .L80241B84 -/* A65B08 80241A78 00000000 */ nop -/* A65B0C 80241A7C 080906E3 */ j .L80241B8C -/* A65B10 80241A80 00000000 */ nop -.L80241A84: -/* A65B14 80241A84 0280282D */ daddu $a1, $s4, $zero -/* A65B18 80241A88 0C012568 */ jal func_800495A0 -/* A65B1C 80241A8C 02A0302D */ daddu $a2, $s5, $zero -/* A65B20 80241A90 96220086 */ lhu $v0, 0x86($s1) -/* A65B24 80241A94 A64200A8 */ sh $v0, 0xa8($s2) -.L80241A98: -/* A65B28 80241A98 0260202D */ daddu $a0, $s3, $zero -/* A65B2C 80241A9C 0280282D */ daddu $a1, $s4, $zero -/* A65B30 80241AA0 0C0125AE */ jal func_800496B8 -/* A65B34 80241AA4 02A0302D */ daddu $a2, $s5, $zero -/* A65B38 80241AA8 080906E3 */ j .L80241B8C -/* A65B3C 80241AAC 00000000 */ nop -.L80241AB0: -/* A65B40 80241AB0 0260202D */ daddu $a0, $s3, $zero -/* A65B44 80241AB4 0280282D */ daddu $a1, $s4, $zero -/* A65B48 80241AB8 0C0126D1 */ jal base_UnkNpcAIFunc1 -/* A65B4C 80241ABC 02A0302D */ daddu $a2, $s5, $zero -/* A65B50 80241AC0 8E230088 */ lw $v1, 0x88($s1) -/* A65B54 80241AC4 24020006 */ addiu $v0, $zero, 6 -/* A65B58 80241AC8 14620014 */ bne $v1, $v0, .L80241B1C -/* A65B5C 80241ACC 0260202D */ daddu $a0, $s3, $zero -/* A65B60 80241AD0 0C00A67F */ jal rand_int -/* A65B64 80241AD4 24040064 */ addiu $a0, $zero, 0x64 -/* A65B68 80241AD8 28420021 */ slti $v0, $v0, 0x21 -/* A65B6C 80241ADC 5040000F */ beql $v0, $zero, .L80241B1C -/* A65B70 80241AE0 0260202D */ daddu $a0, $s3, $zero -/* A65B74 80241AE4 8E22008C */ lw $v0, 0x8c($s1) -/* A65B78 80241AE8 10400005 */ beqz $v0, .L80241B00 -/* A65B7C 80241AEC 3C020055 */ lui $v0, 0x55 -/* A65B80 80241AF0 3442002F */ ori $v0, $v0, 0x2f -/* A65B84 80241AF4 AE20008C */ sw $zero, 0x8c($s1) -/* A65B88 80241AF8 080906C3 */ j .L80241B0C -/* A65B8C 80241AFC A22000B5 */ sb $zero, 0xb5($s1) -.L80241B00: -/* A65B90 80241B00 3442002E */ ori $v0, $v0, 0x2e -/* A65B94 80241B04 AE30008C */ sw $s0, 0x8c($s1) -/* A65B98 80241B08 A23000B5 */ sb $s0, 0xb5($s1) -.L80241B0C: -/* A65B9C 80241B0C AE420028 */ sw $v0, 0x28($s2) -/* A65BA0 80241B10 24020007 */ addiu $v0, $zero, 7 -/* A65BA4 80241B14 080906FE */ j .L80241BF8_A65C88 -/* A65BA8 80241B18 AE220090 */ sw $v0, 0x90($s1) -.L80241B1C: -/* A65BAC 80241B1C 0280282D */ daddu $a1, $s4, $zero -/* A65BB0 80241B20 0C012701 */ jal func_80049C04 -/* A65BB4 80241B24 02A0302D */ daddu $a2, $s5, $zero -/* A65BB8 80241B28 080906E3 */ j .L80241B8C -/* A65BBC 80241B2C 00000000 */ nop -.L80241B30: -/* A65BC0 80241B30 0260202D */ daddu $a0, $s3, $zero -/* A65BC4 80241B34 0280282D */ daddu $a1, $s4, $zero -/* A65BC8 80241B38 0C090513 */ jal kpa_51_set_script_owner_npc_anim -/* A65BCC 80241B3C 02A0302D */ daddu $a2, $s5, $zero -/* A65BD0 80241B40 0260202D */ daddu $a0, $s3, $zero -.L80241B44: -/* A65BD4 80241B44 0280282D */ daddu $a1, $s4, $zero -/* A65BD8 80241B48 0C090532 */ jal kpa_51_UnkDistFunc -/* A65BDC 80241B4C 02A0302D */ daddu $a2, $s5, $zero -/* A65BE0 80241B50 080906E3 */ j .L80241B8C -/* A65BE4 80241B54 00000000 */ nop -.L80241B58: -/* A65BE8 80241B58 0260202D */ daddu $a0, $s3, $zero -/* A65BEC 80241B5C 0280282D */ daddu $a1, $s4, $zero -/* A65BF0 80241B60 0C09057F */ jal kpa_51_UnkNpcAIFunc12 -/* A65BF4 80241B64 02A0302D */ daddu $a2, $s5, $zero -/* A65BF8 80241B68 080906E3 */ j .L80241B8C -/* A65BFC 80241B6C 00000000 */ nop -.L80241B70: -/* A65C00 80241B70 0280282D */ daddu $a1, $s4, $zero -/* A65C04 80241B74 0C0905D8 */ jal kpa_51_set_script_owner_npc_col_height -/* A65C08 80241B78 02A0302D */ daddu $a2, $s5, $zero -/* A65C0C 80241B7C 080906E3 */ j .L80241B8C -/* A65C10 80241B80 00000000 */ nop -.L80241B84: -/* A65C14 80241B84 0C0129CF */ jal func_8004A73C -/* A65C18 80241B88 0260202D */ daddu $a0, $s3, $zero -.L80241B8C: -/* A65C1C 80241B8C 8E230088 */ lw $v1, 0x88($s1) -/* A65C20 80241B90 24020006 */ addiu $v0, $zero, 6 -/* A65C24 80241B94 14620019 */ bne $v1, $v0, .L80241BFC -/* A65C28 80241B98 0000102D */ daddu $v0, $zero, $zero -/* A65C2C 80241B9C 8E22008C */ lw $v0, 0x8c($s1) -/* A65C30 80241BA0 10400003 */ beqz $v0, .L80241BB0 -/* A65C34 80241BA4 24020001 */ addiu $v0, $zero, 1 -/* A65C38 80241BA8 080906ED */ j .L80241BB4 -/* A65C3C 80241BAC A22200B5 */ sb $v0, 0xb5($s1) -.L80241BB0: -/* A65C40 80241BB0 A22000B5 */ sb $zero, 0xb5($s1) -.L80241BB4: -/* A65C44 80241BB4 8E22008C */ lw $v0, 0x8c($s1) -/* A65C48 80241BB8 1040000F */ beqz $v0, .L80241BF8_A65C88 -/* A65C4C 80241BBC 3C03FFAA */ lui $v1, 0xffaa -/* A65C50 80241BC0 8E420028 */ lw $v0, 0x28($s2) -/* A65C54 80241BC4 3463FFFC */ ori $v1, $v1, 0xfffc -/* A65C58 80241BC8 00431821 */ addu $v1, $v0, $v1 -/* A65C5C 80241BCC 2C620015 */ sltiu $v0, $v1, 0x15 -/* A65C60 80241BD0 10400009 */ beqz $v0, .L80241BF8_A65C88 -/* A65C64 80241BD4 00031080 */ sll $v0, $v1, 2 -/* A65C68 80241BD8 3C018024 */ lui $at, %hi(jtbl_80243010_A670A0) -/* A65C6C 80241BDC 00220821 */ addu $at, $at, $v0 -/* A65C70 80241BE0 8C223010 */ lw $v0, %lo(jtbl_80243010_A670A0)($at) -/* A65C74 80241BE4 00400008 */ jr $v0 -/* A65C78 80241BE8 00000000 */ nop -.L80241BEC_A65C7C: -/* A65C7C 80241BEC 8E420028 */ lw $v0, 0x28($s2) -/* A65C80 80241BF0 24420001 */ addiu $v0, $v0, 1 -/* A65C84 80241BF4 AE420028 */ sw $v0, 0x28($s2) -.L80241BF8_A65C88: -/* A65C88 80241BF8 0000102D */ daddu $v0, $zero, $zero -.L80241BFC: -/* A65C8C 80241BFC 8FBF0068 */ lw $ra, 0x68($sp) -/* A65C90 80241C00 8FB50064 */ lw $s5, 0x64($sp) -/* A65C94 80241C04 8FB40060 */ lw $s4, 0x60($sp) -/* A65C98 80241C08 8FB3005C */ lw $s3, 0x5c($sp) -/* A65C9C 80241C0C 8FB20058 */ lw $s2, 0x58($sp) -/* A65CA0 80241C10 8FB10054 */ lw $s1, 0x54($sp) -/* A65CA4 80241C14 8FB00050 */ lw $s0, 0x50($sp) -/* A65CA8 80241C18 03E00008 */ jr $ra -/* A65CAC 80241C1C 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802406A4_A6EA84.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802406A4_A6EA84.s deleted file mode 100644 index 0420a8feed..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802406A4_A6EA84.s +++ /dev/null @@ -1,309 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80243CD8_A720B8 -.word .L80240AB0_A6EE90, .L80240ABC_A6EE9C, .L80240ABC_A6EE9C, .L80240ABC_A6EE9C, .L80240ABC_A6EE9C, .L80240ABC_A6EE9C, .L80240ABC_A6EE9C, .L80240ABC_A6EE9C, .L80240AB0_A6EE90, .L80240ABC_A6EE9C, .L80240AB0_A6EE90, .L80240ABC_A6EE9C, .L80240AB0_A6EE90, .L80240ABC_A6EE9C, .L80240AB0_A6EE90, .L80240ABC_A6EE9C, .L80240ABC_A6EE9C, .L80240ABC_A6EE9C, .L80240AB0_A6EE90, .L80240ABC_A6EE9C, .L80240AB0_A6EE90, 0 - -.section .text - -glabel func_802406A4_A6EA84 -/* A6EA84 802406A4 27BDFF90 */ addiu $sp, $sp, -0x70 -/* A6EA88 802406A8 AFB3005C */ sw $s3, 0x5c($sp) -/* A6EA8C 802406AC 0080982D */ daddu $s3, $a0, $zero -/* A6EA90 802406B0 AFBF0068 */ sw $ra, 0x68($sp) -/* A6EA94 802406B4 AFB50064 */ sw $s5, 0x64($sp) -/* A6EA98 802406B8 AFB40060 */ sw $s4, 0x60($sp) -/* A6EA9C 802406BC AFB20058 */ sw $s2, 0x58($sp) -/* A6EAA0 802406C0 AFB10054 */ sw $s1, 0x54($sp) -/* A6EAA4 802406C4 AFB00050 */ sw $s0, 0x50($sp) -/* A6EAA8 802406C8 8E710148 */ lw $s1, 0x148($s3) -/* A6EAAC 802406CC 86240008 */ lh $a0, 8($s1) -/* A6EAB0 802406D0 0C00EABB */ jal get_npc_unsafe -/* A6EAB4 802406D4 00A0802D */ daddu $s0, $a1, $zero -/* A6EAB8 802406D8 8E63000C */ lw $v1, 0xc($s3) -/* A6EABC 802406DC 0260202D */ daddu $a0, $s3, $zero -/* A6EAC0 802406E0 8C650000 */ lw $a1, ($v1) -/* A6EAC4 802406E4 0C0B1EAF */ jal evt_get_variable -/* A6EAC8 802406E8 0040902D */ daddu $s2, $v0, $zero -/* A6EACC 802406EC AFA00028 */ sw $zero, 0x28($sp) -/* A6EAD0 802406F0 8E2300D0 */ lw $v1, 0xd0($s1) -/* A6EAD4 802406F4 8C630030 */ lw $v1, 0x30($v1) -/* A6EAD8 802406F8 AFA3002C */ sw $v1, 0x2c($sp) -/* A6EADC 802406FC 8E2300D0 */ lw $v1, 0xd0($s1) -/* A6EAE0 80240700 8C63001C */ lw $v1, 0x1c($v1) -/* A6EAE4 80240704 AFA30030 */ sw $v1, 0x30($sp) -/* A6EAE8 80240708 8E2300D0 */ lw $v1, 0xd0($s1) -/* A6EAEC 8024070C 8C630024 */ lw $v1, 0x24($v1) -/* A6EAF0 80240710 AFA30034 */ sw $v1, 0x34($sp) -/* A6EAF4 80240714 8E2300D0 */ lw $v1, 0xd0($s1) -/* A6EAF8 80240718 8C630028 */ lw $v1, 0x28($v1) -/* A6EAFC 8024071C 27B50028 */ addiu $s5, $sp, 0x28 -/* A6EB00 80240720 AFA30038 */ sw $v1, 0x38($sp) -/* A6EB04 80240724 8E2300D0 */ lw $v1, 0xd0($s1) -/* A6EB08 80240728 3C0142C8 */ lui $at, 0x42c8 -/* A6EB0C 8024072C 44810000 */ mtc1 $at, $f0 -/* A6EB10 80240730 8C63002C */ lw $v1, 0x2c($v1) -/* A6EB14 80240734 0040A02D */ daddu $s4, $v0, $zero -/* A6EB18 80240738 E7A00040 */ swc1 $f0, 0x40($sp) -/* A6EB1C 8024073C A7A00044 */ sh $zero, 0x44($sp) -/* A6EB20 80240740 12000009 */ beqz $s0, .L80240768 -/* A6EB24 80240744 AFA3003C */ sw $v1, 0x3c($sp) -/* A6EB28 80240748 864300A8 */ lh $v1, 0xa8($s2) -/* A6EB2C 8024074C 8E2200B0 */ lw $v0, 0xb0($s1) -/* A6EB30 80240750 AE20008C */ sw $zero, 0x8c($s1) -/* A6EB34 80240754 A22000B5 */ sb $zero, 0xb5($s1) -/* A6EB38 80240758 34420008 */ ori $v0, $v0, 8 -/* A6EB3C 8024075C AE230084 */ sw $v1, 0x84($s1) -/* A6EB40 80240760 080901DE */ j .L80240778 -/* A6EB44 80240764 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240768: -/* A6EB48 80240768 8E2200B0 */ lw $v0, 0xb0($s1) -/* A6EB4C 8024076C 30420004 */ andi $v0, $v0, 4 -/* A6EB50 80240770 10400047 */ beqz $v0, .L80240890 -/* A6EB54 80240774 00000000 */ nop -.L80240778: -/* A6EB58 80240778 AE600070 */ sw $zero, 0x70($s3) -/* A6EB5C 8024077C A640008E */ sh $zero, 0x8e($s2) -/* A6EB60 80240780 8E2300CC */ lw $v1, 0xcc($s1) -/* A6EB64 80240784 2404F7FF */ addiu $a0, $zero, -0x801 -/* A6EB68 80240788 A2200007 */ sb $zero, 7($s1) -/* A6EB6C 8024078C 8E420000 */ lw $v0, ($s2) -/* A6EB70 80240790 8C630000 */ lw $v1, ($v1) -/* A6EB74 80240794 00441024 */ and $v0, $v0, $a0 -/* A6EB78 80240798 AE420000 */ sw $v0, ($s2) -/* A6EB7C 8024079C AE430028 */ sw $v1, 0x28($s2) -/* A6EB80 802407A0 96220086 */ lhu $v0, 0x86($s1) -/* A6EB84 802407A4 A64200A8 */ sh $v0, 0xa8($s2) -/* A6EB88 802407A8 8E2200D0 */ lw $v0, 0xd0($s1) -/* A6EB8C 802407AC AE200090 */ sw $zero, 0x90($s1) -/* A6EB90 802407B0 8C420034 */ lw $v0, 0x34($v0) -/* A6EB94 802407B4 14400006 */ bnez $v0, .L802407D0 -/* A6EB98 802407B8 2403FDFF */ addiu $v1, $zero, -0x201 -/* A6EB9C 802407BC 8E420000 */ lw $v0, ($s2) -/* A6EBA0 802407C0 2403FFF7 */ addiu $v1, $zero, -9 -/* A6EBA4 802407C4 34420200 */ ori $v0, $v0, 0x200 -/* A6EBA8 802407C8 080901F7 */ j .L802407DC -/* A6EBAC 802407CC 00431024 */ and $v0, $v0, $v1 -.L802407D0: -/* A6EBB0 802407D0 8E420000 */ lw $v0, ($s2) -/* A6EBB4 802407D4 00431024 */ and $v0, $v0, $v1 -/* A6EBB8 802407D8 34420008 */ ori $v0, $v0, 8 -.L802407DC: -/* A6EBBC 802407DC AE420000 */ sw $v0, ($s2) -/* A6EBC0 802407E0 8E2200B0 */ lw $v0, 0xb0($s1) -/* A6EBC4 802407E4 30420004 */ andi $v0, $v0, 4 -/* A6EBC8 802407E8 1040001E */ beqz $v0, .L80240864 -/* A6EBCC 802407EC 24040002 */ addiu $a0, $zero, 2 -/* A6EBD0 802407F0 0240282D */ daddu $a1, $s2, $zero -/* A6EBD4 802407F4 0000302D */ daddu $a2, $zero, $zero -/* A6EBD8 802407F8 24020063 */ addiu $v0, $zero, 0x63 -/* A6EBDC 802407FC AE620070 */ sw $v0, 0x70($s3) -/* A6EBE0 80240800 AE600074 */ sw $zero, 0x74($s3) -/* A6EBE4 80240804 864300A8 */ lh $v1, 0xa8($s2) -/* A6EBE8 80240808 3C013F80 */ lui $at, 0x3f80 -/* A6EBEC 8024080C 44810000 */ mtc1 $at, $f0 -/* A6EBF0 80240810 3C014000 */ lui $at, 0x4000 -/* A6EBF4 80240814 44811000 */ mtc1 $at, $f2 -/* A6EBF8 80240818 3C01C1A0 */ lui $at, 0xc1a0 -/* A6EBFC 8024081C 44812000 */ mtc1 $at, $f4 -/* A6EC00 80240820 24020028 */ addiu $v0, $zero, 0x28 -/* A6EC04 80240824 AFA2001C */ sw $v0, 0x1c($sp) -/* A6EC08 80240828 44833000 */ mtc1 $v1, $f6 -/* A6EC0C 8024082C 00000000 */ nop -/* A6EC10 80240830 468031A0 */ cvt.s.w $f6, $f6 -/* A6EC14 80240834 44073000 */ mfc1 $a3, $f6 -/* A6EC18 80240838 27A20048 */ addiu $v0, $sp, 0x48 -/* A6EC1C 8024083C AFA20020 */ sw $v0, 0x20($sp) -/* A6EC20 80240840 E7A00010 */ swc1 $f0, 0x10($sp) -/* A6EC24 80240844 E7A20014 */ swc1 $f2, 0x14($sp) -/* A6EC28 80240848 0C01BFA4 */ jal fx_emote -/* A6EC2C 8024084C E7A40018 */ swc1 $f4, 0x18($sp) -/* A6EC30 80240850 8E2200B0 */ lw $v0, 0xb0($s1) -/* A6EC34 80240854 2403FFFB */ addiu $v1, $zero, -5 -/* A6EC38 80240858 00431024 */ and $v0, $v0, $v1 -/* A6EC3C 8024085C 08090224 */ j .L80240890 -/* A6EC40 80240860 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240864: -/* A6EC44 80240864 8E220000 */ lw $v0, ($s1) -/* A6EC48 80240868 3C034000 */ lui $v1, 0x4000 -/* A6EC4C 8024086C 00431024 */ and $v0, $v0, $v1 -/* A6EC50 80240870 10400007 */ beqz $v0, .L80240890 -/* A6EC54 80240874 3C03BFFF */ lui $v1, 0xbfff -/* A6EC58 80240878 2402000C */ addiu $v0, $zero, 0xc -/* A6EC5C 8024087C AE620070 */ sw $v0, 0x70($s3) -/* A6EC60 80240880 8E220000 */ lw $v0, ($s1) -/* A6EC64 80240884 3463FFFF */ ori $v1, $v1, 0xffff -/* A6EC68 80240888 00431024 */ and $v0, $v0, $v1 -/* A6EC6C 8024088C AE220000 */ sw $v0, ($s1) -.L80240890: -/* A6EC70 80240890 8E220090 */ lw $v0, 0x90($s1) -/* A6EC74 80240894 1840000C */ blez $v0, .L802408C8 -/* A6EC78 80240898 2442FFFF */ addiu $v0, $v0, -1 -/* A6EC7C 8024089C 14400087 */ bnez $v0, .L80240ABC_A6EE9C -/* A6EC80 802408A0 AE220090 */ sw $v0, 0x90($s1) -/* A6EC84 802408A4 3C03FFAA */ lui $v1, 0xffaa -/* A6EC88 802408A8 8E420028 */ lw $v0, 0x28($s2) -/* A6EC8C 802408AC 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* A6EC90 802408B0 00431021 */ addu $v0, $v0, $v1 -/* A6EC94 802408B4 2C420002 */ sltiu $v0, $v0, 2 -/* A6EC98 802408B8 10400003 */ beqz $v0, .L802408C8 -/* A6EC9C 802408BC 3C020055 */ lui $v0, 0x55 -/* A6ECA0 802408C0 3442000C */ ori $v0, $v0, 0xc -/* A6ECA4 802408C4 AE420028 */ sw $v0, 0x28($s2) -.L802408C8: -/* A6ECA8 802408C8 8E630070 */ lw $v1, 0x70($s3) -/* A6ECAC 802408CC 2402000C */ addiu $v0, $zero, 0xc -/* A6ECB0 802408D0 10620048 */ beq $v1, $v0, .L802409F4 -/* A6ECB4 802408D4 2862000D */ slti $v0, $v1, 0xd -/* A6ECB8 802408D8 1040000F */ beqz $v0, .L80240918 -/* A6ECBC 802408DC 24100001 */ addiu $s0, $zero, 1 -/* A6ECC0 802408E0 1070001E */ beq $v1, $s0, .L8024095C -/* A6ECC4 802408E4 28620002 */ slti $v0, $v1, 2 -/* A6ECC8 802408E8 10400005 */ beqz $v0, .L80240900 -/* A6ECCC 802408EC 24020002 */ addiu $v0, $zero, 2 -/* A6ECD0 802408F0 10600015 */ beqz $v1, .L80240948 -/* A6ECD4 802408F4 0260202D */ daddu $a0, $s3, $zero -/* A6ECD8 802408F8 08090294 */ j .L80240A50 -/* A6ECDC 802408FC 00000000 */ nop -.L80240900: -/* A6ECE0 80240900 1062001C */ beq $v1, $v0, .L80240974 -/* A6ECE4 80240904 24020003 */ addiu $v0, $zero, 3 -/* A6ECE8 80240908 10620035 */ beq $v1, $v0, .L802409E0 -/* A6ECEC 8024090C 0260202D */ daddu $a0, $s3, $zero -/* A6ECF0 80240910 08090294 */ j .L80240A50 -/* A6ECF4 80240914 00000000 */ nop -.L80240918: -/* A6ECF8 80240918 2402000E */ addiu $v0, $zero, 0xe -/* A6ECFC 8024091C 1062003F */ beq $v1, $v0, .L80240A1C -/* A6ED00 80240920 0062102A */ slt $v0, $v1, $v0 -/* A6ED04 80240924 14400038 */ bnez $v0, .L80240A08 -/* A6ED08 80240928 0260202D */ daddu $a0, $s3, $zero -/* A6ED0C 8024092C 2402000F */ addiu $v0, $zero, 0xf -/* A6ED10 80240930 10620040 */ beq $v1, $v0, .L80240A34 -/* A6ED14 80240934 24020063 */ addiu $v0, $zero, 0x63 -/* A6ED18 80240938 10620043 */ beq $v1, $v0, .L80240A48 -/* A6ED1C 8024093C 00000000 */ nop -/* A6ED20 80240940 08090294 */ j .L80240A50 -/* A6ED24 80240944 00000000 */ nop -.L80240948: -/* A6ED28 80240948 0280282D */ daddu $a1, $s4, $zero -/* A6ED2C 8024094C 0C012568 */ jal func_800495A0 -/* A6ED30 80240950 02A0302D */ daddu $a2, $s5, $zero -/* A6ED34 80240954 96220086 */ lhu $v0, 0x86($s1) -/* A6ED38 80240958 A64200A8 */ sh $v0, 0xa8($s2) -.L8024095C: -/* A6ED3C 8024095C 0260202D */ daddu $a0, $s3, $zero -/* A6ED40 80240960 0280282D */ daddu $a1, $s4, $zero -/* A6ED44 80240964 0C0125AE */ jal func_800496B8 -/* A6ED48 80240968 02A0302D */ daddu $a2, $s5, $zero -/* A6ED4C 8024096C 08090294 */ j .L80240A50 -/* A6ED50 80240970 00000000 */ nop -.L80240974: -/* A6ED54 80240974 0260202D */ daddu $a0, $s3, $zero -/* A6ED58 80240978 0280282D */ daddu $a1, $s4, $zero -/* A6ED5C 8024097C 0C0126D1 */ jal base_UnkNpcAIFunc1 -/* A6ED60 80240980 02A0302D */ daddu $a2, $s5, $zero -/* A6ED64 80240984 8E230088 */ lw $v1, 0x88($s1) -/* A6ED68 80240988 24020006 */ addiu $v0, $zero, 6 -/* A6ED6C 8024098C 14620014 */ bne $v1, $v0, .L802409E0 -/* A6ED70 80240990 0260202D */ daddu $a0, $s3, $zero -/* A6ED74 80240994 0C00A67F */ jal rand_int -/* A6ED78 80240998 24040064 */ addiu $a0, $zero, 0x64 -/* A6ED7C 8024099C 28420021 */ slti $v0, $v0, 0x21 -/* A6ED80 802409A0 5040000F */ beql $v0, $zero, .L802409E0 -/* A6ED84 802409A4 0260202D */ daddu $a0, $s3, $zero -/* A6ED88 802409A8 8E22008C */ lw $v0, 0x8c($s1) -/* A6ED8C 802409AC 10400005 */ beqz $v0, .L802409C4 -/* A6ED90 802409B0 3C020055 */ lui $v0, 0x55 -/* A6ED94 802409B4 3442002F */ ori $v0, $v0, 0x2f -/* A6ED98 802409B8 AE20008C */ sw $zero, 0x8c($s1) -/* A6ED9C 802409BC 08090274 */ j .L802409D0 -/* A6EDA0 802409C0 A22000B5 */ sb $zero, 0xb5($s1) -.L802409C4: -/* A6EDA4 802409C4 3442002E */ ori $v0, $v0, 0x2e -/* A6EDA8 802409C8 AE30008C */ sw $s0, 0x8c($s1) -/* A6EDAC 802409CC A23000B5 */ sb $s0, 0xb5($s1) -.L802409D0: -/* A6EDB0 802409D0 AE420028 */ sw $v0, 0x28($s2) -/* A6EDB4 802409D4 24020007 */ addiu $v0, $zero, 7 -/* A6EDB8 802409D8 080902AF */ j .L80240ABC_A6EE9C -/* A6EDBC 802409DC AE220090 */ sw $v0, 0x90($s1) -.L802409E0: -/* A6EDC0 802409E0 0280282D */ daddu $a1, $s4, $zero -/* A6EDC4 802409E4 0C012701 */ jal func_80049C04 -/* A6EDC8 802409E8 02A0302D */ daddu $a2, $s5, $zero -/* A6EDCC 802409EC 08090294 */ j .L80240A50 -/* A6EDD0 802409F0 00000000 */ nop -.L802409F4: -/* A6EDD4 802409F4 0260202D */ daddu $a0, $s3, $zero -/* A6EDD8 802409F8 0280282D */ daddu $a1, $s4, $zero -/* A6EDDC 802409FC 0C0900C4 */ jal kpa_61_set_script_owner_npc_anim -/* A6EDE0 80240A00 02A0302D */ daddu $a2, $s5, $zero -/* A6EDE4 80240A04 0260202D */ daddu $a0, $s3, $zero -.L80240A08: -/* A6EDE8 80240A08 0280282D */ daddu $a1, $s4, $zero -/* A6EDEC 80240A0C 0C0900E3 */ jal kpa_61_UnkDistFunc -/* A6EDF0 80240A10 02A0302D */ daddu $a2, $s5, $zero -/* A6EDF4 80240A14 08090294 */ j .L80240A50 -/* A6EDF8 80240A18 00000000 */ nop -.L80240A1C: -/* A6EDFC 80240A1C 0260202D */ daddu $a0, $s3, $zero -/* A6EE00 80240A20 0280282D */ daddu $a1, $s4, $zero -/* A6EE04 80240A24 0C090130 */ jal kpa_61_UnkNpcAIFunc12 -/* A6EE08 80240A28 02A0302D */ daddu $a2, $s5, $zero -/* A6EE0C 80240A2C 08090294 */ j .L80240A50 -/* A6EE10 80240A30 00000000 */ nop -.L80240A34: -/* A6EE14 80240A34 0280282D */ daddu $a1, $s4, $zero -/* A6EE18 80240A38 0C090189 */ jal kpa_61_set_script_owner_npc_col_height -/* A6EE1C 80240A3C 02A0302D */ daddu $a2, $s5, $zero -/* A6EE20 80240A40 08090294 */ j .L80240A50 -/* A6EE24 80240A44 00000000 */ nop -.L80240A48: -/* A6EE28 80240A48 0C0129CF */ jal func_8004A73C -/* A6EE2C 80240A4C 0260202D */ daddu $a0, $s3, $zero -.L80240A50: -/* A6EE30 80240A50 8E230088 */ lw $v1, 0x88($s1) -/* A6EE34 80240A54 24020006 */ addiu $v0, $zero, 6 -/* A6EE38 80240A58 14620019 */ bne $v1, $v0, .L80240AC0 -/* A6EE3C 80240A5C 0000102D */ daddu $v0, $zero, $zero -/* A6EE40 80240A60 8E22008C */ lw $v0, 0x8c($s1) -/* A6EE44 80240A64 10400003 */ beqz $v0, .L80240A74 -/* A6EE48 80240A68 24020001 */ addiu $v0, $zero, 1 -/* A6EE4C 80240A6C 0809029E */ j .L80240A78 -/* A6EE50 80240A70 A22200B5 */ sb $v0, 0xb5($s1) -.L80240A74: -/* A6EE54 80240A74 A22000B5 */ sb $zero, 0xb5($s1) -.L80240A78: -/* A6EE58 80240A78 8E22008C */ lw $v0, 0x8c($s1) -/* A6EE5C 80240A7C 1040000F */ beqz $v0, .L80240ABC_A6EE9C -/* A6EE60 80240A80 3C03FFAA */ lui $v1, 0xffaa -/* A6EE64 80240A84 8E420028 */ lw $v0, 0x28($s2) -/* A6EE68 80240A88 3463FFFC */ ori $v1, $v1, 0xfffc -/* A6EE6C 80240A8C 00431821 */ addu $v1, $v0, $v1 -/* A6EE70 80240A90 2C620015 */ sltiu $v0, $v1, 0x15 -/* A6EE74 80240A94 10400009 */ beqz $v0, .L80240ABC_A6EE9C -/* A6EE78 80240A98 00031080 */ sll $v0, $v1, 2 -/* A6EE7C 80240A9C 3C018024 */ lui $at, %hi(jtbl_80243CD8_A720B8) -/* A6EE80 80240AA0 00220821 */ addu $at, $at, $v0 -/* A6EE84 80240AA4 8C223CD8 */ lw $v0, %lo(jtbl_80243CD8_A720B8)($at) -/* A6EE88 80240AA8 00400008 */ jr $v0 -/* A6EE8C 80240AAC 00000000 */ nop -.L80240AB0_A6EE90: -/* A6EE90 80240AB0 8E420028 */ lw $v0, 0x28($s2) -/* A6EE94 80240AB4 24420001 */ addiu $v0, $v0, 1 -/* A6EE98 80240AB8 AE420028 */ sw $v0, 0x28($s2) -.L80240ABC_A6EE9C: -/* A6EE9C 80240ABC 0000102D */ daddu $v0, $zero, $zero -.L80240AC0: -/* A6EEA0 80240AC0 8FBF0068 */ lw $ra, 0x68($sp) -/* A6EEA4 80240AC4 8FB50064 */ lw $s5, 0x64($sp) -/* A6EEA8 80240AC8 8FB40060 */ lw $s4, 0x60($sp) -/* A6EEAC 80240ACC 8FB3005C */ lw $s3, 0x5c($sp) -/* A6EEB0 80240AD0 8FB20058 */ lw $s2, 0x58($sp) -/* A6EEB4 80240AD4 8FB10054 */ lw $s1, 0x54($sp) -/* A6EEB8 80240AD8 8FB00050 */ lw $s0, 0x50($sp) -/* A6EEBC 80240ADC 03E00008 */ jr $ra -/* A6EEC0 80240AE0 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_70/A74B80/func_802406A4_A74F14.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_70/A74B80/func_802406A4_A74F14.s deleted file mode 100644 index d2a7a25869..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_70/A74B80/func_802406A4_A74F14.s +++ /dev/null @@ -1,312 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80243BF8_A78468 -.word .L80240AB0_A75320, .L80240ABC_A7532C, .L80240ABC_A7532C, .L80240ABC_A7532C, .L80240ABC_A7532C, .L80240ABC_A7532C, .L80240ABC_A7532C, .L80240ABC_A7532C, .L80240AB0_A75320, .L80240ABC_A7532C, .L80240AB0_A75320, .L80240ABC_A7532C, .L80240AB0_A75320, .L80240ABC_A7532C, .L80240AB0_A75320, .L80240ABC_A7532C, .L80240ABC_A7532C, .L80240ABC_A7532C, .L80240AB0_A75320, .L80240ABC_A7532C, .L80240AB0_A75320, 0 - -.section .text - -glabel func_802406A4_A74F14 -/* A74F14 802406A4 27BDFF90 */ addiu $sp, $sp, -0x70 -/* A74F18 802406A8 AFB3005C */ sw $s3, 0x5c($sp) -/* A74F1C 802406AC 0080982D */ daddu $s3, $a0, $zero -/* A74F20 802406B0 AFBF0068 */ sw $ra, 0x68($sp) -/* A74F24 802406B4 AFB50064 */ sw $s5, 0x64($sp) -/* A74F28 802406B8 AFB40060 */ sw $s4, 0x60($sp) -/* A74F2C 802406BC AFB20058 */ sw $s2, 0x58($sp) -/* A74F30 802406C0 AFB10054 */ sw $s1, 0x54($sp) -/* A74F34 802406C4 AFB00050 */ sw $s0, 0x50($sp) -/* A74F38 802406C8 8E710148 */ lw $s1, 0x148($s3) -/* A74F3C 802406CC 86240008 */ lh $a0, 8($s1) -/* A74F40 802406D0 0C00EABB */ jal get_npc_unsafe -/* A74F44 802406D4 00A0802D */ daddu $s0, $a1, $zero -/* A74F48 802406D8 8E63000C */ lw $v1, 0xc($s3) -/* A74F4C 802406DC 0260202D */ daddu $a0, $s3, $zero -/* A74F50 802406E0 8C650000 */ lw $a1, ($v1) -/* A74F54 802406E4 0C0B1EAF */ jal evt_get_variable -/* A74F58 802406E8 0040902D */ daddu $s2, $v0, $zero -/* A74F5C 802406EC AFA00028 */ sw $zero, 0x28($sp) -/* A74F60 802406F0 8E2300D0 */ lw $v1, 0xd0($s1) -/* A74F64 802406F4 8C630030 */ lw $v1, 0x30($v1) -/* A74F68 802406F8 AFA3002C */ sw $v1, 0x2c($sp) -/* A74F6C 802406FC 8E2300D0 */ lw $v1, 0xd0($s1) -/* A74F70 80240700 8C63001C */ lw $v1, 0x1c($v1) -/* A74F74 80240704 AFA30030 */ sw $v1, 0x30($sp) -/* A74F78 80240708 8E2300D0 */ lw $v1, 0xd0($s1) -/* A74F7C 8024070C 8C630024 */ lw $v1, 0x24($v1) -/* A74F80 80240710 AFA30034 */ sw $v1, 0x34($sp) -/* A74F84 80240714 8E2300D0 */ lw $v1, 0xd0($s1) -/* A74F88 80240718 8C630028 */ lw $v1, 0x28($v1) -/* A74F8C 8024071C 27B50028 */ addiu $s5, $sp, 0x28 -/* A74F90 80240720 AFA30038 */ sw $v1, 0x38($sp) -/* A74F94 80240724 8E2300D0 */ lw $v1, 0xd0($s1) -/* A74F98 80240728 3C0142C8 */ lui $at, 0x42c8 -/* A74F9C 8024072C 44810000 */ mtc1 $at, $f0 -/* A74FA0 80240730 8C63002C */ lw $v1, 0x2c($v1) -/* A74FA4 80240734 0040A02D */ daddu $s4, $v0, $zero -/* A74FA8 80240738 E7A00040 */ swc1 $f0, 0x40($sp) -/* A74FAC 8024073C A7A00044 */ sh $zero, 0x44($sp) -/* A74FB0 80240740 12000009 */ beqz $s0, .L80240768 -/* A74FB4 80240744 AFA3003C */ sw $v1, 0x3c($sp) -/* A74FB8 80240748 864300A8 */ lh $v1, 0xa8($s2) -/* A74FBC 8024074C 8E2200B0 */ lw $v0, 0xb0($s1) -/* A74FC0 80240750 AE20008C */ sw $zero, 0x8c($s1) -/* A74FC4 80240754 A22000B5 */ sb $zero, 0xb5($s1) -/* A74FC8 80240758 34420008 */ ori $v0, $v0, 8 -/* A74FCC 8024075C AE230084 */ sw $v1, 0x84($s1) -/* A74FD0 80240760 080901DE */ j .L80240778 -/* A74FD4 80240764 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240768: -/* A74FD8 80240768 8E2200B0 */ lw $v0, 0xb0($s1) -/* A74FDC 8024076C 30420004 */ andi $v0, $v0, 4 -/* A74FE0 80240770 10400047 */ beqz $v0, .L80240890 -/* A74FE4 80240774 00000000 */ nop -.L80240778: -/* A74FE8 80240778 AE600070 */ sw $zero, 0x70($s3) -/* A74FEC 8024077C A640008E */ sh $zero, 0x8e($s2) -/* A74FF0 80240780 8E2300CC */ lw $v1, 0xcc($s1) -/* A74FF4 80240784 2404F7FF */ addiu $a0, $zero, -0x801 -/* A74FF8 80240788 A2200007 */ sb $zero, 7($s1) -/* A74FFC 8024078C 8E420000 */ lw $v0, ($s2) -/* A75000 80240790 8C630000 */ lw $v1, ($v1) -/* A75004 80240794 00441024 */ and $v0, $v0, $a0 -/* A75008 80240798 AE420000 */ sw $v0, ($s2) -/* A7500C 8024079C AE430028 */ sw $v1, 0x28($s2) -/* A75010 802407A0 96220086 */ lhu $v0, 0x86($s1) -/* A75014 802407A4 A64200A8 */ sh $v0, 0xa8($s2) -/* A75018 802407A8 8E2200D0 */ lw $v0, 0xd0($s1) -/* A7501C 802407AC AE200090 */ sw $zero, 0x90($s1) -/* A75020 802407B0 8C420034 */ lw $v0, 0x34($v0) -/* A75024 802407B4 14400006 */ bnez $v0, .L802407D0 -/* A75028 802407B8 2403FDFF */ addiu $v1, $zero, -0x201 -/* A7502C 802407BC 8E420000 */ lw $v0, ($s2) -/* A75030 802407C0 2403FFF7 */ addiu $v1, $zero, -9 -/* A75034 802407C4 34420200 */ ori $v0, $v0, 0x200 -/* A75038 802407C8 080901F7 */ j .L802407DC -/* A7503C 802407CC 00431024 */ and $v0, $v0, $v1 -.L802407D0: -/* A75040 802407D0 8E420000 */ lw $v0, ($s2) -/* A75044 802407D4 00431024 */ and $v0, $v0, $v1 -/* A75048 802407D8 34420008 */ ori $v0, $v0, 8 -.L802407DC: -/* A7504C 802407DC AE420000 */ sw $v0, ($s2) -/* A75050 802407E0 8E2200B0 */ lw $v0, 0xb0($s1) -/* A75054 802407E4 30420004 */ andi $v0, $v0, 4 -/* A75058 802407E8 1040001E */ beqz $v0, .L80240864 -/* A7505C 802407EC 24040002 */ addiu $a0, $zero, 2 -/* A75060 802407F0 0240282D */ daddu $a1, $s2, $zero -/* A75064 802407F4 0000302D */ daddu $a2, $zero, $zero -/* A75068 802407F8 24020063 */ addiu $v0, $zero, 0x63 -/* A7506C 802407FC AE620070 */ sw $v0, 0x70($s3) -/* A75070 80240800 AE600074 */ sw $zero, 0x74($s3) -/* A75074 80240804 864300A8 */ lh $v1, 0xa8($s2) -/* A75078 80240808 3C013F80 */ lui $at, 0x3f80 -/* A7507C 8024080C 44810000 */ mtc1 $at, $f0 -/* A75080 80240810 3C014000 */ lui $at, 0x4000 -/* A75084 80240814 44811000 */ mtc1 $at, $f2 -/* A75088 80240818 3C01C1A0 */ lui $at, 0xc1a0 -/* A7508C 8024081C 44812000 */ mtc1 $at, $f4 -/* A75090 80240820 24020028 */ addiu $v0, $zero, 0x28 -/* A75094 80240824 AFA2001C */ sw $v0, 0x1c($sp) -/* A75098 80240828 44833000 */ mtc1 $v1, $f6 -/* A7509C 8024082C 00000000 */ nop -/* A750A0 80240830 468031A0 */ cvt.s.w $f6, $f6 -/* A750A4 80240834 44073000 */ mfc1 $a3, $f6 -/* A750A8 80240838 27A20048 */ addiu $v0, $sp, 0x48 -/* A750AC 8024083C AFA20020 */ sw $v0, 0x20($sp) -/* A750B0 80240840 E7A00010 */ swc1 $f0, 0x10($sp) -/* A750B4 80240844 E7A20014 */ swc1 $f2, 0x14($sp) -/* A750B8 80240848 0C01BFA4 */ jal fx_emote -/* A750BC 8024084C E7A40018 */ swc1 $f4, 0x18($sp) -/* A750C0 80240850 8E2200B0 */ lw $v0, 0xb0($s1) -/* A750C4 80240854 2403FFFB */ addiu $v1, $zero, -5 -/* A750C8 80240858 00431024 */ and $v0, $v0, $v1 -/* A750CC 8024085C 08090224 */ j .L80240890 -/* A750D0 80240860 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240864: -/* A750D4 80240864 8E220000 */ lw $v0, ($s1) -/* A750D8 80240868 3C034000 */ lui $v1, 0x4000 -/* A750DC 8024086C 00431024 */ and $v0, $v0, $v1 -/* A750E0 80240870 10400007 */ beqz $v0, .L80240890 -/* A750E4 80240874 3C03BFFF */ lui $v1, 0xbfff -/* A750E8 80240878 2402000C */ addiu $v0, $zero, 0xc -/* A750EC 8024087C AE620070 */ sw $v0, 0x70($s3) -/* A750F0 80240880 8E220000 */ lw $v0, ($s1) -/* A750F4 80240884 3463FFFF */ ori $v1, $v1, 0xffff -/* A750F8 80240888 00431024 */ and $v0, $v0, $v1 -/* A750FC 8024088C AE220000 */ sw $v0, ($s1) -.L80240890: -/* A75100 80240890 8E220090 */ lw $v0, 0x90($s1) -/* A75104 80240894 1840000C */ blez $v0, .L802408C8 -/* A75108 80240898 2442FFFF */ addiu $v0, $v0, -1 -/* A7510C 8024089C 14400087 */ bnez $v0, .L80240ABC_A7532C -/* A75110 802408A0 AE220090 */ sw $v0, 0x90($s1) -/* A75114 802408A4 3C03FFAA */ lui $v1, 0xffaa -/* A75118 802408A8 8E420028 */ lw $v0, 0x28($s2) -/* A7511C 802408AC 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* A75120 802408B0 00431021 */ addu $v0, $v0, $v1 -/* A75124 802408B4 2C420002 */ sltiu $v0, $v0, 2 -/* A75128 802408B8 10400003 */ beqz $v0, .L802408C8 -/* A7512C 802408BC 3C020055 */ lui $v0, 0x55 -/* A75130 802408C0 3442000C */ ori $v0, $v0, 0xc -/* A75134 802408C4 AE420028 */ sw $v0, 0x28($s2) -.L802408C8: -/* A75138 802408C8 8E630070 */ lw $v1, 0x70($s3) -/* A7513C 802408CC 2402000C */ addiu $v0, $zero, 0xc -/* A75140 802408D0 10620048 */ beq $v1, $v0, .L802409F4 -/* A75144 802408D4 2862000D */ slti $v0, $v1, 0xd -/* A75148 802408D8 1040000F */ beqz $v0, .L80240918 -/* A7514C 802408DC 24100001 */ addiu $s0, $zero, 1 -/* A75150 802408E0 1070001E */ beq $v1, $s0, .L8024095C -/* A75154 802408E4 28620002 */ slti $v0, $v1, 2 -/* A75158 802408E8 10400005 */ beqz $v0, .L80240900 -/* A7515C 802408EC 24020002 */ addiu $v0, $zero, 2 -/* A75160 802408F0 10600015 */ beqz $v1, .L80240948 -/* A75164 802408F4 0260202D */ daddu $a0, $s3, $zero -/* A75168 802408F8 08090294 */ j .L80240A50 -/* A7516C 802408FC 00000000 */ nop -.L80240900: -/* A75170 80240900 1062001C */ beq $v1, $v0, .L80240974 -/* A75174 80240904 24020003 */ addiu $v0, $zero, 3 -/* A75178 80240908 10620035 */ beq $v1, $v0, .L802409E0 -/* A7517C 8024090C 0260202D */ daddu $a0, $s3, $zero -/* A75180 80240910 08090294 */ j .L80240A50 -/* A75184 80240914 00000000 */ nop -.L80240918: -/* A75188 80240918 2402000E */ addiu $v0, $zero, 0xe -/* A7518C 8024091C 1062003F */ beq $v1, $v0, .L80240A1C -/* A75190 80240920 0062102A */ slt $v0, $v1, $v0 -/* A75194 80240924 14400038 */ bnez $v0, .L80240A08 -/* A75198 80240928 0260202D */ daddu $a0, $s3, $zero -/* A7519C 8024092C 2402000F */ addiu $v0, $zero, 0xf -/* A751A0 80240930 10620040 */ beq $v1, $v0, .L80240A34 -/* A751A4 80240934 24020063 */ addiu $v0, $zero, 0x63 -/* A751A8 80240938 10620043 */ beq $v1, $v0, .L80240A48 -/* A751AC 8024093C 00000000 */ nop -/* A751B0 80240940 08090294 */ j .L80240A50 -/* A751B4 80240944 00000000 */ nop -.L80240948: -/* A751B8 80240948 0280282D */ daddu $a1, $s4, $zero -/* A751BC 8024094C 0C012568 */ jal func_800495A0 -/* A751C0 80240950 02A0302D */ daddu $a2, $s5, $zero -/* A751C4 80240954 96220086 */ lhu $v0, 0x86($s1) -/* A751C8 80240958 A64200A8 */ sh $v0, 0xa8($s2) -.L8024095C: -/* A751CC 8024095C 0260202D */ daddu $a0, $s3, $zero -/* A751D0 80240960 0280282D */ daddu $a1, $s4, $zero -/* A751D4 80240964 0C0125AE */ jal func_800496B8 -/* A751D8 80240968 02A0302D */ daddu $a2, $s5, $zero -/* A751DC 8024096C 08090294 */ j .L80240A50 -/* A751E0 80240970 00000000 */ nop -.L80240974: -/* A751E4 80240974 0260202D */ daddu $a0, $s3, $zero -/* A751E8 80240978 0280282D */ daddu $a1, $s4, $zero -/* A751EC 8024097C 0C0126D1 */ jal base_UnkNpcAIFunc1 -/* A751F0 80240980 02A0302D */ daddu $a2, $s5, $zero -/* A751F4 80240984 8E230088 */ lw $v1, 0x88($s1) -/* A751F8 80240988 24020006 */ addiu $v0, $zero, 6 -/* A751FC 8024098C 14620014 */ bne $v1, $v0, .L802409E0 -/* A75200 80240990 0260202D */ daddu $a0, $s3, $zero -/* A75204 80240994 0C00A67F */ jal rand_int -/* A75208 80240998 24040064 */ addiu $a0, $zero, 0x64 -/* A7520C 8024099C 28420021 */ slti $v0, $v0, 0x21 -/* A75210 802409A0 5040000F */ beql $v0, $zero, .L802409E0 -/* A75214 802409A4 0260202D */ daddu $a0, $s3, $zero -/* A75218 802409A8 8E22008C */ lw $v0, 0x8c($s1) -/* A7521C 802409AC 10400005 */ beqz $v0, .L802409C4 -/* A75220 802409B0 3C020055 */ lui $v0, 0x55 -/* A75224 802409B4 3442002F */ ori $v0, $v0, 0x2f -/* A75228 802409B8 AE20008C */ sw $zero, 0x8c($s1) -/* A7522C 802409BC 08090274 */ j .L802409D0 -/* A75230 802409C0 A22000B5 */ sb $zero, 0xb5($s1) -.L802409C4: -/* A75234 802409C4 3442002E */ ori $v0, $v0, 0x2e -/* A75238 802409C8 AE30008C */ sw $s0, 0x8c($s1) -/* A7523C 802409CC A23000B5 */ sb $s0, 0xb5($s1) -.L802409D0: -/* A75240 802409D0 AE420028 */ sw $v0, 0x28($s2) -/* A75244 802409D4 24020007 */ addiu $v0, $zero, 7 -/* A75248 802409D8 080902AF */ j .L80240ABC_A7532C -/* A7524C 802409DC AE220090 */ sw $v0, 0x90($s1) -.L802409E0: -/* A75250 802409E0 0280282D */ daddu $a1, $s4, $zero -/* A75254 802409E4 0C012701 */ jal func_80049C04 -/* A75258 802409E8 02A0302D */ daddu $a2, $s5, $zero -/* A7525C 802409EC 08090294 */ j .L80240A50 -/* A75260 802409F0 00000000 */ nop -.L802409F4: -/* A75264 802409F4 0260202D */ daddu $a0, $s3, $zero -/* A75268 802409F8 0280282D */ daddu $a1, $s4, $zero -/* A7526C 802409FC 0C0900C4 */ jal kpa_70_set_script_owner_npc_anim -/* A75270 80240A00 02A0302D */ daddu $a2, $s5, $zero -/* A75274 80240A04 0260202D */ daddu $a0, $s3, $zero -.L80240A08: -/* A75278 80240A08 0280282D */ daddu $a1, $s4, $zero -/* A7527C 80240A0C 0C0900E3 */ jal kpa_70_UnkDistFunc -/* A75280 80240A10 02A0302D */ daddu $a2, $s5, $zero -/* A75284 80240A14 08090294 */ j .L80240A50 -/* A75288 80240A18 00000000 */ nop -.L80240A1C: -/* A7528C 80240A1C 0260202D */ daddu $a0, $s3, $zero -/* A75290 80240A20 0280282D */ daddu $a1, $s4, $zero -/* A75294 80240A24 0C090130 */ jal kpa_70_UnkNpcAIFunc12 -/* A75298 80240A28 02A0302D */ daddu $a2, $s5, $zero -/* A7529C 80240A2C 08090294 */ j .L80240A50 -/* A752A0 80240A30 00000000 */ nop -.L80240A34: -/* A752A4 80240A34 0280282D */ daddu $a1, $s4, $zero -/* A752A8 80240A38 0C090189 */ jal kpa_70_set_script_owner_npc_col_height -/* A752AC 80240A3C 02A0302D */ daddu $a2, $s5, $zero -/* A752B0 80240A40 08090294 */ j .L80240A50 -/* A752B4 80240A44 00000000 */ nop -.L80240A48: -/* A752B8 80240A48 0C0129CF */ jal func_8004A73C -/* A752BC 80240A4C 0260202D */ daddu $a0, $s3, $zero -.L80240A50: -/* A752C0 80240A50 8E230088 */ lw $v1, 0x88($s1) -/* A752C4 80240A54 24020006 */ addiu $v0, $zero, 6 -/* A752C8 80240A58 14620019 */ bne $v1, $v0, .L80240AC0 -/* A752CC 80240A5C 0000102D */ daddu $v0, $zero, $zero -/* A752D0 80240A60 8E22008C */ lw $v0, 0x8c($s1) -/* A752D4 80240A64 10400003 */ beqz $v0, .L80240A74 -/* A752D8 80240A68 24020001 */ addiu $v0, $zero, 1 -/* A752DC 80240A6C 0809029E */ j .L80240A78 -/* A752E0 80240A70 A22200B5 */ sb $v0, 0xb5($s1) -.L80240A74: -/* A752E4 80240A74 A22000B5 */ sb $zero, 0xb5($s1) -.L80240A78: -/* A752E8 80240A78 8E22008C */ lw $v0, 0x8c($s1) -/* A752EC 80240A7C 1040000F */ beqz $v0, .L80240ABC_A7532C -/* A752F0 80240A80 3C03FFAA */ lui $v1, 0xffaa -/* A752F4 80240A84 8E420028 */ lw $v0, 0x28($s2) -/* A752F8 80240A88 3463FFFC */ ori $v1, $v1, 0xfffc -/* A752FC 80240A8C 00431821 */ addu $v1, $v0, $v1 -/* A75300 80240A90 2C620015 */ sltiu $v0, $v1, 0x15 -/* A75304 80240A94 10400009 */ beqz $v0, .L80240ABC_A7532C -/* A75308 80240A98 00031080 */ sll $v0, $v1, 2 -/* A7530C 80240A9C 3C018024 */ lui $at, %hi(jtbl_80243BF8_A78468) -/* A75310 80240AA0 00220821 */ addu $at, $at, $v0 -/* A75314 80240AA4 8C223BF8 */ lw $v0, %lo(jtbl_80243BF8_A78468)($at) -/* A75318 80240AA8 00400008 */ jr $v0 -/* A7531C 80240AAC 00000000 */ nop -.L80240AB0_A75320: -/* A75320 80240AB0 8E420028 */ lw $v0, 0x28($s2) -/* A75324 80240AB4 24420001 */ addiu $v0, $v0, 1 -/* A75328 80240AB8 AE420028 */ sw $v0, 0x28($s2) -.L80240ABC_A7532C: -/* A7532C 80240ABC 0000102D */ daddu $v0, $zero, $zero -.L80240AC0: -/* A75330 80240AC0 8FBF0068 */ lw $ra, 0x68($sp) -/* A75334 80240AC4 8FB50064 */ lw $s5, 0x64($sp) -/* A75338 80240AC8 8FB40060 */ lw $s4, 0x60($sp) -/* A7533C 80240ACC 8FB3005C */ lw $s3, 0x5c($sp) -/* A75340 80240AD0 8FB20058 */ lw $s2, 0x58($sp) -/* A75344 80240AD4 8FB10054 */ lw $s1, 0x54($sp) -/* A75348 80240AD8 8FB00050 */ lw $s0, 0x50($sp) -/* A7534C 80240ADC 03E00008 */ jr $ra -/* A75350 80240AE0 27BD0070 */ addiu $sp, $sp, 0x70 -/* A75354 80240AE4 00000000 */ nop -/* A75358 80240AE8 00000000 */ nop -/* A7535C 80240AEC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_802406A4_C613B4.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_802406A4_C613B4.s deleted file mode 100644 index 515ad4e6a4..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_802406A4_C613B4.s +++ /dev/null @@ -1,309 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_802471E8_C67EF8 -.word .L80240AB0_C617C0, .L80240ABC_C617CC, .L80240ABC_C617CC, .L80240ABC_C617CC, .L80240ABC_C617CC, .L80240ABC_C617CC, .L80240ABC_C617CC, .L80240ABC_C617CC, .L80240AB0_C617C0, .L80240ABC_C617CC, .L80240AB0_C617C0, .L80240ABC_C617CC, .L80240AB0_C617C0, .L80240ABC_C617CC, .L80240AB0_C617C0, .L80240ABC_C617CC, .L80240ABC_C617CC, .L80240ABC_C617CC, .L80240AB0_C617C0, .L80240ABC_C617CC, .L80240AB0_C617C0, 0 - -.section .text - -glabel func_802406A4_C613B4 -/* C613B4 802406A4 27BDFF90 */ addiu $sp, $sp, -0x70 -/* C613B8 802406A8 AFB3005C */ sw $s3, 0x5c($sp) -/* C613BC 802406AC 0080982D */ daddu $s3, $a0, $zero -/* C613C0 802406B0 AFBF0068 */ sw $ra, 0x68($sp) -/* C613C4 802406B4 AFB50064 */ sw $s5, 0x64($sp) -/* C613C8 802406B8 AFB40060 */ sw $s4, 0x60($sp) -/* C613CC 802406BC AFB20058 */ sw $s2, 0x58($sp) -/* C613D0 802406C0 AFB10054 */ sw $s1, 0x54($sp) -/* C613D4 802406C4 AFB00050 */ sw $s0, 0x50($sp) -/* C613D8 802406C8 8E710148 */ lw $s1, 0x148($s3) -/* C613DC 802406CC 86240008 */ lh $a0, 8($s1) -/* C613E0 802406D0 0C00EABB */ jal get_npc_unsafe -/* C613E4 802406D4 00A0802D */ daddu $s0, $a1, $zero -/* C613E8 802406D8 8E63000C */ lw $v1, 0xc($s3) -/* C613EC 802406DC 0260202D */ daddu $a0, $s3, $zero -/* C613F0 802406E0 8C650000 */ lw $a1, ($v1) -/* C613F4 802406E4 0C0B1EAF */ jal evt_get_variable -/* C613F8 802406E8 0040902D */ daddu $s2, $v0, $zero -/* C613FC 802406EC AFA00028 */ sw $zero, 0x28($sp) -/* C61400 802406F0 8E2300D0 */ lw $v1, 0xd0($s1) -/* C61404 802406F4 8C630030 */ lw $v1, 0x30($v1) -/* C61408 802406F8 AFA3002C */ sw $v1, 0x2c($sp) -/* C6140C 802406FC 8E2300D0 */ lw $v1, 0xd0($s1) -/* C61410 80240700 8C63001C */ lw $v1, 0x1c($v1) -/* C61414 80240704 AFA30030 */ sw $v1, 0x30($sp) -/* C61418 80240708 8E2300D0 */ lw $v1, 0xd0($s1) -/* C6141C 8024070C 8C630024 */ lw $v1, 0x24($v1) -/* C61420 80240710 AFA30034 */ sw $v1, 0x34($sp) -/* C61424 80240714 8E2300D0 */ lw $v1, 0xd0($s1) -/* C61428 80240718 8C630028 */ lw $v1, 0x28($v1) -/* C6142C 8024071C 27B50028 */ addiu $s5, $sp, 0x28 -/* C61430 80240720 AFA30038 */ sw $v1, 0x38($sp) -/* C61434 80240724 8E2300D0 */ lw $v1, 0xd0($s1) -/* C61438 80240728 3C0142C8 */ lui $at, 0x42c8 -/* C6143C 8024072C 44810000 */ mtc1 $at, $f0 -/* C61440 80240730 8C63002C */ lw $v1, 0x2c($v1) -/* C61444 80240734 0040A02D */ daddu $s4, $v0, $zero -/* C61448 80240738 E7A00040 */ swc1 $f0, 0x40($sp) -/* C6144C 8024073C A7A00044 */ sh $zero, 0x44($sp) -/* C61450 80240740 12000009 */ beqz $s0, .L80240768 -/* C61454 80240744 AFA3003C */ sw $v1, 0x3c($sp) -/* C61458 80240748 864300A8 */ lh $v1, 0xa8($s2) -/* C6145C 8024074C 8E2200B0 */ lw $v0, 0xb0($s1) -/* C61460 80240750 AE20008C */ sw $zero, 0x8c($s1) -/* C61464 80240754 A22000B5 */ sb $zero, 0xb5($s1) -/* C61468 80240758 34420008 */ ori $v0, $v0, 8 -/* C6146C 8024075C AE230084 */ sw $v1, 0x84($s1) -/* C61470 80240760 080901DE */ j .L80240778 -/* C61474 80240764 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240768: -/* C61478 80240768 8E2200B0 */ lw $v0, 0xb0($s1) -/* C6147C 8024076C 30420004 */ andi $v0, $v0, 4 -/* C61480 80240770 10400047 */ beqz $v0, .L80240890 -/* C61484 80240774 00000000 */ nop -.L80240778: -/* C61488 80240778 AE600070 */ sw $zero, 0x70($s3) -/* C6148C 8024077C A640008E */ sh $zero, 0x8e($s2) -/* C61490 80240780 8E2300CC */ lw $v1, 0xcc($s1) -/* C61494 80240784 2404F7FF */ addiu $a0, $zero, -0x801 -/* C61498 80240788 A2200007 */ sb $zero, 7($s1) -/* C6149C 8024078C 8E420000 */ lw $v0, ($s2) -/* C614A0 80240790 8C630000 */ lw $v1, ($v1) -/* C614A4 80240794 00441024 */ and $v0, $v0, $a0 -/* C614A8 80240798 AE420000 */ sw $v0, ($s2) -/* C614AC 8024079C AE430028 */ sw $v1, 0x28($s2) -/* C614B0 802407A0 96220086 */ lhu $v0, 0x86($s1) -/* C614B4 802407A4 A64200A8 */ sh $v0, 0xa8($s2) -/* C614B8 802407A8 8E2200D0 */ lw $v0, 0xd0($s1) -/* C614BC 802407AC AE200090 */ sw $zero, 0x90($s1) -/* C614C0 802407B0 8C420034 */ lw $v0, 0x34($v0) -/* C614C4 802407B4 14400006 */ bnez $v0, .L802407D0 -/* C614C8 802407B8 2403FDFF */ addiu $v1, $zero, -0x201 -/* C614CC 802407BC 8E420000 */ lw $v0, ($s2) -/* C614D0 802407C0 2403FFF7 */ addiu $v1, $zero, -9 -/* C614D4 802407C4 34420200 */ ori $v0, $v0, 0x200 -/* C614D8 802407C8 080901F7 */ j .L802407DC -/* C614DC 802407CC 00431024 */ and $v0, $v0, $v1 -.L802407D0: -/* C614E0 802407D0 8E420000 */ lw $v0, ($s2) -/* C614E4 802407D4 00431024 */ and $v0, $v0, $v1 -/* C614E8 802407D8 34420008 */ ori $v0, $v0, 8 -.L802407DC: -/* C614EC 802407DC AE420000 */ sw $v0, ($s2) -/* C614F0 802407E0 8E2200B0 */ lw $v0, 0xb0($s1) -/* C614F4 802407E4 30420004 */ andi $v0, $v0, 4 -/* C614F8 802407E8 1040001E */ beqz $v0, .L80240864 -/* C614FC 802407EC 24040002 */ addiu $a0, $zero, 2 -/* C61500 802407F0 0240282D */ daddu $a1, $s2, $zero -/* C61504 802407F4 0000302D */ daddu $a2, $zero, $zero -/* C61508 802407F8 24020063 */ addiu $v0, $zero, 0x63 -/* C6150C 802407FC AE620070 */ sw $v0, 0x70($s3) -/* C61510 80240800 AE600074 */ sw $zero, 0x74($s3) -/* C61514 80240804 864300A8 */ lh $v1, 0xa8($s2) -/* C61518 80240808 3C013F80 */ lui $at, 0x3f80 -/* C6151C 8024080C 44810000 */ mtc1 $at, $f0 -/* C61520 80240810 3C014000 */ lui $at, 0x4000 -/* C61524 80240814 44811000 */ mtc1 $at, $f2 -/* C61528 80240818 3C01C1A0 */ lui $at, 0xc1a0 -/* C6152C 8024081C 44812000 */ mtc1 $at, $f4 -/* C61530 80240820 24020028 */ addiu $v0, $zero, 0x28 -/* C61534 80240824 AFA2001C */ sw $v0, 0x1c($sp) -/* C61538 80240828 44833000 */ mtc1 $v1, $f6 -/* C6153C 8024082C 00000000 */ nop -/* C61540 80240830 468031A0 */ cvt.s.w $f6, $f6 -/* C61544 80240834 44073000 */ mfc1 $a3, $f6 -/* C61548 80240838 27A20048 */ addiu $v0, $sp, 0x48 -/* C6154C 8024083C AFA20020 */ sw $v0, 0x20($sp) -/* C61550 80240840 E7A00010 */ swc1 $f0, 0x10($sp) -/* C61554 80240844 E7A20014 */ swc1 $f2, 0x14($sp) -/* C61558 80240848 0C01BFA4 */ jal fx_emote -/* C6155C 8024084C E7A40018 */ swc1 $f4, 0x18($sp) -/* C61560 80240850 8E2200B0 */ lw $v0, 0xb0($s1) -/* C61564 80240854 2403FFFB */ addiu $v1, $zero, -5 -/* C61568 80240858 00431024 */ and $v0, $v0, $v1 -/* C6156C 8024085C 08090224 */ j .L80240890 -/* C61570 80240860 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240864: -/* C61574 80240864 8E220000 */ lw $v0, ($s1) -/* C61578 80240868 3C034000 */ lui $v1, 0x4000 -/* C6157C 8024086C 00431024 */ and $v0, $v0, $v1 -/* C61580 80240870 10400007 */ beqz $v0, .L80240890 -/* C61584 80240874 3C03BFFF */ lui $v1, 0xbfff -/* C61588 80240878 2402000C */ addiu $v0, $zero, 0xc -/* C6158C 8024087C AE620070 */ sw $v0, 0x70($s3) -/* C61590 80240880 8E220000 */ lw $v0, ($s1) -/* C61594 80240884 3463FFFF */ ori $v1, $v1, 0xffff -/* C61598 80240888 00431024 */ and $v0, $v0, $v1 -/* C6159C 8024088C AE220000 */ sw $v0, ($s1) -.L80240890: -/* C615A0 80240890 8E220090 */ lw $v0, 0x90($s1) -/* C615A4 80240894 1840000C */ blez $v0, .L802408C8 -/* C615A8 80240898 2442FFFF */ addiu $v0, $v0, -1 -/* C615AC 8024089C 14400087 */ bnez $v0, .L80240ABC_C617CC -/* C615B0 802408A0 AE220090 */ sw $v0, 0x90($s1) -/* C615B4 802408A4 3C03FFAA */ lui $v1, 0xffaa -/* C615B8 802408A8 8E420028 */ lw $v0, 0x28($s2) -/* C615BC 802408AC 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* C615C0 802408B0 00431021 */ addu $v0, $v0, $v1 -/* C615C4 802408B4 2C420002 */ sltiu $v0, $v0, 2 -/* C615C8 802408B8 10400003 */ beqz $v0, .L802408C8 -/* C615CC 802408BC 3C020055 */ lui $v0, 0x55 -/* C615D0 802408C0 3442000C */ ori $v0, $v0, 0xc -/* C615D4 802408C4 AE420028 */ sw $v0, 0x28($s2) -.L802408C8: -/* C615D8 802408C8 8E630070 */ lw $v1, 0x70($s3) -/* C615DC 802408CC 2402000C */ addiu $v0, $zero, 0xc -/* C615E0 802408D0 10620048 */ beq $v1, $v0, .L802409F4 -/* C615E4 802408D4 2862000D */ slti $v0, $v1, 0xd -/* C615E8 802408D8 1040000F */ beqz $v0, .L80240918 -/* C615EC 802408DC 24100001 */ addiu $s0, $zero, 1 -/* C615F0 802408E0 1070001E */ beq $v1, $s0, .L8024095C -/* C615F4 802408E4 28620002 */ slti $v0, $v1, 2 -/* C615F8 802408E8 10400005 */ beqz $v0, .L80240900 -/* C615FC 802408EC 24020002 */ addiu $v0, $zero, 2 -/* C61600 802408F0 10600015 */ beqz $v1, .L80240948 -/* C61604 802408F4 0260202D */ daddu $a0, $s3, $zero -/* C61608 802408F8 08090294 */ j .L80240A50 -/* C6160C 802408FC 00000000 */ nop -.L80240900: -/* C61610 80240900 1062001C */ beq $v1, $v0, .L80240974 -/* C61614 80240904 24020003 */ addiu $v0, $zero, 3 -/* C61618 80240908 10620035 */ beq $v1, $v0, .L802409E0 -/* C6161C 8024090C 0260202D */ daddu $a0, $s3, $zero -/* C61620 80240910 08090294 */ j .L80240A50 -/* C61624 80240914 00000000 */ nop -.L80240918: -/* C61628 80240918 2402000E */ addiu $v0, $zero, 0xe -/* C6162C 8024091C 1062003F */ beq $v1, $v0, .L80240A1C -/* C61630 80240920 0062102A */ slt $v0, $v1, $v0 -/* C61634 80240924 14400038 */ bnez $v0, .L80240A08 -/* C61638 80240928 0260202D */ daddu $a0, $s3, $zero -/* C6163C 8024092C 2402000F */ addiu $v0, $zero, 0xf -/* C61640 80240930 10620040 */ beq $v1, $v0, .L80240A34 -/* C61644 80240934 24020063 */ addiu $v0, $zero, 0x63 -/* C61648 80240938 10620043 */ beq $v1, $v0, .L80240A48 -/* C6164C 8024093C 00000000 */ nop -/* C61650 80240940 08090294 */ j .L80240A50 -/* C61654 80240944 00000000 */ nop -.L80240948: -/* C61658 80240948 0280282D */ daddu $a1, $s4, $zero -/* C6165C 8024094C 0C012568 */ jal func_800495A0 -/* C61660 80240950 02A0302D */ daddu $a2, $s5, $zero -/* C61664 80240954 96220086 */ lhu $v0, 0x86($s1) -/* C61668 80240958 A64200A8 */ sh $v0, 0xa8($s2) -.L8024095C: -/* C6166C 8024095C 0260202D */ daddu $a0, $s3, $zero -/* C61670 80240960 0280282D */ daddu $a1, $s4, $zero -/* C61674 80240964 0C0125AE */ jal func_800496B8 -/* C61678 80240968 02A0302D */ daddu $a2, $s5, $zero -/* C6167C 8024096C 08090294 */ j .L80240A50 -/* C61680 80240970 00000000 */ nop -.L80240974: -/* C61684 80240974 0260202D */ daddu $a0, $s3, $zero -/* C61688 80240978 0280282D */ daddu $a1, $s4, $zero -/* C6168C 8024097C 0C0126D1 */ jal base_UnkNpcAIFunc1 -/* C61690 80240980 02A0302D */ daddu $a2, $s5, $zero -/* C61694 80240984 8E230088 */ lw $v1, 0x88($s1) -/* C61698 80240988 24020006 */ addiu $v0, $zero, 6 -/* C6169C 8024098C 14620014 */ bne $v1, $v0, .L802409E0 -/* C616A0 80240990 0260202D */ daddu $a0, $s3, $zero -/* C616A4 80240994 0C00A67F */ jal rand_int -/* C616A8 80240998 24040064 */ addiu $a0, $zero, 0x64 -/* C616AC 8024099C 28420021 */ slti $v0, $v0, 0x21 -/* C616B0 802409A0 5040000F */ beql $v0, $zero, .L802409E0 -/* C616B4 802409A4 0260202D */ daddu $a0, $s3, $zero -/* C616B8 802409A8 8E22008C */ lw $v0, 0x8c($s1) -/* C616BC 802409AC 10400005 */ beqz $v0, .L802409C4 -/* C616C0 802409B0 3C020055 */ lui $v0, 0x55 -/* C616C4 802409B4 3442002F */ ori $v0, $v0, 0x2f -/* C616C8 802409B8 AE20008C */ sw $zero, 0x8c($s1) -/* C616CC 802409BC 08090274 */ j .L802409D0 -/* C616D0 802409C0 A22000B5 */ sb $zero, 0xb5($s1) -.L802409C4: -/* C616D4 802409C4 3442002E */ ori $v0, $v0, 0x2e -/* C616D8 802409C8 AE30008C */ sw $s0, 0x8c($s1) -/* C616DC 802409CC A23000B5 */ sb $s0, 0xb5($s1) -.L802409D0: -/* C616E0 802409D0 AE420028 */ sw $v0, 0x28($s2) -/* C616E4 802409D4 24020007 */ addiu $v0, $zero, 7 -/* C616E8 802409D8 080902AF */ j .L80240ABC_C617CC -/* C616EC 802409DC AE220090 */ sw $v0, 0x90($s1) -.L802409E0: -/* C616F0 802409E0 0280282D */ daddu $a1, $s4, $zero -/* C616F4 802409E4 0C012701 */ jal func_80049C04 -/* C616F8 802409E8 02A0302D */ daddu $a2, $s5, $zero -/* C616FC 802409EC 08090294 */ j .L80240A50 -/* C61700 802409F0 00000000 */ nop -.L802409F4: -/* C61704 802409F4 0260202D */ daddu $a0, $s3, $zero -/* C61708 802409F8 0280282D */ daddu $a1, $s4, $zero -/* C6170C 802409FC 0C0900C4 */ jal kzn_03_set_script_owner_npc_anim -/* C61710 80240A00 02A0302D */ daddu $a2, $s5, $zero -/* C61714 80240A04 0260202D */ daddu $a0, $s3, $zero -.L80240A08: -/* C61718 80240A08 0280282D */ daddu $a1, $s4, $zero -/* C6171C 80240A0C 0C0900E3 */ jal kzn_03_UnkDistFunc -/* C61720 80240A10 02A0302D */ daddu $a2, $s5, $zero -/* C61724 80240A14 08090294 */ j .L80240A50 -/* C61728 80240A18 00000000 */ nop -.L80240A1C: -/* C6172C 80240A1C 0260202D */ daddu $a0, $s3, $zero -/* C61730 80240A20 0280282D */ daddu $a1, $s4, $zero -/* C61734 80240A24 0C090130 */ jal kzn_03_UnkNpcAIFunc12 -/* C61738 80240A28 02A0302D */ daddu $a2, $s5, $zero -/* C6173C 80240A2C 08090294 */ j .L80240A50 -/* C61740 80240A30 00000000 */ nop -.L80240A34: -/* C61744 80240A34 0280282D */ daddu $a1, $s4, $zero -/* C61748 80240A38 0C090189 */ jal kzn_03_set_script_owner_npc_col_height -/* C6174C 80240A3C 02A0302D */ daddu $a2, $s5, $zero -/* C61750 80240A40 08090294 */ j .L80240A50 -/* C61754 80240A44 00000000 */ nop -.L80240A48: -/* C61758 80240A48 0C0129CF */ jal func_8004A73C -/* C6175C 80240A4C 0260202D */ daddu $a0, $s3, $zero -.L80240A50: -/* C61760 80240A50 8E230088 */ lw $v1, 0x88($s1) -/* C61764 80240A54 24020006 */ addiu $v0, $zero, 6 -/* C61768 80240A58 14620019 */ bne $v1, $v0, .L80240AC0 -/* C6176C 80240A5C 0000102D */ daddu $v0, $zero, $zero -/* C61770 80240A60 8E22008C */ lw $v0, 0x8c($s1) -/* C61774 80240A64 10400003 */ beqz $v0, .L80240A74 -/* C61778 80240A68 24020001 */ addiu $v0, $zero, 1 -/* C6177C 80240A6C 0809029E */ j .L80240A78 -/* C61780 80240A70 A22200B5 */ sb $v0, 0xb5($s1) -.L80240A74: -/* C61784 80240A74 A22000B5 */ sb $zero, 0xb5($s1) -.L80240A78: -/* C61788 80240A78 8E22008C */ lw $v0, 0x8c($s1) -/* C6178C 80240A7C 1040000F */ beqz $v0, .L80240ABC_C617CC -/* C61790 80240A80 3C03FFAA */ lui $v1, 0xffaa -/* C61794 80240A84 8E420028 */ lw $v0, 0x28($s2) -/* C61798 80240A88 3463FFFC */ ori $v1, $v1, 0xfffc -/* C6179C 80240A8C 00431821 */ addu $v1, $v0, $v1 -/* C617A0 80240A90 2C620015 */ sltiu $v0, $v1, 0x15 -/* C617A4 80240A94 10400009 */ beqz $v0, .L80240ABC_C617CC -/* C617A8 80240A98 00031080 */ sll $v0, $v1, 2 -/* C617AC 80240A9C 3C018024 */ lui $at, %hi(jtbl_802471E8_C67EF8) -/* C617B0 80240AA0 00220821 */ addu $at, $at, $v0 -/* C617B4 80240AA4 8C2271E8 */ lw $v0, %lo(jtbl_802471E8_C67EF8)($at) -/* C617B8 80240AA8 00400008 */ jr $v0 -/* C617BC 80240AAC 00000000 */ nop -.L80240AB0_C617C0: -/* C617C0 80240AB0 8E420028 */ lw $v0, 0x28($s2) -/* C617C4 80240AB4 24420001 */ addiu $v0, $v0, 1 -/* C617C8 80240AB8 AE420028 */ sw $v0, 0x28($s2) -.L80240ABC_C617CC: -/* C617CC 80240ABC 0000102D */ daddu $v0, $zero, $zero -.L80240AC0: -/* C617D0 80240AC0 8FBF0068 */ lw $ra, 0x68($sp) -/* C617D4 80240AC4 8FB50064 */ lw $s5, 0x64($sp) -/* C617D8 80240AC8 8FB40060 */ lw $s4, 0x60($sp) -/* C617DC 80240ACC 8FB3005C */ lw $s3, 0x5c($sp) -/* C617E0 80240AD0 8FB20058 */ lw $s2, 0x58($sp) -/* C617E4 80240AD4 8FB10054 */ lw $s1, 0x54($sp) -/* C617E8 80240AD8 8FB00050 */ lw $s0, 0x50($sp) -/* C617EC 80240ADC 03E00008 */ jr $ra -/* C617F0 80240AE0 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242D58_C79A38.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242D58_C79A38.s deleted file mode 100644 index a7880d5ba9..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242D58_C79A38.s +++ /dev/null @@ -1,309 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80247440_C7E120 -.word .L80243164_C79E44, .L80243170_C79E50, .L80243170_C79E50, .L80243170_C79E50, .L80243170_C79E50, .L80243170_C79E50, .L80243170_C79E50, .L80243170_C79E50, .L80243164_C79E44, .L80243170_C79E50, .L80243164_C79E44, .L80243170_C79E50, .L80243164_C79E44, .L80243170_C79E50, .L80243164_C79E44, .L80243170_C79E50, .L80243170_C79E50, .L80243170_C79E50, .L80243164_C79E44, .L80243170_C79E50, .L80243164_C79E44, 0, 0, 0 - -.section .text - -glabel func_80242D58_C79A38 -/* C79A38 80242D58 27BDFF90 */ addiu $sp, $sp, -0x70 -/* C79A3C 80242D5C AFB3005C */ sw $s3, 0x5c($sp) -/* C79A40 80242D60 0080982D */ daddu $s3, $a0, $zero -/* C79A44 80242D64 AFBF0068 */ sw $ra, 0x68($sp) -/* C79A48 80242D68 AFB50064 */ sw $s5, 0x64($sp) -/* C79A4C 80242D6C AFB40060 */ sw $s4, 0x60($sp) -/* C79A50 80242D70 AFB20058 */ sw $s2, 0x58($sp) -/* C79A54 80242D74 AFB10054 */ sw $s1, 0x54($sp) -/* C79A58 80242D78 AFB00050 */ sw $s0, 0x50($sp) -/* C79A5C 80242D7C 8E710148 */ lw $s1, 0x148($s3) -/* C79A60 80242D80 86240008 */ lh $a0, 8($s1) -/* C79A64 80242D84 0C00EABB */ jal get_npc_unsafe -/* C79A68 80242D88 00A0802D */ daddu $s0, $a1, $zero -/* C79A6C 80242D8C 8E63000C */ lw $v1, 0xc($s3) -/* C79A70 80242D90 0260202D */ daddu $a0, $s3, $zero -/* C79A74 80242D94 8C650000 */ lw $a1, ($v1) -/* C79A78 80242D98 0C0B1EAF */ jal evt_get_variable -/* C79A7C 80242D9C 0040902D */ daddu $s2, $v0, $zero -/* C79A80 80242DA0 AFA00028 */ sw $zero, 0x28($sp) -/* C79A84 80242DA4 8E2300D0 */ lw $v1, 0xd0($s1) -/* C79A88 80242DA8 8C630030 */ lw $v1, 0x30($v1) -/* C79A8C 80242DAC AFA3002C */ sw $v1, 0x2c($sp) -/* C79A90 80242DB0 8E2300D0 */ lw $v1, 0xd0($s1) -/* C79A94 80242DB4 8C63001C */ lw $v1, 0x1c($v1) -/* C79A98 80242DB8 AFA30030 */ sw $v1, 0x30($sp) -/* C79A9C 80242DBC 8E2300D0 */ lw $v1, 0xd0($s1) -/* C79AA0 80242DC0 8C630024 */ lw $v1, 0x24($v1) -/* C79AA4 80242DC4 AFA30034 */ sw $v1, 0x34($sp) -/* C79AA8 80242DC8 8E2300D0 */ lw $v1, 0xd0($s1) -/* C79AAC 80242DCC 8C630028 */ lw $v1, 0x28($v1) -/* C79AB0 80242DD0 27B50028 */ addiu $s5, $sp, 0x28 -/* C79AB4 80242DD4 AFA30038 */ sw $v1, 0x38($sp) -/* C79AB8 80242DD8 8E2300D0 */ lw $v1, 0xd0($s1) -/* C79ABC 80242DDC 3C0142C8 */ lui $at, 0x42c8 -/* C79AC0 80242DE0 44810000 */ mtc1 $at, $f0 -/* C79AC4 80242DE4 8C63002C */ lw $v1, 0x2c($v1) -/* C79AC8 80242DE8 0040A02D */ daddu $s4, $v0, $zero -/* C79ACC 80242DEC E7A00040 */ swc1 $f0, 0x40($sp) -/* C79AD0 80242DF0 A7A00044 */ sh $zero, 0x44($sp) -/* C79AD4 80242DF4 12000009 */ beqz $s0, .L80242E1C -/* C79AD8 80242DF8 AFA3003C */ sw $v1, 0x3c($sp) -/* C79ADC 80242DFC 864300A8 */ lh $v1, 0xa8($s2) -/* C79AE0 80242E00 8E2200B0 */ lw $v0, 0xb0($s1) -/* C79AE4 80242E04 AE20008C */ sw $zero, 0x8c($s1) -/* C79AE8 80242E08 A22000B5 */ sb $zero, 0xb5($s1) -/* C79AEC 80242E0C 34420008 */ ori $v0, $v0, 8 -/* C79AF0 80242E10 AE230084 */ sw $v1, 0x84($s1) -/* C79AF4 80242E14 08090B8B */ j .L80242E2C -/* C79AF8 80242E18 AE2200B0 */ sw $v0, 0xb0($s1) -.L80242E1C: -/* C79AFC 80242E1C 8E2200B0 */ lw $v0, 0xb0($s1) -/* C79B00 80242E20 30420004 */ andi $v0, $v0, 4 -/* C79B04 80242E24 10400047 */ beqz $v0, .L80242F44 -/* C79B08 80242E28 00000000 */ nop -.L80242E2C: -/* C79B0C 80242E2C AE600070 */ sw $zero, 0x70($s3) -/* C79B10 80242E30 A640008E */ sh $zero, 0x8e($s2) -/* C79B14 80242E34 8E2300CC */ lw $v1, 0xcc($s1) -/* C79B18 80242E38 2404F7FF */ addiu $a0, $zero, -0x801 -/* C79B1C 80242E3C A2200007 */ sb $zero, 7($s1) -/* C79B20 80242E40 8E420000 */ lw $v0, ($s2) -/* C79B24 80242E44 8C630000 */ lw $v1, ($v1) -/* C79B28 80242E48 00441024 */ and $v0, $v0, $a0 -/* C79B2C 80242E4C AE420000 */ sw $v0, ($s2) -/* C79B30 80242E50 AE430028 */ sw $v1, 0x28($s2) -/* C79B34 80242E54 96220086 */ lhu $v0, 0x86($s1) -/* C79B38 80242E58 A64200A8 */ sh $v0, 0xa8($s2) -/* C79B3C 80242E5C 8E2200D0 */ lw $v0, 0xd0($s1) -/* C79B40 80242E60 AE200090 */ sw $zero, 0x90($s1) -/* C79B44 80242E64 8C420034 */ lw $v0, 0x34($v0) -/* C79B48 80242E68 14400006 */ bnez $v0, .L80242E84 -/* C79B4C 80242E6C 2403FDFF */ addiu $v1, $zero, -0x201 -/* C79B50 80242E70 8E420000 */ lw $v0, ($s2) -/* C79B54 80242E74 2403FFF7 */ addiu $v1, $zero, -9 -/* C79B58 80242E78 34420200 */ ori $v0, $v0, 0x200 -/* C79B5C 80242E7C 08090BA4 */ j .L80242E90 -/* C79B60 80242E80 00431024 */ and $v0, $v0, $v1 -.L80242E84: -/* C79B64 80242E84 8E420000 */ lw $v0, ($s2) -/* C79B68 80242E88 00431024 */ and $v0, $v0, $v1 -/* C79B6C 80242E8C 34420008 */ ori $v0, $v0, 8 -.L80242E90: -/* C79B70 80242E90 AE420000 */ sw $v0, ($s2) -/* C79B74 80242E94 8E2200B0 */ lw $v0, 0xb0($s1) -/* C79B78 80242E98 30420004 */ andi $v0, $v0, 4 -/* C79B7C 80242E9C 1040001E */ beqz $v0, .L80242F18 -/* C79B80 80242EA0 24040002 */ addiu $a0, $zero, 2 -/* C79B84 80242EA4 0240282D */ daddu $a1, $s2, $zero -/* C79B88 80242EA8 0000302D */ daddu $a2, $zero, $zero -/* C79B8C 80242EAC 24020063 */ addiu $v0, $zero, 0x63 -/* C79B90 80242EB0 AE620070 */ sw $v0, 0x70($s3) -/* C79B94 80242EB4 AE600074 */ sw $zero, 0x74($s3) -/* C79B98 80242EB8 864300A8 */ lh $v1, 0xa8($s2) -/* C79B9C 80242EBC 3C013F80 */ lui $at, 0x3f80 -/* C79BA0 80242EC0 44810000 */ mtc1 $at, $f0 -/* C79BA4 80242EC4 3C014000 */ lui $at, 0x4000 -/* C79BA8 80242EC8 44811000 */ mtc1 $at, $f2 -/* C79BAC 80242ECC 3C01C1A0 */ lui $at, 0xc1a0 -/* C79BB0 80242ED0 44812000 */ mtc1 $at, $f4 -/* C79BB4 80242ED4 24020028 */ addiu $v0, $zero, 0x28 -/* C79BB8 80242ED8 AFA2001C */ sw $v0, 0x1c($sp) -/* C79BBC 80242EDC 44833000 */ mtc1 $v1, $f6 -/* C79BC0 80242EE0 00000000 */ nop -/* C79BC4 80242EE4 468031A0 */ cvt.s.w $f6, $f6 -/* C79BC8 80242EE8 44073000 */ mfc1 $a3, $f6 -/* C79BCC 80242EEC 27A20048 */ addiu $v0, $sp, 0x48 -/* C79BD0 80242EF0 AFA20020 */ sw $v0, 0x20($sp) -/* C79BD4 80242EF4 E7A00010 */ swc1 $f0, 0x10($sp) -/* C79BD8 80242EF8 E7A20014 */ swc1 $f2, 0x14($sp) -/* C79BDC 80242EFC 0C01BFA4 */ jal fx_emote -/* C79BE0 80242F00 E7A40018 */ swc1 $f4, 0x18($sp) -/* C79BE4 80242F04 8E2200B0 */ lw $v0, 0xb0($s1) -/* C79BE8 80242F08 2403FFFB */ addiu $v1, $zero, -5 -/* C79BEC 80242F0C 00431024 */ and $v0, $v0, $v1 -/* C79BF0 80242F10 08090BD1 */ j .L80242F44 -/* C79BF4 80242F14 AE2200B0 */ sw $v0, 0xb0($s1) -.L80242F18: -/* C79BF8 80242F18 8E220000 */ lw $v0, ($s1) -/* C79BFC 80242F1C 3C034000 */ lui $v1, 0x4000 -/* C79C00 80242F20 00431024 */ and $v0, $v0, $v1 -/* C79C04 80242F24 10400007 */ beqz $v0, .L80242F44 -/* C79C08 80242F28 3C03BFFF */ lui $v1, 0xbfff -/* C79C0C 80242F2C 2402000C */ addiu $v0, $zero, 0xc -/* C79C10 80242F30 AE620070 */ sw $v0, 0x70($s3) -/* C79C14 80242F34 8E220000 */ lw $v0, ($s1) -/* C79C18 80242F38 3463FFFF */ ori $v1, $v1, 0xffff -/* C79C1C 80242F3C 00431024 */ and $v0, $v0, $v1 -/* C79C20 80242F40 AE220000 */ sw $v0, ($s1) -.L80242F44: -/* C79C24 80242F44 8E220090 */ lw $v0, 0x90($s1) -/* C79C28 80242F48 1840000C */ blez $v0, .L80242F7C -/* C79C2C 80242F4C 2442FFFF */ addiu $v0, $v0, -1 -/* C79C30 80242F50 14400087 */ bnez $v0, .L80243170_C79E50 -/* C79C34 80242F54 AE220090 */ sw $v0, 0x90($s1) -/* C79C38 80242F58 3C03FFAA */ lui $v1, 0xffaa -/* C79C3C 80242F5C 8E420028 */ lw $v0, 0x28($s2) -/* C79C40 80242F60 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* C79C44 80242F64 00431021 */ addu $v0, $v0, $v1 -/* C79C48 80242F68 2C420002 */ sltiu $v0, $v0, 2 -/* C79C4C 80242F6C 10400003 */ beqz $v0, .L80242F7C -/* C79C50 80242F70 3C020055 */ lui $v0, 0x55 -/* C79C54 80242F74 3442000C */ ori $v0, $v0, 0xc -/* C79C58 80242F78 AE420028 */ sw $v0, 0x28($s2) -.L80242F7C: -/* C79C5C 80242F7C 8E630070 */ lw $v1, 0x70($s3) -/* C79C60 80242F80 2402000C */ addiu $v0, $zero, 0xc -/* C79C64 80242F84 10620048 */ beq $v1, $v0, .L802430A8 -/* C79C68 80242F88 2862000D */ slti $v0, $v1, 0xd -/* C79C6C 80242F8C 1040000F */ beqz $v0, .L80242FCC -/* C79C70 80242F90 24100001 */ addiu $s0, $zero, 1 -/* C79C74 80242F94 1070001E */ beq $v1, $s0, .L80243010 -/* C79C78 80242F98 28620002 */ slti $v0, $v1, 2 -/* C79C7C 80242F9C 10400005 */ beqz $v0, .L80242FB4 -/* C79C80 80242FA0 24020002 */ addiu $v0, $zero, 2 -/* C79C84 80242FA4 10600015 */ beqz $v1, .L80242FFC -/* C79C88 80242FA8 0260202D */ daddu $a0, $s3, $zero -/* C79C8C 80242FAC 08090C41 */ j .L80243104 -/* C79C90 80242FB0 00000000 */ nop -.L80242FB4: -/* C79C94 80242FB4 1062001C */ beq $v1, $v0, .L80243028 -/* C79C98 80242FB8 24020003 */ addiu $v0, $zero, 3 -/* C79C9C 80242FBC 10620035 */ beq $v1, $v0, .L80243094 -/* C79CA0 80242FC0 0260202D */ daddu $a0, $s3, $zero -/* C79CA4 80242FC4 08090C41 */ j .L80243104 -/* C79CA8 80242FC8 00000000 */ nop -.L80242FCC: -/* C79CAC 80242FCC 2402000E */ addiu $v0, $zero, 0xe -/* C79CB0 80242FD0 1062003F */ beq $v1, $v0, .L802430D0 -/* C79CB4 80242FD4 0062102A */ slt $v0, $v1, $v0 -/* C79CB8 80242FD8 14400038 */ bnez $v0, .L802430BC -/* C79CBC 80242FDC 0260202D */ daddu $a0, $s3, $zero -/* C79CC0 80242FE0 2402000F */ addiu $v0, $zero, 0xf -/* C79CC4 80242FE4 10620040 */ beq $v1, $v0, .L802430E8 -/* C79CC8 80242FE8 24020063 */ addiu $v0, $zero, 0x63 -/* C79CCC 80242FEC 10620043 */ beq $v1, $v0, .L802430FC -/* C79CD0 80242FF0 00000000 */ nop -/* C79CD4 80242FF4 08090C41 */ j .L80243104 -/* C79CD8 80242FF8 00000000 */ nop -.L80242FFC: -/* C79CDC 80242FFC 0280282D */ daddu $a1, $s4, $zero -/* C79CE0 80243000 0C012568 */ jal func_800495A0 -/* C79CE4 80243004 02A0302D */ daddu $a2, $s5, $zero -/* C79CE8 80243008 96220086 */ lhu $v0, 0x86($s1) -/* C79CEC 8024300C A64200A8 */ sh $v0, 0xa8($s2) -.L80243010: -/* C79CF0 80243010 0260202D */ daddu $a0, $s3, $zero -/* C79CF4 80243014 0280282D */ daddu $a1, $s4, $zero -/* C79CF8 80243018 0C0125AE */ jal func_800496B8 -/* C79CFC 8024301C 02A0302D */ daddu $a2, $s5, $zero -/* C79D00 80243020 08090C41 */ j .L80243104 -/* C79D04 80243024 00000000 */ nop -.L80243028: -/* C79D08 80243028 0260202D */ daddu $a0, $s3, $zero -/* C79D0C 8024302C 0280282D */ daddu $a1, $s4, $zero -/* C79D10 80243030 0C0126D1 */ jal base_UnkNpcAIFunc1 -/* C79D14 80243034 02A0302D */ daddu $a2, $s5, $zero -/* C79D18 80243038 8E230088 */ lw $v1, 0x88($s1) -/* C79D1C 8024303C 24020006 */ addiu $v0, $zero, 6 -/* C79D20 80243040 14620014 */ bne $v1, $v0, .L80243094 -/* C79D24 80243044 0260202D */ daddu $a0, $s3, $zero -/* C79D28 80243048 0C00A67F */ jal rand_int -/* C79D2C 8024304C 24040064 */ addiu $a0, $zero, 0x64 -/* C79D30 80243050 28420021 */ slti $v0, $v0, 0x21 -/* C79D34 80243054 5040000F */ beql $v0, $zero, .L80243094 -/* C79D38 80243058 0260202D */ daddu $a0, $s3, $zero -/* C79D3C 8024305C 8E22008C */ lw $v0, 0x8c($s1) -/* C79D40 80243060 10400005 */ beqz $v0, .L80243078 -/* C79D44 80243064 3C020055 */ lui $v0, 0x55 -/* C79D48 80243068 3442002F */ ori $v0, $v0, 0x2f -/* C79D4C 8024306C AE20008C */ sw $zero, 0x8c($s1) -/* C79D50 80243070 08090C21 */ j .L80243084 -/* C79D54 80243074 A22000B5 */ sb $zero, 0xb5($s1) -.L80243078: -/* C79D58 80243078 3442002E */ ori $v0, $v0, 0x2e -/* C79D5C 8024307C AE30008C */ sw $s0, 0x8c($s1) -/* C79D60 80243080 A23000B5 */ sb $s0, 0xb5($s1) -.L80243084: -/* C79D64 80243084 AE420028 */ sw $v0, 0x28($s2) -/* C79D68 80243088 24020007 */ addiu $v0, $zero, 7 -/* C79D6C 8024308C 08090C5C */ j .L80243170_C79E50 -/* C79D70 80243090 AE220090 */ sw $v0, 0x90($s1) -.L80243094: -/* C79D74 80243094 0280282D */ daddu $a1, $s4, $zero -/* C79D78 80243098 0C012701 */ jal func_80049C04 -/* C79D7C 8024309C 02A0302D */ daddu $a2, $s5, $zero -/* C79D80 802430A0 08090C41 */ j .L80243104 -/* C79D84 802430A4 00000000 */ nop -.L802430A8: -/* C79D88 802430A8 0260202D */ daddu $a0, $s3, $zero -/* C79D8C 802430AC 0280282D */ daddu $a1, $s4, $zero -/* C79D90 802430B0 0C090A71 */ jal kzn_09_set_script_owner_npc_anim -/* C79D94 802430B4 02A0302D */ daddu $a2, $s5, $zero -/* C79D98 802430B8 0260202D */ daddu $a0, $s3, $zero -.L802430BC: -/* C79D9C 802430BC 0280282D */ daddu $a1, $s4, $zero -/* C79DA0 802430C0 0C090A90 */ jal kzn_09_UnkDistFunc -/* C79DA4 802430C4 02A0302D */ daddu $a2, $s5, $zero -/* C79DA8 802430C8 08090C41 */ j .L80243104 -/* C79DAC 802430CC 00000000 */ nop -.L802430D0: -/* C79DB0 802430D0 0260202D */ daddu $a0, $s3, $zero -/* C79DB4 802430D4 0280282D */ daddu $a1, $s4, $zero -/* C79DB8 802430D8 0C090ADD */ jal kzn_09_UnkNpcAIFunc12 -/* C79DBC 802430DC 02A0302D */ daddu $a2, $s5, $zero -/* C79DC0 802430E0 08090C41 */ j .L80243104 -/* C79DC4 802430E4 00000000 */ nop -.L802430E8: -/* C79DC8 802430E8 0280282D */ daddu $a1, $s4, $zero -/* C79DCC 802430EC 0C090B36 */ jal kzn_09_set_script_owner_npc_col_height -/* C79DD0 802430F0 02A0302D */ daddu $a2, $s5, $zero -/* C79DD4 802430F4 08090C41 */ j .L80243104 -/* C79DD8 802430F8 00000000 */ nop -.L802430FC: -/* C79DDC 802430FC 0C0129CF */ jal func_8004A73C -/* C79DE0 80243100 0260202D */ daddu $a0, $s3, $zero -.L80243104: -/* C79DE4 80243104 8E230088 */ lw $v1, 0x88($s1) -/* C79DE8 80243108 24020006 */ addiu $v0, $zero, 6 -/* C79DEC 8024310C 14620019 */ bne $v1, $v0, .L80243174 -/* C79DF0 80243110 0000102D */ daddu $v0, $zero, $zero -/* C79DF4 80243114 8E22008C */ lw $v0, 0x8c($s1) -/* C79DF8 80243118 10400003 */ beqz $v0, .L80243128 -/* C79DFC 8024311C 24020001 */ addiu $v0, $zero, 1 -/* C79E00 80243120 08090C4B */ j .L8024312C -/* C79E04 80243124 A22200B5 */ sb $v0, 0xb5($s1) -.L80243128: -/* C79E08 80243128 A22000B5 */ sb $zero, 0xb5($s1) -.L8024312C: -/* C79E0C 8024312C 8E22008C */ lw $v0, 0x8c($s1) -/* C79E10 80243130 1040000F */ beqz $v0, .L80243170_C79E50 -/* C79E14 80243134 3C03FFAA */ lui $v1, 0xffaa -/* C79E18 80243138 8E420028 */ lw $v0, 0x28($s2) -/* C79E1C 8024313C 3463FFFC */ ori $v1, $v1, 0xfffc -/* C79E20 80243140 00431821 */ addu $v1, $v0, $v1 -/* C79E24 80243144 2C620015 */ sltiu $v0, $v1, 0x15 -/* C79E28 80243148 10400009 */ beqz $v0, .L80243170_C79E50 -/* C79E2C 8024314C 00031080 */ sll $v0, $v1, 2 -/* C79E30 80243150 3C018024 */ lui $at, %hi(jtbl_80247440_C7E120) -/* C79E34 80243154 00220821 */ addu $at, $at, $v0 -/* C79E38 80243158 8C227440 */ lw $v0, %lo(jtbl_80247440_C7E120)($at) -/* C79E3C 8024315C 00400008 */ jr $v0 -/* C79E40 80243160 00000000 */ nop -.L80243164_C79E44: -/* C79E44 80243164 8E420028 */ lw $v0, 0x28($s2) -/* C79E48 80243168 24420001 */ addiu $v0, $v0, 1 -/* C79E4C 8024316C AE420028 */ sw $v0, 0x28($s2) -.L80243170_C79E50: -/* C79E50 80243170 0000102D */ daddu $v0, $zero, $zero -.L80243174: -/* C79E54 80243174 8FBF0068 */ lw $ra, 0x68($sp) -/* C79E58 80243178 8FB50064 */ lw $s5, 0x64($sp) -/* C79E5C 8024317C 8FB40060 */ lw $s4, 0x60($sp) -/* C79E60 80243180 8FB3005C */ lw $s3, 0x5c($sp) -/* C79E64 80243184 8FB20058 */ lw $s2, 0x58($sp) -/* C79E68 80243188 8FB10054 */ lw $s1, 0x54($sp) -/* C79E6C 8024318C 8FB00050 */ lw $s0, 0x50($sp) -/* C79E70 80243190 03E00008 */ jr $ra -/* C79E74 80243194 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242048_C87AF8.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242048_C87AF8.s deleted file mode 100644 index 3d956fe0e4..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242048_C87AF8.s +++ /dev/null @@ -1,309 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80246570_C8C020 -.word .L80242454_C87F04, .L80242460_C87F10, .L80242460_C87F10, .L80242460_C87F10, .L80242460_C87F10, .L80242460_C87F10, .L80242460_C87F10, .L80242460_C87F10, .L80242454_C87F04, .L80242460_C87F10, .L80242454_C87F04, .L80242460_C87F10, .L80242454_C87F04, .L80242460_C87F10, .L80242454_C87F04, .L80242460_C87F10, .L80242460_C87F10, .L80242460_C87F10, .L80242454_C87F04, .L80242460_C87F10, .L80242454_C87F04, 0, 0, 0 - -.section .text - -glabel func_80242048_C87AF8 -/* C87AF8 80242048 27BDFF90 */ addiu $sp, $sp, -0x70 -/* C87AFC 8024204C AFB3005C */ sw $s3, 0x5c($sp) -/* C87B00 80242050 0080982D */ daddu $s3, $a0, $zero -/* C87B04 80242054 AFBF0068 */ sw $ra, 0x68($sp) -/* C87B08 80242058 AFB50064 */ sw $s5, 0x64($sp) -/* C87B0C 8024205C AFB40060 */ sw $s4, 0x60($sp) -/* C87B10 80242060 AFB20058 */ sw $s2, 0x58($sp) -/* C87B14 80242064 AFB10054 */ sw $s1, 0x54($sp) -/* C87B18 80242068 AFB00050 */ sw $s0, 0x50($sp) -/* C87B1C 8024206C 8E710148 */ lw $s1, 0x148($s3) -/* C87B20 80242070 86240008 */ lh $a0, 8($s1) -/* C87B24 80242074 0C00EABB */ jal get_npc_unsafe -/* C87B28 80242078 00A0802D */ daddu $s0, $a1, $zero -/* C87B2C 8024207C 8E63000C */ lw $v1, 0xc($s3) -/* C87B30 80242080 0260202D */ daddu $a0, $s3, $zero -/* C87B34 80242084 8C650000 */ lw $a1, ($v1) -/* C87B38 80242088 0C0B1EAF */ jal evt_get_variable -/* C87B3C 8024208C 0040902D */ daddu $s2, $v0, $zero -/* C87B40 80242090 AFA00028 */ sw $zero, 0x28($sp) -/* C87B44 80242094 8E2300D0 */ lw $v1, 0xd0($s1) -/* C87B48 80242098 8C630030 */ lw $v1, 0x30($v1) -/* C87B4C 8024209C AFA3002C */ sw $v1, 0x2c($sp) -/* C87B50 802420A0 8E2300D0 */ lw $v1, 0xd0($s1) -/* C87B54 802420A4 8C63001C */ lw $v1, 0x1c($v1) -/* C87B58 802420A8 AFA30030 */ sw $v1, 0x30($sp) -/* C87B5C 802420AC 8E2300D0 */ lw $v1, 0xd0($s1) -/* C87B60 802420B0 8C630024 */ lw $v1, 0x24($v1) -/* C87B64 802420B4 AFA30034 */ sw $v1, 0x34($sp) -/* C87B68 802420B8 8E2300D0 */ lw $v1, 0xd0($s1) -/* C87B6C 802420BC 8C630028 */ lw $v1, 0x28($v1) -/* C87B70 802420C0 27B50028 */ addiu $s5, $sp, 0x28 -/* C87B74 802420C4 AFA30038 */ sw $v1, 0x38($sp) -/* C87B78 802420C8 8E2300D0 */ lw $v1, 0xd0($s1) -/* C87B7C 802420CC 3C0142C8 */ lui $at, 0x42c8 -/* C87B80 802420D0 44810000 */ mtc1 $at, $f0 -/* C87B84 802420D4 8C63002C */ lw $v1, 0x2c($v1) -/* C87B88 802420D8 0040A02D */ daddu $s4, $v0, $zero -/* C87B8C 802420DC E7A00040 */ swc1 $f0, 0x40($sp) -/* C87B90 802420E0 A7A00044 */ sh $zero, 0x44($sp) -/* C87B94 802420E4 12000009 */ beqz $s0, .L8024210C -/* C87B98 802420E8 AFA3003C */ sw $v1, 0x3c($sp) -/* C87B9C 802420EC 864300A8 */ lh $v1, 0xa8($s2) -/* C87BA0 802420F0 8E2200B0 */ lw $v0, 0xb0($s1) -/* C87BA4 802420F4 AE20008C */ sw $zero, 0x8c($s1) -/* C87BA8 802420F8 A22000B5 */ sb $zero, 0xb5($s1) -/* C87BAC 802420FC 34420008 */ ori $v0, $v0, 8 -/* C87BB0 80242100 AE230084 */ sw $v1, 0x84($s1) -/* C87BB4 80242104 08090847 */ j .L8024211C -/* C87BB8 80242108 AE2200B0 */ sw $v0, 0xb0($s1) -.L8024210C: -/* C87BBC 8024210C 8E2200B0 */ lw $v0, 0xb0($s1) -/* C87BC0 80242110 30420004 */ andi $v0, $v0, 4 -/* C87BC4 80242114 10400047 */ beqz $v0, .L80242234 -/* C87BC8 80242118 00000000 */ nop -.L8024211C: -/* C87BCC 8024211C AE600070 */ sw $zero, 0x70($s3) -/* C87BD0 80242120 A640008E */ sh $zero, 0x8e($s2) -/* C87BD4 80242124 8E2300CC */ lw $v1, 0xcc($s1) -/* C87BD8 80242128 2404F7FF */ addiu $a0, $zero, -0x801 -/* C87BDC 8024212C A2200007 */ sb $zero, 7($s1) -/* C87BE0 80242130 8E420000 */ lw $v0, ($s2) -/* C87BE4 80242134 8C630000 */ lw $v1, ($v1) -/* C87BE8 80242138 00441024 */ and $v0, $v0, $a0 -/* C87BEC 8024213C AE420000 */ sw $v0, ($s2) -/* C87BF0 80242140 AE430028 */ sw $v1, 0x28($s2) -/* C87BF4 80242144 96220086 */ lhu $v0, 0x86($s1) -/* C87BF8 80242148 A64200A8 */ sh $v0, 0xa8($s2) -/* C87BFC 8024214C 8E2200D0 */ lw $v0, 0xd0($s1) -/* C87C00 80242150 AE200090 */ sw $zero, 0x90($s1) -/* C87C04 80242154 8C420034 */ lw $v0, 0x34($v0) -/* C87C08 80242158 14400006 */ bnez $v0, .L80242174 -/* C87C0C 8024215C 2403FDFF */ addiu $v1, $zero, -0x201 -/* C87C10 80242160 8E420000 */ lw $v0, ($s2) -/* C87C14 80242164 2403FFF7 */ addiu $v1, $zero, -9 -/* C87C18 80242168 34420200 */ ori $v0, $v0, 0x200 -/* C87C1C 8024216C 08090860 */ j .L80242180 -/* C87C20 80242170 00431024 */ and $v0, $v0, $v1 -.L80242174: -/* C87C24 80242174 8E420000 */ lw $v0, ($s2) -/* C87C28 80242178 00431024 */ and $v0, $v0, $v1 -/* C87C2C 8024217C 34420008 */ ori $v0, $v0, 8 -.L80242180: -/* C87C30 80242180 AE420000 */ sw $v0, ($s2) -/* C87C34 80242184 8E2200B0 */ lw $v0, 0xb0($s1) -/* C87C38 80242188 30420004 */ andi $v0, $v0, 4 -/* C87C3C 8024218C 1040001E */ beqz $v0, .L80242208 -/* C87C40 80242190 24040002 */ addiu $a0, $zero, 2 -/* C87C44 80242194 0240282D */ daddu $a1, $s2, $zero -/* C87C48 80242198 0000302D */ daddu $a2, $zero, $zero -/* C87C4C 8024219C 24020063 */ addiu $v0, $zero, 0x63 -/* C87C50 802421A0 AE620070 */ sw $v0, 0x70($s3) -/* C87C54 802421A4 AE600074 */ sw $zero, 0x74($s3) -/* C87C58 802421A8 864300A8 */ lh $v1, 0xa8($s2) -/* C87C5C 802421AC 3C013F80 */ lui $at, 0x3f80 -/* C87C60 802421B0 44810000 */ mtc1 $at, $f0 -/* C87C64 802421B4 3C014000 */ lui $at, 0x4000 -/* C87C68 802421B8 44811000 */ mtc1 $at, $f2 -/* C87C6C 802421BC 3C01C1A0 */ lui $at, 0xc1a0 -/* C87C70 802421C0 44812000 */ mtc1 $at, $f4 -/* C87C74 802421C4 24020028 */ addiu $v0, $zero, 0x28 -/* C87C78 802421C8 AFA2001C */ sw $v0, 0x1c($sp) -/* C87C7C 802421CC 44833000 */ mtc1 $v1, $f6 -/* C87C80 802421D0 00000000 */ nop -/* C87C84 802421D4 468031A0 */ cvt.s.w $f6, $f6 -/* C87C88 802421D8 44073000 */ mfc1 $a3, $f6 -/* C87C8C 802421DC 27A20048 */ addiu $v0, $sp, 0x48 -/* C87C90 802421E0 AFA20020 */ sw $v0, 0x20($sp) -/* C87C94 802421E4 E7A00010 */ swc1 $f0, 0x10($sp) -/* C87C98 802421E8 E7A20014 */ swc1 $f2, 0x14($sp) -/* C87C9C 802421EC 0C01BFA4 */ jal fx_emote -/* C87CA0 802421F0 E7A40018 */ swc1 $f4, 0x18($sp) -/* C87CA4 802421F4 8E2200B0 */ lw $v0, 0xb0($s1) -/* C87CA8 802421F8 2403FFFB */ addiu $v1, $zero, -5 -/* C87CAC 802421FC 00431024 */ and $v0, $v0, $v1 -/* C87CB0 80242200 0809088D */ j .L80242234 -/* C87CB4 80242204 AE2200B0 */ sw $v0, 0xb0($s1) -.L80242208: -/* C87CB8 80242208 8E220000 */ lw $v0, ($s1) -/* C87CBC 8024220C 3C034000 */ lui $v1, 0x4000 -/* C87CC0 80242210 00431024 */ and $v0, $v0, $v1 -/* C87CC4 80242214 10400007 */ beqz $v0, .L80242234 -/* C87CC8 80242218 3C03BFFF */ lui $v1, 0xbfff -/* C87CCC 8024221C 2402000C */ addiu $v0, $zero, 0xc -/* C87CD0 80242220 AE620070 */ sw $v0, 0x70($s3) -/* C87CD4 80242224 8E220000 */ lw $v0, ($s1) -/* C87CD8 80242228 3463FFFF */ ori $v1, $v1, 0xffff -/* C87CDC 8024222C 00431024 */ and $v0, $v0, $v1 -/* C87CE0 80242230 AE220000 */ sw $v0, ($s1) -.L80242234: -/* C87CE4 80242234 8E220090 */ lw $v0, 0x90($s1) -/* C87CE8 80242238 1840000C */ blez $v0, .L8024226C -/* C87CEC 8024223C 2442FFFF */ addiu $v0, $v0, -1 -/* C87CF0 80242240 14400087 */ bnez $v0, .L80242460_C87F10 -/* C87CF4 80242244 AE220090 */ sw $v0, 0x90($s1) -/* C87CF8 80242248 3C03FFAA */ lui $v1, 0xffaa -/* C87CFC 8024224C 8E420028 */ lw $v0, 0x28($s2) -/* C87D00 80242250 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* C87D04 80242254 00431021 */ addu $v0, $v0, $v1 -/* C87D08 80242258 2C420002 */ sltiu $v0, $v0, 2 -/* C87D0C 8024225C 10400003 */ beqz $v0, .L8024226C -/* C87D10 80242260 3C020055 */ lui $v0, 0x55 -/* C87D14 80242264 3442000C */ ori $v0, $v0, 0xc -/* C87D18 80242268 AE420028 */ sw $v0, 0x28($s2) -.L8024226C: -/* C87D1C 8024226C 8E630070 */ lw $v1, 0x70($s3) -/* C87D20 80242270 2402000C */ addiu $v0, $zero, 0xc -/* C87D24 80242274 10620048 */ beq $v1, $v0, .L80242398 -/* C87D28 80242278 2862000D */ slti $v0, $v1, 0xd -/* C87D2C 8024227C 1040000F */ beqz $v0, .L802422BC -/* C87D30 80242280 24100001 */ addiu $s0, $zero, 1 -/* C87D34 80242284 1070001E */ beq $v1, $s0, .L80242300 -/* C87D38 80242288 28620002 */ slti $v0, $v1, 2 -/* C87D3C 8024228C 10400005 */ beqz $v0, .L802422A4 -/* C87D40 80242290 24020002 */ addiu $v0, $zero, 2 -/* C87D44 80242294 10600015 */ beqz $v1, .L802422EC -/* C87D48 80242298 0260202D */ daddu $a0, $s3, $zero -/* C87D4C 8024229C 080908FD */ j .L802423F4 -/* C87D50 802422A0 00000000 */ nop -.L802422A4: -/* C87D54 802422A4 1062001C */ beq $v1, $v0, .L80242318 -/* C87D58 802422A8 24020003 */ addiu $v0, $zero, 3 -/* C87D5C 802422AC 10620035 */ beq $v1, $v0, .L80242384 -/* C87D60 802422B0 0260202D */ daddu $a0, $s3, $zero -/* C87D64 802422B4 080908FD */ j .L802423F4 -/* C87D68 802422B8 00000000 */ nop -.L802422BC: -/* C87D6C 802422BC 2402000E */ addiu $v0, $zero, 0xe -/* C87D70 802422C0 1062003F */ beq $v1, $v0, .L802423C0 -/* C87D74 802422C4 0062102A */ slt $v0, $v1, $v0 -/* C87D78 802422C8 14400038 */ bnez $v0, .L802423AC -/* C87D7C 802422CC 0260202D */ daddu $a0, $s3, $zero -/* C87D80 802422D0 2402000F */ addiu $v0, $zero, 0xf -/* C87D84 802422D4 10620040 */ beq $v1, $v0, .L802423D8 -/* C87D88 802422D8 24020063 */ addiu $v0, $zero, 0x63 -/* C87D8C 802422DC 10620043 */ beq $v1, $v0, .L802423EC -/* C87D90 802422E0 00000000 */ nop -/* C87D94 802422E4 080908FD */ j .L802423F4 -/* C87D98 802422E8 00000000 */ nop -.L802422EC: -/* C87D9C 802422EC 0280282D */ daddu $a1, $s4, $zero -/* C87DA0 802422F0 0C012568 */ jal func_800495A0 -/* C87DA4 802422F4 02A0302D */ daddu $a2, $s5, $zero -/* C87DA8 802422F8 96220086 */ lhu $v0, 0x86($s1) -/* C87DAC 802422FC A64200A8 */ sh $v0, 0xa8($s2) -.L80242300: -/* C87DB0 80242300 0260202D */ daddu $a0, $s3, $zero -/* C87DB4 80242304 0280282D */ daddu $a1, $s4, $zero -/* C87DB8 80242308 0C0125AE */ jal func_800496B8 -/* C87DBC 8024230C 02A0302D */ daddu $a2, $s5, $zero -/* C87DC0 80242310 080908FD */ j .L802423F4 -/* C87DC4 80242314 00000000 */ nop -.L80242318: -/* C87DC8 80242318 0260202D */ daddu $a0, $s3, $zero -/* C87DCC 8024231C 0280282D */ daddu $a1, $s4, $zero -/* C87DD0 80242320 0C0126D1 */ jal base_UnkNpcAIFunc1 -/* C87DD4 80242324 02A0302D */ daddu $a2, $s5, $zero -/* C87DD8 80242328 8E230088 */ lw $v1, 0x88($s1) -/* C87DDC 8024232C 24020006 */ addiu $v0, $zero, 6 -/* C87DE0 80242330 14620014 */ bne $v1, $v0, .L80242384 -/* C87DE4 80242334 0260202D */ daddu $a0, $s3, $zero -/* C87DE8 80242338 0C00A67F */ jal rand_int -/* C87DEC 8024233C 24040064 */ addiu $a0, $zero, 0x64 -/* C87DF0 80242340 28420021 */ slti $v0, $v0, 0x21 -/* C87DF4 80242344 5040000F */ beql $v0, $zero, .L80242384 -/* C87DF8 80242348 0260202D */ daddu $a0, $s3, $zero -/* C87DFC 8024234C 8E22008C */ lw $v0, 0x8c($s1) -/* C87E00 80242350 10400005 */ beqz $v0, .L80242368 -/* C87E04 80242354 3C020055 */ lui $v0, 0x55 -/* C87E08 80242358 3442002F */ ori $v0, $v0, 0x2f -/* C87E0C 8024235C AE20008C */ sw $zero, 0x8c($s1) -/* C87E10 80242360 080908DD */ j .L80242374 -/* C87E14 80242364 A22000B5 */ sb $zero, 0xb5($s1) -.L80242368: -/* C87E18 80242368 3442002E */ ori $v0, $v0, 0x2e -/* C87E1C 8024236C AE30008C */ sw $s0, 0x8c($s1) -/* C87E20 80242370 A23000B5 */ sb $s0, 0xb5($s1) -.L80242374: -/* C87E24 80242374 AE420028 */ sw $v0, 0x28($s2) -/* C87E28 80242378 24020007 */ addiu $v0, $zero, 7 -/* C87E2C 8024237C 08090918 */ j .L80242460_C87F10 -/* C87E30 80242380 AE220090 */ sw $v0, 0x90($s1) -.L80242384: -/* C87E34 80242384 0280282D */ daddu $a1, $s4, $zero -/* C87E38 80242388 0C012701 */ jal func_80049C04 -/* C87E3C 8024238C 02A0302D */ daddu $a2, $s5, $zero -/* C87E40 80242390 080908FD */ j .L802423F4 -/* C87E44 80242394 00000000 */ nop -.L80242398: -/* C87E48 80242398 0260202D */ daddu $a0, $s3, $zero -/* C87E4C 8024239C 0280282D */ daddu $a1, $s4, $zero -/* C87E50 802423A0 0C09072D */ jal kzn_17_set_script_owner_npc_anim -/* C87E54 802423A4 02A0302D */ daddu $a2, $s5, $zero -/* C87E58 802423A8 0260202D */ daddu $a0, $s3, $zero -.L802423AC: -/* C87E5C 802423AC 0280282D */ daddu $a1, $s4, $zero -/* C87E60 802423B0 0C09074C */ jal kzn_17_UnkDistFunc -/* C87E64 802423B4 02A0302D */ daddu $a2, $s5, $zero -/* C87E68 802423B8 080908FD */ j .L802423F4 -/* C87E6C 802423BC 00000000 */ nop -.L802423C0: -/* C87E70 802423C0 0260202D */ daddu $a0, $s3, $zero -/* C87E74 802423C4 0280282D */ daddu $a1, $s4, $zero -/* C87E78 802423C8 0C090799 */ jal kzn_17_UnkNpcAIFunc12 -/* C87E7C 802423CC 02A0302D */ daddu $a2, $s5, $zero -/* C87E80 802423D0 080908FD */ j .L802423F4 -/* C87E84 802423D4 00000000 */ nop -.L802423D8: -/* C87E88 802423D8 0280282D */ daddu $a1, $s4, $zero -/* C87E8C 802423DC 0C0907F2 */ jal kzn_17_set_script_owner_npc_col_height -/* C87E90 802423E0 02A0302D */ daddu $a2, $s5, $zero -/* C87E94 802423E4 080908FD */ j .L802423F4 -/* C87E98 802423E8 00000000 */ nop -.L802423EC: -/* C87E9C 802423EC 0C0129CF */ jal func_8004A73C -/* C87EA0 802423F0 0260202D */ daddu $a0, $s3, $zero -.L802423F4: -/* C87EA4 802423F4 8E230088 */ lw $v1, 0x88($s1) -/* C87EA8 802423F8 24020006 */ addiu $v0, $zero, 6 -/* C87EAC 802423FC 14620019 */ bne $v1, $v0, .L80242464 -/* C87EB0 80242400 0000102D */ daddu $v0, $zero, $zero -/* C87EB4 80242404 8E22008C */ lw $v0, 0x8c($s1) -/* C87EB8 80242408 10400003 */ beqz $v0, .L80242418 -/* C87EBC 8024240C 24020001 */ addiu $v0, $zero, 1 -/* C87EC0 80242410 08090907 */ j .L8024241C -/* C87EC4 80242414 A22200B5 */ sb $v0, 0xb5($s1) -.L80242418: -/* C87EC8 80242418 A22000B5 */ sb $zero, 0xb5($s1) -.L8024241C: -/* C87ECC 8024241C 8E22008C */ lw $v0, 0x8c($s1) -/* C87ED0 80242420 1040000F */ beqz $v0, .L80242460_C87F10 -/* C87ED4 80242424 3C03FFAA */ lui $v1, 0xffaa -/* C87ED8 80242428 8E420028 */ lw $v0, 0x28($s2) -/* C87EDC 8024242C 3463FFFC */ ori $v1, $v1, 0xfffc -/* C87EE0 80242430 00431821 */ addu $v1, $v0, $v1 -/* C87EE4 80242434 2C620015 */ sltiu $v0, $v1, 0x15 -/* C87EE8 80242438 10400009 */ beqz $v0, .L80242460_C87F10 -/* C87EEC 8024243C 00031080 */ sll $v0, $v1, 2 -/* C87EF0 80242440 3C018024 */ lui $at, %hi(jtbl_80246570_C8C020) -/* C87EF4 80242444 00220821 */ addu $at, $at, $v0 -/* C87EF8 80242448 8C226570 */ lw $v0, %lo(jtbl_80246570_C8C020)($at) -/* C87EFC 8024244C 00400008 */ jr $v0 -/* C87F00 80242450 00000000 */ nop -.L80242454_C87F04: -/* C87F04 80242454 8E420028 */ lw $v0, 0x28($s2) -/* C87F08 80242458 24420001 */ addiu $v0, $v0, 1 -/* C87F0C 8024245C AE420028 */ sw $v0, 0x28($s2) -.L80242460_C87F10: -/* C87F10 80242460 0000102D */ daddu $v0, $zero, $zero -.L80242464: -/* C87F14 80242464 8FBF0068 */ lw $ra, 0x68($sp) -/* C87F18 80242468 8FB50064 */ lw $s5, 0x64($sp) -/* C87F1C 8024246C 8FB40060 */ lw $s4, 0x60($sp) -/* C87F20 80242470 8FB3005C */ lw $s3, 0x5c($sp) -/* C87F24 80242474 8FB20058 */ lw $s2, 0x58($sp) -/* C87F28 80242478 8FB10054 */ lw $s1, 0x54($sp) -/* C87F2C 8024247C 8FB00050 */ lw $s0, 0x50($sp) -/* C87F30 80242480 03E00008 */ jr $ra -/* C87F34 80242484 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240000_9C53E0.s b/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240000_9C53E0.s deleted file mode 100644 index 76256e5ed2..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240000_9C53E0.s +++ /dev/null @@ -1,59 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80251A90_9D6E70 -.double 32767.0 - -.section .text - -glabel func_80240000_9C53E0 -/* 9C53E0 80240000 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9C53E4 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* 9C53E8 80240008 0080802D */ daddu $s0, $a0, $zero -/* 9C53EC 8024000C AFBF001C */ sw $ra, 0x1c($sp) -/* 9C53F0 80240010 AFB20018 */ sw $s2, 0x18($sp) -/* 9C53F4 80240014 AFB10014 */ sw $s1, 0x14($sp) -/* 9C53F8 80240018 8E110148 */ lw $s1, 0x148($s0) -/* 9C53FC 8024001C 86240008 */ lh $a0, 8($s1) -/* 9C5400 80240020 0C00EABB */ jal get_npc_unsafe -/* 9C5404 80240024 00A0902D */ daddu $s2, $a1, $zero -/* 9C5408 80240028 8E2300CC */ lw $v1, 0xcc($s1) -/* 9C540C 8024002C 0040202D */ daddu $a0, $v0, $zero -/* 9C5410 80240030 8C630000 */ lw $v1, ($v1) -/* 9C5414 80240034 24020001 */ addiu $v0, $zero, 1 -/* 9C5418 80240038 AC830028 */ sw $v1, 0x28($a0) -/* 9C541C 8024003C AE020070 */ sw $v0, 0x70($s0) -/* 9C5420 80240040 8E220000 */ lw $v0, ($s1) -/* 9C5424 80240044 3C030010 */ lui $v1, 0x10 -/* 9C5428 80240048 00431024 */ and $v0, $v0, $v1 -/* 9C542C 8024004C 10400004 */ beqz $v0, .L80240060 -/* 9C5430 80240050 00000000 */ nop -/* 9C5434 80240054 C620006C */ lwc1 $f0, 0x6c($s1) -/* 9C5438 80240058 46800020 */ cvt.s.w $f0, $f0 -/* 9C543C 8024005C E480000C */ swc1 $f0, 0xc($a0) -.L80240060: -/* 9C5440 80240060 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9C5444 80240064 8C420014 */ lw $v0, 0x14($v0) -/* 9C5448 80240068 1C400004 */ bgtz $v0, .L8024007C -/* 9C544C 8024006C 00000000 */ nop -/* 9C5450 80240070 C640000C */ lwc1 $f0, 0xc($s2) -/* 9C5454 80240074 08090027 */ j .L8024009C -/* 9C5458 80240078 E4800018 */ swc1 $f0, 0x18($a0) -.L8024007C: -/* 9C545C 8024007C 3C018025 */ lui $at, %hi(D_80251A90_9D6E70) -/* 9C5460 80240080 D4221A90 */ ldc1 $f2, %lo(D_80251A90_9D6E70)($at) -/* 9C5464 80240084 44820000 */ mtc1 $v0, $f0 -/* 9C5468 80240088 00000000 */ nop -/* 9C546C 8024008C 46800021 */ cvt.d.w $f0, $f0 -/* 9C5470 80240090 46220003 */ div.d $f0, $f0, $f2 -/* 9C5474 80240094 46200020 */ cvt.s.d $f0, $f0 -/* 9C5478 80240098 E4800018 */ swc1 $f0, 0x18($a0) -.L8024009C: -/* 9C547C 8024009C 8FBF001C */ lw $ra, 0x1c($sp) -/* 9C5480 802400A0 8FB20018 */ lw $s2, 0x18($sp) -/* 9C5484 802400A4 8FB10014 */ lw $s1, 0x14($sp) -/* 9C5488 802400A8 8FB00010 */ lw $s0, 0x10($sp) -/* 9C548C 802400AC 03E00008 */ jr $ra -/* 9C5490 802400B0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802400B4_9C5494.s b/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802400B4_9C5494.s deleted file mode 100644 index 6c170846ef..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802400B4_9C5494.s +++ /dev/null @@ -1,78 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400B4_9C5494 -/* 9C5494 802400B4 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 9C5498 802400B8 AFB40040 */ sw $s4, 0x40($sp) -/* 9C549C 802400BC 0080A02D */ daddu $s4, $a0, $zero -/* 9C54A0 802400C0 AFBF0044 */ sw $ra, 0x44($sp) -/* 9C54A4 802400C4 AFB3003C */ sw $s3, 0x3c($sp) -/* 9C54A8 802400C8 AFB20038 */ sw $s2, 0x38($sp) -/* 9C54AC 802400CC AFB10034 */ sw $s1, 0x34($sp) -/* 9C54B0 802400D0 AFB00030 */ sw $s0, 0x30($sp) -/* 9C54B4 802400D4 8E920148 */ lw $s2, 0x148($s4) -/* 9C54B8 802400D8 00A0802D */ daddu $s0, $a1, $zero -/* 9C54BC 802400DC 86440008 */ lh $a0, 8($s2) -/* 9C54C0 802400E0 0C00EABB */ jal get_npc_unsafe -/* 9C54C4 802400E4 00C0982D */ daddu $s3, $a2, $zero -/* 9C54C8 802400E8 8E030008 */ lw $v1, 8($s0) -/* 9C54CC 802400EC 04600031 */ bltz $v1, .L802401B4 -/* 9C54D0 802400F0 0040882D */ daddu $s1, $v0, $zero -/* 9C54D4 802400F4 0260202D */ daddu $a0, $s3, $zero -/* 9C54D8 802400F8 AFA00010 */ sw $zero, 0x10($sp) -/* 9C54DC 802400FC 8E060018 */ lw $a2, 0x18($s0) -/* 9C54E0 80240100 8E07001C */ lw $a3, 0x1c($s0) -/* 9C54E4 80240104 0C01242D */ jal func_800490B4 -/* 9C54E8 80240108 0240282D */ daddu $a1, $s2, $zero -/* 9C54EC 8024010C 10400029 */ beqz $v0, .L802401B4 -/* 9C54F0 80240110 0000202D */ daddu $a0, $zero, $zero -/* 9C54F4 80240114 0220282D */ daddu $a1, $s1, $zero -/* 9C54F8 80240118 0000302D */ daddu $a2, $zero, $zero -/* 9C54FC 8024011C 862300A8 */ lh $v1, 0xa8($s1) -/* 9C5500 80240120 3C013F80 */ lui $at, 0x3f80 -/* 9C5504 80240124 44810000 */ mtc1 $at, $f0 -/* 9C5508 80240128 3C014000 */ lui $at, 0x4000 -/* 9C550C 8024012C 44811000 */ mtc1 $at, $f2 -/* 9C5510 80240130 3C01C1A0 */ lui $at, 0xc1a0 -/* 9C5514 80240134 44812000 */ mtc1 $at, $f4 -/* 9C5518 80240138 2402000F */ addiu $v0, $zero, 0xf -/* 9C551C 8024013C AFA2001C */ sw $v0, 0x1c($sp) -/* 9C5520 80240140 44833000 */ mtc1 $v1, $f6 -/* 9C5524 80240144 00000000 */ nop -/* 9C5528 80240148 468031A0 */ cvt.s.w $f6, $f6 -/* 9C552C 8024014C 44073000 */ mfc1 $a3, $f6 -/* 9C5530 80240150 27A20028 */ addiu $v0, $sp, 0x28 -/* 9C5534 80240154 AFA20020 */ sw $v0, 0x20($sp) -/* 9C5538 80240158 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9C553C 8024015C E7A20014 */ swc1 $f2, 0x14($sp) -/* 9C5540 80240160 0C01BFA4 */ jal fx_emote -/* 9C5544 80240164 E7A40018 */ swc1 $f4, 0x18($sp) -/* 9C5548 80240168 0220202D */ daddu $a0, $s1, $zero -/* 9C554C 8024016C 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 9C5550 80240170 0C012530 */ jal ai_enemy_play_sound -/* 9C5554 80240174 3C060020 */ lui $a2, 0x20 -/* 9C5558 80240178 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9C555C 8024017C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9C5560 80240180 C62C0038 */ lwc1 $f12, 0x38($s1) -/* 9C5564 80240184 C62E0040 */ lwc1 $f14, 0x40($s1) -/* 9C5568 80240188 8C460028 */ lw $a2, 0x28($v0) -/* 9C556C 8024018C 0C00A720 */ jal atan2 -/* 9C5570 80240190 8C470030 */ lw $a3, 0x30($v0) -/* 9C5574 80240194 E620000C */ swc1 $f0, 0xc($s1) -/* 9C5578 80240198 8E420018 */ lw $v0, 0x18($s2) -/* 9C557C 8024019C 9442002A */ lhu $v0, 0x2a($v0) -/* 9C5580 802401A0 30420001 */ andi $v0, $v0, 1 -/* 9C5584 802401A4 14400002 */ bnez $v0, .L802401B0 -/* 9C5588 802401A8 2402000A */ addiu $v0, $zero, 0xa -/* 9C558C 802401AC 2402000C */ addiu $v0, $zero, 0xc -.L802401B0: -/* 9C5590 802401B0 AE820070 */ sw $v0, 0x70($s4) -.L802401B4: -/* 9C5594 802401B4 8FBF0044 */ lw $ra, 0x44($sp) -/* 9C5598 802401B8 8FB40040 */ lw $s4, 0x40($sp) -/* 9C559C 802401BC 8FB3003C */ lw $s3, 0x3c($sp) -/* 9C55A0 802401C0 8FB20038 */ lw $s2, 0x38($sp) -/* 9C55A4 802401C4 8FB10034 */ lw $s1, 0x34($sp) -/* 9C55A8 802401C8 8FB00030 */ lw $s0, 0x30($sp) -/* 9C55AC 802401CC 03E00008 */ jr $ra -/* 9C55B0 802401D0 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240540_9C5920.s b/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240540_9C5920.s deleted file mode 100644 index 97c4d4af79..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240540_9C5920.s +++ /dev/null @@ -1,59 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80251A98_9D6E78 -.double 0.3 - -dlabel D_80251AA0_9D6E80 -.double 32767.0 - -.section .text - -glabel func_80240540_9C5920 -/* 9C5920 80240540 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9C5924 80240544 AFB10014 */ sw $s1, 0x14($sp) -/* 9C5928 80240548 0080882D */ daddu $s1, $a0, $zero -/* 9C592C 8024054C AFBF001C */ sw $ra, 0x1c($sp) -/* 9C5930 80240550 AFB20018 */ sw $s2, 0x18($sp) -/* 9C5934 80240554 AFB00010 */ sw $s0, 0x10($sp) -/* 9C5938 80240558 8E300148 */ lw $s0, 0x148($s1) -/* 9C593C 8024055C 86040008 */ lh $a0, 8($s0) -/* 9C5940 80240560 0C00EABB */ jal get_npc_unsafe -/* 9C5944 80240564 00A0902D */ daddu $s2, $a1, $zero -/* 9C5948 80240568 8E0300CC */ lw $v1, 0xcc($s0) -/* 9C594C 8024056C 8C630004 */ lw $v1, 4($v1) -/* 9C5950 80240570 0040202D */ daddu $a0, $v0, $zero -/* 9C5954 80240574 AC830028 */ sw $v1, 0x28($a0) -/* 9C5958 80240578 8E0200D0 */ lw $v0, 0xd0($s0) -/* 9C595C 8024057C 8C420014 */ lw $v0, 0x14($v0) -/* 9C5960 80240580 04410009 */ bgez $v0, .L802405A8 -/* 9C5964 80240584 00000000 */ nop -/* 9C5968 80240588 C640000C */ lwc1 $f0, 0xc($s2) -/* 9C596C 8024058C 3C018025 */ lui $at, %hi(D_80251A98_9D6E78) -/* 9C5970 80240590 D4221A98 */ ldc1 $f2, %lo(D_80251A98_9D6E78)($at) -/* 9C5974 80240594 46000021 */ cvt.d.s $f0, $f0 -/* 9C5978 80240598 46220002 */ mul.d $f0, $f0, $f2 -/* 9C597C 8024059C 00000000 */ nop -/* 9C5980 802405A0 08090171 */ j .L802405C4 -/* 9C5984 802405A4 46200020 */ cvt.s.d $f0, $f0 -.L802405A8: -/* 9C5988 802405A8 3C018025 */ lui $at, %hi(D_80251AA0_9D6E80) -/* 9C598C 802405AC D4221AA0 */ ldc1 $f2, %lo(D_80251AA0_9D6E80)($at) -/* 9C5990 802405B0 44820000 */ mtc1 $v0, $f0 -/* 9C5994 802405B4 00000000 */ nop -/* 9C5998 802405B8 46800021 */ cvt.d.w $f0, $f0 -/* 9C599C 802405BC 46220003 */ div.d $f0, $f0, $f2 -/* 9C59A0 802405C0 46200020 */ cvt.s.d $f0, $f0 -.L802405C4: -/* 9C59A4 802405C4 E4800018 */ swc1 $f0, 0x18($a0) -/* 9C59A8 802405C8 24020010 */ addiu $v0, $zero, 0x10 -/* 9C59AC 802405CC AE200074 */ sw $zero, 0x74($s1) -/* 9C59B0 802405D0 AE220070 */ sw $v0, 0x70($s1) -/* 9C59B4 802405D4 8FBF001C */ lw $ra, 0x1c($sp) -/* 9C59B8 802405D8 8FB20018 */ lw $s2, 0x18($sp) -/* 9C59BC 802405DC 8FB10014 */ lw $s1, 0x14($sp) -/* 9C59C0 802405E0 8FB00010 */ lw $s0, 0x10($sp) -/* 9C59C4 802405E4 03E00008 */ jr $ra -/* 9C59C8 802405E8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802405EC_9C59CC.s b/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802405EC_9C59CC.s deleted file mode 100644 index 8591577539..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802405EC_9C59CC.s +++ /dev/null @@ -1,140 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405EC_9C59CC -/* 9C59CC 802405EC 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 9C59D0 802405F0 AFB3003C */ sw $s3, 0x3c($sp) -/* 9C59D4 802405F4 0080982D */ daddu $s3, $a0, $zero -/* 9C59D8 802405F8 AFBF0044 */ sw $ra, 0x44($sp) -/* 9C59DC 802405FC AFB40040 */ sw $s4, 0x40($sp) -/* 9C59E0 80240600 AFB20038 */ sw $s2, 0x38($sp) -/* 9C59E4 80240604 AFB10034 */ sw $s1, 0x34($sp) -/* 9C59E8 80240608 AFB00030 */ sw $s0, 0x30($sp) -/* 9C59EC 8024060C 8E710148 */ lw $s1, 0x148($s3) -/* 9C59F0 80240610 00A0902D */ daddu $s2, $a1, $zero -/* 9C59F4 80240614 86240008 */ lh $a0, 8($s1) -/* 9C59F8 80240618 0C00EABB */ jal get_npc_unsafe -/* 9C59FC 8024061C 00C0A02D */ daddu $s4, $a2, $zero -/* 9C5A00 80240620 8E430008 */ lw $v1, 8($s2) -/* 9C5A04 80240624 0460003B */ bltz $v1, .L80240714 -/* 9C5A08 80240628 0040802D */ daddu $s0, $v0, $zero -/* 9C5A0C 8024062C 8E620074 */ lw $v0, 0x74($s3) -/* 9C5A10 80240630 1C400037 */ bgtz $v0, .L80240710 -/* 9C5A14 80240634 2442FFFF */ addiu $v0, $v0, -1 -/* 9C5A18 80240638 0280202D */ daddu $a0, $s4, $zero -/* 9C5A1C 8024063C AE630074 */ sw $v1, 0x74($s3) -/* 9C5A20 80240640 AFA00010 */ sw $zero, 0x10($sp) -/* 9C5A24 80240644 8E460018 */ lw $a2, 0x18($s2) -/* 9C5A28 80240648 8E47001C */ lw $a3, 0x1c($s2) -/* 9C5A2C 8024064C 0C01242D */ jal func_800490B4 -/* 9C5A30 80240650 0220282D */ daddu $a1, $s1, $zero -/* 9C5A34 80240654 1040002C */ beqz $v0, .L80240708 -/* 9C5A38 80240658 0000202D */ daddu $a0, $zero, $zero -/* 9C5A3C 8024065C 0200282D */ daddu $a1, $s0, $zero -/* 9C5A40 80240660 0000302D */ daddu $a2, $zero, $zero -/* 9C5A44 80240664 860300A8 */ lh $v1, 0xa8($s0) -/* 9C5A48 80240668 3C013F80 */ lui $at, 0x3f80 -/* 9C5A4C 8024066C 44810000 */ mtc1 $at, $f0 -/* 9C5A50 80240670 3C014000 */ lui $at, 0x4000 -/* 9C5A54 80240674 44811000 */ mtc1 $at, $f2 -/* 9C5A58 80240678 3C01C1A0 */ lui $at, 0xc1a0 -/* 9C5A5C 8024067C 44812000 */ mtc1 $at, $f4 -/* 9C5A60 80240680 2402000F */ addiu $v0, $zero, 0xf -/* 9C5A64 80240684 AFA2001C */ sw $v0, 0x1c($sp) -/* 9C5A68 80240688 44833000 */ mtc1 $v1, $f6 -/* 9C5A6C 8024068C 00000000 */ nop -/* 9C5A70 80240690 468031A0 */ cvt.s.w $f6, $f6 -/* 9C5A74 80240694 44073000 */ mfc1 $a3, $f6 -/* 9C5A78 80240698 27A20028 */ addiu $v0, $sp, 0x28 -/* 9C5A7C 8024069C AFA20020 */ sw $v0, 0x20($sp) -/* 9C5A80 802406A0 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9C5A84 802406A4 E7A20014 */ swc1 $f2, 0x14($sp) -/* 9C5A88 802406A8 0C01BFA4 */ jal fx_emote -/* 9C5A8C 802406AC E7A40018 */ swc1 $f4, 0x18($sp) -/* 9C5A90 802406B0 0200202D */ daddu $a0, $s0, $zero -/* 9C5A94 802406B4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 9C5A98 802406B8 0C012530 */ jal ai_enemy_play_sound -/* 9C5A9C 802406BC 3C060020 */ lui $a2, 0x20 -/* 9C5AA0 802406C0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9C5AA4 802406C4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9C5AA8 802406C8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9C5AAC 802406CC C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9C5AB0 802406D0 8C460028 */ lw $a2, 0x28($v0) -/* 9C5AB4 802406D4 0C00A720 */ jal atan2 -/* 9C5AB8 802406D8 8C470030 */ lw $a3, 0x30($v0) -/* 9C5ABC 802406DC E600000C */ swc1 $f0, 0xc($s0) -/* 9C5AC0 802406E0 8E220018 */ lw $v0, 0x18($s1) -/* 9C5AC4 802406E4 9442002A */ lhu $v0, 0x2a($v0) -/* 9C5AC8 802406E8 30420001 */ andi $v0, $v0, 1 -/* 9C5ACC 802406EC 10400003 */ beqz $v0, .L802406FC -/* 9C5AD0 802406F0 2402000A */ addiu $v0, $zero, 0xa -/* 9C5AD4 802406F4 080901F5 */ j .L802407D4 -/* 9C5AD8 802406F8 AE620070 */ sw $v0, 0x70($s3) -.L802406FC: -/* 9C5ADC 802406FC 2402000C */ addiu $v0, $zero, 0xc -/* 9C5AE0 80240700 080901F5 */ j .L802407D4 -/* 9C5AE4 80240704 AE620070 */ sw $v0, 0x70($s3) -.L80240708: -/* 9C5AE8 80240708 8E620074 */ lw $v0, 0x74($s3) -/* 9C5AEC 8024070C 2442FFFF */ addiu $v0, $v0, -1 -.L80240710: -/* 9C5AF0 80240710 AE620074 */ sw $v0, 0x74($s3) -.L80240714: -/* 9C5AF4 80240714 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9C5AF8 80240718 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9C5AFC 8024071C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9C5B00 80240720 C4460000 */ lwc1 $f6, ($v0) -/* 9C5B04 80240724 468031A0 */ cvt.s.w $f6, $f6 -/* 9C5B08 80240728 44063000 */ mfc1 $a2, $f6 -/* 9C5B0C 8024072C C4460008 */ lwc1 $f6, 8($v0) -/* 9C5B10 80240730 468031A0 */ cvt.s.w $f6, $f6 -/* 9C5B14 80240734 44073000 */ mfc1 $a3, $f6 -/* 9C5B18 80240738 0C00A7B5 */ jal dist2D -/* 9C5B1C 8024073C 00000000 */ nop -/* 9C5B20 80240740 C6020018 */ lwc1 $f2, 0x18($s0) -/* 9C5B24 80240744 4602003C */ c.lt.s $f0, $f2 -/* 9C5B28 80240748 00000000 */ nop -/* 9C5B2C 8024074C 4500000E */ bc1f .L80240788 -/* 9C5B30 80240750 00000000 */ nop -/* 9C5B34 80240754 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9C5B38 80240758 C4400000 */ lwc1 $f0, ($v0) -/* 9C5B3C 8024075C 46800020 */ cvt.s.w $f0, $f0 -/* 9C5B40 80240760 E6000038 */ swc1 $f0, 0x38($s0) -/* 9C5B44 80240764 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9C5B48 80240768 C4400008 */ lwc1 $f0, 8($v0) -/* 9C5B4C 8024076C 46800020 */ cvt.s.w $f0, $f0 -/* 9C5B50 80240770 E6000040 */ swc1 $f0, 0x40($s0) -/* 9C5B54 80240774 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9C5B58 80240778 C440000C */ lwc1 $f0, 0xc($v0) -/* 9C5B5C 8024077C 46800020 */ cvt.s.w $f0, $f0 -/* 9C5B60 80240780 E600000C */ swc1 $f0, 0xc($s0) -/* 9C5B64 80240784 AE600070 */ sw $zero, 0x70($s3) -.L80240788: -/* 9C5B68 80240788 8602008C */ lh $v0, 0x8c($s0) -/* 9C5B6C 8024078C 14400011 */ bnez $v0, .L802407D4 -/* 9C5B70 80240790 00000000 */ nop -/* 9C5B74 80240794 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9C5B78 80240798 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9C5B7C 8024079C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9C5B80 802407A0 C4460000 */ lwc1 $f6, ($v0) -/* 9C5B84 802407A4 468031A0 */ cvt.s.w $f6, $f6 -/* 9C5B88 802407A8 44063000 */ mfc1 $a2, $f6 -/* 9C5B8C 802407AC C4460008 */ lwc1 $f6, 8($v0) -/* 9C5B90 802407B0 468031A0 */ cvt.s.w $f6, $f6 -/* 9C5B94 802407B4 44073000 */ mfc1 $a3, $f6 -/* 9C5B98 802407B8 0C00A720 */ jal atan2 -/* 9C5B9C 802407BC 00000000 */ nop -/* 9C5BA0 802407C0 8E050018 */ lw $a1, 0x18($s0) -/* 9C5BA4 802407C4 44060000 */ mfc1 $a2, $f0 -/* 9C5BA8 802407C8 0200202D */ daddu $a0, $s0, $zero -/* 9C5BAC 802407CC 0C00EA95 */ jal npc_move_heading -/* 9C5BB0 802407D0 AC86000C */ sw $a2, 0xc($a0) -.L802407D4: -/* 9C5BB4 802407D4 8FBF0044 */ lw $ra, 0x44($sp) -/* 9C5BB8 802407D8 8FB40040 */ lw $s4, 0x40($sp) -/* 9C5BBC 802407DC 8FB3003C */ lw $s3, 0x3c($sp) -/* 9C5BC0 802407E0 8FB20038 */ lw $s2, 0x38($sp) -/* 9C5BC4 802407E4 8FB10034 */ lw $s1, 0x34($sp) -/* 9C5BC8 802407E8 8FB00030 */ lw $s0, 0x30($sp) -/* 9C5BCC 802407EC 03E00008 */ jr $ra -/* 9C5BD0 802407F0 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802407F4_9C5BD4.s b/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802407F4_9C5BD4.s deleted file mode 100644 index ede0248e5e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802407F4_9C5BD4.s +++ /dev/null @@ -1,185 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80251AA8_9D6E88 -.word .L80240984_9C5D64, .L80240994_9C5D74, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L802409AC_9C5D8C, .L802409BC_9C5D9C, .L802409D4_9C5DB4, .L802409E4_9C5DC4, .L802409FC_9C5DDC, .L80240A14_9C5DF4, .L80240A24_9C5E04, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A44_9C5E24, .L80240A3C_9C5E1C, 0, 0 - -.section .text - -glabel func_802407F4_9C5BD4 -/* 9C5BD4 802407F4 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 9C5BD8 802407F8 AFB40040 */ sw $s4, 0x40($sp) -/* 9C5BDC 802407FC 0080A02D */ daddu $s4, $a0, $zero -/* 9C5BE0 80240800 AFBF0048 */ sw $ra, 0x48($sp) -/* 9C5BE4 80240804 AFB50044 */ sw $s5, 0x44($sp) -/* 9C5BE8 80240808 AFB3003C */ sw $s3, 0x3c($sp) -/* 9C5BEC 8024080C AFB20038 */ sw $s2, 0x38($sp) -/* 9C5BF0 80240810 AFB10034 */ sw $s1, 0x34($sp) -/* 9C5BF4 80240814 AFB00030 */ sw $s0, 0x30($sp) -/* 9C5BF8 80240818 8E920148 */ lw $s2, 0x148($s4) -/* 9C5BFC 8024081C 86440008 */ lh $a0, 8($s2) -/* 9C5C00 80240820 8E90000C */ lw $s0, 0xc($s4) -/* 9C5C04 80240824 0C00EABB */ jal get_npc_unsafe -/* 9C5C08 80240828 00A0882D */ daddu $s1, $a1, $zero -/* 9C5C0C 8024082C 0280202D */ daddu $a0, $s4, $zero -/* 9C5C10 80240830 8E050000 */ lw $a1, ($s0) -/* 9C5C14 80240834 0C0B1EAF */ jal evt_get_variable -/* 9C5C18 80240838 0040802D */ daddu $s0, $v0, $zero -/* 9C5C1C 8024083C AFA00010 */ sw $zero, 0x10($sp) -/* 9C5C20 80240840 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9C5C24 80240844 8C630030 */ lw $v1, 0x30($v1) -/* 9C5C28 80240848 AFA30014 */ sw $v1, 0x14($sp) -/* 9C5C2C 8024084C 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9C5C30 80240850 8C63001C */ lw $v1, 0x1c($v1) -/* 9C5C34 80240854 AFA30018 */ sw $v1, 0x18($sp) -/* 9C5C38 80240858 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9C5C3C 8024085C 8C630024 */ lw $v1, 0x24($v1) -/* 9C5C40 80240860 AFA3001C */ sw $v1, 0x1c($sp) -/* 9C5C44 80240864 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9C5C48 80240868 8C630028 */ lw $v1, 0x28($v1) -/* 9C5C4C 8024086C 27B50010 */ addiu $s5, $sp, 0x10 -/* 9C5C50 80240870 AFA30020 */ sw $v1, 0x20($sp) -/* 9C5C54 80240874 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9C5C58 80240878 3C014282 */ lui $at, 0x4282 -/* 9C5C5C 8024087C 44810000 */ mtc1 $at, $f0 -/* 9C5C60 80240880 8C63002C */ lw $v1, 0x2c($v1) -/* 9C5C64 80240884 0040982D */ daddu $s3, $v0, $zero -/* 9C5C68 80240888 E7A00028 */ swc1 $f0, 0x28($sp) -/* 9C5C6C 8024088C A7A0002C */ sh $zero, 0x2c($sp) -/* 9C5C70 80240890 16200005 */ bnez $s1, .L802408A8 -/* 9C5C74 80240894 AFA30024 */ sw $v1, 0x24($sp) -/* 9C5C78 80240898 8E4200B0 */ lw $v0, 0xb0($s2) -/* 9C5C7C 8024089C 30420004 */ andi $v0, $v0, 4 -/* 9C5C80 802408A0 1040002F */ beqz $v0, .L80240960 -/* 9C5C84 802408A4 00000000 */ nop -.L802408A8: -/* 9C5C88 802408A8 AE800070 */ sw $zero, 0x70($s4) -/* 9C5C8C 802408AC C600000C */ lwc1 $f0, 0xc($s0) -/* 9C5C90 802408B0 A600008E */ sh $zero, 0x8e($s0) -/* 9C5C94 802408B4 8E4200CC */ lw $v0, 0xcc($s2) -/* 9C5C98 802408B8 4600008D */ trunc.w.s $f2, $f0 -/* 9C5C9C 802408BC E642006C */ swc1 $f2, 0x6c($s2) -/* 9C5CA0 802408C0 8C420000 */ lw $v0, ($v0) -/* 9C5CA4 802408C4 8E030000 */ lw $v1, ($s0) -/* 9C5CA8 802408C8 AE020028 */ sw $v0, 0x28($s0) -/* 9C5CAC 802408CC 2402F7FF */ addiu $v0, $zero, -0x801 -/* 9C5CB0 802408D0 00621824 */ and $v1, $v1, $v0 -/* 9C5CB4 802408D4 AE030000 */ sw $v1, ($s0) -/* 9C5CB8 802408D8 8E4200D0 */ lw $v0, 0xd0($s2) -/* 9C5CBC 802408DC 8C420034 */ lw $v0, 0x34($v0) -/* 9C5CC0 802408E0 54400005 */ bnel $v0, $zero, .L802408F8 -/* 9C5CC4 802408E4 2402FDFF */ addiu $v0, $zero, -0x201 -/* 9C5CC8 802408E8 34620200 */ ori $v0, $v1, 0x200 -/* 9C5CCC 802408EC 2403FFF7 */ addiu $v1, $zero, -9 -/* 9C5CD0 802408F0 08090240 */ j .L80240900 -/* 9C5CD4 802408F4 00431024 */ and $v0, $v0, $v1 -.L802408F8: -/* 9C5CD8 802408F8 00621024 */ and $v0, $v1, $v0 -/* 9C5CDC 802408FC 34420008 */ ori $v0, $v0, 8 -.L80240900: -/* 9C5CE0 80240900 AE020000 */ sw $v0, ($s0) -/* 9C5CE4 80240904 8E4200B0 */ lw $v0, 0xb0($s2) -/* 9C5CE8 80240908 30420004 */ andi $v0, $v0, 4 -/* 9C5CEC 8024090C 10400009 */ beqz $v0, .L80240934 -/* 9C5CF0 80240910 24020063 */ addiu $v0, $zero, 0x63 -/* 9C5CF4 80240914 AE820070 */ sw $v0, 0x70($s4) -/* 9C5CF8 80240918 2402000F */ addiu $v0, $zero, 0xf -/* 9C5CFC 8024091C AE820074 */ sw $v0, 0x74($s4) -/* 9C5D00 80240920 8E4200B0 */ lw $v0, 0xb0($s2) -/* 9C5D04 80240924 2403FFFB */ addiu $v1, $zero, -5 -/* 9C5D08 80240928 00431024 */ and $v0, $v0, $v1 -/* 9C5D0C 8024092C 08090258 */ j .L80240960 -/* 9C5D10 80240930 AE4200B0 */ sw $v0, 0xb0($s2) -.L80240934: -/* 9C5D14 80240934 8E420000 */ lw $v0, ($s2) -/* 9C5D18 80240938 3C034000 */ lui $v1, 0x4000 -/* 9C5D1C 8024093C 00431024 */ and $v0, $v0, $v1 -/* 9C5D20 80240940 10400007 */ beqz $v0, .L80240960 -/* 9C5D24 80240944 3C03BFFF */ lui $v1, 0xbfff -/* 9C5D28 80240948 2402000C */ addiu $v0, $zero, 0xc -/* 9C5D2C 8024094C AE820070 */ sw $v0, 0x70($s4) -/* 9C5D30 80240950 8E420000 */ lw $v0, ($s2) -/* 9C5D34 80240954 3463FFFF */ ori $v1, $v1, 0xffff -/* 9C5D38 80240958 00431024 */ and $v0, $v0, $v1 -/* 9C5D3C 8024095C AE420000 */ sw $v0, ($s2) -.L80240960: -/* 9C5D40 80240960 8E830070 */ lw $v1, 0x70($s4) -/* 9C5D44 80240964 2C620064 */ sltiu $v0, $v1, 0x64 -/* 9C5D48 80240968 10400036 */ beqz $v0, .L80240A44_9C5E24 -/* 9C5D4C 8024096C 00031080 */ sll $v0, $v1, 2 -/* 9C5D50 80240970 3C018025 */ lui $at, %hi(jtbl_80251AA8_9D6E88) -/* 9C5D54 80240974 00220821 */ addu $at, $at, $v0 -/* 9C5D58 80240978 8C221AA8 */ lw $v0, %lo(jtbl_80251AA8_9D6E88)($at) -/* 9C5D5C 8024097C 00400008 */ jr $v0 -/* 9C5D60 80240980 00000000 */ nop -.L80240984_9C5D64: -/* 9C5D64 80240984 0280202D */ daddu $a0, $s4, $zero -/* 9C5D68 80240988 0260282D */ daddu $a1, $s3, $zero -/* 9C5D6C 8024098C 0C090000 */ jal func_80240000_9C53E0 -/* 9C5D70 80240990 02A0302D */ daddu $a2, $s5, $zero -.L80240994_9C5D74: -/* 9C5D74 80240994 0280202D */ daddu $a0, $s4, $zero -/* 9C5D78 80240998 0260282D */ daddu $a1, $s3, $zero -/* 9C5D7C 8024099C 0C09002D */ jal func_802400B4_9C5494 -/* 9C5D80 802409A0 02A0302D */ daddu $a2, $s5, $zero -/* 9C5D84 802409A4 08090291 */ j .L80240A44_9C5E24 -/* 9C5D88 802409A8 00000000 */ nop -.L802409AC_9C5D8C: -/* 9C5D8C 802409AC 0280202D */ daddu $a0, $s4, $zero -/* 9C5D90 802409B0 0260282D */ daddu $a1, $s3, $zero -/* 9C5D94 802409B4 0C090075 */ jal nok_01_NpcJumpFunc3 -/* 9C5D98 802409B8 02A0302D */ daddu $a2, $s5, $zero -.L802409BC_9C5D9C: -/* 9C5D9C 802409BC 0280202D */ daddu $a0, $s4, $zero -/* 9C5DA0 802409C0 0260282D */ daddu $a1, $s3, $zero -/* 9C5DA4 802409C4 0C09008D */ jal nok_01_NpcJumpFunc -/* 9C5DA8 802409C8 02A0302D */ daddu $a2, $s5, $zero -/* 9C5DAC 802409CC 08090291 */ j .L80240A44_9C5E24 -/* 9C5DB0 802409D0 00000000 */ nop -.L802409D4_9C5DB4: -/* 9C5DB4 802409D4 0280202D */ daddu $a0, $s4, $zero -/* 9C5DB8 802409D8 0260282D */ daddu $a1, $s3, $zero -/* 9C5DBC 802409DC 0C0900AB */ jal nok_01_UnkNpcAIFunc13_2 -/* 9C5DC0 802409E0 02A0302D */ daddu $a2, $s5, $zero -.L802409E4_9C5DC4: -/* 9C5DC4 802409E4 0280202D */ daddu $a0, $s4, $zero -/* 9C5DC8 802409E8 0260282D */ daddu $a1, $s3, $zero -/* 9C5DCC 802409EC 0C0900F7 */ jal nok_01_UnkNpcAIFunc11 -/* 9C5DD0 802409F0 02A0302D */ daddu $a2, $s5, $zero -/* 9C5DD4 802409F4 08090291 */ j .L80240A44_9C5E24 -/* 9C5DD8 802409F8 00000000 */ nop -.L802409FC_9C5DDC: -/* 9C5DDC 802409FC 0280202D */ daddu $a0, $s4, $zero -/* 9C5DE0 80240A00 0260282D */ daddu $a1, $s3, $zero -/* 9C5DE4 80240A04 0C09013E */ jal nok_01_UnkNpcAIFunc10 -/* 9C5DE8 80240A08 02A0302D */ daddu $a2, $s5, $zero -/* 9C5DEC 80240A0C 08090291 */ j .L80240A44_9C5E24 -/* 9C5DF0 80240A10 00000000 */ nop -.L80240A14_9C5DF4: -/* 9C5DF4 80240A14 0280202D */ daddu $a0, $s4, $zero -/* 9C5DF8 80240A18 0260282D */ daddu $a1, $s3, $zero -/* 9C5DFC 80240A1C 0C090150 */ jal func_80240540_9C5920 -/* 9C5E00 80240A20 02A0302D */ daddu $a2, $s5, $zero -.L80240A24_9C5E04: -/* 9C5E04 80240A24 0280202D */ daddu $a0, $s4, $zero -/* 9C5E08 80240A28 0260282D */ daddu $a1, $s3, $zero -/* 9C5E0C 80240A2C 0C09017B */ jal func_802405EC_9C59CC -/* 9C5E10 80240A30 02A0302D */ daddu $a2, $s5, $zero -/* 9C5E14 80240A34 08090291 */ j .L80240A44_9C5E24 -/* 9C5E18 80240A38 00000000 */ nop -.L80240A3C_9C5E1C: -/* 9C5E1C 80240A3C 0C0129CF */ jal func_8004A73C -/* 9C5E20 80240A40 0280202D */ daddu $a0, $s4, $zero -.L80240A44_9C5E24: -/* 9C5E24 80240A44 8FBF0048 */ lw $ra, 0x48($sp) -/* 9C5E28 80240A48 8FB50044 */ lw $s5, 0x44($sp) -/* 9C5E2C 80240A4C 8FB40040 */ lw $s4, 0x40($sp) -/* 9C5E30 80240A50 8FB3003C */ lw $s3, 0x3c($sp) -/* 9C5E34 80240A54 8FB20038 */ lw $s2, 0x38($sp) -/* 9C5E38 80240A58 8FB10034 */ lw $s1, 0x34($sp) -/* 9C5E3C 80240A5C 8FB00030 */ lw $s0, 0x30($sp) -/* 9C5E40 80240A60 0000102D */ daddu $v0, $zero, $zero -/* 9C5E44 80240A64 03E00008 */ jr $ra -/* 9C5E48 80240A68 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80240394_9F4DD4.s b/ver/us/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80240394_9F4DD4.s deleted file mode 100644 index 67a3e80e7e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80240394_9F4DD4.s +++ /dev/null @@ -1,309 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80245CF8_9FA738 -.word .L802407A0_9F51E0, .L802407AC_9F51EC, .L802407AC_9F51EC, .L802407AC_9F51EC, .L802407AC_9F51EC, .L802407AC_9F51EC, .L802407AC_9F51EC, .L802407AC_9F51EC, .L802407A0_9F51E0, .L802407AC_9F51EC, .L802407A0_9F51E0, .L802407AC_9F51EC, .L802407A0_9F51E0, .L802407AC_9F51EC, .L802407A0_9F51E0, .L802407AC_9F51EC, .L802407AC_9F51EC, .L802407AC_9F51EC, .L802407A0_9F51E0, .L802407AC_9F51EC, .L802407A0_9F51E0, 0 - -.section .text - -glabel func_80240394_9F4DD4 -/* 9F4DD4 80240394 27BDFF90 */ addiu $sp, $sp, -0x70 -/* 9F4DD8 80240398 AFB3005C */ sw $s3, 0x5c($sp) -/* 9F4DDC 8024039C 0080982D */ daddu $s3, $a0, $zero -/* 9F4DE0 802403A0 AFBF0068 */ sw $ra, 0x68($sp) -/* 9F4DE4 802403A4 AFB50064 */ sw $s5, 0x64($sp) -/* 9F4DE8 802403A8 AFB40060 */ sw $s4, 0x60($sp) -/* 9F4DEC 802403AC AFB20058 */ sw $s2, 0x58($sp) -/* 9F4DF0 802403B0 AFB10054 */ sw $s1, 0x54($sp) -/* 9F4DF4 802403B4 AFB00050 */ sw $s0, 0x50($sp) -/* 9F4DF8 802403B8 8E710148 */ lw $s1, 0x148($s3) -/* 9F4DFC 802403BC 86240008 */ lh $a0, 8($s1) -/* 9F4E00 802403C0 0C00EABB */ jal get_npc_unsafe -/* 9F4E04 802403C4 00A0802D */ daddu $s0, $a1, $zero -/* 9F4E08 802403C8 8E63000C */ lw $v1, 0xc($s3) -/* 9F4E0C 802403CC 0260202D */ daddu $a0, $s3, $zero -/* 9F4E10 802403D0 8C650000 */ lw $a1, ($v1) -/* 9F4E14 802403D4 0C0B1EAF */ jal evt_get_variable -/* 9F4E18 802403D8 0040902D */ daddu $s2, $v0, $zero -/* 9F4E1C 802403DC AFA00028 */ sw $zero, 0x28($sp) -/* 9F4E20 802403E0 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9F4E24 802403E4 8C630030 */ lw $v1, 0x30($v1) -/* 9F4E28 802403E8 AFA3002C */ sw $v1, 0x2c($sp) -/* 9F4E2C 802403EC 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9F4E30 802403F0 8C63001C */ lw $v1, 0x1c($v1) -/* 9F4E34 802403F4 AFA30030 */ sw $v1, 0x30($sp) -/* 9F4E38 802403F8 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9F4E3C 802403FC 8C630024 */ lw $v1, 0x24($v1) -/* 9F4E40 80240400 AFA30034 */ sw $v1, 0x34($sp) -/* 9F4E44 80240404 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9F4E48 80240408 8C630028 */ lw $v1, 0x28($v1) -/* 9F4E4C 8024040C 27B50028 */ addiu $s5, $sp, 0x28 -/* 9F4E50 80240410 AFA30038 */ sw $v1, 0x38($sp) -/* 9F4E54 80240414 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9F4E58 80240418 3C0142C8 */ lui $at, 0x42c8 -/* 9F4E5C 8024041C 44810000 */ mtc1 $at, $f0 -/* 9F4E60 80240420 8C63002C */ lw $v1, 0x2c($v1) -/* 9F4E64 80240424 0040A02D */ daddu $s4, $v0, $zero -/* 9F4E68 80240428 E7A00040 */ swc1 $f0, 0x40($sp) -/* 9F4E6C 8024042C A7A00044 */ sh $zero, 0x44($sp) -/* 9F4E70 80240430 12000009 */ beqz $s0, .L80240458 -/* 9F4E74 80240434 AFA3003C */ sw $v1, 0x3c($sp) -/* 9F4E78 80240438 864300A8 */ lh $v1, 0xa8($s2) -/* 9F4E7C 8024043C 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9F4E80 80240440 AE20008C */ sw $zero, 0x8c($s1) -/* 9F4E84 80240444 A22000B5 */ sb $zero, 0xb5($s1) -/* 9F4E88 80240448 34420008 */ ori $v0, $v0, 8 -/* 9F4E8C 8024044C AE230084 */ sw $v1, 0x84($s1) -/* 9F4E90 80240450 0809011A */ j .L80240468 -/* 9F4E94 80240454 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240458: -/* 9F4E98 80240458 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9F4E9C 8024045C 30420004 */ andi $v0, $v0, 4 -/* 9F4EA0 80240460 10400047 */ beqz $v0, .L80240580 -/* 9F4EA4 80240464 00000000 */ nop -.L80240468: -/* 9F4EA8 80240468 AE600070 */ sw $zero, 0x70($s3) -/* 9F4EAC 8024046C A640008E */ sh $zero, 0x8e($s2) -/* 9F4EB0 80240470 8E2300CC */ lw $v1, 0xcc($s1) -/* 9F4EB4 80240474 2404F7FF */ addiu $a0, $zero, -0x801 -/* 9F4EB8 80240478 A2200007 */ sb $zero, 7($s1) -/* 9F4EBC 8024047C 8E420000 */ lw $v0, ($s2) -/* 9F4EC0 80240480 8C630000 */ lw $v1, ($v1) -/* 9F4EC4 80240484 00441024 */ and $v0, $v0, $a0 -/* 9F4EC8 80240488 AE420000 */ sw $v0, ($s2) -/* 9F4ECC 8024048C AE430028 */ sw $v1, 0x28($s2) -/* 9F4ED0 80240490 96220086 */ lhu $v0, 0x86($s1) -/* 9F4ED4 80240494 A64200A8 */ sh $v0, 0xa8($s2) -/* 9F4ED8 80240498 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9F4EDC 8024049C AE200090 */ sw $zero, 0x90($s1) -/* 9F4EE0 802404A0 8C420034 */ lw $v0, 0x34($v0) -/* 9F4EE4 802404A4 14400006 */ bnez $v0, .L802404C0 -/* 9F4EE8 802404A8 2403FDFF */ addiu $v1, $zero, -0x201 -/* 9F4EEC 802404AC 8E420000 */ lw $v0, ($s2) -/* 9F4EF0 802404B0 2403FFF7 */ addiu $v1, $zero, -9 -/* 9F4EF4 802404B4 34420200 */ ori $v0, $v0, 0x200 -/* 9F4EF8 802404B8 08090133 */ j .L802404CC -/* 9F4EFC 802404BC 00431024 */ and $v0, $v0, $v1 -.L802404C0: -/* 9F4F00 802404C0 8E420000 */ lw $v0, ($s2) -/* 9F4F04 802404C4 00431024 */ and $v0, $v0, $v1 -/* 9F4F08 802404C8 34420008 */ ori $v0, $v0, 8 -.L802404CC: -/* 9F4F0C 802404CC AE420000 */ sw $v0, ($s2) -/* 9F4F10 802404D0 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9F4F14 802404D4 30420004 */ andi $v0, $v0, 4 -/* 9F4F18 802404D8 1040001E */ beqz $v0, .L80240554 -/* 9F4F1C 802404DC 24040002 */ addiu $a0, $zero, 2 -/* 9F4F20 802404E0 0240282D */ daddu $a1, $s2, $zero -/* 9F4F24 802404E4 0000302D */ daddu $a2, $zero, $zero -/* 9F4F28 802404E8 24020063 */ addiu $v0, $zero, 0x63 -/* 9F4F2C 802404EC AE620070 */ sw $v0, 0x70($s3) -/* 9F4F30 802404F0 AE600074 */ sw $zero, 0x74($s3) -/* 9F4F34 802404F4 864300A8 */ lh $v1, 0xa8($s2) -/* 9F4F38 802404F8 3C013F80 */ lui $at, 0x3f80 -/* 9F4F3C 802404FC 44810000 */ mtc1 $at, $f0 -/* 9F4F40 80240500 3C014000 */ lui $at, 0x4000 -/* 9F4F44 80240504 44811000 */ mtc1 $at, $f2 -/* 9F4F48 80240508 3C01C1A0 */ lui $at, 0xc1a0 -/* 9F4F4C 8024050C 44812000 */ mtc1 $at, $f4 -/* 9F4F50 80240510 24020028 */ addiu $v0, $zero, 0x28 -/* 9F4F54 80240514 AFA2001C */ sw $v0, 0x1c($sp) -/* 9F4F58 80240518 44833000 */ mtc1 $v1, $f6 -/* 9F4F5C 8024051C 00000000 */ nop -/* 9F4F60 80240520 468031A0 */ cvt.s.w $f6, $f6 -/* 9F4F64 80240524 44073000 */ mfc1 $a3, $f6 -/* 9F4F68 80240528 27A20048 */ addiu $v0, $sp, 0x48 -/* 9F4F6C 8024052C AFA20020 */ sw $v0, 0x20($sp) -/* 9F4F70 80240530 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9F4F74 80240534 E7A20014 */ swc1 $f2, 0x14($sp) -/* 9F4F78 80240538 0C01BFA4 */ jal fx_emote -/* 9F4F7C 8024053C E7A40018 */ swc1 $f4, 0x18($sp) -/* 9F4F80 80240540 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9F4F84 80240544 2403FFFB */ addiu $v1, $zero, -5 -/* 9F4F88 80240548 00431024 */ and $v0, $v0, $v1 -/* 9F4F8C 8024054C 08090160 */ j .L80240580 -/* 9F4F90 80240550 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240554: -/* 9F4F94 80240554 8E220000 */ lw $v0, ($s1) -/* 9F4F98 80240558 3C034000 */ lui $v1, 0x4000 -/* 9F4F9C 8024055C 00431024 */ and $v0, $v0, $v1 -/* 9F4FA0 80240560 10400007 */ beqz $v0, .L80240580 -/* 9F4FA4 80240564 3C03BFFF */ lui $v1, 0xbfff -/* 9F4FA8 80240568 2402000C */ addiu $v0, $zero, 0xc -/* 9F4FAC 8024056C AE620070 */ sw $v0, 0x70($s3) -/* 9F4FB0 80240570 8E220000 */ lw $v0, ($s1) -/* 9F4FB4 80240574 3463FFFF */ ori $v1, $v1, 0xffff -/* 9F4FB8 80240578 00431024 */ and $v0, $v0, $v1 -/* 9F4FBC 8024057C AE220000 */ sw $v0, ($s1) -.L80240580: -/* 9F4FC0 80240580 8E220090 */ lw $v0, 0x90($s1) -/* 9F4FC4 80240584 1840000C */ blez $v0, .L802405B8 -/* 9F4FC8 80240588 2442FFFF */ addiu $v0, $v0, -1 -/* 9F4FCC 8024058C 14400087 */ bnez $v0, .L802407AC_9F51EC -/* 9F4FD0 80240590 AE220090 */ sw $v0, 0x90($s1) -/* 9F4FD4 80240594 3C03FFAA */ lui $v1, 0xffaa -/* 9F4FD8 80240598 8E420028 */ lw $v0, 0x28($s2) -/* 9F4FDC 8024059C 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* 9F4FE0 802405A0 00431021 */ addu $v0, $v0, $v1 -/* 9F4FE4 802405A4 2C420002 */ sltiu $v0, $v0, 2 -/* 9F4FE8 802405A8 10400003 */ beqz $v0, .L802405B8 -/* 9F4FEC 802405AC 3C020055 */ lui $v0, 0x55 -/* 9F4FF0 802405B0 3442000C */ ori $v0, $v0, 0xc -/* 9F4FF4 802405B4 AE420028 */ sw $v0, 0x28($s2) -.L802405B8: -/* 9F4FF8 802405B8 8E630070 */ lw $v1, 0x70($s3) -/* 9F4FFC 802405BC 2402000C */ addiu $v0, $zero, 0xc -/* 9F5000 802405C0 10620048 */ beq $v1, $v0, .L802406E4 -/* 9F5004 802405C4 2862000D */ slti $v0, $v1, 0xd -/* 9F5008 802405C8 1040000F */ beqz $v0, .L80240608 -/* 9F500C 802405CC 24100001 */ addiu $s0, $zero, 1 -/* 9F5010 802405D0 1070001E */ beq $v1, $s0, .L8024064C -/* 9F5014 802405D4 28620002 */ slti $v0, $v1, 2 -/* 9F5018 802405D8 10400005 */ beqz $v0, .L802405F0 -/* 9F501C 802405DC 24020002 */ addiu $v0, $zero, 2 -/* 9F5020 802405E0 10600015 */ beqz $v1, .L80240638 -/* 9F5024 802405E4 0260202D */ daddu $a0, $s3, $zero -/* 9F5028 802405E8 080901D0 */ j .L80240740 -/* 9F502C 802405EC 00000000 */ nop -.L802405F0: -/* 9F5030 802405F0 1062001C */ beq $v1, $v0, .L80240664 -/* 9F5034 802405F4 24020003 */ addiu $v0, $zero, 3 -/* 9F5038 802405F8 10620035 */ beq $v1, $v0, .L802406D0 -/* 9F503C 802405FC 0260202D */ daddu $a0, $s3, $zero -/* 9F5040 80240600 080901D0 */ j .L80240740 -/* 9F5044 80240604 00000000 */ nop -.L80240608: -/* 9F5048 80240608 2402000E */ addiu $v0, $zero, 0xe -/* 9F504C 8024060C 1062003F */ beq $v1, $v0, .L8024070C -/* 9F5050 80240610 0062102A */ slt $v0, $v1, $v0 -/* 9F5054 80240614 14400038 */ bnez $v0, .L802406F8 -/* 9F5058 80240618 0260202D */ daddu $a0, $s3, $zero -/* 9F505C 8024061C 2402000F */ addiu $v0, $zero, 0xf -/* 9F5060 80240620 10620040 */ beq $v1, $v0, .L80240724 -/* 9F5064 80240624 24020063 */ addiu $v0, $zero, 0x63 -/* 9F5068 80240628 10620043 */ beq $v1, $v0, .L80240738 -/* 9F506C 8024062C 00000000 */ nop -/* 9F5070 80240630 080901D0 */ j .L80240740 -/* 9F5074 80240634 00000000 */ nop -.L80240638: -/* 9F5078 80240638 0280282D */ daddu $a1, $s4, $zero -/* 9F507C 8024063C 0C012568 */ jal func_800495A0 -/* 9F5080 80240640 02A0302D */ daddu $a2, $s5, $zero -/* 9F5084 80240644 96220086 */ lhu $v0, 0x86($s1) -/* 9F5088 80240648 A64200A8 */ sh $v0, 0xa8($s2) -.L8024064C: -/* 9F508C 8024064C 0260202D */ daddu $a0, $s3, $zero -/* 9F5090 80240650 0280282D */ daddu $a1, $s4, $zero -/* 9F5094 80240654 0C0125AE */ jal func_800496B8 -/* 9F5098 80240658 02A0302D */ daddu $a2, $s5, $zero -/* 9F509C 8024065C 080901D0 */ j .L80240740 -/* 9F50A0 80240660 00000000 */ nop -.L80240664: -/* 9F50A4 80240664 0260202D */ daddu $a0, $s3, $zero -/* 9F50A8 80240668 0280282D */ daddu $a1, $s4, $zero -/* 9F50AC 8024066C 0C0126D1 */ jal base_UnkNpcAIFunc1 -/* 9F50B0 80240670 02A0302D */ daddu $a2, $s5, $zero -/* 9F50B4 80240674 8E230088 */ lw $v1, 0x88($s1) -/* 9F50B8 80240678 24020006 */ addiu $v0, $zero, 6 -/* 9F50BC 8024067C 14620014 */ bne $v1, $v0, .L802406D0 -/* 9F50C0 80240680 0260202D */ daddu $a0, $s3, $zero -/* 9F50C4 80240684 0C00A67F */ jal rand_int -/* 9F50C8 80240688 24040064 */ addiu $a0, $zero, 0x64 -/* 9F50CC 8024068C 28420021 */ slti $v0, $v0, 0x21 -/* 9F50D0 80240690 5040000F */ beql $v0, $zero, .L802406D0 -/* 9F50D4 80240694 0260202D */ daddu $a0, $s3, $zero -/* 9F50D8 80240698 8E22008C */ lw $v0, 0x8c($s1) -/* 9F50DC 8024069C 10400005 */ beqz $v0, .L802406B4 -/* 9F50E0 802406A0 3C020055 */ lui $v0, 0x55 -/* 9F50E4 802406A4 3442002F */ ori $v0, $v0, 0x2f -/* 9F50E8 802406A8 AE20008C */ sw $zero, 0x8c($s1) -/* 9F50EC 802406AC 080901B0 */ j .L802406C0 -/* 9F50F0 802406B0 A22000B5 */ sb $zero, 0xb5($s1) -.L802406B4: -/* 9F50F4 802406B4 3442002E */ ori $v0, $v0, 0x2e -/* 9F50F8 802406B8 AE30008C */ sw $s0, 0x8c($s1) -/* 9F50FC 802406BC A23000B5 */ sb $s0, 0xb5($s1) -.L802406C0: -/* 9F5100 802406C0 AE420028 */ sw $v0, 0x28($s2) -/* 9F5104 802406C4 24020007 */ addiu $v0, $zero, 7 -/* 9F5108 802406C8 080901EB */ j .L802407AC_9F51EC -/* 9F510C 802406CC AE220090 */ sw $v0, 0x90($s1) -.L802406D0: -/* 9F5110 802406D0 0280282D */ daddu $a1, $s4, $zero -/* 9F5114 802406D4 0C012701 */ jal func_80049C04 -/* 9F5118 802406D8 02A0302D */ daddu $a2, $s5, $zero -/* 9F511C 802406DC 080901D0 */ j .L80240740 -/* 9F5120 802406E0 00000000 */ nop -.L802406E4: -/* 9F5124 802406E4 0260202D */ daddu $a0, $s3, $zero -/* 9F5128 802406E8 0280282D */ daddu $a1, $s4, $zero -/* 9F512C 802406EC 0C090000 */ jal nok_11_set_script_owner_npc_anim -/* 9F5130 802406F0 02A0302D */ daddu $a2, $s5, $zero -/* 9F5134 802406F4 0260202D */ daddu $a0, $s3, $zero -.L802406F8: -/* 9F5138 802406F8 0280282D */ daddu $a1, $s4, $zero -/* 9F513C 802406FC 0C09001F */ jal nok_11_UnkDistFunc -/* 9F5140 80240700 02A0302D */ daddu $a2, $s5, $zero -/* 9F5144 80240704 080901D0 */ j .L80240740 -/* 9F5148 80240708 00000000 */ nop -.L8024070C: -/* 9F514C 8024070C 0260202D */ daddu $a0, $s3, $zero -/* 9F5150 80240710 0280282D */ daddu $a1, $s4, $zero -/* 9F5154 80240714 0C09006C */ jal nok_11_UnkNpcAIFunc12 -/* 9F5158 80240718 02A0302D */ daddu $a2, $s5, $zero -/* 9F515C 8024071C 080901D0 */ j .L80240740 -/* 9F5160 80240720 00000000 */ nop -.L80240724: -/* 9F5164 80240724 0280282D */ daddu $a1, $s4, $zero -/* 9F5168 80240728 0C0900C5 */ jal nok_11_set_script_owner_npc_col_height -/* 9F516C 8024072C 02A0302D */ daddu $a2, $s5, $zero -/* 9F5170 80240730 080901D0 */ j .L80240740 -/* 9F5174 80240734 00000000 */ nop -.L80240738: -/* 9F5178 80240738 0C0129CF */ jal func_8004A73C -/* 9F517C 8024073C 0260202D */ daddu $a0, $s3, $zero -.L80240740: -/* 9F5180 80240740 8E230088 */ lw $v1, 0x88($s1) -/* 9F5184 80240744 24020006 */ addiu $v0, $zero, 6 -/* 9F5188 80240748 14620019 */ bne $v1, $v0, .L802407B0 -/* 9F518C 8024074C 0000102D */ daddu $v0, $zero, $zero -/* 9F5190 80240750 8E22008C */ lw $v0, 0x8c($s1) -/* 9F5194 80240754 10400003 */ beqz $v0, .L80240764 -/* 9F5198 80240758 24020001 */ addiu $v0, $zero, 1 -/* 9F519C 8024075C 080901DA */ j .L80240768 -/* 9F51A0 80240760 A22200B5 */ sb $v0, 0xb5($s1) -.L80240764: -/* 9F51A4 80240764 A22000B5 */ sb $zero, 0xb5($s1) -.L80240768: -/* 9F51A8 80240768 8E22008C */ lw $v0, 0x8c($s1) -/* 9F51AC 8024076C 1040000F */ beqz $v0, .L802407AC_9F51EC -/* 9F51B0 80240770 3C03FFAA */ lui $v1, 0xffaa -/* 9F51B4 80240774 8E420028 */ lw $v0, 0x28($s2) -/* 9F51B8 80240778 3463FFFC */ ori $v1, $v1, 0xfffc -/* 9F51BC 8024077C 00431821 */ addu $v1, $v0, $v1 -/* 9F51C0 80240780 2C620015 */ sltiu $v0, $v1, 0x15 -/* 9F51C4 80240784 10400009 */ beqz $v0, .L802407AC_9F51EC -/* 9F51C8 80240788 00031080 */ sll $v0, $v1, 2 -/* 9F51CC 8024078C 3C018024 */ lui $at, %hi(jtbl_80245CF8_9FA738) -/* 9F51D0 80240790 00220821 */ addu $at, $at, $v0 -/* 9F51D4 80240794 8C225CF8 */ lw $v0, %lo(jtbl_80245CF8_9FA738)($at) -/* 9F51D8 80240798 00400008 */ jr $v0 -/* 9F51DC 8024079C 00000000 */ nop -.L802407A0_9F51E0: -/* 9F51E0 802407A0 8E420028 */ lw $v0, 0x28($s2) -/* 9F51E4 802407A4 24420001 */ addiu $v0, $v0, 1 -/* 9F51E8 802407A8 AE420028 */ sw $v0, 0x28($s2) -.L802407AC_9F51EC: -/* 9F51EC 802407AC 0000102D */ daddu $v0, $zero, $zero -.L802407B0: -/* 9F51F0 802407B0 8FBF0068 */ lw $ra, 0x68($sp) -/* 9F51F4 802407B4 8FB50064 */ lw $s5, 0x64($sp) -/* 9F51F8 802407B8 8FB40060 */ lw $s4, 0x60($sp) -/* 9F51FC 802407BC 8FB3005C */ lw $s3, 0x5c($sp) -/* 9F5200 802407C0 8FB20058 */ lw $s2, 0x58($sp) -/* 9F5204 802407C4 8FB10054 */ lw $s1, 0x54($sp) -/* 9F5208 802407C8 8FB00050 */ lw $s0, 0x50($sp) -/* 9F520C 802407CC 03E00008 */ jr $ra -/* 9F5210 802407D0 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240904_9FB0F4.s b/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240904_9FB0F4.s deleted file mode 100644 index fdb10f6a0b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240904_9FB0F4.s +++ /dev/null @@ -1,309 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80245A78_A00268 -.word .L80240D10_9FB500, .L80240D1C_9FB50C, .L80240D1C_9FB50C, .L80240D1C_9FB50C, .L80240D1C_9FB50C, .L80240D1C_9FB50C, .L80240D1C_9FB50C, .L80240D1C_9FB50C, .L80240D10_9FB500, .L80240D1C_9FB50C, .L80240D10_9FB500, .L80240D1C_9FB50C, .L80240D10_9FB500, .L80240D1C_9FB50C, .L80240D10_9FB500, .L80240D1C_9FB50C, .L80240D1C_9FB50C, .L80240D1C_9FB50C, .L80240D10_9FB500, .L80240D1C_9FB50C, .L80240D10_9FB500, 0 - -.section .text - -glabel func_80240904_9FB0F4 -/* 9FB0F4 80240904 27BDFF90 */ addiu $sp, $sp, -0x70 -/* 9FB0F8 80240908 AFB3005C */ sw $s3, 0x5c($sp) -/* 9FB0FC 8024090C 0080982D */ daddu $s3, $a0, $zero -/* 9FB100 80240910 AFBF0068 */ sw $ra, 0x68($sp) -/* 9FB104 80240914 AFB50064 */ sw $s5, 0x64($sp) -/* 9FB108 80240918 AFB40060 */ sw $s4, 0x60($sp) -/* 9FB10C 8024091C AFB20058 */ sw $s2, 0x58($sp) -/* 9FB110 80240920 AFB10054 */ sw $s1, 0x54($sp) -/* 9FB114 80240924 AFB00050 */ sw $s0, 0x50($sp) -/* 9FB118 80240928 8E710148 */ lw $s1, 0x148($s3) -/* 9FB11C 8024092C 86240008 */ lh $a0, 8($s1) -/* 9FB120 80240930 0C00EABB */ jal get_npc_unsafe -/* 9FB124 80240934 00A0802D */ daddu $s0, $a1, $zero -/* 9FB128 80240938 8E63000C */ lw $v1, 0xc($s3) -/* 9FB12C 8024093C 0260202D */ daddu $a0, $s3, $zero -/* 9FB130 80240940 8C650000 */ lw $a1, ($v1) -/* 9FB134 80240944 0C0B1EAF */ jal evt_get_variable -/* 9FB138 80240948 0040902D */ daddu $s2, $v0, $zero -/* 9FB13C 8024094C AFA00028 */ sw $zero, 0x28($sp) -/* 9FB140 80240950 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9FB144 80240954 8C630030 */ lw $v1, 0x30($v1) -/* 9FB148 80240958 AFA3002C */ sw $v1, 0x2c($sp) -/* 9FB14C 8024095C 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9FB150 80240960 8C63001C */ lw $v1, 0x1c($v1) -/* 9FB154 80240964 AFA30030 */ sw $v1, 0x30($sp) -/* 9FB158 80240968 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9FB15C 8024096C 8C630024 */ lw $v1, 0x24($v1) -/* 9FB160 80240970 AFA30034 */ sw $v1, 0x34($sp) -/* 9FB164 80240974 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9FB168 80240978 8C630028 */ lw $v1, 0x28($v1) -/* 9FB16C 8024097C 27B50028 */ addiu $s5, $sp, 0x28 -/* 9FB170 80240980 AFA30038 */ sw $v1, 0x38($sp) -/* 9FB174 80240984 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9FB178 80240988 3C0142C8 */ lui $at, 0x42c8 -/* 9FB17C 8024098C 44810000 */ mtc1 $at, $f0 -/* 9FB180 80240990 8C63002C */ lw $v1, 0x2c($v1) -/* 9FB184 80240994 0040A02D */ daddu $s4, $v0, $zero -/* 9FB188 80240998 E7A00040 */ swc1 $f0, 0x40($sp) -/* 9FB18C 8024099C A7A00044 */ sh $zero, 0x44($sp) -/* 9FB190 802409A0 12000009 */ beqz $s0, .L802409C8 -/* 9FB194 802409A4 AFA3003C */ sw $v1, 0x3c($sp) -/* 9FB198 802409A8 864300A8 */ lh $v1, 0xa8($s2) -/* 9FB19C 802409AC 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9FB1A0 802409B0 AE20008C */ sw $zero, 0x8c($s1) -/* 9FB1A4 802409B4 A22000B5 */ sb $zero, 0xb5($s1) -/* 9FB1A8 802409B8 34420008 */ ori $v0, $v0, 8 -/* 9FB1AC 802409BC AE230084 */ sw $v1, 0x84($s1) -/* 9FB1B0 802409C0 08090276 */ j .L802409D8 -/* 9FB1B4 802409C4 AE2200B0 */ sw $v0, 0xb0($s1) -.L802409C8: -/* 9FB1B8 802409C8 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9FB1BC 802409CC 30420004 */ andi $v0, $v0, 4 -/* 9FB1C0 802409D0 10400047 */ beqz $v0, .L80240AF0 -/* 9FB1C4 802409D4 00000000 */ nop -.L802409D8: -/* 9FB1C8 802409D8 AE600070 */ sw $zero, 0x70($s3) -/* 9FB1CC 802409DC A640008E */ sh $zero, 0x8e($s2) -/* 9FB1D0 802409E0 8E2300CC */ lw $v1, 0xcc($s1) -/* 9FB1D4 802409E4 2404F7FF */ addiu $a0, $zero, -0x801 -/* 9FB1D8 802409E8 A2200007 */ sb $zero, 7($s1) -/* 9FB1DC 802409EC 8E420000 */ lw $v0, ($s2) -/* 9FB1E0 802409F0 8C630000 */ lw $v1, ($v1) -/* 9FB1E4 802409F4 00441024 */ and $v0, $v0, $a0 -/* 9FB1E8 802409F8 AE420000 */ sw $v0, ($s2) -/* 9FB1EC 802409FC AE430028 */ sw $v1, 0x28($s2) -/* 9FB1F0 80240A00 96220086 */ lhu $v0, 0x86($s1) -/* 9FB1F4 80240A04 A64200A8 */ sh $v0, 0xa8($s2) -/* 9FB1F8 80240A08 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9FB1FC 80240A0C AE200090 */ sw $zero, 0x90($s1) -/* 9FB200 80240A10 8C420034 */ lw $v0, 0x34($v0) -/* 9FB204 80240A14 14400006 */ bnez $v0, .L80240A30 -/* 9FB208 80240A18 2403FDFF */ addiu $v1, $zero, -0x201 -/* 9FB20C 80240A1C 8E420000 */ lw $v0, ($s2) -/* 9FB210 80240A20 2403FFF7 */ addiu $v1, $zero, -9 -/* 9FB214 80240A24 34420200 */ ori $v0, $v0, 0x200 -/* 9FB218 80240A28 0809028F */ j .L80240A3C -/* 9FB21C 80240A2C 00431024 */ and $v0, $v0, $v1 -.L80240A30: -/* 9FB220 80240A30 8E420000 */ lw $v0, ($s2) -/* 9FB224 80240A34 00431024 */ and $v0, $v0, $v1 -/* 9FB228 80240A38 34420008 */ ori $v0, $v0, 8 -.L80240A3C: -/* 9FB22C 80240A3C AE420000 */ sw $v0, ($s2) -/* 9FB230 80240A40 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9FB234 80240A44 30420004 */ andi $v0, $v0, 4 -/* 9FB238 80240A48 1040001E */ beqz $v0, .L80240AC4 -/* 9FB23C 80240A4C 24040002 */ addiu $a0, $zero, 2 -/* 9FB240 80240A50 0240282D */ daddu $a1, $s2, $zero -/* 9FB244 80240A54 0000302D */ daddu $a2, $zero, $zero -/* 9FB248 80240A58 24020063 */ addiu $v0, $zero, 0x63 -/* 9FB24C 80240A5C AE620070 */ sw $v0, 0x70($s3) -/* 9FB250 80240A60 AE600074 */ sw $zero, 0x74($s3) -/* 9FB254 80240A64 864300A8 */ lh $v1, 0xa8($s2) -/* 9FB258 80240A68 3C013F80 */ lui $at, 0x3f80 -/* 9FB25C 80240A6C 44810000 */ mtc1 $at, $f0 -/* 9FB260 80240A70 3C014000 */ lui $at, 0x4000 -/* 9FB264 80240A74 44811000 */ mtc1 $at, $f2 -/* 9FB268 80240A78 3C01C1A0 */ lui $at, 0xc1a0 -/* 9FB26C 80240A7C 44812000 */ mtc1 $at, $f4 -/* 9FB270 80240A80 24020028 */ addiu $v0, $zero, 0x28 -/* 9FB274 80240A84 AFA2001C */ sw $v0, 0x1c($sp) -/* 9FB278 80240A88 44833000 */ mtc1 $v1, $f6 -/* 9FB27C 80240A8C 00000000 */ nop -/* 9FB280 80240A90 468031A0 */ cvt.s.w $f6, $f6 -/* 9FB284 80240A94 44073000 */ mfc1 $a3, $f6 -/* 9FB288 80240A98 27A20048 */ addiu $v0, $sp, 0x48 -/* 9FB28C 80240A9C AFA20020 */ sw $v0, 0x20($sp) -/* 9FB290 80240AA0 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9FB294 80240AA4 E7A20014 */ swc1 $f2, 0x14($sp) -/* 9FB298 80240AA8 0C01BFA4 */ jal fx_emote -/* 9FB29C 80240AAC E7A40018 */ swc1 $f4, 0x18($sp) -/* 9FB2A0 80240AB0 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9FB2A4 80240AB4 2403FFFB */ addiu $v1, $zero, -5 -/* 9FB2A8 80240AB8 00431024 */ and $v0, $v0, $v1 -/* 9FB2AC 80240ABC 080902BC */ j .L80240AF0 -/* 9FB2B0 80240AC0 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240AC4: -/* 9FB2B4 80240AC4 8E220000 */ lw $v0, ($s1) -/* 9FB2B8 80240AC8 3C034000 */ lui $v1, 0x4000 -/* 9FB2BC 80240ACC 00431024 */ and $v0, $v0, $v1 -/* 9FB2C0 80240AD0 10400007 */ beqz $v0, .L80240AF0 -/* 9FB2C4 80240AD4 3C03BFFF */ lui $v1, 0xbfff -/* 9FB2C8 80240AD8 2402000C */ addiu $v0, $zero, 0xc -/* 9FB2CC 80240ADC AE620070 */ sw $v0, 0x70($s3) -/* 9FB2D0 80240AE0 8E220000 */ lw $v0, ($s1) -/* 9FB2D4 80240AE4 3463FFFF */ ori $v1, $v1, 0xffff -/* 9FB2D8 80240AE8 00431024 */ and $v0, $v0, $v1 -/* 9FB2DC 80240AEC AE220000 */ sw $v0, ($s1) -.L80240AF0: -/* 9FB2E0 80240AF0 8E220090 */ lw $v0, 0x90($s1) -/* 9FB2E4 80240AF4 1840000C */ blez $v0, .L80240B28 -/* 9FB2E8 80240AF8 2442FFFF */ addiu $v0, $v0, -1 -/* 9FB2EC 80240AFC 14400087 */ bnez $v0, .L80240D1C_9FB50C -/* 9FB2F0 80240B00 AE220090 */ sw $v0, 0x90($s1) -/* 9FB2F4 80240B04 3C03FFAA */ lui $v1, 0xffaa -/* 9FB2F8 80240B08 8E420028 */ lw $v0, 0x28($s2) -/* 9FB2FC 80240B0C 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* 9FB300 80240B10 00431021 */ addu $v0, $v0, $v1 -/* 9FB304 80240B14 2C420002 */ sltiu $v0, $v0, 2 -/* 9FB308 80240B18 10400003 */ beqz $v0, .L80240B28 -/* 9FB30C 80240B1C 3C020055 */ lui $v0, 0x55 -/* 9FB310 80240B20 3442000C */ ori $v0, $v0, 0xc -/* 9FB314 80240B24 AE420028 */ sw $v0, 0x28($s2) -.L80240B28: -/* 9FB318 80240B28 8E630070 */ lw $v1, 0x70($s3) -/* 9FB31C 80240B2C 2402000C */ addiu $v0, $zero, 0xc -/* 9FB320 80240B30 10620048 */ beq $v1, $v0, .L80240C54 -/* 9FB324 80240B34 2862000D */ slti $v0, $v1, 0xd -/* 9FB328 80240B38 1040000F */ beqz $v0, .L80240B78 -/* 9FB32C 80240B3C 24100001 */ addiu $s0, $zero, 1 -/* 9FB330 80240B40 1070001E */ beq $v1, $s0, .L80240BBC -/* 9FB334 80240B44 28620002 */ slti $v0, $v1, 2 -/* 9FB338 80240B48 10400005 */ beqz $v0, .L80240B60 -/* 9FB33C 80240B4C 24020002 */ addiu $v0, $zero, 2 -/* 9FB340 80240B50 10600015 */ beqz $v1, .L80240BA8 -/* 9FB344 80240B54 0260202D */ daddu $a0, $s3, $zero -/* 9FB348 80240B58 0809032C */ j .L80240CB0 -/* 9FB34C 80240B5C 00000000 */ nop -.L80240B60: -/* 9FB350 80240B60 1062001C */ beq $v1, $v0, .L80240BD4 -/* 9FB354 80240B64 24020003 */ addiu $v0, $zero, 3 -/* 9FB358 80240B68 10620035 */ beq $v1, $v0, .L80240C40 -/* 9FB35C 80240B6C 0260202D */ daddu $a0, $s3, $zero -/* 9FB360 80240B70 0809032C */ j .L80240CB0 -/* 9FB364 80240B74 00000000 */ nop -.L80240B78: -/* 9FB368 80240B78 2402000E */ addiu $v0, $zero, 0xe -/* 9FB36C 80240B7C 1062003F */ beq $v1, $v0, .L80240C7C -/* 9FB370 80240B80 0062102A */ slt $v0, $v1, $v0 -/* 9FB374 80240B84 14400038 */ bnez $v0, .L80240C68 -/* 9FB378 80240B88 0260202D */ daddu $a0, $s3, $zero -/* 9FB37C 80240B8C 2402000F */ addiu $v0, $zero, 0xf -/* 9FB380 80240B90 10620040 */ beq $v1, $v0, .L80240C94 -/* 9FB384 80240B94 24020063 */ addiu $v0, $zero, 0x63 -/* 9FB388 80240B98 10620043 */ beq $v1, $v0, .L80240CA8 -/* 9FB38C 80240B9C 00000000 */ nop -/* 9FB390 80240BA0 0809032C */ j .L80240CB0 -/* 9FB394 80240BA4 00000000 */ nop -.L80240BA8: -/* 9FB398 80240BA8 0280282D */ daddu $a1, $s4, $zero -/* 9FB39C 80240BAC 0C012568 */ jal func_800495A0 -/* 9FB3A0 80240BB0 02A0302D */ daddu $a2, $s5, $zero -/* 9FB3A4 80240BB4 96220086 */ lhu $v0, 0x86($s1) -/* 9FB3A8 80240BB8 A64200A8 */ sh $v0, 0xa8($s2) -.L80240BBC: -/* 9FB3AC 80240BBC 0260202D */ daddu $a0, $s3, $zero -/* 9FB3B0 80240BC0 0280282D */ daddu $a1, $s4, $zero -/* 9FB3B4 80240BC4 0C0125AE */ jal func_800496B8 -/* 9FB3B8 80240BC8 02A0302D */ daddu $a2, $s5, $zero -/* 9FB3BC 80240BCC 0809032C */ j .L80240CB0 -/* 9FB3C0 80240BD0 00000000 */ nop -.L80240BD4: -/* 9FB3C4 80240BD4 0260202D */ daddu $a0, $s3, $zero -/* 9FB3C8 80240BD8 0280282D */ daddu $a1, $s4, $zero -/* 9FB3CC 80240BDC 0C0126D1 */ jal base_UnkNpcAIFunc1 -/* 9FB3D0 80240BE0 02A0302D */ daddu $a2, $s5, $zero -/* 9FB3D4 80240BE4 8E230088 */ lw $v1, 0x88($s1) -/* 9FB3D8 80240BE8 24020006 */ addiu $v0, $zero, 6 -/* 9FB3DC 80240BEC 14620014 */ bne $v1, $v0, .L80240C40 -/* 9FB3E0 80240BF0 0260202D */ daddu $a0, $s3, $zero -/* 9FB3E4 80240BF4 0C00A67F */ jal rand_int -/* 9FB3E8 80240BF8 24040064 */ addiu $a0, $zero, 0x64 -/* 9FB3EC 80240BFC 28420021 */ slti $v0, $v0, 0x21 -/* 9FB3F0 80240C00 5040000F */ beql $v0, $zero, .L80240C40 -/* 9FB3F4 80240C04 0260202D */ daddu $a0, $s3, $zero -/* 9FB3F8 80240C08 8E22008C */ lw $v0, 0x8c($s1) -/* 9FB3FC 80240C0C 10400005 */ beqz $v0, .L80240C24 -/* 9FB400 80240C10 3C020055 */ lui $v0, 0x55 -/* 9FB404 80240C14 3442002F */ ori $v0, $v0, 0x2f -/* 9FB408 80240C18 AE20008C */ sw $zero, 0x8c($s1) -/* 9FB40C 80240C1C 0809030C */ j .L80240C30 -/* 9FB410 80240C20 A22000B5 */ sb $zero, 0xb5($s1) -.L80240C24: -/* 9FB414 80240C24 3442002E */ ori $v0, $v0, 0x2e -/* 9FB418 80240C28 AE30008C */ sw $s0, 0x8c($s1) -/* 9FB41C 80240C2C A23000B5 */ sb $s0, 0xb5($s1) -.L80240C30: -/* 9FB420 80240C30 AE420028 */ sw $v0, 0x28($s2) -/* 9FB424 80240C34 24020007 */ addiu $v0, $zero, 7 -/* 9FB428 80240C38 08090347 */ j .L80240D1C_9FB50C -/* 9FB42C 80240C3C AE220090 */ sw $v0, 0x90($s1) -.L80240C40: -/* 9FB430 80240C40 0280282D */ daddu $a1, $s4, $zero -/* 9FB434 80240C44 0C012701 */ jal func_80049C04 -/* 9FB438 80240C48 02A0302D */ daddu $a2, $s5, $zero -/* 9FB43C 80240C4C 0809032C */ j .L80240CB0 -/* 9FB440 80240C50 00000000 */ nop -.L80240C54: -/* 9FB444 80240C54 0260202D */ daddu $a0, $s3, $zero -/* 9FB448 80240C58 0280282D */ daddu $a1, $s4, $zero -/* 9FB44C 80240C5C 0C09015C */ jal nok_12_set_script_owner_npc_anim -/* 9FB450 80240C60 02A0302D */ daddu $a2, $s5, $zero -/* 9FB454 80240C64 0260202D */ daddu $a0, $s3, $zero -.L80240C68: -/* 9FB458 80240C68 0280282D */ daddu $a1, $s4, $zero -/* 9FB45C 80240C6C 0C09017B */ jal nok_12_UnkDistFunc -/* 9FB460 80240C70 02A0302D */ daddu $a2, $s5, $zero -/* 9FB464 80240C74 0809032C */ j .L80240CB0 -/* 9FB468 80240C78 00000000 */ nop -.L80240C7C: -/* 9FB46C 80240C7C 0260202D */ daddu $a0, $s3, $zero -/* 9FB470 80240C80 0280282D */ daddu $a1, $s4, $zero -/* 9FB474 80240C84 0C0901C8 */ jal nok_12_UnkNpcAIFunc12 -/* 9FB478 80240C88 02A0302D */ daddu $a2, $s5, $zero -/* 9FB47C 80240C8C 0809032C */ j .L80240CB0 -/* 9FB480 80240C90 00000000 */ nop -.L80240C94: -/* 9FB484 80240C94 0280282D */ daddu $a1, $s4, $zero -/* 9FB488 80240C98 0C090221 */ jal nok_12_set_script_owner_npc_col_height -/* 9FB48C 80240C9C 02A0302D */ daddu $a2, $s5, $zero -/* 9FB490 80240CA0 0809032C */ j .L80240CB0 -/* 9FB494 80240CA4 00000000 */ nop -.L80240CA8: -/* 9FB498 80240CA8 0C0129CF */ jal func_8004A73C -/* 9FB49C 80240CAC 0260202D */ daddu $a0, $s3, $zero -.L80240CB0: -/* 9FB4A0 80240CB0 8E230088 */ lw $v1, 0x88($s1) -/* 9FB4A4 80240CB4 24020006 */ addiu $v0, $zero, 6 -/* 9FB4A8 80240CB8 14620019 */ bne $v1, $v0, .L80240D20 -/* 9FB4AC 80240CBC 0000102D */ daddu $v0, $zero, $zero -/* 9FB4B0 80240CC0 8E22008C */ lw $v0, 0x8c($s1) -/* 9FB4B4 80240CC4 10400003 */ beqz $v0, .L80240CD4 -/* 9FB4B8 80240CC8 24020001 */ addiu $v0, $zero, 1 -/* 9FB4BC 80240CCC 08090336 */ j .L80240CD8 -/* 9FB4C0 80240CD0 A22200B5 */ sb $v0, 0xb5($s1) -.L80240CD4: -/* 9FB4C4 80240CD4 A22000B5 */ sb $zero, 0xb5($s1) -.L80240CD8: -/* 9FB4C8 80240CD8 8E22008C */ lw $v0, 0x8c($s1) -/* 9FB4CC 80240CDC 1040000F */ beqz $v0, .L80240D1C_9FB50C -/* 9FB4D0 80240CE0 3C03FFAA */ lui $v1, 0xffaa -/* 9FB4D4 80240CE4 8E420028 */ lw $v0, 0x28($s2) -/* 9FB4D8 80240CE8 3463FFFC */ ori $v1, $v1, 0xfffc -/* 9FB4DC 80240CEC 00431821 */ addu $v1, $v0, $v1 -/* 9FB4E0 80240CF0 2C620015 */ sltiu $v0, $v1, 0x15 -/* 9FB4E4 80240CF4 10400009 */ beqz $v0, .L80240D1C_9FB50C -/* 9FB4E8 80240CF8 00031080 */ sll $v0, $v1, 2 -/* 9FB4EC 80240CFC 3C018024 */ lui $at, %hi(jtbl_80245A78_A00268) -/* 9FB4F0 80240D00 00220821 */ addu $at, $at, $v0 -/* 9FB4F4 80240D04 8C225A78 */ lw $v0, %lo(jtbl_80245A78_A00268)($at) -/* 9FB4F8 80240D08 00400008 */ jr $v0 -/* 9FB4FC 80240D0C 00000000 */ nop -.L80240D10_9FB500: -/* 9FB500 80240D10 8E420028 */ lw $v0, 0x28($s2) -/* 9FB504 80240D14 24420001 */ addiu $v0, $v0, 1 -/* 9FB508 80240D18 AE420028 */ sw $v0, 0x28($s2) -.L80240D1C_9FB50C: -/* 9FB50C 80240D1C 0000102D */ daddu $v0, $zero, $zero -.L80240D20: -/* 9FB510 80240D20 8FBF0068 */ lw $ra, 0x68($sp) -/* 9FB514 80240D24 8FB50064 */ lw $s5, 0x64($sp) -/* 9FB518 80240D28 8FB40060 */ lw $s4, 0x60($sp) -/* 9FB51C 80240D2C 8FB3005C */ lw $s3, 0x5c($sp) -/* 9FB520 80240D30 8FB20058 */ lw $s2, 0x58($sp) -/* 9FB524 80240D34 8FB10054 */ lw $s1, 0x54($sp) -/* 9FB528 80240D38 8FB00050 */ lw $s0, 0x50($sp) -/* 9FB52C 80240D3C 03E00008 */ jr $ra -/* 9FB530 80240D40 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240554_A02D94.s b/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240554_A02D94.s deleted file mode 100644 index f74d213ca0..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240554_A02D94.s +++ /dev/null @@ -1,309 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_802445C8_A06E08 -.word .L80240960_A031A0, .L8024096C_A031AC, .L8024096C_A031AC, .L8024096C_A031AC, .L8024096C_A031AC, .L8024096C_A031AC, .L8024096C_A031AC, .L8024096C_A031AC, .L80240960_A031A0, .L8024096C_A031AC, .L80240960_A031A0, .L8024096C_A031AC, .L80240960_A031A0, .L8024096C_A031AC, .L80240960_A031A0, .L8024096C_A031AC, .L8024096C_A031AC, .L8024096C_A031AC, .L80240960_A031A0, .L8024096C_A031AC, .L80240960_A031A0, 0 - -.section .text - -glabel func_80240554_A02D94 -/* A02D94 80240554 27BDFF90 */ addiu $sp, $sp, -0x70 -/* A02D98 80240558 AFB3005C */ sw $s3, 0x5c($sp) -/* A02D9C 8024055C 0080982D */ daddu $s3, $a0, $zero -/* A02DA0 80240560 AFBF0068 */ sw $ra, 0x68($sp) -/* A02DA4 80240564 AFB50064 */ sw $s5, 0x64($sp) -/* A02DA8 80240568 AFB40060 */ sw $s4, 0x60($sp) -/* A02DAC 8024056C AFB20058 */ sw $s2, 0x58($sp) -/* A02DB0 80240570 AFB10054 */ sw $s1, 0x54($sp) -/* A02DB4 80240574 AFB00050 */ sw $s0, 0x50($sp) -/* A02DB8 80240578 8E710148 */ lw $s1, 0x148($s3) -/* A02DBC 8024057C 86240008 */ lh $a0, 8($s1) -/* A02DC0 80240580 0C00EABB */ jal get_npc_unsafe -/* A02DC4 80240584 00A0802D */ daddu $s0, $a1, $zero -/* A02DC8 80240588 8E63000C */ lw $v1, 0xc($s3) -/* A02DCC 8024058C 0260202D */ daddu $a0, $s3, $zero -/* A02DD0 80240590 8C650000 */ lw $a1, ($v1) -/* A02DD4 80240594 0C0B1EAF */ jal evt_get_variable -/* A02DD8 80240598 0040902D */ daddu $s2, $v0, $zero -/* A02DDC 8024059C AFA00028 */ sw $zero, 0x28($sp) -/* A02DE0 802405A0 8E2300D0 */ lw $v1, 0xd0($s1) -/* A02DE4 802405A4 8C630030 */ lw $v1, 0x30($v1) -/* A02DE8 802405A8 AFA3002C */ sw $v1, 0x2c($sp) -/* A02DEC 802405AC 8E2300D0 */ lw $v1, 0xd0($s1) -/* A02DF0 802405B0 8C63001C */ lw $v1, 0x1c($v1) -/* A02DF4 802405B4 AFA30030 */ sw $v1, 0x30($sp) -/* A02DF8 802405B8 8E2300D0 */ lw $v1, 0xd0($s1) -/* A02DFC 802405BC 8C630024 */ lw $v1, 0x24($v1) -/* A02E00 802405C0 AFA30034 */ sw $v1, 0x34($sp) -/* A02E04 802405C4 8E2300D0 */ lw $v1, 0xd0($s1) -/* A02E08 802405C8 8C630028 */ lw $v1, 0x28($v1) -/* A02E0C 802405CC 27B50028 */ addiu $s5, $sp, 0x28 -/* A02E10 802405D0 AFA30038 */ sw $v1, 0x38($sp) -/* A02E14 802405D4 8E2300D0 */ lw $v1, 0xd0($s1) -/* A02E18 802405D8 3C0142C8 */ lui $at, 0x42c8 -/* A02E1C 802405DC 44810000 */ mtc1 $at, $f0 -/* A02E20 802405E0 8C63002C */ lw $v1, 0x2c($v1) -/* A02E24 802405E4 0040A02D */ daddu $s4, $v0, $zero -/* A02E28 802405E8 E7A00040 */ swc1 $f0, 0x40($sp) -/* A02E2C 802405EC A7A00044 */ sh $zero, 0x44($sp) -/* A02E30 802405F0 12000009 */ beqz $s0, .L80240618 -/* A02E34 802405F4 AFA3003C */ sw $v1, 0x3c($sp) -/* A02E38 802405F8 864300A8 */ lh $v1, 0xa8($s2) -/* A02E3C 802405FC 8E2200B0 */ lw $v0, 0xb0($s1) -/* A02E40 80240600 AE20008C */ sw $zero, 0x8c($s1) -/* A02E44 80240604 A22000B5 */ sb $zero, 0xb5($s1) -/* A02E48 80240608 34420008 */ ori $v0, $v0, 8 -/* A02E4C 8024060C AE230084 */ sw $v1, 0x84($s1) -/* A02E50 80240610 0809018A */ j .L80240628 -/* A02E54 80240614 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240618: -/* A02E58 80240618 8E2200B0 */ lw $v0, 0xb0($s1) -/* A02E5C 8024061C 30420004 */ andi $v0, $v0, 4 -/* A02E60 80240620 10400047 */ beqz $v0, .L80240740 -/* A02E64 80240624 00000000 */ nop -.L80240628: -/* A02E68 80240628 AE600070 */ sw $zero, 0x70($s3) -/* A02E6C 8024062C A640008E */ sh $zero, 0x8e($s2) -/* A02E70 80240630 8E2300CC */ lw $v1, 0xcc($s1) -/* A02E74 80240634 2404F7FF */ addiu $a0, $zero, -0x801 -/* A02E78 80240638 A2200007 */ sb $zero, 7($s1) -/* A02E7C 8024063C 8E420000 */ lw $v0, ($s2) -/* A02E80 80240640 8C630000 */ lw $v1, ($v1) -/* A02E84 80240644 00441024 */ and $v0, $v0, $a0 -/* A02E88 80240648 AE420000 */ sw $v0, ($s2) -/* A02E8C 8024064C AE430028 */ sw $v1, 0x28($s2) -/* A02E90 80240650 96220086 */ lhu $v0, 0x86($s1) -/* A02E94 80240654 A64200A8 */ sh $v0, 0xa8($s2) -/* A02E98 80240658 8E2200D0 */ lw $v0, 0xd0($s1) -/* A02E9C 8024065C AE200090 */ sw $zero, 0x90($s1) -/* A02EA0 80240660 8C420034 */ lw $v0, 0x34($v0) -/* A02EA4 80240664 14400006 */ bnez $v0, .L80240680 -/* A02EA8 80240668 2403FDFF */ addiu $v1, $zero, -0x201 -/* A02EAC 8024066C 8E420000 */ lw $v0, ($s2) -/* A02EB0 80240670 2403FFF7 */ addiu $v1, $zero, -9 -/* A02EB4 80240674 34420200 */ ori $v0, $v0, 0x200 -/* A02EB8 80240678 080901A3 */ j .L8024068C -/* A02EBC 8024067C 00431024 */ and $v0, $v0, $v1 -.L80240680: -/* A02EC0 80240680 8E420000 */ lw $v0, ($s2) -/* A02EC4 80240684 00431024 */ and $v0, $v0, $v1 -/* A02EC8 80240688 34420008 */ ori $v0, $v0, 8 -.L8024068C: -/* A02ECC 8024068C AE420000 */ sw $v0, ($s2) -/* A02ED0 80240690 8E2200B0 */ lw $v0, 0xb0($s1) -/* A02ED4 80240694 30420004 */ andi $v0, $v0, 4 -/* A02ED8 80240698 1040001E */ beqz $v0, .L80240714 -/* A02EDC 8024069C 24040002 */ addiu $a0, $zero, 2 -/* A02EE0 802406A0 0240282D */ daddu $a1, $s2, $zero -/* A02EE4 802406A4 0000302D */ daddu $a2, $zero, $zero -/* A02EE8 802406A8 24020063 */ addiu $v0, $zero, 0x63 -/* A02EEC 802406AC AE620070 */ sw $v0, 0x70($s3) -/* A02EF0 802406B0 AE600074 */ sw $zero, 0x74($s3) -/* A02EF4 802406B4 864300A8 */ lh $v1, 0xa8($s2) -/* A02EF8 802406B8 3C013F80 */ lui $at, 0x3f80 -/* A02EFC 802406BC 44810000 */ mtc1 $at, $f0 -/* A02F00 802406C0 3C014000 */ lui $at, 0x4000 -/* A02F04 802406C4 44811000 */ mtc1 $at, $f2 -/* A02F08 802406C8 3C01C1A0 */ lui $at, 0xc1a0 -/* A02F0C 802406CC 44812000 */ mtc1 $at, $f4 -/* A02F10 802406D0 24020028 */ addiu $v0, $zero, 0x28 -/* A02F14 802406D4 AFA2001C */ sw $v0, 0x1c($sp) -/* A02F18 802406D8 44833000 */ mtc1 $v1, $f6 -/* A02F1C 802406DC 00000000 */ nop -/* A02F20 802406E0 468031A0 */ cvt.s.w $f6, $f6 -/* A02F24 802406E4 44073000 */ mfc1 $a3, $f6 -/* A02F28 802406E8 27A20048 */ addiu $v0, $sp, 0x48 -/* A02F2C 802406EC AFA20020 */ sw $v0, 0x20($sp) -/* A02F30 802406F0 E7A00010 */ swc1 $f0, 0x10($sp) -/* A02F34 802406F4 E7A20014 */ swc1 $f2, 0x14($sp) -/* A02F38 802406F8 0C01BFA4 */ jal fx_emote -/* A02F3C 802406FC E7A40018 */ swc1 $f4, 0x18($sp) -/* A02F40 80240700 8E2200B0 */ lw $v0, 0xb0($s1) -/* A02F44 80240704 2403FFFB */ addiu $v1, $zero, -5 -/* A02F48 80240708 00431024 */ and $v0, $v0, $v1 -/* A02F4C 8024070C 080901D0 */ j .L80240740 -/* A02F50 80240710 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240714: -/* A02F54 80240714 8E220000 */ lw $v0, ($s1) -/* A02F58 80240718 3C034000 */ lui $v1, 0x4000 -/* A02F5C 8024071C 00431024 */ and $v0, $v0, $v1 -/* A02F60 80240720 10400007 */ beqz $v0, .L80240740 -/* A02F64 80240724 3C03BFFF */ lui $v1, 0xbfff -/* A02F68 80240728 2402000C */ addiu $v0, $zero, 0xc -/* A02F6C 8024072C AE620070 */ sw $v0, 0x70($s3) -/* A02F70 80240730 8E220000 */ lw $v0, ($s1) -/* A02F74 80240734 3463FFFF */ ori $v1, $v1, 0xffff -/* A02F78 80240738 00431024 */ and $v0, $v0, $v1 -/* A02F7C 8024073C AE220000 */ sw $v0, ($s1) -.L80240740: -/* A02F80 80240740 8E220090 */ lw $v0, 0x90($s1) -/* A02F84 80240744 1840000C */ blez $v0, .L80240778 -/* A02F88 80240748 2442FFFF */ addiu $v0, $v0, -1 -/* A02F8C 8024074C 14400087 */ bnez $v0, .L8024096C_A031AC -/* A02F90 80240750 AE220090 */ sw $v0, 0x90($s1) -/* A02F94 80240754 3C03FFAA */ lui $v1, 0xffaa -/* A02F98 80240758 8E420028 */ lw $v0, 0x28($s2) -/* A02F9C 8024075C 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* A02FA0 80240760 00431021 */ addu $v0, $v0, $v1 -/* A02FA4 80240764 2C420002 */ sltiu $v0, $v0, 2 -/* A02FA8 80240768 10400003 */ beqz $v0, .L80240778 -/* A02FAC 8024076C 3C020055 */ lui $v0, 0x55 -/* A02FB0 80240770 3442000C */ ori $v0, $v0, 0xc -/* A02FB4 80240774 AE420028 */ sw $v0, 0x28($s2) -.L80240778: -/* A02FB8 80240778 8E630070 */ lw $v1, 0x70($s3) -/* A02FBC 8024077C 2402000C */ addiu $v0, $zero, 0xc -/* A02FC0 80240780 10620048 */ beq $v1, $v0, .L802408A4 -/* A02FC4 80240784 2862000D */ slti $v0, $v1, 0xd -/* A02FC8 80240788 1040000F */ beqz $v0, .L802407C8 -/* A02FCC 8024078C 24100001 */ addiu $s0, $zero, 1 -/* A02FD0 80240790 1070001E */ beq $v1, $s0, .L8024080C -/* A02FD4 80240794 28620002 */ slti $v0, $v1, 2 -/* A02FD8 80240798 10400005 */ beqz $v0, .L802407B0 -/* A02FDC 8024079C 24020002 */ addiu $v0, $zero, 2 -/* A02FE0 802407A0 10600015 */ beqz $v1, .L802407F8 -/* A02FE4 802407A4 0260202D */ daddu $a0, $s3, $zero -/* A02FE8 802407A8 08090240 */ j .L80240900 -/* A02FEC 802407AC 00000000 */ nop -.L802407B0: -/* A02FF0 802407B0 1062001C */ beq $v1, $v0, .L80240824 -/* A02FF4 802407B4 24020003 */ addiu $v0, $zero, 3 -/* A02FF8 802407B8 10620035 */ beq $v1, $v0, .L80240890 -/* A02FFC 802407BC 0260202D */ daddu $a0, $s3, $zero -/* A03000 802407C0 08090240 */ j .L80240900 -/* A03004 802407C4 00000000 */ nop -.L802407C8: -/* A03008 802407C8 2402000E */ addiu $v0, $zero, 0xe -/* A0300C 802407CC 1062003F */ beq $v1, $v0, .L802408CC -/* A03010 802407D0 0062102A */ slt $v0, $v1, $v0 -/* A03014 802407D4 14400038 */ bnez $v0, .L802408B8 -/* A03018 802407D8 0260202D */ daddu $a0, $s3, $zero -/* A0301C 802407DC 2402000F */ addiu $v0, $zero, 0xf -/* A03020 802407E0 10620040 */ beq $v1, $v0, .L802408E4 -/* A03024 802407E4 24020063 */ addiu $v0, $zero, 0x63 -/* A03028 802407E8 10620043 */ beq $v1, $v0, .L802408F8 -/* A0302C 802407EC 00000000 */ nop -/* A03030 802407F0 08090240 */ j .L80240900 -/* A03034 802407F4 00000000 */ nop -.L802407F8: -/* A03038 802407F8 0280282D */ daddu $a1, $s4, $zero -/* A0303C 802407FC 0C012568 */ jal func_800495A0 -/* A03040 80240800 02A0302D */ daddu $a2, $s5, $zero -/* A03044 80240804 96220086 */ lhu $v0, 0x86($s1) -/* A03048 80240808 A64200A8 */ sh $v0, 0xa8($s2) -.L8024080C: -/* A0304C 8024080C 0260202D */ daddu $a0, $s3, $zero -/* A03050 80240810 0280282D */ daddu $a1, $s4, $zero -/* A03054 80240814 0C0125AE */ jal func_800496B8 -/* A03058 80240818 02A0302D */ daddu $a2, $s5, $zero -/* A0305C 8024081C 08090240 */ j .L80240900 -/* A03060 80240820 00000000 */ nop -.L80240824: -/* A03064 80240824 0260202D */ daddu $a0, $s3, $zero -/* A03068 80240828 0280282D */ daddu $a1, $s4, $zero -/* A0306C 8024082C 0C0126D1 */ jal base_UnkNpcAIFunc1 -/* A03070 80240830 02A0302D */ daddu $a2, $s5, $zero -/* A03074 80240834 8E230088 */ lw $v1, 0x88($s1) -/* A03078 80240838 24020006 */ addiu $v0, $zero, 6 -/* A0307C 8024083C 14620014 */ bne $v1, $v0, .L80240890 -/* A03080 80240840 0260202D */ daddu $a0, $s3, $zero -/* A03084 80240844 0C00A67F */ jal rand_int -/* A03088 80240848 24040064 */ addiu $a0, $zero, 0x64 -/* A0308C 8024084C 28420021 */ slti $v0, $v0, 0x21 -/* A03090 80240850 5040000F */ beql $v0, $zero, .L80240890 -/* A03094 80240854 0260202D */ daddu $a0, $s3, $zero -/* A03098 80240858 8E22008C */ lw $v0, 0x8c($s1) -/* A0309C 8024085C 10400005 */ beqz $v0, .L80240874 -/* A030A0 80240860 3C020055 */ lui $v0, 0x55 -/* A030A4 80240864 3442002F */ ori $v0, $v0, 0x2f -/* A030A8 80240868 AE20008C */ sw $zero, 0x8c($s1) -/* A030AC 8024086C 08090220 */ j .L80240880 -/* A030B0 80240870 A22000B5 */ sb $zero, 0xb5($s1) -.L80240874: -/* A030B4 80240874 3442002E */ ori $v0, $v0, 0x2e -/* A030B8 80240878 AE30008C */ sw $s0, 0x8c($s1) -/* A030BC 8024087C A23000B5 */ sb $s0, 0xb5($s1) -.L80240880: -/* A030C0 80240880 AE420028 */ sw $v0, 0x28($s2) -/* A030C4 80240884 24020007 */ addiu $v0, $zero, 7 -/* A030C8 80240888 0809025B */ j .L8024096C_A031AC -/* A030CC 8024088C AE220090 */ sw $v0, 0x90($s1) -.L80240890: -/* A030D0 80240890 0280282D */ daddu $a1, $s4, $zero -/* A030D4 80240894 0C012701 */ jal func_80049C04 -/* A030D8 80240898 02A0302D */ daddu $a2, $s5, $zero -/* A030DC 8024089C 08090240 */ j .L80240900 -/* A030E0 802408A0 00000000 */ nop -.L802408A4: -/* A030E4 802408A4 0260202D */ daddu $a0, $s3, $zero -/* A030E8 802408A8 0280282D */ daddu $a1, $s4, $zero -/* A030EC 802408AC 0C090070 */ jal nok_14_set_script_owner_npc_anim -/* A030F0 802408B0 02A0302D */ daddu $a2, $s5, $zero -/* A030F4 802408B4 0260202D */ daddu $a0, $s3, $zero -.L802408B8: -/* A030F8 802408B8 0280282D */ daddu $a1, $s4, $zero -/* A030FC 802408BC 0C09008F */ jal nok_14_UnkDistFunc -/* A03100 802408C0 02A0302D */ daddu $a2, $s5, $zero -/* A03104 802408C4 08090240 */ j .L80240900 -/* A03108 802408C8 00000000 */ nop -.L802408CC: -/* A0310C 802408CC 0260202D */ daddu $a0, $s3, $zero -/* A03110 802408D0 0280282D */ daddu $a1, $s4, $zero -/* A03114 802408D4 0C0900DC */ jal nok_14_UnkNpcAIFunc12 -/* A03118 802408D8 02A0302D */ daddu $a2, $s5, $zero -/* A0311C 802408DC 08090240 */ j .L80240900 -/* A03120 802408E0 00000000 */ nop -.L802408E4: -/* A03124 802408E4 0280282D */ daddu $a1, $s4, $zero -/* A03128 802408E8 0C090135 */ jal nok_14_set_script_owner_npc_col_height -/* A0312C 802408EC 02A0302D */ daddu $a2, $s5, $zero -/* A03130 802408F0 08090240 */ j .L80240900 -/* A03134 802408F4 00000000 */ nop -.L802408F8: -/* A03138 802408F8 0C0129CF */ jal func_8004A73C -/* A0313C 802408FC 0260202D */ daddu $a0, $s3, $zero -.L80240900: -/* A03140 80240900 8E230088 */ lw $v1, 0x88($s1) -/* A03144 80240904 24020006 */ addiu $v0, $zero, 6 -/* A03148 80240908 14620019 */ bne $v1, $v0, .L80240970 -/* A0314C 8024090C 0000102D */ daddu $v0, $zero, $zero -/* A03150 80240910 8E22008C */ lw $v0, 0x8c($s1) -/* A03154 80240914 10400003 */ beqz $v0, .L80240924 -/* A03158 80240918 24020001 */ addiu $v0, $zero, 1 -/* A0315C 8024091C 0809024A */ j .L80240928 -/* A03160 80240920 A22200B5 */ sb $v0, 0xb5($s1) -.L80240924: -/* A03164 80240924 A22000B5 */ sb $zero, 0xb5($s1) -.L80240928: -/* A03168 80240928 8E22008C */ lw $v0, 0x8c($s1) -/* A0316C 8024092C 1040000F */ beqz $v0, .L8024096C_A031AC -/* A03170 80240930 3C03FFAA */ lui $v1, 0xffaa -/* A03174 80240934 8E420028 */ lw $v0, 0x28($s2) -/* A03178 80240938 3463FFFC */ ori $v1, $v1, 0xfffc -/* A0317C 8024093C 00431821 */ addu $v1, $v0, $v1 -/* A03180 80240940 2C620015 */ sltiu $v0, $v1, 0x15 -/* A03184 80240944 10400009 */ beqz $v0, .L8024096C_A031AC -/* A03188 80240948 00031080 */ sll $v0, $v1, 2 -/* A0318C 8024094C 3C018024 */ lui $at, %hi(jtbl_802445C8_A06E08) -/* A03190 80240950 00220821 */ addu $at, $at, $v0 -/* A03194 80240954 8C2245C8 */ lw $v0, %lo(jtbl_802445C8_A06E08)($at) -/* A03198 80240958 00400008 */ jr $v0 -/* A0319C 8024095C 00000000 */ nop -.L80240960_A031A0: -/* A031A0 80240960 8E420028 */ lw $v0, 0x28($s2) -/* A031A4 80240964 24420001 */ addiu $v0, $v0, 1 -/* A031A8 80240968 AE420028 */ sw $v0, 0x28($s2) -.L8024096C_A031AC: -/* A031AC 8024096C 0000102D */ daddu $v0, $zero, $zero -.L80240970: -/* A031B0 80240970 8FBF0068 */ lw $ra, 0x68($sp) -/* A031B4 80240974 8FB50064 */ lw $s5, 0x64($sp) -/* A031B8 80240978 8FB40060 */ lw $s4, 0x60($sp) -/* A031BC 8024097C 8FB3005C */ lw $s3, 0x5c($sp) -/* A031C0 80240980 8FB20058 */ lw $s2, 0x58($sp) -/* A031C4 80240984 8FB10054 */ lw $s1, 0x54($sp) -/* A031C8 80240988 8FB00050 */ lw $s0, 0x50($sp) -/* A031CC 8024098C 03E00008 */ jr $ra -/* A031D0 80240990 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240674_A07574.s b/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240674_A07574.s deleted file mode 100644 index dfa1c23aa8..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240674_A07574.s +++ /dev/null @@ -1,309 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80244CF8_A0BBF8 -.word .L80240A80_A07980, .L80240A8C_A0798C, .L80240A8C_A0798C, .L80240A8C_A0798C, .L80240A8C_A0798C, .L80240A8C_A0798C, .L80240A8C_A0798C, .L80240A8C_A0798C, .L80240A80_A07980, .L80240A8C_A0798C, .L80240A80_A07980, .L80240A8C_A0798C, .L80240A80_A07980, .L80240A8C_A0798C, .L80240A80_A07980, .L80240A8C_A0798C, .L80240A8C_A0798C, .L80240A8C_A0798C, .L80240A80_A07980, .L80240A8C_A0798C, .L80240A80_A07980, 0 - -.section .text - -glabel func_80240674_A07574 -/* A07574 80240674 27BDFF90 */ addiu $sp, $sp, -0x70 -/* A07578 80240678 AFB3005C */ sw $s3, 0x5c($sp) -/* A0757C 8024067C 0080982D */ daddu $s3, $a0, $zero -/* A07580 80240680 AFBF0068 */ sw $ra, 0x68($sp) -/* A07584 80240684 AFB50064 */ sw $s5, 0x64($sp) -/* A07588 80240688 AFB40060 */ sw $s4, 0x60($sp) -/* A0758C 8024068C AFB20058 */ sw $s2, 0x58($sp) -/* A07590 80240690 AFB10054 */ sw $s1, 0x54($sp) -/* A07594 80240694 AFB00050 */ sw $s0, 0x50($sp) -/* A07598 80240698 8E710148 */ lw $s1, 0x148($s3) -/* A0759C 8024069C 86240008 */ lh $a0, 8($s1) -/* A075A0 802406A0 0C00EABB */ jal get_npc_unsafe -/* A075A4 802406A4 00A0802D */ daddu $s0, $a1, $zero -/* A075A8 802406A8 8E63000C */ lw $v1, 0xc($s3) -/* A075AC 802406AC 0260202D */ daddu $a0, $s3, $zero -/* A075B0 802406B0 8C650000 */ lw $a1, ($v1) -/* A075B4 802406B4 0C0B1EAF */ jal evt_get_variable -/* A075B8 802406B8 0040902D */ daddu $s2, $v0, $zero -/* A075BC 802406BC AFA00028 */ sw $zero, 0x28($sp) -/* A075C0 802406C0 8E2300D0 */ lw $v1, 0xd0($s1) -/* A075C4 802406C4 8C630030 */ lw $v1, 0x30($v1) -/* A075C8 802406C8 AFA3002C */ sw $v1, 0x2c($sp) -/* A075CC 802406CC 8E2300D0 */ lw $v1, 0xd0($s1) -/* A075D0 802406D0 8C63001C */ lw $v1, 0x1c($v1) -/* A075D4 802406D4 AFA30030 */ sw $v1, 0x30($sp) -/* A075D8 802406D8 8E2300D0 */ lw $v1, 0xd0($s1) -/* A075DC 802406DC 8C630024 */ lw $v1, 0x24($v1) -/* A075E0 802406E0 AFA30034 */ sw $v1, 0x34($sp) -/* A075E4 802406E4 8E2300D0 */ lw $v1, 0xd0($s1) -/* A075E8 802406E8 8C630028 */ lw $v1, 0x28($v1) -/* A075EC 802406EC 27B50028 */ addiu $s5, $sp, 0x28 -/* A075F0 802406F0 AFA30038 */ sw $v1, 0x38($sp) -/* A075F4 802406F4 8E2300D0 */ lw $v1, 0xd0($s1) -/* A075F8 802406F8 3C0142C8 */ lui $at, 0x42c8 -/* A075FC 802406FC 44810000 */ mtc1 $at, $f0 -/* A07600 80240700 8C63002C */ lw $v1, 0x2c($v1) -/* A07604 80240704 0040A02D */ daddu $s4, $v0, $zero -/* A07608 80240708 E7A00040 */ swc1 $f0, 0x40($sp) -/* A0760C 8024070C A7A00044 */ sh $zero, 0x44($sp) -/* A07610 80240710 12000009 */ beqz $s0, .L80240738 -/* A07614 80240714 AFA3003C */ sw $v1, 0x3c($sp) -/* A07618 80240718 864300A8 */ lh $v1, 0xa8($s2) -/* A0761C 8024071C 8E2200B0 */ lw $v0, 0xb0($s1) -/* A07620 80240720 AE20008C */ sw $zero, 0x8c($s1) -/* A07624 80240724 A22000B5 */ sb $zero, 0xb5($s1) -/* A07628 80240728 34420008 */ ori $v0, $v0, 8 -/* A0762C 8024072C AE230084 */ sw $v1, 0x84($s1) -/* A07630 80240730 080901D2 */ j .L80240748 -/* A07634 80240734 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240738: -/* A07638 80240738 8E2200B0 */ lw $v0, 0xb0($s1) -/* A0763C 8024073C 30420004 */ andi $v0, $v0, 4 -/* A07640 80240740 10400047 */ beqz $v0, .L80240860 -/* A07644 80240744 00000000 */ nop -.L80240748: -/* A07648 80240748 AE600070 */ sw $zero, 0x70($s3) -/* A0764C 8024074C A640008E */ sh $zero, 0x8e($s2) -/* A07650 80240750 8E2300CC */ lw $v1, 0xcc($s1) -/* A07654 80240754 2404F7FF */ addiu $a0, $zero, -0x801 -/* A07658 80240758 A2200007 */ sb $zero, 7($s1) -/* A0765C 8024075C 8E420000 */ lw $v0, ($s2) -/* A07660 80240760 8C630000 */ lw $v1, ($v1) -/* A07664 80240764 00441024 */ and $v0, $v0, $a0 -/* A07668 80240768 AE420000 */ sw $v0, ($s2) -/* A0766C 8024076C AE430028 */ sw $v1, 0x28($s2) -/* A07670 80240770 96220086 */ lhu $v0, 0x86($s1) -/* A07674 80240774 A64200A8 */ sh $v0, 0xa8($s2) -/* A07678 80240778 8E2200D0 */ lw $v0, 0xd0($s1) -/* A0767C 8024077C AE200090 */ sw $zero, 0x90($s1) -/* A07680 80240780 8C420034 */ lw $v0, 0x34($v0) -/* A07684 80240784 14400006 */ bnez $v0, .L802407A0 -/* A07688 80240788 2403FDFF */ addiu $v1, $zero, -0x201 -/* A0768C 8024078C 8E420000 */ lw $v0, ($s2) -/* A07690 80240790 2403FFF7 */ addiu $v1, $zero, -9 -/* A07694 80240794 34420200 */ ori $v0, $v0, 0x200 -/* A07698 80240798 080901EB */ j .L802407AC -/* A0769C 8024079C 00431024 */ and $v0, $v0, $v1 -.L802407A0: -/* A076A0 802407A0 8E420000 */ lw $v0, ($s2) -/* A076A4 802407A4 00431024 */ and $v0, $v0, $v1 -/* A076A8 802407A8 34420008 */ ori $v0, $v0, 8 -.L802407AC: -/* A076AC 802407AC AE420000 */ sw $v0, ($s2) -/* A076B0 802407B0 8E2200B0 */ lw $v0, 0xb0($s1) -/* A076B4 802407B4 30420004 */ andi $v0, $v0, 4 -/* A076B8 802407B8 1040001E */ beqz $v0, .L80240834 -/* A076BC 802407BC 24040002 */ addiu $a0, $zero, 2 -/* A076C0 802407C0 0240282D */ daddu $a1, $s2, $zero -/* A076C4 802407C4 0000302D */ daddu $a2, $zero, $zero -/* A076C8 802407C8 24020063 */ addiu $v0, $zero, 0x63 -/* A076CC 802407CC AE620070 */ sw $v0, 0x70($s3) -/* A076D0 802407D0 AE600074 */ sw $zero, 0x74($s3) -/* A076D4 802407D4 864300A8 */ lh $v1, 0xa8($s2) -/* A076D8 802407D8 3C013F80 */ lui $at, 0x3f80 -/* A076DC 802407DC 44810000 */ mtc1 $at, $f0 -/* A076E0 802407E0 3C014000 */ lui $at, 0x4000 -/* A076E4 802407E4 44811000 */ mtc1 $at, $f2 -/* A076E8 802407E8 3C01C1A0 */ lui $at, 0xc1a0 -/* A076EC 802407EC 44812000 */ mtc1 $at, $f4 -/* A076F0 802407F0 24020028 */ addiu $v0, $zero, 0x28 -/* A076F4 802407F4 AFA2001C */ sw $v0, 0x1c($sp) -/* A076F8 802407F8 44833000 */ mtc1 $v1, $f6 -/* A076FC 802407FC 00000000 */ nop -/* A07700 80240800 468031A0 */ cvt.s.w $f6, $f6 -/* A07704 80240804 44073000 */ mfc1 $a3, $f6 -/* A07708 80240808 27A20048 */ addiu $v0, $sp, 0x48 -/* A0770C 8024080C AFA20020 */ sw $v0, 0x20($sp) -/* A07710 80240810 E7A00010 */ swc1 $f0, 0x10($sp) -/* A07714 80240814 E7A20014 */ swc1 $f2, 0x14($sp) -/* A07718 80240818 0C01BFA4 */ jal fx_emote -/* A0771C 8024081C E7A40018 */ swc1 $f4, 0x18($sp) -/* A07720 80240820 8E2200B0 */ lw $v0, 0xb0($s1) -/* A07724 80240824 2403FFFB */ addiu $v1, $zero, -5 -/* A07728 80240828 00431024 */ and $v0, $v0, $v1 -/* A0772C 8024082C 08090218 */ j .L80240860 -/* A07730 80240830 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240834: -/* A07734 80240834 8E220000 */ lw $v0, ($s1) -/* A07738 80240838 3C034000 */ lui $v1, 0x4000 -/* A0773C 8024083C 00431024 */ and $v0, $v0, $v1 -/* A07740 80240840 10400007 */ beqz $v0, .L80240860 -/* A07744 80240844 3C03BFFF */ lui $v1, 0xbfff -/* A07748 80240848 2402000C */ addiu $v0, $zero, 0xc -/* A0774C 8024084C AE620070 */ sw $v0, 0x70($s3) -/* A07750 80240850 8E220000 */ lw $v0, ($s1) -/* A07754 80240854 3463FFFF */ ori $v1, $v1, 0xffff -/* A07758 80240858 00431024 */ and $v0, $v0, $v1 -/* A0775C 8024085C AE220000 */ sw $v0, ($s1) -.L80240860: -/* A07760 80240860 8E220090 */ lw $v0, 0x90($s1) -/* A07764 80240864 1840000C */ blez $v0, .L80240898 -/* A07768 80240868 2442FFFF */ addiu $v0, $v0, -1 -/* A0776C 8024086C 14400087 */ bnez $v0, .L80240A8C_A0798C -/* A07770 80240870 AE220090 */ sw $v0, 0x90($s1) -/* A07774 80240874 3C03FFAA */ lui $v1, 0xffaa -/* A07778 80240878 8E420028 */ lw $v0, 0x28($s2) -/* A0777C 8024087C 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* A07780 80240880 00431021 */ addu $v0, $v0, $v1 -/* A07784 80240884 2C420002 */ sltiu $v0, $v0, 2 -/* A07788 80240888 10400003 */ beqz $v0, .L80240898 -/* A0778C 8024088C 3C020055 */ lui $v0, 0x55 -/* A07790 80240890 3442000C */ ori $v0, $v0, 0xc -/* A07794 80240894 AE420028 */ sw $v0, 0x28($s2) -.L80240898: -/* A07798 80240898 8E630070 */ lw $v1, 0x70($s3) -/* A0779C 8024089C 2402000C */ addiu $v0, $zero, 0xc -/* A077A0 802408A0 10620048 */ beq $v1, $v0, .L802409C4 -/* A077A4 802408A4 2862000D */ slti $v0, $v1, 0xd -/* A077A8 802408A8 1040000F */ beqz $v0, .L802408E8 -/* A077AC 802408AC 24100001 */ addiu $s0, $zero, 1 -/* A077B0 802408B0 1070001E */ beq $v1, $s0, .L8024092C -/* A077B4 802408B4 28620002 */ slti $v0, $v1, 2 -/* A077B8 802408B8 10400005 */ beqz $v0, .L802408D0 -/* A077BC 802408BC 24020002 */ addiu $v0, $zero, 2 -/* A077C0 802408C0 10600015 */ beqz $v1, .L80240918 -/* A077C4 802408C4 0260202D */ daddu $a0, $s3, $zero -/* A077C8 802408C8 08090288 */ j .L80240A20 -/* A077CC 802408CC 00000000 */ nop -.L802408D0: -/* A077D0 802408D0 1062001C */ beq $v1, $v0, .L80240944 -/* A077D4 802408D4 24020003 */ addiu $v0, $zero, 3 -/* A077D8 802408D8 10620035 */ beq $v1, $v0, .L802409B0 -/* A077DC 802408DC 0260202D */ daddu $a0, $s3, $zero -/* A077E0 802408E0 08090288 */ j .L80240A20 -/* A077E4 802408E4 00000000 */ nop -.L802408E8: -/* A077E8 802408E8 2402000E */ addiu $v0, $zero, 0xe -/* A077EC 802408EC 1062003F */ beq $v1, $v0, .L802409EC -/* A077F0 802408F0 0062102A */ slt $v0, $v1, $v0 -/* A077F4 802408F4 14400038 */ bnez $v0, .L802409D8 -/* A077F8 802408F8 0260202D */ daddu $a0, $s3, $zero -/* A077FC 802408FC 2402000F */ addiu $v0, $zero, 0xf -/* A07800 80240900 10620040 */ beq $v1, $v0, .L80240A04 -/* A07804 80240904 24020063 */ addiu $v0, $zero, 0x63 -/* A07808 80240908 10620043 */ beq $v1, $v0, .L80240A18 -/* A0780C 8024090C 00000000 */ nop -/* A07810 80240910 08090288 */ j .L80240A20 -/* A07814 80240914 00000000 */ nop -.L80240918: -/* A07818 80240918 0280282D */ daddu $a1, $s4, $zero -/* A0781C 8024091C 0C012568 */ jal func_800495A0 -/* A07820 80240920 02A0302D */ daddu $a2, $s5, $zero -/* A07824 80240924 96220086 */ lhu $v0, 0x86($s1) -/* A07828 80240928 A64200A8 */ sh $v0, 0xa8($s2) -.L8024092C: -/* A0782C 8024092C 0260202D */ daddu $a0, $s3, $zero -/* A07830 80240930 0280282D */ daddu $a1, $s4, $zero -/* A07834 80240934 0C0125AE */ jal func_800496B8 -/* A07838 80240938 02A0302D */ daddu $a2, $s5, $zero -/* A0783C 8024093C 08090288 */ j .L80240A20 -/* A07840 80240940 00000000 */ nop -.L80240944: -/* A07844 80240944 0260202D */ daddu $a0, $s3, $zero -/* A07848 80240948 0280282D */ daddu $a1, $s4, $zero -/* A0784C 8024094C 0C0126D1 */ jal base_UnkNpcAIFunc1 -/* A07850 80240950 02A0302D */ daddu $a2, $s5, $zero -/* A07854 80240954 8E230088 */ lw $v1, 0x88($s1) -/* A07858 80240958 24020006 */ addiu $v0, $zero, 6 -/* A0785C 8024095C 14620014 */ bne $v1, $v0, .L802409B0 -/* A07860 80240960 0260202D */ daddu $a0, $s3, $zero -/* A07864 80240964 0C00A67F */ jal rand_int -/* A07868 80240968 24040064 */ addiu $a0, $zero, 0x64 -/* A0786C 8024096C 28420021 */ slti $v0, $v0, 0x21 -/* A07870 80240970 5040000F */ beql $v0, $zero, .L802409B0 -/* A07874 80240974 0260202D */ daddu $a0, $s3, $zero -/* A07878 80240978 8E22008C */ lw $v0, 0x8c($s1) -/* A0787C 8024097C 10400005 */ beqz $v0, .L80240994 -/* A07880 80240980 3C020055 */ lui $v0, 0x55 -/* A07884 80240984 3442002F */ ori $v0, $v0, 0x2f -/* A07888 80240988 AE20008C */ sw $zero, 0x8c($s1) -/* A0788C 8024098C 08090268 */ j .L802409A0 -/* A07890 80240990 A22000B5 */ sb $zero, 0xb5($s1) -.L80240994: -/* A07894 80240994 3442002E */ ori $v0, $v0, 0x2e -/* A07898 80240998 AE30008C */ sw $s0, 0x8c($s1) -/* A0789C 8024099C A23000B5 */ sb $s0, 0xb5($s1) -.L802409A0: -/* A078A0 802409A0 AE420028 */ sw $v0, 0x28($s2) -/* A078A4 802409A4 24020007 */ addiu $v0, $zero, 7 -/* A078A8 802409A8 080902A3 */ j .L80240A8C_A0798C -/* A078AC 802409AC AE220090 */ sw $v0, 0x90($s1) -.L802409B0: -/* A078B0 802409B0 0280282D */ daddu $a1, $s4, $zero -/* A078B4 802409B4 0C012701 */ jal func_80049C04 -/* A078B8 802409B8 02A0302D */ daddu $a2, $s5, $zero -/* A078BC 802409BC 08090288 */ j .L80240A20 -/* A078C0 802409C0 00000000 */ nop -.L802409C4: -/* A078C4 802409C4 0260202D */ daddu $a0, $s3, $zero -/* A078C8 802409C8 0280282D */ daddu $a1, $s4, $zero -/* A078CC 802409CC 0C0900B8 */ jal nok_15_set_script_owner_npc_anim -/* A078D0 802409D0 02A0302D */ daddu $a2, $s5, $zero -/* A078D4 802409D4 0260202D */ daddu $a0, $s3, $zero -.L802409D8: -/* A078D8 802409D8 0280282D */ daddu $a1, $s4, $zero -/* A078DC 802409DC 0C0900D7 */ jal nok_15_UnkDistFunc -/* A078E0 802409E0 02A0302D */ daddu $a2, $s5, $zero -/* A078E4 802409E4 08090288 */ j .L80240A20 -/* A078E8 802409E8 00000000 */ nop -.L802409EC: -/* A078EC 802409EC 0260202D */ daddu $a0, $s3, $zero -/* A078F0 802409F0 0280282D */ daddu $a1, $s4, $zero -/* A078F4 802409F4 0C090124 */ jal nok_15_UnkNpcAIFunc12 -/* A078F8 802409F8 02A0302D */ daddu $a2, $s5, $zero -/* A078FC 802409FC 08090288 */ j .L80240A20 -/* A07900 80240A00 00000000 */ nop -.L80240A04: -/* A07904 80240A04 0280282D */ daddu $a1, $s4, $zero -/* A07908 80240A08 0C09017D */ jal nok_15_set_script_owner_npc_col_height -/* A0790C 80240A0C 02A0302D */ daddu $a2, $s5, $zero -/* A07910 80240A10 08090288 */ j .L80240A20 -/* A07914 80240A14 00000000 */ nop -.L80240A18: -/* A07918 80240A18 0C0129CF */ jal func_8004A73C -/* A0791C 80240A1C 0260202D */ daddu $a0, $s3, $zero -.L80240A20: -/* A07920 80240A20 8E230088 */ lw $v1, 0x88($s1) -/* A07924 80240A24 24020006 */ addiu $v0, $zero, 6 -/* A07928 80240A28 14620019 */ bne $v1, $v0, .L80240A90 -/* A0792C 80240A2C 0000102D */ daddu $v0, $zero, $zero -/* A07930 80240A30 8E22008C */ lw $v0, 0x8c($s1) -/* A07934 80240A34 10400003 */ beqz $v0, .L80240A44 -/* A07938 80240A38 24020001 */ addiu $v0, $zero, 1 -/* A0793C 80240A3C 08090292 */ j .L80240A48 -/* A07940 80240A40 A22200B5 */ sb $v0, 0xb5($s1) -.L80240A44: -/* A07944 80240A44 A22000B5 */ sb $zero, 0xb5($s1) -.L80240A48: -/* A07948 80240A48 8E22008C */ lw $v0, 0x8c($s1) -/* A0794C 80240A4C 1040000F */ beqz $v0, .L80240A8C_A0798C -/* A07950 80240A50 3C03FFAA */ lui $v1, 0xffaa -/* A07954 80240A54 8E420028 */ lw $v0, 0x28($s2) -/* A07958 80240A58 3463FFFC */ ori $v1, $v1, 0xfffc -/* A0795C 80240A5C 00431821 */ addu $v1, $v0, $v1 -/* A07960 80240A60 2C620015 */ sltiu $v0, $v1, 0x15 -/* A07964 80240A64 10400009 */ beqz $v0, .L80240A8C_A0798C -/* A07968 80240A68 00031080 */ sll $v0, $v1, 2 -/* A0796C 80240A6C 3C018024 */ lui $at, %hi(jtbl_80244CF8_A0BBF8) -/* A07970 80240A70 00220821 */ addu $at, $at, $v0 -/* A07974 80240A74 8C224CF8 */ lw $v0, %lo(jtbl_80244CF8_A0BBF8)($at) -/* A07978 80240A78 00400008 */ jr $v0 -/* A0797C 80240A7C 00000000 */ nop -.L80240A80_A07980: -/* A07980 80240A80 8E420028 */ lw $v0, 0x28($s2) -/* A07984 80240A84 24420001 */ addiu $v0, $v0, 1 -/* A07988 80240A88 AE420028 */ sw $v0, 0x28($s2) -.L80240A8C_A0798C: -/* A0798C 80240A8C 0000102D */ daddu $v0, $zero, $zero -.L80240A90: -/* A07990 80240A90 8FBF0068 */ lw $ra, 0x68($sp) -/* A07994 80240A94 8FB50064 */ lw $s5, 0x64($sp) -/* A07998 80240A98 8FB40060 */ lw $s4, 0x60($sp) -/* A0799C 80240A9C 8FB3005C */ lw $s3, 0x5c($sp) -/* A079A0 80240AA0 8FB20058 */ lw $s2, 0x58($sp) -/* A079A4 80240AA4 8FB10054 */ lw $s1, 0x54($sp) -/* A079A8 80240AA8 8FB00050 */ lw $s0, 0x50($sp) -/* A079AC 80240AAC 03E00008 */ jr $ra -/* A079B0 80240AB0 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240EDC_D9E3AC.s b/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240EDC_D9E3AC.s deleted file mode 100644 index 6b77cf7a86..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240EDC_D9E3AC.s +++ /dev/null @@ -1,59 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80247A10_DA4EE0 -.double 32767.0 - -.section .text - -glabel func_80240EDC_D9E3AC -/* D9E3AC 80240EDC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D9E3B0 80240EE0 AFB00010 */ sw $s0, 0x10($sp) -/* D9E3B4 80240EE4 0080802D */ daddu $s0, $a0, $zero -/* D9E3B8 80240EE8 AFBF001C */ sw $ra, 0x1c($sp) -/* D9E3BC 80240EEC AFB20018 */ sw $s2, 0x18($sp) -/* D9E3C0 80240EF0 AFB10014 */ sw $s1, 0x14($sp) -/* D9E3C4 80240EF4 8E110148 */ lw $s1, 0x148($s0) -/* D9E3C8 80240EF8 86240008 */ lh $a0, 8($s1) -/* D9E3CC 80240EFC 0C00EABB */ jal get_npc_unsafe -/* D9E3D0 80240F00 00A0902D */ daddu $s2, $a1, $zero -/* D9E3D4 80240F04 8E2300CC */ lw $v1, 0xcc($s1) -/* D9E3D8 80240F08 0040202D */ daddu $a0, $v0, $zero -/* D9E3DC 80240F0C 8C630000 */ lw $v1, ($v1) -/* D9E3E0 80240F10 24020001 */ addiu $v0, $zero, 1 -/* D9E3E4 80240F14 AC830028 */ sw $v1, 0x28($a0) -/* D9E3E8 80240F18 AE020070 */ sw $v0, 0x70($s0) -/* D9E3EC 80240F1C 8E220000 */ lw $v0, ($s1) -/* D9E3F0 80240F20 3C030010 */ lui $v1, 0x10 -/* D9E3F4 80240F24 00431024 */ and $v0, $v0, $v1 -/* D9E3F8 80240F28 10400004 */ beqz $v0, .L80240F3C -/* D9E3FC 80240F2C 00000000 */ nop -/* D9E400 80240F30 C620006C */ lwc1 $f0, 0x6c($s1) -/* D9E404 80240F34 46800020 */ cvt.s.w $f0, $f0 -/* D9E408 80240F38 E480000C */ swc1 $f0, 0xc($a0) -.L80240F3C: -/* D9E40C 80240F3C 8E2200D0 */ lw $v0, 0xd0($s1) -/* D9E410 80240F40 8C420014 */ lw $v0, 0x14($v0) -/* D9E414 80240F44 1C400004 */ bgtz $v0, .L80240F58 -/* D9E418 80240F48 00000000 */ nop -/* D9E41C 80240F4C C640000C */ lwc1 $f0, 0xc($s2) -/* D9E420 80240F50 080903DE */ j .L80240F78 -/* D9E424 80240F54 E4800018 */ swc1 $f0, 0x18($a0) -.L80240F58: -/* D9E428 80240F58 3C018024 */ lui $at, %hi(D_80247A10_DA4EE0) -/* D9E42C 80240F5C D4227A10 */ ldc1 $f2, %lo(D_80247A10_DA4EE0)($at) -/* D9E430 80240F60 44820000 */ mtc1 $v0, $f0 -/* D9E434 80240F64 00000000 */ nop -/* D9E438 80240F68 46800021 */ cvt.d.w $f0, $f0 -/* D9E43C 80240F6C 46220003 */ div.d $f0, $f0, $f2 -/* D9E440 80240F70 46200020 */ cvt.s.d $f0, $f0 -/* D9E444 80240F74 E4800018 */ swc1 $f0, 0x18($a0) -.L80240F78: -/* D9E448 80240F78 8FBF001C */ lw $ra, 0x1c($sp) -/* D9E44C 80240F7C 8FB20018 */ lw $s2, 0x18($sp) -/* D9E450 80240F80 8FB10014 */ lw $s1, 0x14($sp) -/* D9E454 80240F84 8FB00010 */ lw $s0, 0x10($sp) -/* D9E458 80240F88 03E00008 */ jr $ra -/* D9E45C 80240F8C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240F90_D9E460.s b/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240F90_D9E460.s deleted file mode 100644 index c26bb3eec3..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240F90_D9E460.s +++ /dev/null @@ -1,78 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F90_D9E460 -/* D9E460 80240F90 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* D9E464 80240F94 AFB40040 */ sw $s4, 0x40($sp) -/* D9E468 80240F98 0080A02D */ daddu $s4, $a0, $zero -/* D9E46C 80240F9C AFBF0044 */ sw $ra, 0x44($sp) -/* D9E470 80240FA0 AFB3003C */ sw $s3, 0x3c($sp) -/* D9E474 80240FA4 AFB20038 */ sw $s2, 0x38($sp) -/* D9E478 80240FA8 AFB10034 */ sw $s1, 0x34($sp) -/* D9E47C 80240FAC AFB00030 */ sw $s0, 0x30($sp) -/* D9E480 80240FB0 8E920148 */ lw $s2, 0x148($s4) -/* D9E484 80240FB4 00A0802D */ daddu $s0, $a1, $zero -/* D9E488 80240FB8 86440008 */ lh $a0, 8($s2) -/* D9E48C 80240FBC 0C00EABB */ jal get_npc_unsafe -/* D9E490 80240FC0 00C0982D */ daddu $s3, $a2, $zero -/* D9E494 80240FC4 8E030008 */ lw $v1, 8($s0) -/* D9E498 80240FC8 04600031 */ bltz $v1, .L80241090 -/* D9E49C 80240FCC 0040882D */ daddu $s1, $v0, $zero -/* D9E4A0 80240FD0 0260202D */ daddu $a0, $s3, $zero -/* D9E4A4 80240FD4 AFA00010 */ sw $zero, 0x10($sp) -/* D9E4A8 80240FD8 8E060018 */ lw $a2, 0x18($s0) -/* D9E4AC 80240FDC 8E07001C */ lw $a3, 0x1c($s0) -/* D9E4B0 80240FE0 0C01242D */ jal func_800490B4 -/* D9E4B4 80240FE4 0240282D */ daddu $a1, $s2, $zero -/* D9E4B8 80240FE8 10400029 */ beqz $v0, .L80241090 -/* D9E4BC 80240FEC 0000202D */ daddu $a0, $zero, $zero -/* D9E4C0 80240FF0 0220282D */ daddu $a1, $s1, $zero -/* D9E4C4 80240FF4 0000302D */ daddu $a2, $zero, $zero -/* D9E4C8 80240FF8 862300A8 */ lh $v1, 0xa8($s1) -/* D9E4CC 80240FFC 3C013F80 */ lui $at, 0x3f80 -/* D9E4D0 80241000 44810000 */ mtc1 $at, $f0 -/* D9E4D4 80241004 3C014000 */ lui $at, 0x4000 -/* D9E4D8 80241008 44811000 */ mtc1 $at, $f2 -/* D9E4DC 8024100C 3C01C1A0 */ lui $at, 0xc1a0 -/* D9E4E0 80241010 44812000 */ mtc1 $at, $f4 -/* D9E4E4 80241014 2402000F */ addiu $v0, $zero, 0xf -/* D9E4E8 80241018 AFA2001C */ sw $v0, 0x1c($sp) -/* D9E4EC 8024101C 44833000 */ mtc1 $v1, $f6 -/* D9E4F0 80241020 00000000 */ nop -/* D9E4F4 80241024 468031A0 */ cvt.s.w $f6, $f6 -/* D9E4F8 80241028 44073000 */ mfc1 $a3, $f6 -/* D9E4FC 8024102C 27A20028 */ addiu $v0, $sp, 0x28 -/* D9E500 80241030 AFA20020 */ sw $v0, 0x20($sp) -/* D9E504 80241034 E7A00010 */ swc1 $f0, 0x10($sp) -/* D9E508 80241038 E7A20014 */ swc1 $f2, 0x14($sp) -/* D9E50C 8024103C 0C01BFA4 */ jal fx_emote -/* D9E510 80241040 E7A40018 */ swc1 $f4, 0x18($sp) -/* D9E514 80241044 0220202D */ daddu $a0, $s1, $zero -/* D9E518 80241048 240502F4 */ addiu $a1, $zero, 0x2f4 -/* D9E51C 8024104C 0C012530 */ jal ai_enemy_play_sound -/* D9E520 80241050 3C060020 */ lui $a2, 0x20 -/* D9E524 80241054 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* D9E528 80241058 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* D9E52C 8024105C C62C0038 */ lwc1 $f12, 0x38($s1) -/* D9E530 80241060 C62E0040 */ lwc1 $f14, 0x40($s1) -/* D9E534 80241064 8C460028 */ lw $a2, 0x28($v0) -/* D9E538 80241068 0C00A720 */ jal atan2 -/* D9E53C 8024106C 8C470030 */ lw $a3, 0x30($v0) -/* D9E540 80241070 E620000C */ swc1 $f0, 0xc($s1) -/* D9E544 80241074 8E420018 */ lw $v0, 0x18($s2) -/* D9E548 80241078 9442002A */ lhu $v0, 0x2a($v0) -/* D9E54C 8024107C 30420001 */ andi $v0, $v0, 1 -/* D9E550 80241080 14400002 */ bnez $v0, .L8024108C -/* D9E554 80241084 2402000A */ addiu $v0, $zero, 0xa -/* D9E558 80241088 2402000C */ addiu $v0, $zero, 0xc -.L8024108C: -/* D9E55C 8024108C AE820070 */ sw $v0, 0x70($s4) -.L80241090: -/* D9E560 80241090 8FBF0044 */ lw $ra, 0x44($sp) -/* D9E564 80241094 8FB40040 */ lw $s4, 0x40($sp) -/* D9E568 80241098 8FB3003C */ lw $s3, 0x3c($sp) -/* D9E56C 8024109C 8FB20038 */ lw $s2, 0x38($sp) -/* D9E570 802410A0 8FB10034 */ lw $s1, 0x34($sp) -/* D9E574 802410A4 8FB00030 */ lw $s0, 0x30($sp) -/* D9E578 802410A8 03E00008 */ jr $ra -/* D9E57C 802410AC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024141C_D9E8EC.s b/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024141C_D9E8EC.s deleted file mode 100644 index 01b0626fbc..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024141C_D9E8EC.s +++ /dev/null @@ -1,59 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80247A18_DA4EE8 -.double 0.3 - -dlabel D_80247A20_DA4EF0 -.double 32767.0 - -.section .text - -glabel func_8024141C_D9E8EC -/* D9E8EC 8024141C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D9E8F0 80241420 AFB10014 */ sw $s1, 0x14($sp) -/* D9E8F4 80241424 0080882D */ daddu $s1, $a0, $zero -/* D9E8F8 80241428 AFBF001C */ sw $ra, 0x1c($sp) -/* D9E8FC 8024142C AFB20018 */ sw $s2, 0x18($sp) -/* D9E900 80241430 AFB00010 */ sw $s0, 0x10($sp) -/* D9E904 80241434 8E300148 */ lw $s0, 0x148($s1) -/* D9E908 80241438 86040008 */ lh $a0, 8($s0) -/* D9E90C 8024143C 0C00EABB */ jal get_npc_unsafe -/* D9E910 80241440 00A0902D */ daddu $s2, $a1, $zero -/* D9E914 80241444 8E0300CC */ lw $v1, 0xcc($s0) -/* D9E918 80241448 8C630004 */ lw $v1, 4($v1) -/* D9E91C 8024144C 0040202D */ daddu $a0, $v0, $zero -/* D9E920 80241450 AC830028 */ sw $v1, 0x28($a0) -/* D9E924 80241454 8E0200D0 */ lw $v0, 0xd0($s0) -/* D9E928 80241458 8C420014 */ lw $v0, 0x14($v0) -/* D9E92C 8024145C 04410009 */ bgez $v0, .L80241484 -/* D9E930 80241460 00000000 */ nop -/* D9E934 80241464 C640000C */ lwc1 $f0, 0xc($s2) -/* D9E938 80241468 3C018024 */ lui $at, %hi(D_80247A18_DA4EE8) -/* D9E93C 8024146C D4227A18 */ ldc1 $f2, %lo(D_80247A18_DA4EE8)($at) -/* D9E940 80241470 46000021 */ cvt.d.s $f0, $f0 -/* D9E944 80241474 46220002 */ mul.d $f0, $f0, $f2 -/* D9E948 80241478 00000000 */ nop -/* D9E94C 8024147C 08090528 */ j .L802414A0 -/* D9E950 80241480 46200020 */ cvt.s.d $f0, $f0 -.L80241484: -/* D9E954 80241484 3C018024 */ lui $at, %hi(D_80247A20_DA4EF0) -/* D9E958 80241488 D4227A20 */ ldc1 $f2, %lo(D_80247A20_DA4EF0)($at) -/* D9E95C 8024148C 44820000 */ mtc1 $v0, $f0 -/* D9E960 80241490 00000000 */ nop -/* D9E964 80241494 46800021 */ cvt.d.w $f0, $f0 -/* D9E968 80241498 46220003 */ div.d $f0, $f0, $f2 -/* D9E96C 8024149C 46200020 */ cvt.s.d $f0, $f0 -.L802414A0: -/* D9E970 802414A0 E4800018 */ swc1 $f0, 0x18($a0) -/* D9E974 802414A4 24020010 */ addiu $v0, $zero, 0x10 -/* D9E978 802414A8 AE200074 */ sw $zero, 0x74($s1) -/* D9E97C 802414AC AE220070 */ sw $v0, 0x70($s1) -/* D9E980 802414B0 8FBF001C */ lw $ra, 0x1c($sp) -/* D9E984 802414B4 8FB20018 */ lw $s2, 0x18($sp) -/* D9E988 802414B8 8FB10014 */ lw $s1, 0x14($sp) -/* D9E98C 802414BC 8FB00010 */ lw $s0, 0x10($sp) -/* D9E990 802414C0 03E00008 */ jr $ra -/* D9E994 802414C4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802414C8_D9E998.s b/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802414C8_D9E998.s deleted file mode 100644 index 7df1dc89b2..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802414C8_D9E998.s +++ /dev/null @@ -1,140 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802414C8_D9E998 -/* D9E998 802414C8 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* D9E99C 802414CC AFB3003C */ sw $s3, 0x3c($sp) -/* D9E9A0 802414D0 0080982D */ daddu $s3, $a0, $zero -/* D9E9A4 802414D4 AFBF0044 */ sw $ra, 0x44($sp) -/* D9E9A8 802414D8 AFB40040 */ sw $s4, 0x40($sp) -/* D9E9AC 802414DC AFB20038 */ sw $s2, 0x38($sp) -/* D9E9B0 802414E0 AFB10034 */ sw $s1, 0x34($sp) -/* D9E9B4 802414E4 AFB00030 */ sw $s0, 0x30($sp) -/* D9E9B8 802414E8 8E710148 */ lw $s1, 0x148($s3) -/* D9E9BC 802414EC 00A0902D */ daddu $s2, $a1, $zero -/* D9E9C0 802414F0 86240008 */ lh $a0, 8($s1) -/* D9E9C4 802414F4 0C00EABB */ jal get_npc_unsafe -/* D9E9C8 802414F8 00C0A02D */ daddu $s4, $a2, $zero -/* D9E9CC 802414FC 8E430008 */ lw $v1, 8($s2) -/* D9E9D0 80241500 0460003B */ bltz $v1, .L802415F0 -/* D9E9D4 80241504 0040802D */ daddu $s0, $v0, $zero -/* D9E9D8 80241508 8E620074 */ lw $v0, 0x74($s3) -/* D9E9DC 8024150C 1C400037 */ bgtz $v0, .L802415EC -/* D9E9E0 80241510 2442FFFF */ addiu $v0, $v0, -1 -/* D9E9E4 80241514 0280202D */ daddu $a0, $s4, $zero -/* D9E9E8 80241518 AE630074 */ sw $v1, 0x74($s3) -/* D9E9EC 8024151C AFA00010 */ sw $zero, 0x10($sp) -/* D9E9F0 80241520 8E460018 */ lw $a2, 0x18($s2) -/* D9E9F4 80241524 8E47001C */ lw $a3, 0x1c($s2) -/* D9E9F8 80241528 0C01242D */ jal func_800490B4 -/* D9E9FC 8024152C 0220282D */ daddu $a1, $s1, $zero -/* D9EA00 80241530 1040002C */ beqz $v0, .L802415E4 -/* D9EA04 80241534 0000202D */ daddu $a0, $zero, $zero -/* D9EA08 80241538 0200282D */ daddu $a1, $s0, $zero -/* D9EA0C 8024153C 0000302D */ daddu $a2, $zero, $zero -/* D9EA10 80241540 860300A8 */ lh $v1, 0xa8($s0) -/* D9EA14 80241544 3C013F80 */ lui $at, 0x3f80 -/* D9EA18 80241548 44810000 */ mtc1 $at, $f0 -/* D9EA1C 8024154C 3C014000 */ lui $at, 0x4000 -/* D9EA20 80241550 44811000 */ mtc1 $at, $f2 -/* D9EA24 80241554 3C01C1A0 */ lui $at, 0xc1a0 -/* D9EA28 80241558 44812000 */ mtc1 $at, $f4 -/* D9EA2C 8024155C 2402000F */ addiu $v0, $zero, 0xf -/* D9EA30 80241560 AFA2001C */ sw $v0, 0x1c($sp) -/* D9EA34 80241564 44833000 */ mtc1 $v1, $f6 -/* D9EA38 80241568 00000000 */ nop -/* D9EA3C 8024156C 468031A0 */ cvt.s.w $f6, $f6 -/* D9EA40 80241570 44073000 */ mfc1 $a3, $f6 -/* D9EA44 80241574 27A20028 */ addiu $v0, $sp, 0x28 -/* D9EA48 80241578 AFA20020 */ sw $v0, 0x20($sp) -/* D9EA4C 8024157C E7A00010 */ swc1 $f0, 0x10($sp) -/* D9EA50 80241580 E7A20014 */ swc1 $f2, 0x14($sp) -/* D9EA54 80241584 0C01BFA4 */ jal fx_emote -/* D9EA58 80241588 E7A40018 */ swc1 $f4, 0x18($sp) -/* D9EA5C 8024158C 0200202D */ daddu $a0, $s0, $zero -/* D9EA60 80241590 240502F4 */ addiu $a1, $zero, 0x2f4 -/* D9EA64 80241594 0C012530 */ jal ai_enemy_play_sound -/* D9EA68 80241598 3C060020 */ lui $a2, 0x20 -/* D9EA6C 8024159C C60C0038 */ lwc1 $f12, 0x38($s0) -/* D9EA70 802415A0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* D9EA74 802415A4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* D9EA78 802415A8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* D9EA7C 802415AC 8C460028 */ lw $a2, 0x28($v0) -/* D9EA80 802415B0 0C00A720 */ jal atan2 -/* D9EA84 802415B4 8C470030 */ lw $a3, 0x30($v0) -/* D9EA88 802415B8 E600000C */ swc1 $f0, 0xc($s0) -/* D9EA8C 802415BC 8E220018 */ lw $v0, 0x18($s1) -/* D9EA90 802415C0 9442002A */ lhu $v0, 0x2a($v0) -/* D9EA94 802415C4 30420001 */ andi $v0, $v0, 1 -/* D9EA98 802415C8 10400003 */ beqz $v0, .L802415D8 -/* D9EA9C 802415CC 2402000A */ addiu $v0, $zero, 0xa -/* D9EAA0 802415D0 080905AC */ j .L802416B0 -/* D9EAA4 802415D4 AE620070 */ sw $v0, 0x70($s3) -.L802415D8: -/* D9EAA8 802415D8 2402000C */ addiu $v0, $zero, 0xc -/* D9EAAC 802415DC 080905AC */ j .L802416B0 -/* D9EAB0 802415E0 AE620070 */ sw $v0, 0x70($s3) -.L802415E4: -/* D9EAB4 802415E4 8E620074 */ lw $v0, 0x74($s3) -/* D9EAB8 802415E8 2442FFFF */ addiu $v0, $v0, -1 -.L802415EC: -/* D9EABC 802415EC AE620074 */ sw $v0, 0x74($s3) -.L802415F0: -/* D9EAC0 802415F0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* D9EAC4 802415F4 8E2200D0 */ lw $v0, 0xd0($s1) -/* D9EAC8 802415F8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* D9EACC 802415FC C4460000 */ lwc1 $f6, ($v0) -/* D9EAD0 80241600 468031A0 */ cvt.s.w $f6, $f6 -/* D9EAD4 80241604 44063000 */ mfc1 $a2, $f6 -/* D9EAD8 80241608 C4460008 */ lwc1 $f6, 8($v0) -/* D9EADC 8024160C 468031A0 */ cvt.s.w $f6, $f6 -/* D9EAE0 80241610 44073000 */ mfc1 $a3, $f6 -/* D9EAE4 80241614 0C00A7B5 */ jal dist2D -/* D9EAE8 80241618 00000000 */ nop -/* D9EAEC 8024161C C6020018 */ lwc1 $f2, 0x18($s0) -/* D9EAF0 80241620 4602003C */ c.lt.s $f0, $f2 -/* D9EAF4 80241624 00000000 */ nop -/* D9EAF8 80241628 4500000E */ bc1f .L80241664 -/* D9EAFC 8024162C 00000000 */ nop -/* D9EB00 80241630 8E2200D0 */ lw $v0, 0xd0($s1) -/* D9EB04 80241634 C4400000 */ lwc1 $f0, ($v0) -/* D9EB08 80241638 46800020 */ cvt.s.w $f0, $f0 -/* D9EB0C 8024163C E6000038 */ swc1 $f0, 0x38($s0) -/* D9EB10 80241640 8E2200D0 */ lw $v0, 0xd0($s1) -/* D9EB14 80241644 C4400008 */ lwc1 $f0, 8($v0) -/* D9EB18 80241648 46800020 */ cvt.s.w $f0, $f0 -/* D9EB1C 8024164C E6000040 */ swc1 $f0, 0x40($s0) -/* D9EB20 80241650 8E2200D0 */ lw $v0, 0xd0($s1) -/* D9EB24 80241654 C440000C */ lwc1 $f0, 0xc($v0) -/* D9EB28 80241658 46800020 */ cvt.s.w $f0, $f0 -/* D9EB2C 8024165C E600000C */ swc1 $f0, 0xc($s0) -/* D9EB30 80241660 AE600070 */ sw $zero, 0x70($s3) -.L80241664: -/* D9EB34 80241664 8602008C */ lh $v0, 0x8c($s0) -/* D9EB38 80241668 14400011 */ bnez $v0, .L802416B0 -/* D9EB3C 8024166C 00000000 */ nop -/* D9EB40 80241670 C60C0038 */ lwc1 $f12, 0x38($s0) -/* D9EB44 80241674 8E2200D0 */ lw $v0, 0xd0($s1) -/* D9EB48 80241678 C60E0040 */ lwc1 $f14, 0x40($s0) -/* D9EB4C 8024167C C4460000 */ lwc1 $f6, ($v0) -/* D9EB50 80241680 468031A0 */ cvt.s.w $f6, $f6 -/* D9EB54 80241684 44063000 */ mfc1 $a2, $f6 -/* D9EB58 80241688 C4460008 */ lwc1 $f6, 8($v0) -/* D9EB5C 8024168C 468031A0 */ cvt.s.w $f6, $f6 -/* D9EB60 80241690 44073000 */ mfc1 $a3, $f6 -/* D9EB64 80241694 0C00A720 */ jal atan2 -/* D9EB68 80241698 00000000 */ nop -/* D9EB6C 8024169C 8E050018 */ lw $a1, 0x18($s0) -/* D9EB70 802416A0 44060000 */ mfc1 $a2, $f0 -/* D9EB74 802416A4 0200202D */ daddu $a0, $s0, $zero -/* D9EB78 802416A8 0C00EA95 */ jal npc_move_heading -/* D9EB7C 802416AC AC86000C */ sw $a2, 0xc($a0) -.L802416B0: -/* D9EB80 802416B0 8FBF0044 */ lw $ra, 0x44($sp) -/* D9EB84 802416B4 8FB40040 */ lw $s4, 0x40($sp) -/* D9EB88 802416B8 8FB3003C */ lw $s3, 0x3c($sp) -/* D9EB8C 802416BC 8FB20038 */ lw $s2, 0x38($sp) -/* D9EB90 802416C0 8FB10034 */ lw $s1, 0x34($sp) -/* D9EB94 802416C4 8FB00030 */ lw $s0, 0x30($sp) -/* D9EB98 802416C8 03E00008 */ jr $ra -/* D9EB9C 802416CC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802416D0_D9EBA0.s b/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802416D0_D9EBA0.s deleted file mode 100644 index f27ad519af..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802416D0_D9EBA0.s +++ /dev/null @@ -1,185 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80247A28_DA4EF8 -.word .L80241860_D9ED30, .L80241870_D9ED40, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241888_D9ED58, .L80241898_D9ED68, .L802418B0_D9ED80, .L802418C0_D9ED90, .L802418D8_D9EDA8, .L802418F0_D9EDC0, .L80241900_D9EDD0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241920_D9EDF0, .L80241918_D9EDE8 - -.section .text - -glabel func_802416D0_D9EBA0 -/* D9EBA0 802416D0 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D9EBA4 802416D4 AFB40040 */ sw $s4, 0x40($sp) -/* D9EBA8 802416D8 0080A02D */ daddu $s4, $a0, $zero -/* D9EBAC 802416DC AFBF0048 */ sw $ra, 0x48($sp) -/* D9EBB0 802416E0 AFB50044 */ sw $s5, 0x44($sp) -/* D9EBB4 802416E4 AFB3003C */ sw $s3, 0x3c($sp) -/* D9EBB8 802416E8 AFB20038 */ sw $s2, 0x38($sp) -/* D9EBBC 802416EC AFB10034 */ sw $s1, 0x34($sp) -/* D9EBC0 802416F0 AFB00030 */ sw $s0, 0x30($sp) -/* D9EBC4 802416F4 8E920148 */ lw $s2, 0x148($s4) -/* D9EBC8 802416F8 86440008 */ lh $a0, 8($s2) -/* D9EBCC 802416FC 8E90000C */ lw $s0, 0xc($s4) -/* D9EBD0 80241700 0C00EABB */ jal get_npc_unsafe -/* D9EBD4 80241704 00A0882D */ daddu $s1, $a1, $zero -/* D9EBD8 80241708 0280202D */ daddu $a0, $s4, $zero -/* D9EBDC 8024170C 8E050000 */ lw $a1, ($s0) -/* D9EBE0 80241710 0C0B1EAF */ jal evt_get_variable -/* D9EBE4 80241714 0040802D */ daddu $s0, $v0, $zero -/* D9EBE8 80241718 AFA00010 */ sw $zero, 0x10($sp) -/* D9EBEC 8024171C 8E4300D0 */ lw $v1, 0xd0($s2) -/* D9EBF0 80241720 8C630030 */ lw $v1, 0x30($v1) -/* D9EBF4 80241724 AFA30014 */ sw $v1, 0x14($sp) -/* D9EBF8 80241728 8E4300D0 */ lw $v1, 0xd0($s2) -/* D9EBFC 8024172C 8C63001C */ lw $v1, 0x1c($v1) -/* D9EC00 80241730 AFA30018 */ sw $v1, 0x18($sp) -/* D9EC04 80241734 8E4300D0 */ lw $v1, 0xd0($s2) -/* D9EC08 80241738 8C630024 */ lw $v1, 0x24($v1) -/* D9EC0C 8024173C AFA3001C */ sw $v1, 0x1c($sp) -/* D9EC10 80241740 8E4300D0 */ lw $v1, 0xd0($s2) -/* D9EC14 80241744 8C630028 */ lw $v1, 0x28($v1) -/* D9EC18 80241748 27B50010 */ addiu $s5, $sp, 0x10 -/* D9EC1C 8024174C AFA30020 */ sw $v1, 0x20($sp) -/* D9EC20 80241750 8E4300D0 */ lw $v1, 0xd0($s2) -/* D9EC24 80241754 3C014282 */ lui $at, 0x4282 -/* D9EC28 80241758 44810000 */ mtc1 $at, $f0 -/* D9EC2C 8024175C 8C63002C */ lw $v1, 0x2c($v1) -/* D9EC30 80241760 0040982D */ daddu $s3, $v0, $zero -/* D9EC34 80241764 E7A00028 */ swc1 $f0, 0x28($sp) -/* D9EC38 80241768 A7A0002C */ sh $zero, 0x2c($sp) -/* D9EC3C 8024176C 16200005 */ bnez $s1, .L80241784 -/* D9EC40 80241770 AFA30024 */ sw $v1, 0x24($sp) -/* D9EC44 80241774 8E4200B0 */ lw $v0, 0xb0($s2) -/* D9EC48 80241778 30420004 */ andi $v0, $v0, 4 -/* D9EC4C 8024177C 1040002F */ beqz $v0, .L8024183C -/* D9EC50 80241780 00000000 */ nop -.L80241784: -/* D9EC54 80241784 AE800070 */ sw $zero, 0x70($s4) -/* D9EC58 80241788 C600000C */ lwc1 $f0, 0xc($s0) -/* D9EC5C 8024178C A600008E */ sh $zero, 0x8e($s0) -/* D9EC60 80241790 8E4200CC */ lw $v0, 0xcc($s2) -/* D9EC64 80241794 4600008D */ trunc.w.s $f2, $f0 -/* D9EC68 80241798 E642006C */ swc1 $f2, 0x6c($s2) -/* D9EC6C 8024179C 8C420000 */ lw $v0, ($v0) -/* D9EC70 802417A0 8E030000 */ lw $v1, ($s0) -/* D9EC74 802417A4 AE020028 */ sw $v0, 0x28($s0) -/* D9EC78 802417A8 2402F7FF */ addiu $v0, $zero, -0x801 -/* D9EC7C 802417AC 00621824 */ and $v1, $v1, $v0 -/* D9EC80 802417B0 AE030000 */ sw $v1, ($s0) -/* D9EC84 802417B4 8E4200D0 */ lw $v0, 0xd0($s2) -/* D9EC88 802417B8 8C420034 */ lw $v0, 0x34($v0) -/* D9EC8C 802417BC 54400005 */ bnel $v0, $zero, .L802417D4 -/* D9EC90 802417C0 2402FDFF */ addiu $v0, $zero, -0x201 -/* D9EC94 802417C4 34620200 */ ori $v0, $v1, 0x200 -/* D9EC98 802417C8 2403FFF7 */ addiu $v1, $zero, -9 -/* D9EC9C 802417CC 080905F7 */ j .L802417DC -/* D9ECA0 802417D0 00431024 */ and $v0, $v0, $v1 -.L802417D4: -/* D9ECA4 802417D4 00621024 */ and $v0, $v1, $v0 -/* D9ECA8 802417D8 34420008 */ ori $v0, $v0, 8 -.L802417DC: -/* D9ECAC 802417DC AE020000 */ sw $v0, ($s0) -/* D9ECB0 802417E0 8E4200B0 */ lw $v0, 0xb0($s2) -/* D9ECB4 802417E4 30420004 */ andi $v0, $v0, 4 -/* D9ECB8 802417E8 10400009 */ beqz $v0, .L80241810 -/* D9ECBC 802417EC 24020063 */ addiu $v0, $zero, 0x63 -/* D9ECC0 802417F0 AE820070 */ sw $v0, 0x70($s4) -/* D9ECC4 802417F4 2402000F */ addiu $v0, $zero, 0xf -/* D9ECC8 802417F8 AE820074 */ sw $v0, 0x74($s4) -/* D9ECCC 802417FC 8E4200B0 */ lw $v0, 0xb0($s2) -/* D9ECD0 80241800 2403FFFB */ addiu $v1, $zero, -5 -/* D9ECD4 80241804 00431024 */ and $v0, $v0, $v1 -/* D9ECD8 80241808 0809060F */ j .L8024183C -/* D9ECDC 8024180C AE4200B0 */ sw $v0, 0xb0($s2) -.L80241810: -/* D9ECE0 80241810 8E420000 */ lw $v0, ($s2) -/* D9ECE4 80241814 3C034000 */ lui $v1, 0x4000 -/* D9ECE8 80241818 00431024 */ and $v0, $v0, $v1 -/* D9ECEC 8024181C 10400007 */ beqz $v0, .L8024183C -/* D9ECF0 80241820 3C03BFFF */ lui $v1, 0xbfff -/* D9ECF4 80241824 2402000C */ addiu $v0, $zero, 0xc -/* D9ECF8 80241828 AE820070 */ sw $v0, 0x70($s4) -/* D9ECFC 8024182C 8E420000 */ lw $v0, ($s2) -/* D9ED00 80241830 3463FFFF */ ori $v1, $v1, 0xffff -/* D9ED04 80241834 00431024 */ and $v0, $v0, $v1 -/* D9ED08 80241838 AE420000 */ sw $v0, ($s2) -.L8024183C: -/* D9ED0C 8024183C 8E830070 */ lw $v1, 0x70($s4) -/* D9ED10 80241840 2C620064 */ sltiu $v0, $v1, 0x64 -/* D9ED14 80241844 10400036 */ beqz $v0, .L80241920_D9EDF0 -/* D9ED18 80241848 00031080 */ sll $v0, $v1, 2 -/* D9ED1C 8024184C 3C018024 */ lui $at, %hi(jtbl_80247A28_DA4EF8) -/* D9ED20 80241850 00220821 */ addu $at, $at, $v0 -/* D9ED24 80241854 8C227A28 */ lw $v0, %lo(jtbl_80247A28_DA4EF8)($at) -/* D9ED28 80241858 00400008 */ jr $v0 -/* D9ED2C 8024185C 00000000 */ nop -.L80241860_D9ED30: -/* D9ED30 80241860 0280202D */ daddu $a0, $s4, $zero -/* D9ED34 80241864 0260282D */ daddu $a1, $s3, $zero -/* D9ED38 80241868 0C0903B7 */ jal func_80240EDC_D9E3AC -/* D9ED3C 8024186C 02A0302D */ daddu $a2, $s5, $zero -.L80241870_D9ED40: -/* D9ED40 80241870 0280202D */ daddu $a0, $s4, $zero -/* D9ED44 80241874 0260282D */ daddu $a1, $s3, $zero -/* D9ED48 80241878 0C0903E4 */ jal func_80240F90_D9E460 -/* D9ED4C 8024187C 02A0302D */ daddu $a2, $s5, $zero -/* D9ED50 80241880 08090648 */ j .L80241920_D9EDF0 -/* D9ED54 80241884 00000000 */ nop -.L80241888_D9ED58: -/* D9ED58 80241888 0280202D */ daddu $a0, $s4, $zero -/* D9ED5C 8024188C 0260282D */ daddu $a1, $s3, $zero -/* D9ED60 80241890 0C09042C */ jal omo_02_NpcJumpFunc3 -/* D9ED64 80241894 02A0302D */ daddu $a2, $s5, $zero -.L80241898_D9ED68: -/* D9ED68 80241898 0280202D */ daddu $a0, $s4, $zero -/* D9ED6C 8024189C 0260282D */ daddu $a1, $s3, $zero -/* D9ED70 802418A0 0C090444 */ jal omo_02_NpcJumpFunc -/* D9ED74 802418A4 02A0302D */ daddu $a2, $s5, $zero -/* D9ED78 802418A8 08090648 */ j .L80241920_D9EDF0 -/* D9ED7C 802418AC 00000000 */ nop -.L802418B0_D9ED80: -/* D9ED80 802418B0 0280202D */ daddu $a0, $s4, $zero -/* D9ED84 802418B4 0260282D */ daddu $a1, $s3, $zero -/* D9ED88 802418B8 0C090462 */ jal omo_02_UnkNpcAIFunc13_2 -/* D9ED8C 802418BC 02A0302D */ daddu $a2, $s5, $zero -.L802418C0_D9ED90: -/* D9ED90 802418C0 0280202D */ daddu $a0, $s4, $zero -/* D9ED94 802418C4 0260282D */ daddu $a1, $s3, $zero -/* D9ED98 802418C8 0C0904AE */ jal omo_02_UnkNpcAIFunc11 -/* D9ED9C 802418CC 02A0302D */ daddu $a2, $s5, $zero -/* D9EDA0 802418D0 08090648 */ j .L80241920_D9EDF0 -/* D9EDA4 802418D4 00000000 */ nop -.L802418D8_D9EDA8: -/* D9EDA8 802418D8 0280202D */ daddu $a0, $s4, $zero -/* D9EDAC 802418DC 0260282D */ daddu $a1, $s3, $zero -/* D9EDB0 802418E0 0C0904F5 */ jal omo_02_UnkNpcAIFunc10 -/* D9EDB4 802418E4 02A0302D */ daddu $a2, $s5, $zero -/* D9EDB8 802418E8 08090648 */ j .L80241920_D9EDF0 -/* D9EDBC 802418EC 00000000 */ nop -.L802418F0_D9EDC0: -/* D9EDC0 802418F0 0280202D */ daddu $a0, $s4, $zero -/* D9EDC4 802418F4 0260282D */ daddu $a1, $s3, $zero -/* D9EDC8 802418F8 0C090507 */ jal func_8024141C_D9E8EC -/* D9EDCC 802418FC 02A0302D */ daddu $a2, $s5, $zero -.L80241900_D9EDD0: -/* D9EDD0 80241900 0280202D */ daddu $a0, $s4, $zero -/* D9EDD4 80241904 0260282D */ daddu $a1, $s3, $zero -/* D9EDD8 80241908 0C090532 */ jal func_802414C8_D9E998 -/* D9EDDC 8024190C 02A0302D */ daddu $a2, $s5, $zero -/* D9EDE0 80241910 08090648 */ j .L80241920_D9EDF0 -/* D9EDE4 80241914 00000000 */ nop -.L80241918_D9EDE8: -/* D9EDE8 80241918 0C0129CF */ jal func_8004A73C -/* D9EDEC 8024191C 0280202D */ daddu $a0, $s4, $zero -.L80241920_D9EDF0: -/* D9EDF0 80241920 8FBF0048 */ lw $ra, 0x48($sp) -/* D9EDF4 80241924 8FB50044 */ lw $s5, 0x44($sp) -/* D9EDF8 80241928 8FB40040 */ lw $s4, 0x40($sp) -/* D9EDFC 8024192C 8FB3003C */ lw $s3, 0x3c($sp) -/* D9EE00 80241930 8FB20038 */ lw $s2, 0x38($sp) -/* D9EE04 80241934 8FB10034 */ lw $s1, 0x34($sp) -/* D9EE08 80241938 8FB00030 */ lw $s0, 0x30($sp) -/* D9EE0C 8024193C 0000102D */ daddu $v0, $zero, $zero -/* D9EE10 80241940 03E00008 */ jr $ra -/* D9EE14 80241944 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240370_93F920.s b/ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240370_93F920.s deleted file mode 100644 index 63bc599f66..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240370_93F920.s +++ /dev/null @@ -1,59 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_802448A0_943E50 -.double 32767.0 - -.section .text - -glabel func_80240370_93F920 -/* 93F920 80240370 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 93F924 80240374 AFB00010 */ sw $s0, 0x10($sp) -/* 93F928 80240378 0080802D */ daddu $s0, $a0, $zero -/* 93F92C 8024037C AFBF001C */ sw $ra, 0x1c($sp) -/* 93F930 80240380 AFB20018 */ sw $s2, 0x18($sp) -/* 93F934 80240384 AFB10014 */ sw $s1, 0x14($sp) -/* 93F938 80240388 8E110148 */ lw $s1, 0x148($s0) -/* 93F93C 8024038C 86240008 */ lh $a0, 8($s1) -/* 93F940 80240390 0C00EABB */ jal get_npc_unsafe -/* 93F944 80240394 00A0902D */ daddu $s2, $a1, $zero -/* 93F948 80240398 8E2300CC */ lw $v1, 0xcc($s1) -/* 93F94C 8024039C 0040202D */ daddu $a0, $v0, $zero -/* 93F950 802403A0 8C630000 */ lw $v1, ($v1) -/* 93F954 802403A4 24020001 */ addiu $v0, $zero, 1 -/* 93F958 802403A8 AC830028 */ sw $v1, 0x28($a0) -/* 93F95C 802403AC AE020070 */ sw $v0, 0x70($s0) -/* 93F960 802403B0 8E220000 */ lw $v0, ($s1) -/* 93F964 802403B4 3C030010 */ lui $v1, 0x10 -/* 93F968 802403B8 00431024 */ and $v0, $v0, $v1 -/* 93F96C 802403BC 10400004 */ beqz $v0, .L802403D0 -/* 93F970 802403C0 00000000 */ nop -/* 93F974 802403C4 C620006C */ lwc1 $f0, 0x6c($s1) -/* 93F978 802403C8 46800020 */ cvt.s.w $f0, $f0 -/* 93F97C 802403CC E480000C */ swc1 $f0, 0xc($a0) -.L802403D0: -/* 93F980 802403D0 8E2200D0 */ lw $v0, 0xd0($s1) -/* 93F984 802403D4 8C420014 */ lw $v0, 0x14($v0) -/* 93F988 802403D8 1C400004 */ bgtz $v0, .L802403EC -/* 93F98C 802403DC 00000000 */ nop -/* 93F990 802403E0 C640000C */ lwc1 $f0, 0xc($s2) -/* 93F994 802403E4 08090103 */ j .L8024040C -/* 93F998 802403E8 E4800018 */ swc1 $f0, 0x18($a0) -.L802403EC: -/* 93F99C 802403EC 3C018024 */ lui $at, %hi(D_802448A0_943E50) -/* 93F9A0 802403F0 D42248A0 */ ldc1 $f2, %lo(D_802448A0_943E50)($at) -/* 93F9A4 802403F4 44820000 */ mtc1 $v0, $f0 -/* 93F9A8 802403F8 00000000 */ nop -/* 93F9AC 802403FC 46800021 */ cvt.d.w $f0, $f0 -/* 93F9B0 80240400 46220003 */ div.d $f0, $f0, $f2 -/* 93F9B4 80240404 46200020 */ cvt.s.d $f0, $f0 -/* 93F9B8 80240408 E4800018 */ swc1 $f0, 0x18($a0) -.L8024040C: -/* 93F9BC 8024040C 8FBF001C */ lw $ra, 0x1c($sp) -/* 93F9C0 80240410 8FB20018 */ lw $s2, 0x18($sp) -/* 93F9C4 80240414 8FB10014 */ lw $s1, 0x14($sp) -/* 93F9C8 80240418 8FB00010 */ lw $s0, 0x10($sp) -/* 93F9CC 8024041C 03E00008 */ jr $ra -/* 93F9D0 80240420 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240424_93F9D4.s b/ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240424_93F9D4.s deleted file mode 100644 index 5a6cc0b43c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240424_93F9D4.s +++ /dev/null @@ -1,78 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240424_93F9D4 -/* 93F9D4 80240424 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 93F9D8 80240428 AFB40040 */ sw $s4, 0x40($sp) -/* 93F9DC 8024042C 0080A02D */ daddu $s4, $a0, $zero -/* 93F9E0 80240430 AFBF0044 */ sw $ra, 0x44($sp) -/* 93F9E4 80240434 AFB3003C */ sw $s3, 0x3c($sp) -/* 93F9E8 80240438 AFB20038 */ sw $s2, 0x38($sp) -/* 93F9EC 8024043C AFB10034 */ sw $s1, 0x34($sp) -/* 93F9F0 80240440 AFB00030 */ sw $s0, 0x30($sp) -/* 93F9F4 80240444 8E920148 */ lw $s2, 0x148($s4) -/* 93F9F8 80240448 00A0802D */ daddu $s0, $a1, $zero -/* 93F9FC 8024044C 86440008 */ lh $a0, 8($s2) -/* 93FA00 80240450 0C00EABB */ jal get_npc_unsafe -/* 93FA04 80240454 00C0982D */ daddu $s3, $a2, $zero -/* 93FA08 80240458 8E030008 */ lw $v1, 8($s0) -/* 93FA0C 8024045C 04600031 */ bltz $v1, .L80240524 -/* 93FA10 80240460 0040882D */ daddu $s1, $v0, $zero -/* 93FA14 80240464 0260202D */ daddu $a0, $s3, $zero -/* 93FA18 80240468 AFA00010 */ sw $zero, 0x10($sp) -/* 93FA1C 8024046C 8E060018 */ lw $a2, 0x18($s0) -/* 93FA20 80240470 8E07001C */ lw $a3, 0x1c($s0) -/* 93FA24 80240474 0C01242D */ jal func_800490B4 -/* 93FA28 80240478 0240282D */ daddu $a1, $s2, $zero -/* 93FA2C 8024047C 10400029 */ beqz $v0, .L80240524 -/* 93FA30 80240480 0000202D */ daddu $a0, $zero, $zero -/* 93FA34 80240484 0220282D */ daddu $a1, $s1, $zero -/* 93FA38 80240488 0000302D */ daddu $a2, $zero, $zero -/* 93FA3C 8024048C 862300A8 */ lh $v1, 0xa8($s1) -/* 93FA40 80240490 3C013F80 */ lui $at, 0x3f80 -/* 93FA44 80240494 44810000 */ mtc1 $at, $f0 -/* 93FA48 80240498 3C014000 */ lui $at, 0x4000 -/* 93FA4C 8024049C 44811000 */ mtc1 $at, $f2 -/* 93FA50 802404A0 3C01C1A0 */ lui $at, 0xc1a0 -/* 93FA54 802404A4 44812000 */ mtc1 $at, $f4 -/* 93FA58 802404A8 2402000F */ addiu $v0, $zero, 0xf -/* 93FA5C 802404AC AFA2001C */ sw $v0, 0x1c($sp) -/* 93FA60 802404B0 44833000 */ mtc1 $v1, $f6 -/* 93FA64 802404B4 00000000 */ nop -/* 93FA68 802404B8 468031A0 */ cvt.s.w $f6, $f6 -/* 93FA6C 802404BC 44073000 */ mfc1 $a3, $f6 -/* 93FA70 802404C0 27A20028 */ addiu $v0, $sp, 0x28 -/* 93FA74 802404C4 AFA20020 */ sw $v0, 0x20($sp) -/* 93FA78 802404C8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 93FA7C 802404CC E7A20014 */ swc1 $f2, 0x14($sp) -/* 93FA80 802404D0 0C01BFA4 */ jal fx_emote -/* 93FA84 802404D4 E7A40018 */ swc1 $f4, 0x18($sp) -/* 93FA88 802404D8 0220202D */ daddu $a0, $s1, $zero -/* 93FA8C 802404DC 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 93FA90 802404E0 0C012530 */ jal ai_enemy_play_sound -/* 93FA94 802404E4 3C060020 */ lui $a2, 0x20 -/* 93FA98 802404E8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 93FA9C 802404EC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 93FAA0 802404F0 C62C0038 */ lwc1 $f12, 0x38($s1) -/* 93FAA4 802404F4 C62E0040 */ lwc1 $f14, 0x40($s1) -/* 93FAA8 802404F8 8C460028 */ lw $a2, 0x28($v0) -/* 93FAAC 802404FC 0C00A720 */ jal atan2 -/* 93FAB0 80240500 8C470030 */ lw $a3, 0x30($v0) -/* 93FAB4 80240504 E620000C */ swc1 $f0, 0xc($s1) -/* 93FAB8 80240508 8E420018 */ lw $v0, 0x18($s2) -/* 93FABC 8024050C 9442002A */ lhu $v0, 0x2a($v0) -/* 93FAC0 80240510 30420001 */ andi $v0, $v0, 1 -/* 93FAC4 80240514 14400002 */ bnez $v0, .L80240520 -/* 93FAC8 80240518 2402000A */ addiu $v0, $zero, 0xa -/* 93FACC 8024051C 2402000C */ addiu $v0, $zero, 0xc -.L80240520: -/* 93FAD0 80240520 AE820070 */ sw $v0, 0x70($s4) -.L80240524: -/* 93FAD4 80240524 8FBF0044 */ lw $ra, 0x44($sp) -/* 93FAD8 80240528 8FB40040 */ lw $s4, 0x40($sp) -/* 93FADC 8024052C 8FB3003C */ lw $s3, 0x3c($sp) -/* 93FAE0 80240530 8FB20038 */ lw $s2, 0x38($sp) -/* 93FAE4 80240534 8FB10034 */ lw $s1, 0x34($sp) -/* 93FAE8 80240538 8FB00030 */ lw $s0, 0x30($sp) -/* 93FAEC 8024053C 03E00008 */ jr $ra -/* 93FAF0 80240540 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_802408B0_93FE60.s b/ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_802408B0_93FE60.s deleted file mode 100644 index 18bbd8a925..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_802408B0_93FE60.s +++ /dev/null @@ -1,59 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_802448A8_943E58 -.double 0.3 - -dlabel D_802448B0_943E60 -.double 32767.0 - -.section .text - -glabel func_802408B0_93FE60 -/* 93FE60 802408B0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 93FE64 802408B4 AFB10014 */ sw $s1, 0x14($sp) -/* 93FE68 802408B8 0080882D */ daddu $s1, $a0, $zero -/* 93FE6C 802408BC AFBF001C */ sw $ra, 0x1c($sp) -/* 93FE70 802408C0 AFB20018 */ sw $s2, 0x18($sp) -/* 93FE74 802408C4 AFB00010 */ sw $s0, 0x10($sp) -/* 93FE78 802408C8 8E300148 */ lw $s0, 0x148($s1) -/* 93FE7C 802408CC 86040008 */ lh $a0, 8($s0) -/* 93FE80 802408D0 0C00EABB */ jal get_npc_unsafe -/* 93FE84 802408D4 00A0902D */ daddu $s2, $a1, $zero -/* 93FE88 802408D8 8E0300CC */ lw $v1, 0xcc($s0) -/* 93FE8C 802408DC 8C630004 */ lw $v1, 4($v1) -/* 93FE90 802408E0 0040202D */ daddu $a0, $v0, $zero -/* 93FE94 802408E4 AC830028 */ sw $v1, 0x28($a0) -/* 93FE98 802408E8 8E0200D0 */ lw $v0, 0xd0($s0) -/* 93FE9C 802408EC 8C420014 */ lw $v0, 0x14($v0) -/* 93FEA0 802408F0 04410009 */ bgez $v0, .L80240918 -/* 93FEA4 802408F4 00000000 */ nop -/* 93FEA8 802408F8 C640000C */ lwc1 $f0, 0xc($s2) -/* 93FEAC 802408FC 3C018024 */ lui $at, %hi(D_802448A8_943E58) -/* 93FEB0 80240900 D42248A8 */ ldc1 $f2, %lo(D_802448A8_943E58)($at) -/* 93FEB4 80240904 46000021 */ cvt.d.s $f0, $f0 -/* 93FEB8 80240908 46220002 */ mul.d $f0, $f0, $f2 -/* 93FEBC 8024090C 00000000 */ nop -/* 93FEC0 80240910 0809024D */ j .L80240934 -/* 93FEC4 80240914 46200020 */ cvt.s.d $f0, $f0 -.L80240918: -/* 93FEC8 80240918 3C018024 */ lui $at, %hi(D_802448B0_943E60) -/* 93FECC 8024091C D42248B0 */ ldc1 $f2, %lo(D_802448B0_943E60)($at) -/* 93FED0 80240920 44820000 */ mtc1 $v0, $f0 -/* 93FED4 80240924 00000000 */ nop -/* 93FED8 80240928 46800021 */ cvt.d.w $f0, $f0 -/* 93FEDC 8024092C 46220003 */ div.d $f0, $f0, $f2 -/* 93FEE0 80240930 46200020 */ cvt.s.d $f0, $f0 -.L80240934: -/* 93FEE4 80240934 E4800018 */ swc1 $f0, 0x18($a0) -/* 93FEE8 80240938 24020010 */ addiu $v0, $zero, 0x10 -/* 93FEEC 8024093C AE200074 */ sw $zero, 0x74($s1) -/* 93FEF0 80240940 AE220070 */ sw $v0, 0x70($s1) -/* 93FEF4 80240944 8FBF001C */ lw $ra, 0x1c($sp) -/* 93FEF8 80240948 8FB20018 */ lw $s2, 0x18($sp) -/* 93FEFC 8024094C 8FB10014 */ lw $s1, 0x14($sp) -/* 93FF00 80240950 8FB00010 */ lw $s0, 0x10($sp) -/* 93FF04 80240954 03E00008 */ jr $ra -/* 93FF08 80240958 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_8024095C_93FF0C.s b/ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_8024095C_93FF0C.s deleted file mode 100644 index fc1686983c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_8024095C_93FF0C.s +++ /dev/null @@ -1,140 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024095C_93FF0C -/* 93FF0C 8024095C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 93FF10 80240960 AFB3003C */ sw $s3, 0x3c($sp) -/* 93FF14 80240964 0080982D */ daddu $s3, $a0, $zero -/* 93FF18 80240968 AFBF0044 */ sw $ra, 0x44($sp) -/* 93FF1C 8024096C AFB40040 */ sw $s4, 0x40($sp) -/* 93FF20 80240970 AFB20038 */ sw $s2, 0x38($sp) -/* 93FF24 80240974 AFB10034 */ sw $s1, 0x34($sp) -/* 93FF28 80240978 AFB00030 */ sw $s0, 0x30($sp) -/* 93FF2C 8024097C 8E710148 */ lw $s1, 0x148($s3) -/* 93FF30 80240980 00A0902D */ daddu $s2, $a1, $zero -/* 93FF34 80240984 86240008 */ lh $a0, 8($s1) -/* 93FF38 80240988 0C00EABB */ jal get_npc_unsafe -/* 93FF3C 8024098C 00C0A02D */ daddu $s4, $a2, $zero -/* 93FF40 80240990 8E430008 */ lw $v1, 8($s2) -/* 93FF44 80240994 0460003B */ bltz $v1, .L80240A84 -/* 93FF48 80240998 0040802D */ daddu $s0, $v0, $zero -/* 93FF4C 8024099C 8E620074 */ lw $v0, 0x74($s3) -/* 93FF50 802409A0 1C400037 */ bgtz $v0, .L80240A80 -/* 93FF54 802409A4 2442FFFF */ addiu $v0, $v0, -1 -/* 93FF58 802409A8 0280202D */ daddu $a0, $s4, $zero -/* 93FF5C 802409AC AE630074 */ sw $v1, 0x74($s3) -/* 93FF60 802409B0 AFA00010 */ sw $zero, 0x10($sp) -/* 93FF64 802409B4 8E460018 */ lw $a2, 0x18($s2) -/* 93FF68 802409B8 8E47001C */ lw $a3, 0x1c($s2) -/* 93FF6C 802409BC 0C01242D */ jal func_800490B4 -/* 93FF70 802409C0 0220282D */ daddu $a1, $s1, $zero -/* 93FF74 802409C4 1040002C */ beqz $v0, .L80240A78 -/* 93FF78 802409C8 0000202D */ daddu $a0, $zero, $zero -/* 93FF7C 802409CC 0200282D */ daddu $a1, $s0, $zero -/* 93FF80 802409D0 0000302D */ daddu $a2, $zero, $zero -/* 93FF84 802409D4 860300A8 */ lh $v1, 0xa8($s0) -/* 93FF88 802409D8 3C013F80 */ lui $at, 0x3f80 -/* 93FF8C 802409DC 44810000 */ mtc1 $at, $f0 -/* 93FF90 802409E0 3C014000 */ lui $at, 0x4000 -/* 93FF94 802409E4 44811000 */ mtc1 $at, $f2 -/* 93FF98 802409E8 3C01C1A0 */ lui $at, 0xc1a0 -/* 93FF9C 802409EC 44812000 */ mtc1 $at, $f4 -/* 93FFA0 802409F0 2402000F */ addiu $v0, $zero, 0xf -/* 93FFA4 802409F4 AFA2001C */ sw $v0, 0x1c($sp) -/* 93FFA8 802409F8 44833000 */ mtc1 $v1, $f6 -/* 93FFAC 802409FC 00000000 */ nop -/* 93FFB0 80240A00 468031A0 */ cvt.s.w $f6, $f6 -/* 93FFB4 80240A04 44073000 */ mfc1 $a3, $f6 -/* 93FFB8 80240A08 27A20028 */ addiu $v0, $sp, 0x28 -/* 93FFBC 80240A0C AFA20020 */ sw $v0, 0x20($sp) -/* 93FFC0 80240A10 E7A00010 */ swc1 $f0, 0x10($sp) -/* 93FFC4 80240A14 E7A20014 */ swc1 $f2, 0x14($sp) -/* 93FFC8 80240A18 0C01BFA4 */ jal fx_emote -/* 93FFCC 80240A1C E7A40018 */ swc1 $f4, 0x18($sp) -/* 93FFD0 80240A20 0200202D */ daddu $a0, $s0, $zero -/* 93FFD4 80240A24 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 93FFD8 80240A28 0C012530 */ jal ai_enemy_play_sound -/* 93FFDC 80240A2C 3C060020 */ lui $a2, 0x20 -/* 93FFE0 80240A30 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 93FFE4 80240A34 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 93FFE8 80240A38 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 93FFEC 80240A3C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 93FFF0 80240A40 8C460028 */ lw $a2, 0x28($v0) -/* 93FFF4 80240A44 0C00A720 */ jal atan2 -/* 93FFF8 80240A48 8C470030 */ lw $a3, 0x30($v0) -/* 93FFFC 80240A4C E600000C */ swc1 $f0, 0xc($s0) -/* 940000 80240A50 8E220018 */ lw $v0, 0x18($s1) -/* 940004 80240A54 9442002A */ lhu $v0, 0x2a($v0) -/* 940008 80240A58 30420001 */ andi $v0, $v0, 1 -/* 94000C 80240A5C 10400003 */ beqz $v0, .L80240A6C -/* 940010 80240A60 2402000A */ addiu $v0, $zero, 0xa -/* 940014 80240A64 080902D1 */ j .L80240B44 -/* 940018 80240A68 AE620070 */ sw $v0, 0x70($s3) -.L80240A6C: -/* 94001C 80240A6C 2402000C */ addiu $v0, $zero, 0xc -/* 940020 80240A70 080902D1 */ j .L80240B44 -/* 940024 80240A74 AE620070 */ sw $v0, 0x70($s3) -.L80240A78: -/* 940028 80240A78 8E620074 */ lw $v0, 0x74($s3) -/* 94002C 80240A7C 2442FFFF */ addiu $v0, $v0, -1 -.L80240A80: -/* 940030 80240A80 AE620074 */ sw $v0, 0x74($s3) -.L80240A84: -/* 940034 80240A84 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 940038 80240A88 8E2200D0 */ lw $v0, 0xd0($s1) -/* 94003C 80240A8C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 940040 80240A90 C4460000 */ lwc1 $f6, ($v0) -/* 940044 80240A94 468031A0 */ cvt.s.w $f6, $f6 -/* 940048 80240A98 44063000 */ mfc1 $a2, $f6 -/* 94004C 80240A9C C4460008 */ lwc1 $f6, 8($v0) -/* 940050 80240AA0 468031A0 */ cvt.s.w $f6, $f6 -/* 940054 80240AA4 44073000 */ mfc1 $a3, $f6 -/* 940058 80240AA8 0C00A7B5 */ jal dist2D -/* 94005C 80240AAC 00000000 */ nop -/* 940060 80240AB0 C6020018 */ lwc1 $f2, 0x18($s0) -/* 940064 80240AB4 4602003C */ c.lt.s $f0, $f2 -/* 940068 80240AB8 00000000 */ nop -/* 94006C 80240ABC 4500000E */ bc1f .L80240AF8 -/* 940070 80240AC0 00000000 */ nop -/* 940074 80240AC4 8E2200D0 */ lw $v0, 0xd0($s1) -/* 940078 80240AC8 C4400000 */ lwc1 $f0, ($v0) -/* 94007C 80240ACC 46800020 */ cvt.s.w $f0, $f0 -/* 940080 80240AD0 E6000038 */ swc1 $f0, 0x38($s0) -/* 940084 80240AD4 8E2200D0 */ lw $v0, 0xd0($s1) -/* 940088 80240AD8 C4400008 */ lwc1 $f0, 8($v0) -/* 94008C 80240ADC 46800020 */ cvt.s.w $f0, $f0 -/* 940090 80240AE0 E6000040 */ swc1 $f0, 0x40($s0) -/* 940094 80240AE4 8E2200D0 */ lw $v0, 0xd0($s1) -/* 940098 80240AE8 C440000C */ lwc1 $f0, 0xc($v0) -/* 94009C 80240AEC 46800020 */ cvt.s.w $f0, $f0 -/* 9400A0 80240AF0 E600000C */ swc1 $f0, 0xc($s0) -/* 9400A4 80240AF4 AE600070 */ sw $zero, 0x70($s3) -.L80240AF8: -/* 9400A8 80240AF8 8602008C */ lh $v0, 0x8c($s0) -/* 9400AC 80240AFC 14400011 */ bnez $v0, .L80240B44 -/* 9400B0 80240B00 00000000 */ nop -/* 9400B4 80240B04 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9400B8 80240B08 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9400BC 80240B0C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9400C0 80240B10 C4460000 */ lwc1 $f6, ($v0) -/* 9400C4 80240B14 468031A0 */ cvt.s.w $f6, $f6 -/* 9400C8 80240B18 44063000 */ mfc1 $a2, $f6 -/* 9400CC 80240B1C C4460008 */ lwc1 $f6, 8($v0) -/* 9400D0 80240B20 468031A0 */ cvt.s.w $f6, $f6 -/* 9400D4 80240B24 44073000 */ mfc1 $a3, $f6 -/* 9400D8 80240B28 0C00A720 */ jal atan2 -/* 9400DC 80240B2C 00000000 */ nop -/* 9400E0 80240B30 8E050018 */ lw $a1, 0x18($s0) -/* 9400E4 80240B34 44060000 */ mfc1 $a2, $f0 -/* 9400E8 80240B38 0200202D */ daddu $a0, $s0, $zero -/* 9400EC 80240B3C 0C00EA95 */ jal npc_move_heading -/* 9400F0 80240B40 AC86000C */ sw $a2, 0xc($a0) -.L80240B44: -/* 9400F4 80240B44 8FBF0044 */ lw $ra, 0x44($sp) -/* 9400F8 80240B48 8FB40040 */ lw $s4, 0x40($sp) -/* 9400FC 80240B4C 8FB3003C */ lw $s3, 0x3c($sp) -/* 940100 80240B50 8FB20038 */ lw $s2, 0x38($sp) -/* 940104 80240B54 8FB10034 */ lw $s1, 0x34($sp) -/* 940108 80240B58 8FB00030 */ lw $s0, 0x30($sp) -/* 94010C 80240B5C 03E00008 */ jr $ra -/* 940110 80240B60 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240B64_940114.s b/ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240B64_940114.s deleted file mode 100644 index aa0b56b556..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240B64_940114.s +++ /dev/null @@ -1,185 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_802448B8_943E68 -.word .L80240CF4_9402A4, .L80240D04_9402B4, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240D1C_9402CC, .L80240D2C_9402DC, .L80240D44_9402F4, .L80240D54_940304, .L80240D6C_94031C, .L80240D84_940334, .L80240D94_940344, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DB4_940364, .L80240DAC_94035C, 0, 0 - -.section .text - -glabel func_80240B64_940114 -/* 940114 80240B64 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 940118 80240B68 AFB40040 */ sw $s4, 0x40($sp) -/* 94011C 80240B6C 0080A02D */ daddu $s4, $a0, $zero -/* 940120 80240B70 AFBF0048 */ sw $ra, 0x48($sp) -/* 940124 80240B74 AFB50044 */ sw $s5, 0x44($sp) -/* 940128 80240B78 AFB3003C */ sw $s3, 0x3c($sp) -/* 94012C 80240B7C AFB20038 */ sw $s2, 0x38($sp) -/* 940130 80240B80 AFB10034 */ sw $s1, 0x34($sp) -/* 940134 80240B84 AFB00030 */ sw $s0, 0x30($sp) -/* 940138 80240B88 8E920148 */ lw $s2, 0x148($s4) -/* 94013C 80240B8C 86440008 */ lh $a0, 8($s2) -/* 940140 80240B90 8E90000C */ lw $s0, 0xc($s4) -/* 940144 80240B94 0C00EABB */ jal get_npc_unsafe -/* 940148 80240B98 00A0882D */ daddu $s1, $a1, $zero -/* 94014C 80240B9C 0280202D */ daddu $a0, $s4, $zero -/* 940150 80240BA0 8E050000 */ lw $a1, ($s0) -/* 940154 80240BA4 0C0B1EAF */ jal evt_get_variable -/* 940158 80240BA8 0040802D */ daddu $s0, $v0, $zero -/* 94015C 80240BAC AFA00010 */ sw $zero, 0x10($sp) -/* 940160 80240BB0 8E4300D0 */ lw $v1, 0xd0($s2) -/* 940164 80240BB4 8C630030 */ lw $v1, 0x30($v1) -/* 940168 80240BB8 AFA30014 */ sw $v1, 0x14($sp) -/* 94016C 80240BBC 8E4300D0 */ lw $v1, 0xd0($s2) -/* 940170 80240BC0 8C63001C */ lw $v1, 0x1c($v1) -/* 940174 80240BC4 AFA30018 */ sw $v1, 0x18($sp) -/* 940178 80240BC8 8E4300D0 */ lw $v1, 0xd0($s2) -/* 94017C 80240BCC 8C630024 */ lw $v1, 0x24($v1) -/* 940180 80240BD0 AFA3001C */ sw $v1, 0x1c($sp) -/* 940184 80240BD4 8E4300D0 */ lw $v1, 0xd0($s2) -/* 940188 80240BD8 8C630028 */ lw $v1, 0x28($v1) -/* 94018C 80240BDC 27B50010 */ addiu $s5, $sp, 0x10 -/* 940190 80240BE0 AFA30020 */ sw $v1, 0x20($sp) -/* 940194 80240BE4 8E4300D0 */ lw $v1, 0xd0($s2) -/* 940198 80240BE8 3C014282 */ lui $at, 0x4282 -/* 94019C 80240BEC 44810000 */ mtc1 $at, $f0 -/* 9401A0 80240BF0 8C63002C */ lw $v1, 0x2c($v1) -/* 9401A4 80240BF4 0040982D */ daddu $s3, $v0, $zero -/* 9401A8 80240BF8 E7A00028 */ swc1 $f0, 0x28($sp) -/* 9401AC 80240BFC A7A0002C */ sh $zero, 0x2c($sp) -/* 9401B0 80240C00 16200005 */ bnez $s1, .L80240C18 -/* 9401B4 80240C04 AFA30024 */ sw $v1, 0x24($sp) -/* 9401B8 80240C08 8E4200B0 */ lw $v0, 0xb0($s2) -/* 9401BC 80240C0C 30420004 */ andi $v0, $v0, 4 -/* 9401C0 80240C10 1040002F */ beqz $v0, .L80240CD0 -/* 9401C4 80240C14 00000000 */ nop -.L80240C18: -/* 9401C8 80240C18 AE800070 */ sw $zero, 0x70($s4) -/* 9401CC 80240C1C C600000C */ lwc1 $f0, 0xc($s0) -/* 9401D0 80240C20 A600008E */ sh $zero, 0x8e($s0) -/* 9401D4 80240C24 8E4200CC */ lw $v0, 0xcc($s2) -/* 9401D8 80240C28 4600008D */ trunc.w.s $f2, $f0 -/* 9401DC 80240C2C E642006C */ swc1 $f2, 0x6c($s2) -/* 9401E0 80240C30 8C420000 */ lw $v0, ($v0) -/* 9401E4 80240C34 8E030000 */ lw $v1, ($s0) -/* 9401E8 80240C38 AE020028 */ sw $v0, 0x28($s0) -/* 9401EC 80240C3C 2402F7FF */ addiu $v0, $zero, -0x801 -/* 9401F0 80240C40 00621824 */ and $v1, $v1, $v0 -/* 9401F4 80240C44 AE030000 */ sw $v1, ($s0) -/* 9401F8 80240C48 8E4200D0 */ lw $v0, 0xd0($s2) -/* 9401FC 80240C4C 8C420034 */ lw $v0, 0x34($v0) -/* 940200 80240C50 54400005 */ bnel $v0, $zero, .L80240C68 -/* 940204 80240C54 2402FDFF */ addiu $v0, $zero, -0x201 -/* 940208 80240C58 34620200 */ ori $v0, $v1, 0x200 -/* 94020C 80240C5C 2403FFF7 */ addiu $v1, $zero, -9 -/* 940210 80240C60 0809031C */ j .L80240C70 -/* 940214 80240C64 00431024 */ and $v0, $v0, $v1 -.L80240C68: -/* 940218 80240C68 00621024 */ and $v0, $v1, $v0 -/* 94021C 80240C6C 34420008 */ ori $v0, $v0, 8 -.L80240C70: -/* 940220 80240C70 AE020000 */ sw $v0, ($s0) -/* 940224 80240C74 8E4200B0 */ lw $v0, 0xb0($s2) -/* 940228 80240C78 30420004 */ andi $v0, $v0, 4 -/* 94022C 80240C7C 10400009 */ beqz $v0, .L80240CA4 -/* 940230 80240C80 24020063 */ addiu $v0, $zero, 0x63 -/* 940234 80240C84 AE820070 */ sw $v0, 0x70($s4) -/* 940238 80240C88 2402000F */ addiu $v0, $zero, 0xf -/* 94023C 80240C8C AE820074 */ sw $v0, 0x74($s4) -/* 940240 80240C90 8E4200B0 */ lw $v0, 0xb0($s2) -/* 940244 80240C94 2403FFFB */ addiu $v1, $zero, -5 -/* 940248 80240C98 00431024 */ and $v0, $v0, $v1 -/* 94024C 80240C9C 08090334 */ j .L80240CD0 -/* 940250 80240CA0 AE4200B0 */ sw $v0, 0xb0($s2) -.L80240CA4: -/* 940254 80240CA4 8E420000 */ lw $v0, ($s2) -/* 940258 80240CA8 3C034000 */ lui $v1, 0x4000 -/* 94025C 80240CAC 00431024 */ and $v0, $v0, $v1 -/* 940260 80240CB0 10400007 */ beqz $v0, .L80240CD0 -/* 940264 80240CB4 3C03BFFF */ lui $v1, 0xbfff -/* 940268 80240CB8 2402000C */ addiu $v0, $zero, 0xc -/* 94026C 80240CBC AE820070 */ sw $v0, 0x70($s4) -/* 940270 80240CC0 8E420000 */ lw $v0, ($s2) -/* 940274 80240CC4 3463FFFF */ ori $v1, $v1, 0xffff -/* 940278 80240CC8 00431024 */ and $v0, $v0, $v1 -/* 94027C 80240CCC AE420000 */ sw $v0, ($s2) -.L80240CD0: -/* 940280 80240CD0 8E830070 */ lw $v1, 0x70($s4) -/* 940284 80240CD4 2C620064 */ sltiu $v0, $v1, 0x64 -/* 940288 80240CD8 10400036 */ beqz $v0, .L80240DB4_940364 -/* 94028C 80240CDC 00031080 */ sll $v0, $v1, 2 -/* 940290 80240CE0 3C018024 */ lui $at, %hi(jtbl_802448B8_943E68) -/* 940294 80240CE4 00220821 */ addu $at, $at, $v0 -/* 940298 80240CE8 8C2248B8 */ lw $v0, %lo(jtbl_802448B8_943E68)($at) -/* 94029C 80240CEC 00400008 */ jr $v0 -/* 9402A0 80240CF0 00000000 */ nop -.L80240CF4_9402A4: -/* 9402A4 80240CF4 0280202D */ daddu $a0, $s4, $zero -/* 9402A8 80240CF8 0260282D */ daddu $a1, $s3, $zero -/* 9402AC 80240CFC 0C0900DC */ jal func_80240370_93F920 -/* 9402B0 80240D00 02A0302D */ daddu $a2, $s5, $zero -.L80240D04_9402B4: -/* 9402B4 80240D04 0280202D */ daddu $a0, $s4, $zero -/* 9402B8 80240D08 0260282D */ daddu $a1, $s3, $zero -/* 9402BC 80240D0C 0C090109 */ jal func_80240424_93F9D4 -/* 9402C0 80240D10 02A0302D */ daddu $a2, $s5, $zero -/* 9402C4 80240D14 0809036D */ j .L80240DB4_940364 -/* 9402C8 80240D18 00000000 */ nop -.L80240D1C_9402CC: -/* 9402CC 80240D1C 0280202D */ daddu $a0, $s4, $zero -/* 9402D0 80240D20 0260282D */ daddu $a1, $s3, $zero -/* 9402D4 80240D24 0C090151 */ jal sbk_30_NpcJumpFunc3 -/* 9402D8 80240D28 02A0302D */ daddu $a2, $s5, $zero -.L80240D2C_9402DC: -/* 9402DC 80240D2C 0280202D */ daddu $a0, $s4, $zero -/* 9402E0 80240D30 0260282D */ daddu $a1, $s3, $zero -/* 9402E4 80240D34 0C090169 */ jal sbk_30_NpcJumpFunc -/* 9402E8 80240D38 02A0302D */ daddu $a2, $s5, $zero -/* 9402EC 80240D3C 0809036D */ j .L80240DB4_940364 -/* 9402F0 80240D40 00000000 */ nop -.L80240D44_9402F4: -/* 9402F4 80240D44 0280202D */ daddu $a0, $s4, $zero -/* 9402F8 80240D48 0260282D */ daddu $a1, $s3, $zero -/* 9402FC 80240D4C 0C090187 */ jal sbk_30_UnkNpcAIFunc13_2 -/* 940300 80240D50 02A0302D */ daddu $a2, $s5, $zero -.L80240D54_940304: -/* 940304 80240D54 0280202D */ daddu $a0, $s4, $zero -/* 940308 80240D58 0260282D */ daddu $a1, $s3, $zero -/* 94030C 80240D5C 0C0901D3 */ jal sbk_30_UnkNpcAIFunc11 -/* 940310 80240D60 02A0302D */ daddu $a2, $s5, $zero -/* 940314 80240D64 0809036D */ j .L80240DB4_940364 -/* 940318 80240D68 00000000 */ nop -.L80240D6C_94031C: -/* 94031C 80240D6C 0280202D */ daddu $a0, $s4, $zero -/* 940320 80240D70 0260282D */ daddu $a1, $s3, $zero -/* 940324 80240D74 0C09021A */ jal sbk_30_UnkNpcAIFunc10 -/* 940328 80240D78 02A0302D */ daddu $a2, $s5, $zero -/* 94032C 80240D7C 0809036D */ j .L80240DB4_940364 -/* 940330 80240D80 00000000 */ nop -.L80240D84_940334: -/* 940334 80240D84 0280202D */ daddu $a0, $s4, $zero -/* 940338 80240D88 0260282D */ daddu $a1, $s3, $zero -/* 94033C 80240D8C 0C09022C */ jal func_802408B0_93FE60 -/* 940340 80240D90 02A0302D */ daddu $a2, $s5, $zero -.L80240D94_940344: -/* 940344 80240D94 0280202D */ daddu $a0, $s4, $zero -/* 940348 80240D98 0260282D */ daddu $a1, $s3, $zero -/* 94034C 80240D9C 0C090257 */ jal func_8024095C_93FF0C -/* 940350 80240DA0 02A0302D */ daddu $a2, $s5, $zero -/* 940354 80240DA4 0809036D */ j .L80240DB4_940364 -/* 940358 80240DA8 00000000 */ nop -.L80240DAC_94035C: -/* 94035C 80240DAC 0C0129CF */ jal func_8004A73C -/* 940360 80240DB0 0280202D */ daddu $a0, $s4, $zero -.L80240DB4_940364: -/* 940364 80240DB4 8FBF0048 */ lw $ra, 0x48($sp) -/* 940368 80240DB8 8FB50044 */ lw $s5, 0x44($sp) -/* 94036C 80240DBC 8FB40040 */ lw $s4, 0x40($sp) -/* 940370 80240DC0 8FB3003C */ lw $s3, 0x3c($sp) -/* 940374 80240DC4 8FB20038 */ lw $s2, 0x38($sp) -/* 940378 80240DC8 8FB10034 */ lw $s1, 0x34($sp) -/* 94037C 80240DCC 8FB00030 */ lw $s0, 0x30($sp) -/* 940380 80240DD0 0000102D */ daddu $v0, $zero, $zero -/* 940384 80240DD4 03E00008 */ jr $ra -/* 940388 80240DD8 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240DC4_882F84.s b/ver/us/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240DC4_882F84.s deleted file mode 100644 index 3d1c9de01d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240DC4_882F84.s +++ /dev/null @@ -1,309 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_802441A8_886368 -.word .L802411D0_883390, .L802411DC_88339C, .L802411DC_88339C, .L802411DC_88339C, .L802411DC_88339C, .L802411DC_88339C, .L802411DC_88339C, .L802411DC_88339C, .L802411D0_883390, .L802411DC_88339C, .L802411D0_883390, .L802411DC_88339C, .L802411D0_883390, .L802411DC_88339C, .L802411D0_883390, .L802411DC_88339C, .L802411DC_88339C, .L802411DC_88339C, .L802411D0_883390, .L802411DC_88339C, .L802411D0_883390, 0 - -.section .text - -glabel func_80240DC4_882F84 -/* 882F84 80240DC4 27BDFF90 */ addiu $sp, $sp, -0x70 -/* 882F88 80240DC8 AFB3005C */ sw $s3, 0x5c($sp) -/* 882F8C 80240DCC 0080982D */ daddu $s3, $a0, $zero -/* 882F90 80240DD0 AFBF0068 */ sw $ra, 0x68($sp) -/* 882F94 80240DD4 AFB50064 */ sw $s5, 0x64($sp) -/* 882F98 80240DD8 AFB40060 */ sw $s4, 0x60($sp) -/* 882F9C 80240DDC AFB20058 */ sw $s2, 0x58($sp) -/* 882FA0 80240DE0 AFB10054 */ sw $s1, 0x54($sp) -/* 882FA4 80240DE4 AFB00050 */ sw $s0, 0x50($sp) -/* 882FA8 80240DE8 8E710148 */ lw $s1, 0x148($s3) -/* 882FAC 80240DEC 86240008 */ lh $a0, 8($s1) -/* 882FB0 80240DF0 0C00EABB */ jal get_npc_unsafe -/* 882FB4 80240DF4 00A0802D */ daddu $s0, $a1, $zero -/* 882FB8 80240DF8 8E63000C */ lw $v1, 0xc($s3) -/* 882FBC 80240DFC 0260202D */ daddu $a0, $s3, $zero -/* 882FC0 80240E00 8C650000 */ lw $a1, ($v1) -/* 882FC4 80240E04 0C0B1EAF */ jal evt_get_variable -/* 882FC8 80240E08 0040902D */ daddu $s2, $v0, $zero -/* 882FCC 80240E0C AFA00028 */ sw $zero, 0x28($sp) -/* 882FD0 80240E10 8E2300D0 */ lw $v1, 0xd0($s1) -/* 882FD4 80240E14 8C630030 */ lw $v1, 0x30($v1) -/* 882FD8 80240E18 AFA3002C */ sw $v1, 0x2c($sp) -/* 882FDC 80240E1C 8E2300D0 */ lw $v1, 0xd0($s1) -/* 882FE0 80240E20 8C63001C */ lw $v1, 0x1c($v1) -/* 882FE4 80240E24 AFA30030 */ sw $v1, 0x30($sp) -/* 882FE8 80240E28 8E2300D0 */ lw $v1, 0xd0($s1) -/* 882FEC 80240E2C 8C630024 */ lw $v1, 0x24($v1) -/* 882FF0 80240E30 AFA30034 */ sw $v1, 0x34($sp) -/* 882FF4 80240E34 8E2300D0 */ lw $v1, 0xd0($s1) -/* 882FF8 80240E38 8C630028 */ lw $v1, 0x28($v1) -/* 882FFC 80240E3C 27B50028 */ addiu $s5, $sp, 0x28 -/* 883000 80240E40 AFA30038 */ sw $v1, 0x38($sp) -/* 883004 80240E44 8E2300D0 */ lw $v1, 0xd0($s1) -/* 883008 80240E48 3C0142C8 */ lui $at, 0x42c8 -/* 88300C 80240E4C 44810000 */ mtc1 $at, $f0 -/* 883010 80240E50 8C63002C */ lw $v1, 0x2c($v1) -/* 883014 80240E54 0040A02D */ daddu $s4, $v0, $zero -/* 883018 80240E58 E7A00040 */ swc1 $f0, 0x40($sp) -/* 88301C 80240E5C A7A00044 */ sh $zero, 0x44($sp) -/* 883020 80240E60 12000009 */ beqz $s0, .L80240E88 -/* 883024 80240E64 AFA3003C */ sw $v1, 0x3c($sp) -/* 883028 80240E68 864300A8 */ lh $v1, 0xa8($s2) -/* 88302C 80240E6C 8E2200B0 */ lw $v0, 0xb0($s1) -/* 883030 80240E70 AE20008C */ sw $zero, 0x8c($s1) -/* 883034 80240E74 A22000B5 */ sb $zero, 0xb5($s1) -/* 883038 80240E78 34420008 */ ori $v0, $v0, 8 -/* 88303C 80240E7C AE230084 */ sw $v1, 0x84($s1) -/* 883040 80240E80 080903A6 */ j .L80240E98 -/* 883044 80240E84 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240E88: -/* 883048 80240E88 8E2200B0 */ lw $v0, 0xb0($s1) -/* 88304C 80240E8C 30420004 */ andi $v0, $v0, 4 -/* 883050 80240E90 10400047 */ beqz $v0, .L80240FB0 -/* 883054 80240E94 00000000 */ nop -.L80240E98: -/* 883058 80240E98 AE600070 */ sw $zero, 0x70($s3) -/* 88305C 80240E9C A640008E */ sh $zero, 0x8e($s2) -/* 883060 80240EA0 8E2300CC */ lw $v1, 0xcc($s1) -/* 883064 80240EA4 2404F7FF */ addiu $a0, $zero, -0x801 -/* 883068 80240EA8 A2200007 */ sb $zero, 7($s1) -/* 88306C 80240EAC 8E420000 */ lw $v0, ($s2) -/* 883070 80240EB0 8C630000 */ lw $v1, ($v1) -/* 883074 80240EB4 00441024 */ and $v0, $v0, $a0 -/* 883078 80240EB8 AE420000 */ sw $v0, ($s2) -/* 88307C 80240EBC AE430028 */ sw $v1, 0x28($s2) -/* 883080 80240EC0 96220086 */ lhu $v0, 0x86($s1) -/* 883084 80240EC4 A64200A8 */ sh $v0, 0xa8($s2) -/* 883088 80240EC8 8E2200D0 */ lw $v0, 0xd0($s1) -/* 88308C 80240ECC AE200090 */ sw $zero, 0x90($s1) -/* 883090 80240ED0 8C420034 */ lw $v0, 0x34($v0) -/* 883094 80240ED4 14400006 */ bnez $v0, .L80240EF0 -/* 883098 80240ED8 2403FDFF */ addiu $v1, $zero, -0x201 -/* 88309C 80240EDC 8E420000 */ lw $v0, ($s2) -/* 8830A0 80240EE0 2403FFF7 */ addiu $v1, $zero, -9 -/* 8830A4 80240EE4 34420200 */ ori $v0, $v0, 0x200 -/* 8830A8 80240EE8 080903BF */ j .L80240EFC -/* 8830AC 80240EEC 00431024 */ and $v0, $v0, $v1 -.L80240EF0: -/* 8830B0 80240EF0 8E420000 */ lw $v0, ($s2) -/* 8830B4 80240EF4 00431024 */ and $v0, $v0, $v1 -/* 8830B8 80240EF8 34420008 */ ori $v0, $v0, 8 -.L80240EFC: -/* 8830BC 80240EFC AE420000 */ sw $v0, ($s2) -/* 8830C0 80240F00 8E2200B0 */ lw $v0, 0xb0($s1) -/* 8830C4 80240F04 30420004 */ andi $v0, $v0, 4 -/* 8830C8 80240F08 1040001E */ beqz $v0, .L80240F84 -/* 8830CC 80240F0C 24040002 */ addiu $a0, $zero, 2 -/* 8830D0 80240F10 0240282D */ daddu $a1, $s2, $zero -/* 8830D4 80240F14 0000302D */ daddu $a2, $zero, $zero -/* 8830D8 80240F18 24020063 */ addiu $v0, $zero, 0x63 -/* 8830DC 80240F1C AE620070 */ sw $v0, 0x70($s3) -/* 8830E0 80240F20 AE600074 */ sw $zero, 0x74($s3) -/* 8830E4 80240F24 864300A8 */ lh $v1, 0xa8($s2) -/* 8830E8 80240F28 3C013F80 */ lui $at, 0x3f80 -/* 8830EC 80240F2C 44810000 */ mtc1 $at, $f0 -/* 8830F0 80240F30 3C014000 */ lui $at, 0x4000 -/* 8830F4 80240F34 44811000 */ mtc1 $at, $f2 -/* 8830F8 80240F38 3C01C1A0 */ lui $at, 0xc1a0 -/* 8830FC 80240F3C 44812000 */ mtc1 $at, $f4 -/* 883100 80240F40 24020028 */ addiu $v0, $zero, 0x28 -/* 883104 80240F44 AFA2001C */ sw $v0, 0x1c($sp) -/* 883108 80240F48 44833000 */ mtc1 $v1, $f6 -/* 88310C 80240F4C 00000000 */ nop -/* 883110 80240F50 468031A0 */ cvt.s.w $f6, $f6 -/* 883114 80240F54 44073000 */ mfc1 $a3, $f6 -/* 883118 80240F58 27A20048 */ addiu $v0, $sp, 0x48 -/* 88311C 80240F5C AFA20020 */ sw $v0, 0x20($sp) -/* 883120 80240F60 E7A00010 */ swc1 $f0, 0x10($sp) -/* 883124 80240F64 E7A20014 */ swc1 $f2, 0x14($sp) -/* 883128 80240F68 0C01BFA4 */ jal fx_emote -/* 88312C 80240F6C E7A40018 */ swc1 $f4, 0x18($sp) -/* 883130 80240F70 8E2200B0 */ lw $v0, 0xb0($s1) -/* 883134 80240F74 2403FFFB */ addiu $v1, $zero, -5 -/* 883138 80240F78 00431024 */ and $v0, $v0, $v1 -/* 88313C 80240F7C 080903EC */ j .L80240FB0 -/* 883140 80240F80 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240F84: -/* 883144 80240F84 8E220000 */ lw $v0, ($s1) -/* 883148 80240F88 3C034000 */ lui $v1, 0x4000 -/* 88314C 80240F8C 00431024 */ and $v0, $v0, $v1 -/* 883150 80240F90 10400007 */ beqz $v0, .L80240FB0 -/* 883154 80240F94 3C03BFFF */ lui $v1, 0xbfff -/* 883158 80240F98 2402000C */ addiu $v0, $zero, 0xc -/* 88315C 80240F9C AE620070 */ sw $v0, 0x70($s3) -/* 883160 80240FA0 8E220000 */ lw $v0, ($s1) -/* 883164 80240FA4 3463FFFF */ ori $v1, $v1, 0xffff -/* 883168 80240FA8 00431024 */ and $v0, $v0, $v1 -/* 88316C 80240FAC AE220000 */ sw $v0, ($s1) -.L80240FB0: -/* 883170 80240FB0 8E220090 */ lw $v0, 0x90($s1) -/* 883174 80240FB4 1840000C */ blez $v0, .L80240FE8 -/* 883178 80240FB8 2442FFFF */ addiu $v0, $v0, -1 -/* 88317C 80240FBC 14400087 */ bnez $v0, .L802411DC_88339C -/* 883180 80240FC0 AE220090 */ sw $v0, 0x90($s1) -/* 883184 80240FC4 3C03FFAA */ lui $v1, 0xffaa -/* 883188 80240FC8 8E420028 */ lw $v0, 0x28($s2) -/* 88318C 80240FCC 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* 883190 80240FD0 00431021 */ addu $v0, $v0, $v1 -/* 883194 80240FD4 2C420002 */ sltiu $v0, $v0, 2 -/* 883198 80240FD8 10400003 */ beqz $v0, .L80240FE8 -/* 88319C 80240FDC 3C020055 */ lui $v0, 0x55 -/* 8831A0 80240FE0 3442000C */ ori $v0, $v0, 0xc -/* 8831A4 80240FE4 AE420028 */ sw $v0, 0x28($s2) -.L80240FE8: -/* 8831A8 80240FE8 8E630070 */ lw $v1, 0x70($s3) -/* 8831AC 80240FEC 2402000C */ addiu $v0, $zero, 0xc -/* 8831B0 80240FF0 10620048 */ beq $v1, $v0, .L80241114 -/* 8831B4 80240FF4 2862000D */ slti $v0, $v1, 0xd -/* 8831B8 80240FF8 1040000F */ beqz $v0, .L80241038 -/* 8831BC 80240FFC 24100001 */ addiu $s0, $zero, 1 -/* 8831C0 80241000 1070001E */ beq $v1, $s0, .L8024107C -/* 8831C4 80241004 28620002 */ slti $v0, $v1, 2 -/* 8831C8 80241008 10400005 */ beqz $v0, .L80241020 -/* 8831CC 8024100C 24020002 */ addiu $v0, $zero, 2 -/* 8831D0 80241010 10600015 */ beqz $v1, .L80241068 -/* 8831D4 80241014 0260202D */ daddu $a0, $s3, $zero -/* 8831D8 80241018 0809045C */ j .L80241170 -/* 8831DC 8024101C 00000000 */ nop -.L80241020: -/* 8831E0 80241020 1062001C */ beq $v1, $v0, .L80241094 -/* 8831E4 80241024 24020003 */ addiu $v0, $zero, 3 -/* 8831E8 80241028 10620035 */ beq $v1, $v0, .L80241100 -/* 8831EC 8024102C 0260202D */ daddu $a0, $s3, $zero -/* 8831F0 80241030 0809045C */ j .L80241170 -/* 8831F4 80241034 00000000 */ nop -.L80241038: -/* 8831F8 80241038 2402000E */ addiu $v0, $zero, 0xe -/* 8831FC 8024103C 1062003F */ beq $v1, $v0, .L8024113C -/* 883200 80241040 0062102A */ slt $v0, $v1, $v0 -/* 883204 80241044 14400038 */ bnez $v0, .L80241128 -/* 883208 80241048 0260202D */ daddu $a0, $s3, $zero -/* 88320C 8024104C 2402000F */ addiu $v0, $zero, 0xf -/* 883210 80241050 10620040 */ beq $v1, $v0, .L80241154 -/* 883214 80241054 24020063 */ addiu $v0, $zero, 0x63 -/* 883218 80241058 10620043 */ beq $v1, $v0, .L80241168 -/* 88321C 8024105C 00000000 */ nop -/* 883220 80241060 0809045C */ j .L80241170 -/* 883224 80241064 00000000 */ nop -.L80241068: -/* 883228 80241068 0280282D */ daddu $a1, $s4, $zero -/* 88322C 8024106C 0C012568 */ jal func_800495A0 -/* 883230 80241070 02A0302D */ daddu $a2, $s5, $zero -/* 883234 80241074 96220086 */ lhu $v0, 0x86($s1) -/* 883238 80241078 A64200A8 */ sh $v0, 0xa8($s2) -.L8024107C: -/* 88323C 8024107C 0260202D */ daddu $a0, $s3, $zero -/* 883240 80241080 0280282D */ daddu $a1, $s4, $zero -/* 883244 80241084 0C0125AE */ jal func_800496B8 -/* 883248 80241088 02A0302D */ daddu $a2, $s5, $zero -/* 88324C 8024108C 0809045C */ j .L80241170 -/* 883250 80241090 00000000 */ nop -.L80241094: -/* 883254 80241094 0260202D */ daddu $a0, $s3, $zero -/* 883258 80241098 0280282D */ daddu $a1, $s4, $zero -/* 88325C 8024109C 0C0126D1 */ jal base_UnkNpcAIFunc1 -/* 883260 802410A0 02A0302D */ daddu $a2, $s5, $zero -/* 883264 802410A4 8E230088 */ lw $v1, 0x88($s1) -/* 883268 802410A8 24020006 */ addiu $v0, $zero, 6 -/* 88326C 802410AC 14620014 */ bne $v1, $v0, .L80241100 -/* 883270 802410B0 0260202D */ daddu $a0, $s3, $zero -/* 883274 802410B4 0C00A67F */ jal rand_int -/* 883278 802410B8 24040064 */ addiu $a0, $zero, 0x64 -/* 88327C 802410BC 28420021 */ slti $v0, $v0, 0x21 -/* 883280 802410C0 5040000F */ beql $v0, $zero, .L80241100 -/* 883284 802410C4 0260202D */ daddu $a0, $s3, $zero -/* 883288 802410C8 8E22008C */ lw $v0, 0x8c($s1) -/* 88328C 802410CC 10400005 */ beqz $v0, .L802410E4 -/* 883290 802410D0 3C020055 */ lui $v0, 0x55 -/* 883294 802410D4 3442002F */ ori $v0, $v0, 0x2f -/* 883298 802410D8 AE20008C */ sw $zero, 0x8c($s1) -/* 88329C 802410DC 0809043C */ j .L802410F0 -/* 8832A0 802410E0 A22000B5 */ sb $zero, 0xb5($s1) -.L802410E4: -/* 8832A4 802410E4 3442002E */ ori $v0, $v0, 0x2e -/* 8832A8 802410E8 AE30008C */ sw $s0, 0x8c($s1) -/* 8832AC 802410EC A23000B5 */ sb $s0, 0xb5($s1) -.L802410F0: -/* 8832B0 802410F0 AE420028 */ sw $v0, 0x28($s2) -/* 8832B4 802410F4 24020007 */ addiu $v0, $zero, 7 -/* 8832B8 802410F8 08090477 */ j .L802411DC_88339C -/* 8832BC 802410FC AE220090 */ sw $v0, 0x90($s1) -.L80241100: -/* 8832C0 80241100 0280282D */ daddu $a1, $s4, $zero -/* 8832C4 80241104 0C012701 */ jal func_80049C04 -/* 8832C8 80241108 02A0302D */ daddu $a2, $s5, $zero -/* 8832CC 8024110C 0809045C */ j .L80241170 -/* 8832D0 80241110 00000000 */ nop -.L80241114: -/* 8832D4 80241114 0260202D */ daddu $a0, $s3, $zero -/* 8832D8 80241118 0280282D */ daddu $a1, $s4, $zero -/* 8832DC 8024111C 0C09028C */ jal tik_09_set_script_owner_npc_anim -/* 8832E0 80241120 02A0302D */ daddu $a2, $s5, $zero -/* 8832E4 80241124 0260202D */ daddu $a0, $s3, $zero -.L80241128: -/* 8832E8 80241128 0280282D */ daddu $a1, $s4, $zero -/* 8832EC 8024112C 0C0902AB */ jal tik_09_UnkDistFunc -/* 8832F0 80241130 02A0302D */ daddu $a2, $s5, $zero -/* 8832F4 80241134 0809045C */ j .L80241170 -/* 8832F8 80241138 00000000 */ nop -.L8024113C: -/* 8832FC 8024113C 0260202D */ daddu $a0, $s3, $zero -/* 883300 80241140 0280282D */ daddu $a1, $s4, $zero -/* 883304 80241144 0C0902F8 */ jal tik_09_UnkNpcAIFunc12 -/* 883308 80241148 02A0302D */ daddu $a2, $s5, $zero -/* 88330C 8024114C 0809045C */ j .L80241170 -/* 883310 80241150 00000000 */ nop -.L80241154: -/* 883314 80241154 0280282D */ daddu $a1, $s4, $zero -/* 883318 80241158 0C090351 */ jal tik_09_set_script_owner_npc_col_height -/* 88331C 8024115C 02A0302D */ daddu $a2, $s5, $zero -/* 883320 80241160 0809045C */ j .L80241170 -/* 883324 80241164 00000000 */ nop -.L80241168: -/* 883328 80241168 0C0129CF */ jal func_8004A73C -/* 88332C 8024116C 0260202D */ daddu $a0, $s3, $zero -.L80241170: -/* 883330 80241170 8E230088 */ lw $v1, 0x88($s1) -/* 883334 80241174 24020006 */ addiu $v0, $zero, 6 -/* 883338 80241178 14620019 */ bne $v1, $v0, .L802411E0 -/* 88333C 8024117C 0000102D */ daddu $v0, $zero, $zero -/* 883340 80241180 8E22008C */ lw $v0, 0x8c($s1) -/* 883344 80241184 10400003 */ beqz $v0, .L80241194 -/* 883348 80241188 24020001 */ addiu $v0, $zero, 1 -/* 88334C 8024118C 08090466 */ j .L80241198 -/* 883350 80241190 A22200B5 */ sb $v0, 0xb5($s1) -.L80241194: -/* 883354 80241194 A22000B5 */ sb $zero, 0xb5($s1) -.L80241198: -/* 883358 80241198 8E22008C */ lw $v0, 0x8c($s1) -/* 88335C 8024119C 1040000F */ beqz $v0, .L802411DC_88339C -/* 883360 802411A0 3C03FFAA */ lui $v1, 0xffaa -/* 883364 802411A4 8E420028 */ lw $v0, 0x28($s2) -/* 883368 802411A8 3463FFFC */ ori $v1, $v1, 0xfffc -/* 88336C 802411AC 00431821 */ addu $v1, $v0, $v1 -/* 883370 802411B0 2C620015 */ sltiu $v0, $v1, 0x15 -/* 883374 802411B4 10400009 */ beqz $v0, .L802411DC_88339C -/* 883378 802411B8 00031080 */ sll $v0, $v1, 2 -/* 88337C 802411BC 3C018024 */ lui $at, %hi(jtbl_802441A8_886368) -/* 883380 802411C0 00220821 */ addu $at, $at, $v0 -/* 883384 802411C4 8C2241A8 */ lw $v0, %lo(jtbl_802441A8_886368)($at) -/* 883388 802411C8 00400008 */ jr $v0 -/* 88338C 802411CC 00000000 */ nop -.L802411D0_883390: -/* 883390 802411D0 8E420028 */ lw $v0, 0x28($s2) -/* 883394 802411D4 24420001 */ addiu $v0, $v0, 1 -/* 883398 802411D8 AE420028 */ sw $v0, 0x28($s2) -.L802411DC_88339C: -/* 88339C 802411DC 0000102D */ daddu $v0, $zero, $zero -.L802411E0: -/* 8833A0 802411E0 8FBF0068 */ lw $ra, 0x68($sp) -/* 8833A4 802411E4 8FB50064 */ lw $s5, 0x64($sp) -/* 8833A8 802411E8 8FB40060 */ lw $s4, 0x60($sp) -/* 8833AC 802411EC 8FB3005C */ lw $s3, 0x5c($sp) -/* 8833B0 802411F0 8FB20058 */ lw $s2, 0x58($sp) -/* 8833B4 802411F4 8FB10054 */ lw $s1, 0x54($sp) -/* 8833B8 802411F8 8FB00050 */ lw $s0, 0x50($sp) -/* 8833BC 802411FC 03E00008 */ jr $ra -/* 8833C0 80241200 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241CF4_88A8C4.s b/ver/us/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241CF4_88A8C4.s deleted file mode 100644 index 0bcef9882d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241CF4_88A8C4.s +++ /dev/null @@ -1,309 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_802449D8_88D5A8 -.word .L80242100_88ACD0, .L8024210C_88ACDC, .L8024210C_88ACDC, .L8024210C_88ACDC, .L8024210C_88ACDC, .L8024210C_88ACDC, .L8024210C_88ACDC, .L8024210C_88ACDC, .L80242100_88ACD0, .L8024210C_88ACDC, .L80242100_88ACD0, .L8024210C_88ACDC, .L80242100_88ACD0, .L8024210C_88ACDC, .L80242100_88ACD0, .L8024210C_88ACDC, .L8024210C_88ACDC, .L8024210C_88ACDC, .L80242100_88ACD0, .L8024210C_88ACDC, .L80242100_88ACD0, 0 - -.section .text - -glabel func_80241CF4_88A8C4 -/* 88A8C4 80241CF4 27BDFF90 */ addiu $sp, $sp, -0x70 -/* 88A8C8 80241CF8 AFB3005C */ sw $s3, 0x5c($sp) -/* 88A8CC 80241CFC 0080982D */ daddu $s3, $a0, $zero -/* 88A8D0 80241D00 AFBF0068 */ sw $ra, 0x68($sp) -/* 88A8D4 80241D04 AFB50064 */ sw $s5, 0x64($sp) -/* 88A8D8 80241D08 AFB40060 */ sw $s4, 0x60($sp) -/* 88A8DC 80241D0C AFB20058 */ sw $s2, 0x58($sp) -/* 88A8E0 80241D10 AFB10054 */ sw $s1, 0x54($sp) -/* 88A8E4 80241D14 AFB00050 */ sw $s0, 0x50($sp) -/* 88A8E8 80241D18 8E710148 */ lw $s1, 0x148($s3) -/* 88A8EC 80241D1C 86240008 */ lh $a0, 8($s1) -/* 88A8F0 80241D20 0C00EABB */ jal get_npc_unsafe -/* 88A8F4 80241D24 00A0802D */ daddu $s0, $a1, $zero -/* 88A8F8 80241D28 8E63000C */ lw $v1, 0xc($s3) -/* 88A8FC 80241D2C 0260202D */ daddu $a0, $s3, $zero -/* 88A900 80241D30 8C650000 */ lw $a1, ($v1) -/* 88A904 80241D34 0C0B1EAF */ jal evt_get_variable -/* 88A908 80241D38 0040902D */ daddu $s2, $v0, $zero -/* 88A90C 80241D3C AFA00028 */ sw $zero, 0x28($sp) -/* 88A910 80241D40 8E2300D0 */ lw $v1, 0xd0($s1) -/* 88A914 80241D44 8C630030 */ lw $v1, 0x30($v1) -/* 88A918 80241D48 AFA3002C */ sw $v1, 0x2c($sp) -/* 88A91C 80241D4C 8E2300D0 */ lw $v1, 0xd0($s1) -/* 88A920 80241D50 8C63001C */ lw $v1, 0x1c($v1) -/* 88A924 80241D54 AFA30030 */ sw $v1, 0x30($sp) -/* 88A928 80241D58 8E2300D0 */ lw $v1, 0xd0($s1) -/* 88A92C 80241D5C 8C630024 */ lw $v1, 0x24($v1) -/* 88A930 80241D60 AFA30034 */ sw $v1, 0x34($sp) -/* 88A934 80241D64 8E2300D0 */ lw $v1, 0xd0($s1) -/* 88A938 80241D68 8C630028 */ lw $v1, 0x28($v1) -/* 88A93C 80241D6C 27B50028 */ addiu $s5, $sp, 0x28 -/* 88A940 80241D70 AFA30038 */ sw $v1, 0x38($sp) -/* 88A944 80241D74 8E2300D0 */ lw $v1, 0xd0($s1) -/* 88A948 80241D78 3C0142C8 */ lui $at, 0x42c8 -/* 88A94C 80241D7C 44810000 */ mtc1 $at, $f0 -/* 88A950 80241D80 8C63002C */ lw $v1, 0x2c($v1) -/* 88A954 80241D84 0040A02D */ daddu $s4, $v0, $zero -/* 88A958 80241D88 E7A00040 */ swc1 $f0, 0x40($sp) -/* 88A95C 80241D8C A7A00044 */ sh $zero, 0x44($sp) -/* 88A960 80241D90 12000009 */ beqz $s0, .L80241DB8 -/* 88A964 80241D94 AFA3003C */ sw $v1, 0x3c($sp) -/* 88A968 80241D98 864300A8 */ lh $v1, 0xa8($s2) -/* 88A96C 80241D9C 8E2200B0 */ lw $v0, 0xb0($s1) -/* 88A970 80241DA0 AE20008C */ sw $zero, 0x8c($s1) -/* 88A974 80241DA4 A22000B5 */ sb $zero, 0xb5($s1) -/* 88A978 80241DA8 34420008 */ ori $v0, $v0, 8 -/* 88A97C 80241DAC AE230084 */ sw $v1, 0x84($s1) -/* 88A980 80241DB0 08090772 */ j .L80241DC8 -/* 88A984 80241DB4 AE2200B0 */ sw $v0, 0xb0($s1) -.L80241DB8: -/* 88A988 80241DB8 8E2200B0 */ lw $v0, 0xb0($s1) -/* 88A98C 80241DBC 30420004 */ andi $v0, $v0, 4 -/* 88A990 80241DC0 10400047 */ beqz $v0, .L80241EE0 -/* 88A994 80241DC4 00000000 */ nop -.L80241DC8: -/* 88A998 80241DC8 AE600070 */ sw $zero, 0x70($s3) -/* 88A99C 80241DCC A640008E */ sh $zero, 0x8e($s2) -/* 88A9A0 80241DD0 8E2300CC */ lw $v1, 0xcc($s1) -/* 88A9A4 80241DD4 2404F7FF */ addiu $a0, $zero, -0x801 -/* 88A9A8 80241DD8 A2200007 */ sb $zero, 7($s1) -/* 88A9AC 80241DDC 8E420000 */ lw $v0, ($s2) -/* 88A9B0 80241DE0 8C630000 */ lw $v1, ($v1) -/* 88A9B4 80241DE4 00441024 */ and $v0, $v0, $a0 -/* 88A9B8 80241DE8 AE420000 */ sw $v0, ($s2) -/* 88A9BC 80241DEC AE430028 */ sw $v1, 0x28($s2) -/* 88A9C0 80241DF0 96220086 */ lhu $v0, 0x86($s1) -/* 88A9C4 80241DF4 A64200A8 */ sh $v0, 0xa8($s2) -/* 88A9C8 80241DF8 8E2200D0 */ lw $v0, 0xd0($s1) -/* 88A9CC 80241DFC AE200090 */ sw $zero, 0x90($s1) -/* 88A9D0 80241E00 8C420034 */ lw $v0, 0x34($v0) -/* 88A9D4 80241E04 14400006 */ bnez $v0, .L80241E20 -/* 88A9D8 80241E08 2403FDFF */ addiu $v1, $zero, -0x201 -/* 88A9DC 80241E0C 8E420000 */ lw $v0, ($s2) -/* 88A9E0 80241E10 2403FFF7 */ addiu $v1, $zero, -9 -/* 88A9E4 80241E14 34420200 */ ori $v0, $v0, 0x200 -/* 88A9E8 80241E18 0809078B */ j .L80241E2C -/* 88A9EC 80241E1C 00431024 */ and $v0, $v0, $v1 -.L80241E20: -/* 88A9F0 80241E20 8E420000 */ lw $v0, ($s2) -/* 88A9F4 80241E24 00431024 */ and $v0, $v0, $v1 -/* 88A9F8 80241E28 34420008 */ ori $v0, $v0, 8 -.L80241E2C: -/* 88A9FC 80241E2C AE420000 */ sw $v0, ($s2) -/* 88AA00 80241E30 8E2200B0 */ lw $v0, 0xb0($s1) -/* 88AA04 80241E34 30420004 */ andi $v0, $v0, 4 -/* 88AA08 80241E38 1040001E */ beqz $v0, .L80241EB4 -/* 88AA0C 80241E3C 24040002 */ addiu $a0, $zero, 2 -/* 88AA10 80241E40 0240282D */ daddu $a1, $s2, $zero -/* 88AA14 80241E44 0000302D */ daddu $a2, $zero, $zero -/* 88AA18 80241E48 24020063 */ addiu $v0, $zero, 0x63 -/* 88AA1C 80241E4C AE620070 */ sw $v0, 0x70($s3) -/* 88AA20 80241E50 AE600074 */ sw $zero, 0x74($s3) -/* 88AA24 80241E54 864300A8 */ lh $v1, 0xa8($s2) -/* 88AA28 80241E58 3C013F80 */ lui $at, 0x3f80 -/* 88AA2C 80241E5C 44810000 */ mtc1 $at, $f0 -/* 88AA30 80241E60 3C014000 */ lui $at, 0x4000 -/* 88AA34 80241E64 44811000 */ mtc1 $at, $f2 -/* 88AA38 80241E68 3C01C1A0 */ lui $at, 0xc1a0 -/* 88AA3C 80241E6C 44812000 */ mtc1 $at, $f4 -/* 88AA40 80241E70 24020028 */ addiu $v0, $zero, 0x28 -/* 88AA44 80241E74 AFA2001C */ sw $v0, 0x1c($sp) -/* 88AA48 80241E78 44833000 */ mtc1 $v1, $f6 -/* 88AA4C 80241E7C 00000000 */ nop -/* 88AA50 80241E80 468031A0 */ cvt.s.w $f6, $f6 -/* 88AA54 80241E84 44073000 */ mfc1 $a3, $f6 -/* 88AA58 80241E88 27A20048 */ addiu $v0, $sp, 0x48 -/* 88AA5C 80241E8C AFA20020 */ sw $v0, 0x20($sp) -/* 88AA60 80241E90 E7A00010 */ swc1 $f0, 0x10($sp) -/* 88AA64 80241E94 E7A20014 */ swc1 $f2, 0x14($sp) -/* 88AA68 80241E98 0C01BFA4 */ jal fx_emote -/* 88AA6C 80241E9C E7A40018 */ swc1 $f4, 0x18($sp) -/* 88AA70 80241EA0 8E2200B0 */ lw $v0, 0xb0($s1) -/* 88AA74 80241EA4 2403FFFB */ addiu $v1, $zero, -5 -/* 88AA78 80241EA8 00431024 */ and $v0, $v0, $v1 -/* 88AA7C 80241EAC 080907B8 */ j .L80241EE0 -/* 88AA80 80241EB0 AE2200B0 */ sw $v0, 0xb0($s1) -.L80241EB4: -/* 88AA84 80241EB4 8E220000 */ lw $v0, ($s1) -/* 88AA88 80241EB8 3C034000 */ lui $v1, 0x4000 -/* 88AA8C 80241EBC 00431024 */ and $v0, $v0, $v1 -/* 88AA90 80241EC0 10400007 */ beqz $v0, .L80241EE0 -/* 88AA94 80241EC4 3C03BFFF */ lui $v1, 0xbfff -/* 88AA98 80241EC8 2402000C */ addiu $v0, $zero, 0xc -/* 88AA9C 80241ECC AE620070 */ sw $v0, 0x70($s3) -/* 88AAA0 80241ED0 8E220000 */ lw $v0, ($s1) -/* 88AAA4 80241ED4 3463FFFF */ ori $v1, $v1, 0xffff -/* 88AAA8 80241ED8 00431024 */ and $v0, $v0, $v1 -/* 88AAAC 80241EDC AE220000 */ sw $v0, ($s1) -.L80241EE0: -/* 88AAB0 80241EE0 8E220090 */ lw $v0, 0x90($s1) -/* 88AAB4 80241EE4 1840000C */ blez $v0, .L80241F18 -/* 88AAB8 80241EE8 2442FFFF */ addiu $v0, $v0, -1 -/* 88AABC 80241EEC 14400087 */ bnez $v0, .L8024210C_88ACDC -/* 88AAC0 80241EF0 AE220090 */ sw $v0, 0x90($s1) -/* 88AAC4 80241EF4 3C03FFAA */ lui $v1, 0xffaa -/* 88AAC8 80241EF8 8E420028 */ lw $v0, 0x28($s2) -/* 88AACC 80241EFC 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* 88AAD0 80241F00 00431021 */ addu $v0, $v0, $v1 -/* 88AAD4 80241F04 2C420002 */ sltiu $v0, $v0, 2 -/* 88AAD8 80241F08 10400003 */ beqz $v0, .L80241F18 -/* 88AADC 80241F0C 3C020055 */ lui $v0, 0x55 -/* 88AAE0 80241F10 3442000C */ ori $v0, $v0, 0xc -/* 88AAE4 80241F14 AE420028 */ sw $v0, 0x28($s2) -.L80241F18: -/* 88AAE8 80241F18 8E630070 */ lw $v1, 0x70($s3) -/* 88AAEC 80241F1C 2402000C */ addiu $v0, $zero, 0xc -/* 88AAF0 80241F20 10620048 */ beq $v1, $v0, .L80242044 -/* 88AAF4 80241F24 2862000D */ slti $v0, $v1, 0xd -/* 88AAF8 80241F28 1040000F */ beqz $v0, .L80241F68 -/* 88AAFC 80241F2C 24100001 */ addiu $s0, $zero, 1 -/* 88AB00 80241F30 1070001E */ beq $v1, $s0, .L80241FAC -/* 88AB04 80241F34 28620002 */ slti $v0, $v1, 2 -/* 88AB08 80241F38 10400005 */ beqz $v0, .L80241F50 -/* 88AB0C 80241F3C 24020002 */ addiu $v0, $zero, 2 -/* 88AB10 80241F40 10600015 */ beqz $v1, .L80241F98 -/* 88AB14 80241F44 0260202D */ daddu $a0, $s3, $zero -/* 88AB18 80241F48 08090828 */ j .L802420A0 -/* 88AB1C 80241F4C 00000000 */ nop -.L80241F50: -/* 88AB20 80241F50 1062001C */ beq $v1, $v0, .L80241FC4 -/* 88AB24 80241F54 24020003 */ addiu $v0, $zero, 3 -/* 88AB28 80241F58 10620035 */ beq $v1, $v0, .L80242030 -/* 88AB2C 80241F5C 0260202D */ daddu $a0, $s3, $zero -/* 88AB30 80241F60 08090828 */ j .L802420A0 -/* 88AB34 80241F64 00000000 */ nop -.L80241F68: -/* 88AB38 80241F68 2402000E */ addiu $v0, $zero, 0xe -/* 88AB3C 80241F6C 1062003F */ beq $v1, $v0, .L8024206C -/* 88AB40 80241F70 0062102A */ slt $v0, $v1, $v0 -/* 88AB44 80241F74 14400038 */ bnez $v0, .L80242058 -/* 88AB48 80241F78 0260202D */ daddu $a0, $s3, $zero -/* 88AB4C 80241F7C 2402000F */ addiu $v0, $zero, 0xf -/* 88AB50 80241F80 10620040 */ beq $v1, $v0, .L80242084 -/* 88AB54 80241F84 24020063 */ addiu $v0, $zero, 0x63 -/* 88AB58 80241F88 10620043 */ beq $v1, $v0, .L80242098 -/* 88AB5C 80241F8C 00000000 */ nop -/* 88AB60 80241F90 08090828 */ j .L802420A0 -/* 88AB64 80241F94 00000000 */ nop -.L80241F98: -/* 88AB68 80241F98 0280282D */ daddu $a1, $s4, $zero -/* 88AB6C 80241F9C 0C012568 */ jal func_800495A0 -/* 88AB70 80241FA0 02A0302D */ daddu $a2, $s5, $zero -/* 88AB74 80241FA4 96220086 */ lhu $v0, 0x86($s1) -/* 88AB78 80241FA8 A64200A8 */ sh $v0, 0xa8($s2) -.L80241FAC: -/* 88AB7C 80241FAC 0260202D */ daddu $a0, $s3, $zero -/* 88AB80 80241FB0 0280282D */ daddu $a1, $s4, $zero -/* 88AB84 80241FB4 0C0125AE */ jal func_800496B8 -/* 88AB88 80241FB8 02A0302D */ daddu $a2, $s5, $zero -/* 88AB8C 80241FBC 08090828 */ j .L802420A0 -/* 88AB90 80241FC0 00000000 */ nop -.L80241FC4: -/* 88AB94 80241FC4 0260202D */ daddu $a0, $s3, $zero -/* 88AB98 80241FC8 0280282D */ daddu $a1, $s4, $zero -/* 88AB9C 80241FCC 0C0126D1 */ jal base_UnkNpcAIFunc1 -/* 88ABA0 80241FD0 02A0302D */ daddu $a2, $s5, $zero -/* 88ABA4 80241FD4 8E230088 */ lw $v1, 0x88($s1) -/* 88ABA8 80241FD8 24020006 */ addiu $v0, $zero, 6 -/* 88ABAC 80241FDC 14620014 */ bne $v1, $v0, .L80242030 -/* 88ABB0 80241FE0 0260202D */ daddu $a0, $s3, $zero -/* 88ABB4 80241FE4 0C00A67F */ jal rand_int -/* 88ABB8 80241FE8 24040064 */ addiu $a0, $zero, 0x64 -/* 88ABBC 80241FEC 28420021 */ slti $v0, $v0, 0x21 -/* 88ABC0 80241FF0 5040000F */ beql $v0, $zero, .L80242030 -/* 88ABC4 80241FF4 0260202D */ daddu $a0, $s3, $zero -/* 88ABC8 80241FF8 8E22008C */ lw $v0, 0x8c($s1) -/* 88ABCC 80241FFC 10400005 */ beqz $v0, .L80242014 -/* 88ABD0 80242000 3C020055 */ lui $v0, 0x55 -/* 88ABD4 80242004 3442002F */ ori $v0, $v0, 0x2f -/* 88ABD8 80242008 AE20008C */ sw $zero, 0x8c($s1) -/* 88ABDC 8024200C 08090808 */ j .L80242020 -/* 88ABE0 80242010 A22000B5 */ sb $zero, 0xb5($s1) -.L80242014: -/* 88ABE4 80242014 3442002E */ ori $v0, $v0, 0x2e -/* 88ABE8 80242018 AE30008C */ sw $s0, 0x8c($s1) -/* 88ABEC 8024201C A23000B5 */ sb $s0, 0xb5($s1) -.L80242020: -/* 88ABF0 80242020 AE420028 */ sw $v0, 0x28($s2) -/* 88ABF4 80242024 24020007 */ addiu $v0, $zero, 7 -/* 88ABF8 80242028 08090843 */ j .L8024210C_88ACDC -/* 88ABFC 8024202C AE220090 */ sw $v0, 0x90($s1) -.L80242030: -/* 88AC00 80242030 0280282D */ daddu $a1, $s4, $zero -/* 88AC04 80242034 0C012701 */ jal func_80049C04 -/* 88AC08 80242038 02A0302D */ daddu $a2, $s5, $zero -/* 88AC0C 8024203C 08090828 */ j .L802420A0 -/* 88AC10 80242040 00000000 */ nop -.L80242044: -/* 88AC14 80242044 0260202D */ daddu $a0, $s3, $zero -/* 88AC18 80242048 0280282D */ daddu $a1, $s4, $zero -/* 88AC1C 8024204C 0C090658 */ jal tik_12_set_script_owner_npc_anim -/* 88AC20 80242050 02A0302D */ daddu $a2, $s5, $zero -/* 88AC24 80242054 0260202D */ daddu $a0, $s3, $zero -.L80242058: -/* 88AC28 80242058 0280282D */ daddu $a1, $s4, $zero -/* 88AC2C 8024205C 0C090677 */ jal tik_12_UnkDistFunc -/* 88AC30 80242060 02A0302D */ daddu $a2, $s5, $zero -/* 88AC34 80242064 08090828 */ j .L802420A0 -/* 88AC38 80242068 00000000 */ nop -.L8024206C: -/* 88AC3C 8024206C 0260202D */ daddu $a0, $s3, $zero -/* 88AC40 80242070 0280282D */ daddu $a1, $s4, $zero -/* 88AC44 80242074 0C0906C4 */ jal tik_12_UnkNpcAIFunc12 -/* 88AC48 80242078 02A0302D */ daddu $a2, $s5, $zero -/* 88AC4C 8024207C 08090828 */ j .L802420A0 -/* 88AC50 80242080 00000000 */ nop -.L80242084: -/* 88AC54 80242084 0280282D */ daddu $a1, $s4, $zero -/* 88AC58 80242088 0C09071D */ jal tik_12_set_script_owner_npc_col_height -/* 88AC5C 8024208C 02A0302D */ daddu $a2, $s5, $zero -/* 88AC60 80242090 08090828 */ j .L802420A0 -/* 88AC64 80242094 00000000 */ nop -.L80242098: -/* 88AC68 80242098 0C0129CF */ jal func_8004A73C -/* 88AC6C 8024209C 0260202D */ daddu $a0, $s3, $zero -.L802420A0: -/* 88AC70 802420A0 8E230088 */ lw $v1, 0x88($s1) -/* 88AC74 802420A4 24020006 */ addiu $v0, $zero, 6 -/* 88AC78 802420A8 14620019 */ bne $v1, $v0, .L80242110 -/* 88AC7C 802420AC 0000102D */ daddu $v0, $zero, $zero -/* 88AC80 802420B0 8E22008C */ lw $v0, 0x8c($s1) -/* 88AC84 802420B4 10400003 */ beqz $v0, .L802420C4 -/* 88AC88 802420B8 24020001 */ addiu $v0, $zero, 1 -/* 88AC8C 802420BC 08090832 */ j .L802420C8 -/* 88AC90 802420C0 A22200B5 */ sb $v0, 0xb5($s1) -.L802420C4: -/* 88AC94 802420C4 A22000B5 */ sb $zero, 0xb5($s1) -.L802420C8: -/* 88AC98 802420C8 8E22008C */ lw $v0, 0x8c($s1) -/* 88AC9C 802420CC 1040000F */ beqz $v0, .L8024210C_88ACDC -/* 88ACA0 802420D0 3C03FFAA */ lui $v1, 0xffaa -/* 88ACA4 802420D4 8E420028 */ lw $v0, 0x28($s2) -/* 88ACA8 802420D8 3463FFFC */ ori $v1, $v1, 0xfffc -/* 88ACAC 802420DC 00431821 */ addu $v1, $v0, $v1 -/* 88ACB0 802420E0 2C620015 */ sltiu $v0, $v1, 0x15 -/* 88ACB4 802420E4 10400009 */ beqz $v0, .L8024210C_88ACDC -/* 88ACB8 802420E8 00031080 */ sll $v0, $v1, 2 -/* 88ACBC 802420EC 3C018024 */ lui $at, %hi(jtbl_802449D8_88D5A8) -/* 88ACC0 802420F0 00220821 */ addu $at, $at, $v0 -/* 88ACC4 802420F4 8C2249D8 */ lw $v0, %lo(jtbl_802449D8_88D5A8)($at) -/* 88ACC8 802420F8 00400008 */ jr $v0 -/* 88ACCC 802420FC 00000000 */ nop -.L80242100_88ACD0: -/* 88ACD0 80242100 8E420028 */ lw $v0, 0x28($s2) -/* 88ACD4 80242104 24420001 */ addiu $v0, $v0, 1 -/* 88ACD8 80242108 AE420028 */ sw $v0, 0x28($s2) -.L8024210C_88ACDC: -/* 88ACDC 8024210C 0000102D */ daddu $v0, $zero, $zero -.L80242110: -/* 88ACE0 80242110 8FBF0068 */ lw $ra, 0x68($sp) -/* 88ACE4 80242114 8FB50064 */ lw $s5, 0x64($sp) -/* 88ACE8 80242118 8FB40060 */ lw $s4, 0x60($sp) -/* 88ACEC 8024211C 8FB3005C */ lw $s3, 0x5c($sp) -/* 88ACF0 80242120 8FB20058 */ lw $s2, 0x58($sp) -/* 88ACF4 80242124 8FB10054 */ lw $s1, 0x54($sp) -/* 88ACF8 80242128 8FB00050 */ lw $s0, 0x50($sp) -/* 88ACFC 8024212C 03E00008 */ jr $ra -/* 88AD00 80242130 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_80240CF4_89B044.s b/ver/us/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_80240CF4_89B044.s deleted file mode 100644 index 98d1680af3..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_80240CF4_89B044.s +++ /dev/null @@ -1,312 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_802433F8_89D748 -.word .L80241100_89B450, .L8024110C_89B45C, .L8024110C_89B45C, .L8024110C_89B45C, .L8024110C_89B45C, .L8024110C_89B45C, .L8024110C_89B45C, .L8024110C_89B45C, .L80241100_89B450, .L8024110C_89B45C, .L80241100_89B450, .L8024110C_89B45C, .L80241100_89B450, .L8024110C_89B45C, .L80241100_89B450, .L8024110C_89B45C, .L8024110C_89B45C, .L8024110C_89B45C, .L80241100_89B450, .L8024110C_89B45C, .L80241100_89B450, 0 - -.section .text - -glabel func_80240CF4_89B044 -/* 89B044 80240CF4 27BDFF90 */ addiu $sp, $sp, -0x70 -/* 89B048 80240CF8 AFB3005C */ sw $s3, 0x5c($sp) -/* 89B04C 80240CFC 0080982D */ daddu $s3, $a0, $zero -/* 89B050 80240D00 AFBF0068 */ sw $ra, 0x68($sp) -/* 89B054 80240D04 AFB50064 */ sw $s5, 0x64($sp) -/* 89B058 80240D08 AFB40060 */ sw $s4, 0x60($sp) -/* 89B05C 80240D0C AFB20058 */ sw $s2, 0x58($sp) -/* 89B060 80240D10 AFB10054 */ sw $s1, 0x54($sp) -/* 89B064 80240D14 AFB00050 */ sw $s0, 0x50($sp) -/* 89B068 80240D18 8E710148 */ lw $s1, 0x148($s3) -/* 89B06C 80240D1C 86240008 */ lh $a0, 8($s1) -/* 89B070 80240D20 0C00EABB */ jal get_npc_unsafe -/* 89B074 80240D24 00A0802D */ daddu $s0, $a1, $zero -/* 89B078 80240D28 8E63000C */ lw $v1, 0xc($s3) -/* 89B07C 80240D2C 0260202D */ daddu $a0, $s3, $zero -/* 89B080 80240D30 8C650000 */ lw $a1, ($v1) -/* 89B084 80240D34 0C0B1EAF */ jal evt_get_variable -/* 89B088 80240D38 0040902D */ daddu $s2, $v0, $zero -/* 89B08C 80240D3C AFA00028 */ sw $zero, 0x28($sp) -/* 89B090 80240D40 8E2300D0 */ lw $v1, 0xd0($s1) -/* 89B094 80240D44 8C630030 */ lw $v1, 0x30($v1) -/* 89B098 80240D48 AFA3002C */ sw $v1, 0x2c($sp) -/* 89B09C 80240D4C 8E2300D0 */ lw $v1, 0xd0($s1) -/* 89B0A0 80240D50 8C63001C */ lw $v1, 0x1c($v1) -/* 89B0A4 80240D54 AFA30030 */ sw $v1, 0x30($sp) -/* 89B0A8 80240D58 8E2300D0 */ lw $v1, 0xd0($s1) -/* 89B0AC 80240D5C 8C630024 */ lw $v1, 0x24($v1) -/* 89B0B0 80240D60 AFA30034 */ sw $v1, 0x34($sp) -/* 89B0B4 80240D64 8E2300D0 */ lw $v1, 0xd0($s1) -/* 89B0B8 80240D68 8C630028 */ lw $v1, 0x28($v1) -/* 89B0BC 80240D6C 27B50028 */ addiu $s5, $sp, 0x28 -/* 89B0C0 80240D70 AFA30038 */ sw $v1, 0x38($sp) -/* 89B0C4 80240D74 8E2300D0 */ lw $v1, 0xd0($s1) -/* 89B0C8 80240D78 3C0142C8 */ lui $at, 0x42c8 -/* 89B0CC 80240D7C 44810000 */ mtc1 $at, $f0 -/* 89B0D0 80240D80 8C63002C */ lw $v1, 0x2c($v1) -/* 89B0D4 80240D84 0040A02D */ daddu $s4, $v0, $zero -/* 89B0D8 80240D88 E7A00040 */ swc1 $f0, 0x40($sp) -/* 89B0DC 80240D8C A7A00044 */ sh $zero, 0x44($sp) -/* 89B0E0 80240D90 12000009 */ beqz $s0, .L80240DB8 -/* 89B0E4 80240D94 AFA3003C */ sw $v1, 0x3c($sp) -/* 89B0E8 80240D98 864300A8 */ lh $v1, 0xa8($s2) -/* 89B0EC 80240D9C 8E2200B0 */ lw $v0, 0xb0($s1) -/* 89B0F0 80240DA0 AE20008C */ sw $zero, 0x8c($s1) -/* 89B0F4 80240DA4 A22000B5 */ sb $zero, 0xb5($s1) -/* 89B0F8 80240DA8 34420008 */ ori $v0, $v0, 8 -/* 89B0FC 80240DAC AE230084 */ sw $v1, 0x84($s1) -/* 89B100 80240DB0 08090372 */ j .L80240DC8 -/* 89B104 80240DB4 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240DB8: -/* 89B108 80240DB8 8E2200B0 */ lw $v0, 0xb0($s1) -/* 89B10C 80240DBC 30420004 */ andi $v0, $v0, 4 -/* 89B110 80240DC0 10400047 */ beqz $v0, .L80240EE0 -/* 89B114 80240DC4 00000000 */ nop -.L80240DC8: -/* 89B118 80240DC8 AE600070 */ sw $zero, 0x70($s3) -/* 89B11C 80240DCC A640008E */ sh $zero, 0x8e($s2) -/* 89B120 80240DD0 8E2300CC */ lw $v1, 0xcc($s1) -/* 89B124 80240DD4 2404F7FF */ addiu $a0, $zero, -0x801 -/* 89B128 80240DD8 A2200007 */ sb $zero, 7($s1) -/* 89B12C 80240DDC 8E420000 */ lw $v0, ($s2) -/* 89B130 80240DE0 8C630000 */ lw $v1, ($v1) -/* 89B134 80240DE4 00441024 */ and $v0, $v0, $a0 -/* 89B138 80240DE8 AE420000 */ sw $v0, ($s2) -/* 89B13C 80240DEC AE430028 */ sw $v1, 0x28($s2) -/* 89B140 80240DF0 96220086 */ lhu $v0, 0x86($s1) -/* 89B144 80240DF4 A64200A8 */ sh $v0, 0xa8($s2) -/* 89B148 80240DF8 8E2200D0 */ lw $v0, 0xd0($s1) -/* 89B14C 80240DFC AE200090 */ sw $zero, 0x90($s1) -/* 89B150 80240E00 8C420034 */ lw $v0, 0x34($v0) -/* 89B154 80240E04 14400006 */ bnez $v0, .L80240E20 -/* 89B158 80240E08 2403FDFF */ addiu $v1, $zero, -0x201 -/* 89B15C 80240E0C 8E420000 */ lw $v0, ($s2) -/* 89B160 80240E10 2403FFF7 */ addiu $v1, $zero, -9 -/* 89B164 80240E14 34420200 */ ori $v0, $v0, 0x200 -/* 89B168 80240E18 0809038B */ j .L80240E2C -/* 89B16C 80240E1C 00431024 */ and $v0, $v0, $v1 -.L80240E20: -/* 89B170 80240E20 8E420000 */ lw $v0, ($s2) -/* 89B174 80240E24 00431024 */ and $v0, $v0, $v1 -/* 89B178 80240E28 34420008 */ ori $v0, $v0, 8 -.L80240E2C: -/* 89B17C 80240E2C AE420000 */ sw $v0, ($s2) -/* 89B180 80240E30 8E2200B0 */ lw $v0, 0xb0($s1) -/* 89B184 80240E34 30420004 */ andi $v0, $v0, 4 -/* 89B188 80240E38 1040001E */ beqz $v0, .L80240EB4 -/* 89B18C 80240E3C 24040002 */ addiu $a0, $zero, 2 -/* 89B190 80240E40 0240282D */ daddu $a1, $s2, $zero -/* 89B194 80240E44 0000302D */ daddu $a2, $zero, $zero -/* 89B198 80240E48 24020063 */ addiu $v0, $zero, 0x63 -/* 89B19C 80240E4C AE620070 */ sw $v0, 0x70($s3) -/* 89B1A0 80240E50 AE600074 */ sw $zero, 0x74($s3) -/* 89B1A4 80240E54 864300A8 */ lh $v1, 0xa8($s2) -/* 89B1A8 80240E58 3C013F80 */ lui $at, 0x3f80 -/* 89B1AC 80240E5C 44810000 */ mtc1 $at, $f0 -/* 89B1B0 80240E60 3C014000 */ lui $at, 0x4000 -/* 89B1B4 80240E64 44811000 */ mtc1 $at, $f2 -/* 89B1B8 80240E68 3C01C1A0 */ lui $at, 0xc1a0 -/* 89B1BC 80240E6C 44812000 */ mtc1 $at, $f4 -/* 89B1C0 80240E70 24020028 */ addiu $v0, $zero, 0x28 -/* 89B1C4 80240E74 AFA2001C */ sw $v0, 0x1c($sp) -/* 89B1C8 80240E78 44833000 */ mtc1 $v1, $f6 -/* 89B1CC 80240E7C 00000000 */ nop -/* 89B1D0 80240E80 468031A0 */ cvt.s.w $f6, $f6 -/* 89B1D4 80240E84 44073000 */ mfc1 $a3, $f6 -/* 89B1D8 80240E88 27A20048 */ addiu $v0, $sp, 0x48 -/* 89B1DC 80240E8C AFA20020 */ sw $v0, 0x20($sp) -/* 89B1E0 80240E90 E7A00010 */ swc1 $f0, 0x10($sp) -/* 89B1E4 80240E94 E7A20014 */ swc1 $f2, 0x14($sp) -/* 89B1E8 80240E98 0C01BFA4 */ jal fx_emote -/* 89B1EC 80240E9C E7A40018 */ swc1 $f4, 0x18($sp) -/* 89B1F0 80240EA0 8E2200B0 */ lw $v0, 0xb0($s1) -/* 89B1F4 80240EA4 2403FFFB */ addiu $v1, $zero, -5 -/* 89B1F8 80240EA8 00431024 */ and $v0, $v0, $v1 -/* 89B1FC 80240EAC 080903B8 */ j .L80240EE0 -/* 89B200 80240EB0 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240EB4: -/* 89B204 80240EB4 8E220000 */ lw $v0, ($s1) -/* 89B208 80240EB8 3C034000 */ lui $v1, 0x4000 -/* 89B20C 80240EBC 00431024 */ and $v0, $v0, $v1 -/* 89B210 80240EC0 10400007 */ beqz $v0, .L80240EE0 -/* 89B214 80240EC4 3C03BFFF */ lui $v1, 0xbfff -/* 89B218 80240EC8 2402000C */ addiu $v0, $zero, 0xc -/* 89B21C 80240ECC AE620070 */ sw $v0, 0x70($s3) -/* 89B220 80240ED0 8E220000 */ lw $v0, ($s1) -/* 89B224 80240ED4 3463FFFF */ ori $v1, $v1, 0xffff -/* 89B228 80240ED8 00431024 */ and $v0, $v0, $v1 -/* 89B22C 80240EDC AE220000 */ sw $v0, ($s1) -.L80240EE0: -/* 89B230 80240EE0 8E220090 */ lw $v0, 0x90($s1) -/* 89B234 80240EE4 1840000C */ blez $v0, .L80240F18 -/* 89B238 80240EE8 2442FFFF */ addiu $v0, $v0, -1 -/* 89B23C 80240EEC 14400087 */ bnez $v0, .L8024110C_89B45C -/* 89B240 80240EF0 AE220090 */ sw $v0, 0x90($s1) -/* 89B244 80240EF4 3C03FFAA */ lui $v1, 0xffaa -/* 89B248 80240EF8 8E420028 */ lw $v0, 0x28($s2) -/* 89B24C 80240EFC 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* 89B250 80240F00 00431021 */ addu $v0, $v0, $v1 -/* 89B254 80240F04 2C420002 */ sltiu $v0, $v0, 2 -/* 89B258 80240F08 10400003 */ beqz $v0, .L80240F18 -/* 89B25C 80240F0C 3C020055 */ lui $v0, 0x55 -/* 89B260 80240F10 3442000C */ ori $v0, $v0, 0xc -/* 89B264 80240F14 AE420028 */ sw $v0, 0x28($s2) -.L80240F18: -/* 89B268 80240F18 8E630070 */ lw $v1, 0x70($s3) -/* 89B26C 80240F1C 2402000C */ addiu $v0, $zero, 0xc -/* 89B270 80240F20 10620048 */ beq $v1, $v0, .L80241044 -/* 89B274 80240F24 2862000D */ slti $v0, $v1, 0xd -/* 89B278 80240F28 1040000F */ beqz $v0, .L80240F68 -/* 89B27C 80240F2C 24100001 */ addiu $s0, $zero, 1 -/* 89B280 80240F30 1070001E */ beq $v1, $s0, .L80240FAC -/* 89B284 80240F34 28620002 */ slti $v0, $v1, 2 -/* 89B288 80240F38 10400005 */ beqz $v0, .L80240F50 -/* 89B28C 80240F3C 24020002 */ addiu $v0, $zero, 2 -/* 89B290 80240F40 10600015 */ beqz $v1, .L80240F98 -/* 89B294 80240F44 0260202D */ daddu $a0, $s3, $zero -/* 89B298 80240F48 08090428 */ j .L802410A0 -/* 89B29C 80240F4C 00000000 */ nop -.L80240F50: -/* 89B2A0 80240F50 1062001C */ beq $v1, $v0, .L80240FC4 -/* 89B2A4 80240F54 24020003 */ addiu $v0, $zero, 3 -/* 89B2A8 80240F58 10620035 */ beq $v1, $v0, .L80241030 -/* 89B2AC 80240F5C 0260202D */ daddu $a0, $s3, $zero -/* 89B2B0 80240F60 08090428 */ j .L802410A0 -/* 89B2B4 80240F64 00000000 */ nop -.L80240F68: -/* 89B2B8 80240F68 2402000E */ addiu $v0, $zero, 0xe -/* 89B2BC 80240F6C 1062003F */ beq $v1, $v0, .L8024106C -/* 89B2C0 80240F70 0062102A */ slt $v0, $v1, $v0 -/* 89B2C4 80240F74 14400038 */ bnez $v0, .L80241058 -/* 89B2C8 80240F78 0260202D */ daddu $a0, $s3, $zero -/* 89B2CC 80240F7C 2402000F */ addiu $v0, $zero, 0xf -/* 89B2D0 80240F80 10620040 */ beq $v1, $v0, .L80241084 -/* 89B2D4 80240F84 24020063 */ addiu $v0, $zero, 0x63 -/* 89B2D8 80240F88 10620043 */ beq $v1, $v0, .L80241098 -/* 89B2DC 80240F8C 00000000 */ nop -/* 89B2E0 80240F90 08090428 */ j .L802410A0 -/* 89B2E4 80240F94 00000000 */ nop -.L80240F98: -/* 89B2E8 80240F98 0280282D */ daddu $a1, $s4, $zero -/* 89B2EC 80240F9C 0C012568 */ jal func_800495A0 -/* 89B2F0 80240FA0 02A0302D */ daddu $a2, $s5, $zero -/* 89B2F4 80240FA4 96220086 */ lhu $v0, 0x86($s1) -/* 89B2F8 80240FA8 A64200A8 */ sh $v0, 0xa8($s2) -.L80240FAC: -/* 89B2FC 80240FAC 0260202D */ daddu $a0, $s3, $zero -/* 89B300 80240FB0 0280282D */ daddu $a1, $s4, $zero -/* 89B304 80240FB4 0C0125AE */ jal func_800496B8 -/* 89B308 80240FB8 02A0302D */ daddu $a2, $s5, $zero -/* 89B30C 80240FBC 08090428 */ j .L802410A0 -/* 89B310 80240FC0 00000000 */ nop -.L80240FC4: -/* 89B314 80240FC4 0260202D */ daddu $a0, $s3, $zero -/* 89B318 80240FC8 0280282D */ daddu $a1, $s4, $zero -/* 89B31C 80240FCC 0C0126D1 */ jal base_UnkNpcAIFunc1 -/* 89B320 80240FD0 02A0302D */ daddu $a2, $s5, $zero -/* 89B324 80240FD4 8E230088 */ lw $v1, 0x88($s1) -/* 89B328 80240FD8 24020006 */ addiu $v0, $zero, 6 -/* 89B32C 80240FDC 14620014 */ bne $v1, $v0, .L80241030 -/* 89B330 80240FE0 0260202D */ daddu $a0, $s3, $zero -/* 89B334 80240FE4 0C00A67F */ jal rand_int -/* 89B338 80240FE8 24040064 */ addiu $a0, $zero, 0x64 -/* 89B33C 80240FEC 28420021 */ slti $v0, $v0, 0x21 -/* 89B340 80240FF0 5040000F */ beql $v0, $zero, .L80241030 -/* 89B344 80240FF4 0260202D */ daddu $a0, $s3, $zero -/* 89B348 80240FF8 8E22008C */ lw $v0, 0x8c($s1) -/* 89B34C 80240FFC 10400005 */ beqz $v0, .L80241014 -/* 89B350 80241000 3C020055 */ lui $v0, 0x55 -/* 89B354 80241004 3442002F */ ori $v0, $v0, 0x2f -/* 89B358 80241008 AE20008C */ sw $zero, 0x8c($s1) -/* 89B35C 8024100C 08090408 */ j .L80241020 -/* 89B360 80241010 A22000B5 */ sb $zero, 0xb5($s1) -.L80241014: -/* 89B364 80241014 3442002E */ ori $v0, $v0, 0x2e -/* 89B368 80241018 AE30008C */ sw $s0, 0x8c($s1) -/* 89B36C 8024101C A23000B5 */ sb $s0, 0xb5($s1) -.L80241020: -/* 89B370 80241020 AE420028 */ sw $v0, 0x28($s2) -/* 89B374 80241024 24020007 */ addiu $v0, $zero, 7 -/* 89B378 80241028 08090443 */ j .L8024110C_89B45C -/* 89B37C 8024102C AE220090 */ sw $v0, 0x90($s1) -.L80241030: -/* 89B380 80241030 0280282D */ daddu $a1, $s4, $zero -/* 89B384 80241034 0C012701 */ jal func_80049C04 -/* 89B388 80241038 02A0302D */ daddu $a2, $s5, $zero -/* 89B38C 8024103C 08090428 */ j .L802410A0 -/* 89B390 80241040 00000000 */ nop -.L80241044: -/* 89B394 80241044 0260202D */ daddu $a0, $s3, $zero -/* 89B398 80241048 0280282D */ daddu $a1, $s4, $zero -/* 89B39C 8024104C 0C090258 */ jal tik_20_set_script_owner_npc_anim -/* 89B3A0 80241050 02A0302D */ daddu $a2, $s5, $zero -/* 89B3A4 80241054 0260202D */ daddu $a0, $s3, $zero -.L80241058: -/* 89B3A8 80241058 0280282D */ daddu $a1, $s4, $zero -/* 89B3AC 8024105C 0C090277 */ jal tik_20_UnkDistFunc -/* 89B3B0 80241060 02A0302D */ daddu $a2, $s5, $zero -/* 89B3B4 80241064 08090428 */ j .L802410A0 -/* 89B3B8 80241068 00000000 */ nop -.L8024106C: -/* 89B3BC 8024106C 0260202D */ daddu $a0, $s3, $zero -/* 89B3C0 80241070 0280282D */ daddu $a1, $s4, $zero -/* 89B3C4 80241074 0C0902C4 */ jal tik_20_UnkNpcAIFunc12 -/* 89B3C8 80241078 02A0302D */ daddu $a2, $s5, $zero -/* 89B3CC 8024107C 08090428 */ j .L802410A0 -/* 89B3D0 80241080 00000000 */ nop -.L80241084: -/* 89B3D4 80241084 0280282D */ daddu $a1, $s4, $zero -/* 89B3D8 80241088 0C09031D */ jal tik_20_set_script_owner_npc_col_height -/* 89B3DC 8024108C 02A0302D */ daddu $a2, $s5, $zero -/* 89B3E0 80241090 08090428 */ j .L802410A0 -/* 89B3E4 80241094 00000000 */ nop -.L80241098: -/* 89B3E8 80241098 0C0129CF */ jal func_8004A73C -/* 89B3EC 8024109C 0260202D */ daddu $a0, $s3, $zero -.L802410A0: -/* 89B3F0 802410A0 8E230088 */ lw $v1, 0x88($s1) -/* 89B3F4 802410A4 24020006 */ addiu $v0, $zero, 6 -/* 89B3F8 802410A8 14620019 */ bne $v1, $v0, .L80241110 -/* 89B3FC 802410AC 0000102D */ daddu $v0, $zero, $zero -/* 89B400 802410B0 8E22008C */ lw $v0, 0x8c($s1) -/* 89B404 802410B4 10400003 */ beqz $v0, .L802410C4 -/* 89B408 802410B8 24020001 */ addiu $v0, $zero, 1 -/* 89B40C 802410BC 08090432 */ j .L802410C8 -/* 89B410 802410C0 A22200B5 */ sb $v0, 0xb5($s1) -.L802410C4: -/* 89B414 802410C4 A22000B5 */ sb $zero, 0xb5($s1) -.L802410C8: -/* 89B418 802410C8 8E22008C */ lw $v0, 0x8c($s1) -/* 89B41C 802410CC 1040000F */ beqz $v0, .L8024110C_89B45C -/* 89B420 802410D0 3C03FFAA */ lui $v1, 0xffaa -/* 89B424 802410D4 8E420028 */ lw $v0, 0x28($s2) -/* 89B428 802410D8 3463FFFC */ ori $v1, $v1, 0xfffc -/* 89B42C 802410DC 00431821 */ addu $v1, $v0, $v1 -/* 89B430 802410E0 2C620015 */ sltiu $v0, $v1, 0x15 -/* 89B434 802410E4 10400009 */ beqz $v0, .L8024110C_89B45C -/* 89B438 802410E8 00031080 */ sll $v0, $v1, 2 -/* 89B43C 802410EC 3C018024 */ lui $at, %hi(jtbl_802433F8_89D748) -/* 89B440 802410F0 00220821 */ addu $at, $at, $v0 -/* 89B444 802410F4 8C2233F8 */ lw $v0, %lo(jtbl_802433F8_89D748)($at) -/* 89B448 802410F8 00400008 */ jr $v0 -/* 89B44C 802410FC 00000000 */ nop -.L80241100_89B450: -/* 89B450 80241100 8E420028 */ lw $v0, 0x28($s2) -/* 89B454 80241104 24420001 */ addiu $v0, $v0, 1 -/* 89B458 80241108 AE420028 */ sw $v0, 0x28($s2) -.L8024110C_89B45C: -/* 89B45C 8024110C 0000102D */ daddu $v0, $zero, $zero -.L80241110: -/* 89B460 80241110 8FBF0068 */ lw $ra, 0x68($sp) -/* 89B464 80241114 8FB50064 */ lw $s5, 0x64($sp) -/* 89B468 80241118 8FB40060 */ lw $s4, 0x60($sp) -/* 89B46C 8024111C 8FB3005C */ lw $s3, 0x5c($sp) -/* 89B470 80241120 8FB20058 */ lw $s2, 0x58($sp) -/* 89B474 80241124 8FB10054 */ lw $s1, 0x54($sp) -/* 89B478 80241128 8FB00050 */ lw $s0, 0x50($sp) -/* 89B47C 8024112C 03E00008 */ jr $ra -/* 89B480 80241130 27BD0070 */ addiu $sp, $sp, 0x70 -/* 89B484 80241134 00000000 */ nop -/* 89B488 80241138 00000000 */ nop -/* 89B48C 8024113C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_23/8A2D30/func_80240CF4_8A30C4.s b/ver/us/asm/nonmatchings/world/area_tik/tik_23/8A2D30/func_80240CF4_8A30C4.s deleted file mode 100644 index 11282e9c44..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_23/8A2D30/func_80240CF4_8A30C4.s +++ /dev/null @@ -1,312 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80243658_8A5A28 -.word .L80241100_8A34D0, .L8024110C_8A34DC, .L8024110C_8A34DC, .L8024110C_8A34DC, .L8024110C_8A34DC, .L8024110C_8A34DC, .L8024110C_8A34DC, .L8024110C_8A34DC, .L80241100_8A34D0, .L8024110C_8A34DC, .L80241100_8A34D0, .L8024110C_8A34DC, .L80241100_8A34D0, .L8024110C_8A34DC, .L80241100_8A34D0, .L8024110C_8A34DC, .L8024110C_8A34DC, .L8024110C_8A34DC, .L80241100_8A34D0, .L8024110C_8A34DC, .L80241100_8A34D0, 0 - -.section .text - -glabel func_80240CF4_8A30C4 -/* 8A30C4 80240CF4 27BDFF90 */ addiu $sp, $sp, -0x70 -/* 8A30C8 80240CF8 AFB3005C */ sw $s3, 0x5c($sp) -/* 8A30CC 80240CFC 0080982D */ daddu $s3, $a0, $zero -/* 8A30D0 80240D00 AFBF0068 */ sw $ra, 0x68($sp) -/* 8A30D4 80240D04 AFB50064 */ sw $s5, 0x64($sp) -/* 8A30D8 80240D08 AFB40060 */ sw $s4, 0x60($sp) -/* 8A30DC 80240D0C AFB20058 */ sw $s2, 0x58($sp) -/* 8A30E0 80240D10 AFB10054 */ sw $s1, 0x54($sp) -/* 8A30E4 80240D14 AFB00050 */ sw $s0, 0x50($sp) -/* 8A30E8 80240D18 8E710148 */ lw $s1, 0x148($s3) -/* 8A30EC 80240D1C 86240008 */ lh $a0, 8($s1) -/* 8A30F0 80240D20 0C00EABB */ jal get_npc_unsafe -/* 8A30F4 80240D24 00A0802D */ daddu $s0, $a1, $zero -/* 8A30F8 80240D28 8E63000C */ lw $v1, 0xc($s3) -/* 8A30FC 80240D2C 0260202D */ daddu $a0, $s3, $zero -/* 8A3100 80240D30 8C650000 */ lw $a1, ($v1) -/* 8A3104 80240D34 0C0B1EAF */ jal evt_get_variable -/* 8A3108 80240D38 0040902D */ daddu $s2, $v0, $zero -/* 8A310C 80240D3C AFA00028 */ sw $zero, 0x28($sp) -/* 8A3110 80240D40 8E2300D0 */ lw $v1, 0xd0($s1) -/* 8A3114 80240D44 8C630030 */ lw $v1, 0x30($v1) -/* 8A3118 80240D48 AFA3002C */ sw $v1, 0x2c($sp) -/* 8A311C 80240D4C 8E2300D0 */ lw $v1, 0xd0($s1) -/* 8A3120 80240D50 8C63001C */ lw $v1, 0x1c($v1) -/* 8A3124 80240D54 AFA30030 */ sw $v1, 0x30($sp) -/* 8A3128 80240D58 8E2300D0 */ lw $v1, 0xd0($s1) -/* 8A312C 80240D5C 8C630024 */ lw $v1, 0x24($v1) -/* 8A3130 80240D60 AFA30034 */ sw $v1, 0x34($sp) -/* 8A3134 80240D64 8E2300D0 */ lw $v1, 0xd0($s1) -/* 8A3138 80240D68 8C630028 */ lw $v1, 0x28($v1) -/* 8A313C 80240D6C 27B50028 */ addiu $s5, $sp, 0x28 -/* 8A3140 80240D70 AFA30038 */ sw $v1, 0x38($sp) -/* 8A3144 80240D74 8E2300D0 */ lw $v1, 0xd0($s1) -/* 8A3148 80240D78 3C0142C8 */ lui $at, 0x42c8 -/* 8A314C 80240D7C 44810000 */ mtc1 $at, $f0 -/* 8A3150 80240D80 8C63002C */ lw $v1, 0x2c($v1) -/* 8A3154 80240D84 0040A02D */ daddu $s4, $v0, $zero -/* 8A3158 80240D88 E7A00040 */ swc1 $f0, 0x40($sp) -/* 8A315C 80240D8C A7A00044 */ sh $zero, 0x44($sp) -/* 8A3160 80240D90 12000009 */ beqz $s0, .L80240DB8 -/* 8A3164 80240D94 AFA3003C */ sw $v1, 0x3c($sp) -/* 8A3168 80240D98 864300A8 */ lh $v1, 0xa8($s2) -/* 8A316C 80240D9C 8E2200B0 */ lw $v0, 0xb0($s1) -/* 8A3170 80240DA0 AE20008C */ sw $zero, 0x8c($s1) -/* 8A3174 80240DA4 A22000B5 */ sb $zero, 0xb5($s1) -/* 8A3178 80240DA8 34420008 */ ori $v0, $v0, 8 -/* 8A317C 80240DAC AE230084 */ sw $v1, 0x84($s1) -/* 8A3180 80240DB0 08090372 */ j .L80240DC8 -/* 8A3184 80240DB4 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240DB8: -/* 8A3188 80240DB8 8E2200B0 */ lw $v0, 0xb0($s1) -/* 8A318C 80240DBC 30420004 */ andi $v0, $v0, 4 -/* 8A3190 80240DC0 10400047 */ beqz $v0, .L80240EE0 -/* 8A3194 80240DC4 00000000 */ nop -.L80240DC8: -/* 8A3198 80240DC8 AE600070 */ sw $zero, 0x70($s3) -/* 8A319C 80240DCC A640008E */ sh $zero, 0x8e($s2) -/* 8A31A0 80240DD0 8E2300CC */ lw $v1, 0xcc($s1) -/* 8A31A4 80240DD4 2404F7FF */ addiu $a0, $zero, -0x801 -/* 8A31A8 80240DD8 A2200007 */ sb $zero, 7($s1) -/* 8A31AC 80240DDC 8E420000 */ lw $v0, ($s2) -/* 8A31B0 80240DE0 8C630000 */ lw $v1, ($v1) -/* 8A31B4 80240DE4 00441024 */ and $v0, $v0, $a0 -/* 8A31B8 80240DE8 AE420000 */ sw $v0, ($s2) -/* 8A31BC 80240DEC AE430028 */ sw $v1, 0x28($s2) -/* 8A31C0 80240DF0 96220086 */ lhu $v0, 0x86($s1) -/* 8A31C4 80240DF4 A64200A8 */ sh $v0, 0xa8($s2) -/* 8A31C8 80240DF8 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8A31CC 80240DFC AE200090 */ sw $zero, 0x90($s1) -/* 8A31D0 80240E00 8C420034 */ lw $v0, 0x34($v0) -/* 8A31D4 80240E04 14400006 */ bnez $v0, .L80240E20 -/* 8A31D8 80240E08 2403FDFF */ addiu $v1, $zero, -0x201 -/* 8A31DC 80240E0C 8E420000 */ lw $v0, ($s2) -/* 8A31E0 80240E10 2403FFF7 */ addiu $v1, $zero, -9 -/* 8A31E4 80240E14 34420200 */ ori $v0, $v0, 0x200 -/* 8A31E8 80240E18 0809038B */ j .L80240E2C -/* 8A31EC 80240E1C 00431024 */ and $v0, $v0, $v1 -.L80240E20: -/* 8A31F0 80240E20 8E420000 */ lw $v0, ($s2) -/* 8A31F4 80240E24 00431024 */ and $v0, $v0, $v1 -/* 8A31F8 80240E28 34420008 */ ori $v0, $v0, 8 -.L80240E2C: -/* 8A31FC 80240E2C AE420000 */ sw $v0, ($s2) -/* 8A3200 80240E30 8E2200B0 */ lw $v0, 0xb0($s1) -/* 8A3204 80240E34 30420004 */ andi $v0, $v0, 4 -/* 8A3208 80240E38 1040001E */ beqz $v0, .L80240EB4 -/* 8A320C 80240E3C 24040002 */ addiu $a0, $zero, 2 -/* 8A3210 80240E40 0240282D */ daddu $a1, $s2, $zero -/* 8A3214 80240E44 0000302D */ daddu $a2, $zero, $zero -/* 8A3218 80240E48 24020063 */ addiu $v0, $zero, 0x63 -/* 8A321C 80240E4C AE620070 */ sw $v0, 0x70($s3) -/* 8A3220 80240E50 AE600074 */ sw $zero, 0x74($s3) -/* 8A3224 80240E54 864300A8 */ lh $v1, 0xa8($s2) -/* 8A3228 80240E58 3C013F80 */ lui $at, 0x3f80 -/* 8A322C 80240E5C 44810000 */ mtc1 $at, $f0 -/* 8A3230 80240E60 3C014000 */ lui $at, 0x4000 -/* 8A3234 80240E64 44811000 */ mtc1 $at, $f2 -/* 8A3238 80240E68 3C01C1A0 */ lui $at, 0xc1a0 -/* 8A323C 80240E6C 44812000 */ mtc1 $at, $f4 -/* 8A3240 80240E70 24020028 */ addiu $v0, $zero, 0x28 -/* 8A3244 80240E74 AFA2001C */ sw $v0, 0x1c($sp) -/* 8A3248 80240E78 44833000 */ mtc1 $v1, $f6 -/* 8A324C 80240E7C 00000000 */ nop -/* 8A3250 80240E80 468031A0 */ cvt.s.w $f6, $f6 -/* 8A3254 80240E84 44073000 */ mfc1 $a3, $f6 -/* 8A3258 80240E88 27A20048 */ addiu $v0, $sp, 0x48 -/* 8A325C 80240E8C AFA20020 */ sw $v0, 0x20($sp) -/* 8A3260 80240E90 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8A3264 80240E94 E7A20014 */ swc1 $f2, 0x14($sp) -/* 8A3268 80240E98 0C01BFA4 */ jal fx_emote -/* 8A326C 80240E9C E7A40018 */ swc1 $f4, 0x18($sp) -/* 8A3270 80240EA0 8E2200B0 */ lw $v0, 0xb0($s1) -/* 8A3274 80240EA4 2403FFFB */ addiu $v1, $zero, -5 -/* 8A3278 80240EA8 00431024 */ and $v0, $v0, $v1 -/* 8A327C 80240EAC 080903B8 */ j .L80240EE0 -/* 8A3280 80240EB0 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240EB4: -/* 8A3284 80240EB4 8E220000 */ lw $v0, ($s1) -/* 8A3288 80240EB8 3C034000 */ lui $v1, 0x4000 -/* 8A328C 80240EBC 00431024 */ and $v0, $v0, $v1 -/* 8A3290 80240EC0 10400007 */ beqz $v0, .L80240EE0 -/* 8A3294 80240EC4 3C03BFFF */ lui $v1, 0xbfff -/* 8A3298 80240EC8 2402000C */ addiu $v0, $zero, 0xc -/* 8A329C 80240ECC AE620070 */ sw $v0, 0x70($s3) -/* 8A32A0 80240ED0 8E220000 */ lw $v0, ($s1) -/* 8A32A4 80240ED4 3463FFFF */ ori $v1, $v1, 0xffff -/* 8A32A8 80240ED8 00431024 */ and $v0, $v0, $v1 -/* 8A32AC 80240EDC AE220000 */ sw $v0, ($s1) -.L80240EE0: -/* 8A32B0 80240EE0 8E220090 */ lw $v0, 0x90($s1) -/* 8A32B4 80240EE4 1840000C */ blez $v0, .L80240F18 -/* 8A32B8 80240EE8 2442FFFF */ addiu $v0, $v0, -1 -/* 8A32BC 80240EEC 14400087 */ bnez $v0, .L8024110C_8A34DC -/* 8A32C0 80240EF0 AE220090 */ sw $v0, 0x90($s1) -/* 8A32C4 80240EF4 3C03FFAA */ lui $v1, 0xffaa -/* 8A32C8 80240EF8 8E420028 */ lw $v0, 0x28($s2) -/* 8A32CC 80240EFC 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* 8A32D0 80240F00 00431021 */ addu $v0, $v0, $v1 -/* 8A32D4 80240F04 2C420002 */ sltiu $v0, $v0, 2 -/* 8A32D8 80240F08 10400003 */ beqz $v0, .L80240F18 -/* 8A32DC 80240F0C 3C020055 */ lui $v0, 0x55 -/* 8A32E0 80240F10 3442000C */ ori $v0, $v0, 0xc -/* 8A32E4 80240F14 AE420028 */ sw $v0, 0x28($s2) -.L80240F18: -/* 8A32E8 80240F18 8E630070 */ lw $v1, 0x70($s3) -/* 8A32EC 80240F1C 2402000C */ addiu $v0, $zero, 0xc -/* 8A32F0 80240F20 10620048 */ beq $v1, $v0, .L80241044 -/* 8A32F4 80240F24 2862000D */ slti $v0, $v1, 0xd -/* 8A32F8 80240F28 1040000F */ beqz $v0, .L80240F68 -/* 8A32FC 80240F2C 24100001 */ addiu $s0, $zero, 1 -/* 8A3300 80240F30 1070001E */ beq $v1, $s0, .L80240FAC -/* 8A3304 80240F34 28620002 */ slti $v0, $v1, 2 -/* 8A3308 80240F38 10400005 */ beqz $v0, .L80240F50 -/* 8A330C 80240F3C 24020002 */ addiu $v0, $zero, 2 -/* 8A3310 80240F40 10600015 */ beqz $v1, .L80240F98 -/* 8A3314 80240F44 0260202D */ daddu $a0, $s3, $zero -/* 8A3318 80240F48 08090428 */ j .L802410A0 -/* 8A331C 80240F4C 00000000 */ nop -.L80240F50: -/* 8A3320 80240F50 1062001C */ beq $v1, $v0, .L80240FC4 -/* 8A3324 80240F54 24020003 */ addiu $v0, $zero, 3 -/* 8A3328 80240F58 10620035 */ beq $v1, $v0, .L80241030 -/* 8A332C 80240F5C 0260202D */ daddu $a0, $s3, $zero -/* 8A3330 80240F60 08090428 */ j .L802410A0 -/* 8A3334 80240F64 00000000 */ nop -.L80240F68: -/* 8A3338 80240F68 2402000E */ addiu $v0, $zero, 0xe -/* 8A333C 80240F6C 1062003F */ beq $v1, $v0, .L8024106C -/* 8A3340 80240F70 0062102A */ slt $v0, $v1, $v0 -/* 8A3344 80240F74 14400038 */ bnez $v0, .L80241058 -/* 8A3348 80240F78 0260202D */ daddu $a0, $s3, $zero -/* 8A334C 80240F7C 2402000F */ addiu $v0, $zero, 0xf -/* 8A3350 80240F80 10620040 */ beq $v1, $v0, .L80241084 -/* 8A3354 80240F84 24020063 */ addiu $v0, $zero, 0x63 -/* 8A3358 80240F88 10620043 */ beq $v1, $v0, .L80241098 -/* 8A335C 80240F8C 00000000 */ nop -/* 8A3360 80240F90 08090428 */ j .L802410A0 -/* 8A3364 80240F94 00000000 */ nop -.L80240F98: -/* 8A3368 80240F98 0280282D */ daddu $a1, $s4, $zero -/* 8A336C 80240F9C 0C012568 */ jal func_800495A0 -/* 8A3370 80240FA0 02A0302D */ daddu $a2, $s5, $zero -/* 8A3374 80240FA4 96220086 */ lhu $v0, 0x86($s1) -/* 8A3378 80240FA8 A64200A8 */ sh $v0, 0xa8($s2) -.L80240FAC: -/* 8A337C 80240FAC 0260202D */ daddu $a0, $s3, $zero -/* 8A3380 80240FB0 0280282D */ daddu $a1, $s4, $zero -/* 8A3384 80240FB4 0C0125AE */ jal func_800496B8 -/* 8A3388 80240FB8 02A0302D */ daddu $a2, $s5, $zero -/* 8A338C 80240FBC 08090428 */ j .L802410A0 -/* 8A3390 80240FC0 00000000 */ nop -.L80240FC4: -/* 8A3394 80240FC4 0260202D */ daddu $a0, $s3, $zero -/* 8A3398 80240FC8 0280282D */ daddu $a1, $s4, $zero -/* 8A339C 80240FCC 0C0126D1 */ jal base_UnkNpcAIFunc1 -/* 8A33A0 80240FD0 02A0302D */ daddu $a2, $s5, $zero -/* 8A33A4 80240FD4 8E230088 */ lw $v1, 0x88($s1) -/* 8A33A8 80240FD8 24020006 */ addiu $v0, $zero, 6 -/* 8A33AC 80240FDC 14620014 */ bne $v1, $v0, .L80241030 -/* 8A33B0 80240FE0 0260202D */ daddu $a0, $s3, $zero -/* 8A33B4 80240FE4 0C00A67F */ jal rand_int -/* 8A33B8 80240FE8 24040064 */ addiu $a0, $zero, 0x64 -/* 8A33BC 80240FEC 28420021 */ slti $v0, $v0, 0x21 -/* 8A33C0 80240FF0 5040000F */ beql $v0, $zero, .L80241030 -/* 8A33C4 80240FF4 0260202D */ daddu $a0, $s3, $zero -/* 8A33C8 80240FF8 8E22008C */ lw $v0, 0x8c($s1) -/* 8A33CC 80240FFC 10400005 */ beqz $v0, .L80241014 -/* 8A33D0 80241000 3C020055 */ lui $v0, 0x55 -/* 8A33D4 80241004 3442002F */ ori $v0, $v0, 0x2f -/* 8A33D8 80241008 AE20008C */ sw $zero, 0x8c($s1) -/* 8A33DC 8024100C 08090408 */ j .L80241020 -/* 8A33E0 80241010 A22000B5 */ sb $zero, 0xb5($s1) -.L80241014: -/* 8A33E4 80241014 3442002E */ ori $v0, $v0, 0x2e -/* 8A33E8 80241018 AE30008C */ sw $s0, 0x8c($s1) -/* 8A33EC 8024101C A23000B5 */ sb $s0, 0xb5($s1) -.L80241020: -/* 8A33F0 80241020 AE420028 */ sw $v0, 0x28($s2) -/* 8A33F4 80241024 24020007 */ addiu $v0, $zero, 7 -/* 8A33F8 80241028 08090443 */ j .L8024110C_8A34DC -/* 8A33FC 8024102C AE220090 */ sw $v0, 0x90($s1) -.L80241030: -/* 8A3400 80241030 0280282D */ daddu $a1, $s4, $zero -/* 8A3404 80241034 0C012701 */ jal func_80049C04 -/* 8A3408 80241038 02A0302D */ daddu $a2, $s5, $zero -/* 8A340C 8024103C 08090428 */ j .L802410A0 -/* 8A3410 80241040 00000000 */ nop -.L80241044: -/* 8A3414 80241044 0260202D */ daddu $a0, $s3, $zero -/* 8A3418 80241048 0280282D */ daddu $a1, $s4, $zero -/* 8A341C 8024104C 0C090258 */ jal tik_23_set_script_owner_npc_anim -/* 8A3420 80241050 02A0302D */ daddu $a2, $s5, $zero -/* 8A3424 80241054 0260202D */ daddu $a0, $s3, $zero -.L80241058: -/* 8A3428 80241058 0280282D */ daddu $a1, $s4, $zero -/* 8A342C 8024105C 0C090277 */ jal tik_23_UnkDistFunc -/* 8A3430 80241060 02A0302D */ daddu $a2, $s5, $zero -/* 8A3434 80241064 08090428 */ j .L802410A0 -/* 8A3438 80241068 00000000 */ nop -.L8024106C: -/* 8A343C 8024106C 0260202D */ daddu $a0, $s3, $zero -/* 8A3440 80241070 0280282D */ daddu $a1, $s4, $zero -/* 8A3444 80241074 0C0902C4 */ jal tik_23_UnkNpcAIFunc12 -/* 8A3448 80241078 02A0302D */ daddu $a2, $s5, $zero -/* 8A344C 8024107C 08090428 */ j .L802410A0 -/* 8A3450 80241080 00000000 */ nop -.L80241084: -/* 8A3454 80241084 0280282D */ daddu $a1, $s4, $zero -/* 8A3458 80241088 0C09031D */ jal tik_23_set_script_owner_npc_col_height -/* 8A345C 8024108C 02A0302D */ daddu $a2, $s5, $zero -/* 8A3460 80241090 08090428 */ j .L802410A0 -/* 8A3464 80241094 00000000 */ nop -.L80241098: -/* 8A3468 80241098 0C0129CF */ jal func_8004A73C -/* 8A346C 8024109C 0260202D */ daddu $a0, $s3, $zero -.L802410A0: -/* 8A3470 802410A0 8E230088 */ lw $v1, 0x88($s1) -/* 8A3474 802410A4 24020006 */ addiu $v0, $zero, 6 -/* 8A3478 802410A8 14620019 */ bne $v1, $v0, .L80241110 -/* 8A347C 802410AC 0000102D */ daddu $v0, $zero, $zero -/* 8A3480 802410B0 8E22008C */ lw $v0, 0x8c($s1) -/* 8A3484 802410B4 10400003 */ beqz $v0, .L802410C4 -/* 8A3488 802410B8 24020001 */ addiu $v0, $zero, 1 -/* 8A348C 802410BC 08090432 */ j .L802410C8 -/* 8A3490 802410C0 A22200B5 */ sb $v0, 0xb5($s1) -.L802410C4: -/* 8A3494 802410C4 A22000B5 */ sb $zero, 0xb5($s1) -.L802410C8: -/* 8A3498 802410C8 8E22008C */ lw $v0, 0x8c($s1) -/* 8A349C 802410CC 1040000F */ beqz $v0, .L8024110C_8A34DC -/* 8A34A0 802410D0 3C03FFAA */ lui $v1, 0xffaa -/* 8A34A4 802410D4 8E420028 */ lw $v0, 0x28($s2) -/* 8A34A8 802410D8 3463FFFC */ ori $v1, $v1, 0xfffc -/* 8A34AC 802410DC 00431821 */ addu $v1, $v0, $v1 -/* 8A34B0 802410E0 2C620015 */ sltiu $v0, $v1, 0x15 -/* 8A34B4 802410E4 10400009 */ beqz $v0, .L8024110C_8A34DC -/* 8A34B8 802410E8 00031080 */ sll $v0, $v1, 2 -/* 8A34BC 802410EC 3C018024 */ lui $at, %hi(jtbl_80243658_8A5A28) -/* 8A34C0 802410F0 00220821 */ addu $at, $at, $v0 -/* 8A34C4 802410F4 8C223658 */ lw $v0, %lo(jtbl_80243658_8A5A28)($at) -/* 8A34C8 802410F8 00400008 */ jr $v0 -/* 8A34CC 802410FC 00000000 */ nop -.L80241100_8A34D0: -/* 8A34D0 80241100 8E420028 */ lw $v0, 0x28($s2) -/* 8A34D4 80241104 24420001 */ addiu $v0, $v0, 1 -/* 8A34D8 80241108 AE420028 */ sw $v0, 0x28($s2) -.L8024110C_8A34DC: -/* 8A34DC 8024110C 0000102D */ daddu $v0, $zero, $zero -.L80241110: -/* 8A34E0 80241110 8FBF0068 */ lw $ra, 0x68($sp) -/* 8A34E4 80241114 8FB50064 */ lw $s5, 0x64($sp) -/* 8A34E8 80241118 8FB40060 */ lw $s4, 0x60($sp) -/* 8A34EC 8024111C 8FB3005C */ lw $s3, 0x5c($sp) -/* 8A34F0 80241120 8FB20058 */ lw $s2, 0x58($sp) -/* 8A34F4 80241124 8FB10054 */ lw $s1, 0x54($sp) -/* 8A34F8 80241128 8FB00050 */ lw $s0, 0x50($sp) -/* 8A34FC 8024112C 03E00008 */ jr $ra -/* 8A3500 80241130 27BD0070 */ addiu $sp, $sp, 0x70 -/* 8A3504 80241134 00000000 */ nop -/* 8A3508 80241138 00000000 */ nop -/* 8A350C 8024113C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240A64_8A64E4.s b/ver/us/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240A64_8A64E4.s deleted file mode 100644 index 45ab93d1b1..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240A64_8A64E4.s +++ /dev/null @@ -1,312 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_802424A8_8A7F28 -.word .L80240E70_8A68F0, .L80240E7C_8A68FC, .L80240E7C_8A68FC, .L80240E7C_8A68FC, .L80240E7C_8A68FC, .L80240E7C_8A68FC, .L80240E7C_8A68FC, .L80240E7C_8A68FC, .L80240E70_8A68F0, .L80240E7C_8A68FC, .L80240E70_8A68F0, .L80240E7C_8A68FC, .L80240E70_8A68F0, .L80240E7C_8A68FC, .L80240E70_8A68F0, .L80240E7C_8A68FC, .L80240E7C_8A68FC, .L80240E7C_8A68FC, .L80240E70_8A68F0, .L80240E7C_8A68FC, .L80240E70_8A68F0, 0 - -.section .text - -glabel func_80240A64_8A64E4 -/* 8A64E4 80240A64 27BDFF90 */ addiu $sp, $sp, -0x70 -/* 8A64E8 80240A68 AFB3005C */ sw $s3, 0x5c($sp) -/* 8A64EC 80240A6C 0080982D */ daddu $s3, $a0, $zero -/* 8A64F0 80240A70 AFBF0068 */ sw $ra, 0x68($sp) -/* 8A64F4 80240A74 AFB50064 */ sw $s5, 0x64($sp) -/* 8A64F8 80240A78 AFB40060 */ sw $s4, 0x60($sp) -/* 8A64FC 80240A7C AFB20058 */ sw $s2, 0x58($sp) -/* 8A6500 80240A80 AFB10054 */ sw $s1, 0x54($sp) -/* 8A6504 80240A84 AFB00050 */ sw $s0, 0x50($sp) -/* 8A6508 80240A88 8E710148 */ lw $s1, 0x148($s3) -/* 8A650C 80240A8C 86240008 */ lh $a0, 8($s1) -/* 8A6510 80240A90 0C00EABB */ jal get_npc_unsafe -/* 8A6514 80240A94 00A0802D */ daddu $s0, $a1, $zero -/* 8A6518 80240A98 8E63000C */ lw $v1, 0xc($s3) -/* 8A651C 80240A9C 0260202D */ daddu $a0, $s3, $zero -/* 8A6520 80240AA0 8C650000 */ lw $a1, ($v1) -/* 8A6524 80240AA4 0C0B1EAF */ jal evt_get_variable -/* 8A6528 80240AA8 0040902D */ daddu $s2, $v0, $zero -/* 8A652C 80240AAC AFA00028 */ sw $zero, 0x28($sp) -/* 8A6530 80240AB0 8E2300D0 */ lw $v1, 0xd0($s1) -/* 8A6534 80240AB4 8C630030 */ lw $v1, 0x30($v1) -/* 8A6538 80240AB8 AFA3002C */ sw $v1, 0x2c($sp) -/* 8A653C 80240ABC 8E2300D0 */ lw $v1, 0xd0($s1) -/* 8A6540 80240AC0 8C63001C */ lw $v1, 0x1c($v1) -/* 8A6544 80240AC4 AFA30030 */ sw $v1, 0x30($sp) -/* 8A6548 80240AC8 8E2300D0 */ lw $v1, 0xd0($s1) -/* 8A654C 80240ACC 8C630024 */ lw $v1, 0x24($v1) -/* 8A6550 80240AD0 AFA30034 */ sw $v1, 0x34($sp) -/* 8A6554 80240AD4 8E2300D0 */ lw $v1, 0xd0($s1) -/* 8A6558 80240AD8 8C630028 */ lw $v1, 0x28($v1) -/* 8A655C 80240ADC 27B50028 */ addiu $s5, $sp, 0x28 -/* 8A6560 80240AE0 AFA30038 */ sw $v1, 0x38($sp) -/* 8A6564 80240AE4 8E2300D0 */ lw $v1, 0xd0($s1) -/* 8A6568 80240AE8 3C0142C8 */ lui $at, 0x42c8 -/* 8A656C 80240AEC 44810000 */ mtc1 $at, $f0 -/* 8A6570 80240AF0 8C63002C */ lw $v1, 0x2c($v1) -/* 8A6574 80240AF4 0040A02D */ daddu $s4, $v0, $zero -/* 8A6578 80240AF8 E7A00040 */ swc1 $f0, 0x40($sp) -/* 8A657C 80240AFC A7A00044 */ sh $zero, 0x44($sp) -/* 8A6580 80240B00 12000009 */ beqz $s0, .L80240B28 -/* 8A6584 80240B04 AFA3003C */ sw $v1, 0x3c($sp) -/* 8A6588 80240B08 864300A8 */ lh $v1, 0xa8($s2) -/* 8A658C 80240B0C 8E2200B0 */ lw $v0, 0xb0($s1) -/* 8A6590 80240B10 AE20008C */ sw $zero, 0x8c($s1) -/* 8A6594 80240B14 A22000B5 */ sb $zero, 0xb5($s1) -/* 8A6598 80240B18 34420008 */ ori $v0, $v0, 8 -/* 8A659C 80240B1C AE230084 */ sw $v1, 0x84($s1) -/* 8A65A0 80240B20 080902CE */ j .L80240B38 -/* 8A65A4 80240B24 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240B28: -/* 8A65A8 80240B28 8E2200B0 */ lw $v0, 0xb0($s1) -/* 8A65AC 80240B2C 30420004 */ andi $v0, $v0, 4 -/* 8A65B0 80240B30 10400047 */ beqz $v0, .L80240C50 -/* 8A65B4 80240B34 00000000 */ nop -.L80240B38: -/* 8A65B8 80240B38 AE600070 */ sw $zero, 0x70($s3) -/* 8A65BC 80240B3C A640008E */ sh $zero, 0x8e($s2) -/* 8A65C0 80240B40 8E2300CC */ lw $v1, 0xcc($s1) -/* 8A65C4 80240B44 2404F7FF */ addiu $a0, $zero, -0x801 -/* 8A65C8 80240B48 A2200007 */ sb $zero, 7($s1) -/* 8A65CC 80240B4C 8E420000 */ lw $v0, ($s2) -/* 8A65D0 80240B50 8C630000 */ lw $v1, ($v1) -/* 8A65D4 80240B54 00441024 */ and $v0, $v0, $a0 -/* 8A65D8 80240B58 AE420000 */ sw $v0, ($s2) -/* 8A65DC 80240B5C AE430028 */ sw $v1, 0x28($s2) -/* 8A65E0 80240B60 96220086 */ lhu $v0, 0x86($s1) -/* 8A65E4 80240B64 A64200A8 */ sh $v0, 0xa8($s2) -/* 8A65E8 80240B68 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8A65EC 80240B6C AE200090 */ sw $zero, 0x90($s1) -/* 8A65F0 80240B70 8C420034 */ lw $v0, 0x34($v0) -/* 8A65F4 80240B74 14400006 */ bnez $v0, .L80240B90 -/* 8A65F8 80240B78 2403FDFF */ addiu $v1, $zero, -0x201 -/* 8A65FC 80240B7C 8E420000 */ lw $v0, ($s2) -/* 8A6600 80240B80 2403FFF7 */ addiu $v1, $zero, -9 -/* 8A6604 80240B84 34420200 */ ori $v0, $v0, 0x200 -/* 8A6608 80240B88 080902E7 */ j .L80240B9C -/* 8A660C 80240B8C 00431024 */ and $v0, $v0, $v1 -.L80240B90: -/* 8A6610 80240B90 8E420000 */ lw $v0, ($s2) -/* 8A6614 80240B94 00431024 */ and $v0, $v0, $v1 -/* 8A6618 80240B98 34420008 */ ori $v0, $v0, 8 -.L80240B9C: -/* 8A661C 80240B9C AE420000 */ sw $v0, ($s2) -/* 8A6620 80240BA0 8E2200B0 */ lw $v0, 0xb0($s1) -/* 8A6624 80240BA4 30420004 */ andi $v0, $v0, 4 -/* 8A6628 80240BA8 1040001E */ beqz $v0, .L80240C24 -/* 8A662C 80240BAC 24040002 */ addiu $a0, $zero, 2 -/* 8A6630 80240BB0 0240282D */ daddu $a1, $s2, $zero -/* 8A6634 80240BB4 0000302D */ daddu $a2, $zero, $zero -/* 8A6638 80240BB8 24020063 */ addiu $v0, $zero, 0x63 -/* 8A663C 80240BBC AE620070 */ sw $v0, 0x70($s3) -/* 8A6640 80240BC0 AE600074 */ sw $zero, 0x74($s3) -/* 8A6644 80240BC4 864300A8 */ lh $v1, 0xa8($s2) -/* 8A6648 80240BC8 3C013F80 */ lui $at, 0x3f80 -/* 8A664C 80240BCC 44810000 */ mtc1 $at, $f0 -/* 8A6650 80240BD0 3C014000 */ lui $at, 0x4000 -/* 8A6654 80240BD4 44811000 */ mtc1 $at, $f2 -/* 8A6658 80240BD8 3C01C1A0 */ lui $at, 0xc1a0 -/* 8A665C 80240BDC 44812000 */ mtc1 $at, $f4 -/* 8A6660 80240BE0 24020028 */ addiu $v0, $zero, 0x28 -/* 8A6664 80240BE4 AFA2001C */ sw $v0, 0x1c($sp) -/* 8A6668 80240BE8 44833000 */ mtc1 $v1, $f6 -/* 8A666C 80240BEC 00000000 */ nop -/* 8A6670 80240BF0 468031A0 */ cvt.s.w $f6, $f6 -/* 8A6674 80240BF4 44073000 */ mfc1 $a3, $f6 -/* 8A6678 80240BF8 27A20048 */ addiu $v0, $sp, 0x48 -/* 8A667C 80240BFC AFA20020 */ sw $v0, 0x20($sp) -/* 8A6680 80240C00 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8A6684 80240C04 E7A20014 */ swc1 $f2, 0x14($sp) -/* 8A6688 80240C08 0C01BFA4 */ jal fx_emote -/* 8A668C 80240C0C E7A40018 */ swc1 $f4, 0x18($sp) -/* 8A6690 80240C10 8E2200B0 */ lw $v0, 0xb0($s1) -/* 8A6694 80240C14 2403FFFB */ addiu $v1, $zero, -5 -/* 8A6698 80240C18 00431024 */ and $v0, $v0, $v1 -/* 8A669C 80240C1C 08090314 */ j .L80240C50 -/* 8A66A0 80240C20 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240C24: -/* 8A66A4 80240C24 8E220000 */ lw $v0, ($s1) -/* 8A66A8 80240C28 3C034000 */ lui $v1, 0x4000 -/* 8A66AC 80240C2C 00431024 */ and $v0, $v0, $v1 -/* 8A66B0 80240C30 10400007 */ beqz $v0, .L80240C50 -/* 8A66B4 80240C34 3C03BFFF */ lui $v1, 0xbfff -/* 8A66B8 80240C38 2402000C */ addiu $v0, $zero, 0xc -/* 8A66BC 80240C3C AE620070 */ sw $v0, 0x70($s3) -/* 8A66C0 80240C40 8E220000 */ lw $v0, ($s1) -/* 8A66C4 80240C44 3463FFFF */ ori $v1, $v1, 0xffff -/* 8A66C8 80240C48 00431024 */ and $v0, $v0, $v1 -/* 8A66CC 80240C4C AE220000 */ sw $v0, ($s1) -.L80240C50: -/* 8A66D0 80240C50 8E220090 */ lw $v0, 0x90($s1) -/* 8A66D4 80240C54 1840000C */ blez $v0, .L80240C88 -/* 8A66D8 80240C58 2442FFFF */ addiu $v0, $v0, -1 -/* 8A66DC 80240C5C 14400087 */ bnez $v0, .L80240E7C_8A68FC -/* 8A66E0 80240C60 AE220090 */ sw $v0, 0x90($s1) -/* 8A66E4 80240C64 3C03FFAA */ lui $v1, 0xffaa -/* 8A66E8 80240C68 8E420028 */ lw $v0, 0x28($s2) -/* 8A66EC 80240C6C 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* 8A66F0 80240C70 00431021 */ addu $v0, $v0, $v1 -/* 8A66F4 80240C74 2C420002 */ sltiu $v0, $v0, 2 -/* 8A66F8 80240C78 10400003 */ beqz $v0, .L80240C88 -/* 8A66FC 80240C7C 3C020055 */ lui $v0, 0x55 -/* 8A6700 80240C80 3442000C */ ori $v0, $v0, 0xc -/* 8A6704 80240C84 AE420028 */ sw $v0, 0x28($s2) -.L80240C88: -/* 8A6708 80240C88 8E630070 */ lw $v1, 0x70($s3) -/* 8A670C 80240C8C 2402000C */ addiu $v0, $zero, 0xc -/* 8A6710 80240C90 10620048 */ beq $v1, $v0, .L80240DB4 -/* 8A6714 80240C94 2862000D */ slti $v0, $v1, 0xd -/* 8A6718 80240C98 1040000F */ beqz $v0, .L80240CD8 -/* 8A671C 80240C9C 24100001 */ addiu $s0, $zero, 1 -/* 8A6720 80240CA0 1070001E */ beq $v1, $s0, .L80240D1C -/* 8A6724 80240CA4 28620002 */ slti $v0, $v1, 2 -/* 8A6728 80240CA8 10400005 */ beqz $v0, .L80240CC0 -/* 8A672C 80240CAC 24020002 */ addiu $v0, $zero, 2 -/* 8A6730 80240CB0 10600015 */ beqz $v1, .L80240D08 -/* 8A6734 80240CB4 0260202D */ daddu $a0, $s3, $zero -/* 8A6738 80240CB8 08090384 */ j .L80240E10 -/* 8A673C 80240CBC 00000000 */ nop -.L80240CC0: -/* 8A6740 80240CC0 1062001C */ beq $v1, $v0, .L80240D34 -/* 8A6744 80240CC4 24020003 */ addiu $v0, $zero, 3 -/* 8A6748 80240CC8 10620035 */ beq $v1, $v0, .L80240DA0 -/* 8A674C 80240CCC 0260202D */ daddu $a0, $s3, $zero -/* 8A6750 80240CD0 08090384 */ j .L80240E10 -/* 8A6754 80240CD4 00000000 */ nop -.L80240CD8: -/* 8A6758 80240CD8 2402000E */ addiu $v0, $zero, 0xe -/* 8A675C 80240CDC 1062003F */ beq $v1, $v0, .L80240DDC -/* 8A6760 80240CE0 0062102A */ slt $v0, $v1, $v0 -/* 8A6764 80240CE4 14400038 */ bnez $v0, .L80240DC8 -/* 8A6768 80240CE8 0260202D */ daddu $a0, $s3, $zero -/* 8A676C 80240CEC 2402000F */ addiu $v0, $zero, 0xf -/* 8A6770 80240CF0 10620040 */ beq $v1, $v0, .L80240DF4 -/* 8A6774 80240CF4 24020063 */ addiu $v0, $zero, 0x63 -/* 8A6778 80240CF8 10620043 */ beq $v1, $v0, .L80240E08 -/* 8A677C 80240CFC 00000000 */ nop -/* 8A6780 80240D00 08090384 */ j .L80240E10 -/* 8A6784 80240D04 00000000 */ nop -.L80240D08: -/* 8A6788 80240D08 0280282D */ daddu $a1, $s4, $zero -/* 8A678C 80240D0C 0C012568 */ jal func_800495A0 -/* 8A6790 80240D10 02A0302D */ daddu $a2, $s5, $zero -/* 8A6794 80240D14 96220086 */ lhu $v0, 0x86($s1) -/* 8A6798 80240D18 A64200A8 */ sh $v0, 0xa8($s2) -.L80240D1C: -/* 8A679C 80240D1C 0260202D */ daddu $a0, $s3, $zero -/* 8A67A0 80240D20 0280282D */ daddu $a1, $s4, $zero -/* 8A67A4 80240D24 0C0125AE */ jal func_800496B8 -/* 8A67A8 80240D28 02A0302D */ daddu $a2, $s5, $zero -/* 8A67AC 80240D2C 08090384 */ j .L80240E10 -/* 8A67B0 80240D30 00000000 */ nop -.L80240D34: -/* 8A67B4 80240D34 0260202D */ daddu $a0, $s3, $zero -/* 8A67B8 80240D38 0280282D */ daddu $a1, $s4, $zero -/* 8A67BC 80240D3C 0C0126D1 */ jal base_UnkNpcAIFunc1 -/* 8A67C0 80240D40 02A0302D */ daddu $a2, $s5, $zero -/* 8A67C4 80240D44 8E230088 */ lw $v1, 0x88($s1) -/* 8A67C8 80240D48 24020006 */ addiu $v0, $zero, 6 -/* 8A67CC 80240D4C 14620014 */ bne $v1, $v0, .L80240DA0 -/* 8A67D0 80240D50 0260202D */ daddu $a0, $s3, $zero -/* 8A67D4 80240D54 0C00A67F */ jal rand_int -/* 8A67D8 80240D58 24040064 */ addiu $a0, $zero, 0x64 -/* 8A67DC 80240D5C 28420021 */ slti $v0, $v0, 0x21 -/* 8A67E0 80240D60 5040000F */ beql $v0, $zero, .L80240DA0 -/* 8A67E4 80240D64 0260202D */ daddu $a0, $s3, $zero -/* 8A67E8 80240D68 8E22008C */ lw $v0, 0x8c($s1) -/* 8A67EC 80240D6C 10400005 */ beqz $v0, .L80240D84 -/* 8A67F0 80240D70 3C020055 */ lui $v0, 0x55 -/* 8A67F4 80240D74 3442002F */ ori $v0, $v0, 0x2f -/* 8A67F8 80240D78 AE20008C */ sw $zero, 0x8c($s1) -/* 8A67FC 80240D7C 08090364 */ j .L80240D90 -/* 8A6800 80240D80 A22000B5 */ sb $zero, 0xb5($s1) -.L80240D84: -/* 8A6804 80240D84 3442002E */ ori $v0, $v0, 0x2e -/* 8A6808 80240D88 AE30008C */ sw $s0, 0x8c($s1) -/* 8A680C 80240D8C A23000B5 */ sb $s0, 0xb5($s1) -.L80240D90: -/* 8A6810 80240D90 AE420028 */ sw $v0, 0x28($s2) -/* 8A6814 80240D94 24020007 */ addiu $v0, $zero, 7 -/* 8A6818 80240D98 0809039F */ j .L80240E7C_8A68FC -/* 8A681C 80240D9C AE220090 */ sw $v0, 0x90($s1) -.L80240DA0: -/* 8A6820 80240DA0 0280282D */ daddu $a1, $s4, $zero -/* 8A6824 80240DA4 0C012701 */ jal func_80049C04 -/* 8A6828 80240DA8 02A0302D */ daddu $a2, $s5, $zero -/* 8A682C 80240DAC 08090384 */ j .L80240E10 -/* 8A6830 80240DB0 00000000 */ nop -.L80240DB4: -/* 8A6834 80240DB4 0260202D */ daddu $a0, $s3, $zero -/* 8A6838 80240DB8 0280282D */ daddu $a1, $s4, $zero -/* 8A683C 80240DBC 0C0901B4 */ jal tik_24_set_script_owner_npc_anim -/* 8A6840 80240DC0 02A0302D */ daddu $a2, $s5, $zero -/* 8A6844 80240DC4 0260202D */ daddu $a0, $s3, $zero -.L80240DC8: -/* 8A6848 80240DC8 0280282D */ daddu $a1, $s4, $zero -/* 8A684C 80240DCC 0C0901D3 */ jal tik_24_UnkDistFunc -/* 8A6850 80240DD0 02A0302D */ daddu $a2, $s5, $zero -/* 8A6854 80240DD4 08090384 */ j .L80240E10 -/* 8A6858 80240DD8 00000000 */ nop -.L80240DDC: -/* 8A685C 80240DDC 0260202D */ daddu $a0, $s3, $zero -/* 8A6860 80240DE0 0280282D */ daddu $a1, $s4, $zero -/* 8A6864 80240DE4 0C090220 */ jal tik_24_UnkNpcAIFunc12 -/* 8A6868 80240DE8 02A0302D */ daddu $a2, $s5, $zero -/* 8A686C 80240DEC 08090384 */ j .L80240E10 -/* 8A6870 80240DF0 00000000 */ nop -.L80240DF4: -/* 8A6874 80240DF4 0280282D */ daddu $a1, $s4, $zero -/* 8A6878 80240DF8 0C090279 */ jal tik_24_set_script_owner_npc_col_height -/* 8A687C 80240DFC 02A0302D */ daddu $a2, $s5, $zero -/* 8A6880 80240E00 08090384 */ j .L80240E10 -/* 8A6884 80240E04 00000000 */ nop -.L80240E08: -/* 8A6888 80240E08 0C0129CF */ jal func_8004A73C -/* 8A688C 80240E0C 0260202D */ daddu $a0, $s3, $zero -.L80240E10: -/* 8A6890 80240E10 8E230088 */ lw $v1, 0x88($s1) -/* 8A6894 80240E14 24020006 */ addiu $v0, $zero, 6 -/* 8A6898 80240E18 14620019 */ bne $v1, $v0, .L80240E80 -/* 8A689C 80240E1C 0000102D */ daddu $v0, $zero, $zero -/* 8A68A0 80240E20 8E22008C */ lw $v0, 0x8c($s1) -/* 8A68A4 80240E24 10400003 */ beqz $v0, .L80240E34 -/* 8A68A8 80240E28 24020001 */ addiu $v0, $zero, 1 -/* 8A68AC 80240E2C 0809038E */ j .L80240E38 -/* 8A68B0 80240E30 A22200B5 */ sb $v0, 0xb5($s1) -.L80240E34: -/* 8A68B4 80240E34 A22000B5 */ sb $zero, 0xb5($s1) -.L80240E38: -/* 8A68B8 80240E38 8E22008C */ lw $v0, 0x8c($s1) -/* 8A68BC 80240E3C 1040000F */ beqz $v0, .L80240E7C_8A68FC -/* 8A68C0 80240E40 3C03FFAA */ lui $v1, 0xffaa -/* 8A68C4 80240E44 8E420028 */ lw $v0, 0x28($s2) -/* 8A68C8 80240E48 3463FFFC */ ori $v1, $v1, 0xfffc -/* 8A68CC 80240E4C 00431821 */ addu $v1, $v0, $v1 -/* 8A68D0 80240E50 2C620015 */ sltiu $v0, $v1, 0x15 -/* 8A68D4 80240E54 10400009 */ beqz $v0, .L80240E7C_8A68FC -/* 8A68D8 80240E58 00031080 */ sll $v0, $v1, 2 -/* 8A68DC 80240E5C 3C018024 */ lui $at, %hi(jtbl_802424A8_8A7F28) -/* 8A68E0 80240E60 00220821 */ addu $at, $at, $v0 -/* 8A68E4 80240E64 8C2224A8 */ lw $v0, %lo(jtbl_802424A8_8A7F28)($at) -/* 8A68E8 80240E68 00400008 */ jr $v0 -/* 8A68EC 80240E6C 00000000 */ nop -.L80240E70_8A68F0: -/* 8A68F0 80240E70 8E420028 */ lw $v0, 0x28($s2) -/* 8A68F4 80240E74 24420001 */ addiu $v0, $v0, 1 -/* 8A68F8 80240E78 AE420028 */ sw $v0, 0x28($s2) -.L80240E7C_8A68FC: -/* 8A68FC 80240E7C 0000102D */ daddu $v0, $zero, $zero -.L80240E80: -/* 8A6900 80240E80 8FBF0068 */ lw $ra, 0x68($sp) -/* 8A6904 80240E84 8FB50064 */ lw $s5, 0x64($sp) -/* 8A6908 80240E88 8FB40060 */ lw $s4, 0x60($sp) -/* 8A690C 80240E8C 8FB3005C */ lw $s3, 0x5c($sp) -/* 8A6910 80240E90 8FB20058 */ lw $s2, 0x58($sp) -/* 8A6914 80240E94 8FB10054 */ lw $s1, 0x54($sp) -/* 8A6918 80240E98 8FB00050 */ lw $s0, 0x50($sp) -/* 8A691C 80240E9C 03E00008 */ jr $ra -/* 8A6920 80240EA0 27BD0070 */ addiu $sp, $sp, 0x70 -/* 8A6924 80240EA4 00000000 */ nop -/* 8A6928 80240EA8 00000000 */ nop -/* 8A692C 80240EAC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240784_99D114.s b/ver/us/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240784_99D114.s deleted file mode 100644 index 41b90e47ea..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240784_99D114.s +++ /dev/null @@ -1,309 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80244448_9A0DD8 -.word .L80240B90_99D520, .L80240B9C_99D52C, .L80240B9C_99D52C, .L80240B9C_99D52C, .L80240B9C_99D52C, .L80240B9C_99D52C, .L80240B9C_99D52C, .L80240B9C_99D52C, .L80240B90_99D520, .L80240B9C_99D52C, .L80240B90_99D520, .L80240B9C_99D52C, .L80240B90_99D520, .L80240B9C_99D52C, .L80240B90_99D520, .L80240B9C_99D52C, .L80240B9C_99D52C, .L80240B9C_99D52C, .L80240B90_99D520, .L80240B9C_99D52C, .L80240B90_99D520, 0 - -.section .text - -glabel func_80240784_99D114 -/* 99D114 80240784 27BDFF90 */ addiu $sp, $sp, -0x70 -/* 99D118 80240788 AFB3005C */ sw $s3, 0x5c($sp) -/* 99D11C 8024078C 0080982D */ daddu $s3, $a0, $zero -/* 99D120 80240790 AFBF0068 */ sw $ra, 0x68($sp) -/* 99D124 80240794 AFB50064 */ sw $s5, 0x64($sp) -/* 99D128 80240798 AFB40060 */ sw $s4, 0x60($sp) -/* 99D12C 8024079C AFB20058 */ sw $s2, 0x58($sp) -/* 99D130 802407A0 AFB10054 */ sw $s1, 0x54($sp) -/* 99D134 802407A4 AFB00050 */ sw $s0, 0x50($sp) -/* 99D138 802407A8 8E710148 */ lw $s1, 0x148($s3) -/* 99D13C 802407AC 86240008 */ lh $a0, 8($s1) -/* 99D140 802407B0 0C00EABB */ jal get_npc_unsafe -/* 99D144 802407B4 00A0802D */ daddu $s0, $a1, $zero -/* 99D148 802407B8 8E63000C */ lw $v1, 0xc($s3) -/* 99D14C 802407BC 0260202D */ daddu $a0, $s3, $zero -/* 99D150 802407C0 8C650000 */ lw $a1, ($v1) -/* 99D154 802407C4 0C0B1EAF */ jal evt_get_variable -/* 99D158 802407C8 0040902D */ daddu $s2, $v0, $zero -/* 99D15C 802407CC AFA00028 */ sw $zero, 0x28($sp) -/* 99D160 802407D0 8E2300D0 */ lw $v1, 0xd0($s1) -/* 99D164 802407D4 8C630030 */ lw $v1, 0x30($v1) -/* 99D168 802407D8 AFA3002C */ sw $v1, 0x2c($sp) -/* 99D16C 802407DC 8E2300D0 */ lw $v1, 0xd0($s1) -/* 99D170 802407E0 8C63001C */ lw $v1, 0x1c($v1) -/* 99D174 802407E4 AFA30030 */ sw $v1, 0x30($sp) -/* 99D178 802407E8 8E2300D0 */ lw $v1, 0xd0($s1) -/* 99D17C 802407EC 8C630024 */ lw $v1, 0x24($v1) -/* 99D180 802407F0 AFA30034 */ sw $v1, 0x34($sp) -/* 99D184 802407F4 8E2300D0 */ lw $v1, 0xd0($s1) -/* 99D188 802407F8 8C630028 */ lw $v1, 0x28($v1) -/* 99D18C 802407FC 27B50028 */ addiu $s5, $sp, 0x28 -/* 99D190 80240800 AFA30038 */ sw $v1, 0x38($sp) -/* 99D194 80240804 8E2300D0 */ lw $v1, 0xd0($s1) -/* 99D198 80240808 3C0142C8 */ lui $at, 0x42c8 -/* 99D19C 8024080C 44810000 */ mtc1 $at, $f0 -/* 99D1A0 80240810 8C63002C */ lw $v1, 0x2c($v1) -/* 99D1A4 80240814 0040A02D */ daddu $s4, $v0, $zero -/* 99D1A8 80240818 E7A00040 */ swc1 $f0, 0x40($sp) -/* 99D1AC 8024081C A7A00044 */ sh $zero, 0x44($sp) -/* 99D1B0 80240820 12000009 */ beqz $s0, .L80240848 -/* 99D1B4 80240824 AFA3003C */ sw $v1, 0x3c($sp) -/* 99D1B8 80240828 864300A8 */ lh $v1, 0xa8($s2) -/* 99D1BC 8024082C 8E2200B0 */ lw $v0, 0xb0($s1) -/* 99D1C0 80240830 AE20008C */ sw $zero, 0x8c($s1) -/* 99D1C4 80240834 A22000B5 */ sb $zero, 0xb5($s1) -/* 99D1C8 80240838 34420008 */ ori $v0, $v0, 8 -/* 99D1CC 8024083C AE230084 */ sw $v1, 0x84($s1) -/* 99D1D0 80240840 08090216 */ j .L80240858 -/* 99D1D4 80240844 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240848: -/* 99D1D8 80240848 8E2200B0 */ lw $v0, 0xb0($s1) -/* 99D1DC 8024084C 30420004 */ andi $v0, $v0, 4 -/* 99D1E0 80240850 10400047 */ beqz $v0, .L80240970 -/* 99D1E4 80240854 00000000 */ nop -.L80240858: -/* 99D1E8 80240858 AE600070 */ sw $zero, 0x70($s3) -/* 99D1EC 8024085C A640008E */ sh $zero, 0x8e($s2) -/* 99D1F0 80240860 8E2300CC */ lw $v1, 0xcc($s1) -/* 99D1F4 80240864 2404F7FF */ addiu $a0, $zero, -0x801 -/* 99D1F8 80240868 A2200007 */ sb $zero, 7($s1) -/* 99D1FC 8024086C 8E420000 */ lw $v0, ($s2) -/* 99D200 80240870 8C630000 */ lw $v1, ($v1) -/* 99D204 80240874 00441024 */ and $v0, $v0, $a0 -/* 99D208 80240878 AE420000 */ sw $v0, ($s2) -/* 99D20C 8024087C AE430028 */ sw $v1, 0x28($s2) -/* 99D210 80240880 96220086 */ lhu $v0, 0x86($s1) -/* 99D214 80240884 A64200A8 */ sh $v0, 0xa8($s2) -/* 99D218 80240888 8E2200D0 */ lw $v0, 0xd0($s1) -/* 99D21C 8024088C AE200090 */ sw $zero, 0x90($s1) -/* 99D220 80240890 8C420034 */ lw $v0, 0x34($v0) -/* 99D224 80240894 14400006 */ bnez $v0, .L802408B0 -/* 99D228 80240898 2403FDFF */ addiu $v1, $zero, -0x201 -/* 99D22C 8024089C 8E420000 */ lw $v0, ($s2) -/* 99D230 802408A0 2403FFF7 */ addiu $v1, $zero, -9 -/* 99D234 802408A4 34420200 */ ori $v0, $v0, 0x200 -/* 99D238 802408A8 0809022F */ j .L802408BC -/* 99D23C 802408AC 00431024 */ and $v0, $v0, $v1 -.L802408B0: -/* 99D240 802408B0 8E420000 */ lw $v0, ($s2) -/* 99D244 802408B4 00431024 */ and $v0, $v0, $v1 -/* 99D248 802408B8 34420008 */ ori $v0, $v0, 8 -.L802408BC: -/* 99D24C 802408BC AE420000 */ sw $v0, ($s2) -/* 99D250 802408C0 8E2200B0 */ lw $v0, 0xb0($s1) -/* 99D254 802408C4 30420004 */ andi $v0, $v0, 4 -/* 99D258 802408C8 1040001E */ beqz $v0, .L80240944 -/* 99D25C 802408CC 24040002 */ addiu $a0, $zero, 2 -/* 99D260 802408D0 0240282D */ daddu $a1, $s2, $zero -/* 99D264 802408D4 0000302D */ daddu $a2, $zero, $zero -/* 99D268 802408D8 24020063 */ addiu $v0, $zero, 0x63 -/* 99D26C 802408DC AE620070 */ sw $v0, 0x70($s3) -/* 99D270 802408E0 AE600074 */ sw $zero, 0x74($s3) -/* 99D274 802408E4 864300A8 */ lh $v1, 0xa8($s2) -/* 99D278 802408E8 3C013F80 */ lui $at, 0x3f80 -/* 99D27C 802408EC 44810000 */ mtc1 $at, $f0 -/* 99D280 802408F0 3C014000 */ lui $at, 0x4000 -/* 99D284 802408F4 44811000 */ mtc1 $at, $f2 -/* 99D288 802408F8 3C01C1A0 */ lui $at, 0xc1a0 -/* 99D28C 802408FC 44812000 */ mtc1 $at, $f4 -/* 99D290 80240900 24020028 */ addiu $v0, $zero, 0x28 -/* 99D294 80240904 AFA2001C */ sw $v0, 0x1c($sp) -/* 99D298 80240908 44833000 */ mtc1 $v1, $f6 -/* 99D29C 8024090C 00000000 */ nop -/* 99D2A0 80240910 468031A0 */ cvt.s.w $f6, $f6 -/* 99D2A4 80240914 44073000 */ mfc1 $a3, $f6 -/* 99D2A8 80240918 27A20048 */ addiu $v0, $sp, 0x48 -/* 99D2AC 8024091C AFA20020 */ sw $v0, 0x20($sp) -/* 99D2B0 80240920 E7A00010 */ swc1 $f0, 0x10($sp) -/* 99D2B4 80240924 E7A20014 */ swc1 $f2, 0x14($sp) -/* 99D2B8 80240928 0C01BFA4 */ jal fx_emote -/* 99D2BC 8024092C E7A40018 */ swc1 $f4, 0x18($sp) -/* 99D2C0 80240930 8E2200B0 */ lw $v0, 0xb0($s1) -/* 99D2C4 80240934 2403FFFB */ addiu $v1, $zero, -5 -/* 99D2C8 80240938 00431024 */ and $v0, $v0, $v1 -/* 99D2CC 8024093C 0809025C */ j .L80240970 -/* 99D2D0 80240940 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240944: -/* 99D2D4 80240944 8E220000 */ lw $v0, ($s1) -/* 99D2D8 80240948 3C034000 */ lui $v1, 0x4000 -/* 99D2DC 8024094C 00431024 */ and $v0, $v0, $v1 -/* 99D2E0 80240950 10400007 */ beqz $v0, .L80240970 -/* 99D2E4 80240954 3C03BFFF */ lui $v1, 0xbfff -/* 99D2E8 80240958 2402000C */ addiu $v0, $zero, 0xc -/* 99D2EC 8024095C AE620070 */ sw $v0, 0x70($s3) -/* 99D2F0 80240960 8E220000 */ lw $v0, ($s1) -/* 99D2F4 80240964 3463FFFF */ ori $v1, $v1, 0xffff -/* 99D2F8 80240968 00431024 */ and $v0, $v0, $v1 -/* 99D2FC 8024096C AE220000 */ sw $v0, ($s1) -.L80240970: -/* 99D300 80240970 8E220090 */ lw $v0, 0x90($s1) -/* 99D304 80240974 1840000C */ blez $v0, .L802409A8 -/* 99D308 80240978 2442FFFF */ addiu $v0, $v0, -1 -/* 99D30C 8024097C 14400087 */ bnez $v0, .L80240B9C_99D52C -/* 99D310 80240980 AE220090 */ sw $v0, 0x90($s1) -/* 99D314 80240984 3C03FFAA */ lui $v1, 0xffaa -/* 99D318 80240988 8E420028 */ lw $v0, 0x28($s2) -/* 99D31C 8024098C 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* 99D320 80240990 00431021 */ addu $v0, $v0, $v1 -/* 99D324 80240994 2C420002 */ sltiu $v0, $v0, 2 -/* 99D328 80240998 10400003 */ beqz $v0, .L802409A8 -/* 99D32C 8024099C 3C020055 */ lui $v0, 0x55 -/* 99D330 802409A0 3442000C */ ori $v0, $v0, 0xc -/* 99D334 802409A4 AE420028 */ sw $v0, 0x28($s2) -.L802409A8: -/* 99D338 802409A8 8E630070 */ lw $v1, 0x70($s3) -/* 99D33C 802409AC 2402000C */ addiu $v0, $zero, 0xc -/* 99D340 802409B0 10620048 */ beq $v1, $v0, .L80240AD4 -/* 99D344 802409B4 2862000D */ slti $v0, $v1, 0xd -/* 99D348 802409B8 1040000F */ beqz $v0, .L802409F8 -/* 99D34C 802409BC 24100001 */ addiu $s0, $zero, 1 -/* 99D350 802409C0 1070001E */ beq $v1, $s0, .L80240A3C -/* 99D354 802409C4 28620002 */ slti $v0, $v1, 2 -/* 99D358 802409C8 10400005 */ beqz $v0, .L802409E0 -/* 99D35C 802409CC 24020002 */ addiu $v0, $zero, 2 -/* 99D360 802409D0 10600015 */ beqz $v1, .L80240A28 -/* 99D364 802409D4 0260202D */ daddu $a0, $s3, $zero -/* 99D368 802409D8 080902CC */ j .L80240B30 -/* 99D36C 802409DC 00000000 */ nop -.L802409E0: -/* 99D370 802409E0 1062001C */ beq $v1, $v0, .L80240A54 -/* 99D374 802409E4 24020003 */ addiu $v0, $zero, 3 -/* 99D378 802409E8 10620035 */ beq $v1, $v0, .L80240AC0 -/* 99D37C 802409EC 0260202D */ daddu $a0, $s3, $zero -/* 99D380 802409F0 080902CC */ j .L80240B30 -/* 99D384 802409F4 00000000 */ nop -.L802409F8: -/* 99D388 802409F8 2402000E */ addiu $v0, $zero, 0xe -/* 99D38C 802409FC 1062003F */ beq $v1, $v0, .L80240AFC -/* 99D390 80240A00 0062102A */ slt $v0, $v1, $v0 -/* 99D394 80240A04 14400038 */ bnez $v0, .L80240AE8 -/* 99D398 80240A08 0260202D */ daddu $a0, $s3, $zero -/* 99D39C 80240A0C 2402000F */ addiu $v0, $zero, 0xf -/* 99D3A0 80240A10 10620040 */ beq $v1, $v0, .L80240B14 -/* 99D3A4 80240A14 24020063 */ addiu $v0, $zero, 0x63 -/* 99D3A8 80240A18 10620043 */ beq $v1, $v0, .L80240B28 -/* 99D3AC 80240A1C 00000000 */ nop -/* 99D3B0 80240A20 080902CC */ j .L80240B30 -/* 99D3B4 80240A24 00000000 */ nop -.L80240A28: -/* 99D3B8 80240A28 0280282D */ daddu $a1, $s4, $zero -/* 99D3BC 80240A2C 0C012568 */ jal func_800495A0 -/* 99D3C0 80240A30 02A0302D */ daddu $a2, $s5, $zero -/* 99D3C4 80240A34 96220086 */ lhu $v0, 0x86($s1) -/* 99D3C8 80240A38 A64200A8 */ sh $v0, 0xa8($s2) -.L80240A3C: -/* 99D3CC 80240A3C 0260202D */ daddu $a0, $s3, $zero -/* 99D3D0 80240A40 0280282D */ daddu $a1, $s4, $zero -/* 99D3D4 80240A44 0C0125AE */ jal func_800496B8 -/* 99D3D8 80240A48 02A0302D */ daddu $a2, $s5, $zero -/* 99D3DC 80240A4C 080902CC */ j .L80240B30 -/* 99D3E0 80240A50 00000000 */ nop -.L80240A54: -/* 99D3E4 80240A54 0260202D */ daddu $a0, $s3, $zero -/* 99D3E8 80240A58 0280282D */ daddu $a1, $s4, $zero -/* 99D3EC 80240A5C 0C0126D1 */ jal base_UnkNpcAIFunc1 -/* 99D3F0 80240A60 02A0302D */ daddu $a2, $s5, $zero -/* 99D3F4 80240A64 8E230088 */ lw $v1, 0x88($s1) -/* 99D3F8 80240A68 24020006 */ addiu $v0, $zero, 6 -/* 99D3FC 80240A6C 14620014 */ bne $v1, $v0, .L80240AC0 -/* 99D400 80240A70 0260202D */ daddu $a0, $s3, $zero -/* 99D404 80240A74 0C00A67F */ jal rand_int -/* 99D408 80240A78 24040064 */ addiu $a0, $zero, 0x64 -/* 99D40C 80240A7C 28420021 */ slti $v0, $v0, 0x21 -/* 99D410 80240A80 5040000F */ beql $v0, $zero, .L80240AC0 -/* 99D414 80240A84 0260202D */ daddu $a0, $s3, $zero -/* 99D418 80240A88 8E22008C */ lw $v0, 0x8c($s1) -/* 99D41C 80240A8C 10400005 */ beqz $v0, .L80240AA4 -/* 99D420 80240A90 3C020055 */ lui $v0, 0x55 -/* 99D424 80240A94 3442002F */ ori $v0, $v0, 0x2f -/* 99D428 80240A98 AE20008C */ sw $zero, 0x8c($s1) -/* 99D42C 80240A9C 080902AC */ j .L80240AB0 -/* 99D430 80240AA0 A22000B5 */ sb $zero, 0xb5($s1) -.L80240AA4: -/* 99D434 80240AA4 3442002E */ ori $v0, $v0, 0x2e -/* 99D438 80240AA8 AE30008C */ sw $s0, 0x8c($s1) -/* 99D43C 80240AAC A23000B5 */ sb $s0, 0xb5($s1) -.L80240AB0: -/* 99D440 80240AB0 AE420028 */ sw $v0, 0x28($s2) -/* 99D444 80240AB4 24020007 */ addiu $v0, $zero, 7 -/* 99D448 80240AB8 080902E7 */ j .L80240B9C_99D52C -/* 99D44C 80240ABC AE220090 */ sw $v0, 0x90($s1) -.L80240AC0: -/* 99D450 80240AC0 0280282D */ daddu $a1, $s4, $zero -/* 99D454 80240AC4 0C012701 */ jal func_80049C04 -/* 99D458 80240AC8 02A0302D */ daddu $a2, $s5, $zero -/* 99D45C 80240ACC 080902CC */ j .L80240B30 -/* 99D460 80240AD0 00000000 */ nop -.L80240AD4: -/* 99D464 80240AD4 0260202D */ daddu $a0, $s3, $zero -/* 99D468 80240AD8 0280282D */ daddu $a1, $s4, $zero -/* 99D46C 80240ADC 0C0900FC */ jal trd_01_set_script_owner_npc_anim -/* 99D470 80240AE0 02A0302D */ daddu $a2, $s5, $zero -/* 99D474 80240AE4 0260202D */ daddu $a0, $s3, $zero -.L80240AE8: -/* 99D478 80240AE8 0280282D */ daddu $a1, $s4, $zero -/* 99D47C 80240AEC 0C09011B */ jal trd_01_UnkDistFunc -/* 99D480 80240AF0 02A0302D */ daddu $a2, $s5, $zero -/* 99D484 80240AF4 080902CC */ j .L80240B30 -/* 99D488 80240AF8 00000000 */ nop -.L80240AFC: -/* 99D48C 80240AFC 0260202D */ daddu $a0, $s3, $zero -/* 99D490 80240B00 0280282D */ daddu $a1, $s4, $zero -/* 99D494 80240B04 0C090168 */ jal trd_01_UnkNpcAIFunc12 -/* 99D498 80240B08 02A0302D */ daddu $a2, $s5, $zero -/* 99D49C 80240B0C 080902CC */ j .L80240B30 -/* 99D4A0 80240B10 00000000 */ nop -.L80240B14: -/* 99D4A4 80240B14 0280282D */ daddu $a1, $s4, $zero -/* 99D4A8 80240B18 0C0901C1 */ jal trd_01_set_script_owner_npc_col_height -/* 99D4AC 80240B1C 02A0302D */ daddu $a2, $s5, $zero -/* 99D4B0 80240B20 080902CC */ j .L80240B30 -/* 99D4B4 80240B24 00000000 */ nop -.L80240B28: -/* 99D4B8 80240B28 0C0129CF */ jal func_8004A73C -/* 99D4BC 80240B2C 0260202D */ daddu $a0, $s3, $zero -.L80240B30: -/* 99D4C0 80240B30 8E230088 */ lw $v1, 0x88($s1) -/* 99D4C4 80240B34 24020006 */ addiu $v0, $zero, 6 -/* 99D4C8 80240B38 14620019 */ bne $v1, $v0, .L80240BA0 -/* 99D4CC 80240B3C 0000102D */ daddu $v0, $zero, $zero -/* 99D4D0 80240B40 8E22008C */ lw $v0, 0x8c($s1) -/* 99D4D4 80240B44 10400003 */ beqz $v0, .L80240B54 -/* 99D4D8 80240B48 24020001 */ addiu $v0, $zero, 1 -/* 99D4DC 80240B4C 080902D6 */ j .L80240B58 -/* 99D4E0 80240B50 A22200B5 */ sb $v0, 0xb5($s1) -.L80240B54: -/* 99D4E4 80240B54 A22000B5 */ sb $zero, 0xb5($s1) -.L80240B58: -/* 99D4E8 80240B58 8E22008C */ lw $v0, 0x8c($s1) -/* 99D4EC 80240B5C 1040000F */ beqz $v0, .L80240B9C_99D52C -/* 99D4F0 80240B60 3C03FFAA */ lui $v1, 0xffaa -/* 99D4F4 80240B64 8E420028 */ lw $v0, 0x28($s2) -/* 99D4F8 80240B68 3463FFFC */ ori $v1, $v1, 0xfffc -/* 99D4FC 80240B6C 00431821 */ addu $v1, $v0, $v1 -/* 99D500 80240B70 2C620015 */ sltiu $v0, $v1, 0x15 -/* 99D504 80240B74 10400009 */ beqz $v0, .L80240B9C_99D52C -/* 99D508 80240B78 00031080 */ sll $v0, $v1, 2 -/* 99D50C 80240B7C 3C018024 */ lui $at, %hi(jtbl_80244448_9A0DD8) -/* 99D510 80240B80 00220821 */ addu $at, $at, $v0 -/* 99D514 80240B84 8C224448 */ lw $v0, %lo(jtbl_80244448_9A0DD8)($at) -/* 99D518 80240B88 00400008 */ jr $v0 -/* 99D51C 80240B8C 00000000 */ nop -.L80240B90_99D520: -/* 99D520 80240B90 8E420028 */ lw $v0, 0x28($s2) -/* 99D524 80240B94 24420001 */ addiu $v0, $v0, 1 -/* 99D528 80240B98 AE420028 */ sw $v0, 0x28($s2) -.L80240B9C_99D52C: -/* 99D52C 80240B9C 0000102D */ daddu $v0, $zero, $zero -.L80240BA0: -/* 99D530 80240BA0 8FBF0068 */ lw $ra, 0x68($sp) -/* 99D534 80240BA4 8FB50064 */ lw $s5, 0x64($sp) -/* 99D538 80240BA8 8FB40060 */ lw $s4, 0x60($sp) -/* 99D53C 80240BAC 8FB3005C */ lw $s3, 0x5c($sp) -/* 99D540 80240BB0 8FB20058 */ lw $s2, 0x58($sp) -/* 99D544 80240BB4 8FB10054 */ lw $s1, 0x54($sp) -/* 99D548 80240BB8 8FB00050 */ lw $s0, 0x50($sp) -/* 99D54C 80240BBC 03E00008 */ jr $ra -/* 99D550 80240BC0 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240BC4_99D554.s b/ver/us/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240BC4_99D554.s deleted file mode 100644 index fa889e887c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240BC4_99D554.s +++ /dev/null @@ -1,59 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_802444A0_9A0E30 -.double 32767.0 - -.section .text - -glabel func_80240BC4_99D554 -/* 99D554 80240BC4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 99D558 80240BC8 AFB00010 */ sw $s0, 0x10($sp) -/* 99D55C 80240BCC 0080802D */ daddu $s0, $a0, $zero -/* 99D560 80240BD0 AFBF001C */ sw $ra, 0x1c($sp) -/* 99D564 80240BD4 AFB20018 */ sw $s2, 0x18($sp) -/* 99D568 80240BD8 AFB10014 */ sw $s1, 0x14($sp) -/* 99D56C 80240BDC 8E110148 */ lw $s1, 0x148($s0) -/* 99D570 80240BE0 86240008 */ lh $a0, 8($s1) -/* 99D574 80240BE4 0C00EABB */ jal get_npc_unsafe -/* 99D578 80240BE8 00A0902D */ daddu $s2, $a1, $zero -/* 99D57C 80240BEC 8E2300CC */ lw $v1, 0xcc($s1) -/* 99D580 80240BF0 0040202D */ daddu $a0, $v0, $zero -/* 99D584 80240BF4 8C630000 */ lw $v1, ($v1) -/* 99D588 80240BF8 24020001 */ addiu $v0, $zero, 1 -/* 99D58C 80240BFC AC830028 */ sw $v1, 0x28($a0) -/* 99D590 80240C00 AE020070 */ sw $v0, 0x70($s0) -/* 99D594 80240C04 8E220000 */ lw $v0, ($s1) -/* 99D598 80240C08 3C030010 */ lui $v1, 0x10 -/* 99D59C 80240C0C 00431024 */ and $v0, $v0, $v1 -/* 99D5A0 80240C10 10400004 */ beqz $v0, .L80240C24 -/* 99D5A4 80240C14 00000000 */ nop -/* 99D5A8 80240C18 C620006C */ lwc1 $f0, 0x6c($s1) -/* 99D5AC 80240C1C 46800020 */ cvt.s.w $f0, $f0 -/* 99D5B0 80240C20 E480000C */ swc1 $f0, 0xc($a0) -.L80240C24: -/* 99D5B4 80240C24 8E2200D0 */ lw $v0, 0xd0($s1) -/* 99D5B8 80240C28 8C420014 */ lw $v0, 0x14($v0) -/* 99D5BC 80240C2C 1C400004 */ bgtz $v0, .L80240C40 -/* 99D5C0 80240C30 00000000 */ nop -/* 99D5C4 80240C34 C640000C */ lwc1 $f0, 0xc($s2) -/* 99D5C8 80240C38 08090318 */ j .L80240C60 -/* 99D5CC 80240C3C E4800018 */ swc1 $f0, 0x18($a0) -.L80240C40: -/* 99D5D0 80240C40 3C018024 */ lui $at, %hi(D_802444A0_9A0E30) -/* 99D5D4 80240C44 D42244A0 */ ldc1 $f2, %lo(D_802444A0_9A0E30)($at) -/* 99D5D8 80240C48 44820000 */ mtc1 $v0, $f0 -/* 99D5DC 80240C4C 00000000 */ nop -/* 99D5E0 80240C50 46800021 */ cvt.d.w $f0, $f0 -/* 99D5E4 80240C54 46220003 */ div.d $f0, $f0, $f2 -/* 99D5E8 80240C58 46200020 */ cvt.s.d $f0, $f0 -/* 99D5EC 80240C5C E4800018 */ swc1 $f0, 0x18($a0) -.L80240C60: -/* 99D5F0 80240C60 8FBF001C */ lw $ra, 0x1c($sp) -/* 99D5F4 80240C64 8FB20018 */ lw $s2, 0x18($sp) -/* 99D5F8 80240C68 8FB10014 */ lw $s1, 0x14($sp) -/* 99D5FC 80240C6C 8FB00010 */ lw $s0, 0x10($sp) -/* 99D600 80240C70 03E00008 */ jr $ra -/* 99D604 80240C74 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240C78_99D608.s b/ver/us/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240C78_99D608.s deleted file mode 100644 index fde2171659..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240C78_99D608.s +++ /dev/null @@ -1,78 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C78_99D608 -/* 99D608 80240C78 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 99D60C 80240C7C AFB40040 */ sw $s4, 0x40($sp) -/* 99D610 80240C80 0080A02D */ daddu $s4, $a0, $zero -/* 99D614 80240C84 AFBF0044 */ sw $ra, 0x44($sp) -/* 99D618 80240C88 AFB3003C */ sw $s3, 0x3c($sp) -/* 99D61C 80240C8C AFB20038 */ sw $s2, 0x38($sp) -/* 99D620 80240C90 AFB10034 */ sw $s1, 0x34($sp) -/* 99D624 80240C94 AFB00030 */ sw $s0, 0x30($sp) -/* 99D628 80240C98 8E920148 */ lw $s2, 0x148($s4) -/* 99D62C 80240C9C 00A0802D */ daddu $s0, $a1, $zero -/* 99D630 80240CA0 86440008 */ lh $a0, 8($s2) -/* 99D634 80240CA4 0C00EABB */ jal get_npc_unsafe -/* 99D638 80240CA8 00C0982D */ daddu $s3, $a2, $zero -/* 99D63C 80240CAC 8E030008 */ lw $v1, 8($s0) -/* 99D640 80240CB0 04600031 */ bltz $v1, .L80240D78 -/* 99D644 80240CB4 0040882D */ daddu $s1, $v0, $zero -/* 99D648 80240CB8 0260202D */ daddu $a0, $s3, $zero -/* 99D64C 80240CBC AFA00010 */ sw $zero, 0x10($sp) -/* 99D650 80240CC0 8E060018 */ lw $a2, 0x18($s0) -/* 99D654 80240CC4 8E07001C */ lw $a3, 0x1c($s0) -/* 99D658 80240CC8 0C01242D */ jal func_800490B4 -/* 99D65C 80240CCC 0240282D */ daddu $a1, $s2, $zero -/* 99D660 80240CD0 10400029 */ beqz $v0, .L80240D78 -/* 99D664 80240CD4 0000202D */ daddu $a0, $zero, $zero -/* 99D668 80240CD8 0220282D */ daddu $a1, $s1, $zero -/* 99D66C 80240CDC 0000302D */ daddu $a2, $zero, $zero -/* 99D670 80240CE0 862300A8 */ lh $v1, 0xa8($s1) -/* 99D674 80240CE4 3C013F80 */ lui $at, 0x3f80 -/* 99D678 80240CE8 44810000 */ mtc1 $at, $f0 -/* 99D67C 80240CEC 3C014000 */ lui $at, 0x4000 -/* 99D680 80240CF0 44811000 */ mtc1 $at, $f2 -/* 99D684 80240CF4 3C01C1A0 */ lui $at, 0xc1a0 -/* 99D688 80240CF8 44812000 */ mtc1 $at, $f4 -/* 99D68C 80240CFC 2402000F */ addiu $v0, $zero, 0xf -/* 99D690 80240D00 AFA2001C */ sw $v0, 0x1c($sp) -/* 99D694 80240D04 44833000 */ mtc1 $v1, $f6 -/* 99D698 80240D08 00000000 */ nop -/* 99D69C 80240D0C 468031A0 */ cvt.s.w $f6, $f6 -/* 99D6A0 80240D10 44073000 */ mfc1 $a3, $f6 -/* 99D6A4 80240D14 27A20028 */ addiu $v0, $sp, 0x28 -/* 99D6A8 80240D18 AFA20020 */ sw $v0, 0x20($sp) -/* 99D6AC 80240D1C E7A00010 */ swc1 $f0, 0x10($sp) -/* 99D6B0 80240D20 E7A20014 */ swc1 $f2, 0x14($sp) -/* 99D6B4 80240D24 0C01BFA4 */ jal fx_emote -/* 99D6B8 80240D28 E7A40018 */ swc1 $f4, 0x18($sp) -/* 99D6BC 80240D2C 0220202D */ daddu $a0, $s1, $zero -/* 99D6C0 80240D30 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 99D6C4 80240D34 0C012530 */ jal ai_enemy_play_sound -/* 99D6C8 80240D38 3C060020 */ lui $a2, 0x20 -/* 99D6CC 80240D3C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 99D6D0 80240D40 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 99D6D4 80240D44 C62C0038 */ lwc1 $f12, 0x38($s1) -/* 99D6D8 80240D48 C62E0040 */ lwc1 $f14, 0x40($s1) -/* 99D6DC 80240D4C 8C460028 */ lw $a2, 0x28($v0) -/* 99D6E0 80240D50 0C00A720 */ jal atan2 -/* 99D6E4 80240D54 8C470030 */ lw $a3, 0x30($v0) -/* 99D6E8 80240D58 E620000C */ swc1 $f0, 0xc($s1) -/* 99D6EC 80240D5C 8E420018 */ lw $v0, 0x18($s2) -/* 99D6F0 80240D60 9442002A */ lhu $v0, 0x2a($v0) -/* 99D6F4 80240D64 30420001 */ andi $v0, $v0, 1 -/* 99D6F8 80240D68 14400002 */ bnez $v0, .L80240D74 -/* 99D6FC 80240D6C 2402000A */ addiu $v0, $zero, 0xa -/* 99D700 80240D70 2402000C */ addiu $v0, $zero, 0xc -.L80240D74: -/* 99D704 80240D74 AE820070 */ sw $v0, 0x70($s4) -.L80240D78: -/* 99D708 80240D78 8FBF0044 */ lw $ra, 0x44($sp) -/* 99D70C 80240D7C 8FB40040 */ lw $s4, 0x40($sp) -/* 99D710 80240D80 8FB3003C */ lw $s3, 0x3c($sp) -/* 99D714 80240D84 8FB20038 */ lw $s2, 0x38($sp) -/* 99D718 80240D88 8FB10034 */ lw $s1, 0x34($sp) -/* 99D71C 80240D8C 8FB00030 */ lw $s0, 0x30($sp) -/* 99D720 80240D90 03E00008 */ jr $ra -/* 99D724 80240D94 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80241104_99DA94.s b/ver/us/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80241104_99DA94.s deleted file mode 100644 index 634a392644..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80241104_99DA94.s +++ /dev/null @@ -1,59 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_802444A8_9A0E38 -.double 0.3 - -dlabel D_802444B0_9A0E40 -.double 32767.0 - -.section .text - -glabel func_80241104_99DA94 -/* 99DA94 80241104 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 99DA98 80241108 AFB10014 */ sw $s1, 0x14($sp) -/* 99DA9C 8024110C 0080882D */ daddu $s1, $a0, $zero -/* 99DAA0 80241110 AFBF001C */ sw $ra, 0x1c($sp) -/* 99DAA4 80241114 AFB20018 */ sw $s2, 0x18($sp) -/* 99DAA8 80241118 AFB00010 */ sw $s0, 0x10($sp) -/* 99DAAC 8024111C 8E300148 */ lw $s0, 0x148($s1) -/* 99DAB0 80241120 86040008 */ lh $a0, 8($s0) -/* 99DAB4 80241124 0C00EABB */ jal get_npc_unsafe -/* 99DAB8 80241128 00A0902D */ daddu $s2, $a1, $zero -/* 99DABC 8024112C 8E0300CC */ lw $v1, 0xcc($s0) -/* 99DAC0 80241130 8C630004 */ lw $v1, 4($v1) -/* 99DAC4 80241134 0040202D */ daddu $a0, $v0, $zero -/* 99DAC8 80241138 AC830028 */ sw $v1, 0x28($a0) -/* 99DACC 8024113C 8E0200D0 */ lw $v0, 0xd0($s0) -/* 99DAD0 80241140 8C420014 */ lw $v0, 0x14($v0) -/* 99DAD4 80241144 04410009 */ bgez $v0, .L8024116C -/* 99DAD8 80241148 00000000 */ nop -/* 99DADC 8024114C C640000C */ lwc1 $f0, 0xc($s2) -/* 99DAE0 80241150 3C018024 */ lui $at, %hi(D_802444A8_9A0E38) -/* 99DAE4 80241154 D42244A8 */ ldc1 $f2, %lo(D_802444A8_9A0E38)($at) -/* 99DAE8 80241158 46000021 */ cvt.d.s $f0, $f0 -/* 99DAEC 8024115C 46220002 */ mul.d $f0, $f0, $f2 -/* 99DAF0 80241160 00000000 */ nop -/* 99DAF4 80241164 08090462 */ j .L80241188 -/* 99DAF8 80241168 46200020 */ cvt.s.d $f0, $f0 -.L8024116C: -/* 99DAFC 8024116C 3C018024 */ lui $at, %hi(D_802444B0_9A0E40) -/* 99DB00 80241170 D42244B0 */ ldc1 $f2, %lo(D_802444B0_9A0E40)($at) -/* 99DB04 80241174 44820000 */ mtc1 $v0, $f0 -/* 99DB08 80241178 00000000 */ nop -/* 99DB0C 8024117C 46800021 */ cvt.d.w $f0, $f0 -/* 99DB10 80241180 46220003 */ div.d $f0, $f0, $f2 -/* 99DB14 80241184 46200020 */ cvt.s.d $f0, $f0 -.L80241188: -/* 99DB18 80241188 E4800018 */ swc1 $f0, 0x18($a0) -/* 99DB1C 8024118C 24020010 */ addiu $v0, $zero, 0x10 -/* 99DB20 80241190 AE200074 */ sw $zero, 0x74($s1) -/* 99DB24 80241194 AE220070 */ sw $v0, 0x70($s1) -/* 99DB28 80241198 8FBF001C */ lw $ra, 0x1c($sp) -/* 99DB2C 8024119C 8FB20018 */ lw $s2, 0x18($sp) -/* 99DB30 802411A0 8FB10014 */ lw $s1, 0x14($sp) -/* 99DB34 802411A4 8FB00010 */ lw $s0, 0x10($sp) -/* 99DB38 802411A8 03E00008 */ jr $ra -/* 99DB3C 802411AC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802411B0_99DB40.s b/ver/us/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802411B0_99DB40.s deleted file mode 100644 index 2c718447a3..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802411B0_99DB40.s +++ /dev/null @@ -1,140 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411B0_99DB40 -/* 99DB40 802411B0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 99DB44 802411B4 AFB3003C */ sw $s3, 0x3c($sp) -/* 99DB48 802411B8 0080982D */ daddu $s3, $a0, $zero -/* 99DB4C 802411BC AFBF0044 */ sw $ra, 0x44($sp) -/* 99DB50 802411C0 AFB40040 */ sw $s4, 0x40($sp) -/* 99DB54 802411C4 AFB20038 */ sw $s2, 0x38($sp) -/* 99DB58 802411C8 AFB10034 */ sw $s1, 0x34($sp) -/* 99DB5C 802411CC AFB00030 */ sw $s0, 0x30($sp) -/* 99DB60 802411D0 8E710148 */ lw $s1, 0x148($s3) -/* 99DB64 802411D4 00A0902D */ daddu $s2, $a1, $zero -/* 99DB68 802411D8 86240008 */ lh $a0, 8($s1) -/* 99DB6C 802411DC 0C00EABB */ jal get_npc_unsafe -/* 99DB70 802411E0 00C0A02D */ daddu $s4, $a2, $zero -/* 99DB74 802411E4 8E430008 */ lw $v1, 8($s2) -/* 99DB78 802411E8 0460003B */ bltz $v1, .L802412D8 -/* 99DB7C 802411EC 0040802D */ daddu $s0, $v0, $zero -/* 99DB80 802411F0 8E620074 */ lw $v0, 0x74($s3) -/* 99DB84 802411F4 1C400037 */ bgtz $v0, .L802412D4 -/* 99DB88 802411F8 2442FFFF */ addiu $v0, $v0, -1 -/* 99DB8C 802411FC 0280202D */ daddu $a0, $s4, $zero -/* 99DB90 80241200 AE630074 */ sw $v1, 0x74($s3) -/* 99DB94 80241204 AFA00010 */ sw $zero, 0x10($sp) -/* 99DB98 80241208 8E460018 */ lw $a2, 0x18($s2) -/* 99DB9C 8024120C 8E47001C */ lw $a3, 0x1c($s2) -/* 99DBA0 80241210 0C01242D */ jal func_800490B4 -/* 99DBA4 80241214 0220282D */ daddu $a1, $s1, $zero -/* 99DBA8 80241218 1040002C */ beqz $v0, .L802412CC -/* 99DBAC 8024121C 0000202D */ daddu $a0, $zero, $zero -/* 99DBB0 80241220 0200282D */ daddu $a1, $s0, $zero -/* 99DBB4 80241224 0000302D */ daddu $a2, $zero, $zero -/* 99DBB8 80241228 860300A8 */ lh $v1, 0xa8($s0) -/* 99DBBC 8024122C 3C013F80 */ lui $at, 0x3f80 -/* 99DBC0 80241230 44810000 */ mtc1 $at, $f0 -/* 99DBC4 80241234 3C014000 */ lui $at, 0x4000 -/* 99DBC8 80241238 44811000 */ mtc1 $at, $f2 -/* 99DBCC 8024123C 3C01C1A0 */ lui $at, 0xc1a0 -/* 99DBD0 80241240 44812000 */ mtc1 $at, $f4 -/* 99DBD4 80241244 2402000F */ addiu $v0, $zero, 0xf -/* 99DBD8 80241248 AFA2001C */ sw $v0, 0x1c($sp) -/* 99DBDC 8024124C 44833000 */ mtc1 $v1, $f6 -/* 99DBE0 80241250 00000000 */ nop -/* 99DBE4 80241254 468031A0 */ cvt.s.w $f6, $f6 -/* 99DBE8 80241258 44073000 */ mfc1 $a3, $f6 -/* 99DBEC 8024125C 27A20028 */ addiu $v0, $sp, 0x28 -/* 99DBF0 80241260 AFA20020 */ sw $v0, 0x20($sp) -/* 99DBF4 80241264 E7A00010 */ swc1 $f0, 0x10($sp) -/* 99DBF8 80241268 E7A20014 */ swc1 $f2, 0x14($sp) -/* 99DBFC 8024126C 0C01BFA4 */ jal fx_emote -/* 99DC00 80241270 E7A40018 */ swc1 $f4, 0x18($sp) -/* 99DC04 80241274 0200202D */ daddu $a0, $s0, $zero -/* 99DC08 80241278 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 99DC0C 8024127C 0C012530 */ jal ai_enemy_play_sound -/* 99DC10 80241280 3C060020 */ lui $a2, 0x20 -/* 99DC14 80241284 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 99DC18 80241288 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 99DC1C 8024128C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 99DC20 80241290 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 99DC24 80241294 8C460028 */ lw $a2, 0x28($v0) -/* 99DC28 80241298 0C00A720 */ jal atan2 -/* 99DC2C 8024129C 8C470030 */ lw $a3, 0x30($v0) -/* 99DC30 802412A0 E600000C */ swc1 $f0, 0xc($s0) -/* 99DC34 802412A4 8E220018 */ lw $v0, 0x18($s1) -/* 99DC38 802412A8 9442002A */ lhu $v0, 0x2a($v0) -/* 99DC3C 802412AC 30420001 */ andi $v0, $v0, 1 -/* 99DC40 802412B0 10400003 */ beqz $v0, .L802412C0 -/* 99DC44 802412B4 2402000A */ addiu $v0, $zero, 0xa -/* 99DC48 802412B8 080904E6 */ j .L80241398 -/* 99DC4C 802412BC AE620070 */ sw $v0, 0x70($s3) -.L802412C0: -/* 99DC50 802412C0 2402000C */ addiu $v0, $zero, 0xc -/* 99DC54 802412C4 080904E6 */ j .L80241398 -/* 99DC58 802412C8 AE620070 */ sw $v0, 0x70($s3) -.L802412CC: -/* 99DC5C 802412CC 8E620074 */ lw $v0, 0x74($s3) -/* 99DC60 802412D0 2442FFFF */ addiu $v0, $v0, -1 -.L802412D4: -/* 99DC64 802412D4 AE620074 */ sw $v0, 0x74($s3) -.L802412D8: -/* 99DC68 802412D8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 99DC6C 802412DC 8E2200D0 */ lw $v0, 0xd0($s1) -/* 99DC70 802412E0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 99DC74 802412E4 C4460000 */ lwc1 $f6, ($v0) -/* 99DC78 802412E8 468031A0 */ cvt.s.w $f6, $f6 -/* 99DC7C 802412EC 44063000 */ mfc1 $a2, $f6 -/* 99DC80 802412F0 C4460008 */ lwc1 $f6, 8($v0) -/* 99DC84 802412F4 468031A0 */ cvt.s.w $f6, $f6 -/* 99DC88 802412F8 44073000 */ mfc1 $a3, $f6 -/* 99DC8C 802412FC 0C00A7B5 */ jal dist2D -/* 99DC90 80241300 00000000 */ nop -/* 99DC94 80241304 C6020018 */ lwc1 $f2, 0x18($s0) -/* 99DC98 80241308 4602003C */ c.lt.s $f0, $f2 -/* 99DC9C 8024130C 00000000 */ nop -/* 99DCA0 80241310 4500000E */ bc1f .L8024134C -/* 99DCA4 80241314 00000000 */ nop -/* 99DCA8 80241318 8E2200D0 */ lw $v0, 0xd0($s1) -/* 99DCAC 8024131C C4400000 */ lwc1 $f0, ($v0) -/* 99DCB0 80241320 46800020 */ cvt.s.w $f0, $f0 -/* 99DCB4 80241324 E6000038 */ swc1 $f0, 0x38($s0) -/* 99DCB8 80241328 8E2200D0 */ lw $v0, 0xd0($s1) -/* 99DCBC 8024132C C4400008 */ lwc1 $f0, 8($v0) -/* 99DCC0 80241330 46800020 */ cvt.s.w $f0, $f0 -/* 99DCC4 80241334 E6000040 */ swc1 $f0, 0x40($s0) -/* 99DCC8 80241338 8E2200D0 */ lw $v0, 0xd0($s1) -/* 99DCCC 8024133C C440000C */ lwc1 $f0, 0xc($v0) -/* 99DCD0 80241340 46800020 */ cvt.s.w $f0, $f0 -/* 99DCD4 80241344 E600000C */ swc1 $f0, 0xc($s0) -/* 99DCD8 80241348 AE600070 */ sw $zero, 0x70($s3) -.L8024134C: -/* 99DCDC 8024134C 8602008C */ lh $v0, 0x8c($s0) -/* 99DCE0 80241350 14400011 */ bnez $v0, .L80241398 -/* 99DCE4 80241354 00000000 */ nop -/* 99DCE8 80241358 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 99DCEC 8024135C 8E2200D0 */ lw $v0, 0xd0($s1) -/* 99DCF0 80241360 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 99DCF4 80241364 C4460000 */ lwc1 $f6, ($v0) -/* 99DCF8 80241368 468031A0 */ cvt.s.w $f6, $f6 -/* 99DCFC 8024136C 44063000 */ mfc1 $a2, $f6 -/* 99DD00 80241370 C4460008 */ lwc1 $f6, 8($v0) -/* 99DD04 80241374 468031A0 */ cvt.s.w $f6, $f6 -/* 99DD08 80241378 44073000 */ mfc1 $a3, $f6 -/* 99DD0C 8024137C 0C00A720 */ jal atan2 -/* 99DD10 80241380 00000000 */ nop -/* 99DD14 80241384 8E050018 */ lw $a1, 0x18($s0) -/* 99DD18 80241388 44060000 */ mfc1 $a2, $f0 -/* 99DD1C 8024138C 0200202D */ daddu $a0, $s0, $zero -/* 99DD20 80241390 0C00EA95 */ jal npc_move_heading -/* 99DD24 80241394 AC86000C */ sw $a2, 0xc($a0) -.L80241398: -/* 99DD28 80241398 8FBF0044 */ lw $ra, 0x44($sp) -/* 99DD2C 8024139C 8FB40040 */ lw $s4, 0x40($sp) -/* 99DD30 802413A0 8FB3003C */ lw $s3, 0x3c($sp) -/* 99DD34 802413A4 8FB20038 */ lw $s2, 0x38($sp) -/* 99DD38 802413A8 8FB10034 */ lw $s1, 0x34($sp) -/* 99DD3C 802413AC 8FB00030 */ lw $s0, 0x30($sp) -/* 99DD40 802413B0 03E00008 */ jr $ra -/* 99DD44 802413B4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802413B8_99DD48.s b/ver/us/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802413B8_99DD48.s deleted file mode 100644 index bcd29365f9..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802413B8_99DD48.s +++ /dev/null @@ -1,185 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_802444B8_9A0E48 -.word .L80241548_99DED8, .L80241558_99DEE8, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241570_99DF00, .L80241580_99DF10, .L80241598_99DF28, .L802415A8_99DF38, .L802415C0_99DF50, .L802415D8_99DF68, .L802415E8_99DF78, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241608_99DF98, .L80241600_99DF90, 0, 0 - -.section .text - -glabel func_802413B8_99DD48 -/* 99DD48 802413B8 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 99DD4C 802413BC AFB40040 */ sw $s4, 0x40($sp) -/* 99DD50 802413C0 0080A02D */ daddu $s4, $a0, $zero -/* 99DD54 802413C4 AFBF0048 */ sw $ra, 0x48($sp) -/* 99DD58 802413C8 AFB50044 */ sw $s5, 0x44($sp) -/* 99DD5C 802413CC AFB3003C */ sw $s3, 0x3c($sp) -/* 99DD60 802413D0 AFB20038 */ sw $s2, 0x38($sp) -/* 99DD64 802413D4 AFB10034 */ sw $s1, 0x34($sp) -/* 99DD68 802413D8 AFB00030 */ sw $s0, 0x30($sp) -/* 99DD6C 802413DC 8E920148 */ lw $s2, 0x148($s4) -/* 99DD70 802413E0 86440008 */ lh $a0, 8($s2) -/* 99DD74 802413E4 8E90000C */ lw $s0, 0xc($s4) -/* 99DD78 802413E8 0C00EABB */ jal get_npc_unsafe -/* 99DD7C 802413EC 00A0882D */ daddu $s1, $a1, $zero -/* 99DD80 802413F0 0280202D */ daddu $a0, $s4, $zero -/* 99DD84 802413F4 8E050000 */ lw $a1, ($s0) -/* 99DD88 802413F8 0C0B1EAF */ jal evt_get_variable -/* 99DD8C 802413FC 0040802D */ daddu $s0, $v0, $zero -/* 99DD90 80241400 AFA00010 */ sw $zero, 0x10($sp) -/* 99DD94 80241404 8E4300D0 */ lw $v1, 0xd0($s2) -/* 99DD98 80241408 8C630030 */ lw $v1, 0x30($v1) -/* 99DD9C 8024140C AFA30014 */ sw $v1, 0x14($sp) -/* 99DDA0 80241410 8E4300D0 */ lw $v1, 0xd0($s2) -/* 99DDA4 80241414 8C63001C */ lw $v1, 0x1c($v1) -/* 99DDA8 80241418 AFA30018 */ sw $v1, 0x18($sp) -/* 99DDAC 8024141C 8E4300D0 */ lw $v1, 0xd0($s2) -/* 99DDB0 80241420 8C630024 */ lw $v1, 0x24($v1) -/* 99DDB4 80241424 AFA3001C */ sw $v1, 0x1c($sp) -/* 99DDB8 80241428 8E4300D0 */ lw $v1, 0xd0($s2) -/* 99DDBC 8024142C 8C630028 */ lw $v1, 0x28($v1) -/* 99DDC0 80241430 27B50010 */ addiu $s5, $sp, 0x10 -/* 99DDC4 80241434 AFA30020 */ sw $v1, 0x20($sp) -/* 99DDC8 80241438 8E4300D0 */ lw $v1, 0xd0($s2) -/* 99DDCC 8024143C 3C014282 */ lui $at, 0x4282 -/* 99DDD0 80241440 44810000 */ mtc1 $at, $f0 -/* 99DDD4 80241444 8C63002C */ lw $v1, 0x2c($v1) -/* 99DDD8 80241448 0040982D */ daddu $s3, $v0, $zero -/* 99DDDC 8024144C E7A00028 */ swc1 $f0, 0x28($sp) -/* 99DDE0 80241450 A7A0002C */ sh $zero, 0x2c($sp) -/* 99DDE4 80241454 16200005 */ bnez $s1, .L8024146C -/* 99DDE8 80241458 AFA30024 */ sw $v1, 0x24($sp) -/* 99DDEC 8024145C 8E4200B0 */ lw $v0, 0xb0($s2) -/* 99DDF0 80241460 30420004 */ andi $v0, $v0, 4 -/* 99DDF4 80241464 1040002F */ beqz $v0, .L80241524 -/* 99DDF8 80241468 00000000 */ nop -.L8024146C: -/* 99DDFC 8024146C AE800070 */ sw $zero, 0x70($s4) -/* 99DE00 80241470 C600000C */ lwc1 $f0, 0xc($s0) -/* 99DE04 80241474 A600008E */ sh $zero, 0x8e($s0) -/* 99DE08 80241478 8E4200CC */ lw $v0, 0xcc($s2) -/* 99DE0C 8024147C 4600008D */ trunc.w.s $f2, $f0 -/* 99DE10 80241480 E642006C */ swc1 $f2, 0x6c($s2) -/* 99DE14 80241484 8C420000 */ lw $v0, ($v0) -/* 99DE18 80241488 8E030000 */ lw $v1, ($s0) -/* 99DE1C 8024148C AE020028 */ sw $v0, 0x28($s0) -/* 99DE20 80241490 2402F7FF */ addiu $v0, $zero, -0x801 -/* 99DE24 80241494 00621824 */ and $v1, $v1, $v0 -/* 99DE28 80241498 AE030000 */ sw $v1, ($s0) -/* 99DE2C 8024149C 8E4200D0 */ lw $v0, 0xd0($s2) -/* 99DE30 802414A0 8C420034 */ lw $v0, 0x34($v0) -/* 99DE34 802414A4 54400005 */ bnel $v0, $zero, .L802414BC -/* 99DE38 802414A8 2402FDFF */ addiu $v0, $zero, -0x201 -/* 99DE3C 802414AC 34620200 */ ori $v0, $v1, 0x200 -/* 99DE40 802414B0 2403FFF7 */ addiu $v1, $zero, -9 -/* 99DE44 802414B4 08090531 */ j .L802414C4 -/* 99DE48 802414B8 00431024 */ and $v0, $v0, $v1 -.L802414BC: -/* 99DE4C 802414BC 00621024 */ and $v0, $v1, $v0 -/* 99DE50 802414C0 34420008 */ ori $v0, $v0, 8 -.L802414C4: -/* 99DE54 802414C4 AE020000 */ sw $v0, ($s0) -/* 99DE58 802414C8 8E4200B0 */ lw $v0, 0xb0($s2) -/* 99DE5C 802414CC 30420004 */ andi $v0, $v0, 4 -/* 99DE60 802414D0 10400009 */ beqz $v0, .L802414F8 -/* 99DE64 802414D4 24020063 */ addiu $v0, $zero, 0x63 -/* 99DE68 802414D8 AE820070 */ sw $v0, 0x70($s4) -/* 99DE6C 802414DC 2402000F */ addiu $v0, $zero, 0xf -/* 99DE70 802414E0 AE820074 */ sw $v0, 0x74($s4) -/* 99DE74 802414E4 8E4200B0 */ lw $v0, 0xb0($s2) -/* 99DE78 802414E8 2403FFFB */ addiu $v1, $zero, -5 -/* 99DE7C 802414EC 00431024 */ and $v0, $v0, $v1 -/* 99DE80 802414F0 08090549 */ j .L80241524 -/* 99DE84 802414F4 AE4200B0 */ sw $v0, 0xb0($s2) -.L802414F8: -/* 99DE88 802414F8 8E420000 */ lw $v0, ($s2) -/* 99DE8C 802414FC 3C034000 */ lui $v1, 0x4000 -/* 99DE90 80241500 00431024 */ and $v0, $v0, $v1 -/* 99DE94 80241504 10400007 */ beqz $v0, .L80241524 -/* 99DE98 80241508 3C03BFFF */ lui $v1, 0xbfff -/* 99DE9C 8024150C 2402000C */ addiu $v0, $zero, 0xc -/* 99DEA0 80241510 AE820070 */ sw $v0, 0x70($s4) -/* 99DEA4 80241514 8E420000 */ lw $v0, ($s2) -/* 99DEA8 80241518 3463FFFF */ ori $v1, $v1, 0xffff -/* 99DEAC 8024151C 00431024 */ and $v0, $v0, $v1 -/* 99DEB0 80241520 AE420000 */ sw $v0, ($s2) -.L80241524: -/* 99DEB4 80241524 8E830070 */ lw $v1, 0x70($s4) -/* 99DEB8 80241528 2C620064 */ sltiu $v0, $v1, 0x64 -/* 99DEBC 8024152C 10400036 */ beqz $v0, .L80241608_99DF98 -/* 99DEC0 80241530 00031080 */ sll $v0, $v1, 2 -/* 99DEC4 80241534 3C018024 */ lui $at, %hi(jtbl_802444B8_9A0E48) -/* 99DEC8 80241538 00220821 */ addu $at, $at, $v0 -/* 99DECC 8024153C 8C2244B8 */ lw $v0, %lo(jtbl_802444B8_9A0E48)($at) -/* 99DED0 80241540 00400008 */ jr $v0 -/* 99DED4 80241544 00000000 */ nop -.L80241548_99DED8: -/* 99DED8 80241548 0280202D */ daddu $a0, $s4, $zero -/* 99DEDC 8024154C 0260282D */ daddu $a1, $s3, $zero -/* 99DEE0 80241550 0C0902F1 */ jal func_80240BC4_99D554 -/* 99DEE4 80241554 02A0302D */ daddu $a2, $s5, $zero -.L80241558_99DEE8: -/* 99DEE8 80241558 0280202D */ daddu $a0, $s4, $zero -/* 99DEEC 8024155C 0260282D */ daddu $a1, $s3, $zero -/* 99DEF0 80241560 0C09031E */ jal func_80240C78_99D608 -/* 99DEF4 80241564 02A0302D */ daddu $a2, $s5, $zero -/* 99DEF8 80241568 08090582 */ j .L80241608_99DF98 -/* 99DEFC 8024156C 00000000 */ nop -.L80241570_99DF00: -/* 99DF00 80241570 0280202D */ daddu $a0, $s4, $zero -/* 99DF04 80241574 0260282D */ daddu $a1, $s3, $zero -/* 99DF08 80241578 0C090366 */ jal trd_01_NpcJumpFunc3 -/* 99DF0C 8024157C 02A0302D */ daddu $a2, $s5, $zero -.L80241580_99DF10: -/* 99DF10 80241580 0280202D */ daddu $a0, $s4, $zero -/* 99DF14 80241584 0260282D */ daddu $a1, $s3, $zero -/* 99DF18 80241588 0C09037E */ jal trd_01_NpcJumpFunc -/* 99DF1C 8024158C 02A0302D */ daddu $a2, $s5, $zero -/* 99DF20 80241590 08090582 */ j .L80241608_99DF98 -/* 99DF24 80241594 00000000 */ nop -.L80241598_99DF28: -/* 99DF28 80241598 0280202D */ daddu $a0, $s4, $zero -/* 99DF2C 8024159C 0260282D */ daddu $a1, $s3, $zero -/* 99DF30 802415A0 0C09039C */ jal trd_01_UnkNpcAIFunc13_2 -/* 99DF34 802415A4 02A0302D */ daddu $a2, $s5, $zero -.L802415A8_99DF38: -/* 99DF38 802415A8 0280202D */ daddu $a0, $s4, $zero -/* 99DF3C 802415AC 0260282D */ daddu $a1, $s3, $zero -/* 99DF40 802415B0 0C0903E8 */ jal trd_01_UnkNpcAIFunc11 -/* 99DF44 802415B4 02A0302D */ daddu $a2, $s5, $zero -/* 99DF48 802415B8 08090582 */ j .L80241608_99DF98 -/* 99DF4C 802415BC 00000000 */ nop -.L802415C0_99DF50: -/* 99DF50 802415C0 0280202D */ daddu $a0, $s4, $zero -/* 99DF54 802415C4 0260282D */ daddu $a1, $s3, $zero -/* 99DF58 802415C8 0C09042F */ jal trd_01_UnkNpcAIFunc10 -/* 99DF5C 802415CC 02A0302D */ daddu $a2, $s5, $zero -/* 99DF60 802415D0 08090582 */ j .L80241608_99DF98 -/* 99DF64 802415D4 00000000 */ nop -.L802415D8_99DF68: -/* 99DF68 802415D8 0280202D */ daddu $a0, $s4, $zero -/* 99DF6C 802415DC 0260282D */ daddu $a1, $s3, $zero -/* 99DF70 802415E0 0C090441 */ jal func_80241104_99DA94 -/* 99DF74 802415E4 02A0302D */ daddu $a2, $s5, $zero -.L802415E8_99DF78: -/* 99DF78 802415E8 0280202D */ daddu $a0, $s4, $zero -/* 99DF7C 802415EC 0260282D */ daddu $a1, $s3, $zero -/* 99DF80 802415F0 0C09046C */ jal func_802411B0_99DB40 -/* 99DF84 802415F4 02A0302D */ daddu $a2, $s5, $zero -/* 99DF88 802415F8 08090582 */ j .L80241608_99DF98 -/* 99DF8C 802415FC 00000000 */ nop -.L80241600_99DF90: -/* 99DF90 80241600 0C0129CF */ jal func_8004A73C -/* 99DF94 80241604 0280202D */ daddu $a0, $s4, $zero -.L80241608_99DF98: -/* 99DF98 80241608 8FBF0048 */ lw $ra, 0x48($sp) -/* 99DF9C 8024160C 8FB50044 */ lw $s5, 0x44($sp) -/* 99DFA0 80241610 8FB40040 */ lw $s4, 0x40($sp) -/* 99DFA4 80241614 8FB3003C */ lw $s3, 0x3c($sp) -/* 99DFA8 80241618 8FB20038 */ lw $s2, 0x38($sp) -/* 99DFAC 8024161C 8FB10034 */ lw $s1, 0x34($sp) -/* 99DFB0 80241620 8FB00030 */ lw $s0, 0x30($sp) -/* 99DFB4 80241624 0000102D */ daddu $v0, $zero, $zero -/* 99DFB8 80241628 03E00008 */ jr $ra -/* 99DFBC 8024162C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80241630_99DFC0.s b/ver/us/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80241630_99DFC0.s deleted file mode 100644 index fc7c96b3a1..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80241630_99DFC0.s +++ /dev/null @@ -1,40 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241630_99DFC0 -/* 99DFC0 80241630 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 99DFC4 80241634 0080102D */ daddu $v0, $a0, $zero -/* 99DFC8 80241638 AFBF0014 */ sw $ra, 0x14($sp) -/* 99DFCC 8024163C AFB00010 */ sw $s0, 0x10($sp) -/* 99DFD0 80241640 8C44014C */ lw $a0, 0x14c($v0) -/* 99DFD4 80241644 0C00EAD2 */ jal get_npc_safe -/* 99DFD8 80241648 8C500148 */ lw $s0, 0x148($v0) -/* 99DFDC 8024164C 8E0300D0 */ lw $v1, 0xd0($s0) -/* 99DFE0 80241650 C4400038 */ lwc1 $f0, 0x38($v0) -/* 99DFE4 80241654 4600008D */ trunc.w.s $f2, $f0 -/* 99DFE8 80241658 E4620000 */ swc1 $f2, ($v1) -/* 99DFEC 8024165C 8E0300D0 */ lw $v1, 0xd0($s0) -/* 99DFF0 80241660 C440003C */ lwc1 $f0, 0x3c($v0) -/* 99DFF4 80241664 4600008D */ trunc.w.s $f2, $f0 -/* 99DFF8 80241668 E4620004 */ swc1 $f2, 4($v1) -/* 99DFFC 8024166C 8E0300D0 */ lw $v1, 0xd0($s0) -/* 99E000 80241670 C4400040 */ lwc1 $f0, 0x40($v0) -/* 99E004 80241674 4600008D */ trunc.w.s $f2, $f0 -/* 99E008 80241678 E4620008 */ swc1 $f2, 8($v1) -/* 99E00C 8024167C 8E0300D0 */ lw $v1, 0xd0($s0) -/* 99E010 80241680 C4400038 */ lwc1 $f0, 0x38($v0) -/* 99E014 80241684 4600008D */ trunc.w.s $f2, $f0 -/* 99E018 80241688 E462001C */ swc1 $f2, 0x1c($v1) -/* 99E01C 8024168C 8E0300D0 */ lw $v1, 0xd0($s0) -/* 99E020 80241690 C440003C */ lwc1 $f0, 0x3c($v0) -/* 99E024 80241694 4600008D */ trunc.w.s $f2, $f0 -/* 99E028 80241698 E4620020 */ swc1 $f2, 0x20($v1) -/* 99E02C 8024169C 8E0300D0 */ lw $v1, 0xd0($s0) -/* 99E030 802416A0 C4400040 */ lwc1 $f0, 0x40($v0) -/* 99E034 802416A4 4600008D */ trunc.w.s $f2, $f0 -/* 99E038 802416A8 E4620024 */ swc1 $f2, 0x24($v1) -/* 99E03C 802416AC 8FBF0014 */ lw $ra, 0x14($sp) -/* 99E040 802416B0 8FB00010 */ lw $s0, 0x10($sp) -/* 99E044 802416B4 24020002 */ addiu $v0, $zero, 2 -/* 99E048 802416B8 03E00008 */ jr $ra -/* 99E04C 802416BC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240474_9A1454.s b/ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240474_9A1454.s deleted file mode 100644 index 9456f34833..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240474_9A1454.s +++ /dev/null @@ -1,309 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_802432E8_9A42C8 -.word .L80240880_9A1860, .L8024088C_9A186C, .L8024088C_9A186C, .L8024088C_9A186C, .L8024088C_9A186C, .L8024088C_9A186C, .L8024088C_9A186C, .L8024088C_9A186C, .L80240880_9A1860, .L8024088C_9A186C, .L80240880_9A1860, .L8024088C_9A186C, .L80240880_9A1860, .L8024088C_9A186C, .L80240880_9A1860, .L8024088C_9A186C, .L8024088C_9A186C, .L8024088C_9A186C, .L80240880_9A1860, .L8024088C_9A186C, .L80240880_9A1860, 0 - -.section .text - -glabel func_80240474_9A1454 -/* 9A1454 80240474 27BDFF90 */ addiu $sp, $sp, -0x70 -/* 9A1458 80240478 AFB3005C */ sw $s3, 0x5c($sp) -/* 9A145C 8024047C 0080982D */ daddu $s3, $a0, $zero -/* 9A1460 80240480 AFBF0068 */ sw $ra, 0x68($sp) -/* 9A1464 80240484 AFB50064 */ sw $s5, 0x64($sp) -/* 9A1468 80240488 AFB40060 */ sw $s4, 0x60($sp) -/* 9A146C 8024048C AFB20058 */ sw $s2, 0x58($sp) -/* 9A1470 80240490 AFB10054 */ sw $s1, 0x54($sp) -/* 9A1474 80240494 AFB00050 */ sw $s0, 0x50($sp) -/* 9A1478 80240498 8E710148 */ lw $s1, 0x148($s3) -/* 9A147C 8024049C 86240008 */ lh $a0, 8($s1) -/* 9A1480 802404A0 0C00EABB */ jal get_npc_unsafe -/* 9A1484 802404A4 00A0802D */ daddu $s0, $a1, $zero -/* 9A1488 802404A8 8E63000C */ lw $v1, 0xc($s3) -/* 9A148C 802404AC 0260202D */ daddu $a0, $s3, $zero -/* 9A1490 802404B0 8C650000 */ lw $a1, ($v1) -/* 9A1494 802404B4 0C0B1EAF */ jal evt_get_variable -/* 9A1498 802404B8 0040902D */ daddu $s2, $v0, $zero -/* 9A149C 802404BC AFA00028 */ sw $zero, 0x28($sp) -/* 9A14A0 802404C0 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A14A4 802404C4 8C630030 */ lw $v1, 0x30($v1) -/* 9A14A8 802404C8 AFA3002C */ sw $v1, 0x2c($sp) -/* 9A14AC 802404CC 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A14B0 802404D0 8C63001C */ lw $v1, 0x1c($v1) -/* 9A14B4 802404D4 AFA30030 */ sw $v1, 0x30($sp) -/* 9A14B8 802404D8 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A14BC 802404DC 8C630024 */ lw $v1, 0x24($v1) -/* 9A14C0 802404E0 AFA30034 */ sw $v1, 0x34($sp) -/* 9A14C4 802404E4 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A14C8 802404E8 8C630028 */ lw $v1, 0x28($v1) -/* 9A14CC 802404EC 27B50028 */ addiu $s5, $sp, 0x28 -/* 9A14D0 802404F0 AFA30038 */ sw $v1, 0x38($sp) -/* 9A14D4 802404F4 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A14D8 802404F8 3C0142C8 */ lui $at, 0x42c8 -/* 9A14DC 802404FC 44810000 */ mtc1 $at, $f0 -/* 9A14E0 80240500 8C63002C */ lw $v1, 0x2c($v1) -/* 9A14E4 80240504 0040A02D */ daddu $s4, $v0, $zero -/* 9A14E8 80240508 E7A00040 */ swc1 $f0, 0x40($sp) -/* 9A14EC 8024050C A7A00044 */ sh $zero, 0x44($sp) -/* 9A14F0 80240510 12000009 */ beqz $s0, .L80240538 -/* 9A14F4 80240514 AFA3003C */ sw $v1, 0x3c($sp) -/* 9A14F8 80240518 864300A8 */ lh $v1, 0xa8($s2) -/* 9A14FC 8024051C 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9A1500 80240520 AE20008C */ sw $zero, 0x8c($s1) -/* 9A1504 80240524 A22000B5 */ sb $zero, 0xb5($s1) -/* 9A1508 80240528 34420008 */ ori $v0, $v0, 8 -/* 9A150C 8024052C AE230084 */ sw $v1, 0x84($s1) -/* 9A1510 80240530 08090152 */ j .L80240548 -/* 9A1514 80240534 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240538: -/* 9A1518 80240538 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9A151C 8024053C 30420004 */ andi $v0, $v0, 4 -/* 9A1520 80240540 10400047 */ beqz $v0, .L80240660 -/* 9A1524 80240544 00000000 */ nop -.L80240548: -/* 9A1528 80240548 AE600070 */ sw $zero, 0x70($s3) -/* 9A152C 8024054C A640008E */ sh $zero, 0x8e($s2) -/* 9A1530 80240550 8E2300CC */ lw $v1, 0xcc($s1) -/* 9A1534 80240554 2404F7FF */ addiu $a0, $zero, -0x801 -/* 9A1538 80240558 A2200007 */ sb $zero, 7($s1) -/* 9A153C 8024055C 8E420000 */ lw $v0, ($s2) -/* 9A1540 80240560 8C630000 */ lw $v1, ($v1) -/* 9A1544 80240564 00441024 */ and $v0, $v0, $a0 -/* 9A1548 80240568 AE420000 */ sw $v0, ($s2) -/* 9A154C 8024056C AE430028 */ sw $v1, 0x28($s2) -/* 9A1550 80240570 96220086 */ lhu $v0, 0x86($s1) -/* 9A1554 80240574 A64200A8 */ sh $v0, 0xa8($s2) -/* 9A1558 80240578 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9A155C 8024057C AE200090 */ sw $zero, 0x90($s1) -/* 9A1560 80240580 8C420034 */ lw $v0, 0x34($v0) -/* 9A1564 80240584 14400006 */ bnez $v0, .L802405A0 -/* 9A1568 80240588 2403FDFF */ addiu $v1, $zero, -0x201 -/* 9A156C 8024058C 8E420000 */ lw $v0, ($s2) -/* 9A1570 80240590 2403FFF7 */ addiu $v1, $zero, -9 -/* 9A1574 80240594 34420200 */ ori $v0, $v0, 0x200 -/* 9A1578 80240598 0809016B */ j .L802405AC -/* 9A157C 8024059C 00431024 */ and $v0, $v0, $v1 -.L802405A0: -/* 9A1580 802405A0 8E420000 */ lw $v0, ($s2) -/* 9A1584 802405A4 00431024 */ and $v0, $v0, $v1 -/* 9A1588 802405A8 34420008 */ ori $v0, $v0, 8 -.L802405AC: -/* 9A158C 802405AC AE420000 */ sw $v0, ($s2) -/* 9A1590 802405B0 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9A1594 802405B4 30420004 */ andi $v0, $v0, 4 -/* 9A1598 802405B8 1040001E */ beqz $v0, .L80240634 -/* 9A159C 802405BC 24040002 */ addiu $a0, $zero, 2 -/* 9A15A0 802405C0 0240282D */ daddu $a1, $s2, $zero -/* 9A15A4 802405C4 0000302D */ daddu $a2, $zero, $zero -/* 9A15A8 802405C8 24020063 */ addiu $v0, $zero, 0x63 -/* 9A15AC 802405CC AE620070 */ sw $v0, 0x70($s3) -/* 9A15B0 802405D0 AE600074 */ sw $zero, 0x74($s3) -/* 9A15B4 802405D4 864300A8 */ lh $v1, 0xa8($s2) -/* 9A15B8 802405D8 3C013F80 */ lui $at, 0x3f80 -/* 9A15BC 802405DC 44810000 */ mtc1 $at, $f0 -/* 9A15C0 802405E0 3C014000 */ lui $at, 0x4000 -/* 9A15C4 802405E4 44811000 */ mtc1 $at, $f2 -/* 9A15C8 802405E8 3C01C1A0 */ lui $at, 0xc1a0 -/* 9A15CC 802405EC 44812000 */ mtc1 $at, $f4 -/* 9A15D0 802405F0 24020028 */ addiu $v0, $zero, 0x28 -/* 9A15D4 802405F4 AFA2001C */ sw $v0, 0x1c($sp) -/* 9A15D8 802405F8 44833000 */ mtc1 $v1, $f6 -/* 9A15DC 802405FC 00000000 */ nop -/* 9A15E0 80240600 468031A0 */ cvt.s.w $f6, $f6 -/* 9A15E4 80240604 44073000 */ mfc1 $a3, $f6 -/* 9A15E8 80240608 27A20048 */ addiu $v0, $sp, 0x48 -/* 9A15EC 8024060C AFA20020 */ sw $v0, 0x20($sp) -/* 9A15F0 80240610 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9A15F4 80240614 E7A20014 */ swc1 $f2, 0x14($sp) -/* 9A15F8 80240618 0C01BFA4 */ jal fx_emote -/* 9A15FC 8024061C E7A40018 */ swc1 $f4, 0x18($sp) -/* 9A1600 80240620 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9A1604 80240624 2403FFFB */ addiu $v1, $zero, -5 -/* 9A1608 80240628 00431024 */ and $v0, $v0, $v1 -/* 9A160C 8024062C 08090198 */ j .L80240660 -/* 9A1610 80240630 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240634: -/* 9A1614 80240634 8E220000 */ lw $v0, ($s1) -/* 9A1618 80240638 3C034000 */ lui $v1, 0x4000 -/* 9A161C 8024063C 00431024 */ and $v0, $v0, $v1 -/* 9A1620 80240640 10400007 */ beqz $v0, .L80240660 -/* 9A1624 80240644 3C03BFFF */ lui $v1, 0xbfff -/* 9A1628 80240648 2402000C */ addiu $v0, $zero, 0xc -/* 9A162C 8024064C AE620070 */ sw $v0, 0x70($s3) -/* 9A1630 80240650 8E220000 */ lw $v0, ($s1) -/* 9A1634 80240654 3463FFFF */ ori $v1, $v1, 0xffff -/* 9A1638 80240658 00431024 */ and $v0, $v0, $v1 -/* 9A163C 8024065C AE220000 */ sw $v0, ($s1) -.L80240660: -/* 9A1640 80240660 8E220090 */ lw $v0, 0x90($s1) -/* 9A1644 80240664 1840000C */ blez $v0, .L80240698 -/* 9A1648 80240668 2442FFFF */ addiu $v0, $v0, -1 -/* 9A164C 8024066C 14400087 */ bnez $v0, .L8024088C_9A186C -/* 9A1650 80240670 AE220090 */ sw $v0, 0x90($s1) -/* 9A1654 80240674 3C03FFAA */ lui $v1, 0xffaa -/* 9A1658 80240678 8E420028 */ lw $v0, 0x28($s2) -/* 9A165C 8024067C 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* 9A1660 80240680 00431021 */ addu $v0, $v0, $v1 -/* 9A1664 80240684 2C420002 */ sltiu $v0, $v0, 2 -/* 9A1668 80240688 10400003 */ beqz $v0, .L80240698 -/* 9A166C 8024068C 3C020055 */ lui $v0, 0x55 -/* 9A1670 80240690 3442000C */ ori $v0, $v0, 0xc -/* 9A1674 80240694 AE420028 */ sw $v0, 0x28($s2) -.L80240698: -/* 9A1678 80240698 8E630070 */ lw $v1, 0x70($s3) -/* 9A167C 8024069C 2402000C */ addiu $v0, $zero, 0xc -/* 9A1680 802406A0 10620048 */ beq $v1, $v0, .L802407C4 -/* 9A1684 802406A4 2862000D */ slti $v0, $v1, 0xd -/* 9A1688 802406A8 1040000F */ beqz $v0, .L802406E8 -/* 9A168C 802406AC 24100001 */ addiu $s0, $zero, 1 -/* 9A1690 802406B0 1070001E */ beq $v1, $s0, .L8024072C -/* 9A1694 802406B4 28620002 */ slti $v0, $v1, 2 -/* 9A1698 802406B8 10400005 */ beqz $v0, .L802406D0 -/* 9A169C 802406BC 24020002 */ addiu $v0, $zero, 2 -/* 9A16A0 802406C0 10600015 */ beqz $v1, .L80240718 -/* 9A16A4 802406C4 0260202D */ daddu $a0, $s3, $zero -/* 9A16A8 802406C8 08090208 */ j .L80240820 -/* 9A16AC 802406CC 00000000 */ nop -.L802406D0: -/* 9A16B0 802406D0 1062001C */ beq $v1, $v0, .L80240744 -/* 9A16B4 802406D4 24020003 */ addiu $v0, $zero, 3 -/* 9A16B8 802406D8 10620035 */ beq $v1, $v0, .L802407B0 -/* 9A16BC 802406DC 0260202D */ daddu $a0, $s3, $zero -/* 9A16C0 802406E0 08090208 */ j .L80240820 -/* 9A16C4 802406E4 00000000 */ nop -.L802406E8: -/* 9A16C8 802406E8 2402000E */ addiu $v0, $zero, 0xe -/* 9A16CC 802406EC 1062003F */ beq $v1, $v0, .L802407EC -/* 9A16D0 802406F0 0062102A */ slt $v0, $v1, $v0 -/* 9A16D4 802406F4 14400038 */ bnez $v0, .L802407D8 -/* 9A16D8 802406F8 0260202D */ daddu $a0, $s3, $zero -/* 9A16DC 802406FC 2402000F */ addiu $v0, $zero, 0xf -/* 9A16E0 80240700 10620040 */ beq $v1, $v0, .L80240804 -/* 9A16E4 80240704 24020063 */ addiu $v0, $zero, 0x63 -/* 9A16E8 80240708 10620043 */ beq $v1, $v0, .L80240818 -/* 9A16EC 8024070C 00000000 */ nop -/* 9A16F0 80240710 08090208 */ j .L80240820 -/* 9A16F4 80240714 00000000 */ nop -.L80240718: -/* 9A16F8 80240718 0280282D */ daddu $a1, $s4, $zero -/* 9A16FC 8024071C 0C012568 */ jal func_800495A0 -/* 9A1700 80240720 02A0302D */ daddu $a2, $s5, $zero -/* 9A1704 80240724 96220086 */ lhu $v0, 0x86($s1) -/* 9A1708 80240728 A64200A8 */ sh $v0, 0xa8($s2) -.L8024072C: -/* 9A170C 8024072C 0260202D */ daddu $a0, $s3, $zero -/* 9A1710 80240730 0280282D */ daddu $a1, $s4, $zero -/* 9A1714 80240734 0C0125AE */ jal func_800496B8 -/* 9A1718 80240738 02A0302D */ daddu $a2, $s5, $zero -/* 9A171C 8024073C 08090208 */ j .L80240820 -/* 9A1720 80240740 00000000 */ nop -.L80240744: -/* 9A1724 80240744 0260202D */ daddu $a0, $s3, $zero -/* 9A1728 80240748 0280282D */ daddu $a1, $s4, $zero -/* 9A172C 8024074C 0C0126D1 */ jal base_UnkNpcAIFunc1 -/* 9A1730 80240750 02A0302D */ daddu $a2, $s5, $zero -/* 9A1734 80240754 8E230088 */ lw $v1, 0x88($s1) -/* 9A1738 80240758 24020006 */ addiu $v0, $zero, 6 -/* 9A173C 8024075C 14620014 */ bne $v1, $v0, .L802407B0 -/* 9A1740 80240760 0260202D */ daddu $a0, $s3, $zero -/* 9A1744 80240764 0C00A67F */ jal rand_int -/* 9A1748 80240768 24040064 */ addiu $a0, $zero, 0x64 -/* 9A174C 8024076C 28420021 */ slti $v0, $v0, 0x21 -/* 9A1750 80240770 5040000F */ beql $v0, $zero, .L802407B0 -/* 9A1754 80240774 0260202D */ daddu $a0, $s3, $zero -/* 9A1758 80240778 8E22008C */ lw $v0, 0x8c($s1) -/* 9A175C 8024077C 10400005 */ beqz $v0, .L80240794 -/* 9A1760 80240780 3C020055 */ lui $v0, 0x55 -/* 9A1764 80240784 3442002F */ ori $v0, $v0, 0x2f -/* 9A1768 80240788 AE20008C */ sw $zero, 0x8c($s1) -/* 9A176C 8024078C 080901E8 */ j .L802407A0 -/* 9A1770 80240790 A22000B5 */ sb $zero, 0xb5($s1) -.L80240794: -/* 9A1774 80240794 3442002E */ ori $v0, $v0, 0x2e -/* 9A1778 80240798 AE30008C */ sw $s0, 0x8c($s1) -/* 9A177C 8024079C A23000B5 */ sb $s0, 0xb5($s1) -.L802407A0: -/* 9A1780 802407A0 AE420028 */ sw $v0, 0x28($s2) -/* 9A1784 802407A4 24020007 */ addiu $v0, $zero, 7 -/* 9A1788 802407A8 08090223 */ j .L8024088C_9A186C -/* 9A178C 802407AC AE220090 */ sw $v0, 0x90($s1) -.L802407B0: -/* 9A1790 802407B0 0280282D */ daddu $a1, $s4, $zero -/* 9A1794 802407B4 0C012701 */ jal func_80049C04 -/* 9A1798 802407B8 02A0302D */ daddu $a2, $s5, $zero -/* 9A179C 802407BC 08090208 */ j .L80240820 -/* 9A17A0 802407C0 00000000 */ nop -.L802407C4: -/* 9A17A4 802407C4 0260202D */ daddu $a0, $s3, $zero -/* 9A17A8 802407C8 0280282D */ daddu $a1, $s4, $zero -/* 9A17AC 802407CC 0C090038 */ jal trd_02_set_script_owner_npc_anim -/* 9A17B0 802407D0 02A0302D */ daddu $a2, $s5, $zero -/* 9A17B4 802407D4 0260202D */ daddu $a0, $s3, $zero -.L802407D8: -/* 9A17B8 802407D8 0280282D */ daddu $a1, $s4, $zero -/* 9A17BC 802407DC 0C090057 */ jal trd_02_UnkDistFunc -/* 9A17C0 802407E0 02A0302D */ daddu $a2, $s5, $zero -/* 9A17C4 802407E4 08090208 */ j .L80240820 -/* 9A17C8 802407E8 00000000 */ nop -.L802407EC: -/* 9A17CC 802407EC 0260202D */ daddu $a0, $s3, $zero -/* 9A17D0 802407F0 0280282D */ daddu $a1, $s4, $zero -/* 9A17D4 802407F4 0C0900A4 */ jal trd_02_UnkNpcAIFunc12 -/* 9A17D8 802407F8 02A0302D */ daddu $a2, $s5, $zero -/* 9A17DC 802407FC 08090208 */ j .L80240820 -/* 9A17E0 80240800 00000000 */ nop -.L80240804: -/* 9A17E4 80240804 0280282D */ daddu $a1, $s4, $zero -/* 9A17E8 80240808 0C0900FD */ jal trd_02_set_script_owner_npc_col_height -/* 9A17EC 8024080C 02A0302D */ daddu $a2, $s5, $zero -/* 9A17F0 80240810 08090208 */ j .L80240820 -/* 9A17F4 80240814 00000000 */ nop -.L80240818: -/* 9A17F8 80240818 0C0129CF */ jal func_8004A73C -/* 9A17FC 8024081C 0260202D */ daddu $a0, $s3, $zero -.L80240820: -/* 9A1800 80240820 8E230088 */ lw $v1, 0x88($s1) -/* 9A1804 80240824 24020006 */ addiu $v0, $zero, 6 -/* 9A1808 80240828 14620019 */ bne $v1, $v0, .L80240890 -/* 9A180C 8024082C 0000102D */ daddu $v0, $zero, $zero -/* 9A1810 80240830 8E22008C */ lw $v0, 0x8c($s1) -/* 9A1814 80240834 10400003 */ beqz $v0, .L80240844 -/* 9A1818 80240838 24020001 */ addiu $v0, $zero, 1 -/* 9A181C 8024083C 08090212 */ j .L80240848 -/* 9A1820 80240840 A22200B5 */ sb $v0, 0xb5($s1) -.L80240844: -/* 9A1824 80240844 A22000B5 */ sb $zero, 0xb5($s1) -.L80240848: -/* 9A1828 80240848 8E22008C */ lw $v0, 0x8c($s1) -/* 9A182C 8024084C 1040000F */ beqz $v0, .L8024088C_9A186C -/* 9A1830 80240850 3C03FFAA */ lui $v1, 0xffaa -/* 9A1834 80240854 8E420028 */ lw $v0, 0x28($s2) -/* 9A1838 80240858 3463FFFC */ ori $v1, $v1, 0xfffc -/* 9A183C 8024085C 00431821 */ addu $v1, $v0, $v1 -/* 9A1840 80240860 2C620015 */ sltiu $v0, $v1, 0x15 -/* 9A1844 80240864 10400009 */ beqz $v0, .L8024088C_9A186C -/* 9A1848 80240868 00031080 */ sll $v0, $v1, 2 -/* 9A184C 8024086C 3C018024 */ lui $at, %hi(jtbl_802432E8_9A42C8) -/* 9A1850 80240870 00220821 */ addu $at, $at, $v0 -/* 9A1854 80240874 8C2232E8 */ lw $v0, %lo(jtbl_802432E8_9A42C8)($at) -/* 9A1858 80240878 00400008 */ jr $v0 -/* 9A185C 8024087C 00000000 */ nop -.L80240880_9A1860: -/* 9A1860 80240880 8E420028 */ lw $v0, 0x28($s2) -/* 9A1864 80240884 24420001 */ addiu $v0, $v0, 1 -/* 9A1868 80240888 AE420028 */ sw $v0, 0x28($s2) -.L8024088C_9A186C: -/* 9A186C 8024088C 0000102D */ daddu $v0, $zero, $zero -.L80240890: -/* 9A1870 80240890 8FBF0068 */ lw $ra, 0x68($sp) -/* 9A1874 80240894 8FB50064 */ lw $s5, 0x64($sp) -/* 9A1878 80240898 8FB40060 */ lw $s4, 0x60($sp) -/* 9A187C 8024089C 8FB3005C */ lw $s3, 0x5c($sp) -/* 9A1880 802408A0 8FB20058 */ lw $s2, 0x58($sp) -/* 9A1884 802408A4 8FB10054 */ lw $s1, 0x54($sp) -/* 9A1888 802408A8 8FB00050 */ lw $s0, 0x50($sp) -/* 9A188C 802408AC 03E00008 */ jr $ra -/* 9A1890 802408B0 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_80240434_9A4A84.s b/ver/us/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_80240434_9A4A84.s deleted file mode 100644 index b0a39053f2..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_80240434_9A4A84.s +++ /dev/null @@ -1,312 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80243D48_9A8398 -.word .L80240840_9A4E90, .L8024084C_9A4E9C, .L8024084C_9A4E9C, .L8024084C_9A4E9C, .L8024084C_9A4E9C, .L8024084C_9A4E9C, .L8024084C_9A4E9C, .L8024084C_9A4E9C, .L80240840_9A4E90, .L8024084C_9A4E9C, .L80240840_9A4E90, .L8024084C_9A4E9C, .L80240840_9A4E90, .L8024084C_9A4E9C, .L80240840_9A4E90, .L8024084C_9A4E9C, .L8024084C_9A4E9C, .L8024084C_9A4E9C, .L80240840_9A4E90, .L8024084C_9A4E9C, .L80240840_9A4E90, 0 - -.section .text - -glabel func_80240434_9A4A84 -/* 9A4A84 80240434 27BDFF90 */ addiu $sp, $sp, -0x70 -/* 9A4A88 80240438 AFB3005C */ sw $s3, 0x5c($sp) -/* 9A4A8C 8024043C 0080982D */ daddu $s3, $a0, $zero -/* 9A4A90 80240440 AFBF0068 */ sw $ra, 0x68($sp) -/* 9A4A94 80240444 AFB50064 */ sw $s5, 0x64($sp) -/* 9A4A98 80240448 AFB40060 */ sw $s4, 0x60($sp) -/* 9A4A9C 8024044C AFB20058 */ sw $s2, 0x58($sp) -/* 9A4AA0 80240450 AFB10054 */ sw $s1, 0x54($sp) -/* 9A4AA4 80240454 AFB00050 */ sw $s0, 0x50($sp) -/* 9A4AA8 80240458 8E710148 */ lw $s1, 0x148($s3) -/* 9A4AAC 8024045C 86240008 */ lh $a0, 8($s1) -/* 9A4AB0 80240460 0C00EABB */ jal get_npc_unsafe -/* 9A4AB4 80240464 00A0802D */ daddu $s0, $a1, $zero -/* 9A4AB8 80240468 8E63000C */ lw $v1, 0xc($s3) -/* 9A4ABC 8024046C 0260202D */ daddu $a0, $s3, $zero -/* 9A4AC0 80240470 8C650000 */ lw $a1, ($v1) -/* 9A4AC4 80240474 0C0B1EAF */ jal evt_get_variable -/* 9A4AC8 80240478 0040902D */ daddu $s2, $v0, $zero -/* 9A4ACC 8024047C AFA00028 */ sw $zero, 0x28($sp) -/* 9A4AD0 80240480 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A4AD4 80240484 8C630030 */ lw $v1, 0x30($v1) -/* 9A4AD8 80240488 AFA3002C */ sw $v1, 0x2c($sp) -/* 9A4ADC 8024048C 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A4AE0 80240490 8C63001C */ lw $v1, 0x1c($v1) -/* 9A4AE4 80240494 AFA30030 */ sw $v1, 0x30($sp) -/* 9A4AE8 80240498 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A4AEC 8024049C 8C630024 */ lw $v1, 0x24($v1) -/* 9A4AF0 802404A0 AFA30034 */ sw $v1, 0x34($sp) -/* 9A4AF4 802404A4 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A4AF8 802404A8 8C630028 */ lw $v1, 0x28($v1) -/* 9A4AFC 802404AC 27B50028 */ addiu $s5, $sp, 0x28 -/* 9A4B00 802404B0 AFA30038 */ sw $v1, 0x38($sp) -/* 9A4B04 802404B4 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A4B08 802404B8 3C0142C8 */ lui $at, 0x42c8 -/* 9A4B0C 802404BC 44810000 */ mtc1 $at, $f0 -/* 9A4B10 802404C0 8C63002C */ lw $v1, 0x2c($v1) -/* 9A4B14 802404C4 0040A02D */ daddu $s4, $v0, $zero -/* 9A4B18 802404C8 E7A00040 */ swc1 $f0, 0x40($sp) -/* 9A4B1C 802404CC A7A00044 */ sh $zero, 0x44($sp) -/* 9A4B20 802404D0 12000009 */ beqz $s0, .L802404F8 -/* 9A4B24 802404D4 AFA3003C */ sw $v1, 0x3c($sp) -/* 9A4B28 802404D8 864300A8 */ lh $v1, 0xa8($s2) -/* 9A4B2C 802404DC 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9A4B30 802404E0 AE20008C */ sw $zero, 0x8c($s1) -/* 9A4B34 802404E4 A22000B5 */ sb $zero, 0xb5($s1) -/* 9A4B38 802404E8 34420008 */ ori $v0, $v0, 8 -/* 9A4B3C 802404EC AE230084 */ sw $v1, 0x84($s1) -/* 9A4B40 802404F0 08090142 */ j .L80240508 -/* 9A4B44 802404F4 AE2200B0 */ sw $v0, 0xb0($s1) -.L802404F8: -/* 9A4B48 802404F8 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9A4B4C 802404FC 30420004 */ andi $v0, $v0, 4 -/* 9A4B50 80240500 10400047 */ beqz $v0, .L80240620 -/* 9A4B54 80240504 00000000 */ nop -.L80240508: -/* 9A4B58 80240508 AE600070 */ sw $zero, 0x70($s3) -/* 9A4B5C 8024050C A640008E */ sh $zero, 0x8e($s2) -/* 9A4B60 80240510 8E2300CC */ lw $v1, 0xcc($s1) -/* 9A4B64 80240514 2404F7FF */ addiu $a0, $zero, -0x801 -/* 9A4B68 80240518 A2200007 */ sb $zero, 7($s1) -/* 9A4B6C 8024051C 8E420000 */ lw $v0, ($s2) -/* 9A4B70 80240520 8C630000 */ lw $v1, ($v1) -/* 9A4B74 80240524 00441024 */ and $v0, $v0, $a0 -/* 9A4B78 80240528 AE420000 */ sw $v0, ($s2) -/* 9A4B7C 8024052C AE430028 */ sw $v1, 0x28($s2) -/* 9A4B80 80240530 96220086 */ lhu $v0, 0x86($s1) -/* 9A4B84 80240534 A64200A8 */ sh $v0, 0xa8($s2) -/* 9A4B88 80240538 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9A4B8C 8024053C AE200090 */ sw $zero, 0x90($s1) -/* 9A4B90 80240540 8C420034 */ lw $v0, 0x34($v0) -/* 9A4B94 80240544 14400006 */ bnez $v0, .L80240560 -/* 9A4B98 80240548 2403FDFF */ addiu $v1, $zero, -0x201 -/* 9A4B9C 8024054C 8E420000 */ lw $v0, ($s2) -/* 9A4BA0 80240550 2403FFF7 */ addiu $v1, $zero, -9 -/* 9A4BA4 80240554 34420200 */ ori $v0, $v0, 0x200 -/* 9A4BA8 80240558 0809015B */ j .L8024056C -/* 9A4BAC 8024055C 00431024 */ and $v0, $v0, $v1 -.L80240560: -/* 9A4BB0 80240560 8E420000 */ lw $v0, ($s2) -/* 9A4BB4 80240564 00431024 */ and $v0, $v0, $v1 -/* 9A4BB8 80240568 34420008 */ ori $v0, $v0, 8 -.L8024056C: -/* 9A4BBC 8024056C AE420000 */ sw $v0, ($s2) -/* 9A4BC0 80240570 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9A4BC4 80240574 30420004 */ andi $v0, $v0, 4 -/* 9A4BC8 80240578 1040001E */ beqz $v0, .L802405F4 -/* 9A4BCC 8024057C 24040002 */ addiu $a0, $zero, 2 -/* 9A4BD0 80240580 0240282D */ daddu $a1, $s2, $zero -/* 9A4BD4 80240584 0000302D */ daddu $a2, $zero, $zero -/* 9A4BD8 80240588 24020063 */ addiu $v0, $zero, 0x63 -/* 9A4BDC 8024058C AE620070 */ sw $v0, 0x70($s3) -/* 9A4BE0 80240590 AE600074 */ sw $zero, 0x74($s3) -/* 9A4BE4 80240594 864300A8 */ lh $v1, 0xa8($s2) -/* 9A4BE8 80240598 3C013F80 */ lui $at, 0x3f80 -/* 9A4BEC 8024059C 44810000 */ mtc1 $at, $f0 -/* 9A4BF0 802405A0 3C014000 */ lui $at, 0x4000 -/* 9A4BF4 802405A4 44811000 */ mtc1 $at, $f2 -/* 9A4BF8 802405A8 3C01C1A0 */ lui $at, 0xc1a0 -/* 9A4BFC 802405AC 44812000 */ mtc1 $at, $f4 -/* 9A4C00 802405B0 24020028 */ addiu $v0, $zero, 0x28 -/* 9A4C04 802405B4 AFA2001C */ sw $v0, 0x1c($sp) -/* 9A4C08 802405B8 44833000 */ mtc1 $v1, $f6 -/* 9A4C0C 802405BC 00000000 */ nop -/* 9A4C10 802405C0 468031A0 */ cvt.s.w $f6, $f6 -/* 9A4C14 802405C4 44073000 */ mfc1 $a3, $f6 -/* 9A4C18 802405C8 27A20048 */ addiu $v0, $sp, 0x48 -/* 9A4C1C 802405CC AFA20020 */ sw $v0, 0x20($sp) -/* 9A4C20 802405D0 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9A4C24 802405D4 E7A20014 */ swc1 $f2, 0x14($sp) -/* 9A4C28 802405D8 0C01BFA4 */ jal fx_emote -/* 9A4C2C 802405DC E7A40018 */ swc1 $f4, 0x18($sp) -/* 9A4C30 802405E0 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9A4C34 802405E4 2403FFFB */ addiu $v1, $zero, -5 -/* 9A4C38 802405E8 00431024 */ and $v0, $v0, $v1 -/* 9A4C3C 802405EC 08090188 */ j .L80240620 -/* 9A4C40 802405F0 AE2200B0 */ sw $v0, 0xb0($s1) -.L802405F4: -/* 9A4C44 802405F4 8E220000 */ lw $v0, ($s1) -/* 9A4C48 802405F8 3C034000 */ lui $v1, 0x4000 -/* 9A4C4C 802405FC 00431024 */ and $v0, $v0, $v1 -/* 9A4C50 80240600 10400007 */ beqz $v0, .L80240620 -/* 9A4C54 80240604 3C03BFFF */ lui $v1, 0xbfff -/* 9A4C58 80240608 2402000C */ addiu $v0, $zero, 0xc -/* 9A4C5C 8024060C AE620070 */ sw $v0, 0x70($s3) -/* 9A4C60 80240610 8E220000 */ lw $v0, ($s1) -/* 9A4C64 80240614 3463FFFF */ ori $v1, $v1, 0xffff -/* 9A4C68 80240618 00431024 */ and $v0, $v0, $v1 -/* 9A4C6C 8024061C AE220000 */ sw $v0, ($s1) -.L80240620: -/* 9A4C70 80240620 8E220090 */ lw $v0, 0x90($s1) -/* 9A4C74 80240624 1840000C */ blez $v0, .L80240658 -/* 9A4C78 80240628 2442FFFF */ addiu $v0, $v0, -1 -/* 9A4C7C 8024062C 14400087 */ bnez $v0, .L8024084C_9A4E9C -/* 9A4C80 80240630 AE220090 */ sw $v0, 0x90($s1) -/* 9A4C84 80240634 3C03FFAA */ lui $v1, 0xffaa -/* 9A4C88 80240638 8E420028 */ lw $v0, 0x28($s2) -/* 9A4C8C 8024063C 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* 9A4C90 80240640 00431021 */ addu $v0, $v0, $v1 -/* 9A4C94 80240644 2C420002 */ sltiu $v0, $v0, 2 -/* 9A4C98 80240648 10400003 */ beqz $v0, .L80240658 -/* 9A4C9C 8024064C 3C020055 */ lui $v0, 0x55 -/* 9A4CA0 80240650 3442000C */ ori $v0, $v0, 0xc -/* 9A4CA4 80240654 AE420028 */ sw $v0, 0x28($s2) -.L80240658: -/* 9A4CA8 80240658 8E630070 */ lw $v1, 0x70($s3) -/* 9A4CAC 8024065C 2402000C */ addiu $v0, $zero, 0xc -/* 9A4CB0 80240660 10620048 */ beq $v1, $v0, .L80240784 -/* 9A4CB4 80240664 2862000D */ slti $v0, $v1, 0xd -/* 9A4CB8 80240668 1040000F */ beqz $v0, .L802406A8 -/* 9A4CBC 8024066C 24100001 */ addiu $s0, $zero, 1 -/* 9A4CC0 80240670 1070001E */ beq $v1, $s0, .L802406EC -/* 9A4CC4 80240674 28620002 */ slti $v0, $v1, 2 -/* 9A4CC8 80240678 10400005 */ beqz $v0, .L80240690 -/* 9A4CCC 8024067C 24020002 */ addiu $v0, $zero, 2 -/* 9A4CD0 80240680 10600015 */ beqz $v1, .L802406D8 -/* 9A4CD4 80240684 0260202D */ daddu $a0, $s3, $zero -/* 9A4CD8 80240688 080901F8 */ j .L802407E0 -/* 9A4CDC 8024068C 00000000 */ nop -.L80240690: -/* 9A4CE0 80240690 1062001C */ beq $v1, $v0, .L80240704 -/* 9A4CE4 80240694 24020003 */ addiu $v0, $zero, 3 -/* 9A4CE8 80240698 10620035 */ beq $v1, $v0, .L80240770 -/* 9A4CEC 8024069C 0260202D */ daddu $a0, $s3, $zero -/* 9A4CF0 802406A0 080901F8 */ j .L802407E0 -/* 9A4CF4 802406A4 00000000 */ nop -.L802406A8: -/* 9A4CF8 802406A8 2402000E */ addiu $v0, $zero, 0xe -/* 9A4CFC 802406AC 1062003F */ beq $v1, $v0, .L802407AC -/* 9A4D00 802406B0 0062102A */ slt $v0, $v1, $v0 -/* 9A4D04 802406B4 14400038 */ bnez $v0, .L80240798 -/* 9A4D08 802406B8 0260202D */ daddu $a0, $s3, $zero -/* 9A4D0C 802406BC 2402000F */ addiu $v0, $zero, 0xf -/* 9A4D10 802406C0 10620040 */ beq $v1, $v0, .L802407C4 -/* 9A4D14 802406C4 24020063 */ addiu $v0, $zero, 0x63 -/* 9A4D18 802406C8 10620043 */ beq $v1, $v0, .L802407D8 -/* 9A4D1C 802406CC 00000000 */ nop -/* 9A4D20 802406D0 080901F8 */ j .L802407E0 -/* 9A4D24 802406D4 00000000 */ nop -.L802406D8: -/* 9A4D28 802406D8 0280282D */ daddu $a1, $s4, $zero -/* 9A4D2C 802406DC 0C012568 */ jal func_800495A0 -/* 9A4D30 802406E0 02A0302D */ daddu $a2, $s5, $zero -/* 9A4D34 802406E4 96220086 */ lhu $v0, 0x86($s1) -/* 9A4D38 802406E8 A64200A8 */ sh $v0, 0xa8($s2) -.L802406EC: -/* 9A4D3C 802406EC 0260202D */ daddu $a0, $s3, $zero -/* 9A4D40 802406F0 0280282D */ daddu $a1, $s4, $zero -/* 9A4D44 802406F4 0C0125AE */ jal func_800496B8 -/* 9A4D48 802406F8 02A0302D */ daddu $a2, $s5, $zero -/* 9A4D4C 802406FC 080901F8 */ j .L802407E0 -/* 9A4D50 80240700 00000000 */ nop -.L80240704: -/* 9A4D54 80240704 0260202D */ daddu $a0, $s3, $zero -/* 9A4D58 80240708 0280282D */ daddu $a1, $s4, $zero -/* 9A4D5C 8024070C 0C0126D1 */ jal base_UnkNpcAIFunc1 -/* 9A4D60 80240710 02A0302D */ daddu $a2, $s5, $zero -/* 9A4D64 80240714 8E230088 */ lw $v1, 0x88($s1) -/* 9A4D68 80240718 24020006 */ addiu $v0, $zero, 6 -/* 9A4D6C 8024071C 14620014 */ bne $v1, $v0, .L80240770 -/* 9A4D70 80240720 0260202D */ daddu $a0, $s3, $zero -/* 9A4D74 80240724 0C00A67F */ jal rand_int -/* 9A4D78 80240728 24040064 */ addiu $a0, $zero, 0x64 -/* 9A4D7C 8024072C 28420021 */ slti $v0, $v0, 0x21 -/* 9A4D80 80240730 5040000F */ beql $v0, $zero, .L80240770 -/* 9A4D84 80240734 0260202D */ daddu $a0, $s3, $zero -/* 9A4D88 80240738 8E22008C */ lw $v0, 0x8c($s1) -/* 9A4D8C 8024073C 10400005 */ beqz $v0, .L80240754 -/* 9A4D90 80240740 3C020055 */ lui $v0, 0x55 -/* 9A4D94 80240744 3442002F */ ori $v0, $v0, 0x2f -/* 9A4D98 80240748 AE20008C */ sw $zero, 0x8c($s1) -/* 9A4D9C 8024074C 080901D8 */ j .L80240760 -/* 9A4DA0 80240750 A22000B5 */ sb $zero, 0xb5($s1) -.L80240754: -/* 9A4DA4 80240754 3442002E */ ori $v0, $v0, 0x2e -/* 9A4DA8 80240758 AE30008C */ sw $s0, 0x8c($s1) -/* 9A4DAC 8024075C A23000B5 */ sb $s0, 0xb5($s1) -.L80240760: -/* 9A4DB0 80240760 AE420028 */ sw $v0, 0x28($s2) -/* 9A4DB4 80240764 24020007 */ addiu $v0, $zero, 7 -/* 9A4DB8 80240768 08090213 */ j .L8024084C_9A4E9C -/* 9A4DBC 8024076C AE220090 */ sw $v0, 0x90($s1) -.L80240770: -/* 9A4DC0 80240770 0280282D */ daddu $a1, $s4, $zero -/* 9A4DC4 80240774 0C012701 */ jal func_80049C04 -/* 9A4DC8 80240778 02A0302D */ daddu $a2, $s5, $zero -/* 9A4DCC 8024077C 080901F8 */ j .L802407E0 -/* 9A4DD0 80240780 00000000 */ nop -.L80240784: -/* 9A4DD4 80240784 0260202D */ daddu $a0, $s3, $zero -/* 9A4DD8 80240788 0280282D */ daddu $a1, $s4, $zero -/* 9A4DDC 8024078C 0C090028 */ jal trd_03_set_script_owner_npc_anim -/* 9A4DE0 80240790 02A0302D */ daddu $a2, $s5, $zero -/* 9A4DE4 80240794 0260202D */ daddu $a0, $s3, $zero -.L80240798: -/* 9A4DE8 80240798 0280282D */ daddu $a1, $s4, $zero -/* 9A4DEC 8024079C 0C090047 */ jal trd_03_UnkDistFunc -/* 9A4DF0 802407A0 02A0302D */ daddu $a2, $s5, $zero -/* 9A4DF4 802407A4 080901F8 */ j .L802407E0 -/* 9A4DF8 802407A8 00000000 */ nop -.L802407AC: -/* 9A4DFC 802407AC 0260202D */ daddu $a0, $s3, $zero -/* 9A4E00 802407B0 0280282D */ daddu $a1, $s4, $zero -/* 9A4E04 802407B4 0C090094 */ jal trd_03_UnkNpcAIFunc12 -/* 9A4E08 802407B8 02A0302D */ daddu $a2, $s5, $zero -/* 9A4E0C 802407BC 080901F8 */ j .L802407E0 -/* 9A4E10 802407C0 00000000 */ nop -.L802407C4: -/* 9A4E14 802407C4 0280282D */ daddu $a1, $s4, $zero -/* 9A4E18 802407C8 0C0900ED */ jal trd_03_set_script_owner_npc_col_height -/* 9A4E1C 802407CC 02A0302D */ daddu $a2, $s5, $zero -/* 9A4E20 802407D0 080901F8 */ j .L802407E0 -/* 9A4E24 802407D4 00000000 */ nop -.L802407D8: -/* 9A4E28 802407D8 0C0129CF */ jal func_8004A73C -/* 9A4E2C 802407DC 0260202D */ daddu $a0, $s3, $zero -.L802407E0: -/* 9A4E30 802407E0 8E230088 */ lw $v1, 0x88($s1) -/* 9A4E34 802407E4 24020006 */ addiu $v0, $zero, 6 -/* 9A4E38 802407E8 14620019 */ bne $v1, $v0, .L80240850 -/* 9A4E3C 802407EC 0000102D */ daddu $v0, $zero, $zero -/* 9A4E40 802407F0 8E22008C */ lw $v0, 0x8c($s1) -/* 9A4E44 802407F4 10400003 */ beqz $v0, .L80240804 -/* 9A4E48 802407F8 24020001 */ addiu $v0, $zero, 1 -/* 9A4E4C 802407FC 08090202 */ j .L80240808 -/* 9A4E50 80240800 A22200B5 */ sb $v0, 0xb5($s1) -.L80240804: -/* 9A4E54 80240804 A22000B5 */ sb $zero, 0xb5($s1) -.L80240808: -/* 9A4E58 80240808 8E22008C */ lw $v0, 0x8c($s1) -/* 9A4E5C 8024080C 1040000F */ beqz $v0, .L8024084C_9A4E9C -/* 9A4E60 80240810 3C03FFAA */ lui $v1, 0xffaa -/* 9A4E64 80240814 8E420028 */ lw $v0, 0x28($s2) -/* 9A4E68 80240818 3463FFFC */ ori $v1, $v1, 0xfffc -/* 9A4E6C 8024081C 00431821 */ addu $v1, $v0, $v1 -/* 9A4E70 80240820 2C620015 */ sltiu $v0, $v1, 0x15 -/* 9A4E74 80240824 10400009 */ beqz $v0, .L8024084C_9A4E9C -/* 9A4E78 80240828 00031080 */ sll $v0, $v1, 2 -/* 9A4E7C 8024082C 3C018024 */ lui $at, %hi(jtbl_80243D48_9A8398) -/* 9A4E80 80240830 00220821 */ addu $at, $at, $v0 -/* 9A4E84 80240834 8C223D48 */ lw $v0, %lo(jtbl_80243D48_9A8398)($at) -/* 9A4E88 80240838 00400008 */ jr $v0 -/* 9A4E8C 8024083C 00000000 */ nop -.L80240840_9A4E90: -/* 9A4E90 80240840 8E420028 */ lw $v0, 0x28($s2) -/* 9A4E94 80240844 24420001 */ addiu $v0, $v0, 1 -/* 9A4E98 80240848 AE420028 */ sw $v0, 0x28($s2) -.L8024084C_9A4E9C: -/* 9A4E9C 8024084C 0000102D */ daddu $v0, $zero, $zero -.L80240850: -/* 9A4EA0 80240850 8FBF0068 */ lw $ra, 0x68($sp) -/* 9A4EA4 80240854 8FB50064 */ lw $s5, 0x64($sp) -/* 9A4EA8 80240858 8FB40060 */ lw $s4, 0x60($sp) -/* 9A4EAC 8024085C 8FB3005C */ lw $s3, 0x5c($sp) -/* 9A4EB0 80240860 8FB20058 */ lw $s2, 0x58($sp) -/* 9A4EB4 80240864 8FB10054 */ lw $s1, 0x54($sp) -/* 9A4EB8 80240868 8FB00050 */ lw $s0, 0x50($sp) -/* 9A4EBC 8024086C 03E00008 */ jr $ra -/* 9A4EC0 80240870 27BD0070 */ addiu $sp, $sp, 0x70 -/* 9A4EC4 80240874 00000000 */ nop -/* 9A4EC8 80240878 00000000 */ nop -/* 9A4ECC 8024087C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240844_9A8C34.s b/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240844_9A8C34.s deleted file mode 100644 index 23d62c7220..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240844_9A8C34.s +++ /dev/null @@ -1,309 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80245EE8_9AE2D8 -.word .L80240C50_9A9040, .L80240C5C_9A904C, .L80240C5C_9A904C, .L80240C5C_9A904C, .L80240C5C_9A904C, .L80240C5C_9A904C, .L80240C5C_9A904C, .L80240C5C_9A904C, .L80240C50_9A9040, .L80240C5C_9A904C, .L80240C50_9A9040, .L80240C5C_9A904C, .L80240C50_9A9040, .L80240C5C_9A904C, .L80240C50_9A9040, .L80240C5C_9A904C, .L80240C5C_9A904C, .L80240C5C_9A904C, .L80240C50_9A9040, .L80240C5C_9A904C, .L80240C50_9A9040, 0 - -.section .text - -glabel func_80240844_9A8C34 -/* 9A8C34 80240844 27BDFF90 */ addiu $sp, $sp, -0x70 -/* 9A8C38 80240848 AFB3005C */ sw $s3, 0x5c($sp) -/* 9A8C3C 8024084C 0080982D */ daddu $s3, $a0, $zero -/* 9A8C40 80240850 AFBF0068 */ sw $ra, 0x68($sp) -/* 9A8C44 80240854 AFB50064 */ sw $s5, 0x64($sp) -/* 9A8C48 80240858 AFB40060 */ sw $s4, 0x60($sp) -/* 9A8C4C 8024085C AFB20058 */ sw $s2, 0x58($sp) -/* 9A8C50 80240860 AFB10054 */ sw $s1, 0x54($sp) -/* 9A8C54 80240864 AFB00050 */ sw $s0, 0x50($sp) -/* 9A8C58 80240868 8E710148 */ lw $s1, 0x148($s3) -/* 9A8C5C 8024086C 86240008 */ lh $a0, 8($s1) -/* 9A8C60 80240870 0C00EABB */ jal get_npc_unsafe -/* 9A8C64 80240874 00A0802D */ daddu $s0, $a1, $zero -/* 9A8C68 80240878 8E63000C */ lw $v1, 0xc($s3) -/* 9A8C6C 8024087C 0260202D */ daddu $a0, $s3, $zero -/* 9A8C70 80240880 8C650000 */ lw $a1, ($v1) -/* 9A8C74 80240884 0C0B1EAF */ jal evt_get_variable -/* 9A8C78 80240888 0040902D */ daddu $s2, $v0, $zero -/* 9A8C7C 8024088C AFA00028 */ sw $zero, 0x28($sp) -/* 9A8C80 80240890 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A8C84 80240894 8C630030 */ lw $v1, 0x30($v1) -/* 9A8C88 80240898 AFA3002C */ sw $v1, 0x2c($sp) -/* 9A8C8C 8024089C 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A8C90 802408A0 8C63001C */ lw $v1, 0x1c($v1) -/* 9A8C94 802408A4 AFA30030 */ sw $v1, 0x30($sp) -/* 9A8C98 802408A8 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A8C9C 802408AC 8C630024 */ lw $v1, 0x24($v1) -/* 9A8CA0 802408B0 AFA30034 */ sw $v1, 0x34($sp) -/* 9A8CA4 802408B4 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A8CA8 802408B8 8C630028 */ lw $v1, 0x28($v1) -/* 9A8CAC 802408BC 27B50028 */ addiu $s5, $sp, 0x28 -/* 9A8CB0 802408C0 AFA30038 */ sw $v1, 0x38($sp) -/* 9A8CB4 802408C4 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A8CB8 802408C8 3C0142C8 */ lui $at, 0x42c8 -/* 9A8CBC 802408CC 44810000 */ mtc1 $at, $f0 -/* 9A8CC0 802408D0 8C63002C */ lw $v1, 0x2c($v1) -/* 9A8CC4 802408D4 0040A02D */ daddu $s4, $v0, $zero -/* 9A8CC8 802408D8 E7A00040 */ swc1 $f0, 0x40($sp) -/* 9A8CCC 802408DC A7A00044 */ sh $zero, 0x44($sp) -/* 9A8CD0 802408E0 12000009 */ beqz $s0, .L80240908 -/* 9A8CD4 802408E4 AFA3003C */ sw $v1, 0x3c($sp) -/* 9A8CD8 802408E8 864300A8 */ lh $v1, 0xa8($s2) -/* 9A8CDC 802408EC 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9A8CE0 802408F0 AE20008C */ sw $zero, 0x8c($s1) -/* 9A8CE4 802408F4 A22000B5 */ sb $zero, 0xb5($s1) -/* 9A8CE8 802408F8 34420008 */ ori $v0, $v0, 8 -/* 9A8CEC 802408FC AE230084 */ sw $v1, 0x84($s1) -/* 9A8CF0 80240900 08090246 */ j .L80240918 -/* 9A8CF4 80240904 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240908: -/* 9A8CF8 80240908 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9A8CFC 8024090C 30420004 */ andi $v0, $v0, 4 -/* 9A8D00 80240910 10400047 */ beqz $v0, .L80240A30 -/* 9A8D04 80240914 00000000 */ nop -.L80240918: -/* 9A8D08 80240918 AE600070 */ sw $zero, 0x70($s3) -/* 9A8D0C 8024091C A640008E */ sh $zero, 0x8e($s2) -/* 9A8D10 80240920 8E2300CC */ lw $v1, 0xcc($s1) -/* 9A8D14 80240924 2404F7FF */ addiu $a0, $zero, -0x801 -/* 9A8D18 80240928 A2200007 */ sb $zero, 7($s1) -/* 9A8D1C 8024092C 8E420000 */ lw $v0, ($s2) -/* 9A8D20 80240930 8C630000 */ lw $v1, ($v1) -/* 9A8D24 80240934 00441024 */ and $v0, $v0, $a0 -/* 9A8D28 80240938 AE420000 */ sw $v0, ($s2) -/* 9A8D2C 8024093C AE430028 */ sw $v1, 0x28($s2) -/* 9A8D30 80240940 96220086 */ lhu $v0, 0x86($s1) -/* 9A8D34 80240944 A64200A8 */ sh $v0, 0xa8($s2) -/* 9A8D38 80240948 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9A8D3C 8024094C AE200090 */ sw $zero, 0x90($s1) -/* 9A8D40 80240950 8C420034 */ lw $v0, 0x34($v0) -/* 9A8D44 80240954 14400006 */ bnez $v0, .L80240970 -/* 9A8D48 80240958 2403FDFF */ addiu $v1, $zero, -0x201 -/* 9A8D4C 8024095C 8E420000 */ lw $v0, ($s2) -/* 9A8D50 80240960 2403FFF7 */ addiu $v1, $zero, -9 -/* 9A8D54 80240964 34420200 */ ori $v0, $v0, 0x200 -/* 9A8D58 80240968 0809025F */ j .L8024097C -/* 9A8D5C 8024096C 00431024 */ and $v0, $v0, $v1 -.L80240970: -/* 9A8D60 80240970 8E420000 */ lw $v0, ($s2) -/* 9A8D64 80240974 00431024 */ and $v0, $v0, $v1 -/* 9A8D68 80240978 34420008 */ ori $v0, $v0, 8 -.L8024097C: -/* 9A8D6C 8024097C AE420000 */ sw $v0, ($s2) -/* 9A8D70 80240980 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9A8D74 80240984 30420004 */ andi $v0, $v0, 4 -/* 9A8D78 80240988 1040001E */ beqz $v0, .L80240A04 -/* 9A8D7C 8024098C 24040002 */ addiu $a0, $zero, 2 -/* 9A8D80 80240990 0240282D */ daddu $a1, $s2, $zero -/* 9A8D84 80240994 0000302D */ daddu $a2, $zero, $zero -/* 9A8D88 80240998 24020063 */ addiu $v0, $zero, 0x63 -/* 9A8D8C 8024099C AE620070 */ sw $v0, 0x70($s3) -/* 9A8D90 802409A0 AE600074 */ sw $zero, 0x74($s3) -/* 9A8D94 802409A4 864300A8 */ lh $v1, 0xa8($s2) -/* 9A8D98 802409A8 3C013F80 */ lui $at, 0x3f80 -/* 9A8D9C 802409AC 44810000 */ mtc1 $at, $f0 -/* 9A8DA0 802409B0 3C014000 */ lui $at, 0x4000 -/* 9A8DA4 802409B4 44811000 */ mtc1 $at, $f2 -/* 9A8DA8 802409B8 3C01C1A0 */ lui $at, 0xc1a0 -/* 9A8DAC 802409BC 44812000 */ mtc1 $at, $f4 -/* 9A8DB0 802409C0 24020028 */ addiu $v0, $zero, 0x28 -/* 9A8DB4 802409C4 AFA2001C */ sw $v0, 0x1c($sp) -/* 9A8DB8 802409C8 44833000 */ mtc1 $v1, $f6 -/* 9A8DBC 802409CC 00000000 */ nop -/* 9A8DC0 802409D0 468031A0 */ cvt.s.w $f6, $f6 -/* 9A8DC4 802409D4 44073000 */ mfc1 $a3, $f6 -/* 9A8DC8 802409D8 27A20048 */ addiu $v0, $sp, 0x48 -/* 9A8DCC 802409DC AFA20020 */ sw $v0, 0x20($sp) -/* 9A8DD0 802409E0 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9A8DD4 802409E4 E7A20014 */ swc1 $f2, 0x14($sp) -/* 9A8DD8 802409E8 0C01BFA4 */ jal fx_emote -/* 9A8DDC 802409EC E7A40018 */ swc1 $f4, 0x18($sp) -/* 9A8DE0 802409F0 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9A8DE4 802409F4 2403FFFB */ addiu $v1, $zero, -5 -/* 9A8DE8 802409F8 00431024 */ and $v0, $v0, $v1 -/* 9A8DEC 802409FC 0809028C */ j .L80240A30 -/* 9A8DF0 80240A00 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240A04: -/* 9A8DF4 80240A04 8E220000 */ lw $v0, ($s1) -/* 9A8DF8 80240A08 3C034000 */ lui $v1, 0x4000 -/* 9A8DFC 80240A0C 00431024 */ and $v0, $v0, $v1 -/* 9A8E00 80240A10 10400007 */ beqz $v0, .L80240A30 -/* 9A8E04 80240A14 3C03BFFF */ lui $v1, 0xbfff -/* 9A8E08 80240A18 2402000C */ addiu $v0, $zero, 0xc -/* 9A8E0C 80240A1C AE620070 */ sw $v0, 0x70($s3) -/* 9A8E10 80240A20 8E220000 */ lw $v0, ($s1) -/* 9A8E14 80240A24 3463FFFF */ ori $v1, $v1, 0xffff -/* 9A8E18 80240A28 00431024 */ and $v0, $v0, $v1 -/* 9A8E1C 80240A2C AE220000 */ sw $v0, ($s1) -.L80240A30: -/* 9A8E20 80240A30 8E220090 */ lw $v0, 0x90($s1) -/* 9A8E24 80240A34 1840000C */ blez $v0, .L80240A68 -/* 9A8E28 80240A38 2442FFFF */ addiu $v0, $v0, -1 -/* 9A8E2C 80240A3C 14400087 */ bnez $v0, .L80240C5C_9A904C -/* 9A8E30 80240A40 AE220090 */ sw $v0, 0x90($s1) -/* 9A8E34 80240A44 3C03FFAA */ lui $v1, 0xffaa -/* 9A8E38 80240A48 8E420028 */ lw $v0, 0x28($s2) -/* 9A8E3C 80240A4C 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* 9A8E40 80240A50 00431021 */ addu $v0, $v0, $v1 -/* 9A8E44 80240A54 2C420002 */ sltiu $v0, $v0, 2 -/* 9A8E48 80240A58 10400003 */ beqz $v0, .L80240A68 -/* 9A8E4C 80240A5C 3C020055 */ lui $v0, 0x55 -/* 9A8E50 80240A60 3442000C */ ori $v0, $v0, 0xc -/* 9A8E54 80240A64 AE420028 */ sw $v0, 0x28($s2) -.L80240A68: -/* 9A8E58 80240A68 8E630070 */ lw $v1, 0x70($s3) -/* 9A8E5C 80240A6C 2402000C */ addiu $v0, $zero, 0xc -/* 9A8E60 80240A70 10620048 */ beq $v1, $v0, .L80240B94 -/* 9A8E64 80240A74 2862000D */ slti $v0, $v1, 0xd -/* 9A8E68 80240A78 1040000F */ beqz $v0, .L80240AB8 -/* 9A8E6C 80240A7C 24100001 */ addiu $s0, $zero, 1 -/* 9A8E70 80240A80 1070001E */ beq $v1, $s0, .L80240AFC -/* 9A8E74 80240A84 28620002 */ slti $v0, $v1, 2 -/* 9A8E78 80240A88 10400005 */ beqz $v0, .L80240AA0 -/* 9A8E7C 80240A8C 24020002 */ addiu $v0, $zero, 2 -/* 9A8E80 80240A90 10600015 */ beqz $v1, .L80240AE8 -/* 9A8E84 80240A94 0260202D */ daddu $a0, $s3, $zero -/* 9A8E88 80240A98 080902FC */ j .L80240BF0 -/* 9A8E8C 80240A9C 00000000 */ nop -.L80240AA0: -/* 9A8E90 80240AA0 1062001C */ beq $v1, $v0, .L80240B14 -/* 9A8E94 80240AA4 24020003 */ addiu $v0, $zero, 3 -/* 9A8E98 80240AA8 10620035 */ beq $v1, $v0, .L80240B80 -/* 9A8E9C 80240AAC 0260202D */ daddu $a0, $s3, $zero -/* 9A8EA0 80240AB0 080902FC */ j .L80240BF0 -/* 9A8EA4 80240AB4 00000000 */ nop -.L80240AB8: -/* 9A8EA8 80240AB8 2402000E */ addiu $v0, $zero, 0xe -/* 9A8EAC 80240ABC 1062003F */ beq $v1, $v0, .L80240BBC -/* 9A8EB0 80240AC0 0062102A */ slt $v0, $v1, $v0 -/* 9A8EB4 80240AC4 14400038 */ bnez $v0, .L80240BA8 -/* 9A8EB8 80240AC8 0260202D */ daddu $a0, $s3, $zero -/* 9A8EBC 80240ACC 2402000F */ addiu $v0, $zero, 0xf -/* 9A8EC0 80240AD0 10620040 */ beq $v1, $v0, .L80240BD4 -/* 9A8EC4 80240AD4 24020063 */ addiu $v0, $zero, 0x63 -/* 9A8EC8 80240AD8 10620043 */ beq $v1, $v0, .L80240BE8 -/* 9A8ECC 80240ADC 00000000 */ nop -/* 9A8ED0 80240AE0 080902FC */ j .L80240BF0 -/* 9A8ED4 80240AE4 00000000 */ nop -.L80240AE8: -/* 9A8ED8 80240AE8 0280282D */ daddu $a1, $s4, $zero -/* 9A8EDC 80240AEC 0C012568 */ jal func_800495A0 -/* 9A8EE0 80240AF0 02A0302D */ daddu $a2, $s5, $zero -/* 9A8EE4 80240AF4 96220086 */ lhu $v0, 0x86($s1) -/* 9A8EE8 80240AF8 A64200A8 */ sh $v0, 0xa8($s2) -.L80240AFC: -/* 9A8EEC 80240AFC 0260202D */ daddu $a0, $s3, $zero -/* 9A8EF0 80240B00 0280282D */ daddu $a1, $s4, $zero -/* 9A8EF4 80240B04 0C0125AE */ jal func_800496B8 -/* 9A8EF8 80240B08 02A0302D */ daddu $a2, $s5, $zero -/* 9A8EFC 80240B0C 080902FC */ j .L80240BF0 -/* 9A8F00 80240B10 00000000 */ nop -.L80240B14: -/* 9A8F04 80240B14 0260202D */ daddu $a0, $s3, $zero -/* 9A8F08 80240B18 0280282D */ daddu $a1, $s4, $zero -/* 9A8F0C 80240B1C 0C0126D1 */ jal base_UnkNpcAIFunc1 -/* 9A8F10 80240B20 02A0302D */ daddu $a2, $s5, $zero -/* 9A8F14 80240B24 8E230088 */ lw $v1, 0x88($s1) -/* 9A8F18 80240B28 24020006 */ addiu $v0, $zero, 6 -/* 9A8F1C 80240B2C 14620014 */ bne $v1, $v0, .L80240B80 -/* 9A8F20 80240B30 0260202D */ daddu $a0, $s3, $zero -/* 9A8F24 80240B34 0C00A67F */ jal rand_int -/* 9A8F28 80240B38 24040064 */ addiu $a0, $zero, 0x64 -/* 9A8F2C 80240B3C 28420021 */ slti $v0, $v0, 0x21 -/* 9A8F30 80240B40 5040000F */ beql $v0, $zero, .L80240B80 -/* 9A8F34 80240B44 0260202D */ daddu $a0, $s3, $zero -/* 9A8F38 80240B48 8E22008C */ lw $v0, 0x8c($s1) -/* 9A8F3C 80240B4C 10400005 */ beqz $v0, .L80240B64 -/* 9A8F40 80240B50 3C020055 */ lui $v0, 0x55 -/* 9A8F44 80240B54 3442002F */ ori $v0, $v0, 0x2f -/* 9A8F48 80240B58 AE20008C */ sw $zero, 0x8c($s1) -/* 9A8F4C 80240B5C 080902DC */ j .L80240B70 -/* 9A8F50 80240B60 A22000B5 */ sb $zero, 0xb5($s1) -.L80240B64: -/* 9A8F54 80240B64 3442002E */ ori $v0, $v0, 0x2e -/* 9A8F58 80240B68 AE30008C */ sw $s0, 0x8c($s1) -/* 9A8F5C 80240B6C A23000B5 */ sb $s0, 0xb5($s1) -.L80240B70: -/* 9A8F60 80240B70 AE420028 */ sw $v0, 0x28($s2) -/* 9A8F64 80240B74 24020007 */ addiu $v0, $zero, 7 -/* 9A8F68 80240B78 08090317 */ j .L80240C5C_9A904C -/* 9A8F6C 80240B7C AE220090 */ sw $v0, 0x90($s1) -.L80240B80: -/* 9A8F70 80240B80 0280282D */ daddu $a1, $s4, $zero -/* 9A8F74 80240B84 0C012701 */ jal func_80049C04 -/* 9A8F78 80240B88 02A0302D */ daddu $a2, $s5, $zero -/* 9A8F7C 80240B8C 080902FC */ j .L80240BF0 -/* 9A8F80 80240B90 00000000 */ nop -.L80240B94: -/* 9A8F84 80240B94 0260202D */ daddu $a0, $s3, $zero -/* 9A8F88 80240B98 0280282D */ daddu $a1, $s4, $zero -/* 9A8F8C 80240B9C 0C09012C */ jal trd_04_set_script_owner_npc_anim -/* 9A8F90 80240BA0 02A0302D */ daddu $a2, $s5, $zero -/* 9A8F94 80240BA4 0260202D */ daddu $a0, $s3, $zero -.L80240BA8: -/* 9A8F98 80240BA8 0280282D */ daddu $a1, $s4, $zero -/* 9A8F9C 80240BAC 0C09014B */ jal trd_04_UnkDistFunc -/* 9A8FA0 80240BB0 02A0302D */ daddu $a2, $s5, $zero -/* 9A8FA4 80240BB4 080902FC */ j .L80240BF0 -/* 9A8FA8 80240BB8 00000000 */ nop -.L80240BBC: -/* 9A8FAC 80240BBC 0260202D */ daddu $a0, $s3, $zero -/* 9A8FB0 80240BC0 0280282D */ daddu $a1, $s4, $zero -/* 9A8FB4 80240BC4 0C090198 */ jal trd_04_UnkNpcAIFunc12 -/* 9A8FB8 80240BC8 02A0302D */ daddu $a2, $s5, $zero -/* 9A8FBC 80240BCC 080902FC */ j .L80240BF0 -/* 9A8FC0 80240BD0 00000000 */ nop -.L80240BD4: -/* 9A8FC4 80240BD4 0280282D */ daddu $a1, $s4, $zero -/* 9A8FC8 80240BD8 0C0901F1 */ jal trd_04_set_script_owner_npc_col_height -/* 9A8FCC 80240BDC 02A0302D */ daddu $a2, $s5, $zero -/* 9A8FD0 80240BE0 080902FC */ j .L80240BF0 -/* 9A8FD4 80240BE4 00000000 */ nop -.L80240BE8: -/* 9A8FD8 80240BE8 0C0129CF */ jal func_8004A73C -/* 9A8FDC 80240BEC 0260202D */ daddu $a0, $s3, $zero -.L80240BF0: -/* 9A8FE0 80240BF0 8E230088 */ lw $v1, 0x88($s1) -/* 9A8FE4 80240BF4 24020006 */ addiu $v0, $zero, 6 -/* 9A8FE8 80240BF8 14620019 */ bne $v1, $v0, .L80240C60 -/* 9A8FEC 80240BFC 0000102D */ daddu $v0, $zero, $zero -/* 9A8FF0 80240C00 8E22008C */ lw $v0, 0x8c($s1) -/* 9A8FF4 80240C04 10400003 */ beqz $v0, .L80240C14 -/* 9A8FF8 80240C08 24020001 */ addiu $v0, $zero, 1 -/* 9A8FFC 80240C0C 08090306 */ j .L80240C18 -/* 9A9000 80240C10 A22200B5 */ sb $v0, 0xb5($s1) -.L80240C14: -/* 9A9004 80240C14 A22000B5 */ sb $zero, 0xb5($s1) -.L80240C18: -/* 9A9008 80240C18 8E22008C */ lw $v0, 0x8c($s1) -/* 9A900C 80240C1C 1040000F */ beqz $v0, .L80240C5C_9A904C -/* 9A9010 80240C20 3C03FFAA */ lui $v1, 0xffaa -/* 9A9014 80240C24 8E420028 */ lw $v0, 0x28($s2) -/* 9A9018 80240C28 3463FFFC */ ori $v1, $v1, 0xfffc -/* 9A901C 80240C2C 00431821 */ addu $v1, $v0, $v1 -/* 9A9020 80240C30 2C620015 */ sltiu $v0, $v1, 0x15 -/* 9A9024 80240C34 10400009 */ beqz $v0, .L80240C5C_9A904C -/* 9A9028 80240C38 00031080 */ sll $v0, $v1, 2 -/* 9A902C 80240C3C 3C018024 */ lui $at, %hi(jtbl_80245EE8_9AE2D8) -/* 9A9030 80240C40 00220821 */ addu $at, $at, $v0 -/* 9A9034 80240C44 8C225EE8 */ lw $v0, %lo(jtbl_80245EE8_9AE2D8)($at) -/* 9A9038 80240C48 00400008 */ jr $v0 -/* 9A903C 80240C4C 00000000 */ nop -.L80240C50_9A9040: -/* 9A9040 80240C50 8E420028 */ lw $v0, 0x28($s2) -/* 9A9044 80240C54 24420001 */ addiu $v0, $v0, 1 -/* 9A9048 80240C58 AE420028 */ sw $v0, 0x28($s2) -.L80240C5C_9A904C: -/* 9A904C 80240C5C 0000102D */ daddu $v0, $zero, $zero -.L80240C60: -/* 9A9050 80240C60 8FBF0068 */ lw $ra, 0x68($sp) -/* 9A9054 80240C64 8FB50064 */ lw $s5, 0x64($sp) -/* 9A9058 80240C68 8FB40060 */ lw $s4, 0x60($sp) -/* 9A905C 80240C6C 8FB3005C */ lw $s3, 0x5c($sp) -/* 9A9060 80240C70 8FB20058 */ lw $s2, 0x58($sp) -/* 9A9064 80240C74 8FB10054 */ lw $s1, 0x54($sp) -/* 9A9068 80240C78 8FB00050 */ lw $s0, 0x50($sp) -/* 9A906C 80240C7C 03E00008 */ jr $ra -/* 9A9070 80240C80 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802406A4_9B7024.s b/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802406A4_9B7024.s deleted file mode 100644 index 7468527194..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802406A4_9B7024.s +++ /dev/null @@ -1,309 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80244828_9BB1A8 -.word .L80240AB0_9B7430, .L80240ABC_9B743C, .L80240ABC_9B743C, .L80240ABC_9B743C, .L80240ABC_9B743C, .L80240ABC_9B743C, .L80240ABC_9B743C, .L80240ABC_9B743C, .L80240AB0_9B7430, .L80240ABC_9B743C, .L80240AB0_9B7430, .L80240ABC_9B743C, .L80240AB0_9B7430, .L80240ABC_9B743C, .L80240AB0_9B7430, .L80240ABC_9B743C, .L80240ABC_9B743C, .L80240ABC_9B743C, .L80240AB0_9B7430, .L80240ABC_9B743C, .L80240AB0_9B7430, 0 - -.section .text - -glabel func_802406A4_9B7024 -/* 9B7024 802406A4 27BDFF90 */ addiu $sp, $sp, -0x70 -/* 9B7028 802406A8 AFB3005C */ sw $s3, 0x5c($sp) -/* 9B702C 802406AC 0080982D */ daddu $s3, $a0, $zero -/* 9B7030 802406B0 AFBF0068 */ sw $ra, 0x68($sp) -/* 9B7034 802406B4 AFB50064 */ sw $s5, 0x64($sp) -/* 9B7038 802406B8 AFB40060 */ sw $s4, 0x60($sp) -/* 9B703C 802406BC AFB20058 */ sw $s2, 0x58($sp) -/* 9B7040 802406C0 AFB10054 */ sw $s1, 0x54($sp) -/* 9B7044 802406C4 AFB00050 */ sw $s0, 0x50($sp) -/* 9B7048 802406C8 8E710148 */ lw $s1, 0x148($s3) -/* 9B704C 802406CC 86240008 */ lh $a0, 8($s1) -/* 9B7050 802406D0 0C00EABB */ jal get_npc_unsafe -/* 9B7054 802406D4 00A0802D */ daddu $s0, $a1, $zero -/* 9B7058 802406D8 8E63000C */ lw $v1, 0xc($s3) -/* 9B705C 802406DC 0260202D */ daddu $a0, $s3, $zero -/* 9B7060 802406E0 8C650000 */ lw $a1, ($v1) -/* 9B7064 802406E4 0C0B1EAF */ jal evt_get_variable -/* 9B7068 802406E8 0040902D */ daddu $s2, $v0, $zero -/* 9B706C 802406EC AFA00028 */ sw $zero, 0x28($sp) -/* 9B7070 802406F0 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9B7074 802406F4 8C630030 */ lw $v1, 0x30($v1) -/* 9B7078 802406F8 AFA3002C */ sw $v1, 0x2c($sp) -/* 9B707C 802406FC 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9B7080 80240700 8C63001C */ lw $v1, 0x1c($v1) -/* 9B7084 80240704 AFA30030 */ sw $v1, 0x30($sp) -/* 9B7088 80240708 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9B708C 8024070C 8C630024 */ lw $v1, 0x24($v1) -/* 9B7090 80240710 AFA30034 */ sw $v1, 0x34($sp) -/* 9B7094 80240714 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9B7098 80240718 8C630028 */ lw $v1, 0x28($v1) -/* 9B709C 8024071C 27B50028 */ addiu $s5, $sp, 0x28 -/* 9B70A0 80240720 AFA30038 */ sw $v1, 0x38($sp) -/* 9B70A4 80240724 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9B70A8 80240728 3C0142C8 */ lui $at, 0x42c8 -/* 9B70AC 8024072C 44810000 */ mtc1 $at, $f0 -/* 9B70B0 80240730 8C63002C */ lw $v1, 0x2c($v1) -/* 9B70B4 80240734 0040A02D */ daddu $s4, $v0, $zero -/* 9B70B8 80240738 E7A00040 */ swc1 $f0, 0x40($sp) -/* 9B70BC 8024073C A7A00044 */ sh $zero, 0x44($sp) -/* 9B70C0 80240740 12000009 */ beqz $s0, .L80240768 -/* 9B70C4 80240744 AFA3003C */ sw $v1, 0x3c($sp) -/* 9B70C8 80240748 864300A8 */ lh $v1, 0xa8($s2) -/* 9B70CC 8024074C 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9B70D0 80240750 AE20008C */ sw $zero, 0x8c($s1) -/* 9B70D4 80240754 A22000B5 */ sb $zero, 0xb5($s1) -/* 9B70D8 80240758 34420008 */ ori $v0, $v0, 8 -/* 9B70DC 8024075C AE230084 */ sw $v1, 0x84($s1) -/* 9B70E0 80240760 080901DE */ j .L80240778 -/* 9B70E4 80240764 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240768: -/* 9B70E8 80240768 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9B70EC 8024076C 30420004 */ andi $v0, $v0, 4 -/* 9B70F0 80240770 10400047 */ beqz $v0, .L80240890 -/* 9B70F4 80240774 00000000 */ nop -.L80240778: -/* 9B70F8 80240778 AE600070 */ sw $zero, 0x70($s3) -/* 9B70FC 8024077C A640008E */ sh $zero, 0x8e($s2) -/* 9B7100 80240780 8E2300CC */ lw $v1, 0xcc($s1) -/* 9B7104 80240784 2404F7FF */ addiu $a0, $zero, -0x801 -/* 9B7108 80240788 A2200007 */ sb $zero, 7($s1) -/* 9B710C 8024078C 8E420000 */ lw $v0, ($s2) -/* 9B7110 80240790 8C630000 */ lw $v1, ($v1) -/* 9B7114 80240794 00441024 */ and $v0, $v0, $a0 -/* 9B7118 80240798 AE420000 */ sw $v0, ($s2) -/* 9B711C 8024079C AE430028 */ sw $v1, 0x28($s2) -/* 9B7120 802407A0 96220086 */ lhu $v0, 0x86($s1) -/* 9B7124 802407A4 A64200A8 */ sh $v0, 0xa8($s2) -/* 9B7128 802407A8 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9B712C 802407AC AE200090 */ sw $zero, 0x90($s1) -/* 9B7130 802407B0 8C420034 */ lw $v0, 0x34($v0) -/* 9B7134 802407B4 14400006 */ bnez $v0, .L802407D0 -/* 9B7138 802407B8 2403FDFF */ addiu $v1, $zero, -0x201 -/* 9B713C 802407BC 8E420000 */ lw $v0, ($s2) -/* 9B7140 802407C0 2403FFF7 */ addiu $v1, $zero, -9 -/* 9B7144 802407C4 34420200 */ ori $v0, $v0, 0x200 -/* 9B7148 802407C8 080901F7 */ j .L802407DC -/* 9B714C 802407CC 00431024 */ and $v0, $v0, $v1 -.L802407D0: -/* 9B7150 802407D0 8E420000 */ lw $v0, ($s2) -/* 9B7154 802407D4 00431024 */ and $v0, $v0, $v1 -/* 9B7158 802407D8 34420008 */ ori $v0, $v0, 8 -.L802407DC: -/* 9B715C 802407DC AE420000 */ sw $v0, ($s2) -/* 9B7160 802407E0 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9B7164 802407E4 30420004 */ andi $v0, $v0, 4 -/* 9B7168 802407E8 1040001E */ beqz $v0, .L80240864 -/* 9B716C 802407EC 24040002 */ addiu $a0, $zero, 2 -/* 9B7170 802407F0 0240282D */ daddu $a1, $s2, $zero -/* 9B7174 802407F4 0000302D */ daddu $a2, $zero, $zero -/* 9B7178 802407F8 24020063 */ addiu $v0, $zero, 0x63 -/* 9B717C 802407FC AE620070 */ sw $v0, 0x70($s3) -/* 9B7180 80240800 AE600074 */ sw $zero, 0x74($s3) -/* 9B7184 80240804 864300A8 */ lh $v1, 0xa8($s2) -/* 9B7188 80240808 3C013F80 */ lui $at, 0x3f80 -/* 9B718C 8024080C 44810000 */ mtc1 $at, $f0 -/* 9B7190 80240810 3C014000 */ lui $at, 0x4000 -/* 9B7194 80240814 44811000 */ mtc1 $at, $f2 -/* 9B7198 80240818 3C01C1A0 */ lui $at, 0xc1a0 -/* 9B719C 8024081C 44812000 */ mtc1 $at, $f4 -/* 9B71A0 80240820 24020028 */ addiu $v0, $zero, 0x28 -/* 9B71A4 80240824 AFA2001C */ sw $v0, 0x1c($sp) -/* 9B71A8 80240828 44833000 */ mtc1 $v1, $f6 -/* 9B71AC 8024082C 00000000 */ nop -/* 9B71B0 80240830 468031A0 */ cvt.s.w $f6, $f6 -/* 9B71B4 80240834 44073000 */ mfc1 $a3, $f6 -/* 9B71B8 80240838 27A20048 */ addiu $v0, $sp, 0x48 -/* 9B71BC 8024083C AFA20020 */ sw $v0, 0x20($sp) -/* 9B71C0 80240840 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9B71C4 80240844 E7A20014 */ swc1 $f2, 0x14($sp) -/* 9B71C8 80240848 0C01BFA4 */ jal fx_emote -/* 9B71CC 8024084C E7A40018 */ swc1 $f4, 0x18($sp) -/* 9B71D0 80240850 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9B71D4 80240854 2403FFFB */ addiu $v1, $zero, -5 -/* 9B71D8 80240858 00431024 */ and $v0, $v0, $v1 -/* 9B71DC 8024085C 08090224 */ j .L80240890 -/* 9B71E0 80240860 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240864: -/* 9B71E4 80240864 8E220000 */ lw $v0, ($s1) -/* 9B71E8 80240868 3C034000 */ lui $v1, 0x4000 -/* 9B71EC 8024086C 00431024 */ and $v0, $v0, $v1 -/* 9B71F0 80240870 10400007 */ beqz $v0, .L80240890 -/* 9B71F4 80240874 3C03BFFF */ lui $v1, 0xbfff -/* 9B71F8 80240878 2402000C */ addiu $v0, $zero, 0xc -/* 9B71FC 8024087C AE620070 */ sw $v0, 0x70($s3) -/* 9B7200 80240880 8E220000 */ lw $v0, ($s1) -/* 9B7204 80240884 3463FFFF */ ori $v1, $v1, 0xffff -/* 9B7208 80240888 00431024 */ and $v0, $v0, $v1 -/* 9B720C 8024088C AE220000 */ sw $v0, ($s1) -.L80240890: -/* 9B7210 80240890 8E220090 */ lw $v0, 0x90($s1) -/* 9B7214 80240894 1840000C */ blez $v0, .L802408C8 -/* 9B7218 80240898 2442FFFF */ addiu $v0, $v0, -1 -/* 9B721C 8024089C 14400087 */ bnez $v0, .L80240ABC_9B743C -/* 9B7220 802408A0 AE220090 */ sw $v0, 0x90($s1) -/* 9B7224 802408A4 3C03FFAA */ lui $v1, 0xffaa -/* 9B7228 802408A8 8E420028 */ lw $v0, 0x28($s2) -/* 9B722C 802408AC 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* 9B7230 802408B0 00431021 */ addu $v0, $v0, $v1 -/* 9B7234 802408B4 2C420002 */ sltiu $v0, $v0, 2 -/* 9B7238 802408B8 10400003 */ beqz $v0, .L802408C8 -/* 9B723C 802408BC 3C020055 */ lui $v0, 0x55 -/* 9B7240 802408C0 3442000C */ ori $v0, $v0, 0xc -/* 9B7244 802408C4 AE420028 */ sw $v0, 0x28($s2) -.L802408C8: -/* 9B7248 802408C8 8E630070 */ lw $v1, 0x70($s3) -/* 9B724C 802408CC 2402000C */ addiu $v0, $zero, 0xc -/* 9B7250 802408D0 10620048 */ beq $v1, $v0, .L802409F4 -/* 9B7254 802408D4 2862000D */ slti $v0, $v1, 0xd -/* 9B7258 802408D8 1040000F */ beqz $v0, .L80240918 -/* 9B725C 802408DC 24100001 */ addiu $s0, $zero, 1 -/* 9B7260 802408E0 1070001E */ beq $v1, $s0, .L8024095C -/* 9B7264 802408E4 28620002 */ slti $v0, $v1, 2 -/* 9B7268 802408E8 10400005 */ beqz $v0, .L80240900 -/* 9B726C 802408EC 24020002 */ addiu $v0, $zero, 2 -/* 9B7270 802408F0 10600015 */ beqz $v1, .L80240948 -/* 9B7274 802408F4 0260202D */ daddu $a0, $s3, $zero -/* 9B7278 802408F8 08090294 */ j .L80240A50 -/* 9B727C 802408FC 00000000 */ nop -.L80240900: -/* 9B7280 80240900 1062001C */ beq $v1, $v0, .L80240974 -/* 9B7284 80240904 24020003 */ addiu $v0, $zero, 3 -/* 9B7288 80240908 10620035 */ beq $v1, $v0, .L802409E0 -/* 9B728C 8024090C 0260202D */ daddu $a0, $s3, $zero -/* 9B7290 80240910 08090294 */ j .L80240A50 -/* 9B7294 80240914 00000000 */ nop -.L80240918: -/* 9B7298 80240918 2402000E */ addiu $v0, $zero, 0xe -/* 9B729C 8024091C 1062003F */ beq $v1, $v0, .L80240A1C -/* 9B72A0 80240920 0062102A */ slt $v0, $v1, $v0 -/* 9B72A4 80240924 14400038 */ bnez $v0, .L80240A08 -/* 9B72A8 80240928 0260202D */ daddu $a0, $s3, $zero -/* 9B72AC 8024092C 2402000F */ addiu $v0, $zero, 0xf -/* 9B72B0 80240930 10620040 */ beq $v1, $v0, .L80240A34 -/* 9B72B4 80240934 24020063 */ addiu $v0, $zero, 0x63 -/* 9B72B8 80240938 10620043 */ beq $v1, $v0, .L80240A48 -/* 9B72BC 8024093C 00000000 */ nop -/* 9B72C0 80240940 08090294 */ j .L80240A50 -/* 9B72C4 80240944 00000000 */ nop -.L80240948: -/* 9B72C8 80240948 0280282D */ daddu $a1, $s4, $zero -/* 9B72CC 8024094C 0C012568 */ jal func_800495A0 -/* 9B72D0 80240950 02A0302D */ daddu $a2, $s5, $zero -/* 9B72D4 80240954 96220086 */ lhu $v0, 0x86($s1) -/* 9B72D8 80240958 A64200A8 */ sh $v0, 0xa8($s2) -.L8024095C: -/* 9B72DC 8024095C 0260202D */ daddu $a0, $s3, $zero -/* 9B72E0 80240960 0280282D */ daddu $a1, $s4, $zero -/* 9B72E4 80240964 0C0125AE */ jal func_800496B8 -/* 9B72E8 80240968 02A0302D */ daddu $a2, $s5, $zero -/* 9B72EC 8024096C 08090294 */ j .L80240A50 -/* 9B72F0 80240970 00000000 */ nop -.L80240974: -/* 9B72F4 80240974 0260202D */ daddu $a0, $s3, $zero -/* 9B72F8 80240978 0280282D */ daddu $a1, $s4, $zero -/* 9B72FC 8024097C 0C0126D1 */ jal base_UnkNpcAIFunc1 -/* 9B7300 80240980 02A0302D */ daddu $a2, $s5, $zero -/* 9B7304 80240984 8E230088 */ lw $v1, 0x88($s1) -/* 9B7308 80240988 24020006 */ addiu $v0, $zero, 6 -/* 9B730C 8024098C 14620014 */ bne $v1, $v0, .L802409E0 -/* 9B7310 80240990 0260202D */ daddu $a0, $s3, $zero -/* 9B7314 80240994 0C00A67F */ jal rand_int -/* 9B7318 80240998 24040064 */ addiu $a0, $zero, 0x64 -/* 9B731C 8024099C 28420021 */ slti $v0, $v0, 0x21 -/* 9B7320 802409A0 5040000F */ beql $v0, $zero, .L802409E0 -/* 9B7324 802409A4 0260202D */ daddu $a0, $s3, $zero -/* 9B7328 802409A8 8E22008C */ lw $v0, 0x8c($s1) -/* 9B732C 802409AC 10400005 */ beqz $v0, .L802409C4 -/* 9B7330 802409B0 3C020055 */ lui $v0, 0x55 -/* 9B7334 802409B4 3442002F */ ori $v0, $v0, 0x2f -/* 9B7338 802409B8 AE20008C */ sw $zero, 0x8c($s1) -/* 9B733C 802409BC 08090274 */ j .L802409D0 -/* 9B7340 802409C0 A22000B5 */ sb $zero, 0xb5($s1) -.L802409C4: -/* 9B7344 802409C4 3442002E */ ori $v0, $v0, 0x2e -/* 9B7348 802409C8 AE30008C */ sw $s0, 0x8c($s1) -/* 9B734C 802409CC A23000B5 */ sb $s0, 0xb5($s1) -.L802409D0: -/* 9B7350 802409D0 AE420028 */ sw $v0, 0x28($s2) -/* 9B7354 802409D4 24020007 */ addiu $v0, $zero, 7 -/* 9B7358 802409D8 080902AF */ j .L80240ABC_9B743C -/* 9B735C 802409DC AE220090 */ sw $v0, 0x90($s1) -.L802409E0: -/* 9B7360 802409E0 0280282D */ daddu $a1, $s4, $zero -/* 9B7364 802409E4 0C012701 */ jal func_80049C04 -/* 9B7368 802409E8 02A0302D */ daddu $a2, $s5, $zero -/* 9B736C 802409EC 08090294 */ j .L80240A50 -/* 9B7370 802409F0 00000000 */ nop -.L802409F4: -/* 9B7374 802409F4 0260202D */ daddu $a0, $s3, $zero -/* 9B7378 802409F8 0280282D */ daddu $a1, $s4, $zero -/* 9B737C 802409FC 0C0900C4 */ jal trd_07_set_script_owner_npc_anim -/* 9B7380 80240A00 02A0302D */ daddu $a2, $s5, $zero -/* 9B7384 80240A04 0260202D */ daddu $a0, $s3, $zero -.L80240A08: -/* 9B7388 80240A08 0280282D */ daddu $a1, $s4, $zero -/* 9B738C 80240A0C 0C0900E3 */ jal trd_07_UnkDistFunc -/* 9B7390 80240A10 02A0302D */ daddu $a2, $s5, $zero -/* 9B7394 80240A14 08090294 */ j .L80240A50 -/* 9B7398 80240A18 00000000 */ nop -.L80240A1C: -/* 9B739C 80240A1C 0260202D */ daddu $a0, $s3, $zero -/* 9B73A0 80240A20 0280282D */ daddu $a1, $s4, $zero -/* 9B73A4 80240A24 0C090130 */ jal trd_07_UnkNpcAIFunc12 -/* 9B73A8 80240A28 02A0302D */ daddu $a2, $s5, $zero -/* 9B73AC 80240A2C 08090294 */ j .L80240A50 -/* 9B73B0 80240A30 00000000 */ nop -.L80240A34: -/* 9B73B4 80240A34 0280282D */ daddu $a1, $s4, $zero -/* 9B73B8 80240A38 0C090189 */ jal trd_07_set_script_owner_npc_col_height -/* 9B73BC 80240A3C 02A0302D */ daddu $a2, $s5, $zero -/* 9B73C0 80240A40 08090294 */ j .L80240A50 -/* 9B73C4 80240A44 00000000 */ nop -.L80240A48: -/* 9B73C8 80240A48 0C0129CF */ jal func_8004A73C -/* 9B73CC 80240A4C 0260202D */ daddu $a0, $s3, $zero -.L80240A50: -/* 9B73D0 80240A50 8E230088 */ lw $v1, 0x88($s1) -/* 9B73D4 80240A54 24020006 */ addiu $v0, $zero, 6 -/* 9B73D8 80240A58 14620019 */ bne $v1, $v0, .L80240AC0 -/* 9B73DC 80240A5C 0000102D */ daddu $v0, $zero, $zero -/* 9B73E0 80240A60 8E22008C */ lw $v0, 0x8c($s1) -/* 9B73E4 80240A64 10400003 */ beqz $v0, .L80240A74 -/* 9B73E8 80240A68 24020001 */ addiu $v0, $zero, 1 -/* 9B73EC 80240A6C 0809029E */ j .L80240A78 -/* 9B73F0 80240A70 A22200B5 */ sb $v0, 0xb5($s1) -.L80240A74: -/* 9B73F4 80240A74 A22000B5 */ sb $zero, 0xb5($s1) -.L80240A78: -/* 9B73F8 80240A78 8E22008C */ lw $v0, 0x8c($s1) -/* 9B73FC 80240A7C 1040000F */ beqz $v0, .L80240ABC_9B743C -/* 9B7400 80240A80 3C03FFAA */ lui $v1, 0xffaa -/* 9B7404 80240A84 8E420028 */ lw $v0, 0x28($s2) -/* 9B7408 80240A88 3463FFFC */ ori $v1, $v1, 0xfffc -/* 9B740C 80240A8C 00431821 */ addu $v1, $v0, $v1 -/* 9B7410 80240A90 2C620015 */ sltiu $v0, $v1, 0x15 -/* 9B7414 80240A94 10400009 */ beqz $v0, .L80240ABC_9B743C -/* 9B7418 80240A98 00031080 */ sll $v0, $v1, 2 -/* 9B741C 80240A9C 3C018024 */ lui $at, %hi(jtbl_80244828_9BB1A8) -/* 9B7420 80240AA0 00220821 */ addu $at, $at, $v0 -/* 9B7424 80240AA4 8C224828 */ lw $v0, %lo(jtbl_80244828_9BB1A8)($at) -/* 9B7428 80240AA8 00400008 */ jr $v0 -/* 9B742C 80240AAC 00000000 */ nop -.L80240AB0_9B7430: -/* 9B7430 80240AB0 8E420028 */ lw $v0, 0x28($s2) -/* 9B7434 80240AB4 24420001 */ addiu $v0, $v0, 1 -/* 9B7438 80240AB8 AE420028 */ sw $v0, 0x28($s2) -.L80240ABC_9B743C: -/* 9B743C 80240ABC 0000102D */ daddu $v0, $zero, $zero -.L80240AC0: -/* 9B7440 80240AC0 8FBF0068 */ lw $ra, 0x68($sp) -/* 9B7444 80240AC4 8FB50064 */ lw $s5, 0x64($sp) -/* 9B7448 80240AC8 8FB40060 */ lw $s4, 0x60($sp) -/* 9B744C 80240ACC 8FB3005C */ lw $s3, 0x5c($sp) -/* 9B7450 80240AD0 8FB20058 */ lw $s2, 0x58($sp) -/* 9B7454 80240AD4 8FB10054 */ lw $s1, 0x54($sp) -/* 9B7458 80240AD8 8FB00050 */ lw $s0, 0x50($sp) -/* 9B745C 80240ADC 03E00008 */ jr $ra -/* 9B7460 80240AE0 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/ver/us/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_802403B8_B1CE08.s b/ver/us/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_802403B8_B1CE08.s deleted file mode 100644 index ddc09a82b3..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_802403B8_B1CE08.s +++ /dev/null @@ -1,203 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403B8_B1CE08 -/* B1CE08 802403B8 27BDFEA0 */ addiu $sp, $sp, -0x160 -/* B1CE0C 802403BC F7B40138 */ sdc1 $f20, 0x138($sp) -/* B1CE10 802403C0 4480A000 */ mtc1 $zero, $f20 -/* B1CE14 802403C4 3C03800A */ lui $v1, %hi(gCurrentCamID) -/* B1CE18 802403C8 8463A634 */ lh $v1, %lo(gCurrentCamID)($v1) -/* B1CE1C 802403CC F7BC0158 */ sdc1 $f28, 0x158($sp) -/* B1CE20 802403D0 3C01BF80 */ lui $at, 0xbf80 -/* B1CE24 802403D4 4481E000 */ mtc1 $at, $f28 -/* B1CE28 802403D8 AFB20128 */ sw $s2, 0x128($sp) -/* B1CE2C 802403DC 0080902D */ daddu $s2, $a0, $zero -/* B1CE30 802403E0 AFB10124 */ sw $s1, 0x124($sp) -/* B1CE34 802403E4 27B100A0 */ addiu $s1, $sp, 0xa0 -/* B1CE38 802403E8 AFBF0134 */ sw $ra, 0x134($sp) -/* B1CE3C 802403EC AFB40130 */ sw $s4, 0x130($sp) -/* B1CE40 802403F0 AFB3012C */ sw $s3, 0x12c($sp) -/* B1CE44 802403F4 AFB00120 */ sw $s0, 0x120($sp) -/* B1CE48 802403F8 F7BA0150 */ sdc1 $f26, 0x150($sp) -/* B1CE4C 802403FC F7B80148 */ sdc1 $f24, 0x148($sp) -/* B1CE50 80240400 F7B60140 */ sdc1 $f22, 0x140($sp) -/* B1CE54 80240404 00031080 */ sll $v0, $v1, 2 -/* B1CE58 80240408 00431021 */ addu $v0, $v0, $v1 -/* B1CE5C 8024040C 00021080 */ sll $v0, $v0, 2 -/* B1CE60 80240410 00431023 */ subu $v0, $v0, $v1 -/* B1CE64 80240414 000218C0 */ sll $v1, $v0, 3 -/* B1CE68 80240418 00431021 */ addu $v0, $v0, $v1 -/* B1CE6C 8024041C 000210C0 */ sll $v0, $v0, 3 -/* B1CE70 80240420 4406A000 */ mfc1 $a2, $f20 -/* B1CE74 80240424 3C01800B */ lui $at, %hi(gCameras+0x6C) -/* B1CE78 80240428 00220821 */ addu $at, $at, $v0 -/* B1CE7C 8024042C C4361DEC */ lwc1 $f22, %lo(gCameras+0x6C)($at) -/* B1CE80 80240430 4407E000 */ mfc1 $a3, $f28 -/* B1CE84 80240434 4600B587 */ neg.s $f22, $f22 -/* B1CE88 80240438 4405B000 */ mfc1 $a1, $f22 -/* B1CE8C 8024043C 0220202D */ daddu $a0, $s1, $zero -/* B1CE90 80240440 0C019EC8 */ jal guRotateF -/* B1CE94 80240444 E7B40010 */ swc1 $f20, 0x10($sp) -/* B1CE98 80240448 C64C008C */ lwc1 $f12, 0x8c($s2) -/* B1CE9C 8024044C 0C00A6C9 */ jal clamp_angle -/* B1CEA0 80240450 00000000 */ nop -/* B1CEA4 80240454 44050000 */ mfc1 $a1, $f0 -/* B1CEA8 80240458 4406A000 */ mfc1 $a2, $f20 -/* B1CEAC 8024045C 4407A000 */ mfc1 $a3, $f20 -/* B1CEB0 80240460 3C013F80 */ lui $at, 0x3f80 -/* B1CEB4 80240464 4481C000 */ mtc1 $at, $f24 -/* B1CEB8 80240468 27A40020 */ addiu $a0, $sp, 0x20 -/* B1CEBC 8024046C 0C019EC8 */ jal guRotateF -/* B1CEC0 80240470 E7B80010 */ swc1 $f24, 0x10($sp) -/* B1CEC4 80240474 0220202D */ daddu $a0, $s1, $zero -/* B1CEC8 80240478 27A50020 */ addiu $a1, $sp, 0x20 -/* B1CECC 8024047C 0C019D80 */ jal guMtxCatF -/* B1CED0 80240480 00A0302D */ daddu $a2, $a1, $zero -/* B1CED4 80240484 4405B000 */ mfc1 $a1, $f22 -/* B1CED8 80240488 4406A000 */ mfc1 $a2, $f20 -/* B1CEDC 8024048C 4407C000 */ mfc1 $a3, $f24 -/* B1CEE0 80240490 0220202D */ daddu $a0, $s1, $zero -/* B1CEE4 80240494 0C019EC8 */ jal guRotateF -/* B1CEE8 80240498 E7B40010 */ swc1 $f20, 0x10($sp) -/* B1CEEC 8024049C 27A40020 */ addiu $a0, $sp, 0x20 -/* B1CEF0 802404A0 0220282D */ daddu $a1, $s1, $zero -/* B1CEF4 802404A4 0C019D80 */ jal guMtxCatF -/* B1CEF8 802404A8 0080302D */ daddu $a2, $a0, $zero -/* B1CEFC 802404AC E7B40010 */ swc1 $f20, 0x10($sp) -/* B1CF00 802404B0 8E4500A8 */ lw $a1, 0xa8($s2) -/* B1CF04 802404B4 4406A000 */ mfc1 $a2, $f20 -/* B1CF08 802404B8 4407C000 */ mfc1 $a3, $f24 -/* B1CF0C 802404BC 0C019EC8 */ jal guRotateF -/* B1CF10 802404C0 0220202D */ daddu $a0, $s1, $zero -/* B1CF14 802404C4 27A40020 */ addiu $a0, $sp, 0x20 -/* B1CF18 802404C8 0220282D */ daddu $a1, $s1, $zero -/* B1CF1C 802404CC 0C019D80 */ jal guMtxCatF -/* B1CF20 802404D0 0080302D */ daddu $a2, $a0, $zero -/* B1CF24 802404D4 27B300E0 */ addiu $s3, $sp, 0xe0 -/* B1CF28 802404D8 3C013F36 */ lui $at, 0x3f36 -/* B1CF2C 802404DC 3421DB6E */ ori $at, $at, 0xdb6e -/* B1CF30 802404E0 4481D000 */ mtc1 $at, $f26 -/* B1CF34 802404E4 3C06BF36 */ lui $a2, 0xbf36 -/* B1CF38 802404E8 34C6DB6E */ ori $a2, $a2, 0xdb6e -/* B1CF3C 802404EC 4405D000 */ mfc1 $a1, $f26 -/* B1CF40 802404F0 4407D000 */ mfc1 $a3, $f26 -/* B1CF44 802404F4 0C019DF0 */ jal guScaleF -/* B1CF48 802404F8 0260202D */ daddu $a0, $s3, $zero -/* B1CF4C 802404FC 27A40020 */ addiu $a0, $sp, 0x20 -/* B1CF50 80240500 0260282D */ daddu $a1, $s3, $zero -/* B1CF54 80240504 0C019D80 */ jal guMtxCatF -/* B1CF58 80240508 0080302D */ daddu $a2, $a0, $zero -/* B1CF5C 8024050C 27B40060 */ addiu $s4, $sp, 0x60 -/* B1CF60 80240510 8E450028 */ lw $a1, 0x28($s2) -/* B1CF64 80240514 C640002C */ lwc1 $f0, 0x2c($s2) -/* B1CF68 80240518 8E470030 */ lw $a3, 0x30($s2) -/* B1CF6C 8024051C 46000007 */ neg.s $f0, $f0 -/* B1CF70 80240520 44060000 */ mfc1 $a2, $f0 -/* B1CF74 80240524 0C019E40 */ jal guTranslateF -/* B1CF78 80240528 0280202D */ daddu $a0, $s4, $zero -/* B1CF7C 8024052C 27A40020 */ addiu $a0, $sp, 0x20 -/* B1CF80 80240530 0280282D */ daddu $a1, $s4, $zero -/* B1CF84 80240534 0C019D80 */ jal guMtxCatF -/* B1CF88 80240538 0080302D */ daddu $a2, $a0, $zero -/* B1CF8C 8024053C 24040001 */ addiu $a0, $zero, 1 -/* B1CF90 80240540 0000282D */ daddu $a1, $zero, $zero -/* B1CF94 80240544 00A0302D */ daddu $a2, $a1, $zero -/* B1CF98 80240548 00A0382D */ daddu $a3, $a1, $zero -/* B1CF9C 8024054C 27B00020 */ addiu $s0, $sp, 0x20 -/* B1CFA0 80240550 0C0B7710 */ jal spr_draw_player_sprite -/* B1CFA4 80240554 AFB00010 */ sw $s0, 0x10($sp) -/* B1CFA8 80240558 4405B000 */ mfc1 $a1, $f22 -/* B1CFAC 8024055C 4406A000 */ mfc1 $a2, $f20 -/* B1CFB0 80240560 4407E000 */ mfc1 $a3, $f28 -/* B1CFB4 80240564 0220202D */ daddu $a0, $s1, $zero -/* B1CFB8 80240568 0C019EC8 */ jal guRotateF -/* B1CFBC 8024056C E7B40010 */ swc1 $f20, 0x10($sp) -/* B1CFC0 80240570 C64C008C */ lwc1 $f12, 0x8c($s2) -/* B1CFC4 80240574 0C00A6C9 */ jal clamp_angle -/* B1CFC8 80240578 00000000 */ nop -/* B1CFCC 8024057C 44050000 */ mfc1 $a1, $f0 -/* B1CFD0 80240580 4406A000 */ mfc1 $a2, $f20 -/* B1CFD4 80240584 4407A000 */ mfc1 $a3, $f20 -/* B1CFD8 80240588 0200202D */ daddu $a0, $s0, $zero -/* B1CFDC 8024058C 0C019EC8 */ jal guRotateF -/* B1CFE0 80240590 E7B80010 */ swc1 $f24, 0x10($sp) -/* B1CFE4 80240594 0220202D */ daddu $a0, $s1, $zero -/* B1CFE8 80240598 0200282D */ daddu $a1, $s0, $zero -/* B1CFEC 8024059C 0C019D80 */ jal guMtxCatF -/* B1CFF0 802405A0 0200302D */ daddu $a2, $s0, $zero -/* B1CFF4 802405A4 4405B000 */ mfc1 $a1, $f22 -/* B1CFF8 802405A8 4406A000 */ mfc1 $a2, $f20 -/* B1CFFC 802405AC 4407C000 */ mfc1 $a3, $f24 -/* B1D000 802405B0 0220202D */ daddu $a0, $s1, $zero -/* B1D004 802405B4 0C019EC8 */ jal guRotateF -/* B1D008 802405B8 E7B40010 */ swc1 $f20, 0x10($sp) -/* B1D00C 802405BC 0200202D */ daddu $a0, $s0, $zero -/* B1D010 802405C0 0220282D */ daddu $a1, $s1, $zero -/* B1D014 802405C4 0C019D80 */ jal guMtxCatF -/* B1D018 802405C8 0200302D */ daddu $a2, $s0, $zero -/* B1D01C 802405CC E7B40010 */ swc1 $f20, 0x10($sp) -/* B1D020 802405D0 8E4500A8 */ lw $a1, 0xa8($s2) -/* B1D024 802405D4 4406A000 */ mfc1 $a2, $f20 -/* B1D028 802405D8 4407C000 */ mfc1 $a3, $f24 -/* B1D02C 802405DC 0C019EC8 */ jal guRotateF -/* B1D030 802405E0 0220202D */ daddu $a0, $s1, $zero -/* B1D034 802405E4 0200202D */ daddu $a0, $s0, $zero -/* B1D038 802405E8 0220282D */ daddu $a1, $s1, $zero -/* B1D03C 802405EC 0C019D80 */ jal guMtxCatF -/* B1D040 802405F0 0200302D */ daddu $a2, $s0, $zero -/* B1D044 802405F4 4405D000 */ mfc1 $a1, $f26 -/* B1D048 802405F8 0260202D */ daddu $a0, $s3, $zero -/* B1D04C 802405FC 00A0302D */ daddu $a2, $a1, $zero -/* B1D050 80240600 0C019DF0 */ jal guScaleF -/* B1D054 80240604 00A0382D */ daddu $a3, $a1, $zero -/* B1D058 80240608 0200202D */ daddu $a0, $s0, $zero -/* B1D05C 8024060C 0260282D */ daddu $a1, $s3, $zero -/* B1D060 80240610 0C019D80 */ jal guMtxCatF -/* B1D064 80240614 0200302D */ daddu $a2, $s0, $zero -/* B1D068 80240618 8E450028 */ lw $a1, 0x28($s2) -/* B1D06C 8024061C 8E46002C */ lw $a2, 0x2c($s2) -/* B1D070 80240620 4407A000 */ mfc1 $a3, $f20 -/* B1D074 80240624 0C019E40 */ jal guTranslateF -/* B1D078 80240628 0280202D */ daddu $a0, $s4, $zero -/* B1D07C 8024062C 0200202D */ daddu $a0, $s0, $zero -/* B1D080 80240630 0280282D */ daddu $a1, $s4, $zero -/* B1D084 80240634 0C019D80 */ jal guMtxCatF -/* B1D088 80240638 0200302D */ daddu $a2, $s0, $zero -/* B1D08C 8024063C 24050007 */ addiu $a1, $zero, 7 -/* B1D090 80240640 240600FF */ addiu $a2, $zero, 0xff -/* B1D094 80240644 00C0382D */ daddu $a3, $a2, $zero -/* B1D098 80240648 8E5100A4 */ lw $s1, 0xa4($s2) -/* B1D09C 8024064C 00C0102D */ daddu $v0, $a2, $zero -/* B1D0A0 80240650 AFA20010 */ sw $v0, 0x10($sp) -/* B1D0A4 80240654 24020014 */ addiu $v0, $zero, 0x14 -/* B1D0A8 80240658 AFA20014 */ sw $v0, 0x14($sp) -/* B1D0AC 8024065C AFA00018 */ sw $zero, 0x18($sp) -/* B1D0B0 80240660 0C0B77FE */ jal func_802DDFF8 -/* B1D0B4 80240664 0220202D */ daddu $a0, $s1, $zero -/* B1D0B8 80240668 24040001 */ addiu $a0, $zero, 1 -/* B1D0BC 8024066C 0000282D */ daddu $a1, $zero, $zero -/* B1D0C0 80240670 00A0302D */ daddu $a2, $a1, $zero -/* B1D0C4 80240674 00A0382D */ daddu $a3, $a1, $zero -/* B1D0C8 80240678 0C0B7710 */ jal spr_draw_player_sprite -/* B1D0CC 8024067C AFB00010 */ sw $s0, 0x10($sp) -/* B1D0D0 80240680 0220202D */ daddu $a0, $s1, $zero -/* B1D0D4 80240684 0000282D */ daddu $a1, $zero, $zero -/* B1D0D8 80240688 00A0302D */ daddu $a2, $a1, $zero -/* B1D0DC 8024068C 00A0382D */ daddu $a3, $a1, $zero -/* B1D0E0 80240690 AFA00010 */ sw $zero, 0x10($sp) -/* B1D0E4 80240694 AFA00014 */ sw $zero, 0x14($sp) -/* B1D0E8 80240698 0C0B77FE */ jal func_802DDFF8 -/* B1D0EC 8024069C AFA00018 */ sw $zero, 0x18($sp) -/* B1D0F0 802406A0 8FBF0134 */ lw $ra, 0x134($sp) -/* B1D0F4 802406A4 8FB40130 */ lw $s4, 0x130($sp) -/* B1D0F8 802406A8 8FB3012C */ lw $s3, 0x12c($sp) -/* B1D0FC 802406AC 8FB20128 */ lw $s2, 0x128($sp) -/* B1D100 802406B0 8FB10124 */ lw $s1, 0x124($sp) -/* B1D104 802406B4 8FB00120 */ lw $s0, 0x120($sp) -/* B1D108 802406B8 D7BC0158 */ ldc1 $f28, 0x158($sp) -/* B1D10C 802406BC D7BA0150 */ ldc1 $f26, 0x150($sp) -/* B1D110 802406C0 D7B80148 */ ldc1 $f24, 0x148($sp) -/* B1D114 802406C4 D7B60140 */ ldc1 $f22, 0x140($sp) -/* B1D118 802406C8 D7B40138 */ ldc1 $f20, 0x138($sp) -/* B1D11C 802406CC 03E00008 */ jr $ra -/* B1D120 802406D0 27BD0160 */ addiu $sp, $sp, 0x160 diff --git a/ver/us/asm/nonmatchings/world/area_tst/tst_13/B1D760/func_802400A0_B1D800.s b/ver/us/asm/nonmatchings/world/area_tst/tst_13/B1D760/func_802400A0_B1D800.s deleted file mode 100644 index 1be0daa472..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tst/tst_13/B1D760/func_802400A0_B1D800.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400A0_B1D800 -/* B1D800 802400A0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B1D804 802400A4 AFB00010 */ sw $s0, 0x10($sp) -/* B1D808 802400A8 0080802D */ daddu $s0, $a0, $zero -/* B1D80C 802400AC 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* B1D810 802400B0 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* B1D814 802400B4 AFBF0014 */ sw $ra, 0x14($sp) -/* B1D818 802400B8 8E02013C */ lw $v0, 0x13c($s0) -/* B1D81C 802400BC C46C0028 */ lwc1 $f12, 0x28($v1) -/* B1D820 802400C0 C46E0030 */ lwc1 $f14, 0x30($v1) -/* B1D824 802400C4 C4460008 */ lwc1 $f6, 8($v0) -/* B1D828 802400C8 468031A0 */ cvt.s.w $f6, $f6 -/* B1D82C 802400CC 44063000 */ mfc1 $a2, $f6 -/* B1D830 802400D0 C4460010 */ lwc1 $f6, 0x10($v0) -/* B1D834 802400D4 468031A0 */ cvt.s.w $f6, $f6 -/* B1D838 802400D8 44073000 */ mfc1 $a3, $f6 -/* B1D83C 802400DC 0C00A7B5 */ jal dist2D -/* B1D840 802400E0 00000000 */ nop -/* B1D844 802400E4 3C0142E1 */ lui $at, 0x42e1 -/* B1D848 802400E8 44811000 */ mtc1 $at, $f2 -/* B1D84C 802400EC 46000106 */ mov.s $f4, $f0 -/* B1D850 802400F0 4602203C */ c.lt.s $f4, $f2 -/* B1D854 802400F4 00000000 */ nop -/* B1D858 802400F8 45000003 */ bc1f .L80240108 -/* B1D85C 802400FC AE000084 */ sw $zero, 0x84($s0) -/* B1D860 80240100 24020002 */ addiu $v0, $zero, 2 -/* B1D864 80240104 AE020084 */ sw $v0, 0x84($s0) -.L80240108: -/* B1D868 80240108 3C014216 */ lui $at, 0x4216 -/* B1D86C 8024010C 44810000 */ mtc1 $at, $f0 -/* B1D870 80240110 00000000 */ nop -/* B1D874 80240114 4600203C */ c.lt.s $f4, $f0 -/* B1D878 80240118 00000000 */ nop -/* B1D87C 8024011C 45000002 */ bc1f .L80240128 -/* B1D880 80240120 24020001 */ addiu $v0, $zero, 1 -/* B1D884 80240124 AE020084 */ sw $v0, 0x84($s0) -.L80240128: -/* B1D888 80240128 8FBF0014 */ lw $ra, 0x14($sp) -/* B1D88C 8024012C 8FB00010 */ lw $s0, 0x10($sp) -/* B1D890 80240130 24020002 */ addiu $v0, $zero, 2 -/* B1D894 80240134 03E00008 */ jr $ra -/* B1D898 80240138 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_tst/tst_13/B1D760/func_8024013C_B1D89C.s b/ver/us/asm/nonmatchings/world/area_tst/tst_13/B1D760/func_8024013C_B1D89C.s deleted file mode 100644 index a35104cdf7..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tst/tst_13/B1D760/func_8024013C_B1D89C.s +++ /dev/null @@ -1,172 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80242D00_B20460 -.double 0.1, 0.0 - -.section .text - -glabel func_8024013C_B1D89C -/* B1D89C 8024013C 27BDFF38 */ addiu $sp, $sp, -0xc8 -/* B1D8A0 80240140 27A40010 */ addiu $a0, $sp, 0x10 -/* B1D8A4 80240144 0000302D */ daddu $a2, $zero, $zero -/* B1D8A8 80240148 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* B1D8AC 8024014C 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* B1D8B0 80240150 AFB00090 */ sw $s0, 0x90($sp) -/* B1D8B4 80240154 3C108024 */ lui $s0, %hi(D_80242BF8_B20358) -/* B1D8B8 80240158 26102BF8 */ addiu $s0, $s0, %lo(D_80242BF8_B20358) -/* B1D8BC 8024015C AFBF00A4 */ sw $ra, 0xa4($sp) -/* B1D8C0 80240160 AFB400A0 */ sw $s4, 0xa0($sp) -/* B1D8C4 80240164 AFB3009C */ sw $s3, 0x9c($sp) -/* B1D8C8 80240168 AFB20098 */ sw $s2, 0x98($sp) -/* B1D8CC 8024016C AFB10094 */ sw $s1, 0x94($sp) -/* B1D8D0 80240170 F7BA00C0 */ sdc1 $f26, 0xc0($sp) -/* B1D8D4 80240174 F7B800B8 */ sdc1 $f24, 0xb8($sp) -/* B1D8D8 80240178 F7B600B0 */ sdc1 $f22, 0xb0($sp) -/* B1D8DC 8024017C F7B400A8 */ sdc1 $f20, 0xa8($sp) -/* B1D8E0 80240180 8C650028 */ lw $a1, 0x28($v1) -/* B1D8E4 80240184 8E020000 */ lw $v0, ($s0) -/* B1D8E8 80240188 8C670030 */ lw $a3, 0x30($v1) -/* B1D8EC 8024018C 24420001 */ addiu $v0, $v0, 1 -/* B1D8F0 80240190 0C019E40 */ jal guTranslateF -/* B1D8F4 80240194 AE020000 */ sw $v0, ($s0) -/* B1D8F8 80240198 3C014248 */ lui $at, 0x4248 -/* B1D8FC 8024019C 4481D000 */ mtc1 $at, $f26 -/* B1D900 802401A0 C60C0000 */ lwc1 $f12, ($s0) -/* B1D904 802401A4 46806320 */ cvt.s.w $f12, $f12 -/* B1D908 802401A8 0C00A85B */ jal sin_rad -/* B1D90C 802401AC 461A6303 */ div.s $f12, $f12, $f26 -/* B1D910 802401B0 3C013FE0 */ lui $at, 0x3fe0 -/* B1D914 802401B4 4481C800 */ mtc1 $at, $f25 -/* B1D918 802401B8 4480C000 */ mtc1 $zero, $f24 -/* B1D91C 802401BC 460005A1 */ cvt.d.s $f22, $f0 -/* B1D920 802401C0 4638B582 */ mul.d $f22, $f22, $f24 -/* B1D924 802401C4 00000000 */ nop -/* B1D928 802401C8 4638B580 */ add.d $f22, $f22, $f24 -/* B1D92C 802401CC C60C0000 */ lwc1 $f12, ($s0) -/* B1D930 802401D0 46806320 */ cvt.s.w $f12, $f12 -/* B1D934 802401D4 461A6303 */ div.s $f12, $f12, $f26 -/* B1D938 802401D8 0C00A874 */ jal cos_rad -/* B1D93C 802401DC 4620B5A0 */ cvt.s.d $f22, $f22 -/* B1D940 802401E0 C60C0000 */ lwc1 $f12, ($s0) -/* B1D944 802401E4 46806320 */ cvt.s.w $f12, $f12 -/* B1D948 802401E8 461A6303 */ div.s $f12, $f12, $f26 -/* B1D94C 802401EC 0C00A874 */ jal cos_rad -/* B1D950 802401F0 46000506 */ mov.s $f20, $f0 -/* B1D954 802401F4 4600A502 */ mul.s $f20, $f20, $f0 -/* B1D958 802401F8 00000000 */ nop -/* B1D95C 802401FC 3C018024 */ lui $at, %hi(D_80242D00_B20460) -/* B1D960 80240200 D4202D00 */ ldc1 $f0, %lo(D_80242D00_B20460)($at) -/* B1D964 80240204 4600A521 */ cvt.d.s $f20, $f20 -/* B1D968 80240208 4620A500 */ add.d $f20, $f20, $f0 -/* B1D96C 8024020C C60C0000 */ lwc1 $f12, ($s0) -/* B1D970 80240210 46806320 */ cvt.s.w $f12, $f12 -/* B1D974 80240214 461A6303 */ div.s $f12, $f12, $f26 -/* B1D978 80240218 0C00A85B */ jal sin_rad -/* B1D97C 8024021C 4620A520 */ cvt.s.d $f20, $f20 -/* B1D980 80240220 46000021 */ cvt.d.s $f0, $f0 -/* B1D984 80240224 46380002 */ mul.d $f0, $f0, $f24 -/* B1D988 80240228 00000000 */ nop -/* B1D98C 8024022C 3C140001 */ lui $s4, 1 -/* B1D990 80240230 36941630 */ ori $s4, $s4, 0x1630 -/* B1D994 80240234 27B00050 */ addiu $s0, $sp, 0x50 -/* B1D998 80240238 46380000 */ add.d $f0, $f0, $f24 -/* B1D99C 8024023C 4405B000 */ mfc1 $a1, $f22 -/* B1D9A0 80240240 4406A000 */ mfc1 $a2, $f20 -/* B1D9A4 80240244 46200020 */ cvt.s.d $f0, $f0 -/* B1D9A8 80240248 44070000 */ mfc1 $a3, $f0 -/* B1D9AC 8024024C 0C019DF0 */ jal guScaleF -/* B1D9B0 80240250 0200202D */ daddu $a0, $s0, $zero -/* B1D9B4 80240254 0200202D */ daddu $a0, $s0, $zero -/* B1D9B8 80240258 27A50010 */ addiu $a1, $sp, 0x10 -/* B1D9BC 8024025C 0C019D80 */ jal guMtxCatF -/* B1D9C0 80240260 00A0302D */ daddu $a2, $a1, $zero -/* B1D9C4 80240264 27A40010 */ addiu $a0, $sp, 0x10 -/* B1D9C8 80240268 3C118007 */ lui $s1, %hi(gMatrixListPos) -/* B1D9CC 8024026C 263141F0 */ addiu $s1, $s1, %lo(gMatrixListPos) -/* B1D9D0 80240270 3C12800A */ lui $s2, %hi(gDisplayContext) -/* B1D9D4 80240274 2652A674 */ addiu $s2, $s2, %lo(gDisplayContext) -/* B1D9D8 80240278 96250000 */ lhu $a1, ($s1) -/* B1D9DC 8024027C 8E420000 */ lw $v0, ($s2) -/* B1D9E0 80240280 00052980 */ sll $a1, $a1, 6 -/* B1D9E4 80240284 00B42821 */ addu $a1, $a1, $s4 -/* B1D9E8 80240288 0C019D40 */ jal guMtxF2L -/* B1D9EC 8024028C 00452821 */ addu $a1, $v0, $a1 -/* B1D9F0 80240290 24040001 */ addiu $a0, $zero, 1 -/* B1D9F4 80240294 3C138024 */ lui $s3, %hi(D_80242860_B1FFC0) -/* B1D9F8 80240298 26732860 */ addiu $s3, $s3, %lo(D_80242860_B1FFC0) -/* B1D9FC 8024029C 0260282D */ daddu $a1, $s3, $zero -/* B1DA00 802402A0 27A60010 */ addiu $a2, $sp, 0x10 -/* B1DA04 802402A4 0C0470CB */ jal mdl_project_tex_coords -/* B1DA08 802402A8 0000382D */ daddu $a3, $zero, $zero -/* B1DA0C 802402AC 3C07E300 */ lui $a3, 0xe300 -/* B1DA10 802402B0 34E70A01 */ ori $a3, $a3, 0xa01 -/* B1DA14 802402B4 3C09E200 */ lui $t1, 0xe200 -/* B1DA18 802402B8 3529001C */ ori $t1, $t1, 0x1c -/* B1DA1C 802402BC 3C080055 */ lui $t0, 0x55 -/* B1DA20 802402C0 35082078 */ ori $t0, $t0, 0x2078 -/* B1DA24 802402C4 3C10800A */ lui $s0, %hi(gMasterGfxPos) -/* B1DA28 802402C8 2610A66C */ addiu $s0, $s0, %lo(gMasterGfxPos) -/* B1DA2C 802402CC 0200202D */ daddu $a0, $s0, $zero -/* B1DA30 802402D0 24050001 */ addiu $a1, $zero, 1 -/* B1DA34 802402D4 8E020000 */ lw $v0, ($s0) -/* B1DA38 802402D8 3C03E700 */ lui $v1, 0xe700 -/* B1DA3C 802402DC 0040302D */ daddu $a2, $v0, $zero -/* B1DA40 802402E0 24420008 */ addiu $v0, $v0, 8 -/* B1DA44 802402E4 AE020000 */ sw $v0, ($s0) -/* B1DA48 802402E8 ACC30000 */ sw $v1, ($a2) -/* B1DA4C 802402EC 24430008 */ addiu $v1, $v0, 8 -/* B1DA50 802402F0 ACC00004 */ sw $zero, 4($a2) -/* B1DA54 802402F4 AE030000 */ sw $v1, ($s0) -/* B1DA58 802402F8 24430010 */ addiu $v1, $v0, 0x10 -/* B1DA5C 802402FC AC470000 */ sw $a3, ($v0) -/* B1DA60 80240300 AC400004 */ sw $zero, 4($v0) -/* B1DA64 80240304 AE030000 */ sw $v1, ($s0) -/* B1DA68 80240308 AC490008 */ sw $t1, 8($v0) -/* B1DA6C 8024030C 0C0475CB */ jal mdl_draw_hidden_panel_surface -/* B1DA70 80240310 AC48000C */ sw $t0, 0xc($v0) -/* B1DA74 80240314 3C03DA38 */ lui $v1, 0xda38 -/* B1DA78 80240318 34630002 */ ori $v1, $v1, 2 -/* B1DA7C 8024031C 3C06D838 */ lui $a2, 0xd838 -/* B1DA80 80240320 34C60002 */ ori $a2, $a2, 2 -/* B1DA84 80240324 8E040000 */ lw $a0, ($s0) -/* B1DA88 80240328 96220000 */ lhu $v0, ($s1) -/* B1DA8C 8024032C 0080282D */ daddu $a1, $a0, $zero -/* B1DA90 80240330 24840008 */ addiu $a0, $a0, 8 -/* B1DA94 80240334 AE040000 */ sw $a0, ($s0) -/* B1DA98 80240338 ACA30000 */ sw $v1, ($a1) -/* B1DA9C 8024033C 24430001 */ addiu $v1, $v0, 1 -/* B1DAA0 80240340 3042FFFF */ andi $v0, $v0, 0xffff -/* B1DAA4 80240344 00021180 */ sll $v0, $v0, 6 -/* B1DAA8 80240348 A6230000 */ sh $v1, ($s1) -/* B1DAAC 8024034C 8E430000 */ lw $v1, ($s2) -/* B1DAB0 80240350 00541021 */ addu $v0, $v0, $s4 -/* B1DAB4 80240354 00621821 */ addu $v1, $v1, $v0 -/* B1DAB8 80240358 24820008 */ addiu $v0, $a0, 8 -/* B1DABC 8024035C ACA30004 */ sw $v1, 4($a1) -/* B1DAC0 80240360 AE020000 */ sw $v0, ($s0) -/* B1DAC4 80240364 3C02DE00 */ lui $v0, 0xde00 -/* B1DAC8 80240368 AC820000 */ sw $v0, ($a0) -/* B1DACC 8024036C 24820010 */ addiu $v0, $a0, 0x10 -/* B1DAD0 80240370 AC930004 */ sw $s3, 4($a0) -/* B1DAD4 80240374 AE020000 */ sw $v0, ($s0) -/* B1DAD8 80240378 24020040 */ addiu $v0, $zero, 0x40 -/* B1DADC 8024037C AC860008 */ sw $a2, 8($a0) -/* B1DAE0 80240380 AC82000C */ sw $v0, 0xc($a0) -/* B1DAE4 80240384 8FBF00A4 */ lw $ra, 0xa4($sp) -/* B1DAE8 80240388 8FB400A0 */ lw $s4, 0xa0($sp) -/* B1DAEC 8024038C 8FB3009C */ lw $s3, 0x9c($sp) -/* B1DAF0 80240390 8FB20098 */ lw $s2, 0x98($sp) -/* B1DAF4 80240394 8FB10094 */ lw $s1, 0x94($sp) -/* B1DAF8 80240398 8FB00090 */ lw $s0, 0x90($sp) -/* B1DAFC 8024039C D7BA00C0 */ ldc1 $f26, 0xc0($sp) -/* B1DB00 802403A0 D7B800B8 */ ldc1 $f24, 0xb8($sp) -/* B1DB04 802403A4 D7B600B0 */ ldc1 $f22, 0xb0($sp) -/* B1DB08 802403A8 D7B400A8 */ ldc1 $f20, 0xa8($sp) -/* B1DB0C 802403AC 03E00008 */ jr $ra -/* B1DB10 802403B0 27BD00C8 */ addiu $sp, $sp, 0xc8 -/* B1DB14 802403B4 00000000 */ nop -/* B1DB18 802403B8 00000000 */ nop -/* B1DB1C 802403BC 00000000 */ nop diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml index b529f6bb42..b88904db0b 100644 --- a/ver/us/splat.yaml +++ b/ver/us/splat.yaml @@ -10920,8 +10920,7 @@ segments: - [0xDFE5B0, data] - [0xE019E0, data] - [0xE04180, data] - - [0xE052C0, data] - - [0xE05300] + - [0xE052C0] - name: end_01 dir: world/area_end/end_01 type: code