From 6d66d5fedb0745a39411c9a58d4682cdb04f5ae0 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sat, 20 Feb 2021 09:41:30 -0500 Subject: [PATCH] Odds and Ends (#189) * fixing segment * redoing subtree * git subrepo clone https://github.com/ethteck/splat.git tools/splat subrepo: subdir: "tools/splat" merged: "99cf514297" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "99cf514297" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * fix symbol_addrs * sweet victory * reformat collision_main_lateral.s * Lots of matches, fixed diff.py issue, improved coverage.py * some more * update symbol_addrs * git subrepo pull tools/splat subrepo: subdir: "tools/splat" merged: "c46026725a" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "c46026725a" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * update symbol_addrs * fix disasm * 2 mo * Jenkinsfile * PR comments * check_input_status_menu, removing some macros * a few funcs * assist updates * UnkAlphaFunc * UnkPartnerPosFuncs * Deleting stuff * oopz * dead_syms.txt, UnkNpcAIFunc14 * update symbol_addrs * cleanup * symbol_addrs * cleanup --- .vscode/settings.json | 3 +- .../area_kpa2/69F320/func_80219F5C_6A115C.s | 44 ---- .../area_kpa2/69F320/func_8021B314_6A2514.s | 44 ---- .../area_omo/512E50/func_80218A98_513068.s | 44 ---- .../check_input_status_menu.s | 78 ------- .../code_EC9D00/func_80240C78_ECA978.s | 22 -- .../code_EC9D00/func_80240CC0_ECA9C0.s | 22 -- .../code_ED0310/func_80240FE0_ED0FD0.s | 83 -------- .../code_ED0310/func_8024162C_ED161C.s | 2 +- .../code_EDEA00/func_80240E84_EDF844.s | 83 -------- .../code_EDEA00/func_802414D0_EDFE90.s | 2 +- .../code_EDEA00/func_80241DE4_EE07A4.s | 2 +- .../code_EE70C0/func_802417D0_EE7D80.s | 83 -------- .../code_EE70C0/func_80241E1C_EE83CC.s | 2 +- .../code_EED1E0/func_80240D58_EEDE58.s | 22 -- .../code_EED1E0/func_80240DA0_EEDEA0.s | 22 -- .../code_EEDF50/func_80241B10_EEEC10.s | 83 -------- .../code_EEDF50/func_8024215C_EEF25C.s | 2 +- .../code_EF2680/func_80240D30_EF3340.s | 83 -------- .../code_EF2680/func_8024137C_EF398C.s | 2 +- .../code_EF2680/func_80241C90_EF42A0.s | 2 +- .../arn_04/BE37B0/func_80241B50_BE5300.s | 83 -------- .../arn_04/BE37B0/func_8024219C_BE594C.s | 2 +- .../arn_07/BED740/func_80241610_BEE400.s | 83 -------- .../arn_07/BED740/func_80241C5C_BEEA4C.s | 2 +- .../dgb_01/BFD9A0/func_80240DE0_BFE660.s | 83 -------- .../dgb_01/BFD9A0/func_8024142C_BFECAC.s | 2 +- .../dgb_04/C36530/func_80240CC0_C371F0.s | 83 -------- .../dgb_04/C36530/func_8024130C_C3783C.s | 2 +- .../dgb_04/C36530/func_80243048_C39578.s | 22 -- .../dgb_04/C36530/func_80243090_C395C0.s | 22 -- .../dgb_08/C3FDB0/func_80242420_C421D0.s | 83 -------- .../dgb_08/C3FDB0/func_80242A6C_C4281C.s | 2 +- .../dgb_09/C46BE0/func_802420E4_C48CC4.s | 83 -------- .../dgb_09/C46BE0/func_80242730_C49310.s | 2 +- .../dro_01/95B7E0/func_8024189C_95CA9C.s | 93 --------- .../dro_02/9694C0/func_8024072C_9698EC.s | 93 --------- .../flo_08/CAED40/func_80240C78_CAF9B8.s | 22 -- .../flo_08/CAED40/func_80240CC0_CAFA00.s | 22 -- .../flo_09/CB5320/func_80240FE0_CB5FE0.s | 83 -------- .../flo_09/CB5320/func_8024162C_CB662C.s | 2 +- .../flo_13/CC3850/func_80240E84_CC4694.s | 83 -------- .../flo_13/CC3850/func_802414D0_CC4CE0.s | 2 +- .../flo_13/CC3850/func_80241DB8_CC55C8.s | 2 +- .../flo_14/CCBE20/func_802417D0_CCCAE0.s | 83 -------- .../flo_14/CCBE20/func_80241E1C_CCD12C.s | 2 +- .../flo_16/CD1F10/func_80240D58_CD2B88.s | 22 -- .../flo_16/CD1F10/func_80240DA0_CD2BD0.s | 22 -- .../flo_16/CD2C80/func_80241B10_CD3940.s | 83 -------- .../flo_16/CD2C80/func_8024215C_CD3F8C.s | 2 +- .../flo_17/CD7350/func_80240D30_CD8010.s | 83 -------- .../flo_17/CD7350/func_8024137C_CD865C.s | 2 +- .../flo_17/CD7350/func_80241C64_CD8F44.s | 2 +- .../flo_25/CF2C10/func_80240D00_CF38D0.s | 83 -------- .../flo_25/CF2C10/func_8024134C_CF3F1C.s | 2 +- .../hos_02/A17210/func_80241CB0_A17ED0.s | 83 -------- .../hos_02/A17210/func_802422FC_A1851C.s | 2 +- .../hos_03/A1BDB0/func_80241970_A1CA70.s | 83 -------- .../hos_03/A1BDB0/func_80241FBC_A1D0BC.s | 2 +- .../hos_03/A1BDB0/func_802428D0_A1D9D0.s | 93 --------- .../isk_10/988B60/func_80240C78_9897D8.s | 22 -- .../isk_10/988B60/func_80240CC0_989820.s | 22 -- .../iwa_10/91E6D0/func_80240F68_91F4D8.s | 22 -- .../iwa_10/91E6D0/func_80240FB0_91F520.s | 22 -- .../jan_02/B2C8A0/func_80241A40_B2DEB0.s | 93 --------- .../jan_03/B34BD0/func_80241FC8_B36B98.s | 93 --------- .../jan_08/B5E910/func_802412D8_B5F588.s | 22 -- .../jan_08/B5E910/func_80241320_B5F5D0.s | 22 -- .../kmr_02/8B0070/func_802407BC_8B082C.s | 93 --------- .../kmr_05/8CE070/func_80240CC0_8CED30.s | 83 -------- .../kmr_05/8CE070/func_8024130C_8CF37C.s | 2 +- .../kmr_06/8D1510/func_80240CC0_8D21D0.s | 83 -------- .../kmr_06/8D1510/func_8024130C_8D281C.s | 2 +- .../kmr_09/8D5E00/func_80240CC0_8D6AC0.s | 83 -------- .../kmr_09/8D5E00/func_8024130C_8D710C.s | 2 +- .../kzn_02/C5AC20/func_802411A0_C5B8E0.s | 83 -------- .../kzn_02/C5AC20/func_802417EC_C5BF2C.s | 2 +- .../kzn_04/C68440/func_80240F88_C690B8.s | 22 -- .../kzn_04/C68440/func_80240FD0_C69100.s | 22 -- .../kzn_07/C6EA50/func_802414E0_C6F810.s | 83 -------- .../kzn_07/C6EA50/func_80241B2C_C6FE5C.s | 2 +- .../kzn_08/C71ED0/func_80241710_C72B90.s | 83 -------- .../kzn_08/C71ED0/func_80241D5C_C731DC.s | 2 +- .../kzn_09/C76CE0/func_80240C78_C77958.s | 22 -- .../kzn_09/C76CE0/func_80240CC0_C779A0.s | 22 -- .../kzn_11/C80600/func_80241120_C812C0.s | 83 -------- .../kzn_11/C80600/func_8024176C_C8190C.s | 2 +- .../mac_00/7EB340/func_80240A5C_7EB76C.s | 93 --------- .../mac_01/8017D0/func_8024233C_802BBC.s | 93 --------- .../mac_02/823BF0/func_80241BEC_824EAC.s | 93 --------- .../mac_03/831B20/func_802408DC_8320DC.s | 93 --------- .../mac_04/843030/func_8024088C_84345C.s | 93 --------- .../mac_05/852170/func_8024174C_8538BC.s | 93 --------- .../mim_08/BAD940/func_80240D60_BAE6A0.s | 83 -------- .../mim_08/BAD940/func_802413AC_BAECEC.s | 2 +- .../nok_01/9C53E0/func_80241194_9C6574.s | 93 --------- .../nok_02/9D7AA0/func_80241D3C_9D8D5C.s | 93 --------- .../nok_11/9F4A40/func_80241494_9F5ED4.s | 83 -------- .../nok_11/9F4A40/func_80241AE0_9F6520.s | 2 +- .../nok_14/A02A00/func_80241654_A03E94.s | 83 -------- .../nok_14/A02A00/func_80241CA0_A044E0.s | 2 +- .../nok_15/A06F00/func_80241774_A08674.s | 83 -------- .../nok_15/A06F00/func_80241DC0_A08CC0.s | 2 +- .../omo_04/DAD400/func_80241060_DAE460.s | 83 -------- .../omo_04/DAD400/func_802416AC_DAEAAC.s | 2 +- .../omo_05/DB22C0/func_80241714_DB39D4.s | 83 -------- .../omo_05/DB22C0/func_80241D60_DB4020.s | 2 +- .../omo_07/DBD2B0/func_80242638_DBF8E8.s | 83 -------- .../omo_07/DBD2B0/func_80242C84_DBFF34.s | 2 +- .../omo_11/DDCFC0/func_80241408_DDDC38.s | 22 -- .../omo_11/DDCFC0/func_80241450_DDDC80.s | 22 -- .../omo_17/DEF400/func_80241C74_DF0B14.s | 83 -------- .../omo_17/DEF400/func_802422C0_DF1160.s | 2 +- .../sam_01/CF7E80/func_80240B2C_CF869C.s | 93 --------- .../sam_01/CF7E80/func_80241A80_CF95F0.s | 44 ---- .../sam_02/D05F60/func_80240F58_D06688.s | 93 --------- .../sam_06/D203E0/func_80241210_D210A0.s | 83 -------- .../sam_06/D203E0/func_8024185C_D216EC.s | 2 +- .../sam_08/D2FC80/func_80240C78_D308F8.s | 22 -- .../sam_08/D2FC80/func_80240CC0_D30940.s | 22 -- .../sam_11/D3ADA0/func_80240BFC_D3B1CC.s | 93 --------- .../sbk_56/953FC0/func_80240CF8_954CB8.s | 22 -- .../sbk_56/953FC0/func_80240D40_954D00.s | 22 -- .../tik_07/879BE0/func_80240F58_87AB38.s | 22 -- .../tik_07/879BE0/func_80240FA0_87AB80.s | 22 -- .../tik_07/87AC00/func_802420B0_87BC90.s | 83 -------- .../tik_07/87AC00/func_802426FC_87C2DC.s | 2 +- .../tik_10/8866D0/func_802412F8_8876B8.s | 22 -- .../tik_10/8866D0/func_80241340_887700.s | 22 -- .../tik_12/8891C0/func_80241894_88A464.s | 22 -- .../tik_12/8891C0/func_802418DC_88A4AC.s | 22 -- .../tik_17/892A50/func_80240CA8_8936C8.s | 22 -- .../tik_17/892A50/func_80240CF0_893710.s | 22 -- .../tik_19/897BD0/func_80241268_898848.s | 22 -- .../tik_19/897BD0/func_802412B0_898890.s | 22 -- .../trd_04/9A88A0/func_80242AD8_9AAEC8.s | 83 -------- .../trd_04/9A88A0/func_80243124_9AB514.s | 2 +- .../trd_07/9B6C90/func_802417A4_9B8124.s | 83 -------- .../trd_07/9B6C90/func_80241DF0_9B8770.s | 2 +- .../world/partners/func_800EA5B8.s | 10 - .../world/partners/func_800EA6A8.s | 13 -- .../world/partners/func_800EE994.s | 13 -- .../world/partners/func_800EECC4.s | 13 -- .../world/partners/func_800EF300.s | 9 - .../world/partners/func_800EF314.s | 9 - .../world/partners/func_800EF3C0.s | 9 - .../world/partners/func_800EF3D4.s | 8 - .../world/partners/func_800EF3E4.s | 16 -- .../world/partners/func_800EF414.s | 14 -- .../world/partners/func_800EF43C.s | 12 -- .../world/partners/func_800EF600.s | 15 -- .../world/partners/func_800EF628.s | 10 - .../partners/is_current_partner_flying.s | 9 - .../world/partners/partner_get_ride_script.s | 13 -- .../partners/reset_parter_tether_distance.s | 11 - .../partners/set_parter_tether_distance.s | 8 - configure.py | 2 +- dead_syms.txt | 2 + include/enums.h | 2 +- include/functions.h | 12 +- include/macros.h | 6 - include/variables.h | 4 + src/battle/area_dig/6DE3F0.c | 2 +- src/battle/area_dig/6DE4A0.c | 8 +- src/battle/area_hos/47F0B0.c | 2 +- src/battle/area_kpa2/69F320.c | 6 +- src/battle/area_omo/512E50.c | 2 +- src/battle/area_trd_part_3/4CF1B0.c | 8 +- src/battle/item/coconut/lib.c | 6 +- src/battle/partner/twink_714CF0.c | 2 +- src/code_102610_len_2330.c | 2 +- src/code_109660_len_1270.c | 2 +- src/code_10A8D0.c | 2 +- src/code_111f0_len_860.c | 4 +- src/code_11a50_len_7a0.c | 10 +- src/code_13480_len_3f0.c | 12 +- src/code_1370_len_7d0.c | 2 +- src/code_138CC0.c | 4 +- src/code_16c8e0.c | 2 +- src/code_17FEB0.c | 58 +++--- src/code_181810.c | 8 +- src/code_190B20.c | 4 +- src/code_1967B0.c | 2 +- src/code_197F40.c | 16 +- src/code_19FAF0.c | 2 +- src/code_1A5830.c | 2 +- src/code_1a1f0_len_5390.c | 2 +- src/code_1b40_len_20b0.c | 22 +- src/code_1f580_len_1940.c | 2 +- src/code_3251D0.c | 8 +- src/code_341d0.c | 4 +- src/code_3bf0_len_6f0.c | 6 +- src/code_42e0_len_1f60.c | 16 +- src/code_6000.c | 8 +- src/code_6240_len_c00.c | 2 +- src/code_77480.c | 24 +-- src/code_7B440.c | 2 +- src/code_7bb60_len_41b0.c | 26 +-- src/code_7fd10_len_b40.c | 68 ++++++- src/code_80850_len_3060.c | 12 +- src/code_EC9D00.c | 6 +- src/code_ED0310.c | 4 +- src/code_ED510.c | 6 +- src/code_EDEA00.c | 4 +- src/code_EE70C0.c | 4 +- src/code_EED1E0.c | 6 +- src/code_EEDF50.c | 4 +- src/code_EF2680.c | 4 +- src/code_F5750.c | 4 +- src/code_a5dd0_len_114e0.c | 6 +- src/code_b72b0_len_15ed0.c | 2 +- src/code_dba20_len_350.c | 2 +- src/code_dbd70_len_700.c | 2 +- src/code_dc470_len_14c0.c | 6 +- src/code_dd930_len_1c0.c | 2 +- src/code_e0b30_len_b80.c | 14 +- src/code_e79b0_len_1920.c | 4 +- src/code_e940_len_290.c | 10 +- src/code_ebd0_len_6a0.c | 12 +- src/code_ef070_len_3400.c | 4 +- src/code_f2470_len_27f0.c | 2 +- src/code_fa4c0_len_3bf0.c | 2 +- src/code_fe0b0_len_5a0.c | 16 +- src/common/GetItemEntityPosition.inc.c | 12 ++ src/common/IsGameStatusUnkAA_1.inc.c | 2 +- src/world/area_arn/arn_04/BE37B0.c | 2 +- src/world/area_arn/arn_07/BED740.c | 4 +- src/world/area_dgb/dgb_01/BFD9A0.c | 2 +- src/world/area_dgb/dgb_04/C36530.c | 6 +- src/world/area_dgb/dgb_08/C3FDB0.c | 2 +- src/world/area_dgb/dgb_09/C46BE0.c | 2 +- src/world/area_dro/dro_01/95B7E0.c | 4 +- src/world/area_dro/dro_02/9694C0.c | 4 +- src/world/area_flo/flo_00/C9DF60.c | 2 +- src/world/area_flo/flo_08/CAED40.c | 4 +- src/world/area_flo/flo_09/CB5320.c | 2 +- src/world/area_flo/flo_13/CC3850.c | 2 +- src/world/area_flo/flo_14/CCBE20.c | 2 +- src/world/area_flo/flo_16/CD1F10.c | 4 +- src/world/area_flo/flo_16/CD2C80.c | 2 +- src/world/area_flo/flo_17/CD7350.c | 2 +- src/world/area_flo/flo_25/CF2C10.c | 2 +- src/world/area_hos/hos_02/A17210.c | 2 +- src/world/area_hos/hos_03/A1BDB0.c | 6 +- src/world/area_isk/isk_10/988B60.c | 4 +- src/world/area_iwa/iwa_10/91E6D0.c | 4 +- src/world/area_jan/jan_02/B2C8A0.c | 4 +- src/world/area_jan/jan_03/B34BD0.c | 4 +- src/world/area_jan/jan_08/B5E910.c | 4 +- src/world/area_jan/jan_22/B84180.c | 2 +- src/world/area_kmr/kmr_02/8B0070.c | 4 +- src/world/area_kmr/kmr_03/8C7F90.c | 2 +- src/world/area_kmr/kmr_03/8C82B0.c | 2 +- src/world/area_kmr/kmr_05/8CE070.c | 2 +- src/world/area_kmr/kmr_06/8D1510.c | 2 +- src/world/area_kmr/kmr_09/8D5E00.c | 2 +- src/world/area_kzn/kzn_02/C5AC20.c | 2 +- src/world/area_kzn/kzn_04/C68440.c | 4 +- src/world/area_kzn/kzn_07/C6EA50.c | 2 +- src/world/area_kzn/kzn_08/C71ED0.c | 2 +- src/world/area_kzn/kzn_09/C76CE0.c | 4 +- src/world/area_kzn/kzn_11/C80600.c | 2 +- src/world/area_mac/mac_00/7EAD10.c | 20 +- src/world/area_mac/mac_00/7EB340.c | 4 +- src/world/area_mac/mac_01/800880.c | 4 +- src/world/area_mac/mac_01/8017D0.c | 6 +- src/world/area_mac/mac_02/823BF0.c | 4 +- src/world/area_mac/mac_03/831B20.c | 4 +- src/world/area_mac/mac_04/843030.c | 6 +- src/world/area_mac/mac_05/852170.c | 4 +- src/world/area_mim/mim_08/BAD940.c | 2 +- src/world/area_nok/nok_01/9C53E0.c | 4 +- src/world/area_nok/nok_02/9D7AA0.c | 4 +- src/world/area_nok/nok_11/9F4A40.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_04/DAD400.c | 2 +- src/world/area_omo/omo_05/DB22C0.c | 2 +- src/world/area_omo/omo_07/DBD2B0.c | 2 +- src/world/area_omo/omo_11/DDCFC0.c | 4 +- src/world/area_omo/omo_17/DEF400.c | 2 +- src/world/area_pra/pra_01/D4D060.c | 2 +- src/world/area_sam/sam_01/CF7E80.c | 6 +- src/world/area_sam/sam_02/D05F60.c | 4 +- src/world/area_sam/sam_06/D203E0.c | 2 +- src/world/area_sam/sam_08/D2FC80.c | 4 +- src/world/area_sam/sam_11/D3ADA0.c | 4 +- src/world/area_sbk/sbk_02/92A9A0.c | 2 +- src/world/area_sbk/sbk_56/953FC0.c | 4 +- src/world/area_tik/tik_07/879BE0.c | 4 +- src/world/area_tik/tik_07/87AC00.c | 2 +- src/world/area_tik/tik_10/8866D0.c | 4 +- src/world/area_tik/tik_12/8891C0.c | 4 +- src/world/area_tik/tik_17/892A50.c | 4 +- src/world/area_tik/tik_19/897BD0.c | 4 +- src/world/area_trd/trd_00/99A240.c | 2 +- src/world/area_trd/trd_03/9A4650.c | 6 +- src/world/area_trd/trd_04/9A88A0.c | 2 +- src/world/area_trd/trd_07/9B6C90.c | 2 +- src/world/common/AwaitPlayerNearNpc.inc.c | 2 +- src/world/common/DeadUnkNpcAIFunc14.inc.c | 31 +++ src/world/common/DeadUnkPartnerPosFuncs.inc.c | 15 ++ src/world/common/GetGameStatus75.inc.c | 2 +- src/world/common/GetPartnerCall800EB168.inc.c | 2 +- src/world/common/SetGameStatusUnk84_1.inc.c | 2 +- src/world/common/SomeXYZFunc2.inc.c | 2 +- src/world/common/SomeXYZFuncTodoRename.inc.c | 2 +- src/world/common/UnkAlphaFunc.inc.c | 37 ++++ src/world/common/UnkNpcAIFunc14.inc.c | 31 +++ src/world/common/UnkPartnerPosFuncs.inc.c | 15 ++ src/world/common/UnkPositionFunc.inc.c | 2 +- src/world/common/UnkRotatePlayer.inc.c | 2 +- src/world/partner/bombette.c | 2 +- src/world/partner/parakarry.c | 2 +- src/world/partners.c | 104 ++++++++-- src/world/partners.h | 26 +-- src/world/script_api/7E0E80.c | 4 +- src/world/script_api/7E3700.c | 2 +- src/world/script_api/7E4690.c | 22 +- tools/assist.py | 33 +-- tools/ignored_funcs.txt | 6 +- tools/symbol_addrs.txt | 190 +++++++++--------- ...symbol_addrs.py => update_symbol_addrs.py} | 0 323 files changed, 855 insertions(+), 6529 deletions(-) delete mode 100644 asm/nonmatchings/battle/area_kpa2/69F320/func_80219F5C_6A115C.s delete mode 100644 asm/nonmatchings/battle/area_kpa2/69F320/func_8021B314_6A2514.s delete mode 100644 asm/nonmatchings/battle/area_omo/512E50/func_80218A98_513068.s delete mode 100644 asm/nonmatchings/code_7fd10_len_b40/check_input_status_menu.s delete mode 100644 asm/nonmatchings/code_EC9D00/func_80240C78_ECA978.s delete mode 100644 asm/nonmatchings/code_EC9D00/func_80240CC0_ECA9C0.s delete mode 100644 asm/nonmatchings/code_ED0310/func_80240FE0_ED0FD0.s delete mode 100644 asm/nonmatchings/code_EDEA00/func_80240E84_EDF844.s delete mode 100644 asm/nonmatchings/code_EE70C0/func_802417D0_EE7D80.s delete mode 100644 asm/nonmatchings/code_EED1E0/func_80240D58_EEDE58.s delete mode 100644 asm/nonmatchings/code_EED1E0/func_80240DA0_EEDEA0.s delete mode 100644 asm/nonmatchings/code_EEDF50/func_80241B10_EEEC10.s delete mode 100644 asm/nonmatchings/code_EF2680/func_80240D30_EF3340.s delete mode 100644 asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241B50_BE5300.s delete mode 100644 asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241610_BEE400.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80240DE0_BFE660.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80240CC0_C371F0.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80243048_C39578.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80243090_C395C0.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242420_C421D0.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802420E4_C48CC4.s delete mode 100644 asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024189C_95CA9C.s delete mode 100644 asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024072C_9698EC.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240C78_CAF9B8.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240CC0_CAFA00.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80240FE0_CB5FE0.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80240E84_CC4694.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_802417D0_CCCAE0.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240D58_CD2B88.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240DA0_CD2BD0.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80241B10_CD3940.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240D30_CD8010.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240D00_CF38D0.s delete mode 100644 asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241CB0_A17ED0.s delete mode 100644 asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241970_A1CA70.s delete mode 100644 asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802428D0_A1D9D0.s delete mode 100644 asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240C78_9897D8.s delete mode 100644 asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240CC0_989820.s delete mode 100644 asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240F68_91F4D8.s delete mode 100644 asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240FB0_91F520.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241A40_B2DEB0.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241FC8_B36B98.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_08/B5E910/func_802412D8_B5F588.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80241320_B5F5D0.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802407BC_8B082C.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240CC0_8CED30.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_80240CC0_8D21D0.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_80240CC0_8D6AC0.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802411A0_C5B8E0.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240F88_C690B8.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240FD0_C69100.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_802414E0_C6F810.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241710_C72B90.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240C78_C77958.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240CC0_C779A0.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241120_C812C0.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240A5C_7EB76C.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024233C_802BBC.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241BEC_824EAC.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_03/831B20/func_802408DC_8320DC.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_04/843030/func_8024088C_84345C.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_05/852170/func_8024174C_8538BC.s delete mode 100644 asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240D60_BAE6A0.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241194_9C6574.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241D3C_9D8D5C.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241494_9F5ED4.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241654_A03E94.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241774_A08674.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241060_DAE460.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241714_DB39D4.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242638_DBF8E8.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80241408_DDDC38.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80241450_DDDC80.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241C74_DF0B14.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240B2C_CF869C.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241A80_CF95F0.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240F58_D06688.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241210_D210A0.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240C78_D308F8.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240CC0_D30940.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240BFC_D3B1CC.s delete mode 100644 asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240CF8_954CB8.s delete mode 100644 asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240D40_954D00.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240F58_87AB38.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240FA0_87AB80.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802420B0_87BC90.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802412F8_8876B8.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80241340_887700.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241894_88A464.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_12/8891C0/func_802418DC_88A4AC.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240CA8_8936C8.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240CF0_893710.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80241268_898848.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_19/897BD0/func_802412B0_898890.s delete mode 100644 asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80242AD8_9AAEC8.s delete mode 100644 asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802417A4_9B8124.s delete mode 100644 asm/nonmatchings/world/partners/func_800EA5B8.s delete mode 100644 asm/nonmatchings/world/partners/func_800EA6A8.s delete mode 100644 asm/nonmatchings/world/partners/func_800EE994.s delete mode 100644 asm/nonmatchings/world/partners/func_800EECC4.s delete mode 100644 asm/nonmatchings/world/partners/func_800EF300.s delete mode 100644 asm/nonmatchings/world/partners/func_800EF314.s delete mode 100644 asm/nonmatchings/world/partners/func_800EF3C0.s delete mode 100644 asm/nonmatchings/world/partners/func_800EF3D4.s delete mode 100644 asm/nonmatchings/world/partners/func_800EF3E4.s delete mode 100644 asm/nonmatchings/world/partners/func_800EF414.s delete mode 100644 asm/nonmatchings/world/partners/func_800EF43C.s delete mode 100644 asm/nonmatchings/world/partners/func_800EF600.s delete mode 100644 asm/nonmatchings/world/partners/func_800EF628.s delete mode 100644 asm/nonmatchings/world/partners/is_current_partner_flying.s delete mode 100644 asm/nonmatchings/world/partners/partner_get_ride_script.s delete mode 100644 asm/nonmatchings/world/partners/reset_parter_tether_distance.s delete mode 100644 asm/nonmatchings/world/partners/set_parter_tether_distance.s create mode 100644 dead_syms.txt create mode 100644 src/common/GetItemEntityPosition.inc.c create mode 100644 src/world/common/DeadUnkNpcAIFunc14.inc.c create mode 100644 src/world/common/DeadUnkPartnerPosFuncs.inc.c create mode 100644 src/world/common/UnkAlphaFunc.inc.c create mode 100644 src/world/common/UnkNpcAIFunc14.inc.c create mode 100644 src/world/common/UnkPartnerPosFuncs.inc.c rename tools/{add_to_symbol_addrs.py => update_symbol_addrs.py} (100%) diff --git a/.vscode/settings.json b/.vscode/settings.json index 12387c68b0..3ac447cf43 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -40,6 +40,7 @@ "string_view": "c", "initializer_list": "c", "ranges": "c", - "regex": "c" + "regex": "c", + "variant": "c" }, } diff --git a/asm/nonmatchings/battle/area_kpa2/69F320/func_80219F5C_6A115C.s b/asm/nonmatchings/battle/area_kpa2/69F320/func_80219F5C_6A115C.s deleted file mode 100644 index 085a90bafd..0000000000 --- a/asm/nonmatchings/battle/area_kpa2/69F320/func_80219F5C_6A115C.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80219F5C_6A115C -/* 6A115C 80219F5C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 6A1160 80219F60 AFB20018 */ sw $s2, 0x18($sp) -/* 6A1164 80219F64 0080902D */ daddu $s2, $a0, $zero -/* 6A1168 80219F68 AFBF001C */ sw $ra, 0x1c($sp) -/* 6A116C 80219F6C AFB10014 */ sw $s1, 0x14($sp) -/* 6A1170 80219F70 AFB00010 */ sw $s0, 0x10($sp) -/* 6A1174 80219F74 8E50000C */ lw $s0, 0xc($s2) -/* 6A1178 80219F78 8E050000 */ lw $a1, ($s0) -/* 6A117C 80219F7C 0C0B1EAF */ jal get_variable -/* 6A1180 80219F80 26100004 */ addiu $s0, $s0, 4 -/* 6A1184 80219F84 0C04C3D6 */ jal get_item_entity -/* 6A1188 80219F88 0040202D */ daddu $a0, $v0, $zero -/* 6A118C 80219F8C 8E050000 */ lw $a1, ($s0) -/* 6A1190 80219F90 26100004 */ addiu $s0, $s0, 4 -/* 6A1194 80219F94 0040882D */ daddu $s1, $v0, $zero -/* 6A1198 80219F98 C6200008 */ lwc1 $f0, 8($s1) -/* 6A119C 80219F9C 4600008D */ trunc.w.s $f2, $f0 -/* 6A11A0 80219FA0 44061000 */ mfc1 $a2, $f2 -/* 6A11A4 80219FA4 0C0B2026 */ jal set_variable -/* 6A11A8 80219FA8 0240202D */ daddu $a0, $s2, $zero -/* 6A11AC 80219FAC 8E050000 */ lw $a1, ($s0) -/* 6A11B0 80219FB0 26100004 */ addiu $s0, $s0, 4 -/* 6A11B4 80219FB4 C620000C */ lwc1 $f0, 0xc($s1) -/* 6A11B8 80219FB8 4600008D */ trunc.w.s $f2, $f0 -/* 6A11BC 80219FBC 44061000 */ mfc1 $a2, $f2 -/* 6A11C0 80219FC0 0C0B2026 */ jal set_variable -/* 6A11C4 80219FC4 0240202D */ daddu $a0, $s2, $zero -/* 6A11C8 80219FC8 C6200010 */ lwc1 $f0, 0x10($s1) -/* 6A11CC 80219FCC 8E050000 */ lw $a1, ($s0) -/* 6A11D0 80219FD0 4600008D */ trunc.w.s $f2, $f0 -/* 6A11D4 80219FD4 44061000 */ mfc1 $a2, $f2 -/* 6A11D8 80219FD8 0C0B2026 */ jal set_variable -/* 6A11DC 80219FDC 0240202D */ daddu $a0, $s2, $zero -/* 6A11E0 80219FE0 8FBF001C */ lw $ra, 0x1c($sp) -/* 6A11E4 80219FE4 8FB20018 */ lw $s2, 0x18($sp) -/* 6A11E8 80219FE8 8FB10014 */ lw $s1, 0x14($sp) -/* 6A11EC 80219FEC 8FB00010 */ lw $s0, 0x10($sp) -/* 6A11F0 80219FF0 24020002 */ addiu $v0, $zero, 2 -/* 6A11F4 80219FF4 03E00008 */ jr $ra -/* 6A11F8 80219FF8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/battle/area_kpa2/69F320/func_8021B314_6A2514.s b/asm/nonmatchings/battle/area_kpa2/69F320/func_8021B314_6A2514.s deleted file mode 100644 index 0cd4396edb..0000000000 --- a/asm/nonmatchings/battle/area_kpa2/69F320/func_8021B314_6A2514.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8021B314_6A2514 -/* 6A2514 8021B314 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 6A2518 8021B318 AFB20018 */ sw $s2, 0x18($sp) -/* 6A251C 8021B31C 0080902D */ daddu $s2, $a0, $zero -/* 6A2520 8021B320 AFBF001C */ sw $ra, 0x1c($sp) -/* 6A2524 8021B324 AFB10014 */ sw $s1, 0x14($sp) -/* 6A2528 8021B328 AFB00010 */ sw $s0, 0x10($sp) -/* 6A252C 8021B32C 8E50000C */ lw $s0, 0xc($s2) -/* 6A2530 8021B330 8E050000 */ lw $a1, ($s0) -/* 6A2534 8021B334 0C0B1EAF */ jal get_variable -/* 6A2538 8021B338 26100004 */ addiu $s0, $s0, 4 -/* 6A253C 8021B33C 0C04C3D6 */ jal get_item_entity -/* 6A2540 8021B340 0040202D */ daddu $a0, $v0, $zero -/* 6A2544 8021B344 8E050000 */ lw $a1, ($s0) -/* 6A2548 8021B348 26100004 */ addiu $s0, $s0, 4 -/* 6A254C 8021B34C 0040882D */ daddu $s1, $v0, $zero -/* 6A2550 8021B350 C6200008 */ lwc1 $f0, 8($s1) -/* 6A2554 8021B354 4600008D */ trunc.w.s $f2, $f0 -/* 6A2558 8021B358 44061000 */ mfc1 $a2, $f2 -/* 6A255C 8021B35C 0C0B2026 */ jal set_variable -/* 6A2560 8021B360 0240202D */ daddu $a0, $s2, $zero -/* 6A2564 8021B364 8E050000 */ lw $a1, ($s0) -/* 6A2568 8021B368 26100004 */ addiu $s0, $s0, 4 -/* 6A256C 8021B36C C620000C */ lwc1 $f0, 0xc($s1) -/* 6A2570 8021B370 4600008D */ trunc.w.s $f2, $f0 -/* 6A2574 8021B374 44061000 */ mfc1 $a2, $f2 -/* 6A2578 8021B378 0C0B2026 */ jal set_variable -/* 6A257C 8021B37C 0240202D */ daddu $a0, $s2, $zero -/* 6A2580 8021B380 C6200010 */ lwc1 $f0, 0x10($s1) -/* 6A2584 8021B384 8E050000 */ lw $a1, ($s0) -/* 6A2588 8021B388 4600008D */ trunc.w.s $f2, $f0 -/* 6A258C 8021B38C 44061000 */ mfc1 $a2, $f2 -/* 6A2590 8021B390 0C0B2026 */ jal set_variable -/* 6A2594 8021B394 0240202D */ daddu $a0, $s2, $zero -/* 6A2598 8021B398 8FBF001C */ lw $ra, 0x1c($sp) -/* 6A259C 8021B39C 8FB20018 */ lw $s2, 0x18($sp) -/* 6A25A0 8021B3A0 8FB10014 */ lw $s1, 0x14($sp) -/* 6A25A4 8021B3A4 8FB00010 */ lw $s0, 0x10($sp) -/* 6A25A8 8021B3A8 24020002 */ addiu $v0, $zero, 2 -/* 6A25AC 8021B3AC 03E00008 */ jr $ra -/* 6A25B0 8021B3B0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/battle/area_omo/512E50/func_80218A98_513068.s b/asm/nonmatchings/battle/area_omo/512E50/func_80218A98_513068.s deleted file mode 100644 index 5218449362..0000000000 --- a/asm/nonmatchings/battle/area_omo/512E50/func_80218A98_513068.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218A98_513068 -/* 513068 80218A98 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 51306C 80218A9C AFB20018 */ sw $s2, 0x18($sp) -/* 513070 80218AA0 0080902D */ daddu $s2, $a0, $zero -/* 513074 80218AA4 AFBF001C */ sw $ra, 0x1c($sp) -/* 513078 80218AA8 AFB10014 */ sw $s1, 0x14($sp) -/* 51307C 80218AAC AFB00010 */ sw $s0, 0x10($sp) -/* 513080 80218AB0 8E50000C */ lw $s0, 0xc($s2) -/* 513084 80218AB4 8E050000 */ lw $a1, ($s0) -/* 513088 80218AB8 0C0B1EAF */ jal get_variable -/* 51308C 80218ABC 26100004 */ addiu $s0, $s0, 4 -/* 513090 80218AC0 0C04C3D6 */ jal get_item_entity -/* 513094 80218AC4 0040202D */ daddu $a0, $v0, $zero -/* 513098 80218AC8 8E050000 */ lw $a1, ($s0) -/* 51309C 80218ACC 26100004 */ addiu $s0, $s0, 4 -/* 5130A0 80218AD0 0040882D */ daddu $s1, $v0, $zero -/* 5130A4 80218AD4 C6200008 */ lwc1 $f0, 8($s1) -/* 5130A8 80218AD8 4600008D */ trunc.w.s $f2, $f0 -/* 5130AC 80218ADC 44061000 */ mfc1 $a2, $f2 -/* 5130B0 80218AE0 0C0B2026 */ jal set_variable -/* 5130B4 80218AE4 0240202D */ daddu $a0, $s2, $zero -/* 5130B8 80218AE8 8E050000 */ lw $a1, ($s0) -/* 5130BC 80218AEC 26100004 */ addiu $s0, $s0, 4 -/* 5130C0 80218AF0 C620000C */ lwc1 $f0, 0xc($s1) -/* 5130C4 80218AF4 4600008D */ trunc.w.s $f2, $f0 -/* 5130C8 80218AF8 44061000 */ mfc1 $a2, $f2 -/* 5130CC 80218AFC 0C0B2026 */ jal set_variable -/* 5130D0 80218B00 0240202D */ daddu $a0, $s2, $zero -/* 5130D4 80218B04 C6200010 */ lwc1 $f0, 0x10($s1) -/* 5130D8 80218B08 8E050000 */ lw $a1, ($s0) -/* 5130DC 80218B0C 4600008D */ trunc.w.s $f2, $f0 -/* 5130E0 80218B10 44061000 */ mfc1 $a2, $f2 -/* 5130E4 80218B14 0C0B2026 */ jal set_variable -/* 5130E8 80218B18 0240202D */ daddu $a0, $s2, $zero -/* 5130EC 80218B1C 8FBF001C */ lw $ra, 0x1c($sp) -/* 5130F0 80218B20 8FB20018 */ lw $s2, 0x18($sp) -/* 5130F4 80218B24 8FB10014 */ lw $s1, 0x14($sp) -/* 5130F8 80218B28 8FB00010 */ lw $s0, 0x10($sp) -/* 5130FC 80218B2C 24020002 */ addiu $v0, $zero, 2 -/* 513100 80218B30 03E00008 */ jr $ra -/* 513104 80218B34 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_7fd10_len_b40/check_input_status_menu.s b/asm/nonmatchings/code_7fd10_len_b40/check_input_status_menu.s deleted file mode 100644 index ac5e53dec8..0000000000 --- a/asm/nonmatchings/code_7fd10_len_b40/check_input_status_menu.s +++ /dev/null @@ -1,78 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel check_input_status_menu -/* 8073C 800E728C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 80740 800E7290 0000202D */ daddu $a0, $zero, $zero -/* 80744 800E7294 3C05F5DE */ lui $a1, 0xf5de -/* 80748 800E7298 34A50180 */ ori $a1, $a1, 0x180 -/* 8074C 800E729C AFBF0018 */ sw $ra, 0x18($sp) -/* 80750 800E72A0 AFB10014 */ sw $s1, 0x14($sp) -/* 80754 800E72A4 0C0B1EAF */ jal get_variable -/* 80758 800E72A8 AFB00010 */ sw $s0, 0x10($sp) -/* 8075C 800E72AC 3C118011 */ lui $s1, %hi(gPlayerStatus) -/* 80760 800E72B0 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) -/* 80764 800E72B4 28420060 */ slti $v0, $v0, 0x60 -/* 80768 800E72B8 10400031 */ beqz $v0, .L800E7380 -/* 8076C 800E72BC 24020021 */ addiu $v0, $zero, 0x21 -/* 80770 800E72C0 822300B4 */ lb $v1, 0xb4($s1) -/* 80774 800E72C4 10620003 */ beq $v1, $v0, .L800E72D4 -/* 80778 800E72C8 00000000 */ nop -/* 8077C 800E72CC 08039CB8 */ j .L800E72E0 -/* 80780 800E72D0 8E3000E0 */ lw $s0, 0xe0($s1) -.L800E72D4: -/* 80784 800E72D4 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 80788 800E72D8 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 8078C 800E72DC 8C500010 */ lw $s0, 0x10($v0) -.L800E72E0: -/* 80790 800E72E0 0C03A644 */ jal is_status_menu_visible -/* 80794 800E72E4 00000000 */ nop -/* 80798 800E72E8 14400013 */ bnez $v0, .L800E7338 -/* 8079C 800E72EC 00000000 */ nop -/* 807A0 800E72F0 8E2200DC */ lw $v0, 0xdc($s1) -/* 807A4 800E72F4 30422010 */ andi $v0, $v0, 0x2010 -/* 807A8 800E72F8 14400021 */ bnez $v0, .L800E7380 -/* 807AC 800E72FC 32020008 */ andi $v0, $s0, 8 -/* 807B0 800E7300 1040001F */ beqz $v0, .L800E7380 -/* 807B4 800E7304 00000000 */ nop -/* 807B8 800E7308 0C03A618 */ jal func_800E9860 -/* 807BC 800E730C 00000000 */ nop -/* 807C0 800E7310 1040001B */ beqz $v0, .L800E7380 -/* 807C4 800E7314 00000000 */ nop -/* 807C8 800E7318 0C03A5D8 */ jal open_status_menu_long -/* 807CC 800E731C 00000000 */ nop -/* 807D0 800E7320 0C04D07A */ jal is_picking_up_item -/* 807D4 800E7324 00000000 */ nop -/* 807D8 800E7328 14400015 */ bnez $v0, .L800E7380 -/* 807DC 800E732C 24040003 */ addiu $a0, $zero, 3 -/* 807E0 800E7330 08039CDE */ j .L800E7378 -/* 807E4 800E7334 00000000 */ nop -.L800E7338: -/* 807E8 800E7338 8E2200DC */ lw $v0, 0xdc($s1) -/* 807EC 800E733C 30422010 */ andi $v0, $v0, 0x2010 -/* 807F0 800E7340 1440000F */ bnez $v0, .L800E7380 -/* 807F4 800E7344 32020008 */ andi $v0, $s0, 8 -/* 807F8 800E7348 1040000D */ beqz $v0, .L800E7380 -/* 807FC 800E734C 00000000 */ nop -/* 80800 800E7350 0C03A618 */ jal func_800E9860 -/* 80804 800E7354 00000000 */ nop -/* 80808 800E7358 10400009 */ beqz $v0, .L800E7380 -/* 8080C 800E735C 00000000 */ nop -/* 80810 800E7360 0C03A5EE */ jal close_status_menu -/* 80814 800E7364 00000000 */ nop -/* 80818 800E7368 0C04D07A */ jal is_picking_up_item -/* 8081C 800E736C 00000000 */ nop -/* 80820 800E7370 14400003 */ bnez $v0, .L800E7380 -/* 80824 800E7374 24040004 */ addiu $a0, $zero, 4 -.L800E7378: -/* 80828 800E7378 0C05272D */ jal play_sound -/* 8082C 800E737C 00000000 */ nop -.L800E7380: -/* 80830 800E7380 8FBF0018 */ lw $ra, 0x18($sp) -/* 80834 800E7384 8FB10014 */ lw $s1, 0x14($sp) -/* 80838 800E7388 8FB00010 */ lw $s0, 0x10($sp) -/* 8083C 800E738C 03E00008 */ jr $ra -/* 80840 800E7390 27BD0020 */ addiu $sp, $sp, 0x20 -/* 80844 800E7394 00000000 */ nop -/* 80848 800E7398 00000000 */ nop -/* 8084C 800E739C 00000000 */ nop diff --git a/asm/nonmatchings/code_EC9D00/func_80240C78_ECA978.s b/asm/nonmatchings/code_EC9D00/func_80240C78_ECA978.s deleted file mode 100644 index 1e5a332d65..0000000000 --- a/asm/nonmatchings/code_EC9D00/func_80240C78_ECA978.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C78_ECA978 -/* ECA978 80240C78 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* ECA97C 80240C7C AFBF0018 */ sw $ra, 0x18($sp) -/* ECA980 80240C80 0C00F94D */ jal func_8003E534 -/* ECA984 80240C84 2404FFFC */ addiu $a0, $zero, -4 -/* ECA988 80240C88 3C0141F0 */ lui $at, 0x41f0 -/* ECA98C 80240C8C 44810000 */ mtc1 $at, $f0 -/* ECA990 80240C90 C442003C */ lwc1 $f2, 0x3c($v0) -/* ECA994 80240C94 46001080 */ add.s $f2, $f2, $f0 -/* ECA998 80240C98 E7A00010 */ swc1 $f0, 0x10($sp) -/* ECA99C 80240C9C 8C450038 */ lw $a1, 0x38($v0) -/* ECA9A0 80240CA0 8C470040 */ lw $a3, 0x40($v0) -/* ECA9A4 80240CA4 44061000 */ mfc1 $a2, $f2 -/* ECA9A8 80240CA8 0C01D45C */ jal func_80075170 -/* ECA9AC 80240CAC 24040002 */ addiu $a0, $zero, 2 -/* ECA9B0 80240CB0 8FBF0018 */ lw $ra, 0x18($sp) -/* ECA9B4 80240CB4 24020002 */ addiu $v0, $zero, 2 -/* ECA9B8 80240CB8 03E00008 */ jr $ra -/* ECA9BC 80240CBC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EC9D00/func_80240CC0_ECA9C0.s b/asm/nonmatchings/code_EC9D00/func_80240CC0_ECA9C0.s deleted file mode 100644 index ac54321e90..0000000000 --- a/asm/nonmatchings/code_EC9D00/func_80240CC0_ECA9C0.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CC0_ECA9C0 -/* ECA9C0 80240CC0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* ECA9C4 80240CC4 AFBF0018 */ sw $ra, 0x18($sp) -/* ECA9C8 80240CC8 0C00F94D */ jal func_8003E534 -/* ECA9CC 80240CCC 2404FFFC */ addiu $a0, $zero, -4 -/* ECA9D0 80240CD0 3C0141F0 */ lui $at, 0x41f0 -/* ECA9D4 80240CD4 44810000 */ mtc1 $at, $f0 -/* ECA9D8 80240CD8 C442003C */ lwc1 $f2, 0x3c($v0) -/* ECA9DC 80240CDC 46001080 */ add.s $f2, $f2, $f0 -/* ECA9E0 80240CE0 E7A00010 */ swc1 $f0, 0x10($sp) -/* ECA9E4 80240CE4 8C450038 */ lw $a1, 0x38($v0) -/* ECA9E8 80240CE8 8C470040 */ lw $a3, 0x40($v0) -/* ECA9EC 80240CEC 44061000 */ mfc1 $a2, $f2 -/* ECA9F0 80240CF0 0C01D45C */ jal func_80075170 -/* ECA9F4 80240CF4 24040004 */ addiu $a0, $zero, 4 -/* ECA9F8 80240CF8 8FBF0018 */ lw $ra, 0x18($sp) -/* ECA9FC 80240CFC 24020002 */ addiu $v0, $zero, 2 -/* ECAA00 80240D00 03E00008 */ jr $ra -/* ECAA04 80240D04 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_ED0310/func_80240FE0_ED0FD0.s b/asm/nonmatchings/code_ED0310/func_80240FE0_ED0FD0.s deleted file mode 100644 index c06fee21bb..0000000000 --- a/asm/nonmatchings/code_ED0310/func_80240FE0_ED0FD0.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FE0_ED0FD0 -/* ED0FD0 80240FE0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* ED0FD4 80240FE4 AFB3001C */ sw $s3, 0x1c($sp) -/* ED0FD8 80240FE8 0080982D */ daddu $s3, $a0, $zero -/* ED0FDC 80240FEC AFBF0020 */ sw $ra, 0x20($sp) -/* ED0FE0 80240FF0 AFB20018 */ sw $s2, 0x18($sp) -/* ED0FE4 80240FF4 AFB10014 */ sw $s1, 0x14($sp) -/* ED0FE8 80240FF8 AFB00010 */ sw $s0, 0x10($sp) -/* ED0FEC 80240FFC 8E720148 */ lw $s2, 0x148($s3) -/* ED0FF0 80241000 86440008 */ lh $a0, 8($s2) -/* ED0FF4 80241004 0C00F92F */ jal func_8003E4BC -/* ED0FF8 80241008 00A0802D */ daddu $s0, $a1, $zero -/* ED0FFC 8024100C 0040882D */ daddu $s1, $v0, $zero -/* ED1000 80241010 C6420080 */ lwc1 $f2, 0x80($s2) -/* ED1004 80241014 468010A0 */ cvt.s.w $f2, $f2 -/* ED1008 80241018 460010A1 */ cvt.d.s $f2, $f2 -/* ED100C 8024101C C6400084 */ lwc1 $f0, 0x84($s2) -/* ED1010 80241020 46800020 */ cvt.s.w $f0, $f0 -/* ED1014 80241024 46000021 */ cvt.d.s $f0, $f0 -/* ED1018 80241028 3C014059 */ lui $at, 0x4059 -/* ED101C 8024102C 44812800 */ mtc1 $at, $f5 -/* ED1020 80241030 44802000 */ mtc1 $zero, $f4 -/* ED1024 80241034 8E4200CC */ lw $v0, 0xcc($s2) -/* ED1028 80241038 C62C0038 */ lwc1 $f12, 0x38($s1) -/* ED102C 8024103C C62E0040 */ lwc1 $f14, 0x40($s1) -/* ED1030 80241040 46241083 */ div.d $f2, $f2, $f4 -/* ED1034 80241044 462010A0 */ cvt.s.d $f2, $f2 -/* ED1038 80241048 46240003 */ div.d $f0, $f0, $f4 -/* ED103C 8024104C 8C420020 */ lw $v0, 0x20($v0) -/* ED1040 80241050 46200020 */ cvt.s.d $f0, $f0 -/* ED1044 80241054 E622001C */ swc1 $f2, 0x1c($s1) -/* ED1048 80241058 E6200014 */ swc1 $f0, 0x14($s1) -/* ED104C 8024105C AE220028 */ sw $v0, 0x28($s1) -/* ED1050 80241060 C6000018 */ lwc1 $f0, 0x18($s0) -/* ED1054 80241064 3C028010 */ lui $v0, %hi(D_800FFC90) -/* ED1058 80241068 8C42FC90 */ lw $v0, %lo(D_800FFC90)($v0) -/* ED105C 8024106C E6200018 */ swc1 $f0, 0x18($s1) -/* ED1060 80241070 8C460028 */ lw $a2, 0x28($v0) -/* ED1064 80241074 0C00ABDC */ jal fio_validate_header_checksums -/* ED1068 80241078 8C470030 */ lw $a3, 0x30($v0) -/* ED106C 8024107C E620000C */ swc1 $f0, 0xc($s1) -/* ED1070 80241080 8E420018 */ lw $v0, 0x18($s2) -/* ED1074 80241084 AE400074 */ sw $zero, 0x74($s2) -/* ED1078 80241088 9442002A */ lhu $v0, 0x2a($v0) -/* ED107C 8024108C 30420002 */ andi $v0, $v0, 2 -/* ED1080 80241090 10400005 */ beqz $v0, .L802410A8 -/* ED1084 80241094 24020003 */ addiu $v0, $zero, 3 -/* ED1088 80241098 A622008E */ sh $v0, 0x8e($s1) -/* ED108C 8024109C 2402000D */ addiu $v0, $zero, 0xd -/* ED1090 802410A0 0809043E */ j .L802410F8 -/* ED1094 802410A4 AE620070 */ sw $v0, 0x70($s3) -.L802410A8: -/* ED1098 802410A8 24030001 */ addiu $v1, $zero, 1 -/* ED109C 802410AC 2402000E */ addiu $v0, $zero, 0xe -/* ED10A0 802410B0 A623008E */ sh $v1, 0x8e($s1) -/* ED10A4 802410B4 AE620070 */ sw $v0, 0x70($s3) -/* ED10A8 802410B8 C6200038 */ lwc1 $f0, 0x38($s1) -/* ED10AC 802410BC 4600018D */ trunc.w.s $f6, $f0 -/* ED10B0 802410C0 44023000 */ mfc1 $v0, $f6 -/* ED10B4 802410C4 00000000 */ nop -/* ED10B8 802410C8 A6420010 */ sh $v0, 0x10($s2) -/* ED10BC 802410CC C620003C */ lwc1 $f0, 0x3c($s1) -/* ED10C0 802410D0 4600018D */ trunc.w.s $f6, $f0 -/* ED10C4 802410D4 44023000 */ mfc1 $v0, $f6 -/* ED10C8 802410D8 00000000 */ nop -/* ED10CC 802410DC A6420012 */ sh $v0, 0x12($s2) -/* ED10D0 802410E0 C6200040 */ lwc1 $f0, 0x40($s1) -/* ED10D4 802410E4 A2430007 */ sb $v1, 7($s2) -/* ED10D8 802410E8 4600018D */ trunc.w.s $f6, $f0 -/* ED10DC 802410EC 44023000 */ mfc1 $v0, $f6 -/* ED10E0 802410F0 00000000 */ nop -/* ED10E4 802410F4 A6420014 */ sh $v0, 0x14($s2) -.L802410F8: -/* ED10E8 802410F8 8FBF0020 */ lw $ra, 0x20($sp) -/* ED10EC 802410FC 8FB3001C */ lw $s3, 0x1c($sp) -/* ED10F0 80241100 8FB20018 */ lw $s2, 0x18($sp) -/* ED10F4 80241104 8FB10014 */ lw $s1, 0x14($sp) -/* ED10F8 80241108 8FB00010 */ lw $s0, 0x10($sp) -/* ED10FC 8024110C 03E00008 */ jr $ra -/* ED1100 80241110 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_ED0310/func_8024162C_ED161C.s b/asm/nonmatchings/code_ED0310/func_8024162C_ED161C.s index 32cf802871..5bc0da0137 100644 --- a/asm/nonmatchings/code_ED0310/func_8024162C_ED161C.s +++ b/asm/nonmatchings/code_ED0310/func_8024162C_ED161C.s @@ -121,7 +121,7 @@ glabel L802417C4_ED17B4 glabel L802417DC_ED17CC /* ED17CC 802417DC 02A0202D */ daddu $a0, $s5, $zero /* ED17D0 802417E0 0200282D */ daddu $a1, $s0, $zero -/* ED17D4 802417E4 0C0903F8 */ jal func_80240FE0_ED0FD0 +/* ED17D4 802417E4 0C0903F8 */ jal code_ED0310_DeadUnkNpcAIFunc14 /* ED17D8 802417E8 0260302D */ daddu $a2, $s3, $zero /* ED17DC 802417EC 08090608 */ j .L80241820 /* ED17E0 802417F0 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/code_EDEA00/func_80240E84_EDF844.s b/asm/nonmatchings/code_EDEA00/func_80240E84_EDF844.s deleted file mode 100644 index e448d6c046..0000000000 --- a/asm/nonmatchings/code_EDEA00/func_80240E84_EDF844.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E84_EDF844 -/* EDF844 80240E84 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* EDF848 80240E88 AFB3001C */ sw $s3, 0x1c($sp) -/* EDF84C 80240E8C 0080982D */ daddu $s3, $a0, $zero -/* EDF850 80240E90 AFBF0020 */ sw $ra, 0x20($sp) -/* EDF854 80240E94 AFB20018 */ sw $s2, 0x18($sp) -/* EDF858 80240E98 AFB10014 */ sw $s1, 0x14($sp) -/* EDF85C 80240E9C AFB00010 */ sw $s0, 0x10($sp) -/* EDF860 80240EA0 8E720148 */ lw $s2, 0x148($s3) -/* EDF864 80240EA4 86440008 */ lh $a0, 8($s2) -/* EDF868 80240EA8 0C00F92F */ jal func_8003E4BC -/* EDF86C 80240EAC 00A0802D */ daddu $s0, $a1, $zero -/* EDF870 80240EB0 0040882D */ daddu $s1, $v0, $zero -/* EDF874 80240EB4 C6420080 */ lwc1 $f2, 0x80($s2) -/* EDF878 80240EB8 468010A0 */ cvt.s.w $f2, $f2 -/* EDF87C 80240EBC 460010A1 */ cvt.d.s $f2, $f2 -/* EDF880 80240EC0 C6400084 */ lwc1 $f0, 0x84($s2) -/* EDF884 80240EC4 46800020 */ cvt.s.w $f0, $f0 -/* EDF888 80240EC8 46000021 */ cvt.d.s $f0, $f0 -/* EDF88C 80240ECC 3C014059 */ lui $at, 0x4059 -/* EDF890 80240ED0 44812800 */ mtc1 $at, $f5 -/* EDF894 80240ED4 44802000 */ mtc1 $zero, $f4 -/* EDF898 80240ED8 8E4200CC */ lw $v0, 0xcc($s2) -/* EDF89C 80240EDC C62C0038 */ lwc1 $f12, 0x38($s1) -/* EDF8A0 80240EE0 C62E0040 */ lwc1 $f14, 0x40($s1) -/* EDF8A4 80240EE4 46241083 */ div.d $f2, $f2, $f4 -/* EDF8A8 80240EE8 462010A0 */ cvt.s.d $f2, $f2 -/* EDF8AC 80240EEC 46240003 */ div.d $f0, $f0, $f4 -/* EDF8B0 80240EF0 8C420020 */ lw $v0, 0x20($v0) -/* EDF8B4 80240EF4 46200020 */ cvt.s.d $f0, $f0 -/* EDF8B8 80240EF8 E622001C */ swc1 $f2, 0x1c($s1) -/* EDF8BC 80240EFC E6200014 */ swc1 $f0, 0x14($s1) -/* EDF8C0 80240F00 AE220028 */ sw $v0, 0x28($s1) -/* EDF8C4 80240F04 C6000018 */ lwc1 $f0, 0x18($s0) -/* EDF8C8 80240F08 3C028010 */ lui $v0, %hi(D_800FFC90) -/* EDF8CC 80240F0C 8C42FC90 */ lw $v0, %lo(D_800FFC90)($v0) -/* EDF8D0 80240F10 E6200018 */ swc1 $f0, 0x18($s1) -/* EDF8D4 80240F14 8C460028 */ lw $a2, 0x28($v0) -/* EDF8D8 80240F18 0C00ABDC */ jal fio_validate_header_checksums -/* EDF8DC 80240F1C 8C470030 */ lw $a3, 0x30($v0) -/* EDF8E0 80240F20 E620000C */ swc1 $f0, 0xc($s1) -/* EDF8E4 80240F24 8E420018 */ lw $v0, 0x18($s2) -/* EDF8E8 80240F28 AE400074 */ sw $zero, 0x74($s2) -/* EDF8EC 80240F2C 9442002A */ lhu $v0, 0x2a($v0) -/* EDF8F0 80240F30 30420002 */ andi $v0, $v0, 2 -/* EDF8F4 80240F34 10400005 */ beqz $v0, .L80240F4C -/* EDF8F8 80240F38 24020003 */ addiu $v0, $zero, 3 -/* EDF8FC 80240F3C A622008E */ sh $v0, 0x8e($s1) -/* EDF900 80240F40 2402000D */ addiu $v0, $zero, 0xd -/* EDF904 80240F44 080903E7 */ j .L80240F9C -/* EDF908 80240F48 AE620070 */ sw $v0, 0x70($s3) -.L80240F4C: -/* EDF90C 80240F4C 24030001 */ addiu $v1, $zero, 1 -/* EDF910 80240F50 2402000E */ addiu $v0, $zero, 0xe -/* EDF914 80240F54 A623008E */ sh $v1, 0x8e($s1) -/* EDF918 80240F58 AE620070 */ sw $v0, 0x70($s3) -/* EDF91C 80240F5C C6200038 */ lwc1 $f0, 0x38($s1) -/* EDF920 80240F60 4600018D */ trunc.w.s $f6, $f0 -/* EDF924 80240F64 44023000 */ mfc1 $v0, $f6 -/* EDF928 80240F68 00000000 */ nop -/* EDF92C 80240F6C A6420010 */ sh $v0, 0x10($s2) -/* EDF930 80240F70 C620003C */ lwc1 $f0, 0x3c($s1) -/* EDF934 80240F74 4600018D */ trunc.w.s $f6, $f0 -/* EDF938 80240F78 44023000 */ mfc1 $v0, $f6 -/* EDF93C 80240F7C 00000000 */ nop -/* EDF940 80240F80 A6420012 */ sh $v0, 0x12($s2) -/* EDF944 80240F84 C6200040 */ lwc1 $f0, 0x40($s1) -/* EDF948 80240F88 A2430007 */ sb $v1, 7($s2) -/* EDF94C 80240F8C 4600018D */ trunc.w.s $f6, $f0 -/* EDF950 80240F90 44023000 */ mfc1 $v0, $f6 -/* EDF954 80240F94 00000000 */ nop -/* EDF958 80240F98 A6420014 */ sh $v0, 0x14($s2) -.L80240F9C: -/* EDF95C 80240F9C 8FBF0020 */ lw $ra, 0x20($sp) -/* EDF960 80240FA0 8FB3001C */ lw $s3, 0x1c($sp) -/* EDF964 80240FA4 8FB20018 */ lw $s2, 0x18($sp) -/* EDF968 80240FA8 8FB10014 */ lw $s1, 0x14($sp) -/* EDF96C 80240FAC 8FB00010 */ lw $s0, 0x10($sp) -/* EDF970 80240FB0 03E00008 */ jr $ra -/* EDF974 80240FB4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_EDEA00/func_802414D0_EDFE90.s b/asm/nonmatchings/code_EDEA00/func_802414D0_EDFE90.s index a39ec1284c..9a6c267635 100644 --- a/asm/nonmatchings/code_EDEA00/func_802414D0_EDFE90.s +++ b/asm/nonmatchings/code_EDEA00/func_802414D0_EDFE90.s @@ -121,7 +121,7 @@ glabel L80241668_EE0028 glabel L80241680_EE0040 /* EE0040 80241680 02A0202D */ daddu $a0, $s5, $zero /* EE0044 80241684 0200282D */ daddu $a1, $s0, $zero -/* EE0048 80241688 0C0903A1 */ jal func_80240E84_EDF844 +/* EE0048 80241688 0C0903A1 */ jal code_EDEA00_DeadUnkNpcAIFunc14 /* EE004C 8024168C 0260302D */ daddu $a2, $s3, $zero /* EE0050 80241690 080905B1 */ j .L802416C4 /* EE0054 80241694 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/code_EDEA00/func_80241DE4_EE07A4.s b/asm/nonmatchings/code_EDEA00/func_80241DE4_EE07A4.s index ef64bc1ca2..b3c802156a 100644 --- a/asm/nonmatchings/code_EDEA00/func_80241DE4_EE07A4.s +++ b/asm/nonmatchings/code_EDEA00/func_80241DE4_EE07A4.s @@ -166,7 +166,7 @@ glabel func_80241DE4_EE07A4 .L8024203C: /* EE09FC 8024203C 0280202D */ daddu $a0, $s4, $zero /* EE0A00 80242040 02C0282D */ daddu $a1, $s6, $zero -/* EE0A04 80242044 0C0903A1 */ jal func_80240E84_EDF844 +/* EE0A04 80242044 0C0903A1 */ jal code_EDEA00_DeadUnkNpcAIFunc14 /* EE0A08 80242048 02A0302D */ daddu $a2, $s5, $zero .L8024204C: /* EE0A0C 8024204C 0280202D */ daddu $a0, $s4, $zero diff --git a/asm/nonmatchings/code_EE70C0/func_802417D0_EE7D80.s b/asm/nonmatchings/code_EE70C0/func_802417D0_EE7D80.s deleted file mode 100644 index 1108124ffa..0000000000 --- a/asm/nonmatchings/code_EE70C0/func_802417D0_EE7D80.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802417D0_EE7D80 -/* EE7D80 802417D0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* EE7D84 802417D4 AFB3001C */ sw $s3, 0x1c($sp) -/* EE7D88 802417D8 0080982D */ daddu $s3, $a0, $zero -/* EE7D8C 802417DC AFBF0020 */ sw $ra, 0x20($sp) -/* EE7D90 802417E0 AFB20018 */ sw $s2, 0x18($sp) -/* EE7D94 802417E4 AFB10014 */ sw $s1, 0x14($sp) -/* EE7D98 802417E8 AFB00010 */ sw $s0, 0x10($sp) -/* EE7D9C 802417EC 8E720148 */ lw $s2, 0x148($s3) -/* EE7DA0 802417F0 86440008 */ lh $a0, 8($s2) -/* EE7DA4 802417F4 0C00F92F */ jal func_8003E4BC -/* EE7DA8 802417F8 00A0802D */ daddu $s0, $a1, $zero -/* EE7DAC 802417FC 0040882D */ daddu $s1, $v0, $zero -/* EE7DB0 80241800 C6420080 */ lwc1 $f2, 0x80($s2) -/* EE7DB4 80241804 468010A0 */ cvt.s.w $f2, $f2 -/* EE7DB8 80241808 460010A1 */ cvt.d.s $f2, $f2 -/* EE7DBC 8024180C C6400084 */ lwc1 $f0, 0x84($s2) -/* EE7DC0 80241810 46800020 */ cvt.s.w $f0, $f0 -/* EE7DC4 80241814 46000021 */ cvt.d.s $f0, $f0 -/* EE7DC8 80241818 3C014059 */ lui $at, 0x4059 -/* EE7DCC 8024181C 44812800 */ mtc1 $at, $f5 -/* EE7DD0 80241820 44802000 */ mtc1 $zero, $f4 -/* EE7DD4 80241824 8E4200CC */ lw $v0, 0xcc($s2) -/* EE7DD8 80241828 C62C0038 */ lwc1 $f12, 0x38($s1) -/* EE7DDC 8024182C C62E0040 */ lwc1 $f14, 0x40($s1) -/* EE7DE0 80241830 46241083 */ div.d $f2, $f2, $f4 -/* EE7DE4 80241834 462010A0 */ cvt.s.d $f2, $f2 -/* EE7DE8 80241838 46240003 */ div.d $f0, $f0, $f4 -/* EE7DEC 8024183C 8C420020 */ lw $v0, 0x20($v0) -/* EE7DF0 80241840 46200020 */ cvt.s.d $f0, $f0 -/* EE7DF4 80241844 E622001C */ swc1 $f2, 0x1c($s1) -/* EE7DF8 80241848 E6200014 */ swc1 $f0, 0x14($s1) -/* EE7DFC 8024184C AE220028 */ sw $v0, 0x28($s1) -/* EE7E00 80241850 C6000018 */ lwc1 $f0, 0x18($s0) -/* EE7E04 80241854 3C028010 */ lui $v0, %hi(D_800FFC90) -/* EE7E08 80241858 8C42FC90 */ lw $v0, %lo(D_800FFC90)($v0) -/* EE7E0C 8024185C E6200018 */ swc1 $f0, 0x18($s1) -/* EE7E10 80241860 8C460028 */ lw $a2, 0x28($v0) -/* EE7E14 80241864 0C00ABDC */ jal fio_validate_header_checksums -/* EE7E18 80241868 8C470030 */ lw $a3, 0x30($v0) -/* EE7E1C 8024186C E620000C */ swc1 $f0, 0xc($s1) -/* EE7E20 80241870 8E420018 */ lw $v0, 0x18($s2) -/* EE7E24 80241874 AE400074 */ sw $zero, 0x74($s2) -/* EE7E28 80241878 9442002A */ lhu $v0, 0x2a($v0) -/* EE7E2C 8024187C 30420002 */ andi $v0, $v0, 2 -/* EE7E30 80241880 10400005 */ beqz $v0, .L80241898 -/* EE7E34 80241884 24020003 */ addiu $v0, $zero, 3 -/* EE7E38 80241888 A622008E */ sh $v0, 0x8e($s1) -/* EE7E3C 8024188C 2402000D */ addiu $v0, $zero, 0xd -/* EE7E40 80241890 0809063A */ j .L802418E8 -/* EE7E44 80241894 AE620070 */ sw $v0, 0x70($s3) -.L80241898: -/* EE7E48 80241898 24030001 */ addiu $v1, $zero, 1 -/* EE7E4C 8024189C 2402000E */ addiu $v0, $zero, 0xe -/* EE7E50 802418A0 A623008E */ sh $v1, 0x8e($s1) -/* EE7E54 802418A4 AE620070 */ sw $v0, 0x70($s3) -/* EE7E58 802418A8 C6200038 */ lwc1 $f0, 0x38($s1) -/* EE7E5C 802418AC 4600018D */ trunc.w.s $f6, $f0 -/* EE7E60 802418B0 44023000 */ mfc1 $v0, $f6 -/* EE7E64 802418B4 00000000 */ nop -/* EE7E68 802418B8 A6420010 */ sh $v0, 0x10($s2) -/* EE7E6C 802418BC C620003C */ lwc1 $f0, 0x3c($s1) -/* EE7E70 802418C0 4600018D */ trunc.w.s $f6, $f0 -/* EE7E74 802418C4 44023000 */ mfc1 $v0, $f6 -/* EE7E78 802418C8 00000000 */ nop -/* EE7E7C 802418CC A6420012 */ sh $v0, 0x12($s2) -/* EE7E80 802418D0 C6200040 */ lwc1 $f0, 0x40($s1) -/* EE7E84 802418D4 A2430007 */ sb $v1, 7($s2) -/* EE7E88 802418D8 4600018D */ trunc.w.s $f6, $f0 -/* EE7E8C 802418DC 44023000 */ mfc1 $v0, $f6 -/* EE7E90 802418E0 00000000 */ nop -/* EE7E94 802418E4 A6420014 */ sh $v0, 0x14($s2) -.L802418E8: -/* EE7E98 802418E8 8FBF0020 */ lw $ra, 0x20($sp) -/* EE7E9C 802418EC 8FB3001C */ lw $s3, 0x1c($sp) -/* EE7EA0 802418F0 8FB20018 */ lw $s2, 0x18($sp) -/* EE7EA4 802418F4 8FB10014 */ lw $s1, 0x14($sp) -/* EE7EA8 802418F8 8FB00010 */ lw $s0, 0x10($sp) -/* EE7EAC 802418FC 03E00008 */ jr $ra -/* EE7EB0 80241900 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_EE70C0/func_80241E1C_EE83CC.s b/asm/nonmatchings/code_EE70C0/func_80241E1C_EE83CC.s index ec478cba43..2f5d4cbfc0 100644 --- a/asm/nonmatchings/code_EE70C0/func_80241E1C_EE83CC.s +++ b/asm/nonmatchings/code_EE70C0/func_80241E1C_EE83CC.s @@ -121,7 +121,7 @@ glabel L80241FB4_EE8564 glabel L80241FCC_EE857C /* EE857C 80241FCC 02A0202D */ daddu $a0, $s5, $zero /* EE8580 80241FD0 0200282D */ daddu $a1, $s0, $zero -/* EE8584 80241FD4 0C0905F4 */ jal func_802417D0_EE7D80 +/* EE8584 80241FD4 0C0905F4 */ jal code_EE70C0_DeadUnkNpcAIFunc14 /* EE8588 80241FD8 0260302D */ daddu $a2, $s3, $zero /* EE858C 80241FDC 08090804 */ j .L80242010 /* EE8590 80241FE0 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/code_EED1E0/func_80240D58_EEDE58.s b/asm/nonmatchings/code_EED1E0/func_80240D58_EEDE58.s deleted file mode 100644 index 8706f36bdc..0000000000 --- a/asm/nonmatchings/code_EED1E0/func_80240D58_EEDE58.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D58_EEDE58 -/* EEDE58 80240D58 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* EEDE5C 80240D5C AFBF0018 */ sw $ra, 0x18($sp) -/* EEDE60 80240D60 0C00F94D */ jal func_8003E534 -/* EEDE64 80240D64 2404FFFC */ addiu $a0, $zero, -4 -/* EEDE68 80240D68 3C0141F0 */ lui $at, 0x41f0 -/* EEDE6C 80240D6C 44810000 */ mtc1 $at, $f0 -/* EEDE70 80240D70 C442003C */ lwc1 $f2, 0x3c($v0) -/* EEDE74 80240D74 46001080 */ add.s $f2, $f2, $f0 -/* EEDE78 80240D78 E7A00010 */ swc1 $f0, 0x10($sp) -/* EEDE7C 80240D7C 8C450038 */ lw $a1, 0x38($v0) -/* EEDE80 80240D80 8C470040 */ lw $a3, 0x40($v0) -/* EEDE84 80240D84 44061000 */ mfc1 $a2, $f2 -/* EEDE88 80240D88 0C01D45C */ jal func_80075170 -/* EEDE8C 80240D8C 24040002 */ addiu $a0, $zero, 2 -/* EEDE90 80240D90 8FBF0018 */ lw $ra, 0x18($sp) -/* EEDE94 80240D94 24020002 */ addiu $v0, $zero, 2 -/* EEDE98 80240D98 03E00008 */ jr $ra -/* EEDE9C 80240D9C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EED1E0/func_80240DA0_EEDEA0.s b/asm/nonmatchings/code_EED1E0/func_80240DA0_EEDEA0.s deleted file mode 100644 index 3f436abba2..0000000000 --- a/asm/nonmatchings/code_EED1E0/func_80240DA0_EEDEA0.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DA0_EEDEA0 -/* EEDEA0 80240DA0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* EEDEA4 80240DA4 AFBF0018 */ sw $ra, 0x18($sp) -/* EEDEA8 80240DA8 0C00F94D */ jal func_8003E534 -/* EEDEAC 80240DAC 2404FFFC */ addiu $a0, $zero, -4 -/* EEDEB0 80240DB0 3C0141F0 */ lui $at, 0x41f0 -/* EEDEB4 80240DB4 44810000 */ mtc1 $at, $f0 -/* EEDEB8 80240DB8 C442003C */ lwc1 $f2, 0x3c($v0) -/* EEDEBC 80240DBC 46001080 */ add.s $f2, $f2, $f0 -/* EEDEC0 80240DC0 E7A00010 */ swc1 $f0, 0x10($sp) -/* EEDEC4 80240DC4 8C450038 */ lw $a1, 0x38($v0) -/* EEDEC8 80240DC8 8C470040 */ lw $a3, 0x40($v0) -/* EEDECC 80240DCC 44061000 */ mfc1 $a2, $f2 -/* EEDED0 80240DD0 0C01D45C */ jal func_80075170 -/* EEDED4 80240DD4 24040004 */ addiu $a0, $zero, 4 -/* EEDED8 80240DD8 8FBF0018 */ lw $ra, 0x18($sp) -/* EEDEDC 80240DDC 24020002 */ addiu $v0, $zero, 2 -/* EEDEE0 80240DE0 03E00008 */ jr $ra -/* EEDEE4 80240DE4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EEDF50/func_80241B10_EEEC10.s b/asm/nonmatchings/code_EEDF50/func_80241B10_EEEC10.s deleted file mode 100644 index 6e0b1aaad6..0000000000 --- a/asm/nonmatchings/code_EEDF50/func_80241B10_EEEC10.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B10_EEEC10 -/* EEEC10 80241B10 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* EEEC14 80241B14 AFB3001C */ sw $s3, 0x1c($sp) -/* EEEC18 80241B18 0080982D */ daddu $s3, $a0, $zero -/* EEEC1C 80241B1C AFBF0020 */ sw $ra, 0x20($sp) -/* EEEC20 80241B20 AFB20018 */ sw $s2, 0x18($sp) -/* EEEC24 80241B24 AFB10014 */ sw $s1, 0x14($sp) -/* EEEC28 80241B28 AFB00010 */ sw $s0, 0x10($sp) -/* EEEC2C 80241B2C 8E720148 */ lw $s2, 0x148($s3) -/* EEEC30 80241B30 86440008 */ lh $a0, 8($s2) -/* EEEC34 80241B34 0C00F92F */ jal func_8003E4BC -/* EEEC38 80241B38 00A0802D */ daddu $s0, $a1, $zero -/* EEEC3C 80241B3C 0040882D */ daddu $s1, $v0, $zero -/* EEEC40 80241B40 C6420080 */ lwc1 $f2, 0x80($s2) -/* EEEC44 80241B44 468010A0 */ cvt.s.w $f2, $f2 -/* EEEC48 80241B48 460010A1 */ cvt.d.s $f2, $f2 -/* EEEC4C 80241B4C C6400084 */ lwc1 $f0, 0x84($s2) -/* EEEC50 80241B50 46800020 */ cvt.s.w $f0, $f0 -/* EEEC54 80241B54 46000021 */ cvt.d.s $f0, $f0 -/* EEEC58 80241B58 3C014059 */ lui $at, 0x4059 -/* EEEC5C 80241B5C 44812800 */ mtc1 $at, $f5 -/* EEEC60 80241B60 44802000 */ mtc1 $zero, $f4 -/* EEEC64 80241B64 8E4200CC */ lw $v0, 0xcc($s2) -/* EEEC68 80241B68 C62C0038 */ lwc1 $f12, 0x38($s1) -/* EEEC6C 80241B6C C62E0040 */ lwc1 $f14, 0x40($s1) -/* EEEC70 80241B70 46241083 */ div.d $f2, $f2, $f4 -/* EEEC74 80241B74 462010A0 */ cvt.s.d $f2, $f2 -/* EEEC78 80241B78 46240003 */ div.d $f0, $f0, $f4 -/* EEEC7C 80241B7C 8C420020 */ lw $v0, 0x20($v0) -/* EEEC80 80241B80 46200020 */ cvt.s.d $f0, $f0 -/* EEEC84 80241B84 E622001C */ swc1 $f2, 0x1c($s1) -/* EEEC88 80241B88 E6200014 */ swc1 $f0, 0x14($s1) -/* EEEC8C 80241B8C AE220028 */ sw $v0, 0x28($s1) -/* EEEC90 80241B90 C6000018 */ lwc1 $f0, 0x18($s0) -/* EEEC94 80241B94 3C028010 */ lui $v0, %hi(D_800FFC90) -/* EEEC98 80241B98 8C42FC90 */ lw $v0, %lo(D_800FFC90)($v0) -/* EEEC9C 80241B9C E6200018 */ swc1 $f0, 0x18($s1) -/* EEECA0 80241BA0 8C460028 */ lw $a2, 0x28($v0) -/* EEECA4 80241BA4 0C00ABDC */ jal fio_validate_header_checksums -/* EEECA8 80241BA8 8C470030 */ lw $a3, 0x30($v0) -/* EEECAC 80241BAC E620000C */ swc1 $f0, 0xc($s1) -/* EEECB0 80241BB0 8E420018 */ lw $v0, 0x18($s2) -/* EEECB4 80241BB4 AE400074 */ sw $zero, 0x74($s2) -/* EEECB8 80241BB8 9442002A */ lhu $v0, 0x2a($v0) -/* EEECBC 80241BBC 30420002 */ andi $v0, $v0, 2 -/* EEECC0 80241BC0 10400005 */ beqz $v0, .L80241BD8 -/* EEECC4 80241BC4 24020003 */ addiu $v0, $zero, 3 -/* EEECC8 80241BC8 A622008E */ sh $v0, 0x8e($s1) -/* EEECCC 80241BCC 2402000D */ addiu $v0, $zero, 0xd -/* EEECD0 80241BD0 0809070A */ j .L80241C28 -/* EEECD4 80241BD4 AE620070 */ sw $v0, 0x70($s3) -.L80241BD8: -/* EEECD8 80241BD8 24030001 */ addiu $v1, $zero, 1 -/* EEECDC 80241BDC 2402000E */ addiu $v0, $zero, 0xe -/* EEECE0 80241BE0 A623008E */ sh $v1, 0x8e($s1) -/* EEECE4 80241BE4 AE620070 */ sw $v0, 0x70($s3) -/* EEECE8 80241BE8 C6200038 */ lwc1 $f0, 0x38($s1) -/* EEECEC 80241BEC 4600018D */ trunc.w.s $f6, $f0 -/* EEECF0 80241BF0 44023000 */ mfc1 $v0, $f6 -/* EEECF4 80241BF4 00000000 */ nop -/* EEECF8 80241BF8 A6420010 */ sh $v0, 0x10($s2) -/* EEECFC 80241BFC C620003C */ lwc1 $f0, 0x3c($s1) -/* EEED00 80241C00 4600018D */ trunc.w.s $f6, $f0 -/* EEED04 80241C04 44023000 */ mfc1 $v0, $f6 -/* EEED08 80241C08 00000000 */ nop -/* EEED0C 80241C0C A6420012 */ sh $v0, 0x12($s2) -/* EEED10 80241C10 C6200040 */ lwc1 $f0, 0x40($s1) -/* EEED14 80241C14 A2430007 */ sb $v1, 7($s2) -/* EEED18 80241C18 4600018D */ trunc.w.s $f6, $f0 -/* EEED1C 80241C1C 44023000 */ mfc1 $v0, $f6 -/* EEED20 80241C20 00000000 */ nop -/* EEED24 80241C24 A6420014 */ sh $v0, 0x14($s2) -.L80241C28: -/* EEED28 80241C28 8FBF0020 */ lw $ra, 0x20($sp) -/* EEED2C 80241C2C 8FB3001C */ lw $s3, 0x1c($sp) -/* EEED30 80241C30 8FB20018 */ lw $s2, 0x18($sp) -/* EEED34 80241C34 8FB10014 */ lw $s1, 0x14($sp) -/* EEED38 80241C38 8FB00010 */ lw $s0, 0x10($sp) -/* EEED3C 80241C3C 03E00008 */ jr $ra -/* EEED40 80241C40 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_EEDF50/func_8024215C_EEF25C.s b/asm/nonmatchings/code_EEDF50/func_8024215C_EEF25C.s index 88b3ba12b1..e324081b60 100644 --- a/asm/nonmatchings/code_EEDF50/func_8024215C_EEF25C.s +++ b/asm/nonmatchings/code_EEDF50/func_8024215C_EEF25C.s @@ -121,7 +121,7 @@ glabel L802422F4_EEF3F4 glabel L8024230C_EEF40C /* EEF40C 8024230C 02A0202D */ daddu $a0, $s5, $zero /* EEF410 80242310 0200282D */ daddu $a1, $s0, $zero -/* EEF414 80242314 0C0906C4 */ jal func_80241B10_EEEC10 +/* EEF414 80242314 0C0906C4 */ jal code_EEDF50_DeadUnkNpcAIFunc14 /* EEF418 80242318 0260302D */ daddu $a2, $s3, $zero /* EEF41C 8024231C 080908D4 */ j .L80242350 /* EEF420 80242320 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/code_EF2680/func_80240D30_EF3340.s b/asm/nonmatchings/code_EF2680/func_80240D30_EF3340.s deleted file mode 100644 index 7c96b74314..0000000000 --- a/asm/nonmatchings/code_EF2680/func_80240D30_EF3340.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D30_EF3340 -/* EF3340 80240D30 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* EF3344 80240D34 AFB3001C */ sw $s3, 0x1c($sp) -/* EF3348 80240D38 0080982D */ daddu $s3, $a0, $zero -/* EF334C 80240D3C AFBF0020 */ sw $ra, 0x20($sp) -/* EF3350 80240D40 AFB20018 */ sw $s2, 0x18($sp) -/* EF3354 80240D44 AFB10014 */ sw $s1, 0x14($sp) -/* EF3358 80240D48 AFB00010 */ sw $s0, 0x10($sp) -/* EF335C 80240D4C 8E720148 */ lw $s2, 0x148($s3) -/* EF3360 80240D50 86440008 */ lh $a0, 8($s2) -/* EF3364 80240D54 0C00F92F */ jal func_8003E4BC -/* EF3368 80240D58 00A0802D */ daddu $s0, $a1, $zero -/* EF336C 80240D5C 0040882D */ daddu $s1, $v0, $zero -/* EF3370 80240D60 C6420080 */ lwc1 $f2, 0x80($s2) -/* EF3374 80240D64 468010A0 */ cvt.s.w $f2, $f2 -/* EF3378 80240D68 460010A1 */ cvt.d.s $f2, $f2 -/* EF337C 80240D6C C6400084 */ lwc1 $f0, 0x84($s2) -/* EF3380 80240D70 46800020 */ cvt.s.w $f0, $f0 -/* EF3384 80240D74 46000021 */ cvt.d.s $f0, $f0 -/* EF3388 80240D78 3C014059 */ lui $at, 0x4059 -/* EF338C 80240D7C 44812800 */ mtc1 $at, $f5 -/* EF3390 80240D80 44802000 */ mtc1 $zero, $f4 -/* EF3394 80240D84 8E4200CC */ lw $v0, 0xcc($s2) -/* EF3398 80240D88 C62C0038 */ lwc1 $f12, 0x38($s1) -/* EF339C 80240D8C C62E0040 */ lwc1 $f14, 0x40($s1) -/* EF33A0 80240D90 46241083 */ div.d $f2, $f2, $f4 -/* EF33A4 80240D94 462010A0 */ cvt.s.d $f2, $f2 -/* EF33A8 80240D98 46240003 */ div.d $f0, $f0, $f4 -/* EF33AC 80240D9C 8C420020 */ lw $v0, 0x20($v0) -/* EF33B0 80240DA0 46200020 */ cvt.s.d $f0, $f0 -/* EF33B4 80240DA4 E622001C */ swc1 $f2, 0x1c($s1) -/* EF33B8 80240DA8 E6200014 */ swc1 $f0, 0x14($s1) -/* EF33BC 80240DAC AE220028 */ sw $v0, 0x28($s1) -/* EF33C0 80240DB0 C6000018 */ lwc1 $f0, 0x18($s0) -/* EF33C4 80240DB4 3C028010 */ lui $v0, %hi(D_800FFC90) -/* EF33C8 80240DB8 8C42FC90 */ lw $v0, %lo(D_800FFC90)($v0) -/* EF33CC 80240DBC E6200018 */ swc1 $f0, 0x18($s1) -/* EF33D0 80240DC0 8C460028 */ lw $a2, 0x28($v0) -/* EF33D4 80240DC4 0C00ABDC */ jal fio_validate_header_checksums -/* EF33D8 80240DC8 8C470030 */ lw $a3, 0x30($v0) -/* EF33DC 80240DCC E620000C */ swc1 $f0, 0xc($s1) -/* EF33E0 80240DD0 8E420018 */ lw $v0, 0x18($s2) -/* EF33E4 80240DD4 AE400074 */ sw $zero, 0x74($s2) -/* EF33E8 80240DD8 9442002A */ lhu $v0, 0x2a($v0) -/* EF33EC 80240DDC 30420002 */ andi $v0, $v0, 2 -/* EF33F0 80240DE0 10400005 */ beqz $v0, .L80240DF8 -/* EF33F4 80240DE4 24020003 */ addiu $v0, $zero, 3 -/* EF33F8 80240DE8 A622008E */ sh $v0, 0x8e($s1) -/* EF33FC 80240DEC 2402000D */ addiu $v0, $zero, 0xd -/* EF3400 80240DF0 08090392 */ j .L80240E48 -/* EF3404 80240DF4 AE620070 */ sw $v0, 0x70($s3) -.L80240DF8: -/* EF3408 80240DF8 24030001 */ addiu $v1, $zero, 1 -/* EF340C 80240DFC 2402000E */ addiu $v0, $zero, 0xe -/* EF3410 80240E00 A623008E */ sh $v1, 0x8e($s1) -/* EF3414 80240E04 AE620070 */ sw $v0, 0x70($s3) -/* EF3418 80240E08 C6200038 */ lwc1 $f0, 0x38($s1) -/* EF341C 80240E0C 4600018D */ trunc.w.s $f6, $f0 -/* EF3420 80240E10 44023000 */ mfc1 $v0, $f6 -/* EF3424 80240E14 00000000 */ nop -/* EF3428 80240E18 A6420010 */ sh $v0, 0x10($s2) -/* EF342C 80240E1C C620003C */ lwc1 $f0, 0x3c($s1) -/* EF3430 80240E20 4600018D */ trunc.w.s $f6, $f0 -/* EF3434 80240E24 44023000 */ mfc1 $v0, $f6 -/* EF3438 80240E28 00000000 */ nop -/* EF343C 80240E2C A6420012 */ sh $v0, 0x12($s2) -/* EF3440 80240E30 C6200040 */ lwc1 $f0, 0x40($s1) -/* EF3444 80240E34 A2430007 */ sb $v1, 7($s2) -/* EF3448 80240E38 4600018D */ trunc.w.s $f6, $f0 -/* EF344C 80240E3C 44023000 */ mfc1 $v0, $f6 -/* EF3450 80240E40 00000000 */ nop -/* EF3454 80240E44 A6420014 */ sh $v0, 0x14($s2) -.L80240E48: -/* EF3458 80240E48 8FBF0020 */ lw $ra, 0x20($sp) -/* EF345C 80240E4C 8FB3001C */ lw $s3, 0x1c($sp) -/* EF3460 80240E50 8FB20018 */ lw $s2, 0x18($sp) -/* EF3464 80240E54 8FB10014 */ lw $s1, 0x14($sp) -/* EF3468 80240E58 8FB00010 */ lw $s0, 0x10($sp) -/* EF346C 80240E5C 03E00008 */ jr $ra -/* EF3470 80240E60 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_EF2680/func_8024137C_EF398C.s b/asm/nonmatchings/code_EF2680/func_8024137C_EF398C.s index 7a6b9c5919..79889b7520 100644 --- a/asm/nonmatchings/code_EF2680/func_8024137C_EF398C.s +++ b/asm/nonmatchings/code_EF2680/func_8024137C_EF398C.s @@ -121,7 +121,7 @@ glabel L80241514_EF3B24 glabel L8024152C_EF3B3C /* EF3B3C 8024152C 02A0202D */ daddu $a0, $s5, $zero /* EF3B40 80241530 0200282D */ daddu $a1, $s0, $zero -/* EF3B44 80241534 0C09034C */ jal func_80240D30_EF3340 +/* EF3B44 80241534 0C09034C */ jal code_EF2680_DeadUnkNpcAIFunc14 /* EF3B48 80241538 0260302D */ daddu $a2, $s3, $zero /* EF3B4C 8024153C 0809055C */ j .L80241570 /* EF3B50 80241540 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/code_EF2680/func_80241C90_EF42A0.s b/asm/nonmatchings/code_EF2680/func_80241C90_EF42A0.s index 8e7033556b..eba2648022 100644 --- a/asm/nonmatchings/code_EF2680/func_80241C90_EF42A0.s +++ b/asm/nonmatchings/code_EF2680/func_80241C90_EF42A0.s @@ -166,7 +166,7 @@ glabel func_80241C90_EF42A0 .L80241EE8: /* EF44F8 80241EE8 0280202D */ daddu $a0, $s4, $zero /* EF44FC 80241EEC 02C0282D */ daddu $a1, $s6, $zero -/* EF4500 80241EF0 0C09034C */ jal func_80240D30_EF3340 +/* EF4500 80241EF0 0C09034C */ jal code_EF2680_DeadUnkNpcAIFunc14 /* EF4504 80241EF4 02A0302D */ daddu $a2, $s5, $zero .L80241EF8: /* EF4508 80241EF8 0280202D */ daddu $a0, $s4, $zero diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241B50_BE5300.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241B50_BE5300.s deleted file mode 100644 index 1dfff3546c..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241B50_BE5300.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B50_BE5300 -/* BE5300 80241B50 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* BE5304 80241B54 AFB3001C */ sw $s3, 0x1c($sp) -/* BE5308 80241B58 0080982D */ daddu $s3, $a0, $zero -/* BE530C 80241B5C AFBF0020 */ sw $ra, 0x20($sp) -/* BE5310 80241B60 AFB20018 */ sw $s2, 0x18($sp) -/* BE5314 80241B64 AFB10014 */ sw $s1, 0x14($sp) -/* BE5318 80241B68 AFB00010 */ sw $s0, 0x10($sp) -/* BE531C 80241B6C 8E720148 */ lw $s2, 0x148($s3) -/* BE5320 80241B70 86440008 */ lh $a0, 8($s2) -/* BE5324 80241B74 0C00EABB */ jal get_npc_unsafe -/* BE5328 80241B78 00A0802D */ daddu $s0, $a1, $zero -/* BE532C 80241B7C 0040882D */ daddu $s1, $v0, $zero -/* BE5330 80241B80 C6420080 */ lwc1 $f2, 0x80($s2) -/* BE5334 80241B84 468010A0 */ cvt.s.w $f2, $f2 -/* BE5338 80241B88 460010A1 */ cvt.d.s $f2, $f2 -/* BE533C 80241B8C C6400084 */ lwc1 $f0, 0x84($s2) -/* BE5340 80241B90 46800020 */ cvt.s.w $f0, $f0 -/* BE5344 80241B94 46000021 */ cvt.d.s $f0, $f0 -/* BE5348 80241B98 3C014059 */ lui $at, 0x4059 -/* BE534C 80241B9C 44812800 */ mtc1 $at, $f5 -/* BE5350 80241BA0 44802000 */ mtc1 $zero, $f4 -/* BE5354 80241BA4 8E4200CC */ lw $v0, 0xcc($s2) -/* BE5358 80241BA8 C62C0038 */ lwc1 $f12, 0x38($s1) -/* BE535C 80241BAC C62E0040 */ lwc1 $f14, 0x40($s1) -/* BE5360 80241BB0 46241083 */ div.d $f2, $f2, $f4 -/* BE5364 80241BB4 462010A0 */ cvt.s.d $f2, $f2 -/* BE5368 80241BB8 46240003 */ div.d $f0, $f0, $f4 -/* BE536C 80241BBC 8C420020 */ lw $v0, 0x20($v0) -/* BE5370 80241BC0 46200020 */ cvt.s.d $f0, $f0 -/* BE5374 80241BC4 E622001C */ swc1 $f2, 0x1c($s1) -/* BE5378 80241BC8 E6200014 */ swc1 $f0, 0x14($s1) -/* BE537C 80241BCC AE220028 */ sw $v0, 0x28($s1) -/* BE5380 80241BD0 C6000018 */ lwc1 $f0, 0x18($s0) -/* BE5384 80241BD4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BE5388 80241BD8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BE538C 80241BDC E6200018 */ swc1 $f0, 0x18($s1) -/* BE5390 80241BE0 8C460028 */ lw $a2, 0x28($v0) -/* BE5394 80241BE4 0C00A720 */ jal atan2 -/* BE5398 80241BE8 8C470030 */ lw $a3, 0x30($v0) -/* BE539C 80241BEC E620000C */ swc1 $f0, 0xc($s1) -/* BE53A0 80241BF0 8E420018 */ lw $v0, 0x18($s2) -/* BE53A4 80241BF4 AE400074 */ sw $zero, 0x74($s2) -/* BE53A8 80241BF8 9442002A */ lhu $v0, 0x2a($v0) -/* BE53AC 80241BFC 30420002 */ andi $v0, $v0, 2 -/* BE53B0 80241C00 10400005 */ beqz $v0, .L80241C18 -/* BE53B4 80241C04 24020003 */ addiu $v0, $zero, 3 -/* BE53B8 80241C08 A622008E */ sh $v0, 0x8e($s1) -/* BE53BC 80241C0C 2402000D */ addiu $v0, $zero, 0xd -/* BE53C0 80241C10 0809071A */ j .L80241C68 -/* BE53C4 80241C14 AE620070 */ sw $v0, 0x70($s3) -.L80241C18: -/* BE53C8 80241C18 24030001 */ addiu $v1, $zero, 1 -/* BE53CC 80241C1C 2402000E */ addiu $v0, $zero, 0xe -/* BE53D0 80241C20 A623008E */ sh $v1, 0x8e($s1) -/* BE53D4 80241C24 AE620070 */ sw $v0, 0x70($s3) -/* BE53D8 80241C28 C6200038 */ lwc1 $f0, 0x38($s1) -/* BE53DC 80241C2C 4600018D */ trunc.w.s $f6, $f0 -/* BE53E0 80241C30 44023000 */ mfc1 $v0, $f6 -/* BE53E4 80241C34 00000000 */ nop -/* BE53E8 80241C38 A6420010 */ sh $v0, 0x10($s2) -/* BE53EC 80241C3C C620003C */ lwc1 $f0, 0x3c($s1) -/* BE53F0 80241C40 4600018D */ trunc.w.s $f6, $f0 -/* BE53F4 80241C44 44023000 */ mfc1 $v0, $f6 -/* BE53F8 80241C48 00000000 */ nop -/* BE53FC 80241C4C A6420012 */ sh $v0, 0x12($s2) -/* BE5400 80241C50 C6200040 */ lwc1 $f0, 0x40($s1) -/* BE5404 80241C54 A2430007 */ sb $v1, 7($s2) -/* BE5408 80241C58 4600018D */ trunc.w.s $f6, $f0 -/* BE540C 80241C5C 44023000 */ mfc1 $v0, $f6 -/* BE5410 80241C60 00000000 */ nop -/* BE5414 80241C64 A6420014 */ sh $v0, 0x14($s2) -.L80241C68: -/* BE5418 80241C68 8FBF0020 */ lw $ra, 0x20($sp) -/* BE541C 80241C6C 8FB3001C */ lw $s3, 0x1c($sp) -/* BE5420 80241C70 8FB20018 */ lw $s2, 0x18($sp) -/* BE5424 80241C74 8FB10014 */ lw $s1, 0x14($sp) -/* BE5428 80241C78 8FB00010 */ lw $s0, 0x10($sp) -/* BE542C 80241C7C 03E00008 */ jr $ra -/* BE5430 80241C80 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024219C_BE594C.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024219C_BE594C.s index 19f9d51e88..72e2eafda8 100644 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024219C_BE594C.s +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024219C_BE594C.s @@ -110,7 +110,7 @@ glabel L80242308_BE5AB8 glabel L80242320_BE5AD0 /* BE5AD0 80242320 0280202D */ daddu $a0, $s4, $zero /* BE5AD4 80242324 0200282D */ daddu $a1, $s0, $zero -/* BE5AD8 80242328 0C0906D4 */ jal func_80241B50_BE5300 +/* BE5AD8 80242328 0C0906D4 */ jal arn_04_UnkNpcAIFunc14 /* BE5ADC 8024232C 0260302D */ daddu $a2, $s3, $zero /* BE5AE0 80242330 080908D9 */ j .L80242364 /* BE5AE4 80242334 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241610_BEE400.s b/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241610_BEE400.s deleted file mode 100644 index 62a084de67..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241610_BEE400.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241610_BEE400 -/* BEE400 80241610 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* BEE404 80241614 AFB3001C */ sw $s3, 0x1c($sp) -/* BEE408 80241618 0080982D */ daddu $s3, $a0, $zero -/* BEE40C 8024161C AFBF0020 */ sw $ra, 0x20($sp) -/* BEE410 80241620 AFB20018 */ sw $s2, 0x18($sp) -/* BEE414 80241624 AFB10014 */ sw $s1, 0x14($sp) -/* BEE418 80241628 AFB00010 */ sw $s0, 0x10($sp) -/* BEE41C 8024162C 8E720148 */ lw $s2, 0x148($s3) -/* BEE420 80241630 86440008 */ lh $a0, 8($s2) -/* BEE424 80241634 0C00EABB */ jal get_npc_unsafe -/* BEE428 80241638 00A0802D */ daddu $s0, $a1, $zero -/* BEE42C 8024163C 0040882D */ daddu $s1, $v0, $zero -/* BEE430 80241640 C6420080 */ lwc1 $f2, 0x80($s2) -/* BEE434 80241644 468010A0 */ cvt.s.w $f2, $f2 -/* BEE438 80241648 460010A1 */ cvt.d.s $f2, $f2 -/* BEE43C 8024164C C6400084 */ lwc1 $f0, 0x84($s2) -/* BEE440 80241650 46800020 */ cvt.s.w $f0, $f0 -/* BEE444 80241654 46000021 */ cvt.d.s $f0, $f0 -/* BEE448 80241658 3C014059 */ lui $at, 0x4059 -/* BEE44C 8024165C 44812800 */ mtc1 $at, $f5 -/* BEE450 80241660 44802000 */ mtc1 $zero, $f4 -/* BEE454 80241664 8E4200CC */ lw $v0, 0xcc($s2) -/* BEE458 80241668 C62C0038 */ lwc1 $f12, 0x38($s1) -/* BEE45C 8024166C C62E0040 */ lwc1 $f14, 0x40($s1) -/* BEE460 80241670 46241083 */ div.d $f2, $f2, $f4 -/* BEE464 80241674 462010A0 */ cvt.s.d $f2, $f2 -/* BEE468 80241678 46240003 */ div.d $f0, $f0, $f4 -/* BEE46C 8024167C 8C420020 */ lw $v0, 0x20($v0) -/* BEE470 80241680 46200020 */ cvt.s.d $f0, $f0 -/* BEE474 80241684 E622001C */ swc1 $f2, 0x1c($s1) -/* BEE478 80241688 E6200014 */ swc1 $f0, 0x14($s1) -/* BEE47C 8024168C AE220028 */ sw $v0, 0x28($s1) -/* BEE480 80241690 C6000018 */ lwc1 $f0, 0x18($s0) -/* BEE484 80241694 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BEE488 80241698 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BEE48C 8024169C E6200018 */ swc1 $f0, 0x18($s1) -/* BEE490 802416A0 8C460028 */ lw $a2, 0x28($v0) -/* BEE494 802416A4 0C00A720 */ jal atan2 -/* BEE498 802416A8 8C470030 */ lw $a3, 0x30($v0) -/* BEE49C 802416AC E620000C */ swc1 $f0, 0xc($s1) -/* BEE4A0 802416B0 8E420018 */ lw $v0, 0x18($s2) -/* BEE4A4 802416B4 AE400074 */ sw $zero, 0x74($s2) -/* BEE4A8 802416B8 9442002A */ lhu $v0, 0x2a($v0) -/* BEE4AC 802416BC 30420002 */ andi $v0, $v0, 2 -/* BEE4B0 802416C0 10400005 */ beqz $v0, .L802416D8 -/* BEE4B4 802416C4 24020003 */ addiu $v0, $zero, 3 -/* BEE4B8 802416C8 A622008E */ sh $v0, 0x8e($s1) -/* BEE4BC 802416CC 2402000D */ addiu $v0, $zero, 0xd -/* BEE4C0 802416D0 080905CA */ j .L80241728 -/* BEE4C4 802416D4 AE620070 */ sw $v0, 0x70($s3) -.L802416D8: -/* BEE4C8 802416D8 24030001 */ addiu $v1, $zero, 1 -/* BEE4CC 802416DC 2402000E */ addiu $v0, $zero, 0xe -/* BEE4D0 802416E0 A623008E */ sh $v1, 0x8e($s1) -/* BEE4D4 802416E4 AE620070 */ sw $v0, 0x70($s3) -/* BEE4D8 802416E8 C6200038 */ lwc1 $f0, 0x38($s1) -/* BEE4DC 802416EC 4600018D */ trunc.w.s $f6, $f0 -/* BEE4E0 802416F0 44023000 */ mfc1 $v0, $f6 -/* BEE4E4 802416F4 00000000 */ nop -/* BEE4E8 802416F8 A6420010 */ sh $v0, 0x10($s2) -/* BEE4EC 802416FC C620003C */ lwc1 $f0, 0x3c($s1) -/* BEE4F0 80241700 4600018D */ trunc.w.s $f6, $f0 -/* BEE4F4 80241704 44023000 */ mfc1 $v0, $f6 -/* BEE4F8 80241708 00000000 */ nop -/* BEE4FC 8024170C A6420012 */ sh $v0, 0x12($s2) -/* BEE500 80241710 C6200040 */ lwc1 $f0, 0x40($s1) -/* BEE504 80241714 A2430007 */ sb $v1, 7($s2) -/* BEE508 80241718 4600018D */ trunc.w.s $f6, $f0 -/* BEE50C 8024171C 44023000 */ mfc1 $v0, $f6 -/* BEE510 80241720 00000000 */ nop -/* BEE514 80241724 A6420014 */ sh $v0, 0x14($s2) -.L80241728: -/* BEE518 80241728 8FBF0020 */ lw $ra, 0x20($sp) -/* BEE51C 8024172C 8FB3001C */ lw $s3, 0x1c($sp) -/* BEE520 80241730 8FB20018 */ lw $s2, 0x18($sp) -/* BEE524 80241734 8FB10014 */ lw $s1, 0x14($sp) -/* BEE528 80241738 8FB00010 */ lw $s0, 0x10($sp) -/* BEE52C 8024173C 03E00008 */ jr $ra -/* BEE530 80241740 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241C5C_BEEA4C.s b/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241C5C_BEEA4C.s index bf936d3124..dcd91039ef 100644 --- a/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241C5C_BEEA4C.s +++ b/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241C5C_BEEA4C.s @@ -110,7 +110,7 @@ glabel L80241DC8_BEEBB8 glabel L80241DE0_BEEBD0 /* BEEBD0 80241DE0 0280202D */ daddu $a0, $s4, $zero /* BEEBD4 80241DE4 0200282D */ daddu $a1, $s0, $zero -/* BEEBD8 80241DE8 0C090584 */ jal func_80241610_BEE400 +/* BEEBD8 80241DE8 0C090584 */ jal arn_07_UnkNpcAIFunc14 /* BEEBDC 80241DEC 0260302D */ daddu $a2, $s3, $zero /* BEEBE0 80241DF0 08090789 */ j .L80241E24 /* BEEBE4 80241DF4 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80240DE0_BFE660.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80240DE0_BFE660.s deleted file mode 100644 index 9676dc5a7b..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80240DE0_BFE660.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DE0_BFE660 -/* BFE660 80240DE0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* BFE664 80240DE4 AFB3001C */ sw $s3, 0x1c($sp) -/* BFE668 80240DE8 0080982D */ daddu $s3, $a0, $zero -/* BFE66C 80240DEC AFBF0020 */ sw $ra, 0x20($sp) -/* BFE670 80240DF0 AFB20018 */ sw $s2, 0x18($sp) -/* BFE674 80240DF4 AFB10014 */ sw $s1, 0x14($sp) -/* BFE678 80240DF8 AFB00010 */ sw $s0, 0x10($sp) -/* BFE67C 80240DFC 8E720148 */ lw $s2, 0x148($s3) -/* BFE680 80240E00 86440008 */ lh $a0, 8($s2) -/* BFE684 80240E04 0C00EABB */ jal get_npc_unsafe -/* BFE688 80240E08 00A0802D */ daddu $s0, $a1, $zero -/* BFE68C 80240E0C 0040882D */ daddu $s1, $v0, $zero -/* BFE690 80240E10 C6420080 */ lwc1 $f2, 0x80($s2) -/* BFE694 80240E14 468010A0 */ cvt.s.w $f2, $f2 -/* BFE698 80240E18 460010A1 */ cvt.d.s $f2, $f2 -/* BFE69C 80240E1C C6400084 */ lwc1 $f0, 0x84($s2) -/* BFE6A0 80240E20 46800020 */ cvt.s.w $f0, $f0 -/* BFE6A4 80240E24 46000021 */ cvt.d.s $f0, $f0 -/* BFE6A8 80240E28 3C014059 */ lui $at, 0x4059 -/* BFE6AC 80240E2C 44812800 */ mtc1 $at, $f5 -/* BFE6B0 80240E30 44802000 */ mtc1 $zero, $f4 -/* BFE6B4 80240E34 8E4200CC */ lw $v0, 0xcc($s2) -/* BFE6B8 80240E38 C62C0038 */ lwc1 $f12, 0x38($s1) -/* BFE6BC 80240E3C C62E0040 */ lwc1 $f14, 0x40($s1) -/* BFE6C0 80240E40 46241083 */ div.d $f2, $f2, $f4 -/* BFE6C4 80240E44 462010A0 */ cvt.s.d $f2, $f2 -/* BFE6C8 80240E48 46240003 */ div.d $f0, $f0, $f4 -/* BFE6CC 80240E4C 8C420020 */ lw $v0, 0x20($v0) -/* BFE6D0 80240E50 46200020 */ cvt.s.d $f0, $f0 -/* BFE6D4 80240E54 E622001C */ swc1 $f2, 0x1c($s1) -/* BFE6D8 80240E58 E6200014 */ swc1 $f0, 0x14($s1) -/* BFE6DC 80240E5C AE220028 */ sw $v0, 0x28($s1) -/* BFE6E0 80240E60 C6000018 */ lwc1 $f0, 0x18($s0) -/* BFE6E4 80240E64 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BFE6E8 80240E68 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BFE6EC 80240E6C E6200018 */ swc1 $f0, 0x18($s1) -/* BFE6F0 80240E70 8C460028 */ lw $a2, 0x28($v0) -/* BFE6F4 80240E74 0C00A720 */ jal atan2 -/* BFE6F8 80240E78 8C470030 */ lw $a3, 0x30($v0) -/* BFE6FC 80240E7C E620000C */ swc1 $f0, 0xc($s1) -/* BFE700 80240E80 8E420018 */ lw $v0, 0x18($s2) -/* BFE704 80240E84 AE400074 */ sw $zero, 0x74($s2) -/* BFE708 80240E88 9442002A */ lhu $v0, 0x2a($v0) -/* BFE70C 80240E8C 30420002 */ andi $v0, $v0, 2 -/* BFE710 80240E90 10400005 */ beqz $v0, .L80240EA8 -/* BFE714 80240E94 24020003 */ addiu $v0, $zero, 3 -/* BFE718 80240E98 A622008E */ sh $v0, 0x8e($s1) -/* BFE71C 80240E9C 2402000D */ addiu $v0, $zero, 0xd -/* BFE720 80240EA0 080903BE */ j .L80240EF8 -/* BFE724 80240EA4 AE620070 */ sw $v0, 0x70($s3) -.L80240EA8: -/* BFE728 80240EA8 24030001 */ addiu $v1, $zero, 1 -/* BFE72C 80240EAC 2402000E */ addiu $v0, $zero, 0xe -/* BFE730 80240EB0 A623008E */ sh $v1, 0x8e($s1) -/* BFE734 80240EB4 AE620070 */ sw $v0, 0x70($s3) -/* BFE738 80240EB8 C6200038 */ lwc1 $f0, 0x38($s1) -/* BFE73C 80240EBC 4600018D */ trunc.w.s $f6, $f0 -/* BFE740 80240EC0 44023000 */ mfc1 $v0, $f6 -/* BFE744 80240EC4 00000000 */ nop -/* BFE748 80240EC8 A6420010 */ sh $v0, 0x10($s2) -/* BFE74C 80240ECC C620003C */ lwc1 $f0, 0x3c($s1) -/* BFE750 80240ED0 4600018D */ trunc.w.s $f6, $f0 -/* BFE754 80240ED4 44023000 */ mfc1 $v0, $f6 -/* BFE758 80240ED8 00000000 */ nop -/* BFE75C 80240EDC A6420012 */ sh $v0, 0x12($s2) -/* BFE760 80240EE0 C6200040 */ lwc1 $f0, 0x40($s1) -/* BFE764 80240EE4 A2430007 */ sb $v1, 7($s2) -/* BFE768 80240EE8 4600018D */ trunc.w.s $f6, $f0 -/* BFE76C 80240EEC 44023000 */ mfc1 $v0, $f6 -/* BFE770 80240EF0 00000000 */ nop -/* BFE774 80240EF4 A6420014 */ sh $v0, 0x14($s2) -.L80240EF8: -/* BFE778 80240EF8 8FBF0020 */ lw $ra, 0x20($sp) -/* BFE77C 80240EFC 8FB3001C */ lw $s3, 0x1c($sp) -/* BFE780 80240F00 8FB20018 */ lw $s2, 0x18($sp) -/* BFE784 80240F04 8FB10014 */ lw $s1, 0x14($sp) -/* BFE788 80240F08 8FB00010 */ lw $s0, 0x10($sp) -/* BFE78C 80240F0C 03E00008 */ jr $ra -/* BFE790 80240F10 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024142C_BFECAC.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024142C_BFECAC.s index a3569fc3f8..8c04c8422b 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024142C_BFECAC.s +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024142C_BFECAC.s @@ -110,7 +110,7 @@ glabel L80241598_BFEE18 glabel L802415B0_BFEE30 /* BFEE30 802415B0 0280202D */ daddu $a0, $s4, $zero /* BFEE34 802415B4 0200282D */ daddu $a1, $s0, $zero -/* BFEE38 802415B8 0C090378 */ jal func_80240DE0_BFE660 +/* BFEE38 802415B8 0C090378 */ jal dgb_01_UnkNpcAIFunc14 /* BFEE3C 802415BC 0260302D */ daddu $a2, $s3, $zero /* BFEE40 802415C0 0809057D */ j .L802415F4 /* BFEE44 802415C4 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80240CC0_C371F0.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80240CC0_C371F0.s deleted file mode 100644 index f1f59cf01f..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80240CC0_C371F0.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CC0_C371F0 -/* C371F0 80240CC0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C371F4 80240CC4 AFB3001C */ sw $s3, 0x1c($sp) -/* C371F8 80240CC8 0080982D */ daddu $s3, $a0, $zero -/* C371FC 80240CCC AFBF0020 */ sw $ra, 0x20($sp) -/* C37200 80240CD0 AFB20018 */ sw $s2, 0x18($sp) -/* C37204 80240CD4 AFB10014 */ sw $s1, 0x14($sp) -/* C37208 80240CD8 AFB00010 */ sw $s0, 0x10($sp) -/* C3720C 80240CDC 8E720148 */ lw $s2, 0x148($s3) -/* C37210 80240CE0 86440008 */ lh $a0, 8($s2) -/* C37214 80240CE4 0C00EABB */ jal get_npc_unsafe -/* C37218 80240CE8 00A0802D */ daddu $s0, $a1, $zero -/* C3721C 80240CEC 0040882D */ daddu $s1, $v0, $zero -/* C37220 80240CF0 C6420080 */ lwc1 $f2, 0x80($s2) -/* C37224 80240CF4 468010A0 */ cvt.s.w $f2, $f2 -/* C37228 80240CF8 460010A1 */ cvt.d.s $f2, $f2 -/* C3722C 80240CFC C6400084 */ lwc1 $f0, 0x84($s2) -/* C37230 80240D00 46800020 */ cvt.s.w $f0, $f0 -/* C37234 80240D04 46000021 */ cvt.d.s $f0, $f0 -/* C37238 80240D08 3C014059 */ lui $at, 0x4059 -/* C3723C 80240D0C 44812800 */ mtc1 $at, $f5 -/* C37240 80240D10 44802000 */ mtc1 $zero, $f4 -/* C37244 80240D14 8E4200CC */ lw $v0, 0xcc($s2) -/* C37248 80240D18 C62C0038 */ lwc1 $f12, 0x38($s1) -/* C3724C 80240D1C C62E0040 */ lwc1 $f14, 0x40($s1) -/* C37250 80240D20 46241083 */ div.d $f2, $f2, $f4 -/* C37254 80240D24 462010A0 */ cvt.s.d $f2, $f2 -/* C37258 80240D28 46240003 */ div.d $f0, $f0, $f4 -/* C3725C 80240D2C 8C420020 */ lw $v0, 0x20($v0) -/* C37260 80240D30 46200020 */ cvt.s.d $f0, $f0 -/* C37264 80240D34 E622001C */ swc1 $f2, 0x1c($s1) -/* C37268 80240D38 E6200014 */ swc1 $f0, 0x14($s1) -/* C3726C 80240D3C AE220028 */ sw $v0, 0x28($s1) -/* C37270 80240D40 C6000018 */ lwc1 $f0, 0x18($s0) -/* C37274 80240D44 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C37278 80240D48 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C3727C 80240D4C E6200018 */ swc1 $f0, 0x18($s1) -/* C37280 80240D50 8C460028 */ lw $a2, 0x28($v0) -/* C37284 80240D54 0C00A720 */ jal atan2 -/* C37288 80240D58 8C470030 */ lw $a3, 0x30($v0) -/* C3728C 80240D5C E620000C */ swc1 $f0, 0xc($s1) -/* C37290 80240D60 8E420018 */ lw $v0, 0x18($s2) -/* C37294 80240D64 AE400074 */ sw $zero, 0x74($s2) -/* C37298 80240D68 9442002A */ lhu $v0, 0x2a($v0) -/* C3729C 80240D6C 30420002 */ andi $v0, $v0, 2 -/* C372A0 80240D70 10400005 */ beqz $v0, .L80240D88 -/* C372A4 80240D74 24020003 */ addiu $v0, $zero, 3 -/* C372A8 80240D78 A622008E */ sh $v0, 0x8e($s1) -/* C372AC 80240D7C 2402000D */ addiu $v0, $zero, 0xd -/* C372B0 80240D80 08090376 */ j .L80240DD8 -/* C372B4 80240D84 AE620070 */ sw $v0, 0x70($s3) -.L80240D88: -/* C372B8 80240D88 24030001 */ addiu $v1, $zero, 1 -/* C372BC 80240D8C 2402000E */ addiu $v0, $zero, 0xe -/* C372C0 80240D90 A623008E */ sh $v1, 0x8e($s1) -/* C372C4 80240D94 AE620070 */ sw $v0, 0x70($s3) -/* C372C8 80240D98 C6200038 */ lwc1 $f0, 0x38($s1) -/* C372CC 80240D9C 4600018D */ trunc.w.s $f6, $f0 -/* C372D0 80240DA0 44023000 */ mfc1 $v0, $f6 -/* C372D4 80240DA4 00000000 */ nop -/* C372D8 80240DA8 A6420010 */ sh $v0, 0x10($s2) -/* C372DC 80240DAC C620003C */ lwc1 $f0, 0x3c($s1) -/* C372E0 80240DB0 4600018D */ trunc.w.s $f6, $f0 -/* C372E4 80240DB4 44023000 */ mfc1 $v0, $f6 -/* C372E8 80240DB8 00000000 */ nop -/* C372EC 80240DBC A6420012 */ sh $v0, 0x12($s2) -/* C372F0 80240DC0 C6200040 */ lwc1 $f0, 0x40($s1) -/* C372F4 80240DC4 A2430007 */ sb $v1, 7($s2) -/* C372F8 80240DC8 4600018D */ trunc.w.s $f6, $f0 -/* C372FC 80240DCC 44023000 */ mfc1 $v0, $f6 -/* C37300 80240DD0 00000000 */ nop -/* C37304 80240DD4 A6420014 */ sh $v0, 0x14($s2) -.L80240DD8: -/* C37308 80240DD8 8FBF0020 */ lw $ra, 0x20($sp) -/* C3730C 80240DDC 8FB3001C */ lw $s3, 0x1c($sp) -/* C37310 80240DE0 8FB20018 */ lw $s2, 0x18($sp) -/* C37314 80240DE4 8FB10014 */ lw $s1, 0x14($sp) -/* C37318 80240DE8 8FB00010 */ lw $s0, 0x10($sp) -/* C3731C 80240DEC 03E00008 */ jr $ra -/* C37320 80240DF0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024130C_C3783C.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024130C_C3783C.s index ad5257e9c5..dddd8d4813 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024130C_C3783C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024130C_C3783C.s @@ -110,7 +110,7 @@ glabel L80241478_C379A8 glabel L80241490_C379C0 /* C379C0 80241490 0280202D */ daddu $a0, $s4, $zero /* C379C4 80241494 0200282D */ daddu $a1, $s0, $zero -/* C379C8 80241498 0C090330 */ jal func_80240CC0_C371F0 +/* C379C8 80241498 0C090330 */ jal dgb_04_UnkNpcAIFunc14 /* C379CC 8024149C 0260302D */ daddu $a2, $s3, $zero /* C379D0 802414A0 08090535 */ j .L802414D4 /* C379D4 802414A4 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80243048_C39578.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80243048_C39578.s deleted file mode 100644 index e4b838bff4..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80243048_C39578.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243048_C39578 -/* C39578 80243048 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C3957C 8024304C AFBF0018 */ sw $ra, 0x18($sp) -/* C39580 80243050 0C00EAD2 */ jal get_npc_safe -/* C39584 80243054 2404FFFC */ addiu $a0, $zero, -4 -/* C39588 80243058 3C0141F0 */ lui $at, 0x41f0 -/* C3958C 8024305C 44810000 */ mtc1 $at, $f0 -/* C39590 80243060 C442003C */ lwc1 $f2, 0x3c($v0) -/* C39594 80243064 46001080 */ add.s $f2, $f2, $f0 -/* C39598 80243068 E7A00010 */ swc1 $f0, 0x10($sp) -/* C3959C 8024306C 8C450038 */ lw $a1, 0x38($v0) -/* C395A0 80243070 8C470040 */ lw $a3, 0x40($v0) -/* C395A4 80243074 44061000 */ mfc1 $a2, $f2 -/* C395A8 80243078 0C01BFBC */ jal func_8006FEF0 -/* C395AC 8024307C 24040002 */ addiu $a0, $zero, 2 -/* C395B0 80243080 8FBF0018 */ lw $ra, 0x18($sp) -/* C395B4 80243084 24020002 */ addiu $v0, $zero, 2 -/* C395B8 80243088 03E00008 */ jr $ra -/* C395BC 8024308C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80243090_C395C0.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80243090_C395C0.s deleted file mode 100644 index 4532e191f5..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80243090_C395C0.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243090_C395C0 -/* C395C0 80243090 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C395C4 80243094 AFBF0018 */ sw $ra, 0x18($sp) -/* C395C8 80243098 0C00EAD2 */ jal get_npc_safe -/* C395CC 8024309C 2404FFFC */ addiu $a0, $zero, -4 -/* C395D0 802430A0 3C0141F0 */ lui $at, 0x41f0 -/* C395D4 802430A4 44810000 */ mtc1 $at, $f0 -/* C395D8 802430A8 C442003C */ lwc1 $f2, 0x3c($v0) -/* C395DC 802430AC 46001080 */ add.s $f2, $f2, $f0 -/* C395E0 802430B0 E7A00010 */ swc1 $f0, 0x10($sp) -/* C395E4 802430B4 8C450038 */ lw $a1, 0x38($v0) -/* C395E8 802430B8 8C470040 */ lw $a3, 0x40($v0) -/* C395EC 802430BC 44061000 */ mfc1 $a2, $f2 -/* C395F0 802430C0 0C01BFBC */ jal func_8006FEF0 -/* C395F4 802430C4 24040004 */ addiu $a0, $zero, 4 -/* C395F8 802430C8 8FBF0018 */ lw $ra, 0x18($sp) -/* C395FC 802430CC 24020002 */ addiu $v0, $zero, 2 -/* C39600 802430D0 03E00008 */ jr $ra -/* C39604 802430D4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242420_C421D0.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242420_C421D0.s deleted file mode 100644 index 17009a25c4..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242420_C421D0.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242420_C421D0 -/* C421D0 80242420 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C421D4 80242424 AFB3001C */ sw $s3, 0x1c($sp) -/* C421D8 80242428 0080982D */ daddu $s3, $a0, $zero -/* C421DC 8024242C AFBF0020 */ sw $ra, 0x20($sp) -/* C421E0 80242430 AFB20018 */ sw $s2, 0x18($sp) -/* C421E4 80242434 AFB10014 */ sw $s1, 0x14($sp) -/* C421E8 80242438 AFB00010 */ sw $s0, 0x10($sp) -/* C421EC 8024243C 8E720148 */ lw $s2, 0x148($s3) -/* C421F0 80242440 86440008 */ lh $a0, 8($s2) -/* C421F4 80242444 0C00EABB */ jal get_npc_unsafe -/* C421F8 80242448 00A0802D */ daddu $s0, $a1, $zero -/* C421FC 8024244C 0040882D */ daddu $s1, $v0, $zero -/* C42200 80242450 C6420080 */ lwc1 $f2, 0x80($s2) -/* C42204 80242454 468010A0 */ cvt.s.w $f2, $f2 -/* C42208 80242458 460010A1 */ cvt.d.s $f2, $f2 -/* C4220C 8024245C C6400084 */ lwc1 $f0, 0x84($s2) -/* C42210 80242460 46800020 */ cvt.s.w $f0, $f0 -/* C42214 80242464 46000021 */ cvt.d.s $f0, $f0 -/* C42218 80242468 3C014059 */ lui $at, 0x4059 -/* C4221C 8024246C 44812800 */ mtc1 $at, $f5 -/* C42220 80242470 44802000 */ mtc1 $zero, $f4 -/* C42224 80242474 8E4200CC */ lw $v0, 0xcc($s2) -/* C42228 80242478 C62C0038 */ lwc1 $f12, 0x38($s1) -/* C4222C 8024247C C62E0040 */ lwc1 $f14, 0x40($s1) -/* C42230 80242480 46241083 */ div.d $f2, $f2, $f4 -/* C42234 80242484 462010A0 */ cvt.s.d $f2, $f2 -/* C42238 80242488 46240003 */ div.d $f0, $f0, $f4 -/* C4223C 8024248C 8C420020 */ lw $v0, 0x20($v0) -/* C42240 80242490 46200020 */ cvt.s.d $f0, $f0 -/* C42244 80242494 E622001C */ swc1 $f2, 0x1c($s1) -/* C42248 80242498 E6200014 */ swc1 $f0, 0x14($s1) -/* C4224C 8024249C AE220028 */ sw $v0, 0x28($s1) -/* C42250 802424A0 C6000018 */ lwc1 $f0, 0x18($s0) -/* C42254 802424A4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C42258 802424A8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C4225C 802424AC E6200018 */ swc1 $f0, 0x18($s1) -/* C42260 802424B0 8C460028 */ lw $a2, 0x28($v0) -/* C42264 802424B4 0C00A720 */ jal atan2 -/* C42268 802424B8 8C470030 */ lw $a3, 0x30($v0) -/* C4226C 802424BC E620000C */ swc1 $f0, 0xc($s1) -/* C42270 802424C0 8E420018 */ lw $v0, 0x18($s2) -/* C42274 802424C4 AE400074 */ sw $zero, 0x74($s2) -/* C42278 802424C8 9442002A */ lhu $v0, 0x2a($v0) -/* C4227C 802424CC 30420002 */ andi $v0, $v0, 2 -/* C42280 802424D0 10400005 */ beqz $v0, .L802424E8 -/* C42284 802424D4 24020003 */ addiu $v0, $zero, 3 -/* C42288 802424D8 A622008E */ sh $v0, 0x8e($s1) -/* C4228C 802424DC 2402000D */ addiu $v0, $zero, 0xd -/* C42290 802424E0 0809094E */ j .L80242538 -/* C42294 802424E4 AE620070 */ sw $v0, 0x70($s3) -.L802424E8: -/* C42298 802424E8 24030001 */ addiu $v1, $zero, 1 -/* C4229C 802424EC 2402000E */ addiu $v0, $zero, 0xe -/* C422A0 802424F0 A623008E */ sh $v1, 0x8e($s1) -/* C422A4 802424F4 AE620070 */ sw $v0, 0x70($s3) -/* C422A8 802424F8 C6200038 */ lwc1 $f0, 0x38($s1) -/* C422AC 802424FC 4600018D */ trunc.w.s $f6, $f0 -/* C422B0 80242500 44023000 */ mfc1 $v0, $f6 -/* C422B4 80242504 00000000 */ nop -/* C422B8 80242508 A6420010 */ sh $v0, 0x10($s2) -/* C422BC 8024250C C620003C */ lwc1 $f0, 0x3c($s1) -/* C422C0 80242510 4600018D */ trunc.w.s $f6, $f0 -/* C422C4 80242514 44023000 */ mfc1 $v0, $f6 -/* C422C8 80242518 00000000 */ nop -/* C422CC 8024251C A6420012 */ sh $v0, 0x12($s2) -/* C422D0 80242520 C6200040 */ lwc1 $f0, 0x40($s1) -/* C422D4 80242524 A2430007 */ sb $v1, 7($s2) -/* C422D8 80242528 4600018D */ trunc.w.s $f6, $f0 -/* C422DC 8024252C 44023000 */ mfc1 $v0, $f6 -/* C422E0 80242530 00000000 */ nop -/* C422E4 80242534 A6420014 */ sh $v0, 0x14($s2) -.L80242538: -/* C422E8 80242538 8FBF0020 */ lw $ra, 0x20($sp) -/* C422EC 8024253C 8FB3001C */ lw $s3, 0x1c($sp) -/* C422F0 80242540 8FB20018 */ lw $s2, 0x18($sp) -/* C422F4 80242544 8FB10014 */ lw $s1, 0x14($sp) -/* C422F8 80242548 8FB00010 */ lw $s0, 0x10($sp) -/* C422FC 8024254C 03E00008 */ jr $ra -/* C42300 80242550 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242A6C_C4281C.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242A6C_C4281C.s index a965021fcc..61b5c8b49a 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242A6C_C4281C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242A6C_C4281C.s @@ -110,7 +110,7 @@ glabel L80242BD8_C42988 glabel L80242BF0_C429A0 /* C429A0 80242BF0 0280202D */ daddu $a0, $s4, $zero /* C429A4 80242BF4 0200282D */ daddu $a1, $s0, $zero -/* C429A8 80242BF8 0C090908 */ jal func_80242420_C421D0 +/* C429A8 80242BF8 0C090908 */ jal dgb_08_UnkNpcAIFunc14 /* C429AC 80242BFC 0260302D */ daddu $a2, $s3, $zero /* C429B0 80242C00 08090B0D */ j .L80242C34 /* C429B4 80242C04 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802420E4_C48CC4.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802420E4_C48CC4.s deleted file mode 100644 index 59106aa732..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802420E4_C48CC4.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802420E4_C48CC4 -/* C48CC4 802420E4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C48CC8 802420E8 AFB3001C */ sw $s3, 0x1c($sp) -/* C48CCC 802420EC 0080982D */ daddu $s3, $a0, $zero -/* C48CD0 802420F0 AFBF0020 */ sw $ra, 0x20($sp) -/* C48CD4 802420F4 AFB20018 */ sw $s2, 0x18($sp) -/* C48CD8 802420F8 AFB10014 */ sw $s1, 0x14($sp) -/* C48CDC 802420FC AFB00010 */ sw $s0, 0x10($sp) -/* C48CE0 80242100 8E720148 */ lw $s2, 0x148($s3) -/* C48CE4 80242104 86440008 */ lh $a0, 8($s2) -/* C48CE8 80242108 0C00EABB */ jal get_npc_unsafe -/* C48CEC 8024210C 00A0802D */ daddu $s0, $a1, $zero -/* C48CF0 80242110 0040882D */ daddu $s1, $v0, $zero -/* C48CF4 80242114 C6420080 */ lwc1 $f2, 0x80($s2) -/* C48CF8 80242118 468010A0 */ cvt.s.w $f2, $f2 -/* C48CFC 8024211C 460010A1 */ cvt.d.s $f2, $f2 -/* C48D00 80242120 C6400084 */ lwc1 $f0, 0x84($s2) -/* C48D04 80242124 46800020 */ cvt.s.w $f0, $f0 -/* C48D08 80242128 46000021 */ cvt.d.s $f0, $f0 -/* C48D0C 8024212C 3C014059 */ lui $at, 0x4059 -/* C48D10 80242130 44812800 */ mtc1 $at, $f5 -/* C48D14 80242134 44802000 */ mtc1 $zero, $f4 -/* C48D18 80242138 8E4200CC */ lw $v0, 0xcc($s2) -/* C48D1C 8024213C C62C0038 */ lwc1 $f12, 0x38($s1) -/* C48D20 80242140 C62E0040 */ lwc1 $f14, 0x40($s1) -/* C48D24 80242144 46241083 */ div.d $f2, $f2, $f4 -/* C48D28 80242148 462010A0 */ cvt.s.d $f2, $f2 -/* C48D2C 8024214C 46240003 */ div.d $f0, $f0, $f4 -/* C48D30 80242150 8C420020 */ lw $v0, 0x20($v0) -/* C48D34 80242154 46200020 */ cvt.s.d $f0, $f0 -/* C48D38 80242158 E622001C */ swc1 $f2, 0x1c($s1) -/* C48D3C 8024215C E6200014 */ swc1 $f0, 0x14($s1) -/* C48D40 80242160 AE220028 */ sw $v0, 0x28($s1) -/* C48D44 80242164 C6000018 */ lwc1 $f0, 0x18($s0) -/* C48D48 80242168 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C48D4C 8024216C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C48D50 80242170 E6200018 */ swc1 $f0, 0x18($s1) -/* C48D54 80242174 8C460028 */ lw $a2, 0x28($v0) -/* C48D58 80242178 0C00A720 */ jal atan2 -/* C48D5C 8024217C 8C470030 */ lw $a3, 0x30($v0) -/* C48D60 80242180 E620000C */ swc1 $f0, 0xc($s1) -/* C48D64 80242184 8E420018 */ lw $v0, 0x18($s2) -/* C48D68 80242188 AE400074 */ sw $zero, 0x74($s2) -/* C48D6C 8024218C 9442002A */ lhu $v0, 0x2a($v0) -/* C48D70 80242190 30420002 */ andi $v0, $v0, 2 -/* C48D74 80242194 10400005 */ beqz $v0, .L802421AC -/* C48D78 80242198 24020003 */ addiu $v0, $zero, 3 -/* C48D7C 8024219C A622008E */ sh $v0, 0x8e($s1) -/* C48D80 802421A0 2402000D */ addiu $v0, $zero, 0xd -/* C48D84 802421A4 0809087F */ j .L802421FC -/* C48D88 802421A8 AE620070 */ sw $v0, 0x70($s3) -.L802421AC: -/* C48D8C 802421AC 24030001 */ addiu $v1, $zero, 1 -/* C48D90 802421B0 2402000E */ addiu $v0, $zero, 0xe -/* C48D94 802421B4 A623008E */ sh $v1, 0x8e($s1) -/* C48D98 802421B8 AE620070 */ sw $v0, 0x70($s3) -/* C48D9C 802421BC C6200038 */ lwc1 $f0, 0x38($s1) -/* C48DA0 802421C0 4600018D */ trunc.w.s $f6, $f0 -/* C48DA4 802421C4 44023000 */ mfc1 $v0, $f6 -/* C48DA8 802421C8 00000000 */ nop -/* C48DAC 802421CC A6420010 */ sh $v0, 0x10($s2) -/* C48DB0 802421D0 C620003C */ lwc1 $f0, 0x3c($s1) -/* C48DB4 802421D4 4600018D */ trunc.w.s $f6, $f0 -/* C48DB8 802421D8 44023000 */ mfc1 $v0, $f6 -/* C48DBC 802421DC 00000000 */ nop -/* C48DC0 802421E0 A6420012 */ sh $v0, 0x12($s2) -/* C48DC4 802421E4 C6200040 */ lwc1 $f0, 0x40($s1) -/* C48DC8 802421E8 A2430007 */ sb $v1, 7($s2) -/* C48DCC 802421EC 4600018D */ trunc.w.s $f6, $f0 -/* C48DD0 802421F0 44023000 */ mfc1 $v0, $f6 -/* C48DD4 802421F4 00000000 */ nop -/* C48DD8 802421F8 A6420014 */ sh $v0, 0x14($s2) -.L802421FC: -/* C48DDC 802421FC 8FBF0020 */ lw $ra, 0x20($sp) -/* C48DE0 80242200 8FB3001C */ lw $s3, 0x1c($sp) -/* C48DE4 80242204 8FB20018 */ lw $s2, 0x18($sp) -/* C48DE8 80242208 8FB10014 */ lw $s1, 0x14($sp) -/* C48DEC 8024220C 8FB00010 */ lw $s0, 0x10($sp) -/* C48DF0 80242210 03E00008 */ jr $ra -/* C48DF4 80242214 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242730_C49310.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242730_C49310.s index e722439b31..544746ac99 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242730_C49310.s +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242730_C49310.s @@ -110,7 +110,7 @@ glabel L8024289C_C4947C glabel L802428B4_C49494 /* C49494 802428B4 0280202D */ daddu $a0, $s4, $zero /* C49498 802428B8 0200282D */ daddu $a1, $s0, $zero -/* C4949C 802428BC 0C090839 */ jal func_802420E4_C48CC4 +/* C4949C 802428BC 0C090839 */ jal dgb_09_UnkNpcAIFunc14 /* C494A0 802428C0 0260302D */ daddu $a2, $s3, $zero /* C494A4 802428C4 08090A3E */ j .L802428F8 /* C494A8 802428C8 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024189C_95CA9C.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024189C_95CA9C.s deleted file mode 100644 index 2a7e9451b2..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024189C_95CA9C.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024189C_95CA9C -/* 95CA9C 8024189C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 95CAA0 802418A0 AFB10014 */ sw $s1, 0x14($sp) -/* 95CAA4 802418A4 0080882D */ daddu $s1, $a0, $zero -/* 95CAA8 802418A8 AFBF0024 */ sw $ra, 0x24($sp) -/* 95CAAC 802418AC AFB40020 */ sw $s4, 0x20($sp) -/* 95CAB0 802418B0 AFB3001C */ sw $s3, 0x1c($sp) -/* 95CAB4 802418B4 AFB20018 */ sw $s2, 0x18($sp) -/* 95CAB8 802418B8 10A00033 */ beqz $a1, .L80241988 -/* 95CABC 802418BC AFB00010 */ sw $s0, 0x10($sp) -/* 95CAC0 802418C0 0C04760B */ jal func_8011D82C -/* 95CAC4 802418C4 24040001 */ addiu $a0, $zero, 1 -/* 95CAC8 802418C8 0000202D */ daddu $a0, $zero, $zero -/* 95CACC 802418CC 0080282D */ daddu $a1, $a0, $zero -/* 95CAD0 802418D0 0080302D */ daddu $a2, $a0, $zero -/* 95CAD4 802418D4 0080382D */ daddu $a3, $a0, $zero -/* 95CAD8 802418D8 0080802D */ daddu $s0, $a0, $zero -/* 95CADC 802418DC 2414FFFC */ addiu $s4, $zero, -4 -/* 95CAE0 802418E0 2413000A */ addiu $s3, $zero, 0xa -/* 95CAE4 802418E4 3C120080 */ lui $s2, 0x80 -/* 95CAE8 802418E8 3C038015 */ lui $v1, %hi(D_801512F0) -/* 95CAEC 802418EC 8C6312F0 */ lw $v1, %lo(D_801512F0)($v1) -/* 95CAF0 802418F0 24020001 */ addiu $v0, $zero, 1 -/* 95CAF4 802418F4 0C046F97 */ jal set_background_color_blend -/* 95CAF8 802418F8 A0620000 */ sb $v0, ($v1) -.L802418FC: -/* 95CAFC 802418FC 0C00E2B7 */ jal get_npc_by_index -/* 95CB00 80241900 0200202D */ daddu $a0, $s0, $zero -/* 95CB04 80241904 0040202D */ daddu $a0, $v0, $zero -/* 95CB08 80241908 5080000B */ beql $a0, $zero, .L80241938 -/* 95CB0C 8024190C 26100001 */ addiu $s0, $s0, 1 -/* 95CB10 80241910 8C820000 */ lw $v0, ($a0) -/* 95CB14 80241914 50400008 */ beql $v0, $zero, .L80241938 -/* 95CB18 80241918 26100001 */ addiu $s0, $s0, 1 -/* 95CB1C 8024191C 808300A4 */ lb $v1, 0xa4($a0) -/* 95CB20 80241920 10740005 */ beq $v1, $s4, .L80241938 -/* 95CB24 80241924 26100001 */ addiu $s0, $s0, 1 -/* 95CB28 80241928 10730003 */ beq $v1, $s3, .L80241938 -/* 95CB2C 8024192C 00000000 */ nop -/* 95CB30 80241930 00521025 */ or $v0, $v0, $s2 -/* 95CB34 80241934 AC820000 */ sw $v0, ($a0) -.L80241938: -/* 95CB38 80241938 2A020040 */ slti $v0, $s0, 0x40 -/* 95CB3C 8024193C 1440FFEF */ bnez $v0, .L802418FC -/* 95CB40 80241940 00000000 */ nop -/* 95CB44 80241944 0000802D */ daddu $s0, $zero, $zero -/* 95CB48 80241948 3C120800 */ lui $s2, 0x800 -.L8024194C: -/* 95CB4C 8024194C 0C04C3D6 */ jal get_item_entity -/* 95CB50 80241950 0200202D */ daddu $a0, $s0, $zero -/* 95CB54 80241954 0040182D */ daddu $v1, $v0, $zero -/* 95CB58 80241958 10600007 */ beqz $v1, .L80241978 -/* 95CB5C 8024195C 26100001 */ addiu $s0, $s0, 1 -/* 95CB60 80241960 8C640000 */ lw $a0, ($v1) -/* 95CB64 80241964 30820010 */ andi $v0, $a0, 0x10 -/* 95CB68 80241968 10400003 */ beqz $v0, .L80241978 -/* 95CB6C 8024196C 00000000 */ nop -/* 95CB70 80241970 00921025 */ or $v0, $a0, $s2 -/* 95CB74 80241974 AC620000 */ sw $v0, ($v1) -.L80241978: -/* 95CB78 80241978 2A020100 */ slti $v0, $s0, 0x100 -/* 95CB7C 8024197C 1440FFF3 */ bnez $v0, .L8024194C -/* 95CB80 80241980 00000000 */ nop -/* 95CB84 80241984 AE200070 */ sw $zero, 0x70($s1) -.L80241988: -/* 95CB88 80241988 8E220070 */ lw $v0, 0x70($s1) -/* 95CB8C 8024198C 24420008 */ addiu $v0, $v0, 8 -/* 95CB90 80241990 AE220070 */ sw $v0, 0x70($s1) -/* 95CB94 80241994 28420100 */ slti $v0, $v0, 0x100 -/* 95CB98 80241998 14400003 */ bnez $v0, .L802419A8 -/* 95CB9C 8024199C 0000202D */ daddu $a0, $zero, $zero -/* 95CBA0 802419A0 240200FF */ addiu $v0, $zero, 0xff -/* 95CBA4 802419A4 AE220070 */ sw $v0, 0x70($s1) -.L802419A8: -/* 95CBA8 802419A8 0080282D */ daddu $a1, $a0, $zero -/* 95CBAC 802419AC 92270073 */ lbu $a3, 0x73($s1) -/* 95CBB0 802419B0 0C046F97 */ jal set_background_color_blend -/* 95CBB4 802419B4 0080302D */ daddu $a2, $a0, $zero -/* 95CBB8 802419B8 8E220070 */ lw $v0, 0x70($s1) -/* 95CBBC 802419BC 8FBF0024 */ lw $ra, 0x24($sp) -/* 95CBC0 802419C0 8FB40020 */ lw $s4, 0x20($sp) -/* 95CBC4 802419C4 8FB3001C */ lw $s3, 0x1c($sp) -/* 95CBC8 802419C8 8FB20018 */ lw $s2, 0x18($sp) -/* 95CBCC 802419CC 8FB10014 */ lw $s1, 0x14($sp) -/* 95CBD0 802419D0 8FB00010 */ lw $s0, 0x10($sp) -/* 95CBD4 802419D4 384200FF */ xori $v0, $v0, 0xff -/* 95CBD8 802419D8 2C420001 */ sltiu $v0, $v0, 1 -/* 95CBDC 802419DC 00021040 */ sll $v0, $v0, 1 -/* 95CBE0 802419E0 03E00008 */ jr $ra -/* 95CBE4 802419E4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024072C_9698EC.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024072C_9698EC.s deleted file mode 100644 index 910db3e9cc..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024072C_9698EC.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024072C_9698EC -/* 9698EC 8024072C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9698F0 80240730 AFB10014 */ sw $s1, 0x14($sp) -/* 9698F4 80240734 0080882D */ daddu $s1, $a0, $zero -/* 9698F8 80240738 AFBF0024 */ sw $ra, 0x24($sp) -/* 9698FC 8024073C AFB40020 */ sw $s4, 0x20($sp) -/* 969900 80240740 AFB3001C */ sw $s3, 0x1c($sp) -/* 969904 80240744 AFB20018 */ sw $s2, 0x18($sp) -/* 969908 80240748 10A00033 */ beqz $a1, .L80240818 -/* 96990C 8024074C AFB00010 */ sw $s0, 0x10($sp) -/* 969910 80240750 0C04760B */ jal func_8011D82C -/* 969914 80240754 24040001 */ addiu $a0, $zero, 1 -/* 969918 80240758 0000202D */ daddu $a0, $zero, $zero -/* 96991C 8024075C 0080282D */ daddu $a1, $a0, $zero -/* 969920 80240760 0080302D */ daddu $a2, $a0, $zero -/* 969924 80240764 0080382D */ daddu $a3, $a0, $zero -/* 969928 80240768 0080802D */ daddu $s0, $a0, $zero -/* 96992C 8024076C 2414FFFC */ addiu $s4, $zero, -4 -/* 969930 80240770 2413000A */ addiu $s3, $zero, 0xa -/* 969934 80240774 3C120080 */ lui $s2, 0x80 -/* 969938 80240778 3C038015 */ lui $v1, %hi(D_801512F0) -/* 96993C 8024077C 8C6312F0 */ lw $v1, %lo(D_801512F0)($v1) -/* 969940 80240780 24020001 */ addiu $v0, $zero, 1 -/* 969944 80240784 0C046F97 */ jal set_background_color_blend -/* 969948 80240788 A0620000 */ sb $v0, ($v1) -.L8024078C: -/* 96994C 8024078C 0C00E2B7 */ jal get_npc_by_index -/* 969950 80240790 0200202D */ daddu $a0, $s0, $zero -/* 969954 80240794 0040202D */ daddu $a0, $v0, $zero -/* 969958 80240798 5080000B */ beql $a0, $zero, .L802407C8 -/* 96995C 8024079C 26100001 */ addiu $s0, $s0, 1 -/* 969960 802407A0 8C820000 */ lw $v0, ($a0) -/* 969964 802407A4 50400008 */ beql $v0, $zero, .L802407C8 -/* 969968 802407A8 26100001 */ addiu $s0, $s0, 1 -/* 96996C 802407AC 808300A4 */ lb $v1, 0xa4($a0) -/* 969970 802407B0 10740005 */ beq $v1, $s4, .L802407C8 -/* 969974 802407B4 26100001 */ addiu $s0, $s0, 1 -/* 969978 802407B8 10730003 */ beq $v1, $s3, .L802407C8 -/* 96997C 802407BC 00000000 */ nop -/* 969980 802407C0 00521025 */ or $v0, $v0, $s2 -/* 969984 802407C4 AC820000 */ sw $v0, ($a0) -.L802407C8: -/* 969988 802407C8 2A020040 */ slti $v0, $s0, 0x40 -/* 96998C 802407CC 1440FFEF */ bnez $v0, .L8024078C -/* 969990 802407D0 00000000 */ nop -/* 969994 802407D4 0000802D */ daddu $s0, $zero, $zero -/* 969998 802407D8 3C120800 */ lui $s2, 0x800 -.L802407DC: -/* 96999C 802407DC 0C04C3D6 */ jal get_item_entity -/* 9699A0 802407E0 0200202D */ daddu $a0, $s0, $zero -/* 9699A4 802407E4 0040182D */ daddu $v1, $v0, $zero -/* 9699A8 802407E8 10600007 */ beqz $v1, .L80240808 -/* 9699AC 802407EC 26100001 */ addiu $s0, $s0, 1 -/* 9699B0 802407F0 8C640000 */ lw $a0, ($v1) -/* 9699B4 802407F4 30820010 */ andi $v0, $a0, 0x10 -/* 9699B8 802407F8 10400003 */ beqz $v0, .L80240808 -/* 9699BC 802407FC 00000000 */ nop -/* 9699C0 80240800 00921025 */ or $v0, $a0, $s2 -/* 9699C4 80240804 AC620000 */ sw $v0, ($v1) -.L80240808: -/* 9699C8 80240808 2A020100 */ slti $v0, $s0, 0x100 -/* 9699CC 8024080C 1440FFF3 */ bnez $v0, .L802407DC -/* 9699D0 80240810 00000000 */ nop -/* 9699D4 80240814 AE200070 */ sw $zero, 0x70($s1) -.L80240818: -/* 9699D8 80240818 8E220070 */ lw $v0, 0x70($s1) -/* 9699DC 8024081C 24420008 */ addiu $v0, $v0, 8 -/* 9699E0 80240820 AE220070 */ sw $v0, 0x70($s1) -/* 9699E4 80240824 28420100 */ slti $v0, $v0, 0x100 -/* 9699E8 80240828 14400003 */ bnez $v0, .L80240838 -/* 9699EC 8024082C 0000202D */ daddu $a0, $zero, $zero -/* 9699F0 80240830 240200FF */ addiu $v0, $zero, 0xff -/* 9699F4 80240834 AE220070 */ sw $v0, 0x70($s1) -.L80240838: -/* 9699F8 80240838 0080282D */ daddu $a1, $a0, $zero -/* 9699FC 8024083C 92270073 */ lbu $a3, 0x73($s1) -/* 969A00 80240840 0C046F97 */ jal set_background_color_blend -/* 969A04 80240844 0080302D */ daddu $a2, $a0, $zero -/* 969A08 80240848 8E220070 */ lw $v0, 0x70($s1) -/* 969A0C 8024084C 8FBF0024 */ lw $ra, 0x24($sp) -/* 969A10 80240850 8FB40020 */ lw $s4, 0x20($sp) -/* 969A14 80240854 8FB3001C */ lw $s3, 0x1c($sp) -/* 969A18 80240858 8FB20018 */ lw $s2, 0x18($sp) -/* 969A1C 8024085C 8FB10014 */ lw $s1, 0x14($sp) -/* 969A20 80240860 8FB00010 */ lw $s0, 0x10($sp) -/* 969A24 80240864 384200FF */ xori $v0, $v0, 0xff -/* 969A28 80240868 2C420001 */ sltiu $v0, $v0, 1 -/* 969A2C 8024086C 00021040 */ sll $v0, $v0, 1 -/* 969A30 80240870 03E00008 */ jr $ra -/* 969A34 80240874 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240C78_CAF9B8.s b/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240C78_CAF9B8.s deleted file mode 100644 index e53c8fd5ed..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240C78_CAF9B8.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C78_CAF9B8 -/* CAF9B8 80240C78 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CAF9BC 80240C7C AFBF0018 */ sw $ra, 0x18($sp) -/* CAF9C0 80240C80 0C00EAD2 */ jal get_npc_safe -/* CAF9C4 80240C84 2404FFFC */ addiu $a0, $zero, -4 -/* CAF9C8 80240C88 3C0141F0 */ lui $at, 0x41f0 -/* CAF9CC 80240C8C 44810000 */ mtc1 $at, $f0 -/* CAF9D0 80240C90 C442003C */ lwc1 $f2, 0x3c($v0) -/* CAF9D4 80240C94 46001080 */ add.s $f2, $f2, $f0 -/* CAF9D8 80240C98 E7A00010 */ swc1 $f0, 0x10($sp) -/* CAF9DC 80240C9C 8C450038 */ lw $a1, 0x38($v0) -/* CAF9E0 80240CA0 8C470040 */ lw $a3, 0x40($v0) -/* CAF9E4 80240CA4 44061000 */ mfc1 $a2, $f2 -/* CAF9E8 80240CA8 0C01BFBC */ jal func_8006FEF0 -/* CAF9EC 80240CAC 24040002 */ addiu $a0, $zero, 2 -/* CAF9F0 80240CB0 8FBF0018 */ lw $ra, 0x18($sp) -/* CAF9F4 80240CB4 24020002 */ addiu $v0, $zero, 2 -/* CAF9F8 80240CB8 03E00008 */ jr $ra -/* CAF9FC 80240CBC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240CC0_CAFA00.s b/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240CC0_CAFA00.s deleted file mode 100644 index f77a23f1cb..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240CC0_CAFA00.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CC0_CAFA00 -/* CAFA00 80240CC0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CAFA04 80240CC4 AFBF0018 */ sw $ra, 0x18($sp) -/* CAFA08 80240CC8 0C00EAD2 */ jal get_npc_safe -/* CAFA0C 80240CCC 2404FFFC */ addiu $a0, $zero, -4 -/* CAFA10 80240CD0 3C0141F0 */ lui $at, 0x41f0 -/* CAFA14 80240CD4 44810000 */ mtc1 $at, $f0 -/* CAFA18 80240CD8 C442003C */ lwc1 $f2, 0x3c($v0) -/* CAFA1C 80240CDC 46001080 */ add.s $f2, $f2, $f0 -/* CAFA20 80240CE0 E7A00010 */ swc1 $f0, 0x10($sp) -/* CAFA24 80240CE4 8C450038 */ lw $a1, 0x38($v0) -/* CAFA28 80240CE8 8C470040 */ lw $a3, 0x40($v0) -/* CAFA2C 80240CEC 44061000 */ mfc1 $a2, $f2 -/* CAFA30 80240CF0 0C01BFBC */ jal func_8006FEF0 -/* CAFA34 80240CF4 24040004 */ addiu $a0, $zero, 4 -/* CAFA38 80240CF8 8FBF0018 */ lw $ra, 0x18($sp) -/* CAFA3C 80240CFC 24020002 */ addiu $v0, $zero, 2 -/* CAFA40 80240D00 03E00008 */ jr $ra -/* CAFA44 80240D04 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80240FE0_CB5FE0.s b/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80240FE0_CB5FE0.s deleted file mode 100644 index 9d7ca94088..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80240FE0_CB5FE0.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FE0_CB5FE0 -/* CB5FE0 80240FE0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* CB5FE4 80240FE4 AFB3001C */ sw $s3, 0x1c($sp) -/* CB5FE8 80240FE8 0080982D */ daddu $s3, $a0, $zero -/* CB5FEC 80240FEC AFBF0020 */ sw $ra, 0x20($sp) -/* CB5FF0 80240FF0 AFB20018 */ sw $s2, 0x18($sp) -/* CB5FF4 80240FF4 AFB10014 */ sw $s1, 0x14($sp) -/* CB5FF8 80240FF8 AFB00010 */ sw $s0, 0x10($sp) -/* CB5FFC 80240FFC 8E720148 */ lw $s2, 0x148($s3) -/* CB6000 80241000 86440008 */ lh $a0, 8($s2) -/* CB6004 80241004 0C00EABB */ jal get_npc_unsafe -/* CB6008 80241008 00A0802D */ daddu $s0, $a1, $zero -/* CB600C 8024100C 0040882D */ daddu $s1, $v0, $zero -/* CB6010 80241010 C6420080 */ lwc1 $f2, 0x80($s2) -/* CB6014 80241014 468010A0 */ cvt.s.w $f2, $f2 -/* CB6018 80241018 460010A1 */ cvt.d.s $f2, $f2 -/* CB601C 8024101C C6400084 */ lwc1 $f0, 0x84($s2) -/* CB6020 80241020 46800020 */ cvt.s.w $f0, $f0 -/* CB6024 80241024 46000021 */ cvt.d.s $f0, $f0 -/* CB6028 80241028 3C014059 */ lui $at, 0x4059 -/* CB602C 8024102C 44812800 */ mtc1 $at, $f5 -/* CB6030 80241030 44802000 */ mtc1 $zero, $f4 -/* CB6034 80241034 8E4200CC */ lw $v0, 0xcc($s2) -/* CB6038 80241038 C62C0038 */ lwc1 $f12, 0x38($s1) -/* CB603C 8024103C C62E0040 */ lwc1 $f14, 0x40($s1) -/* CB6040 80241040 46241083 */ div.d $f2, $f2, $f4 -/* CB6044 80241044 462010A0 */ cvt.s.d $f2, $f2 -/* CB6048 80241048 46240003 */ div.d $f0, $f0, $f4 -/* CB604C 8024104C 8C420020 */ lw $v0, 0x20($v0) -/* CB6050 80241050 46200020 */ cvt.s.d $f0, $f0 -/* CB6054 80241054 E622001C */ swc1 $f2, 0x1c($s1) -/* CB6058 80241058 E6200014 */ swc1 $f0, 0x14($s1) -/* CB605C 8024105C AE220028 */ sw $v0, 0x28($s1) -/* CB6060 80241060 C6000018 */ lwc1 $f0, 0x18($s0) -/* CB6064 80241064 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CB6068 80241068 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CB606C 8024106C E6200018 */ swc1 $f0, 0x18($s1) -/* CB6070 80241070 8C460028 */ lw $a2, 0x28($v0) -/* CB6074 80241074 0C00A720 */ jal atan2 -/* CB6078 80241078 8C470030 */ lw $a3, 0x30($v0) -/* CB607C 8024107C E620000C */ swc1 $f0, 0xc($s1) -/* CB6080 80241080 8E420018 */ lw $v0, 0x18($s2) -/* CB6084 80241084 AE400074 */ sw $zero, 0x74($s2) -/* CB6088 80241088 9442002A */ lhu $v0, 0x2a($v0) -/* CB608C 8024108C 30420002 */ andi $v0, $v0, 2 -/* CB6090 80241090 10400005 */ beqz $v0, .L802410A8 -/* CB6094 80241094 24020003 */ addiu $v0, $zero, 3 -/* CB6098 80241098 A622008E */ sh $v0, 0x8e($s1) -/* CB609C 8024109C 2402000D */ addiu $v0, $zero, 0xd -/* CB60A0 802410A0 0809043E */ j .L802410F8 -/* CB60A4 802410A4 AE620070 */ sw $v0, 0x70($s3) -.L802410A8: -/* CB60A8 802410A8 24030001 */ addiu $v1, $zero, 1 -/* CB60AC 802410AC 2402000E */ addiu $v0, $zero, 0xe -/* CB60B0 802410B0 A623008E */ sh $v1, 0x8e($s1) -/* CB60B4 802410B4 AE620070 */ sw $v0, 0x70($s3) -/* CB60B8 802410B8 C6200038 */ lwc1 $f0, 0x38($s1) -/* CB60BC 802410BC 4600018D */ trunc.w.s $f6, $f0 -/* CB60C0 802410C0 44023000 */ mfc1 $v0, $f6 -/* CB60C4 802410C4 00000000 */ nop -/* CB60C8 802410C8 A6420010 */ sh $v0, 0x10($s2) -/* CB60CC 802410CC C620003C */ lwc1 $f0, 0x3c($s1) -/* CB60D0 802410D0 4600018D */ trunc.w.s $f6, $f0 -/* CB60D4 802410D4 44023000 */ mfc1 $v0, $f6 -/* CB60D8 802410D8 00000000 */ nop -/* CB60DC 802410DC A6420012 */ sh $v0, 0x12($s2) -/* CB60E0 802410E0 C6200040 */ lwc1 $f0, 0x40($s1) -/* CB60E4 802410E4 A2430007 */ sb $v1, 7($s2) -/* CB60E8 802410E8 4600018D */ trunc.w.s $f6, $f0 -/* CB60EC 802410EC 44023000 */ mfc1 $v0, $f6 -/* CB60F0 802410F0 00000000 */ nop -/* CB60F4 802410F4 A6420014 */ sh $v0, 0x14($s2) -.L802410F8: -/* CB60F8 802410F8 8FBF0020 */ lw $ra, 0x20($sp) -/* CB60FC 802410FC 8FB3001C */ lw $s3, 0x1c($sp) -/* CB6100 80241100 8FB20018 */ lw $s2, 0x18($sp) -/* CB6104 80241104 8FB10014 */ lw $s1, 0x14($sp) -/* CB6108 80241108 8FB00010 */ lw $s0, 0x10($sp) -/* CB610C 8024110C 03E00008 */ jr $ra -/* CB6110 80241110 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_8024162C_CB662C.s b/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_8024162C_CB662C.s index 76f7a3ea47..fb58a5bd7f 100644 --- a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_8024162C_CB662C.s +++ b/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_8024162C_CB662C.s @@ -110,7 +110,7 @@ glabel L80241798_CB6798 glabel L802417B0_CB67B0 /* CB67B0 802417B0 0280202D */ daddu $a0, $s4, $zero /* CB67B4 802417B4 0200282D */ daddu $a1, $s0, $zero -/* CB67B8 802417B8 0C0903F8 */ jal func_80240FE0_CB5FE0 +/* CB67B8 802417B8 0C0903F8 */ jal flo_09_UnkNpcAIFunc14 /* CB67BC 802417BC 0260302D */ daddu $a2, $s3, $zero /* CB67C0 802417C0 080905FD */ j .L802417F4 /* CB67C4 802417C4 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80240E84_CC4694.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80240E84_CC4694.s deleted file mode 100644 index 97ef424781..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80240E84_CC4694.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E84_CC4694 -/* CC4694 80240E84 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* CC4698 80240E88 AFB3001C */ sw $s3, 0x1c($sp) -/* CC469C 80240E8C 0080982D */ daddu $s3, $a0, $zero -/* CC46A0 80240E90 AFBF0020 */ sw $ra, 0x20($sp) -/* CC46A4 80240E94 AFB20018 */ sw $s2, 0x18($sp) -/* CC46A8 80240E98 AFB10014 */ sw $s1, 0x14($sp) -/* CC46AC 80240E9C AFB00010 */ sw $s0, 0x10($sp) -/* CC46B0 80240EA0 8E720148 */ lw $s2, 0x148($s3) -/* CC46B4 80240EA4 86440008 */ lh $a0, 8($s2) -/* CC46B8 80240EA8 0C00EABB */ jal get_npc_unsafe -/* CC46BC 80240EAC 00A0802D */ daddu $s0, $a1, $zero -/* CC46C0 80240EB0 0040882D */ daddu $s1, $v0, $zero -/* CC46C4 80240EB4 C6420080 */ lwc1 $f2, 0x80($s2) -/* CC46C8 80240EB8 468010A0 */ cvt.s.w $f2, $f2 -/* CC46CC 80240EBC 460010A1 */ cvt.d.s $f2, $f2 -/* CC46D0 80240EC0 C6400084 */ lwc1 $f0, 0x84($s2) -/* CC46D4 80240EC4 46800020 */ cvt.s.w $f0, $f0 -/* CC46D8 80240EC8 46000021 */ cvt.d.s $f0, $f0 -/* CC46DC 80240ECC 3C014059 */ lui $at, 0x4059 -/* CC46E0 80240ED0 44812800 */ mtc1 $at, $f5 -/* CC46E4 80240ED4 44802000 */ mtc1 $zero, $f4 -/* CC46E8 80240ED8 8E4200CC */ lw $v0, 0xcc($s2) -/* CC46EC 80240EDC C62C0038 */ lwc1 $f12, 0x38($s1) -/* CC46F0 80240EE0 C62E0040 */ lwc1 $f14, 0x40($s1) -/* CC46F4 80240EE4 46241083 */ div.d $f2, $f2, $f4 -/* CC46F8 80240EE8 462010A0 */ cvt.s.d $f2, $f2 -/* CC46FC 80240EEC 46240003 */ div.d $f0, $f0, $f4 -/* CC4700 80240EF0 8C420020 */ lw $v0, 0x20($v0) -/* CC4704 80240EF4 46200020 */ cvt.s.d $f0, $f0 -/* CC4708 80240EF8 E622001C */ swc1 $f2, 0x1c($s1) -/* CC470C 80240EFC E6200014 */ swc1 $f0, 0x14($s1) -/* CC4710 80240F00 AE220028 */ sw $v0, 0x28($s1) -/* CC4714 80240F04 C6000018 */ lwc1 $f0, 0x18($s0) -/* CC4718 80240F08 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CC471C 80240F0C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CC4720 80240F10 E6200018 */ swc1 $f0, 0x18($s1) -/* CC4724 80240F14 8C460028 */ lw $a2, 0x28($v0) -/* CC4728 80240F18 0C00A720 */ jal atan2 -/* CC472C 80240F1C 8C470030 */ lw $a3, 0x30($v0) -/* CC4730 80240F20 E620000C */ swc1 $f0, 0xc($s1) -/* CC4734 80240F24 8E420018 */ lw $v0, 0x18($s2) -/* CC4738 80240F28 AE400074 */ sw $zero, 0x74($s2) -/* CC473C 80240F2C 9442002A */ lhu $v0, 0x2a($v0) -/* CC4740 80240F30 30420002 */ andi $v0, $v0, 2 -/* CC4744 80240F34 10400005 */ beqz $v0, .L80240F4C -/* CC4748 80240F38 24020003 */ addiu $v0, $zero, 3 -/* CC474C 80240F3C A622008E */ sh $v0, 0x8e($s1) -/* CC4750 80240F40 2402000D */ addiu $v0, $zero, 0xd -/* CC4754 80240F44 080903E7 */ j .L80240F9C -/* CC4758 80240F48 AE620070 */ sw $v0, 0x70($s3) -.L80240F4C: -/* CC475C 80240F4C 24030001 */ addiu $v1, $zero, 1 -/* CC4760 80240F50 2402000E */ addiu $v0, $zero, 0xe -/* CC4764 80240F54 A623008E */ sh $v1, 0x8e($s1) -/* CC4768 80240F58 AE620070 */ sw $v0, 0x70($s3) -/* CC476C 80240F5C C6200038 */ lwc1 $f0, 0x38($s1) -/* CC4770 80240F60 4600018D */ trunc.w.s $f6, $f0 -/* CC4774 80240F64 44023000 */ mfc1 $v0, $f6 -/* CC4778 80240F68 00000000 */ nop -/* CC477C 80240F6C A6420010 */ sh $v0, 0x10($s2) -/* CC4780 80240F70 C620003C */ lwc1 $f0, 0x3c($s1) -/* CC4784 80240F74 4600018D */ trunc.w.s $f6, $f0 -/* CC4788 80240F78 44023000 */ mfc1 $v0, $f6 -/* CC478C 80240F7C 00000000 */ nop -/* CC4790 80240F80 A6420012 */ sh $v0, 0x12($s2) -/* CC4794 80240F84 C6200040 */ lwc1 $f0, 0x40($s1) -/* CC4798 80240F88 A2430007 */ sb $v1, 7($s2) -/* CC479C 80240F8C 4600018D */ trunc.w.s $f6, $f0 -/* CC47A0 80240F90 44023000 */ mfc1 $v0, $f6 -/* CC47A4 80240F94 00000000 */ nop -/* CC47A8 80240F98 A6420014 */ sh $v0, 0x14($s2) -.L80240F9C: -/* CC47AC 80240F9C 8FBF0020 */ lw $ra, 0x20($sp) -/* CC47B0 80240FA0 8FB3001C */ lw $s3, 0x1c($sp) -/* CC47B4 80240FA4 8FB20018 */ lw $s2, 0x18($sp) -/* CC47B8 80240FA8 8FB10014 */ lw $s1, 0x14($sp) -/* CC47BC 80240FAC 8FB00010 */ lw $s0, 0x10($sp) -/* CC47C0 80240FB0 03E00008 */ jr $ra -/* CC47C4 80240FB4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802414D0_CC4CE0.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802414D0_CC4CE0.s index dae1fa8aa3..24666d4af9 100644 --- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802414D0_CC4CE0.s +++ b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802414D0_CC4CE0.s @@ -110,7 +110,7 @@ glabel L8024163C_CC4E4C glabel L80241654_CC4E64 /* CC4E64 80241654 0280202D */ daddu $a0, $s4, $zero /* CC4E68 80241658 0200282D */ daddu $a1, $s0, $zero -/* CC4E6C 8024165C 0C0903A1 */ jal func_80240E84_CC4694 +/* CC4E6C 8024165C 0C0903A1 */ jal flo_13_UnkNpcAIFunc14 /* CC4E70 80241660 0260302D */ daddu $a2, $s3, $zero /* CC4E74 80241664 080905A6 */ j .L80241698 /* CC4E78 80241668 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241DB8_CC55C8.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241DB8_CC55C8.s index 967235fb43..e085cca7d2 100644 --- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241DB8_CC55C8.s +++ b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241DB8_CC55C8.s @@ -155,7 +155,7 @@ glabel func_80241DB8_CC55C8 .L80241FE4: /* CC57F4 80241FE4 0280202D */ daddu $a0, $s4, $zero /* CC57F8 80241FE8 02C0282D */ daddu $a1, $s6, $zero -/* CC57FC 80241FEC 0C0903A1 */ jal func_80240E84_CC4694 +/* CC57FC 80241FEC 0C0903A1 */ jal flo_13_UnkNpcAIFunc14 /* CC5800 80241FF0 02A0302D */ daddu $a2, $s5, $zero .L80241FF4: /* CC5804 80241FF4 0280202D */ daddu $a0, $s4, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_802417D0_CCCAE0.s b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_802417D0_CCCAE0.s deleted file mode 100644 index 94a64af97d..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_802417D0_CCCAE0.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802417D0_CCCAE0 -/* CCCAE0 802417D0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* CCCAE4 802417D4 AFB3001C */ sw $s3, 0x1c($sp) -/* CCCAE8 802417D8 0080982D */ daddu $s3, $a0, $zero -/* CCCAEC 802417DC AFBF0020 */ sw $ra, 0x20($sp) -/* CCCAF0 802417E0 AFB20018 */ sw $s2, 0x18($sp) -/* CCCAF4 802417E4 AFB10014 */ sw $s1, 0x14($sp) -/* CCCAF8 802417E8 AFB00010 */ sw $s0, 0x10($sp) -/* CCCAFC 802417EC 8E720148 */ lw $s2, 0x148($s3) -/* CCCB00 802417F0 86440008 */ lh $a0, 8($s2) -/* CCCB04 802417F4 0C00EABB */ jal get_npc_unsafe -/* CCCB08 802417F8 00A0802D */ daddu $s0, $a1, $zero -/* CCCB0C 802417FC 0040882D */ daddu $s1, $v0, $zero -/* CCCB10 80241800 C6420080 */ lwc1 $f2, 0x80($s2) -/* CCCB14 80241804 468010A0 */ cvt.s.w $f2, $f2 -/* CCCB18 80241808 460010A1 */ cvt.d.s $f2, $f2 -/* CCCB1C 8024180C C6400084 */ lwc1 $f0, 0x84($s2) -/* CCCB20 80241810 46800020 */ cvt.s.w $f0, $f0 -/* CCCB24 80241814 46000021 */ cvt.d.s $f0, $f0 -/* CCCB28 80241818 3C014059 */ lui $at, 0x4059 -/* CCCB2C 8024181C 44812800 */ mtc1 $at, $f5 -/* CCCB30 80241820 44802000 */ mtc1 $zero, $f4 -/* CCCB34 80241824 8E4200CC */ lw $v0, 0xcc($s2) -/* CCCB38 80241828 C62C0038 */ lwc1 $f12, 0x38($s1) -/* CCCB3C 8024182C C62E0040 */ lwc1 $f14, 0x40($s1) -/* CCCB40 80241830 46241083 */ div.d $f2, $f2, $f4 -/* CCCB44 80241834 462010A0 */ cvt.s.d $f2, $f2 -/* CCCB48 80241838 46240003 */ div.d $f0, $f0, $f4 -/* CCCB4C 8024183C 8C420020 */ lw $v0, 0x20($v0) -/* CCCB50 80241840 46200020 */ cvt.s.d $f0, $f0 -/* CCCB54 80241844 E622001C */ swc1 $f2, 0x1c($s1) -/* CCCB58 80241848 E6200014 */ swc1 $f0, 0x14($s1) -/* CCCB5C 8024184C AE220028 */ sw $v0, 0x28($s1) -/* CCCB60 80241850 C6000018 */ lwc1 $f0, 0x18($s0) -/* CCCB64 80241854 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CCCB68 80241858 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CCCB6C 8024185C E6200018 */ swc1 $f0, 0x18($s1) -/* CCCB70 80241860 8C460028 */ lw $a2, 0x28($v0) -/* CCCB74 80241864 0C00A720 */ jal atan2 -/* CCCB78 80241868 8C470030 */ lw $a3, 0x30($v0) -/* CCCB7C 8024186C E620000C */ swc1 $f0, 0xc($s1) -/* CCCB80 80241870 8E420018 */ lw $v0, 0x18($s2) -/* CCCB84 80241874 AE400074 */ sw $zero, 0x74($s2) -/* CCCB88 80241878 9442002A */ lhu $v0, 0x2a($v0) -/* CCCB8C 8024187C 30420002 */ andi $v0, $v0, 2 -/* CCCB90 80241880 10400005 */ beqz $v0, .L80241898 -/* CCCB94 80241884 24020003 */ addiu $v0, $zero, 3 -/* CCCB98 80241888 A622008E */ sh $v0, 0x8e($s1) -/* CCCB9C 8024188C 2402000D */ addiu $v0, $zero, 0xd -/* CCCBA0 80241890 0809063A */ j .L802418E8 -/* CCCBA4 80241894 AE620070 */ sw $v0, 0x70($s3) -.L80241898: -/* CCCBA8 80241898 24030001 */ addiu $v1, $zero, 1 -/* CCCBAC 8024189C 2402000E */ addiu $v0, $zero, 0xe -/* CCCBB0 802418A0 A623008E */ sh $v1, 0x8e($s1) -/* CCCBB4 802418A4 AE620070 */ sw $v0, 0x70($s3) -/* CCCBB8 802418A8 C6200038 */ lwc1 $f0, 0x38($s1) -/* CCCBBC 802418AC 4600018D */ trunc.w.s $f6, $f0 -/* CCCBC0 802418B0 44023000 */ mfc1 $v0, $f6 -/* CCCBC4 802418B4 00000000 */ nop -/* CCCBC8 802418B8 A6420010 */ sh $v0, 0x10($s2) -/* CCCBCC 802418BC C620003C */ lwc1 $f0, 0x3c($s1) -/* CCCBD0 802418C0 4600018D */ trunc.w.s $f6, $f0 -/* CCCBD4 802418C4 44023000 */ mfc1 $v0, $f6 -/* CCCBD8 802418C8 00000000 */ nop -/* CCCBDC 802418CC A6420012 */ sh $v0, 0x12($s2) -/* CCCBE0 802418D0 C6200040 */ lwc1 $f0, 0x40($s1) -/* CCCBE4 802418D4 A2430007 */ sb $v1, 7($s2) -/* CCCBE8 802418D8 4600018D */ trunc.w.s $f6, $f0 -/* CCCBEC 802418DC 44023000 */ mfc1 $v0, $f6 -/* CCCBF0 802418E0 00000000 */ nop -/* CCCBF4 802418E4 A6420014 */ sh $v0, 0x14($s2) -.L802418E8: -/* CCCBF8 802418E8 8FBF0020 */ lw $ra, 0x20($sp) -/* CCCBFC 802418EC 8FB3001C */ lw $s3, 0x1c($sp) -/* CCCC00 802418F0 8FB20018 */ lw $s2, 0x18($sp) -/* CCCC04 802418F4 8FB10014 */ lw $s1, 0x14($sp) -/* CCCC08 802418F8 8FB00010 */ lw $s0, 0x10($sp) -/* CCCC0C 802418FC 03E00008 */ jr $ra -/* CCCC10 80241900 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241E1C_CCD12C.s b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241E1C_CCD12C.s index 31c9363115..51184c1bf0 100644 --- a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241E1C_CCD12C.s +++ b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241E1C_CCD12C.s @@ -110,7 +110,7 @@ glabel L80241F88_CCD298 glabel L80241FA0_CCD2B0 /* CCD2B0 80241FA0 0280202D */ daddu $a0, $s4, $zero /* CCD2B4 80241FA4 0200282D */ daddu $a1, $s0, $zero -/* CCD2B8 80241FA8 0C0905F4 */ jal func_802417D0_CCCAE0 +/* CCD2B8 80241FA8 0C0905F4 */ jal flo_14_UnkNpcAIFunc14 /* CCD2BC 80241FAC 0260302D */ daddu $a2, $s3, $zero /* CCD2C0 80241FB0 080907F9 */ j .L80241FE4 /* CCD2C4 80241FB4 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240D58_CD2B88.s b/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240D58_CD2B88.s deleted file mode 100644 index 08d017b506..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240D58_CD2B88.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D58_CD2B88 -/* CD2B88 80240D58 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CD2B8C 80240D5C AFBF0018 */ sw $ra, 0x18($sp) -/* CD2B90 80240D60 0C00EAD2 */ jal get_npc_safe -/* CD2B94 80240D64 2404FFFC */ addiu $a0, $zero, -4 -/* CD2B98 80240D68 3C0141F0 */ lui $at, 0x41f0 -/* CD2B9C 80240D6C 44810000 */ mtc1 $at, $f0 -/* CD2BA0 80240D70 C442003C */ lwc1 $f2, 0x3c($v0) -/* CD2BA4 80240D74 46001080 */ add.s $f2, $f2, $f0 -/* CD2BA8 80240D78 E7A00010 */ swc1 $f0, 0x10($sp) -/* CD2BAC 80240D7C 8C450038 */ lw $a1, 0x38($v0) -/* CD2BB0 80240D80 8C470040 */ lw $a3, 0x40($v0) -/* CD2BB4 80240D84 44061000 */ mfc1 $a2, $f2 -/* CD2BB8 80240D88 0C01BFBC */ jal func_8006FEF0 -/* CD2BBC 80240D8C 24040002 */ addiu $a0, $zero, 2 -/* CD2BC0 80240D90 8FBF0018 */ lw $ra, 0x18($sp) -/* CD2BC4 80240D94 24020002 */ addiu $v0, $zero, 2 -/* CD2BC8 80240D98 03E00008 */ jr $ra -/* CD2BCC 80240D9C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240DA0_CD2BD0.s b/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240DA0_CD2BD0.s deleted file mode 100644 index 6423b74d60..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240DA0_CD2BD0.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DA0_CD2BD0 -/* CD2BD0 80240DA0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CD2BD4 80240DA4 AFBF0018 */ sw $ra, 0x18($sp) -/* CD2BD8 80240DA8 0C00EAD2 */ jal get_npc_safe -/* CD2BDC 80240DAC 2404FFFC */ addiu $a0, $zero, -4 -/* CD2BE0 80240DB0 3C0141F0 */ lui $at, 0x41f0 -/* CD2BE4 80240DB4 44810000 */ mtc1 $at, $f0 -/* CD2BE8 80240DB8 C442003C */ lwc1 $f2, 0x3c($v0) -/* CD2BEC 80240DBC 46001080 */ add.s $f2, $f2, $f0 -/* CD2BF0 80240DC0 E7A00010 */ swc1 $f0, 0x10($sp) -/* CD2BF4 80240DC4 8C450038 */ lw $a1, 0x38($v0) -/* CD2BF8 80240DC8 8C470040 */ lw $a3, 0x40($v0) -/* CD2BFC 80240DCC 44061000 */ mfc1 $a2, $f2 -/* CD2C00 80240DD0 0C01BFBC */ jal func_8006FEF0 -/* CD2C04 80240DD4 24040004 */ addiu $a0, $zero, 4 -/* CD2C08 80240DD8 8FBF0018 */ lw $ra, 0x18($sp) -/* CD2C0C 80240DDC 24020002 */ addiu $v0, $zero, 2 -/* CD2C10 80240DE0 03E00008 */ jr $ra -/* CD2C14 80240DE4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80241B10_CD3940.s b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80241B10_CD3940.s deleted file mode 100644 index 9bcd863831..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80241B10_CD3940.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B10_CD3940 -/* CD3940 80241B10 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* CD3944 80241B14 AFB3001C */ sw $s3, 0x1c($sp) -/* CD3948 80241B18 0080982D */ daddu $s3, $a0, $zero -/* CD394C 80241B1C AFBF0020 */ sw $ra, 0x20($sp) -/* CD3950 80241B20 AFB20018 */ sw $s2, 0x18($sp) -/* CD3954 80241B24 AFB10014 */ sw $s1, 0x14($sp) -/* CD3958 80241B28 AFB00010 */ sw $s0, 0x10($sp) -/* CD395C 80241B2C 8E720148 */ lw $s2, 0x148($s3) -/* CD3960 80241B30 86440008 */ lh $a0, 8($s2) -/* CD3964 80241B34 0C00EABB */ jal get_npc_unsafe -/* CD3968 80241B38 00A0802D */ daddu $s0, $a1, $zero -/* CD396C 80241B3C 0040882D */ daddu $s1, $v0, $zero -/* CD3970 80241B40 C6420080 */ lwc1 $f2, 0x80($s2) -/* CD3974 80241B44 468010A0 */ cvt.s.w $f2, $f2 -/* CD3978 80241B48 460010A1 */ cvt.d.s $f2, $f2 -/* CD397C 80241B4C C6400084 */ lwc1 $f0, 0x84($s2) -/* CD3980 80241B50 46800020 */ cvt.s.w $f0, $f0 -/* CD3984 80241B54 46000021 */ cvt.d.s $f0, $f0 -/* CD3988 80241B58 3C014059 */ lui $at, 0x4059 -/* CD398C 80241B5C 44812800 */ mtc1 $at, $f5 -/* CD3990 80241B60 44802000 */ mtc1 $zero, $f4 -/* CD3994 80241B64 8E4200CC */ lw $v0, 0xcc($s2) -/* CD3998 80241B68 C62C0038 */ lwc1 $f12, 0x38($s1) -/* CD399C 80241B6C C62E0040 */ lwc1 $f14, 0x40($s1) -/* CD39A0 80241B70 46241083 */ div.d $f2, $f2, $f4 -/* CD39A4 80241B74 462010A0 */ cvt.s.d $f2, $f2 -/* CD39A8 80241B78 46240003 */ div.d $f0, $f0, $f4 -/* CD39AC 80241B7C 8C420020 */ lw $v0, 0x20($v0) -/* CD39B0 80241B80 46200020 */ cvt.s.d $f0, $f0 -/* CD39B4 80241B84 E622001C */ swc1 $f2, 0x1c($s1) -/* CD39B8 80241B88 E6200014 */ swc1 $f0, 0x14($s1) -/* CD39BC 80241B8C AE220028 */ sw $v0, 0x28($s1) -/* CD39C0 80241B90 C6000018 */ lwc1 $f0, 0x18($s0) -/* CD39C4 80241B94 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CD39C8 80241B98 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CD39CC 80241B9C E6200018 */ swc1 $f0, 0x18($s1) -/* CD39D0 80241BA0 8C460028 */ lw $a2, 0x28($v0) -/* CD39D4 80241BA4 0C00A720 */ jal atan2 -/* CD39D8 80241BA8 8C470030 */ lw $a3, 0x30($v0) -/* CD39DC 80241BAC E620000C */ swc1 $f0, 0xc($s1) -/* CD39E0 80241BB0 8E420018 */ lw $v0, 0x18($s2) -/* CD39E4 80241BB4 AE400074 */ sw $zero, 0x74($s2) -/* CD39E8 80241BB8 9442002A */ lhu $v0, 0x2a($v0) -/* CD39EC 80241BBC 30420002 */ andi $v0, $v0, 2 -/* CD39F0 80241BC0 10400005 */ beqz $v0, .L80241BD8 -/* CD39F4 80241BC4 24020003 */ addiu $v0, $zero, 3 -/* CD39F8 80241BC8 A622008E */ sh $v0, 0x8e($s1) -/* CD39FC 80241BCC 2402000D */ addiu $v0, $zero, 0xd -/* CD3A00 80241BD0 0809070A */ j .L80241C28 -/* CD3A04 80241BD4 AE620070 */ sw $v0, 0x70($s3) -.L80241BD8: -/* CD3A08 80241BD8 24030001 */ addiu $v1, $zero, 1 -/* CD3A0C 80241BDC 2402000E */ addiu $v0, $zero, 0xe -/* CD3A10 80241BE0 A623008E */ sh $v1, 0x8e($s1) -/* CD3A14 80241BE4 AE620070 */ sw $v0, 0x70($s3) -/* CD3A18 80241BE8 C6200038 */ lwc1 $f0, 0x38($s1) -/* CD3A1C 80241BEC 4600018D */ trunc.w.s $f6, $f0 -/* CD3A20 80241BF0 44023000 */ mfc1 $v0, $f6 -/* CD3A24 80241BF4 00000000 */ nop -/* CD3A28 80241BF8 A6420010 */ sh $v0, 0x10($s2) -/* CD3A2C 80241BFC C620003C */ lwc1 $f0, 0x3c($s1) -/* CD3A30 80241C00 4600018D */ trunc.w.s $f6, $f0 -/* CD3A34 80241C04 44023000 */ mfc1 $v0, $f6 -/* CD3A38 80241C08 00000000 */ nop -/* CD3A3C 80241C0C A6420012 */ sh $v0, 0x12($s2) -/* CD3A40 80241C10 C6200040 */ lwc1 $f0, 0x40($s1) -/* CD3A44 80241C14 A2430007 */ sb $v1, 7($s2) -/* CD3A48 80241C18 4600018D */ trunc.w.s $f6, $f0 -/* CD3A4C 80241C1C 44023000 */ mfc1 $v0, $f6 -/* CD3A50 80241C20 00000000 */ nop -/* CD3A54 80241C24 A6420014 */ sh $v0, 0x14($s2) -.L80241C28: -/* CD3A58 80241C28 8FBF0020 */ lw $ra, 0x20($sp) -/* CD3A5C 80241C2C 8FB3001C */ lw $s3, 0x1c($sp) -/* CD3A60 80241C30 8FB20018 */ lw $s2, 0x18($sp) -/* CD3A64 80241C34 8FB10014 */ lw $s1, 0x14($sp) -/* CD3A68 80241C38 8FB00010 */ lw $s0, 0x10($sp) -/* CD3A6C 80241C3C 03E00008 */ jr $ra -/* CD3A70 80241C40 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_8024215C_CD3F8C.s b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_8024215C_CD3F8C.s index baf298352b..4a54eb20b7 100644 --- a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_8024215C_CD3F8C.s +++ b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_8024215C_CD3F8C.s @@ -110,7 +110,7 @@ glabel L802422C8_CD40F8 glabel L802422E0_CD4110 /* CD4110 802422E0 0280202D */ daddu $a0, $s4, $zero /* CD4114 802422E4 0200282D */ daddu $a1, $s0, $zero -/* CD4118 802422E8 0C0906C4 */ jal func_80241B10_CD3940 +/* CD4118 802422E8 0C0906C4 */ jal flo_16_UnkNpcAIFunc14 /* CD411C 802422EC 0260302D */ daddu $a2, $s3, $zero /* CD4120 802422F0 080908C9 */ j .L80242324 /* CD4124 802422F4 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240D30_CD8010.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240D30_CD8010.s deleted file mode 100644 index b830a81c9a..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240D30_CD8010.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D30_CD8010 -/* CD8010 80240D30 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* CD8014 80240D34 AFB3001C */ sw $s3, 0x1c($sp) -/* CD8018 80240D38 0080982D */ daddu $s3, $a0, $zero -/* CD801C 80240D3C AFBF0020 */ sw $ra, 0x20($sp) -/* CD8020 80240D40 AFB20018 */ sw $s2, 0x18($sp) -/* CD8024 80240D44 AFB10014 */ sw $s1, 0x14($sp) -/* CD8028 80240D48 AFB00010 */ sw $s0, 0x10($sp) -/* CD802C 80240D4C 8E720148 */ lw $s2, 0x148($s3) -/* CD8030 80240D50 86440008 */ lh $a0, 8($s2) -/* CD8034 80240D54 0C00EABB */ jal get_npc_unsafe -/* CD8038 80240D58 00A0802D */ daddu $s0, $a1, $zero -/* CD803C 80240D5C 0040882D */ daddu $s1, $v0, $zero -/* CD8040 80240D60 C6420080 */ lwc1 $f2, 0x80($s2) -/* CD8044 80240D64 468010A0 */ cvt.s.w $f2, $f2 -/* CD8048 80240D68 460010A1 */ cvt.d.s $f2, $f2 -/* CD804C 80240D6C C6400084 */ lwc1 $f0, 0x84($s2) -/* CD8050 80240D70 46800020 */ cvt.s.w $f0, $f0 -/* CD8054 80240D74 46000021 */ cvt.d.s $f0, $f0 -/* CD8058 80240D78 3C014059 */ lui $at, 0x4059 -/* CD805C 80240D7C 44812800 */ mtc1 $at, $f5 -/* CD8060 80240D80 44802000 */ mtc1 $zero, $f4 -/* CD8064 80240D84 8E4200CC */ lw $v0, 0xcc($s2) -/* CD8068 80240D88 C62C0038 */ lwc1 $f12, 0x38($s1) -/* CD806C 80240D8C C62E0040 */ lwc1 $f14, 0x40($s1) -/* CD8070 80240D90 46241083 */ div.d $f2, $f2, $f4 -/* CD8074 80240D94 462010A0 */ cvt.s.d $f2, $f2 -/* CD8078 80240D98 46240003 */ div.d $f0, $f0, $f4 -/* CD807C 80240D9C 8C420020 */ lw $v0, 0x20($v0) -/* CD8080 80240DA0 46200020 */ cvt.s.d $f0, $f0 -/* CD8084 80240DA4 E622001C */ swc1 $f2, 0x1c($s1) -/* CD8088 80240DA8 E6200014 */ swc1 $f0, 0x14($s1) -/* CD808C 80240DAC AE220028 */ sw $v0, 0x28($s1) -/* CD8090 80240DB0 C6000018 */ lwc1 $f0, 0x18($s0) -/* CD8094 80240DB4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CD8098 80240DB8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CD809C 80240DBC E6200018 */ swc1 $f0, 0x18($s1) -/* CD80A0 80240DC0 8C460028 */ lw $a2, 0x28($v0) -/* CD80A4 80240DC4 0C00A720 */ jal atan2 -/* CD80A8 80240DC8 8C470030 */ lw $a3, 0x30($v0) -/* CD80AC 80240DCC E620000C */ swc1 $f0, 0xc($s1) -/* CD80B0 80240DD0 8E420018 */ lw $v0, 0x18($s2) -/* CD80B4 80240DD4 AE400074 */ sw $zero, 0x74($s2) -/* CD80B8 80240DD8 9442002A */ lhu $v0, 0x2a($v0) -/* CD80BC 80240DDC 30420002 */ andi $v0, $v0, 2 -/* CD80C0 80240DE0 10400005 */ beqz $v0, .L80240DF8 -/* CD80C4 80240DE4 24020003 */ addiu $v0, $zero, 3 -/* CD80C8 80240DE8 A622008E */ sh $v0, 0x8e($s1) -/* CD80CC 80240DEC 2402000D */ addiu $v0, $zero, 0xd -/* CD80D0 80240DF0 08090392 */ j .L80240E48 -/* CD80D4 80240DF4 AE620070 */ sw $v0, 0x70($s3) -.L80240DF8: -/* CD80D8 80240DF8 24030001 */ addiu $v1, $zero, 1 -/* CD80DC 80240DFC 2402000E */ addiu $v0, $zero, 0xe -/* CD80E0 80240E00 A623008E */ sh $v1, 0x8e($s1) -/* CD80E4 80240E04 AE620070 */ sw $v0, 0x70($s3) -/* CD80E8 80240E08 C6200038 */ lwc1 $f0, 0x38($s1) -/* CD80EC 80240E0C 4600018D */ trunc.w.s $f6, $f0 -/* CD80F0 80240E10 44023000 */ mfc1 $v0, $f6 -/* CD80F4 80240E14 00000000 */ nop -/* CD80F8 80240E18 A6420010 */ sh $v0, 0x10($s2) -/* CD80FC 80240E1C C620003C */ lwc1 $f0, 0x3c($s1) -/* CD8100 80240E20 4600018D */ trunc.w.s $f6, $f0 -/* CD8104 80240E24 44023000 */ mfc1 $v0, $f6 -/* CD8108 80240E28 00000000 */ nop -/* CD810C 80240E2C A6420012 */ sh $v0, 0x12($s2) -/* CD8110 80240E30 C6200040 */ lwc1 $f0, 0x40($s1) -/* CD8114 80240E34 A2430007 */ sb $v1, 7($s2) -/* CD8118 80240E38 4600018D */ trunc.w.s $f6, $f0 -/* CD811C 80240E3C 44023000 */ mfc1 $v0, $f6 -/* CD8120 80240E40 00000000 */ nop -/* CD8124 80240E44 A6420014 */ sh $v0, 0x14($s2) -.L80240E48: -/* CD8128 80240E48 8FBF0020 */ lw $ra, 0x20($sp) -/* CD812C 80240E4C 8FB3001C */ lw $s3, 0x1c($sp) -/* CD8130 80240E50 8FB20018 */ lw $s2, 0x18($sp) -/* CD8134 80240E54 8FB10014 */ lw $s1, 0x14($sp) -/* CD8138 80240E58 8FB00010 */ lw $s0, 0x10($sp) -/* CD813C 80240E5C 03E00008 */ jr $ra -/* CD8140 80240E60 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_8024137C_CD865C.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_8024137C_CD865C.s index 4aa1647a86..c6b8155c53 100644 --- a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_8024137C_CD865C.s +++ b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_8024137C_CD865C.s @@ -110,7 +110,7 @@ glabel L802414E8_CD87C8 glabel L80241500_CD87E0 /* CD87E0 80241500 0280202D */ daddu $a0, $s4, $zero /* CD87E4 80241504 0200282D */ daddu $a1, $s0, $zero -/* CD87E8 80241508 0C09034C */ jal func_80240D30_CD8010 +/* CD87E8 80241508 0C09034C */ jal flo_17_UnkNpcAIFunc14 /* CD87EC 8024150C 0260302D */ daddu $a2, $s3, $zero /* CD87F0 80241510 08090551 */ j .L80241544 /* CD87F4 80241514 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241C64_CD8F44.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241C64_CD8F44.s index dfb0881690..b0a8fefd6e 100644 --- a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241C64_CD8F44.s +++ b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241C64_CD8F44.s @@ -155,7 +155,7 @@ glabel func_80241C64_CD8F44 .L80241E90: /* CD9170 80241E90 0280202D */ daddu $a0, $s4, $zero /* CD9174 80241E94 02C0282D */ daddu $a1, $s6, $zero -/* CD9178 80241E98 0C09034C */ jal func_80240D30_CD8010 +/* CD9178 80241E98 0C09034C */ jal flo_17_UnkNpcAIFunc14 /* CD917C 80241E9C 02A0302D */ daddu $a2, $s5, $zero .L80241EA0: /* CD9180 80241EA0 0280202D */ daddu $a0, $s4, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240D00_CF38D0.s b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240D00_CF38D0.s deleted file mode 100644 index 080c399ad4..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240D00_CF38D0.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D00_CF38D0 -/* CF38D0 80240D00 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* CF38D4 80240D04 AFB3001C */ sw $s3, 0x1c($sp) -/* CF38D8 80240D08 0080982D */ daddu $s3, $a0, $zero -/* CF38DC 80240D0C AFBF0020 */ sw $ra, 0x20($sp) -/* CF38E0 80240D10 AFB20018 */ sw $s2, 0x18($sp) -/* CF38E4 80240D14 AFB10014 */ sw $s1, 0x14($sp) -/* CF38E8 80240D18 AFB00010 */ sw $s0, 0x10($sp) -/* CF38EC 80240D1C 8E720148 */ lw $s2, 0x148($s3) -/* CF38F0 80240D20 86440008 */ lh $a0, 8($s2) -/* CF38F4 80240D24 0C00EABB */ jal get_npc_unsafe -/* CF38F8 80240D28 00A0802D */ daddu $s0, $a1, $zero -/* CF38FC 80240D2C 0040882D */ daddu $s1, $v0, $zero -/* CF3900 80240D30 C6420080 */ lwc1 $f2, 0x80($s2) -/* CF3904 80240D34 468010A0 */ cvt.s.w $f2, $f2 -/* CF3908 80240D38 460010A1 */ cvt.d.s $f2, $f2 -/* CF390C 80240D3C C6400084 */ lwc1 $f0, 0x84($s2) -/* CF3910 80240D40 46800020 */ cvt.s.w $f0, $f0 -/* CF3914 80240D44 46000021 */ cvt.d.s $f0, $f0 -/* CF3918 80240D48 3C014059 */ lui $at, 0x4059 -/* CF391C 80240D4C 44812800 */ mtc1 $at, $f5 -/* CF3920 80240D50 44802000 */ mtc1 $zero, $f4 -/* CF3924 80240D54 8E4200CC */ lw $v0, 0xcc($s2) -/* CF3928 80240D58 C62C0038 */ lwc1 $f12, 0x38($s1) -/* CF392C 80240D5C C62E0040 */ lwc1 $f14, 0x40($s1) -/* CF3930 80240D60 46241083 */ div.d $f2, $f2, $f4 -/* CF3934 80240D64 462010A0 */ cvt.s.d $f2, $f2 -/* CF3938 80240D68 46240003 */ div.d $f0, $f0, $f4 -/* CF393C 80240D6C 8C420020 */ lw $v0, 0x20($v0) -/* CF3940 80240D70 46200020 */ cvt.s.d $f0, $f0 -/* CF3944 80240D74 E622001C */ swc1 $f2, 0x1c($s1) -/* CF3948 80240D78 E6200014 */ swc1 $f0, 0x14($s1) -/* CF394C 80240D7C AE220028 */ sw $v0, 0x28($s1) -/* CF3950 80240D80 C6000018 */ lwc1 $f0, 0x18($s0) -/* CF3954 80240D84 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CF3958 80240D88 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CF395C 80240D8C E6200018 */ swc1 $f0, 0x18($s1) -/* CF3960 80240D90 8C460028 */ lw $a2, 0x28($v0) -/* CF3964 80240D94 0C00A720 */ jal atan2 -/* CF3968 80240D98 8C470030 */ lw $a3, 0x30($v0) -/* CF396C 80240D9C E620000C */ swc1 $f0, 0xc($s1) -/* CF3970 80240DA0 8E420018 */ lw $v0, 0x18($s2) -/* CF3974 80240DA4 AE400074 */ sw $zero, 0x74($s2) -/* CF3978 80240DA8 9442002A */ lhu $v0, 0x2a($v0) -/* CF397C 80240DAC 30420002 */ andi $v0, $v0, 2 -/* CF3980 80240DB0 10400005 */ beqz $v0, .L80240DC8 -/* CF3984 80240DB4 24020003 */ addiu $v0, $zero, 3 -/* CF3988 80240DB8 A622008E */ sh $v0, 0x8e($s1) -/* CF398C 80240DBC 2402000D */ addiu $v0, $zero, 0xd -/* CF3990 80240DC0 08090386 */ j .L80240E18 -/* CF3994 80240DC4 AE620070 */ sw $v0, 0x70($s3) -.L80240DC8: -/* CF3998 80240DC8 24030001 */ addiu $v1, $zero, 1 -/* CF399C 80240DCC 2402000E */ addiu $v0, $zero, 0xe -/* CF39A0 80240DD0 A623008E */ sh $v1, 0x8e($s1) -/* CF39A4 80240DD4 AE620070 */ sw $v0, 0x70($s3) -/* CF39A8 80240DD8 C6200038 */ lwc1 $f0, 0x38($s1) -/* CF39AC 80240DDC 4600018D */ trunc.w.s $f6, $f0 -/* CF39B0 80240DE0 44023000 */ mfc1 $v0, $f6 -/* CF39B4 80240DE4 00000000 */ nop -/* CF39B8 80240DE8 A6420010 */ sh $v0, 0x10($s2) -/* CF39BC 80240DEC C620003C */ lwc1 $f0, 0x3c($s1) -/* CF39C0 80240DF0 4600018D */ trunc.w.s $f6, $f0 -/* CF39C4 80240DF4 44023000 */ mfc1 $v0, $f6 -/* CF39C8 80240DF8 00000000 */ nop -/* CF39CC 80240DFC A6420012 */ sh $v0, 0x12($s2) -/* CF39D0 80240E00 C6200040 */ lwc1 $f0, 0x40($s1) -/* CF39D4 80240E04 A2430007 */ sb $v1, 7($s2) -/* CF39D8 80240E08 4600018D */ trunc.w.s $f6, $f0 -/* CF39DC 80240E0C 44023000 */ mfc1 $v0, $f6 -/* CF39E0 80240E10 00000000 */ nop -/* CF39E4 80240E14 A6420014 */ sh $v0, 0x14($s2) -.L80240E18: -/* CF39E8 80240E18 8FBF0020 */ lw $ra, 0x20($sp) -/* CF39EC 80240E1C 8FB3001C */ lw $s3, 0x1c($sp) -/* CF39F0 80240E20 8FB20018 */ lw $s2, 0x18($sp) -/* CF39F4 80240E24 8FB10014 */ lw $s1, 0x14($sp) -/* CF39F8 80240E28 8FB00010 */ lw $s0, 0x10($sp) -/* CF39FC 80240E2C 03E00008 */ jr $ra -/* CF3A00 80240E30 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_8024134C_CF3F1C.s b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_8024134C_CF3F1C.s index 670c181dfe..f43c10d8c1 100644 --- a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_8024134C_CF3F1C.s +++ b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_8024134C_CF3F1C.s @@ -110,7 +110,7 @@ glabel L802414B8_CF4088 glabel L802414D0_CF40A0 /* CF40A0 802414D0 0280202D */ daddu $a0, $s4, $zero /* CF40A4 802414D4 0200282D */ daddu $a1, $s0, $zero -/* CF40A8 802414D8 0C090340 */ jal func_80240D00_CF38D0 +/* CF40A8 802414D8 0C090340 */ jal flo_25_UnkNpcAIFunc14 /* CF40AC 802414DC 0260302D */ daddu $a2, $s3, $zero /* CF40B0 802414E0 08090545 */ j .L80241514 /* CF40B4 802414E4 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241CB0_A17ED0.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241CB0_A17ED0.s deleted file mode 100644 index 7f7ce35b88..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241CB0_A17ED0.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241CB0_A17ED0 -/* A17ED0 80241CB0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A17ED4 80241CB4 AFB3001C */ sw $s3, 0x1c($sp) -/* A17ED8 80241CB8 0080982D */ daddu $s3, $a0, $zero -/* A17EDC 80241CBC AFBF0020 */ sw $ra, 0x20($sp) -/* A17EE0 80241CC0 AFB20018 */ sw $s2, 0x18($sp) -/* A17EE4 80241CC4 AFB10014 */ sw $s1, 0x14($sp) -/* A17EE8 80241CC8 AFB00010 */ sw $s0, 0x10($sp) -/* A17EEC 80241CCC 8E720148 */ lw $s2, 0x148($s3) -/* A17EF0 80241CD0 86440008 */ lh $a0, 8($s2) -/* A17EF4 80241CD4 0C00EABB */ jal get_npc_unsafe -/* A17EF8 80241CD8 00A0802D */ daddu $s0, $a1, $zero -/* A17EFC 80241CDC 0040882D */ daddu $s1, $v0, $zero -/* A17F00 80241CE0 C6420080 */ lwc1 $f2, 0x80($s2) -/* A17F04 80241CE4 468010A0 */ cvt.s.w $f2, $f2 -/* A17F08 80241CE8 460010A1 */ cvt.d.s $f2, $f2 -/* A17F0C 80241CEC C6400084 */ lwc1 $f0, 0x84($s2) -/* A17F10 80241CF0 46800020 */ cvt.s.w $f0, $f0 -/* A17F14 80241CF4 46000021 */ cvt.d.s $f0, $f0 -/* A17F18 80241CF8 3C014059 */ lui $at, 0x4059 -/* A17F1C 80241CFC 44812800 */ mtc1 $at, $f5 -/* A17F20 80241D00 44802000 */ mtc1 $zero, $f4 -/* A17F24 80241D04 8E4200CC */ lw $v0, 0xcc($s2) -/* A17F28 80241D08 C62C0038 */ lwc1 $f12, 0x38($s1) -/* A17F2C 80241D0C C62E0040 */ lwc1 $f14, 0x40($s1) -/* A17F30 80241D10 46241083 */ div.d $f2, $f2, $f4 -/* A17F34 80241D14 462010A0 */ cvt.s.d $f2, $f2 -/* A17F38 80241D18 46240003 */ div.d $f0, $f0, $f4 -/* A17F3C 80241D1C 8C420020 */ lw $v0, 0x20($v0) -/* A17F40 80241D20 46200020 */ cvt.s.d $f0, $f0 -/* A17F44 80241D24 E622001C */ swc1 $f2, 0x1c($s1) -/* A17F48 80241D28 E6200014 */ swc1 $f0, 0x14($s1) -/* A17F4C 80241D2C AE220028 */ sw $v0, 0x28($s1) -/* A17F50 80241D30 C6000018 */ lwc1 $f0, 0x18($s0) -/* A17F54 80241D34 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A17F58 80241D38 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A17F5C 80241D3C E6200018 */ swc1 $f0, 0x18($s1) -/* A17F60 80241D40 8C460028 */ lw $a2, 0x28($v0) -/* A17F64 80241D44 0C00A720 */ jal atan2 -/* A17F68 80241D48 8C470030 */ lw $a3, 0x30($v0) -/* A17F6C 80241D4C E620000C */ swc1 $f0, 0xc($s1) -/* A17F70 80241D50 8E420018 */ lw $v0, 0x18($s2) -/* A17F74 80241D54 AE400074 */ sw $zero, 0x74($s2) -/* A17F78 80241D58 9442002A */ lhu $v0, 0x2a($v0) -/* A17F7C 80241D5C 30420002 */ andi $v0, $v0, 2 -/* A17F80 80241D60 10400005 */ beqz $v0, .L80241D78 -/* A17F84 80241D64 24020003 */ addiu $v0, $zero, 3 -/* A17F88 80241D68 A622008E */ sh $v0, 0x8e($s1) -/* A17F8C 80241D6C 2402000D */ addiu $v0, $zero, 0xd -/* A17F90 80241D70 08090772 */ j .L80241DC8 -/* A17F94 80241D74 AE620070 */ sw $v0, 0x70($s3) -.L80241D78: -/* A17F98 80241D78 24030001 */ addiu $v1, $zero, 1 -/* A17F9C 80241D7C 2402000E */ addiu $v0, $zero, 0xe -/* A17FA0 80241D80 A623008E */ sh $v1, 0x8e($s1) -/* A17FA4 80241D84 AE620070 */ sw $v0, 0x70($s3) -/* A17FA8 80241D88 C6200038 */ lwc1 $f0, 0x38($s1) -/* A17FAC 80241D8C 4600018D */ trunc.w.s $f6, $f0 -/* A17FB0 80241D90 44023000 */ mfc1 $v0, $f6 -/* A17FB4 80241D94 00000000 */ nop -/* A17FB8 80241D98 A6420010 */ sh $v0, 0x10($s2) -/* A17FBC 80241D9C C620003C */ lwc1 $f0, 0x3c($s1) -/* A17FC0 80241DA0 4600018D */ trunc.w.s $f6, $f0 -/* A17FC4 80241DA4 44023000 */ mfc1 $v0, $f6 -/* A17FC8 80241DA8 00000000 */ nop -/* A17FCC 80241DAC A6420012 */ sh $v0, 0x12($s2) -/* A17FD0 80241DB0 C6200040 */ lwc1 $f0, 0x40($s1) -/* A17FD4 80241DB4 A2430007 */ sb $v1, 7($s2) -/* A17FD8 80241DB8 4600018D */ trunc.w.s $f6, $f0 -/* A17FDC 80241DBC 44023000 */ mfc1 $v0, $f6 -/* A17FE0 80241DC0 00000000 */ nop -/* A17FE4 80241DC4 A6420014 */ sh $v0, 0x14($s2) -.L80241DC8: -/* A17FE8 80241DC8 8FBF0020 */ lw $ra, 0x20($sp) -/* A17FEC 80241DCC 8FB3001C */ lw $s3, 0x1c($sp) -/* A17FF0 80241DD0 8FB20018 */ lw $s2, 0x18($sp) -/* A17FF4 80241DD4 8FB10014 */ lw $s1, 0x14($sp) -/* A17FF8 80241DD8 8FB00010 */ lw $s0, 0x10($sp) -/* A17FFC 80241DDC 03E00008 */ jr $ra -/* A18000 80241DE0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802422FC_A1851C.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802422FC_A1851C.s index 60d62e1369..5d49510ee7 100644 --- a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802422FC_A1851C.s +++ b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802422FC_A1851C.s @@ -110,7 +110,7 @@ glabel L80242468_A18688 glabel L80242480_A186A0 /* A186A0 80242480 0280202D */ daddu $a0, $s4, $zero /* A186A4 80242484 0200282D */ daddu $a1, $s0, $zero -/* A186A8 80242488 0C09072C */ jal func_80241CB0_A17ED0 +/* A186A8 80242488 0C09072C */ jal hos_02_UnkNpcAIFunc14 /* A186AC 8024248C 0260302D */ daddu $a2, $s3, $zero /* A186B0 80242490 08090931 */ j .L802424C4 /* A186B4 80242494 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241970_A1CA70.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241970_A1CA70.s deleted file mode 100644 index 9659155504..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241970_A1CA70.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241970_A1CA70 -/* A1CA70 80241970 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A1CA74 80241974 AFB3001C */ sw $s3, 0x1c($sp) -/* A1CA78 80241978 0080982D */ daddu $s3, $a0, $zero -/* A1CA7C 8024197C AFBF0020 */ sw $ra, 0x20($sp) -/* A1CA80 80241980 AFB20018 */ sw $s2, 0x18($sp) -/* A1CA84 80241984 AFB10014 */ sw $s1, 0x14($sp) -/* A1CA88 80241988 AFB00010 */ sw $s0, 0x10($sp) -/* A1CA8C 8024198C 8E720148 */ lw $s2, 0x148($s3) -/* A1CA90 80241990 86440008 */ lh $a0, 8($s2) -/* A1CA94 80241994 0C00EABB */ jal get_npc_unsafe -/* A1CA98 80241998 00A0802D */ daddu $s0, $a1, $zero -/* A1CA9C 8024199C 0040882D */ daddu $s1, $v0, $zero -/* A1CAA0 802419A0 C6420080 */ lwc1 $f2, 0x80($s2) -/* A1CAA4 802419A4 468010A0 */ cvt.s.w $f2, $f2 -/* A1CAA8 802419A8 460010A1 */ cvt.d.s $f2, $f2 -/* A1CAAC 802419AC C6400084 */ lwc1 $f0, 0x84($s2) -/* A1CAB0 802419B0 46800020 */ cvt.s.w $f0, $f0 -/* A1CAB4 802419B4 46000021 */ cvt.d.s $f0, $f0 -/* A1CAB8 802419B8 3C014059 */ lui $at, 0x4059 -/* A1CABC 802419BC 44812800 */ mtc1 $at, $f5 -/* A1CAC0 802419C0 44802000 */ mtc1 $zero, $f4 -/* A1CAC4 802419C4 8E4200CC */ lw $v0, 0xcc($s2) -/* A1CAC8 802419C8 C62C0038 */ lwc1 $f12, 0x38($s1) -/* A1CACC 802419CC C62E0040 */ lwc1 $f14, 0x40($s1) -/* A1CAD0 802419D0 46241083 */ div.d $f2, $f2, $f4 -/* A1CAD4 802419D4 462010A0 */ cvt.s.d $f2, $f2 -/* A1CAD8 802419D8 46240003 */ div.d $f0, $f0, $f4 -/* A1CADC 802419DC 8C420020 */ lw $v0, 0x20($v0) -/* A1CAE0 802419E0 46200020 */ cvt.s.d $f0, $f0 -/* A1CAE4 802419E4 E622001C */ swc1 $f2, 0x1c($s1) -/* A1CAE8 802419E8 E6200014 */ swc1 $f0, 0x14($s1) -/* A1CAEC 802419EC AE220028 */ sw $v0, 0x28($s1) -/* A1CAF0 802419F0 C6000018 */ lwc1 $f0, 0x18($s0) -/* A1CAF4 802419F4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A1CAF8 802419F8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A1CAFC 802419FC E6200018 */ swc1 $f0, 0x18($s1) -/* A1CB00 80241A00 8C460028 */ lw $a2, 0x28($v0) -/* A1CB04 80241A04 0C00A720 */ jal atan2 -/* A1CB08 80241A08 8C470030 */ lw $a3, 0x30($v0) -/* A1CB0C 80241A0C E620000C */ swc1 $f0, 0xc($s1) -/* A1CB10 80241A10 8E420018 */ lw $v0, 0x18($s2) -/* A1CB14 80241A14 AE400074 */ sw $zero, 0x74($s2) -/* A1CB18 80241A18 9442002A */ lhu $v0, 0x2a($v0) -/* A1CB1C 80241A1C 30420002 */ andi $v0, $v0, 2 -/* A1CB20 80241A20 10400005 */ beqz $v0, .L80241A38 -/* A1CB24 80241A24 24020003 */ addiu $v0, $zero, 3 -/* A1CB28 80241A28 A622008E */ sh $v0, 0x8e($s1) -/* A1CB2C 80241A2C 2402000D */ addiu $v0, $zero, 0xd -/* A1CB30 80241A30 080906A2 */ j .L80241A88 -/* A1CB34 80241A34 AE620070 */ sw $v0, 0x70($s3) -.L80241A38: -/* A1CB38 80241A38 24030001 */ addiu $v1, $zero, 1 -/* A1CB3C 80241A3C 2402000E */ addiu $v0, $zero, 0xe -/* A1CB40 80241A40 A623008E */ sh $v1, 0x8e($s1) -/* A1CB44 80241A44 AE620070 */ sw $v0, 0x70($s3) -/* A1CB48 80241A48 C6200038 */ lwc1 $f0, 0x38($s1) -/* A1CB4C 80241A4C 4600018D */ trunc.w.s $f6, $f0 -/* A1CB50 80241A50 44023000 */ mfc1 $v0, $f6 -/* A1CB54 80241A54 00000000 */ nop -/* A1CB58 80241A58 A6420010 */ sh $v0, 0x10($s2) -/* A1CB5C 80241A5C C620003C */ lwc1 $f0, 0x3c($s1) -/* A1CB60 80241A60 4600018D */ trunc.w.s $f6, $f0 -/* A1CB64 80241A64 44023000 */ mfc1 $v0, $f6 -/* A1CB68 80241A68 00000000 */ nop -/* A1CB6C 80241A6C A6420012 */ sh $v0, 0x12($s2) -/* A1CB70 80241A70 C6200040 */ lwc1 $f0, 0x40($s1) -/* A1CB74 80241A74 A2430007 */ sb $v1, 7($s2) -/* A1CB78 80241A78 4600018D */ trunc.w.s $f6, $f0 -/* A1CB7C 80241A7C 44023000 */ mfc1 $v0, $f6 -/* A1CB80 80241A80 00000000 */ nop -/* A1CB84 80241A84 A6420014 */ sh $v0, 0x14($s2) -.L80241A88: -/* A1CB88 80241A88 8FBF0020 */ lw $ra, 0x20($sp) -/* A1CB8C 80241A8C 8FB3001C */ lw $s3, 0x1c($sp) -/* A1CB90 80241A90 8FB20018 */ lw $s2, 0x18($sp) -/* A1CB94 80241A94 8FB10014 */ lw $s1, 0x14($sp) -/* A1CB98 80241A98 8FB00010 */ lw $s0, 0x10($sp) -/* A1CB9C 80241A9C 03E00008 */ jr $ra -/* A1CBA0 80241AA0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241FBC_A1D0BC.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241FBC_A1D0BC.s index 5f16f5b92e..5332b185e1 100644 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241FBC_A1D0BC.s +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241FBC_A1D0BC.s @@ -110,7 +110,7 @@ glabel L80242128_A1D228 glabel L80242140_A1D240 /* A1D240 80242140 0280202D */ daddu $a0, $s4, $zero /* A1D244 80242144 0200282D */ daddu $a1, $s0, $zero -/* A1D248 80242148 0C09065C */ jal func_80241970_A1CA70 +/* A1D248 80242148 0C09065C */ jal hos_03_UnkNpcAIFunc14 /* A1D24C 8024214C 0260302D */ daddu $a2, $s3, $zero /* A1D250 80242150 08090861 */ j .L80242184 /* A1D254 80242154 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802428D0_A1D9D0.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802428D0_A1D9D0.s deleted file mode 100644 index b92384e308..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802428D0_A1D9D0.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802428D0_A1D9D0 -/* A1D9D0 802428D0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A1D9D4 802428D4 AFB10014 */ sw $s1, 0x14($sp) -/* A1D9D8 802428D8 0080882D */ daddu $s1, $a0, $zero -/* A1D9DC 802428DC AFBF0024 */ sw $ra, 0x24($sp) -/* A1D9E0 802428E0 AFB40020 */ sw $s4, 0x20($sp) -/* A1D9E4 802428E4 AFB3001C */ sw $s3, 0x1c($sp) -/* A1D9E8 802428E8 AFB20018 */ sw $s2, 0x18($sp) -/* A1D9EC 802428EC 10A00033 */ beqz $a1, .L802429BC -/* A1D9F0 802428F0 AFB00010 */ sw $s0, 0x10($sp) -/* A1D9F4 802428F4 0C04760B */ jal func_8011D82C -/* A1D9F8 802428F8 24040001 */ addiu $a0, $zero, 1 -/* A1D9FC 802428FC 0000202D */ daddu $a0, $zero, $zero -/* A1DA00 80242900 0080282D */ daddu $a1, $a0, $zero -/* A1DA04 80242904 0080302D */ daddu $a2, $a0, $zero -/* A1DA08 80242908 0080382D */ daddu $a3, $a0, $zero -/* A1DA0C 8024290C 0080802D */ daddu $s0, $a0, $zero -/* A1DA10 80242910 2414FFFC */ addiu $s4, $zero, -4 -/* A1DA14 80242914 24130007 */ addiu $s3, $zero, 7 -/* A1DA18 80242918 3C120080 */ lui $s2, 0x80 -/* A1DA1C 8024291C 3C038015 */ lui $v1, %hi(D_801512F0) -/* A1DA20 80242920 8C6312F0 */ lw $v1, %lo(D_801512F0)($v1) -/* A1DA24 80242924 24020001 */ addiu $v0, $zero, 1 -/* A1DA28 80242928 0C046F97 */ jal set_background_color_blend -/* A1DA2C 8024292C A0620000 */ sb $v0, ($v1) -.L80242930: -/* A1DA30 80242930 0C00E2B7 */ jal get_npc_by_index -/* A1DA34 80242934 0200202D */ daddu $a0, $s0, $zero -/* A1DA38 80242938 0040202D */ daddu $a0, $v0, $zero -/* A1DA3C 8024293C 5080000B */ beql $a0, $zero, .L8024296C -/* A1DA40 80242940 26100001 */ addiu $s0, $s0, 1 -/* A1DA44 80242944 8C820000 */ lw $v0, ($a0) -/* A1DA48 80242948 50400008 */ beql $v0, $zero, .L8024296C -/* A1DA4C 8024294C 26100001 */ addiu $s0, $s0, 1 -/* A1DA50 80242950 808300A4 */ lb $v1, 0xa4($a0) -/* A1DA54 80242954 10740005 */ beq $v1, $s4, .L8024296C -/* A1DA58 80242958 26100001 */ addiu $s0, $s0, 1 -/* A1DA5C 8024295C 10730003 */ beq $v1, $s3, .L8024296C -/* A1DA60 80242960 00000000 */ nop -/* A1DA64 80242964 00521025 */ or $v0, $v0, $s2 -/* A1DA68 80242968 AC820000 */ sw $v0, ($a0) -.L8024296C: -/* A1DA6C 8024296C 2A020040 */ slti $v0, $s0, 0x40 -/* A1DA70 80242970 1440FFEF */ bnez $v0, .L80242930 -/* A1DA74 80242974 00000000 */ nop -/* A1DA78 80242978 0000802D */ daddu $s0, $zero, $zero -/* A1DA7C 8024297C 3C120800 */ lui $s2, 0x800 -.L80242980: -/* A1DA80 80242980 0C04C3D6 */ jal get_item_entity -/* A1DA84 80242984 0200202D */ daddu $a0, $s0, $zero -/* A1DA88 80242988 0040182D */ daddu $v1, $v0, $zero -/* A1DA8C 8024298C 10600007 */ beqz $v1, .L802429AC -/* A1DA90 80242990 26100001 */ addiu $s0, $s0, 1 -/* A1DA94 80242994 8C640000 */ lw $a0, ($v1) -/* A1DA98 80242998 30820010 */ andi $v0, $a0, 0x10 -/* A1DA9C 8024299C 10400003 */ beqz $v0, .L802429AC -/* A1DAA0 802429A0 00000000 */ nop -/* A1DAA4 802429A4 00921025 */ or $v0, $a0, $s2 -/* A1DAA8 802429A8 AC620000 */ sw $v0, ($v1) -.L802429AC: -/* A1DAAC 802429AC 2A020100 */ slti $v0, $s0, 0x100 -/* A1DAB0 802429B0 1440FFF3 */ bnez $v0, .L80242980 -/* A1DAB4 802429B4 00000000 */ nop -/* A1DAB8 802429B8 AE200070 */ sw $zero, 0x70($s1) -.L802429BC: -/* A1DABC 802429BC 8E220070 */ lw $v0, 0x70($s1) -/* A1DAC0 802429C0 24420008 */ addiu $v0, $v0, 8 -/* A1DAC4 802429C4 AE220070 */ sw $v0, 0x70($s1) -/* A1DAC8 802429C8 28420100 */ slti $v0, $v0, 0x100 -/* A1DACC 802429CC 14400003 */ bnez $v0, .L802429DC -/* A1DAD0 802429D0 0000202D */ daddu $a0, $zero, $zero -/* A1DAD4 802429D4 240200FF */ addiu $v0, $zero, 0xff -/* A1DAD8 802429D8 AE220070 */ sw $v0, 0x70($s1) -.L802429DC: -/* A1DADC 802429DC 0080282D */ daddu $a1, $a0, $zero -/* A1DAE0 802429E0 92270073 */ lbu $a3, 0x73($s1) -/* A1DAE4 802429E4 0C046F97 */ jal set_background_color_blend -/* A1DAE8 802429E8 0080302D */ daddu $a2, $a0, $zero -/* A1DAEC 802429EC 8E220070 */ lw $v0, 0x70($s1) -/* A1DAF0 802429F0 8FBF0024 */ lw $ra, 0x24($sp) -/* A1DAF4 802429F4 8FB40020 */ lw $s4, 0x20($sp) -/* A1DAF8 802429F8 8FB3001C */ lw $s3, 0x1c($sp) -/* A1DAFC 802429FC 8FB20018 */ lw $s2, 0x18($sp) -/* A1DB00 80242A00 8FB10014 */ lw $s1, 0x14($sp) -/* A1DB04 80242A04 8FB00010 */ lw $s0, 0x10($sp) -/* A1DB08 80242A08 384200FF */ xori $v0, $v0, 0xff -/* A1DB0C 80242A0C 2C420001 */ sltiu $v0, $v0, 1 -/* A1DB10 80242A10 00021040 */ sll $v0, $v0, 1 -/* A1DB14 80242A14 03E00008 */ jr $ra -/* A1DB18 80242A18 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240C78_9897D8.s b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240C78_9897D8.s deleted file mode 100644 index 1bf4649df1..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240C78_9897D8.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C78_9897D8 -/* 9897D8 80240C78 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9897DC 80240C7C AFBF0018 */ sw $ra, 0x18($sp) -/* 9897E0 80240C80 0C00EAD2 */ jal get_npc_safe -/* 9897E4 80240C84 2404FFFC */ addiu $a0, $zero, -4 -/* 9897E8 80240C88 3C0141F0 */ lui $at, 0x41f0 -/* 9897EC 80240C8C 44810000 */ mtc1 $at, $f0 -/* 9897F0 80240C90 C442003C */ lwc1 $f2, 0x3c($v0) -/* 9897F4 80240C94 46001080 */ add.s $f2, $f2, $f0 -/* 9897F8 80240C98 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9897FC 80240C9C 8C450038 */ lw $a1, 0x38($v0) -/* 989800 80240CA0 8C470040 */ lw $a3, 0x40($v0) -/* 989804 80240CA4 44061000 */ mfc1 $a2, $f2 -/* 989808 80240CA8 0C01BFBC */ jal func_8006FEF0 -/* 98980C 80240CAC 24040002 */ addiu $a0, $zero, 2 -/* 989810 80240CB0 8FBF0018 */ lw $ra, 0x18($sp) -/* 989814 80240CB4 24020002 */ addiu $v0, $zero, 2 -/* 989818 80240CB8 03E00008 */ jr $ra -/* 98981C 80240CBC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240CC0_989820.s b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240CC0_989820.s deleted file mode 100644 index 5327bc50e9..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240CC0_989820.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CC0_989820 -/* 989820 80240CC0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 989824 80240CC4 AFBF0018 */ sw $ra, 0x18($sp) -/* 989828 80240CC8 0C00EAD2 */ jal get_npc_safe -/* 98982C 80240CCC 2404FFFC */ addiu $a0, $zero, -4 -/* 989830 80240CD0 3C0141F0 */ lui $at, 0x41f0 -/* 989834 80240CD4 44810000 */ mtc1 $at, $f0 -/* 989838 80240CD8 C442003C */ lwc1 $f2, 0x3c($v0) -/* 98983C 80240CDC 46001080 */ add.s $f2, $f2, $f0 -/* 989840 80240CE0 E7A00010 */ swc1 $f0, 0x10($sp) -/* 989844 80240CE4 8C450038 */ lw $a1, 0x38($v0) -/* 989848 80240CE8 8C470040 */ lw $a3, 0x40($v0) -/* 98984C 80240CEC 44061000 */ mfc1 $a2, $f2 -/* 989850 80240CF0 0C01BFBC */ jal func_8006FEF0 -/* 989854 80240CF4 24040004 */ addiu $a0, $zero, 4 -/* 989858 80240CF8 8FBF0018 */ lw $ra, 0x18($sp) -/* 98985C 80240CFC 24020002 */ addiu $v0, $zero, 2 -/* 989860 80240D00 03E00008 */ jr $ra -/* 989864 80240D04 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240F68_91F4D8.s b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240F68_91F4D8.s deleted file mode 100644 index 7a27d1f31c..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240F68_91F4D8.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F68_91F4D8 -/* 91F4D8 80240F68 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 91F4DC 80240F6C AFBF0018 */ sw $ra, 0x18($sp) -/* 91F4E0 80240F70 0C00EAD2 */ jal get_npc_safe -/* 91F4E4 80240F74 2404FFFC */ addiu $a0, $zero, -4 -/* 91F4E8 80240F78 3C0141F0 */ lui $at, 0x41f0 -/* 91F4EC 80240F7C 44810000 */ mtc1 $at, $f0 -/* 91F4F0 80240F80 C442003C */ lwc1 $f2, 0x3c($v0) -/* 91F4F4 80240F84 46001080 */ add.s $f2, $f2, $f0 -/* 91F4F8 80240F88 E7A00010 */ swc1 $f0, 0x10($sp) -/* 91F4FC 80240F8C 8C450038 */ lw $a1, 0x38($v0) -/* 91F500 80240F90 8C470040 */ lw $a3, 0x40($v0) -/* 91F504 80240F94 44061000 */ mfc1 $a2, $f2 -/* 91F508 80240F98 0C01BFBC */ jal func_8006FEF0 -/* 91F50C 80240F9C 24040002 */ addiu $a0, $zero, 2 -/* 91F510 80240FA0 8FBF0018 */ lw $ra, 0x18($sp) -/* 91F514 80240FA4 24020002 */ addiu $v0, $zero, 2 -/* 91F518 80240FA8 03E00008 */ jr $ra -/* 91F51C 80240FAC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240FB0_91F520.s b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240FB0_91F520.s deleted file mode 100644 index f6cff5e50f..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240FB0_91F520.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FB0_91F520 -/* 91F520 80240FB0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 91F524 80240FB4 AFBF0018 */ sw $ra, 0x18($sp) -/* 91F528 80240FB8 0C00EAD2 */ jal get_npc_safe -/* 91F52C 80240FBC 2404FFFC */ addiu $a0, $zero, -4 -/* 91F530 80240FC0 3C0141F0 */ lui $at, 0x41f0 -/* 91F534 80240FC4 44810000 */ mtc1 $at, $f0 -/* 91F538 80240FC8 C442003C */ lwc1 $f2, 0x3c($v0) -/* 91F53C 80240FCC 46001080 */ add.s $f2, $f2, $f0 -/* 91F540 80240FD0 E7A00010 */ swc1 $f0, 0x10($sp) -/* 91F544 80240FD4 8C450038 */ lw $a1, 0x38($v0) -/* 91F548 80240FD8 8C470040 */ lw $a3, 0x40($v0) -/* 91F54C 80240FDC 44061000 */ mfc1 $a2, $f2 -/* 91F550 80240FE0 0C01BFBC */ jal func_8006FEF0 -/* 91F554 80240FE4 24040004 */ addiu $a0, $zero, 4 -/* 91F558 80240FE8 8FBF0018 */ lw $ra, 0x18($sp) -/* 91F55C 80240FEC 24020002 */ addiu $v0, $zero, 2 -/* 91F560 80240FF0 03E00008 */ jr $ra -/* 91F564 80240FF4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241A40_B2DEB0.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241A40_B2DEB0.s deleted file mode 100644 index 4b6264045e..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241A40_B2DEB0.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A40_B2DEB0 -/* B2DEB0 80241A40 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B2DEB4 80241A44 AFB10014 */ sw $s1, 0x14($sp) -/* B2DEB8 80241A48 0080882D */ daddu $s1, $a0, $zero -/* B2DEBC 80241A4C AFBF0024 */ sw $ra, 0x24($sp) -/* B2DEC0 80241A50 AFB40020 */ sw $s4, 0x20($sp) -/* B2DEC4 80241A54 AFB3001C */ sw $s3, 0x1c($sp) -/* B2DEC8 80241A58 AFB20018 */ sw $s2, 0x18($sp) -/* B2DECC 80241A5C 10A00033 */ beqz $a1, .L80241B2C -/* B2DED0 80241A60 AFB00010 */ sw $s0, 0x10($sp) -/* B2DED4 80241A64 0C04760B */ jal func_8011D82C -/* B2DED8 80241A68 24040001 */ addiu $a0, $zero, 1 -/* B2DEDC 80241A6C 0000202D */ daddu $a0, $zero, $zero -/* B2DEE0 80241A70 0080282D */ daddu $a1, $a0, $zero -/* B2DEE4 80241A74 0080302D */ daddu $a2, $a0, $zero -/* B2DEE8 80241A78 0080382D */ daddu $a3, $a0, $zero -/* B2DEEC 80241A7C 0080802D */ daddu $s0, $a0, $zero -/* B2DEF0 80241A80 2414FFFC */ addiu $s4, $zero, -4 -/* B2DEF4 80241A84 24130005 */ addiu $s3, $zero, 5 -/* B2DEF8 80241A88 3C120080 */ lui $s2, 0x80 -/* B2DEFC 80241A8C 3C038015 */ lui $v1, %hi(D_801512F0) -/* B2DF00 80241A90 8C6312F0 */ lw $v1, %lo(D_801512F0)($v1) -/* B2DF04 80241A94 24020001 */ addiu $v0, $zero, 1 -/* B2DF08 80241A98 0C046F97 */ jal set_background_color_blend -/* B2DF0C 80241A9C A0620000 */ sb $v0, ($v1) -.L80241AA0: -/* B2DF10 80241AA0 0C00E2B7 */ jal get_npc_by_index -/* B2DF14 80241AA4 0200202D */ daddu $a0, $s0, $zero -/* B2DF18 80241AA8 0040202D */ daddu $a0, $v0, $zero -/* B2DF1C 80241AAC 5080000B */ beql $a0, $zero, .L80241ADC -/* B2DF20 80241AB0 26100001 */ addiu $s0, $s0, 1 -/* B2DF24 80241AB4 8C820000 */ lw $v0, ($a0) -/* B2DF28 80241AB8 50400008 */ beql $v0, $zero, .L80241ADC -/* B2DF2C 80241ABC 26100001 */ addiu $s0, $s0, 1 -/* B2DF30 80241AC0 808300A4 */ lb $v1, 0xa4($a0) -/* B2DF34 80241AC4 10740005 */ beq $v1, $s4, .L80241ADC -/* B2DF38 80241AC8 26100001 */ addiu $s0, $s0, 1 -/* B2DF3C 80241ACC 10730003 */ beq $v1, $s3, .L80241ADC -/* B2DF40 80241AD0 00000000 */ nop -/* B2DF44 80241AD4 00521025 */ or $v0, $v0, $s2 -/* B2DF48 80241AD8 AC820000 */ sw $v0, ($a0) -.L80241ADC: -/* B2DF4C 80241ADC 2A020040 */ slti $v0, $s0, 0x40 -/* B2DF50 80241AE0 1440FFEF */ bnez $v0, .L80241AA0 -/* B2DF54 80241AE4 00000000 */ nop -/* B2DF58 80241AE8 0000802D */ daddu $s0, $zero, $zero -/* B2DF5C 80241AEC 3C120800 */ lui $s2, 0x800 -.L80241AF0: -/* B2DF60 80241AF0 0C04C3D6 */ jal get_item_entity -/* B2DF64 80241AF4 0200202D */ daddu $a0, $s0, $zero -/* B2DF68 80241AF8 0040182D */ daddu $v1, $v0, $zero -/* B2DF6C 80241AFC 10600007 */ beqz $v1, .L80241B1C -/* B2DF70 80241B00 26100001 */ addiu $s0, $s0, 1 -/* B2DF74 80241B04 8C640000 */ lw $a0, ($v1) -/* B2DF78 80241B08 30820010 */ andi $v0, $a0, 0x10 -/* B2DF7C 80241B0C 10400003 */ beqz $v0, .L80241B1C -/* B2DF80 80241B10 00000000 */ nop -/* B2DF84 80241B14 00921025 */ or $v0, $a0, $s2 -/* B2DF88 80241B18 AC620000 */ sw $v0, ($v1) -.L80241B1C: -/* B2DF8C 80241B1C 2A020100 */ slti $v0, $s0, 0x100 -/* B2DF90 80241B20 1440FFF3 */ bnez $v0, .L80241AF0 -/* B2DF94 80241B24 00000000 */ nop -/* B2DF98 80241B28 AE200070 */ sw $zero, 0x70($s1) -.L80241B2C: -/* B2DF9C 80241B2C 8E220070 */ lw $v0, 0x70($s1) -/* B2DFA0 80241B30 24420008 */ addiu $v0, $v0, 8 -/* B2DFA4 80241B34 AE220070 */ sw $v0, 0x70($s1) -/* B2DFA8 80241B38 28420100 */ slti $v0, $v0, 0x100 -/* B2DFAC 80241B3C 14400003 */ bnez $v0, .L80241B4C -/* B2DFB0 80241B40 0000202D */ daddu $a0, $zero, $zero -/* B2DFB4 80241B44 240200FF */ addiu $v0, $zero, 0xff -/* B2DFB8 80241B48 AE220070 */ sw $v0, 0x70($s1) -.L80241B4C: -/* B2DFBC 80241B4C 0080282D */ daddu $a1, $a0, $zero -/* B2DFC0 80241B50 92270073 */ lbu $a3, 0x73($s1) -/* B2DFC4 80241B54 0C046F97 */ jal set_background_color_blend -/* B2DFC8 80241B58 0080302D */ daddu $a2, $a0, $zero -/* B2DFCC 80241B5C 8E220070 */ lw $v0, 0x70($s1) -/* B2DFD0 80241B60 8FBF0024 */ lw $ra, 0x24($sp) -/* B2DFD4 80241B64 8FB40020 */ lw $s4, 0x20($sp) -/* B2DFD8 80241B68 8FB3001C */ lw $s3, 0x1c($sp) -/* B2DFDC 80241B6C 8FB20018 */ lw $s2, 0x18($sp) -/* B2DFE0 80241B70 8FB10014 */ lw $s1, 0x14($sp) -/* B2DFE4 80241B74 8FB00010 */ lw $s0, 0x10($sp) -/* B2DFE8 80241B78 384200FF */ xori $v0, $v0, 0xff -/* B2DFEC 80241B7C 2C420001 */ sltiu $v0, $v0, 1 -/* B2DFF0 80241B80 00021040 */ sll $v0, $v0, 1 -/* B2DFF4 80241B84 03E00008 */ jr $ra -/* B2DFF8 80241B88 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241FC8_B36B98.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241FC8_B36B98.s deleted file mode 100644 index e3a6841996..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241FC8_B36B98.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241FC8_B36B98 -/* B36B98 80241FC8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B36B9C 80241FCC AFB10014 */ sw $s1, 0x14($sp) -/* B36BA0 80241FD0 0080882D */ daddu $s1, $a0, $zero -/* B36BA4 80241FD4 AFBF0024 */ sw $ra, 0x24($sp) -/* B36BA8 80241FD8 AFB40020 */ sw $s4, 0x20($sp) -/* B36BAC 80241FDC AFB3001C */ sw $s3, 0x1c($sp) -/* B36BB0 80241FE0 AFB20018 */ sw $s2, 0x18($sp) -/* B36BB4 80241FE4 10A00033 */ beqz $a1, .L802420B4 -/* B36BB8 80241FE8 AFB00010 */ sw $s0, 0x10($sp) -/* B36BBC 80241FEC 0C04760B */ jal func_8011D82C -/* B36BC0 80241FF0 24040001 */ addiu $a0, $zero, 1 -/* B36BC4 80241FF4 0000202D */ daddu $a0, $zero, $zero -/* B36BC8 80241FF8 0080282D */ daddu $a1, $a0, $zero -/* B36BCC 80241FFC 0080302D */ daddu $a2, $a0, $zero -/* B36BD0 80242000 0080382D */ daddu $a3, $a0, $zero -/* B36BD4 80242004 0080802D */ daddu $s0, $a0, $zero -/* B36BD8 80242008 2414FFFC */ addiu $s4, $zero, -4 -/* B36BDC 8024200C 24130011 */ addiu $s3, $zero, 0x11 -/* B36BE0 80242010 3C120080 */ lui $s2, 0x80 -/* B36BE4 80242014 3C038015 */ lui $v1, %hi(D_801512F0) -/* B36BE8 80242018 8C6312F0 */ lw $v1, %lo(D_801512F0)($v1) -/* B36BEC 8024201C 24020001 */ addiu $v0, $zero, 1 -/* B36BF0 80242020 0C046F97 */ jal set_background_color_blend -/* B36BF4 80242024 A0620000 */ sb $v0, ($v1) -.L80242028: -/* B36BF8 80242028 0C00E2B7 */ jal get_npc_by_index -/* B36BFC 8024202C 0200202D */ daddu $a0, $s0, $zero -/* B36C00 80242030 0040202D */ daddu $a0, $v0, $zero -/* B36C04 80242034 5080000B */ beql $a0, $zero, .L80242064 -/* B36C08 80242038 26100001 */ addiu $s0, $s0, 1 -/* B36C0C 8024203C 8C820000 */ lw $v0, ($a0) -/* B36C10 80242040 50400008 */ beql $v0, $zero, .L80242064 -/* B36C14 80242044 26100001 */ addiu $s0, $s0, 1 -/* B36C18 80242048 808300A4 */ lb $v1, 0xa4($a0) -/* B36C1C 8024204C 10740005 */ beq $v1, $s4, .L80242064 -/* B36C20 80242050 26100001 */ addiu $s0, $s0, 1 -/* B36C24 80242054 10730003 */ beq $v1, $s3, .L80242064 -/* B36C28 80242058 00000000 */ nop -/* B36C2C 8024205C 00521025 */ or $v0, $v0, $s2 -/* B36C30 80242060 AC820000 */ sw $v0, ($a0) -.L80242064: -/* B36C34 80242064 2A020040 */ slti $v0, $s0, 0x40 -/* B36C38 80242068 1440FFEF */ bnez $v0, .L80242028 -/* B36C3C 8024206C 00000000 */ nop -/* B36C40 80242070 0000802D */ daddu $s0, $zero, $zero -/* B36C44 80242074 3C120800 */ lui $s2, 0x800 -.L80242078: -/* B36C48 80242078 0C04C3D6 */ jal get_item_entity -/* B36C4C 8024207C 0200202D */ daddu $a0, $s0, $zero -/* B36C50 80242080 0040182D */ daddu $v1, $v0, $zero -/* B36C54 80242084 10600007 */ beqz $v1, .L802420A4 -/* B36C58 80242088 26100001 */ addiu $s0, $s0, 1 -/* B36C5C 8024208C 8C640000 */ lw $a0, ($v1) -/* B36C60 80242090 30820010 */ andi $v0, $a0, 0x10 -/* B36C64 80242094 10400003 */ beqz $v0, .L802420A4 -/* B36C68 80242098 00000000 */ nop -/* B36C6C 8024209C 00921025 */ or $v0, $a0, $s2 -/* B36C70 802420A0 AC620000 */ sw $v0, ($v1) -.L802420A4: -/* B36C74 802420A4 2A020100 */ slti $v0, $s0, 0x100 -/* B36C78 802420A8 1440FFF3 */ bnez $v0, .L80242078 -/* B36C7C 802420AC 00000000 */ nop -/* B36C80 802420B0 AE200070 */ sw $zero, 0x70($s1) -.L802420B4: -/* B36C84 802420B4 8E220070 */ lw $v0, 0x70($s1) -/* B36C88 802420B8 24420008 */ addiu $v0, $v0, 8 -/* B36C8C 802420BC AE220070 */ sw $v0, 0x70($s1) -/* B36C90 802420C0 28420100 */ slti $v0, $v0, 0x100 -/* B36C94 802420C4 14400003 */ bnez $v0, .L802420D4 -/* B36C98 802420C8 0000202D */ daddu $a0, $zero, $zero -/* B36C9C 802420CC 240200FF */ addiu $v0, $zero, 0xff -/* B36CA0 802420D0 AE220070 */ sw $v0, 0x70($s1) -.L802420D4: -/* B36CA4 802420D4 0080282D */ daddu $a1, $a0, $zero -/* B36CA8 802420D8 92270073 */ lbu $a3, 0x73($s1) -/* B36CAC 802420DC 0C046F97 */ jal set_background_color_blend -/* B36CB0 802420E0 0080302D */ daddu $a2, $a0, $zero -/* B36CB4 802420E4 8E220070 */ lw $v0, 0x70($s1) -/* B36CB8 802420E8 8FBF0024 */ lw $ra, 0x24($sp) -/* B36CBC 802420EC 8FB40020 */ lw $s4, 0x20($sp) -/* B36CC0 802420F0 8FB3001C */ lw $s3, 0x1c($sp) -/* B36CC4 802420F4 8FB20018 */ lw $s2, 0x18($sp) -/* B36CC8 802420F8 8FB10014 */ lw $s1, 0x14($sp) -/* B36CCC 802420FC 8FB00010 */ lw $s0, 0x10($sp) -/* B36CD0 80242100 384200FF */ xori $v0, $v0, 0xff -/* B36CD4 80242104 2C420001 */ sltiu $v0, $v0, 1 -/* B36CD8 80242108 00021040 */ sll $v0, $v0, 1 -/* B36CDC 8024210C 03E00008 */ jr $ra -/* B36CE0 80242110 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_802412D8_B5F588.s b/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_802412D8_B5F588.s deleted file mode 100644 index 3971802ac8..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_802412D8_B5F588.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412D8_B5F588 -/* B5F588 802412D8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B5F58C 802412DC AFBF0018 */ sw $ra, 0x18($sp) -/* B5F590 802412E0 0C00EAD2 */ jal get_npc_safe -/* B5F594 802412E4 2404FFFC */ addiu $a0, $zero, -4 -/* B5F598 802412E8 3C0141F0 */ lui $at, 0x41f0 -/* B5F59C 802412EC 44810000 */ mtc1 $at, $f0 -/* B5F5A0 802412F0 C442003C */ lwc1 $f2, 0x3c($v0) -/* B5F5A4 802412F4 46001080 */ add.s $f2, $f2, $f0 -/* B5F5A8 802412F8 E7A00010 */ swc1 $f0, 0x10($sp) -/* B5F5AC 802412FC 8C450038 */ lw $a1, 0x38($v0) -/* B5F5B0 80241300 8C470040 */ lw $a3, 0x40($v0) -/* B5F5B4 80241304 44061000 */ mfc1 $a2, $f2 -/* B5F5B8 80241308 0C01BFBC */ jal func_8006FEF0 -/* B5F5BC 8024130C 24040002 */ addiu $a0, $zero, 2 -/* B5F5C0 80241310 8FBF0018 */ lw $ra, 0x18($sp) -/* B5F5C4 80241314 24020002 */ addiu $v0, $zero, 2 -/* B5F5C8 80241318 03E00008 */ jr $ra -/* B5F5CC 8024131C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80241320_B5F5D0.s b/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80241320_B5F5D0.s deleted file mode 100644 index 36207e9597..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80241320_B5F5D0.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241320_B5F5D0 -/* B5F5D0 80241320 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B5F5D4 80241324 AFBF0018 */ sw $ra, 0x18($sp) -/* B5F5D8 80241328 0C00EAD2 */ jal get_npc_safe -/* B5F5DC 8024132C 2404FFFC */ addiu $a0, $zero, -4 -/* B5F5E0 80241330 3C0141F0 */ lui $at, 0x41f0 -/* B5F5E4 80241334 44810000 */ mtc1 $at, $f0 -/* B5F5E8 80241338 C442003C */ lwc1 $f2, 0x3c($v0) -/* B5F5EC 8024133C 46001080 */ add.s $f2, $f2, $f0 -/* B5F5F0 80241340 E7A00010 */ swc1 $f0, 0x10($sp) -/* B5F5F4 80241344 8C450038 */ lw $a1, 0x38($v0) -/* B5F5F8 80241348 8C470040 */ lw $a3, 0x40($v0) -/* B5F5FC 8024134C 44061000 */ mfc1 $a2, $f2 -/* B5F600 80241350 0C01BFBC */ jal func_8006FEF0 -/* B5F604 80241354 24040004 */ addiu $a0, $zero, 4 -/* B5F608 80241358 8FBF0018 */ lw $ra, 0x18($sp) -/* B5F60C 8024135C 24020002 */ addiu $v0, $zero, 2 -/* B5F610 80241360 03E00008 */ jr $ra -/* B5F614 80241364 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802407BC_8B082C.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802407BC_8B082C.s deleted file mode 100644 index d1c9fb020d..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802407BC_8B082C.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407BC_8B082C -/* 8B082C 802407BC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8B0830 802407C0 AFB10014 */ sw $s1, 0x14($sp) -/* 8B0834 802407C4 0080882D */ daddu $s1, $a0, $zero -/* 8B0838 802407C8 AFBF0024 */ sw $ra, 0x24($sp) -/* 8B083C 802407CC AFB40020 */ sw $s4, 0x20($sp) -/* 8B0840 802407D0 AFB3001C */ sw $s3, 0x1c($sp) -/* 8B0844 802407D4 AFB20018 */ sw $s2, 0x18($sp) -/* 8B0848 802407D8 10A00033 */ beqz $a1, .L802408A8 -/* 8B084C 802407DC AFB00010 */ sw $s0, 0x10($sp) -/* 8B0850 802407E0 0C04760B */ jal func_8011D82C -/* 8B0854 802407E4 24040001 */ addiu $a0, $zero, 1 -/* 8B0858 802407E8 0000202D */ daddu $a0, $zero, $zero -/* 8B085C 802407EC 0080282D */ daddu $a1, $a0, $zero -/* 8B0860 802407F0 0080302D */ daddu $a2, $a0, $zero -/* 8B0864 802407F4 0080382D */ daddu $a3, $a0, $zero -/* 8B0868 802407F8 0080802D */ daddu $s0, $a0, $zero -/* 8B086C 802407FC 2414FFFC */ addiu $s4, $zero, -4 -/* 8B0870 80240800 24130008 */ addiu $s3, $zero, 8 -/* 8B0874 80240804 3C120080 */ lui $s2, 0x80 -/* 8B0878 80240808 3C038015 */ lui $v1, %hi(D_801512F0) -/* 8B087C 8024080C 8C6312F0 */ lw $v1, %lo(D_801512F0)($v1) -/* 8B0880 80240810 24020001 */ addiu $v0, $zero, 1 -/* 8B0884 80240814 0C046F97 */ jal set_background_color_blend -/* 8B0888 80240818 A0620000 */ sb $v0, ($v1) -.L8024081C: -/* 8B088C 8024081C 0C00E2B7 */ jal get_npc_by_index -/* 8B0890 80240820 0200202D */ daddu $a0, $s0, $zero -/* 8B0894 80240824 0040202D */ daddu $a0, $v0, $zero -/* 8B0898 80240828 5080000B */ beql $a0, $zero, .L80240858 -/* 8B089C 8024082C 26100001 */ addiu $s0, $s0, 1 -/* 8B08A0 80240830 8C820000 */ lw $v0, ($a0) -/* 8B08A4 80240834 50400008 */ beql $v0, $zero, .L80240858 -/* 8B08A8 80240838 26100001 */ addiu $s0, $s0, 1 -/* 8B08AC 8024083C 808300A4 */ lb $v1, 0xa4($a0) -/* 8B08B0 80240840 10740005 */ beq $v1, $s4, .L80240858 -/* 8B08B4 80240844 26100001 */ addiu $s0, $s0, 1 -/* 8B08B8 80240848 10730003 */ beq $v1, $s3, .L80240858 -/* 8B08BC 8024084C 00000000 */ nop -/* 8B08C0 80240850 00521025 */ or $v0, $v0, $s2 -/* 8B08C4 80240854 AC820000 */ sw $v0, ($a0) -.L80240858: -/* 8B08C8 80240858 2A020040 */ slti $v0, $s0, 0x40 -/* 8B08CC 8024085C 1440FFEF */ bnez $v0, .L8024081C -/* 8B08D0 80240860 00000000 */ nop -/* 8B08D4 80240864 0000802D */ daddu $s0, $zero, $zero -/* 8B08D8 80240868 3C120800 */ lui $s2, 0x800 -.L8024086C: -/* 8B08DC 8024086C 0C04C3D6 */ jal get_item_entity -/* 8B08E0 80240870 0200202D */ daddu $a0, $s0, $zero -/* 8B08E4 80240874 0040182D */ daddu $v1, $v0, $zero -/* 8B08E8 80240878 10600007 */ beqz $v1, .L80240898 -/* 8B08EC 8024087C 26100001 */ addiu $s0, $s0, 1 -/* 8B08F0 80240880 8C640000 */ lw $a0, ($v1) -/* 8B08F4 80240884 30820010 */ andi $v0, $a0, 0x10 -/* 8B08F8 80240888 10400003 */ beqz $v0, .L80240898 -/* 8B08FC 8024088C 00000000 */ nop -/* 8B0900 80240890 00921025 */ or $v0, $a0, $s2 -/* 8B0904 80240894 AC620000 */ sw $v0, ($v1) -.L80240898: -/* 8B0908 80240898 2A020100 */ slti $v0, $s0, 0x100 -/* 8B090C 8024089C 1440FFF3 */ bnez $v0, .L8024086C -/* 8B0910 802408A0 00000000 */ nop -/* 8B0914 802408A4 AE200070 */ sw $zero, 0x70($s1) -.L802408A8: -/* 8B0918 802408A8 8E220070 */ lw $v0, 0x70($s1) -/* 8B091C 802408AC 24420008 */ addiu $v0, $v0, 8 -/* 8B0920 802408B0 AE220070 */ sw $v0, 0x70($s1) -/* 8B0924 802408B4 28420100 */ slti $v0, $v0, 0x100 -/* 8B0928 802408B8 14400003 */ bnez $v0, .L802408C8 -/* 8B092C 802408BC 0000202D */ daddu $a0, $zero, $zero -/* 8B0930 802408C0 240200FF */ addiu $v0, $zero, 0xff -/* 8B0934 802408C4 AE220070 */ sw $v0, 0x70($s1) -.L802408C8: -/* 8B0938 802408C8 0080282D */ daddu $a1, $a0, $zero -/* 8B093C 802408CC 92270073 */ lbu $a3, 0x73($s1) -/* 8B0940 802408D0 0C046F97 */ jal set_background_color_blend -/* 8B0944 802408D4 0080302D */ daddu $a2, $a0, $zero -/* 8B0948 802408D8 8E220070 */ lw $v0, 0x70($s1) -/* 8B094C 802408DC 8FBF0024 */ lw $ra, 0x24($sp) -/* 8B0950 802408E0 8FB40020 */ lw $s4, 0x20($sp) -/* 8B0954 802408E4 8FB3001C */ lw $s3, 0x1c($sp) -/* 8B0958 802408E8 8FB20018 */ lw $s2, 0x18($sp) -/* 8B095C 802408EC 8FB10014 */ lw $s1, 0x14($sp) -/* 8B0960 802408F0 8FB00010 */ lw $s0, 0x10($sp) -/* 8B0964 802408F4 384200FF */ xori $v0, $v0, 0xff -/* 8B0968 802408F8 2C420001 */ sltiu $v0, $v0, 1 -/* 8B096C 802408FC 00021040 */ sll $v0, $v0, 1 -/* 8B0970 80240900 03E00008 */ jr $ra -/* 8B0974 80240904 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240CC0_8CED30.s b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240CC0_8CED30.s deleted file mode 100644 index acf33e8ae2..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240CC0_8CED30.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CC0_8CED30 -/* 8CED30 80240CC0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8CED34 80240CC4 AFB3001C */ sw $s3, 0x1c($sp) -/* 8CED38 80240CC8 0080982D */ daddu $s3, $a0, $zero -/* 8CED3C 80240CCC AFBF0020 */ sw $ra, 0x20($sp) -/* 8CED40 80240CD0 AFB20018 */ sw $s2, 0x18($sp) -/* 8CED44 80240CD4 AFB10014 */ sw $s1, 0x14($sp) -/* 8CED48 80240CD8 AFB00010 */ sw $s0, 0x10($sp) -/* 8CED4C 80240CDC 8E720148 */ lw $s2, 0x148($s3) -/* 8CED50 80240CE0 86440008 */ lh $a0, 8($s2) -/* 8CED54 80240CE4 0C00EABB */ jal get_npc_unsafe -/* 8CED58 80240CE8 00A0802D */ daddu $s0, $a1, $zero -/* 8CED5C 80240CEC 0040882D */ daddu $s1, $v0, $zero -/* 8CED60 80240CF0 C6420080 */ lwc1 $f2, 0x80($s2) -/* 8CED64 80240CF4 468010A0 */ cvt.s.w $f2, $f2 -/* 8CED68 80240CF8 460010A1 */ cvt.d.s $f2, $f2 -/* 8CED6C 80240CFC C6400084 */ lwc1 $f0, 0x84($s2) -/* 8CED70 80240D00 46800020 */ cvt.s.w $f0, $f0 -/* 8CED74 80240D04 46000021 */ cvt.d.s $f0, $f0 -/* 8CED78 80240D08 3C014059 */ lui $at, 0x4059 -/* 8CED7C 80240D0C 44812800 */ mtc1 $at, $f5 -/* 8CED80 80240D10 44802000 */ mtc1 $zero, $f4 -/* 8CED84 80240D14 8E4200CC */ lw $v0, 0xcc($s2) -/* 8CED88 80240D18 C62C0038 */ lwc1 $f12, 0x38($s1) -/* 8CED8C 80240D1C C62E0040 */ lwc1 $f14, 0x40($s1) -/* 8CED90 80240D20 46241083 */ div.d $f2, $f2, $f4 -/* 8CED94 80240D24 462010A0 */ cvt.s.d $f2, $f2 -/* 8CED98 80240D28 46240003 */ div.d $f0, $f0, $f4 -/* 8CED9C 80240D2C 8C420020 */ lw $v0, 0x20($v0) -/* 8CEDA0 80240D30 46200020 */ cvt.s.d $f0, $f0 -/* 8CEDA4 80240D34 E622001C */ swc1 $f2, 0x1c($s1) -/* 8CEDA8 80240D38 E6200014 */ swc1 $f0, 0x14($s1) -/* 8CEDAC 80240D3C AE220028 */ sw $v0, 0x28($s1) -/* 8CEDB0 80240D40 C6000018 */ lwc1 $f0, 0x18($s0) -/* 8CEDB4 80240D44 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8CEDB8 80240D48 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8CEDBC 80240D4C E6200018 */ swc1 $f0, 0x18($s1) -/* 8CEDC0 80240D50 8C460028 */ lw $a2, 0x28($v0) -/* 8CEDC4 80240D54 0C00A720 */ jal atan2 -/* 8CEDC8 80240D58 8C470030 */ lw $a3, 0x30($v0) -/* 8CEDCC 80240D5C E620000C */ swc1 $f0, 0xc($s1) -/* 8CEDD0 80240D60 8E420018 */ lw $v0, 0x18($s2) -/* 8CEDD4 80240D64 AE400074 */ sw $zero, 0x74($s2) -/* 8CEDD8 80240D68 9442002A */ lhu $v0, 0x2a($v0) -/* 8CEDDC 80240D6C 30420002 */ andi $v0, $v0, 2 -/* 8CEDE0 80240D70 10400005 */ beqz $v0, .L80240D88 -/* 8CEDE4 80240D74 24020003 */ addiu $v0, $zero, 3 -/* 8CEDE8 80240D78 A622008E */ sh $v0, 0x8e($s1) -/* 8CEDEC 80240D7C 2402000D */ addiu $v0, $zero, 0xd -/* 8CEDF0 80240D80 08090376 */ j .L80240DD8 -/* 8CEDF4 80240D84 AE620070 */ sw $v0, 0x70($s3) -.L80240D88: -/* 8CEDF8 80240D88 24030001 */ addiu $v1, $zero, 1 -/* 8CEDFC 80240D8C 2402000E */ addiu $v0, $zero, 0xe -/* 8CEE00 80240D90 A623008E */ sh $v1, 0x8e($s1) -/* 8CEE04 80240D94 AE620070 */ sw $v0, 0x70($s3) -/* 8CEE08 80240D98 C6200038 */ lwc1 $f0, 0x38($s1) -/* 8CEE0C 80240D9C 4600018D */ trunc.w.s $f6, $f0 -/* 8CEE10 80240DA0 44023000 */ mfc1 $v0, $f6 -/* 8CEE14 80240DA4 00000000 */ nop -/* 8CEE18 80240DA8 A6420010 */ sh $v0, 0x10($s2) -/* 8CEE1C 80240DAC C620003C */ lwc1 $f0, 0x3c($s1) -/* 8CEE20 80240DB0 4600018D */ trunc.w.s $f6, $f0 -/* 8CEE24 80240DB4 44023000 */ mfc1 $v0, $f6 -/* 8CEE28 80240DB8 00000000 */ nop -/* 8CEE2C 80240DBC A6420012 */ sh $v0, 0x12($s2) -/* 8CEE30 80240DC0 C6200040 */ lwc1 $f0, 0x40($s1) -/* 8CEE34 80240DC4 A2430007 */ sb $v1, 7($s2) -/* 8CEE38 80240DC8 4600018D */ trunc.w.s $f6, $f0 -/* 8CEE3C 80240DCC 44023000 */ mfc1 $v0, $f6 -/* 8CEE40 80240DD0 00000000 */ nop -/* 8CEE44 80240DD4 A6420014 */ sh $v0, 0x14($s2) -.L80240DD8: -/* 8CEE48 80240DD8 8FBF0020 */ lw $ra, 0x20($sp) -/* 8CEE4C 80240DDC 8FB3001C */ lw $s3, 0x1c($sp) -/* 8CEE50 80240DE0 8FB20018 */ lw $s2, 0x18($sp) -/* 8CEE54 80240DE4 8FB10014 */ lw $s1, 0x14($sp) -/* 8CEE58 80240DE8 8FB00010 */ lw $s0, 0x10($sp) -/* 8CEE5C 80240DEC 03E00008 */ jr $ra -/* 8CEE60 80240DF0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_8024130C_8CF37C.s b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_8024130C_8CF37C.s index 28e70836bf..ec3a0aa7f0 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_8024130C_8CF37C.s +++ b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_8024130C_8CF37C.s @@ -110,7 +110,7 @@ glabel L80241478_8CF4E8 glabel L80241490_8CF500 /* 8CF500 80241490 0280202D */ daddu $a0, $s4, $zero /* 8CF504 80241494 0200282D */ daddu $a1, $s0, $zero -/* 8CF508 80241498 0C090330 */ jal func_80240CC0_8CED30 +/* 8CF508 80241498 0C090330 */ jal kmr_05_UnkNpcAIFunc14 /* 8CF50C 8024149C 0260302D */ daddu $a2, $s3, $zero /* 8CF510 802414A0 08090535 */ j .L802414D4 /* 8CF514 802414A4 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_80240CC0_8D21D0.s b/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_80240CC0_8D21D0.s deleted file mode 100644 index da4166ef2d..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_80240CC0_8D21D0.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CC0_8D21D0 -/* 8D21D0 80240CC0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8D21D4 80240CC4 AFB3001C */ sw $s3, 0x1c($sp) -/* 8D21D8 80240CC8 0080982D */ daddu $s3, $a0, $zero -/* 8D21DC 80240CCC AFBF0020 */ sw $ra, 0x20($sp) -/* 8D21E0 80240CD0 AFB20018 */ sw $s2, 0x18($sp) -/* 8D21E4 80240CD4 AFB10014 */ sw $s1, 0x14($sp) -/* 8D21E8 80240CD8 AFB00010 */ sw $s0, 0x10($sp) -/* 8D21EC 80240CDC 8E720148 */ lw $s2, 0x148($s3) -/* 8D21F0 80240CE0 86440008 */ lh $a0, 8($s2) -/* 8D21F4 80240CE4 0C00EABB */ jal get_npc_unsafe -/* 8D21F8 80240CE8 00A0802D */ daddu $s0, $a1, $zero -/* 8D21FC 80240CEC 0040882D */ daddu $s1, $v0, $zero -/* 8D2200 80240CF0 C6420080 */ lwc1 $f2, 0x80($s2) -/* 8D2204 80240CF4 468010A0 */ cvt.s.w $f2, $f2 -/* 8D2208 80240CF8 460010A1 */ cvt.d.s $f2, $f2 -/* 8D220C 80240CFC C6400084 */ lwc1 $f0, 0x84($s2) -/* 8D2210 80240D00 46800020 */ cvt.s.w $f0, $f0 -/* 8D2214 80240D04 46000021 */ cvt.d.s $f0, $f0 -/* 8D2218 80240D08 3C014059 */ lui $at, 0x4059 -/* 8D221C 80240D0C 44812800 */ mtc1 $at, $f5 -/* 8D2220 80240D10 44802000 */ mtc1 $zero, $f4 -/* 8D2224 80240D14 8E4200CC */ lw $v0, 0xcc($s2) -/* 8D2228 80240D18 C62C0038 */ lwc1 $f12, 0x38($s1) -/* 8D222C 80240D1C C62E0040 */ lwc1 $f14, 0x40($s1) -/* 8D2230 80240D20 46241083 */ div.d $f2, $f2, $f4 -/* 8D2234 80240D24 462010A0 */ cvt.s.d $f2, $f2 -/* 8D2238 80240D28 46240003 */ div.d $f0, $f0, $f4 -/* 8D223C 80240D2C 8C420020 */ lw $v0, 0x20($v0) -/* 8D2240 80240D30 46200020 */ cvt.s.d $f0, $f0 -/* 8D2244 80240D34 E622001C */ swc1 $f2, 0x1c($s1) -/* 8D2248 80240D38 E6200014 */ swc1 $f0, 0x14($s1) -/* 8D224C 80240D3C AE220028 */ sw $v0, 0x28($s1) -/* 8D2250 80240D40 C6000018 */ lwc1 $f0, 0x18($s0) -/* 8D2254 80240D44 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8D2258 80240D48 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8D225C 80240D4C E6200018 */ swc1 $f0, 0x18($s1) -/* 8D2260 80240D50 8C460028 */ lw $a2, 0x28($v0) -/* 8D2264 80240D54 0C00A720 */ jal atan2 -/* 8D2268 80240D58 8C470030 */ lw $a3, 0x30($v0) -/* 8D226C 80240D5C E620000C */ swc1 $f0, 0xc($s1) -/* 8D2270 80240D60 8E420018 */ lw $v0, 0x18($s2) -/* 8D2274 80240D64 AE400074 */ sw $zero, 0x74($s2) -/* 8D2278 80240D68 9442002A */ lhu $v0, 0x2a($v0) -/* 8D227C 80240D6C 30420002 */ andi $v0, $v0, 2 -/* 8D2280 80240D70 10400005 */ beqz $v0, .L80240D88 -/* 8D2284 80240D74 24020003 */ addiu $v0, $zero, 3 -/* 8D2288 80240D78 A622008E */ sh $v0, 0x8e($s1) -/* 8D228C 80240D7C 2402000D */ addiu $v0, $zero, 0xd -/* 8D2290 80240D80 08090376 */ j .L80240DD8 -/* 8D2294 80240D84 AE620070 */ sw $v0, 0x70($s3) -.L80240D88: -/* 8D2298 80240D88 24030001 */ addiu $v1, $zero, 1 -/* 8D229C 80240D8C 2402000E */ addiu $v0, $zero, 0xe -/* 8D22A0 80240D90 A623008E */ sh $v1, 0x8e($s1) -/* 8D22A4 80240D94 AE620070 */ sw $v0, 0x70($s3) -/* 8D22A8 80240D98 C6200038 */ lwc1 $f0, 0x38($s1) -/* 8D22AC 80240D9C 4600018D */ trunc.w.s $f6, $f0 -/* 8D22B0 80240DA0 44023000 */ mfc1 $v0, $f6 -/* 8D22B4 80240DA4 00000000 */ nop -/* 8D22B8 80240DA8 A6420010 */ sh $v0, 0x10($s2) -/* 8D22BC 80240DAC C620003C */ lwc1 $f0, 0x3c($s1) -/* 8D22C0 80240DB0 4600018D */ trunc.w.s $f6, $f0 -/* 8D22C4 80240DB4 44023000 */ mfc1 $v0, $f6 -/* 8D22C8 80240DB8 00000000 */ nop -/* 8D22CC 80240DBC A6420012 */ sh $v0, 0x12($s2) -/* 8D22D0 80240DC0 C6200040 */ lwc1 $f0, 0x40($s1) -/* 8D22D4 80240DC4 A2430007 */ sb $v1, 7($s2) -/* 8D22D8 80240DC8 4600018D */ trunc.w.s $f6, $f0 -/* 8D22DC 80240DCC 44023000 */ mfc1 $v0, $f6 -/* 8D22E0 80240DD0 00000000 */ nop -/* 8D22E4 80240DD4 A6420014 */ sh $v0, 0x14($s2) -.L80240DD8: -/* 8D22E8 80240DD8 8FBF0020 */ lw $ra, 0x20($sp) -/* 8D22EC 80240DDC 8FB3001C */ lw $s3, 0x1c($sp) -/* 8D22F0 80240DE0 8FB20018 */ lw $s2, 0x18($sp) -/* 8D22F4 80240DE4 8FB10014 */ lw $s1, 0x14($sp) -/* 8D22F8 80240DE8 8FB00010 */ lw $s0, 0x10($sp) -/* 8D22FC 80240DEC 03E00008 */ jr $ra -/* 8D2300 80240DF0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_8024130C_8D281C.s b/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_8024130C_8D281C.s index ab85361412..9d816fcb1f 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_8024130C_8D281C.s +++ b/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_8024130C_8D281C.s @@ -110,7 +110,7 @@ glabel L80241478_8D2988 glabel L80241490_8D29A0 /* 8D29A0 80241490 0280202D */ daddu $a0, $s4, $zero /* 8D29A4 80241494 0200282D */ daddu $a1, $s0, $zero -/* 8D29A8 80241498 0C090330 */ jal func_80240CC0_8D21D0 +/* 8D29A8 80241498 0C090330 */ jal kmr_06_UnkNpcAIFunc14 /* 8D29AC 8024149C 0260302D */ daddu $a2, $s3, $zero /* 8D29B0 802414A0 08090535 */ j .L802414D4 /* 8D29B4 802414A4 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_80240CC0_8D6AC0.s b/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_80240CC0_8D6AC0.s deleted file mode 100644 index 1ffbca833a..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_80240CC0_8D6AC0.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CC0_8D6AC0 -/* 8D6AC0 80240CC0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8D6AC4 80240CC4 AFB3001C */ sw $s3, 0x1c($sp) -/* 8D6AC8 80240CC8 0080982D */ daddu $s3, $a0, $zero -/* 8D6ACC 80240CCC AFBF0020 */ sw $ra, 0x20($sp) -/* 8D6AD0 80240CD0 AFB20018 */ sw $s2, 0x18($sp) -/* 8D6AD4 80240CD4 AFB10014 */ sw $s1, 0x14($sp) -/* 8D6AD8 80240CD8 AFB00010 */ sw $s0, 0x10($sp) -/* 8D6ADC 80240CDC 8E720148 */ lw $s2, 0x148($s3) -/* 8D6AE0 80240CE0 86440008 */ lh $a0, 8($s2) -/* 8D6AE4 80240CE4 0C00EABB */ jal get_npc_unsafe -/* 8D6AE8 80240CE8 00A0802D */ daddu $s0, $a1, $zero -/* 8D6AEC 80240CEC 0040882D */ daddu $s1, $v0, $zero -/* 8D6AF0 80240CF0 C6420080 */ lwc1 $f2, 0x80($s2) -/* 8D6AF4 80240CF4 468010A0 */ cvt.s.w $f2, $f2 -/* 8D6AF8 80240CF8 460010A1 */ cvt.d.s $f2, $f2 -/* 8D6AFC 80240CFC C6400084 */ lwc1 $f0, 0x84($s2) -/* 8D6B00 80240D00 46800020 */ cvt.s.w $f0, $f0 -/* 8D6B04 80240D04 46000021 */ cvt.d.s $f0, $f0 -/* 8D6B08 80240D08 3C014059 */ lui $at, 0x4059 -/* 8D6B0C 80240D0C 44812800 */ mtc1 $at, $f5 -/* 8D6B10 80240D10 44802000 */ mtc1 $zero, $f4 -/* 8D6B14 80240D14 8E4200CC */ lw $v0, 0xcc($s2) -/* 8D6B18 80240D18 C62C0038 */ lwc1 $f12, 0x38($s1) -/* 8D6B1C 80240D1C C62E0040 */ lwc1 $f14, 0x40($s1) -/* 8D6B20 80240D20 46241083 */ div.d $f2, $f2, $f4 -/* 8D6B24 80240D24 462010A0 */ cvt.s.d $f2, $f2 -/* 8D6B28 80240D28 46240003 */ div.d $f0, $f0, $f4 -/* 8D6B2C 80240D2C 8C420020 */ lw $v0, 0x20($v0) -/* 8D6B30 80240D30 46200020 */ cvt.s.d $f0, $f0 -/* 8D6B34 80240D34 E622001C */ swc1 $f2, 0x1c($s1) -/* 8D6B38 80240D38 E6200014 */ swc1 $f0, 0x14($s1) -/* 8D6B3C 80240D3C AE220028 */ sw $v0, 0x28($s1) -/* 8D6B40 80240D40 C6000018 */ lwc1 $f0, 0x18($s0) -/* 8D6B44 80240D44 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8D6B48 80240D48 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8D6B4C 80240D4C E6200018 */ swc1 $f0, 0x18($s1) -/* 8D6B50 80240D50 8C460028 */ lw $a2, 0x28($v0) -/* 8D6B54 80240D54 0C00A720 */ jal atan2 -/* 8D6B58 80240D58 8C470030 */ lw $a3, 0x30($v0) -/* 8D6B5C 80240D5C E620000C */ swc1 $f0, 0xc($s1) -/* 8D6B60 80240D60 8E420018 */ lw $v0, 0x18($s2) -/* 8D6B64 80240D64 AE400074 */ sw $zero, 0x74($s2) -/* 8D6B68 80240D68 9442002A */ lhu $v0, 0x2a($v0) -/* 8D6B6C 80240D6C 30420002 */ andi $v0, $v0, 2 -/* 8D6B70 80240D70 10400005 */ beqz $v0, .L80240D88 -/* 8D6B74 80240D74 24020003 */ addiu $v0, $zero, 3 -/* 8D6B78 80240D78 A622008E */ sh $v0, 0x8e($s1) -/* 8D6B7C 80240D7C 2402000D */ addiu $v0, $zero, 0xd -/* 8D6B80 80240D80 08090376 */ j .L80240DD8 -/* 8D6B84 80240D84 AE620070 */ sw $v0, 0x70($s3) -.L80240D88: -/* 8D6B88 80240D88 24030001 */ addiu $v1, $zero, 1 -/* 8D6B8C 80240D8C 2402000E */ addiu $v0, $zero, 0xe -/* 8D6B90 80240D90 A623008E */ sh $v1, 0x8e($s1) -/* 8D6B94 80240D94 AE620070 */ sw $v0, 0x70($s3) -/* 8D6B98 80240D98 C6200038 */ lwc1 $f0, 0x38($s1) -/* 8D6B9C 80240D9C 4600018D */ trunc.w.s $f6, $f0 -/* 8D6BA0 80240DA0 44023000 */ mfc1 $v0, $f6 -/* 8D6BA4 80240DA4 00000000 */ nop -/* 8D6BA8 80240DA8 A6420010 */ sh $v0, 0x10($s2) -/* 8D6BAC 80240DAC C620003C */ lwc1 $f0, 0x3c($s1) -/* 8D6BB0 80240DB0 4600018D */ trunc.w.s $f6, $f0 -/* 8D6BB4 80240DB4 44023000 */ mfc1 $v0, $f6 -/* 8D6BB8 80240DB8 00000000 */ nop -/* 8D6BBC 80240DBC A6420012 */ sh $v0, 0x12($s2) -/* 8D6BC0 80240DC0 C6200040 */ lwc1 $f0, 0x40($s1) -/* 8D6BC4 80240DC4 A2430007 */ sb $v1, 7($s2) -/* 8D6BC8 80240DC8 4600018D */ trunc.w.s $f6, $f0 -/* 8D6BCC 80240DCC 44023000 */ mfc1 $v0, $f6 -/* 8D6BD0 80240DD0 00000000 */ nop -/* 8D6BD4 80240DD4 A6420014 */ sh $v0, 0x14($s2) -.L80240DD8: -/* 8D6BD8 80240DD8 8FBF0020 */ lw $ra, 0x20($sp) -/* 8D6BDC 80240DDC 8FB3001C */ lw $s3, 0x1c($sp) -/* 8D6BE0 80240DE0 8FB20018 */ lw $s2, 0x18($sp) -/* 8D6BE4 80240DE4 8FB10014 */ lw $s1, 0x14($sp) -/* 8D6BE8 80240DE8 8FB00010 */ lw $s0, 0x10($sp) -/* 8D6BEC 80240DEC 03E00008 */ jr $ra -/* 8D6BF0 80240DF0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_8024130C_8D710C.s b/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_8024130C_8D710C.s index e6d2d206e1..bc2ac6fa20 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_8024130C_8D710C.s +++ b/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_8024130C_8D710C.s @@ -110,7 +110,7 @@ glabel L80241478_8D7278 glabel L80241490_8D7290 /* 8D7290 80241490 0280202D */ daddu $a0, $s4, $zero /* 8D7294 80241494 0200282D */ daddu $a1, $s0, $zero -/* 8D7298 80241498 0C090330 */ jal func_80240CC0_8D6AC0 +/* 8D7298 80241498 0C090330 */ jal kmr_09_UnkNpcAIFunc14 /* 8D729C 8024149C 0260302D */ daddu $a2, $s3, $zero /* 8D72A0 802414A0 08090535 */ j .L802414D4 /* 8D72A4 802414A4 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802411A0_C5B8E0.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802411A0_C5B8E0.s deleted file mode 100644 index f19ca0c6a3..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802411A0_C5B8E0.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411A0_C5B8E0 -/* C5B8E0 802411A0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C5B8E4 802411A4 AFB3001C */ sw $s3, 0x1c($sp) -/* C5B8E8 802411A8 0080982D */ daddu $s3, $a0, $zero -/* C5B8EC 802411AC AFBF0020 */ sw $ra, 0x20($sp) -/* C5B8F0 802411B0 AFB20018 */ sw $s2, 0x18($sp) -/* C5B8F4 802411B4 AFB10014 */ sw $s1, 0x14($sp) -/* C5B8F8 802411B8 AFB00010 */ sw $s0, 0x10($sp) -/* C5B8FC 802411BC 8E720148 */ lw $s2, 0x148($s3) -/* C5B900 802411C0 86440008 */ lh $a0, 8($s2) -/* C5B904 802411C4 0C00EABB */ jal get_npc_unsafe -/* C5B908 802411C8 00A0802D */ daddu $s0, $a1, $zero -/* C5B90C 802411CC 0040882D */ daddu $s1, $v0, $zero -/* C5B910 802411D0 C6420080 */ lwc1 $f2, 0x80($s2) -/* C5B914 802411D4 468010A0 */ cvt.s.w $f2, $f2 -/* C5B918 802411D8 460010A1 */ cvt.d.s $f2, $f2 -/* C5B91C 802411DC C6400084 */ lwc1 $f0, 0x84($s2) -/* C5B920 802411E0 46800020 */ cvt.s.w $f0, $f0 -/* C5B924 802411E4 46000021 */ cvt.d.s $f0, $f0 -/* C5B928 802411E8 3C014059 */ lui $at, 0x4059 -/* C5B92C 802411EC 44812800 */ mtc1 $at, $f5 -/* C5B930 802411F0 44802000 */ mtc1 $zero, $f4 -/* C5B934 802411F4 8E4200CC */ lw $v0, 0xcc($s2) -/* C5B938 802411F8 C62C0038 */ lwc1 $f12, 0x38($s1) -/* C5B93C 802411FC C62E0040 */ lwc1 $f14, 0x40($s1) -/* C5B940 80241200 46241083 */ div.d $f2, $f2, $f4 -/* C5B944 80241204 462010A0 */ cvt.s.d $f2, $f2 -/* C5B948 80241208 46240003 */ div.d $f0, $f0, $f4 -/* C5B94C 8024120C 8C420020 */ lw $v0, 0x20($v0) -/* C5B950 80241210 46200020 */ cvt.s.d $f0, $f0 -/* C5B954 80241214 E622001C */ swc1 $f2, 0x1c($s1) -/* C5B958 80241218 E6200014 */ swc1 $f0, 0x14($s1) -/* C5B95C 8024121C AE220028 */ sw $v0, 0x28($s1) -/* C5B960 80241220 C6000018 */ lwc1 $f0, 0x18($s0) -/* C5B964 80241224 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C5B968 80241228 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C5B96C 8024122C E6200018 */ swc1 $f0, 0x18($s1) -/* C5B970 80241230 8C460028 */ lw $a2, 0x28($v0) -/* C5B974 80241234 0C00A720 */ jal atan2 -/* C5B978 80241238 8C470030 */ lw $a3, 0x30($v0) -/* C5B97C 8024123C E620000C */ swc1 $f0, 0xc($s1) -/* C5B980 80241240 8E420018 */ lw $v0, 0x18($s2) -/* C5B984 80241244 AE400074 */ sw $zero, 0x74($s2) -/* C5B988 80241248 9442002A */ lhu $v0, 0x2a($v0) -/* C5B98C 8024124C 30420002 */ andi $v0, $v0, 2 -/* C5B990 80241250 10400005 */ beqz $v0, .L80241268 -/* C5B994 80241254 24020003 */ addiu $v0, $zero, 3 -/* C5B998 80241258 A622008E */ sh $v0, 0x8e($s1) -/* C5B99C 8024125C 2402000D */ addiu $v0, $zero, 0xd -/* C5B9A0 80241260 080904AE */ j .L802412B8 -/* C5B9A4 80241264 AE620070 */ sw $v0, 0x70($s3) -.L80241268: -/* C5B9A8 80241268 24030001 */ addiu $v1, $zero, 1 -/* C5B9AC 8024126C 2402000E */ addiu $v0, $zero, 0xe -/* C5B9B0 80241270 A623008E */ sh $v1, 0x8e($s1) -/* C5B9B4 80241274 AE620070 */ sw $v0, 0x70($s3) -/* C5B9B8 80241278 C6200038 */ lwc1 $f0, 0x38($s1) -/* C5B9BC 8024127C 4600018D */ trunc.w.s $f6, $f0 -/* C5B9C0 80241280 44023000 */ mfc1 $v0, $f6 -/* C5B9C4 80241284 00000000 */ nop -/* C5B9C8 80241288 A6420010 */ sh $v0, 0x10($s2) -/* C5B9CC 8024128C C620003C */ lwc1 $f0, 0x3c($s1) -/* C5B9D0 80241290 4600018D */ trunc.w.s $f6, $f0 -/* C5B9D4 80241294 44023000 */ mfc1 $v0, $f6 -/* C5B9D8 80241298 00000000 */ nop -/* C5B9DC 8024129C A6420012 */ sh $v0, 0x12($s2) -/* C5B9E0 802412A0 C6200040 */ lwc1 $f0, 0x40($s1) -/* C5B9E4 802412A4 A2430007 */ sb $v1, 7($s2) -/* C5B9E8 802412A8 4600018D */ trunc.w.s $f6, $f0 -/* C5B9EC 802412AC 44023000 */ mfc1 $v0, $f6 -/* C5B9F0 802412B0 00000000 */ nop -/* C5B9F4 802412B4 A6420014 */ sh $v0, 0x14($s2) -.L802412B8: -/* C5B9F8 802412B8 8FBF0020 */ lw $ra, 0x20($sp) -/* C5B9FC 802412BC 8FB3001C */ lw $s3, 0x1c($sp) -/* C5BA00 802412C0 8FB20018 */ lw $s2, 0x18($sp) -/* C5BA04 802412C4 8FB10014 */ lw $s1, 0x14($sp) -/* C5BA08 802412C8 8FB00010 */ lw $s0, 0x10($sp) -/* C5BA0C 802412CC 03E00008 */ jr $ra -/* C5BA10 802412D0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802417EC_C5BF2C.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802417EC_C5BF2C.s index 802c914f1a..c7d0462410 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802417EC_C5BF2C.s +++ b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802417EC_C5BF2C.s @@ -110,7 +110,7 @@ glabel L80241958_C5C098 glabel L80241970_C5C0B0 /* C5C0B0 80241970 0280202D */ daddu $a0, $s4, $zero /* C5C0B4 80241974 0200282D */ daddu $a1, $s0, $zero -/* C5C0B8 80241978 0C090468 */ jal func_802411A0_C5B8E0 +/* C5C0B8 80241978 0C090468 */ jal kzn_02_UnkNpcAIFunc14 /* C5C0BC 8024197C 0260302D */ daddu $a2, $s3, $zero /* C5C0C0 80241980 0809066D */ j .L802419B4 /* C5C0C4 80241984 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240F88_C690B8.s b/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240F88_C690B8.s deleted file mode 100644 index c059bab2f9..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240F88_C690B8.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F88_C690B8 -/* C690B8 80240F88 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C690BC 80240F8C AFBF0018 */ sw $ra, 0x18($sp) -/* C690C0 80240F90 0C00EAD2 */ jal get_npc_safe -/* C690C4 80240F94 2404FFFC */ addiu $a0, $zero, -4 -/* C690C8 80240F98 3C0141F0 */ lui $at, 0x41f0 -/* C690CC 80240F9C 44810000 */ mtc1 $at, $f0 -/* C690D0 80240FA0 C442003C */ lwc1 $f2, 0x3c($v0) -/* C690D4 80240FA4 46001080 */ add.s $f2, $f2, $f0 -/* C690D8 80240FA8 E7A00010 */ swc1 $f0, 0x10($sp) -/* C690DC 80240FAC 8C450038 */ lw $a1, 0x38($v0) -/* C690E0 80240FB0 8C470040 */ lw $a3, 0x40($v0) -/* C690E4 80240FB4 44061000 */ mfc1 $a2, $f2 -/* C690E8 80240FB8 0C01BFBC */ jal func_8006FEF0 -/* C690EC 80240FBC 24040002 */ addiu $a0, $zero, 2 -/* C690F0 80240FC0 8FBF0018 */ lw $ra, 0x18($sp) -/* C690F4 80240FC4 24020002 */ addiu $v0, $zero, 2 -/* C690F8 80240FC8 03E00008 */ jr $ra -/* C690FC 80240FCC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240FD0_C69100.s b/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240FD0_C69100.s deleted file mode 100644 index 29d9a68c1f..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240FD0_C69100.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FD0_C69100 -/* C69100 80240FD0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C69104 80240FD4 AFBF0018 */ sw $ra, 0x18($sp) -/* C69108 80240FD8 0C00EAD2 */ jal get_npc_safe -/* C6910C 80240FDC 2404FFFC */ addiu $a0, $zero, -4 -/* C69110 80240FE0 3C0141F0 */ lui $at, 0x41f0 -/* C69114 80240FE4 44810000 */ mtc1 $at, $f0 -/* C69118 80240FE8 C442003C */ lwc1 $f2, 0x3c($v0) -/* C6911C 80240FEC 46001080 */ add.s $f2, $f2, $f0 -/* C69120 80240FF0 E7A00010 */ swc1 $f0, 0x10($sp) -/* C69124 80240FF4 8C450038 */ lw $a1, 0x38($v0) -/* C69128 80240FF8 8C470040 */ lw $a3, 0x40($v0) -/* C6912C 80240FFC 44061000 */ mfc1 $a2, $f2 -/* C69130 80241000 0C01BFBC */ jal func_8006FEF0 -/* C69134 80241004 24040004 */ addiu $a0, $zero, 4 -/* C69138 80241008 8FBF0018 */ lw $ra, 0x18($sp) -/* C6913C 8024100C 24020002 */ addiu $v0, $zero, 2 -/* C69140 80241010 03E00008 */ jr $ra -/* C69144 80241014 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_802414E0_C6F810.s b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_802414E0_C6F810.s deleted file mode 100644 index efba374a97..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_802414E0_C6F810.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802414E0_C6F810 -/* C6F810 802414E0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C6F814 802414E4 AFB3001C */ sw $s3, 0x1c($sp) -/* C6F818 802414E8 0080982D */ daddu $s3, $a0, $zero -/* C6F81C 802414EC AFBF0020 */ sw $ra, 0x20($sp) -/* C6F820 802414F0 AFB20018 */ sw $s2, 0x18($sp) -/* C6F824 802414F4 AFB10014 */ sw $s1, 0x14($sp) -/* C6F828 802414F8 AFB00010 */ sw $s0, 0x10($sp) -/* C6F82C 802414FC 8E720148 */ lw $s2, 0x148($s3) -/* C6F830 80241500 86440008 */ lh $a0, 8($s2) -/* C6F834 80241504 0C00EABB */ jal get_npc_unsafe -/* C6F838 80241508 00A0802D */ daddu $s0, $a1, $zero -/* C6F83C 8024150C 0040882D */ daddu $s1, $v0, $zero -/* C6F840 80241510 C6420080 */ lwc1 $f2, 0x80($s2) -/* C6F844 80241514 468010A0 */ cvt.s.w $f2, $f2 -/* C6F848 80241518 460010A1 */ cvt.d.s $f2, $f2 -/* C6F84C 8024151C C6400084 */ lwc1 $f0, 0x84($s2) -/* C6F850 80241520 46800020 */ cvt.s.w $f0, $f0 -/* C6F854 80241524 46000021 */ cvt.d.s $f0, $f0 -/* C6F858 80241528 3C014059 */ lui $at, 0x4059 -/* C6F85C 8024152C 44812800 */ mtc1 $at, $f5 -/* C6F860 80241530 44802000 */ mtc1 $zero, $f4 -/* C6F864 80241534 8E4200CC */ lw $v0, 0xcc($s2) -/* C6F868 80241538 C62C0038 */ lwc1 $f12, 0x38($s1) -/* C6F86C 8024153C C62E0040 */ lwc1 $f14, 0x40($s1) -/* C6F870 80241540 46241083 */ div.d $f2, $f2, $f4 -/* C6F874 80241544 462010A0 */ cvt.s.d $f2, $f2 -/* C6F878 80241548 46240003 */ div.d $f0, $f0, $f4 -/* C6F87C 8024154C 8C420020 */ lw $v0, 0x20($v0) -/* C6F880 80241550 46200020 */ cvt.s.d $f0, $f0 -/* C6F884 80241554 E622001C */ swc1 $f2, 0x1c($s1) -/* C6F888 80241558 E6200014 */ swc1 $f0, 0x14($s1) -/* C6F88C 8024155C AE220028 */ sw $v0, 0x28($s1) -/* C6F890 80241560 C6000018 */ lwc1 $f0, 0x18($s0) -/* C6F894 80241564 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C6F898 80241568 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C6F89C 8024156C E6200018 */ swc1 $f0, 0x18($s1) -/* C6F8A0 80241570 8C460028 */ lw $a2, 0x28($v0) -/* C6F8A4 80241574 0C00A720 */ jal atan2 -/* C6F8A8 80241578 8C470030 */ lw $a3, 0x30($v0) -/* C6F8AC 8024157C E620000C */ swc1 $f0, 0xc($s1) -/* C6F8B0 80241580 8E420018 */ lw $v0, 0x18($s2) -/* C6F8B4 80241584 AE400074 */ sw $zero, 0x74($s2) -/* C6F8B8 80241588 9442002A */ lhu $v0, 0x2a($v0) -/* C6F8BC 8024158C 30420002 */ andi $v0, $v0, 2 -/* C6F8C0 80241590 10400005 */ beqz $v0, .L802415A8 -/* C6F8C4 80241594 24020003 */ addiu $v0, $zero, 3 -/* C6F8C8 80241598 A622008E */ sh $v0, 0x8e($s1) -/* C6F8CC 8024159C 2402000D */ addiu $v0, $zero, 0xd -/* C6F8D0 802415A0 0809057E */ j .L802415F8 -/* C6F8D4 802415A4 AE620070 */ sw $v0, 0x70($s3) -.L802415A8: -/* C6F8D8 802415A8 24030001 */ addiu $v1, $zero, 1 -/* C6F8DC 802415AC 2402000E */ addiu $v0, $zero, 0xe -/* C6F8E0 802415B0 A623008E */ sh $v1, 0x8e($s1) -/* C6F8E4 802415B4 AE620070 */ sw $v0, 0x70($s3) -/* C6F8E8 802415B8 C6200038 */ lwc1 $f0, 0x38($s1) -/* C6F8EC 802415BC 4600018D */ trunc.w.s $f6, $f0 -/* C6F8F0 802415C0 44023000 */ mfc1 $v0, $f6 -/* C6F8F4 802415C4 00000000 */ nop -/* C6F8F8 802415C8 A6420010 */ sh $v0, 0x10($s2) -/* C6F8FC 802415CC C620003C */ lwc1 $f0, 0x3c($s1) -/* C6F900 802415D0 4600018D */ trunc.w.s $f6, $f0 -/* C6F904 802415D4 44023000 */ mfc1 $v0, $f6 -/* C6F908 802415D8 00000000 */ nop -/* C6F90C 802415DC A6420012 */ sh $v0, 0x12($s2) -/* C6F910 802415E0 C6200040 */ lwc1 $f0, 0x40($s1) -/* C6F914 802415E4 A2430007 */ sb $v1, 7($s2) -/* C6F918 802415E8 4600018D */ trunc.w.s $f6, $f0 -/* C6F91C 802415EC 44023000 */ mfc1 $v0, $f6 -/* C6F920 802415F0 00000000 */ nop -/* C6F924 802415F4 A6420014 */ sh $v0, 0x14($s2) -.L802415F8: -/* C6F928 802415F8 8FBF0020 */ lw $ra, 0x20($sp) -/* C6F92C 802415FC 8FB3001C */ lw $s3, 0x1c($sp) -/* C6F930 80241600 8FB20018 */ lw $s2, 0x18($sp) -/* C6F934 80241604 8FB10014 */ lw $s1, 0x14($sp) -/* C6F938 80241608 8FB00010 */ lw $s0, 0x10($sp) -/* C6F93C 8024160C 03E00008 */ jr $ra -/* C6F940 80241610 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241B2C_C6FE5C.s b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241B2C_C6FE5C.s index 9447e8f546..7bcfb65f3f 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241B2C_C6FE5C.s +++ b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241B2C_C6FE5C.s @@ -110,7 +110,7 @@ glabel L80241C98_C6FFC8 glabel L80241CB0_C6FFE0 /* C6FFE0 80241CB0 0280202D */ daddu $a0, $s4, $zero /* C6FFE4 80241CB4 0200282D */ daddu $a1, $s0, $zero -/* C6FFE8 80241CB8 0C090538 */ jal func_802414E0_C6F810 +/* C6FFE8 80241CB8 0C090538 */ jal kzn_07_UnkNpcAIFunc14 /* C6FFEC 80241CBC 0260302D */ daddu $a2, $s3, $zero /* C6FFF0 80241CC0 0809073D */ j .L80241CF4 /* C6FFF4 80241CC4 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241710_C72B90.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241710_C72B90.s deleted file mode 100644 index 6be38b51ec..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241710_C72B90.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241710_C72B90 -/* C72B90 80241710 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C72B94 80241714 AFB3001C */ sw $s3, 0x1c($sp) -/* C72B98 80241718 0080982D */ daddu $s3, $a0, $zero -/* C72B9C 8024171C AFBF0020 */ sw $ra, 0x20($sp) -/* C72BA0 80241720 AFB20018 */ sw $s2, 0x18($sp) -/* C72BA4 80241724 AFB10014 */ sw $s1, 0x14($sp) -/* C72BA8 80241728 AFB00010 */ sw $s0, 0x10($sp) -/* C72BAC 8024172C 8E720148 */ lw $s2, 0x148($s3) -/* C72BB0 80241730 86440008 */ lh $a0, 8($s2) -/* C72BB4 80241734 0C00EABB */ jal get_npc_unsafe -/* C72BB8 80241738 00A0802D */ daddu $s0, $a1, $zero -/* C72BBC 8024173C 0040882D */ daddu $s1, $v0, $zero -/* C72BC0 80241740 C6420080 */ lwc1 $f2, 0x80($s2) -/* C72BC4 80241744 468010A0 */ cvt.s.w $f2, $f2 -/* C72BC8 80241748 460010A1 */ cvt.d.s $f2, $f2 -/* C72BCC 8024174C C6400084 */ lwc1 $f0, 0x84($s2) -/* C72BD0 80241750 46800020 */ cvt.s.w $f0, $f0 -/* C72BD4 80241754 46000021 */ cvt.d.s $f0, $f0 -/* C72BD8 80241758 3C014059 */ lui $at, 0x4059 -/* C72BDC 8024175C 44812800 */ mtc1 $at, $f5 -/* C72BE0 80241760 44802000 */ mtc1 $zero, $f4 -/* C72BE4 80241764 8E4200CC */ lw $v0, 0xcc($s2) -/* C72BE8 80241768 C62C0038 */ lwc1 $f12, 0x38($s1) -/* C72BEC 8024176C C62E0040 */ lwc1 $f14, 0x40($s1) -/* C72BF0 80241770 46241083 */ div.d $f2, $f2, $f4 -/* C72BF4 80241774 462010A0 */ cvt.s.d $f2, $f2 -/* C72BF8 80241778 46240003 */ div.d $f0, $f0, $f4 -/* C72BFC 8024177C 8C420020 */ lw $v0, 0x20($v0) -/* C72C00 80241780 46200020 */ cvt.s.d $f0, $f0 -/* C72C04 80241784 E622001C */ swc1 $f2, 0x1c($s1) -/* C72C08 80241788 E6200014 */ swc1 $f0, 0x14($s1) -/* C72C0C 8024178C AE220028 */ sw $v0, 0x28($s1) -/* C72C10 80241790 C6000018 */ lwc1 $f0, 0x18($s0) -/* C72C14 80241794 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C72C18 80241798 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C72C1C 8024179C E6200018 */ swc1 $f0, 0x18($s1) -/* C72C20 802417A0 8C460028 */ lw $a2, 0x28($v0) -/* C72C24 802417A4 0C00A720 */ jal atan2 -/* C72C28 802417A8 8C470030 */ lw $a3, 0x30($v0) -/* C72C2C 802417AC E620000C */ swc1 $f0, 0xc($s1) -/* C72C30 802417B0 8E420018 */ lw $v0, 0x18($s2) -/* C72C34 802417B4 AE400074 */ sw $zero, 0x74($s2) -/* C72C38 802417B8 9442002A */ lhu $v0, 0x2a($v0) -/* C72C3C 802417BC 30420002 */ andi $v0, $v0, 2 -/* C72C40 802417C0 10400005 */ beqz $v0, .L802417D8 -/* C72C44 802417C4 24020003 */ addiu $v0, $zero, 3 -/* C72C48 802417C8 A622008E */ sh $v0, 0x8e($s1) -/* C72C4C 802417CC 2402000D */ addiu $v0, $zero, 0xd -/* C72C50 802417D0 0809060A */ j .L80241828 -/* C72C54 802417D4 AE620070 */ sw $v0, 0x70($s3) -.L802417D8: -/* C72C58 802417D8 24030001 */ addiu $v1, $zero, 1 -/* C72C5C 802417DC 2402000E */ addiu $v0, $zero, 0xe -/* C72C60 802417E0 A623008E */ sh $v1, 0x8e($s1) -/* C72C64 802417E4 AE620070 */ sw $v0, 0x70($s3) -/* C72C68 802417E8 C6200038 */ lwc1 $f0, 0x38($s1) -/* C72C6C 802417EC 4600018D */ trunc.w.s $f6, $f0 -/* C72C70 802417F0 44023000 */ mfc1 $v0, $f6 -/* C72C74 802417F4 00000000 */ nop -/* C72C78 802417F8 A6420010 */ sh $v0, 0x10($s2) -/* C72C7C 802417FC C620003C */ lwc1 $f0, 0x3c($s1) -/* C72C80 80241800 4600018D */ trunc.w.s $f6, $f0 -/* C72C84 80241804 44023000 */ mfc1 $v0, $f6 -/* C72C88 80241808 00000000 */ nop -/* C72C8C 8024180C A6420012 */ sh $v0, 0x12($s2) -/* C72C90 80241810 C6200040 */ lwc1 $f0, 0x40($s1) -/* C72C94 80241814 A2430007 */ sb $v1, 7($s2) -/* C72C98 80241818 4600018D */ trunc.w.s $f6, $f0 -/* C72C9C 8024181C 44023000 */ mfc1 $v0, $f6 -/* C72CA0 80241820 00000000 */ nop -/* C72CA4 80241824 A6420014 */ sh $v0, 0x14($s2) -.L80241828: -/* C72CA8 80241828 8FBF0020 */ lw $ra, 0x20($sp) -/* C72CAC 8024182C 8FB3001C */ lw $s3, 0x1c($sp) -/* C72CB0 80241830 8FB20018 */ lw $s2, 0x18($sp) -/* C72CB4 80241834 8FB10014 */ lw $s1, 0x14($sp) -/* C72CB8 80241838 8FB00010 */ lw $s0, 0x10($sp) -/* C72CBC 8024183C 03E00008 */ jr $ra -/* C72CC0 80241840 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241D5C_C731DC.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241D5C_C731DC.s index 7ca1d6ab05..f0450d63b2 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241D5C_C731DC.s +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241D5C_C731DC.s @@ -110,7 +110,7 @@ glabel L80241EC8_C73348 glabel L80241EE0_C73360 /* C73360 80241EE0 0280202D */ daddu $a0, $s4, $zero /* C73364 80241EE4 0200282D */ daddu $a1, $s0, $zero -/* C73368 80241EE8 0C0905C4 */ jal func_80241710_C72B90 +/* C73368 80241EE8 0C0905C4 */ jal kzn_08_UnkNpcAIFunc14 /* C7336C 80241EEC 0260302D */ daddu $a2, $s3, $zero /* C73370 80241EF0 080907C9 */ j .L80241F24 /* C73374 80241EF4 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240C78_C77958.s b/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240C78_C77958.s deleted file mode 100644 index 2df8dfc57d..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240C78_C77958.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C78_C77958 -/* C77958 80240C78 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C7795C 80240C7C AFBF0018 */ sw $ra, 0x18($sp) -/* C77960 80240C80 0C00EAD2 */ jal get_npc_safe -/* C77964 80240C84 2404FFFC */ addiu $a0, $zero, -4 -/* C77968 80240C88 3C0141F0 */ lui $at, 0x41f0 -/* C7796C 80240C8C 44810000 */ mtc1 $at, $f0 -/* C77970 80240C90 C442003C */ lwc1 $f2, 0x3c($v0) -/* C77974 80240C94 46001080 */ add.s $f2, $f2, $f0 -/* C77978 80240C98 E7A00010 */ swc1 $f0, 0x10($sp) -/* C7797C 80240C9C 8C450038 */ lw $a1, 0x38($v0) -/* C77980 80240CA0 8C470040 */ lw $a3, 0x40($v0) -/* C77984 80240CA4 44061000 */ mfc1 $a2, $f2 -/* C77988 80240CA8 0C01BFBC */ jal func_8006FEF0 -/* C7798C 80240CAC 24040002 */ addiu $a0, $zero, 2 -/* C77990 80240CB0 8FBF0018 */ lw $ra, 0x18($sp) -/* C77994 80240CB4 24020002 */ addiu $v0, $zero, 2 -/* C77998 80240CB8 03E00008 */ jr $ra -/* C7799C 80240CBC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240CC0_C779A0.s b/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240CC0_C779A0.s deleted file mode 100644 index edc402908f..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240CC0_C779A0.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CC0_C779A0 -/* C779A0 80240CC0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C779A4 80240CC4 AFBF0018 */ sw $ra, 0x18($sp) -/* C779A8 80240CC8 0C00EAD2 */ jal get_npc_safe -/* C779AC 80240CCC 2404FFFC */ addiu $a0, $zero, -4 -/* C779B0 80240CD0 3C0141F0 */ lui $at, 0x41f0 -/* C779B4 80240CD4 44810000 */ mtc1 $at, $f0 -/* C779B8 80240CD8 C442003C */ lwc1 $f2, 0x3c($v0) -/* C779BC 80240CDC 46001080 */ add.s $f2, $f2, $f0 -/* C779C0 80240CE0 E7A00010 */ swc1 $f0, 0x10($sp) -/* C779C4 80240CE4 8C450038 */ lw $a1, 0x38($v0) -/* C779C8 80240CE8 8C470040 */ lw $a3, 0x40($v0) -/* C779CC 80240CEC 44061000 */ mfc1 $a2, $f2 -/* C779D0 80240CF0 0C01BFBC */ jal func_8006FEF0 -/* C779D4 80240CF4 24040004 */ addiu $a0, $zero, 4 -/* C779D8 80240CF8 8FBF0018 */ lw $ra, 0x18($sp) -/* C779DC 80240CFC 24020002 */ addiu $v0, $zero, 2 -/* C779E0 80240D00 03E00008 */ jr $ra -/* C779E4 80240D04 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241120_C812C0.s b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241120_C812C0.s deleted file mode 100644 index 58c38c60a0..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241120_C812C0.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241120_C812C0 -/* C812C0 80241120 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C812C4 80241124 AFB3001C */ sw $s3, 0x1c($sp) -/* C812C8 80241128 0080982D */ daddu $s3, $a0, $zero -/* C812CC 8024112C AFBF0020 */ sw $ra, 0x20($sp) -/* C812D0 80241130 AFB20018 */ sw $s2, 0x18($sp) -/* C812D4 80241134 AFB10014 */ sw $s1, 0x14($sp) -/* C812D8 80241138 AFB00010 */ sw $s0, 0x10($sp) -/* C812DC 8024113C 8E720148 */ lw $s2, 0x148($s3) -/* C812E0 80241140 86440008 */ lh $a0, 8($s2) -/* C812E4 80241144 0C00EABB */ jal get_npc_unsafe -/* C812E8 80241148 00A0802D */ daddu $s0, $a1, $zero -/* C812EC 8024114C 0040882D */ daddu $s1, $v0, $zero -/* C812F0 80241150 C6420080 */ lwc1 $f2, 0x80($s2) -/* C812F4 80241154 468010A0 */ cvt.s.w $f2, $f2 -/* C812F8 80241158 460010A1 */ cvt.d.s $f2, $f2 -/* C812FC 8024115C C6400084 */ lwc1 $f0, 0x84($s2) -/* C81300 80241160 46800020 */ cvt.s.w $f0, $f0 -/* C81304 80241164 46000021 */ cvt.d.s $f0, $f0 -/* C81308 80241168 3C014059 */ lui $at, 0x4059 -/* C8130C 8024116C 44812800 */ mtc1 $at, $f5 -/* C81310 80241170 44802000 */ mtc1 $zero, $f4 -/* C81314 80241174 8E4200CC */ lw $v0, 0xcc($s2) -/* C81318 80241178 C62C0038 */ lwc1 $f12, 0x38($s1) -/* C8131C 8024117C C62E0040 */ lwc1 $f14, 0x40($s1) -/* C81320 80241180 46241083 */ div.d $f2, $f2, $f4 -/* C81324 80241184 462010A0 */ cvt.s.d $f2, $f2 -/* C81328 80241188 46240003 */ div.d $f0, $f0, $f4 -/* C8132C 8024118C 8C420020 */ lw $v0, 0x20($v0) -/* C81330 80241190 46200020 */ cvt.s.d $f0, $f0 -/* C81334 80241194 E622001C */ swc1 $f2, 0x1c($s1) -/* C81338 80241198 E6200014 */ swc1 $f0, 0x14($s1) -/* C8133C 8024119C AE220028 */ sw $v0, 0x28($s1) -/* C81340 802411A0 C6000018 */ lwc1 $f0, 0x18($s0) -/* C81344 802411A4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C81348 802411A8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C8134C 802411AC E6200018 */ swc1 $f0, 0x18($s1) -/* C81350 802411B0 8C460028 */ lw $a2, 0x28($v0) -/* C81354 802411B4 0C00A720 */ jal atan2 -/* C81358 802411B8 8C470030 */ lw $a3, 0x30($v0) -/* C8135C 802411BC E620000C */ swc1 $f0, 0xc($s1) -/* C81360 802411C0 8E420018 */ lw $v0, 0x18($s2) -/* C81364 802411C4 AE400074 */ sw $zero, 0x74($s2) -/* C81368 802411C8 9442002A */ lhu $v0, 0x2a($v0) -/* C8136C 802411CC 30420002 */ andi $v0, $v0, 2 -/* C81370 802411D0 10400005 */ beqz $v0, .L802411E8 -/* C81374 802411D4 24020003 */ addiu $v0, $zero, 3 -/* C81378 802411D8 A622008E */ sh $v0, 0x8e($s1) -/* C8137C 802411DC 2402000D */ addiu $v0, $zero, 0xd -/* C81380 802411E0 0809048E */ j .L80241238 -/* C81384 802411E4 AE620070 */ sw $v0, 0x70($s3) -.L802411E8: -/* C81388 802411E8 24030001 */ addiu $v1, $zero, 1 -/* C8138C 802411EC 2402000E */ addiu $v0, $zero, 0xe -/* C81390 802411F0 A623008E */ sh $v1, 0x8e($s1) -/* C81394 802411F4 AE620070 */ sw $v0, 0x70($s3) -/* C81398 802411F8 C6200038 */ lwc1 $f0, 0x38($s1) -/* C8139C 802411FC 4600018D */ trunc.w.s $f6, $f0 -/* C813A0 80241200 44023000 */ mfc1 $v0, $f6 -/* C813A4 80241204 00000000 */ nop -/* C813A8 80241208 A6420010 */ sh $v0, 0x10($s2) -/* C813AC 8024120C C620003C */ lwc1 $f0, 0x3c($s1) -/* C813B0 80241210 4600018D */ trunc.w.s $f6, $f0 -/* C813B4 80241214 44023000 */ mfc1 $v0, $f6 -/* C813B8 80241218 00000000 */ nop -/* C813BC 8024121C A6420012 */ sh $v0, 0x12($s2) -/* C813C0 80241220 C6200040 */ lwc1 $f0, 0x40($s1) -/* C813C4 80241224 A2430007 */ sb $v1, 7($s2) -/* C813C8 80241228 4600018D */ trunc.w.s $f6, $f0 -/* C813CC 8024122C 44023000 */ mfc1 $v0, $f6 -/* C813D0 80241230 00000000 */ nop -/* C813D4 80241234 A6420014 */ sh $v0, 0x14($s2) -.L80241238: -/* C813D8 80241238 8FBF0020 */ lw $ra, 0x20($sp) -/* C813DC 8024123C 8FB3001C */ lw $s3, 0x1c($sp) -/* C813E0 80241240 8FB20018 */ lw $s2, 0x18($sp) -/* C813E4 80241244 8FB10014 */ lw $s1, 0x14($sp) -/* C813E8 80241248 8FB00010 */ lw $s0, 0x10($sp) -/* C813EC 8024124C 03E00008 */ jr $ra -/* C813F0 80241250 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024176C_C8190C.s b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024176C_C8190C.s index 56f79c1120..6618f0e685 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024176C_C8190C.s +++ b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024176C_C8190C.s @@ -110,7 +110,7 @@ glabel L802418D8_C81A78 glabel L802418F0_C81A90 /* C81A90 802418F0 0280202D */ daddu $a0, $s4, $zero /* C81A94 802418F4 0200282D */ daddu $a1, $s0, $zero -/* C81A98 802418F8 0C090448 */ jal func_80241120_C812C0 +/* C81A98 802418F8 0C090448 */ jal kzn_11_UnkNpcAIFunc14 /* C81A9C 802418FC 0260302D */ daddu $a2, $s3, $zero /* C81AA0 80241900 0809064D */ j .L80241934 /* C81AA4 80241904 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240A5C_7EB76C.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240A5C_7EB76C.s deleted file mode 100644 index c0b5b18e9a..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240A5C_7EB76C.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A5C_7EB76C -/* 7EB76C 80240A5C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 7EB770 80240A60 AFB10014 */ sw $s1, 0x14($sp) -/* 7EB774 80240A64 0080882D */ daddu $s1, $a0, $zero -/* 7EB778 80240A68 AFBF0024 */ sw $ra, 0x24($sp) -/* 7EB77C 80240A6C AFB40020 */ sw $s4, 0x20($sp) -/* 7EB780 80240A70 AFB3001C */ sw $s3, 0x1c($sp) -/* 7EB784 80240A74 AFB20018 */ sw $s2, 0x18($sp) -/* 7EB788 80240A78 10A00033 */ beqz $a1, .L80240B48 -/* 7EB78C 80240A7C AFB00010 */ sw $s0, 0x10($sp) -/* 7EB790 80240A80 0C04760B */ jal func_8011D82C -/* 7EB794 80240A84 24040001 */ addiu $a0, $zero, 1 -/* 7EB798 80240A88 0000202D */ daddu $a0, $zero, $zero -/* 7EB79C 80240A8C 0080282D */ daddu $a1, $a0, $zero -/* 7EB7A0 80240A90 0080302D */ daddu $a2, $a0, $zero -/* 7EB7A4 80240A94 0080382D */ daddu $a3, $a0, $zero -/* 7EB7A8 80240A98 0080802D */ daddu $s0, $a0, $zero -/* 7EB7AC 80240A9C 2414FFFC */ addiu $s4, $zero, -4 -/* 7EB7B0 80240AA0 24130006 */ addiu $s3, $zero, 6 -/* 7EB7B4 80240AA4 3C120080 */ lui $s2, 0x80 -/* 7EB7B8 80240AA8 3C038015 */ lui $v1, %hi(D_801512F0) -/* 7EB7BC 80240AAC 8C6312F0 */ lw $v1, %lo(D_801512F0)($v1) -/* 7EB7C0 80240AB0 24020001 */ addiu $v0, $zero, 1 -/* 7EB7C4 80240AB4 0C046F97 */ jal set_background_color_blend -/* 7EB7C8 80240AB8 A0620000 */ sb $v0, ($v1) -.L80240ABC: -/* 7EB7CC 80240ABC 0C00E2B7 */ jal get_npc_by_index -/* 7EB7D0 80240AC0 0200202D */ daddu $a0, $s0, $zero -/* 7EB7D4 80240AC4 0040202D */ daddu $a0, $v0, $zero -/* 7EB7D8 80240AC8 5080000B */ beql $a0, $zero, .L80240AF8 -/* 7EB7DC 80240ACC 26100001 */ addiu $s0, $s0, 1 -/* 7EB7E0 80240AD0 8C820000 */ lw $v0, ($a0) -/* 7EB7E4 80240AD4 50400008 */ beql $v0, $zero, .L80240AF8 -/* 7EB7E8 80240AD8 26100001 */ addiu $s0, $s0, 1 -/* 7EB7EC 80240ADC 808300A4 */ lb $v1, 0xa4($a0) -/* 7EB7F0 80240AE0 10740005 */ beq $v1, $s4, .L80240AF8 -/* 7EB7F4 80240AE4 26100001 */ addiu $s0, $s0, 1 -/* 7EB7F8 80240AE8 10730003 */ beq $v1, $s3, .L80240AF8 -/* 7EB7FC 80240AEC 00000000 */ nop -/* 7EB800 80240AF0 00521025 */ or $v0, $v0, $s2 -/* 7EB804 80240AF4 AC820000 */ sw $v0, ($a0) -.L80240AF8: -/* 7EB808 80240AF8 2A020040 */ slti $v0, $s0, 0x40 -/* 7EB80C 80240AFC 1440FFEF */ bnez $v0, .L80240ABC -/* 7EB810 80240B00 00000000 */ nop -/* 7EB814 80240B04 0000802D */ daddu $s0, $zero, $zero -/* 7EB818 80240B08 3C120800 */ lui $s2, 0x800 -.L80240B0C: -/* 7EB81C 80240B0C 0C04C3D6 */ jal get_item_entity -/* 7EB820 80240B10 0200202D */ daddu $a0, $s0, $zero -/* 7EB824 80240B14 0040182D */ daddu $v1, $v0, $zero -/* 7EB828 80240B18 10600007 */ beqz $v1, .L80240B38 -/* 7EB82C 80240B1C 26100001 */ addiu $s0, $s0, 1 -/* 7EB830 80240B20 8C640000 */ lw $a0, ($v1) -/* 7EB834 80240B24 30820010 */ andi $v0, $a0, 0x10 -/* 7EB838 80240B28 10400003 */ beqz $v0, .L80240B38 -/* 7EB83C 80240B2C 00000000 */ nop -/* 7EB840 80240B30 00921025 */ or $v0, $a0, $s2 -/* 7EB844 80240B34 AC620000 */ sw $v0, ($v1) -.L80240B38: -/* 7EB848 80240B38 2A020100 */ slti $v0, $s0, 0x100 -/* 7EB84C 80240B3C 1440FFF3 */ bnez $v0, .L80240B0C -/* 7EB850 80240B40 00000000 */ nop -/* 7EB854 80240B44 AE200070 */ sw $zero, 0x70($s1) -.L80240B48: -/* 7EB858 80240B48 8E220070 */ lw $v0, 0x70($s1) -/* 7EB85C 80240B4C 24420008 */ addiu $v0, $v0, 8 -/* 7EB860 80240B50 AE220070 */ sw $v0, 0x70($s1) -/* 7EB864 80240B54 28420100 */ slti $v0, $v0, 0x100 -/* 7EB868 80240B58 14400003 */ bnez $v0, .L80240B68 -/* 7EB86C 80240B5C 0000202D */ daddu $a0, $zero, $zero -/* 7EB870 80240B60 240200FF */ addiu $v0, $zero, 0xff -/* 7EB874 80240B64 AE220070 */ sw $v0, 0x70($s1) -.L80240B68: -/* 7EB878 80240B68 0080282D */ daddu $a1, $a0, $zero -/* 7EB87C 80240B6C 92270073 */ lbu $a3, 0x73($s1) -/* 7EB880 80240B70 0C046F97 */ jal set_background_color_blend -/* 7EB884 80240B74 0080302D */ daddu $a2, $a0, $zero -/* 7EB888 80240B78 8E220070 */ lw $v0, 0x70($s1) -/* 7EB88C 80240B7C 8FBF0024 */ lw $ra, 0x24($sp) -/* 7EB890 80240B80 8FB40020 */ lw $s4, 0x20($sp) -/* 7EB894 80240B84 8FB3001C */ lw $s3, 0x1c($sp) -/* 7EB898 80240B88 8FB20018 */ lw $s2, 0x18($sp) -/* 7EB89C 80240B8C 8FB10014 */ lw $s1, 0x14($sp) -/* 7EB8A0 80240B90 8FB00010 */ lw $s0, 0x10($sp) -/* 7EB8A4 80240B94 384200FF */ xori $v0, $v0, 0xff -/* 7EB8A8 80240B98 2C420001 */ sltiu $v0, $v0, 1 -/* 7EB8AC 80240B9C 00021040 */ sll $v0, $v0, 1 -/* 7EB8B0 80240BA0 03E00008 */ jr $ra -/* 7EB8B4 80240BA4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024233C_802BBC.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024233C_802BBC.s deleted file mode 100644 index 961ffe6f28..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024233C_802BBC.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024233C_802BBC -/* 802BBC 8024233C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 802BC0 80242340 AFB10014 */ sw $s1, 0x14($sp) -/* 802BC4 80242344 0080882D */ daddu $s1, $a0, $zero -/* 802BC8 80242348 AFBF0024 */ sw $ra, 0x24($sp) -/* 802BCC 8024234C AFB40020 */ sw $s4, 0x20($sp) -/* 802BD0 80242350 AFB3001C */ sw $s3, 0x1c($sp) -/* 802BD4 80242354 AFB20018 */ sw $s2, 0x18($sp) -/* 802BD8 80242358 10A00033 */ beqz $a1, .L80242428 -/* 802BDC 8024235C AFB00010 */ sw $s0, 0x10($sp) -/* 802BE0 80242360 0C04760B */ jal func_8011D82C -/* 802BE4 80242364 24040001 */ addiu $a0, $zero, 1 -/* 802BE8 80242368 0000202D */ daddu $a0, $zero, $zero -/* 802BEC 8024236C 0080282D */ daddu $a1, $a0, $zero -/* 802BF0 80242370 0080302D */ daddu $a2, $a0, $zero -/* 802BF4 80242374 0080382D */ daddu $a3, $a0, $zero -/* 802BF8 80242378 0080802D */ daddu $s0, $a0, $zero -/* 802BFC 8024237C 2414FFFC */ addiu $s4, $zero, -4 -/* 802C00 80242380 24130005 */ addiu $s3, $zero, 5 -/* 802C04 80242384 3C120080 */ lui $s2, 0x80 -/* 802C08 80242388 3C038015 */ lui $v1, %hi(D_801512F0) -/* 802C0C 8024238C 8C6312F0 */ lw $v1, %lo(D_801512F0)($v1) -/* 802C10 80242390 24020001 */ addiu $v0, $zero, 1 -/* 802C14 80242394 0C046F97 */ jal set_background_color_blend -/* 802C18 80242398 A0620000 */ sb $v0, ($v1) -.L8024239C: -/* 802C1C 8024239C 0C00E2B7 */ jal get_npc_by_index -/* 802C20 802423A0 0200202D */ daddu $a0, $s0, $zero -/* 802C24 802423A4 0040202D */ daddu $a0, $v0, $zero -/* 802C28 802423A8 5080000B */ beql $a0, $zero, .L802423D8 -/* 802C2C 802423AC 26100001 */ addiu $s0, $s0, 1 -/* 802C30 802423B0 8C820000 */ lw $v0, ($a0) -/* 802C34 802423B4 50400008 */ beql $v0, $zero, .L802423D8 -/* 802C38 802423B8 26100001 */ addiu $s0, $s0, 1 -/* 802C3C 802423BC 808300A4 */ lb $v1, 0xa4($a0) -/* 802C40 802423C0 10740005 */ beq $v1, $s4, .L802423D8 -/* 802C44 802423C4 26100001 */ addiu $s0, $s0, 1 -/* 802C48 802423C8 10730003 */ beq $v1, $s3, .L802423D8 -/* 802C4C 802423CC 00000000 */ nop -/* 802C50 802423D0 00521025 */ or $v0, $v0, $s2 -/* 802C54 802423D4 AC820000 */ sw $v0, ($a0) -.L802423D8: -/* 802C58 802423D8 2A020040 */ slti $v0, $s0, 0x40 -/* 802C5C 802423DC 1440FFEF */ bnez $v0, .L8024239C -/* 802C60 802423E0 00000000 */ nop -/* 802C64 802423E4 0000802D */ daddu $s0, $zero, $zero -/* 802C68 802423E8 3C120800 */ lui $s2, 0x800 -.L802423EC: -/* 802C6C 802423EC 0C04C3D6 */ jal get_item_entity -/* 802C70 802423F0 0200202D */ daddu $a0, $s0, $zero -/* 802C74 802423F4 0040182D */ daddu $v1, $v0, $zero -/* 802C78 802423F8 10600007 */ beqz $v1, .L80242418 -/* 802C7C 802423FC 26100001 */ addiu $s0, $s0, 1 -/* 802C80 80242400 8C640000 */ lw $a0, ($v1) -/* 802C84 80242404 30820010 */ andi $v0, $a0, 0x10 -/* 802C88 80242408 10400003 */ beqz $v0, .L80242418 -/* 802C8C 8024240C 00000000 */ nop -/* 802C90 80242410 00921025 */ or $v0, $a0, $s2 -/* 802C94 80242414 AC620000 */ sw $v0, ($v1) -.L80242418: -/* 802C98 80242418 2A020100 */ slti $v0, $s0, 0x100 -/* 802C9C 8024241C 1440FFF3 */ bnez $v0, .L802423EC -/* 802CA0 80242420 00000000 */ nop -/* 802CA4 80242424 AE200070 */ sw $zero, 0x70($s1) -.L80242428: -/* 802CA8 80242428 8E220070 */ lw $v0, 0x70($s1) -/* 802CAC 8024242C 24420008 */ addiu $v0, $v0, 8 -/* 802CB0 80242430 AE220070 */ sw $v0, 0x70($s1) -/* 802CB4 80242434 28420100 */ slti $v0, $v0, 0x100 -/* 802CB8 80242438 14400003 */ bnez $v0, .L80242448 -/* 802CBC 8024243C 0000202D */ daddu $a0, $zero, $zero -/* 802CC0 80242440 240200FF */ addiu $v0, $zero, 0xff -/* 802CC4 80242444 AE220070 */ sw $v0, 0x70($s1) -.L80242448: -/* 802CC8 80242448 0080282D */ daddu $a1, $a0, $zero -/* 802CCC 8024244C 92270073 */ lbu $a3, 0x73($s1) -/* 802CD0 80242450 0C046F97 */ jal set_background_color_blend -/* 802CD4 80242454 0080302D */ daddu $a2, $a0, $zero -/* 802CD8 80242458 8E220070 */ lw $v0, 0x70($s1) -/* 802CDC 8024245C 8FBF0024 */ lw $ra, 0x24($sp) -/* 802CE0 80242460 8FB40020 */ lw $s4, 0x20($sp) -/* 802CE4 80242464 8FB3001C */ lw $s3, 0x1c($sp) -/* 802CE8 80242468 8FB20018 */ lw $s2, 0x18($sp) -/* 802CEC 8024246C 8FB10014 */ lw $s1, 0x14($sp) -/* 802CF0 80242470 8FB00010 */ lw $s0, 0x10($sp) -/* 802CF4 80242474 384200FF */ xori $v0, $v0, 0xff -/* 802CF8 80242478 2C420001 */ sltiu $v0, $v0, 1 -/* 802CFC 8024247C 00021040 */ sll $v0, $v0, 1 -/* 802D00 80242480 03E00008 */ jr $ra -/* 802D04 80242484 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241BEC_824EAC.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241BEC_824EAC.s deleted file mode 100644 index 87a39b44e5..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241BEC_824EAC.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241BEC_824EAC -/* 824EAC 80241BEC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 824EB0 80241BF0 AFB10014 */ sw $s1, 0x14($sp) -/* 824EB4 80241BF4 0080882D */ daddu $s1, $a0, $zero -/* 824EB8 80241BF8 AFBF0024 */ sw $ra, 0x24($sp) -/* 824EBC 80241BFC AFB40020 */ sw $s4, 0x20($sp) -/* 824EC0 80241C00 AFB3001C */ sw $s3, 0x1c($sp) -/* 824EC4 80241C04 AFB20018 */ sw $s2, 0x18($sp) -/* 824EC8 80241C08 10A00033 */ beqz $a1, .L80241CD8 -/* 824ECC 80241C0C AFB00010 */ sw $s0, 0x10($sp) -/* 824ED0 80241C10 0C04760B */ jal func_8011D82C -/* 824ED4 80241C14 24040001 */ addiu $a0, $zero, 1 -/* 824ED8 80241C18 0000202D */ daddu $a0, $zero, $zero -/* 824EDC 80241C1C 0080282D */ daddu $a1, $a0, $zero -/* 824EE0 80241C20 0080302D */ daddu $a2, $a0, $zero -/* 824EE4 80241C24 0080382D */ daddu $a3, $a0, $zero -/* 824EE8 80241C28 0080802D */ daddu $s0, $a0, $zero -/* 824EEC 80241C2C 2414FFFC */ addiu $s4, $zero, -4 -/* 824EF0 80241C30 2413000C */ addiu $s3, $zero, 0xc -/* 824EF4 80241C34 3C120080 */ lui $s2, 0x80 -/* 824EF8 80241C38 3C038015 */ lui $v1, %hi(D_801512F0) -/* 824EFC 80241C3C 8C6312F0 */ lw $v1, %lo(D_801512F0)($v1) -/* 824F00 80241C40 24020001 */ addiu $v0, $zero, 1 -/* 824F04 80241C44 0C046F97 */ jal set_background_color_blend -/* 824F08 80241C48 A0620000 */ sb $v0, ($v1) -.L80241C4C: -/* 824F0C 80241C4C 0C00E2B7 */ jal get_npc_by_index -/* 824F10 80241C50 0200202D */ daddu $a0, $s0, $zero -/* 824F14 80241C54 0040202D */ daddu $a0, $v0, $zero -/* 824F18 80241C58 5080000B */ beql $a0, $zero, .L80241C88 -/* 824F1C 80241C5C 26100001 */ addiu $s0, $s0, 1 -/* 824F20 80241C60 8C820000 */ lw $v0, ($a0) -/* 824F24 80241C64 50400008 */ beql $v0, $zero, .L80241C88 -/* 824F28 80241C68 26100001 */ addiu $s0, $s0, 1 -/* 824F2C 80241C6C 808300A4 */ lb $v1, 0xa4($a0) -/* 824F30 80241C70 10740005 */ beq $v1, $s4, .L80241C88 -/* 824F34 80241C74 26100001 */ addiu $s0, $s0, 1 -/* 824F38 80241C78 10730003 */ beq $v1, $s3, .L80241C88 -/* 824F3C 80241C7C 00000000 */ nop -/* 824F40 80241C80 00521025 */ or $v0, $v0, $s2 -/* 824F44 80241C84 AC820000 */ sw $v0, ($a0) -.L80241C88: -/* 824F48 80241C88 2A020040 */ slti $v0, $s0, 0x40 -/* 824F4C 80241C8C 1440FFEF */ bnez $v0, .L80241C4C -/* 824F50 80241C90 00000000 */ nop -/* 824F54 80241C94 0000802D */ daddu $s0, $zero, $zero -/* 824F58 80241C98 3C120800 */ lui $s2, 0x800 -.L80241C9C: -/* 824F5C 80241C9C 0C04C3D6 */ jal get_item_entity -/* 824F60 80241CA0 0200202D */ daddu $a0, $s0, $zero -/* 824F64 80241CA4 0040182D */ daddu $v1, $v0, $zero -/* 824F68 80241CA8 10600007 */ beqz $v1, .L80241CC8 -/* 824F6C 80241CAC 26100001 */ addiu $s0, $s0, 1 -/* 824F70 80241CB0 8C640000 */ lw $a0, ($v1) -/* 824F74 80241CB4 30820010 */ andi $v0, $a0, 0x10 -/* 824F78 80241CB8 10400003 */ beqz $v0, .L80241CC8 -/* 824F7C 80241CBC 00000000 */ nop -/* 824F80 80241CC0 00921025 */ or $v0, $a0, $s2 -/* 824F84 80241CC4 AC620000 */ sw $v0, ($v1) -.L80241CC8: -/* 824F88 80241CC8 2A020100 */ slti $v0, $s0, 0x100 -/* 824F8C 80241CCC 1440FFF3 */ bnez $v0, .L80241C9C -/* 824F90 80241CD0 00000000 */ nop -/* 824F94 80241CD4 AE200070 */ sw $zero, 0x70($s1) -.L80241CD8: -/* 824F98 80241CD8 8E220070 */ lw $v0, 0x70($s1) -/* 824F9C 80241CDC 24420008 */ addiu $v0, $v0, 8 -/* 824FA0 80241CE0 AE220070 */ sw $v0, 0x70($s1) -/* 824FA4 80241CE4 28420100 */ slti $v0, $v0, 0x100 -/* 824FA8 80241CE8 14400003 */ bnez $v0, .L80241CF8 -/* 824FAC 80241CEC 0000202D */ daddu $a0, $zero, $zero -/* 824FB0 80241CF0 240200FF */ addiu $v0, $zero, 0xff -/* 824FB4 80241CF4 AE220070 */ sw $v0, 0x70($s1) -.L80241CF8: -/* 824FB8 80241CF8 0080282D */ daddu $a1, $a0, $zero -/* 824FBC 80241CFC 92270073 */ lbu $a3, 0x73($s1) -/* 824FC0 80241D00 0C046F97 */ jal set_background_color_blend -/* 824FC4 80241D04 0080302D */ daddu $a2, $a0, $zero -/* 824FC8 80241D08 8E220070 */ lw $v0, 0x70($s1) -/* 824FCC 80241D0C 8FBF0024 */ lw $ra, 0x24($sp) -/* 824FD0 80241D10 8FB40020 */ lw $s4, 0x20($sp) -/* 824FD4 80241D14 8FB3001C */ lw $s3, 0x1c($sp) -/* 824FD8 80241D18 8FB20018 */ lw $s2, 0x18($sp) -/* 824FDC 80241D1C 8FB10014 */ lw $s1, 0x14($sp) -/* 824FE0 80241D20 8FB00010 */ lw $s0, 0x10($sp) -/* 824FE4 80241D24 384200FF */ xori $v0, $v0, 0xff -/* 824FE8 80241D28 2C420001 */ sltiu $v0, $v0, 1 -/* 824FEC 80241D2C 00021040 */ sll $v0, $v0, 1 -/* 824FF0 80241D30 03E00008 */ jr $ra -/* 824FF4 80241D34 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802408DC_8320DC.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802408DC_8320DC.s deleted file mode 100644 index c8d72868b4..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802408DC_8320DC.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408DC_8320DC -/* 8320DC 802408DC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8320E0 802408E0 AFB10014 */ sw $s1, 0x14($sp) -/* 8320E4 802408E4 0080882D */ daddu $s1, $a0, $zero -/* 8320E8 802408E8 AFBF0024 */ sw $ra, 0x24($sp) -/* 8320EC 802408EC AFB40020 */ sw $s4, 0x20($sp) -/* 8320F0 802408F0 AFB3001C */ sw $s3, 0x1c($sp) -/* 8320F4 802408F4 AFB20018 */ sw $s2, 0x18($sp) -/* 8320F8 802408F8 10A00033 */ beqz $a1, .L802409C8 -/* 8320FC 802408FC AFB00010 */ sw $s0, 0x10($sp) -/* 832100 80240900 0C04760B */ jal func_8011D82C -/* 832104 80240904 24040001 */ addiu $a0, $zero, 1 -/* 832108 80240908 0000202D */ daddu $a0, $zero, $zero -/* 83210C 8024090C 0080282D */ daddu $a1, $a0, $zero -/* 832110 80240910 0080302D */ daddu $a2, $a0, $zero -/* 832114 80240914 0080382D */ daddu $a3, $a0, $zero -/* 832118 80240918 0080802D */ daddu $s0, $a0, $zero -/* 83211C 8024091C 2414FFFC */ addiu $s4, $zero, -4 -/* 832120 80240920 24130017 */ addiu $s3, $zero, 0x17 -/* 832124 80240924 3C120080 */ lui $s2, 0x80 -/* 832128 80240928 3C038015 */ lui $v1, %hi(D_801512F0) -/* 83212C 8024092C 8C6312F0 */ lw $v1, %lo(D_801512F0)($v1) -/* 832130 80240930 24020001 */ addiu $v0, $zero, 1 -/* 832134 80240934 0C046F97 */ jal set_background_color_blend -/* 832138 80240938 A0620000 */ sb $v0, ($v1) -.L8024093C: -/* 83213C 8024093C 0C00E2B7 */ jal get_npc_by_index -/* 832140 80240940 0200202D */ daddu $a0, $s0, $zero -/* 832144 80240944 0040202D */ daddu $a0, $v0, $zero -/* 832148 80240948 5080000B */ beql $a0, $zero, .L80240978 -/* 83214C 8024094C 26100001 */ addiu $s0, $s0, 1 -/* 832150 80240950 8C820000 */ lw $v0, ($a0) -/* 832154 80240954 50400008 */ beql $v0, $zero, .L80240978 -/* 832158 80240958 26100001 */ addiu $s0, $s0, 1 -/* 83215C 8024095C 808300A4 */ lb $v1, 0xa4($a0) -/* 832160 80240960 10740005 */ beq $v1, $s4, .L80240978 -/* 832164 80240964 26100001 */ addiu $s0, $s0, 1 -/* 832168 80240968 10730003 */ beq $v1, $s3, .L80240978 -/* 83216C 8024096C 00000000 */ nop -/* 832170 80240970 00521025 */ or $v0, $v0, $s2 -/* 832174 80240974 AC820000 */ sw $v0, ($a0) -.L80240978: -/* 832178 80240978 2A020040 */ slti $v0, $s0, 0x40 -/* 83217C 8024097C 1440FFEF */ bnez $v0, .L8024093C -/* 832180 80240980 00000000 */ nop -/* 832184 80240984 0000802D */ daddu $s0, $zero, $zero -/* 832188 80240988 3C120800 */ lui $s2, 0x800 -.L8024098C: -/* 83218C 8024098C 0C04C3D6 */ jal get_item_entity -/* 832190 80240990 0200202D */ daddu $a0, $s0, $zero -/* 832194 80240994 0040182D */ daddu $v1, $v0, $zero -/* 832198 80240998 10600007 */ beqz $v1, .L802409B8 -/* 83219C 8024099C 26100001 */ addiu $s0, $s0, 1 -/* 8321A0 802409A0 8C640000 */ lw $a0, ($v1) -/* 8321A4 802409A4 30820010 */ andi $v0, $a0, 0x10 -/* 8321A8 802409A8 10400003 */ beqz $v0, .L802409B8 -/* 8321AC 802409AC 00000000 */ nop -/* 8321B0 802409B0 00921025 */ or $v0, $a0, $s2 -/* 8321B4 802409B4 AC620000 */ sw $v0, ($v1) -.L802409B8: -/* 8321B8 802409B8 2A020100 */ slti $v0, $s0, 0x100 -/* 8321BC 802409BC 1440FFF3 */ bnez $v0, .L8024098C -/* 8321C0 802409C0 00000000 */ nop -/* 8321C4 802409C4 AE200070 */ sw $zero, 0x70($s1) -.L802409C8: -/* 8321C8 802409C8 8E220070 */ lw $v0, 0x70($s1) -/* 8321CC 802409CC 24420008 */ addiu $v0, $v0, 8 -/* 8321D0 802409D0 AE220070 */ sw $v0, 0x70($s1) -/* 8321D4 802409D4 28420100 */ slti $v0, $v0, 0x100 -/* 8321D8 802409D8 14400003 */ bnez $v0, .L802409E8 -/* 8321DC 802409DC 0000202D */ daddu $a0, $zero, $zero -/* 8321E0 802409E0 240200FF */ addiu $v0, $zero, 0xff -/* 8321E4 802409E4 AE220070 */ sw $v0, 0x70($s1) -.L802409E8: -/* 8321E8 802409E8 0080282D */ daddu $a1, $a0, $zero -/* 8321EC 802409EC 92270073 */ lbu $a3, 0x73($s1) -/* 8321F0 802409F0 0C046F97 */ jal set_background_color_blend -/* 8321F4 802409F4 0080302D */ daddu $a2, $a0, $zero -/* 8321F8 802409F8 8E220070 */ lw $v0, 0x70($s1) -/* 8321FC 802409FC 8FBF0024 */ lw $ra, 0x24($sp) -/* 832200 80240A00 8FB40020 */ lw $s4, 0x20($sp) -/* 832204 80240A04 8FB3001C */ lw $s3, 0x1c($sp) -/* 832208 80240A08 8FB20018 */ lw $s2, 0x18($sp) -/* 83220C 80240A0C 8FB10014 */ lw $s1, 0x14($sp) -/* 832210 80240A10 8FB00010 */ lw $s0, 0x10($sp) -/* 832214 80240A14 384200FF */ xori $v0, $v0, 0xff -/* 832218 80240A18 2C420001 */ sltiu $v0, $v0, 1 -/* 83221C 80240A1C 00021040 */ sll $v0, $v0, 1 -/* 832220 80240A20 03E00008 */ jr $ra -/* 832224 80240A24 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024088C_84345C.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024088C_84345C.s deleted file mode 100644 index 80c789b827..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024088C_84345C.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024088C_84345C -/* 84345C 8024088C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 843460 80240890 AFB10014 */ sw $s1, 0x14($sp) -/* 843464 80240894 0080882D */ daddu $s1, $a0, $zero -/* 843468 80240898 AFBF0024 */ sw $ra, 0x24($sp) -/* 84346C 8024089C AFB40020 */ sw $s4, 0x20($sp) -/* 843470 802408A0 AFB3001C */ sw $s3, 0x1c($sp) -/* 843474 802408A4 AFB20018 */ sw $s2, 0x18($sp) -/* 843478 802408A8 10A00033 */ beqz $a1, .L80240978 -/* 84347C 802408AC AFB00010 */ sw $s0, 0x10($sp) -/* 843480 802408B0 0C04760B */ jal func_8011D82C -/* 843484 802408B4 24040001 */ addiu $a0, $zero, 1 -/* 843488 802408B8 0000202D */ daddu $a0, $zero, $zero -/* 84348C 802408BC 0080282D */ daddu $a1, $a0, $zero -/* 843490 802408C0 0080302D */ daddu $a2, $a0, $zero -/* 843494 802408C4 0080382D */ daddu $a3, $a0, $zero -/* 843498 802408C8 0080802D */ daddu $s0, $a0, $zero -/* 84349C 802408CC 2414FFFC */ addiu $s4, $zero, -4 -/* 8434A0 802408D0 24130014 */ addiu $s3, $zero, 0x14 -/* 8434A4 802408D4 3C120080 */ lui $s2, 0x80 -/* 8434A8 802408D8 3C038015 */ lui $v1, %hi(D_801512F0) -/* 8434AC 802408DC 8C6312F0 */ lw $v1, %lo(D_801512F0)($v1) -/* 8434B0 802408E0 24020001 */ addiu $v0, $zero, 1 -/* 8434B4 802408E4 0C046F97 */ jal set_background_color_blend -/* 8434B8 802408E8 A0620000 */ sb $v0, ($v1) -.L802408EC: -/* 8434BC 802408EC 0C00E2B7 */ jal get_npc_by_index -/* 8434C0 802408F0 0200202D */ daddu $a0, $s0, $zero -/* 8434C4 802408F4 0040202D */ daddu $a0, $v0, $zero -/* 8434C8 802408F8 5080000B */ beql $a0, $zero, .L80240928 -/* 8434CC 802408FC 26100001 */ addiu $s0, $s0, 1 -/* 8434D0 80240900 8C820000 */ lw $v0, ($a0) -/* 8434D4 80240904 50400008 */ beql $v0, $zero, .L80240928 -/* 8434D8 80240908 26100001 */ addiu $s0, $s0, 1 -/* 8434DC 8024090C 808300A4 */ lb $v1, 0xa4($a0) -/* 8434E0 80240910 10740005 */ beq $v1, $s4, .L80240928 -/* 8434E4 80240914 26100001 */ addiu $s0, $s0, 1 -/* 8434E8 80240918 10730003 */ beq $v1, $s3, .L80240928 -/* 8434EC 8024091C 00000000 */ nop -/* 8434F0 80240920 00521025 */ or $v0, $v0, $s2 -/* 8434F4 80240924 AC820000 */ sw $v0, ($a0) -.L80240928: -/* 8434F8 80240928 2A020040 */ slti $v0, $s0, 0x40 -/* 8434FC 8024092C 1440FFEF */ bnez $v0, .L802408EC -/* 843500 80240930 00000000 */ nop -/* 843504 80240934 0000802D */ daddu $s0, $zero, $zero -/* 843508 80240938 3C120800 */ lui $s2, 0x800 -.L8024093C: -/* 84350C 8024093C 0C04C3D6 */ jal get_item_entity -/* 843510 80240940 0200202D */ daddu $a0, $s0, $zero -/* 843514 80240944 0040182D */ daddu $v1, $v0, $zero -/* 843518 80240948 10600007 */ beqz $v1, .L80240968 -/* 84351C 8024094C 26100001 */ addiu $s0, $s0, 1 -/* 843520 80240950 8C640000 */ lw $a0, ($v1) -/* 843524 80240954 30820010 */ andi $v0, $a0, 0x10 -/* 843528 80240958 10400003 */ beqz $v0, .L80240968 -/* 84352C 8024095C 00000000 */ nop -/* 843530 80240960 00921025 */ or $v0, $a0, $s2 -/* 843534 80240964 AC620000 */ sw $v0, ($v1) -.L80240968: -/* 843538 80240968 2A020100 */ slti $v0, $s0, 0x100 -/* 84353C 8024096C 1440FFF3 */ bnez $v0, .L8024093C -/* 843540 80240970 00000000 */ nop -/* 843544 80240974 AE200070 */ sw $zero, 0x70($s1) -.L80240978: -/* 843548 80240978 8E220070 */ lw $v0, 0x70($s1) -/* 84354C 8024097C 24420008 */ addiu $v0, $v0, 8 -/* 843550 80240980 AE220070 */ sw $v0, 0x70($s1) -/* 843554 80240984 28420100 */ slti $v0, $v0, 0x100 -/* 843558 80240988 14400003 */ bnez $v0, .L80240998 -/* 84355C 8024098C 0000202D */ daddu $a0, $zero, $zero -/* 843560 80240990 240200FF */ addiu $v0, $zero, 0xff -/* 843564 80240994 AE220070 */ sw $v0, 0x70($s1) -.L80240998: -/* 843568 80240998 0080282D */ daddu $a1, $a0, $zero -/* 84356C 8024099C 92270073 */ lbu $a3, 0x73($s1) -/* 843570 802409A0 0C046F97 */ jal set_background_color_blend -/* 843574 802409A4 0080302D */ daddu $a2, $a0, $zero -/* 843578 802409A8 8E220070 */ lw $v0, 0x70($s1) -/* 84357C 802409AC 8FBF0024 */ lw $ra, 0x24($sp) -/* 843580 802409B0 8FB40020 */ lw $s4, 0x20($sp) -/* 843584 802409B4 8FB3001C */ lw $s3, 0x1c($sp) -/* 843588 802409B8 8FB20018 */ lw $s2, 0x18($sp) -/* 84358C 802409BC 8FB10014 */ lw $s1, 0x14($sp) -/* 843590 802409C0 8FB00010 */ lw $s0, 0x10($sp) -/* 843594 802409C4 384200FF */ xori $v0, $v0, 0xff -/* 843598 802409C8 2C420001 */ sltiu $v0, $v0, 1 -/* 84359C 802409CC 00021040 */ sll $v0, $v0, 1 -/* 8435A0 802409D0 03E00008 */ jr $ra -/* 8435A4 802409D4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024174C_8538BC.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024174C_8538BC.s deleted file mode 100644 index 62265356b0..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024174C_8538BC.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024174C_8538BC -/* 8538BC 8024174C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8538C0 80241750 AFB10014 */ sw $s1, 0x14($sp) -/* 8538C4 80241754 0080882D */ daddu $s1, $a0, $zero -/* 8538C8 80241758 AFBF0024 */ sw $ra, 0x24($sp) -/* 8538CC 8024175C AFB40020 */ sw $s4, 0x20($sp) -/* 8538D0 80241760 AFB3001C */ sw $s3, 0x1c($sp) -/* 8538D4 80241764 AFB20018 */ sw $s2, 0x18($sp) -/* 8538D8 80241768 10A00033 */ beqz $a1, .L80241838 -/* 8538DC 8024176C AFB00010 */ sw $s0, 0x10($sp) -/* 8538E0 80241770 0C04760B */ jal func_8011D82C -/* 8538E4 80241774 24040001 */ addiu $a0, $zero, 1 -/* 8538E8 80241778 0000202D */ daddu $a0, $zero, $zero -/* 8538EC 8024177C 0080282D */ daddu $a1, $a0, $zero -/* 8538F0 80241780 0080302D */ daddu $a2, $a0, $zero -/* 8538F4 80241784 0080382D */ daddu $a3, $a0, $zero -/* 8538F8 80241788 0080802D */ daddu $s0, $a0, $zero -/* 8538FC 8024178C 2414FFFC */ addiu $s4, $zero, -4 -/* 853900 80241790 24130006 */ addiu $s3, $zero, 6 -/* 853904 80241794 3C120080 */ lui $s2, 0x80 -/* 853908 80241798 3C038015 */ lui $v1, %hi(D_801512F0) -/* 85390C 8024179C 8C6312F0 */ lw $v1, %lo(D_801512F0)($v1) -/* 853910 802417A0 24020001 */ addiu $v0, $zero, 1 -/* 853914 802417A4 0C046F97 */ jal set_background_color_blend -/* 853918 802417A8 A0620000 */ sb $v0, ($v1) -.L802417AC: -/* 85391C 802417AC 0C00E2B7 */ jal get_npc_by_index -/* 853920 802417B0 0200202D */ daddu $a0, $s0, $zero -/* 853924 802417B4 0040202D */ daddu $a0, $v0, $zero -/* 853928 802417B8 5080000B */ beql $a0, $zero, .L802417E8 -/* 85392C 802417BC 26100001 */ addiu $s0, $s0, 1 -/* 853930 802417C0 8C820000 */ lw $v0, ($a0) -/* 853934 802417C4 50400008 */ beql $v0, $zero, .L802417E8 -/* 853938 802417C8 26100001 */ addiu $s0, $s0, 1 -/* 85393C 802417CC 808300A4 */ lb $v1, 0xa4($a0) -/* 853940 802417D0 10740005 */ beq $v1, $s4, .L802417E8 -/* 853944 802417D4 26100001 */ addiu $s0, $s0, 1 -/* 853948 802417D8 10730003 */ beq $v1, $s3, .L802417E8 -/* 85394C 802417DC 00000000 */ nop -/* 853950 802417E0 00521025 */ or $v0, $v0, $s2 -/* 853954 802417E4 AC820000 */ sw $v0, ($a0) -.L802417E8: -/* 853958 802417E8 2A020040 */ slti $v0, $s0, 0x40 -/* 85395C 802417EC 1440FFEF */ bnez $v0, .L802417AC -/* 853960 802417F0 00000000 */ nop -/* 853964 802417F4 0000802D */ daddu $s0, $zero, $zero -/* 853968 802417F8 3C120800 */ lui $s2, 0x800 -.L802417FC: -/* 85396C 802417FC 0C04C3D6 */ jal get_item_entity -/* 853970 80241800 0200202D */ daddu $a0, $s0, $zero -/* 853974 80241804 0040182D */ daddu $v1, $v0, $zero -/* 853978 80241808 10600007 */ beqz $v1, .L80241828 -/* 85397C 8024180C 26100001 */ addiu $s0, $s0, 1 -/* 853980 80241810 8C640000 */ lw $a0, ($v1) -/* 853984 80241814 30820010 */ andi $v0, $a0, 0x10 -/* 853988 80241818 10400003 */ beqz $v0, .L80241828 -/* 85398C 8024181C 00000000 */ nop -/* 853990 80241820 00921025 */ or $v0, $a0, $s2 -/* 853994 80241824 AC620000 */ sw $v0, ($v1) -.L80241828: -/* 853998 80241828 2A020100 */ slti $v0, $s0, 0x100 -/* 85399C 8024182C 1440FFF3 */ bnez $v0, .L802417FC -/* 8539A0 80241830 00000000 */ nop -/* 8539A4 80241834 AE200070 */ sw $zero, 0x70($s1) -.L80241838: -/* 8539A8 80241838 8E220070 */ lw $v0, 0x70($s1) -/* 8539AC 8024183C 24420008 */ addiu $v0, $v0, 8 -/* 8539B0 80241840 AE220070 */ sw $v0, 0x70($s1) -/* 8539B4 80241844 28420100 */ slti $v0, $v0, 0x100 -/* 8539B8 80241848 14400003 */ bnez $v0, .L80241858 -/* 8539BC 8024184C 0000202D */ daddu $a0, $zero, $zero -/* 8539C0 80241850 240200FF */ addiu $v0, $zero, 0xff -/* 8539C4 80241854 AE220070 */ sw $v0, 0x70($s1) -.L80241858: -/* 8539C8 80241858 0080282D */ daddu $a1, $a0, $zero -/* 8539CC 8024185C 92270073 */ lbu $a3, 0x73($s1) -/* 8539D0 80241860 0C046F97 */ jal set_background_color_blend -/* 8539D4 80241864 0080302D */ daddu $a2, $a0, $zero -/* 8539D8 80241868 8E220070 */ lw $v0, 0x70($s1) -/* 8539DC 8024186C 8FBF0024 */ lw $ra, 0x24($sp) -/* 8539E0 80241870 8FB40020 */ lw $s4, 0x20($sp) -/* 8539E4 80241874 8FB3001C */ lw $s3, 0x1c($sp) -/* 8539E8 80241878 8FB20018 */ lw $s2, 0x18($sp) -/* 8539EC 8024187C 8FB10014 */ lw $s1, 0x14($sp) -/* 8539F0 80241880 8FB00010 */ lw $s0, 0x10($sp) -/* 8539F4 80241884 384200FF */ xori $v0, $v0, 0xff -/* 8539F8 80241888 2C420001 */ sltiu $v0, $v0, 1 -/* 8539FC 8024188C 00021040 */ sll $v0, $v0, 1 -/* 853A00 80241890 03E00008 */ jr $ra -/* 853A04 80241894 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240D60_BAE6A0.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240D60_BAE6A0.s deleted file mode 100644 index d675ca92e4..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240D60_BAE6A0.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D60_BAE6A0 -/* BAE6A0 80240D60 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* BAE6A4 80240D64 AFB3001C */ sw $s3, 0x1c($sp) -/* BAE6A8 80240D68 0080982D */ daddu $s3, $a0, $zero -/* BAE6AC 80240D6C AFBF0020 */ sw $ra, 0x20($sp) -/* BAE6B0 80240D70 AFB20018 */ sw $s2, 0x18($sp) -/* BAE6B4 80240D74 AFB10014 */ sw $s1, 0x14($sp) -/* BAE6B8 80240D78 AFB00010 */ sw $s0, 0x10($sp) -/* BAE6BC 80240D7C 8E720148 */ lw $s2, 0x148($s3) -/* BAE6C0 80240D80 86440008 */ lh $a0, 8($s2) -/* BAE6C4 80240D84 0C00EABB */ jal get_npc_unsafe -/* BAE6C8 80240D88 00A0802D */ daddu $s0, $a1, $zero -/* BAE6CC 80240D8C 0040882D */ daddu $s1, $v0, $zero -/* BAE6D0 80240D90 C6420080 */ lwc1 $f2, 0x80($s2) -/* BAE6D4 80240D94 468010A0 */ cvt.s.w $f2, $f2 -/* BAE6D8 80240D98 460010A1 */ cvt.d.s $f2, $f2 -/* BAE6DC 80240D9C C6400084 */ lwc1 $f0, 0x84($s2) -/* BAE6E0 80240DA0 46800020 */ cvt.s.w $f0, $f0 -/* BAE6E4 80240DA4 46000021 */ cvt.d.s $f0, $f0 -/* BAE6E8 80240DA8 3C014059 */ lui $at, 0x4059 -/* BAE6EC 80240DAC 44812800 */ mtc1 $at, $f5 -/* BAE6F0 80240DB0 44802000 */ mtc1 $zero, $f4 -/* BAE6F4 80240DB4 8E4200CC */ lw $v0, 0xcc($s2) -/* BAE6F8 80240DB8 C62C0038 */ lwc1 $f12, 0x38($s1) -/* BAE6FC 80240DBC C62E0040 */ lwc1 $f14, 0x40($s1) -/* BAE700 80240DC0 46241083 */ div.d $f2, $f2, $f4 -/* BAE704 80240DC4 462010A0 */ cvt.s.d $f2, $f2 -/* BAE708 80240DC8 46240003 */ div.d $f0, $f0, $f4 -/* BAE70C 80240DCC 8C420020 */ lw $v0, 0x20($v0) -/* BAE710 80240DD0 46200020 */ cvt.s.d $f0, $f0 -/* BAE714 80240DD4 E622001C */ swc1 $f2, 0x1c($s1) -/* BAE718 80240DD8 E6200014 */ swc1 $f0, 0x14($s1) -/* BAE71C 80240DDC AE220028 */ sw $v0, 0x28($s1) -/* BAE720 80240DE0 C6000018 */ lwc1 $f0, 0x18($s0) -/* BAE724 80240DE4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BAE728 80240DE8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BAE72C 80240DEC E6200018 */ swc1 $f0, 0x18($s1) -/* BAE730 80240DF0 8C460028 */ lw $a2, 0x28($v0) -/* BAE734 80240DF4 0C00A720 */ jal atan2 -/* BAE738 80240DF8 8C470030 */ lw $a3, 0x30($v0) -/* BAE73C 80240DFC E620000C */ swc1 $f0, 0xc($s1) -/* BAE740 80240E00 8E420018 */ lw $v0, 0x18($s2) -/* BAE744 80240E04 AE400074 */ sw $zero, 0x74($s2) -/* BAE748 80240E08 9442002A */ lhu $v0, 0x2a($v0) -/* BAE74C 80240E0C 30420002 */ andi $v0, $v0, 2 -/* BAE750 80240E10 10400005 */ beqz $v0, .L80240E28 -/* BAE754 80240E14 24020003 */ addiu $v0, $zero, 3 -/* BAE758 80240E18 A622008E */ sh $v0, 0x8e($s1) -/* BAE75C 80240E1C 2402000D */ addiu $v0, $zero, 0xd -/* BAE760 80240E20 0809039E */ j .L80240E78 -/* BAE764 80240E24 AE620070 */ sw $v0, 0x70($s3) -.L80240E28: -/* BAE768 80240E28 24030001 */ addiu $v1, $zero, 1 -/* BAE76C 80240E2C 2402000E */ addiu $v0, $zero, 0xe -/* BAE770 80240E30 A623008E */ sh $v1, 0x8e($s1) -/* BAE774 80240E34 AE620070 */ sw $v0, 0x70($s3) -/* BAE778 80240E38 C6200038 */ lwc1 $f0, 0x38($s1) -/* BAE77C 80240E3C 4600018D */ trunc.w.s $f6, $f0 -/* BAE780 80240E40 44023000 */ mfc1 $v0, $f6 -/* BAE784 80240E44 00000000 */ nop -/* BAE788 80240E48 A6420010 */ sh $v0, 0x10($s2) -/* BAE78C 80240E4C C620003C */ lwc1 $f0, 0x3c($s1) -/* BAE790 80240E50 4600018D */ trunc.w.s $f6, $f0 -/* BAE794 80240E54 44023000 */ mfc1 $v0, $f6 -/* BAE798 80240E58 00000000 */ nop -/* BAE79C 80240E5C A6420012 */ sh $v0, 0x12($s2) -/* BAE7A0 80240E60 C6200040 */ lwc1 $f0, 0x40($s1) -/* BAE7A4 80240E64 A2430007 */ sb $v1, 7($s2) -/* BAE7A8 80240E68 4600018D */ trunc.w.s $f6, $f0 -/* BAE7AC 80240E6C 44023000 */ mfc1 $v0, $f6 -/* BAE7B0 80240E70 00000000 */ nop -/* BAE7B4 80240E74 A6420014 */ sh $v0, 0x14($s2) -.L80240E78: -/* BAE7B8 80240E78 8FBF0020 */ lw $ra, 0x20($sp) -/* BAE7BC 80240E7C 8FB3001C */ lw $s3, 0x1c($sp) -/* BAE7C0 80240E80 8FB20018 */ lw $s2, 0x18($sp) -/* BAE7C4 80240E84 8FB10014 */ lw $s1, 0x14($sp) -/* BAE7C8 80240E88 8FB00010 */ lw $s0, 0x10($sp) -/* BAE7CC 80240E8C 03E00008 */ jr $ra -/* BAE7D0 80240E90 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802413AC_BAECEC.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802413AC_BAECEC.s index 52f3081310..642750432e 100644 --- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802413AC_BAECEC.s +++ b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802413AC_BAECEC.s @@ -110,7 +110,7 @@ glabel L80241518_BAEE58 glabel L80241530_BAEE70 /* BAEE70 80241530 0280202D */ daddu $a0, $s4, $zero /* BAEE74 80241534 0200282D */ daddu $a1, $s0, $zero -/* BAEE78 80241538 0C090358 */ jal func_80240D60_BAE6A0 +/* BAEE78 80241538 0C090358 */ jal mim_08_UnkNpcAIFunc14 /* BAEE7C 8024153C 0260302D */ daddu $a2, $s3, $zero /* BAEE80 80241540 0809055D */ j .L80241574 /* BAEE84 80241544 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241194_9C6574.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241194_9C6574.s deleted file mode 100644 index d8dfa1d0dd..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241194_9C6574.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241194_9C6574 -/* 9C6574 80241194 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9C6578 80241198 AFB10014 */ sw $s1, 0x14($sp) -/* 9C657C 8024119C 0080882D */ daddu $s1, $a0, $zero -/* 9C6580 802411A0 AFBF0024 */ sw $ra, 0x24($sp) -/* 9C6584 802411A4 AFB40020 */ sw $s4, 0x20($sp) -/* 9C6588 802411A8 AFB3001C */ sw $s3, 0x1c($sp) -/* 9C658C 802411AC AFB20018 */ sw $s2, 0x18($sp) -/* 9C6590 802411B0 10A00033 */ beqz $a1, .L80241280 -/* 9C6594 802411B4 AFB00010 */ sw $s0, 0x10($sp) -/* 9C6598 802411B8 0C04760B */ jal func_8011D82C -/* 9C659C 802411BC 24040001 */ addiu $a0, $zero, 1 -/* 9C65A0 802411C0 0000202D */ daddu $a0, $zero, $zero -/* 9C65A4 802411C4 0080282D */ daddu $a1, $a0, $zero -/* 9C65A8 802411C8 0080302D */ daddu $a2, $a0, $zero -/* 9C65AC 802411CC 0080382D */ daddu $a3, $a0, $zero -/* 9C65B0 802411D0 0080802D */ daddu $s0, $a0, $zero -/* 9C65B4 802411D4 2414FFFC */ addiu $s4, $zero, -4 -/* 9C65B8 802411D8 2413000F */ addiu $s3, $zero, 0xf -/* 9C65BC 802411DC 3C120080 */ lui $s2, 0x80 -/* 9C65C0 802411E0 3C038015 */ lui $v1, %hi(D_801512F0) -/* 9C65C4 802411E4 8C6312F0 */ lw $v1, %lo(D_801512F0)($v1) -/* 9C65C8 802411E8 24020001 */ addiu $v0, $zero, 1 -/* 9C65CC 802411EC 0C046F97 */ jal set_background_color_blend -/* 9C65D0 802411F0 A0620000 */ sb $v0, ($v1) -.L802411F4: -/* 9C65D4 802411F4 0C00E2B7 */ jal get_npc_by_index -/* 9C65D8 802411F8 0200202D */ daddu $a0, $s0, $zero -/* 9C65DC 802411FC 0040202D */ daddu $a0, $v0, $zero -/* 9C65E0 80241200 5080000B */ beql $a0, $zero, .L80241230 -/* 9C65E4 80241204 26100001 */ addiu $s0, $s0, 1 -/* 9C65E8 80241208 8C820000 */ lw $v0, ($a0) -/* 9C65EC 8024120C 50400008 */ beql $v0, $zero, .L80241230 -/* 9C65F0 80241210 26100001 */ addiu $s0, $s0, 1 -/* 9C65F4 80241214 808300A4 */ lb $v1, 0xa4($a0) -/* 9C65F8 80241218 10740005 */ beq $v1, $s4, .L80241230 -/* 9C65FC 8024121C 26100001 */ addiu $s0, $s0, 1 -/* 9C6600 80241220 10730003 */ beq $v1, $s3, .L80241230 -/* 9C6604 80241224 00000000 */ nop -/* 9C6608 80241228 00521025 */ or $v0, $v0, $s2 -/* 9C660C 8024122C AC820000 */ sw $v0, ($a0) -.L80241230: -/* 9C6610 80241230 2A020040 */ slti $v0, $s0, 0x40 -/* 9C6614 80241234 1440FFEF */ bnez $v0, .L802411F4 -/* 9C6618 80241238 00000000 */ nop -/* 9C661C 8024123C 0000802D */ daddu $s0, $zero, $zero -/* 9C6620 80241240 3C120800 */ lui $s2, 0x800 -.L80241244: -/* 9C6624 80241244 0C04C3D6 */ jal get_item_entity -/* 9C6628 80241248 0200202D */ daddu $a0, $s0, $zero -/* 9C662C 8024124C 0040182D */ daddu $v1, $v0, $zero -/* 9C6630 80241250 10600007 */ beqz $v1, .L80241270 -/* 9C6634 80241254 26100001 */ addiu $s0, $s0, 1 -/* 9C6638 80241258 8C640000 */ lw $a0, ($v1) -/* 9C663C 8024125C 30820010 */ andi $v0, $a0, 0x10 -/* 9C6640 80241260 10400003 */ beqz $v0, .L80241270 -/* 9C6644 80241264 00000000 */ nop -/* 9C6648 80241268 00921025 */ or $v0, $a0, $s2 -/* 9C664C 8024126C AC620000 */ sw $v0, ($v1) -.L80241270: -/* 9C6650 80241270 2A020100 */ slti $v0, $s0, 0x100 -/* 9C6654 80241274 1440FFF3 */ bnez $v0, .L80241244 -/* 9C6658 80241278 00000000 */ nop -/* 9C665C 8024127C AE200070 */ sw $zero, 0x70($s1) -.L80241280: -/* 9C6660 80241280 8E220070 */ lw $v0, 0x70($s1) -/* 9C6664 80241284 24420008 */ addiu $v0, $v0, 8 -/* 9C6668 80241288 AE220070 */ sw $v0, 0x70($s1) -/* 9C666C 8024128C 28420100 */ slti $v0, $v0, 0x100 -/* 9C6670 80241290 14400003 */ bnez $v0, .L802412A0 -/* 9C6674 80241294 0000202D */ daddu $a0, $zero, $zero -/* 9C6678 80241298 240200FF */ addiu $v0, $zero, 0xff -/* 9C667C 8024129C AE220070 */ sw $v0, 0x70($s1) -.L802412A0: -/* 9C6680 802412A0 0080282D */ daddu $a1, $a0, $zero -/* 9C6684 802412A4 92270073 */ lbu $a3, 0x73($s1) -/* 9C6688 802412A8 0C046F97 */ jal set_background_color_blend -/* 9C668C 802412AC 0080302D */ daddu $a2, $a0, $zero -/* 9C6690 802412B0 8E220070 */ lw $v0, 0x70($s1) -/* 9C6694 802412B4 8FBF0024 */ lw $ra, 0x24($sp) -/* 9C6698 802412B8 8FB40020 */ lw $s4, 0x20($sp) -/* 9C669C 802412BC 8FB3001C */ lw $s3, 0x1c($sp) -/* 9C66A0 802412C0 8FB20018 */ lw $s2, 0x18($sp) -/* 9C66A4 802412C4 8FB10014 */ lw $s1, 0x14($sp) -/* 9C66A8 802412C8 8FB00010 */ lw $s0, 0x10($sp) -/* 9C66AC 802412CC 384200FF */ xori $v0, $v0, 0xff -/* 9C66B0 802412D0 2C420001 */ sltiu $v0, $v0, 1 -/* 9C66B4 802412D4 00021040 */ sll $v0, $v0, 1 -/* 9C66B8 802412D8 03E00008 */ jr $ra -/* 9C66BC 802412DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241D3C_9D8D5C.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241D3C_9D8D5C.s deleted file mode 100644 index 53e6bf78c6..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241D3C_9D8D5C.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241D3C_9D8D5C -/* 9D8D5C 80241D3C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9D8D60 80241D40 AFB10014 */ sw $s1, 0x14($sp) -/* 9D8D64 80241D44 0080882D */ daddu $s1, $a0, $zero -/* 9D8D68 80241D48 AFBF0024 */ sw $ra, 0x24($sp) -/* 9D8D6C 80241D4C AFB40020 */ sw $s4, 0x20($sp) -/* 9D8D70 80241D50 AFB3001C */ sw $s3, 0x1c($sp) -/* 9D8D74 80241D54 AFB20018 */ sw $s2, 0x18($sp) -/* 9D8D78 80241D58 10A00033 */ beqz $a1, .L80241E28 -/* 9D8D7C 80241D5C AFB00010 */ sw $s0, 0x10($sp) -/* 9D8D80 80241D60 0C04760B */ jal func_8011D82C -/* 9D8D84 80241D64 24040001 */ addiu $a0, $zero, 1 -/* 9D8D88 80241D68 0000202D */ daddu $a0, $zero, $zero -/* 9D8D8C 80241D6C 0080282D */ daddu $a1, $a0, $zero -/* 9D8D90 80241D70 0080302D */ daddu $a2, $a0, $zero -/* 9D8D94 80241D74 0080382D */ daddu $a3, $a0, $zero -/* 9D8D98 80241D78 0080802D */ daddu $s0, $a0, $zero -/* 9D8D9C 80241D7C 2414FFFC */ addiu $s4, $zero, -4 -/* 9D8DA0 80241D80 24130013 */ addiu $s3, $zero, 0x13 -/* 9D8DA4 80241D84 3C120080 */ lui $s2, 0x80 -/* 9D8DA8 80241D88 3C038015 */ lui $v1, %hi(D_801512F0) -/* 9D8DAC 80241D8C 8C6312F0 */ lw $v1, %lo(D_801512F0)($v1) -/* 9D8DB0 80241D90 24020001 */ addiu $v0, $zero, 1 -/* 9D8DB4 80241D94 0C046F97 */ jal set_background_color_blend -/* 9D8DB8 80241D98 A0620000 */ sb $v0, ($v1) -.L80241D9C: -/* 9D8DBC 80241D9C 0C00E2B7 */ jal get_npc_by_index -/* 9D8DC0 80241DA0 0200202D */ daddu $a0, $s0, $zero -/* 9D8DC4 80241DA4 0040202D */ daddu $a0, $v0, $zero -/* 9D8DC8 80241DA8 5080000B */ beql $a0, $zero, .L80241DD8 -/* 9D8DCC 80241DAC 26100001 */ addiu $s0, $s0, 1 -/* 9D8DD0 80241DB0 8C820000 */ lw $v0, ($a0) -/* 9D8DD4 80241DB4 50400008 */ beql $v0, $zero, .L80241DD8 -/* 9D8DD8 80241DB8 26100001 */ addiu $s0, $s0, 1 -/* 9D8DDC 80241DBC 808300A4 */ lb $v1, 0xa4($a0) -/* 9D8DE0 80241DC0 10740005 */ beq $v1, $s4, .L80241DD8 -/* 9D8DE4 80241DC4 26100001 */ addiu $s0, $s0, 1 -/* 9D8DE8 80241DC8 10730003 */ beq $v1, $s3, .L80241DD8 -/* 9D8DEC 80241DCC 00000000 */ nop -/* 9D8DF0 80241DD0 00521025 */ or $v0, $v0, $s2 -/* 9D8DF4 80241DD4 AC820000 */ sw $v0, ($a0) -.L80241DD8: -/* 9D8DF8 80241DD8 2A020040 */ slti $v0, $s0, 0x40 -/* 9D8DFC 80241DDC 1440FFEF */ bnez $v0, .L80241D9C -/* 9D8E00 80241DE0 00000000 */ nop -/* 9D8E04 80241DE4 0000802D */ daddu $s0, $zero, $zero -/* 9D8E08 80241DE8 3C120800 */ lui $s2, 0x800 -.L80241DEC: -/* 9D8E0C 80241DEC 0C04C3D6 */ jal get_item_entity -/* 9D8E10 80241DF0 0200202D */ daddu $a0, $s0, $zero -/* 9D8E14 80241DF4 0040182D */ daddu $v1, $v0, $zero -/* 9D8E18 80241DF8 10600007 */ beqz $v1, .L80241E18 -/* 9D8E1C 80241DFC 26100001 */ addiu $s0, $s0, 1 -/* 9D8E20 80241E00 8C640000 */ lw $a0, ($v1) -/* 9D8E24 80241E04 30820010 */ andi $v0, $a0, 0x10 -/* 9D8E28 80241E08 10400003 */ beqz $v0, .L80241E18 -/* 9D8E2C 80241E0C 00000000 */ nop -/* 9D8E30 80241E10 00921025 */ or $v0, $a0, $s2 -/* 9D8E34 80241E14 AC620000 */ sw $v0, ($v1) -.L80241E18: -/* 9D8E38 80241E18 2A020100 */ slti $v0, $s0, 0x100 -/* 9D8E3C 80241E1C 1440FFF3 */ bnez $v0, .L80241DEC -/* 9D8E40 80241E20 00000000 */ nop -/* 9D8E44 80241E24 AE200070 */ sw $zero, 0x70($s1) -.L80241E28: -/* 9D8E48 80241E28 8E220070 */ lw $v0, 0x70($s1) -/* 9D8E4C 80241E2C 24420008 */ addiu $v0, $v0, 8 -/* 9D8E50 80241E30 AE220070 */ sw $v0, 0x70($s1) -/* 9D8E54 80241E34 28420100 */ slti $v0, $v0, 0x100 -/* 9D8E58 80241E38 14400003 */ bnez $v0, .L80241E48 -/* 9D8E5C 80241E3C 0000202D */ daddu $a0, $zero, $zero -/* 9D8E60 80241E40 240200FF */ addiu $v0, $zero, 0xff -/* 9D8E64 80241E44 AE220070 */ sw $v0, 0x70($s1) -.L80241E48: -/* 9D8E68 80241E48 0080282D */ daddu $a1, $a0, $zero -/* 9D8E6C 80241E4C 92270073 */ lbu $a3, 0x73($s1) -/* 9D8E70 80241E50 0C046F97 */ jal set_background_color_blend -/* 9D8E74 80241E54 0080302D */ daddu $a2, $a0, $zero -/* 9D8E78 80241E58 8E220070 */ lw $v0, 0x70($s1) -/* 9D8E7C 80241E5C 8FBF0024 */ lw $ra, 0x24($sp) -/* 9D8E80 80241E60 8FB40020 */ lw $s4, 0x20($sp) -/* 9D8E84 80241E64 8FB3001C */ lw $s3, 0x1c($sp) -/* 9D8E88 80241E68 8FB20018 */ lw $s2, 0x18($sp) -/* 9D8E8C 80241E6C 8FB10014 */ lw $s1, 0x14($sp) -/* 9D8E90 80241E70 8FB00010 */ lw $s0, 0x10($sp) -/* 9D8E94 80241E74 384200FF */ xori $v0, $v0, 0xff -/* 9D8E98 80241E78 2C420001 */ sltiu $v0, $v0, 1 -/* 9D8E9C 80241E7C 00021040 */ sll $v0, $v0, 1 -/* 9D8EA0 80241E80 03E00008 */ jr $ra -/* 9D8EA4 80241E84 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241494_9F5ED4.s b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241494_9F5ED4.s deleted file mode 100644 index 95f7bb08ac..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241494_9F5ED4.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241494_9F5ED4 -/* 9F5ED4 80241494 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9F5ED8 80241498 AFB3001C */ sw $s3, 0x1c($sp) -/* 9F5EDC 8024149C 0080982D */ daddu $s3, $a0, $zero -/* 9F5EE0 802414A0 AFBF0020 */ sw $ra, 0x20($sp) -/* 9F5EE4 802414A4 AFB20018 */ sw $s2, 0x18($sp) -/* 9F5EE8 802414A8 AFB10014 */ sw $s1, 0x14($sp) -/* 9F5EEC 802414AC AFB00010 */ sw $s0, 0x10($sp) -/* 9F5EF0 802414B0 8E720148 */ lw $s2, 0x148($s3) -/* 9F5EF4 802414B4 86440008 */ lh $a0, 8($s2) -/* 9F5EF8 802414B8 0C00EABB */ jal get_npc_unsafe -/* 9F5EFC 802414BC 00A0802D */ daddu $s0, $a1, $zero -/* 9F5F00 802414C0 0040882D */ daddu $s1, $v0, $zero -/* 9F5F04 802414C4 C6420080 */ lwc1 $f2, 0x80($s2) -/* 9F5F08 802414C8 468010A0 */ cvt.s.w $f2, $f2 -/* 9F5F0C 802414CC 460010A1 */ cvt.d.s $f2, $f2 -/* 9F5F10 802414D0 C6400084 */ lwc1 $f0, 0x84($s2) -/* 9F5F14 802414D4 46800020 */ cvt.s.w $f0, $f0 -/* 9F5F18 802414D8 46000021 */ cvt.d.s $f0, $f0 -/* 9F5F1C 802414DC 3C014059 */ lui $at, 0x4059 -/* 9F5F20 802414E0 44812800 */ mtc1 $at, $f5 -/* 9F5F24 802414E4 44802000 */ mtc1 $zero, $f4 -/* 9F5F28 802414E8 8E4200CC */ lw $v0, 0xcc($s2) -/* 9F5F2C 802414EC C62C0038 */ lwc1 $f12, 0x38($s1) -/* 9F5F30 802414F0 C62E0040 */ lwc1 $f14, 0x40($s1) -/* 9F5F34 802414F4 46241083 */ div.d $f2, $f2, $f4 -/* 9F5F38 802414F8 462010A0 */ cvt.s.d $f2, $f2 -/* 9F5F3C 802414FC 46240003 */ div.d $f0, $f0, $f4 -/* 9F5F40 80241500 8C420020 */ lw $v0, 0x20($v0) -/* 9F5F44 80241504 46200020 */ cvt.s.d $f0, $f0 -/* 9F5F48 80241508 E622001C */ swc1 $f2, 0x1c($s1) -/* 9F5F4C 8024150C E6200014 */ swc1 $f0, 0x14($s1) -/* 9F5F50 80241510 AE220028 */ sw $v0, 0x28($s1) -/* 9F5F54 80241514 C6000018 */ lwc1 $f0, 0x18($s0) -/* 9F5F58 80241518 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9F5F5C 8024151C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9F5F60 80241520 E6200018 */ swc1 $f0, 0x18($s1) -/* 9F5F64 80241524 8C460028 */ lw $a2, 0x28($v0) -/* 9F5F68 80241528 0C00A720 */ jal atan2 -/* 9F5F6C 8024152C 8C470030 */ lw $a3, 0x30($v0) -/* 9F5F70 80241530 E620000C */ swc1 $f0, 0xc($s1) -/* 9F5F74 80241534 8E420018 */ lw $v0, 0x18($s2) -/* 9F5F78 80241538 AE400074 */ sw $zero, 0x74($s2) -/* 9F5F7C 8024153C 9442002A */ lhu $v0, 0x2a($v0) -/* 9F5F80 80241540 30420002 */ andi $v0, $v0, 2 -/* 9F5F84 80241544 10400005 */ beqz $v0, .L8024155C -/* 9F5F88 80241548 24020003 */ addiu $v0, $zero, 3 -/* 9F5F8C 8024154C A622008E */ sh $v0, 0x8e($s1) -/* 9F5F90 80241550 2402000D */ addiu $v0, $zero, 0xd -/* 9F5F94 80241554 0809056B */ j .L802415AC -/* 9F5F98 80241558 AE620070 */ sw $v0, 0x70($s3) -.L8024155C: -/* 9F5F9C 8024155C 24030001 */ addiu $v1, $zero, 1 -/* 9F5FA0 80241560 2402000E */ addiu $v0, $zero, 0xe -/* 9F5FA4 80241564 A623008E */ sh $v1, 0x8e($s1) -/* 9F5FA8 80241568 AE620070 */ sw $v0, 0x70($s3) -/* 9F5FAC 8024156C C6200038 */ lwc1 $f0, 0x38($s1) -/* 9F5FB0 80241570 4600018D */ trunc.w.s $f6, $f0 -/* 9F5FB4 80241574 44023000 */ mfc1 $v0, $f6 -/* 9F5FB8 80241578 00000000 */ nop -/* 9F5FBC 8024157C A6420010 */ sh $v0, 0x10($s2) -/* 9F5FC0 80241580 C620003C */ lwc1 $f0, 0x3c($s1) -/* 9F5FC4 80241584 4600018D */ trunc.w.s $f6, $f0 -/* 9F5FC8 80241588 44023000 */ mfc1 $v0, $f6 -/* 9F5FCC 8024158C 00000000 */ nop -/* 9F5FD0 80241590 A6420012 */ sh $v0, 0x12($s2) -/* 9F5FD4 80241594 C6200040 */ lwc1 $f0, 0x40($s1) -/* 9F5FD8 80241598 A2430007 */ sb $v1, 7($s2) -/* 9F5FDC 8024159C 4600018D */ trunc.w.s $f6, $f0 -/* 9F5FE0 802415A0 44023000 */ mfc1 $v0, $f6 -/* 9F5FE4 802415A4 00000000 */ nop -/* 9F5FE8 802415A8 A6420014 */ sh $v0, 0x14($s2) -.L802415AC: -/* 9F5FEC 802415AC 8FBF0020 */ lw $ra, 0x20($sp) -/* 9F5FF0 802415B0 8FB3001C */ lw $s3, 0x1c($sp) -/* 9F5FF4 802415B4 8FB20018 */ lw $s2, 0x18($sp) -/* 9F5FF8 802415B8 8FB10014 */ lw $s1, 0x14($sp) -/* 9F5FFC 802415BC 8FB00010 */ lw $s0, 0x10($sp) -/* 9F6000 802415C0 03E00008 */ jr $ra -/* 9F6004 802415C4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241AE0_9F6520.s b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241AE0_9F6520.s index 1a8b99191c..8f76feadb6 100644 --- a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241AE0_9F6520.s +++ b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241AE0_9F6520.s @@ -110,7 +110,7 @@ glabel L80241C4C_9F668C glabel L80241C64_9F66A4 /* 9F66A4 80241C64 0280202D */ daddu $a0, $s4, $zero /* 9F66A8 80241C68 0200282D */ daddu $a1, $s0, $zero -/* 9F66AC 80241C6C 0C090525 */ jal func_80241494_9F5ED4 +/* 9F66AC 80241C6C 0C090525 */ jal nok_11_UnkNpcAIFunc14 /* 9F66B0 80241C70 0260302D */ daddu $a2, $s3, $zero /* 9F66B4 80241C74 0809072A */ j .L80241CA8 /* 9F66B8 80241C78 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241654_A03E94.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241654_A03E94.s deleted file mode 100644 index 52230a9a4c..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241654_A03E94.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241654_A03E94 -/* A03E94 80241654 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A03E98 80241658 AFB3001C */ sw $s3, 0x1c($sp) -/* A03E9C 8024165C 0080982D */ daddu $s3, $a0, $zero -/* A03EA0 80241660 AFBF0020 */ sw $ra, 0x20($sp) -/* A03EA4 80241664 AFB20018 */ sw $s2, 0x18($sp) -/* A03EA8 80241668 AFB10014 */ sw $s1, 0x14($sp) -/* A03EAC 8024166C AFB00010 */ sw $s0, 0x10($sp) -/* A03EB0 80241670 8E720148 */ lw $s2, 0x148($s3) -/* A03EB4 80241674 86440008 */ lh $a0, 8($s2) -/* A03EB8 80241678 0C00EABB */ jal get_npc_unsafe -/* A03EBC 8024167C 00A0802D */ daddu $s0, $a1, $zero -/* A03EC0 80241680 0040882D */ daddu $s1, $v0, $zero -/* A03EC4 80241684 C6420080 */ lwc1 $f2, 0x80($s2) -/* A03EC8 80241688 468010A0 */ cvt.s.w $f2, $f2 -/* A03ECC 8024168C 460010A1 */ cvt.d.s $f2, $f2 -/* A03ED0 80241690 C6400084 */ lwc1 $f0, 0x84($s2) -/* A03ED4 80241694 46800020 */ cvt.s.w $f0, $f0 -/* A03ED8 80241698 46000021 */ cvt.d.s $f0, $f0 -/* A03EDC 8024169C 3C014059 */ lui $at, 0x4059 -/* A03EE0 802416A0 44812800 */ mtc1 $at, $f5 -/* A03EE4 802416A4 44802000 */ mtc1 $zero, $f4 -/* A03EE8 802416A8 8E4200CC */ lw $v0, 0xcc($s2) -/* A03EEC 802416AC C62C0038 */ lwc1 $f12, 0x38($s1) -/* A03EF0 802416B0 C62E0040 */ lwc1 $f14, 0x40($s1) -/* A03EF4 802416B4 46241083 */ div.d $f2, $f2, $f4 -/* A03EF8 802416B8 462010A0 */ cvt.s.d $f2, $f2 -/* A03EFC 802416BC 46240003 */ div.d $f0, $f0, $f4 -/* A03F00 802416C0 8C420020 */ lw $v0, 0x20($v0) -/* A03F04 802416C4 46200020 */ cvt.s.d $f0, $f0 -/* A03F08 802416C8 E622001C */ swc1 $f2, 0x1c($s1) -/* A03F0C 802416CC E6200014 */ swc1 $f0, 0x14($s1) -/* A03F10 802416D0 AE220028 */ sw $v0, 0x28($s1) -/* A03F14 802416D4 C6000018 */ lwc1 $f0, 0x18($s0) -/* A03F18 802416D8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A03F1C 802416DC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A03F20 802416E0 E6200018 */ swc1 $f0, 0x18($s1) -/* A03F24 802416E4 8C460028 */ lw $a2, 0x28($v0) -/* A03F28 802416E8 0C00A720 */ jal atan2 -/* A03F2C 802416EC 8C470030 */ lw $a3, 0x30($v0) -/* A03F30 802416F0 E620000C */ swc1 $f0, 0xc($s1) -/* A03F34 802416F4 8E420018 */ lw $v0, 0x18($s2) -/* A03F38 802416F8 AE400074 */ sw $zero, 0x74($s2) -/* A03F3C 802416FC 9442002A */ lhu $v0, 0x2a($v0) -/* A03F40 80241700 30420002 */ andi $v0, $v0, 2 -/* A03F44 80241704 10400005 */ beqz $v0, .L8024171C -/* A03F48 80241708 24020003 */ addiu $v0, $zero, 3 -/* A03F4C 8024170C A622008E */ sh $v0, 0x8e($s1) -/* A03F50 80241710 2402000D */ addiu $v0, $zero, 0xd -/* A03F54 80241714 080905DB */ j .L8024176C -/* A03F58 80241718 AE620070 */ sw $v0, 0x70($s3) -.L8024171C: -/* A03F5C 8024171C 24030001 */ addiu $v1, $zero, 1 -/* A03F60 80241720 2402000E */ addiu $v0, $zero, 0xe -/* A03F64 80241724 A623008E */ sh $v1, 0x8e($s1) -/* A03F68 80241728 AE620070 */ sw $v0, 0x70($s3) -/* A03F6C 8024172C C6200038 */ lwc1 $f0, 0x38($s1) -/* A03F70 80241730 4600018D */ trunc.w.s $f6, $f0 -/* A03F74 80241734 44023000 */ mfc1 $v0, $f6 -/* A03F78 80241738 00000000 */ nop -/* A03F7C 8024173C A6420010 */ sh $v0, 0x10($s2) -/* A03F80 80241740 C620003C */ lwc1 $f0, 0x3c($s1) -/* A03F84 80241744 4600018D */ trunc.w.s $f6, $f0 -/* A03F88 80241748 44023000 */ mfc1 $v0, $f6 -/* A03F8C 8024174C 00000000 */ nop -/* A03F90 80241750 A6420012 */ sh $v0, 0x12($s2) -/* A03F94 80241754 C6200040 */ lwc1 $f0, 0x40($s1) -/* A03F98 80241758 A2430007 */ sb $v1, 7($s2) -/* A03F9C 8024175C 4600018D */ trunc.w.s $f6, $f0 -/* A03FA0 80241760 44023000 */ mfc1 $v0, $f6 -/* A03FA4 80241764 00000000 */ nop -/* A03FA8 80241768 A6420014 */ sh $v0, 0x14($s2) -.L8024176C: -/* A03FAC 8024176C 8FBF0020 */ lw $ra, 0x20($sp) -/* A03FB0 80241770 8FB3001C */ lw $s3, 0x1c($sp) -/* A03FB4 80241774 8FB20018 */ lw $s2, 0x18($sp) -/* A03FB8 80241778 8FB10014 */ lw $s1, 0x14($sp) -/* A03FBC 8024177C 8FB00010 */ lw $s0, 0x10($sp) -/* A03FC0 80241780 03E00008 */ jr $ra -/* A03FC4 80241784 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241CA0_A044E0.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241CA0_A044E0.s index 402435a5bb..62e572daeb 100644 --- a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241CA0_A044E0.s +++ b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241CA0_A044E0.s @@ -110,7 +110,7 @@ glabel L80241E0C_A0464C glabel L80241E24_A04664 /* A04664 80241E24 0280202D */ daddu $a0, $s4, $zero /* A04668 80241E28 0200282D */ daddu $a1, $s0, $zero -/* A0466C 80241E2C 0C090595 */ jal func_80241654_A03E94 +/* A0466C 80241E2C 0C090595 */ jal nok_14_UnkNpcAIFunc14 /* A04670 80241E30 0260302D */ daddu $a2, $s3, $zero /* A04674 80241E34 0809079A */ j .L80241E68 /* A04678 80241E38 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241774_A08674.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241774_A08674.s deleted file mode 100644 index c0c73dcca2..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241774_A08674.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241774_A08674 -/* A08674 80241774 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A08678 80241778 AFB3001C */ sw $s3, 0x1c($sp) -/* A0867C 8024177C 0080982D */ daddu $s3, $a0, $zero -/* A08680 80241780 AFBF0020 */ sw $ra, 0x20($sp) -/* A08684 80241784 AFB20018 */ sw $s2, 0x18($sp) -/* A08688 80241788 AFB10014 */ sw $s1, 0x14($sp) -/* A0868C 8024178C AFB00010 */ sw $s0, 0x10($sp) -/* A08690 80241790 8E720148 */ lw $s2, 0x148($s3) -/* A08694 80241794 86440008 */ lh $a0, 8($s2) -/* A08698 80241798 0C00EABB */ jal get_npc_unsafe -/* A0869C 8024179C 00A0802D */ daddu $s0, $a1, $zero -/* A086A0 802417A0 0040882D */ daddu $s1, $v0, $zero -/* A086A4 802417A4 C6420080 */ lwc1 $f2, 0x80($s2) -/* A086A8 802417A8 468010A0 */ cvt.s.w $f2, $f2 -/* A086AC 802417AC 460010A1 */ cvt.d.s $f2, $f2 -/* A086B0 802417B0 C6400084 */ lwc1 $f0, 0x84($s2) -/* A086B4 802417B4 46800020 */ cvt.s.w $f0, $f0 -/* A086B8 802417B8 46000021 */ cvt.d.s $f0, $f0 -/* A086BC 802417BC 3C014059 */ lui $at, 0x4059 -/* A086C0 802417C0 44812800 */ mtc1 $at, $f5 -/* A086C4 802417C4 44802000 */ mtc1 $zero, $f4 -/* A086C8 802417C8 8E4200CC */ lw $v0, 0xcc($s2) -/* A086CC 802417CC C62C0038 */ lwc1 $f12, 0x38($s1) -/* A086D0 802417D0 C62E0040 */ lwc1 $f14, 0x40($s1) -/* A086D4 802417D4 46241083 */ div.d $f2, $f2, $f4 -/* A086D8 802417D8 462010A0 */ cvt.s.d $f2, $f2 -/* A086DC 802417DC 46240003 */ div.d $f0, $f0, $f4 -/* A086E0 802417E0 8C420020 */ lw $v0, 0x20($v0) -/* A086E4 802417E4 46200020 */ cvt.s.d $f0, $f0 -/* A086E8 802417E8 E622001C */ swc1 $f2, 0x1c($s1) -/* A086EC 802417EC E6200014 */ swc1 $f0, 0x14($s1) -/* A086F0 802417F0 AE220028 */ sw $v0, 0x28($s1) -/* A086F4 802417F4 C6000018 */ lwc1 $f0, 0x18($s0) -/* A086F8 802417F8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A086FC 802417FC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A08700 80241800 E6200018 */ swc1 $f0, 0x18($s1) -/* A08704 80241804 8C460028 */ lw $a2, 0x28($v0) -/* A08708 80241808 0C00A720 */ jal atan2 -/* A0870C 8024180C 8C470030 */ lw $a3, 0x30($v0) -/* A08710 80241810 E620000C */ swc1 $f0, 0xc($s1) -/* A08714 80241814 8E420018 */ lw $v0, 0x18($s2) -/* A08718 80241818 AE400074 */ sw $zero, 0x74($s2) -/* A0871C 8024181C 9442002A */ lhu $v0, 0x2a($v0) -/* A08720 80241820 30420002 */ andi $v0, $v0, 2 -/* A08724 80241824 10400005 */ beqz $v0, .L8024183C -/* A08728 80241828 24020003 */ addiu $v0, $zero, 3 -/* A0872C 8024182C A622008E */ sh $v0, 0x8e($s1) -/* A08730 80241830 2402000D */ addiu $v0, $zero, 0xd -/* A08734 80241834 08090623 */ j .L8024188C -/* A08738 80241838 AE620070 */ sw $v0, 0x70($s3) -.L8024183C: -/* A0873C 8024183C 24030001 */ addiu $v1, $zero, 1 -/* A08740 80241840 2402000E */ addiu $v0, $zero, 0xe -/* A08744 80241844 A623008E */ sh $v1, 0x8e($s1) -/* A08748 80241848 AE620070 */ sw $v0, 0x70($s3) -/* A0874C 8024184C C6200038 */ lwc1 $f0, 0x38($s1) -/* A08750 80241850 4600018D */ trunc.w.s $f6, $f0 -/* A08754 80241854 44023000 */ mfc1 $v0, $f6 -/* A08758 80241858 00000000 */ nop -/* A0875C 8024185C A6420010 */ sh $v0, 0x10($s2) -/* A08760 80241860 C620003C */ lwc1 $f0, 0x3c($s1) -/* A08764 80241864 4600018D */ trunc.w.s $f6, $f0 -/* A08768 80241868 44023000 */ mfc1 $v0, $f6 -/* A0876C 8024186C 00000000 */ nop -/* A08770 80241870 A6420012 */ sh $v0, 0x12($s2) -/* A08774 80241874 C6200040 */ lwc1 $f0, 0x40($s1) -/* A08778 80241878 A2430007 */ sb $v1, 7($s2) -/* A0877C 8024187C 4600018D */ trunc.w.s $f6, $f0 -/* A08780 80241880 44023000 */ mfc1 $v0, $f6 -/* A08784 80241884 00000000 */ nop -/* A08788 80241888 A6420014 */ sh $v0, 0x14($s2) -.L8024188C: -/* A0878C 8024188C 8FBF0020 */ lw $ra, 0x20($sp) -/* A08790 80241890 8FB3001C */ lw $s3, 0x1c($sp) -/* A08794 80241894 8FB20018 */ lw $s2, 0x18($sp) -/* A08798 80241898 8FB10014 */ lw $s1, 0x14($sp) -/* A0879C 8024189C 8FB00010 */ lw $s0, 0x10($sp) -/* A087A0 802418A0 03E00008 */ jr $ra -/* A087A4 802418A4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241DC0_A08CC0.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241DC0_A08CC0.s index 234d0cf54f..54b937eb6f 100644 --- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241DC0_A08CC0.s +++ b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241DC0_A08CC0.s @@ -110,7 +110,7 @@ glabel L80241F2C_A08E2C glabel L80241F44_A08E44 /* A08E44 80241F44 0280202D */ daddu $a0, $s4, $zero /* A08E48 80241F48 0200282D */ daddu $a1, $s0, $zero -/* A08E4C 80241F4C 0C0905DD */ jal func_80241774_A08674 +/* A08E4C 80241F4C 0C0905DD */ jal nok_15_UnkNpcAIFunc14 /* A08E50 80241F50 0260302D */ daddu $a2, $s3, $zero /* A08E54 80241F54 080907E2 */ j .L80241F88 /* A08E58 80241F58 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241060_DAE460.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241060_DAE460.s deleted file mode 100644 index 0f50247c72..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241060_DAE460.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241060_DAE460 -/* DAE460 80241060 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* DAE464 80241064 AFB3001C */ sw $s3, 0x1c($sp) -/* DAE468 80241068 0080982D */ daddu $s3, $a0, $zero -/* DAE46C 8024106C AFBF0020 */ sw $ra, 0x20($sp) -/* DAE470 80241070 AFB20018 */ sw $s2, 0x18($sp) -/* DAE474 80241074 AFB10014 */ sw $s1, 0x14($sp) -/* DAE478 80241078 AFB00010 */ sw $s0, 0x10($sp) -/* DAE47C 8024107C 8E720148 */ lw $s2, 0x148($s3) -/* DAE480 80241080 86440008 */ lh $a0, 8($s2) -/* DAE484 80241084 0C00EABB */ jal get_npc_unsafe -/* DAE488 80241088 00A0802D */ daddu $s0, $a1, $zero -/* DAE48C 8024108C 0040882D */ daddu $s1, $v0, $zero -/* DAE490 80241090 C6420080 */ lwc1 $f2, 0x80($s2) -/* DAE494 80241094 468010A0 */ cvt.s.w $f2, $f2 -/* DAE498 80241098 460010A1 */ cvt.d.s $f2, $f2 -/* DAE49C 8024109C C6400084 */ lwc1 $f0, 0x84($s2) -/* DAE4A0 802410A0 46800020 */ cvt.s.w $f0, $f0 -/* DAE4A4 802410A4 46000021 */ cvt.d.s $f0, $f0 -/* DAE4A8 802410A8 3C014059 */ lui $at, 0x4059 -/* DAE4AC 802410AC 44812800 */ mtc1 $at, $f5 -/* DAE4B0 802410B0 44802000 */ mtc1 $zero, $f4 -/* DAE4B4 802410B4 8E4200CC */ lw $v0, 0xcc($s2) -/* DAE4B8 802410B8 C62C0038 */ lwc1 $f12, 0x38($s1) -/* DAE4BC 802410BC C62E0040 */ lwc1 $f14, 0x40($s1) -/* DAE4C0 802410C0 46241083 */ div.d $f2, $f2, $f4 -/* DAE4C4 802410C4 462010A0 */ cvt.s.d $f2, $f2 -/* DAE4C8 802410C8 46240003 */ div.d $f0, $f0, $f4 -/* DAE4CC 802410CC 8C420020 */ lw $v0, 0x20($v0) -/* DAE4D0 802410D0 46200020 */ cvt.s.d $f0, $f0 -/* DAE4D4 802410D4 E622001C */ swc1 $f2, 0x1c($s1) -/* DAE4D8 802410D8 E6200014 */ swc1 $f0, 0x14($s1) -/* DAE4DC 802410DC AE220028 */ sw $v0, 0x28($s1) -/* DAE4E0 802410E0 C6000018 */ lwc1 $f0, 0x18($s0) -/* DAE4E4 802410E4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* DAE4E8 802410E8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* DAE4EC 802410EC E6200018 */ swc1 $f0, 0x18($s1) -/* DAE4F0 802410F0 8C460028 */ lw $a2, 0x28($v0) -/* DAE4F4 802410F4 0C00A720 */ jal atan2 -/* DAE4F8 802410F8 8C470030 */ lw $a3, 0x30($v0) -/* DAE4FC 802410FC E620000C */ swc1 $f0, 0xc($s1) -/* DAE500 80241100 8E420018 */ lw $v0, 0x18($s2) -/* DAE504 80241104 AE400074 */ sw $zero, 0x74($s2) -/* DAE508 80241108 9442002A */ lhu $v0, 0x2a($v0) -/* DAE50C 8024110C 30420002 */ andi $v0, $v0, 2 -/* DAE510 80241110 10400005 */ beqz $v0, .L80241128 -/* DAE514 80241114 24020003 */ addiu $v0, $zero, 3 -/* DAE518 80241118 A622008E */ sh $v0, 0x8e($s1) -/* DAE51C 8024111C 2402000D */ addiu $v0, $zero, 0xd -/* DAE520 80241120 0809045E */ j .L80241178 -/* DAE524 80241124 AE620070 */ sw $v0, 0x70($s3) -.L80241128: -/* DAE528 80241128 24030001 */ addiu $v1, $zero, 1 -/* DAE52C 8024112C 2402000E */ addiu $v0, $zero, 0xe -/* DAE530 80241130 A623008E */ sh $v1, 0x8e($s1) -/* DAE534 80241134 AE620070 */ sw $v0, 0x70($s3) -/* DAE538 80241138 C6200038 */ lwc1 $f0, 0x38($s1) -/* DAE53C 8024113C 4600018D */ trunc.w.s $f6, $f0 -/* DAE540 80241140 44023000 */ mfc1 $v0, $f6 -/* DAE544 80241144 00000000 */ nop -/* DAE548 80241148 A6420010 */ sh $v0, 0x10($s2) -/* DAE54C 8024114C C620003C */ lwc1 $f0, 0x3c($s1) -/* DAE550 80241150 4600018D */ trunc.w.s $f6, $f0 -/* DAE554 80241154 44023000 */ mfc1 $v0, $f6 -/* DAE558 80241158 00000000 */ nop -/* DAE55C 8024115C A6420012 */ sh $v0, 0x12($s2) -/* DAE560 80241160 C6200040 */ lwc1 $f0, 0x40($s1) -/* DAE564 80241164 A2430007 */ sb $v1, 7($s2) -/* DAE568 80241168 4600018D */ trunc.w.s $f6, $f0 -/* DAE56C 8024116C 44023000 */ mfc1 $v0, $f6 -/* DAE570 80241170 00000000 */ nop -/* DAE574 80241174 A6420014 */ sh $v0, 0x14($s2) -.L80241178: -/* DAE578 80241178 8FBF0020 */ lw $ra, 0x20($sp) -/* DAE57C 8024117C 8FB3001C */ lw $s3, 0x1c($sp) -/* DAE580 80241180 8FB20018 */ lw $s2, 0x18($sp) -/* DAE584 80241184 8FB10014 */ lw $s1, 0x14($sp) -/* DAE588 80241188 8FB00010 */ lw $s0, 0x10($sp) -/* DAE58C 8024118C 03E00008 */ jr $ra -/* DAE590 80241190 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802416AC_DAEAAC.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802416AC_DAEAAC.s index fe38842244..db1d003bd3 100644 --- a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802416AC_DAEAAC.s +++ b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802416AC_DAEAAC.s @@ -110,7 +110,7 @@ glabel L80241818_DAEC18 glabel L80241830_DAEC30 /* DAEC30 80241830 0280202D */ daddu $a0, $s4, $zero /* DAEC34 80241834 0200282D */ daddu $a1, $s0, $zero -/* DAEC38 80241838 0C090418 */ jal func_80241060_DAE460 +/* DAEC38 80241838 0C090418 */ jal omo_04_UnkNpcAIFunc14 /* DAEC3C 8024183C 0260302D */ daddu $a2, $s3, $zero /* DAEC40 80241840 0809061D */ j .L80241874 /* DAEC44 80241844 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241714_DB39D4.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241714_DB39D4.s deleted file mode 100644 index 2dd5c7e36c..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241714_DB39D4.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241714_DB39D4 -/* DB39D4 80241714 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* DB39D8 80241718 AFB3001C */ sw $s3, 0x1c($sp) -/* DB39DC 8024171C 0080982D */ daddu $s3, $a0, $zero -/* DB39E0 80241720 AFBF0020 */ sw $ra, 0x20($sp) -/* DB39E4 80241724 AFB20018 */ sw $s2, 0x18($sp) -/* DB39E8 80241728 AFB10014 */ sw $s1, 0x14($sp) -/* DB39EC 8024172C AFB00010 */ sw $s0, 0x10($sp) -/* DB39F0 80241730 8E720148 */ lw $s2, 0x148($s3) -/* DB39F4 80241734 86440008 */ lh $a0, 8($s2) -/* DB39F8 80241738 0C00EABB */ jal get_npc_unsafe -/* DB39FC 8024173C 00A0802D */ daddu $s0, $a1, $zero -/* DB3A00 80241740 0040882D */ daddu $s1, $v0, $zero -/* DB3A04 80241744 C6420080 */ lwc1 $f2, 0x80($s2) -/* DB3A08 80241748 468010A0 */ cvt.s.w $f2, $f2 -/* DB3A0C 8024174C 460010A1 */ cvt.d.s $f2, $f2 -/* DB3A10 80241750 C6400084 */ lwc1 $f0, 0x84($s2) -/* DB3A14 80241754 46800020 */ cvt.s.w $f0, $f0 -/* DB3A18 80241758 46000021 */ cvt.d.s $f0, $f0 -/* DB3A1C 8024175C 3C014059 */ lui $at, 0x4059 -/* DB3A20 80241760 44812800 */ mtc1 $at, $f5 -/* DB3A24 80241764 44802000 */ mtc1 $zero, $f4 -/* DB3A28 80241768 8E4200CC */ lw $v0, 0xcc($s2) -/* DB3A2C 8024176C C62C0038 */ lwc1 $f12, 0x38($s1) -/* DB3A30 80241770 C62E0040 */ lwc1 $f14, 0x40($s1) -/* DB3A34 80241774 46241083 */ div.d $f2, $f2, $f4 -/* DB3A38 80241778 462010A0 */ cvt.s.d $f2, $f2 -/* DB3A3C 8024177C 46240003 */ div.d $f0, $f0, $f4 -/* DB3A40 80241780 8C420020 */ lw $v0, 0x20($v0) -/* DB3A44 80241784 46200020 */ cvt.s.d $f0, $f0 -/* DB3A48 80241788 E622001C */ swc1 $f2, 0x1c($s1) -/* DB3A4C 8024178C E6200014 */ swc1 $f0, 0x14($s1) -/* DB3A50 80241790 AE220028 */ sw $v0, 0x28($s1) -/* DB3A54 80241794 C6000018 */ lwc1 $f0, 0x18($s0) -/* DB3A58 80241798 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* DB3A5C 8024179C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* DB3A60 802417A0 E6200018 */ swc1 $f0, 0x18($s1) -/* DB3A64 802417A4 8C460028 */ lw $a2, 0x28($v0) -/* DB3A68 802417A8 0C00A720 */ jal atan2 -/* DB3A6C 802417AC 8C470030 */ lw $a3, 0x30($v0) -/* DB3A70 802417B0 E620000C */ swc1 $f0, 0xc($s1) -/* DB3A74 802417B4 8E420018 */ lw $v0, 0x18($s2) -/* DB3A78 802417B8 AE400074 */ sw $zero, 0x74($s2) -/* DB3A7C 802417BC 9442002A */ lhu $v0, 0x2a($v0) -/* DB3A80 802417C0 30420002 */ andi $v0, $v0, 2 -/* DB3A84 802417C4 10400005 */ beqz $v0, .L802417DC -/* DB3A88 802417C8 24020003 */ addiu $v0, $zero, 3 -/* DB3A8C 802417CC A622008E */ sh $v0, 0x8e($s1) -/* DB3A90 802417D0 2402000D */ addiu $v0, $zero, 0xd -/* DB3A94 802417D4 0809060B */ j .L8024182C -/* DB3A98 802417D8 AE620070 */ sw $v0, 0x70($s3) -.L802417DC: -/* DB3A9C 802417DC 24030001 */ addiu $v1, $zero, 1 -/* DB3AA0 802417E0 2402000E */ addiu $v0, $zero, 0xe -/* DB3AA4 802417E4 A623008E */ sh $v1, 0x8e($s1) -/* DB3AA8 802417E8 AE620070 */ sw $v0, 0x70($s3) -/* DB3AAC 802417EC C6200038 */ lwc1 $f0, 0x38($s1) -/* DB3AB0 802417F0 4600018D */ trunc.w.s $f6, $f0 -/* DB3AB4 802417F4 44023000 */ mfc1 $v0, $f6 -/* DB3AB8 802417F8 00000000 */ nop -/* DB3ABC 802417FC A6420010 */ sh $v0, 0x10($s2) -/* DB3AC0 80241800 C620003C */ lwc1 $f0, 0x3c($s1) -/* DB3AC4 80241804 4600018D */ trunc.w.s $f6, $f0 -/* DB3AC8 80241808 44023000 */ mfc1 $v0, $f6 -/* DB3ACC 8024180C 00000000 */ nop -/* DB3AD0 80241810 A6420012 */ sh $v0, 0x12($s2) -/* DB3AD4 80241814 C6200040 */ lwc1 $f0, 0x40($s1) -/* DB3AD8 80241818 A2430007 */ sb $v1, 7($s2) -/* DB3ADC 8024181C 4600018D */ trunc.w.s $f6, $f0 -/* DB3AE0 80241820 44023000 */ mfc1 $v0, $f6 -/* DB3AE4 80241824 00000000 */ nop -/* DB3AE8 80241828 A6420014 */ sh $v0, 0x14($s2) -.L8024182C: -/* DB3AEC 8024182C 8FBF0020 */ lw $ra, 0x20($sp) -/* DB3AF0 80241830 8FB3001C */ lw $s3, 0x1c($sp) -/* DB3AF4 80241834 8FB20018 */ lw $s2, 0x18($sp) -/* DB3AF8 80241838 8FB10014 */ lw $s1, 0x14($sp) -/* DB3AFC 8024183C 8FB00010 */ lw $s0, 0x10($sp) -/* DB3B00 80241840 03E00008 */ jr $ra -/* DB3B04 80241844 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241D60_DB4020.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241D60_DB4020.s index 0c0074616d..e6a74666ae 100644 --- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241D60_DB4020.s +++ b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241D60_DB4020.s @@ -110,7 +110,7 @@ glabel L80241ECC_DB418C glabel L80241EE4_DB41A4 /* DB41A4 80241EE4 0280202D */ daddu $a0, $s4, $zero /* DB41A8 80241EE8 0200282D */ daddu $a1, $s0, $zero -/* DB41AC 80241EEC 0C0905C5 */ jal func_80241714_DB39D4 +/* DB41AC 80241EEC 0C0905C5 */ jal omo_05_UnkNpcAIFunc14 /* DB41B0 80241EF0 0260302D */ daddu $a2, $s3, $zero /* DB41B4 80241EF4 080907CA */ j .L80241F28 /* DB41B8 80241EF8 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242638_DBF8E8.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242638_DBF8E8.s deleted file mode 100644 index 0759f2b5ed..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242638_DBF8E8.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242638_DBF8E8 -/* DBF8E8 80242638 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* DBF8EC 8024263C AFB3001C */ sw $s3, 0x1c($sp) -/* DBF8F0 80242640 0080982D */ daddu $s3, $a0, $zero -/* DBF8F4 80242644 AFBF0020 */ sw $ra, 0x20($sp) -/* DBF8F8 80242648 AFB20018 */ sw $s2, 0x18($sp) -/* DBF8FC 8024264C AFB10014 */ sw $s1, 0x14($sp) -/* DBF900 80242650 AFB00010 */ sw $s0, 0x10($sp) -/* DBF904 80242654 8E720148 */ lw $s2, 0x148($s3) -/* DBF908 80242658 86440008 */ lh $a0, 8($s2) -/* DBF90C 8024265C 0C00EABB */ jal get_npc_unsafe -/* DBF910 80242660 00A0802D */ daddu $s0, $a1, $zero -/* DBF914 80242664 0040882D */ daddu $s1, $v0, $zero -/* DBF918 80242668 C6420080 */ lwc1 $f2, 0x80($s2) -/* DBF91C 8024266C 468010A0 */ cvt.s.w $f2, $f2 -/* DBF920 80242670 460010A1 */ cvt.d.s $f2, $f2 -/* DBF924 80242674 C6400084 */ lwc1 $f0, 0x84($s2) -/* DBF928 80242678 46800020 */ cvt.s.w $f0, $f0 -/* DBF92C 8024267C 46000021 */ cvt.d.s $f0, $f0 -/* DBF930 80242680 3C014059 */ lui $at, 0x4059 -/* DBF934 80242684 44812800 */ mtc1 $at, $f5 -/* DBF938 80242688 44802000 */ mtc1 $zero, $f4 -/* DBF93C 8024268C 8E4200CC */ lw $v0, 0xcc($s2) -/* DBF940 80242690 C62C0038 */ lwc1 $f12, 0x38($s1) -/* DBF944 80242694 C62E0040 */ lwc1 $f14, 0x40($s1) -/* DBF948 80242698 46241083 */ div.d $f2, $f2, $f4 -/* DBF94C 8024269C 462010A0 */ cvt.s.d $f2, $f2 -/* DBF950 802426A0 46240003 */ div.d $f0, $f0, $f4 -/* DBF954 802426A4 8C420020 */ lw $v0, 0x20($v0) -/* DBF958 802426A8 46200020 */ cvt.s.d $f0, $f0 -/* DBF95C 802426AC E622001C */ swc1 $f2, 0x1c($s1) -/* DBF960 802426B0 E6200014 */ swc1 $f0, 0x14($s1) -/* DBF964 802426B4 AE220028 */ sw $v0, 0x28($s1) -/* DBF968 802426B8 C6000018 */ lwc1 $f0, 0x18($s0) -/* DBF96C 802426BC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* DBF970 802426C0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* DBF974 802426C4 E6200018 */ swc1 $f0, 0x18($s1) -/* DBF978 802426C8 8C460028 */ lw $a2, 0x28($v0) -/* DBF97C 802426CC 0C00A720 */ jal atan2 -/* DBF980 802426D0 8C470030 */ lw $a3, 0x30($v0) -/* DBF984 802426D4 E620000C */ swc1 $f0, 0xc($s1) -/* DBF988 802426D8 8E420018 */ lw $v0, 0x18($s2) -/* DBF98C 802426DC AE400074 */ sw $zero, 0x74($s2) -/* DBF990 802426E0 9442002A */ lhu $v0, 0x2a($v0) -/* DBF994 802426E4 30420002 */ andi $v0, $v0, 2 -/* DBF998 802426E8 10400005 */ beqz $v0, .L80242700 -/* DBF99C 802426EC 24020003 */ addiu $v0, $zero, 3 -/* DBF9A0 802426F0 A622008E */ sh $v0, 0x8e($s1) -/* DBF9A4 802426F4 2402000D */ addiu $v0, $zero, 0xd -/* DBF9A8 802426F8 080909D4 */ j .L80242750 -/* DBF9AC 802426FC AE620070 */ sw $v0, 0x70($s3) -.L80242700: -/* DBF9B0 80242700 24030001 */ addiu $v1, $zero, 1 -/* DBF9B4 80242704 2402000E */ addiu $v0, $zero, 0xe -/* DBF9B8 80242708 A623008E */ sh $v1, 0x8e($s1) -/* DBF9BC 8024270C AE620070 */ sw $v0, 0x70($s3) -/* DBF9C0 80242710 C6200038 */ lwc1 $f0, 0x38($s1) -/* DBF9C4 80242714 4600018D */ trunc.w.s $f6, $f0 -/* DBF9C8 80242718 44023000 */ mfc1 $v0, $f6 -/* DBF9CC 8024271C 00000000 */ nop -/* DBF9D0 80242720 A6420010 */ sh $v0, 0x10($s2) -/* DBF9D4 80242724 C620003C */ lwc1 $f0, 0x3c($s1) -/* DBF9D8 80242728 4600018D */ trunc.w.s $f6, $f0 -/* DBF9DC 8024272C 44023000 */ mfc1 $v0, $f6 -/* DBF9E0 80242730 00000000 */ nop -/* DBF9E4 80242734 A6420012 */ sh $v0, 0x12($s2) -/* DBF9E8 80242738 C6200040 */ lwc1 $f0, 0x40($s1) -/* DBF9EC 8024273C A2430007 */ sb $v1, 7($s2) -/* DBF9F0 80242740 4600018D */ trunc.w.s $f6, $f0 -/* DBF9F4 80242744 44023000 */ mfc1 $v0, $f6 -/* DBF9F8 80242748 00000000 */ nop -/* DBF9FC 8024274C A6420014 */ sh $v0, 0x14($s2) -.L80242750: -/* DBFA00 80242750 8FBF0020 */ lw $ra, 0x20($sp) -/* DBFA04 80242754 8FB3001C */ lw $s3, 0x1c($sp) -/* DBFA08 80242758 8FB20018 */ lw $s2, 0x18($sp) -/* DBFA0C 8024275C 8FB10014 */ lw $s1, 0x14($sp) -/* DBFA10 80242760 8FB00010 */ lw $s0, 0x10($sp) -/* DBFA14 80242764 03E00008 */ jr $ra -/* DBFA18 80242768 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242C84_DBFF34.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242C84_DBFF34.s index 5010dd0e9d..9d0746e2af 100644 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242C84_DBFF34.s +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242C84_DBFF34.s @@ -110,7 +110,7 @@ glabel L80242DF0_DC00A0 glabel L80242E08_DC00B8 /* DC00B8 80242E08 0280202D */ daddu $a0, $s4, $zero /* DC00BC 80242E0C 0200282D */ daddu $a1, $s0, $zero -/* DC00C0 80242E10 0C09098E */ jal func_80242638_DBF8E8 +/* DC00C0 80242E10 0C09098E */ jal omo_07_UnkNpcAIFunc14 /* DC00C4 80242E14 0260302D */ daddu $a2, $s3, $zero /* DC00C8 80242E18 08090B93 */ j .L80242E4C /* DC00CC 80242E1C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80241408_DDDC38.s b/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80241408_DDDC38.s deleted file mode 100644 index 334d976c83..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80241408_DDDC38.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241408_DDDC38 -/* DDDC38 80241408 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DDDC3C 8024140C AFBF0018 */ sw $ra, 0x18($sp) -/* DDDC40 80241410 0C00EAD2 */ jal get_npc_safe -/* DDDC44 80241414 2404FFFC */ addiu $a0, $zero, -4 -/* DDDC48 80241418 3C0141F0 */ lui $at, 0x41f0 -/* DDDC4C 8024141C 44810000 */ mtc1 $at, $f0 -/* DDDC50 80241420 C442003C */ lwc1 $f2, 0x3c($v0) -/* DDDC54 80241424 46001080 */ add.s $f2, $f2, $f0 -/* DDDC58 80241428 E7A00010 */ swc1 $f0, 0x10($sp) -/* DDDC5C 8024142C 8C450038 */ lw $a1, 0x38($v0) -/* DDDC60 80241430 8C470040 */ lw $a3, 0x40($v0) -/* DDDC64 80241434 44061000 */ mfc1 $a2, $f2 -/* DDDC68 80241438 0C01BFBC */ jal func_8006FEF0 -/* DDDC6C 8024143C 24040002 */ addiu $a0, $zero, 2 -/* DDDC70 80241440 8FBF0018 */ lw $ra, 0x18($sp) -/* DDDC74 80241444 24020002 */ addiu $v0, $zero, 2 -/* DDDC78 80241448 03E00008 */ jr $ra -/* DDDC7C 8024144C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80241450_DDDC80.s b/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80241450_DDDC80.s deleted file mode 100644 index fa49c6c1e0..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80241450_DDDC80.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241450_DDDC80 -/* DDDC80 80241450 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DDDC84 80241454 AFBF0018 */ sw $ra, 0x18($sp) -/* DDDC88 80241458 0C00EAD2 */ jal get_npc_safe -/* DDDC8C 8024145C 2404FFFC */ addiu $a0, $zero, -4 -/* DDDC90 80241460 3C0141F0 */ lui $at, 0x41f0 -/* DDDC94 80241464 44810000 */ mtc1 $at, $f0 -/* DDDC98 80241468 C442003C */ lwc1 $f2, 0x3c($v0) -/* DDDC9C 8024146C 46001080 */ add.s $f2, $f2, $f0 -/* DDDCA0 80241470 E7A00010 */ swc1 $f0, 0x10($sp) -/* DDDCA4 80241474 8C450038 */ lw $a1, 0x38($v0) -/* DDDCA8 80241478 8C470040 */ lw $a3, 0x40($v0) -/* DDDCAC 8024147C 44061000 */ mfc1 $a2, $f2 -/* DDDCB0 80241480 0C01BFBC */ jal func_8006FEF0 -/* DDDCB4 80241484 24040004 */ addiu $a0, $zero, 4 -/* DDDCB8 80241488 8FBF0018 */ lw $ra, 0x18($sp) -/* DDDCBC 8024148C 24020002 */ addiu $v0, $zero, 2 -/* DDDCC0 80241490 03E00008 */ jr $ra -/* DDDCC4 80241494 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241C74_DF0B14.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241C74_DF0B14.s deleted file mode 100644 index 1768e460ae..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241C74_DF0B14.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241C74_DF0B14 -/* DF0B14 80241C74 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* DF0B18 80241C78 AFB3001C */ sw $s3, 0x1c($sp) -/* DF0B1C 80241C7C 0080982D */ daddu $s3, $a0, $zero -/* DF0B20 80241C80 AFBF0020 */ sw $ra, 0x20($sp) -/* DF0B24 80241C84 AFB20018 */ sw $s2, 0x18($sp) -/* DF0B28 80241C88 AFB10014 */ sw $s1, 0x14($sp) -/* DF0B2C 80241C8C AFB00010 */ sw $s0, 0x10($sp) -/* DF0B30 80241C90 8E720148 */ lw $s2, 0x148($s3) -/* DF0B34 80241C94 86440008 */ lh $a0, 8($s2) -/* DF0B38 80241C98 0C00EABB */ jal get_npc_unsafe -/* DF0B3C 80241C9C 00A0802D */ daddu $s0, $a1, $zero -/* DF0B40 80241CA0 0040882D */ daddu $s1, $v0, $zero -/* DF0B44 80241CA4 C6420080 */ lwc1 $f2, 0x80($s2) -/* DF0B48 80241CA8 468010A0 */ cvt.s.w $f2, $f2 -/* DF0B4C 80241CAC 460010A1 */ cvt.d.s $f2, $f2 -/* DF0B50 80241CB0 C6400084 */ lwc1 $f0, 0x84($s2) -/* DF0B54 80241CB4 46800020 */ cvt.s.w $f0, $f0 -/* DF0B58 80241CB8 46000021 */ cvt.d.s $f0, $f0 -/* DF0B5C 80241CBC 3C014059 */ lui $at, 0x4059 -/* DF0B60 80241CC0 44812800 */ mtc1 $at, $f5 -/* DF0B64 80241CC4 44802000 */ mtc1 $zero, $f4 -/* DF0B68 80241CC8 8E4200CC */ lw $v0, 0xcc($s2) -/* DF0B6C 80241CCC C62C0038 */ lwc1 $f12, 0x38($s1) -/* DF0B70 80241CD0 C62E0040 */ lwc1 $f14, 0x40($s1) -/* DF0B74 80241CD4 46241083 */ div.d $f2, $f2, $f4 -/* DF0B78 80241CD8 462010A0 */ cvt.s.d $f2, $f2 -/* DF0B7C 80241CDC 46240003 */ div.d $f0, $f0, $f4 -/* DF0B80 80241CE0 8C420020 */ lw $v0, 0x20($v0) -/* DF0B84 80241CE4 46200020 */ cvt.s.d $f0, $f0 -/* DF0B88 80241CE8 E622001C */ swc1 $f2, 0x1c($s1) -/* DF0B8C 80241CEC E6200014 */ swc1 $f0, 0x14($s1) -/* DF0B90 80241CF0 AE220028 */ sw $v0, 0x28($s1) -/* DF0B94 80241CF4 C6000018 */ lwc1 $f0, 0x18($s0) -/* DF0B98 80241CF8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* DF0B9C 80241CFC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* DF0BA0 80241D00 E6200018 */ swc1 $f0, 0x18($s1) -/* DF0BA4 80241D04 8C460028 */ lw $a2, 0x28($v0) -/* DF0BA8 80241D08 0C00A720 */ jal atan2 -/* DF0BAC 80241D0C 8C470030 */ lw $a3, 0x30($v0) -/* DF0BB0 80241D10 E620000C */ swc1 $f0, 0xc($s1) -/* DF0BB4 80241D14 8E420018 */ lw $v0, 0x18($s2) -/* DF0BB8 80241D18 AE400074 */ sw $zero, 0x74($s2) -/* DF0BBC 80241D1C 9442002A */ lhu $v0, 0x2a($v0) -/* DF0BC0 80241D20 30420002 */ andi $v0, $v0, 2 -/* DF0BC4 80241D24 10400005 */ beqz $v0, .L80241D3C -/* DF0BC8 80241D28 24020003 */ addiu $v0, $zero, 3 -/* DF0BCC 80241D2C A622008E */ sh $v0, 0x8e($s1) -/* DF0BD0 80241D30 2402000D */ addiu $v0, $zero, 0xd -/* DF0BD4 80241D34 08090763 */ j .L80241D8C -/* DF0BD8 80241D38 AE620070 */ sw $v0, 0x70($s3) -.L80241D3C: -/* DF0BDC 80241D3C 24030001 */ addiu $v1, $zero, 1 -/* DF0BE0 80241D40 2402000E */ addiu $v0, $zero, 0xe -/* DF0BE4 80241D44 A623008E */ sh $v1, 0x8e($s1) -/* DF0BE8 80241D48 AE620070 */ sw $v0, 0x70($s3) -/* DF0BEC 80241D4C C6200038 */ lwc1 $f0, 0x38($s1) -/* DF0BF0 80241D50 4600018D */ trunc.w.s $f6, $f0 -/* DF0BF4 80241D54 44023000 */ mfc1 $v0, $f6 -/* DF0BF8 80241D58 00000000 */ nop -/* DF0BFC 80241D5C A6420010 */ sh $v0, 0x10($s2) -/* DF0C00 80241D60 C620003C */ lwc1 $f0, 0x3c($s1) -/* DF0C04 80241D64 4600018D */ trunc.w.s $f6, $f0 -/* DF0C08 80241D68 44023000 */ mfc1 $v0, $f6 -/* DF0C0C 80241D6C 00000000 */ nop -/* DF0C10 80241D70 A6420012 */ sh $v0, 0x12($s2) -/* DF0C14 80241D74 C6200040 */ lwc1 $f0, 0x40($s1) -/* DF0C18 80241D78 A2430007 */ sb $v1, 7($s2) -/* DF0C1C 80241D7C 4600018D */ trunc.w.s $f6, $f0 -/* DF0C20 80241D80 44023000 */ mfc1 $v0, $f6 -/* DF0C24 80241D84 00000000 */ nop -/* DF0C28 80241D88 A6420014 */ sh $v0, 0x14($s2) -.L80241D8C: -/* DF0C2C 80241D8C 8FBF0020 */ lw $ra, 0x20($sp) -/* DF0C30 80241D90 8FB3001C */ lw $s3, 0x1c($sp) -/* DF0C34 80241D94 8FB20018 */ lw $s2, 0x18($sp) -/* DF0C38 80241D98 8FB10014 */ lw $s1, 0x14($sp) -/* DF0C3C 80241D9C 8FB00010 */ lw $s0, 0x10($sp) -/* DF0C40 80241DA0 03E00008 */ jr $ra -/* DF0C44 80241DA4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802422C0_DF1160.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802422C0_DF1160.s index 2458efc742..62651cfd31 100644 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802422C0_DF1160.s +++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802422C0_DF1160.s @@ -110,7 +110,7 @@ glabel L8024242C_DF12CC glabel L80242444_DF12E4 /* DF12E4 80242444 0280202D */ daddu $a0, $s4, $zero /* DF12E8 80242448 0200282D */ daddu $a1, $s0, $zero -/* DF12EC 8024244C 0C09071D */ jal func_80241C74_DF0B14 +/* DF12EC 8024244C 0C09071D */ jal omo_17_UnkNpcAIFunc14 /* DF12F0 80242450 0260302D */ daddu $a2, $s3, $zero /* DF12F4 80242454 08090922 */ j .L80242488 /* DF12F8 80242458 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240B2C_CF869C.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240B2C_CF869C.s deleted file mode 100644 index d2d1049de7..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240B2C_CF869C.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B2C_CF869C -/* CF869C 80240B2C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* CF86A0 80240B30 AFB10014 */ sw $s1, 0x14($sp) -/* CF86A4 80240B34 0080882D */ daddu $s1, $a0, $zero -/* CF86A8 80240B38 AFBF0024 */ sw $ra, 0x24($sp) -/* CF86AC 80240B3C AFB40020 */ sw $s4, 0x20($sp) -/* CF86B0 80240B40 AFB3001C */ sw $s3, 0x1c($sp) -/* CF86B4 80240B44 AFB20018 */ sw $s2, 0x18($sp) -/* CF86B8 80240B48 10A00033 */ beqz $a1, .L80240C18 -/* CF86BC 80240B4C AFB00010 */ sw $s0, 0x10($sp) -/* CF86C0 80240B50 0C04760B */ jal func_8011D82C -/* CF86C4 80240B54 24040001 */ addiu $a0, $zero, 1 -/* CF86C8 80240B58 0000202D */ daddu $a0, $zero, $zero -/* CF86CC 80240B5C 0080282D */ daddu $a1, $a0, $zero -/* CF86D0 80240B60 0080302D */ daddu $a2, $a0, $zero -/* CF86D4 80240B64 0080382D */ daddu $a3, $a0, $zero -/* CF86D8 80240B68 0080802D */ daddu $s0, $a0, $zero -/* CF86DC 80240B6C 2414FFFC */ addiu $s4, $zero, -4 -/* CF86E0 80240B70 2413000E */ addiu $s3, $zero, 0xe -/* CF86E4 80240B74 3C120080 */ lui $s2, 0x80 -/* CF86E8 80240B78 3C038015 */ lui $v1, %hi(D_801512F0) -/* CF86EC 80240B7C 8C6312F0 */ lw $v1, %lo(D_801512F0)($v1) -/* CF86F0 80240B80 24020001 */ addiu $v0, $zero, 1 -/* CF86F4 80240B84 0C046F97 */ jal set_background_color_blend -/* CF86F8 80240B88 A0620000 */ sb $v0, ($v1) -.L80240B8C: -/* CF86FC 80240B8C 0C00E2B7 */ jal get_npc_by_index -/* CF8700 80240B90 0200202D */ daddu $a0, $s0, $zero -/* CF8704 80240B94 0040202D */ daddu $a0, $v0, $zero -/* CF8708 80240B98 5080000B */ beql $a0, $zero, .L80240BC8 -/* CF870C 80240B9C 26100001 */ addiu $s0, $s0, 1 -/* CF8710 80240BA0 8C820000 */ lw $v0, ($a0) -/* CF8714 80240BA4 50400008 */ beql $v0, $zero, .L80240BC8 -/* CF8718 80240BA8 26100001 */ addiu $s0, $s0, 1 -/* CF871C 80240BAC 808300A4 */ lb $v1, 0xa4($a0) -/* CF8720 80240BB0 10740005 */ beq $v1, $s4, .L80240BC8 -/* CF8724 80240BB4 26100001 */ addiu $s0, $s0, 1 -/* CF8728 80240BB8 10730003 */ beq $v1, $s3, .L80240BC8 -/* CF872C 80240BBC 00000000 */ nop -/* CF8730 80240BC0 00521025 */ or $v0, $v0, $s2 -/* CF8734 80240BC4 AC820000 */ sw $v0, ($a0) -.L80240BC8: -/* CF8738 80240BC8 2A020040 */ slti $v0, $s0, 0x40 -/* CF873C 80240BCC 1440FFEF */ bnez $v0, .L80240B8C -/* CF8740 80240BD0 00000000 */ nop -/* CF8744 80240BD4 0000802D */ daddu $s0, $zero, $zero -/* CF8748 80240BD8 3C120800 */ lui $s2, 0x800 -.L80240BDC: -/* CF874C 80240BDC 0C04C3D6 */ jal get_item_entity -/* CF8750 80240BE0 0200202D */ daddu $a0, $s0, $zero -/* CF8754 80240BE4 0040182D */ daddu $v1, $v0, $zero -/* CF8758 80240BE8 10600007 */ beqz $v1, .L80240C08 -/* CF875C 80240BEC 26100001 */ addiu $s0, $s0, 1 -/* CF8760 80240BF0 8C640000 */ lw $a0, ($v1) -/* CF8764 80240BF4 30820010 */ andi $v0, $a0, 0x10 -/* CF8768 80240BF8 10400003 */ beqz $v0, .L80240C08 -/* CF876C 80240BFC 00000000 */ nop -/* CF8770 80240C00 00921025 */ or $v0, $a0, $s2 -/* CF8774 80240C04 AC620000 */ sw $v0, ($v1) -.L80240C08: -/* CF8778 80240C08 2A020100 */ slti $v0, $s0, 0x100 -/* CF877C 80240C0C 1440FFF3 */ bnez $v0, .L80240BDC -/* CF8780 80240C10 00000000 */ nop -/* CF8784 80240C14 AE200070 */ sw $zero, 0x70($s1) -.L80240C18: -/* CF8788 80240C18 8E220070 */ lw $v0, 0x70($s1) -/* CF878C 80240C1C 24420008 */ addiu $v0, $v0, 8 -/* CF8790 80240C20 AE220070 */ sw $v0, 0x70($s1) -/* CF8794 80240C24 28420100 */ slti $v0, $v0, 0x100 -/* CF8798 80240C28 14400003 */ bnez $v0, .L80240C38 -/* CF879C 80240C2C 0000202D */ daddu $a0, $zero, $zero -/* CF87A0 80240C30 240200FF */ addiu $v0, $zero, 0xff -/* CF87A4 80240C34 AE220070 */ sw $v0, 0x70($s1) -.L80240C38: -/* CF87A8 80240C38 0080282D */ daddu $a1, $a0, $zero -/* CF87AC 80240C3C 92270073 */ lbu $a3, 0x73($s1) -/* CF87B0 80240C40 0C046F97 */ jal set_background_color_blend -/* CF87B4 80240C44 0080302D */ daddu $a2, $a0, $zero -/* CF87B8 80240C48 8E220070 */ lw $v0, 0x70($s1) -/* CF87BC 80240C4C 8FBF0024 */ lw $ra, 0x24($sp) -/* CF87C0 80240C50 8FB40020 */ lw $s4, 0x20($sp) -/* CF87C4 80240C54 8FB3001C */ lw $s3, 0x1c($sp) -/* CF87C8 80240C58 8FB20018 */ lw $s2, 0x18($sp) -/* CF87CC 80240C5C 8FB10014 */ lw $s1, 0x14($sp) -/* CF87D0 80240C60 8FB00010 */ lw $s0, 0x10($sp) -/* CF87D4 80240C64 384200FF */ xori $v0, $v0, 0xff -/* CF87D8 80240C68 2C420001 */ sltiu $v0, $v0, 1 -/* CF87DC 80240C6C 00021040 */ sll $v0, $v0, 1 -/* CF87E0 80240C70 03E00008 */ jr $ra -/* CF87E4 80240C74 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241A80_CF95F0.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241A80_CF95F0.s deleted file mode 100644 index 38ab059e13..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241A80_CF95F0.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A80_CF95F0 -/* CF95F0 80241A80 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CF95F4 80241A84 AFB20018 */ sw $s2, 0x18($sp) -/* CF95F8 80241A88 0080902D */ daddu $s2, $a0, $zero -/* CF95FC 80241A8C AFBF001C */ sw $ra, 0x1c($sp) -/* CF9600 80241A90 AFB10014 */ sw $s1, 0x14($sp) -/* CF9604 80241A94 AFB00010 */ sw $s0, 0x10($sp) -/* CF9608 80241A98 8E50000C */ lw $s0, 0xc($s2) -/* CF960C 80241A9C 8E050000 */ lw $a1, ($s0) -/* CF9610 80241AA0 0C0B1EAF */ jal get_variable -/* CF9614 80241AA4 26100004 */ addiu $s0, $s0, 4 -/* CF9618 80241AA8 0C04C3D6 */ jal get_item_entity -/* CF961C 80241AAC 0040202D */ daddu $a0, $v0, $zero -/* CF9620 80241AB0 8E050000 */ lw $a1, ($s0) -/* CF9624 80241AB4 26100004 */ addiu $s0, $s0, 4 -/* CF9628 80241AB8 0040882D */ daddu $s1, $v0, $zero -/* CF962C 80241ABC C6200008 */ lwc1 $f0, 8($s1) -/* CF9630 80241AC0 4600008D */ trunc.w.s $f2, $f0 -/* CF9634 80241AC4 44061000 */ mfc1 $a2, $f2 -/* CF9638 80241AC8 0C0B2026 */ jal set_variable -/* CF963C 80241ACC 0240202D */ daddu $a0, $s2, $zero -/* CF9640 80241AD0 8E050000 */ lw $a1, ($s0) -/* CF9644 80241AD4 26100004 */ addiu $s0, $s0, 4 -/* CF9648 80241AD8 C620000C */ lwc1 $f0, 0xc($s1) -/* CF964C 80241ADC 4600008D */ trunc.w.s $f2, $f0 -/* CF9650 80241AE0 44061000 */ mfc1 $a2, $f2 -/* CF9654 80241AE4 0C0B2026 */ jal set_variable -/* CF9658 80241AE8 0240202D */ daddu $a0, $s2, $zero -/* CF965C 80241AEC C6200010 */ lwc1 $f0, 0x10($s1) -/* CF9660 80241AF0 8E050000 */ lw $a1, ($s0) -/* CF9664 80241AF4 4600008D */ trunc.w.s $f2, $f0 -/* CF9668 80241AF8 44061000 */ mfc1 $a2, $f2 -/* CF966C 80241AFC 0C0B2026 */ jal set_variable -/* CF9670 80241B00 0240202D */ daddu $a0, $s2, $zero -/* CF9674 80241B04 8FBF001C */ lw $ra, 0x1c($sp) -/* CF9678 80241B08 8FB20018 */ lw $s2, 0x18($sp) -/* CF967C 80241B0C 8FB10014 */ lw $s1, 0x14($sp) -/* CF9680 80241B10 8FB00010 */ lw $s0, 0x10($sp) -/* CF9684 80241B14 24020002 */ addiu $v0, $zero, 2 -/* CF9688 80241B18 03E00008 */ jr $ra -/* CF968C 80241B1C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240F58_D06688.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240F58_D06688.s deleted file mode 100644 index 81318d4d84..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240F58_D06688.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F58_D06688 -/* D06688 80240F58 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* D0668C 80240F5C AFB10014 */ sw $s1, 0x14($sp) -/* D06690 80240F60 0080882D */ daddu $s1, $a0, $zero -/* D06694 80240F64 AFBF0024 */ sw $ra, 0x24($sp) -/* D06698 80240F68 AFB40020 */ sw $s4, 0x20($sp) -/* D0669C 80240F6C AFB3001C */ sw $s3, 0x1c($sp) -/* D066A0 80240F70 AFB20018 */ sw $s2, 0x18($sp) -/* D066A4 80240F74 10A00033 */ beqz $a1, .L80241044 -/* D066A8 80240F78 AFB00010 */ sw $s0, 0x10($sp) -/* D066AC 80240F7C 0C04760B */ jal func_8011D82C -/* D066B0 80240F80 24040001 */ addiu $a0, $zero, 1 -/* D066B4 80240F84 0000202D */ daddu $a0, $zero, $zero -/* D066B8 80240F88 0080282D */ daddu $a1, $a0, $zero -/* D066BC 80240F8C 0080302D */ daddu $a2, $a0, $zero -/* D066C0 80240F90 0080382D */ daddu $a3, $a0, $zero -/* D066C4 80240F94 0080802D */ daddu $s0, $a0, $zero -/* D066C8 80240F98 2414FFFC */ addiu $s4, $zero, -4 -/* D066CC 80240F9C 24130008 */ addiu $s3, $zero, 8 -/* D066D0 80240FA0 3C120080 */ lui $s2, 0x80 -/* D066D4 80240FA4 3C038015 */ lui $v1, %hi(D_801512F0) -/* D066D8 80240FA8 8C6312F0 */ lw $v1, %lo(D_801512F0)($v1) -/* D066DC 80240FAC 24020001 */ addiu $v0, $zero, 1 -/* D066E0 80240FB0 0C046F97 */ jal set_background_color_blend -/* D066E4 80240FB4 A0620000 */ sb $v0, ($v1) -.L80240FB8: -/* D066E8 80240FB8 0C00E2B7 */ jal get_npc_by_index -/* D066EC 80240FBC 0200202D */ daddu $a0, $s0, $zero -/* D066F0 80240FC0 0040202D */ daddu $a0, $v0, $zero -/* D066F4 80240FC4 5080000B */ beql $a0, $zero, .L80240FF4 -/* D066F8 80240FC8 26100001 */ addiu $s0, $s0, 1 -/* D066FC 80240FCC 8C820000 */ lw $v0, ($a0) -/* D06700 80240FD0 50400008 */ beql $v0, $zero, .L80240FF4 -/* D06704 80240FD4 26100001 */ addiu $s0, $s0, 1 -/* D06708 80240FD8 808300A4 */ lb $v1, 0xa4($a0) -/* D0670C 80240FDC 10740005 */ beq $v1, $s4, .L80240FF4 -/* D06710 80240FE0 26100001 */ addiu $s0, $s0, 1 -/* D06714 80240FE4 10730003 */ beq $v1, $s3, .L80240FF4 -/* D06718 80240FE8 00000000 */ nop -/* D0671C 80240FEC 00521025 */ or $v0, $v0, $s2 -/* D06720 80240FF0 AC820000 */ sw $v0, ($a0) -.L80240FF4: -/* D06724 80240FF4 2A020040 */ slti $v0, $s0, 0x40 -/* D06728 80240FF8 1440FFEF */ bnez $v0, .L80240FB8 -/* D0672C 80240FFC 00000000 */ nop -/* D06730 80241000 0000802D */ daddu $s0, $zero, $zero -/* D06734 80241004 3C120800 */ lui $s2, 0x800 -.L80241008: -/* D06738 80241008 0C04C3D6 */ jal get_item_entity -/* D0673C 8024100C 0200202D */ daddu $a0, $s0, $zero -/* D06740 80241010 0040182D */ daddu $v1, $v0, $zero -/* D06744 80241014 10600007 */ beqz $v1, .L80241034 -/* D06748 80241018 26100001 */ addiu $s0, $s0, 1 -/* D0674C 8024101C 8C640000 */ lw $a0, ($v1) -/* D06750 80241020 30820010 */ andi $v0, $a0, 0x10 -/* D06754 80241024 10400003 */ beqz $v0, .L80241034 -/* D06758 80241028 00000000 */ nop -/* D0675C 8024102C 00921025 */ or $v0, $a0, $s2 -/* D06760 80241030 AC620000 */ sw $v0, ($v1) -.L80241034: -/* D06764 80241034 2A020100 */ slti $v0, $s0, 0x100 -/* D06768 80241038 1440FFF3 */ bnez $v0, .L80241008 -/* D0676C 8024103C 00000000 */ nop -/* D06770 80241040 AE200070 */ sw $zero, 0x70($s1) -.L80241044: -/* D06774 80241044 8E220070 */ lw $v0, 0x70($s1) -/* D06778 80241048 24420008 */ addiu $v0, $v0, 8 -/* D0677C 8024104C AE220070 */ sw $v0, 0x70($s1) -/* D06780 80241050 28420100 */ slti $v0, $v0, 0x100 -/* D06784 80241054 14400003 */ bnez $v0, .L80241064 -/* D06788 80241058 0000202D */ daddu $a0, $zero, $zero -/* D0678C 8024105C 240200FF */ addiu $v0, $zero, 0xff -/* D06790 80241060 AE220070 */ sw $v0, 0x70($s1) -.L80241064: -/* D06794 80241064 0080282D */ daddu $a1, $a0, $zero -/* D06798 80241068 92270073 */ lbu $a3, 0x73($s1) -/* D0679C 8024106C 0C046F97 */ jal set_background_color_blend -/* D067A0 80241070 0080302D */ daddu $a2, $a0, $zero -/* D067A4 80241074 8E220070 */ lw $v0, 0x70($s1) -/* D067A8 80241078 8FBF0024 */ lw $ra, 0x24($sp) -/* D067AC 8024107C 8FB40020 */ lw $s4, 0x20($sp) -/* D067B0 80241080 8FB3001C */ lw $s3, 0x1c($sp) -/* D067B4 80241084 8FB20018 */ lw $s2, 0x18($sp) -/* D067B8 80241088 8FB10014 */ lw $s1, 0x14($sp) -/* D067BC 8024108C 8FB00010 */ lw $s0, 0x10($sp) -/* D067C0 80241090 384200FF */ xori $v0, $v0, 0xff -/* D067C4 80241094 2C420001 */ sltiu $v0, $v0, 1 -/* D067C8 80241098 00021040 */ sll $v0, $v0, 1 -/* D067CC 8024109C 03E00008 */ jr $ra -/* D067D0 802410A0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241210_D210A0.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241210_D210A0.s deleted file mode 100644 index 1ff458ee4f..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241210_D210A0.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241210_D210A0 -/* D210A0 80241210 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* D210A4 80241214 AFB3001C */ sw $s3, 0x1c($sp) -/* D210A8 80241218 0080982D */ daddu $s3, $a0, $zero -/* D210AC 8024121C AFBF0020 */ sw $ra, 0x20($sp) -/* D210B0 80241220 AFB20018 */ sw $s2, 0x18($sp) -/* D210B4 80241224 AFB10014 */ sw $s1, 0x14($sp) -/* D210B8 80241228 AFB00010 */ sw $s0, 0x10($sp) -/* D210BC 8024122C 8E720148 */ lw $s2, 0x148($s3) -/* D210C0 80241230 86440008 */ lh $a0, 8($s2) -/* D210C4 80241234 0C00EABB */ jal get_npc_unsafe -/* D210C8 80241238 00A0802D */ daddu $s0, $a1, $zero -/* D210CC 8024123C 0040882D */ daddu $s1, $v0, $zero -/* D210D0 80241240 C6420080 */ lwc1 $f2, 0x80($s2) -/* D210D4 80241244 468010A0 */ cvt.s.w $f2, $f2 -/* D210D8 80241248 460010A1 */ cvt.d.s $f2, $f2 -/* D210DC 8024124C C6400084 */ lwc1 $f0, 0x84($s2) -/* D210E0 80241250 46800020 */ cvt.s.w $f0, $f0 -/* D210E4 80241254 46000021 */ cvt.d.s $f0, $f0 -/* D210E8 80241258 3C014059 */ lui $at, 0x4059 -/* D210EC 8024125C 44812800 */ mtc1 $at, $f5 -/* D210F0 80241260 44802000 */ mtc1 $zero, $f4 -/* D210F4 80241264 8E4200CC */ lw $v0, 0xcc($s2) -/* D210F8 80241268 C62C0038 */ lwc1 $f12, 0x38($s1) -/* D210FC 8024126C C62E0040 */ lwc1 $f14, 0x40($s1) -/* D21100 80241270 46241083 */ div.d $f2, $f2, $f4 -/* D21104 80241274 462010A0 */ cvt.s.d $f2, $f2 -/* D21108 80241278 46240003 */ div.d $f0, $f0, $f4 -/* D2110C 8024127C 8C420020 */ lw $v0, 0x20($v0) -/* D21110 80241280 46200020 */ cvt.s.d $f0, $f0 -/* D21114 80241284 E622001C */ swc1 $f2, 0x1c($s1) -/* D21118 80241288 E6200014 */ swc1 $f0, 0x14($s1) -/* D2111C 8024128C AE220028 */ sw $v0, 0x28($s1) -/* D21120 80241290 C6000018 */ lwc1 $f0, 0x18($s0) -/* D21124 80241294 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* D21128 80241298 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* D2112C 8024129C E6200018 */ swc1 $f0, 0x18($s1) -/* D21130 802412A0 8C460028 */ lw $a2, 0x28($v0) -/* D21134 802412A4 0C00A720 */ jal atan2 -/* D21138 802412A8 8C470030 */ lw $a3, 0x30($v0) -/* D2113C 802412AC E620000C */ swc1 $f0, 0xc($s1) -/* D21140 802412B0 8E420018 */ lw $v0, 0x18($s2) -/* D21144 802412B4 AE400074 */ sw $zero, 0x74($s2) -/* D21148 802412B8 9442002A */ lhu $v0, 0x2a($v0) -/* D2114C 802412BC 30420002 */ andi $v0, $v0, 2 -/* D21150 802412C0 10400005 */ beqz $v0, .L802412D8 -/* D21154 802412C4 24020003 */ addiu $v0, $zero, 3 -/* D21158 802412C8 A622008E */ sh $v0, 0x8e($s1) -/* D2115C 802412CC 2402000D */ addiu $v0, $zero, 0xd -/* D21160 802412D0 080904CA */ j .L80241328 -/* D21164 802412D4 AE620070 */ sw $v0, 0x70($s3) -.L802412D8: -/* D21168 802412D8 24030001 */ addiu $v1, $zero, 1 -/* D2116C 802412DC 2402000E */ addiu $v0, $zero, 0xe -/* D21170 802412E0 A623008E */ sh $v1, 0x8e($s1) -/* D21174 802412E4 AE620070 */ sw $v0, 0x70($s3) -/* D21178 802412E8 C6200038 */ lwc1 $f0, 0x38($s1) -/* D2117C 802412EC 4600018D */ trunc.w.s $f6, $f0 -/* D21180 802412F0 44023000 */ mfc1 $v0, $f6 -/* D21184 802412F4 00000000 */ nop -/* D21188 802412F8 A6420010 */ sh $v0, 0x10($s2) -/* D2118C 802412FC C620003C */ lwc1 $f0, 0x3c($s1) -/* D21190 80241300 4600018D */ trunc.w.s $f6, $f0 -/* D21194 80241304 44023000 */ mfc1 $v0, $f6 -/* D21198 80241308 00000000 */ nop -/* D2119C 8024130C A6420012 */ sh $v0, 0x12($s2) -/* D211A0 80241310 C6200040 */ lwc1 $f0, 0x40($s1) -/* D211A4 80241314 A2430007 */ sb $v1, 7($s2) -/* D211A8 80241318 4600018D */ trunc.w.s $f6, $f0 -/* D211AC 8024131C 44023000 */ mfc1 $v0, $f6 -/* D211B0 80241320 00000000 */ nop -/* D211B4 80241324 A6420014 */ sh $v0, 0x14($s2) -.L80241328: -/* D211B8 80241328 8FBF0020 */ lw $ra, 0x20($sp) -/* D211BC 8024132C 8FB3001C */ lw $s3, 0x1c($sp) -/* D211C0 80241330 8FB20018 */ lw $s2, 0x18($sp) -/* D211C4 80241334 8FB10014 */ lw $s1, 0x14($sp) -/* D211C8 80241338 8FB00010 */ lw $s0, 0x10($sp) -/* D211CC 8024133C 03E00008 */ jr $ra -/* D211D0 80241340 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024185C_D216EC.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024185C_D216EC.s index f3bfac5e43..b30eb5004d 100644 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024185C_D216EC.s +++ b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024185C_D216EC.s @@ -110,7 +110,7 @@ glabel L802419C8_D21858 glabel L802419E0_D21870 /* D21870 802419E0 0280202D */ daddu $a0, $s4, $zero /* D21874 802419E4 0200282D */ daddu $a1, $s0, $zero -/* D21878 802419E8 0C090484 */ jal func_80241210_D210A0 +/* D21878 802419E8 0C090484 */ jal sam_06_UnkNpcAIFunc14 /* D2187C 802419EC 0260302D */ daddu $a2, $s3, $zero /* D21880 802419F0 08090689 */ j .L80241A24 /* D21884 802419F4 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240C78_D308F8.s b/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240C78_D308F8.s deleted file mode 100644 index 7e8a0bf4da..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240C78_D308F8.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C78_D308F8 -/* D308F8 80240C78 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D308FC 80240C7C AFBF0018 */ sw $ra, 0x18($sp) -/* D30900 80240C80 0C00EAD2 */ jal get_npc_safe -/* D30904 80240C84 2404FFFC */ addiu $a0, $zero, -4 -/* D30908 80240C88 3C0141F0 */ lui $at, 0x41f0 -/* D3090C 80240C8C 44810000 */ mtc1 $at, $f0 -/* D30910 80240C90 C442003C */ lwc1 $f2, 0x3c($v0) -/* D30914 80240C94 46001080 */ add.s $f2, $f2, $f0 -/* D30918 80240C98 E7A00010 */ swc1 $f0, 0x10($sp) -/* D3091C 80240C9C 8C450038 */ lw $a1, 0x38($v0) -/* D30920 80240CA0 8C470040 */ lw $a3, 0x40($v0) -/* D30924 80240CA4 44061000 */ mfc1 $a2, $f2 -/* D30928 80240CA8 0C01BFBC */ jal func_8006FEF0 -/* D3092C 80240CAC 24040002 */ addiu $a0, $zero, 2 -/* D30930 80240CB0 8FBF0018 */ lw $ra, 0x18($sp) -/* D30934 80240CB4 24020002 */ addiu $v0, $zero, 2 -/* D30938 80240CB8 03E00008 */ jr $ra -/* D3093C 80240CBC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240CC0_D30940.s b/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240CC0_D30940.s deleted file mode 100644 index f01b5e3382..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240CC0_D30940.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CC0_D30940 -/* D30940 80240CC0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D30944 80240CC4 AFBF0018 */ sw $ra, 0x18($sp) -/* D30948 80240CC8 0C00EAD2 */ jal get_npc_safe -/* D3094C 80240CCC 2404FFFC */ addiu $a0, $zero, -4 -/* D30950 80240CD0 3C0141F0 */ lui $at, 0x41f0 -/* D30954 80240CD4 44810000 */ mtc1 $at, $f0 -/* D30958 80240CD8 C442003C */ lwc1 $f2, 0x3c($v0) -/* D3095C 80240CDC 46001080 */ add.s $f2, $f2, $f0 -/* D30960 80240CE0 E7A00010 */ swc1 $f0, 0x10($sp) -/* D30964 80240CE4 8C450038 */ lw $a1, 0x38($v0) -/* D30968 80240CE8 8C470040 */ lw $a3, 0x40($v0) -/* D3096C 80240CEC 44061000 */ mfc1 $a2, $f2 -/* D30970 80240CF0 0C01BFBC */ jal func_8006FEF0 -/* D30974 80240CF4 24040004 */ addiu $a0, $zero, 4 -/* D30978 80240CF8 8FBF0018 */ lw $ra, 0x18($sp) -/* D3097C 80240CFC 24020002 */ addiu $v0, $zero, 2 -/* D30980 80240D00 03E00008 */ jr $ra -/* D30984 80240D04 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240BFC_D3B1CC.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240BFC_D3B1CC.s deleted file mode 100644 index 0c42cf1b63..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240BFC_D3B1CC.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BFC_D3B1CC -/* D3B1CC 80240BFC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* D3B1D0 80240C00 AFB10014 */ sw $s1, 0x14($sp) -/* D3B1D4 80240C04 0080882D */ daddu $s1, $a0, $zero -/* D3B1D8 80240C08 AFBF0024 */ sw $ra, 0x24($sp) -/* D3B1DC 80240C0C AFB40020 */ sw $s4, 0x20($sp) -/* D3B1E0 80240C10 AFB3001C */ sw $s3, 0x1c($sp) -/* D3B1E4 80240C14 AFB20018 */ sw $s2, 0x18($sp) -/* D3B1E8 80240C18 10A00033 */ beqz $a1, .L80240CE8 -/* D3B1EC 80240C1C AFB00010 */ sw $s0, 0x10($sp) -/* D3B1F0 80240C20 0C04760B */ jal func_8011D82C -/* D3B1F4 80240C24 24040001 */ addiu $a0, $zero, 1 -/* D3B1F8 80240C28 0000202D */ daddu $a0, $zero, $zero -/* D3B1FC 80240C2C 0080282D */ daddu $a1, $a0, $zero -/* D3B200 80240C30 0080302D */ daddu $a2, $a0, $zero -/* D3B204 80240C34 0080382D */ daddu $a3, $a0, $zero -/* D3B208 80240C38 0080802D */ daddu $s0, $a0, $zero -/* D3B20C 80240C3C 2414FFFC */ addiu $s4, $zero, -4 -/* D3B210 80240C40 24130011 */ addiu $s3, $zero, 0x11 -/* D3B214 80240C44 3C120080 */ lui $s2, 0x80 -/* D3B218 80240C48 3C038015 */ lui $v1, %hi(D_801512F0) -/* D3B21C 80240C4C 8C6312F0 */ lw $v1, %lo(D_801512F0)($v1) -/* D3B220 80240C50 24020001 */ addiu $v0, $zero, 1 -/* D3B224 80240C54 0C046F97 */ jal set_background_color_blend -/* D3B228 80240C58 A0620000 */ sb $v0, ($v1) -.L80240C5C: -/* D3B22C 80240C5C 0C00E2B7 */ jal get_npc_by_index -/* D3B230 80240C60 0200202D */ daddu $a0, $s0, $zero -/* D3B234 80240C64 0040202D */ daddu $a0, $v0, $zero -/* D3B238 80240C68 5080000B */ beql $a0, $zero, .L80240C98 -/* D3B23C 80240C6C 26100001 */ addiu $s0, $s0, 1 -/* D3B240 80240C70 8C820000 */ lw $v0, ($a0) -/* D3B244 80240C74 50400008 */ beql $v0, $zero, .L80240C98 -/* D3B248 80240C78 26100001 */ addiu $s0, $s0, 1 -/* D3B24C 80240C7C 808300A4 */ lb $v1, 0xa4($a0) -/* D3B250 80240C80 10740005 */ beq $v1, $s4, .L80240C98 -/* D3B254 80240C84 26100001 */ addiu $s0, $s0, 1 -/* D3B258 80240C88 10730003 */ beq $v1, $s3, .L80240C98 -/* D3B25C 80240C8C 00000000 */ nop -/* D3B260 80240C90 00521025 */ or $v0, $v0, $s2 -/* D3B264 80240C94 AC820000 */ sw $v0, ($a0) -.L80240C98: -/* D3B268 80240C98 2A020040 */ slti $v0, $s0, 0x40 -/* D3B26C 80240C9C 1440FFEF */ bnez $v0, .L80240C5C -/* D3B270 80240CA0 00000000 */ nop -/* D3B274 80240CA4 0000802D */ daddu $s0, $zero, $zero -/* D3B278 80240CA8 3C120800 */ lui $s2, 0x800 -.L80240CAC: -/* D3B27C 80240CAC 0C04C3D6 */ jal get_item_entity -/* D3B280 80240CB0 0200202D */ daddu $a0, $s0, $zero -/* D3B284 80240CB4 0040182D */ daddu $v1, $v0, $zero -/* D3B288 80240CB8 10600007 */ beqz $v1, .L80240CD8 -/* D3B28C 80240CBC 26100001 */ addiu $s0, $s0, 1 -/* D3B290 80240CC0 8C640000 */ lw $a0, ($v1) -/* D3B294 80240CC4 30820010 */ andi $v0, $a0, 0x10 -/* D3B298 80240CC8 10400003 */ beqz $v0, .L80240CD8 -/* D3B29C 80240CCC 00000000 */ nop -/* D3B2A0 80240CD0 00921025 */ or $v0, $a0, $s2 -/* D3B2A4 80240CD4 AC620000 */ sw $v0, ($v1) -.L80240CD8: -/* D3B2A8 80240CD8 2A020100 */ slti $v0, $s0, 0x100 -/* D3B2AC 80240CDC 1440FFF3 */ bnez $v0, .L80240CAC -/* D3B2B0 80240CE0 00000000 */ nop -/* D3B2B4 80240CE4 AE200070 */ sw $zero, 0x70($s1) -.L80240CE8: -/* D3B2B8 80240CE8 8E220070 */ lw $v0, 0x70($s1) -/* D3B2BC 80240CEC 24420008 */ addiu $v0, $v0, 8 -/* D3B2C0 80240CF0 AE220070 */ sw $v0, 0x70($s1) -/* D3B2C4 80240CF4 28420100 */ slti $v0, $v0, 0x100 -/* D3B2C8 80240CF8 14400003 */ bnez $v0, .L80240D08 -/* D3B2CC 80240CFC 0000202D */ daddu $a0, $zero, $zero -/* D3B2D0 80240D00 240200FF */ addiu $v0, $zero, 0xff -/* D3B2D4 80240D04 AE220070 */ sw $v0, 0x70($s1) -.L80240D08: -/* D3B2D8 80240D08 0080282D */ daddu $a1, $a0, $zero -/* D3B2DC 80240D0C 92270073 */ lbu $a3, 0x73($s1) -/* D3B2E0 80240D10 0C046F97 */ jal set_background_color_blend -/* D3B2E4 80240D14 0080302D */ daddu $a2, $a0, $zero -/* D3B2E8 80240D18 8E220070 */ lw $v0, 0x70($s1) -/* D3B2EC 80240D1C 8FBF0024 */ lw $ra, 0x24($sp) -/* D3B2F0 80240D20 8FB40020 */ lw $s4, 0x20($sp) -/* D3B2F4 80240D24 8FB3001C */ lw $s3, 0x1c($sp) -/* D3B2F8 80240D28 8FB20018 */ lw $s2, 0x18($sp) -/* D3B2FC 80240D2C 8FB10014 */ lw $s1, 0x14($sp) -/* D3B300 80240D30 8FB00010 */ lw $s0, 0x10($sp) -/* D3B304 80240D34 384200FF */ xori $v0, $v0, 0xff -/* D3B308 80240D38 2C420001 */ sltiu $v0, $v0, 1 -/* D3B30C 80240D3C 00021040 */ sll $v0, $v0, 1 -/* D3B310 80240D40 03E00008 */ jr $ra -/* D3B314 80240D44 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240CF8_954CB8.s b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240CF8_954CB8.s deleted file mode 100644 index 642dfb985e..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240CF8_954CB8.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CF8_954CB8 -/* 954CB8 80240CF8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 954CBC 80240CFC AFBF0018 */ sw $ra, 0x18($sp) -/* 954CC0 80240D00 0C00EAD2 */ jal get_npc_safe -/* 954CC4 80240D04 2404FFFC */ addiu $a0, $zero, -4 -/* 954CC8 80240D08 3C0141F0 */ lui $at, 0x41f0 -/* 954CCC 80240D0C 44810000 */ mtc1 $at, $f0 -/* 954CD0 80240D10 C442003C */ lwc1 $f2, 0x3c($v0) -/* 954CD4 80240D14 46001080 */ add.s $f2, $f2, $f0 -/* 954CD8 80240D18 E7A00010 */ swc1 $f0, 0x10($sp) -/* 954CDC 80240D1C 8C450038 */ lw $a1, 0x38($v0) -/* 954CE0 80240D20 8C470040 */ lw $a3, 0x40($v0) -/* 954CE4 80240D24 44061000 */ mfc1 $a2, $f2 -/* 954CE8 80240D28 0C01BFBC */ jal func_8006FEF0 -/* 954CEC 80240D2C 24040002 */ addiu $a0, $zero, 2 -/* 954CF0 80240D30 8FBF0018 */ lw $ra, 0x18($sp) -/* 954CF4 80240D34 24020002 */ addiu $v0, $zero, 2 -/* 954CF8 80240D38 03E00008 */ jr $ra -/* 954CFC 80240D3C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240D40_954D00.s b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240D40_954D00.s deleted file mode 100644 index 4d36d3c1a7..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240D40_954D00.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D40_954D00 -/* 954D00 80240D40 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 954D04 80240D44 AFBF0018 */ sw $ra, 0x18($sp) -/* 954D08 80240D48 0C00EAD2 */ jal get_npc_safe -/* 954D0C 80240D4C 2404FFFC */ addiu $a0, $zero, -4 -/* 954D10 80240D50 3C0141F0 */ lui $at, 0x41f0 -/* 954D14 80240D54 44810000 */ mtc1 $at, $f0 -/* 954D18 80240D58 C442003C */ lwc1 $f2, 0x3c($v0) -/* 954D1C 80240D5C 46001080 */ add.s $f2, $f2, $f0 -/* 954D20 80240D60 E7A00010 */ swc1 $f0, 0x10($sp) -/* 954D24 80240D64 8C450038 */ lw $a1, 0x38($v0) -/* 954D28 80240D68 8C470040 */ lw $a3, 0x40($v0) -/* 954D2C 80240D6C 44061000 */ mfc1 $a2, $f2 -/* 954D30 80240D70 0C01BFBC */ jal func_8006FEF0 -/* 954D34 80240D74 24040004 */ addiu $a0, $zero, 4 -/* 954D38 80240D78 8FBF0018 */ lw $ra, 0x18($sp) -/* 954D3C 80240D7C 24020002 */ addiu $v0, $zero, 2 -/* 954D40 80240D80 03E00008 */ jr $ra -/* 954D44 80240D84 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240F58_87AB38.s b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240F58_87AB38.s deleted file mode 100644 index 532ed0f70e..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240F58_87AB38.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F58_87AB38 -/* 87AB38 80240F58 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 87AB3C 80240F5C AFBF0018 */ sw $ra, 0x18($sp) -/* 87AB40 80240F60 0C00EAD2 */ jal get_npc_safe -/* 87AB44 80240F64 2404FFFC */ addiu $a0, $zero, -4 -/* 87AB48 80240F68 3C0141F0 */ lui $at, 0x41f0 -/* 87AB4C 80240F6C 44810000 */ mtc1 $at, $f0 -/* 87AB50 80240F70 C442003C */ lwc1 $f2, 0x3c($v0) -/* 87AB54 80240F74 46001080 */ add.s $f2, $f2, $f0 -/* 87AB58 80240F78 E7A00010 */ swc1 $f0, 0x10($sp) -/* 87AB5C 80240F7C 8C450038 */ lw $a1, 0x38($v0) -/* 87AB60 80240F80 8C470040 */ lw $a3, 0x40($v0) -/* 87AB64 80240F84 44061000 */ mfc1 $a2, $f2 -/* 87AB68 80240F88 0C01BFBC */ jal func_8006FEF0 -/* 87AB6C 80240F8C 24040002 */ addiu $a0, $zero, 2 -/* 87AB70 80240F90 8FBF0018 */ lw $ra, 0x18($sp) -/* 87AB74 80240F94 24020002 */ addiu $v0, $zero, 2 -/* 87AB78 80240F98 03E00008 */ jr $ra -/* 87AB7C 80240F9C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240FA0_87AB80.s b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240FA0_87AB80.s deleted file mode 100644 index 9c08c2dc44..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240FA0_87AB80.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FA0_87AB80 -/* 87AB80 80240FA0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 87AB84 80240FA4 AFBF0018 */ sw $ra, 0x18($sp) -/* 87AB88 80240FA8 0C00EAD2 */ jal get_npc_safe -/* 87AB8C 80240FAC 2404FFFC */ addiu $a0, $zero, -4 -/* 87AB90 80240FB0 3C0141F0 */ lui $at, 0x41f0 -/* 87AB94 80240FB4 44810000 */ mtc1 $at, $f0 -/* 87AB98 80240FB8 C442003C */ lwc1 $f2, 0x3c($v0) -/* 87AB9C 80240FBC 46001080 */ add.s $f2, $f2, $f0 -/* 87ABA0 80240FC0 E7A00010 */ swc1 $f0, 0x10($sp) -/* 87ABA4 80240FC4 8C450038 */ lw $a1, 0x38($v0) -/* 87ABA8 80240FC8 8C470040 */ lw $a3, 0x40($v0) -/* 87ABAC 80240FCC 44061000 */ mfc1 $a2, $f2 -/* 87ABB0 80240FD0 0C01BFBC */ jal func_8006FEF0 -/* 87ABB4 80240FD4 24040004 */ addiu $a0, $zero, 4 -/* 87ABB8 80240FD8 8FBF0018 */ lw $ra, 0x18($sp) -/* 87ABBC 80240FDC 24020002 */ addiu $v0, $zero, 2 -/* 87ABC0 80240FE0 03E00008 */ jr $ra -/* 87ABC4 80240FE4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802420B0_87BC90.s b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802420B0_87BC90.s deleted file mode 100644 index 6acc1c962e..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802420B0_87BC90.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802420B0_87BC90 -/* 87BC90 802420B0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 87BC94 802420B4 AFB3001C */ sw $s3, 0x1c($sp) -/* 87BC98 802420B8 0080982D */ daddu $s3, $a0, $zero -/* 87BC9C 802420BC AFBF0020 */ sw $ra, 0x20($sp) -/* 87BCA0 802420C0 AFB20018 */ sw $s2, 0x18($sp) -/* 87BCA4 802420C4 AFB10014 */ sw $s1, 0x14($sp) -/* 87BCA8 802420C8 AFB00010 */ sw $s0, 0x10($sp) -/* 87BCAC 802420CC 8E720148 */ lw $s2, 0x148($s3) -/* 87BCB0 802420D0 86440008 */ lh $a0, 8($s2) -/* 87BCB4 802420D4 0C00EABB */ jal get_npc_unsafe -/* 87BCB8 802420D8 00A0802D */ daddu $s0, $a1, $zero -/* 87BCBC 802420DC 0040882D */ daddu $s1, $v0, $zero -/* 87BCC0 802420E0 C6420080 */ lwc1 $f2, 0x80($s2) -/* 87BCC4 802420E4 468010A0 */ cvt.s.w $f2, $f2 -/* 87BCC8 802420E8 460010A1 */ cvt.d.s $f2, $f2 -/* 87BCCC 802420EC C6400084 */ lwc1 $f0, 0x84($s2) -/* 87BCD0 802420F0 46800020 */ cvt.s.w $f0, $f0 -/* 87BCD4 802420F4 46000021 */ cvt.d.s $f0, $f0 -/* 87BCD8 802420F8 3C014059 */ lui $at, 0x4059 -/* 87BCDC 802420FC 44812800 */ mtc1 $at, $f5 -/* 87BCE0 80242100 44802000 */ mtc1 $zero, $f4 -/* 87BCE4 80242104 8E4200CC */ lw $v0, 0xcc($s2) -/* 87BCE8 80242108 C62C0038 */ lwc1 $f12, 0x38($s1) -/* 87BCEC 8024210C C62E0040 */ lwc1 $f14, 0x40($s1) -/* 87BCF0 80242110 46241083 */ div.d $f2, $f2, $f4 -/* 87BCF4 80242114 462010A0 */ cvt.s.d $f2, $f2 -/* 87BCF8 80242118 46240003 */ div.d $f0, $f0, $f4 -/* 87BCFC 8024211C 8C420020 */ lw $v0, 0x20($v0) -/* 87BD00 80242120 46200020 */ cvt.s.d $f0, $f0 -/* 87BD04 80242124 E622001C */ swc1 $f2, 0x1c($s1) -/* 87BD08 80242128 E6200014 */ swc1 $f0, 0x14($s1) -/* 87BD0C 8024212C AE220028 */ sw $v0, 0x28($s1) -/* 87BD10 80242130 C6000018 */ lwc1 $f0, 0x18($s0) -/* 87BD14 80242134 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 87BD18 80242138 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 87BD1C 8024213C E6200018 */ swc1 $f0, 0x18($s1) -/* 87BD20 80242140 8C460028 */ lw $a2, 0x28($v0) -/* 87BD24 80242144 0C00A720 */ jal atan2 -/* 87BD28 80242148 8C470030 */ lw $a3, 0x30($v0) -/* 87BD2C 8024214C E620000C */ swc1 $f0, 0xc($s1) -/* 87BD30 80242150 8E420018 */ lw $v0, 0x18($s2) -/* 87BD34 80242154 AE400074 */ sw $zero, 0x74($s2) -/* 87BD38 80242158 9442002A */ lhu $v0, 0x2a($v0) -/* 87BD3C 8024215C 30420002 */ andi $v0, $v0, 2 -/* 87BD40 80242160 10400005 */ beqz $v0, .L80242178 -/* 87BD44 80242164 24020003 */ addiu $v0, $zero, 3 -/* 87BD48 80242168 A622008E */ sh $v0, 0x8e($s1) -/* 87BD4C 8024216C 2402000D */ addiu $v0, $zero, 0xd -/* 87BD50 80242170 08090872 */ j .L802421C8 -/* 87BD54 80242174 AE620070 */ sw $v0, 0x70($s3) -.L80242178: -/* 87BD58 80242178 24030001 */ addiu $v1, $zero, 1 -/* 87BD5C 8024217C 2402000E */ addiu $v0, $zero, 0xe -/* 87BD60 80242180 A623008E */ sh $v1, 0x8e($s1) -/* 87BD64 80242184 AE620070 */ sw $v0, 0x70($s3) -/* 87BD68 80242188 C6200038 */ lwc1 $f0, 0x38($s1) -/* 87BD6C 8024218C 4600018D */ trunc.w.s $f6, $f0 -/* 87BD70 80242190 44023000 */ mfc1 $v0, $f6 -/* 87BD74 80242194 00000000 */ nop -/* 87BD78 80242198 A6420010 */ sh $v0, 0x10($s2) -/* 87BD7C 8024219C C620003C */ lwc1 $f0, 0x3c($s1) -/* 87BD80 802421A0 4600018D */ trunc.w.s $f6, $f0 -/* 87BD84 802421A4 44023000 */ mfc1 $v0, $f6 -/* 87BD88 802421A8 00000000 */ nop -/* 87BD8C 802421AC A6420012 */ sh $v0, 0x12($s2) -/* 87BD90 802421B0 C6200040 */ lwc1 $f0, 0x40($s1) -/* 87BD94 802421B4 A2430007 */ sb $v1, 7($s2) -/* 87BD98 802421B8 4600018D */ trunc.w.s $f6, $f0 -/* 87BD9C 802421BC 44023000 */ mfc1 $v0, $f6 -/* 87BDA0 802421C0 00000000 */ nop -/* 87BDA4 802421C4 A6420014 */ sh $v0, 0x14($s2) -.L802421C8: -/* 87BDA8 802421C8 8FBF0020 */ lw $ra, 0x20($sp) -/* 87BDAC 802421CC 8FB3001C */ lw $s3, 0x1c($sp) -/* 87BDB0 802421D0 8FB20018 */ lw $s2, 0x18($sp) -/* 87BDB4 802421D4 8FB10014 */ lw $s1, 0x14($sp) -/* 87BDB8 802421D8 8FB00010 */ lw $s0, 0x10($sp) -/* 87BDBC 802421DC 03E00008 */ jr $ra -/* 87BDC0 802421E0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC_87C2DC.s b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC_87C2DC.s index e8f466f08a..e919c64688 100644 --- a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC_87C2DC.s +++ b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC_87C2DC.s @@ -110,7 +110,7 @@ glabel L80242868_87C448 glabel L80242880_87C460 /* 87C460 80242880 0280202D */ daddu $a0, $s4, $zero /* 87C464 80242884 0200282D */ daddu $a1, $s0, $zero -/* 87C468 80242888 0C09082C */ jal func_802420B0_87BC90 +/* 87C468 80242888 0C09082C */ jal tik_07_UnkNpcAIFunc14 /* 87C46C 8024288C 0260302D */ daddu $a2, $s3, $zero /* 87C470 80242890 08090A31 */ j .L802428C4 /* 87C474 80242894 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802412F8_8876B8.s b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802412F8_8876B8.s deleted file mode 100644 index 2dbe7f5a77..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802412F8_8876B8.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412F8_8876B8 -/* 8876B8 802412F8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8876BC 802412FC AFBF0018 */ sw $ra, 0x18($sp) -/* 8876C0 80241300 0C00EAD2 */ jal get_npc_safe -/* 8876C4 80241304 2404FFFC */ addiu $a0, $zero, -4 -/* 8876C8 80241308 3C0141F0 */ lui $at, 0x41f0 -/* 8876CC 8024130C 44810000 */ mtc1 $at, $f0 -/* 8876D0 80241310 C442003C */ lwc1 $f2, 0x3c($v0) -/* 8876D4 80241314 46001080 */ add.s $f2, $f2, $f0 -/* 8876D8 80241318 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8876DC 8024131C 8C450038 */ lw $a1, 0x38($v0) -/* 8876E0 80241320 8C470040 */ lw $a3, 0x40($v0) -/* 8876E4 80241324 44061000 */ mfc1 $a2, $f2 -/* 8876E8 80241328 0C01BFBC */ jal func_8006FEF0 -/* 8876EC 8024132C 24040002 */ addiu $a0, $zero, 2 -/* 8876F0 80241330 8FBF0018 */ lw $ra, 0x18($sp) -/* 8876F4 80241334 24020002 */ addiu $v0, $zero, 2 -/* 8876F8 80241338 03E00008 */ jr $ra -/* 8876FC 8024133C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80241340_887700.s b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80241340_887700.s deleted file mode 100644 index 7edb6fd5c4..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80241340_887700.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241340_887700 -/* 887700 80241340 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 887704 80241344 AFBF0018 */ sw $ra, 0x18($sp) -/* 887708 80241348 0C00EAD2 */ jal get_npc_safe -/* 88770C 8024134C 2404FFFC */ addiu $a0, $zero, -4 -/* 887710 80241350 3C0141F0 */ lui $at, 0x41f0 -/* 887714 80241354 44810000 */ mtc1 $at, $f0 -/* 887718 80241358 C442003C */ lwc1 $f2, 0x3c($v0) -/* 88771C 8024135C 46001080 */ add.s $f2, $f2, $f0 -/* 887720 80241360 E7A00010 */ swc1 $f0, 0x10($sp) -/* 887724 80241364 8C450038 */ lw $a1, 0x38($v0) -/* 887728 80241368 8C470040 */ lw $a3, 0x40($v0) -/* 88772C 8024136C 44061000 */ mfc1 $a2, $f2 -/* 887730 80241370 0C01BFBC */ jal func_8006FEF0 -/* 887734 80241374 24040004 */ addiu $a0, $zero, 4 -/* 887738 80241378 8FBF0018 */ lw $ra, 0x18($sp) -/* 88773C 8024137C 24020002 */ addiu $v0, $zero, 2 -/* 887740 80241380 03E00008 */ jr $ra -/* 887744 80241384 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241894_88A464.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241894_88A464.s deleted file mode 100644 index 561938ddb3..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241894_88A464.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241894_88A464 -/* 88A464 80241894 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 88A468 80241898 AFBF0018 */ sw $ra, 0x18($sp) -/* 88A46C 8024189C 0C00EAD2 */ jal get_npc_safe -/* 88A470 802418A0 2404FFFC */ addiu $a0, $zero, -4 -/* 88A474 802418A4 3C0141F0 */ lui $at, 0x41f0 -/* 88A478 802418A8 44810000 */ mtc1 $at, $f0 -/* 88A47C 802418AC C442003C */ lwc1 $f2, 0x3c($v0) -/* 88A480 802418B0 46001080 */ add.s $f2, $f2, $f0 -/* 88A484 802418B4 E7A00010 */ swc1 $f0, 0x10($sp) -/* 88A488 802418B8 8C450038 */ lw $a1, 0x38($v0) -/* 88A48C 802418BC 8C470040 */ lw $a3, 0x40($v0) -/* 88A490 802418C0 44061000 */ mfc1 $a2, $f2 -/* 88A494 802418C4 0C01BFBC */ jal func_8006FEF0 -/* 88A498 802418C8 24040002 */ addiu $a0, $zero, 2 -/* 88A49C 802418CC 8FBF0018 */ lw $ra, 0x18($sp) -/* 88A4A0 802418D0 24020002 */ addiu $v0, $zero, 2 -/* 88A4A4 802418D4 03E00008 */ jr $ra -/* 88A4A8 802418D8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_802418DC_88A4AC.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_802418DC_88A4AC.s deleted file mode 100644 index bbeb9a29ba..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_802418DC_88A4AC.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802418DC_88A4AC -/* 88A4AC 802418DC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 88A4B0 802418E0 AFBF0018 */ sw $ra, 0x18($sp) -/* 88A4B4 802418E4 0C00EAD2 */ jal get_npc_safe -/* 88A4B8 802418E8 2404FFFC */ addiu $a0, $zero, -4 -/* 88A4BC 802418EC 3C0141F0 */ lui $at, 0x41f0 -/* 88A4C0 802418F0 44810000 */ mtc1 $at, $f0 -/* 88A4C4 802418F4 C442003C */ lwc1 $f2, 0x3c($v0) -/* 88A4C8 802418F8 46001080 */ add.s $f2, $f2, $f0 -/* 88A4CC 802418FC E7A00010 */ swc1 $f0, 0x10($sp) -/* 88A4D0 80241900 8C450038 */ lw $a1, 0x38($v0) -/* 88A4D4 80241904 8C470040 */ lw $a3, 0x40($v0) -/* 88A4D8 80241908 44061000 */ mfc1 $a2, $f2 -/* 88A4DC 8024190C 0C01BFBC */ jal func_8006FEF0 -/* 88A4E0 80241910 24040004 */ addiu $a0, $zero, 4 -/* 88A4E4 80241914 8FBF0018 */ lw $ra, 0x18($sp) -/* 88A4E8 80241918 24020002 */ addiu $v0, $zero, 2 -/* 88A4EC 8024191C 03E00008 */ jr $ra -/* 88A4F0 80241920 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240CA8_8936C8.s b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240CA8_8936C8.s deleted file mode 100644 index e80cbf9862..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240CA8_8936C8.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CA8_8936C8 -/* 8936C8 80240CA8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8936CC 80240CAC AFBF0018 */ sw $ra, 0x18($sp) -/* 8936D0 80240CB0 0C00EAD2 */ jal get_npc_safe -/* 8936D4 80240CB4 2404FFFC */ addiu $a0, $zero, -4 -/* 8936D8 80240CB8 3C0141F0 */ lui $at, 0x41f0 -/* 8936DC 80240CBC 44810000 */ mtc1 $at, $f0 -/* 8936E0 80240CC0 C442003C */ lwc1 $f2, 0x3c($v0) -/* 8936E4 80240CC4 46001080 */ add.s $f2, $f2, $f0 -/* 8936E8 80240CC8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8936EC 80240CCC 8C450038 */ lw $a1, 0x38($v0) -/* 8936F0 80240CD0 8C470040 */ lw $a3, 0x40($v0) -/* 8936F4 80240CD4 44061000 */ mfc1 $a2, $f2 -/* 8936F8 80240CD8 0C01BFBC */ jal func_8006FEF0 -/* 8936FC 80240CDC 24040002 */ addiu $a0, $zero, 2 -/* 893700 80240CE0 8FBF0018 */ lw $ra, 0x18($sp) -/* 893704 80240CE4 24020002 */ addiu $v0, $zero, 2 -/* 893708 80240CE8 03E00008 */ jr $ra -/* 89370C 80240CEC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240CF0_893710.s b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240CF0_893710.s deleted file mode 100644 index 13e3c428cb..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240CF0_893710.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CF0_893710 -/* 893710 80240CF0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 893714 80240CF4 AFBF0018 */ sw $ra, 0x18($sp) -/* 893718 80240CF8 0C00EAD2 */ jal get_npc_safe -/* 89371C 80240CFC 2404FFFC */ addiu $a0, $zero, -4 -/* 893720 80240D00 3C0141F0 */ lui $at, 0x41f0 -/* 893724 80240D04 44810000 */ mtc1 $at, $f0 -/* 893728 80240D08 C442003C */ lwc1 $f2, 0x3c($v0) -/* 89372C 80240D0C 46001080 */ add.s $f2, $f2, $f0 -/* 893730 80240D10 E7A00010 */ swc1 $f0, 0x10($sp) -/* 893734 80240D14 8C450038 */ lw $a1, 0x38($v0) -/* 893738 80240D18 8C470040 */ lw $a3, 0x40($v0) -/* 89373C 80240D1C 44061000 */ mfc1 $a2, $f2 -/* 893740 80240D20 0C01BFBC */ jal func_8006FEF0 -/* 893744 80240D24 24040004 */ addiu $a0, $zero, 4 -/* 893748 80240D28 8FBF0018 */ lw $ra, 0x18($sp) -/* 89374C 80240D2C 24020002 */ addiu $v0, $zero, 2 -/* 893750 80240D30 03E00008 */ jr $ra -/* 893754 80240D34 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80241268_898848.s b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80241268_898848.s deleted file mode 100644 index 2a62360939..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80241268_898848.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241268_898848 -/* 898848 80241268 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 89884C 8024126C AFBF0018 */ sw $ra, 0x18($sp) -/* 898850 80241270 0C00EAD2 */ jal get_npc_safe -/* 898854 80241274 2404FFFC */ addiu $a0, $zero, -4 -/* 898858 80241278 3C0141F0 */ lui $at, 0x41f0 -/* 89885C 8024127C 44810000 */ mtc1 $at, $f0 -/* 898860 80241280 C442003C */ lwc1 $f2, 0x3c($v0) -/* 898864 80241284 46001080 */ add.s $f2, $f2, $f0 -/* 898868 80241288 E7A00010 */ swc1 $f0, 0x10($sp) -/* 89886C 8024128C 8C450038 */ lw $a1, 0x38($v0) -/* 898870 80241290 8C470040 */ lw $a3, 0x40($v0) -/* 898874 80241294 44061000 */ mfc1 $a2, $f2 -/* 898878 80241298 0C01BFBC */ jal func_8006FEF0 -/* 89887C 8024129C 24040002 */ addiu $a0, $zero, 2 -/* 898880 802412A0 8FBF0018 */ lw $ra, 0x18($sp) -/* 898884 802412A4 24020002 */ addiu $v0, $zero, 2 -/* 898888 802412A8 03E00008 */ jr $ra -/* 89888C 802412AC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_802412B0_898890.s b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_802412B0_898890.s deleted file mode 100644 index 93ac2d7a1b..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_802412B0_898890.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412B0_898890 -/* 898890 802412B0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 898894 802412B4 AFBF0018 */ sw $ra, 0x18($sp) -/* 898898 802412B8 0C00EAD2 */ jal get_npc_safe -/* 89889C 802412BC 2404FFFC */ addiu $a0, $zero, -4 -/* 8988A0 802412C0 3C0141F0 */ lui $at, 0x41f0 -/* 8988A4 802412C4 44810000 */ mtc1 $at, $f0 -/* 8988A8 802412C8 C442003C */ lwc1 $f2, 0x3c($v0) -/* 8988AC 802412CC 46001080 */ add.s $f2, $f2, $f0 -/* 8988B0 802412D0 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8988B4 802412D4 8C450038 */ lw $a1, 0x38($v0) -/* 8988B8 802412D8 8C470040 */ lw $a3, 0x40($v0) -/* 8988BC 802412DC 44061000 */ mfc1 $a2, $f2 -/* 8988C0 802412E0 0C01BFBC */ jal func_8006FEF0 -/* 8988C4 802412E4 24040004 */ addiu $a0, $zero, 4 -/* 8988C8 802412E8 8FBF0018 */ lw $ra, 0x18($sp) -/* 8988CC 802412EC 24020002 */ addiu $v0, $zero, 2 -/* 8988D0 802412F0 03E00008 */ jr $ra -/* 8988D4 802412F4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80242AD8_9AAEC8.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80242AD8_9AAEC8.s deleted file mode 100644 index 9c52bca49b..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80242AD8_9AAEC8.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242AD8_9AAEC8 -/* 9AAEC8 80242AD8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9AAECC 80242ADC AFB3001C */ sw $s3, 0x1c($sp) -/* 9AAED0 80242AE0 0080982D */ daddu $s3, $a0, $zero -/* 9AAED4 80242AE4 AFBF0020 */ sw $ra, 0x20($sp) -/* 9AAED8 80242AE8 AFB20018 */ sw $s2, 0x18($sp) -/* 9AAEDC 80242AEC AFB10014 */ sw $s1, 0x14($sp) -/* 9AAEE0 80242AF0 AFB00010 */ sw $s0, 0x10($sp) -/* 9AAEE4 80242AF4 8E720148 */ lw $s2, 0x148($s3) -/* 9AAEE8 80242AF8 86440008 */ lh $a0, 8($s2) -/* 9AAEEC 80242AFC 0C00EABB */ jal get_npc_unsafe -/* 9AAEF0 80242B00 00A0802D */ daddu $s0, $a1, $zero -/* 9AAEF4 80242B04 0040882D */ daddu $s1, $v0, $zero -/* 9AAEF8 80242B08 C6420080 */ lwc1 $f2, 0x80($s2) -/* 9AAEFC 80242B0C 468010A0 */ cvt.s.w $f2, $f2 -/* 9AAF00 80242B10 460010A1 */ cvt.d.s $f2, $f2 -/* 9AAF04 80242B14 C6400084 */ lwc1 $f0, 0x84($s2) -/* 9AAF08 80242B18 46800020 */ cvt.s.w $f0, $f0 -/* 9AAF0C 80242B1C 46000021 */ cvt.d.s $f0, $f0 -/* 9AAF10 80242B20 3C014059 */ lui $at, 0x4059 -/* 9AAF14 80242B24 44812800 */ mtc1 $at, $f5 -/* 9AAF18 80242B28 44802000 */ mtc1 $zero, $f4 -/* 9AAF1C 80242B2C 8E4200CC */ lw $v0, 0xcc($s2) -/* 9AAF20 80242B30 C62C0038 */ lwc1 $f12, 0x38($s1) -/* 9AAF24 80242B34 C62E0040 */ lwc1 $f14, 0x40($s1) -/* 9AAF28 80242B38 46241083 */ div.d $f2, $f2, $f4 -/* 9AAF2C 80242B3C 462010A0 */ cvt.s.d $f2, $f2 -/* 9AAF30 80242B40 46240003 */ div.d $f0, $f0, $f4 -/* 9AAF34 80242B44 8C420020 */ lw $v0, 0x20($v0) -/* 9AAF38 80242B48 46200020 */ cvt.s.d $f0, $f0 -/* 9AAF3C 80242B4C E622001C */ swc1 $f2, 0x1c($s1) -/* 9AAF40 80242B50 E6200014 */ swc1 $f0, 0x14($s1) -/* 9AAF44 80242B54 AE220028 */ sw $v0, 0x28($s1) -/* 9AAF48 80242B58 C6000018 */ lwc1 $f0, 0x18($s0) -/* 9AAF4C 80242B5C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9AAF50 80242B60 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9AAF54 80242B64 E6200018 */ swc1 $f0, 0x18($s1) -/* 9AAF58 80242B68 8C460028 */ lw $a2, 0x28($v0) -/* 9AAF5C 80242B6C 0C00A720 */ jal atan2 -/* 9AAF60 80242B70 8C470030 */ lw $a3, 0x30($v0) -/* 9AAF64 80242B74 E620000C */ swc1 $f0, 0xc($s1) -/* 9AAF68 80242B78 8E420018 */ lw $v0, 0x18($s2) -/* 9AAF6C 80242B7C AE400074 */ sw $zero, 0x74($s2) -/* 9AAF70 80242B80 9442002A */ lhu $v0, 0x2a($v0) -/* 9AAF74 80242B84 30420002 */ andi $v0, $v0, 2 -/* 9AAF78 80242B88 10400005 */ beqz $v0, .L80242BA0 -/* 9AAF7C 80242B8C 24020003 */ addiu $v0, $zero, 3 -/* 9AAF80 80242B90 A622008E */ sh $v0, 0x8e($s1) -/* 9AAF84 80242B94 2402000D */ addiu $v0, $zero, 0xd -/* 9AAF88 80242B98 08090AFC */ j .L80242BF0 -/* 9AAF8C 80242B9C AE620070 */ sw $v0, 0x70($s3) -.L80242BA0: -/* 9AAF90 80242BA0 24030001 */ addiu $v1, $zero, 1 -/* 9AAF94 80242BA4 2402000E */ addiu $v0, $zero, 0xe -/* 9AAF98 80242BA8 A623008E */ sh $v1, 0x8e($s1) -/* 9AAF9C 80242BAC AE620070 */ sw $v0, 0x70($s3) -/* 9AAFA0 80242BB0 C6200038 */ lwc1 $f0, 0x38($s1) -/* 9AAFA4 80242BB4 4600018D */ trunc.w.s $f6, $f0 -/* 9AAFA8 80242BB8 44023000 */ mfc1 $v0, $f6 -/* 9AAFAC 80242BBC 00000000 */ nop -/* 9AAFB0 80242BC0 A6420010 */ sh $v0, 0x10($s2) -/* 9AAFB4 80242BC4 C620003C */ lwc1 $f0, 0x3c($s1) -/* 9AAFB8 80242BC8 4600018D */ trunc.w.s $f6, $f0 -/* 9AAFBC 80242BCC 44023000 */ mfc1 $v0, $f6 -/* 9AAFC0 80242BD0 00000000 */ nop -/* 9AAFC4 80242BD4 A6420012 */ sh $v0, 0x12($s2) -/* 9AAFC8 80242BD8 C6200040 */ lwc1 $f0, 0x40($s1) -/* 9AAFCC 80242BDC A2430007 */ sb $v1, 7($s2) -/* 9AAFD0 80242BE0 4600018D */ trunc.w.s $f6, $f0 -/* 9AAFD4 80242BE4 44023000 */ mfc1 $v0, $f6 -/* 9AAFD8 80242BE8 00000000 */ nop -/* 9AAFDC 80242BEC A6420014 */ sh $v0, 0x14($s2) -.L80242BF0: -/* 9AAFE0 80242BF0 8FBF0020 */ lw $ra, 0x20($sp) -/* 9AAFE4 80242BF4 8FB3001C */ lw $s3, 0x1c($sp) -/* 9AAFE8 80242BF8 8FB20018 */ lw $s2, 0x18($sp) -/* 9AAFEC 80242BFC 8FB10014 */ lw $s1, 0x14($sp) -/* 9AAFF0 80242C00 8FB00010 */ lw $s0, 0x10($sp) -/* 9AAFF4 80242C04 03E00008 */ jr $ra -/* 9AAFF8 80242C08 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243124_9AB514.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243124_9AB514.s index df803c7283..1d718d9aac 100644 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243124_9AB514.s +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243124_9AB514.s @@ -110,7 +110,7 @@ glabel L80243290_9AB680 glabel L802432A8_9AB698 /* 9AB698 802432A8 0280202D */ daddu $a0, $s4, $zero /* 9AB69C 802432AC 0200282D */ daddu $a1, $s0, $zero -/* 9AB6A0 802432B0 0C090AB6 */ jal func_80242AD8_9AAEC8 +/* 9AB6A0 802432B0 0C090AB6 */ jal trd_04_UnkNpcAIFunc14 /* 9AB6A4 802432B4 0260302D */ daddu $a2, $s3, $zero /* 9AB6A8 802432B8 08090CBB */ j .L802432EC /* 9AB6AC 802432BC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802417A4_9B8124.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802417A4_9B8124.s deleted file mode 100644 index b2314519dc..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802417A4_9B8124.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802417A4_9B8124 -/* 9B8124 802417A4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9B8128 802417A8 AFB3001C */ sw $s3, 0x1c($sp) -/* 9B812C 802417AC 0080982D */ daddu $s3, $a0, $zero -/* 9B8130 802417B0 AFBF0020 */ sw $ra, 0x20($sp) -/* 9B8134 802417B4 AFB20018 */ sw $s2, 0x18($sp) -/* 9B8138 802417B8 AFB10014 */ sw $s1, 0x14($sp) -/* 9B813C 802417BC AFB00010 */ sw $s0, 0x10($sp) -/* 9B8140 802417C0 8E720148 */ lw $s2, 0x148($s3) -/* 9B8144 802417C4 86440008 */ lh $a0, 8($s2) -/* 9B8148 802417C8 0C00EABB */ jal get_npc_unsafe -/* 9B814C 802417CC 00A0802D */ daddu $s0, $a1, $zero -/* 9B8150 802417D0 0040882D */ daddu $s1, $v0, $zero -/* 9B8154 802417D4 C6420080 */ lwc1 $f2, 0x80($s2) -/* 9B8158 802417D8 468010A0 */ cvt.s.w $f2, $f2 -/* 9B815C 802417DC 460010A1 */ cvt.d.s $f2, $f2 -/* 9B8160 802417E0 C6400084 */ lwc1 $f0, 0x84($s2) -/* 9B8164 802417E4 46800020 */ cvt.s.w $f0, $f0 -/* 9B8168 802417E8 46000021 */ cvt.d.s $f0, $f0 -/* 9B816C 802417EC 3C014059 */ lui $at, 0x4059 -/* 9B8170 802417F0 44812800 */ mtc1 $at, $f5 -/* 9B8174 802417F4 44802000 */ mtc1 $zero, $f4 -/* 9B8178 802417F8 8E4200CC */ lw $v0, 0xcc($s2) -/* 9B817C 802417FC C62C0038 */ lwc1 $f12, 0x38($s1) -/* 9B8180 80241800 C62E0040 */ lwc1 $f14, 0x40($s1) -/* 9B8184 80241804 46241083 */ div.d $f2, $f2, $f4 -/* 9B8188 80241808 462010A0 */ cvt.s.d $f2, $f2 -/* 9B818C 8024180C 46240003 */ div.d $f0, $f0, $f4 -/* 9B8190 80241810 8C420020 */ lw $v0, 0x20($v0) -/* 9B8194 80241814 46200020 */ cvt.s.d $f0, $f0 -/* 9B8198 80241818 E622001C */ swc1 $f2, 0x1c($s1) -/* 9B819C 8024181C E6200014 */ swc1 $f0, 0x14($s1) -/* 9B81A0 80241820 AE220028 */ sw $v0, 0x28($s1) -/* 9B81A4 80241824 C6000018 */ lwc1 $f0, 0x18($s0) -/* 9B81A8 80241828 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9B81AC 8024182C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9B81B0 80241830 E6200018 */ swc1 $f0, 0x18($s1) -/* 9B81B4 80241834 8C460028 */ lw $a2, 0x28($v0) -/* 9B81B8 80241838 0C00A720 */ jal atan2 -/* 9B81BC 8024183C 8C470030 */ lw $a3, 0x30($v0) -/* 9B81C0 80241840 E620000C */ swc1 $f0, 0xc($s1) -/* 9B81C4 80241844 8E420018 */ lw $v0, 0x18($s2) -/* 9B81C8 80241848 AE400074 */ sw $zero, 0x74($s2) -/* 9B81CC 8024184C 9442002A */ lhu $v0, 0x2a($v0) -/* 9B81D0 80241850 30420002 */ andi $v0, $v0, 2 -/* 9B81D4 80241854 10400005 */ beqz $v0, .L8024186C -/* 9B81D8 80241858 24020003 */ addiu $v0, $zero, 3 -/* 9B81DC 8024185C A622008E */ sh $v0, 0x8e($s1) -/* 9B81E0 80241860 2402000D */ addiu $v0, $zero, 0xd -/* 9B81E4 80241864 0809062F */ j .L802418BC -/* 9B81E8 80241868 AE620070 */ sw $v0, 0x70($s3) -.L8024186C: -/* 9B81EC 8024186C 24030001 */ addiu $v1, $zero, 1 -/* 9B81F0 80241870 2402000E */ addiu $v0, $zero, 0xe -/* 9B81F4 80241874 A623008E */ sh $v1, 0x8e($s1) -/* 9B81F8 80241878 AE620070 */ sw $v0, 0x70($s3) -/* 9B81FC 8024187C C6200038 */ lwc1 $f0, 0x38($s1) -/* 9B8200 80241880 4600018D */ trunc.w.s $f6, $f0 -/* 9B8204 80241884 44023000 */ mfc1 $v0, $f6 -/* 9B8208 80241888 00000000 */ nop -/* 9B820C 8024188C A6420010 */ sh $v0, 0x10($s2) -/* 9B8210 80241890 C620003C */ lwc1 $f0, 0x3c($s1) -/* 9B8214 80241894 4600018D */ trunc.w.s $f6, $f0 -/* 9B8218 80241898 44023000 */ mfc1 $v0, $f6 -/* 9B821C 8024189C 00000000 */ nop -/* 9B8220 802418A0 A6420012 */ sh $v0, 0x12($s2) -/* 9B8224 802418A4 C6200040 */ lwc1 $f0, 0x40($s1) -/* 9B8228 802418A8 A2430007 */ sb $v1, 7($s2) -/* 9B822C 802418AC 4600018D */ trunc.w.s $f6, $f0 -/* 9B8230 802418B0 44023000 */ mfc1 $v0, $f6 -/* 9B8234 802418B4 00000000 */ nop -/* 9B8238 802418B8 A6420014 */ sh $v0, 0x14($s2) -.L802418BC: -/* 9B823C 802418BC 8FBF0020 */ lw $ra, 0x20($sp) -/* 9B8240 802418C0 8FB3001C */ lw $s3, 0x1c($sp) -/* 9B8244 802418C4 8FB20018 */ lw $s2, 0x18($sp) -/* 9B8248 802418C8 8FB10014 */ lw $s1, 0x14($sp) -/* 9B824C 802418CC 8FB00010 */ lw $s0, 0x10($sp) -/* 9B8250 802418D0 03E00008 */ jr $ra -/* 9B8254 802418D4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241DF0_9B8770.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241DF0_9B8770.s index f8062caa1d..4663d0eb4c 100644 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241DF0_9B8770.s +++ b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241DF0_9B8770.s @@ -110,7 +110,7 @@ glabel L80241F5C_9B88DC glabel L80241F74_9B88F4 /* 9B88F4 80241F74 0280202D */ daddu $a0, $s4, $zero /* 9B88F8 80241F78 0200282D */ daddu $a1, $s0, $zero -/* 9B88FC 80241F7C 0C0905E9 */ jal func_802417A4_9B8124 +/* 9B88FC 80241F7C 0C0905E9 */ jal trd_07_UnkNpcAIFunc14 /* 9B8900 80241F80 0260302D */ daddu $a2, $s3, $zero /* 9B8904 80241F84 080907EE */ j .L80241FB8 /* 9B8908 80241F88 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/partners/func_800EA5B8.s b/asm/nonmatchings/world/partners/func_800EA5B8.s deleted file mode 100644 index db7b9bc0e6..0000000000 --- a/asm/nonmatchings/world/partners/func_800EA5B8.s +++ /dev/null @@ -1,10 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_800EA5B8 -/* 83A68 800EA5B8 3C03FDFF */ lui $v1, 0xfdff -/* 83A6C 800EA5BC 8C820000 */ lw $v0, ($a0) -/* 83A70 800EA5C0 346387FF */ ori $v1, $v1, 0x87ff -/* 83A74 800EA5C4 00431024 */ and $v0, $v0, $v1 -/* 83A78 800EA5C8 03E00008 */ jr $ra -/* 83A7C 800EA5CC AC820000 */ sw $v0, ($a0) diff --git a/asm/nonmatchings/world/partners/func_800EA6A8.s b/asm/nonmatchings/world/partners/func_800EA6A8.s deleted file mode 100644 index ac44bb4191..0000000000 --- a/asm/nonmatchings/world/partners/func_800EA6A8.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_800EA6A8 -/* 83B58 800EA6A8 3C048011 */ lui $a0, %hi(D_8010CFD0) -/* 83B5C 800EA6AC 8C84CFD0 */ lw $a0, %lo(D_8010CFD0)($a0) -/* 83B60 800EA6B0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 83B64 800EA6B4 AFBF0010 */ sw $ra, 0x10($sp) -/* 83B68 800EA6B8 0C00E228 */ jal free_npc_by_index -/* 83B6C 800EA6BC 00000000 */ nop -/* 83B70 800EA6C0 8FBF0010 */ lw $ra, 0x10($sp) -/* 83B74 800EA6C4 03E00008 */ jr $ra -/* 83B78 800EA6C8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/partners/func_800EE994.s b/asm/nonmatchings/world/partners/func_800EE994.s deleted file mode 100644 index d0c0e8ee5e..0000000000 --- a/asm/nonmatchings/world/partners/func_800EE994.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_800EE994 -/* 87E44 800EE994 8C830000 */ lw $v1, ($a0) -/* 87E48 800EE998 3C020001 */ lui $v0, 1 -/* 87E4C 800EE99C AC820080 */ sw $v0, 0x80($a0) -/* 87E50 800EE9A0 0000102D */ daddu $v0, $zero, $zero -/* 87E54 800EE9A4 3C018011 */ lui $at, %hi(D_8010CFC8) -/* 87E58 800EE9A8 A420CFC8 */ sh $zero, %lo(D_8010CFC8)($at) -/* 87E5C 800EE9AC 34630100 */ ori $v1, $v1, 0x100 -/* 87E60 800EE9B0 03E00008 */ jr $ra -/* 87E64 800EE9B4 AC830000 */ sw $v1, ($a0) diff --git a/asm/nonmatchings/world/partners/func_800EECC4.s b/asm/nonmatchings/world/partners/func_800EECC4.s deleted file mode 100644 index 1de3febce1..0000000000 --- a/asm/nonmatchings/world/partners/func_800EECC4.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_800EECC4 -/* 88174 800EECC4 8C830000 */ lw $v1, ($a0) -/* 88178 800EECC8 3C020001 */ lui $v0, 1 -/* 8817C 800EECCC AC820080 */ sw $v0, 0x80($a0) -/* 88180 800EECD0 0000102D */ daddu $v0, $zero, $zero -/* 88184 800EECD4 3C018011 */ lui $at, %hi(D_8010CFC8) -/* 88188 800EECD8 A420CFC8 */ sh $zero, %lo(D_8010CFC8)($at) -/* 8818C 800EECDC 34630100 */ ori $v1, $v1, 0x100 -/* 88190 800EECE0 03E00008 */ jr $ra -/* 88194 800EECE4 AC830000 */ sw $v1, ($a0) diff --git a/asm/nonmatchings/world/partners/func_800EF300.s b/asm/nonmatchings/world/partners/func_800EF300.s deleted file mode 100644 index d9853c68d5..0000000000 --- a/asm/nonmatchings/world/partners/func_800EF300.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_800EF300 -/* 887B0 800EF300 24020028 */ addiu $v0, $zero, 0x28 -/* 887B4 800EF304 3C018011 */ lui $at, %hi(D_8010CFC8) -/* 887B8 800EF308 A422CFC8 */ sh $v0, %lo(D_8010CFC8)($at) -/* 887BC 800EF30C 03E00008 */ jr $ra -/* 887C0 800EF310 00000000 */ nop diff --git a/asm/nonmatchings/world/partners/func_800EF314.s b/asm/nonmatchings/world/partners/func_800EF314.s deleted file mode 100644 index a3452c7ebc..0000000000 --- a/asm/nonmatchings/world/partners/func_800EF314.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_800EF314 -/* 887C4 800EF314 24020032 */ addiu $v0, $zero, 0x32 -/* 887C8 800EF318 3C018011 */ lui $at, %hi(D_8010CFC8) -/* 887CC 800EF31C A422CFC8 */ sh $v0, %lo(D_8010CFC8)($at) -/* 887D0 800EF320 03E00008 */ jr $ra -/* 887D4 800EF324 00000000 */ nop diff --git a/asm/nonmatchings/world/partners/func_800EF3C0.s b/asm/nonmatchings/world/partners/func_800EF3C0.s deleted file mode 100644 index 39ff6bb177..0000000000 --- a/asm/nonmatchings/world/partners/func_800EF3C0.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_800EF3C0 -/* 88870 800EF3C0 3C018010 */ lui $at, %hi(D_800F8024) -/* 88874 800EF3C4 AC248024 */ sw $a0, %lo(D_800F8024)($at) -/* 88878 800EF3C8 3C018010 */ lui $at, %hi(D_800F8028) -/* 8887C 800EF3CC 03E00008 */ jr $ra -/* 88880 800EF3D0 AC258028 */ sw $a1, %lo(D_800F8028)($at) diff --git a/asm/nonmatchings/world/partners/func_800EF3D4.s b/asm/nonmatchings/world/partners/func_800EF3D4.s deleted file mode 100644 index 774aaf5d10..0000000000 --- a/asm/nonmatchings/world/partners/func_800EF3D4.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_800EF3D4 -/* 88884 800EF3D4 3C018011 */ lui $at, %hi(D_8010CFCA) -/* 88888 800EF3D8 A424CFCA */ sh $a0, %lo(D_8010CFCA)($at) -/* 8888C 800EF3DC 03E00008 */ jr $ra -/* 88890 800EF3E0 00000000 */ nop diff --git a/asm/nonmatchings/world/partners/func_800EF3E4.s b/asm/nonmatchings/world/partners/func_800EF3E4.s deleted file mode 100644 index 1d6762502e..0000000000 --- a/asm/nonmatchings/world/partners/func_800EF3E4.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_800EF3E4 -/* 88894 800EF3E4 2402000F */ addiu $v0, $zero, 0xf -/* 88898 800EF3E8 3C018011 */ lui $at, %hi(D_8010CFC8) -/* 8889C 800EF3EC A422CFC8 */ sh $v0, %lo(D_8010CFC8)($at) -/* 888A0 800EF3F0 2402000A */ addiu $v0, $zero, 0xa -/* 888A4 800EF3F4 3C018011 */ lui $at, %hi(D_8010CFCA) -/* 888A8 800EF3F8 A420CFCA */ sh $zero, %lo(D_8010CFCA)($at) -/* 888AC 800EF3FC 3C018010 */ lui $at, %hi(D_800F802C) -/* 888B0 800EF400 AC22802C */ sw $v0, %lo(D_800F802C)($at) -/* 888B4 800EF404 3C018011 */ lui $at, %hi(D_8010CFCE) -/* 888B8 800EF408 A420CFCE */ sh $zero, %lo(D_8010CFCE)($at) -/* 888BC 800EF40C 03E00008 */ jr $ra -/* 888C0 800EF410 00000000 */ nop diff --git a/asm/nonmatchings/world/partners/func_800EF414.s b/asm/nonmatchings/world/partners/func_800EF414.s deleted file mode 100644 index 241083b871..0000000000 --- a/asm/nonmatchings/world/partners/func_800EF414.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_800EF414 -/* 888C4 800EF414 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 888C8 800EF418 AFBF0010 */ sw $ra, 0x10($sp) -/* 888CC 800EF41C 0C03BCF0 */ jal func_800EF3C0 -/* 888D0 800EF420 00000000 */ nop -/* 888D4 800EF424 8FBF0010 */ lw $ra, 0x10($sp) -/* 888D8 800EF428 24020014 */ addiu $v0, $zero, 0x14 -/* 888DC 800EF42C 3C018011 */ lui $at, %hi(D_8010CFC8) -/* 888E0 800EF430 A422CFC8 */ sh $v0, %lo(D_8010CFC8)($at) -/* 888E4 800EF434 03E00008 */ jr $ra -/* 888E8 800EF438 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/partners/func_800EF43C.s b/asm/nonmatchings/world/partners/func_800EF43C.s deleted file mode 100644 index 2a17e18ecf..0000000000 --- a/asm/nonmatchings/world/partners/func_800EF43C.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_800EF43C -/* 888EC 800EF43C 3C018011 */ lui $at, %hi(D_8010CFC8) -/* 888F0 800EF440 A420CFC8 */ sh $zero, %lo(D_8010CFC8)($at) -/* 888F4 800EF444 3C018011 */ lui $at, %hi(D_8010CFCA) -/* 888F8 800EF448 A420CFCA */ sh $zero, %lo(D_8010CFCA)($at) -/* 888FC 800EF44C 3C018011 */ lui $at, %hi(D_8010CFCE) -/* 88900 800EF450 A420CFCE */ sh $zero, %lo(D_8010CFCE)($at) -/* 88904 800EF454 03E00008 */ jr $ra -/* 88908 800EF458 00000000 */ nop diff --git a/asm/nonmatchings/world/partners/func_800EF600.s b/asm/nonmatchings/world/partners/func_800EF600.s deleted file mode 100644 index 110396174c..0000000000 --- a/asm/nonmatchings/world/partners/func_800EF600.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_800EF600 -/* 88AB0 800EF600 3C038011 */ lui $v1, %hi(D_8010EBB0) -/* 88AB4 800EF604 2463EBB0 */ addiu $v1, $v1, %lo(D_8010EBB0) -/* 88AB8 800EF608 90620014 */ lbu $v0, 0x14($v1) -/* 88ABC 800EF60C 2442FFFF */ addiu $v0, $v0, -1 -/* 88AC0 800EF610 A0620014 */ sb $v0, 0x14($v1) -/* 88AC4 800EF614 00021600 */ sll $v0, $v0, 0x18 -/* 88AC8 800EF618 04420001 */ bltzl $v0, .L800EF620 -/* 88ACC 800EF61C A0600014 */ sb $zero, 0x14($v1) -.L800EF620: -/* 88AD0 800EF620 03E00008 */ jr $ra -/* 88AD4 800EF624 00000000 */ nop diff --git a/asm/nonmatchings/world/partners/func_800EF628.s b/asm/nonmatchings/world/partners/func_800EF628.s deleted file mode 100644 index 8fcc4c4e26..0000000000 --- a/asm/nonmatchings/world/partners/func_800EF628.s +++ /dev/null @@ -1,10 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_800EF628 -/* 88AD8 800EF628 3C038011 */ lui $v1, %hi(D_8010EBB0) -/* 88ADC 800EF62C 2463EBB0 */ addiu $v1, $v1, %lo(D_8010EBB0) -/* 88AE0 800EF630 90620014 */ lbu $v0, 0x14($v1) -/* 88AE4 800EF634 24420001 */ addiu $v0, $v0, 1 -/* 88AE8 800EF638 03E00008 */ jr $ra -/* 88AEC 800EF63C A0620014 */ sb $v0, 0x14($v1) diff --git a/asm/nonmatchings/world/partners/is_current_partner_flying.s b/asm/nonmatchings/world/partners/is_current_partner_flying.s deleted file mode 100644 index abd2e92c3f..0000000000 --- a/asm/nonmatchings/world/partners/is_current_partner_flying.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel is_current_partner_flying -/* 83A54 800EA5A4 3C028011 */ lui $v0, %hi(D_8010CFEC) -/* 83A58 800EA5A8 8C42CFEC */ lw $v0, %lo(D_8010CFEC)($v0) -/* 83A5C 800EA5AC 8C42000C */ lw $v0, 0xc($v0) -/* 83A60 800EA5B0 03E00008 */ jr $ra -/* 83A64 800EA5B4 2C420001 */ sltiu $v0, $v0, 1 diff --git a/asm/nonmatchings/world/partners/partner_get_ride_script.s b/asm/nonmatchings/world/partners/partner_get_ride_script.s deleted file mode 100644 index 650d2fceb0..0000000000 --- a/asm/nonmatchings/world/partners/partner_get_ride_script.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel partner_get_ride_script -/* 84AE8 800EB638 3C028011 */ lui $v0, %hi(D_8010CFEC) -/* 84AEC 800EB63C 8C42CFEC */ lw $v0, %lo(D_8010CFEC)($v0) -/* 84AF0 800EB640 10400003 */ beqz $v0, .L800EB650 -/* 84AF4 800EB644 00000000 */ nop -/* 84AF8 800EB648 03E00008 */ jr $ra -/* 84AFC 800EB64C 8C42003C */ lw $v0, 0x3c($v0) -.L800EB650: -/* 84B00 800EB650 03E00008 */ jr $ra -/* 84B04 800EB654 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/partners/reset_parter_tether_distance.s b/asm/nonmatchings/world/partners/reset_parter_tether_distance.s deleted file mode 100644 index 32adf8e611..0000000000 --- a/asm/nonmatchings/world/partners/reset_parter_tether_distance.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel reset_parter_tether_distance -/* 88854 800EF3A4 3C014220 */ lui $at, 0x4220 -/* 88858 800EF3A8 44810000 */ mtc1 $at, $f0 -/* 8885C 800EF3AC 00000000 */ nop -/* 88860 800EF3B0 3C018011 */ lui $at, %hi(D_8010CFC0) -/* 88864 800EF3B4 E420CFC0 */ swc1 $f0, %lo(D_8010CFC0)($at) -/* 88868 800EF3B8 03E00008 */ jr $ra -/* 8886C 800EF3BC 00000000 */ nop diff --git a/asm/nonmatchings/world/partners/set_parter_tether_distance.s b/asm/nonmatchings/world/partners/set_parter_tether_distance.s deleted file mode 100644 index 1d8bb3f831..0000000000 --- a/asm/nonmatchings/world/partners/set_parter_tether_distance.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel set_parter_tether_distance -/* 88844 800EF394 3C018011 */ lui $at, %hi(D_8010CFC0) -/* 88848 800EF398 E42CCFC0 */ swc1 $f12, %lo(D_8010CFC0)($at) -/* 8884C 800EF39C 03E00008 */ jr $ra -/* 88850 800EF3A0 00000000 */ nop diff --git a/configure.py b/configure.py index aafa502212..cce1c6ad6e 100755 --- a/configure.py +++ b/configure.py @@ -350,7 +350,7 @@ async def main(): n.newline() n.rule("link", - command="${cross}ld -T undefined_syms.txt -T undefined_syms_auto.txt -T undefined_funcs_auto.txt -Map $builddir/$target.map --no-check-sections -T $in -o $out", + command="${cross}ld -T undefined_syms.txt -T undefined_syms_auto.txt -T undefined_funcs_auto.txt -T dead_syms.txt -Map $builddir/$target.map --no-check-sections -T $in -o $out", description="link $out") n.newline() diff --git a/dead_syms.txt b/dead_syms.txt new file mode 100644 index 0000000000..4032789213 --- /dev/null +++ b/dead_syms.txt @@ -0,0 +1,2 @@ +func_8002AF70 = 0x8002AF70; +D_800FFC90 = 0x800FFC90; diff --git a/include/enums.h b/include/enums.h index d435615d22..ffa24e808a 100644 --- a/include/enums.h +++ b/include/enums.h @@ -286,7 +286,7 @@ typedef UNK_TYPE SoundId; #define SoundId_MOLE_THROW 0x000003E8 #define SoundId_CLOSE_SHELL 0x000002FF #define SoundId_OPEN_SHELL 0x000003D4 -#define SoundId_THROW 0x3FA +#define SoundId_THROW 0x000003FA #define SoundId_BOW_VANISH 0x0000200E #define SoundId_BOW_APPEAR 0x0000200F #define SoundId_CANNON1 0x00002016 diff --git a/include/functions.h b/include/functions.h index 5171b55754..3e38f84afd 100644 --- a/include/functions.h +++ b/include/functions.h @@ -85,6 +85,8 @@ s32 collision_main_above(void); s32 do_lateral_collision(s32, PlayerStatus*, f32*, f32*, f32*, f32, f32); Npc* make_disguise_npc(s32 peachDisguise); +s32 partner_player_can_pause(void); + void func_80027088(s32); void func_8006F8F0(f32, f32, f32); @@ -168,7 +170,9 @@ s32 is_current_partner_flying(void); void func_800ED5D0(Npc* partner); void clear_partner_move_history(Npc* partner); -s32 set_parter_tether_distance(f32); +void set_background_color_blend(u8 r, u8 g, u8 b, u8 a); + +void set_parter_tether_distance(f32); s32 does_script_exist(s32 id); s32 does_script_exist_by_ref(ScriptInstance* script); ScriptInstance* start_script(Bytecode* initialLine, s32 priority, s32 initialState); @@ -252,4 +256,10 @@ void func_80070B50(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4); void func_800718D0(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5); void func_80070BB0(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5); +// Dead functions: +f32 func_8002AF70(f32 startX, f32 startZ, f32 endX, f32 endZ); // atan2 +Npc* func_8003E4BC(NpcId npcId); // get_npc_safe +Npc* func_8003E534(NpcId npcId); // get_npc_safe +void func_80075170(s32, f32, f32, f32, f32); // func_8006FEF0 + #endif diff --git a/include/macros.h b/include/macros.h index f593a22294..700c15ac6b 100644 --- a/include/macros.h +++ b/include/macros.h @@ -23,12 +23,6 @@ #define PANIC() ASSERT(0) #define STATIC_ASSERT(condition) enum { static_assert_fail = 1/(!!(condition)) } // Causes division by zero ("not integer constant") if false -#define BATTLE_STATUS (&gBattleStatus) -#define PLAYER_ACTOR (gBattleStatus.playerActor) -#define GAME_STATUS (*gGameStatusPtr) -#define PLAYER_STATUS (&gPlayerStatus) -#define UI_STATUS (&gUIStatus) -#define PLAYER_DATA (&gPlayerData) #define CAM(id) (&gCameras[id]) #define CURRENT_CAM (&gCameras[gCurrentCameraID]) #define GET_MAP_ENTRY(cfg, idx) (&(*cfg->entryList)[idx]) diff --git a/include/variables.h b/include/variables.h index a5d2bbf9ce..a2ee096b6a 100644 --- a/include/variables.h +++ b/include/variables.h @@ -81,6 +81,7 @@ extern s32 D_80151310; extern s16* D_80151328; extern s32 D_8010C92C; +extern s16 D_8010CD00; extern s16 D_8010CD10; extern s16 D_8010CD12; extern s32 D_8010CD20; @@ -324,4 +325,7 @@ extern UNK_PTR D_800F7B94; extern s32 D_802C05CC; +// Dead code +extern PlayerStatus* D_800FFC90; // gPlayerStatusPtr + #endif diff --git a/src/battle/area_dig/6DE3F0.c b/src/battle/area_dig/6DE3F0.c index 12ecf7ac94..784dedace2 100644 --- a/src/battle/area_dig/6DE3F0.c +++ b/src/battle/area_dig/6DE3F0.c @@ -7,7 +7,7 @@ extern s32 D_8008F0A0; ApiStatus func_80218644_6DE404(ScriptInstance* script, s32 isInitialCall) { - BattleStatus* battleStatus = BATTLE_STATUS; + BattleStatus* battleStatus = &gBattleStatus; Actor* player = battleStatus->playerActor; SelectableTarget* selectableTarget; diff --git a/src/battle/area_dig/6DE4A0.c b/src/battle/area_dig/6DE4A0.c index 232f488c50..ea26692482 100644 --- a/src/battle/area_dig/6DE4A0.c +++ b/src/battle/area_dig/6DE4A0.c @@ -6,7 +6,7 @@ extern s32 D_8008F2E4; extern s32 D_8008FC44; ApiStatus func_802186E0_6DE4A0(ScriptInstance* script, s32 isInitialCall) { - BattleStatus* battleStatus = BATTLE_STATUS; + BattleStatus* battleStatus = &gBattleStatus; Actor* player = battleStatus->playerActor; SelectableTarget* selectableTarget; @@ -27,7 +27,7 @@ ApiStatus func_802186E0_6DE4A0(ScriptInstance* script, s32 isInitialCall) { // Reordering near the beginning #ifdef NON_MATCHING ApiStatus func_80218770_6DE530(ScriptInstance* script, s32 isInitialCall) { - BattleStatus* battleStatus = BATTLE_STATUS; + BattleStatus* battleStatus = &gBattleStatus; Actor* partner = battleStatus->partnerActor; SelectableTarget* selectableTarget; @@ -49,8 +49,8 @@ INCLUDE_ASM(s32, "battle/area_dig/6DE4A0", func_80218770_6DE530); #endif ApiStatus func_802187F0_6DE5B0(ScriptInstance* script, s32 isInitialCall) { - BattleStatus* battleStatus = BATTLE_STATUS; - PlayerData* playerData = PLAYER_DATA; + BattleStatus* battleStatus = &gBattleStatus; + PlayerData* playerData = &gPlayerData; s32 selectedItemID; Actor* player = battleStatus->playerActor; SelectableTarget* selectableTarget; diff --git a/src/battle/area_hos/47F0B0.c b/src/battle/area_hos/47F0B0.c index e7f56cac0c..7d4984694c 100644 --- a/src/battle/area_hos/47F0B0.c +++ b/src/battle/area_hos/47F0B0.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_hos ApiStatus func_80218000_47F0B0(ScriptInstance* script, s32 isInitialCall) { - PlayerData* playerData = PLAYER_DATA; + PlayerData* playerData = &gPlayerData; playerData->currentPartner = PartnerID_GOOMBARIO; return ApiStatus_DONE2; diff --git a/src/battle/area_kpa2/69F320.c b/src/battle/area_kpa2/69F320.c index 220d99aea4..1249888a65 100644 --- a/src/battle/area_kpa2/69F320.c +++ b/src/battle/area_kpa2/69F320.c @@ -46,7 +46,9 @@ INCLUDE_ASM(s32, "battle/area_kpa2/69F320", func_80219CD4_6A0ED4); INCLUDE_ASM(s32, "battle/area_kpa2/69F320", func_80219D44_6A0F44); -INCLUDE_ASM(s32, "battle/area_kpa2/69F320", func_80219F5C_6A115C); +#define NAMESPACE dup_b_area_kpa2 +#include "common/GetItemEntityPosition.inc.c" +#define NAMESPACE b_area_kpa2 INCLUDE_ASM(s32, "battle/area_kpa2/69F320", func_80219FFC_6A11FC); @@ -78,7 +80,7 @@ INCLUDE_ASM(s32, "battle/area_kpa2/69F320", func_8021B08C_6A228C); INCLUDE_ASM(s32, "battle/area_kpa2/69F320", func_8021B0FC_6A22FC); -INCLUDE_ASM(s32, "battle/area_kpa2/69F320", func_8021B314_6A2514); +#include "common/GetItemEntityPosition.inc.c" INCLUDE_ASM(s32, "battle/area_kpa2/69F320", func_8021B3B4_6A25B4); diff --git a/src/battle/area_omo/512E50.c b/src/battle/area_omo/512E50.c index b7f126aefd..d787066e41 100644 --- a/src/battle/area_omo/512E50.c +++ b/src/battle/area_omo/512E50.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "battle/area_omo/512E50", func_80218880_512E50); -INCLUDE_ASM(s32, "battle/area_omo/512E50", func_80218A98_513068); +#include "common/GetItemEntityPosition.inc.c" INCLUDE_ASM(s32, "battle/area_omo/512E50", func_80218B38_513108); diff --git a/src/battle/area_trd_part_3/4CF1B0.c b/src/battle/area_trd_part_3/4CF1B0.c index 95afc3757f..d3fa64ecb8 100644 --- a/src/battle/area_trd_part_3/4CF1B0.c +++ b/src/battle/area_trd_part_3/4CF1B0.c @@ -43,7 +43,7 @@ ApiStatus func_80218130_4CF2E0(ScriptInstance* script, s32 isInitialCall) { } ApiStatus func_80218158_4CF308(ScriptInstance* script, s32 isInitialCall) { - BattleStatus* battleStatus = BATTLE_STATUS; + BattleStatus* battleStatus = &gBattleStatus; battleStatus->unk_4C = 0; battleStatus->unk_5C = 0; @@ -52,7 +52,7 @@ ApiStatus func_80218158_4CF308(ScriptInstance* script, s32 isInitialCall) { } ApiStatus func_80218170_4CF320(ScriptInstance* script, s32 isInitialCall) { - BattleStatus* battleStatus = BATTLE_STATUS; + BattleStatus* battleStatus = &gBattleStatus; if (isInitialCall) { script->functionTemp[0].s = 10; @@ -69,7 +69,7 @@ ApiStatus func_80218170_4CF320(ScriptInstance* script, s32 isInitialCall) { } ApiStatus func_802181B4_4CF364(ScriptInstance* script, s32 isInitialCall) { - BattleStatus* battleStatus = BATTLE_STATUS; + BattleStatus* battleStatus = &gBattleStatus; if (isInitialCall) { script->functionTemp[0].s = 10; @@ -86,7 +86,7 @@ ApiStatus func_802181B4_4CF364(ScriptInstance* script, s32 isInitialCall) { } ApiStatus func_802181F8_4CF3A8(ScriptInstance* script, s32 isInitialCall) { - PlayerData* playerData = PLAYER_DATA; + PlayerData* playerData = &gPlayerData; playerData->specialBarsFilled += 32; diff --git a/src/battle/item/coconut/lib.c b/src/battle/item/coconut/lib.c index 76ef47fe79..20388625d4 100644 --- a/src/battle/item/coconut/lib.c +++ b/src/battle/item/coconut/lib.c @@ -5,8 +5,8 @@ void* D_80108A64; // an image // Returns time to sleep for on $x. ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) { - BattleStatus* battleStatus = BATTLE_STATUS; - Actor* player = PLAYER_ACTOR; + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = gBattleStatus.playerActor; s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; f32 posX; f32 posY = player->currentPos.y + player->size.y; @@ -50,7 +50,7 @@ ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) { } ApiStatus N(GiveRefundCleanup)(ScriptInstance* script, s32 isInitialCall) { - BattleStatus* battleStatus = BATTLE_STATUS; + BattleStatus* battleStatus = &gBattleStatus; s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; if (heroes_is_ability_active(battleStatus->playerActor, Ability_REFUND) && sellValue > 0) { diff --git a/src/battle/partner/twink_714CF0.c b/src/battle/partner/twink_714CF0.c index a3c8f8ee37..557e3e6804 100644 --- a/src/battle/partner/twink_714CF0.c +++ b/src/battle/partner/twink_714CF0.c @@ -1,7 +1,7 @@ #include "common.h" ApiStatus func_80238000_714CF0(ScriptInstance* script, s32 isInitialCall) { - BattleStatus* battleStatus = BATTLE_STATUS; + BattleStatus* battleStatus = &gBattleStatus; if (battleStatus->flags2 & 0x40) { script->varTable[0] = 1; diff --git a/src/code_102610_len_2330.c b/src/code_102610_len_2330.c index f187d929e0..b45eb27e05 100644 --- a/src/code_102610_len_2330.c +++ b/src/code_102610_len_2330.c @@ -41,7 +41,7 @@ void func_802E117C(void) { } void save_game_at_player_position(void) { - GameStatus* gameStatus = GAME_STATUS; + GameStatus* gameStatus = *gGameStatusPtr; gameStatus->savedPos.x = gPlayerStatusPtr->position.x; gameStatus->savedPos.y = gPlayerStatusPtr->position.y; diff --git a/src/code_109660_len_1270.c b/src/code_109660_len_1270.c index 39815a8feb..3c39195271 100644 --- a/src/code_109660_len_1270.c +++ b/src/code_109660_len_1270.c @@ -137,7 +137,7 @@ void func_802E89F8(Entity* entity) { void func_802E8A58(Entity* entity) { struct802E89B0* temp = entity->dataBuf; - if (temp->unk_0C == GAME_STATUS->entryID) { + if (temp->unk_0C == (*gGameStatusPtr)->entryID) { switch (temp->unk_04) { case 0: if (gCollisionStatus.currentFloor > 0) { diff --git a/src/code_10A8D0.c b/src/code_10A8D0.c index 1fca3dcf42..3a2024d5d2 100644 --- a/src/code_10A8D0.c +++ b/src/code_10A8D0.c @@ -1,7 +1,7 @@ #include "common.h" void func_802E9050(Entity* entity) { - PlayerStatus* playerStatus = PLAYER_STATUS; + PlayerStatus* playerStatus = &gPlayerStatus; f32 val = fabsf(clamp_angle(180.0f - entity->rotation.y) - clamp_angle(atan2(entity->position.x, entity->position.z, playerStatus->position.x, playerStatus->position.z))); diff --git a/src/code_111f0_len_860.c b/src/code_111f0_len_860.c index 43c6873c66..6cb717ba48 100644 --- a/src/code_111f0_len_860.c +++ b/src/code_111f0_len_860.c @@ -38,7 +38,7 @@ void func_80035E54(void) { INCLUDE_ASM(s32, "code_111f0_len_860", func_80035EEC); void func_800360FC(void) { - GameStatus* gameStatus = GAME_STATUS; + GameStatus* gameStatus = *gGameStatusPtr; if (gameStatus->loadMenuState == 2) { draw_status_ui(); @@ -46,7 +46,7 @@ void func_800360FC(void) { } void func_80036130(void) { - GameStatus* gameStatus = GAME_STATUS; + GameStatus* gameStatus = *gGameStatusPtr; gMapTransitionAlpha = 0x00; D_800A0942 = 0x14; diff --git a/src/code_11a50_len_7a0.c b/src/code_11a50_len_7a0.c index 020a34d1f2..fc70e4d6d8 100644 --- a/src/code_11a50_len_7a0.c +++ b/src/code_11a50_len_7a0.c @@ -4,12 +4,12 @@ void begin_state_intro(void) { s8 unk_A8; - GAME_STATUS->loadMenuState = 0; + (*gGameStatusPtr)->loadMenuState = 0; set_curtain_scale_goal(1.0f); set_curtain_fade_goal(0.3f); - unk_A8 = GAME_STATUS->unk_A8; + unk_A8 = (*gGameStatusPtr)->unk_A8; switch (unk_A8) { case 0: intro_logos_set_fade_alpha(0); @@ -24,7 +24,7 @@ void begin_state_intro(void) { D_800A0964 = 0; do { - GameStatus* gameStatus = GAME_STATUS; + GameStatus* gameStatus = *gGameStatusPtr; // hos_05 (Star Sanctuary) gameStatus->areaID = 5; @@ -47,7 +47,7 @@ void begin_state_intro(void) { // FIXME: regalloc issues do { - GameStatus* gameStatus = GAME_STATUS; + GameStatus* gameStatus = *gGameStatusPtr; // hos_04 (Outside the Sanctuary) gameStatus->areaID = 5; @@ -61,7 +61,7 @@ void begin_state_intro(void) { intro_logos_set_fade_color(0xD0); { - GameStatus* gameStatus = GAME_STATUS; + GameStatus* gameStatus = *gGameStatusPtr; u8* mystery = &D_800779B0; gameStatus->unk_A8 = -1; diff --git a/src/code_13480_len_3f0.c b/src/code_13480_len_3f0.c index 9dd4dbb6a1..dcb95459b5 100644 --- a/src/code_13480_len_3f0.c +++ b/src/code_13480_len_3f0.c @@ -4,14 +4,14 @@ void init_demo_data(void) { GameStatus* gameStatus; GameStatus* gameStatus2; - if (GAME_STATUS->demoState == 0) { - GAME_STATUS->nextDemoScene = 0; - GAME_STATUS->demoState = 1; + if ((*gGameStatusPtr)->demoState == 0) { + (*gGameStatusPtr)->nextDemoScene = 0; + (*gGameStatusPtr)->demoState = 1; } - gameStatus = GAME_STATUS; - GAME_STATUS->demoStickX = 0; - gameStatus2 = GAME_STATUS; + gameStatus = *gGameStatusPtr; + (*gGameStatusPtr)->demoStickX = 0; + gameStatus2 = *gGameStatusPtr; gameStatus->demoButtonInput = 0; gameStatus2->demoStickY = 0; diff --git a/src/code_1370_len_7d0.c b/src/code_1370_len_7d0.c index 99129707d6..c093759f03 100644 --- a/src/code_1370_len_7d0.c +++ b/src/code_1370_len_7d0.c @@ -30,7 +30,7 @@ void boot_main(void) { crash_create_monitor(); func_80025C60(); nuGfxInitEX2(); - GAME_STATUS->contBitPattern = nuContInit(); + (*gGameStatusPtr)->contBitPattern = nuContInit(); func_8002D160(); func_802B2000(); func_802B203C(); diff --git a/src/code_138CC0.c b/src/code_138CC0.c index e2c6235fd7..1c5edaee16 100644 --- a/src/code_138CC0.c +++ b/src/code_138CC0.c @@ -41,7 +41,7 @@ s32 pause_badges_comparator(s16* a, s16* b) { } s32 pause_badges_count_all(void) { - PlayerData* playerData = PLAYER_DATA; + PlayerData* playerData = &gPlayerData; s32 i; pause_sort_item_list(playerData->badges, ARRAY_COUNT(playerData->badges), pause_badges_comparator); @@ -56,7 +56,7 @@ s32 pause_badges_count_all(void) { } s32 pause_badges_count_equipped(void) { - PlayerData* playerData = PLAYER_DATA; + PlayerData* playerData = &gPlayerData; s32 i; pause_sort_item_list(playerData->equippedBadges, ARRAY_COUNT(playerData->equippedBadges), &pause_badges_comparator); diff --git a/src/code_16c8e0.c b/src/code_16c8e0.c index bb688d2a56..6fadd16b6e 100644 --- a/src/code_16c8e0.c +++ b/src/code_16c8e0.c @@ -134,7 +134,7 @@ Script D_80280EB8 = SCRIPT({ }); void get_dpad_input_radial(f32* angle, f32* magnitude) { - BattleStatus* battleStatus = BATTLE_STATUS; + BattleStatus* battleStatus = &gBattleStatus; u16 currentButtonsDown; f32 stickX; f32 stickY; diff --git a/src/code_17FEB0.c b/src/code_17FEB0.c index c733d2ba9c..f26170c5ed 100644 --- a/src/code_17FEB0.c +++ b/src/code_17FEB0.c @@ -1,7 +1,7 @@ #include "common.h" HitResult calc_item_check_hit(void) { - BattleStatus* battleStatus = BATTLE_STATUS; + BattleStatus* battleStatus = &gBattleStatus; ActorMovePos* movePos = &battleStatus->playerActor->movePos; ActorID actorID = battleStatus->currentTargetID; s8 currentTargetPartS8; @@ -40,7 +40,7 @@ HitResult calc_item_check_hit(void) { INCLUDE_ASM(s32, "code_17FEB0", calc_item_damage_enemy); ApiStatus ItemDamageEnemy(ScriptInstance* script, s32 isInitialCall) { - BattleStatus* battleStatus = BATTLE_STATUS; + BattleStatus* battleStatus = &gBattleStatus; Bytecode* args = script->ptrReadPos; s32 itemDamageOut = *args++; s32 a5; @@ -65,21 +65,21 @@ ApiStatus ItemDamageEnemy(ScriptInstance* script, s32 isInitialCall) { } if (a5 & 0x40) { - BATTLE_STATUS->flags1 |= 0x40; + gBattleStatus.flags1 |= 0x40; } else { - BATTLE_STATUS->flags1 &= ~0x40; + gBattleStatus.flags1 &= ~0x40; } if (a5 & 0x200) { - BATTLE_STATUS->flags1 |= 0x200; + gBattleStatus.flags1 |= 0x200; } else { - BATTLE_STATUS->flags1 &= ~0x200; + gBattleStatus.flags1 &= ~0x200; } if (a5 & 0x80) { - BATTLE_STATUS->flags1 |= 0x80; + gBattleStatus.flags1 |= 0x80; } else { - BATTLE_STATUS->flags1 &= ~0x80; + gBattleStatus.flags1 &= ~0x80; } actor = get_actor(script->owner1.actorID); @@ -107,7 +107,7 @@ ApiStatus ItemDamageEnemy(ScriptInstance* script, s32 isInitialCall) { } ApiStatus ItemAfflictEnemy(ScriptInstance* script, s32 isInitialCall) { - BattleStatus* battleStatus = BATTLE_STATUS; + BattleStatus* battleStatus = &gBattleStatus; Bytecode* args = script->ptrReadPos; s32 itemDamageOut = *args++; s32 a5; @@ -133,21 +133,21 @@ ApiStatus ItemAfflictEnemy(ScriptInstance* script, s32 isInitialCall) { } if (a5 & 0x40) { - BATTLE_STATUS->flags1 |= 0x40; + gBattleStatus.flags1 |= 0x40; } else { - BATTLE_STATUS->flags1 &= ~0x40; + gBattleStatus.flags1 &= ~0x40; } if (a5 & 0x200) { - BATTLE_STATUS->flags1 |= 0x200; + gBattleStatus.flags1 |= 0x200; } else { - BATTLE_STATUS->flags1 &= ~0x200; + gBattleStatus.flags1 &= ~0x200; } if (a5 & 0x80) { - BATTLE_STATUS->flags1 |= 0x80; + gBattleStatus.flags1 |= 0x80; } else { - BATTLE_STATUS->flags1 &= ~0x80; + gBattleStatus.flags1 &= ~0x80; } actor = get_actor(script->owner1.actorID); @@ -175,7 +175,7 @@ ApiStatus ItemAfflictEnemy(ScriptInstance* script, s32 isInitialCall) { } ApiStatus func_80252B3C(ScriptInstance* script, s32 isInitialCall) { - BattleStatus* battleStatus = BATTLE_STATUS; + BattleStatus* battleStatus = &gBattleStatus; Bytecode* args = script->ptrReadPos; s32 itemDamageOut = *args++; s32 a5; @@ -200,21 +200,21 @@ ApiStatus func_80252B3C(ScriptInstance* script, s32 isInitialCall) { } if (a5 & 0x40) { - BATTLE_STATUS->flags1 |= 0x40; + gBattleStatus.flags1 |= 0x40; } else { - BATTLE_STATUS->flags1 &= ~0x40; + gBattleStatus.flags1 &= ~0x40; } if (a5 & 0x200) { - BATTLE_STATUS->flags1 |= 0x200; + gBattleStatus.flags1 |= 0x200; } else { - BATTLE_STATUS->flags1 &= ~0x200; + gBattleStatus.flags1 &= ~0x200; } if (a5 & 0x80) { - BATTLE_STATUS->flags1 |= 0x80; + gBattleStatus.flags1 |= 0x80; } else { - BATTLE_STATUS->flags1 &= ~0x80; + gBattleStatus.flags1 &= ~0x80; } actor = get_actor(script->owner1.actorID); @@ -242,7 +242,7 @@ ApiStatus func_80252B3C(ScriptInstance* script, s32 isInitialCall) { } ApiStatus ItemCheckHit(ScriptInstance* script, s32 isInitialCall) { - BattleStatus* battleStatus = BATTLE_STATUS; + BattleStatus* battleStatus = &gBattleStatus; Bytecode* args = script->ptrReadPos; s32 itemDamageOut = *args++; s32 a5; @@ -267,21 +267,21 @@ ApiStatus ItemCheckHit(ScriptInstance* script, s32 isInitialCall) { } if (a5 & 0x40) { - BATTLE_STATUS->flags1 |= 0x40; + gBattleStatus.flags1 |= 0x40; } else { - BATTLE_STATUS->flags1 &= ~0x40; + gBattleStatus.flags1 &= ~0x40; } if (a5 & 0x200) { - BATTLE_STATUS->flags1 |= 0x200; + gBattleStatus.flags1 |= 0x200; } else { - BATTLE_STATUS->flags1 &= ~0x200; + gBattleStatus.flags1 &= ~0x200; } if (a5 & 0x80) { - BATTLE_STATUS->flags1 |= 0x80; + gBattleStatus.flags1 |= 0x80; } else { - BATTLE_STATUS->flags1 &= ~0x80; + gBattleStatus.flags1 &= ~0x80; } actor = get_actor(script->owner1.actorID); diff --git a/src/code_181810.c b/src/code_181810.c index ab8c5f6daa..295e724cc3 100644 --- a/src/code_181810.c +++ b/src/code_181810.c @@ -154,7 +154,7 @@ ApiStatus OverrideBattleDmaDest(ScriptInstance* script, s32 isInitialCall) { INCLUDE_ASM(s32, "code_181810", LoadBattleDmaData); ApiStatus func_802536A8(ScriptInstance* script, s32 isInitialCall) { - BattleStatus* battleStatus = BATTLE_STATUS; + BattleStatus* battleStatus = &gBattleStatus; BattleStatus* battleStatus2 = battleStatus; if (get_variable(script, *script->ptrReadPos) != 0) { @@ -170,7 +170,7 @@ ApiStatus func_802536A8(ScriptInstance* script, s32 isInitialCall) { ApiStatus func_80253734(ScriptInstance* script, s32 isInitialCall) { - BattleStatus* battleStatus = BATTLE_STATUS; + BattleStatus* battleStatus = &gBattleStatus; s32 val = get_variable(script, *script->ptrReadPos); switch (val) { @@ -326,7 +326,7 @@ ApiStatus MakeStatusField(ScriptInstance* script, s32 isInitialCall) { } s32 is_actor_hp_bar_visible(Actor* actor) { - BattleStatus* battleStatus = BATTLE_STATUS; + BattleStatus* battleStatus = &gBattleStatus; s32 flags; if (is_ability_active(Ability_PEEKABOO)) { @@ -341,7 +341,7 @@ s32 is_actor_hp_bar_visible(Actor* actor) { } s32 is_actortype_hpbar_visible(s32 actorType) { - BattleStatus* battleStatus = BATTLE_STATUS; + BattleStatus* battleStatus = &gBattleStatus; s32 idx; if (is_ability_active(Ability_PEEKABOO)) { diff --git a/src/code_190B20.c b/src/code_190B20.c index 8c21baa56f..611d7d3080 100644 --- a/src/code_190B20.c +++ b/src/code_190B20.c @@ -1398,7 +1398,7 @@ void func_80071A50(s32, f32 x, f32 y, f32 z, f32 scale /* maybe */, s32); void func_80071C30(s32, f32 x, f32 y, f32 z, f32 scale /* maybe */, s32); void remove_player_buffs(PlayerBuff buffs) { - BattleStatus* battleStatus = BATTLE_STATUS; + BattleStatus* battleStatus = &gBattleStatus; Actor* player = battleStatus->playerActor; Actor* partner = battleStatus->partnerActor; ActorPart* playerPartsTable = player->partsTable; @@ -1455,7 +1455,7 @@ void remove_player_buffs(PlayerBuff buffs) { } if ((partner != NULL) && (buffs & 0x10000)) { - BattleStatus* bs = BATTLE_STATUS; + BattleStatus* bs = &gBattleStatus; partner->isGlowing = FALSE; bs->flags1 &= ~0x40000000; diff --git a/src/code_1967B0.c b/src/code_1967B0.c index 173626fbbd..28207b3d72 100644 --- a/src/code_1967B0.c +++ b/src/code_1967B0.c @@ -5,7 +5,7 @@ INCLUDE_ASM(s32, "code_1967B0", LoadItemScript); INCLUDE_ASM(s32, "code_1967B0", LoadFreeItemScript); ApiStatus LoadMoveScript(ScriptInstance* script, s32 isInitialCall) { - BattleStatus* battleStatus = BATTLE_STATUS; + BattleStatus* battleStatus = &gBattleStatus; s32* moveScript = gMoveScriptTable[battleStatus->selectedMoveID]; dma_copy(moveScript[0], moveScript[1], moveScript[2]); diff --git a/src/code_197F40.c b/src/code_197F40.c index b7e4abfcad..646135d29c 100644 --- a/src/code_197F40.c +++ b/src/code_197F40.c @@ -4,7 +4,7 @@ extern s8 D_8029FBD4; s32 count_targets(Actor* actor, s32 targetHomeIndex, s32 targetSelectionFlags) { - BattleStatus* battleStatus = BATTLE_STATUS; + BattleStatus* battleStatus = &gBattleStatus; battleStatus->targetHomeIndex = targetHomeIndex; battleStatus->currentTargetListFlags = targetSelectionFlags; @@ -81,7 +81,7 @@ void set_actor_home_position(ActorID actorID, f32 x, f32 y, f32 z) { Actor* get_actor(ActorID actorID) { Actor* ret = NULL; - BattleStatus* battleStatus = BATTLE_STATUS; + BattleStatus* battleStatus = &gBattleStatus; s32 idFlag = actorID & 0x700; u32 idIdx = (u8)actorID; @@ -1077,8 +1077,8 @@ ApiStatus AddPartDispOffset(ScriptInstance* script, s32 isInitialCall) { } ApiStatus func_8026BF48(ScriptInstance* script, s32 isInitialCall) { - BattleStatus* battleStatus = BATTLE_STATUS; - BattleStatus* battleStatus2 = BATTLE_STATUS; + BattleStatus* battleStatus = &gBattleStatus; + BattleStatus* battleStatus2 = &gBattleStatus; Bytecode* args = script->ptrReadPos; if (get_variable(script, *args++) != 0) { @@ -1502,10 +1502,10 @@ ApiStatus SetBattleFlagBits2(ScriptInstance* script, s32 isInitialCall) { Bytecode a0 = *args++; if (get_variable(script, *args)) { - BattleStatus* battleStatus = BATTLE_STATUS; + BattleStatus* battleStatus = &gBattleStatus; battleStatus->flags2 |= a0; } else { - BattleStatus* battleStatus = BATTLE_STATUS; + BattleStatus* battleStatus = &gBattleStatus; battleStatus->flags2 &= ~a0; } @@ -2001,7 +2001,7 @@ ApiStatus SetBattleInputMask(ScriptInstance* script, s32 isInitialCall) { ApiStatus SetBattleInputButtons(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - BattleStatus* battleStatus = BATTLE_STATUS; + BattleStatus* battleStatus = &gBattleStatus; s32 currentButtonsDown = *args++; s32 currentButtonsPressed = *args++; s32 currentButtonsHeld = *args; @@ -2150,7 +2150,7 @@ INCLUDE_ASM(s32, "code_197F40", CreatePartShadow); INCLUDE_ASM(s32, "code_197F40", RemovePartShadow); ApiStatus func_8026F60C(ScriptInstance* script, s32 isInitialCall) { - BATTLE_STATUS->unk_8D = get_variable(script, *script->ptrReadPos); + gBattleStatus.unk_8D = get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } diff --git a/src/code_19FAF0.c b/src/code_19FAF0.c index 86d80fc6e6..92afcd76e7 100644 --- a/src/code_19FAF0.c +++ b/src/code_19FAF0.c @@ -37,7 +37,7 @@ INCLUDE_ASM(s32, "code_19FAF0", calc_player_damage_enemy); INCLUDE_ASM(s32, "code_19FAF0", dispatch_damage_event_player); void dispatch_damage_event_player_0(s32 damageAmount, Event event) { - BattleStatus* battleStatus = BATTLE_STATUS; + BattleStatus* battleStatus = &gBattleStatus; battleStatus->currentAttackElement = Element_END; battleStatus->unk_19A = 0; diff --git a/src/code_1A5830.c b/src/code_1A5830.c index a99f6d3d8e..4ee9443047 100644 --- a/src/code_1A5830.c +++ b/src/code_1A5830.c @@ -773,7 +773,7 @@ ApiStatus EnableActorGlow(ScriptInstance* script, s32 isInitialCall) { ApiStatus WasStatusInflicted(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - BattleStatus* battleStatus = BATTLE_STATUS; + BattleStatus* battleStatus = &gBattleStatus; s32 outVal; get_variable(script, *args++); diff --git a/src/code_1a1f0_len_5390.c b/src/code_1a1f0_len_5390.c index 811767a243..284269216d 100644 --- a/src/code_1a1f0_len_5390.c +++ b/src/code_1a1f0_len_5390.c @@ -240,7 +240,7 @@ s32 draw_encounters_post_battle(void) { void update_encounters_conversation(void) { EncounterStatus* encounter = &gCurrentEncounter; - PlayerStatus* playerStatus = PLAYER_STATUS; + PlayerStatus* playerStatus = &gPlayerStatus; Enemy* currentEnemy; s32 flag; diff --git a/src/code_1b40_len_20b0.c b/src/code_1b40_len_20b0.c index d01e2c4e33..ecb3a406f9 100644 --- a/src/code_1b40_len_20b0.c +++ b/src/code_1b40_len_20b0.c @@ -46,19 +46,19 @@ void load_engine_data(void) { dma_copy(D_0010CC10, D_0010CC10_end, D_802EB3D0); // new segment required to fix this D_8009A650[0] = 0; phi_s0 = *gGameStatusPtr; - GAME_STATUS->unk_79 = 0; - GAME_STATUS->musicEnabled = 1; + (*gGameStatusPtr)->unk_79 = 0; + (*gGameStatusPtr)->musicEnabled = 1; phi_s0->unk_148 = 0; - GAME_STATUS->unk_7C = 1; - GAME_STATUS->unk_A8 = -1; - GAME_STATUS->unk_AA = 0; - GAME_STATUS->unk_81 = 0; - GAME_STATUS->unk_82 = -8; - GAME_STATUS->unk_83 = 4; + (*gGameStatusPtr)->unk_7C = 1; + (*gGameStatusPtr)->unk_A8 = -1; + (*gGameStatusPtr)->unk_AA = 0; + (*gGameStatusPtr)->unk_81 = 0; + (*gGameStatusPtr)->unk_82 = -8; + (*gGameStatusPtr)->unk_83 = 4; D_8009A5D8 = 0; - GAME_STATUS->unk_75 = GAME_STATUS->unk_13C = 0; + (*gGameStatusPtr)->unk_75 = (*gGameStatusPtr)->unk_13C = 0; D_80074021 = 5; - GAME_STATUS->unk_168 = 0; + (*gGameStatusPtr)->unk_168 = 0; fio_init_flash(); func_80028838(); general_heap_create(); @@ -93,7 +93,7 @@ void load_engine_data(void) { curtains_init(); poll_rumble(); - phi_s0 = GAME_STATUS; + phi_s0 = *gGameStatusPtr; for (i = 0; i < 4; i++) { phi_s0->unk_50[i] = 3; phi_s0->unk_48[i] = 0xC; diff --git a/src/code_1f580_len_1940.c b/src/code_1f580_len_1940.c index 2b2d452dd5..587251830a 100644 --- a/src/code_1f580_len_1940.c +++ b/src/code_1f580_len_1940.c @@ -46,7 +46,7 @@ ApiStatus MakeNpcs(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - make_npcs(get_variable(script, *args++), GAME_STATUS->mapID, get_variable(script, *args++)); + make_npcs(get_variable(script, *args++), (*gGameStatusPtr)->mapID, get_variable(script, *args++)); script->functionTemp[0].s = 1; break; case 1: diff --git a/src/code_3251D0.c b/src/code_3251D0.c index 6e3e155b4b..bfd1e75839 100644 --- a/src/code_3251D0.c +++ b/src/code_3251D0.c @@ -33,8 +33,8 @@ ApiStatus func_802BD26C(ScriptInstance* script, s32 isInitialCall) { } ApiStatus func_802BD32C(ScriptInstance* script, s32 isInitialCall) { - PlayerData* playerData = PLAYER_DATA; - PlayerData* playerData2 = PLAYER_DATA; + PlayerData* playerData = &gPlayerData; + PlayerData* playerData2 = &gPlayerData; s32 newHP = playerData->curHP + get_variable(script, *script->ptrReadPos); if (newHP > playerData->curMaxHP) { @@ -50,8 +50,8 @@ ApiStatus func_802BD32C(ScriptInstance* script, s32 isInitialCall) { } ApiStatus func_802BD388(ScriptInstance* script, s32 isInitialCall) { - PlayerData* playerData = PLAYER_DATA; - PlayerData* playerData2 = PLAYER_DATA; + PlayerData* playerData = &gPlayerData; + PlayerData* playerData2 = &gPlayerData; s32 newFP = playerData->curFP + get_variable(script, *script->ptrReadPos); if (newFP > playerData->curMaxFP) { diff --git a/src/code_341d0.c b/src/code_341d0.c index 79d0ef027f..e1e7d08a95 100644 --- a/src/code_341d0.c +++ b/src/code_341d0.c @@ -50,7 +50,7 @@ s32 render_effects(void) { curEffectInst = &D_800B4398[0]; for (i = 0; i < ARRAY_COUNT(D_800B4398); i++) { if ((curEffectInst[i] != NULL) && (curEffectInst[i]->flags & 1) && (curEffectInst[i]->flags & 8)) { - if (GAME_STATUS->isBattle) { + if ((*gGameStatusPtr)->isBattle) { if (curEffectInst[i]->flags & 4) { curEffectInst[i]->effect->renderWorld(curEffectInst[i]); } @@ -121,7 +121,7 @@ EffectInstance* func_8005A2BC(EffectBlueprint* effectBp) { effectBp->init(newEffectInst); } - if (GAME_STATUS->isBattle) { + if ((*gGameStatusPtr)->isBattle) { newEffectInst->flags |= 4; } return newEffectInst; diff --git a/src/code_3bf0_len_6f0.c b/src/code_3bf0_len_6f0.c index 738bda8f4d..ab9ea90240 100644 --- a/src/code_3bf0_len_6f0.c +++ b/src/code_3bf0_len_6f0.c @@ -5,9 +5,9 @@ void func_800287F0(void) { GameStatus* gameStatus; GameStatus* gameStatus2; - gameStatus = GAME_STATUS; + gameStatus = *gGameStatusPtr; gameStatus->stickX = 0; - gameStatus2 = GAME_STATUS; + gameStatus2 = *gGameStatusPtr; gameStatus->currentButtons = 0; gameStatus->pressedButtons = 0; gameStatus->heldButtons = 0; @@ -15,7 +15,7 @@ void func_800287F0(void) { // TODO: macro { - GameStatus* gameStatus = GAME_STATUS; + GameStatus* gameStatus = *gGameStatusPtr; gameStatus->prevButtons = 0; gameStatus->unk_50[0] = 4; gameStatus->unk_48[0] = 15; diff --git a/src/code_42e0_len_1f60.c b/src/code_42e0_len_1f60.c index ebd5af4e9f..fd86c135cc 100644 --- a/src/code_42e0_len_1f60.c +++ b/src/code_42e0_len_1f60.c @@ -67,7 +67,7 @@ void poll_rumble(void) { } void start_rumble(s32 freq, s32 frame) { - if (GAME_STATUS->demoState == 0) { + if ((*gGameStatusPtr)->demoState == 0) { u16* sym = &D_80074260; if (*sym != 0) { @@ -89,8 +89,8 @@ void update_max_rumble_duration(void) { s32* sym = &D_80074264; u16* sym2; - if (*sym != GAME_STATUS->currentButtons) { - *sym = GAME_STATUS->currentButtons; + if (*sym != (*gGameStatusPtr)->currentButtons) { + *sym = (*gGameStatusPtr)->currentButtons; reset_max_rumble_duration(); } @@ -212,7 +212,7 @@ void func_80029860(s32 dramAddr, s32 devAddr, s32 size) { s32 _advance_rng(void) { s32* rngVal = &gRandSeed; - GAME_STATUS->nextRNG = *rngVal = (*rngVal * 0x5D588B65) + 1; + (*gGameStatusPtr)->nextRNG = *rngVal = (*rngVal * 0x5D588B65) + 1; return *rngVal; } @@ -310,15 +310,15 @@ f32 get_clamped_angle_diff(f32 a, f32 b) { INCLUDE_ASM(f32, "code_42e0_len_1f60", atan2, f32 startX, f32 startZ, f32 endX, f32 endZ); f32 get_player_normal_yaw(void) { - return atan2(0, 0, GAME_STATUS->playerTraceNormal.x, GAME_STATUS->playerTraceNormal.z); + return atan2(0, 0, (*gGameStatusPtr)->playerTraceNormal.x, (*gGameStatusPtr)->playerTraceNormal.z); } f32 get_player_normal_pitch(void) { - f32 traceNormalX = GAME_STATUS->playerTraceNormal.x; - f32 traceNormalZ = GAME_STATUS->playerTraceNormal.z; + f32 traceNormalX = (*gGameStatusPtr)->playerTraceNormal.x; + f32 traceNormalZ = (*gGameStatusPtr)->playerTraceNormal.z; f32 sqrt = sqrtf(SQ(traceNormalX) + SQ(traceNormalZ)); - return atan2(0.0f, 0.0f, sqrt, -GAME_STATUS->playerTraceNormal.y); + return atan2(0.0f, 0.0f, sqrt, -(*gGameStatusPtr)->playerTraceNormal.y); } f32 dist2D(f32 ax, f32 ay, f32 bx, f32 by) { diff --git a/src/code_6000.c b/src/code_6000.c index da74756fa0..9054344dd6 100644 --- a/src/code_6000.c +++ b/src/code_6000.c @@ -33,7 +33,7 @@ s32 func_8002ACDC(void) { } s32 heap_malloc(s32 size) { - if (GAME_STATUS->isBattle == 0) { + if ((*gGameStatusPtr)->isBattle == 0) { return general_heap_malloc(size); } else { return _heap_malloc(&D_803DA800, size); @@ -41,7 +41,7 @@ s32 heap_malloc(s32 size) { } s32 heap_free(s32 size) { - if (GAME_STATUS->isBattle != 0) { + if ((*gGameStatusPtr)->isBattle != 0) { return _heap_free(&D_803DA800, size); } else { return general_heap_free(size); @@ -56,7 +56,7 @@ s32 collision_heap_create(void) { } s32 collision_heap_malloc(s32 size) { - if (!GAME_STATUS->isBattle) { + if (!(*gGameStatusPtr)->isBattle) { return _heap_malloc(&D_80268000, size); } else { return _heap_malloc(&D_803DA800, size); @@ -64,7 +64,7 @@ s32 collision_heap_malloc(s32 size) { } s32 collision_heap_free(void* data) { - if (GAME_STATUS->isBattle) { + if ((*gGameStatusPtr)->isBattle) { return _heap_free(&D_803DA800, data); } else { return _heap_free(&D_80268000, data); diff --git a/src/code_6240_len_c00.c b/src/code_6240_len_c00.c index 7677ba7ffc..3c61e37825 100644 --- a/src/code_6240_len_c00.c +++ b/src/code_6240_len_c00.c @@ -60,7 +60,7 @@ INCLUDE_ASM(s32, "code_6240_len_c00", fio_erase_game); INCLUDE_ASM(s32, "code_6240_len_c00", fio_deserialize_state); void func_8002B608(void) { - GAME_STATUS->entryID = 10; + (*gGameStatusPtr)->entryID = 10; fio_serialize_state(); } diff --git a/src/code_77480.c b/src/code_77480.c index e1629de545..61b1794504 100644 --- a/src/code_77480.c +++ b/src/code_77480.c @@ -184,7 +184,7 @@ void clear_player_status(void) { } void func_800DFC74(void) { - PlayerStatus* playerStatus = PLAYER_STATUS; + PlayerStatus* playerStatus = &gPlayerStatus; mem_clear(playerStatus, sizeof(PlayerStatus)); playerStatus->flags = 1; @@ -210,7 +210,7 @@ s32 func_800DFCF4(void) { INCLUDE_ASM(s32, "code_77480", func_800DFD48); void func_800DFEFC(void) { - PlayerStatus* playerStatus = PLAYER_STATUS; + PlayerStatus* playerStatus = &gPlayerStatus; s32 temp_v0 = func_800DFD48(); if (temp_v0 != -1) { @@ -221,7 +221,7 @@ void func_800DFEFC(void) { } void func_800DFF50(s32 arg0) { - PlayerStatus* playerStatus = PLAYER_STATUS; + PlayerStatus* playerStatus = &gPlayerStatus; playerStatus->anim = arg0; playerStatus->unk_BC = 0; @@ -229,7 +229,7 @@ void func_800DFF50(s32 arg0) { } void func_800DFF78(void) { - PlayerStatus* playerStatus = PLAYER_STATUS; + PlayerStatus* playerStatus = &gPlayerStatus; s32 temp_v0 = func_800DFD48(); if (temp_v0 != -1) { @@ -243,17 +243,17 @@ INCLUDE_ASM(s32, "code_77480", func_800DFFCC); // dist_to_player2D f32 func_800E0088(f32 x, f32 z) { - PlayerStatus* playerStatus = PLAYER_STATUS; + PlayerStatus* playerStatus = &gPlayerStatus; return dist2D(x, z, playerStatus->position.x, playerStatus->position.z); } void enable_player_shadow(void) { - get_shadow_by_index(PLAYER_STATUS->shadowID)->flags &= ~1; + get_shadow_by_index(gPlayerStatus.shadowID)->flags &= ~1; } void disable_player_shadow(void) { - get_shadow_by_index(PLAYER_STATUS->shadowID)->flags |= 1; + get_shadow_by_index(gPlayerStatus.shadowID)->flags |= 1; } s32 disable_player_static_collisions(void) { @@ -301,7 +301,7 @@ void func_800E01DC(void) { } s32 func_800E0208(void) { - GameStatus* gameStatus = GAME_STATUS; + GameStatus* gameStatus = *gGameStatusPtr; s32 ret = 0; if (gameStatus->disableScripts && (gameStatus->currentButtons & 0x10)) { @@ -347,7 +347,7 @@ void func_800E0514(void) { } s32 func_800E0538(void) { - PlayerStatus* playerStatus = PLAYER_STATUS; + PlayerStatus* playerStatus = &gPlayerStatus; s32* unk_C8 = playerStatus->unk_C8; s32 ret = 0; s32 cond; @@ -392,9 +392,9 @@ void func_800E0B14(void) { } void update_partner_timers(void) { - PlayerData* playerData = PLAYER_DATA; + PlayerData* playerData = &gPlayerData; - if (!GAME_STATUS->isBattle) { + if (!(*gGameStatusPtr)->isBattle) { s32 i; for (i = 1; i < ARRAY_COUNT(playerData->unk_2C4); i++) { @@ -410,7 +410,7 @@ INCLUDE_ASM(s32, "code_77480", func_800E0B90); INCLUDE_ASM(s32, "code_77480", get_player_back_anim); void render_player(void) { - if (!GAME_STATUS->disableScripts) { + if (!(*gGameStatusPtr)->disableScripts) { render_player_model(); } } diff --git a/src/code_7B440.c b/src/code_7B440.c index 3b210edc94..b4a7bc1fc0 100644 --- a/src/code_7B440.c +++ b/src/code_7B440.c @@ -40,7 +40,7 @@ void update_player_input(void) { INCLUDE_ASM(s32, "code_7B440", func_800E205C); void func_800E22E4(s32* arg0) { - PlayerStatus* playerStatus = PLAYER_STATUS; + PlayerStatus* playerStatus = &gPlayerStatus; *arg0 = (u16)playerStatus->currentButtons | (playerStatus->pressedButtons << 16); } diff --git a/src/code_7bb60_len_41b0.c b/src/code_7bb60_len_41b0.c index f9149a257d..b7d59f2976 100644 --- a/src/code_7bb60_len_41b0.c +++ b/src/code_7bb60_len_41b0.c @@ -8,7 +8,7 @@ extern s32 D_8010C96C; // npc list index extern s16 D_8010C9B0; void func_800E26B0(void) { - PlayerStatus* playerStatus = PLAYER_STATUS; + PlayerStatus* playerStatus = &gPlayerStatus; playerStatus->jumpApexHeight = playerStatus->position.y; } @@ -52,7 +52,7 @@ s32 func_800E26C4(void) { void set_action_state(s32 actionState); void move_player(s32 duration, f32 heading, f32 speed) { - PlayerStatus* playerStatus = PLAYER_STATUS; + PlayerStatus* playerStatus = &gPlayerStatus; playerStatus->flags |= 0x4000; playerStatus->heading = heading; @@ -96,7 +96,7 @@ void gravity_use_fall_params(void) { } void func_800E3100(void) { - PlayerStatus* playerStatus = PLAYER_STATUS; + PlayerStatus* playerStatus = &gPlayerStatus; if (playerStatus->actionState != ActionState_7 && playerStatus->actionState != ActionState_BOUNCE) { f32* temp; @@ -111,7 +111,7 @@ INCLUDE_ASM(s32, "code_7bb60_len_41b0", func_800E315C); INCLUDE_ASM(s32, "code_7bb60_len_41b0", phys_player_land); f32 integrate_gravity(void) { - PlayerStatus* playerStatus = PLAYER_STATUS; + PlayerStatus* playerStatus = &gPlayerStatus; if (playerStatus->flags & 0x40000) { playerStatus->gravityIntegrator[2] += playerStatus->gravityIntegrator[3] / 1.7f; @@ -326,7 +326,7 @@ void func_800E546C(void) { } void save_ground_pos(void) { - PlayerStatus* playerStatus = PLAYER_STATUS; + PlayerStatus* playerStatus = &gPlayerStatus; playerStatus->lastGoodPosition.x = playerStatus->position.x; playerStatus->lastGoodPosition.y = playerStatus->position.y; @@ -350,8 +350,8 @@ INCLUDE_ASM(s32, "code_7bb60_len_41b0", func_800E5A2C); INCLUDE_ASM(s32, "code_7bb60_len_41b0", func_800E5C78); void set_action_state(s32 actionState) { - PlayerStatus* playerStatus = PLAYER_STATUS; - PlayerData* playerData = PLAYER_DATA; + PlayerStatus* playerStatus = &gPlayerStatus; + PlayerData* playerData = &gPlayerData; UNK_TYPE* unknownStruct = &D_8010F250; if (playerStatus->flags & 0x200) { @@ -424,7 +424,7 @@ void set_action_state(s32 actionState) { } void update_locomotion_state(void) { - PlayerStatus* playerStatus = PLAYER_STATUS; + PlayerStatus* playerStatus = &gPlayerStatus; do { } while (0); // required to match set_action_state((!is_ability_active(Ability_SLOW_GO) @@ -432,7 +432,7 @@ void update_locomotion_state(void) { } void start_falling(void) { - PlayerStatus* playerStatus = PLAYER_STATUS; + PlayerStatus* playerStatus = &gPlayerStatus; set_action_state(ActionState_FALLING); playerStatus->gravityIntegrator[0] = 0.1143f; @@ -442,7 +442,7 @@ void start_falling(void) { } void start_bounce_a(void) { - PlayerStatus* playerStatus = PLAYER_STATUS; + PlayerStatus* playerStatus = &gPlayerStatus; set_action_state(ActionState_BOUNCE); playerStatus->gravityIntegrator[0] = 10.0f; @@ -452,7 +452,7 @@ void start_bounce_a(void) { } void start_bounce_b(void) { - PlayerStatus* playerStatus = PLAYER_STATUS; + PlayerStatus* playerStatus = &gPlayerStatus; set_action_state(ActionState_BOUNCE); playerStatus->gravityIntegrator[0] = 8.0f; @@ -463,8 +463,8 @@ void start_bounce_b(void) { } s32 check_input_hammer(void) { - PlayerStatus* playerStatus = PLAYER_STATUS; - PlayerData* playerData = PLAYER_DATA; + PlayerStatus* playerStatus = &gPlayerStatus; + PlayerData* playerData = &gPlayerData; if (playerStatus->pressedButtons & Button_B) { if (!(playerStatus->flags & 4)) { diff --git a/src/code_7fd10_len_b40.c b/src/code_7fd10_len_b40.c index 3ca9f1434b..22ce97d19e 100644 --- a/src/code_7fd10_len_b40.c +++ b/src/code_7fd10_len_b40.c @@ -1,9 +1,7 @@ #include "common.h" -extern s16 D_8010CD00; - void func_800E6860(void) { - PlayerStatus* playerStatus = PLAYER_STATUS; + PlayerStatus* playerStatus = &gPlayerStatus; if ((D_8010EBB0[0] != 0) && (D_8010EBB0[3] == 9)) { Npc* partner = get_npc_unsafe(NpcId_PARTNER); @@ -14,7 +12,42 @@ void func_800E6860(void) { } } +// playerStatus getting coppied to a0 - how? inlining? +#ifdef NON_MATCHING +s32 func_800E6904(void) { + s8* temp_8010EBB0 = D_8010EBB0; + PlayerStatus* playerStatus = &gPlayerStatus; + s32 actionState = playerStatus->actionState; + + if (!(playerStatus->animFlags & 0x100000)) { + if (temp_8010EBB0[0] == 0) { + if (!(playerStatus->flags & 0x1000)) { + if (actionState == ActionState_IDLE || actionState == ActionState_WALK || actionState == ActionState_RUN) { + return 1; + } + } + } else if (partner_player_can_pause()) { + if (temp_8010EBB0[3] == 6) { + return 1; + } else if (temp_8010EBB0[3] == 9) { + if (actionState == ActionState_RIDE) { + return 1; + } + } else if (temp_8010EBB0[3] == 8) { + if (actionState != ActionState_RIDE) { + play_sound(0x21D); + } else { + return 1; + } + } + } + } + + return 0; +} +#else INCLUDE_ASM(s32, "code_7fd10_len_b40", func_800E6904); +#endif INCLUDE_ASM(s32, "code_7fd10_len_b40", can_pause); @@ -28,4 +61,31 @@ INCLUDE_ASM(s32, "code_7fd10_len_b40", setup_item_popup); INCLUDE_ASM(s32, "code_7fd10_len_b40", check_input_open_menus); -INCLUDE_ASM(s32, "code_7fd10_len_b40", check_input_status_menu); +void check_input_status_menu(void) { + PlayerStatus* playerStatus = &gPlayerStatus; + s32 pressedButtons; + + if (get_variable(NULL, SI_SAVE_VAR(0)) < 0x60) { + if (playerStatus->actionState != ActionState_RIDE) { + pressedButtons = playerStatus->pressedButtons; + } else { + pressedButtons = (*gGameStatusPtr)->pressedButtons; + } + + if (!is_status_menu_visible()) { + if (!(playerStatus->currentButtons & Z_TRIG + R_TRIG) && (pressedButtons & 8) && func_800E9860()) { + open_status_menu_long(); + + if (!is_picking_up_item()) { + play_sound(3); + } + } + } else if (!(playerStatus->currentButtons & Z_TRIG + R_TRIG) && (pressedButtons & 8) && func_800E9860()) { + close_status_menu(); + + if (!is_picking_up_item()) { + play_sound(4); + } + } + } +} diff --git a/src/code_80850_len_3060.c b/src/code_80850_len_3060.c index c91dac38fa..c887567f5a 100644 --- a/src/code_80850_len_3060.c +++ b/src/code_80850_len_3060.c @@ -269,8 +269,8 @@ void enforce_hpfp_limits(void) { } void initialize_status_menu(void) { - UiStatus* uiStatus = UI_STATUS; - PlayerData* playerData = PLAYER_DATA; + UiStatus* uiStatus = &gUIStatus; + PlayerData* playerData = &gPlayerData; s32 iconIndex; s32 newVar; @@ -394,7 +394,7 @@ void coin_counter_draw_content(UNK_TYPE arg0, s32 posX, s32 posY) { UiStatus* uiStatus = &gUIStatus; s32 iconIndex; - if ((gPlayerData.coins != uiStatus->displayCoins) && ((GAME_STATUS->frameCounter % 3) == 0)) { + if ((gPlayerData.coins != uiStatus->displayCoins) && (((*gGameStatusPtr)->frameCounter % 3) == 0)) { play_sound(0x211); } @@ -628,7 +628,7 @@ s32 is_status_menu_visible(void) { } void status_menu_start_blinking_hp(void) { - GameStatus* gameStatus = GAME_STATUS; + GameStatus* gameStatus = *gGameStatusPtr; UiStatus* uiStatus = &gUIStatus; UiStatus* uiStatus2 = &gUIStatus; @@ -653,7 +653,7 @@ void status_menu_stop_blinking_hp(void) { } void status_menu_start_blinking_fp(void) { - GameStatus* gameStatus = GAME_STATUS; + GameStatus* gameStatus = *gGameStatusPtr; UiStatus* uiStatus = &gUIStatus; UiStatus* uiStatus2 = &gUIStatus; @@ -677,7 +677,7 @@ void status_menu_stop_blinking_fp(void) { } void status_menu_start_blinking_coins(void) { - GameStatus* gameStatus = GAME_STATUS; + GameStatus* gameStatus = *gGameStatusPtr; UiStatus* uiStatus = &gUIStatus; UiStatus* uiStatus2 = &gUIStatus; diff --git a/src/code_EC9D00.c b/src/code_EC9D00.c index b80727a124..f4134da1f7 100644 --- a/src/code_EC9D00.c +++ b/src/code_EC9D00.c @@ -1,5 +1,7 @@ #include "common.h" +#define NAMESPACE code_EC9D00 + INCLUDE_ASM(s32, "code_EC9D00", func_80240000_EC9D00); INCLUDE_ASM(s32, "code_EC9D00", func_8024001C_EC9D1C); @@ -30,8 +32,6 @@ INCLUDE_ASM(s32, "code_EC9D00", func_80240600_ECA300); INCLUDE_ASM(s32, "code_EC9D00", func_80240B38_ECA838); -INCLUDE_ASM(s32, "code_EC9D00", func_80240C78_ECA978); - -INCLUDE_ASM(s32, "code_EC9D00", func_80240CC0_ECA9C0); +#include "world/common/DeadUnkPartnerPosFuncs.inc.c" INCLUDE_ASM(s32, "code_EC9D00", func_80240D08_ECAA08); diff --git a/src/code_ED0310.c b/src/code_ED0310.c index 0566191e4b..ce33538d23 100644 --- a/src/code_ED0310.c +++ b/src/code_ED0310.c @@ -1,5 +1,7 @@ #include "common.h" +#define NAMESPACE code_ED0310 + INCLUDE_ASM(s32, "code_ED0310", func_80240320_ED0310); INCLUDE_ASM(s32, "code_ED0310", func_802404D0_ED04C0); @@ -12,7 +14,7 @@ INCLUDE_ASM(s32, "code_ED0310", func_80240EFC_ED0EEC); INCLUDE_ASM(s32, "code_ED0310", func_80240F74_ED0F64); -INCLUDE_ASM(s32, "code_ED0310", func_80240FE0_ED0FD0); +#include "world/common/DeadUnkNpcAIFunc14.inc.c" INCLUDE_ASM(s32, "code_ED0310", func_80241114_ED1104); diff --git a/src/code_ED510.c b/src/code_ED510.c index 0a11b5af52..36748e5d2e 100644 --- a/src/code_ED510.c +++ b/src/code_ED510.c @@ -373,17 +373,17 @@ ApiStatus GotoMapByID(ScriptInstance* script, s32 isInitialCall) { } ApiStatus GetEntryID(ScriptInstance* script, s32 isInitialCall) { - set_variable(script, *script->ptrReadPos, GAME_STATUS->entryID); + set_variable(script, *script->ptrReadPos, (*gGameStatusPtr)->entryID); return ApiStatus_DONE2; } ApiStatus GetMapID(ScriptInstance* script, s32 isInitialCall) { - set_variable(script, *script->ptrReadPos, GAME_STATUS->mapID); + set_variable(script, *script->ptrReadPos, (*gGameStatusPtr)->mapID); return ApiStatus_DONE2; } ApiStatus GetLoadType(ScriptInstance* script, s32 isInitialCall) { - set_variable(script, *script->ptrReadPos, GAME_STATUS->loadType != 0); + set_variable(script, *script->ptrReadPos, (*gGameStatusPtr)->loadType != 0); return ApiStatus_DONE2; } diff --git a/src/code_EDEA00.c b/src/code_EDEA00.c index 9fd6185982..e953159463 100644 --- a/src/code_EDEA00.c +++ b/src/code_EDEA00.c @@ -1,5 +1,7 @@ #include "common.h" +#define NAMESPACE code_EDEA00 + INCLUDE_ASM(s32, "code_EDEA00", func_80240040_EDEA00); INCLUDE_ASM(s32, "code_EDEA00", func_802401C4_EDEB84); @@ -14,7 +16,7 @@ INCLUDE_ASM(s32, "code_EDEA00", func_80240DA0_EDF760); INCLUDE_ASM(s32, "code_EDEA00", func_80240E18_EDF7D8); -INCLUDE_ASM(s32, "code_EDEA00", func_80240E84_EDF844); +#include "world/common/DeadUnkNpcAIFunc14.inc.c" INCLUDE_ASM(s32, "code_EDEA00", func_80240FB8_EDF978); diff --git a/src/code_EE70C0.c b/src/code_EE70C0.c index 2e0f905b8d..c69f2a4c81 100644 --- a/src/code_EE70C0.c +++ b/src/code_EE70C0.c @@ -1,5 +1,7 @@ #include "common.h" +#define NAMESPACE code_EE70C0 + INCLUDE_ASM(s32, "code_EE70C0", func_80240B10_EE70C0); INCLUDE_ASM(s32, "code_EE70C0", func_80240CC0_EE7270); @@ -12,7 +14,7 @@ INCLUDE_ASM(s32, "code_EE70C0", func_802416EC_EE7C9C); INCLUDE_ASM(s32, "code_EE70C0", func_80241764_EE7D14); -INCLUDE_ASM(s32, "code_EE70C0", func_802417D0_EE7D80); +#include "world/common/DeadUnkNpcAIFunc14.inc.c" INCLUDE_ASM(s32, "code_EE70C0", func_80241904_EE7EB4); diff --git a/src/code_EED1E0.c b/src/code_EED1E0.c index f647c343f2..13b7f0f17b 100644 --- a/src/code_EED1E0.c +++ b/src/code_EED1E0.c @@ -1,5 +1,7 @@ #include "common.h" +#define NAMESPACE code_EED1E0 + INCLUDE_ASM(s32, "code_EED1E0", func_802400E0_EED1E0); INCLUDE_ASM(s32, "code_EED1E0", func_802400FC_EED1FC); @@ -30,9 +32,7 @@ INCLUDE_ASM(s32, "code_EED1E0", func_802406E0_EED7E0); INCLUDE_ASM(s32, "code_EED1E0", func_80240C18_EEDD18); -INCLUDE_ASM(s32, "code_EED1E0", func_80240D58_EEDE58); - -INCLUDE_ASM(s32, "code_EED1E0", func_80240DA0_EEDEA0); +#include "world/common/DeadUnkPartnerPosFuncs.inc.c" INCLUDE_ASM(s32, "code_EED1E0", func_80240DE8_EEDEE8); diff --git a/src/code_EEDF50.c b/src/code_EEDF50.c index 11ee79dbcc..01d48d2c42 100644 --- a/src/code_EEDF50.c +++ b/src/code_EEDF50.c @@ -1,5 +1,7 @@ #include "common.h" +#define NAMESPACE code_EEDF50 + INCLUDE_ASM(s32, "code_EEDF50", func_80240E50_EEDF50); INCLUDE_ASM(s32, "code_EEDF50", func_80241000_EEE100); @@ -12,7 +14,7 @@ INCLUDE_ASM(s32, "code_EEDF50", func_80241A2C_EEEB2C); INCLUDE_ASM(s32, "code_EEDF50", func_80241AA4_EEEBA4); -INCLUDE_ASM(s32, "code_EEDF50", func_80241B10_EEEC10); +#include "world/common/DeadUnkNpcAIFunc14.inc.c" INCLUDE_ASM(s32, "code_EEDF50", func_80241C44_EEED44); diff --git a/src/code_EF2680.c b/src/code_EF2680.c index de8da5f105..763815cd4f 100644 --- a/src/code_EF2680.c +++ b/src/code_EF2680.c @@ -1,5 +1,7 @@ #include "common.h" +#define NAMESPACE code_EF2680 + INCLUDE_ASM(s32, "code_EF2680", func_80240070_EF2680); INCLUDE_ASM(s32, "code_EF2680", func_80240220_EF2830); @@ -12,7 +14,7 @@ INCLUDE_ASM(s32, "code_EF2680", func_80240C4C_EF325C); INCLUDE_ASM(s32, "code_EF2680", func_80240CC4_EF32D4); -INCLUDE_ASM(s32, "code_EF2680", func_80240D30_EF3340); +#include "world/common/DeadUnkNpcAIFunc14.inc.c" INCLUDE_ASM(s32, "code_EF2680", func_80240E64_EF3474); diff --git a/src/code_F5750.c b/src/code_F5750.c index 0f54e6ff8c..8a2c8cf8f6 100644 --- a/src/code_F5750.c +++ b/src/code_F5750.c @@ -142,7 +142,7 @@ ApiStatus SetPlayerAnimationSpeed(ScriptInstance* script, s32 isInitialCall) { ApiStatus PlayerMoveTo(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - PlayerStatus* playerStatus = PLAYER_STATUS; + PlayerStatus* playerStatus = &gPlayerStatus; if (isInitialCall) { f32 targetX = get_variable(script, *args++); @@ -187,7 +187,7 @@ void PlayerJump2(ScriptInstance* script, s32 isInitialCall) { ApiStatus InterpPlayerYaw(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - PlayerStatus* playerStatus = PLAYER_STATUS; + PlayerStatus* playerStatus = &gPlayerStatus; f32* initialYaw = &script->functionTemp[1].f; f32* deltaYaw = &script->functionTemp[2].f; s32* time = &script->functionTemp[3].s; diff --git a/src/code_a5dd0_len_114e0.c b/src/code_a5dd0_len_114e0.c index e095a26fcb..acb88fe752 100644 --- a/src/code_a5dd0_len_114e0.c +++ b/src/code_a5dd0_len_114e0.c @@ -48,7 +48,7 @@ Shadow* get_shadow_by_index(s32 index) { EntityList* get_entity_list(void) { EntityList* ret; - if (!GAME_STATUS->isBattle) { + if (!(*gGameStatusPtr)->isBattle) { ret = &gWorldEntityList; } else { ret = &gBattleEntityList; @@ -59,7 +59,7 @@ EntityList* get_entity_list(void) { ShadowList* get_shadow_list(void) { ShadowList* ret; - if (!GAME_STATUS->isBattle) { + if (!(*gGameStatusPtr)->isBattle) { ret = &gWorldShadowList; } else { ret = &gBattleShadowList; @@ -300,7 +300,7 @@ INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011BCEC); /// @returns TRUE if mtx is NULL or identity. INCLUDE_ASM(s32, "code_a5dd0_len_114e0", is_identity_fixed_mtx); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", set_background_color_blend); +INCLUDE_ASM(void, "code_a5dd0_len_114e0", set_background_color_blend, u8 r, u8 g, u8 b, u8 a); INCLUDE_ASM(s32, "code_a5dd0_len_114e0", get_background_color_blend); diff --git a/src/code_b72b0_len_15ed0.c b/src/code_b72b0_len_15ed0.c index f3ab8bdc70..1f260fc178 100644 --- a/src/code_b72b0_len_15ed0.c +++ b/src/code_b72b0_len_15ed0.c @@ -103,7 +103,7 @@ void stub_dynamic_entity_delegate(void) { INCLUDE_ASM(s32, "code_b72b0_len_15ed0", clear_dynamic_entity_list); void init_dynamic_entity_list(void) { - if (!GAME_STATUS->isBattle) { + if (!(*gGameStatusPtr)->isBattle) { gCurrentDynamicEntityListPtr = gWorldDynamicEntityList; } else { gCurrentDynamicEntityListPtr = gBattleDynamicEntityList; diff --git a/src/code_dba20_len_350.c b/src/code_dba20_len_350.c index dc0b4d5508..02e807eb7b 100644 --- a/src/code_dba20_len_350.c +++ b/src/code_dba20_len_350.c @@ -25,7 +25,7 @@ void clear_area_flags(void) { SaveData* saveFile = &gCurrentSaveFile; s32 i; - if (GAME_STATUS->changedArea) { + if ((*gGameStatusPtr)->changedArea) { for (i = 0; i < ARRAY_COUNT(saveFile->areaFlags); i++) { saveFile->areaFlags[i] = 0; } diff --git a/src/code_dbd70_len_700.c b/src/code_dbd70_len_700.c index 692e9bc84c..c394c7a22d 100644 --- a/src/code_dbd70_len_700.c +++ b/src/code_dbd70_len_700.c @@ -7,7 +7,7 @@ void default_trigger_delegate(s32* arg0) { INCLUDE_ASM(s32, "code_dbd70_len_700", clear_trigger_data); void init_trigger_list(void) { - if (!GAME_STATUS->isBattle) { + if (!(*gGameStatusPtr)->isBattle) { gCurrentTriggerListPtr = &gTriggerList1; } else { gCurrentTriggerListPtr = &gTriggerList2; diff --git a/src/code_dc470_len_14c0.c b/src/code_dc470_len_14c0.c index aab5e9160e..1b52d239f9 100644 --- a/src/code_dc470_len_14c0.c +++ b/src/code_dc470_len_14c0.c @@ -26,7 +26,7 @@ void load_map_bg(char* optAssetName) { } void use_default_background_settings(void) { - GameStatus* gameStatus = GAME_STATUS; + GameStatus* gameStatus = *gGameStatusPtr; D_801595A0 = 0; D_8014F12F = 0; @@ -35,7 +35,7 @@ void use_default_background_settings(void) { } void read_background_size(BackgroundHeader* bg) { - GameStatus* gameStatus = GAME_STATUS; + GameStatus* gameStatus = *gGameStatusPtr; gameStatus->backgroundMaxW = bg->width; gameStatus->backgroundMaxH = bg->height; @@ -47,7 +47,7 @@ void read_background_size(BackgroundHeader* bg) { } void set_background_size(s16 startX, s16 startY, s16 sizeX, s16 sizeY) { - GameStatus* gameStatus = GAME_STATUS; + GameStatus* gameStatus = *gGameStatusPtr; gameStatus->enableBackground &= ~1; gameStatus->backgroundMaxW = startX; diff --git a/src/code_dd930_len_1c0.c b/src/code_dd930_len_1c0.c index ed49f94426..6230b226d4 100644 --- a/src/code_dd930_len_1c0.c +++ b/src/code_dd930_len_1c0.c @@ -60,7 +60,7 @@ s32 play_ambient_sounds(s32 fadeInTime, s32 fadeOutTime) { struct_80147230* temp1 = &D_8015C7C0; struct_80147230* temp2 = &D_8015C7C0; - if (!GAME_STATUS->musicEnabled) { + if (!(*gGameStatusPtr)->musicEnabled) { func_800554A4(temp1->fadeInTime, fadeOutTime); temp1->fadeFlags &= ~1; return 1; diff --git a/src/code_e0b30_len_b80.c b/src/code_e0b30_len_b80.c index 4338b69dc7..e780a155e7 100644 --- a/src/code_e0b30_len_b80.c +++ b/src/code_e0b30_len_b80.c @@ -15,7 +15,7 @@ s32 get_song_variation_override_for_cur_map(SongID songID) { for (i = 0; i < ARRAY_COUNT(gSongsUsingVariationFlag); i++) { if (allowed[i] == songID) { - Map* map = &areas[GAME_STATUS->areaID].maps[GAME_STATUS->mapID]; + Map* map = &areas[(*gGameStatusPtr)->areaID].maps[(*gGameStatusPtr)->mapID]; return map->songVariation & 1; } @@ -47,7 +47,7 @@ void func_8014A52C(void) { INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014A548); s32 _set_music_track(s32 playerIndex, SongID songID, s32 variation, s32 fadeOutTime, s16 volume) { - GameStatus* gameStatus = GAME_STATUS; + GameStatus* gameStatus = *gGameStatusPtr; if (gameStatus->demoState != 0) { return 1; @@ -99,7 +99,7 @@ s32 set_music_track(s32 playerIndex, SongID songID, s32 variation, s32 fadeOutTi } s32 func_8014A964(s32 playerIndex, SongID songID, s32 variation, s32 fadeInTime, s16 arg4, s16 arg5) { - GameStatus* gameStatus = GAME_STATUS; + GameStatus* gameStatus = *gGameStatusPtr; if (gameStatus->demoState != 0) { return 1; @@ -218,7 +218,7 @@ INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014AD40); void func_8014ADA4(void) { MusicPlayer* musicPlayer = &gMusicPlayers[0]; - if (GAME_STATUS->demoState == 0) { + if ((*gGameStatusPtr)->demoState == 0) { musicPlayer->flags |= 8; _set_music_track(0, musicPlayer->unk_24, musicPlayer->unk_28, 0, 8); } @@ -227,7 +227,7 @@ void func_8014ADA4(void) { void func_8014ADF8(SongID songID, s32 variation) { MusicPlayer* musicPlayer = &gMusicPlayers[0]; - if (GAME_STATUS->demoState == 0) { + if ((*gGameStatusPtr)->demoState == 0) { musicPlayer->unk_24 = musicPlayer->songID; musicPlayer->unk_28 = musicPlayer->variation; musicPlayer->unk_2C = musicPlayer->unk_18; @@ -239,7 +239,7 @@ void func_8014ADF8(SongID songID, s32 variation) { void func_8014AE6C(void) { MusicPlayer* musicPlayer = &gMusicPlayers[0]; - if (GAME_STATUS->demoState == 0) { + if ((*gGameStatusPtr)->demoState == 0) { if (D_8009A650[0] & 0x20000) { D_8009A650[0] &= ~0x20000; } else { @@ -253,7 +253,7 @@ void func_8014AE6C(void) { void func_8014AEF8(void) { MusicPlayer* musicPlayer = &gMusicPlayers[0]; - if (GAME_STATUS->demoState == 0 && !(D_8009A650[0] & 0x20000)) { + if ((*gGameStatusPtr)->demoState == 0 && !(D_8009A650[0] & 0x20000)) { func_8005553C(0, 250); musicPlayer->unk_24 = musicPlayer->songID; musicPlayer->unk_28 = musicPlayer->variation; diff --git a/src/code_e79b0_len_1920.c b/src/code_e79b0_len_1920.c index 206d93d585..074aa1f862 100644 --- a/src/code_e79b0_len_1920.c +++ b/src/code_e79b0_len_1920.c @@ -89,7 +89,7 @@ void find_script_labels(ScriptInstance* script) { void clear_script_list(void) { s32 i; - if (GAME_STATUS->isBattle == 0) { + if ((*gGameStatusPtr)->isBattle == 0) { gCurrentScriptListPtr = &gWorldScriptList; gMapVars = gWorldMapVars; gMapFlags = gWorldMapFlags; @@ -121,7 +121,7 @@ void clear_script_list(void) { void init_script_list(void) { - if (GAME_STATUS->isBattle == 0) { + if ((*gGameStatusPtr)->isBattle == 0) { gCurrentScriptListPtr = &gWorldScriptList; gMapVars = gWorldMapVars; gMapFlags = gWorldMapFlags; diff --git a/src/code_e940_len_290.c b/src/code_e940_len_290.c index a7885db8d2..8cbc094d43 100644 --- a/src/code_e940_len_290.c +++ b/src/code_e940_len_290.c @@ -2,7 +2,7 @@ void begin_state_init(void) { D_8009A650[0] |= 0x8; - GAME_STATUS->loadMenuState = 3; + (*gGameStatusPtr)->loadMenuState = 3; } void step_init_state(void) { @@ -10,8 +10,8 @@ void step_init_state(void) { GameStatus* gameStatus = *gameStatusPtr; s32 i; - if (GAME_STATUS->loadMenuState != 0) { - GAME_STATUS->loadMenuState--; + if ((*gGameStatusPtr)->loadMenuState != 0) { + (*gGameStatusPtr)->loadMenuState--; return; } @@ -70,10 +70,10 @@ void step_init_state(void) { fio_has_valid_backup(); if (D_800D9620 == 0) { - GAME_STATUS->unk_AB = 1; + (*gGameStatusPtr)->unk_AB = 1; func_8005615C(); } else { - GAME_STATUS->unk_AB = 0; + (*gGameStatusPtr)->unk_AB = 0; func_80056180(); } diff --git a/src/code_ebd0_len_6a0.c b/src/code_ebd0_len_6a0.c index 98712a1406..073b6ca418 100644 --- a/src/code_ebd0_len_6a0.c +++ b/src/code_ebd0_len_6a0.c @@ -1,13 +1,13 @@ #include "code_ebd0_len_6a0.h" void intro_logos_set_fade_alpha(s16 alpha) { - GameStatus* gameStatus = GAME_STATUS; + GameStatus* gameStatus = *gGameStatusPtr; gameStatus->bootAlpha = alpha; } void intro_logos_set_fade_color(s16 color) { - GameStatus* gameStatus = GAME_STATUS; + GameStatus* gameStatus = *gGameStatusPtr; gameStatus->bootRed = color; gameStatus->bootGreen = color; @@ -15,7 +15,7 @@ void intro_logos_set_fade_color(s16 color) { } s16 intro_logos_fade_in(s16 subtractAlpha) { - GameStatus* gameStatus = GAME_STATUS; + GameStatus* gameStatus = *gGameStatusPtr; if (gameStatus->bootAlpha != 0) { gameStatus->bootAlpha -= subtractAlpha; @@ -29,7 +29,7 @@ s16 intro_logos_fade_in(s16 subtractAlpha) { } s16 intro_logos_fade_out(s16 addAlpha) { - GameStatus* gameStatus = GAME_STATUS; + GameStatus* gameStatus = *gGameStatusPtr; if (gameStatus->bootAlpha != 0xFF) { gameStatus->bootAlpha += addAlpha; @@ -43,8 +43,8 @@ s16 intro_logos_fade_out(s16 addAlpha) { } void intro_logos_update_fade(void) { - set_transition_stencil_zoom_0(0, GAME_STATUS->bootAlpha); - set_transition_stencil_color(0, GAME_STATUS->bootBlue, GAME_STATUS->bootGreen, GAME_STATUS->bootRed); + set_transition_stencil_zoom_0(0, (*gGameStatusPtr)->bootAlpha); + set_transition_stencil_color(0, (*gGameStatusPtr)->bootBlue, (*gGameStatusPtr)->bootGreen, (*gGameStatusPtr)->bootRed); } void begin_state_battle(void) { diff --git a/src/code_ef070_len_3400.c b/src/code_ef070_len_3400.c index 541b4ce8c6..3af76397b0 100644 --- a/src/code_ef070_len_3400.c +++ b/src/code_ef070_len_3400.c @@ -480,7 +480,7 @@ void func_802CCAC0(void) { INCLUDE_ASM(s32, "code_ef070_len_3400", draw_anim_models); ApiStatus func_802CCCB0(ScriptInstance* script, s32 isInitialCall) { - if (!GAME_STATUS->isBattle) { + if (!(*gGameStatusPtr)->isBattle) { gCurrentMeshAnimationListPtr = &gWorldMeshAnimationList; } else { gCurrentMeshAnimationListPtr = &gBattleMeshAnimationList; @@ -688,7 +688,7 @@ ApiStatus func_802CD418(ScriptInstance* script, s32 isInitialCall) { INCLUDE_ASM(s32, "code_ef070_len_3400", func_802CD4B4); void func_802CD57C(void) { - if (!GAME_STATUS->isBattle) { + if (!(*gGameStatusPtr)->isBattle) { gCurrentMeshAnimationListPtr = &gWorldMeshAnimationList; } else { gCurrentMeshAnimationListPtr = &gBattleMeshAnimationList; diff --git a/src/code_f2470_len_27f0.c b/src/code_f2470_len_27f0.c index 1643561aec..a28dee83b5 100644 --- a/src/code_f2470_len_27f0.c +++ b/src/code_f2470_len_27f0.c @@ -12,7 +12,7 @@ Npc* resolve_npc(ScriptInstance* script, NpcId npcIdOrPtr) { } void set_npc_animation(Npc* npc, u32 arg1) { - PlayerData* playerData = PLAYER_DATA; + PlayerData* playerData = &gPlayerData; if (arg1 - 0x101 < 9) { npc->currentAnim = gPartnerAnimations[playerData->currentPartner].anims[arg1 - 0x101]; diff --git a/src/code_fa4c0_len_3bf0.c b/src/code_fa4c0_len_3bf0.c index 56968244a9..35dc8f1a6a 100644 --- a/src/code_fa4c0_len_3bf0.c +++ b/src/code_fa4c0_len_3bf0.c @@ -400,7 +400,7 @@ ApiStatus AddBadge(ScriptInstance* script, s32 isInitialCall) { ApiStatus RemoveBadge(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - PlayerData* playerData = PLAYER_DATA; + PlayerData* playerData = &gPlayerData; s32 badge = get_variable(script, *args++); s32 i; diff --git a/src/code_fe0b0_len_5a0.c b/src/code_fe0b0_len_5a0.c index 0fea8161c2..4317b2ab93 100644 --- a/src/code_fe0b0_len_5a0.c +++ b/src/code_fe0b0_len_5a0.c @@ -12,22 +12,22 @@ ApiStatus EnableSpriteShading(ScriptInstance* script, s32 isInitialCall) { } s32 GetDemoState(ScriptInstance* script) { - set_variable(script, *script->ptrReadPos, GAME_STATUS->demoState); + set_variable(script, *script->ptrReadPos, (*gGameStatusPtr)->demoState); return ApiStatus_DONE2; } ApiStatus DemoPressButton(ScriptInstance* script, s32 isInitialCall) { - GAME_STATUS->demoButtonInput |= get_variable(script, *script->ptrReadPos); + (*gGameStatusPtr)->demoButtonInput |= get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } ApiStatus DemoReleaseButton(ScriptInstance* script, s32 isInitialCall) { - GAME_STATUS->demoButtonInput &= ~get_variable(script, *script->ptrReadPos); + (*gGameStatusPtr)->demoButtonInput &= ~get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } ApiStatus DemoSetButtons(ScriptInstance* script, s32 isInitialCall) { - GAME_STATUS->demoButtonInput = get_variable(script, *script->ptrReadPos); + (*gGameStatusPtr)->demoButtonInput = get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } @@ -39,8 +39,8 @@ ApiStatus DemoJoystickRadial(ScriptInstance* script, s32 isInitialCall) { a = get_float_variable(script, *thisPos++); b = get_float_variable(script, *thisPos++); - GAME_STATUS->demoStickX = a * sin_deg(b); - GAME_STATUS->demoStickY = a * cos_deg(b); + (*gGameStatusPtr)->demoStickX = a * sin_deg(b); + (*gGameStatusPtr)->demoStickY = a * cos_deg(b); return ApiStatus_DONE2; } @@ -53,8 +53,8 @@ ApiStatus DemoJoystickXY(ScriptInstance* script, s32 isInitialCall) { x = get_float_variable(script, *thisPos++); y = get_float_variable(script, *thisPos++); - GAME_STATUS->demoStickX = x; - GAME_STATUS->demoStickY = y; + (*gGameStatusPtr)->demoStickX = x; + (*gGameStatusPtr)->demoStickY = y; return ApiStatus_DONE2; } diff --git a/src/common/GetItemEntityPosition.inc.c b/src/common/GetItemEntityPosition.inc.c new file mode 100644 index 0000000000..78d0b42d25 --- /dev/null +++ b/src/common/GetItemEntityPosition.inc.c @@ -0,0 +1,12 @@ +#include "common.h" +#include "map.h" + +ApiStatus N(GetItemEntityPosition)(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + ItemEntity* entity = get_item_entity(get_variable(script, *args++)); + + set_variable(script, *args++, entity->position.x); + set_variable(script, *args++, entity->position.y); + set_variable(script, *args++, entity->position.z); + return ApiStatus_DONE2; +} diff --git a/src/common/IsGameStatusUnkAA_1.inc.c b/src/common/IsGameStatusUnkAA_1.inc.c index 1b2eb71f27..a454bbce2f 100644 --- a/src/common/IsGameStatusUnkAA_1.inc.c +++ b/src/common/IsGameStatusUnkAA_1.inc.c @@ -2,7 +2,7 @@ #include "map.h" ApiStatus N(IsGameStatusUnkAA_1)(ScriptInstance* script, s32 isInitialCall) { - GameStatus* gameStatus = GAME_STATUS; + GameStatus* gameStatus = *gGameStatusPtr; script->varTable[0] = 0; if (gameStatus->unk_AA & 1) { diff --git a/src/world/area_arn/arn_04/BE37B0.c b/src/world/area_arn/arn_04/BE37B0.c index 01eabb1c74..795c99327b 100644 --- a/src/world/area_arn/arn_04/BE37B0.c +++ b/src/world/area_arn/arn_04/BE37B0.c @@ -38,7 +38,7 @@ INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80241728_BE4ED8); INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80241AE4_BE5294); -INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80241B50_BE5300); +#include "world/common/UnkNpcAIFunc14.inc.c" #include "world/common/UnkNpcAIFunc3.inc.c" diff --git a/src/world/area_arn/arn_07/BED740.c b/src/world/area_arn/arn_07/BED740.c index 19e7c7e0db..99b631ab67 100644 --- a/src/world/area_arn/arn_07/BED740.c +++ b/src/world/area_arn/arn_07/BED740.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_arn/arn_07/BED740", func_802411E8_BEDFD8); INCLUDE_ASM(s32, "world/area_arn/arn_07/BED740", func_802415A4_BEE394); -INCLUDE_ASM(s32, "world/area_arn/arn_07/BED740", func_80241610_BEE400); +#include "world/common/UnkNpcAIFunc14.inc.c" #include "world/common/UnkNpcAIFunc3.inc.c" @@ -23,7 +23,7 @@ INCLUDE_ASM(s32, "world/area_arn/arn_07/BED740", func_80241B38_BEE928); INCLUDE_ASM(s32, "world/area_arn/arn_07/BED740", func_80241C5C_BEEA4C); ApiStatus PostChapter3StatUpdate(ScriptInstance* script, s32 isInitialCall) { - PlayerData* playerData = PLAYER_DATA; + PlayerData* playerData = &gPlayerData; set_max_SP(3); playerData->curHP = playerData->curMaxHP; diff --git a/src/world/area_dgb/dgb_01/BFD9A0.c b/src/world/area_dgb/dgb_01/BFD9A0.c index e34d5f6e01..ab750268b3 100644 --- a/src/world/area_dgb/dgb_01/BFD9A0.c +++ b/src/world/area_dgb/dgb_01/BFD9A0.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_802409B8_BFE238); INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80240D74_BFE5F4); -INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80240DE0_BFE660); +#include "world/common/UnkNpcAIFunc14.inc.c" #include "world/common/UnkNpcAIFunc3.inc.c" diff --git a/src/world/area_dgb/dgb_04/C36530.c b/src/world/area_dgb/dgb_04/C36530.c index 4d325af878..b89748b721 100644 --- a/src/world/area_dgb/dgb_04/C36530.c +++ b/src/world/area_dgb/dgb_04/C36530.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80240898_C36DC8); INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80240C54_C37184); -INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80240CC0_C371F0); +#include "world/common/UnkNpcAIFunc14.inc.c" #include "world/common/UnkNpcAIFunc3.inc.c" @@ -74,8 +74,6 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_802429D0_C38F00); INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80242F08_C39438); -INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80243048_C39578); - -INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80243090_C395C0); +#include "world/common/UnkPartnerPosFuncs.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_802430D8_C39608); diff --git a/src/world/area_dgb/dgb_08/C3FDB0.c b/src/world/area_dgb/dgb_08/C3FDB0.c index c9f13b42d9..9b2feb0889 100644 --- a/src/world/area_dgb/dgb_08/C3FDB0.c +++ b/src/world/area_dgb/dgb_08/C3FDB0.c @@ -52,7 +52,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80241FF8_C41DA8); INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_802423B4_C42164); -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80242420_C421D0); +#include "world/common/UnkNpcAIFunc14.inc.c" #include "world/common/UnkNpcAIFunc3.inc.c" diff --git a/src/world/area_dgb/dgb_09/C46BE0.c b/src/world/area_dgb/dgb_09/C46BE0.c index 99f350ea84..d1e71ba66a 100644 --- a/src/world/area_dgb/dgb_09/C46BE0.c +++ b/src/world/area_dgb/dgb_09/C46BE0.c @@ -44,7 +44,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80241CBC_C4889C); INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80242078_C48C58); -INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_802420E4_C48CC4); +#include "world/common/UnkNpcAIFunc14.inc.c" #include "world/common/UnkNpcAIFunc3.inc.c" diff --git a/src/world/area_dro/dro_01/95B7E0.c b/src/world/area_dro/dro_01/95B7E0.c index 13a6ced4aa..b343d3f2a6 100644 --- a/src/world/area_dro/dro_01/95B7E0.c +++ b/src/world/area_dro/dro_01/95B7E0.c @@ -1,5 +1,7 @@ #include "dro_01.h" +#define UNK_ALPHA_FUNC_NPC 10 + INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802405E0_95B7E0); INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80240738_95B938); @@ -38,7 +40,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802417D0_95C9D0); INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_8024183C_95CA3C); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_8024189C_95CA9C); +#include "world/common/UnkAlphaFunc.inc.c" INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802419E8_95CBE8); diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c index f1e8a4fae7..b8464eb86b 100644 --- a/src/world/area_dro/dro_02/9694C0.c +++ b/src/world/area_dro/dro_02/9694C0.c @@ -1,5 +1,7 @@ #include "dro_02.h" +#define UNK_ALPHA_FUNC_NPC 10 + INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240300_9694C0); #include "world/common/GetItemName.inc.c" @@ -14,7 +16,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240660_969820); INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802406CC_96988C); -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_8024072C_9698EC); +#include "world/common/UnkAlphaFunc.inc.c" INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240878_969A38); diff --git a/src/world/area_flo/flo_00/C9DF60.c b/src/world/area_flo/flo_00/C9DF60.c index 2499abdef5..6e7c9a1f1f 100644 --- a/src/world/area_flo/flo_00/C9DF60.c +++ b/src/world/area_flo/flo_00/C9DF60.c @@ -25,7 +25,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_00/C9DF60", func_80240B14_C9EA34); INCLUDE_ASM(s32, "world/area_flo/flo_00/C9DF60", func_80240BD4_C9EAF4); ApiStatus PostChapter6StatUpdate(ScriptInstance* script, s32 isInitialCall) { - PlayerData* playerData = PLAYER_DATA; + PlayerData* playerData = &gPlayerData; set_max_SP(6); playerData->curHP = playerData->curMaxHP; diff --git a/src/world/area_flo/flo_08/CAED40.c b/src/world/area_flo/flo_08/CAED40.c index 06131dcd65..3e086b7897 100644 --- a/src/world/area_flo/flo_08/CAED40.c +++ b/src/world/area_flo/flo_08/CAED40.c @@ -30,8 +30,6 @@ INCLUDE_ASM(s32, "world/area_flo/flo_08/CAED40", func_80240600_CAF340); INCLUDE_ASM(s32, "world/area_flo/flo_08/CAED40", func_80240B38_CAF878); -INCLUDE_ASM(s32, "world/area_flo/flo_08/CAED40", func_80240C78_CAF9B8); - -INCLUDE_ASM(s32, "world/area_flo/flo_08/CAED40", func_80240CC0_CAFA00); +#include "world/common/UnkPartnerPosFuncs.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_08/CAED40", func_80240D08_CAFA48); diff --git a/src/world/area_flo/flo_09/CB5320.c b/src/world/area_flo/flo_09/CB5320.c index d442067970..c966521860 100644 --- a/src/world/area_flo/flo_09/CB5320.c +++ b/src/world/area_flo/flo_09/CB5320.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_09/CB5320", func_80240BB8_CB5BB8); INCLUDE_ASM(s32, "world/area_flo/flo_09/CB5320", func_80240F74_CB5F74); -INCLUDE_ASM(s32, "world/area_flo/flo_09/CB5320", func_80240FE0_CB5FE0); +#include "world/common/UnkNpcAIFunc14.inc.c" #include "world/common/UnkNpcAIFunc3.inc.c" diff --git a/src/world/area_flo/flo_13/CC3850.c b/src/world/area_flo/flo_13/CC3850.c index 13b8fbc1df..dcc072abfd 100644 --- a/src/world/area_flo/flo_13/CC3850.c +++ b/src/world/area_flo/flo_13/CC3850.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_80240A5C_CC426C); INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_80240E18_CC4628); -INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_80240E84_CC4694); +#include "world/common/UnkNpcAIFunc14.inc.c" #include "world/common/UnkNpcAIFunc3.inc.c" diff --git a/src/world/area_flo/flo_14/CCBE20.c b/src/world/area_flo/flo_14/CCBE20.c index c803d04f92..dcd4de0159 100644 --- a/src/world/area_flo/flo_14/CCBE20.c +++ b/src/world/area_flo/flo_14/CCBE20.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_802413A8_CCC6B8); INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_80241764_CCCA74); -INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_802417D0_CCCAE0); +#include "world/common/UnkNpcAIFunc14.inc.c" #include "world/common/UnkNpcAIFunc3.inc.c" diff --git a/src/world/area_flo/flo_16/CD1F10.c b/src/world/area_flo/flo_16/CD1F10.c index 372bafc8d1..8c0642d064 100644 --- a/src/world/area_flo/flo_16/CD1F10.c +++ b/src/world/area_flo/flo_16/CD1F10.c @@ -30,9 +30,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_16/CD1F10", func_802406E0_CD2510); INCLUDE_ASM(s32, "world/area_flo/flo_16/CD1F10", func_80240C18_CD2A48); -INCLUDE_ASM(s32, "world/area_flo/flo_16/CD1F10", func_80240D58_CD2B88); - -INCLUDE_ASM(s32, "world/area_flo/flo_16/CD1F10", func_80240DA0_CD2BD0); +#include "world/common/UnkPartnerPosFuncs.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_16/CD1F10", func_80240DE8_CD2C18); diff --git a/src/world/area_flo/flo_16/CD2C80.c b/src/world/area_flo/flo_16/CD2C80.c index 83f7778887..4afa999fb5 100644 --- a/src/world/area_flo/flo_16/CD2C80.c +++ b/src/world/area_flo/flo_16/CD2C80.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_16/CD2C80", func_802416E8_CD3518); INCLUDE_ASM(s32, "world/area_flo/flo_16/CD2C80", func_80241AA4_CD38D4); -INCLUDE_ASM(s32, "world/area_flo/flo_16/CD2C80", func_80241B10_CD3940); +#include "world/common/UnkNpcAIFunc14.inc.c" #include "world/common/UnkNpcAIFunc3.inc.c" diff --git a/src/world/area_flo/flo_17/CD7350.c b/src/world/area_flo/flo_17/CD7350.c index 4697b21998..8763043d77 100644 --- a/src/world/area_flo/flo_17/CD7350.c +++ b/src/world/area_flo/flo_17/CD7350.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_80240908_CD7BE8); INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_80240CC4_CD7FA4); -INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_80240D30_CD8010); +#include "world/common/UnkNpcAIFunc14.inc.c" #include "world/common/UnkNpcAIFunc3.inc.c" diff --git a/src/world/area_flo/flo_25/CF2C10.c b/src/world/area_flo/flo_25/CF2C10.c index 74c3bef834..6830bbad29 100644 --- a/src/world/area_flo/flo_25/CF2C10.c +++ b/src/world/area_flo/flo_25/CF2C10.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_802408D8_CF34A8); INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_80240C94_CF3864); -INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_80240D00_CF38D0); +#include "world/common/UnkNpcAIFunc14.inc.c" #include "world/common/UnkNpcAIFunc3.inc.c" diff --git a/src/world/area_hos/hos_02/A17210.c b/src/world/area_hos/hos_02/A17210.c index 2f8455c49d..47476d2dc7 100644 --- a/src/world/area_hos/hos_02/A17210.c +++ b/src/world/area_hos/hos_02/A17210.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_80241888_A17AA8); INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_80241C44_A17E64); -INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_80241CB0_A17ED0); +#include "world/common/UnkNpcAIFunc14.inc.c" #include "world/common/UnkNpcAIFunc3.inc.c" diff --git a/src/world/area_hos/hos_03/A1BDB0.c b/src/world/area_hos/hos_03/A1BDB0.c index 4a3b8eb3d3..0fc2bdcff3 100644 --- a/src/world/area_hos/hos_03/A1BDB0.c +++ b/src/world/area_hos/hos_03/A1BDB0.c @@ -1,5 +1,7 @@ #include "hos_03.h" +#define UNK_ALPHA_FUNC_NPC 7 + INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80240CB0_A1BDB0); INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80240E60_A1BF60); @@ -12,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80241548_A1C648); INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80241904_A1CA04); -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80241970_A1CA70); +#include "world/common/UnkNpcAIFunc14.inc.c" #include "world/common/UnkNpcAIFunc3.inc.c" @@ -56,7 +58,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242804_A1D904); INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242870_A1D970); -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802428D0_A1D9D0); +#include "world/common/UnkAlphaFunc.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242A1C_A1DB1C); diff --git a/src/world/area_isk/isk_10/988B60.c b/src/world/area_isk/isk_10/988B60.c index 183bfe3699..1e824d7009 100644 --- a/src/world/area_isk/isk_10/988B60.c +++ b/src/world/area_isk/isk_10/988B60.c @@ -30,9 +30,7 @@ INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_80240600_989160); INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_80240B38_989698); -INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_80240C78_9897D8); - -INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_80240CC0_989820); +#include "world/common/UnkPartnerPosFuncs.inc.c" INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_80240D08_989868); diff --git a/src/world/area_iwa/iwa_10/91E6D0.c b/src/world/area_iwa/iwa_10/91E6D0.c index 75b583d19e..6e044a2995 100644 --- a/src/world/area_iwa/iwa_10/91E6D0.c +++ b/src/world/area_iwa/iwa_10/91E6D0.c @@ -32,8 +32,6 @@ INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_802408F0_91EE60); INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_80240E28_91F398); -INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_80240F68_91F4D8); - -INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_80240FB0_91F520); +#include "world/common/UnkPartnerPosFuncs.inc.c" INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_80240FF8_91F568); diff --git a/src/world/area_jan/jan_02/B2C8A0.c b/src/world/area_jan/jan_02/B2C8A0.c index 26851b13c6..f25a48ed8b 100644 --- a/src/world/area_jan/jan_02/B2C8A0.c +++ b/src/world/area_jan/jan_02/B2C8A0.c @@ -1,5 +1,7 @@ #include "jan_02.h" +#define UNK_ALPHA_FUNC_NPC 5 + INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80240430_B2C8A0); INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80240588_B2C9F8); @@ -48,7 +50,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241974_B2DDE4); INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_802419E0_B2DE50); -INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241A40_B2DEB0); +#include "world/common/UnkAlphaFunc.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241B8C_B2DFFC); diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c index 1d99eb3f55..f3b925fcb9 100644 --- a/src/world/area_jan/jan_03/B34BD0.c +++ b/src/world/area_jan/jan_03/B34BD0.c @@ -1,5 +1,7 @@ #include "jan_03.h" +#define UNK_ALPHA_FUNC_NPC 17 + #include "world/common/SetPlayerStatusAnimFlags100000.inc.c" #include "world/common/GetCurrentFloor.inc.c" @@ -88,7 +90,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241EFC_B36ACC); INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241F68_B36B38); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241FC8_B36B98); +#include "world/common/UnkAlphaFunc.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242114_B36CE4); diff --git a/src/world/area_jan/jan_08/B5E910.c b/src/world/area_jan/jan_08/B5E910.c index f5a78cce67..21b41cb0dc 100644 --- a/src/world/area_jan/jan_08/B5E910.c +++ b/src/world/area_jan/jan_08/B5E910.c @@ -30,8 +30,6 @@ INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E910", func_80240C60_B5EF10); INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E910", func_80241198_B5F448); -INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E910", func_802412D8_B5F588); - -INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E910", func_80241320_B5F5D0); +#include "world/common/UnkPartnerPosFuncs.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E910", func_80241368_B5F618); diff --git a/src/world/area_jan/jan_22/B84180.c b/src/world/area_jan/jan_22/B84180.c index 1325892dc8..80d8a8c183 100644 --- a/src/world/area_jan/jan_22/B84180.c +++ b/src/world/area_jan/jan_22/B84180.c @@ -33,7 +33,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_22/B84180", func_80240FA8_B85128); INCLUDE_ASM(s32, "world/area_jan/jan_22/B84180", func_80240FC4_B85144); ApiStatus PostChapter5StatUpdate(ScriptInstance* script, s32 isInitialCall) { - PlayerData* playerData = PLAYER_DATA; + PlayerData* playerData = &gPlayerData; set_max_SP(5); playerData->curHP = playerData->curMaxHP; diff --git a/src/world/area_kmr/kmr_02/8B0070.c b/src/world/area_kmr/kmr_02/8B0070.c index c411b7c12a..ac3b597173 100644 --- a/src/world/area_kmr/kmr_02/8B0070.c +++ b/src/world/area_kmr/kmr_02/8B0070.c @@ -1,5 +1,7 @@ #include "kmr_02.h" +#define UNK_ALPHA_FUNC_NPC 8 + #include "world/common/SetPlayerStatusAnimFlags100000.inc.c" #include "world/common/GetCurrentFloor.inc.c" @@ -30,7 +32,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802406F0_8B0760); INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_8024075C_8B07CC); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802407BC_8B082C); +#include "world/common/UnkAlphaFunc.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240908_8B0978); diff --git a/src/world/area_kmr/kmr_03/8C7F90.c b/src/world/area_kmr/kmr_03/8C7F90.c index f96d6b4a2b..0b47700f2f 100644 --- a/src/world/area_kmr/kmr_03/8C7F90.c +++ b/src/world/area_kmr/kmr_03/8C7F90.c @@ -6,7 +6,7 @@ Script N(Main); ApiStatus func_80240000_8C7F90(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - PlayerData* playerData = PLAYER_DATA; + PlayerData* playerData = &gPlayerData; NpcId npcID = get_variable(script, *args++); PartnerID partnerID = get_variable(script, *args++); Npc* npc = get_npc_safe(npcID); diff --git a/src/world/area_kmr/kmr_03/8C82B0.c b/src/world/area_kmr/kmr_03/8C82B0.c index 37ca47412b..ce304cc3f9 100644 --- a/src/world/area_kmr/kmr_03/8C82B0.c +++ b/src/world/area_kmr/kmr_03/8C82B0.c @@ -5,7 +5,7 @@ #include "world/common/SetCamera0MoveFlag1.inc.c" ApiStatus func_80240358_8C82E8(ScriptInstance* script, s32 isInitialCall) { - PlayerStatus* playerStatus = PLAYER_STATUS; + PlayerStatus* playerStatus = &gPlayerStatus; f32 xDelta = playerStatus->currentSpeed * 5.0f * sin_deg(playerStatus->targetYaw); f32 zDelta = playerStatus->currentSpeed * 5.0f * -cos_deg(playerStatus->targetYaw); diff --git a/src/world/area_kmr/kmr_05/8CE070.c b/src/world/area_kmr/kmr_05/8CE070.c index d4f8c67856..e672971627 100644 --- a/src/world/area_kmr/kmr_05/8CE070.c +++ b/src/world/area_kmr/kmr_05/8CE070.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CE070", func_80240898_8CE908); INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CE070", func_80240C54_8CECC4); -INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CE070", func_80240CC0_8CED30); +#include "world/common/UnkNpcAIFunc14.inc.c" #include "world/common/UnkNpcAIFunc3.inc.c" diff --git a/src/world/area_kmr/kmr_06/8D1510.c b/src/world/area_kmr/kmr_06/8D1510.c index a695f1fde8..2a1e76af19 100644 --- a/src/world/area_kmr/kmr_06/8D1510.c +++ b/src/world/area_kmr/kmr_06/8D1510.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D1510", func_80240898_8D1DA8); INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D1510", func_80240C54_8D2164); -INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D1510", func_80240CC0_8D21D0); +#include "world/common/UnkNpcAIFunc14.inc.c" #include "world/common/UnkNpcAIFunc3.inc.c" diff --git a/src/world/area_kmr/kmr_09/8D5E00.c b/src/world/area_kmr/kmr_09/8D5E00.c index 3ad9b8b8df..fc9ea8ac4a 100644 --- a/src/world/area_kmr/kmr_09/8D5E00.c +++ b/src/world/area_kmr/kmr_09/8D5E00.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_09/8D5E00", func_80240898_8D6698); INCLUDE_ASM(s32, "world/area_kmr/kmr_09/8D5E00", func_80240C54_8D6A54); -INCLUDE_ASM(s32, "world/area_kmr/kmr_09/8D5E00", func_80240CC0_8D6AC0); +#include "world/common/UnkNpcAIFunc14.inc.c" #include "world/common/UnkNpcAIFunc3.inc.c" diff --git a/src/world/area_kzn/kzn_02/C5AC20.c b/src/world/area_kzn/kzn_02/C5AC20.c index e9798b9918..c25d9c03d4 100644 --- a/src/world/area_kzn/kzn_02/C5AC20.c +++ b/src/world/area_kzn/kzn_02/C5AC20.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80240D78_C5B4B8); INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80241134_C5B874); -INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_802411A0_C5B8E0); +#include "world/common/UnkNpcAIFunc14.inc.c" #include "world/common/UnkNpcAIFunc3.inc.c" diff --git a/src/world/area_kzn/kzn_04/C68440.c b/src/world/area_kzn/kzn_04/C68440.c index 8f7e93457f..4d036623ba 100644 --- a/src/world/area_kzn/kzn_04/C68440.c +++ b/src/world/area_kzn/kzn_04/C68440.c @@ -30,8 +30,6 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_04/C68440", func_80240910_C68A40); INCLUDE_ASM(s32, "world/area_kzn/kzn_04/C68440", func_80240E48_C68F78); -INCLUDE_ASM(s32, "world/area_kzn/kzn_04/C68440", func_80240F88_C690B8); - -INCLUDE_ASM(s32, "world/area_kzn/kzn_04/C68440", func_80240FD0_C69100); +#include "world/common/UnkPartnerPosFuncs.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_04/C68440", func_80241018_C69148); diff --git a/src/world/area_kzn/kzn_07/C6EA50.c b/src/world/area_kzn/kzn_07/C6EA50.c index 492c17f3c8..e8d5140a9c 100644 --- a/src/world/area_kzn/kzn_07/C6EA50.c +++ b/src/world/area_kzn/kzn_07/C6EA50.c @@ -16,7 +16,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_802410B8_C6F3E8); INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_80241474_C6F7A4); -INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_802414E0_C6F810); +#include "world/common/UnkNpcAIFunc14.inc.c" #include "world/common/UnkNpcAIFunc3.inc.c" diff --git a/src/world/area_kzn/kzn_08/C71ED0.c b/src/world/area_kzn/kzn_08/C71ED0.c index c934df00f9..6d1e4dfad0 100644 --- a/src/world/area_kzn/kzn_08/C71ED0.c +++ b/src/world/area_kzn/kzn_08/C71ED0.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_802412E8_C72768); INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_802416A4_C72B24); -INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80241710_C72B90); +#include "world/common/UnkNpcAIFunc14.inc.c" #include "world/common/UnkNpcAIFunc3.inc.c" diff --git a/src/world/area_kzn/kzn_09/C76CE0.c b/src/world/area_kzn/kzn_09/C76CE0.c index 42ba49e10f..0d06debe7a 100644 --- a/src/world/area_kzn/kzn_09/C76CE0.c +++ b/src/world/area_kzn/kzn_09/C76CE0.c @@ -30,8 +30,6 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C76CE0", func_80240600_C772E0); INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C76CE0", func_80240B38_C77818); -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C76CE0", func_80240C78_C77958); - -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C76CE0", func_80240CC0_C779A0); +#include "world/common/UnkPartnerPosFuncs.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C76CE0", func_80240D08_C779E8); diff --git a/src/world/area_kzn/kzn_11/C80600.c b/src/world/area_kzn/kzn_11/C80600.c index 793e3fe7fa..8657ab3a60 100644 --- a/src/world/area_kzn/kzn_11/C80600.c +++ b/src/world/area_kzn/kzn_11/C80600.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_80240CF8_C80E98); INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_802410B4_C81254); -INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_80241120_C812C0); +#include "world/common/UnkNpcAIFunc14.inc.c" #include "world/common/UnkNpcAIFunc3.inc.c" diff --git a/src/world/area_mac/mac_00/7EAD10.c b/src/world/area_mac/mac_00/7EAD10.c index f8f797cb77..7343787fc9 100644 --- a/src/world/area_mac/mac_00/7EAD10.c +++ b/src/world/area_mac/mac_00/7EAD10.c @@ -6,28 +6,30 @@ #ifdef NON_MATCHING ApiStatus func_80240034_7EAD44(ScriptInstance* script, s32 isInitialCall) { - s32 stickY; s32 stickX; + s32 stickY; if (gCollisionStatus.currentFloor != script->varTable[11]) { script->varTable[0] = 0; return ApiStatus_DONE2; } - stickX = GAME_STATUS->stickX; - stickY = GAME_STATUS->stickY; + stickX = (*gGameStatusPtr)->stickX; + stickY = (*gGameStatusPtr)->stickY; if (stickX < 0) { stickX = -stickX; } - if ((stickX != 0) || (stickY != 0)) { - if (atan2(0.0f, 0.0f, stickX, stickY) < 60.0f) { - script->varTable[0] = 1; - return ApiStatus_DONE2; - } + if (stickX == 0 && stickY == 0) { + return ApiStatus_BLOCK; } - return ApiStatus_BLOCK; + if (!(atan2(0.0f, 0.0f, stickX, stickY) < 60.0f)) { + return ApiStatus_BLOCK; + } + + script->varTable[0] = 1; + return ApiStatus_DONE2; } #else INCLUDE_ASM(s32, "world/area_mac/mac_00/7EAD10", func_80240034_7EAD44); diff --git a/src/world/area_mac/mac_00/7EB340.c b/src/world/area_mac/mac_00/7EB340.c index 6b287ce9c7..d1390e980c 100644 --- a/src/world/area_mac/mac_00/7EB340.c +++ b/src/world/area_mac/mac_00/7EB340.c @@ -1,5 +1,7 @@ #include "mac_00.h" +#define UNK_ALPHA_FUNC_NPC 6 + INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80240630_7EB340); #include "world/common/GetItemName.inc.c" @@ -14,7 +16,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80240990_7EB6A0); INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_802409FC_7EB70C); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80240A5C_7EB76C); +#include "world/common/UnkAlphaFunc.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80240BA8_7EB8B8); diff --git a/src/world/area_mac/mac_01/800880.c b/src/world/area_mac/mac_01/800880.c index 308033f505..67c09abf1a 100644 --- a/src/world/area_mac/mac_01/800880.c +++ b/src/world/area_mac/mac_01/800880.c @@ -3,7 +3,7 @@ ApiStatus func_80240000_800880(ScriptInstance* script, s32 isInitialCall) { s32 itemIndex = get_variable(script, *script->ptrReadPos); - set_item_entity_flags(GAME_STATUS->shopItemData[itemIndex * 4], 0x40); + set_item_entity_flags((*gGameStatusPtr)->shopItemData[itemIndex * 4], 0x40); return ApiStatus_DONE2; } @@ -11,7 +11,7 @@ ApiStatus func_80240044_8008C4(ScriptInstance* script, s32 isInitialCall) { s32 itemIndex = get_variable(script, *script->ptrReadPos); s32* var1 = get_variable(NULL, SI_MAP_VAR(2)); - set_item_entity_flags(GAME_STATUS->shopItemData[itemIndex * 4], 0x40); + set_item_entity_flags((*gGameStatusPtr)->shopItemData[itemIndex * 4], 0x40); set_variable(NULL, var1[itemIndex], 1); return ApiStatus_DONE2; } diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c index 52dc0cfb89..34d7376970 100644 --- a/src/world/area_mac/mac_01/8017D0.c +++ b/src/world/area_mac/mac_01/8017D0.c @@ -1,5 +1,7 @@ #include "mac_01.h" +#define UNK_ALPHA_FUNC_NPC 5 + extern u8 D_80258407_818C87; #include "world/common/UnkMusicFunc.inc.c" @@ -52,7 +54,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242270_802AF0); INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802422DC_802B5C); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_8024233C_802BBC); +#include "world/common/UnkAlphaFunc.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242488_802D08); @@ -185,7 +187,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80245028_8058A8); INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_8024522C_805AAC); ApiStatus func_80245440_805CC0(ScriptInstance* script, s32 isInitialCall) { - if (PLAYER_DATA->currentPartner == script->varTable[10]) { + if (gPlayerData.currentPartner == script->varTable[10]) { script->varTable[1] = 0; return ApiStatus_DONE2; } diff --git a/src/world/area_mac/mac_02/823BF0.c b/src/world/area_mac/mac_02/823BF0.c index fe100a956a..a12c34bbeb 100644 --- a/src/world/area_mac/mac_02/823BF0.c +++ b/src/world/area_mac/mac_02/823BF0.c @@ -1,5 +1,7 @@ #include "mac_02.h" +#define UNK_ALPHA_FUNC_NPC 12 + INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80240930_823BF0); INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80240A88_823D48); @@ -38,7 +40,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80241B20_824DE0); INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80241B8C_824E4C); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80241BEC_824EAC); +#include "world/common/UnkAlphaFunc.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80241D38_824FF8); diff --git a/src/world/area_mac/mac_03/831B20.c b/src/world/area_mac/mac_03/831B20.c index 77b79a3ce0..d1c54d8144 100644 --- a/src/world/area_mac/mac_03/831B20.c +++ b/src/world/area_mac/mac_03/831B20.c @@ -1,5 +1,7 @@ #include "mac_03.h" +#define UNK_ALPHA_FUNC_NPC 23 + #include "common/UnkFloatFunc.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802404B0_831CB0); @@ -16,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80240810_832010); INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_8024087C_83207C); -INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802408DC_8320DC); +#include "world/common/UnkAlphaFunc.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80240A28_832228); diff --git a/src/world/area_mac/mac_04/843030.c b/src/world/area_mac/mac_04/843030.c index 000eabbb41..be13c4beab 100644 --- a/src/world/area_mac/mac_04/843030.c +++ b/src/world/area_mac/mac_04/843030.c @@ -1,5 +1,7 @@ #include "mac_04.h" +#define UNK_ALPHA_FUNC_NPC 20 + INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240460_843030); #include "world/common/GetItemName.inc.c" @@ -14,7 +16,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_802407C0_843390); INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_8024082C_8433FC); -INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_8024088C_84345C); +#include "world/common/UnkAlphaFunc.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_802409D8_8435A8); @@ -65,7 +67,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241848_844418); INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_802418AC_84447C); ApiStatus PostChapter4StatUpdate(ScriptInstance* script, s32 isInitialCall) { - PlayerData* playerData = PLAYER_DATA; + PlayerData* playerData = &gPlayerData; set_max_SP(4); playerData->curHP = playerData->curMaxHP; diff --git a/src/world/area_mac/mac_05/852170.c b/src/world/area_mac/mac_05/852170.c index 61e4d9c09c..94deac4ce6 100644 --- a/src/world/area_mac/mac_05/852170.c +++ b/src/world/area_mac/mac_05/852170.c @@ -1,5 +1,7 @@ #include "mac_05.h" +#define UNK_ALPHA_FUNC_NPC 6 + #include "world/common/UnkTexturePanFunc.inc.c" #include "world/common/UnkTexturePanFunc2.inc.c" @@ -46,7 +48,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241680_8537F0); INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_802416EC_85385C); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024174C_8538BC); +#include "world/common/UnkAlphaFunc.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241898_853A08); diff --git a/src/world/area_mim/mim_08/BAD940.c b/src/world/area_mim/mim_08/BAD940.c index e309ab99c2..b0f26d3f74 100644 --- a/src/world/area_mim/mim_08/BAD940.c +++ b/src/world/area_mim/mim_08/BAD940.c @@ -16,7 +16,7 @@ INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80240938_BAE278); INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80240CF4_BAE634); -INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80240D60_BAE6A0); +#include "world/common/UnkNpcAIFunc14.inc.c" #include "world/common/UnkNpcAIFunc3.inc.c" diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c index 4d30852229..e14d4eaca3 100644 --- a/src/world/area_nok/nok_01/9C53E0.c +++ b/src/world/area_nok/nok_01/9C53E0.c @@ -1,5 +1,7 @@ #include "nok_01.h" +#define UNK_ALPHA_FUNC_NPC 15 + INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240000_9C53E0); INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802400B4_9C5494); @@ -54,7 +56,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802410C8_9C64A8); INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241134_9C6514); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241194_9C6574); +#include "world/common/UnkAlphaFunc.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802412E0_9C66C0); diff --git a/src/world/area_nok/nok_02/9D7AA0.c b/src/world/area_nok/nok_02/9D7AA0.c index c510d0e076..93f18345b4 100644 --- a/src/world/area_nok/nok_02/9D7AA0.c +++ b/src/world/area_nok/nok_02/9D7AA0.c @@ -1,5 +1,7 @@ #include "nok_02.h" +#define UNK_ALPHA_FUNC_NPC 19 + INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80240A80_9D7AA0); INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80240BD8_9D7BF8); @@ -38,7 +40,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241C70_9D8C90); INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241CDC_9D8CFC); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241D3C_9D8D5C); +#include "world/common/UnkAlphaFunc.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241E88_9D8EA8); diff --git a/src/world/area_nok/nok_11/9F4A40.c b/src/world/area_nok/nok_11/9F4A40.c index 7f91162dc7..ee5b7fbe4c 100644 --- a/src/world/area_nok/nok_11/9F4A40.c +++ b/src/world/area_nok/nok_11/9F4A40.c @@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_8024106C_9F5AAC); INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_80241428_9F5E68); -INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_80241494_9F5ED4); +#include "world/common/UnkNpcAIFunc14.inc.c" #include "world/common/UnkNpcAIFunc3.inc.c" diff --git a/src/world/area_nok/nok_14/A02A00.c b/src/world/area_nok/nok_14/A02A00.c index 69af440b19..68d0318e84 100644 --- a/src/world/area_nok/nok_14/A02A00.c +++ b/src/world/area_nok/nok_14/A02A00.c @@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_8024122C_A03A6C); INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_802415E8_A03E28); -INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_80241654_A03E94); +#include "world/common/UnkNpcAIFunc14.inc.c" #include "world/common/UnkNpcAIFunc3.inc.c" diff --git a/src/world/area_nok/nok_15/A06F00.c b/src/world/area_nok/nok_15/A06F00.c index 1fad869b70..81a577ab46 100644 --- a/src/world/area_nok/nok_15/A06F00.c +++ b/src/world/area_nok/nok_15/A06F00.c @@ -34,7 +34,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_8024134C_A0824C); INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_80241708_A08608); -INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_80241774_A08674); +#include "world/common/UnkNpcAIFunc14.inc.c" #include "world/common/UnkNpcAIFunc3.inc.c" diff --git a/src/world/area_omo/omo_04/DAD400.c b/src/world/area_omo/omo_04/DAD400.c index 9b0c4d9b90..48897625fc 100644 --- a/src/world/area_omo/omo_04/DAD400.c +++ b/src/world/area_omo/omo_04/DAD400.c @@ -26,7 +26,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80240C38_DAE038); INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80240FF4_DAE3F4); -INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80241060_DAE460); +#include "world/common/UnkNpcAIFunc14.inc.c" #include "world/common/UnkNpcAIFunc3.inc.c" diff --git a/src/world/area_omo/omo_05/DB22C0.c b/src/world/area_omo/omo_05/DB22C0.c index 990af5ff60..5619dc903c 100644 --- a/src/world/area_omo/omo_05/DB22C0.c +++ b/src/world/area_omo/omo_05/DB22C0.c @@ -28,7 +28,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_802412EC_DB35AC); INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_802416A8_DB3968); -INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80241714_DB39D4); +#include "world/common/UnkNpcAIFunc14.inc.c" #include "world/common/UnkNpcAIFunc3.inc.c" diff --git a/src/world/area_omo/omo_07/DBD2B0.c b/src/world/area_omo/omo_07/DBD2B0.c index cb3b50f354..36485033e9 100644 --- a/src/world/area_omo/omo_07/DBD2B0.c +++ b/src/world/area_omo/omo_07/DBD2B0.c @@ -58,7 +58,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80242210_DBF4C0); INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_802425CC_DBF87C); -INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80242638_DBF8E8); +#include "world/common/UnkNpcAIFunc14.inc.c" #include "world/common/UnkNpcAIFunc3.inc.c" diff --git a/src/world/area_omo/omo_11/DDCFC0.c b/src/world/area_omo/omo_11/DDCFC0.c index 201cff06a4..d8eae6e498 100644 --- a/src/world/area_omo/omo_11/DDCFC0.c +++ b/src/world/area_omo/omo_11/DDCFC0.c @@ -30,8 +30,6 @@ INCLUDE_ASM(s32, "world/area_omo/omo_11/DDCFC0", func_80240D90_DDD5C0); INCLUDE_ASM(s32, "world/area_omo/omo_11/DDCFC0", func_802412C8_DDDAF8); -INCLUDE_ASM(s32, "world/area_omo/omo_11/DDCFC0", func_80241408_DDDC38); - -INCLUDE_ASM(s32, "world/area_omo/omo_11/DDCFC0", func_80241450_DDDC80); +#include "world/common/UnkPartnerPosFuncs.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_11/DDCFC0", func_80241498_DDDCC8); diff --git a/src/world/area_omo/omo_17/DEF400.c b/src/world/area_omo/omo_17/DEF400.c index ea46fef4f6..05f57f9984 100644 --- a/src/world/area_omo/omo_17/DEF400.c +++ b/src/world/area_omo/omo_17/DEF400.c @@ -28,7 +28,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_8024184C_DF06EC); INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80241C08_DF0AA8); -INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80241C74_DF0B14); +#include "world/common/UnkNpcAIFunc14.inc.c" #include "world/common/UnkNpcAIFunc3.inc.c" diff --git a/src/world/area_pra/pra_01/D4D060.c b/src/world/area_pra/pra_01/D4D060.c index 992df12048..32fdb3c1fd 100644 --- a/src/world/area_pra/pra_01/D4D060.c +++ b/src/world/area_pra/pra_01/D4D060.c @@ -46,7 +46,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_80241238_D4E278); INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_802412D4_D4E314); ApiStatus PostChapter7StatUpdate(ScriptInstance* script, s32 isInitialCall) { - PlayerData* playerData = PLAYER_DATA; + PlayerData* playerData = &gPlayerData; set_max_SP(7); playerData->curHP = playerData->curMaxHP; diff --git a/src/world/area_sam/sam_01/CF7E80.c b/src/world/area_sam/sam_01/CF7E80.c index baec5357cc..da13b9d1a6 100644 --- a/src/world/area_sam/sam_01/CF7E80.c +++ b/src/world/area_sam/sam_01/CF7E80.c @@ -1,5 +1,7 @@ #include "sam_01.h" +#define UNK_ALPHA_FUNC_NPC 14 + #include "world/common/GetNpcCollisionHeight.inc.c" #include "world/common/SomeXYZFuncTodoRename.inc.c" @@ -26,7 +28,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240A60_CF85D0); INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240ACC_CF863C); -INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240B2C_CF869C); +#include "world/common/UnkAlphaFunc.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240C78_CF87E8); @@ -70,7 +72,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241A10_CF9580); INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241A54_CF95C4); -INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241A80_CF95F0); +#include "common/GetItemEntityPosition.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241B20_CF9690); diff --git a/src/world/area_sam/sam_02/D05F60.c b/src/world/area_sam/sam_02/D05F60.c index 630152cf2d..3793b69096 100644 --- a/src/world/area_sam/sam_02/D05F60.c +++ b/src/world/area_sam/sam_02/D05F60.c @@ -1,5 +1,7 @@ #include "sam_02.h" +#define UNK_ALPHA_FUNC_NPC 8 + #include "world/common/Call800E9894.inc.c" #include "world/common/Call800E98C4SyncStatusMenu.inc.c" @@ -34,7 +36,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240E8C_D065BC); INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240EF8_D06628); -INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240F58_D06688); +#include "world/common/UnkAlphaFunc.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_802410A4_D067D4); diff --git a/src/world/area_sam/sam_06/D203E0.c b/src/world/area_sam/sam_06/D203E0.c index 74c508fda8..e65cba4c07 100644 --- a/src/world/area_sam/sam_06/D203E0.c +++ b/src/world/area_sam/sam_06/D203E0.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80240DE8_D20C78); INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_802411A4_D21034); -INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241210_D210A0); +#include "world/common/UnkNpcAIFunc14.inc.c" #include "world/common/UnkNpcAIFunc3.inc.c" diff --git a/src/world/area_sam/sam_08/D2FC80.c b/src/world/area_sam/sam_08/D2FC80.c index c26c3c630e..ffa612bd65 100644 --- a/src/world/area_sam/sam_08/D2FC80.c +++ b/src/world/area_sam/sam_08/D2FC80.c @@ -30,8 +30,6 @@ INCLUDE_ASM(s32, "world/area_sam/sam_08/D2FC80", func_80240600_D30280); INCLUDE_ASM(s32, "world/area_sam/sam_08/D2FC80", func_80240B38_D307B8); -INCLUDE_ASM(s32, "world/area_sam/sam_08/D2FC80", func_80240C78_D308F8); - -INCLUDE_ASM(s32, "world/area_sam/sam_08/D2FC80", func_80240CC0_D30940); +#include "world/common/UnkPartnerPosFuncs.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_08/D2FC80", func_80240D08_D30988); diff --git a/src/world/area_sam/sam_11/D3ADA0.c b/src/world/area_sam/sam_11/D3ADA0.c index b6a388fc00..cf93878904 100644 --- a/src/world/area_sam/sam_11/D3ADA0.c +++ b/src/world/area_sam/sam_11/D3ADA0.c @@ -1,5 +1,7 @@ #include "sam_11.h" +#define UNK_ALPHA_FUNC_NPC 17 + INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802407D0_D3ADA0); #include "world/common/GetItemName.inc.c" @@ -16,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80240B30_D3B100); INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80240B9C_D3B16C); -INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80240BFC_D3B1CC); +#include "world/common/UnkAlphaFunc.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80240D48_D3B318); diff --git a/src/world/area_sbk/sbk_02/92A9A0.c b/src/world/area_sbk/sbk_02/92A9A0.c index 21a102bad9..a5d383420f 100644 --- a/src/world/area_sbk/sbk_02/92A9A0.c +++ b/src/world/area_sbk/sbk_02/92A9A0.c @@ -15,7 +15,7 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_02/92A9A0", func_80240A44_92ACF4); #include "world/common/GetItemName.inc.c" ApiStatus PostChapter2StatUpdate(ScriptInstance* script, s32 isInitialCall) { - PlayerData* playerData = PLAYER_DATA; + PlayerData* playerData = &gPlayerData; set_max_SP(2); playerData->curHP = playerData->curMaxHP; diff --git a/src/world/area_sbk/sbk_56/953FC0.c b/src/world/area_sbk/sbk_56/953FC0.c index b741449e37..ae7b982ef0 100644 --- a/src/world/area_sbk/sbk_56/953FC0.c +++ b/src/world/area_sbk/sbk_56/953FC0.c @@ -36,8 +36,6 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_80240680_954640); INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_80240BB8_954B78); -INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_80240CF8_954CB8); - -INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_80240D40_954D00); +#include "world/common/UnkPartnerPosFuncs.inc.c" INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_80240D88_954D48); diff --git a/src/world/area_tik/tik_07/879BE0.c b/src/world/area_tik/tik_07/879BE0.c index 3355229358..9765a79049 100644 --- a/src/world/area_tik/tik_07/879BE0.c +++ b/src/world/area_tik/tik_07/879BE0.c @@ -42,8 +42,6 @@ INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_802408E0_87A4C0); INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_80240E18_87A9F8); -INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_80240F58_87AB38); - -INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_80240FA0_87AB80); +#include "world/common/UnkPartnerPosFuncs.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_80240FE8_87ABC8); diff --git a/src/world/area_tik/tik_07/87AC00.c b/src/world/area_tik/tik_07/87AC00.c index 2dbf7e9baf..259990cfcf 100644 --- a/src/world/area_tik/tik_07/87AC00.c +++ b/src/world/area_tik/tik_07/87AC00.c @@ -16,7 +16,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_80241C88_87B868); INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_80242044_87BC24); -INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_802420B0_87BC90); +#include "world/common/UnkNpcAIFunc14.inc.c" #include "world/common/UnkNpcAIFunc3.inc.c" diff --git a/src/world/area_tik/tik_10/8866D0.c b/src/world/area_tik/tik_10/8866D0.c index de041d8d83..d7d363b409 100644 --- a/src/world/area_tik/tik_10/8866D0.c +++ b/src/world/area_tik/tik_10/8866D0.c @@ -32,8 +32,6 @@ INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_80240C80_887040); INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_802411B8_887578); -INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_802412F8_8876B8); - -INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_80241340_887700); +#include "world/common/UnkPartnerPosFuncs.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_80241388_887748); diff --git a/src/world/area_tik/tik_12/8891C0.c b/src/world/area_tik/tik_12/8891C0.c index f7a9adc3e3..e675e57d2f 100644 --- a/src/world/area_tik/tik_12/8891C0.c +++ b/src/world/area_tik/tik_12/8891C0.c @@ -40,8 +40,6 @@ INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_8024121C_889DEC); INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80241754_88A324); -INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80241894_88A464); - -INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_802418DC_88A4AC); +#include "world/common/UnkPartnerPosFuncs.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80241924_88A4F4); diff --git a/src/world/area_tik/tik_17/892A50.c b/src/world/area_tik/tik_17/892A50.c index 5c51823af9..b532e247a9 100644 --- a/src/world/area_tik/tik_17/892A50.c +++ b/src/world/area_tik/tik_17/892A50.c @@ -30,8 +30,6 @@ INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_80240630_893050); INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_80240B68_893588); -INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_80240CA8_8936C8); - -INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_80240CF0_893710); +#include "world/common/UnkPartnerPosFuncs.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_80240D38_893758); diff --git a/src/world/area_tik/tik_19/897BD0.c b/src/world/area_tik/tik_19/897BD0.c index c78f3d7f59..b70a1dddb6 100644 --- a/src/world/area_tik/tik_19/897BD0.c +++ b/src/world/area_tik/tik_19/897BD0.c @@ -30,8 +30,6 @@ INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_80240BF0_8981D0); INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_80241128_898708); -INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_80241268_898848); - -INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_802412B0_898890); +#include "world/common/UnkPartnerPosFuncs.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_802412F8_8988D8); diff --git a/src/world/area_trd/trd_00/99A240.c b/src/world/area_trd/trd_00/99A240.c index a712f4c92e..04bd9ab686 100644 --- a/src/world/area_trd/trd_00/99A240.c +++ b/src/world/area_trd/trd_00/99A240.c @@ -1,7 +1,7 @@ #include "trd_00.h" ApiStatus PostChapter1StatUpdate(ScriptInstance* script, s32 isInitialCall) { - PlayerData* playerData = PLAYER_DATA; + PlayerData* playerData = &gPlayerData; set_max_SP(1); playerData->curHP = playerData->curMaxHP; diff --git a/src/world/area_trd/trd_03/9A4650.c b/src/world/area_trd/trd_03/9A4650.c index 17538165da..6edcf5f86b 100644 --- a/src/world/area_trd/trd_03/9A4650.c +++ b/src/world/area_trd/trd_03/9A4650.c @@ -6,9 +6,9 @@ ApiStatus func_80240000_9A4650(ScriptInstance* script, s32 isInitialCall) { stickX = 0; if (gCollisionStatus.pushingAgainstWall == COLLIDER_o84) { - stickX = GAME_STATUS->stickX < 0; + stickX = (*gGameStatusPtr)->stickX < 0; } - if ((gCollisionStatus.pushingAgainstWall == COLLIDER_o85) && (GAME_STATUS->stickX > 0)) { + if ((gCollisionStatus.pushingAgainstWall == COLLIDER_o85) && ((*gGameStatusPtr)->stickX > 0)) { stickX = 2; } @@ -17,6 +17,6 @@ ApiStatus func_80240000_9A4650(ScriptInstance* script, s32 isInitialCall) { } ApiStatus GetFrameCounter(ScriptInstance* script, s32 isInitialCall) { - set_variable(script, *script->ptrReadPos, GAME_STATUS->frameCounter); + set_variable(script, *script->ptrReadPos, (*gGameStatusPtr)->frameCounter); return ApiStatus_DONE2; } diff --git a/src/world/area_trd/trd_04/9A88A0.c b/src/world/area_trd/trd_04/9A88A0.c index b0023d9fae..fc19378301 100644 --- a/src/world/area_trd/trd_04/9A88A0.c +++ b/src/world/area_trd/trd_04/9A88A0.c @@ -50,7 +50,7 @@ INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_802426B0_9AAAA0); INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80242A6C_9AAE5C); -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80242AD8_9AAEC8); +#include "world/common/UnkNpcAIFunc14.inc.c" #include "world/common/UnkNpcAIFunc3.inc.c" diff --git a/src/world/area_trd/trd_07/9B6C90.c b/src/world/area_trd/trd_07/9B6C90.c index dbbf2217c1..41b8208409 100644 --- a/src/world/area_trd/trd_07/9B6C90.c +++ b/src/world/area_trd/trd_07/9B6C90.c @@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_8024137C_9B7CFC); INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_80241738_9B80B8); -INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_802417A4_9B8124); +#include "world/common/UnkNpcAIFunc14.inc.c" #include "world/common/UnkNpcAIFunc3.inc.c" diff --git a/src/world/common/AwaitPlayerNearNpc.inc.c b/src/world/common/AwaitPlayerNearNpc.inc.c index 4b34ad6493..7ad0522ae5 100644 --- a/src/world/common/AwaitPlayerNearNpc.inc.c +++ b/src/world/common/AwaitPlayerNearNpc.inc.c @@ -11,7 +11,7 @@ ApiStatus N(func_80240814_97BE44)(ScriptInstance* script, s32 isInitialCall) { } ApiStatus N(AwaitPlayerNearNpc)(ScriptInstance* script, s32 isInitialCall) { - PlayerStatus* playerStatus = PLAYER_STATUS; + PlayerStatus* playerStatus = &gPlayerStatus; Npc* npc = get_npc_safe(script->owner2.npcID); if (dist2D(npc->pos.x, npc->pos.z, playerStatus->position.x, playerStatus->position.z) < 50.0f) { diff --git a/src/world/common/DeadUnkNpcAIFunc14.inc.c b/src/world/common/DeadUnkNpcAIFunc14.inc.c new file mode 100644 index 0000000000..9486d88cae --- /dev/null +++ b/src/world/common/DeadUnkNpcAIFunc14.inc.c @@ -0,0 +1,31 @@ +#include "common.h" +#include "map.h" + +void N(DeadUnkNpcAIFunc14)(ScriptInstance* script, NpcAISettings* aiSettings) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = func_8003E4BC(enemy->npcID); + f32 vt5 = enemy->varTable[5]; + f32 jumpVelocity = vt5 / 100.0; + f32 vt6 = enemy->varTable[6]; + f32 jumpScale = vt6 / 100.0; + + npc->currentAnim = enemy->animList[8]; + npc->jumpVelocity = jumpVelocity; + npc->jumpScale = jumpScale; + npc->moveSpeed = aiSettings->chaseSpeed; + npc->yaw = func_8002AF70(npc->pos.x, npc->pos.z, D_800FFC90->position.x, D_800FFC90->position.z); + + enemy->varTable[2] = 0; + + if (enemy->npcSettings->unk_2A & 2) { + npc->duration = 3; + script->functionTemp[0].s = 13; + } else { + npc->duration = 1; + script->functionTemp[0].s = 14; + enemy->unk_10.x = npc->pos.x; + enemy->unk_10.y = npc->pos.y; + enemy->unk_10.z = npc->pos.z; + enemy->unk_07 = 1; + } +} diff --git a/src/world/common/DeadUnkPartnerPosFuncs.inc.c b/src/world/common/DeadUnkPartnerPosFuncs.inc.c new file mode 100644 index 0000000000..efa34e17a6 --- /dev/null +++ b/src/world/common/DeadUnkPartnerPosFuncs.inc.c @@ -0,0 +1,15 @@ +#include "common.h" + +ApiStatus N(DeadUnkPartnerPosFunc)(ScriptInstance* script, s32 isInitialCall) { + Npc* partner = func_8003E534(NpcId_PARTNER); + + func_80075170(2, partner->pos.x, partner->pos.y + 30.0f, partner->pos.z, 30.0f); + return ApiStatus_DONE2; +} + +ApiStatus N(DeadUnkPartnerPosFunc2)(ScriptInstance* script, s32 isInitialCall) { + Npc* partner = func_8003E534(NpcId_PARTNER); + + func_80075170(4, partner->pos.x, partner->pos.y + 30.0f, partner->pos.z, 30.0f); + return ApiStatus_DONE2; +} diff --git a/src/world/common/GetGameStatus75.inc.c b/src/world/common/GetGameStatus75.inc.c index 6aa3d2d94b..3be0ef783f 100644 --- a/src/world/common/GetGameStatus75.inc.c +++ b/src/world/common/GetGameStatus75.inc.c @@ -2,6 +2,6 @@ #include "map.h" ApiStatus N(GetGameStatus75)(ScriptInstance* script, s32 isInitialCall) { - set_variable(script, SI_VAR(0), GAME_STATUS->unk_75); + set_variable(script, SI_VAR(0), (*gGameStatusPtr)->unk_75); return ApiStatus_DONE2; } diff --git a/src/world/common/GetPartnerCall800EB168.inc.c b/src/world/common/GetPartnerCall800EB168.inc.c index 9921c543d8..ce0bab6209 100644 --- a/src/world/common/GetPartnerCall800EB168.inc.c +++ b/src/world/common/GetPartnerCall800EB168.inc.c @@ -2,7 +2,7 @@ #include "map.h" ApiStatus N(GetPartnerCall800EB168)(ScriptInstance* script, s32 isInitialCall) { - set_variable(script, *script->ptrReadPos, PLAYER_DATA->currentPartner); + set_variable(script, *script->ptrReadPos, gPlayerData.currentPartner); func_800EB168(0); return ApiStatus_DONE2; } diff --git a/src/world/common/SetGameStatusUnk84_1.inc.c b/src/world/common/SetGameStatusUnk84_1.inc.c index 5faa09e19f..f5055f0f35 100644 --- a/src/world/common/SetGameStatusUnk84_1.inc.c +++ b/src/world/common/SetGameStatusUnk84_1.inc.c @@ -2,6 +2,6 @@ #include "map.h" ApiStatus N(SetGameStatusUnk84_1)(ScriptInstance* script, s32 isInitialCall) { - GAME_STATUS->unk_84 = 1; + (*gGameStatusPtr)->unk_84 = 1; return ApiStatus_BLOCK; } diff --git a/src/world/common/SomeXYZFunc2.inc.c b/src/world/common/SomeXYZFunc2.inc.c index 0c4dcafc44..ca3a94e64d 100644 --- a/src/world/common/SomeXYZFunc2.inc.c +++ b/src/world/common/SomeXYZFunc2.inc.c @@ -2,7 +2,7 @@ #include "map.h" ApiStatus N(SomeXYZFunc2)(ScriptInstance* script, s32 isInitialStatus) { - PlayerStatus* playerStatus = PLAYER_STATUS; + PlayerStatus* playerStatus = &gPlayerStatus; f32 r = get_float_variable(script, *script->ptrReadPos); f32 x = playerStatus->position.x; f32 y = playerStatus->position.y; diff --git a/src/world/common/SomeXYZFuncTodoRename.inc.c b/src/world/common/SomeXYZFuncTodoRename.inc.c index 6338387545..4c7325756a 100644 --- a/src/world/common/SomeXYZFuncTodoRename.inc.c +++ b/src/world/common/SomeXYZFuncTodoRename.inc.c @@ -2,7 +2,7 @@ #include "map.h" ApiStatus N(SomeXYZFuncTodoRename)(ScriptInstance* script, s32 isInitialStatus) { - PlayerStatus* playerStatus = PLAYER_STATUS; + PlayerStatus* playerStatus = &gPlayerStatus; Bytecode* args = script->ptrReadPos; s32 xVar = *args++; f32 x = (f32)get_variable(script, xVar); diff --git a/src/world/common/UnkAlphaFunc.inc.c b/src/world/common/UnkAlphaFunc.inc.c new file mode 100644 index 0000000000..bb00338329 --- /dev/null +++ b/src/world/common/UnkAlphaFunc.inc.c @@ -0,0 +1,37 @@ +#include "common.h" + +ApiStatus N(UnkAlphaFunc)(ScriptInstance* script, s32 isInitialCall) { + if (isInitialCall) { + s32 i; + + func_8011D82C(1); + D_801512F0[0] = 1; + set_background_color_blend(0, 0, 0, 0); + + for (i = 0; i < 64; i++) { + Npc* npc = get_npc_by_index(i); + + if (npc != NULL && npc->flags != 0 && npc->npcID != NpcId_PARTNER && npc->npcID != UNK_ALPHA_FUNC_NPC) { + npc->flags |= 0x800000; + } + } + + for (i = 0; i < 256; i++) { + ItemEntity* itemEntity = get_item_entity(i); + + if (itemEntity != NULL && itemEntity->flags & 0x10) { + itemEntity->flags |= 0x8000000; + } + } + + script->functionTemp[0].s = 0; + } + + script->functionTemp[0].s += 8; + if (script->functionTemp[0].s > 255) { + script->functionTemp[0].s = 255; + } + + set_background_color_blend(0, 0, 0, script->functionTemp[0].s); + return (script->functionTemp[0].s == 255) * ApiStatus_DONE2; +} diff --git a/src/world/common/UnkNpcAIFunc14.inc.c b/src/world/common/UnkNpcAIFunc14.inc.c new file mode 100644 index 0000000000..957445b302 --- /dev/null +++ b/src/world/common/UnkNpcAIFunc14.inc.c @@ -0,0 +1,31 @@ +#include "common.h" +#include "map.h" + +void N(UnkNpcAIFunc14)(ScriptInstance* script, NpcAISettings* aiSettings) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + f32 vt5 = enemy->varTable[5]; + f32 jumpVelocity = vt5 / 100.0; + f32 vt6 = enemy->varTable[6]; + f32 jumpScale = vt6 / 100.0; + + npc->currentAnim = enemy->animList[8]; + npc->jumpVelocity = jumpVelocity; + npc->jumpScale = jumpScale; + npc->moveSpeed = aiSettings->chaseSpeed; + npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + + enemy->varTable[2] = 0; + + if (enemy->npcSettings->unk_2A & 2) { + npc->duration = 3; + script->functionTemp[0].s = 13; + } else { + npc->duration = 1; + script->functionTemp[0].s = 14; + enemy->unk_10.x = npc->pos.x; + enemy->unk_10.y = npc->pos.y; + enemy->unk_10.z = npc->pos.z; + enemy->unk_07 = 1; + } +} diff --git a/src/world/common/UnkPartnerPosFuncs.inc.c b/src/world/common/UnkPartnerPosFuncs.inc.c new file mode 100644 index 0000000000..4732069ee1 --- /dev/null +++ b/src/world/common/UnkPartnerPosFuncs.inc.c @@ -0,0 +1,15 @@ +#include "common.h" + +ApiStatus N(UnkPartnerPosFunc)(ScriptInstance* script, s32 isInitialCall) { + Npc* partner = get_npc_safe(NpcId_PARTNER); + + func_8006FEF0(2, partner->pos.x, partner->pos.y + 30.0f, partner->pos.z, 30.0f); + return ApiStatus_DONE2; +} + +ApiStatus N(UnkPartnerPosFunc2)(ScriptInstance* script, s32 isInitialCall) { + Npc* partner = get_npc_safe(NpcId_PARTNER); + + func_8006FEF0(4, partner->pos.x, partner->pos.y + 30.0f, partner->pos.z, 30.0f); + return ApiStatus_DONE2; +} diff --git a/src/world/common/UnkPositionFunc.inc.c b/src/world/common/UnkPositionFunc.inc.c index 1fdb844b8d..803a3df5e4 100644 --- a/src/world/common/UnkPositionFunc.inc.c +++ b/src/world/common/UnkPositionFunc.inc.c @@ -3,7 +3,7 @@ ApiStatus N(UnkPositionFunc)(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - PlayerStatus* playerStatus = PLAYER_STATUS; + PlayerStatus* playerStatus = &gPlayerStatus; f32 var0 = get_variable(script, *args++); f32 var1 = get_variable(script, *args++); f32 var2 = get_variable(script, *args++); diff --git a/src/world/common/UnkRotatePlayer.inc.c b/src/world/common/UnkRotatePlayer.inc.c index 9bf1dca16c..742a21a125 100644 --- a/src/world/common/UnkRotatePlayer.inc.c +++ b/src/world/common/UnkRotatePlayer.inc.c @@ -2,7 +2,7 @@ #include "map.h" ApiStatus N(UnkRotatePlayer)(ScriptInstance* script, s32 isInitialCall) { - PlayerStatus* playerStatus = PLAYER_STATUS; + PlayerStatus* playerStatus = &gPlayerStatus; if (isInitialCall) { script->functionTemp[0].s = 60; diff --git a/src/world/partner/bombette.c b/src/world/partner/bombette.c index f83bbbb4dc..f0631a1bf8 100644 --- a/src/world/partner/bombette.c +++ b/src/world/partner/bombette.c @@ -5,7 +5,7 @@ INCLUDE_ASM(s32, "world/partner/bombette", func_802BD100_317E50); INCLUDE_ASM(s32, "world/partner/bombette", func_802BD2D8_318028); ApiStatus func_802BD300_318050(ScriptInstance* script, s32 isInitialCall) { - s32 unk = script->owner2.npc; // todo what is this + Npc* unk = script->owner2.npc; // todo what is this if (isInitialCall) { func_800EECC4(unk); diff --git a/src/world/partner/parakarry.c b/src/world/partner/parakarry.c index 3cea7dc60e..8834474b07 100644 --- a/src/world/partner/parakarry.c +++ b/src/world/partner/parakarry.c @@ -3,7 +3,7 @@ INCLUDE_ASM(s32, "world/partner/parakarry", func_802BD100_319670); ApiStatus func_802BD148_3196B8(ScriptInstance* script, s32 isInitialCall) { - s32 unk = script->owner2.npc; // todo what is this + Npc* unk = script->owner2.npc; // todo what is this if (isInitialCall) { func_800EECC4(unk); diff --git a/src/world/partners.c b/src/world/partners.c index 7527767518..2ef68bb68e 100644 --- a/src/world/partners.c +++ b/src/world/partners.c @@ -57,8 +57,8 @@ s32 D_800F7FFC = 7; s32 D_800F8000[] = { 8, 0, 0, 0 }; s32 D_800F8010[] = { 0x003251D0, 0x00325AD0, (s32)&D_802C05CC, 0x00000000 }; s32 D_800F8020 = 0; -f32 D_800F8024 = 0.0f; -f32 D_800F8028 = 0.0f; +s32 D_800F8024 = 0; +s32 D_800F8028 = 0; s32 D_800F802C = 0; f32 D_800F8030 = 0.0f; s8 D_800F8034[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; @@ -267,9 +267,13 @@ s32 world_partner_can_player_pause_default(Npc* partner) { INCLUDE_ASM(s32, "world/partners", func_800EA52C); -INCLUDE_ASM(s32, "world/partners", is_current_partner_flying, void); +s32 is_current_partner_flying(void) { + return !D_8010CFEC->isFlying; +} -INCLUDE_ASM(s32, "world/partners", func_800EA5B8); +void func_800EA5B8(s32* arg0) { + *arg0 &= ~0x2007800; +} void load_partner_npc(void) { WorldPartner* partnerEntry = &wPartners[D_8010CFD8]; @@ -311,7 +315,9 @@ void load_partner_npc(void) { D_8010C954 = 0; } -INCLUDE_ASM(s32, "world/partners", func_800EA6A8); +void func_800EA6A8(void) { + free_npc_by_index(D_8010CFD0); +} INCLUDE_ASM(s32, "world/partners", _use_partner_ability); @@ -323,7 +329,7 @@ INCLUDE_ASM(s32, "world/partners", func_800EB2A4); INCLUDE_ASM(s32, "world/partners", partner_use_ability); -INCLUDE_ASM(s32, "world/partners", partner_player_can_pause); +INCLUDE_ASM(s32, "world/partners", partner_player_can_pause, void); INCLUDE_ASM(s32, "world/partners", partner_can_use_ability); @@ -333,7 +339,14 @@ INCLUDE_ASM(s32, "world/partners", partner_initialize_data); INCLUDE_ASM(s32, "world/partners", partner_test_enemy_collision); -INCLUDE_ASM(s32, "world/partners", partner_get_ride_script); +Bytecode* partner_get_ride_script(void) { + WorldPartner* partner = D_8010CFEC; + + if (partner == NULL) { + return NULL; + } + return partner->whileRiding; +} INCLUDE_ASM(s32, "world/partners", partner_handle_before_battle); @@ -361,41 +374,92 @@ INCLUDE_ASM(void, "world/partners", func_800ED5D0, Npc* partner); INCLUDE_ASM(s32, "world/partners", func_800ED9F8); -INCLUDE_ASM(s32, "world/partners", func_800EE994); +extern f32 D_8010CFC0; +extern s16 D_8010CFC8; +extern s16 D_8010CFCA; +extern s16 D_8010CFCE; + +s32 func_800EE994(Npc* arg0) { + arg0->unk_80 = 0x10000; + D_8010CFC8 = 0; + arg0->flags |= 0x100; + return D_8010CFC8; +} INCLUDE_ASM(s32, "world/partners", func_800EE9B8); -INCLUDE_ASM(s32, "world/partners", func_800EECC4); +s32 func_800EECC4(Npc* arg0) { + arg0->unk_80 = 0x10000; + D_8010CFC8 = 0; + arg0->flags |= 0x100; + return D_8010CFC8; +} INCLUDE_ASM(s32, "world/partners", func_800EECE8); -INCLUDE_ASM(s32, "world/partners", func_800EF300); +void func_800EF300(void) { + D_8010CFC8 = 40; +} -INCLUDE_ASM(s32, "world/partners", func_800EF314); +void func_800EF314(void) { + D_8010CFC8 = 50; +} INCLUDE_ASM(void, "world/partners", enable_partner_ai, void); -INCLUDE_ASM(s32, "world/partners", set_parter_tether_distance, f32 arg0); +void set_parter_tether_distance(f32 arg0) { + D_8010CFC0 = arg0; +} -INCLUDE_ASM(s32, "world/partners", reset_parter_tether_distance); +void reset_parter_tether_distance(void) { + D_8010CFC0 = 40.0f; +} -INCLUDE_ASM(s32, "world/partners", func_800EF3C0); +void func_800EF3C0(s32 arg0, s32 arg1) { + D_800F8024 = arg0; + D_800F8028 = arg1; +} -INCLUDE_ASM(s32, "world/partners", func_800EF3D4); +void func_800EF3D4(s16 arg0) { + D_8010CFCA = arg0; +} -INCLUDE_ASM(s32, "world/partners", func_800EF3E4); +void func_800EF3E4(void) { + D_8010CFC8 = 15; + D_8010CFCA = 0; + D_800F802C = 10; + D_8010CFCE = 0; +} -INCLUDE_ASM(s32, "world/partners", func_800EF414); +void func_800EF414(s32 arg0, s32 arg1) { + func_800EF3C0(arg0, arg1); + D_8010CFC8 = 20; +} -INCLUDE_ASM(s32, "world/partners", func_800EF43C); +void func_800EF43C(void) { + D_8010CFC8 = 0; + D_8010CFCA = 0; + D_8010CFCE = 0; +} INCLUDE_ASM(void, "world/partners", clear_partner_move_history, Npc* partner); INCLUDE_ASM(s32, "world/partners", func_800EF4E0); -INCLUDE_ASM(s32, "world/partners", func_800EF600); +void func_800EF600(void) { + s8* temp_8010EBB0 = D_8010EBB0; -INCLUDE_ASM(s32, "world/partners", func_800EF628); + temp_8010EBB0[20]--; + if (temp_8010EBB0[20] < 0) { + temp_8010EBB0[20] = 0; + } +} + +void func_800EF628(void) { + s8* temp_8010EBB0 = D_8010EBB0; + + temp_8010EBB0[20]++; +} INCLUDE_ASM(s32, "world/partners", func_800EF640); diff --git a/src/world/partners.h b/src/world/partners.h index 13c7dc0187..4d1b17989f 100644 --- a/src/world/partners.h +++ b/src/world/partners.h @@ -7,19 +7,19 @@ typedef struct WorldPartner { /* 0x00 */ void* dmaStart; /* 0x04 */ void* dmaEnd; /* 0x08 */ void* dmaDest; ///< Always `0x802BD100` - /* 0x10 */ s32 isFlying; - /* 0x14 */ void (*init)(Npc* partner); - /* 0x18 */ Bytecode* takeOut; - /* 0x1C */ Bytecode* update; - /* 0x20 */ Bytecode* useAbility; - /* 0x24 */ Bytecode* putAway; - /* 0x28 */ NpcAnimID idle; - /* 0x2C */ UNK_FUN_PTR(testFirstStrike); - /* 0x30 */ s32 (*canUseAbility)(Npc* partner); - /* 0x34 */ s32 (*canPlayerPause)(Npc* partner); - /* 0x38 */ void (*preBattle)(Npc* partner); - /* 0x3C */ UNK_FUN_PTR(postBattle); - /* 0x40 */ Bytecode* whileRiding; + /* 0x0C */ s32 isFlying; + /* 0x10 */ void (*init)(Npc* partner); + /* 0x14 */ Bytecode* takeOut; + /* 0x18 */ Bytecode* update; + /* 0x1C */ Bytecode* useAbility; + /* 0x20 */ Bytecode* putAway; + /* 0x24 */ NpcAnimID idle; + /* 0x28 */ UNK_FUN_PTR(testFirstStrike); + /* 0x2C */ s32 (*canUseAbility)(Npc* partner); + /* 0x30 */ s32 (*canPlayerPause)(Npc* partner); + /* 0x34 */ void (*preBattle)(Npc* partner); + /* 0x38 */ UNK_FUN_PTR(postBattle); + /* 0x3C */ Bytecode* whileRiding; } WorldPartner; // size = 0x40 /// Set to 0 when partner NPC loaded diff --git a/src/world/script_api/7E0E80.c b/src/world/script_api/7E0E80.c index 45764e55db..01ba04697a 100644 --- a/src/world/script_api/7E0E80.c +++ b/src/world/script_api/7E0E80.c @@ -13,7 +13,7 @@ INCLUDE_ASM(s32, "world/script_api/7E0E80", func_802802D0); INCLUDE_ASM(s32, "world/script_api/7E0E80", func_8028035C); ApiStatus func_802803C8(ScriptInstance* script, s32 isInitialCall) { - PlayerStatus* playerStatus = PLAYER_STATUS; + PlayerStatus* playerStatus = &gPlayerStatus; script->varTable[2] = FALSE; @@ -58,7 +58,7 @@ INCLUDE_ASM(s32, "world/script_api/7E0E80", draw_shop_items); INCLUDE_ASM(s32, "world/script_api/7E0E80", MakeShop); ApiStatus MakeShopOwner(ScriptInstance* script, s32 isInitialCall) { - Shop* mapShop = GAME_STATUS->mapShop; + Shop* mapShop = (*gGameStatusPtr)->mapShop; mapShop->owner = get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; diff --git a/src/world/script_api/7E3700.c b/src/world/script_api/7E3700.c index 5b242a40e3..f36b637e3c 100644 --- a/src/world/script_api/7E3700.c +++ b/src/world/script_api/7E3700.c @@ -1,7 +1,7 @@ #include "common.h" ApiStatus func_80282880(ScriptInstance* script, s32 isInitialCall) { - PlayerStatus* playerStatus = PLAYER_STATUS; + PlayerStatus* playerStatus = &gPlayerStatus; playerStatus->position.x += (script->varTable[0] - playerStatus->position.x) / 2; playerStatus->position.z += (script->varTable[2] - playerStatus->position.z) / 2; diff --git a/src/world/script_api/7E4690.c b/src/world/script_api/7E4690.c index 378811b2fa..90f0d83225 100644 --- a/src/world/script_api/7E4690.c +++ b/src/world/script_api/7E4690.c @@ -2,7 +2,7 @@ #include "../partners.h" ApiStatus func_80283810(ScriptInstance* script, s32 isInitialCall) { - PlayerStatus* playerStatus = PLAYER_STATUS; + PlayerStatus* playerStatus = &gPlayerStatus; script->varTable[10] = 0; if (partner_get_ride_script() != NULL) { @@ -19,11 +19,11 @@ ApiStatus func_80283810(ScriptInstance* script, s32 isInitialCall) { } ApiStatus TeleportPartnerToPlayer(ScriptInstance* script, s32 isInitialCall) { - PlayerStatus* playerStatus = PLAYER_STATUS; - PlayerStatus* playerStatus2 = PLAYER_STATUS; + PlayerStatus* playerStatus = &gPlayerStatus; + PlayerStatus* playerStatus2 = &gPlayerStatus; Npc* partner; - if (PLAYER_DATA->currentPartner == PartnerID_NONE) { + if (gPlayerData.currentPartner == PartnerID_NONE) { return ApiStatus_DONE2; } @@ -43,14 +43,14 @@ ApiStatus TeleportPartnerToPlayer(ScriptInstance* script, s32 isInitialCall) { // currentPartner is being loaded as unsigned instead of signed #ifdef NON_MATCHING ApiStatus func_80283908(ScriptInstance* script, s32 isInitialCall) { - PlayerStatus* playerStatus = PLAYER_STATUS; - PlayerStatus* playerStatus2 = PLAYER_STATUS; + PlayerStatus* playerStatus = &gPlayerStatus; + PlayerStatus* playerStatus2 = &gPlayerStatus; Camera* camera = CURRENT_CAM; - s8 currentPartner = PLAYER_DATA->currentPartner; + s8 currentPartner = gPlayerData.currentPartner; - playerStatus->position.x = GAME_STATUS->savedPos.x; - playerStatus->position.y = GAME_STATUS->savedPos.y; - playerStatus->position.z = GAME_STATUS->savedPos.z; + playerStatus->position.x = (*gGameStatusPtr)->savedPos.x; + playerStatus->position.y = (*gGameStatusPtr)->savedPos.y; + playerStatus->position.z = (*gGameStatusPtr)->savedPos.z; if (currentPartner != PartnerID_NONE) { Npc* partner = get_npc_unsafe(NpcId_PARTNER); @@ -83,7 +83,7 @@ ApiStatus func_80283BB0(ScriptInstance* script, s32 isInitialCall) { ApiStatus func_80283BD0(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - PlayerStatus* playerStatus = PLAYER_STATUS; + PlayerStatus* playerStatus = &gPlayerStatus; if (isInitialCall) { script->functionTemp[0].s = get_variable(script, *args++); diff --git a/tools/assist.py b/tools/assist.py index 0fa277bc6e..48ee779111 100755 --- a/tools/assist.py +++ b/tools/assist.py @@ -1,9 +1,10 @@ #!/usr/bin/python3 import argparse -import difflib from collections import Counter, OrderedDict +from Levenshtein import ratio import os +import re import sys script_dir = os.path.dirname(os.path.realpath(__file__)) @@ -44,15 +45,16 @@ def get_symbol_bytes(offsets, func): return None start = offsets[func]["start"] end = offsets[func]["end"] - bs = rom_bytes[start:end][0::4] + bs = list(rom_bytes[start:end][0::4]) + + while len(bs) > 0 and bs[-1] == 0: + bs.pop() + ret = [] for ins in bs: ret.append(ins >> 2) - while len(ret) > 0 and ret[-1] == 0: - ret.pop() - - return ret + return bytes(ret).decode('utf-8'), bs def parse_map(fname): @@ -114,10 +116,14 @@ def is_zeros(vals): def diff_syms(qb, tb): - if len(tb) < 8: + if len(tb[1]) < 8: return 0 - return difflib.SequenceMatcher(None, qb, tb).ratio() + r = ratio(qb[0], tb[0]) + + if r == 1.0 and qb[1] != tb[1]: + r = 0.99 + return r def get_pair_score(query_bytes, b): @@ -135,8 +141,6 @@ def get_matches(query): ret = {} for symbol in map_offsets: - if symbol == "func_802A10A4_74AE34": - dog = 5 if symbol is not None and query != symbol: score = get_pair_score(query_bytes, symbol) if score >= args.threshold: @@ -174,7 +178,10 @@ def do_cross_query(): clusters = [] for sym_name in map_syms: - if not sym_name.startswith("_binary"): + if not sym_name.startswith("D_") and \ + not sym_name.startswith("_binary") and \ + not sym_name.startswith("jtbl_") and \ + not re.match(r"L[0-9A-F]{8}_[0-9A-F]{5,6}", sym_name): if get_symbol_length(sym_name) > 16: query_bytes = get_symbol_bytes(map_offsets, sym_name) @@ -195,8 +202,8 @@ def do_cross_query(): if cluster_first.startswith("func"): ccount[cluster_first] += 1 - if len(cluster) % 10 == 0 and len(cluster) >= 50: - print(f"Cluster {cluster_first} grew to size {len(cluster)}") + #if len(cluster) % 10 == 0 and len(cluster) >= 10: + print(f"Cluster {cluster_first} grew to size {len(cluster)} - {sym_name}: {str(cluster_score)}") break if not cluster_match: clusters.append([sym_name]) diff --git a/tools/ignored_funcs.txt b/tools/ignored_funcs.txt index 7378e3860d..f8cca5c0a9 100644 --- a/tools/ignored_funcs.txt +++ b/tools/ignored_funcs.txt @@ -3,7 +3,7 @@ func_80126064 = 0x80126064; func_8012607C = 0x8012607C; func_80126094 = 0x80126094; func_801260AC = 0x801260AC; -func_8003E4BC = 0x8003E4BC; +func_8003E4BC = 0x8003E4BC; // get_npc_safe func_80075110 = 0x80075110; func_80042AF4 = 0x80042AF4; func_8002B1C4 = 0x8002B1C4; @@ -30,7 +30,7 @@ func_800E423C = 0x800E423C; func_8004D0C4 = 0x8004D0C4; func_8004D8E0 = 0x8004D8E0; func_8002ACEC = 0x8002ACEC; -func_8003E534 = 0x8003E534; +func_8003E534 = 0x8003E534; // get_npc_safe func_8002BFD4 = 0x8002BFD4; func_8002C01C = 0x8002C01C; func_802D5468 = 0x802D5468; @@ -77,7 +77,7 @@ func_8002BF18 = 0x8002BF18; func_80076970 = 0x80076970; func_80144200 = 0x80144200; func_80144178 = 0x80144178; -func_80075170 = 0x80075170; +func_80075170 = 0x80075170; // func_8006FEF0 func_800E53AC = 0x800E53AC; func_8013CF98 = 0x8013CF98; func_80066FE0 = 0x80066FE0; diff --git a/tools/symbol_addrs.txt b/tools/symbol_addrs.txt index 605e7a10aa..9d4642b074 100644 --- a/tools/symbol_addrs.txt +++ b/tools/symbol_addrs.txt @@ -5290,7 +5290,7 @@ func_802185AC_512B7C = 0x802185AC; // type:func rom:0x512B7C dup7_b_area_omo_UnkBattleFunc1 = 0x802186C0; // type:func rom:0x512C90 func_8021878C_512D5C = 0x8021878C; // type:func rom:0x512D5C func_80218880_512E50 = 0x80218880; // type:func rom:0x512E50 -func_80218A98_513068 = 0x80218A98; // type:func rom:0x513068 +b_area_omo_GetItemEntityPosition = 0x80218A98; // type:func rom:0x513068 func_80218B38_513108 = 0x80218B38; // type:func rom:0x513108 func_80218CF4_5132C4 = 0x80218CF4; // type:func rom:0x5132C4 b_area_omo_StartRumbleWithParams = 0x80218D54; // type:func rom:0x513324 @@ -5775,7 +5775,7 @@ func_80219818_6A0A18 = 0x80219818; // type:func rom:0x6A0A18 func_80219C74_6A0E74 = 0x80219C74; // type:func rom:0x6A0E74 func_80219CD4_6A0ED4 = 0x80219CD4; // type:func rom:0x6A0ED4 func_80219D44_6A0F44 = 0x80219D44; // type:func rom:0x6A0F44 -func_80219F5C_6A115C = 0x80219F5C; // type:func rom:0x6A115C +dup_b_area_kpa2_GetItemEntityPosition = 0x80219F5C; // type:func rom:0x6A115C func_80219FFC_6A11FC = 0x80219FFC; // type:func rom:0x6A11FC func_8021A1B8_6A13B8 = 0x8021A1B8; // type:func rom:0x6A13B8 func_8021A254_6A1454 = 0x8021A254; // type:func rom:0x6A1454 @@ -5789,7 +5789,7 @@ func_8021ABD8_6A1DD8 = 0x8021ABD8; // type:func rom:0x6A1DD8 func_8021B02C_6A222C = 0x8021B02C; // type:func rom:0x6A222C func_8021B08C_6A228C = 0x8021B08C; // type:func rom:0x6A228C func_8021B0FC_6A22FC = 0x8021B0FC; // type:func rom:0x6A22FC -func_8021B314_6A2514 = 0x8021B314; // type:func rom:0x6A2514 +b_area_kpa2_GetItemEntityPosition = 0x8021B314; // type:func rom:0x6A2514 func_8021B3B4_6A25B4 = 0x8021B3B4; // type:func rom:0x6A25B4 func_8021B570_6A2770 = 0x8021B570; // type:func rom:0x6A2770 func_8021B60C_6A280C = 0x8021B60C; // type:func rom:0x6A280C @@ -6491,7 +6491,7 @@ func_8024076C_7EB47C = 0x8024076C; // type:func rom:0x7EB47C func_80240990_7EB6A0 = 0x80240990; // type:func rom:0x7EB6A0 mac_00_GetNpcUnsafeOwner2 = 0x802409DC; // type:func rom:0x7EB6EC func_802409FC_7EB70C = 0x802409FC; // type:func rom:0x7EB70C -func_80240A5C_7EB76C = 0x80240A5C; // type:func rom:0x7EB76C +mac_00_UnkAlphaFunc = 0x80240A5C; // type:func rom:0x7EB76C func_80240BA8_7EB8B8 = 0x80240BA8; // type:func rom:0x7EB8B8 func_80240D1C_7EBA2C = 0x80240D1C; // type:func rom:0x7EBA2C func_80240DA0_7EBAB0 = 0x80240DA0; // type:func rom:0x7EBAB0 @@ -6598,7 +6598,7 @@ func_8024204C_8028CC = 0x8024204C; // type:func rom:0x8028CC func_80242270_802AF0 = 0x80242270; // type:func rom:0x802AF0 mac_01_GetNpcUnsafeOwner2 = 0x802422BC; // type:func rom:0x802B3C func_802422DC_802B5C = 0x802422DC; // type:func rom:0x802B5C -func_8024233C_802BBC = 0x8024233C; // type:func rom:0x802BBC +mac_01_UnkAlphaFunc = 0x8024233C; // type:func rom:0x802BBC func_80242488_802D08 = 0x80242488; // type:func rom:0x802D08 func_802425FC_802E7C = 0x802425FC; // type:func rom:0x802E7C func_80242680_802F00 = 0x80242680; // type:func rom:0x802F00 @@ -6735,7 +6735,7 @@ func_802418FC_824BBC = 0x802418FC; // type:func rom:0x824BBC func_80241B20_824DE0 = 0x80241B20; // type:func rom:0x824DE0 mac_02_GetNpcUnsafeOwner2 = 0x80241B6C; // type:func rom:0x824E2C func_80241B8C_824E4C = 0x80241B8C; // type:func rom:0x824E4C -func_80241BEC_824EAC = 0x80241BEC; // type:func rom:0x824EAC +mac_02_UnkAlphaFunc = 0x80241BEC; // type:func rom:0x824EAC func_80241D38_824FF8 = 0x80241D38; // type:func rom:0x824FF8 func_80241EAC_82516C = 0x80241EAC; // type:func rom:0x82516C func_80241F30_8251F0 = 0x80241F30; // type:func rom:0x8251F0 @@ -6803,7 +6803,7 @@ func_802405EC_831DEC = 0x802405EC; // type:func rom:0x831DEC func_80240810_832010 = 0x80240810; // type:func rom:0x832010 mac_03_GetNpcUnsafeOwner2 = 0x8024085C; // type:func rom:0x83205C func_8024087C_83207C = 0x8024087C; // type:func rom:0x83207C -func_802408DC_8320DC = 0x802408DC; // type:func rom:0x8320DC +mac_03_UnkAlphaFunc = 0x802408DC; // type:func rom:0x8320DC func_80240A28_832228 = 0x80240A28; // type:func rom:0x832228 func_80240B9C_83239C = 0x80240B9C; // type:func rom:0x83239C func_80240C20_832420 = 0x80240C20; // type:func rom:0x832420 @@ -6867,7 +6867,7 @@ func_8024059C_84316C = 0x8024059C; // type:func rom:0x84316C func_802407C0_843390 = 0x802407C0; // type:func rom:0x843390 mac_04_GetNpcUnsafeOwner2 = 0x8024080C; // type:func rom:0x8433DC func_8024082C_8433FC = 0x8024082C; // type:func rom:0x8433FC -func_8024088C_84345C = 0x8024088C; // type:func rom:0x84345C +mac_04_UnkAlphaFunc = 0x8024088C; // type:func rom:0x84345C func_802409D8_8435A8 = 0x802409D8; // type:func rom:0x8435A8 func_80240B4C_84371C = 0x80240B4C; // type:func rom:0x84371C func_80240BD0_8437A0 = 0x80240BD0; // type:func rom:0x8437A0 @@ -6941,7 +6941,7 @@ func_8024145C_8535CC = 0x8024145C; // type:func rom:0x8535CC func_80241680_8537F0 = 0x80241680; // type:func rom:0x8537F0 mac_05_GetNpcUnsafeOwner2 = 0x802416CC; // type:func rom:0x85383C func_802416EC_85385C = 0x802416EC; // type:func rom:0x85385C -func_8024174C_8538BC = 0x8024174C; // type:func rom:0x8538BC +mac_05_UnkAlphaFunc = 0x8024174C; // type:func rom:0x8538BC func_80241898_853A08 = 0x80241898; // type:func rom:0x853A08 func_80241A0C_853B7C = 0x80241A0C; // type:func rom:0x853B7C func_80241A90_853C00 = 0x80241A90; // type:func rom:0x853C00 @@ -7121,8 +7121,8 @@ func_80240824_87A404 = 0x80240824; // type:func rom:0x87A404 func_80240888_87A468 = 0x80240888; // type:func rom:0x87A468 func_802408E0_87A4C0 = 0x802408E0; // type:func rom:0x87A4C0 func_80240E18_87A9F8 = 0x80240E18; // type:func rom:0x87A9F8 -func_80240F58_87AB38 = 0x80240F58; // type:func rom:0x87AB38 -func_80240FA0_87AB80 = 0x80240FA0; // type:func rom:0x87AB80 +tik_07_UnkPartnerPosFunc = 0x80240F58; // type:func rom:0x87AB38 +tik_07_UnkPartnerPosFunc2 = 0x80240FA0; // type:func rom:0x87AB80 func_80240FE8_87ABC8 = 0x80240FE8; // type:func rom:0x87ABC8 func_80241020_87AC00 = 0x80241020; // type:func rom:0x87AC00 func_80241390_87AF70 = 0x80241390; // type:func rom:0x87AF70 @@ -7132,7 +7132,7 @@ tik_07_UnkNpcAIFunc1 = 0x80241BC8; // type:func rom:0x87B7A8 func_80241C88_87B868 = 0x80241C88; // type:func rom:0x87B868 tik_07_UnkNpcAIFunc2 = 0x80241FCC; // type:func rom:0x87BBAC func_80242044_87BC24 = 0x80242044; // type:func rom:0x87BC24 -func_802420B0_87BC90 = 0x802420B0; // type:func rom:0x87BC90 +tik_07_UnkNpcAIFunc14 = 0x802420B0; // type:func rom:0x87BC90 tik_07_UnkNpcAIFunc3 = 0x802421E4; // type:func rom:0x87BDC4 func_80242248_87BE28 = 0x80242248; // type:func rom:0x87BE28 func_802425D8_87C1B8 = 0x802425D8; // type:func rom:0x87C1B8 @@ -7194,8 +7194,8 @@ func_80240BC4_886F84 = 0x80240BC4; // type:func rom:0x886F84 func_80240C28_886FE8 = 0x80240C28; // type:func rom:0x886FE8 func_80240C80_887040 = 0x80240C80; // type:func rom:0x887040 func_802411B8_887578 = 0x802411B8; // type:func rom:0x887578 -func_802412F8_8876B8 = 0x802412F8; // type:func rom:0x8876B8 -func_80241340_887700 = 0x80241340; // type:func rom:0x887700 +tik_10_UnkPartnerPosFunc = 0x802412F8; // type:func rom:0x8876B8 +tik_10_UnkPartnerPosFunc2 = 0x80241340; // type:func rom:0x887700 func_80241388_887748 = 0x80241388; // type:func rom:0x887748 D_80242030_8883F0 = 0x80242030; // type:data rom:0x8883F0 D_80242038_8883F8 = 0x80242038; // type:data rom:0x8883F8 @@ -7229,8 +7229,8 @@ func_80241160_889D30 = 0x80241160; // type:func rom:0x889D30 func_802411C4_889D94 = 0x802411C4; // type:func rom:0x889D94 func_8024121C_889DEC = 0x8024121C; // type:func rom:0x889DEC func_80241754_88A324 = 0x80241754; // type:func rom:0x88A324 -func_80241894_88A464 = 0x80241894; // type:func rom:0x88A464 -func_802418DC_88A4AC = 0x802418DC; // type:func rom:0x88A4AC +tik_12_UnkPartnerPosFunc = 0x80241894; // type:func rom:0x88A464 +tik_12_UnkPartnerPosFunc2 = 0x802418DC; // type:func rom:0x88A4AC func_80241924_88A4F4 = 0x80241924; // type:func rom:0x88A4F4 tik_12_set_script_owner_npc_anim = 0x80241960; // type:func rom:0x88A530 func_802419DC_88A5AC = 0x802419DC; // type:func rom:0x88A5AC @@ -7287,8 +7287,8 @@ func_80240574_892F94 = 0x80240574; // type:func rom:0x892F94 func_802405D8_892FF8 = 0x802405D8; // type:func rom:0x892FF8 func_80240630_893050 = 0x80240630; // type:func rom:0x893050 func_80240B68_893588 = 0x80240B68; // type:func rom:0x893588 -func_80240CA8_8936C8 = 0x80240CA8; // type:func rom:0x8936C8 -func_80240CF0_893710 = 0x80240CF0; // type:func rom:0x893710 +tik_17_UnkPartnerPosFunc = 0x80240CA8; // type:func rom:0x8936C8 +tik_17_UnkPartnerPosFunc2 = 0x80240CF0; // type:func rom:0x893710 func_80240D38_893758 = 0x80240D38; // type:func rom:0x893758 tik_17_SetPlayerStatusAnimFlags100000 = 0x80240D70; // type:func rom:0x893790 tik_17_GetCurrentFloor = 0x80240D90; // type:func rom:0x8937B0 @@ -7329,8 +7329,8 @@ func_80240B34_898114 = 0x80240B34; // type:func rom:0x898114 func_80240B98_898178 = 0x80240B98; // type:func rom:0x898178 func_80240BF0_8981D0 = 0x80240BF0; // type:func rom:0x8981D0 func_80241128_898708 = 0x80241128; // type:func rom:0x898708 -func_80241268_898848 = 0x80241268; // type:func rom:0x898848 -func_802412B0_898890 = 0x802412B0; // type:func rom:0x898890 +tik_19_UnkPartnerPosFunc = 0x80241268; // type:func rom:0x898848 +tik_19_UnkPartnerPosFunc2 = 0x802412B0; // type:func rom:0x898890 func_802412F8_8988D8 = 0x802412F8; // type:func rom:0x8988D8 D_802426B0_899C90 = 0x802426B0; // type:data rom:0x899C90 D_802426B8_899C98 = 0x802426B8; // type:data rom:0x899C98 @@ -7447,7 +7447,7 @@ func_802404CC_8B053C = 0x802404CC; // type:func rom:0x8B053C func_802406F0_8B0760 = 0x802406F0; // type:func rom:0x8B0760 kmr_02_GetNpcUnsafeOwner2 = 0x8024073C; // type:func rom:0x8B07AC func_8024075C_8B07CC = 0x8024075C; // type:func rom:0x8B07CC -func_802407BC_8B082C = 0x802407BC; // type:func rom:0x8B082C +kmr_02_UnkAlphaFunc = 0x802407BC; // type:func rom:0x8B082C func_80240908_8B0978 = 0x80240908; // type:func rom:0x8B0978 func_80240A7C_8B0AEC = 0x80240A7C; // type:func rom:0x8B0AEC func_80240B00_8B0B70 = 0x80240B00; // type:func rom:0x8B0B70 @@ -7603,7 +7603,7 @@ kmr_05_UnkNpcAIFunc1 = 0x802407D8; // type:func rom:0x8CE848 func_80240898_8CE908 = 0x80240898; // type:func rom:0x8CE908 kmr_05_UnkNpcAIFunc2 = 0x80240BDC; // type:func rom:0x8CEC4C func_80240C54_8CECC4 = 0x80240C54; // type:func rom:0x8CECC4 -func_80240CC0_8CED30 = 0x80240CC0; // type:func rom:0x8CED30 +kmr_05_UnkNpcAIFunc14 = 0x80240CC0; // type:func rom:0x8CED30 kmr_05_UnkNpcAIFunc3 = 0x80240DF4; // type:func rom:0x8CEE64 func_80240E58_8CEEC8 = 0x80240E58; // type:func rom:0x8CEEC8 func_802411E8_8CF258 = 0x802411E8; // type:func rom:0x8CF258 @@ -7621,7 +7621,7 @@ kmr_06_UnkNpcAIFunc1 = 0x802407D8; // type:func rom:0x8D1CE8 func_80240898_8D1DA8 = 0x80240898; // type:func rom:0x8D1DA8 kmr_06_UnkNpcAIFunc2 = 0x80240BDC; // type:func rom:0x8D20EC func_80240C54_8D2164 = 0x80240C54; // type:func rom:0x8D2164 -func_80240CC0_8D21D0 = 0x80240CC0; // type:func rom:0x8D21D0 +kmr_06_UnkNpcAIFunc14 = 0x80240CC0; // type:func rom:0x8D21D0 kmr_06_UnkNpcAIFunc3 = 0x80240DF4; // type:func rom:0x8D2304 func_80240E58_8D2368 = 0x80240E58; // type:func rom:0x8D2368 func_802411E8_8D26F8 = 0x802411E8; // type:func rom:0x8D26F8 @@ -7658,7 +7658,7 @@ kmr_09_UnkNpcAIFunc1 = 0x802407D8; // type:func rom:0x8D65D8 func_80240898_8D6698 = 0x80240898; // type:func rom:0x8D6698 kmr_09_UnkNpcAIFunc2 = 0x80240BDC; // type:func rom:0x8D69DC func_80240C54_8D6A54 = 0x80240C54; // type:func rom:0x8D6A54 -func_80240CC0_8D6AC0 = 0x80240CC0; // type:func rom:0x8D6AC0 +kmr_09_UnkNpcAIFunc14 = 0x80240CC0; // type:func rom:0x8D6AC0 kmr_09_UnkNpcAIFunc3 = 0x80240DF4; // type:func rom:0x8D6BF4 func_80240E58_8D6C58 = 0x80240E58; // type:func rom:0x8D6C58 func_802411E8_8D6FE8 = 0x802411E8; // type:func rom:0x8D6FE8 @@ -8018,8 +8018,8 @@ func_80240834_91EDA4 = 0x80240834; // type:func rom:0x91EDA4 func_80240898_91EE08 = 0x80240898; // type:func rom:0x91EE08 func_802408F0_91EE60 = 0x802408F0; // type:func rom:0x91EE60 func_80240E28_91F398 = 0x80240E28; // type:func rom:0x91F398 -func_80240F68_91F4D8 = 0x80240F68; // type:func rom:0x91F4D8 -func_80240FB0_91F520 = 0x80240FB0; // type:func rom:0x91F520 +iwa_10_UnkPartnerPosFunc = 0x80240F68; // type:func rom:0x91F4D8 +iwa_10_UnkPartnerPosFunc2 = 0x80240FB0; // type:func rom:0x91F520 func_80240FF8_91F568 = 0x80240FF8; // type:func rom:0x91F568 func_80241030_91F5A0 = 0x80241030; // type:func rom:0x91F5A0 iwa_10_GetNpcCollisionHeight = 0x802411B4; // type:func rom:0x91F724 @@ -8246,8 +8246,8 @@ func_802405C4_954584 = 0x802405C4; // type:func rom:0x954584 func_80240628_9545E8 = 0x80240628; // type:func rom:0x9545E8 func_80240680_954640 = 0x80240680; // type:func rom:0x954640 func_80240BB8_954B78 = 0x80240BB8; // type:func rom:0x954B78 -func_80240CF8_954CB8 = 0x80240CF8; // type:func rom:0x954CB8 -func_80240D40_954D00 = 0x80240D40; // type:func rom:0x954D00 +sbk_56_UnkPartnerPosFunc = 0x80240CF8; // type:func rom:0x954CB8 +sbk_56_UnkPartnerPosFunc2 = 0x80240D40; // type:func rom:0x954D00 func_80240D88_954D48 = 0x80240D88; // type:func rom:0x954D48 sbk_56_SomeMatrixOperation = 0x80240DC0; // type:func rom:0x954D80 sbk_56_SomeMatrixOperation2 = 0x80240E30; // type:func rom:0x954DF0 @@ -8296,7 +8296,7 @@ func_802415AC_95C7AC = 0x802415AC; // type:func rom:0x95C7AC func_802417D0_95C9D0 = 0x802417D0; // type:func rom:0x95C9D0 dro_01_GetNpcUnsafeOwner2 = 0x8024181C; // type:func rom:0x95CA1C func_8024183C_95CA3C = 0x8024183C; // type:func rom:0x95CA3C -func_8024189C_95CA9C = 0x8024189C; // type:func rom:0x95CA9C +dro_01_UnkAlphaFunc = 0x8024189C; // type:func rom:0x95CA9C func_802419E8_95CBE8 = 0x802419E8; // type:func rom:0x95CBE8 func_80241B5C_95CD5C = 0x80241B5C; // type:func rom:0x95CD5C func_80241BE0_95CDE0 = 0x80241BE0; // type:func rom:0x95CDE0 @@ -8361,7 +8361,7 @@ func_8024043C_9695FC = 0x8024043C; // type:func rom:0x9695FC func_80240660_969820 = 0x80240660; // type:func rom:0x969820 dro_02_GetNpcUnsafeOwner2 = 0x802406AC; // type:func rom:0x96986C func_802406CC_96988C = 0x802406CC; // type:func rom:0x96988C -func_8024072C_9698EC = 0x8024072C; // type:func rom:0x9698EC +dro_02_UnkAlphaFunc = 0x8024072C; // type:func rom:0x9698EC func_80240878_969A38 = 0x80240878; // type:func rom:0x969A38 func_802409EC_969BAC = 0x802409EC; // type:func rom:0x969BAC func_80240A70_969C30 = 0x80240A70; // type:func rom:0x969C30 @@ -8506,8 +8506,8 @@ func_80240544_9890A4 = 0x80240544; // type:func rom:0x9890A4 func_802405A8_989108 = 0x802405A8; // type:func rom:0x989108 func_80240600_989160 = 0x80240600; // type:func rom:0x989160 func_80240B38_989698 = 0x80240B38; // type:func rom:0x989698 -func_80240C78_9897D8 = 0x80240C78; // type:func rom:0x9897D8 -func_80240CC0_989820 = 0x80240CC0; // type:func rom:0x989820 +isk_10_UnkPartnerPosFunc = 0x80240C78; // type:func rom:0x9897D8 +isk_10_UnkPartnerPosFunc2 = 0x80240CC0; // type:func rom:0x989820 func_80240D08_989868 = 0x80240D08; // type:func rom:0x989868 func_80240D38_989898 = 0x80240D38; // type:func rom:0x989898 D_80241100_989C60 = 0x80241100; // type:data rom:0x989C60 @@ -8674,7 +8674,7 @@ dup_trd_04_UnkNpcAIFunc1 = 0x802425F0; // type:func rom:0x9AA9E0 func_802426B0_9AAAA0 = 0x802426B0; // type:func rom:0x9AAAA0 trd_04_UnkNpcAIFunc2 = 0x802429F4; // type:func rom:0x9AADE4 func_80242A6C_9AAE5C = 0x80242A6C; // type:func rom:0x9AAE5C -func_80242AD8_9AAEC8 = 0x80242AD8; // type:func rom:0x9AAEC8 +trd_04_UnkNpcAIFunc14 = 0x80242AD8; // type:func rom:0x9AAEC8 trd_04_UnkNpcAIFunc3 = 0x80242C0C; // type:func rom:0x9AAFFC func_80242C70_9AB060 = 0x80242C70; // type:func rom:0x9AB060 func_80243000_9AB3F0 = 0x80243000; // type:func rom:0x9AB3F0 @@ -8728,7 +8728,7 @@ trd_07_UnkNpcAIFunc1 = 0x802412BC; // type:func rom:0x9B7C3C func_8024137C_9B7CFC = 0x8024137C; // type:func rom:0x9B7CFC trd_07_UnkNpcAIFunc2 = 0x802416C0; // type:func rom:0x9B8040 func_80241738_9B80B8 = 0x80241738; // type:func rom:0x9B80B8 -func_802417A4_9B8124 = 0x802417A4; // type:func rom:0x9B8124 +trd_07_UnkNpcAIFunc14 = 0x802417A4; // type:func rom:0x9B8124 trd_07_UnkNpcAIFunc3 = 0x802418D8; // type:func rom:0x9B8258 func_8024193C_9B82BC = 0x8024193C; // type:func rom:0x9B82BC func_80241CCC_9B864C = 0x80241CCC; // type:func rom:0x9B864C @@ -8793,7 +8793,7 @@ func_80240EA4_9C6284 = 0x80240EA4; // type:func rom:0x9C6284 func_802410C8_9C64A8 = 0x802410C8; // type:func rom:0x9C64A8 nok_01_GetNpcUnsafeOwner2 = 0x80241114; // type:func rom:0x9C64F4 func_80241134_9C6514 = 0x80241134; // type:func rom:0x9C6514 -func_80241194_9C6574 = 0x80241194; // type:func rom:0x9C6574 +nok_01_UnkAlphaFunc = 0x80241194; // type:func rom:0x9C6574 func_802412E0_9C66C0 = 0x802412E0; // type:func rom:0x9C66C0 func_80241454_9C6834 = 0x80241454; // type:func rom:0x9C6834 func_802414D8_9C68B8 = 0x802414D8; // type:func rom:0x9C68B8 @@ -8879,7 +8879,7 @@ func_80241A4C_9D8A6C = 0x80241A4C; // type:func rom:0x9D8A6C func_80241C70_9D8C90 = 0x80241C70; // type:func rom:0x9D8C90 nok_02_GetNpcUnsafeOwner2 = 0x80241CBC; // type:func rom:0x9D8CDC func_80241CDC_9D8CFC = 0x80241CDC; // type:func rom:0x9D8CFC -func_80241D3C_9D8D5C = 0x80241D3C; // type:func rom:0x9D8D5C +nok_02_UnkAlphaFunc = 0x80241D3C; // type:func rom:0x9D8D5C func_80241E88_9D8EA8 = 0x80241E88; // type:func rom:0x9D8EA8 func_80241FFC_9D901C = 0x80241FFC; // type:func rom:0x9D901C func_80242080_9D90A0 = 0x80242080; // type:func rom:0x9D90A0 @@ -8997,7 +8997,7 @@ nok_11_UnkNpcAIFunc1 = 0x80240FAC; // type:func rom:0x9F59EC func_8024106C_9F5AAC = 0x8024106C; // type:func rom:0x9F5AAC nok_11_UnkNpcAIFunc2 = 0x802413B0; // type:func rom:0x9F5DF0 func_80241428_9F5E68 = 0x80241428; // type:func rom:0x9F5E68 -func_80241494_9F5ED4 = 0x80241494; // type:func rom:0x9F5ED4 +nok_11_UnkNpcAIFunc14 = 0x80241494; // type:func rom:0x9F5ED4 nok_11_UnkNpcAIFunc3 = 0x802415C8; // type:func rom:0x9F6008 func_8024162C_9F606C = 0x8024162C; // type:func rom:0x9F606C func_802419BC_9F63FC = 0x802419BC; // type:func rom:0x9F63FC @@ -9070,7 +9070,7 @@ nok_14_UnkNpcAIFunc1 = 0x8024116C; // type:func rom:0xA039AC func_8024122C_A03A6C = 0x8024122C; // type:func rom:0xA03A6C nok_14_UnkNpcAIFunc2 = 0x80241570; // type:func rom:0xA03DB0 func_802415E8_A03E28 = 0x802415E8; // type:func rom:0xA03E28 -func_80241654_A03E94 = 0x80241654; // type:func rom:0xA03E94 +nok_14_UnkNpcAIFunc14 = 0x80241654; // type:func rom:0xA03E94 nok_14_UnkNpcAIFunc3 = 0x80241788; // type:func rom:0xA03FC8 func_802417EC_A0402C = 0x802417EC; // type:func rom:0xA0402C func_80241B7C_A043BC = 0x80241B7C; // type:func rom:0xA043BC @@ -9102,7 +9102,7 @@ nok_15_UnkNpcAIFunc1 = 0x8024128C; // type:func rom:0xA0818C func_8024134C_A0824C = 0x8024134C; // type:func rom:0xA0824C nok_15_UnkNpcAIFunc2 = 0x80241690; // type:func rom:0xA08590 func_80241708_A08608 = 0x80241708; // type:func rom:0xA08608 -func_80241774_A08674 = 0x80241774; // type:func rom:0xA08674 +nok_15_UnkNpcAIFunc14 = 0x80241774; // type:func rom:0xA08674 nok_15_UnkNpcAIFunc3 = 0x802418A8; // type:func rom:0xA087A8 func_8024190C_A0880C = 0x8024190C; // type:func rom:0xA0880C func_80241C9C_A08B9C = 0x80241C9C; // type:func rom:0xA08B9C @@ -9182,7 +9182,7 @@ hos_02_UnkNpcAIFunc1 = 0x802417C8; // type:func rom:0xA179E8 func_80241888_A17AA8 = 0x80241888; // type:func rom:0xA17AA8 hos_02_UnkNpcAIFunc2 = 0x80241BCC; // type:func rom:0xA17DEC func_80241C44_A17E64 = 0x80241C44; // type:func rom:0xA17E64 -func_80241CB0_A17ED0 = 0x80241CB0; // type:func rom:0xA17ED0 +hos_02_UnkNpcAIFunc14 = 0x80241CB0; // type:func rom:0xA17ED0 hos_02_UnkNpcAIFunc3 = 0x80241DE4; // type:func rom:0xA18004 func_80241E48_A18068 = 0x80241E48; // type:func rom:0xA18068 func_802421D8_A183F8 = 0x802421D8; // type:func rom:0xA183F8 @@ -9225,7 +9225,7 @@ hos_03_UnkNpcAIFunc1 = 0x80241488; // type:func rom:0xA1C588 func_80241548_A1C648 = 0x80241548; // type:func rom:0xA1C648 hos_03_UnkNpcAIFunc2 = 0x8024188C; // type:func rom:0xA1C98C func_80241904_A1CA04 = 0x80241904; // type:func rom:0xA1CA04 -func_80241970_A1CA70 = 0x80241970; // type:func rom:0xA1CA70 +hos_03_UnkNpcAIFunc14 = 0x80241970; // type:func rom:0xA1CA70 hos_03_UnkNpcAIFunc3 = 0x80241AA4; // type:func rom:0xA1CBA4 func_80241B08_A1CC08 = 0x80241B08; // type:func rom:0xA1CC08 func_80241E98_A1CF98 = 0x80241E98; // type:func rom:0xA1CF98 @@ -9250,7 +9250,7 @@ func_802425E0_A1D6E0 = 0x802425E0; // type:func rom:0xA1D6E0 func_80242804_A1D904 = 0x80242804; // type:func rom:0xA1D904 hos_03_GetNpcUnsafeOwner2 = 0x80242850; // type:func rom:0xA1D950 func_80242870_A1D970 = 0x80242870; // type:func rom:0xA1D970 -func_802428D0_A1D9D0 = 0x802428D0; // type:func rom:0xA1D9D0 +hos_03_UnkAlphaFunc = 0x802428D0; // type:func rom:0xA1D9D0 func_80242A1C_A1DB1C = 0x80242A1C; // type:func rom:0xA1DB1C func_80242B90_A1DC90 = 0x80242B90; // type:func rom:0xA1DC90 func_80242C14_A1DD14 = 0x80242C14; // type:func rom:0xA1DD14 @@ -10450,7 +10450,7 @@ func_80241750_B2DBC0 = 0x80241750; // type:func rom:0xB2DBC0 func_80241974_B2DDE4 = 0x80241974; // type:func rom:0xB2DDE4 jan_02_GetNpcUnsafeOwner2 = 0x802419C0; // type:func rom:0xB2DE30 func_802419E0_B2DE50 = 0x802419E0; // type:func rom:0xB2DE50 -func_80241A40_B2DEB0 = 0x80241A40; // type:func rom:0xB2DEB0 +jan_02_UnkAlphaFunc = 0x80241A40; // type:func rom:0xB2DEB0 func_80241B8C_B2DFFC = 0x80241B8C; // type:func rom:0xB2DFFC func_80241D00_B2E170 = 0x80241D00; // type:func rom:0xB2E170 func_80241D84_B2E1F4 = 0x80241D84; // type:func rom:0xB2E1F4 @@ -10527,7 +10527,7 @@ func_80241CD8_B368A8 = 0x80241CD8; // type:func rom:0xB368A8 func_80241EFC_B36ACC = 0x80241EFC; // type:func rom:0xB36ACC jan_03_GetNpcUnsafeOwner2 = 0x80241F48; // type:func rom:0xB36B18 func_80241F68_B36B38 = 0x80241F68; // type:func rom:0xB36B38 -func_80241FC8_B36B98 = 0x80241FC8; // type:func rom:0xB36B98 +jan_03_UnkAlphaFunc = 0x80241FC8; // type:func rom:0xB36B98 func_80242114_B36CE4 = 0x80242114; // type:func rom:0xB36CE4 func_80242288_B36E58 = 0x80242288; // type:func rom:0xB36E58 func_8024230C_B36EDC = 0x8024230C; // type:func rom:0xB36EDC @@ -10682,8 +10682,8 @@ func_80240BA4_B5EE54 = 0x80240BA4; // type:func rom:0xB5EE54 func_80240C08_B5EEB8 = 0x80240C08; // type:func rom:0xB5EEB8 func_80240C60_B5EF10 = 0x80240C60; // type:func rom:0xB5EF10 func_80241198_B5F448 = 0x80241198; // type:func rom:0xB5F448 -func_802412D8_B5F588 = 0x802412D8; // type:func rom:0xB5F588 -func_80241320_B5F5D0 = 0x80241320; // type:func rom:0xB5F5D0 +jan_08_UnkPartnerPosFunc = 0x802412D8; // type:func rom:0xB5F588 +jan_08_UnkPartnerPosFunc2 = 0x80241320; // type:func rom:0xB5F5D0 func_80241368_B5F618 = 0x80241368; // type:func rom:0xB5F618 func_802413A0_B5F650 = 0x802413A0; // type:func rom:0xB5F650 jan_08_UnkNpcAIFunc4 = 0x80241454; // type:func rom:0xB5F704 @@ -10990,7 +10990,7 @@ mim_08_UnkNpcAIFunc1 = 0x80240878; // type:func rom:0xBAE1B8 func_80240938_BAE278 = 0x80240938; // type:func rom:0xBAE278 mim_08_UnkNpcAIFunc2 = 0x80240C7C; // type:func rom:0xBAE5BC func_80240CF4_BAE634 = 0x80240CF4; // type:func rom:0xBAE634 -func_80240D60_BAE6A0 = 0x80240D60; // type:func rom:0xBAE6A0 +mim_08_UnkNpcAIFunc14 = 0x80240D60; // type:func rom:0xBAE6A0 mim_08_UnkNpcAIFunc3 = 0x80240E94; // type:func rom:0xBAE7D4 func_80240EF8_BAE838 = 0x80240EF8; // type:func rom:0xBAE838 func_80241288_BAEBC8 = 0x80241288; // type:func rom:0xBAEBC8 @@ -11274,7 +11274,7 @@ dup_arn_04_UnkNpcAIFunc1 = 0x80241668; // type:func rom:0xBE4E18 func_80241728_BE4ED8 = 0x80241728; // type:func rom:0xBE4ED8 arn_04_UnkNpcAIFunc2 = 0x80241A6C; // type:func rom:0xBE521C func_80241AE4_BE5294 = 0x80241AE4; // type:func rom:0xBE5294 -func_80241B50_BE5300 = 0x80241B50; // type:func rom:0xBE5300 +arn_04_UnkNpcAIFunc14 = 0x80241B50; // type:func rom:0xBE5300 arn_04_UnkNpcAIFunc3 = 0x80241C84; // type:func rom:0xBE5434 func_80241CE8_BE5498 = 0x80241CE8; // type:func rom:0xBE5498 func_80242078_BE5828 = 0x80242078; // type:func rom:0xBE5828 @@ -11340,7 +11340,7 @@ arn_07_UnkNpcAIFunc1 = 0x80241128; // type:func rom:0xBEDF18 func_802411E8_BEDFD8 = 0x802411E8; // type:func rom:0xBEDFD8 arn_07_UnkNpcAIFunc2 = 0x8024152C; // type:func rom:0xBEE31C func_802415A4_BEE394 = 0x802415A4; // type:func rom:0xBEE394 -func_80241610_BEE400 = 0x80241610; // type:func rom:0xBEE400 +arn_07_UnkNpcAIFunc14 = 0x80241610; // type:func rom:0xBEE400 arn_07_UnkNpcAIFunc3 = 0x80241744; // type:func rom:0xBEE534 func_802417A8_BEE598 = 0x802417A8; // type:func rom:0xBEE598 func_80241B38_BEE928 = 0x80241B38; // type:func rom:0xBEE928 @@ -11373,7 +11373,7 @@ dgb_01_UnkNpcAIFunc1 = 0x802408F8; // type:func rom:0xBFE178 func_802409B8_BFE238 = 0x802409B8; // type:func rom:0xBFE238 dgb_01_UnkNpcAIFunc2 = 0x80240CFC; // type:func rom:0xBFE57C func_80240D74_BFE5F4 = 0x80240D74; // type:func rom:0xBFE5F4 -func_80240DE0_BFE660 = 0x80240DE0; // type:func rom:0xBFE660 +dgb_01_UnkNpcAIFunc14 = 0x80240DE0; // type:func rom:0xBFE660 dgb_01_UnkNpcAIFunc3 = 0x80240F14; // type:func rom:0xBFE794 func_80240F78_BFE7F8 = 0x80240F78; // type:func rom:0xBFE7F8 func_80241308_BFEB88 = 0x80241308; // type:func rom:0xBFEB88 @@ -11471,7 +11471,7 @@ dgb_04_UnkNpcAIFunc1 = 0x802407D8; // type:func rom:0xC36D08 func_80240898_C36DC8 = 0x80240898; // type:func rom:0xC36DC8 dgb_04_UnkNpcAIFunc2 = 0x80240BDC; // type:func rom:0xC3710C func_80240C54_C37184 = 0x80240C54; // type:func rom:0xC37184 -func_80240CC0_C371F0 = 0x80240CC0; // type:func rom:0xC371F0 +dgb_04_UnkNpcAIFunc14 = 0x80240CC0; // type:func rom:0xC371F0 dgb_04_UnkNpcAIFunc3 = 0x80240DF4; // type:func rom:0xC37324 func_80240E58_C37388 = 0x80240E58; // type:func rom:0xC37388 func_802411E8_C37718 = 0x802411E8; // type:func rom:0xC37718 @@ -11502,8 +11502,8 @@ func_80242914_C38E44 = 0x80242914; // type:func rom:0xC38E44 func_80242978_C38EA8 = 0x80242978; // type:func rom:0xC38EA8 func_802429D0_C38F00 = 0x802429D0; // type:func rom:0xC38F00 func_80242F08_C39438 = 0x80242F08; // type:func rom:0xC39438 -func_80243048_C39578 = 0x80243048; // type:func rom:0xC39578 -func_80243090_C395C0 = 0x80243090; // type:func rom:0xC395C0 +dgb_04_UnkPartnerPosFunc = 0x80243048; // type:func rom:0xC39578 +dgb_04_UnkPartnerPosFunc2 = 0x80243090; // type:func rom:0xC395C0 func_802430D8_C39608 = 0x802430D8; // type:func rom:0xC39608 D_80243560_C39A90 = 0x80243560; // type:data rom:0xC39A90 D_80243D30_C3A260 = 0x80243D30; // type:data rom:0xC3A260 @@ -11583,7 +11583,7 @@ dup_dgb_08_UnkNpcAIFunc1 = 0x80241F38; // type:func rom:0xC41CE8 func_80241FF8_C41DA8 = 0x80241FF8; // type:func rom:0xC41DA8 dgb_08_UnkNpcAIFunc2 = 0x8024233C; // type:func rom:0xC420EC func_802423B4_C42164 = 0x802423B4; // type:func rom:0xC42164 -func_80242420_C421D0 = 0x80242420; // type:func rom:0xC421D0 +dgb_08_UnkNpcAIFunc14 = 0x80242420; // type:func rom:0xC421D0 dgb_08_UnkNpcAIFunc3 = 0x80242554; // type:func rom:0xC42304 func_802425B8_C42368 = 0x802425B8; // type:func rom:0xC42368 func_80242948_C426F8 = 0x80242948; // type:func rom:0xC426F8 @@ -11634,7 +11634,7 @@ dgb_09_UnkNpcAIFunc1 = 0x80241BFC; // type:func rom:0xC487DC func_80241CBC_C4889C = 0x80241CBC; // type:func rom:0xC4889C dgb_09_UnkNpcAIFunc2 = 0x80242000; // type:func rom:0xC48BE0 func_80242078_C48C58 = 0x80242078; // type:func rom:0xC48C58 -func_802420E4_C48CC4 = 0x802420E4; // type:func rom:0xC48CC4 +dgb_09_UnkNpcAIFunc14 = 0x802420E4; // type:func rom:0xC48CC4 dgb_09_UnkNpcAIFunc3 = 0x80242218; // type:func rom:0xC48DF8 func_8024227C_C48E5C = 0x8024227C; // type:func rom:0xC48E5C func_8024260C_C491EC = 0x8024260C; // type:func rom:0xC491EC @@ -11746,7 +11746,7 @@ kzn_02_UnkNpcAIFunc1 = 0x80240CB8; // type:func rom:0xC5B3F8 func_80240D78_C5B4B8 = 0x80240D78; // type:func rom:0xC5B4B8 kzn_02_UnkNpcAIFunc2 = 0x802410BC; // type:func rom:0xC5B7FC func_80241134_C5B874 = 0x80241134; // type:func rom:0xC5B874 -func_802411A0_C5B8E0 = 0x802411A0; // type:func rom:0xC5B8E0 +kzn_02_UnkNpcAIFunc14 = 0x802411A0; // type:func rom:0xC5B8E0 kzn_02_UnkNpcAIFunc3 = 0x802412D4; // type:func rom:0xC5BA14 func_80241338_C5BA78 = 0x80241338; // type:func rom:0xC5BA78 func_802416C8_C5BE08 = 0x802416C8; // type:func rom:0xC5BE08 @@ -11848,8 +11848,8 @@ func_80240854_C68984 = 0x80240854; // type:func rom:0xC68984 func_802408B8_C689E8 = 0x802408B8; // type:func rom:0xC689E8 func_80240910_C68A40 = 0x80240910; // type:func rom:0xC68A40 func_80240E48_C68F78 = 0x80240E48; // type:func rom:0xC68F78 -func_80240F88_C690B8 = 0x80240F88; // type:func rom:0xC690B8 -func_80240FD0_C69100 = 0x80240FD0; // type:func rom:0xC69100 +kzn_04_UnkPartnerPosFunc = 0x80240F88; // type:func rom:0xC690B8 +kzn_04_UnkPartnerPosFunc2 = 0x80240FD0; // type:func rom:0xC69100 func_80241018_C69148 = 0x80241018; // type:func rom:0xC69148 func_80241050_C69180 = 0x80241050; // type:func rom:0xC69180 func_80241644_C69774 = 0x80241644; // type:func rom:0xC69774 @@ -11883,7 +11883,7 @@ kzn_07_UnkNpcAIFunc1 = 0x80240FF8; // type:func rom:0xC6F328 func_802410B8_C6F3E8 = 0x802410B8; // type:func rom:0xC6F3E8 kzn_07_UnkNpcAIFunc2 = 0x802413FC; // type:func rom:0xC6F72C func_80241474_C6F7A4 = 0x80241474; // type:func rom:0xC6F7A4 -func_802414E0_C6F810 = 0x802414E0; // type:func rom:0xC6F810 +kzn_07_UnkNpcAIFunc14 = 0x802414E0; // type:func rom:0xC6F810 kzn_07_UnkNpcAIFunc3 = 0x80241614; // type:func rom:0xC6F944 func_80241678_C6F9A8 = 0x80241678; // type:func rom:0xC6F9A8 func_80241A08_C6FD38 = 0x80241A08; // type:func rom:0xC6FD38 @@ -11915,7 +11915,7 @@ kzn_08_UnkNpcAIFunc1 = 0x80241228; // type:func rom:0xC726A8 func_802412E8_C72768 = 0x802412E8; // type:func rom:0xC72768 kzn_08_UnkNpcAIFunc2 = 0x8024162C; // type:func rom:0xC72AAC func_802416A4_C72B24 = 0x802416A4; // type:func rom:0xC72B24 -func_80241710_C72B90 = 0x80241710; // type:func rom:0xC72B90 +kzn_08_UnkNpcAIFunc14 = 0x80241710; // type:func rom:0xC72B90 kzn_08_UnkNpcAIFunc3 = 0x80241844; // type:func rom:0xC72CC4 func_802418A8_C72D28 = 0x802418A8; // type:func rom:0xC72D28 func_80241C38_C730B8 = 0x80241C38; // type:func rom:0xC730B8 @@ -11970,8 +11970,8 @@ func_80240544_C77224 = 0x80240544; // type:func rom:0xC77224 func_802405A8_C77288 = 0x802405A8; // type:func rom:0xC77288 func_80240600_C772E0 = 0x80240600; // type:func rom:0xC772E0 func_80240B38_C77818 = 0x80240B38; // type:func rom:0xC77818 -func_80240C78_C77958 = 0x80240C78; // type:func rom:0xC77958 -func_80240CC0_C779A0 = 0x80240CC0; // type:func rom:0xC779A0 +kzn_09_UnkPartnerPosFunc = 0x80240C78; // type:func rom:0xC77958 +kzn_09_UnkPartnerPosFunc2 = 0x80240CC0; // type:func rom:0xC779A0 func_80240D08_C779E8 = 0x80240D08; // type:func rom:0xC779E8 func_80240D40_C77A20 = 0x80240D40; // type:func rom:0xC77A20 func_80240DE4_C77AC4 = 0x80240DE4; // type:func rom:0xC77AC4 @@ -12051,7 +12051,7 @@ kzn_11_UnkNpcAIFunc1 = 0x80240C38; // type:func rom:0xC80DD8 func_80240CF8_C80E98 = 0x80240CF8; // type:func rom:0xC80E98 kzn_11_UnkNpcAIFunc2 = 0x8024103C; // type:func rom:0xC811DC func_802410B4_C81254 = 0x802410B4; // type:func rom:0xC81254 -func_80241120_C812C0 = 0x80241120; // type:func rom:0xC812C0 +kzn_11_UnkNpcAIFunc14 = 0x80241120; // type:func rom:0xC812C0 kzn_11_UnkNpcAIFunc3 = 0x80241254; // type:func rom:0xC813F4 func_802412B8_C81458 = 0x802412B8; // type:func rom:0xC81458 func_80241648_C817E8 = 0x80241648; // type:func rom:0xC817E8 @@ -12254,8 +12254,8 @@ func_80240544_CAF284 = 0x80240544; // type:func rom:0xCAF284 func_802405A8_CAF2E8 = 0x802405A8; // type:func rom:0xCAF2E8 func_80240600_CAF340 = 0x80240600; // type:func rom:0xCAF340 func_80240B38_CAF878 = 0x80240B38; // type:func rom:0xCAF878 -func_80240C78_CAF9B8 = 0x80240C78; // type:func rom:0xCAF9B8 -func_80240CC0_CAFA00 = 0x80240CC0; // type:func rom:0xCAFA00 +flo_08_UnkPartnerPosFunc = 0x80240C78; // type:func rom:0xCAF9B8 +flo_08_UnkPartnerPosFunc2 = 0x80240CC0; // type:func rom:0xCAFA00 func_80240D08_CAFA48 = 0x80240D08; // type:func rom:0xCAFA48 func_80240D40_CAFA80 = 0x80240D40; // type:func rom:0xCAFA80 func_80240D80_CAFAC0 = 0x80240D80; // type:func rom:0xCAFAC0 @@ -12289,7 +12289,7 @@ flo_09_UnkNpcAIFunc1 = 0x80240AF8; // type:func rom:0xCB5AF8 func_80240BB8_CB5BB8 = 0x80240BB8; // type:func rom:0xCB5BB8 flo_09_UnkNpcAIFunc2 = 0x80240EFC; // type:func rom:0xCB5EFC func_80240F74_CB5F74 = 0x80240F74; // type:func rom:0xCB5F74 -func_80240FE0_CB5FE0 = 0x80240FE0; // type:func rom:0xCB5FE0 +flo_09_UnkNpcAIFunc14 = 0x80240FE0; // type:func rom:0xCB5FE0 flo_09_UnkNpcAIFunc3 = 0x80241114; // type:func rom:0xCB6114 func_80241178_CB6178 = 0x80241178; // type:func rom:0xCB6178 func_80241508_CB6508 = 0x80241508; // type:func rom:0xCB6508 @@ -12338,7 +12338,7 @@ flo_13_UnkNpcAIFunc1 = 0x8024099C; // type:func rom:0xCC41AC func_80240A5C_CC426C = 0x80240A5C; // type:func rom:0xCC426C flo_13_UnkNpcAIFunc2 = 0x80240DA0; // type:func rom:0xCC45B0 func_80240E18_CC4628 = 0x80240E18; // type:func rom:0xCC4628 -func_80240E84_CC4694 = 0x80240E84; // type:func rom:0xCC4694 +flo_13_UnkNpcAIFunc14 = 0x80240E84; // type:func rom:0xCC4694 flo_13_UnkNpcAIFunc3 = 0x80240FB8; // type:func rom:0xCC47C8 func_8024101C_CC482C = 0x8024101C; // type:func rom:0xCC482C func_802413AC_CC4BBC = 0x802413AC; // type:func rom:0xCC4BBC @@ -12379,7 +12379,7 @@ flo_14_UnkNpcAIFunc1 = 0x802412E8; // type:func rom:0xCCC5F8 func_802413A8_CCC6B8 = 0x802413A8; // type:func rom:0xCCC6B8 flo_14_UnkNpcAIFunc2 = 0x802416EC; // type:func rom:0xCCC9FC func_80241764_CCCA74 = 0x80241764; // type:func rom:0xCCCA74 -func_802417D0_CCCAE0 = 0x802417D0; // type:func rom:0xCCCAE0 +flo_14_UnkNpcAIFunc14 = 0x802417D0; // type:func rom:0xCCCAE0 flo_14_UnkNpcAIFunc3 = 0x80241904; // type:func rom:0xCCCC14 func_80241968_CCCC78 = 0x80241968; // type:func rom:0xCCCC78 func_80241CF8_CCD008 = 0x80241CF8; // type:func rom:0xCCD008 @@ -12422,8 +12422,8 @@ func_80240624_CD2454 = 0x80240624; // type:func rom:0xCD2454 func_80240688_CD24B8 = 0x80240688; // type:func rom:0xCD24B8 func_802406E0_CD2510 = 0x802406E0; // type:func rom:0xCD2510 func_80240C18_CD2A48 = 0x80240C18; // type:func rom:0xCD2A48 -func_80240D58_CD2B88 = 0x80240D58; // type:func rom:0xCD2B88 -func_80240DA0_CD2BD0 = 0x80240DA0; // type:func rom:0xCD2BD0 +flo_16_UnkPartnerPosFunc = 0x80240D58; // type:func rom:0xCD2B88 +flo_16_UnkPartnerPosFunc2 = 0x80240DA0; // type:func rom:0xCD2BD0 func_80240DE8_CD2C18 = 0x80240DE8; // type:func rom:0xCD2C18 func_80240E18_CD2C48 = 0x80240E18; // type:func rom:0xCD2C48 func_80240E50_CD2C80 = 0x80240E50; // type:func rom:0xCD2C80 @@ -12432,7 +12432,7 @@ flo_16_UnkNpcAIFunc1 = 0x80241628; // type:func rom:0xCD3458 func_802416E8_CD3518 = 0x802416E8; // type:func rom:0xCD3518 flo_16_UnkNpcAIFunc2 = 0x80241A2C; // type:func rom:0xCD385C func_80241AA4_CD38D4 = 0x80241AA4; // type:func rom:0xCD38D4 -func_80241B10_CD3940 = 0x80241B10; // type:func rom:0xCD3940 +flo_16_UnkNpcAIFunc14 = 0x80241B10; // type:func rom:0xCD3940 flo_16_UnkNpcAIFunc3 = 0x80241C44; // type:func rom:0xCD3A74 func_80241CA8_CD3AD8 = 0x80241CA8; // type:func rom:0xCD3AD8 func_80242038_CD3E68 = 0x80242038; // type:func rom:0xCD3E68 @@ -12459,7 +12459,7 @@ flo_17_UnkNpcAIFunc1 = 0x80240848; // type:func rom:0xCD7B28 func_80240908_CD7BE8 = 0x80240908; // type:func rom:0xCD7BE8 flo_17_UnkNpcAIFunc2 = 0x80240C4C; // type:func rom:0xCD7F2C func_80240CC4_CD7FA4 = 0x80240CC4; // type:func rom:0xCD7FA4 -func_80240D30_CD8010 = 0x80240D30; // type:func rom:0xCD8010 +flo_17_UnkNpcAIFunc14 = 0x80240D30; // type:func rom:0xCD8010 flo_17_UnkNpcAIFunc3 = 0x80240E64; // type:func rom:0xCD8144 func_80240EC8_CD81A8 = 0x80240EC8; // type:func rom:0xCD81A8 func_80241258_CD8538 = 0x80241258; // type:func rom:0xCD8538 @@ -12541,7 +12541,7 @@ flo_25_UnkNpcAIFunc1 = 0x80240818; // type:func rom:0xCF33E8 func_802408D8_CF34A8 = 0x802408D8; // type:func rom:0xCF34A8 flo_25_UnkNpcAIFunc2 = 0x80240C1C; // type:func rom:0xCF37EC func_80240C94_CF3864 = 0x80240C94; // type:func rom:0xCF3864 -func_80240D00_CF38D0 = 0x80240D00; // type:func rom:0xCF38D0 +flo_25_UnkNpcAIFunc14 = 0x80240D00; // type:func rom:0xCF38D0 flo_25_UnkNpcAIFunc3 = 0x80240E34; // type:func rom:0xCF3A04 func_80240E98_CF3A68 = 0x80240E98; // type:func rom:0xCF3A68 func_80241228_CF3DF8 = 0x80241228; // type:func rom:0xCF3DF8 @@ -12584,7 +12584,7 @@ func_8024083C_CF83AC = 0x8024083C; // type:func rom:0xCF83AC func_80240A60_CF85D0 = 0x80240A60; // type:func rom:0xCF85D0 sam_01_GetNpcUnsafeOwner2 = 0x80240AAC; // type:func rom:0xCF861C func_80240ACC_CF863C = 0x80240ACC; // type:func rom:0xCF863C -func_80240B2C_CF869C = 0x80240B2C; // type:func rom:0xCF869C +sam_01_UnkAlphaFunc = 0x80240B2C; // type:func rom:0xCF869C func_80240C78_CF87E8 = 0x80240C78; // type:func rom:0xCF87E8 func_80240DEC_CF895C = 0x80240DEC; // type:func rom:0xCF895C func_80240E70_CF89E0 = 0x80240E70; // type:func rom:0xCF89E0 @@ -12607,7 +12607,7 @@ sam_01_SetManyVars = 0x80241794; // type:func rom:0xCF9304 sam_01_UnkYawFunc = 0x80241884; // type:func rom:0xCF93F4 func_80241A10_CF9580 = 0x80241A10; // type:func rom:0xCF9580 func_80241A54_CF95C4 = 0x80241A54; // type:func rom:0xCF95C4 -func_80241A80_CF95F0 = 0x80241A80; // type:func rom:0xCF95F0 +sam_01_GetItemEntityPosition = 0x80241A80; // type:func rom:0xCF95F0 func_80241B20_CF9690 = 0x80241B20; // type:func rom:0xCF9690 func_80241C90_CF9800 = 0x80241C90; // type:func rom:0xCF9800 dup_sam_01_GetItemName = 0x80241D44; // type:func rom:0xCF98B4 @@ -12649,7 +12649,7 @@ func_80240C68_D06398 = 0x80240C68; // type:func rom:0xD06398 func_80240E8C_D065BC = 0x80240E8C; // type:func rom:0xD065BC sam_02_GetNpcUnsafeOwner2 = 0x80240ED8; // type:func rom:0xD06608 func_80240EF8_D06628 = 0x80240EF8; // type:func rom:0xD06628 -func_80240F58_D06688 = 0x80240F58; // type:func rom:0xD06688 +sam_02_UnkAlphaFunc = 0x80240F58; // type:func rom:0xD06688 func_802410A4_D067D4 = 0x802410A4; // type:func rom:0xD067D4 begin_battle_D06948 = 0x80241218; // type:func rom:0xD06948 func_8024129C_D069CC = 0x8024129C; // type:func rom:0xD069CC @@ -12726,7 +12726,7 @@ sam_06_UnkNpcAIFunc1 = 0x80240D28; // type:func rom:0xD20BB8 func_80240DE8_D20C78 = 0x80240DE8; // type:func rom:0xD20C78 sam_06_UnkNpcAIFunc2 = 0x8024112C; // type:func rom:0xD20FBC func_802411A4_D21034 = 0x802411A4; // type:func rom:0xD21034 -func_80241210_D210A0 = 0x80241210; // type:func rom:0xD210A0 +sam_06_UnkNpcAIFunc14 = 0x80241210; // type:func rom:0xD210A0 sam_06_UnkNpcAIFunc3 = 0x80241344; // type:func rom:0xD211D4 func_802413A8_D21238 = 0x802413A8; // type:func rom:0xD21238 func_80241738_D215C8 = 0x80241738; // type:func rom:0xD215C8 @@ -12806,8 +12806,8 @@ func_80240544_D301C4 = 0x80240544; // type:func rom:0xD301C4 func_802405A8_D30228 = 0x802405A8; // type:func rom:0xD30228 func_80240600_D30280 = 0x80240600; // type:func rom:0xD30280 func_80240B38_D307B8 = 0x80240B38; // type:func rom:0xD307B8 -func_80240C78_D308F8 = 0x80240C78; // type:func rom:0xD308F8 -func_80240CC0_D30940 = 0x80240CC0; // type:func rom:0xD30940 +sam_08_UnkPartnerPosFunc = 0x80240C78; // type:func rom:0xD308F8 +sam_08_UnkPartnerPosFunc2 = 0x80240CC0; // type:func rom:0xD30940 func_80240D08_D30988 = 0x80240D08; // type:func rom:0xD30988 sam_08_UnkNpcAIFunc6 = 0x80240D40; // type:func rom:0xD309C0 sam_08_UnkNpcAIFunc7 = 0x80240DAC; // type:func rom:0xD30A2C @@ -12868,7 +12868,7 @@ func_8024090C_D3AEDC = 0x8024090C; // type:func rom:0xD3AEDC func_80240B30_D3B100 = 0x80240B30; // type:func rom:0xD3B100 sam_11_GetNpcUnsafeOwner2 = 0x80240B7C; // type:func rom:0xD3B14C func_80240B9C_D3B16C = 0x80240B9C; // type:func rom:0xD3B16C -func_80240BFC_D3B1CC = 0x80240BFC; // type:func rom:0xD3B1CC +sam_11_UnkAlphaFunc = 0x80240BFC; // type:func rom:0xD3B1CC func_80240D48_D3B318 = 0x80240D48; // type:func rom:0xD3B318 func_80240EBC_D3B48C = 0x80240EBC; // type:func rom:0xD3B48C func_80240F40_D3B510 = 0x80240F40; // type:func rom:0xD3B510 @@ -13554,7 +13554,7 @@ omo_04_UnkNpcAIFunc1 = 0x80240B78; // type:func rom:0xDADF78 func_80240C38_DAE038 = 0x80240C38; // type:func rom:0xDAE038 omo_04_UnkNpcAIFunc2 = 0x80240F7C; // type:func rom:0xDAE37C func_80240FF4_DAE3F4 = 0x80240FF4; // type:func rom:0xDAE3F4 -func_80241060_DAE460 = 0x80241060; // type:func rom:0xDAE460 +omo_04_UnkNpcAIFunc14 = 0x80241060; // type:func rom:0xDAE460 omo_04_UnkNpcAIFunc3 = 0x80241194; // type:func rom:0xDAE594 func_802411F8_DAE5F8 = 0x802411F8; // type:func rom:0xDAE5F8 func_80241588_DAE988 = 0x80241588; // type:func rom:0xDAE988 @@ -13588,7 +13588,7 @@ omo_05_UnkNpcAIFunc1 = 0x8024122C; // type:func rom:0xDB34EC func_802412EC_DB35AC = 0x802412EC; // type:func rom:0xDB35AC omo_05_UnkNpcAIFunc2 = 0x80241630; // type:func rom:0xDB38F0 func_802416A8_DB3968 = 0x802416A8; // type:func rom:0xDB3968 -func_80241714_DB39D4 = 0x80241714; // type:func rom:0xDB39D4 +omo_05_UnkNpcAIFunc14 = 0x80241714; // type:func rom:0xDB39D4 omo_05_UnkNpcAIFunc3 = 0x80241848; // type:func rom:0xDB3B08 func_802418AC_DB3B6C = 0x802418AC; // type:func rom:0xDB3B6C func_80241C3C_DB3EFC = 0x80241C3C; // type:func rom:0xDB3EFC @@ -13655,7 +13655,7 @@ dup_omo_07_UnkNpcAIFunc1 = 0x80242150; // type:func rom:0xDBF400 func_80242210_DBF4C0 = 0x80242210; // type:func rom:0xDBF4C0 omo_07_UnkNpcAIFunc2 = 0x80242554; // type:func rom:0xDBF804 func_802425CC_DBF87C = 0x802425CC; // type:func rom:0xDBF87C -func_80242638_DBF8E8 = 0x80242638; // type:func rom:0xDBF8E8 +omo_07_UnkNpcAIFunc14 = 0x80242638; // type:func rom:0xDBF8E8 omo_07_UnkNpcAIFunc3 = 0x8024276C; // type:func rom:0xDBFA1C func_802427D0_DBFA80 = 0x802427D0; // type:func rom:0xDBFA80 func_80242B60_DBFE10 = 0x80242B60; // type:func rom:0xDBFE10 @@ -13788,8 +13788,8 @@ func_80240CD4_DDD504 = 0x80240CD4; // type:func rom:0xDDD504 func_80240D38_DDD568 = 0x80240D38; // type:func rom:0xDDD568 func_80240D90_DDD5C0 = 0x80240D90; // type:func rom:0xDDD5C0 func_802412C8_DDDAF8 = 0x802412C8; // type:func rom:0xDDDAF8 -func_80241408_DDDC38 = 0x80241408; // type:func rom:0xDDDC38 -func_80241450_DDDC80 = 0x80241450; // type:func rom:0xDDDC80 +omo_11_UnkPartnerPosFunc = 0x80241408; // type:func rom:0xDDDC38 +omo_11_UnkPartnerPosFunc2 = 0x80241450; // type:func rom:0xDDDC80 func_80241498_DDDCC8 = 0x80241498; // type:func rom:0xDDDCC8 D_80241740_DDDF70 = 0x80241740; // type:data rom:0xDDDF70 D_80241760_DDDF90 = 0x80241760; // type:data rom:0xDDDF90 @@ -13875,7 +13875,7 @@ omo_17_UnkNpcAIFunc1 = 0x8024178C; // type:func rom:0xDF062C func_8024184C_DF06EC = 0x8024184C; // type:func rom:0xDF06EC omo_17_UnkNpcAIFunc2 = 0x80241B90; // type:func rom:0xDF0A30 func_80241C08_DF0AA8 = 0x80241C08; // type:func rom:0xDF0AA8 -func_80241C74_DF0B14 = 0x80241C74; // type:func rom:0xDF0B14 +omo_17_UnkNpcAIFunc14 = 0x80241C74; // type:func rom:0xDF0B14 omo_17_UnkNpcAIFunc3 = 0x80241DA8; // type:func rom:0xDF0C48 func_80241E0C_DF0CAC = 0x80241E0C; // type:func rom:0xDF0CAC func_8024219C_DF103C = 0x8024219C; // type:func rom:0xDF103C @@ -14515,8 +14515,8 @@ func_80240544_ECA244 = 0x80240544; // type:func rom:0xECA244 func_802405A8_ECA2A8 = 0x802405A8; // type:func rom:0xECA2A8 func_80240600_ECA300 = 0x80240600; // type:func rom:0xECA300 func_80240B38_ECA838 = 0x80240B38; // type:func rom:0xECA838 -func_80240C78_ECA978 = 0x80240C78; // type:func rom:0xECA978 -func_80240CC0_ECA9C0 = 0x80240CC0; // type:func rom:0xECA9C0 +code_EC9D00_DeadUnkPartnerPosFunc = 0x80240C78; // type:func rom:0xECA978 +code_EC9D00_DeadUnkPartnerPosFunc2 = 0x80240CC0; // type:func rom:0xECA9C0 func_80240D08_ECAA08 = 0x80240D08; // type:func rom:0xECAA08 func_80240D40_ECAA40 = 0x80240D40; // type:func rom:0xECAA40 func_80240D80_ECAA80 = 0x80240D80; // type:func rom:0xECAA80 @@ -14550,7 +14550,7 @@ func_80240AF8_ED0AE8 = 0x80240AF8; // type:func rom:0xED0AE8 func_80240BB8_ED0BA8 = 0x80240BB8; // type:func rom:0xED0BA8 func_80240EFC_ED0EEC = 0x80240EFC; // type:func rom:0xED0EEC func_80240F74_ED0F64 = 0x80240F74; // type:func rom:0xED0F64 -func_80240FE0_ED0FD0 = 0x80240FE0; // type:func rom:0xED0FD0 +code_ED0310_DeadUnkNpcAIFunc14 = 0x80240FE0; // type:func rom:0xED0FD0 func_80241114_ED1104 = 0x80241114; // type:func rom:0xED1104 func_80241178_ED1168 = 0x80241178; // type:func rom:0xED1168 func_80241508_ED14F8 = 0x80241508; // type:func rom:0xED14F8 @@ -14602,7 +14602,7 @@ func_8024099C_EDF35C = 0x8024099C; // type:func rom:0xEDF35C func_80240A5C_EDF41C = 0x80240A5C; // type:func rom:0xEDF41C func_80240DA0_EDF760 = 0x80240DA0; // type:func rom:0xEDF760 func_80240E18_EDF7D8 = 0x80240E18; // type:func rom:0xEDF7D8 -func_80240E84_EDF844 = 0x80240E84; // type:func rom:0xEDF844 +code_EDEA00_DeadUnkNpcAIFunc14 = 0x80240E84; // type:func rom:0xEDF844 func_80240FB8_EDF978 = 0x80240FB8; // type:func rom:0xEDF978 func_8024101C_EDF9DC = 0x8024101C; // type:func rom:0xEDF9DC func_802413AC_EDFD6C = 0x802413AC; // type:func rom:0xEDFD6C @@ -14643,7 +14643,7 @@ func_802412E8_EE7898 = 0x802412E8; // type:func rom:0xEE7898 func_802413A8_EE7958 = 0x802413A8; // type:func rom:0xEE7958 func_802416EC_EE7C9C = 0x802416EC; // type:func rom:0xEE7C9C func_80241764_EE7D14 = 0x80241764; // type:func rom:0xEE7D14 -func_802417D0_EE7D80 = 0x802417D0; // type:func rom:0xEE7D80 +code_EE70C0_DeadUnkNpcAIFunc14 = 0x802417D0; // type:func rom:0xEE7D80 func_80241904_EE7EB4 = 0x80241904; // type:func rom:0xEE7EB4 func_80241968_EE7F18 = 0x80241968; // type:func rom:0xEE7F18 func_80241CF8_EE82A8 = 0x80241CF8; // type:func rom:0xEE82A8 @@ -14687,8 +14687,8 @@ func_80240624_EED724 = 0x80240624; // type:func rom:0xEED724 func_80240688_EED788 = 0x80240688; // type:func rom:0xEED788 func_802406E0_EED7E0 = 0x802406E0; // type:func rom:0xEED7E0 func_80240C18_EEDD18 = 0x80240C18; // type:func rom:0xEEDD18 -func_80240D58_EEDE58 = 0x80240D58; // type:func rom:0xEEDE58 -func_80240DA0_EEDEA0 = 0x80240DA0; // type:func rom:0xEEDEA0 +code_EED1E0_DeadUnkPartnerPosFunc = 0x80240D58; // type:func rom:0xEEDE58 +code_EED1E0_DeadUnkPartnerPosFunc2 = 0x80240DA0; // type:func rom:0xEEDEA0 func_80240DE8_EEDEE8 = 0x80240DE8; // type:func rom:0xEEDEE8 func_80240E18_EEDF18 = 0x80240E18; // type:func rom:0xEEDF18 func_80240E50_EEDF50 = 0x80240E50; // type:func rom:0xEEDF50 @@ -14697,7 +14697,7 @@ func_80241628_EEE728 = 0x80241628; // type:func rom:0xEEE728 func_802416E8_EEE7E8 = 0x802416E8; // type:func rom:0xEEE7E8 func_80241A2C_EEEB2C = 0x80241A2C; // type:func rom:0xEEEB2C func_80241AA4_EEEBA4 = 0x80241AA4; // type:func rom:0xEEEBA4 -func_80241B10_EEEC10 = 0x80241B10; // type:func rom:0xEEEC10 +code_EEDF50_DeadUnkNpcAIFunc14 = 0x80241B10; // type:func rom:0xEEEC10 func_80241C44_EEED44 = 0x80241C44; // type:func rom:0xEEED44 func_80241CA8_EEEDA8 = 0x80241CA8; // type:func rom:0xEEEDA8 func_80242038_EEF138 = 0x80242038; // type:func rom:0xEEF138 @@ -14724,7 +14724,7 @@ func_80240848_EF2E58 = 0x80240848; // type:func rom:0xEF2E58 func_80240908_EF2F18 = 0x80240908; // type:func rom:0xEF2F18 func_80240C4C_EF325C = 0x80240C4C; // type:func rom:0xEF325C func_80240CC4_EF32D4 = 0x80240CC4; // type:func rom:0xEF32D4 -func_80240D30_EF3340 = 0x80240D30; // type:func rom:0xEF3340 +code_EF2680_DeadUnkNpcAIFunc14 = 0x80240D30; // type:func rom:0xEF3340 func_80240E64_EF3474 = 0x80240E64; // type:func rom:0xEF3474 func_80240EC8_EF34D8 = 0x80240EC8; // type:func rom:0xEF34D8 func_80241258_EF3868 = 0x80241258; // type:func rom:0xEF3868 diff --git a/tools/add_to_symbol_addrs.py b/tools/update_symbol_addrs.py similarity index 100% rename from tools/add_to_symbol_addrs.py rename to tools/update_symbol_addrs.py