From 4555d9fab5b9d8a943c4b60c2b6a25de46984d1f Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Fri, 8 Apr 2022 14:25:49 -0400 Subject: [PATCH] StashVars (#679) * beginnings * more * done * cleanup * remove sublist.txt --- include/dead.h | 1 + include/effects.h | 2 +- src/EA0C10.c | 3 +- src/EA8AE0.c | 2 +- src/EB1170.c | 2 +- src/EC2240.c | 2 +- src/EC7590.c | 2 +- src/ED42A0.c | 2 +- src/EDC020.c | 24 +- src/world/area_arn/arn_03/events.c | 1 + src/world/area_dgb/dgb_06/C3D080.c | 1 + src/world/area_dgb/dgb_12/C4DEF0.c | 1 + src/world/area_dgb/dgb_18/C55F40.c | 2 +- src/world/area_dgb/dgb_18/C56EF0.c | 19 +- src/world/area_dgb/dgb_18/dgb_18.h | 2 +- src/world/area_dro/dro_01/95B7E0.c | 58 +-- src/world/area_dro/dro_01/95E660.c | 20 +- src/world/area_dro/dro_01/dro_01.h | 2 +- src/world/area_dro/dro_02/9694C0.c | 20 +- src/world/area_flo/flo_03/CA72E0.c | 20 +- src/world/area_flo/flo_07/CAC5D0.c | 20 +- src/world/area_flo/flo_10/CB9280.c | 20 +- src/world/area_flo/flo_10/flo_10.h | 2 +- src/world/area_flo/flo_12/CC0E70.c | 24 +- src/world/area_hos/hos_00/A0C4E0.c | 2 +- src/world/area_hos/hos_03/A1BDB0.c | 2 +- src/world/area_hos/hos_06/A397F0.c | 2 +- src/world/area_hos/hos_06/A3A230.c | 4 +- src/world/area_hos/hos_06/A3B4B0.c | 4 +- src/world/area_isk/isk_09/9864E0.c | 2 +- src/world/area_iwa/iwa_00/90CC40.c | 2 +- src/world/area_iwa/iwa_02/915D70.c | 2 +- src/world/area_iwa/iwa_03/918BB0.c | 2 +- src/world/area_iwa/iwa_10/91E5B0.c | 2 +- src/world/area_jan/jan_00/B20540.c | 2 +- src/world/area_jan/jan_02/B2C8A0.c | 2 +- src/world/area_jan/jan_03/B34BD0.c | 2 +- src/world/area_jan/jan_04/B44AC0.c | 2 +- src/world/area_jan/jan_22/B84180.c | 2 +- src/world/area_kkj/kkj_17/AF1C60.c | 2 +- src/world/area_kkj/kkj_20/AFDB40.c | 2 +- src/world/area_kmr/kmr_02/8B0070.c | 2 +- src/world/area_kmr/kmr_04/8CA960.c | 2 +- src/world/area_kmr/kmr_10/8D84D0.c | 2 +- src/world/area_kmr/kmr_20/8ED440.c | 2 +- src/world/area_kpa/kpa_14/A57830.c | 2 +- src/world/area_kpa/kpa_15/A596A0.c | 2 +- src/world/area_kzn/kzn_02/C5AC20.c | 2 +- src/world/area_kzn/kzn_03/C61020.c | 2 +- src/world/area_kzn/kzn_08/C71C10.c | 2 +- src/world/area_kzn/kzn_09/C77D00.c | 2 +- src/world/area_kzn/kzn_17/C85DC0.c | 2 +- src/world/area_kzn/kzn_19/C8DBB0.c | 2 +- src/world/area_kzn/kzn_20/C96240.c | 2 +- src/world/area_mac/mac_00/7EB340.c | 2 +- src/world/area_mac/mac_00/7ED280.c | 4 +- src/world/area_mac/mac_01/8017D0.c | 2 +- src/world/area_mac/mac_02/823BF0.c | 2 +- src/world/area_mac/mac_03/831B20.c | 2 +- src/world/area_mac/mac_04/843030.c | 2 +- src/world/area_mac/mac_05/852170.c | 2 +- src/world/area_mim/mim_04/B9DB60.c | 2 +- src/world/area_nok/nok_01/9C53E0.c | 2 +- src/world/area_nok/nok_02/9D7020.c | 2 +- src/world/area_nok/nok_02/9D7770.c | 2 +- src/world/area_nok/nok_02/9D7AA0.c | 4 +- src/world/area_nok/nok_02/9DA8F0.c | 4 +- src/world/area_obk/obk_01/BBD980.c | 2 +- src/world/area_obk/obk_03/BC43F0.c | 2 +- src/world/area_obk/obk_04/BC7EB0.c | 2 +- src/world/area_obk/obk_07/BCEBF0.c | 2 +- src/world/area_omo/omo_04/DAD400.c | 2 +- src/world/area_omo/omo_06/DB8180.c | 2 +- src/world/area_omo/omo_07/DC01D0.c | 2 +- src/world/area_omo/omo_09/DCD3F0.c | 2 +- src/world/area_omo/omo_13/DE36C0.c | 2 +- src/world/area_osr/osr_01/AB0350.c | 2 +- src/world/area_pra/pra_05/D55BD0.c | 2 +- src/world/area_pra/pra_11/D61520.c | 2 +- src/world/area_pra/pra_12/D62D10.c | 2 +- src/world/area_pra/pra_14/D67D20.c | 2 +- src/world/area_pra/pra_27/D799F0.c | 2 +- src/world/area_pra/pra_28/D7B2A0.c | 2 +- src/world/area_pra/pra_35/D8FBA0.c | 2 +- src/world/area_sam/sam_01/CF7E80.c | 6 +- src/world/area_sam/sam_02/D05F60.c | 2 +- src/world/area_sam/sam_06/D203E0.c | 2 +- src/world/area_sam/sam_09/D362F0.c | 2 +- src/world/area_sam/sam_10/D37800.c | 2 +- src/world/area_sam/sam_11/D3ADA0.c | 2 +- src/world/area_sbk/sbk_02/92A9A0.c | 2 +- src/world/area_sbk/sbk_30/93F5B0.c | 2 +- src/world/area_sbk/sbk_34/945F10.c | 2 +- src/world/area_tik/tik_02/86CA50.c | 2 +- src/world/area_tik/tik_05/8750D0.c | 2 +- src/world/area_tik/tik_12/8891C0.c | 2 +- src/world/area_tik/tik_15/890190.c | 2 +- src/world/area_trd/trd_00/999F80.c | 2 +- src/world/common/StashVars.inc.c | 17 +- tools/substitute.py | 17 +- ver/us/asm/data/EA3A80.data.s | 2 +- ver/us/asm/data/EAA810.data.s | 2 +- ver/us/asm/data/EB1920.data.s | 2 +- ver/us/asm/data/EC2850.data.s | 2 +- ver/us/asm/data/EC78F0.data.s | 2 +- ver/us/asm/data/ED5780.data.s | 2 +- ver/us/asm/data/EDC6D0.data.s | 2 +- .../data/world/area_hos/hos_00/A0E520.data.s | 2 +- .../data/world/area_hos/hos_03/A1F3C0.data.s | 2 +- .../data/world/area_hos/hos_06/A3C090.data.s | 2 +- .../data/world/area_hos/hos_06/A3DAB0.data.s | 4 +- .../data/world/area_isk/isk_09/986BD0.data.s | 2 +- .../data/world/area_iwa/iwa_00/90CF20.data.s | 2 +- .../data/world/area_iwa/iwa_02/917220.data.s | 2 +- .../data/world/area_iwa/iwa_03/919F00.data.s | 2 +- .../data/world/area_iwa/iwa_10/920280.data.s | 2 +- .../data/world/area_jan/jan_00/B226D0.data.s | 2 +- .../data/world/area_jan/jan_02/B2F410.data.s | 2 +- .../data/world/area_jan/jan_03/B39530.data.s | 2 +- .../data/world/area_jan/jan_04/B45A20.data.s | 2 +- .../data/world/area_jan/jan_22/B85AE0.data.s | 2 +- .../data/world/area_kkj/kkj_17/AF2520.data.s | 2 +- .../data/world/area_kkj/kkj_20/AFE3C0.data.s | 2 +- .../data/world/area_kmr/kmr_02/8B5640.data.s | 2 +- .../data/world/area_kmr/kmr_04/8CC4F0.data.s | 2 +- .../data/world/area_kmr/kmr_10/8D90F0.data.s | 2 +- .../data/world/area_kmr/kmr_20/8F66D0.data.s | 2 +- .../data/world/area_kpa/kpa_14/A58DB0.data.s | 2 +- .../data/world/area_kpa/kpa_15/A59E30.data.s | 2 +- .../data/world/area_kzn/kzn_02/C5D9B0.data.s | 2 +- .../data/world/area_kzn/kzn_03/C647B0.data.s | 2 +- .../data/world/area_kzn/kzn_08/C76030.data.s | 2 +- .../data/world/area_kzn/kzn_09/C7B0D0.data.s | 2 +- .../data/world/area_kzn/kzn_17/C89450.data.s | 2 +- .../data/world/area_kzn/kzn_19/C90BF0.data.s | 2 +- .../data/world/area_kzn/kzn_20/C97600.data.s | 2 +- .../data/world/area_mac/mac_00/7F0A20.data.s | 2 +- .../data/world/area_mac/mac_00/7F9850.data.s | 2 +- .../data/world/area_mac/mac_01/8091F0.data.s | 2 +- .../data/world/area_mac/mac_02/828F10.data.s | 2 +- .../data/world/area_mac/mac_03/837CB0.data.s | 2 +- .../data/world/area_mac/mac_04/8469B0.data.s | 2 +- .../data/world/area_mac/mac_05/857070.data.s | 2 +- .../data/world/area_mim/mim_04/B9FEA0.data.s | 2 +- .../data/world/area_nok/nok_01/9C89E0.data.s | 2 +- .../data/world/area_nok/nok_02/9DB6C0.data.s | 2 +- .../data/world/area_nok/nok_02/9DDE90.data.s | 2 +- .../data/world/area_nok/nok_02/9E9420.data.s | 2 +- .../data/world/area_obk/obk_01/BC11A0.data.s | 2 +- .../data/world/area_obk/obk_03/BC7120.data.s | 2 +- .../data/world/area_obk/obk_04/BCB870.data.s | 2 +- .../data/world/area_obk/obk_07/BD0BA0.data.s | 2 +- .../data/world/area_omo/omo_04/DAF3E0.data.s | 2 +- .../data/world/area_omo/omo_06/DBCFD0.data.s | 2 +- .../data/world/area_omo/omo_07/DC30B0.data.s | 2 +- .../data/world/area_omo/omo_09/DD3520.data.s | 2 +- .../data/world/area_omo/omo_13/DE5100.data.s | 2 +- .../data/world/area_osr/osr_01/AB1150.data.s | 2 +- .../data/world/area_pra/pra_05/D56E20.data.s | 2 +- .../data/world/area_pra/pra_11/D62B10.data.s | 2 +- .../data/world/area_pra/pra_12/D63FB0.data.s | 2 +- .../data/world/area_pra/pra_14/D69630.data.s | 2 +- .../data/world/area_pra/pra_27/D7B080.data.s | 2 +- .../data/world/area_pra/pra_28/D7C930.data.s | 2 +- .../data/world/area_pra/pra_35/D91030.data.s | 2 +- .../data/world/area_sam/sam_01/CF9BC0.data.s | 2 +- .../data/world/area_sam/sam_01/D05460.data.s | 2 +- .../data/world/area_sam/sam_02/D09AD0.data.s | 2 +- .../data/world/area_sam/sam_06/D23E50.data.s | 2 +- .../data/world/area_sam/sam_09/D369A0.data.s | 2 +- .../data/world/area_sam/sam_10/D38840.data.s | 2 +- .../data/world/area_sam/sam_11/D3D900.data.s | 2 +- .../data/world/area_sbk/sbk_02/92E220.data.s | 2 +- .../data/world/area_sbk/sbk_30/940DC0.data.s | 2 +- .../data/world/area_sbk/sbk_34/9468B0.data.s | 2 +- .../data/world/area_tik/tik_02/86D800.data.s | 2 +- .../data/world/area_tik/tik_05/8765C0.data.s | 2 +- .../data/world/area_tik/tik_12/88C810.data.s | 2 +- .../data/world/area_tik/tik_15/8922A0.data.s | 2 +- .../data/world/area_trd/trd_00/99AFB0.data.s | 2 +- .../EA0C10/func_8024267C_EA2F7C.s | 53 --- .../EA8AE0/func_80241468_EA9F48.s | 53 --- .../EB1170/func_80240310_EB1170.s | 53 --- .../EC2240/func_80240040_EC2240.s | 53 --- .../EC7590/func_8024061C_EC77CC.s | 53 --- .../ED42A0/func_80240080_ED42A0.s | 53 --- .../EDC020/func_8024027C_EDC25C.s | 53 --- .../hos_00/A0C4E0/func_802407F0_A0C4E0.s | 53 --- .../hos_03/A1BDB0/func_802424A4_A1D5A4.s | 53 --- .../hos_06/A397F0/func_80240310_A397F0.s | 53 --- .../hos_06/A3A230/func_802410A4_A3A584.s | 53 --- .../hos_06/A3B4B0/func_80241FD0_A3B4B0.s | 53 --- .../isk_09/9864E0/func_80240000_9864E0.s | 53 --- .../iwa_00/90CC40/func_80240000_90CC40.s | 53 --- .../iwa_02/915D70/func_80240FE0_916D50.s | 53 --- .../iwa_03/918BB0/func_80240000_918BB0.s | 53 --- .../iwa_10/91E5B0/func_80240040_91E5B0.s | 53 --- .../jan_00/B20540/func_802403F4_B20934.s | 53 --- .../jan_02/B2C8A0/func_80241614_B2DA84.s | 53 --- .../jan_03/B34BD0/func_80241B9C_B3676C.s | 53 --- .../jan_04/B44AC0/func_80240350_B44AC0.s | 53 --- .../jan_22/B84180/func_80240E90_B85010.s | 53 --- .../kkj_17/AF1C60/func_80240000_AF1C60.s | 53 --- .../kkj_20/AFDB40/func_80240000_AFDB40.s | 53 --- .../kmr_00/8ABF90/func_80240000_8ABF90.s | 8 +- .../kmr_02/8B0070/func_80240390_8B0400.s | 53 --- .../kmr_04/8CA960/func_802402C8_8CABC8.s | 53 --- .../kmr_10/8D84D0/func_80240000_8D84D0.s | 53 --- .../kmr_20/8ED440/func_80241620_8ED440.s | 53 --- .../kpa_14/A57830/func_80240380_A57830.s | 53 --- .../kpa_15/A596A0/func_80240310_A596A0.s | 53 --- .../kzn_02/C5AC20/func_80241FCC_C5C70C.s | 53 --- .../kzn_03/C61020/func_8024259C_C632AC.s | 53 --- .../kzn_08/C71C10/func_80240790_C71C10.s | 53 --- .../kzn_09/C77D00/func_802432AC_C79F8C.s | 53 --- .../kzn_17/C85DC0/func_8024259C_C8804C.s | 53 --- .../kzn_19/C8DBB0/func_80241468_C8F018.s | 53 --- .../kzn_20/C96240/func_80240310_C96240.s | 53 --- .../mac_00/7EB340/func_80240630_7EB340.s | 53 --- .../mac_00/7ED280/func_80243400_7EE110.s | 53 --- .../mac_01/8017D0/func_80241F10_802790.s | 53 --- .../mac_02/823BF0/func_802417C0_824A80.s | 53 --- .../mac_03/831B20/func_802404B0_831CB0.s | 53 --- .../mac_04/843030/func_80240460_843030.s | 53 --- .../mac_05/852170/func_80241320_853490.s | 53 --- .../mim_04/B9DB60/func_80241014_B9E974.s | 53 --- .../nok_01/9C53E0/func_80240D68_9C6148.s | 53 --- .../nok_02/9D7020/func_802402E0_9D7300.s | 53 --- .../nok_02/9D7AA0/func_80241910_9D8930.s | 53 --- .../nok_02/9DA8F0/func_80243DB0_9DADD0.s | 53 --- .../obk_01/BBD980/func_802407E0_BBD980.s | 53 --- .../obk_03/BC43F0/func_80240170_BC43F0.s | 53 --- .../obk_04/BC7EB0/func_80240940_BC87A0.s | 53 --- .../obk_07/BCEBF0/func_80240000_BCEBF0.s | 53 --- .../omo_04/DAD400/func_80240000_DAD400.s | 53 --- .../omo_06/DB8180/func_80240870_DB8180.s | 53 --- .../omo_07/DC01D0/func_80242F20_DC01D0.s | 53 --- .../omo_09/DCD3F0/func_80240720_DCD3F0.s | 53 --- .../omo_13/DE36C0/func_80241230_DE36C0.s | 53 --- .../osr_01/AB0350/func_80240360_AB0350.s | 53 --- .../pra_05/D55BD0/func_80240F20_D56AD0.s | 53 --- .../pra_11/D61520/func_80240F20_D62420.s | 53 --- .../pra_12/D62D10/func_80240F50_D63C60.s | 53 --- .../pra_14/D67D20/func_80240F20_D68C20.s | 53 --- .../pra_27/D799F0/func_80240F50_D7A940.s | 53 --- .../pra_28/D7B2A0/func_80240F50_D7C1F0.s | 53 --- .../pra_35/D8FBA0/func_80242950_D8FBA0.s | 53 --- .../sam_01/CF7E80/func_80240700_CF8270.s | 53 --- .../sam_01/CF7E80/func_80241C90_CF9800.s | 53 --- .../sam_02/D05F60/func_80240B2C_D0625C.s | 53 --- .../sam_06/D203E0/func_80241A48_D218D8.s | 53 --- .../sam_09/D362F0/func_80240000_D362F0.s | 53 --- .../sam_10/D37800/func_80240000_D37800.s | 53 --- .../sam_11/D3ADA0/func_802407D0_D3ADA0.s | 53 --- .../sbk_02/92A9A0/func_80240A44_92ACF4.s | 53 --- .../sbk_30/93F5B0/func_80240DDC_94038C.s | 53 --- .../sbk_34/945F10/func_80240040_945F10.s | 53 --- .../tik_02/86CA50/func_80240310_86CA50.s | 53 --- .../tik_05/8750D0/func_80240680_875440.s | 53 --- .../tik_12/8891C0/func_80240960_889530.s | 53 --- .../tik_15/890190/func_80240960_890500.s | 53 --- .../trd_00/999F80/func_80240310_999F80.s | 53 --- ver/us/symbol_addrs.txt | 378 +++++++++--------- ver/us/undefined_syms.txt | 1 + 264 files changed, 445 insertions(+), 4845 deletions(-) delete mode 100644 ver/us/asm/nonmatchings/EA0C10/func_8024267C_EA2F7C.s delete mode 100644 ver/us/asm/nonmatchings/EA8AE0/func_80241468_EA9F48.s delete mode 100644 ver/us/asm/nonmatchings/EB1170/func_80240310_EB1170.s delete mode 100644 ver/us/asm/nonmatchings/EC2240/func_80240040_EC2240.s delete mode 100644 ver/us/asm/nonmatchings/EC7590/func_8024061C_EC77CC.s delete mode 100644 ver/us/asm/nonmatchings/ED42A0/func_80240080_ED42A0.s delete mode 100644 ver/us/asm/nonmatchings/EDC020/func_8024027C_EDC25C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_802407F0_A0C4E0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802424A4_A1D5A4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240310_A397F0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802410A4_A3A584.s delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_80241FD0_A3B4B0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_isk/isk_09/9864E0/func_80240000_9864E0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_00/90CC40/func_80240000_90CC40.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240FE0_916D50.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_80240000_918BB0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E5B0/func_80240040_91E5B0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_00/B20540/func_802403F4_B20934.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241614_B2DA84.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241B9C_B3676C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_04/B44AC0/func_80240350_B44AC0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240E90_B85010.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_80240000_AF1C60.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kkj/kkj_20/AFDB40/func_80240000_AFDB40.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240390_8B0400.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_802402C8_8CABC8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240000_8D84D0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8ED440/func_80241620_8ED440.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240380_A57830.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_15/A596A0/func_80240310_A596A0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241FCC_C5C70C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_8024259C_C632AC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71C10/func_80240790_C71C10.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802432AC_C79F8C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024259C_C8804C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241468_C8F018.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_80240310_C96240.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240630_7EB340.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243400_7EE110.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241F10_802790.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802417C0_824A80.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802404B0_831CB0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240460_843030.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241320_853490.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80241014_B9E974.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240D68_9C6148.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_802402E0_9D7300.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241910_9D8930.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243DB0_9DADD0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_802407E0_BBD980.s delete mode 100644 ver/us/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_80240170_BC43F0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240940_BC87A0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_obk/obk_07/BCEBF0/func_80240000_BCEBF0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240000_DAD400.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_06/DB8180/func_80240870_DB8180.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_80242F20_DC01D0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD3F0/func_80240720_DCD3F0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_13/DE36C0/func_80241230_DE36C0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_80240360_AB0350.s delete mode 100644 ver/us/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240F20_D56AD0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240F20_D62420.s delete mode 100644 ver/us/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240F50_D63C60.s delete mode 100644 ver/us/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240F20_D68C20.s delete mode 100644 ver/us/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240F50_D7A940.s delete mode 100644 ver/us/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240F50_D7C1F0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_pra/pra_35/D8FBA0/func_80242950_D8FBA0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240700_CF8270.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241C90_CF9800.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240B2C_D0625C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241A48_D218D8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sam/sam_09/D362F0/func_80240000_D362F0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sam/sam_10/D37800/func_80240000_D37800.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802407D0_D3ADA0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_80240A44_92ACF4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240DDC_94038C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_80240040_945F10.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_02/86CA50/func_80240310_86CA50.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_80240680_875440.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240960_889530.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_15/890190/func_80240960_890500.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_00/999F80/func_80240310_999F80.s diff --git a/include/dead.h b/include/dead.h index dff53137cb..c85a7fc68b 100644 --- a/include/dead.h +++ b/include/dead.h @@ -49,6 +49,7 @@ #define sfx_adjust_env_sound_pos dead_sfx_adjust_env_sound_pos #define fx_star_spirits_energy dead_fx_star_spirits_energy #define heap_malloc dead_heap_malloc +#define heap_free dead_heap_free #define general_heap_malloc dead_general_heap_malloc #define update_lerp dead_update_lerp #define create_shadow_type dead_create_shadow_type diff --git a/include/effects.h b/include/effects.h index 4a69a4ec36..f5d32217ba 100644 --- a/include/effects.h +++ b/include/effects.h @@ -657,7 +657,7 @@ typedef struct EffectInstanceDataThing { char unk_4C[0x24]; s32 unk_70; s32 unk_74; -} EffectInstanceDataThing; +} EffectInstanceDataThing; // TODO remove / convert to appropriate effect data struct typedef struct EffectInstanceData { /* 0x00 */ EffectInstanceDataThing* unk_00; diff --git a/src/EA0C10.c b/src/EA0C10.c index ab09563a28..5f6b0ea10d 100644 --- a/src/EA0C10.c +++ b/src/EA0C10.c @@ -341,8 +341,7 @@ ApiStatus func_80241AE0_EA23E0(Evt* script, s32 isInitialCall) { #include "world/common/AwaitPlayerNearNpc.inc.c" -// StashVars.inc.c -INCLUDE_ASM(s32, "EA0C10", func_8024267C_EA2F7C); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/EA8AE0.c b/src/EA8AE0.c index 5825b24143..03845fac08 100644 --- a/src/EA8AE0.c +++ b/src/EA8AE0.c @@ -36,7 +36,7 @@ ApiStatus func_802413FC_EA9EDC(Evt* script, s32 isInitialCall) { INCLUDE_ASM(s32, "EA8AE0", func_8024140C_EA9EEC); -INCLUDE_ASM(s32, "EA8AE0", func_80241468_EA9F48); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/EB1170.c b/src/EB1170.c index 28dcae1082..7a6be739a5 100644 --- a/src/EB1170.c +++ b/src/EB1170.c @@ -12,7 +12,7 @@ extern s32 D_802442D0[]; extern u32 D_80244494; extern s32 D_800B8DEC; -INCLUDE_ASM(s32, "EB1170", func_80240310_EB1170); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/EC2240.c b/src/EC2240.c index 13deb85971..564bbfffe3 100644 --- a/src/EC2240.c +++ b/src/EC2240.c @@ -9,7 +9,7 @@ const char* ascii_EC7170 = "flo_09"; const char* ascii_EC7178 = "flo_22"; const char* ascii_EC7180 = "flo_18\0"; -INCLUDE_ASM(s32, "EC2240", func_80240040_EC2240); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/EC7590.c b/src/EC7590.c index 7bcf89c155..730c5ab854 100644 --- a/src/EC7590.c +++ b/src/EC7590.c @@ -5,6 +5,6 @@ #include "common/foliage.inc.c" -INCLUDE_ASM(s32, "EC7590", func_8024061C_EC77CC); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/ED42A0.c b/src/ED42A0.c index 265b2a07a0..fb94b7103c 100644 --- a/src/ED42A0.c +++ b/src/ED42A0.c @@ -3,7 +3,7 @@ #define NAMESPACE ED42A0 -INCLUDE_ASM(s32, "ED42A0", func_80240080_ED42A0); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/EDC020.c b/src/EDC020.c index 7929bed8b3..20fab2a885 100644 --- a/src/EDC020.c +++ b/src/EDC020.c @@ -6,7 +6,7 @@ #define NAMESPACE EDC020 extern s32 D_802429E0[]; -//extern s32** D_802417EC_EDD7CC = NULL; +//extern s32** EDC020_varTable = NULL; /* extern s32 D_80241850_EDD830 = { @@ -20,27 +20,7 @@ extern s32 D_80241850_EDD834 = { #include "common/foliage.inc.c" -#ifdef NON_MATCHING // TODO(data) -ApiStatus func_8024027C_EDC25C(Evt* script, s32 isInitialCall) { - s32 i; - - if (D_802417EC_EDD7CC == NULL) { - D_802417EC_EDD7CC = heap_malloc(16 * sizeof(s32)); - for (i = 0; i < 16; i++) { - D_802417EC_EDD7CC[i] = script->varTable[i]; - } - } else { - for (i = 0; i < 16; i++) { - script->varTable[i] = D_802417EC_EDD7CC[i]; - } - heap_free(D_802417EC_EDD7CC); - D_802417EC_EDD7CC = NULL; - } - return ApiStatus_DONE2; -} -#else -INCLUDE_ASM(s32, "EDC020", func_8024027C_EDC25C); -#endif +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_arn/arn_03/events.c b/src/world/area_arn/arn_03/events.c index f11b7245a3..5029d1ea11 100644 --- a/src/world/area_arn/arn_03/events.c +++ b/src/world/area_arn/arn_03/events.c @@ -219,6 +219,7 @@ ApiStatus N(func_8024113C_BDFECC)(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } +static s32** N(varTable) = NULL; #include "world/common/StashVars.inc.c" EvtScript N(80241C6C) = { diff --git a/src/world/area_dgb/dgb_06/C3D080.c b/src/world/area_dgb/dgb_06/C3D080.c index 9c62d1f525..a2c747527f 100644 --- a/src/world/area_dgb/dgb_06/C3D080.c +++ b/src/world/area_dgb/dgb_06/C3D080.c @@ -85,6 +85,7 @@ EvtScript N(main) = { EVT_END }; +static s32** N(varTable) = NULL; #include "world/common/StashVars.inc.c" EvtScript N(80240624) = { diff --git a/src/world/area_dgb/dgb_12/C4DEF0.c b/src/world/area_dgb/dgb_12/C4DEF0.c index 738808d1da..896bd0b5a9 100644 --- a/src/world/area_dgb/dgb_12/C4DEF0.c +++ b/src/world/area_dgb/dgb_12/C4DEF0.c @@ -130,6 +130,7 @@ static s32 N(pad_868)[] = { 0x00000000, 0x00000000, }; +static s32** N(varTable) = NULL; #include "world/common/StashVars.inc.c" EvtScript N(80240874) = { diff --git a/src/world/area_dgb/dgb_18/C55F40.c b/src/world/area_dgb/dgb_18/C55F40.c index f497d8388b..94ab200dcd 100644 --- a/src/world/area_dgb/dgb_18/C55F40.c +++ b/src/world/area_dgb/dgb_18/C55F40.c @@ -651,7 +651,7 @@ static s32 N(pad_36D8)[] = { 0x00000000, 0x00000000, }; -s32** N(D_802436E0_C59620) = NULL; // StashVars.inc.c data +s32** N(varTable) = NULL; // StashVars.inc.c data EvtScript N(802436E4) = { EVT_SET_GROUP(0) diff --git a/src/world/area_dgb/dgb_18/C56EF0.c b/src/world/area_dgb/dgb_18/C56EF0.c index 8b888e42ea..a995e08d88 100644 --- a/src/world/area_dgb/dgb_18/C56EF0.c +++ b/src/world/area_dgb/dgb_18/C56EF0.c @@ -1,23 +1,6 @@ #include "dgb_18.h" -// TODO: StashVars.inc.c -ApiStatus N(func_80240FB0_C56EF0)(Evt* script, s32 isInitialCall) { - s32 i; - - if (N(D_802436E0_C59620) == NULL) { - N(D_802436E0_C59620) = heap_malloc(16 * sizeof(s32)); - for (i = 0; i < 16; i++) { - N(D_802436E0_C59620)[i] = script->varTable[i]; - } - } else { - for (i = 0; i < 16; i++) { - script->varTable[i] = N(D_802436E0_C59620)[i]; - } - heap_free(N(D_802436E0_C59620)); - N(D_802436E0_C59620) = NULL; - } - return ApiStatus_DONE2; -} +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_dgb/dgb_18/dgb_18.h b/src/world/area_dgb/dgb_18/dgb_18.h index d53322fa36..5c8c8a28b7 100644 --- a/src/world/area_dgb/dgb_18/dgb_18.h +++ b/src/world/area_dgb/dgb_18/dgb_18.h @@ -9,7 +9,7 @@ ApiStatus N(UnkFunc1)(Evt* script, s32 isInitialCall); ApiStatus N(UnkNpcAIMainFunc)(Evt* script, s32 isInitialCall); -extern s32** N(D_802436E0_C59620); +extern s32** N(varTable); extern NpcGroupList N(npcGroupList_802436B4); extern EvtScript N(main); diff --git a/src/world/area_dro/dro_01/95B7E0.c b/src/world/area_dro/dro_01/95B7E0.c index e3864c0669..6cd3ea499d 100644 --- a/src/world/area_dro/dro_01/95B7E0.c +++ b/src/world/area_dro/dro_01/95B7E0.c @@ -59,25 +59,14 @@ typedef struct { void N(func_802430C8_95E2C8)(Unk_Struct_1* ptr, s32 arg1); -typedef struct { - /* 0x00 */ s32 flags; - /* 0x04 */ s32 effectIndex; - /* 0x08 */ s32 instanceCounter; - /* 0x0C */ EffectInstanceDataThing* unk_0C; - /* 0x10 */ void (*update)(EffectInstance* effectInst); - /* 0x14 */ void (*renderWorld)(EffectInstance* effectInst); - /* 0x18 */ void (*unk_18)(EffectInstance* effectInst); - /* 0x1C */ void* unk_1C; -} N(temp); - static s32 N(D_8024DFC0); static s8 N(pad_D_8024DFC4)[0x4]; static s32 N(pad_D_8024DFC8)[4]; static s32 N(D_8024DFD8); static s8 N(pad_D_8024DFDC)[0x4]; -static N(temp)* N(D_8024DFE0); -static N(temp)* N(D_8024DFE4); -static N(temp)* N(D_8024DFE8); +static EffectInstance* N(D_8024DFE0); +static EffectInstance* N(D_8024DFE4); +static EffectInstance* N(D_8024DFE8); static s8 N(pad_D_8024DFEC)[0x4]; static s32 N(D_8024DFF0)[112]; static s8 N(pad_D_8024E1B0)[0x4]; // Probably part of the above @@ -550,7 +539,8 @@ NpcSettings N(npcSettings_8024518C) = { .level = 99, }; -s32** N(D_802451B8_9603B8) = NULL; + +s32** N(varTable) = NULL; EvtScript N(802451BC) = { EVT_CALL(ShowGotItem, EVT_VAR(0), 1, 0) @@ -2339,7 +2329,9 @@ N(shopPrice) N(shopPriceList_8024B550)[] = { {}, }; -s32** N(D_8024B5B0_9667B0) = NULL; +#define NAMESPACE dro_01_dup +s32** N(varTable) = NULL; +#define NAMESPACE dro_01 EvtScript N(8024B5B4) = { EVT_CALL(ShowGotItem, EVT_VAR(0), 1, 0) @@ -2966,23 +2958,7 @@ EvtScript N(makeEntities) = { #include "world/common/UnkNpcAIMainFunc.inc.c" -ApiStatus N(func_80241470_95C670)(Evt* script, s32 isInitialCall) { - s32 i; - - if (N(D_802451B8_9603B8) == NULL) { - N(D_802451B8_9603B8) = heap_malloc(16 * sizeof(s32)); - for (i = 0; i < 16; i++) { - N(D_802451B8_9603B8)[i] = (s32*) script->varTable[i]; - } - } else { - for (i = 0; i < 16; i++) { - script->varTable[i] = (s32) N(D_802451B8_9603B8)[i]; - } - heap_free(N(D_802451B8_9603B8)); - N(D_802451B8_9603B8) = NULL; - } - return ApiStatus_DONE2; -} +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" @@ -3020,7 +2996,7 @@ ApiStatus N(func_80241BE0_95CDE0)(Evt* script, s32 isInitialCall) { N(D_8024DFE8) = fx_quizmo_assistant(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)), 1.0f, 0); - effectPtr = N(D_8024DFE0)->unk_0C; + effectPtr = N(D_8024DFE0)->data; effectPtr->unk_18 = 0; effectPtr->unk_20 = 0; effectPtr->unk_24.s = 0; @@ -3028,7 +3004,7 @@ ApiStatus N(func_80241BE0_95CDE0)(Evt* script, s32 isInitialCall) { effectPtr->unk_1C = 0; } - effectPtr = N(D_8024DFE0)->unk_0C; + effectPtr = N(D_8024DFE0)->data; effectPtr->unk_20 += 10; effectPtr->unk_28 += 10; @@ -3051,7 +3027,7 @@ ApiStatus N(func_80241DF8_95CFF8)(Evt* script, s32 isInitialCall) { N(D_8024DFE8)->flags |= 0x10; } - effectPtr = N(D_8024DFE0)->unk_0C; + effectPtr = N(D_8024DFE0)->data; effectPtr->unk_18 -= 10; effectPtr->unk_20 -= 10; effectPtr->unk_24.s -= 10; @@ -3069,13 +3045,13 @@ ApiStatus N(func_80241DF8_95CFF8)(Evt* script, s32 isInitialCall) { } ApiStatus N(func_80241EAC_95D0AC)(Evt* script, s32 isInitialCall) { - N(D_8024DFE0)->unk_0C->unk_34 = evt_get_variable(script, *script->ptrReadPos); + ((EffectInstanceDataThing*)N(D_8024DFE0)->data)->unk_34 = evt_get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } ApiStatus N(func_80241EE0_95D0E0)(Evt* script, s32 isInitialCall) { s32 var = evt_get_variable(script, *script->ptrReadPos); - EffectInstanceDataThing* effectPtr = N(D_8024DFE0)->unk_0C; + EffectInstanceDataThing* effectPtr = N(D_8024DFE0)->data; switch (var) { case 0: @@ -3096,17 +3072,17 @@ ApiStatus N(func_80241EE0_95D0E0)(Evt* script, s32 isInitialCall) { } ApiStatus N(func_80241F60_95D160)(Evt* script, s32 isInitialCall) { - N(D_8024DFE8)->unk_0C->unk_1C = 0; + ((EffectInstanceDataThing*)N(D_8024DFE8)->data)->unk_1C = 0; return ApiStatus_DONE2; } ApiStatus N(func_80241F78_95D178)(Evt* script, s32 isInitialCall) { - N(D_8024DFE8)->unk_0C->unk_1C = 1; + ((EffectInstanceDataThing*)N(D_8024DFE8)->data)->unk_1C = 1; return ApiStatus_DONE2; } ApiStatus N(func_80241F94_95D194)(Evt* script, s32 isInitialCall) { - N(D_8024DFE8)->unk_0C->unk_1C = 2; + ((EffectInstanceDataThing*)N(D_8024DFE8)->data)->unk_1C = 2; return ApiStatus_DONE2; } diff --git a/src/world/area_dro/dro_01/95E660.c b/src/world/area_dro/dro_01/95E660.c index f80b7d33da..b5ab65f901 100644 --- a/src/world/area_dro/dro_01/95E660.c +++ b/src/world/area_dro/dro_01/95E660.c @@ -1,22 +1,8 @@ #include "dro_01.h" -ApiStatus N(func_80243460_95E660)(Evt* script, s32 isInitialCall) { - s32 i; - - if (N(D_8024B5B0_9667B0) == NULL) { - N(D_8024B5B0_9667B0) = heap_malloc(16 * sizeof(s32)); - for (i = 0; i < 16; i++) { - N(D_8024B5B0_9667B0)[i] = (s32*) script->varTable[i]; - } - } else { - for (i = 0; i < 16; i++) { - script->varTable[i] = (s32) N(D_8024B5B0_9667B0)[i]; - } - heap_free(N(D_8024B5B0_9667B0)); - N(D_8024B5B0_9667B0) = NULL; - } - return ApiStatus_DONE2; -} +#define NAMESPACE dro_01_dup +#include "world/common/StashVars.inc.c" +#define NAMESPACE dro_01 #define NAMESPACE dro_01_dup #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_dro/dro_01/dro_01.h b/src/world/area_dro/dro_01/dro_01.h index a6e6e3c361..0af382e82f 100644 --- a/src/world/area_dro/dro_01/dro_01.h +++ b/src/world/area_dro/dro_01/dro_01.h @@ -73,7 +73,7 @@ ApiStatus N(dup_GetEntryPos)(Evt* script, s32 isInitialCall); ApiStatus N(dup_SetPlayerStatusAnimFlags100000)(Evt* script, s32 isInitialCall); ApiStatus N(dup_SomeXYZFunc2)(Evt* script, s32 isInitialCall); -extern s32** N(D_8024B5B0_9667B0); +extern s32** N(varTable); extern N(shopInventory) N(shopInventory_8024B4FC)[]; extern N(shopPrice) N(shopPriceList_8024B550)[]; diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c index e92e413732..d0857eafa7 100644 --- a/src/world/area_dro/dro_02/9694C0.c +++ b/src/world/area_dro/dro_02/9694C0.c @@ -467,7 +467,7 @@ static s32 N(pad_4DD4)[] = { 0x00000000, 0x00000000, 0x00000000, }; -s32** N(D_80244DE0_96DFA0) = NULL; +s32** N(varTable) = NULL; EvtScript N(80244DE4) = { EVT_CALL(ShowGotItem, EVT_VAR(0), 1, 0) @@ -3065,23 +3065,7 @@ NpcGroupList N(npcGroupList_8024EEF4) = { {}, }; -ApiStatus N(func_80240300_9694C0)(Evt* script, s32 isInitialCall) { - s32 i; - - if (N(D_80244DE0_96DFA0) == NULL) { - N(D_80244DE0_96DFA0) = heap_malloc(16 * sizeof(s32)); - for (i = 0; i < 16; i++) { - N(D_80244DE0_96DFA0)[i] = (s32*) script->varTable[i]; - } - } else { - for (i = 0; i < 16; i++) { - script->varTable[i] = (s32) N(D_80244DE0_96DFA0)[i]; - } - heap_free(N(D_80244DE0_96DFA0)); - N(D_80244DE0_96DFA0) = NULL; - } - return ApiStatus_DONE2; -} +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_flo/flo_03/CA72E0.c b/src/world/area_flo/flo_03/CA72E0.c index 6b0b9b4e5f..9481b1c958 100644 --- a/src/world/area_flo/flo_03/CA72E0.c +++ b/src/world/area_flo/flo_03/CA72E0.c @@ -183,7 +183,7 @@ NpcSettings N(npcSettings_80240EDC) = { .level = 99, }; -s32** N(D_80240F08_CA81A8) = NULL; +s32** N(varTable) = NULL; EvtScript N(80240F0C) = { EVT_CALL(ShowGotItem, EVT_VAR(0), 1, 0) @@ -1091,23 +1091,7 @@ NpcGroupList N(npcGroupList_8024442C) = { {}, }; -ApiStatus N(func_80240040_CA72E0)(Evt* script, s32 isInitialCall) { - s32 i; - - if (N(D_80240F08_CA81A8) == NULL) { - N(D_80240F08_CA81A8) = heap_malloc(16 * sizeof(s32)); - for (i = 0; i < 16; i++) { - N(D_80240F08_CA81A8)[i] = script->varTable[i]; - } - } else { - for (i = 0; i < 16; i++) { - script->varTable[i] = N(D_80240F08_CA81A8)[i]; - } - heap_free(N(D_80240F08_CA81A8)); - N(D_80240F08_CA81A8) = NULL; - } - return ApiStatus_DONE2; -} +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_flo/flo_07/CAC5D0.c b/src/world/area_flo/flo_07/CAC5D0.c index 5591c3d996..71b961c0f6 100644 --- a/src/world/area_flo/flo_07/CAC5D0.c +++ b/src/world/area_flo/flo_07/CAC5D0.c @@ -226,7 +226,7 @@ NpcSettings N(npcSettings_80241220) = { #include "common/foliage.inc.c" -s32** N(D_80241BB0_CADDA0) = NULL; +s32** N(varTable) = NULL; EvtScript N(80241BB4) = { EVT_CALL(ShowGotItem, EVT_VAR(0), 1, 0) @@ -512,23 +512,7 @@ NpcGroupList N(npcGroupList_80242B0C) = { {}, }; -ApiStatus N(func_8024061C_CAC80C)(Evt* script, s32 isInitialCall) { - s32 i; - - if (N(D_80241BB0_CADDA0) == NULL) { - N(D_80241BB0_CADDA0) = heap_malloc(16 * sizeof(s32)); - for (i = 0; i < 16; i++) { - N(D_80241BB0_CADDA0)[i] = (s32*) script->varTable[i]; - } - } else { - for (i = 0; i < 16; i++) { - script->varTable[i] = (s32) N(D_80241BB0_CADDA0)[i]; - } - heap_free(N(D_80241BB0_CADDA0)); - N(D_80241BB0_CADDA0) = NULL; - } - return ApiStatus_DONE2; -} +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_flo/flo_10/CB9280.c b/src/world/area_flo/flo_10/CB9280.c index 9d0bd46389..3e89f5e8e6 100644 --- a/src/world/area_flo/flo_10/CB9280.c +++ b/src/world/area_flo/flo_10/CB9280.c @@ -164,7 +164,7 @@ static s32 N(pad_1CA8)[] = { 0x00000000, 0x00000000, }; -s32** N(D_80241CB0_CBAEB0) = NULL; +s32** N(varTable) = NULL; EvtScript N(80241CB4) = SCRIPT({ ShowGotItem(EVT_VAR(0), 1, 0); @@ -805,23 +805,7 @@ static s32 N(pad_4084)[] = { 0x00000000, 0x00000000, 0x00000000, }; -ApiStatus N(func_80240080_CB9280)(Evt* script, s32 isInitialCall) { - s32 i; - - if (N(D_80241CB0_CBAEB0) == NULL) { - N(D_80241CB0_CBAEB0) = heap_malloc(16 * sizeof(s32)); - for (i = 0; i < 16; i++) { - N(D_80241CB0_CBAEB0)[i] = (s32*) script->varTable[i]; - } - } else { - for (i = 0; i < 16; i++) { - script->varTable[i] = (s32) N(D_80241CB0_CBAEB0)[i]; - } - heap_free(N(D_80241CB0_CBAEB0)); - N(D_80241CB0_CBAEB0) = NULL; - } - return ApiStatus_DONE2; -} +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_flo/flo_10/flo_10.h b/src/world/area_flo/flo_10/flo_10.h index 9bdaa1f649..d2a56613eb 100644 --- a/src/world/area_flo/flo_10/flo_10.h +++ b/src/world/area_flo/flo_10/flo_10.h @@ -13,7 +13,7 @@ s32 N(func_80240000_CB9200)(void); ApiStatus N(func_80240040_CB9240)(Evt* script, s32 isInitialCall); extern s32 N(D_80244070_CBD270); -extern s32** N(D_80241CB0_CBAEB0); +extern s32** N(varTable); extern NpcGroupList N(npcGroupList_80244054); extern EvtScript N(802427EC); extern EvtScript N(80242AE8); diff --git a/src/world/area_flo/flo_12/CC0E70.c b/src/world/area_flo/flo_12/CC0E70.c index d75d957abe..79bff8909b 100644 --- a/src/world/area_flo/flo_12/CC0E70.c +++ b/src/world/area_flo/flo_12/CC0E70.c @@ -7,7 +7,7 @@ enum { NPC_ROSIE1, }; -static N(D_802429E0)[112]; +static s32 N(D_802429E0)[112]; EntryList N(entryList) = { { 280.0f, 0.0f, 0.0f, 270.0f }, @@ -167,7 +167,7 @@ NpcSettings N(npcSettings_80240E5C) = { #include "common/foliage.inc.c" -s32** N(D_802417EC_CC261C) = NULL; +s32** N(varTable) = NULL; EvtScript N(802417F0) = { EVT_CALL(ShowGotItem, EVT_VAR(0), 1, 0) @@ -474,23 +474,7 @@ NpcGroupList N(npcGroupList_802429B8) = { {}, }; -ApiStatus N(func_8024027C_CC10AC)(Evt* script, s32 isInitialCall) { - s32 i; - - if (N(D_802417EC_CC261C) == NULL) { - N(D_802417EC_CC261C) = heap_malloc(16 * sizeof(s32)); - for (i = 0; i < 16; i++) { - N(D_802417EC_CC261C)[i] = script->varTable[i]; - } - } else { - for (i = 0; i < 16; i++) { - script->varTable[i] = N(D_802417EC_CC261C)[i]; - } - heap_free(N(D_802417EC_CC261C)); - N(D_802417EC_CC261C) = NULL; - } - return ApiStatus_DONE2; -} +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" @@ -524,7 +508,7 @@ ApiStatus N(func_80240614_CC1444)(Evt* script, s32 isInitialCall) { ApiStatus N(func_8024064C_CC147C)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = evt_get_variable(script, *args); + s32* ptr = (s32*)evt_get_variable(script, *args); s32 i; if (ptr != NULL) { diff --git a/src/world/area_hos/hos_00/A0C4E0.c b/src/world/area_hos/hos_00/A0C4E0.c index 729bbca589..d25b126fe4 100644 --- a/src/world/area_hos/hos_00/A0C4E0.c +++ b/src/world/area_hos/hos_00/A0C4E0.c @@ -1,6 +1,6 @@ #include "hos_00.h" -INCLUDE_ASM(s32, "world/area_hos/hos_00/A0C4E0", func_802407F0_A0C4E0); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_hos/hos_03/A1BDB0.c b/src/world/area_hos/hos_03/A1BDB0.c index c8a567c6ec..cc5678f656 100644 --- a/src/world/area_hos/hos_03/A1BDB0.c +++ b/src/world/area_hos/hos_03/A1BDB0.c @@ -44,7 +44,7 @@ #include "world/common/UnkFunc36.inc.c" -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802424A4_A1D5A4); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_hos/hos_06/A397F0.c b/src/world/area_hos/hos_06/A397F0.c index 990f9df5e8..1669240ea0 100644 --- a/src/world/area_hos/hos_06/A397F0.c +++ b/src/world/area_hos/hos_06/A397F0.c @@ -1,6 +1,6 @@ #include "hos_06.h" -INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_80240310_A397F0); +#include "world/common/StashVars.inc.c" #define NAMESPACE dup2_hos_06 #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_hos/hos_06/A3A230.c b/src/world/area_hos/hos_06/A3A230.c index 1a13df4fce..8b45974a01 100644 --- a/src/world/area_hos/hos_06/A3A230.c +++ b/src/world/area_hos/hos_06/A3A230.c @@ -10,7 +10,9 @@ INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_80240FD0_A3A4B0); INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_80241008_A3A4E8); -INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_802410A4_A3A584); +#define NAMESPACE dup_hos_06 +#include "world/common/StashVars.inc.c" +#define NAMESPACE hos_06 #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_hos/hos_06/A3B4B0.c b/src/world/area_hos/hos_06/A3B4B0.c index 2fa2810520..ea78921dcf 100644 --- a/src/world/area_hos/hos_06/A3B4B0.c +++ b/src/world/area_hos/hos_06/A3B4B0.c @@ -1,6 +1,8 @@ #include "hos_06.h" -INCLUDE_ASM(s32, "world/area_hos/hos_06/A3B4B0", func_80241FD0_A3B4B0); +#define NAMESPACE dup2_hos_06 +#include "world/common/StashVars.inc.c" +#define NAMESPACE hos_06 #define NAMESPACE dup_hos_06 #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_isk/isk_09/9864E0.c b/src/world/area_isk/isk_09/9864E0.c index 18848b5b34..3a509beca5 100644 --- a/src/world/area_isk/isk_09/9864E0.c +++ b/src/world/area_isk/isk_09/9864E0.c @@ -3,7 +3,7 @@ static char* N(exit_str_0) = "isk_08"; static char* N(exit_str_1) = ""; -INCLUDE_ASM(s32, "world/area_isk/isk_09/9864E0", func_80240000_9864E0); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_iwa/iwa_00/90CC40.c b/src/world/area_iwa/iwa_00/90CC40.c index 252ba65d90..c027295423 100644 --- a/src/world/area_iwa/iwa_00/90CC40.c +++ b/src/world/area_iwa/iwa_00/90CC40.c @@ -3,7 +3,7 @@ static char* N(exit_str_0) = "iwa_10"; static char* N(exit_str_1) = "iwa_01"; -INCLUDE_ASM(s32, "world/area_iwa/iwa_00/90CC40", func_80240000_90CC40); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_iwa/iwa_02/915D70.c b/src/world/area_iwa/iwa_02/915D70.c index 3043f85b42..edc48a36d2 100644 --- a/src/world/area_iwa/iwa_02/915D70.c +++ b/src/world/area_iwa/iwa_02/915D70.c @@ -35,6 +35,6 @@ INCLUDE_ASM(s32, "world/area_iwa/iwa_02/915D70", func_80240984_9166F4); INCLUDE_ASM(s32, "world/area_iwa/iwa_02/915D70", func_80240C90_916A00); -INCLUDE_ASM(s32, "world/area_iwa/iwa_02/915D70", func_80240FE0_916D50); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_iwa/iwa_03/918BB0.c b/src/world/area_iwa/iwa_03/918BB0.c index b9cf3d9f12..f60283473f 100644 --- a/src/world/area_iwa/iwa_03/918BB0.c +++ b/src/world/area_iwa/iwa_03/918BB0.c @@ -3,7 +3,7 @@ static char* N(exit_str_0) = "iwa_01"; static char* N(exit_str_1) = ""; -INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918BB0", func_80240000_918BB0); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_iwa/iwa_10/91E5B0.c b/src/world/area_iwa/iwa_10/91E5B0.c index d16d6121ca..f7a087413f 100644 --- a/src/world/area_iwa/iwa_10/91E5B0.c +++ b/src/world/area_iwa/iwa_10/91E5B0.c @@ -1,5 +1,5 @@ #include "iwa_10.h" -INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E5B0", func_80240040_91E5B0); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_jan/jan_00/B20540.c b/src/world/area_jan/jan_00/B20540.c index 375159d48d..2de0fbf953 100644 --- a/src/world/area_jan/jan_00/B20540.c +++ b/src/world/area_jan/jan_00/B20540.c @@ -7,7 +7,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_8024030C_B2084C); INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_80240340_B20880); -INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_802403F4_B20934); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_jan/jan_02/B2C8A0.c b/src/world/area_jan/jan_02/B2C8A0.c index 8d31da5da3..b69987433c 100644 --- a/src/world/area_jan/jan_02/B2C8A0.c +++ b/src/world/area_jan/jan_02/B2C8A0.c @@ -36,7 +36,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241540_B2D9B0); INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241578_B2D9E8); -INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241614_B2DA84); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c index b41ae0c9f7..e3e0070fd5 100644 --- a/src/world/area_jan/jan_03/B34BD0.c +++ b/src/world/area_jan/jan_03/B34BD0.c @@ -81,7 +81,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241A64_B36634); INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241B00_B366D0); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241B9C_B3676C); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_jan/jan_04/B44AC0.c b/src/world/area_jan/jan_04/B44AC0.c index 26bb0f5f45..0345ec1092 100644 --- a/src/world/area_jan/jan_04/B44AC0.c +++ b/src/world/area_jan/jan_04/B44AC0.c @@ -1,6 +1,6 @@ #include "jan_04.h" -INCLUDE_ASM(s32, "world/area_jan/jan_04/B44AC0", func_80240350_B44AC0); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_jan/jan_22/B84180.c b/src/world/area_jan/jan_22/B84180.c index eecc3431d5..a73f838aeb 100644 --- a/src/world/area_jan/jan_22/B84180.c +++ b/src/world/area_jan/jan_22/B84180.c @@ -29,7 +29,7 @@ static char* N(exit_str_3) = ""; #include "world/common/UnkNpcAIMainFunc.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_22/B84180", func_80240E90_B85010); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_kkj/kkj_17/AF1C60.c b/src/world/area_kkj/kkj_17/AF1C60.c index 90ed5a20c1..c7013696f7 100644 --- a/src/world/area_kkj/kkj_17/AF1C60.c +++ b/src/world/area_kkj/kkj_17/AF1C60.c @@ -3,7 +3,7 @@ static char* N(exit_str_0) = "kkj_11"; static char* N(exit_str_1) = ""; -INCLUDE_ASM(s32, "world/area_kkj/kkj_17/AF1C60", func_80240000_AF1C60); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_kkj/kkj_20/AFDB40.c b/src/world/area_kkj/kkj_20/AFDB40.c index 7f45d3b00b..b7bbf33915 100644 --- a/src/world/area_kkj/kkj_20/AFDB40.c +++ b/src/world/area_kkj/kkj_20/AFDB40.c @@ -3,7 +3,7 @@ static char* N(exit_str_0) = "kkj_10"; static char* N(exit_str_1) = ""; -INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDB40", func_80240000_AFDB40); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_kmr/kmr_02/8B0070.c b/src/world/area_kmr/kmr_02/8B0070.c index 392cf8d13e..a3fbf7de73 100644 --- a/src/world/area_kmr/kmr_02/8B0070.c +++ b/src/world/area_kmr/kmr_02/8B0070.c @@ -23,7 +23,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802402E0_8B0350); INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240370_8B03E0); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240390_8B0400); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_kmr/kmr_04/8CA960.c b/src/world/area_kmr/kmr_04/8CA960.c index 82e613574a..56bb23fb37 100644 --- a/src/world/area_kmr/kmr_04/8CA960.c +++ b/src/world/area_kmr/kmr_04/8CA960.c @@ -6,7 +6,7 @@ #include "world/common/CheckPartnerFlags1000.inc.c" #define NAMESPACE kmr_04 -INCLUDE_ASM(s32, "world/area_kmr/kmr_04/8CA960", func_802402C8_8CABC8); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_kmr/kmr_10/8D84D0.c b/src/world/area_kmr/kmr_10/8D84D0.c index 89c9ea3212..ecf30c5fc1 100644 --- a/src/world/area_kmr/kmr_10/8D84D0.c +++ b/src/world/area_kmr/kmr_10/8D84D0.c @@ -3,7 +3,7 @@ static char* N(exit_str_0) = "kmr_11"; static char* N(exit_str_1) = "mac_00"; -INCLUDE_ASM(s32, "world/area_kmr/kmr_10/8D84D0", func_80240000_8D84D0); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_kmr/kmr_20/8ED440.c b/src/world/area_kmr/kmr_20/8ED440.c index 4ed9ae7291..696b1d9a57 100644 --- a/src/world/area_kmr/kmr_20/8ED440.c +++ b/src/world/area_kmr/kmr_20/8ED440.c @@ -1,6 +1,6 @@ #include "kmr_20.h" -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED440", func_80241620_8ED440); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_kpa/kpa_14/A57830.c b/src/world/area_kpa/kpa_14/A57830.c index b0ff0cfebd..98677d5cb3 100644 --- a/src/world/area_kpa/kpa_14/A57830.c +++ b/src/world/area_kpa/kpa_14/A57830.c @@ -1,6 +1,6 @@ #include "kpa_14.h" -INCLUDE_ASM(s32, "world/area_kpa/kpa_14/A57830", func_80240380_A57830); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_kpa/kpa_15/A596A0.c b/src/world/area_kpa/kpa_15/A596A0.c index d311dc3f57..3600c2e85e 100644 --- a/src/world/area_kpa/kpa_15/A596A0.c +++ b/src/world/area_kpa/kpa_15/A596A0.c @@ -1,6 +1,6 @@ #include "kpa_15.h" -INCLUDE_ASM(s32, "world/area_kpa/kpa_15/A596A0", func_80240310_A596A0); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_kzn/kzn_02/C5AC20.c b/src/world/area_kzn/kzn_02/C5AC20.c index 9b72865e6a..612f2abfb1 100644 --- a/src/world/area_kzn/kzn_02/C5AC20.c +++ b/src/world/area_kzn/kzn_02/C5AC20.c @@ -31,7 +31,7 @@ #include "world/common/UnkNpcAIMainFunc10.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80241FCC_C5C70C); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_kzn/kzn_03/C61020.c b/src/world/area_kzn/kzn_03/C61020.c index 266247e47d..7d10b06b3e 100644 --- a/src/world/area_kzn/kzn_03/C61020.c +++ b/src/world/area_kzn/kzn_03/C61020.c @@ -42,7 +42,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_8024234C_C6305C); -INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_8024259C_C632AC); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_kzn/kzn_08/C71C10.c b/src/world/area_kzn/kzn_08/C71C10.c index df32b34791..bd29210e33 100644 --- a/src/world/area_kzn/kzn_08/C71C10.c +++ b/src/world/area_kzn/kzn_08/C71C10.c @@ -1,6 +1,6 @@ #include "kzn_08.h" -INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71C10", func_80240790_C71C10); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_kzn/kzn_09/C77D00.c b/src/world/area_kzn/kzn_09/C77D00.c index 129e94d0da..61e075a7e3 100644 --- a/src/world/area_kzn/kzn_09/C77D00.c +++ b/src/world/area_kzn/kzn_09/C77D00.c @@ -43,7 +43,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80242774_C79454); #include "world/common/AwaitPlayerNearNpc.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_802432AC_C79F8C); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_kzn/kzn_17/C85DC0.c b/src/world/area_kzn/kzn_17/C85DC0.c index 55d0da9fa2..f800cebdf4 100644 --- a/src/world/area_kzn/kzn_17/C85DC0.c +++ b/src/world/area_kzn/kzn_17/C85DC0.c @@ -43,7 +43,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80241A64_C87514); #include "world/common/AwaitPlayerNearNpc.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_8024259C_C8804C); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_kzn/kzn_19/C8DBB0.c b/src/world/area_kzn/kzn_19/C8DBB0.c index 20e999067a..a5e799e7b3 100644 --- a/src/world/area_kzn/kzn_19/C8DBB0.c +++ b/src/world/area_kzn/kzn_19/C8DBB0.c @@ -24,7 +24,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_802413FC_C8EFAC); INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_8024140C_C8EFBC); -INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_80241468_C8F018); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_kzn/kzn_20/C96240.c b/src/world/area_kzn/kzn_20/C96240.c index 3fc8047f19..80c811b218 100644 --- a/src/world/area_kzn/kzn_20/C96240.c +++ b/src/world/area_kzn/kzn_20/C96240.c @@ -1,6 +1,6 @@ #include "kzn_20.h" -INCLUDE_ASM(s32, "world/area_kzn/kzn_20/C96240", func_80240310_C96240); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_mac/mac_00/7EB340.c b/src/world/area_mac/mac_00/7EB340.c index 2bb6b0cb79..83f51cc8d2 100644 --- a/src/world/area_mac/mac_00/7EB340.c +++ b/src/world/area_mac/mac_00/7EB340.c @@ -2,7 +2,7 @@ #define UNK_ALPHA_FUNC_NPC 6 -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80240630_7EB340); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_mac/mac_00/7ED280.c b/src/world/area_mac/mac_00/7ED280.c index 6a2eacbd20..2a711eb288 100644 --- a/src/world/area_mac/mac_00/7ED280.c +++ b/src/world/area_mac/mac_00/7ED280.c @@ -26,7 +26,9 @@ static char* N(exit_str_0) = "mac_01"; -INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80243400_7EE110); +#define NAMESPACE dup_mac_00 +#include "world/common/StashVars.inc.c" +#define NAMESPACE mac_00 #define NAMESPACE dup_mac_00 #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c index 4e7f0de650..2890ab647b 100644 --- a/src/world/area_mac/mac_01/8017D0.c +++ b/src/world/area_mac/mac_01/8017D0.c @@ -47,7 +47,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80241C14_802494); static char* N(exit_str_0) = "flo_00"; static char* N(exit_str_1) = "kmr_22"; -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80241F10_802790); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_mac/mac_02/823BF0.c b/src/world/area_mac/mac_02/823BF0.c index f4957bb778..0171a3a111 100644 --- a/src/world/area_mac/mac_02/823BF0.c +++ b/src/world/area_mac/mac_02/823BF0.c @@ -26,7 +26,7 @@ #include "world/common/UnkNpcAIMainFunc.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802417C0_824A80); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_mac/mac_03/831B20.c b/src/world/area_mac/mac_03/831B20.c index 01d2ae85f0..04e6ac729f 100644 --- a/src/world/area_mac/mac_03/831B20.c +++ b/src/world/area_mac/mac_03/831B20.c @@ -4,7 +4,7 @@ #include "common/UnkFloatFunc.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802404B0_831CB0); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_mac/mac_04/843030.c b/src/world/area_mac/mac_04/843030.c index f289b4596f..36e3d9066c 100644 --- a/src/world/area_mac/mac_04/843030.c +++ b/src/world/area_mac/mac_04/843030.c @@ -2,7 +2,7 @@ #define UNK_ALPHA_FUNC_NPC 20 -INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240460_843030); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_mac/mac_05/852170.c b/src/world/area_mac/mac_05/852170.c index d35cbab10b..b9d9a33e51 100644 --- a/src/world/area_mac/mac_05/852170.c +++ b/src/world/area_mac/mac_05/852170.c @@ -35,7 +35,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024047C_8525EC); #include "world/common/UnkNpcAIMainFunc.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241320_853490); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_mim/mim_04/B9DB60.c b/src/world/area_mim/mim_04/B9DB60.c index 00261b712c..1ab88df90a 100644 --- a/src/world/area_mim/mim_04/B9DB60.c +++ b/src/world/area_mim/mim_04/B9DB60.c @@ -16,6 +16,6 @@ #include "world/common/UnkNpcAIMainFunc2.inc.c" -INCLUDE_ASM(s32, "world/area_mim/mim_04/B9DB60", func_80241014_B9E974); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c index 278717a84f..a33fa3fa6d 100644 --- a/src/world/area_nok/nok_01/9C53E0.c +++ b/src/world/area_nok/nok_01/9C53E0.c @@ -45,7 +45,7 @@ static char* N(exit_str_1) = "nok_02"; #include "world/common/UnkFunc36.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240D68_9C6148); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_nok/nok_02/9D7020.c b/src/world/area_nok/nok_02/9D7020.c index fa8809a4a7..1541574e2b 100644 --- a/src/world/area_nok/nok_02/9D7020.c +++ b/src/world/area_nok/nok_02/9D7020.c @@ -17,7 +17,7 @@ static char* N(exit_str_3) = ""; #include "world/common/SomeXYZFunc2.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7020", func_802402E0_9D7300); +#include "world/common/StashVars.inc.c" #define NAMESPACE dup_nok_02 #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_nok/nok_02/9D7770.c b/src/world/area_nok/nok_02/9D7770.c index 7589ca8d84..650002603e 100644 --- a/src/world/area_nok/nok_02/9D7770.c +++ b/src/world/area_nok/nok_02/9D7770.c @@ -1,3 +1,3 @@ #include "nok_02.h" -#include "common/ItemEntityJumpToPos.inc.c"okItemEntityJumpToPos +#include "common/ItemEntityJumpToPos.inc.c" diff --git a/src/world/area_nok/nok_02/9D7AA0.c b/src/world/area_nok/nok_02/9D7AA0.c index 4fe2ebf797..f995deba0c 100644 --- a/src/world/area_nok/nok_02/9D7AA0.c +++ b/src/world/area_nok/nok_02/9D7AA0.c @@ -29,7 +29,9 @@ static char* N(exit_str_0) = "nok_02"; static char* N(exit_str_1) = "obk_09"; -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241910_9D8930); +#define NAMESPACE dup_nok_02 +#include "world/common/StashVars.inc.c" +#define NAMESPACE nok_02 #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_nok/nok_02/9DA8F0.c b/src/world/area_nok/nok_02/9DA8F0.c index 8d29441813..ae6bf9e33b 100644 --- a/src/world/area_nok/nok_02/9DA8F0.c +++ b/src/world/area_nok/nok_02/9DA8F0.c @@ -18,7 +18,9 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80243C78_9DAC98); INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80243D14_9DAD34); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80243DB0_9DADD0); +#define NAMESPACE dup2_nok_02 +#include "world/common/StashVars.inc.c" +#define NAMESPACE nok_02 #define NAMESPACE dup2_nok_02 #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_obk/obk_01/BBD980.c b/src/world/area_obk/obk_01/BBD980.c index 5babc39abf..a6245d3f59 100644 --- a/src/world/area_obk/obk_01/BBD980.c +++ b/src/world/area_obk/obk_01/BBD980.c @@ -1,6 +1,6 @@ #include "obk_01.h" -INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD980", func_802407E0_BBD980); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_obk/obk_03/BC43F0.c b/src/world/area_obk/obk_03/BC43F0.c index 57865a8193..6eab66211d 100644 --- a/src/world/area_obk/obk_03/BC43F0.c +++ b/src/world/area_obk/obk_03/BC43F0.c @@ -1,6 +1,6 @@ #include "obk_03.h" -INCLUDE_ASM(s32, "world/area_obk/obk_03/BC43F0", func_80240170_BC43F0); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_obk/obk_04/BC7EB0.c b/src/world/area_obk/obk_04/BC7EB0.c index 61bfaf6be4..039bcbed7e 100644 --- a/src/world/area_obk/obk_04/BC7EB0.c +++ b/src/world/area_obk/obk_04/BC7EB0.c @@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/area_obk/obk_04/BC7EB0", func_80240624_BC8484); INCLUDE_ASM(s32, "world/area_obk/obk_04/BC7EB0", func_80240910_BC8770); -INCLUDE_ASM(s32, "world/area_obk/obk_04/BC7EB0", func_80240940_BC87A0); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_obk/obk_07/BCEBF0.c b/src/world/area_obk/obk_07/BCEBF0.c index d7c058e7a0..adf3f2b466 100644 --- a/src/world/area_obk/obk_07/BCEBF0.c +++ b/src/world/area_obk/obk_07/BCEBF0.c @@ -3,7 +3,7 @@ static char* N(exit_str_0) = "obk_01"; static char* N(exit_str_1) = ""; -INCLUDE_ASM(s32, "world/area_obk/obk_07/BCEBF0", func_80240000_BCEBF0); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_omo/omo_04/DAD400.c b/src/world/area_omo/omo_04/DAD400.c index d0a4838478..4a72f0865e 100644 --- a/src/world/area_omo/omo_04/DAD400.c +++ b/src/world/area_omo/omo_04/DAD400.c @@ -3,7 +3,7 @@ static char* N(exit_str_0) = "omo_03"; static char* N(exit_str_1) = ""; -INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80240000_DAD400); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_omo/omo_06/DB8180.c b/src/world/area_omo/omo_06/DB8180.c index fa7b3fb67c..a5ae853bb7 100644 --- a/src/world/area_omo/omo_06/DB8180.c +++ b/src/world/area_omo/omo_06/DB8180.c @@ -1,6 +1,6 @@ #include "omo_06.h" -INCLUDE_ASM(s32, "world/area_omo/omo_06/DB8180", func_80240870_DB8180); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_omo/omo_07/DC01D0.c b/src/world/area_omo/omo_07/DC01D0.c index 9580a3cf97..269cb8f1cb 100644 --- a/src/world/area_omo/omo_07/DC01D0.c +++ b/src/world/area_omo/omo_07/DC01D0.c @@ -2,7 +2,7 @@ static char* N(exit_str_2) = "omo_07"; -INCLUDE_ASM(s32, "world/area_omo/omo_07/DC01D0", func_80242F20_DC01D0); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_omo/omo_09/DCD3F0.c b/src/world/area_omo/omo_09/DCD3F0.c index 2c926ed605..6a77241e57 100644 --- a/src/world/area_omo/omo_09/DCD3F0.c +++ b/src/world/area_omo/omo_09/DCD3F0.c @@ -1,6 +1,6 @@ #include "omo_09.h" -INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD3F0", func_80240720_DCD3F0); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_omo/omo_13/DE36C0.c b/src/world/area_omo/omo_13/DE36C0.c index 81b3f5db67..01f5971e13 100644 --- a/src/world/area_omo/omo_13/DE36C0.c +++ b/src/world/area_omo/omo_13/DE36C0.c @@ -1,6 +1,6 @@ #include "omo_13.h" -INCLUDE_ASM(s32, "world/area_omo/omo_13/DE36C0", func_80241230_DE36C0); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_osr/osr_01/AB0350.c b/src/world/area_osr/osr_01/AB0350.c index dc9f2bb6c1..22d7d655c5 100644 --- a/src/world/area_osr/osr_01/AB0350.c +++ b/src/world/area_osr/osr_01/AB0350.c @@ -1,6 +1,6 @@ #include "osr_01.h" -INCLUDE_ASM(s32, "world/area_osr/osr_01/AB0350", func_80240360_AB0350); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_pra/pra_05/D55BD0.c b/src/world/area_pra/pra_05/D55BD0.c index 5e29ef8034..c8dbd5cd9a 100644 --- a/src/world/area_pra/pra_05/D55BD0.c +++ b/src/world/area_pra/pra_05/D55BD0.c @@ -2,7 +2,7 @@ #include "world/common/reflection.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_05/D55BD0", func_80240F20_D56AD0); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_pra/pra_11/D61520.c b/src/world/area_pra/pra_11/D61520.c index ff54374da0..b623da40a2 100644 --- a/src/world/area_pra/pra_11/D61520.c +++ b/src/world/area_pra/pra_11/D61520.c @@ -2,7 +2,7 @@ #include "world/common/reflection.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_11/D61520", func_80240F20_D62420); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_pra/pra_12/D62D10.c b/src/world/area_pra/pra_12/D62D10.c index d39d4fc472..ed2b705e70 100644 --- a/src/world/area_pra/pra_12/D62D10.c +++ b/src/world/area_pra/pra_12/D62D10.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_12/D62D10", func_80240000_D62D10); #include "world/common/reflection.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_12/D62D10", func_80240F50_D63C60); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_pra/pra_14/D67D20.c b/src/world/area_pra/pra_14/D67D20.c index a836e0aa82..a5428649a7 100644 --- a/src/world/area_pra/pra_14/D67D20.c +++ b/src/world/area_pra/pra_14/D67D20.c @@ -2,7 +2,7 @@ #include "world/common/reflection.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_14/D67D20", func_80240F20_D68C20); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_pra/pra_27/D799F0.c b/src/world/area_pra/pra_27/D799F0.c index 2f02dcf212..c5742f3aa4 100644 --- a/src/world/area_pra/pra_27/D799F0.c +++ b/src/world/area_pra/pra_27/D799F0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_27/D799F0", func_80240000_D799F0); #include "world/common/reflection.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_27/D799F0", func_80240F50_D7A940); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_pra/pra_28/D7B2A0.c b/src/world/area_pra/pra_28/D7B2A0.c index 08af1d632e..d319a55de8 100644 --- a/src/world/area_pra/pra_28/D7B2A0.c +++ b/src/world/area_pra/pra_28/D7B2A0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_28/D7B2A0", func_80240000_D7B2A0); #include "world/common/reflection.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_28/D7B2A0", func_80240F50_D7C1F0); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_pra/pra_35/D8FBA0.c b/src/world/area_pra/pra_35/D8FBA0.c index ad243b6b9f..4160f4f824 100644 --- a/src/world/area_pra/pra_35/D8FBA0.c +++ b/src/world/area_pra/pra_35/D8FBA0.c @@ -1,6 +1,6 @@ #include "pra_35.h" -INCLUDE_ASM(s32, "world/area_pra/pra_35/D8FBA0", func_80242950_D8FBA0); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_sam/sam_01/CF7E80.c b/src/world/area_sam/sam_01/CF7E80.c index a1d249840c..a93e3aca88 100644 --- a/src/world/area_sam/sam_01/CF7E80.c +++ b/src/world/area_sam/sam_01/CF7E80.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_802405C8_CF8138); INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240664_CF81D4); -INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240700_CF8270); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" @@ -68,7 +68,9 @@ INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241A54_CF95C4); INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241B20_CF9690); -INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241C90_CF9800); +#define NAMESPACE dup_sam_01 +#include "world/common/StashVars.inc.c" +#define NAMESPACE sam_01 #define NAMESPACE dup_sam_01 #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_sam/sam_02/D05F60.c b/src/world/area_sam/sam_02/D05F60.c index 51517c0cbd..4b2fd89272 100644 --- a/src/world/area_sam/sam_02/D05F60.c +++ b/src/world/area_sam/sam_02/D05F60.c @@ -22,7 +22,7 @@ #include "world/common/UnkFunc36.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240B2C_D0625C); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_sam/sam_06/D203E0.c b/src/world/area_sam/sam_06/D203E0.c index e9d4b7bad3..6337ba8d58 100644 --- a/src/world/area_sam/sam_06/D203E0.c +++ b/src/world/area_sam/sam_06/D203E0.c @@ -22,7 +22,7 @@ #include "world/common/UnkNpcAIMainFunc9.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241A48_D218D8); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_sam/sam_09/D362F0.c b/src/world/area_sam/sam_09/D362F0.c index 181b0cd8f9..b34501ac46 100644 --- a/src/world/area_sam/sam_09/D362F0.c +++ b/src/world/area_sam/sam_09/D362F0.c @@ -3,7 +3,7 @@ static char* N(exit_str_0) = "sam_08"; static char* N(exit_str_1) = "sam_10"; -INCLUDE_ASM(s32, "world/area_sam/sam_09/D362F0", func_80240000_D362F0); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_sam/sam_10/D37800.c b/src/world/area_sam/sam_10/D37800.c index 3a05a0634e..d2b017597f 100644 --- a/src/world/area_sam/sam_10/D37800.c +++ b/src/world/area_sam/sam_10/D37800.c @@ -5,7 +5,7 @@ static char* N(exit_str_1) = "pra_01"; static char* N(exit_str_2) = "sam_12"; static char* N(exit_str_3) = ""; -INCLUDE_ASM(s32, "world/area_sam/sam_10/D37800", func_80240000_D37800); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_sam/sam_11/D3ADA0.c b/src/world/area_sam/sam_11/D3ADA0.c index ce38b2f311..6735ea7a94 100644 --- a/src/world/area_sam/sam_11/D3ADA0.c +++ b/src/world/area_sam/sam_11/D3ADA0.c @@ -2,7 +2,7 @@ #define UNK_ALPHA_FUNC_NPC 17 -INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802407D0_D3ADA0); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_sbk/sbk_02/92A9A0.c b/src/world/area_sbk/sbk_02/92A9A0.c index 87feb4a94d..99e86fd0d7 100644 --- a/src/world/area_sbk/sbk_02/92A9A0.c +++ b/src/world/area_sbk/sbk_02/92A9A0.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_02/92A9A0", func_80240970_92AC20); INCLUDE_ASM(s32, "world/area_sbk/sbk_02/92A9A0", func_802409A8_92AC58); -INCLUDE_ASM(s32, "world/area_sbk/sbk_02/92A9A0", func_80240A44_92ACF4); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_sbk/sbk_30/93F5B0.c b/src/world/area_sbk/sbk_30/93F5B0.c index cb2fbb239e..aeb6c47356 100644 --- a/src/world/area_sbk/sbk_30/93F5B0.c +++ b/src/world/area_sbk/sbk_30/93F5B0.c @@ -35,7 +35,7 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80240000_93F5B0); #include "world/common/UnkNpcAIMainFunc4.inc.c" -INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80240DDC_94038C); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_sbk/sbk_34/945F10.c b/src/world/area_sbk/sbk_34/945F10.c index db8b351ef5..5870276926 100644 --- a/src/world/area_sbk/sbk_34/945F10.c +++ b/src/world/area_sbk/sbk_34/945F10.c @@ -1,6 +1,6 @@ #include "sbk_34.h" -INCLUDE_ASM(s32, "world/area_sbk/sbk_34/945F10", func_80240040_945F10); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_tik/tik_02/86CA50.c b/src/world/area_tik/tik_02/86CA50.c index ae8715539d..a4450b1fe9 100644 --- a/src/world/area_tik/tik_02/86CA50.c +++ b/src/world/area_tik/tik_02/86CA50.c @@ -1,6 +1,6 @@ #include "tik_02.h" -INCLUDE_ASM(s32, "world/area_tik/tik_02/86CA50", func_80240310_86CA50); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_tik/tik_05/8750D0.c b/src/world/area_tik/tik_05/8750D0.c index 247cc6570c..c333ed9ecd 100644 --- a/src/world/area_tik/tik_05/8750D0.c +++ b/src/world/area_tik/tik_05/8750D0.c @@ -2,7 +2,7 @@ #include "world/common/UnkPosFunc2.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_05/8750D0", func_80240680_875440); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_tik/tik_12/8891C0.c b/src/world/area_tik/tik_12/8891C0.c index b83adab635..9ebe4678fd 100644 --- a/src/world/area_tik/tik_12/8891C0.c +++ b/src/world/area_tik/tik_12/8891C0.c @@ -2,7 +2,7 @@ #include "world/common/UnkPosFunc2.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80240960_889530); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_tik/tik_15/890190.c b/src/world/area_tik/tik_15/890190.c index 6614ee1800..7aa8d7791e 100644 --- a/src/world/area_tik/tik_15/890190.c +++ b/src/world/area_tik/tik_15/890190.c @@ -2,7 +2,7 @@ #include "world/common/UnkPosFunc2.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_15/890190", func_80240960_890500); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_trd/trd_00/999F80.c b/src/world/area_trd/trd_00/999F80.c index 19386980cc..6d4cd5dcca 100644 --- a/src/world/area_trd/trd_00/999F80.c +++ b/src/world/area_trd/trd_00/999F80.c @@ -1,6 +1,6 @@ #include "trd_00.h" -INCLUDE_ASM(s32, "world/area_trd/trd_00/999F80", func_80240310_999F80); +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" diff --git a/src/world/common/StashVars.inc.c b/src/world/common/StashVars.inc.c index 93da8c66b9..b887ab5ea4 100644 --- a/src/world/common/StashVars.inc.c +++ b/src/world/common/StashVars.inc.c @@ -1,23 +1,26 @@ #include "common.h" #include "npc.h" +// remove this and uncomment other when all data from all maps that use this are migrated to C +extern s32** N(varTable); + ApiStatus N(StashVars)(Evt* script, s32 isInitialCall) { - static s32** varTable = NULL; + //static s32** varTable = NULL; s32 i; - if (varTable == NULL) { - varTable = heap_malloc(sizeof(script->varTable)); + if (N(varTable) == NULL) { + N(varTable) = heap_malloc(sizeof(script->varTable)); for (i = 0; i < ARRAY_COUNT(script->varTable); i++) { - varTable[i] = (s32*) script->varTable[i]; + N(varTable)[i] = (s32*) script->varTable[i]; } } else { for (i = 0; i < ARRAY_COUNT(script->varTable); i++) { - script->varTable[i] = (s32) varTable[i]; + script->varTable[i] = (s32) N(varTable)[i]; } - heap_free(varTable); - varTable = NULL; + heap_free(N(varTable)); + N(varTable) = NULL; } return ApiStatus_DONE2; diff --git a/tools/substitute.py b/tools/substitute.py index 83896a6e5d..7e099deb8e 100755 --- a/tools/substitute.py +++ b/tools/substitute.py @@ -4,6 +4,7 @@ import argparse import os import re from pathlib import Path +from unicodedata import name script_dir = os.path.dirname(os.path.realpath(__file__)) root_dir = script_dir + "/../" @@ -42,6 +43,9 @@ for root, dirs, files in os.walk(src_dir): with open(f_path, "w", newline="\n") as f: f.write(f_text) +# # Rename symbols in from_funcs to namespace equivalents +# for root, dirs, files in os.walk + for root, dirs, files in os.walk(asm_dir): for f_name in files: if f_name.endswith(".s"): @@ -50,8 +54,19 @@ for root, dirs, files in os.walk(asm_dir): f_text_orig = f.read() f_text = f_text_orig + + if Path(f_path).parent.parent.name == "nonmatchings": + namespace = Path(f_path).parent.name + else: + namespace = Path(f_path).parent.parent.name + + # TODO refactor into new func + if f_name[:-2] in from_funcs: + syms = list(set(re.findall(r"D_[0-9A-F]{8}_[0-9A-F]{6}", f_text))) + print(f"{syms[0]} {namespace}_varTable") + for func in from_funcs: - f_text = f_text.replace(func, Path(f_path).parent.parent.name + "_" + func_name) + f_text = f_text.replace(func, namespace + "_" + func_name) if f_text != f_text_orig: with open(f_path, "w", newline="\n") as f: f.write(f_text) diff --git a/ver/us/asm/data/EA3A80.data.s b/ver/us/asm/data/EA3A80.data.s index 3585dbe321..feb3f0874e 100644 --- a/ver/us/asm/data/EA3A80.data.s +++ b/ver/us/asm/data/EA3A80.data.s @@ -95,7 +95,7 @@ dlabel D_80243FB0_EA48B0 dlabel D_802440FC_EA49FC .word 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80243EA0_EA47A0, 0x8007D3C0, 0x00000000, 0x8007D4EC, 0x00000000, 0x00000000, 0x00110000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, D_80243F40_EA4840, 0x8007D3C0, 0x00000000, 0x8007D4EC, 0x00000000, 0x00000000, 0x00190000 -dlabel D_80244154_EA4A54 +dlabel EA0C10_varTable .word 0x00000000 dlabel D_80244158_EA4A58 diff --git a/ver/us/asm/data/EAA810.data.s b/ver/us/asm/data/EAA810.data.s index 8073e2ea16..71d4725a98 100644 --- a/ver/us/asm/data/EAA810.data.s +++ b/ver/us/asm/data/EAA810.data.s @@ -143,7 +143,7 @@ dlabel D_80243AD8_EAC5B8 dlabel D_80243BB8_EAC698 .word 0x009C8540, 0x009C8F90, 0x80234000, 0x009C7810, 0x009C8540, 0x80234000, 0x009D6E00, 0x009D92C0, 0x80234000, 0x009D92C0, 0x009D9D00, 0x80234000, 0x009C8F90, 0x009C9EE0, 0x80234000, 0x009C9EE0, 0x009CABE0, 0x80234000, 0x009CABE0, 0x009CB690, 0x80234000, 0x009CB690, 0x009CC130, 0x80234000, 0x009CC130, 0x009CCF00, 0x80234000, 0x009CCF00, 0x009CDC30, 0x80234000, 0x009CDC30, 0x009D0C80, 0x80234000, 0x009D0C80, 0x009D3570, 0x80234000, 0x009D3570, 0x009D58B0, 0x80234000, 0x009D58B0, 0x009D6380, 0x80234000, 0x009D6380, 0x009D6E00, 0x80234000, 0x009D9D00, 0x009DC700, 0x80234000, 0x009DC700, 0x009DF4A0, 0x80234000, 0x009DF4A0, 0x009DF9E0, 0x80234000, 0x009DF9E0, 0x009E0EA0, 0x80234000, 0x009E0EA0, 0x009E1B70, 0x80234000, 0x009E1B70, 0x009E2710, 0x80234000, 0x009E2710, 0x009E3390, 0x80234000, 0x009E3390, 0x009E3F30, 0x80234000, 0x009E3F30, 0x009E4810, 0x80234000, 0x009E4810, 0x009E5110, 0x80234000, 0x009E5110, 0x009E7420, 0x80234000, 0x009E7420, 0x009E8E30, 0x80234000, 0x009E8E30, 0x009E9560, 0x80234000, 0x009E9560, 0x009EAEA0, 0x80234000, 0x009EAEA0, 0x009EB590, 0x80234000, 0x009EB590, 0x009EB790, 0x80234000, 0x009EB790, 0x009EBFF0, 0x80234000, 0x009EBFF0, 0x009EE030, 0x80234000, 0x009EE030, 0x009F0820, 0x80234000, 0x009F0820, 0x009F1160, 0x80234000, 0x009F1160, 0x009F2260, 0x80234000, 0x009F2260, 0x009F2D30, 0x80234000 -dlabel D_80243D74_EAC854 +dlabel EA8AE0_varTable .word 0x00000000 dlabel D_80243D78_EAC858 diff --git a/ver/us/asm/data/EB1920.data.s b/ver/us/asm/data/EB1920.data.s index f53b6b24f8..9a52b17221 100644 --- a/ver/us/asm/data/EB1920.data.s +++ b/ver/us/asm/data/EB1920.data.s @@ -50,7 +50,7 @@ dlabel D_802416D0_EB2530 dlabel D_802416FC_EB255C .word 0x00000000, 0x001A0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00140014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00160018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 -dlabel D_80241780_EB25E0 +dlabel EB1170_varTable .word 0x00000000 dlabel D_80241784_EB25E4 diff --git a/ver/us/asm/data/EC2850.data.s b/ver/us/asm/data/EC2850.data.s index 0119864000..52c95fc55a 100644 --- a/ver/us/asm/data/EC2850.data.s +++ b/ver/us/asm/data/EC2850.data.s @@ -35,7 +35,7 @@ dlabel D_80240ED0_EC30D0 dlabel D_80240EFC_EC30FC .word 0x00000000, 0x00380028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 -dlabel D_80240F28_EC3128 +dlabel EC2240_varTable .word 0x00000000 dlabel D_80240F2C_EC312C diff --git a/ver/us/asm/data/EC78F0.data.s b/ver/us/asm/data/EC78F0.data.s index e9629ae34b..0889db8acc 100644 --- a/ver/us/asm/data/EC78F0.data.s +++ b/ver/us/asm/data/EC78F0.data.s @@ -35,7 +35,7 @@ dlabel D_80241220_EC83D0 dlabel D_802415AC_EC875C .word 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, 0x802E37A0, 0x00000165, 0x00000043, 0x00000002, 0x802E37A0, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, EC7590_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C83, 0x00000166, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, EC7590_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, EC7590_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C84, 0x00000165, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, EC7590_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000030, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000005, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000033, 0x00000003, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802E2F8C, 0xFE363C8B, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000003, 0x802E2F30, 0xFE363C8B, 0x00000001, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000030, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000005, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000014, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000046, 0x00000001, 0xFE363C85, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000 -dlabel D_80241BB0_EC8D60 +dlabel EC7590_varTable .word 0x00000000 dlabel D_80241BB4_EC8D64 diff --git a/ver/us/asm/data/ED5780.data.s b/ver/us/asm/data/ED5780.data.s index 48570dff0e..59ae61f72f 100644 --- a/ver/us/asm/data/ED5780.data.s +++ b/ver/us/asm/data/ED5780.data.s @@ -29,7 +29,7 @@ dlabel D_80241A78_ED5C98 dlabel D_80241AA4_ED5CC4 .word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, func_802D8248, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_80244144_ED8364, 0x00000046, 0x00000001, D_80241720_ED5940, 0x00000044, 0x00000001, D_80244B40_ED8D60, 0x00000044, 0x00000001, D_802436E8_ED7908, 0x00000044, 0x00000001, D_80242BD8_ED6DF8, 0x00000044, 0x00000001, D_80244164_ED8384, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000000B, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000000C, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFEF7, 0x00000024, 0x00000002, 0xFE363C81, 0x000000F7, 0x00000024, 0x00000002, 0xFE363C82, 0x000000C7, 0x00000024, 0x00000002, 0xFE363C83, 0x00000139, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80241770_ED5990, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFED4, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFEED, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFF74, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF47, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80241770_ED5990, 0x00000024, 0x00000002, 0xFE363C80, 0x00000107, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF08, 0x00000024, 0x00000002, 0xFE363C82, 0x0000016A, 0x00000024, 0x00000002, 0xFE363C83, 0x00000092, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80241770_ED5990, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000044, 0x00000001, D_8024333C_ED755C, 0x00000016, 0x00000001, 0x00000002, 0x00000044, 0x00000001, D_802428DC_ED6AFC, 0x00000044, 0x00000001, D_80241A78_ED5C98, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80241A78_ED5C98, 0x00000044, 0x00000001, 0x80285C70, 0x00000023, 0x00000000, 0x00000046, 0x00000001, D_802415D0_ED57F0, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, ED4260_DeadUnkFunc1, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 -dlabel D_80241DA0_ED5FC0 +dlabel ED42A0_varTable .word 0x00000000 dlabel D_80241DA4_ED5FC4 diff --git a/ver/us/asm/data/EDC6D0.data.s b/ver/us/asm/data/EDC6D0.data.s index 65ba99a159..1454589a9d 100644 --- a/ver/us/asm/data/EDC6D0.data.s +++ b/ver/us/asm/data/EDC6D0.data.s @@ -32,7 +32,7 @@ dlabel D_80240E30_EDCE10 dlabel D_80240E5C_EDCE3C .word 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, EDC020_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, EDC020_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802E2F8C, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, 0x802E2F30, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, 0x802E37A0, 0x00000165, 0x00000043, 0x00000002, 0x802E37A0, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, EDC020_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C83, 0x00000166, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, EDC020_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, EDC020_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C84, 0x00000165, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, EDC020_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000030, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000005, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000033, 0x00000003, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802E2F8C, 0xFE363C8B, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000003, 0x802E2F30, 0xFE363C8B, 0x00000001, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000030, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000005, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000014, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000046, 0x00000001, 0xFE363C85, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000 -dlabel D_802417EC_EDD7CC +dlabel EDC020_varTable .word 0x00000000 dlabel D_802417F0_EDD7D0 diff --git a/ver/us/asm/data/world/area_hos/hos_00/A0E520.data.s b/ver/us/asm/data/world/area_hos/hos_00/A0E520.data.s index 9f8916ea7f..bb88f8332f 100644 --- a/ver/us/asm/data/world/area_hos/hos_00/A0E520.data.s +++ b/ver/us/asm/data/world/area_hos/hos_00/A0E520.data.s @@ -8,7 +8,7 @@ dlabel D_80242830_A0E520 dlabel D_80242878_A0E568 .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D016D, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802EAFDC, 0x000001C2, 0x0000000A, 0xFFFFFF47, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242830_A0E520, 0x00000043, 0x00000007, MakeEntity, D_802EAFDC, 0x00000357, 0xFFFFFFF6, 0xFFFFFFD8, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242878_A0E568, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0x0000017C, 0xFFFFFFF6, 0x00000019, 0x00000000, 0x00000010, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8405D9A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 -dlabel D_80242970_A0E660 +dlabel hos_00_varTable .word 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802429D4_A0E6C4 diff --git a/ver/us/asm/data/world/area_hos/hos_03/A1F3C0.data.s b/ver/us/asm/data/world/area_hos/hos_03/A1F3C0.data.s index bcac7ad099..737095b0d3 100644 --- a/ver/us/asm/data/world/area_hos/hos_03/A1F3C0.data.s +++ b/ver/us/asm/data/world/area_hos/hos_03/A1F3C0.data.s @@ -140,5 +140,5 @@ dlabel D_80247AA4_A22BA4 dlabel D_80247B1C_A22C1C .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C87, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C84, 0x00000008, 0x00000001, 0x00000046, 0x00000043, 0x00000003, EnableModel, 0xFE363C86, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, EnableModel, 0xFE363C86, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000B4, 0x00000014, 0x00000002, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0xFE363C88, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0xFE363C89, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, hos_03_UnkFunc35, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, 0x8024AAA0, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C83, 0x00000043, 0x00000001, hos_03_DoesPlayerNeedSleep, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B30002, 0x00B30001, 0x00000000, 0xFE363C88, 0x00000043, 0x00000002, ShowChoice, 0x001E0006, 0x00000008, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00B30002, 0x00B30001, 0x00000000, 0xFE363C89, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00B30002, 0x00B30001, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000001, hos_03_Call800E9894, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80247B1C_A22C1C, 0x00000013, 0x00000000, 0x00000043, 0x00000002, hos_03_GetPartnerCall800EB168, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, 0x8024A7E8, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x0000003C, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, hos_03_UnkFunc32, 0x00000003, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, FullyRestoreSP, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80247AA4_A22BA4, 0x00000013, 0x00000000, 0x00000043, 0x00000002, hos_03_Call800EB168, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, hos_03_UnkFunc32, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000069, 0x00000046, 0x00000001, 0x8024AA1C, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B30002, 0x00B30001, 0x00000000, 0xFE363C8B, 0x00000043, 0x00000001, hos_03_Call800E98C4SyncStatusMenu, 0x00000002, 0x00000000, 0x00000001, 0x00000000 -dlabel D_8024801C_A2311C +dlabel hos_03_varTable .word 0x00000000 diff --git a/ver/us/asm/data/world/area_hos/hos_06/A3C090.data.s b/ver/us/asm/data/world/area_hos/hos_06/A3C090.data.s index e95014dba4..bc15cd6aaf 100644 --- a/ver/us/asm/data/world/area_hos/hos_06/A3C090.data.s +++ b/ver/us/asm/data/world/area_hos/hos_06/A3C090.data.s @@ -8,7 +8,7 @@ dlabel D_80242BB0_A3C090 dlabel D_80242BDC_A3C0BC .word 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 -dlabel D_80242C08_A3C0E8 +dlabel hos_06_varTable .word 0x00000000 dlabel D_80242C0C_A3C0EC diff --git a/ver/us/asm/data/world/area_hos/hos_06/A3DAB0.data.s b/ver/us/asm/data/world/area_hos/hos_06/A3DAB0.data.s index 79e52130a0..17b72f691a 100644 --- a/ver/us/asm/data/world/area_hos/hos_06/A3DAB0.data.s +++ b/ver/us/asm/data/world/area_hos/hos_06/A3DAB0.data.s @@ -14,7 +14,7 @@ dlabel D_802445D8_A3DAB8 dlabel D_8024471C_A3DBFC .word 0x00000043, 0x00000002, func_80241008_A3A4E8, 0xFE363C80, 0x0000004E, 0x00000006, D_802445D8_A3DAB8, 0x00000010, 0x00000000, D_80246430_8E0530, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240F7C_A3A45C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 -dlabel D_8024476C_A3DC4C +dlabel dup_hos_06_varTable .word 0x00000000 dlabel D_80244770_A3DC50 @@ -53,7 +53,7 @@ dlabel D_802456F4_A3EBD4 dlabel D_802456FC_A3EBDC .word 0x0000000A, 0x00000002, 0xF8405D98, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D99, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, FindKeyItem, 0x00000027, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00B00004, 0x00B00001, 0x00000000, 0x000A0048, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802456F4_A3EBD4, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000046, 0x00000001, D_8024471C_A3DBFC, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00B00004, 0x00B00001, 0x00000000, 0x000A0049, 0x00000024, 0x00000002, 0xFE363C80, 0x00000071, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80244770_A3DC50, 0x00000043, 0x00000002, AddKeyItem, 0x00000071, 0x00000024, 0x00000002, 0xF8405D99, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00B00004, 0x00B00001, 0x00000000, 0x000A0048, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, func_802CF56C, 0x00000001, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFFCF, 0x00000000, 0x00000006, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F8A, 0x00000000, 0x0000003E, 0x00000002, 0x00000014, 0xFD050F8A, 0x00000013, 0x00000000, 0x0000003C, 0x00000001, 0xFD050F8A, 0x0000000A, 0x00000002, 0xF9718936, 0x00000000, 0x00000024, 0x00000002, 0xF9718936, 0x00000001, 0x0000000A, 0x00000002, 0xF8405D97, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00B00004, 0x00B00001, 0x00000000, 0x000A0038, 0x00000024, 0x00000002, 0xF8405D97, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00B00004, 0x00B00001, 0x00000000, 0x000A0039, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00B00004, 0x00B00001, 0x00000000, 0x000A003A, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, ShowChoice, 0x001E0011, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00B00004, 0x00B00001, 0x00000000, 0x000A003C, 0x00000043, 0x00000002, func_802CF56C, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000001, 0x00000043, 0x00000002, ShowChoice, 0x001E0000, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00B00004, 0x00B00001, 0x00000000, 0x000A003C, 0x00000043, 0x00000002, func_802CF56C, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802417EC_A3ACCC, 0xFE363C80, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00B00004, 0x00B00001, 0x00000000, 0x000A003D, 0x00000043, 0x00000002, func_802CF56C, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80241860_A3AD40, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00B00004, 0x00B00001, 0x00000000, 0x000A003E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00B00007, 0x00B00007, 0x00000000, 0x000A0041, 0x00000046, 0x00000001, D_80244F3C_A3E41C, 0x00000043, 0x00000001, func_80241668_A3AB48, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00B00006, 0x00B00006, 0x00000000, 0x000A0042, 0x00000043, 0x00000002, func_802418A4_A3AD84, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00B00004, 0x00B00001, 0x00000000, 0xFE363C81, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000063, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00B00004, 0x00B00001, 0x00000000, 0x000A003F, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00B00007, 0x00B00007, 0x00000000, 0x000A0041, 0x00000046, 0x00000001, D_80244F3C_A3E41C, 0x00000043, 0x00000001, func_8024126C_A3A74C, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00B00006, 0x00B00006, 0x00000000, 0x000A0043, 0x00000043, 0x00000002, func_802418A4_A3AD84, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00B00004, 0x00B00001, 0x00000000, 0xFE363C81, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000063, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00B00004, 0x00B00001, 0x00000000, 0x000A0040, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00B00007, 0x00B00007, 0x00000000, 0x000A0041, 0x00000046, 0x00000001, D_80244F3C_A3E41C, 0x00000043, 0x00000001, func_802414E4_A3A9C4, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00B00006, 0x00B00006, 0x00000000, 0x000A0044, 0x00000043, 0x00000002, func_802418A4_A3AD84, 0x00000002, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00B00004, 0x00B00001, 0x00000000, 0xFE363C81, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000063, 0x00000023, 0x00000000, 0x00000003, 0x00000001, 0x00000063, 0x00000043, 0x00000002, func_802CF56C, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00B00004, 0x00B00001, 0x00000000, 0x000A0045, 0x00000046, 0x00000001, D_802456FC_A3EBDC, 0x00000046, 0x00000001, D_80245620_A3EB00, 0x00000002, 0x00000000, 0x00000001, 0x00000000 -dlabel D_80245E80_A3F360 +dlabel dup2_hos_06_varTable .word 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000002, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80245EEC_A3F3CC diff --git a/ver/us/asm/data/world/area_isk/isk_09/986BD0.data.s b/ver/us/asm/data/world/area_isk/isk_09/986BD0.data.s index 41748aa2f5..93ed8a7a21 100644 --- a/ver/us/asm/data/world/area_isk/isk_09/986BD0.data.s +++ b/ver/us/asm/data/world/area_isk/isk_09/986BD0.data.s @@ -2,7 +2,7 @@ .section .data -dlabel D_802406F0_986BD0 +dlabel isk_09_varTable .word 0x00000000 dlabel D_802406F4_986BD4 diff --git a/ver/us/asm/data/world/area_iwa/iwa_00/90CF20.data.s b/ver/us/asm/data/world/area_iwa/iwa_00/90CF20.data.s index 666681ec14..f45a861649 100644 --- a/ver/us/asm/data/world/area_iwa/iwa_00/90CF20.data.s +++ b/ver/us/asm/data/world/area_iwa/iwa_00/90CF20.data.s @@ -65,7 +65,7 @@ dlabel D_80240FA0_90DBE0 dlabel D_80240FCC_90DC0C .word 0x00000000, 0x001E001A, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00630000 -dlabel D_80240FF8_90DC38 +dlabel iwa_00_varTable .word 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024105C_90DC9C diff --git a/ver/us/asm/data/world/area_iwa/iwa_02/917220.data.s b/ver/us/asm/data/world/area_iwa/iwa_02/917220.data.s index 27d8689efe..e65dfe573e 100644 --- a/ver/us/asm/data/world/area_iwa/iwa_02/917220.data.s +++ b/ver/us/asm/data/world/area_iwa/iwa_02/917220.data.s @@ -47,7 +47,7 @@ dlabel D_80241D6C_917ADC dlabel D_80241D7C_917AEC .word 0x00000000, 0x002A001A, D_80241D6C_917ADC, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 -dlabel D_80241DA8_917B18 +dlabel iwa_02_varTable .word 0x00000000 dlabel D_80241DAC_917B1C diff --git a/ver/us/asm/data/world/area_iwa/iwa_03/919F00.data.s b/ver/us/asm/data/world/area_iwa/iwa_03/919F00.data.s index dc33a28e84..443f44a774 100644 --- a/ver/us/asm/data/world/area_iwa/iwa_03/919F00.data.s +++ b/ver/us/asm/data/world/area_iwa/iwa_03/919F00.data.s @@ -14,7 +14,7 @@ dlabel D_802413FC_919FAC dlabel D_80241428_919FD8 .word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000008, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x80242920, 0x00000046, 0x00000001, D_8024183C_91A3EC, 0x00000044, 0x00000001, 0x80242BB8, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000016, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xFE363C80, D_802413FC_919FAC, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000012, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000001, 0x00000000 -dlabel D_80241530_91A0E0 +dlabel iwa_03_varTable .word 0x00000000 dlabel D_80241534_91A0E4 diff --git a/ver/us/asm/data/world/area_iwa/iwa_10/920280.data.s b/ver/us/asm/data/world/area_iwa/iwa_10/920280.data.s index 7825f01724..568ac685d5 100644 --- a/ver/us/asm/data/world/area_iwa/iwa_10/920280.data.s +++ b/ver/us/asm/data/world/area_iwa/iwa_10/920280.data.s @@ -14,7 +14,7 @@ dlabel D_80241D4C_9202BC dlabel D_80241DA4_920314 .word 0x00000000, 0x001A0017, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 -dlabel D_80241DD0_920340 +dlabel iwa_10_varTable .word 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241E34_9203A4 diff --git a/ver/us/asm/data/world/area_jan/jan_00/B226D0.data.s b/ver/us/asm/data/world/area_jan/jan_00/B226D0.data.s index f49f907e16..807eff00de 100644 --- a/ver/us/asm/data/world/area_jan/jan_00/B226D0.data.s +++ b/ver/us/asm/data/world/area_jan/jan_00/B226D0.data.s @@ -23,7 +23,7 @@ dlabel D_80242290_B227D0 dlabel D_8024239C_B228DC .word 0x00000000, 0x0014001C, D_80242214_B22754, D_80242290_B227D0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 -dlabel D_802423C8_B22908 +dlabel jan_00_varTable .word 0x00000000 dlabel D_802423CC_B2290C diff --git a/ver/us/asm/data/world/area_jan/jan_02/B2F410.data.s b/ver/us/asm/data/world/area_jan/jan_02/B2F410.data.s index 75cb1074be..20c7da5fc0 100644 --- a/ver/us/asm/data/world/area_jan/jan_02/B2F410.data.s +++ b/ver/us/asm/data/world/area_jan/jan_02/B2F410.data.s @@ -23,7 +23,7 @@ dlabel D_8024304C_B2F4BC dlabel D_80243050_B2F4C0 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, jan_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80241540_B2D9B0, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241578_B2D9E8, 0xFE363C80, 0x0000004E, 0x00000006, D_80243050_B2F4C0, 0x00000010, 0x00000000, D_80248760_DCCB30, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802414EC_B2D95C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 -dlabel D_802431E4_B2F654 +dlabel jan_02_varTable .word 0x00000000 dlabel D_802431E8_B2F658 diff --git a/ver/us/asm/data/world/area_jan/jan_03/B39530.data.s b/ver/us/asm/data/world/area_jan/jan_03/B39530.data.s index 605ae59e26..160107b966 100644 --- a/ver/us/asm/data/world/area_jan/jan_03/B39530.data.s +++ b/ver/us/asm/data/world/area_jan/jan_03/B39530.data.s @@ -140,7 +140,7 @@ dlabel D_802475E0_B3C1B0 dlabel D_80247714_B3C2E4 .word 0x00000043, 0x00000002, func_80241B00_B366D0, 0xFE363C80, 0x0000004E, 0x00000006, D_802475E0_B3C1B0, 0x00000010, 0x00000000, D_8024FD68, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802419D8_B365A8, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 -dlabel D_80247764_B3C334 +dlabel jan_03_varTable .word 0x00000000 dlabel D_80247768_B3C338 diff --git a/ver/us/asm/data/world/area_jan/jan_04/B45A20.data.s b/ver/us/asm/data/world/area_jan/jan_04/B45A20.data.s index a3af50bc05..1b6109b8c8 100644 --- a/ver/us/asm/data/world/area_jan/jan_04/B45A20.data.s +++ b/ver/us/asm/data/world/area_jan/jan_04/B45A20.data.s @@ -14,7 +14,7 @@ dlabel D_802413E0_B45B50 dlabel D_8024140C_B45B7C .word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_802413E0_B45B50, 0x00000044, 0x00000001, EnterWalk, 0x00000021, 0x00000002, 0x00000001, 0x00000002, 0x00000044, 0x00000001, 0x802449E0, 0x00000016, 0x00000001, 0x00000003, 0x00000044, 0x00000001, 0x80244454, 0x00000016, 0x00000001, 0x00000004, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000024, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80243708, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80243720, 0x00000023, 0x00000000, 0x00000044, 0x00000001, D_80241998_B46108, 0x00000044, 0x00000001, 0x80244314, 0x00000044, 0x00000001, 0x80245B74, 0x00000044, 0x00000001, 0x8024385C, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000022, 0x00000004, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000025, 0x00000004, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000028, 0x00000004, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000022, 0x00080000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000025, 0x00080000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000028, 0x00080000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000004, 0x00000001, 0x00000043, 0x00000002, MakeTransformGroup, 0x00000059, 0x00000043, 0x00000003, EnableTexPanning, 0x00000058, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFB0, 0x00000024, 0x00000002, 0xFE363C82, 0x0000008C, 0x00000024, 0x00000002, 0xFE363C83, 0x00000050, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFF9C, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802412B0_B45A20, 0x00000057, 0x00000000, 0x00000043, 0x00000002, GetDemoState, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000046, 0x00000001, 0x80246260, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_8024140C_B45B7C, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x80241180, 0x00000002, 0x00000000, 0x00000001, 0x00000000 -dlabel D_80241800_B45F70 +dlabel jan_04_varTable .word 0x00000000 dlabel D_80241804_B45F74 diff --git a/ver/us/asm/data/world/area_jan/jan_22/B85AE0.data.s b/ver/us/asm/data/world/area_jan/jan_22/B85AE0.data.s index 785c7ec668..9a5a3ee1ce 100644 --- a/ver/us/asm/data/world/area_jan/jan_22/B85AE0.data.s +++ b/ver/us/asm/data/world/area_jan/jan_22/B85AE0.data.s @@ -68,7 +68,7 @@ dlabel D_8024250C_B8668C dlabel D_80242590_B86710 .word 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 -dlabel D_802425BC_B8673C +dlabel jan_22_varTable .word 0x00000000 dlabel D_802425C0_B86740 diff --git a/ver/us/asm/data/world/area_kkj/kkj_17/AF2520.data.s b/ver/us/asm/data/world/area_kkj/kkj_17/AF2520.data.s index b612f173b2..f8da13bcff 100644 --- a/ver/us/asm/data/world/area_kkj/kkj_17/AF2520.data.s +++ b/ver/us/asm/data/world/area_kkj/kkj_17/AF2520.data.s @@ -2,7 +2,7 @@ .section .data -dlabel D_802408C0_AF2520 +dlabel kkj_17_varTable .word 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000002, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024092C_AF258C diff --git a/ver/us/asm/data/world/area_kkj/kkj_20/AFE3C0.data.s b/ver/us/asm/data/world/area_kkj/kkj_20/AFE3C0.data.s index 4657dcb4b3..5d1ac97833 100644 --- a/ver/us/asm/data/world/area_kkj/kkj_20/AFE3C0.data.s +++ b/ver/us/asm/data/world/area_kkj/kkj_20/AFE3C0.data.s @@ -2,7 +2,7 @@ .section .data -dlabel D_80240880_AFE3C0 +dlabel kkj_20_varTable .word 0x00000000 dlabel D_80240884_AFE3C4 diff --git a/ver/us/asm/data/world/area_kmr/kmr_02/8B5640.data.s b/ver/us/asm/data/world/area_kmr/kmr_02/8B5640.data.s index 8f0425fd3a..80c5abdaa1 100644 --- a/ver/us/asm/data/world/area_kmr/kmr_02/8B5640.data.s +++ b/ver/us/asm/data/world/area_kmr/kmr_02/8B5640.data.s @@ -2,7 +2,7 @@ .section .data -dlabel D_802455D0_8B5640 +dlabel kmr_02_varTable .word 0x00000000 dlabel D_802455D4_8B5644 diff --git a/ver/us/asm/data/world/area_kmr/kmr_04/8CC4F0.data.s b/ver/us/asm/data/world/area_kmr/kmr_04/8CC4F0.data.s index 915961b032..82b50ec47b 100644 --- a/ver/us/asm/data/world/area_kmr/kmr_04/8CC4F0.data.s +++ b/ver/us/asm/data/world/area_kmr/kmr_04/8CC4F0.data.s @@ -14,7 +14,7 @@ dlabel D_80242090_8CC990 dlabel D_802423F0_8CCCF0 .word 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, PlaySound, 0x00000165, 0x00000043, 0x00000002, PlaySound, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, kmr_04_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000166, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, kmr_04_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, kmr_04_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C84, 0x00000165, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, kmr_04_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000030, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000005, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000033, 0x00000003, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8B, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8B, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000030, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000005, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x0000000F, PlayEffect, 0x00000014, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000046, 0x00000001, 0xFE363C85, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000 -dlabel D_802429F4_8CD2F4 +dlabel kmr_04_varTable .word 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242A58_8CD358 diff --git a/ver/us/asm/data/world/area_kmr/kmr_10/8D90F0.data.s b/ver/us/asm/data/world/area_kmr/kmr_10/8D90F0.data.s index ffd85c71bd..68c2d5b9f3 100644 --- a/ver/us/asm/data/world/area_kmr/kmr_10/8D90F0.data.s +++ b/ver/us/asm/data/world/area_kmr/kmr_10/8D90F0.data.s @@ -2,7 +2,7 @@ .section .data -dlabel D_80240C20_8D90F0 +dlabel kmr_10_varTable .word 0x00000000 dlabel D_80240C24_8D90F4 diff --git a/ver/us/asm/data/world/area_kmr/kmr_20/8F66D0.data.s b/ver/us/asm/data/world/area_kmr/kmr_20/8F66D0.data.s index 87533c2d68..767df1f74c 100644 --- a/ver/us/asm/data/world/area_kmr/kmr_20/8F66D0.data.s +++ b/ver/us/asm/data/world/area_kmr/kmr_20/8F66D0.data.s @@ -8,7 +8,7 @@ dlabel D_8024A8B0_8F66D0 dlabel D_8024A8DC_8F66FC .word 0x00000000, 0x00170016, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0001 -dlabel D_8024A908_8F6728 +dlabel kmr_20_varTable .word 0x00000000 dlabel D_8024A90C_8F672C diff --git a/ver/us/asm/data/world/area_kpa/kpa_14/A58DB0.data.s b/ver/us/asm/data/world/area_kpa/kpa_14/A58DB0.data.s index 044caec328..1d3924a298 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_14/A58DB0.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_14/A58DB0.data.s @@ -2,7 +2,7 @@ .section .data -dlabel D_80241900_A58DB0 +dlabel kpa_14_varTable .word 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000002, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024196C_A58E1C diff --git a/ver/us/asm/data/world/area_kpa/kpa_15/A59E30.data.s b/ver/us/asm/data/world/area_kpa/kpa_15/A59E30.data.s index 7f39ae4521..acc3e517a8 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_15/A59E30.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_15/A59E30.data.s @@ -2,7 +2,7 @@ .section .data -dlabel D_80240AA0_A59E30 +dlabel kpa_15_varTable .word 0x00000000 dlabel D_80240AA4_A59E34 diff --git a/ver/us/asm/data/world/area_kzn/kzn_02/C5D9B0.data.s b/ver/us/asm/data/world/area_kzn/kzn_02/C5D9B0.data.s index 6552380fb3..7e1c2f5991 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_02/C5D9B0.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_02/C5D9B0.data.s @@ -65,7 +65,7 @@ dlabel D_802449B8_C5F0F8 dlabel D_802449E4_C5F124 .word 0x00000000, 0x00280018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 -dlabel D_80244A10_C5F150 +dlabel kzn_02_varTable .word 0x00000000 dlabel D_80244A14_C5F154 diff --git a/ver/us/asm/data/world/area_kzn/kzn_03/C647B0.data.s b/ver/us/asm/data/world/area_kzn/kzn_03/C647B0.data.s index 562492cbb6..05e10af687 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_03/C647B0.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_03/C647B0.data.s @@ -50,7 +50,7 @@ dlabel D_80244148_C64E58 dlabel D_80244174_C64E84 .word 0x00000000, 0x00280018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 -dlabel D_802441A0_C64EB0 +dlabel kzn_03_varTable .word 0x00000000 dlabel D_802441A4_C64EB4 diff --git a/ver/us/asm/data/world/area_kzn/kzn_08/C76030.data.s b/ver/us/asm/data/world/area_kzn/kzn_08/C76030.data.s index 71bc168291..32b058a052 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_08/C76030.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_08/C76030.data.s @@ -2,7 +2,7 @@ .section .data -dlabel D_80244BB0_C76030 +dlabel kzn_08_varTable .word 0x00000000 dlabel D_80244BB4_C76034 diff --git a/ver/us/asm/data/world/area_kzn/kzn_09/C7B0D0.data.s b/ver/us/asm/data/world/area_kzn/kzn_09/C7B0D0.data.s index 939516cc77..1b3d0a02eb 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_09/C7B0D0.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_09/C7B0D0.data.s @@ -59,7 +59,7 @@ dlabel D_802451CC_C7BEAC dlabel D_80245224_C7BF04 .word 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 -dlabel D_80245250_C7BF30 +dlabel kzn_09_varTable .word 0x00000000 dlabel D_80245254_C7BF34 diff --git a/ver/us/asm/data/world/area_kzn/kzn_17/C89450.data.s b/ver/us/asm/data/world/area_kzn/kzn_17/C89450.data.s index 385614f114..2da32d932e 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_17/C89450.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_17/C89450.data.s @@ -47,7 +47,7 @@ dlabel D_80243ED0_C89980 dlabel D_8024401C_C89ACC .word 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80243DC0_C89870, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, D_80243E60_C89910, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000 -dlabel D_80244074_C89B24 +dlabel kzn_17_varTable .word 0x00000000 dlabel D_80244078_C89B28 diff --git a/ver/us/asm/data/world/area_kzn/kzn_19/C90BF0.data.s b/ver/us/asm/data/world/area_kzn/kzn_19/C90BF0.data.s index 38d85b5af0..0d918e279b 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_19/C90BF0.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_19/C90BF0.data.s @@ -95,7 +95,7 @@ dlabel D_80243AD8_C91688 dlabel D_80243BB8_C91768 .word 0x007B6690, 0x007B70E0, 0x80234000, 0x007B5960, 0x007B6690, 0x80234000, 0x007C4F50, 0x007C7410, 0x80234000, 0x007C7410, 0x007C7E50, 0x80234000, 0x007B70E0, 0x007B8030, 0x80234000, 0x007B8030, 0x007B8D30, 0x80234000, 0x007B8D30, 0x007B97E0, 0x80234000, 0x007B97E0, 0x007BA280, 0x80234000, 0x007BA280, 0x007BB050, 0x80234000, 0x007BB050, 0x007BBD80, 0x80234000, 0x007BBD80, 0x007BEDD0, 0x80234000, 0x007BEDD0, 0x007C16C0, 0x80234000, 0x007C16C0, 0x007C3A00, 0x80234000, 0x007C3A00, 0x007C44D0, 0x80234000, 0x007C44D0, 0x007C4F50, 0x80234000, 0x007C7E50, 0x007CA850, 0x80234000, 0x007CA850, 0x007CD5F0, 0x80234000, 0x007CD5F0, 0x007CDB30, 0x80234000, 0x007CDB30, 0x007CEFF0, 0x80234000, 0x007CEFF0, 0x007CFCC0, 0x80234000, 0x007CFCC0, 0x007D0860, 0x80234000, 0x007D0860, 0x007D14E0, 0x80234000, 0x007D14E0, 0x007D2080, 0x80234000, 0x007D2080, 0x007D2960, 0x80234000, 0x007D2960, 0x007D3260, 0x80234000, 0x007D3260, 0x007D5570, 0x80234000, 0x007D5570, 0x007D6F80, 0x80234000, 0x007D6F80, 0x007D76B0, 0x80234000, 0x007D76B0, 0x007D8FF0, 0x80234000, 0x007D8FF0, 0x007D96E0, 0x80234000, 0x007D96E0, 0x007D98E0, 0x80234000, 0x007D98E0, 0x007DA140, 0x80234000, 0x007DA140, 0x007DC180, 0x80234000, 0x007DC180, 0x007DE970, 0x80234000, 0x007DE970, 0x007DF2B0, 0x80234000, 0x007DF2B0, 0x007E03B0, 0x80234000, 0x007E03B0, 0x007E0E80, 0x80234000 -dlabel D_80243D74_C91924 +dlabel kzn_19_varTable .word 0x00000000 dlabel D_80243D78_C91928 diff --git a/ver/us/asm/data/world/area_kzn/kzn_20/C97600.data.s b/ver/us/asm/data/world/area_kzn/kzn_20/C97600.data.s index e2af2831af..07436ae8ff 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_20/C97600.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_20/C97600.data.s @@ -8,7 +8,7 @@ dlabel D_802416D0_C97600 dlabel D_802416FC_C9762C .word 0x00000000, 0x001A0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00140014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00160018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 -dlabel D_80241780_C976B0 +dlabel kzn_20_varTable .word 0x00000000 dlabel D_80241784_C976B4 diff --git a/ver/us/asm/data/world/area_mac/mac_00/7F0A20.data.s b/ver/us/asm/data/world/area_mac/mac_00/7F0A20.data.s index 8cf2593386..f27792d538 100644 --- a/ver/us/asm/data/world/area_mac/mac_00/7F0A20.data.s +++ b/ver/us/asm/data/world/area_mac/mac_00/7F0A20.data.s @@ -11,7 +11,7 @@ dlabel D_80245D68_7F0A78 dlabel D_80245D94_7F0AA4 .word 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 -dlabel D_80245DC0_7F0AD0 +dlabel mac_00_varTable .word 0x00000000 dlabel D_80245DC4_7F0AD4 diff --git a/ver/us/asm/data/world/area_mac/mac_00/7F9850.data.s b/ver/us/asm/data/world/area_mac/mac_00/7F9850.data.s index 2aa6703ad2..c9b1d4441a 100644 --- a/ver/us/asm/data/world/area_mac/mac_00/7F9850.data.s +++ b/ver/us/asm/data/world/area_mac/mac_00/7F9850.data.s @@ -23,7 +23,7 @@ dlabel D_8024EC38_7F9948 dlabel D_8024EC90_7F99A0 .word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00170013, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 -dlabel D_8024ECE8_7F99F8 +dlabel dup_mac_00_varTable .word 0x00000000 dlabel D_8024ECEC_7F99FC diff --git a/ver/us/asm/data/world/area_mac/mac_01/8091F0.data.s b/ver/us/asm/data/world/area_mac/mac_01/8091F0.data.s index 89ab43fc32..08e6de92c0 100644 --- a/ver/us/asm/data/world/area_mac/mac_01/8091F0.data.s +++ b/ver/us/asm/data/world/area_mac/mac_01/8091F0.data.s @@ -44,7 +44,7 @@ dlabel D_80248BD8_809458 dlabel D_80248C04_809484 .word 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 -dlabel D_80248C30_8094B0 +dlabel mac_01_varTable .word 0x00000000 dlabel D_80248C34_8094B4 diff --git a/ver/us/asm/data/world/area_mac/mac_02/828F10.data.s b/ver/us/asm/data/world/area_mac/mac_02/828F10.data.s index 9951fa5a1c..7e06ad9d9b 100644 --- a/ver/us/asm/data/world/area_mac/mac_02/828F10.data.s +++ b/ver/us/asm/data/world/area_mac/mac_02/828F10.data.s @@ -41,7 +41,7 @@ dlabel D_80246114_8293D4 dlabel D_80246124_8293E4 .word 0x00000000, 0x002A001A, D_80246114_8293D4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 -dlabel D_80246150_829410 +dlabel mac_02_varTable .word 0x00000000 dlabel D_80246154_829414 diff --git a/ver/us/asm/data/world/area_mac/mac_03/837CB0.data.s b/ver/us/asm/data/world/area_mac/mac_03/837CB0.data.s index f9bf200551..5ce27aa6f6 100644 --- a/ver/us/asm/data/world/area_mac/mac_03/837CB0.data.s +++ b/ver/us/asm/data/world/area_mac/mac_03/837CB0.data.s @@ -29,7 +29,7 @@ dlabel D_802465EC_837DEC dlabel D_80246618_837E18 .word 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 -dlabel D_80246644_837E44 +dlabel mac_03_varTable .word 0x00000000 dlabel D_80246648_837E48 diff --git a/ver/us/asm/data/world/area_mac/mac_04/8469B0.data.s b/ver/us/asm/data/world/area_mac/mac_04/8469B0.data.s index f9afaf688c..f922f49f22 100644 --- a/ver/us/asm/data/world/area_mac/mac_04/8469B0.data.s +++ b/ver/us/asm/data/world/area_mac/mac_04/8469B0.data.s @@ -26,7 +26,7 @@ dlabel D_80243F38_846B08 dlabel D_80243FBC_846B8C .word 0x00000000, 0x00140014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 -dlabel D_80243FE8_846BB8 +dlabel mac_04_varTable .word 0x00000000 dlabel D_80243FEC_846BBC diff --git a/ver/us/asm/data/world/area_mac/mac_05/857070.data.s b/ver/us/asm/data/world/area_mac/mac_05/857070.data.s index 4f4b889dd2..aed789338e 100644 --- a/ver/us/asm/data/world/area_mac/mac_05/857070.data.s +++ b/ver/us/asm/data/world/area_mac/mac_05/857070.data.s @@ -20,7 +20,7 @@ dlabel D_80244FB4_857124 dlabel D_8024502C_85719C .word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00170013, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00300020, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 -dlabel D_802450B0_857220 +dlabel mac_05_varTable .word 0x00000000 dlabel D_802450B4_857224 diff --git a/ver/us/asm/data/world/area_mim/mim_04/B9FEA0.data.s b/ver/us/asm/data/world/area_mim/mim_04/B9FEA0.data.s index f23f5bcf34..29ca4cf715 100644 --- a/ver/us/asm/data/world/area_mim/mim_04/B9FEA0.data.s +++ b/ver/us/asm/data/world/area_mim/mim_04/B9FEA0.data.s @@ -17,7 +17,7 @@ dlabel D_802425D8_B9FF38 dlabel D_802425E8_B9FF48 .word 0x00000000, 0x002A001A, D_802425D8_B9FF38, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 -dlabel D_80242614_B9FF74 +dlabel mim_04_varTable .word 0x00000000 dlabel D_80242618_B9FF78 diff --git a/ver/us/asm/data/world/area_nok/nok_01/9C89E0.data.s b/ver/us/asm/data/world/area_nok/nok_01/9C89E0.data.s index ca95fbd859..a1f08ce1f5 100644 --- a/ver/us/asm/data/world/area_nok/nok_01/9C89E0.data.s +++ b/ver/us/asm/data/world/area_nok/nok_01/9C89E0.data.s @@ -104,7 +104,7 @@ dlabel D_80245A44_9CAE24 dlabel D_80245B9C_9CAF7C .word 0x00000043, 0x00000004, nok_01_UnkFunc35, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_80249810_9CEBF0, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C83, 0x00000043, 0x00000001, nok_01_DoesPlayerNeedSleep, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C88, 0x00000043, 0x00000002, ShowChoice, 0x001E0006, 0x00000008, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C89, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000001, nok_01_Call800E9894, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80245A44_9CAE24, 0x00000013, 0x00000000, 0x00000043, 0x00000002, nok_01_GetPartnerCall800EB168, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_802498E8_9CECC8, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x0000003C, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, nok_01_UnkFunc32, 0x00000003, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, FullyRestoreSP, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802459CC_9CADAC, 0x00000013, 0x00000000, 0x00000043, 0x00000002, nok_01_Call800EB168, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, nok_01_UnkFunc32, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000069, 0x00000046, 0x00000001, D_80249B68_9CEF48, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8B, 0x00000043, 0x00000001, nok_01_Call800E98C4SyncStatusMenu, 0x00000002, 0x00000000, 0x00000001, 0x00000000 -dlabel D_80245F44_9CB324 +dlabel nok_01_varTable .word 0x00000000 dlabel D_80245F48_9CB328 diff --git a/ver/us/asm/data/world/area_nok/nok_02/9DB6C0.data.s b/ver/us/asm/data/world/area_nok/nok_02/9DB6C0.data.s index 686aeb7288..a367fd09e7 100644 --- a/ver/us/asm/data/world/area_nok/nok_02/9DB6C0.data.s +++ b/ver/us/asm/data/world/area_nok/nok_02/9DB6C0.data.s @@ -8,7 +8,7 @@ dlabel D_802446A0_9DB6C0 dlabel D_80244EC0_9DBEE0 .word 0x00000043, 0x00000001, nok_02_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, nok_02_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, nok_02_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, nok_02_GetCurrentCameraYawClamped180, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, nok_02_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, nok_02_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, nok_02_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 -dlabel D_802453D0_9DC3F0 +dlabel nok_02_varTable .word 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80245434_9DC454 diff --git a/ver/us/asm/data/world/area_nok/nok_02/9DDE90.data.s b/ver/us/asm/data/world/area_nok/nok_02/9DDE90.data.s index ef1696efdd..69f3e8b011 100644 --- a/ver/us/asm/data/world/area_nok/nok_02/9DDE90.data.s +++ b/ver/us/asm/data/world/area_nok/nok_02/9DDE90.data.s @@ -38,7 +38,7 @@ dlabel D_80247070_9DE090 dlabel D_8024709C_9DE0BC .word 0x00000000, 0x00170014, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 -dlabel D_802470C8_9DE0E8 +dlabel dup_nok_02_varTable .word 0x00000000 dlabel D_802470CC_9DE0EC diff --git a/ver/us/asm/data/world/area_nok/nok_02/9E9420.data.s b/ver/us/asm/data/world/area_nok/nok_02/9E9420.data.s index f48857c95f..897b7fc978 100644 --- a/ver/us/asm/data/world/area_nok/nok_02/9E9420.data.s +++ b/ver/us/asm/data/world/area_nok/nok_02/9E9420.data.s @@ -20,7 +20,7 @@ dlabel D_8025259C_9E95BC dlabel D_802526D0_9E96F0 .word 0x00000043, 0x00000002, func_80243D14_9DAD34, 0xFE363C80, 0x0000004E, 0x00000006, D_8025259C_9E95BC, 0x00000010, 0x00000000, D_80254D68, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80243BEC_9DAC0C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 -dlabel D_80252720_9E9740 +dlabel dup2_nok_02_varTable .word 0x00000000 dlabel D_80252724_9E9744 diff --git a/ver/us/asm/data/world/area_obk/obk_01/BC11A0.data.s b/ver/us/asm/data/world/area_obk/obk_01/BC11A0.data.s index aa6379cd50..e72b2f2487 100644 --- a/ver/us/asm/data/world/area_obk/obk_01/BC11A0.data.s +++ b/ver/us/asm/data/world/area_obk/obk_01/BC11A0.data.s @@ -17,7 +17,7 @@ dlabel D_8024407C_BC121C dlabel D_802440A8_BC1248 .word 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000008, 0x00000001, 0x00000014, 0x00000002, 0x00000000, 0x00000001, 0x00000000 -dlabel D_802440F0_BC1290 +dlabel obk_01_varTable .word 0x00000000 dlabel D_802440F4_BC1294 diff --git a/ver/us/asm/data/world/area_obk/obk_03/BC7120.data.s b/ver/us/asm/data/world/area_obk/obk_03/BC7120.data.s index fd857f91e1..8b76ee679b 100644 --- a/ver/us/asm/data/world/area_obk/obk_03/BC7120.data.s +++ b/ver/us/asm/data/world/area_obk/obk_03/BC7120.data.s @@ -5,7 +5,7 @@ dlabel D_80242EA0_BC7120 .word 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 -dlabel D_80242ECC_BC714C +dlabel obk_03_varTable .word 0x00000000 dlabel D_80242ED0_BC7150 diff --git a/ver/us/asm/data/world/area_obk/obk_04/BCB870.data.s b/ver/us/asm/data/world/area_obk/obk_04/BCB870.data.s index 7e8f4d5580..4e9d5bee7c 100644 --- a/ver/us/asm/data/world/area_obk/obk_04/BCB870.data.s +++ b/ver/us/asm/data/world/area_obk/obk_04/BCB870.data.s @@ -2,7 +2,7 @@ .section .data -dlabel D_80243A10_BCB870 +dlabel obk_04_varTable .word 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243A74_BCB8D4 diff --git a/ver/us/asm/data/world/area_obk/obk_07/BD0BA0.data.s b/ver/us/asm/data/world/area_obk/obk_07/BD0BA0.data.s index cc8826b978..cb218b2682 100644 --- a/ver/us/asm/data/world/area_obk/obk_07/BD0BA0.data.s +++ b/ver/us/asm/data/world/area_obk/obk_07/BD0BA0.data.s @@ -2,7 +2,7 @@ .section .data -dlabel D_80241FB0_BD0BA0 +dlabel obk_07_varTable .word 0x00000000 dlabel D_80241FB4_BD0BA4 diff --git a/ver/us/asm/data/world/area_omo/omo_04/DAF3E0.data.s b/ver/us/asm/data/world/area_omo/omo_04/DAF3E0.data.s index 1bc6eecadb..3f0b5ac8b5 100644 --- a/ver/us/asm/data/world/area_omo/omo_04/DAF3E0.data.s +++ b/ver/us/asm/data/world/area_omo/omo_04/DAF3E0.data.s @@ -17,7 +17,7 @@ dlabel D_8024238C_DAF78C dlabel D_80242608_DAFA08 .word 0x00000044, 0x00000001, D_80242260_DAF660, 0x00000044, 0x00000001, D_8024238C_DAF78C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 -dlabel D_80242630_DAFA30 +dlabel omo_04_varTable .word 0x00000000 dlabel D_80242634_DAFA34 diff --git a/ver/us/asm/data/world/area_omo/omo_06/DBCFD0.data.s b/ver/us/asm/data/world/area_omo/omo_06/DBCFD0.data.s index 975d57f056..907991303b 100644 --- a/ver/us/asm/data/world/area_omo/omo_06/DBCFD0.data.s +++ b/ver/us/asm/data/world/area_omo/omo_06/DBCFD0.data.s @@ -2,7 +2,7 @@ .section .data -dlabel D_802456C0_DBCFD0 +dlabel omo_06_varTable .word 0x00000000 dlabel D_802456C4_DBCFD4 diff --git a/ver/us/asm/data/world/area_omo/omo_07/DC30B0.data.s b/ver/us/asm/data/world/area_omo/omo_07/DC30B0.data.s index b91854ae14..601d0ef325 100644 --- a/ver/us/asm/data/world/area_omo/omo_07/DC30B0.data.s +++ b/ver/us/asm/data/world/area_omo/omo_07/DC30B0.data.s @@ -2,7 +2,7 @@ .section .data -dlabel D_80245E00_DC30B0 +dlabel omo_07_varTable .word 0x00000000 dlabel D_80245E04_DC30B4 diff --git a/ver/us/asm/data/world/area_omo/omo_09/DD3520.data.s b/ver/us/asm/data/world/area_omo/omo_09/DD3520.data.s index 5b5d2d268e..7e31504d07 100644 --- a/ver/us/asm/data/world/area_omo/omo_09/DD3520.data.s +++ b/ver/us/asm/data/world/area_omo/omo_09/DD3520.data.s @@ -17,7 +17,7 @@ dlabel D_80246D44_DD3A14 dlabel D_80246DA4_DD3A74 .word 0x0000004D, 0x00000001, 0x000000EF, 0x00000043, 0x00000001, func_802406E0_DCD3B0, 0x00000008, 0x00000001, 0xFE363C89, 0x00000043, 0x00000003, ParentColliderToModel, 0xFE363C86, 0xFE363C87, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFE363C88, 0xFE363C88, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C86, 0x00000043, 0x00000001, func_802406E0_DCD3B0, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, func_802406E0_DCD3B0, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFE363C88, 0x00000000, 0xFE363C88, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C86, 0x00000043, 0x00000001, func_802406E0_DCD3B0, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, func_802406E0_DCD3B0, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000044, 0x00000001, D_80246850_DD3520, 0x00000044, 0x00000001, D_8024697C_DD364C, 0x00000044, 0x00000001, D_80246C78_DD3948, 0x00000030, 0x00000001, D_80246D44_DD3A14, 0x00000005, 0x00000001, 0x00000006, 0x00000034, 0x00000004, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000044, 0x00000001, D_80246DA4_DD3A74, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 -dlabel D_80247010_DD3CE0 +dlabel omo_09_varTable .word 0x00000000 dlabel D_80247014_DD3CE4 diff --git a/ver/us/asm/data/world/area_omo/omo_13/DE5100.data.s b/ver/us/asm/data/world/area_omo/omo_13/DE5100.data.s index 896306e4cc..805a596506 100644 --- a/ver/us/asm/data/world/area_omo/omo_13/DE5100.data.s +++ b/ver/us/asm/data/world/area_omo/omo_13/DE5100.data.s @@ -2,7 +2,7 @@ .section .data -dlabel D_80242C70_DE5100 +dlabel omo_13_varTable .word 0x00000000 dlabel D_80242C74_DE5104 diff --git a/ver/us/asm/data/world/area_osr/osr_01/AB1150.data.s b/ver/us/asm/data/world/area_osr/osr_01/AB1150.data.s index bc01c4b0c3..38d64b043f 100644 --- a/ver/us/asm/data/world/area_osr/osr_01/AB1150.data.s +++ b/ver/us/asm/data/world/area_osr/osr_01/AB1150.data.s @@ -5,7 +5,7 @@ dlabel D_80241160_AB1150 .word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00170013, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 -dlabel D_802411B8_AB11A8 +dlabel osr_01_varTable .word 0x00000000 dlabel D_802411BC_AB11AC diff --git a/ver/us/asm/data/world/area_pra/pra_05/D56E20.data.s b/ver/us/asm/data/world/area_pra/pra_05/D56E20.data.s index 115fe8b233..f781de4a8b 100644 --- a/ver/us/asm/data/world/area_pra/pra_05/D56E20.data.s +++ b/ver/us/asm/data/world/area_pra/pra_05/D56E20.data.s @@ -17,7 +17,7 @@ dlabel D_802414EC_D5709C dlabel D_80241518_D570C8 .word 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000016, 0x00000024, 0x00000002, 0xFE363C83, 0x00000013, 0x00000024, 0x00000002, 0xFE363C84, 0x00000017, 0x00000024, 0x00000002, 0xFE363C85, 0x00000014, 0x00000046, 0x00000001, 0x80285EC4, 0x00000044, 0x00000001, D_802414EC_D5709C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000015, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000018, 0x00000018, 0x00000028, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000046, 0x00000001, D_80241818_D573C8, 0x00000044, 0x00000001, 0x80241230, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xF8406152, 0x00000044, 0x00000001, D_80241380_D56F30, 0x00000044, 0x00000001, D_80241518_D570C8, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 -dlabel D_80241680_D57230 +dlabel pra_05_varTable .word 0x00000000 dlabel D_80241684_D57234 diff --git a/ver/us/asm/data/world/area_pra/pra_11/D62B10.data.s b/ver/us/asm/data/world/area_pra/pra_11/D62B10.data.s index ab81cc06e4..57da803204 100644 --- a/ver/us/asm/data/world/area_pra/pra_11/D62B10.data.s +++ b/ver/us/asm/data/world/area_pra/pra_11/D62B10.data.s @@ -2,7 +2,7 @@ .section .data -dlabel D_80241610_D62B10 +dlabel pra_11_varTable .word 0x00000000 dlabel D_80241614_D62B14 diff --git a/ver/us/asm/data/world/area_pra/pra_12/D63FB0.data.s b/ver/us/asm/data/world/area_pra/pra_12/D63FB0.data.s index a77efffef7..a45f6b65b5 100644 --- a/ver/us/asm/data/world/area_pra/pra_12/D63FB0.data.s +++ b/ver/us/asm/data/world/area_pra/pra_12/D63FB0.data.s @@ -17,7 +17,7 @@ dlabel D_8024151C_D6422C dlabel D_80241548_D64258 .word 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000016, 0x00000024, 0x00000002, 0xFE363C83, 0x00000013, 0x00000024, 0x00000002, 0xFE363C84, 0x00000017, 0x00000024, 0x00000002, 0xFE363C85, 0x00000014, 0x00000046, 0x00000001, 0x80285EC4, 0x00000044, 0x00000001, D_8024151C_D6422C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000015, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000018, 0x00000018, 0x00000028, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000046, 0x00000001, D_80241848_D64558, 0x00000044, 0x00000001, 0x80241260, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xF8406152, 0x00000044, 0x00000001, D_802413B0_D640C0, 0x00000044, 0x00000001, D_80241548_D64258, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 -dlabel D_802416B0_D643C0 +dlabel pra_12_varTable .word 0x00000000 dlabel D_802416B4_D643C4 diff --git a/ver/us/asm/data/world/area_pra/pra_14/D69630.data.s b/ver/us/asm/data/world/area_pra/pra_14/D69630.data.s index 2df7e740c5..0585170f0a 100644 --- a/ver/us/asm/data/world/area_pra/pra_14/D69630.data.s +++ b/ver/us/asm/data/world/area_pra/pra_14/D69630.data.s @@ -2,7 +2,7 @@ .section .data -dlabel D_80241930_D69630 +dlabel pra_14_varTable .word 0x00000000 dlabel D_80241934_D69634 diff --git a/ver/us/asm/data/world/area_pra/pra_27/D7B080.data.s b/ver/us/asm/data/world/area_pra/pra_27/D7B080.data.s index 6b88b4a92b..6d66fa8c2d 100644 --- a/ver/us/asm/data/world/area_pra/pra_27/D7B080.data.s +++ b/ver/us/asm/data/world/area_pra/pra_27/D7B080.data.s @@ -2,7 +2,7 @@ .section .data -dlabel D_80241690_D7B080 +dlabel pra_27_varTable .word 0x00000000 dlabel D_80241694_D7B084 diff --git a/ver/us/asm/data/world/area_pra/pra_28/D7C930.data.s b/ver/us/asm/data/world/area_pra/pra_28/D7C930.data.s index c1403e1785..661d8c591f 100644 --- a/ver/us/asm/data/world/area_pra/pra_28/D7C930.data.s +++ b/ver/us/asm/data/world/area_pra/pra_28/D7C930.data.s @@ -2,7 +2,7 @@ .section .data -dlabel D_80241690_D7C930 +dlabel pra_28_varTable .word 0x00000000 dlabel D_80241694_D7C934 diff --git a/ver/us/asm/data/world/area_pra/pra_35/D91030.data.s b/ver/us/asm/data/world/area_pra/pra_35/D91030.data.s index 957c375877..a569954acc 100644 --- a/ver/us/asm/data/world/area_pra/pra_35/D91030.data.s +++ b/ver/us/asm/data/world/area_pra/pra_35/D91030.data.s @@ -2,7 +2,7 @@ .section .data -dlabel D_80243DE0_D91030 +dlabel pra_35_varTable .word 0x00000000 dlabel D_80243DE4_D91034 diff --git a/ver/us/asm/data/world/area_sam/sam_01/CF9BC0.data.s b/ver/us/asm/data/world/area_sam/sam_01/CF9BC0.data.s index 7997765f40..3253752226 100644 --- a/ver/us/asm/data/world/area_sam/sam_01/CF9BC0.data.s +++ b/ver/us/asm/data/world/area_sam/sam_01/CF9BC0.data.s @@ -95,7 +95,7 @@ dlabel D_802432D8_CFAE48 dlabel D_8024346C_CFAFDC .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, sam_01_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80240590_CF8100, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240664_CF81D4, 0xFE363C80, 0x0000004E, 0x00000006, D_8024346C_CFAFDC, 0x00000010, 0x00000000, D_8024DD88, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024053C_CF80AC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 -dlabel D_802435F0_CFB160 +dlabel sam_01_varTable .word 0x00000000 dlabel D_802435F4_CFB164 diff --git a/ver/us/asm/data/world/area_sam/sam_01/D05460.data.s b/ver/us/asm/data/world/area_sam/sam_01/D05460.data.s index 01355cfeb1..cc574b8593 100644 --- a/ver/us/asm/data/world/area_sam/sam_01/D05460.data.s +++ b/ver/us/asm/data/world/area_sam/sam_01/D05460.data.s @@ -2,7 +2,7 @@ .section .data -dlabel D_8024D8F0_D05460 +dlabel dup_sam_01_varTable .word 0x00000000 dlabel D_8024D8F4_D05464 diff --git a/ver/us/asm/data/world/area_sam/sam_02/D09AD0.data.s b/ver/us/asm/data/world/area_sam/sam_02/D09AD0.data.s index b6150f330d..08ee8709de 100644 --- a/ver/us/asm/data/world/area_sam/sam_02/D09AD0.data.s +++ b/ver/us/asm/data/world/area_sam/sam_02/D09AD0.data.s @@ -89,7 +89,7 @@ dlabel D_80246B08_D0C238 dlabel D_80246B34_D0C264 .word 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 -dlabel D_80246B60_D0C290 +dlabel sam_02_varTable .word 0x00000000 dlabel D_80246B64_D0C294 diff --git a/ver/us/asm/data/world/area_sam/sam_06/D23E50.data.s b/ver/us/asm/data/world/area_sam/sam_06/D23E50.data.s index a4dacae9f4..1241682e8a 100644 --- a/ver/us/asm/data/world/area_sam/sam_06/D23E50.data.s +++ b/ver/us/asm/data/world/area_sam/sam_06/D23E50.data.s @@ -50,7 +50,7 @@ dlabel D_80244378_D24208 dlabel D_802443A4_D24234 .word 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 -dlabel D_802443D0_D24260 +dlabel sam_06_varTable .word 0x00000000 dlabel D_802443D4_D24264 diff --git a/ver/us/asm/data/world/area_sam/sam_09/D369A0.data.s b/ver/us/asm/data/world/area_sam/sam_09/D369A0.data.s index 3f8affdeb0..76aca3b16c 100644 --- a/ver/us/asm/data/world/area_sam/sam_09/D369A0.data.s +++ b/ver/us/asm/data/world/area_sam/sam_09/D369A0.data.s @@ -5,7 +5,7 @@ dlabel D_802406B0_D369A0 .word 0x00000002, 0x00000000, 0x00000001, 0x00000000 -dlabel D_802406C0_D369B0 +dlabel sam_09_varTable .word 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240724_D36A14 diff --git a/ver/us/asm/data/world/area_sam/sam_10/D38840.data.s b/ver/us/asm/data/world/area_sam/sam_10/D38840.data.s index c08db13a87..41a2291444 100644 --- a/ver/us/asm/data/world/area_sam/sam_10/D38840.data.s +++ b/ver/us/asm/data/world/area_sam/sam_10/D38840.data.s @@ -2,7 +2,7 @@ .section .data -dlabel D_80241040_D38840 +dlabel sam_10_varTable .word 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000002, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA5AC, 0x00000307, 0x0000021C, 0xFFFFFFCE, 0x00000000, 0x00000123, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406137, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0xFFFFFF60, 0x0000012C, 0xFFFFFF92, 0x00000011, 0xF8406138, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000004D, 0x00000043, 0x00000007, DropTinyItemEntity, 0x0000006C, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802402BC_D37ABC, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000012, 0x00000000, 0x00000043, 0x00000007, DropTinyItemEntity, 0x0000006C, 0xFFFFFF8B, 0x000000B3, 0xFFFFFFC9, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802402BC_D37ABC, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0xFFFFFF06, 0x00000366, 0xFFFFFF2E, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA7E0, 0x00000302, 0x000004B0, 0xFFFFFF1F, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802411F0_D389F0 diff --git a/ver/us/asm/data/world/area_sam/sam_11/D3D900.data.s b/ver/us/asm/data/world/area_sam/sam_11/D3D900.data.s index 6c601c0298..58496e8b16 100644 --- a/ver/us/asm/data/world/area_sam/sam_11/D3D900.data.s +++ b/ver/us/asm/data/world/area_sam/sam_11/D3D900.data.s @@ -116,7 +116,7 @@ dlabel D_80244F20_D3F4F0 dlabel D_80244F4C_D3F51C .word 0x00000000, 0x00230018, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 -dlabel D_80244F78_D3F548 +dlabel sam_11_varTable .word 0x00000000 dlabel D_80244F7C_D3F54C diff --git a/ver/us/asm/data/world/area_sbk/sbk_02/92E220.data.s b/ver/us/asm/data/world/area_sbk/sbk_02/92E220.data.s index 72c66f405d..8d721478d2 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_02/92E220.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_02/92E220.data.s @@ -20,7 +20,7 @@ dlabel D_80244054_92E304 dlabel D_80244188_92E438 .word 0x00000043, 0x00000002, func_802409A8_92AC58, 0xFE363C80, 0x0000004E, 0x00000006, D_80244054_92E304, 0x00000010, 0x00000000, dro_01_80245630, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024091C_92ABCC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 -dlabel D_802441D8_92E488 +dlabel sbk_02_varTable .word 0x00000000 dlabel D_802441DC_92E48C diff --git a/ver/us/asm/data/world/area_sbk/sbk_30/940DC0.data.s b/ver/us/asm/data/world/area_sbk/sbk_30/940DC0.data.s index 2a25850167..15ba2ed120 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_30/940DC0.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_30/940DC0.data.s @@ -38,7 +38,7 @@ dlabel D_80241F70_941520 dlabel D_80241FC8_941578 .word 0x00000000, 0x002A0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 -dlabel D_80241FF4_9415A4 +dlabel sbk_30_varTable .word 0x00000000 dlabel D_80241FF8_9415A8 diff --git a/ver/us/asm/data/world/area_sbk/sbk_34/9468B0.data.s b/ver/us/asm/data/world/area_sbk/sbk_34/9468B0.data.s index eed21c1c27..9556454871 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_34/9468B0.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_34/9468B0.data.s @@ -26,7 +26,7 @@ dlabel D_80240C50_946B20 dlabel D_80240D70_946C40 .word 0x00000000, 0x00160019, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 -dlabel D_80240D9C_946C6C +dlabel sbk_34_varTable .word 0x00000000 dlabel D_80240DA0_946C70 diff --git a/ver/us/asm/data/world/area_tik/tik_02/86D800.data.s b/ver/us/asm/data/world/area_tik/tik_02/86D800.data.s index fe1eb9ae38..253b50ebe2 100644 --- a/ver/us/asm/data/world/area_tik/tik_02/86D800.data.s +++ b/ver/us/asm/data/world/area_tik/tik_02/86D800.data.s @@ -2,7 +2,7 @@ .section .data -dlabel D_802410C0_86D800 +dlabel tik_02_varTable .word 0x00000000 dlabel D_802410C4_86D804 diff --git a/ver/us/asm/data/world/area_tik/tik_05/8765C0.data.s b/ver/us/asm/data/world/area_tik/tik_05/8765C0.data.s index 3b6af9bd57..3d542464cb 100644 --- a/ver/us/asm/data/world/area_tik/tik_05/8765C0.data.s +++ b/ver/us/asm/data/world/area_tik/tik_05/8765C0.data.s @@ -2,7 +2,7 @@ .section .data -dlabel D_80241800_8765C0 +dlabel tik_05_varTable .word 0x00000000 dlabel D_80241804_8765C4 diff --git a/ver/us/asm/data/world/area_tik/tik_12/88C810.data.s b/ver/us/asm/data/world/area_tik/tik_12/88C810.data.s index 120e3cc956..46c11288e2 100644 --- a/ver/us/asm/data/world/area_tik/tik_12/88C810.data.s +++ b/ver/us/asm/data/world/area_tik/tik_12/88C810.data.s @@ -2,7 +2,7 @@ .section .data -dlabel D_80243C40_88C810 +dlabel tik_12_varTable .word 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000002, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243CAC_88C87C diff --git a/ver/us/asm/data/world/area_tik/tik_15/8922A0.data.s b/ver/us/asm/data/world/area_tik/tik_15/8922A0.data.s index 690a5bab23..77a97c83d2 100644 --- a/ver/us/asm/data/world/area_tik/tik_15/8922A0.data.s +++ b/ver/us/asm/data/world/area_tik/tik_15/8922A0.data.s @@ -5,7 +5,7 @@ dlabel D_80242700_8922A0 .word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00170013, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 -dlabel D_80242758_8922F8 +dlabel tik_15_varTable .word 0x00000000 dlabel D_8024275C_8922FC diff --git a/ver/us/asm/data/world/area_trd/trd_00/99AFB0.data.s b/ver/us/asm/data/world/area_trd/trd_00/99AFB0.data.s index 184ef98d5f..55303abb39 100644 --- a/ver/us/asm/data/world/area_trd/trd_00/99AFB0.data.s +++ b/ver/us/asm/data/world/area_trd/trd_00/99AFB0.data.s @@ -2,7 +2,7 @@ .section .data -dlabel D_80241340_99AFB0 +dlabel trd_00_varTable .word 0x00000000 dlabel D_80241344_99AFB4 diff --git a/ver/us/asm/nonmatchings/EA0C10/func_8024267C_EA2F7C.s b/ver/us/asm/nonmatchings/EA0C10/func_8024267C_EA2F7C.s deleted file mode 100644 index 4a0c03f8da..0000000000 --- a/ver/us/asm/nonmatchings/EA0C10/func_8024267C_EA2F7C.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024267C_EA2F7C -/* EA2F7C 8024267C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* EA2F80 80242680 AFB00010 */ sw $s0, 0x10($sp) -/* EA2F84 80242684 3C108024 */ lui $s0, %hi(D_80244154_EA4A54) -/* EA2F88 80242688 26104154 */ addiu $s0, $s0, %lo(D_80244154_EA4A54) -/* EA2F8C 8024268C AFBF0018 */ sw $ra, 0x18($sp) -/* EA2F90 80242690 AFB10014 */ sw $s1, 0x14($sp) -/* EA2F94 80242694 8E020000 */ lw $v0, ($s0) -/* EA2F98 80242698 14400010 */ bnez $v0, .L802426DC -/* EA2F9C 8024269C 0080882D */ daddu $s1, $a0, $zero -/* EA2FA0 802426A0 0C00AFF5 */ jal dead_heap_malloc -/* EA2FA4 802426A4 24040040 */ addiu $a0, $zero, 0x40 -/* EA2FA8 802426A8 AE020000 */ sw $v0, ($s0) -/* EA2FAC 802426AC 0000182D */ daddu $v1, $zero, $zero -/* EA2FB0 802426B0 0040282D */ daddu $a1, $v0, $zero -/* EA2FB4 802426B4 0220202D */ daddu $a0, $s1, $zero -.L802426B8: -/* EA2FB8 802426B8 8C820084 */ lw $v0, 0x84($a0) -/* EA2FBC 802426BC 24840004 */ addiu $a0, $a0, 4 -/* EA2FC0 802426C0 24630001 */ addiu $v1, $v1, 1 -/* EA2FC4 802426C4 ACA20000 */ sw $v0, ($a1) -/* EA2FC8 802426C8 28620010 */ slti $v0, $v1, 0x10 -/* EA2FCC 802426CC 1440FFFA */ bnez $v0, .L802426B8 -/* EA2FD0 802426D0 24A50004 */ addiu $a1, $a1, 4 -/* EA2FD4 802426D4 080909C6 */ j .L80242718 -/* EA2FD8 802426D8 00000000 */ nop -.L802426DC: -/* EA2FDC 802426DC 0000182D */ daddu $v1, $zero, $zero -/* EA2FE0 802426E0 0040282D */ daddu $a1, $v0, $zero -/* EA2FE4 802426E4 0220202D */ daddu $a0, $s1, $zero -.L802426E8: -/* EA2FE8 802426E8 8CA20000 */ lw $v0, ($a1) -/* EA2FEC 802426EC 24A50004 */ addiu $a1, $a1, 4 -/* EA2FF0 802426F0 24630001 */ addiu $v1, $v1, 1 -/* EA2FF4 802426F4 AC820084 */ sw $v0, 0x84($a0) -/* EA2FF8 802426F8 28620010 */ slti $v0, $v1, 0x10 -/* EA2FFC 802426FC 1440FFFA */ bnez $v0, .L802426E8 -/* EA3000 80242700 24840004 */ addiu $a0, $a0, 4 -/* EA3004 80242704 3C108024 */ lui $s0, %hi(D_80244154_EA4A54) -/* EA3008 80242708 26104154 */ addiu $s0, $s0, %lo(D_80244154_EA4A54) -/* EA300C 8024270C 0C00B007 */ jal func_8002C01C -/* EA3010 80242710 8E040000 */ lw $a0, ($s0) -/* EA3014 80242714 AE000000 */ sw $zero, ($s0) -.L80242718: -/* EA3018 80242718 8FBF0018 */ lw $ra, 0x18($sp) -/* EA301C 8024271C 8FB10014 */ lw $s1, 0x14($sp) -/* EA3020 80242720 8FB00010 */ lw $s0, 0x10($sp) -/* EA3024 80242724 24020002 */ addiu $v0, $zero, 2 -/* EA3028 80242728 03E00008 */ jr $ra -/* EA302C 8024272C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/EA8AE0/func_80241468_EA9F48.s b/ver/us/asm/nonmatchings/EA8AE0/func_80241468_EA9F48.s deleted file mode 100644 index 6caadf98cb..0000000000 --- a/ver/us/asm/nonmatchings/EA8AE0/func_80241468_EA9F48.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241468_EA9F48 -/* EA9F48 80241468 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* EA9F4C 8024146C AFB00010 */ sw $s0, 0x10($sp) -/* EA9F50 80241470 3C108024 */ lui $s0, %hi(D_80243D74_EAC854) -/* EA9F54 80241474 26103D74 */ addiu $s0, $s0, %lo(D_80243D74_EAC854) -/* EA9F58 80241478 AFBF0018 */ sw $ra, 0x18($sp) -/* EA9F5C 8024147C AFB10014 */ sw $s1, 0x14($sp) -/* EA9F60 80241480 8E020000 */ lw $v0, ($s0) -/* EA9F64 80241484 14400010 */ bnez $v0, .L802414C8 -/* EA9F68 80241488 0080882D */ daddu $s1, $a0, $zero -/* EA9F6C 8024148C 0C00AFF5 */ jal dead_heap_malloc -/* EA9F70 80241490 24040040 */ addiu $a0, $zero, 0x40 -/* EA9F74 80241494 AE020000 */ sw $v0, ($s0) -/* EA9F78 80241498 0000182D */ daddu $v1, $zero, $zero -/* EA9F7C 8024149C 0040282D */ daddu $a1, $v0, $zero -/* EA9F80 802414A0 0220202D */ daddu $a0, $s1, $zero -.L802414A4: -/* EA9F84 802414A4 8C820084 */ lw $v0, 0x84($a0) -/* EA9F88 802414A8 24840004 */ addiu $a0, $a0, 4 -/* EA9F8C 802414AC 24630001 */ addiu $v1, $v1, 1 -/* EA9F90 802414B0 ACA20000 */ sw $v0, ($a1) -/* EA9F94 802414B4 28620010 */ slti $v0, $v1, 0x10 -/* EA9F98 802414B8 1440FFFA */ bnez $v0, .L802414A4 -/* EA9F9C 802414BC 24A50004 */ addiu $a1, $a1, 4 -/* EA9FA0 802414C0 08090541 */ j .L80241504 -/* EA9FA4 802414C4 00000000 */ nop -.L802414C8: -/* EA9FA8 802414C8 0000182D */ daddu $v1, $zero, $zero -/* EA9FAC 802414CC 0040282D */ daddu $a1, $v0, $zero -/* EA9FB0 802414D0 0220202D */ daddu $a0, $s1, $zero -.L802414D4: -/* EA9FB4 802414D4 8CA20000 */ lw $v0, ($a1) -/* EA9FB8 802414D8 24A50004 */ addiu $a1, $a1, 4 -/* EA9FBC 802414DC 24630001 */ addiu $v1, $v1, 1 -/* EA9FC0 802414E0 AC820084 */ sw $v0, 0x84($a0) -/* EA9FC4 802414E4 28620010 */ slti $v0, $v1, 0x10 -/* EA9FC8 802414E8 1440FFFA */ bnez $v0, .L802414D4 -/* EA9FCC 802414EC 24840004 */ addiu $a0, $a0, 4 -/* EA9FD0 802414F0 3C108024 */ lui $s0, %hi(D_80243D74_EAC854) -/* EA9FD4 802414F4 26103D74 */ addiu $s0, $s0, %lo(D_80243D74_EAC854) -/* EA9FD8 802414F8 0C00B007 */ jal func_8002C01C -/* EA9FDC 802414FC 8E040000 */ lw $a0, ($s0) -/* EA9FE0 80241500 AE000000 */ sw $zero, ($s0) -.L80241504: -/* EA9FE4 80241504 8FBF0018 */ lw $ra, 0x18($sp) -/* EA9FE8 80241508 8FB10014 */ lw $s1, 0x14($sp) -/* EA9FEC 8024150C 8FB00010 */ lw $s0, 0x10($sp) -/* EA9FF0 80241510 24020002 */ addiu $v0, $zero, 2 -/* EA9FF4 80241514 03E00008 */ jr $ra -/* EA9FF8 80241518 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/EB1170/func_80240310_EB1170.s b/ver/us/asm/nonmatchings/EB1170/func_80240310_EB1170.s deleted file mode 100644 index 046f1d3c88..0000000000 --- a/ver/us/asm/nonmatchings/EB1170/func_80240310_EB1170.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240310_EB1170 -/* EB1170 80240310 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* EB1174 80240314 AFB00010 */ sw $s0, 0x10($sp) -/* EB1178 80240318 3C108024 */ lui $s0, %hi(D_80241780_EB25E0) -/* EB117C 8024031C 26101780 */ addiu $s0, $s0, %lo(D_80241780_EB25E0) -/* EB1180 80240320 AFBF0018 */ sw $ra, 0x18($sp) -/* EB1184 80240324 AFB10014 */ sw $s1, 0x14($sp) -/* EB1188 80240328 8E020000 */ lw $v0, ($s0) -/* EB118C 8024032C 14400010 */ bnez $v0, .L80240370 -/* EB1190 80240330 0080882D */ daddu $s1, $a0, $zero -/* EB1194 80240334 0C00AFF5 */ jal dead_heap_malloc -/* EB1198 80240338 24040040 */ addiu $a0, $zero, 0x40 -/* EB119C 8024033C AE020000 */ sw $v0, ($s0) -/* EB11A0 80240340 0000182D */ daddu $v1, $zero, $zero -/* EB11A4 80240344 0040282D */ daddu $a1, $v0, $zero -/* EB11A8 80240348 0220202D */ daddu $a0, $s1, $zero -.L8024034C: -/* EB11AC 8024034C 8C820084 */ lw $v0, 0x84($a0) -/* EB11B0 80240350 24840004 */ addiu $a0, $a0, 4 -/* EB11B4 80240354 24630001 */ addiu $v1, $v1, 1 -/* EB11B8 80240358 ACA20000 */ sw $v0, ($a1) -/* EB11BC 8024035C 28620010 */ slti $v0, $v1, 0x10 -/* EB11C0 80240360 1440FFFA */ bnez $v0, .L8024034C -/* EB11C4 80240364 24A50004 */ addiu $a1, $a1, 4 -/* EB11C8 80240368 080900EB */ j .L802403AC -/* EB11CC 8024036C 00000000 */ nop -.L80240370: -/* EB11D0 80240370 0000182D */ daddu $v1, $zero, $zero -/* EB11D4 80240374 0040282D */ daddu $a1, $v0, $zero -/* EB11D8 80240378 0220202D */ daddu $a0, $s1, $zero -.L8024037C: -/* EB11DC 8024037C 8CA20000 */ lw $v0, ($a1) -/* EB11E0 80240380 24A50004 */ addiu $a1, $a1, 4 -/* EB11E4 80240384 24630001 */ addiu $v1, $v1, 1 -/* EB11E8 80240388 AC820084 */ sw $v0, 0x84($a0) -/* EB11EC 8024038C 28620010 */ slti $v0, $v1, 0x10 -/* EB11F0 80240390 1440FFFA */ bnez $v0, .L8024037C -/* EB11F4 80240394 24840004 */ addiu $a0, $a0, 4 -/* EB11F8 80240398 3C108024 */ lui $s0, %hi(D_80241780_EB25E0) -/* EB11FC 8024039C 26101780 */ addiu $s0, $s0, %lo(D_80241780_EB25E0) -/* EB1200 802403A0 0C00B007 */ jal func_8002C01C -/* EB1204 802403A4 8E040000 */ lw $a0, ($s0) -/* EB1208 802403A8 AE000000 */ sw $zero, ($s0) -.L802403AC: -/* EB120C 802403AC 8FBF0018 */ lw $ra, 0x18($sp) -/* EB1210 802403B0 8FB10014 */ lw $s1, 0x14($sp) -/* EB1214 802403B4 8FB00010 */ lw $s0, 0x10($sp) -/* EB1218 802403B8 24020002 */ addiu $v0, $zero, 2 -/* EB121C 802403BC 03E00008 */ jr $ra -/* EB1220 802403C0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/EC2240/func_80240040_EC2240.s b/ver/us/asm/nonmatchings/EC2240/func_80240040_EC2240.s deleted file mode 100644 index 07450882fc..0000000000 --- a/ver/us/asm/nonmatchings/EC2240/func_80240040_EC2240.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_EC2240 -/* EC2240 80240040 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* EC2244 80240044 AFB00010 */ sw $s0, 0x10($sp) -/* EC2248 80240048 3C108024 */ lui $s0, %hi(D_80240F28_EC3128) -/* EC224C 8024004C 26100F28 */ addiu $s0, $s0, %lo(D_80240F28_EC3128) -/* EC2250 80240050 AFBF0018 */ sw $ra, 0x18($sp) -/* EC2254 80240054 AFB10014 */ sw $s1, 0x14($sp) -/* EC2258 80240058 8E020000 */ lw $v0, ($s0) -/* EC225C 8024005C 14400010 */ bnez $v0, .L802400A0 -/* EC2260 80240060 0080882D */ daddu $s1, $a0, $zero -/* EC2264 80240064 0C00AFF5 */ jal dead_heap_malloc -/* EC2268 80240068 24040040 */ addiu $a0, $zero, 0x40 -/* EC226C 8024006C AE020000 */ sw $v0, ($s0) -/* EC2270 80240070 0000182D */ daddu $v1, $zero, $zero -/* EC2274 80240074 0040282D */ daddu $a1, $v0, $zero -/* EC2278 80240078 0220202D */ daddu $a0, $s1, $zero -.L8024007C: -/* EC227C 8024007C 8C820084 */ lw $v0, 0x84($a0) -/* EC2280 80240080 24840004 */ addiu $a0, $a0, 4 -/* EC2284 80240084 24630001 */ addiu $v1, $v1, 1 -/* EC2288 80240088 ACA20000 */ sw $v0, ($a1) -/* EC228C 8024008C 28620010 */ slti $v0, $v1, 0x10 -/* EC2290 80240090 1440FFFA */ bnez $v0, .L8024007C -/* EC2294 80240094 24A50004 */ addiu $a1, $a1, 4 -/* EC2298 80240098 08090037 */ j .L802400DC -/* EC229C 8024009C 00000000 */ nop -.L802400A0: -/* EC22A0 802400A0 0000182D */ daddu $v1, $zero, $zero -/* EC22A4 802400A4 0040282D */ daddu $a1, $v0, $zero -/* EC22A8 802400A8 0220202D */ daddu $a0, $s1, $zero -.L802400AC: -/* EC22AC 802400AC 8CA20000 */ lw $v0, ($a1) -/* EC22B0 802400B0 24A50004 */ addiu $a1, $a1, 4 -/* EC22B4 802400B4 24630001 */ addiu $v1, $v1, 1 -/* EC22B8 802400B8 AC820084 */ sw $v0, 0x84($a0) -/* EC22BC 802400BC 28620010 */ slti $v0, $v1, 0x10 -/* EC22C0 802400C0 1440FFFA */ bnez $v0, .L802400AC -/* EC22C4 802400C4 24840004 */ addiu $a0, $a0, 4 -/* EC22C8 802400C8 3C108024 */ lui $s0, %hi(D_80240F28_EC3128) -/* EC22CC 802400CC 26100F28 */ addiu $s0, $s0, %lo(D_80240F28_EC3128) -/* EC22D0 802400D0 0C00B007 */ jal func_8002C01C -/* EC22D4 802400D4 8E040000 */ lw $a0, ($s0) -/* EC22D8 802400D8 AE000000 */ sw $zero, ($s0) -.L802400DC: -/* EC22DC 802400DC 8FBF0018 */ lw $ra, 0x18($sp) -/* EC22E0 802400E0 8FB10014 */ lw $s1, 0x14($sp) -/* EC22E4 802400E4 8FB00010 */ lw $s0, 0x10($sp) -/* EC22E8 802400E8 24020002 */ addiu $v0, $zero, 2 -/* EC22EC 802400EC 03E00008 */ jr $ra -/* EC22F0 802400F0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/EC7590/func_8024061C_EC77CC.s b/ver/us/asm/nonmatchings/EC7590/func_8024061C_EC77CC.s deleted file mode 100644 index addb4ddb48..0000000000 --- a/ver/us/asm/nonmatchings/EC7590/func_8024061C_EC77CC.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024061C_EC77CC -/* EC77CC 8024061C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* EC77D0 80240620 AFB00010 */ sw $s0, 0x10($sp) -/* EC77D4 80240624 3C108024 */ lui $s0, %hi(D_80241BB0_EC8D60) -/* EC77D8 80240628 26101BB0 */ addiu $s0, $s0, %lo(D_80241BB0_EC8D60) -/* EC77DC 8024062C AFBF0018 */ sw $ra, 0x18($sp) -/* EC77E0 80240630 AFB10014 */ sw $s1, 0x14($sp) -/* EC77E4 80240634 8E020000 */ lw $v0, ($s0) -/* EC77E8 80240638 14400010 */ bnez $v0, .L8024067C -/* EC77EC 8024063C 0080882D */ daddu $s1, $a0, $zero -/* EC77F0 80240640 0C00AFF5 */ jal dead_heap_malloc -/* EC77F4 80240644 24040040 */ addiu $a0, $zero, 0x40 -/* EC77F8 80240648 AE020000 */ sw $v0, ($s0) -/* EC77FC 8024064C 0000182D */ daddu $v1, $zero, $zero -/* EC7800 80240650 0040282D */ daddu $a1, $v0, $zero -/* EC7804 80240654 0220202D */ daddu $a0, $s1, $zero -.L80240658: -/* EC7808 80240658 8C820084 */ lw $v0, 0x84($a0) -/* EC780C 8024065C 24840004 */ addiu $a0, $a0, 4 -/* EC7810 80240660 24630001 */ addiu $v1, $v1, 1 -/* EC7814 80240664 ACA20000 */ sw $v0, ($a1) -/* EC7818 80240668 28620010 */ slti $v0, $v1, 0x10 -/* EC781C 8024066C 1440FFFA */ bnez $v0, .L80240658 -/* EC7820 80240670 24A50004 */ addiu $a1, $a1, 4 -/* EC7824 80240674 080901AE */ j .L802406B8 -/* EC7828 80240678 00000000 */ nop -.L8024067C: -/* EC782C 8024067C 0000182D */ daddu $v1, $zero, $zero -/* EC7830 80240680 0040282D */ daddu $a1, $v0, $zero -/* EC7834 80240684 0220202D */ daddu $a0, $s1, $zero -.L80240688: -/* EC7838 80240688 8CA20000 */ lw $v0, ($a1) -/* EC783C 8024068C 24A50004 */ addiu $a1, $a1, 4 -/* EC7840 80240690 24630001 */ addiu $v1, $v1, 1 -/* EC7844 80240694 AC820084 */ sw $v0, 0x84($a0) -/* EC7848 80240698 28620010 */ slti $v0, $v1, 0x10 -/* EC784C 8024069C 1440FFFA */ bnez $v0, .L80240688 -/* EC7850 802406A0 24840004 */ addiu $a0, $a0, 4 -/* EC7854 802406A4 3C108024 */ lui $s0, %hi(D_80241BB0_EC8D60) -/* EC7858 802406A8 26101BB0 */ addiu $s0, $s0, %lo(D_80241BB0_EC8D60) -/* EC785C 802406AC 0C00B007 */ jal func_8002C01C -/* EC7860 802406B0 8E040000 */ lw $a0, ($s0) -/* EC7864 802406B4 AE000000 */ sw $zero, ($s0) -.L802406B8: -/* EC7868 802406B8 8FBF0018 */ lw $ra, 0x18($sp) -/* EC786C 802406BC 8FB10014 */ lw $s1, 0x14($sp) -/* EC7870 802406C0 8FB00010 */ lw $s0, 0x10($sp) -/* EC7874 802406C4 24020002 */ addiu $v0, $zero, 2 -/* EC7878 802406C8 03E00008 */ jr $ra -/* EC787C 802406CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/ED42A0/func_80240080_ED42A0.s b/ver/us/asm/nonmatchings/ED42A0/func_80240080_ED42A0.s deleted file mode 100644 index 283e783a8e..0000000000 --- a/ver/us/asm/nonmatchings/ED42A0/func_80240080_ED42A0.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240080_ED42A0 -/* ED42A0 80240080 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* ED42A4 80240084 AFB00010 */ sw $s0, 0x10($sp) -/* ED42A8 80240088 3C108024 */ lui $s0, %hi(D_80241DA0_ED5FC0) -/* ED42AC 8024008C 26101DA0 */ addiu $s0, $s0, %lo(D_80241DA0_ED5FC0) -/* ED42B0 80240090 AFBF0018 */ sw $ra, 0x18($sp) -/* ED42B4 80240094 AFB10014 */ sw $s1, 0x14($sp) -/* ED42B8 80240098 8E020000 */ lw $v0, ($s0) -/* ED42BC 8024009C 14400010 */ bnez $v0, .L802400E0 -/* ED42C0 802400A0 0080882D */ daddu $s1, $a0, $zero -/* ED42C4 802400A4 0C00AFF5 */ jal dead_heap_malloc -/* ED42C8 802400A8 24040040 */ addiu $a0, $zero, 0x40 -/* ED42CC 802400AC AE020000 */ sw $v0, ($s0) -/* ED42D0 802400B0 0000182D */ daddu $v1, $zero, $zero -/* ED42D4 802400B4 0040282D */ daddu $a1, $v0, $zero -/* ED42D8 802400B8 0220202D */ daddu $a0, $s1, $zero -.L802400BC: -/* ED42DC 802400BC 8C820084 */ lw $v0, 0x84($a0) -/* ED42E0 802400C0 24840004 */ addiu $a0, $a0, 4 -/* ED42E4 802400C4 24630001 */ addiu $v1, $v1, 1 -/* ED42E8 802400C8 ACA20000 */ sw $v0, ($a1) -/* ED42EC 802400CC 28620010 */ slti $v0, $v1, 0x10 -/* ED42F0 802400D0 1440FFFA */ bnez $v0, .L802400BC -/* ED42F4 802400D4 24A50004 */ addiu $a1, $a1, 4 -/* ED42F8 802400D8 08090047 */ j .L8024011C -/* ED42FC 802400DC 00000000 */ nop -.L802400E0: -/* ED4300 802400E0 0000182D */ daddu $v1, $zero, $zero -/* ED4304 802400E4 0040282D */ daddu $a1, $v0, $zero -/* ED4308 802400E8 0220202D */ daddu $a0, $s1, $zero -.L802400EC: -/* ED430C 802400EC 8CA20000 */ lw $v0, ($a1) -/* ED4310 802400F0 24A50004 */ addiu $a1, $a1, 4 -/* ED4314 802400F4 24630001 */ addiu $v1, $v1, 1 -/* ED4318 802400F8 AC820084 */ sw $v0, 0x84($a0) -/* ED431C 802400FC 28620010 */ slti $v0, $v1, 0x10 -/* ED4320 80240100 1440FFFA */ bnez $v0, .L802400EC -/* ED4324 80240104 24840004 */ addiu $a0, $a0, 4 -/* ED4328 80240108 3C108024 */ lui $s0, %hi(D_80241DA0_ED5FC0) -/* ED432C 8024010C 26101DA0 */ addiu $s0, $s0, %lo(D_80241DA0_ED5FC0) -/* ED4330 80240110 0C00B007 */ jal func_8002C01C -/* ED4334 80240114 8E040000 */ lw $a0, ($s0) -/* ED4338 80240118 AE000000 */ sw $zero, ($s0) -.L8024011C: -/* ED433C 8024011C 8FBF0018 */ lw $ra, 0x18($sp) -/* ED4340 80240120 8FB10014 */ lw $s1, 0x14($sp) -/* ED4344 80240124 8FB00010 */ lw $s0, 0x10($sp) -/* ED4348 80240128 24020002 */ addiu $v0, $zero, 2 -/* ED434C 8024012C 03E00008 */ jr $ra -/* ED4350 80240130 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/EDC020/func_8024027C_EDC25C.s b/ver/us/asm/nonmatchings/EDC020/func_8024027C_EDC25C.s deleted file mode 100644 index 44e00c762d..0000000000 --- a/ver/us/asm/nonmatchings/EDC020/func_8024027C_EDC25C.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024027C_EDC25C -/* EDC25C 8024027C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* EDC260 80240280 AFB00010 */ sw $s0, 0x10($sp) -/* EDC264 80240284 3C108024 */ lui $s0, %hi(D_802417EC_EDD7CC) -/* EDC268 80240288 261017EC */ addiu $s0, $s0, %lo(D_802417EC_EDD7CC) -/* EDC26C 8024028C AFBF0018 */ sw $ra, 0x18($sp) -/* EDC270 80240290 AFB10014 */ sw $s1, 0x14($sp) -/* EDC274 80240294 8E020000 */ lw $v0, ($s0) -/* EDC278 80240298 14400010 */ bnez $v0, .L802402DC -/* EDC27C 8024029C 0080882D */ daddu $s1, $a0, $zero -/* EDC280 802402A0 0C00AFF5 */ jal dead_heap_malloc -/* EDC284 802402A4 24040040 */ addiu $a0, $zero, 0x40 -/* EDC288 802402A8 AE020000 */ sw $v0, ($s0) -/* EDC28C 802402AC 0000182D */ daddu $v1, $zero, $zero -/* EDC290 802402B0 0040282D */ daddu $a1, $v0, $zero -/* EDC294 802402B4 0220202D */ daddu $a0, $s1, $zero -.L802402B8: -/* EDC298 802402B8 8C820084 */ lw $v0, 0x84($a0) -/* EDC29C 802402BC 24840004 */ addiu $a0, $a0, 4 -/* EDC2A0 802402C0 24630001 */ addiu $v1, $v1, 1 -/* EDC2A4 802402C4 ACA20000 */ sw $v0, ($a1) -/* EDC2A8 802402C8 28620010 */ slti $v0, $v1, 0x10 -/* EDC2AC 802402CC 1440FFFA */ bnez $v0, .L802402B8 -/* EDC2B0 802402D0 24A50004 */ addiu $a1, $a1, 4 -/* EDC2B4 802402D4 080900C6 */ j .L80240318 -/* EDC2B8 802402D8 00000000 */ nop -.L802402DC: -/* EDC2BC 802402DC 0000182D */ daddu $v1, $zero, $zero -/* EDC2C0 802402E0 0040282D */ daddu $a1, $v0, $zero -/* EDC2C4 802402E4 0220202D */ daddu $a0, $s1, $zero -.L802402E8: -/* EDC2C8 802402E8 8CA20000 */ lw $v0, ($a1) -/* EDC2CC 802402EC 24A50004 */ addiu $a1, $a1, 4 -/* EDC2D0 802402F0 24630001 */ addiu $v1, $v1, 1 -/* EDC2D4 802402F4 AC820084 */ sw $v0, 0x84($a0) -/* EDC2D8 802402F8 28620010 */ slti $v0, $v1, 0x10 -/* EDC2DC 802402FC 1440FFFA */ bnez $v0, .L802402E8 -/* EDC2E0 80240300 24840004 */ addiu $a0, $a0, 4 -/* EDC2E4 80240304 3C108024 */ lui $s0, %hi(D_802417EC_EDD7CC) -/* EDC2E8 80240308 261017EC */ addiu $s0, $s0, %lo(D_802417EC_EDD7CC) -/* EDC2EC 8024030C 0C00B007 */ jal func_8002C01C -/* EDC2F0 80240310 8E040000 */ lw $a0, ($s0) -/* EDC2F4 80240314 AE000000 */ sw $zero, ($s0) -.L80240318: -/* EDC2F8 80240318 8FBF0018 */ lw $ra, 0x18($sp) -/* EDC2FC 8024031C 8FB10014 */ lw $s1, 0x14($sp) -/* EDC300 80240320 8FB00010 */ lw $s0, 0x10($sp) -/* EDC304 80240324 24020002 */ addiu $v0, $zero, 2 -/* EDC308 80240328 03E00008 */ jr $ra -/* EDC30C 8024032C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_802407F0_A0C4E0.s b/ver/us/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_802407F0_A0C4E0.s deleted file mode 100644 index f1d0b48fec..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_802407F0_A0C4E0.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407F0_A0C4E0 -/* A0C4E0 802407F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A0C4E4 802407F4 AFB00010 */ sw $s0, 0x10($sp) -/* A0C4E8 802407F8 3C108024 */ lui $s0, %hi(D_80242970_A0E660) -/* A0C4EC 802407FC 26102970 */ addiu $s0, $s0, %lo(D_80242970_A0E660) -/* A0C4F0 80240800 AFBF0018 */ sw $ra, 0x18($sp) -/* A0C4F4 80240804 AFB10014 */ sw $s1, 0x14($sp) -/* A0C4F8 80240808 8E020000 */ lw $v0, ($s0) -/* A0C4FC 8024080C 14400010 */ bnez $v0, .L80240850 -/* A0C500 80240810 0080882D */ daddu $s1, $a0, $zero -/* A0C504 80240814 0C00AB39 */ jal heap_malloc -/* A0C508 80240818 24040040 */ addiu $a0, $zero, 0x40 -/* A0C50C 8024081C AE020000 */ sw $v0, ($s0) -/* A0C510 80240820 0000182D */ daddu $v1, $zero, $zero -/* A0C514 80240824 0040282D */ daddu $a1, $v0, $zero -/* A0C518 80240828 0220202D */ daddu $a0, $s1, $zero -.L8024082C: -/* A0C51C 8024082C 8C820084 */ lw $v0, 0x84($a0) -/* A0C520 80240830 24840004 */ addiu $a0, $a0, 4 -/* A0C524 80240834 24630001 */ addiu $v1, $v1, 1 -/* A0C528 80240838 ACA20000 */ sw $v0, ($a1) -/* A0C52C 8024083C 28620010 */ slti $v0, $v1, 0x10 -/* A0C530 80240840 1440FFFA */ bnez $v0, .L8024082C -/* A0C534 80240844 24A50004 */ addiu $a1, $a1, 4 -/* A0C538 80240848 08090223 */ j .L8024088C -/* A0C53C 8024084C 00000000 */ nop -.L80240850: -/* A0C540 80240850 0000182D */ daddu $v1, $zero, $zero -/* A0C544 80240854 0040282D */ daddu $a1, $v0, $zero -/* A0C548 80240858 0220202D */ daddu $a0, $s1, $zero -.L8024085C: -/* A0C54C 8024085C 8CA20000 */ lw $v0, ($a1) -/* A0C550 80240860 24A50004 */ addiu $a1, $a1, 4 -/* A0C554 80240864 24630001 */ addiu $v1, $v1, 1 -/* A0C558 80240868 AC820084 */ sw $v0, 0x84($a0) -/* A0C55C 8024086C 28620010 */ slti $v0, $v1, 0x10 -/* A0C560 80240870 1440FFFA */ bnez $v0, .L8024085C -/* A0C564 80240874 24840004 */ addiu $a0, $a0, 4 -/* A0C568 80240878 3C108024 */ lui $s0, %hi(D_80242970_A0E660) -/* A0C56C 8024087C 26102970 */ addiu $s0, $s0, %lo(D_80242970_A0E660) -/* A0C570 80240880 0C00AB4B */ jal heap_free -/* A0C574 80240884 8E040000 */ lw $a0, ($s0) -/* A0C578 80240888 AE000000 */ sw $zero, ($s0) -.L8024088C: -/* A0C57C 8024088C 8FBF0018 */ lw $ra, 0x18($sp) -/* A0C580 80240890 8FB10014 */ lw $s1, 0x14($sp) -/* A0C584 80240894 8FB00010 */ lw $s0, 0x10($sp) -/* A0C588 80240898 24020002 */ addiu $v0, $zero, 2 -/* A0C58C 8024089C 03E00008 */ jr $ra -/* A0C590 802408A0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802424A4_A1D5A4.s b/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802424A4_A1D5A4.s deleted file mode 100644 index ec9ac63107..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802424A4_A1D5A4.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802424A4_A1D5A4 -/* A1D5A4 802424A4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A1D5A8 802424A8 AFB00010 */ sw $s0, 0x10($sp) -/* A1D5AC 802424AC 3C108025 */ lui $s0, %hi(D_8024801C_A2311C) -/* A1D5B0 802424B0 2610801C */ addiu $s0, $s0, %lo(D_8024801C_A2311C) -/* A1D5B4 802424B4 AFBF0018 */ sw $ra, 0x18($sp) -/* A1D5B8 802424B8 AFB10014 */ sw $s1, 0x14($sp) -/* A1D5BC 802424BC 8E020000 */ lw $v0, ($s0) -/* A1D5C0 802424C0 14400010 */ bnez $v0, .L80242504 -/* A1D5C4 802424C4 0080882D */ daddu $s1, $a0, $zero -/* A1D5C8 802424C8 0C00AB39 */ jal heap_malloc -/* A1D5CC 802424CC 24040040 */ addiu $a0, $zero, 0x40 -/* A1D5D0 802424D0 AE020000 */ sw $v0, ($s0) -/* A1D5D4 802424D4 0000182D */ daddu $v1, $zero, $zero -/* A1D5D8 802424D8 0040282D */ daddu $a1, $v0, $zero -/* A1D5DC 802424DC 0220202D */ daddu $a0, $s1, $zero -.L802424E0: -/* A1D5E0 802424E0 8C820084 */ lw $v0, 0x84($a0) -/* A1D5E4 802424E4 24840004 */ addiu $a0, $a0, 4 -/* A1D5E8 802424E8 24630001 */ addiu $v1, $v1, 1 -/* A1D5EC 802424EC ACA20000 */ sw $v0, ($a1) -/* A1D5F0 802424F0 28620010 */ slti $v0, $v1, 0x10 -/* A1D5F4 802424F4 1440FFFA */ bnez $v0, .L802424E0 -/* A1D5F8 802424F8 24A50004 */ addiu $a1, $a1, 4 -/* A1D5FC 802424FC 08090950 */ j .L80242540 -/* A1D600 80242500 00000000 */ nop -.L80242504: -/* A1D604 80242504 0000182D */ daddu $v1, $zero, $zero -/* A1D608 80242508 0040282D */ daddu $a1, $v0, $zero -/* A1D60C 8024250C 0220202D */ daddu $a0, $s1, $zero -.L80242510: -/* A1D610 80242510 8CA20000 */ lw $v0, ($a1) -/* A1D614 80242514 24A50004 */ addiu $a1, $a1, 4 -/* A1D618 80242518 24630001 */ addiu $v1, $v1, 1 -/* A1D61C 8024251C AC820084 */ sw $v0, 0x84($a0) -/* A1D620 80242520 28620010 */ slti $v0, $v1, 0x10 -/* A1D624 80242524 1440FFFA */ bnez $v0, .L80242510 -/* A1D628 80242528 24840004 */ addiu $a0, $a0, 4 -/* A1D62C 8024252C 3C108025 */ lui $s0, %hi(D_8024801C_A2311C) -/* A1D630 80242530 2610801C */ addiu $s0, $s0, %lo(D_8024801C_A2311C) -/* A1D634 80242534 0C00AB4B */ jal heap_free -/* A1D638 80242538 8E040000 */ lw $a0, ($s0) -/* A1D63C 8024253C AE000000 */ sw $zero, ($s0) -.L80242540: -/* A1D640 80242540 8FBF0018 */ lw $ra, 0x18($sp) -/* A1D644 80242544 8FB10014 */ lw $s1, 0x14($sp) -/* A1D648 80242548 8FB00010 */ lw $s0, 0x10($sp) -/* A1D64C 8024254C 24020002 */ addiu $v0, $zero, 2 -/* A1D650 80242550 03E00008 */ jr $ra -/* A1D654 80242554 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240310_A397F0.s b/ver/us/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240310_A397F0.s deleted file mode 100644 index 0eafb38699..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240310_A397F0.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240310_A397F0 -/* A397F0 80240310 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A397F4 80240314 AFB00010 */ sw $s0, 0x10($sp) -/* A397F8 80240318 3C108024 */ lui $s0, %hi(D_80242C08_A3C0E8) -/* A397FC 8024031C 26102C08 */ addiu $s0, $s0, %lo(D_80242C08_A3C0E8) -/* A39800 80240320 AFBF0018 */ sw $ra, 0x18($sp) -/* A39804 80240324 AFB10014 */ sw $s1, 0x14($sp) -/* A39808 80240328 8E020000 */ lw $v0, ($s0) -/* A3980C 8024032C 14400010 */ bnez $v0, .L80240370 -/* A39810 80240330 0080882D */ daddu $s1, $a0, $zero -/* A39814 80240334 0C00AB39 */ jal heap_malloc -/* A39818 80240338 24040040 */ addiu $a0, $zero, 0x40 -/* A3981C 8024033C AE020000 */ sw $v0, ($s0) -/* A39820 80240340 0000182D */ daddu $v1, $zero, $zero -/* A39824 80240344 0040282D */ daddu $a1, $v0, $zero -/* A39828 80240348 0220202D */ daddu $a0, $s1, $zero -.L8024034C: -/* A3982C 8024034C 8C820084 */ lw $v0, 0x84($a0) -/* A39830 80240350 24840004 */ addiu $a0, $a0, 4 -/* A39834 80240354 24630001 */ addiu $v1, $v1, 1 -/* A39838 80240358 ACA20000 */ sw $v0, ($a1) -/* A3983C 8024035C 28620010 */ slti $v0, $v1, 0x10 -/* A39840 80240360 1440FFFA */ bnez $v0, .L8024034C -/* A39844 80240364 24A50004 */ addiu $a1, $a1, 4 -/* A39848 80240368 080900EB */ j .L802403AC -/* A3984C 8024036C 00000000 */ nop -.L80240370: -/* A39850 80240370 0000182D */ daddu $v1, $zero, $zero -/* A39854 80240374 0040282D */ daddu $a1, $v0, $zero -/* A39858 80240378 0220202D */ daddu $a0, $s1, $zero -.L8024037C: -/* A3985C 8024037C 8CA20000 */ lw $v0, ($a1) -/* A39860 80240380 24A50004 */ addiu $a1, $a1, 4 -/* A39864 80240384 24630001 */ addiu $v1, $v1, 1 -/* A39868 80240388 AC820084 */ sw $v0, 0x84($a0) -/* A3986C 8024038C 28620010 */ slti $v0, $v1, 0x10 -/* A39870 80240390 1440FFFA */ bnez $v0, .L8024037C -/* A39874 80240394 24840004 */ addiu $a0, $a0, 4 -/* A39878 80240398 3C108024 */ lui $s0, %hi(D_80242C08_A3C0E8) -/* A3987C 8024039C 26102C08 */ addiu $s0, $s0, %lo(D_80242C08_A3C0E8) -/* A39880 802403A0 0C00AB4B */ jal heap_free -/* A39884 802403A4 8E040000 */ lw $a0, ($s0) -/* A39888 802403A8 AE000000 */ sw $zero, ($s0) -.L802403AC: -/* A3988C 802403AC 8FBF0018 */ lw $ra, 0x18($sp) -/* A39890 802403B0 8FB10014 */ lw $s1, 0x14($sp) -/* A39894 802403B4 8FB00010 */ lw $s0, 0x10($sp) -/* A39898 802403B8 24020002 */ addiu $v0, $zero, 2 -/* A3989C 802403BC 03E00008 */ jr $ra -/* A398A0 802403C0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802410A4_A3A584.s b/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802410A4_A3A584.s deleted file mode 100644 index 5120fb8ebb..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802410A4_A3A584.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802410A4_A3A584 -/* A3A584 802410A4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A3A588 802410A8 AFB00010 */ sw $s0, 0x10($sp) -/* A3A58C 802410AC 3C108024 */ lui $s0, %hi(D_8024476C_A3DC4C) -/* A3A590 802410B0 2610476C */ addiu $s0, $s0, %lo(D_8024476C_A3DC4C) -/* A3A594 802410B4 AFBF0018 */ sw $ra, 0x18($sp) -/* A3A598 802410B8 AFB10014 */ sw $s1, 0x14($sp) -/* A3A59C 802410BC 8E020000 */ lw $v0, ($s0) -/* A3A5A0 802410C0 14400010 */ bnez $v0, .L80241104 -/* A3A5A4 802410C4 0080882D */ daddu $s1, $a0, $zero -/* A3A5A8 802410C8 0C00AB39 */ jal heap_malloc -/* A3A5AC 802410CC 24040040 */ addiu $a0, $zero, 0x40 -/* A3A5B0 802410D0 AE020000 */ sw $v0, ($s0) -/* A3A5B4 802410D4 0000182D */ daddu $v1, $zero, $zero -/* A3A5B8 802410D8 0040282D */ daddu $a1, $v0, $zero -/* A3A5BC 802410DC 0220202D */ daddu $a0, $s1, $zero -.L802410E0: -/* A3A5C0 802410E0 8C820084 */ lw $v0, 0x84($a0) -/* A3A5C4 802410E4 24840004 */ addiu $a0, $a0, 4 -/* A3A5C8 802410E8 24630001 */ addiu $v1, $v1, 1 -/* A3A5CC 802410EC ACA20000 */ sw $v0, ($a1) -/* A3A5D0 802410F0 28620010 */ slti $v0, $v1, 0x10 -/* A3A5D4 802410F4 1440FFFA */ bnez $v0, .L802410E0 -/* A3A5D8 802410F8 24A50004 */ addiu $a1, $a1, 4 -/* A3A5DC 802410FC 08090450 */ j .L80241140 -/* A3A5E0 80241100 00000000 */ nop -.L80241104: -/* A3A5E4 80241104 0000182D */ daddu $v1, $zero, $zero -/* A3A5E8 80241108 0040282D */ daddu $a1, $v0, $zero -/* A3A5EC 8024110C 0220202D */ daddu $a0, $s1, $zero -.L80241110: -/* A3A5F0 80241110 8CA20000 */ lw $v0, ($a1) -/* A3A5F4 80241114 24A50004 */ addiu $a1, $a1, 4 -/* A3A5F8 80241118 24630001 */ addiu $v1, $v1, 1 -/* A3A5FC 8024111C AC820084 */ sw $v0, 0x84($a0) -/* A3A600 80241120 28620010 */ slti $v0, $v1, 0x10 -/* A3A604 80241124 1440FFFA */ bnez $v0, .L80241110 -/* A3A608 80241128 24840004 */ addiu $a0, $a0, 4 -/* A3A60C 8024112C 3C108024 */ lui $s0, %hi(D_8024476C_A3DC4C) -/* A3A610 80241130 2610476C */ addiu $s0, $s0, %lo(D_8024476C_A3DC4C) -/* A3A614 80241134 0C00AB4B */ jal heap_free -/* A3A618 80241138 8E040000 */ lw $a0, ($s0) -/* A3A61C 8024113C AE000000 */ sw $zero, ($s0) -.L80241140: -/* A3A620 80241140 8FBF0018 */ lw $ra, 0x18($sp) -/* A3A624 80241144 8FB10014 */ lw $s1, 0x14($sp) -/* A3A628 80241148 8FB00010 */ lw $s0, 0x10($sp) -/* A3A62C 8024114C 24020002 */ addiu $v0, $zero, 2 -/* A3A630 80241150 03E00008 */ jr $ra -/* A3A634 80241154 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_80241FD0_A3B4B0.s b/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_80241FD0_A3B4B0.s deleted file mode 100644 index f87fbef035..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_80241FD0_A3B4B0.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241FD0_A3B4B0 -/* A3B4B0 80241FD0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A3B4B4 80241FD4 AFB00010 */ sw $s0, 0x10($sp) -/* A3B4B8 80241FD8 3C108024 */ lui $s0, %hi(D_80245E80_A3F360) -/* A3B4BC 80241FDC 26105E80 */ addiu $s0, $s0, %lo(D_80245E80_A3F360) -/* A3B4C0 80241FE0 AFBF0018 */ sw $ra, 0x18($sp) -/* A3B4C4 80241FE4 AFB10014 */ sw $s1, 0x14($sp) -/* A3B4C8 80241FE8 8E020000 */ lw $v0, ($s0) -/* A3B4CC 80241FEC 14400010 */ bnez $v0, .L80242030 -/* A3B4D0 80241FF0 0080882D */ daddu $s1, $a0, $zero -/* A3B4D4 80241FF4 0C00AB39 */ jal heap_malloc -/* A3B4D8 80241FF8 24040040 */ addiu $a0, $zero, 0x40 -/* A3B4DC 80241FFC AE020000 */ sw $v0, ($s0) -/* A3B4E0 80242000 0000182D */ daddu $v1, $zero, $zero -/* A3B4E4 80242004 0040282D */ daddu $a1, $v0, $zero -/* A3B4E8 80242008 0220202D */ daddu $a0, $s1, $zero -.L8024200C: -/* A3B4EC 8024200C 8C820084 */ lw $v0, 0x84($a0) -/* A3B4F0 80242010 24840004 */ addiu $a0, $a0, 4 -/* A3B4F4 80242014 24630001 */ addiu $v1, $v1, 1 -/* A3B4F8 80242018 ACA20000 */ sw $v0, ($a1) -/* A3B4FC 8024201C 28620010 */ slti $v0, $v1, 0x10 -/* A3B500 80242020 1440FFFA */ bnez $v0, .L8024200C -/* A3B504 80242024 24A50004 */ addiu $a1, $a1, 4 -/* A3B508 80242028 0809081B */ j .L8024206C -/* A3B50C 8024202C 00000000 */ nop -.L80242030: -/* A3B510 80242030 0000182D */ daddu $v1, $zero, $zero -/* A3B514 80242034 0040282D */ daddu $a1, $v0, $zero -/* A3B518 80242038 0220202D */ daddu $a0, $s1, $zero -.L8024203C: -/* A3B51C 8024203C 8CA20000 */ lw $v0, ($a1) -/* A3B520 80242040 24A50004 */ addiu $a1, $a1, 4 -/* A3B524 80242044 24630001 */ addiu $v1, $v1, 1 -/* A3B528 80242048 AC820084 */ sw $v0, 0x84($a0) -/* A3B52C 8024204C 28620010 */ slti $v0, $v1, 0x10 -/* A3B530 80242050 1440FFFA */ bnez $v0, .L8024203C -/* A3B534 80242054 24840004 */ addiu $a0, $a0, 4 -/* A3B538 80242058 3C108024 */ lui $s0, %hi(D_80245E80_A3F360) -/* A3B53C 8024205C 26105E80 */ addiu $s0, $s0, %lo(D_80245E80_A3F360) -/* A3B540 80242060 0C00AB4B */ jal heap_free -/* A3B544 80242064 8E040000 */ lw $a0, ($s0) -/* A3B548 80242068 AE000000 */ sw $zero, ($s0) -.L8024206C: -/* A3B54C 8024206C 8FBF0018 */ lw $ra, 0x18($sp) -/* A3B550 80242070 8FB10014 */ lw $s1, 0x14($sp) -/* A3B554 80242074 8FB00010 */ lw $s0, 0x10($sp) -/* A3B558 80242078 24020002 */ addiu $v0, $zero, 2 -/* A3B55C 8024207C 03E00008 */ jr $ra -/* A3B560 80242080 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_09/9864E0/func_80240000_9864E0.s b/ver/us/asm/nonmatchings/world/area_isk/isk_09/9864E0/func_80240000_9864E0.s deleted file mode 100644 index f495a40b08..0000000000 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_09/9864E0/func_80240000_9864E0.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_9864E0 -/* 9864E0 80240000 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9864E4 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* 9864E8 80240008 3C108024 */ lui $s0, %hi(D_802406F0_986BD0) -/* 9864EC 8024000C 261006F0 */ addiu $s0, $s0, %lo(D_802406F0_986BD0) -/* 9864F0 80240010 AFBF0018 */ sw $ra, 0x18($sp) -/* 9864F4 80240014 AFB10014 */ sw $s1, 0x14($sp) -/* 9864F8 80240018 8E020000 */ lw $v0, ($s0) -/* 9864FC 8024001C 14400010 */ bnez $v0, .L80240060 -/* 986500 80240020 0080882D */ daddu $s1, $a0, $zero -/* 986504 80240024 0C00AB39 */ jal heap_malloc -/* 986508 80240028 24040040 */ addiu $a0, $zero, 0x40 -/* 98650C 8024002C AE020000 */ sw $v0, ($s0) -/* 986510 80240030 0000182D */ daddu $v1, $zero, $zero -/* 986514 80240034 0040282D */ daddu $a1, $v0, $zero -/* 986518 80240038 0220202D */ daddu $a0, $s1, $zero -.L8024003C: -/* 98651C 8024003C 8C820084 */ lw $v0, 0x84($a0) -/* 986520 80240040 24840004 */ addiu $a0, $a0, 4 -/* 986524 80240044 24630001 */ addiu $v1, $v1, 1 -/* 986528 80240048 ACA20000 */ sw $v0, ($a1) -/* 98652C 8024004C 28620010 */ slti $v0, $v1, 0x10 -/* 986530 80240050 1440FFFA */ bnez $v0, .L8024003C -/* 986534 80240054 24A50004 */ addiu $a1, $a1, 4 -/* 986538 80240058 08090027 */ j .L8024009C -/* 98653C 8024005C 00000000 */ nop -.L80240060: -/* 986540 80240060 0000182D */ daddu $v1, $zero, $zero -/* 986544 80240064 0040282D */ daddu $a1, $v0, $zero -/* 986548 80240068 0220202D */ daddu $a0, $s1, $zero -.L8024006C: -/* 98654C 8024006C 8CA20000 */ lw $v0, ($a1) -/* 986550 80240070 24A50004 */ addiu $a1, $a1, 4 -/* 986554 80240074 24630001 */ addiu $v1, $v1, 1 -/* 986558 80240078 AC820084 */ sw $v0, 0x84($a0) -/* 98655C 8024007C 28620010 */ slti $v0, $v1, 0x10 -/* 986560 80240080 1440FFFA */ bnez $v0, .L8024006C -/* 986564 80240084 24840004 */ addiu $a0, $a0, 4 -/* 986568 80240088 3C108024 */ lui $s0, %hi(D_802406F0_986BD0) -/* 98656C 8024008C 261006F0 */ addiu $s0, $s0, %lo(D_802406F0_986BD0) -/* 986570 80240090 0C00AB4B */ jal heap_free -/* 986574 80240094 8E040000 */ lw $a0, ($s0) -/* 986578 80240098 AE000000 */ sw $zero, ($s0) -.L8024009C: -/* 98657C 8024009C 8FBF0018 */ lw $ra, 0x18($sp) -/* 986580 802400A0 8FB10014 */ lw $s1, 0x14($sp) -/* 986584 802400A4 8FB00010 */ lw $s0, 0x10($sp) -/* 986588 802400A8 24020002 */ addiu $v0, $zero, 2 -/* 98658C 802400AC 03E00008 */ jr $ra -/* 986590 802400B0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_00/90CC40/func_80240000_90CC40.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_00/90CC40/func_80240000_90CC40.s deleted file mode 100644 index 847e246a6e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_00/90CC40/func_80240000_90CC40.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_90CC40 -/* 90CC40 80240000 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 90CC44 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* 90CC48 80240008 3C108024 */ lui $s0, %hi(D_80240FF8_90DC38) -/* 90CC4C 8024000C 26100FF8 */ addiu $s0, $s0, %lo(D_80240FF8_90DC38) -/* 90CC50 80240010 AFBF0018 */ sw $ra, 0x18($sp) -/* 90CC54 80240014 AFB10014 */ sw $s1, 0x14($sp) -/* 90CC58 80240018 8E020000 */ lw $v0, ($s0) -/* 90CC5C 8024001C 14400010 */ bnez $v0, .L80240060 -/* 90CC60 80240020 0080882D */ daddu $s1, $a0, $zero -/* 90CC64 80240024 0C00AB39 */ jal heap_malloc -/* 90CC68 80240028 24040040 */ addiu $a0, $zero, 0x40 -/* 90CC6C 8024002C AE020000 */ sw $v0, ($s0) -/* 90CC70 80240030 0000182D */ daddu $v1, $zero, $zero -/* 90CC74 80240034 0040282D */ daddu $a1, $v0, $zero -/* 90CC78 80240038 0220202D */ daddu $a0, $s1, $zero -.L8024003C: -/* 90CC7C 8024003C 8C820084 */ lw $v0, 0x84($a0) -/* 90CC80 80240040 24840004 */ addiu $a0, $a0, 4 -/* 90CC84 80240044 24630001 */ addiu $v1, $v1, 1 -/* 90CC88 80240048 ACA20000 */ sw $v0, ($a1) -/* 90CC8C 8024004C 28620010 */ slti $v0, $v1, 0x10 -/* 90CC90 80240050 1440FFFA */ bnez $v0, .L8024003C -/* 90CC94 80240054 24A50004 */ addiu $a1, $a1, 4 -/* 90CC98 80240058 08090027 */ j .L8024009C -/* 90CC9C 8024005C 00000000 */ nop -.L80240060: -/* 90CCA0 80240060 0000182D */ daddu $v1, $zero, $zero -/* 90CCA4 80240064 0040282D */ daddu $a1, $v0, $zero -/* 90CCA8 80240068 0220202D */ daddu $a0, $s1, $zero -.L8024006C: -/* 90CCAC 8024006C 8CA20000 */ lw $v0, ($a1) -/* 90CCB0 80240070 24A50004 */ addiu $a1, $a1, 4 -/* 90CCB4 80240074 24630001 */ addiu $v1, $v1, 1 -/* 90CCB8 80240078 AC820084 */ sw $v0, 0x84($a0) -/* 90CCBC 8024007C 28620010 */ slti $v0, $v1, 0x10 -/* 90CCC0 80240080 1440FFFA */ bnez $v0, .L8024006C -/* 90CCC4 80240084 24840004 */ addiu $a0, $a0, 4 -/* 90CCC8 80240088 3C108024 */ lui $s0, %hi(D_80240FF8_90DC38) -/* 90CCCC 8024008C 26100FF8 */ addiu $s0, $s0, %lo(D_80240FF8_90DC38) -/* 90CCD0 80240090 0C00AB4B */ jal heap_free -/* 90CCD4 80240094 8E040000 */ lw $a0, ($s0) -/* 90CCD8 80240098 AE000000 */ sw $zero, ($s0) -.L8024009C: -/* 90CCDC 8024009C 8FBF0018 */ lw $ra, 0x18($sp) -/* 90CCE0 802400A0 8FB10014 */ lw $s1, 0x14($sp) -/* 90CCE4 802400A4 8FB00010 */ lw $s0, 0x10($sp) -/* 90CCE8 802400A8 24020002 */ addiu $v0, $zero, 2 -/* 90CCEC 802400AC 03E00008 */ jr $ra -/* 90CCF0 802400B0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240FE0_916D50.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240FE0_916D50.s deleted file mode 100644 index 27762067da..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240FE0_916D50.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FE0_916D50 -/* 916D50 80240FE0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 916D54 80240FE4 AFB00010 */ sw $s0, 0x10($sp) -/* 916D58 80240FE8 3C108024 */ lui $s0, %hi(D_80241DA8_917B18) -/* 916D5C 80240FEC 26101DA8 */ addiu $s0, $s0, %lo(D_80241DA8_917B18) -/* 916D60 80240FF0 AFBF0018 */ sw $ra, 0x18($sp) -/* 916D64 80240FF4 AFB10014 */ sw $s1, 0x14($sp) -/* 916D68 80240FF8 8E020000 */ lw $v0, ($s0) -/* 916D6C 80240FFC 14400010 */ bnez $v0, .L80241040 -/* 916D70 80241000 0080882D */ daddu $s1, $a0, $zero -/* 916D74 80241004 0C00AB39 */ jal heap_malloc -/* 916D78 80241008 24040040 */ addiu $a0, $zero, 0x40 -/* 916D7C 8024100C AE020000 */ sw $v0, ($s0) -/* 916D80 80241010 0000182D */ daddu $v1, $zero, $zero -/* 916D84 80241014 0040282D */ daddu $a1, $v0, $zero -/* 916D88 80241018 0220202D */ daddu $a0, $s1, $zero -.L8024101C: -/* 916D8C 8024101C 8C820084 */ lw $v0, 0x84($a0) -/* 916D90 80241020 24840004 */ addiu $a0, $a0, 4 -/* 916D94 80241024 24630001 */ addiu $v1, $v1, 1 -/* 916D98 80241028 ACA20000 */ sw $v0, ($a1) -/* 916D9C 8024102C 28620010 */ slti $v0, $v1, 0x10 -/* 916DA0 80241030 1440FFFA */ bnez $v0, .L8024101C -/* 916DA4 80241034 24A50004 */ addiu $a1, $a1, 4 -/* 916DA8 80241038 0809041F */ j .L8024107C -/* 916DAC 8024103C 00000000 */ nop -.L80241040: -/* 916DB0 80241040 0000182D */ daddu $v1, $zero, $zero -/* 916DB4 80241044 0040282D */ daddu $a1, $v0, $zero -/* 916DB8 80241048 0220202D */ daddu $a0, $s1, $zero -.L8024104C: -/* 916DBC 8024104C 8CA20000 */ lw $v0, ($a1) -/* 916DC0 80241050 24A50004 */ addiu $a1, $a1, 4 -/* 916DC4 80241054 24630001 */ addiu $v1, $v1, 1 -/* 916DC8 80241058 AC820084 */ sw $v0, 0x84($a0) -/* 916DCC 8024105C 28620010 */ slti $v0, $v1, 0x10 -/* 916DD0 80241060 1440FFFA */ bnez $v0, .L8024104C -/* 916DD4 80241064 24840004 */ addiu $a0, $a0, 4 -/* 916DD8 80241068 3C108024 */ lui $s0, %hi(D_80241DA8_917B18) -/* 916DDC 8024106C 26101DA8 */ addiu $s0, $s0, %lo(D_80241DA8_917B18) -/* 916DE0 80241070 0C00AB4B */ jal heap_free -/* 916DE4 80241074 8E040000 */ lw $a0, ($s0) -/* 916DE8 80241078 AE000000 */ sw $zero, ($s0) -.L8024107C: -/* 916DEC 8024107C 8FBF0018 */ lw $ra, 0x18($sp) -/* 916DF0 80241080 8FB10014 */ lw $s1, 0x14($sp) -/* 916DF4 80241084 8FB00010 */ lw $s0, 0x10($sp) -/* 916DF8 80241088 24020002 */ addiu $v0, $zero, 2 -/* 916DFC 8024108C 03E00008 */ jr $ra -/* 916E00 80241090 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_80240000_918BB0.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_80240000_918BB0.s deleted file mode 100644 index 3705d74844..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_80240000_918BB0.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_918BB0 -/* 918BB0 80240000 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 918BB4 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* 918BB8 80240008 3C108024 */ lui $s0, %hi(D_80241530_91A0E0) -/* 918BBC 8024000C 26101530 */ addiu $s0, $s0, %lo(D_80241530_91A0E0) -/* 918BC0 80240010 AFBF0018 */ sw $ra, 0x18($sp) -/* 918BC4 80240014 AFB10014 */ sw $s1, 0x14($sp) -/* 918BC8 80240018 8E020000 */ lw $v0, ($s0) -/* 918BCC 8024001C 14400010 */ bnez $v0, .L80240060 -/* 918BD0 80240020 0080882D */ daddu $s1, $a0, $zero -/* 918BD4 80240024 0C00AB39 */ jal heap_malloc -/* 918BD8 80240028 24040040 */ addiu $a0, $zero, 0x40 -/* 918BDC 8024002C AE020000 */ sw $v0, ($s0) -/* 918BE0 80240030 0000182D */ daddu $v1, $zero, $zero -/* 918BE4 80240034 0040282D */ daddu $a1, $v0, $zero -/* 918BE8 80240038 0220202D */ daddu $a0, $s1, $zero -.L8024003C: -/* 918BEC 8024003C 8C820084 */ lw $v0, 0x84($a0) -/* 918BF0 80240040 24840004 */ addiu $a0, $a0, 4 -/* 918BF4 80240044 24630001 */ addiu $v1, $v1, 1 -/* 918BF8 80240048 ACA20000 */ sw $v0, ($a1) -/* 918BFC 8024004C 28620010 */ slti $v0, $v1, 0x10 -/* 918C00 80240050 1440FFFA */ bnez $v0, .L8024003C -/* 918C04 80240054 24A50004 */ addiu $a1, $a1, 4 -/* 918C08 80240058 08090027 */ j .L8024009C -/* 918C0C 8024005C 00000000 */ nop -.L80240060: -/* 918C10 80240060 0000182D */ daddu $v1, $zero, $zero -/* 918C14 80240064 0040282D */ daddu $a1, $v0, $zero -/* 918C18 80240068 0220202D */ daddu $a0, $s1, $zero -.L8024006C: -/* 918C1C 8024006C 8CA20000 */ lw $v0, ($a1) -/* 918C20 80240070 24A50004 */ addiu $a1, $a1, 4 -/* 918C24 80240074 24630001 */ addiu $v1, $v1, 1 -/* 918C28 80240078 AC820084 */ sw $v0, 0x84($a0) -/* 918C2C 8024007C 28620010 */ slti $v0, $v1, 0x10 -/* 918C30 80240080 1440FFFA */ bnez $v0, .L8024006C -/* 918C34 80240084 24840004 */ addiu $a0, $a0, 4 -/* 918C38 80240088 3C108024 */ lui $s0, %hi(D_80241530_91A0E0) -/* 918C3C 8024008C 26101530 */ addiu $s0, $s0, %lo(D_80241530_91A0E0) -/* 918C40 80240090 0C00AB4B */ jal heap_free -/* 918C44 80240094 8E040000 */ lw $a0, ($s0) -/* 918C48 80240098 AE000000 */ sw $zero, ($s0) -.L8024009C: -/* 918C4C 8024009C 8FBF0018 */ lw $ra, 0x18($sp) -/* 918C50 802400A0 8FB10014 */ lw $s1, 0x14($sp) -/* 918C54 802400A4 8FB00010 */ lw $s0, 0x10($sp) -/* 918C58 802400A8 24020002 */ addiu $v0, $zero, 2 -/* 918C5C 802400AC 03E00008 */ jr $ra -/* 918C60 802400B0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E5B0/func_80240040_91E5B0.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E5B0/func_80240040_91E5B0.s deleted file mode 100644 index aa467f21bb..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E5B0/func_80240040_91E5B0.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_91E5B0 -/* 91E5B0 80240040 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 91E5B4 80240044 AFB00010 */ sw $s0, 0x10($sp) -/* 91E5B8 80240048 3C108024 */ lui $s0, %hi(D_80241DD0_920340) -/* 91E5BC 8024004C 26101DD0 */ addiu $s0, $s0, %lo(D_80241DD0_920340) -/* 91E5C0 80240050 AFBF0018 */ sw $ra, 0x18($sp) -/* 91E5C4 80240054 AFB10014 */ sw $s1, 0x14($sp) -/* 91E5C8 80240058 8E020000 */ lw $v0, ($s0) -/* 91E5CC 8024005C 14400010 */ bnez $v0, .L802400A0 -/* 91E5D0 80240060 0080882D */ daddu $s1, $a0, $zero -/* 91E5D4 80240064 0C00AB39 */ jal heap_malloc -/* 91E5D8 80240068 24040040 */ addiu $a0, $zero, 0x40 -/* 91E5DC 8024006C AE020000 */ sw $v0, ($s0) -/* 91E5E0 80240070 0000182D */ daddu $v1, $zero, $zero -/* 91E5E4 80240074 0040282D */ daddu $a1, $v0, $zero -/* 91E5E8 80240078 0220202D */ daddu $a0, $s1, $zero -.L8024007C: -/* 91E5EC 8024007C 8C820084 */ lw $v0, 0x84($a0) -/* 91E5F0 80240080 24840004 */ addiu $a0, $a0, 4 -/* 91E5F4 80240084 24630001 */ addiu $v1, $v1, 1 -/* 91E5F8 80240088 ACA20000 */ sw $v0, ($a1) -/* 91E5FC 8024008C 28620010 */ slti $v0, $v1, 0x10 -/* 91E600 80240090 1440FFFA */ bnez $v0, .L8024007C -/* 91E604 80240094 24A50004 */ addiu $a1, $a1, 4 -/* 91E608 80240098 08090037 */ j .L802400DC -/* 91E60C 8024009C 00000000 */ nop -.L802400A0: -/* 91E610 802400A0 0000182D */ daddu $v1, $zero, $zero -/* 91E614 802400A4 0040282D */ daddu $a1, $v0, $zero -/* 91E618 802400A8 0220202D */ daddu $a0, $s1, $zero -.L802400AC: -/* 91E61C 802400AC 8CA20000 */ lw $v0, ($a1) -/* 91E620 802400B0 24A50004 */ addiu $a1, $a1, 4 -/* 91E624 802400B4 24630001 */ addiu $v1, $v1, 1 -/* 91E628 802400B8 AC820084 */ sw $v0, 0x84($a0) -/* 91E62C 802400BC 28620010 */ slti $v0, $v1, 0x10 -/* 91E630 802400C0 1440FFFA */ bnez $v0, .L802400AC -/* 91E634 802400C4 24840004 */ addiu $a0, $a0, 4 -/* 91E638 802400C8 3C108024 */ lui $s0, %hi(D_80241DD0_920340) -/* 91E63C 802400CC 26101DD0 */ addiu $s0, $s0, %lo(D_80241DD0_920340) -/* 91E640 802400D0 0C00AB4B */ jal heap_free -/* 91E644 802400D4 8E040000 */ lw $a0, ($s0) -/* 91E648 802400D8 AE000000 */ sw $zero, ($s0) -.L802400DC: -/* 91E64C 802400DC 8FBF0018 */ lw $ra, 0x18($sp) -/* 91E650 802400E0 8FB10014 */ lw $s1, 0x14($sp) -/* 91E654 802400E4 8FB00010 */ lw $s0, 0x10($sp) -/* 91E658 802400E8 24020002 */ addiu $v0, $zero, 2 -/* 91E65C 802400EC 03E00008 */ jr $ra -/* 91E660 802400F0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_00/B20540/func_802403F4_B20934.s b/ver/us/asm/nonmatchings/world/area_jan/jan_00/B20540/func_802403F4_B20934.s deleted file mode 100644 index bf2b4b069d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_00/B20540/func_802403F4_B20934.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403F4_B20934 -/* B20934 802403F4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B20938 802403F8 AFB00010 */ sw $s0, 0x10($sp) -/* B2093C 802403FC 3C108024 */ lui $s0, %hi(D_802423C8_B22908) -/* B20940 80240400 261023C8 */ addiu $s0, $s0, %lo(D_802423C8_B22908) -/* B20944 80240404 AFBF0018 */ sw $ra, 0x18($sp) -/* B20948 80240408 AFB10014 */ sw $s1, 0x14($sp) -/* B2094C 8024040C 8E020000 */ lw $v0, ($s0) -/* B20950 80240410 14400010 */ bnez $v0, .L80240454 -/* B20954 80240414 0080882D */ daddu $s1, $a0, $zero -/* B20958 80240418 0C00AB39 */ jal heap_malloc -/* B2095C 8024041C 24040040 */ addiu $a0, $zero, 0x40 -/* B20960 80240420 AE020000 */ sw $v0, ($s0) -/* B20964 80240424 0000182D */ daddu $v1, $zero, $zero -/* B20968 80240428 0040282D */ daddu $a1, $v0, $zero -/* B2096C 8024042C 0220202D */ daddu $a0, $s1, $zero -.L80240430: -/* B20970 80240430 8C820084 */ lw $v0, 0x84($a0) -/* B20974 80240434 24840004 */ addiu $a0, $a0, 4 -/* B20978 80240438 24630001 */ addiu $v1, $v1, 1 -/* B2097C 8024043C ACA20000 */ sw $v0, ($a1) -/* B20980 80240440 28620010 */ slti $v0, $v1, 0x10 -/* B20984 80240444 1440FFFA */ bnez $v0, .L80240430 -/* B20988 80240448 24A50004 */ addiu $a1, $a1, 4 -/* B2098C 8024044C 08090124 */ j .L80240490 -/* B20990 80240450 00000000 */ nop -.L80240454: -/* B20994 80240454 0000182D */ daddu $v1, $zero, $zero -/* B20998 80240458 0040282D */ daddu $a1, $v0, $zero -/* B2099C 8024045C 0220202D */ daddu $a0, $s1, $zero -.L80240460: -/* B209A0 80240460 8CA20000 */ lw $v0, ($a1) -/* B209A4 80240464 24A50004 */ addiu $a1, $a1, 4 -/* B209A8 80240468 24630001 */ addiu $v1, $v1, 1 -/* B209AC 8024046C AC820084 */ sw $v0, 0x84($a0) -/* B209B0 80240470 28620010 */ slti $v0, $v1, 0x10 -/* B209B4 80240474 1440FFFA */ bnez $v0, .L80240460 -/* B209B8 80240478 24840004 */ addiu $a0, $a0, 4 -/* B209BC 8024047C 3C108024 */ lui $s0, %hi(D_802423C8_B22908) -/* B209C0 80240480 261023C8 */ addiu $s0, $s0, %lo(D_802423C8_B22908) -/* B209C4 80240484 0C00AB4B */ jal heap_free -/* B209C8 80240488 8E040000 */ lw $a0, ($s0) -/* B209CC 8024048C AE000000 */ sw $zero, ($s0) -.L80240490: -/* B209D0 80240490 8FBF0018 */ lw $ra, 0x18($sp) -/* B209D4 80240494 8FB10014 */ lw $s1, 0x14($sp) -/* B209D8 80240498 8FB00010 */ lw $s0, 0x10($sp) -/* B209DC 8024049C 24020002 */ addiu $v0, $zero, 2 -/* B209E0 802404A0 03E00008 */ jr $ra -/* B209E4 802404A4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241614_B2DA84.s b/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241614_B2DA84.s deleted file mode 100644 index 8c59882475..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241614_B2DA84.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241614_B2DA84 -/* B2DA84 80241614 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B2DA88 80241618 AFB00010 */ sw $s0, 0x10($sp) -/* B2DA8C 8024161C 3C108024 */ lui $s0, %hi(D_802431E4_B2F654) -/* B2DA90 80241620 261031E4 */ addiu $s0, $s0, %lo(D_802431E4_B2F654) -/* B2DA94 80241624 AFBF0018 */ sw $ra, 0x18($sp) -/* B2DA98 80241628 AFB10014 */ sw $s1, 0x14($sp) -/* B2DA9C 8024162C 8E020000 */ lw $v0, ($s0) -/* B2DAA0 80241630 14400010 */ bnez $v0, .L80241674 -/* B2DAA4 80241634 0080882D */ daddu $s1, $a0, $zero -/* B2DAA8 80241638 0C00AB39 */ jal heap_malloc -/* B2DAAC 8024163C 24040040 */ addiu $a0, $zero, 0x40 -/* B2DAB0 80241640 AE020000 */ sw $v0, ($s0) -/* B2DAB4 80241644 0000182D */ daddu $v1, $zero, $zero -/* B2DAB8 80241648 0040282D */ daddu $a1, $v0, $zero -/* B2DABC 8024164C 0220202D */ daddu $a0, $s1, $zero -.L80241650: -/* B2DAC0 80241650 8C820084 */ lw $v0, 0x84($a0) -/* B2DAC4 80241654 24840004 */ addiu $a0, $a0, 4 -/* B2DAC8 80241658 24630001 */ addiu $v1, $v1, 1 -/* B2DACC 8024165C ACA20000 */ sw $v0, ($a1) -/* B2DAD0 80241660 28620010 */ slti $v0, $v1, 0x10 -/* B2DAD4 80241664 1440FFFA */ bnez $v0, .L80241650 -/* B2DAD8 80241668 24A50004 */ addiu $a1, $a1, 4 -/* B2DADC 8024166C 080905AC */ j .L802416B0 -/* B2DAE0 80241670 00000000 */ nop -.L80241674: -/* B2DAE4 80241674 0000182D */ daddu $v1, $zero, $zero -/* B2DAE8 80241678 0040282D */ daddu $a1, $v0, $zero -/* B2DAEC 8024167C 0220202D */ daddu $a0, $s1, $zero -.L80241680: -/* B2DAF0 80241680 8CA20000 */ lw $v0, ($a1) -/* B2DAF4 80241684 24A50004 */ addiu $a1, $a1, 4 -/* B2DAF8 80241688 24630001 */ addiu $v1, $v1, 1 -/* B2DAFC 8024168C AC820084 */ sw $v0, 0x84($a0) -/* B2DB00 80241690 28620010 */ slti $v0, $v1, 0x10 -/* B2DB04 80241694 1440FFFA */ bnez $v0, .L80241680 -/* B2DB08 80241698 24840004 */ addiu $a0, $a0, 4 -/* B2DB0C 8024169C 3C108024 */ lui $s0, %hi(D_802431E4_B2F654) -/* B2DB10 802416A0 261031E4 */ addiu $s0, $s0, %lo(D_802431E4_B2F654) -/* B2DB14 802416A4 0C00AB4B */ jal heap_free -/* B2DB18 802416A8 8E040000 */ lw $a0, ($s0) -/* B2DB1C 802416AC AE000000 */ sw $zero, ($s0) -.L802416B0: -/* B2DB20 802416B0 8FBF0018 */ lw $ra, 0x18($sp) -/* B2DB24 802416B4 8FB10014 */ lw $s1, 0x14($sp) -/* B2DB28 802416B8 8FB00010 */ lw $s0, 0x10($sp) -/* B2DB2C 802416BC 24020002 */ addiu $v0, $zero, 2 -/* B2DB30 802416C0 03E00008 */ jr $ra -/* B2DB34 802416C4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241B9C_B3676C.s b/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241B9C_B3676C.s deleted file mode 100644 index 84a5af1da8..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241B9C_B3676C.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B9C_B3676C -/* B3676C 80241B9C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B36770 80241BA0 AFB00010 */ sw $s0, 0x10($sp) -/* B36774 80241BA4 3C108024 */ lui $s0, %hi(D_80247764_B3C334) -/* B36778 80241BA8 26107764 */ addiu $s0, $s0, %lo(D_80247764_B3C334) -/* B3677C 80241BAC AFBF0018 */ sw $ra, 0x18($sp) -/* B36780 80241BB0 AFB10014 */ sw $s1, 0x14($sp) -/* B36784 80241BB4 8E020000 */ lw $v0, ($s0) -/* B36788 80241BB8 14400010 */ bnez $v0, .L80241BFC -/* B3678C 80241BBC 0080882D */ daddu $s1, $a0, $zero -/* B36790 80241BC0 0C00AB39 */ jal heap_malloc -/* B36794 80241BC4 24040040 */ addiu $a0, $zero, 0x40 -/* B36798 80241BC8 AE020000 */ sw $v0, ($s0) -/* B3679C 80241BCC 0000182D */ daddu $v1, $zero, $zero -/* B367A0 80241BD0 0040282D */ daddu $a1, $v0, $zero -/* B367A4 80241BD4 0220202D */ daddu $a0, $s1, $zero -.L80241BD8: -/* B367A8 80241BD8 8C820084 */ lw $v0, 0x84($a0) -/* B367AC 80241BDC 24840004 */ addiu $a0, $a0, 4 -/* B367B0 80241BE0 24630001 */ addiu $v1, $v1, 1 -/* B367B4 80241BE4 ACA20000 */ sw $v0, ($a1) -/* B367B8 80241BE8 28620010 */ slti $v0, $v1, 0x10 -/* B367BC 80241BEC 1440FFFA */ bnez $v0, .L80241BD8 -/* B367C0 80241BF0 24A50004 */ addiu $a1, $a1, 4 -/* B367C4 80241BF4 0809070E */ j .L80241C38 -/* B367C8 80241BF8 00000000 */ nop -.L80241BFC: -/* B367CC 80241BFC 0000182D */ daddu $v1, $zero, $zero -/* B367D0 80241C00 0040282D */ daddu $a1, $v0, $zero -/* B367D4 80241C04 0220202D */ daddu $a0, $s1, $zero -.L80241C08: -/* B367D8 80241C08 8CA20000 */ lw $v0, ($a1) -/* B367DC 80241C0C 24A50004 */ addiu $a1, $a1, 4 -/* B367E0 80241C10 24630001 */ addiu $v1, $v1, 1 -/* B367E4 80241C14 AC820084 */ sw $v0, 0x84($a0) -/* B367E8 80241C18 28620010 */ slti $v0, $v1, 0x10 -/* B367EC 80241C1C 1440FFFA */ bnez $v0, .L80241C08 -/* B367F0 80241C20 24840004 */ addiu $a0, $a0, 4 -/* B367F4 80241C24 3C108024 */ lui $s0, %hi(D_80247764_B3C334) -/* B367F8 80241C28 26107764 */ addiu $s0, $s0, %lo(D_80247764_B3C334) -/* B367FC 80241C2C 0C00AB4B */ jal heap_free -/* B36800 80241C30 8E040000 */ lw $a0, ($s0) -/* B36804 80241C34 AE000000 */ sw $zero, ($s0) -.L80241C38: -/* B36808 80241C38 8FBF0018 */ lw $ra, 0x18($sp) -/* B3680C 80241C3C 8FB10014 */ lw $s1, 0x14($sp) -/* B36810 80241C40 8FB00010 */ lw $s0, 0x10($sp) -/* B36814 80241C44 24020002 */ addiu $v0, $zero, 2 -/* B36818 80241C48 03E00008 */ jr $ra -/* B3681C 80241C4C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_04/B44AC0/func_80240350_B44AC0.s b/ver/us/asm/nonmatchings/world/area_jan/jan_04/B44AC0/func_80240350_B44AC0.s deleted file mode 100644 index 1003e4fa49..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_04/B44AC0/func_80240350_B44AC0.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240350_B44AC0 -/* B44AC0 80240350 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B44AC4 80240354 AFB00010 */ sw $s0, 0x10($sp) -/* B44AC8 80240358 3C108024 */ lui $s0, %hi(D_80241800_B45F70) -/* B44ACC 8024035C 26101800 */ addiu $s0, $s0, %lo(D_80241800_B45F70) -/* B44AD0 80240360 AFBF0018 */ sw $ra, 0x18($sp) -/* B44AD4 80240364 AFB10014 */ sw $s1, 0x14($sp) -/* B44AD8 80240368 8E020000 */ lw $v0, ($s0) -/* B44ADC 8024036C 14400010 */ bnez $v0, .L802403B0 -/* B44AE0 80240370 0080882D */ daddu $s1, $a0, $zero -/* B44AE4 80240374 0C00AB39 */ jal heap_malloc -/* B44AE8 80240378 24040040 */ addiu $a0, $zero, 0x40 -/* B44AEC 8024037C AE020000 */ sw $v0, ($s0) -/* B44AF0 80240380 0000182D */ daddu $v1, $zero, $zero -/* B44AF4 80240384 0040282D */ daddu $a1, $v0, $zero -/* B44AF8 80240388 0220202D */ daddu $a0, $s1, $zero -.L8024038C: -/* B44AFC 8024038C 8C820084 */ lw $v0, 0x84($a0) -/* B44B00 80240390 24840004 */ addiu $a0, $a0, 4 -/* B44B04 80240394 24630001 */ addiu $v1, $v1, 1 -/* B44B08 80240398 ACA20000 */ sw $v0, ($a1) -/* B44B0C 8024039C 28620010 */ slti $v0, $v1, 0x10 -/* B44B10 802403A0 1440FFFA */ bnez $v0, .L8024038C -/* B44B14 802403A4 24A50004 */ addiu $a1, $a1, 4 -/* B44B18 802403A8 080900FB */ j .L802403EC -/* B44B1C 802403AC 00000000 */ nop -.L802403B0: -/* B44B20 802403B0 0000182D */ daddu $v1, $zero, $zero -/* B44B24 802403B4 0040282D */ daddu $a1, $v0, $zero -/* B44B28 802403B8 0220202D */ daddu $a0, $s1, $zero -.L802403BC: -/* B44B2C 802403BC 8CA20000 */ lw $v0, ($a1) -/* B44B30 802403C0 24A50004 */ addiu $a1, $a1, 4 -/* B44B34 802403C4 24630001 */ addiu $v1, $v1, 1 -/* B44B38 802403C8 AC820084 */ sw $v0, 0x84($a0) -/* B44B3C 802403CC 28620010 */ slti $v0, $v1, 0x10 -/* B44B40 802403D0 1440FFFA */ bnez $v0, .L802403BC -/* B44B44 802403D4 24840004 */ addiu $a0, $a0, 4 -/* B44B48 802403D8 3C108024 */ lui $s0, %hi(D_80241800_B45F70) -/* B44B4C 802403DC 26101800 */ addiu $s0, $s0, %lo(D_80241800_B45F70) -/* B44B50 802403E0 0C00AB4B */ jal heap_free -/* B44B54 802403E4 8E040000 */ lw $a0, ($s0) -/* B44B58 802403E8 AE000000 */ sw $zero, ($s0) -.L802403EC: -/* B44B5C 802403EC 8FBF0018 */ lw $ra, 0x18($sp) -/* B44B60 802403F0 8FB10014 */ lw $s1, 0x14($sp) -/* B44B64 802403F4 8FB00010 */ lw $s0, 0x10($sp) -/* B44B68 802403F8 24020002 */ addiu $v0, $zero, 2 -/* B44B6C 802403FC 03E00008 */ jr $ra -/* B44B70 80240400 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240E90_B85010.s b/ver/us/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240E90_B85010.s deleted file mode 100644 index 68a23b808e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240E90_B85010.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E90_B85010 -/* B85010 80240E90 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B85014 80240E94 AFB00010 */ sw $s0, 0x10($sp) -/* B85018 80240E98 3C108024 */ lui $s0, %hi(D_802425BC_B8673C) -/* B8501C 80240E9C 261025BC */ addiu $s0, $s0, %lo(D_802425BC_B8673C) -/* B85020 80240EA0 AFBF0018 */ sw $ra, 0x18($sp) -/* B85024 80240EA4 AFB10014 */ sw $s1, 0x14($sp) -/* B85028 80240EA8 8E020000 */ lw $v0, ($s0) -/* B8502C 80240EAC 14400010 */ bnez $v0, .L80240EF0 -/* B85030 80240EB0 0080882D */ daddu $s1, $a0, $zero -/* B85034 80240EB4 0C00AB39 */ jal heap_malloc -/* B85038 80240EB8 24040040 */ addiu $a0, $zero, 0x40 -/* B8503C 80240EBC AE020000 */ sw $v0, ($s0) -/* B85040 80240EC0 0000182D */ daddu $v1, $zero, $zero -/* B85044 80240EC4 0040282D */ daddu $a1, $v0, $zero -/* B85048 80240EC8 0220202D */ daddu $a0, $s1, $zero -.L80240ECC: -/* B8504C 80240ECC 8C820084 */ lw $v0, 0x84($a0) -/* B85050 80240ED0 24840004 */ addiu $a0, $a0, 4 -/* B85054 80240ED4 24630001 */ addiu $v1, $v1, 1 -/* B85058 80240ED8 ACA20000 */ sw $v0, ($a1) -/* B8505C 80240EDC 28620010 */ slti $v0, $v1, 0x10 -/* B85060 80240EE0 1440FFFA */ bnez $v0, .L80240ECC -/* B85064 80240EE4 24A50004 */ addiu $a1, $a1, 4 -/* B85068 80240EE8 080903CB */ j .L80240F2C -/* B8506C 80240EEC 00000000 */ nop -.L80240EF0: -/* B85070 80240EF0 0000182D */ daddu $v1, $zero, $zero -/* B85074 80240EF4 0040282D */ daddu $a1, $v0, $zero -/* B85078 80240EF8 0220202D */ daddu $a0, $s1, $zero -.L80240EFC: -/* B8507C 80240EFC 8CA20000 */ lw $v0, ($a1) -/* B85080 80240F00 24A50004 */ addiu $a1, $a1, 4 -/* B85084 80240F04 24630001 */ addiu $v1, $v1, 1 -/* B85088 80240F08 AC820084 */ sw $v0, 0x84($a0) -/* B8508C 80240F0C 28620010 */ slti $v0, $v1, 0x10 -/* B85090 80240F10 1440FFFA */ bnez $v0, .L80240EFC -/* B85094 80240F14 24840004 */ addiu $a0, $a0, 4 -/* B85098 80240F18 3C108024 */ lui $s0, %hi(D_802425BC_B8673C) -/* B8509C 80240F1C 261025BC */ addiu $s0, $s0, %lo(D_802425BC_B8673C) -/* B850A0 80240F20 0C00AB4B */ jal heap_free -/* B850A4 80240F24 8E040000 */ lw $a0, ($s0) -/* B850A8 80240F28 AE000000 */ sw $zero, ($s0) -.L80240F2C: -/* B850AC 80240F2C 8FBF0018 */ lw $ra, 0x18($sp) -/* B850B0 80240F30 8FB10014 */ lw $s1, 0x14($sp) -/* B850B4 80240F34 8FB00010 */ lw $s0, 0x10($sp) -/* B850B8 80240F38 24020002 */ addiu $v0, $zero, 2 -/* B850BC 80240F3C 03E00008 */ jr $ra -/* B850C0 80240F40 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_80240000_AF1C60.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_80240000_AF1C60.s deleted file mode 100644 index d3b1c4eae3..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_80240000_AF1C60.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_AF1C60 -/* AF1C60 80240000 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AF1C64 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* AF1C68 80240008 3C108024 */ lui $s0, %hi(D_802408C0_AF2520) -/* AF1C6C 8024000C 261008C0 */ addiu $s0, $s0, %lo(D_802408C0_AF2520) -/* AF1C70 80240010 AFBF0018 */ sw $ra, 0x18($sp) -/* AF1C74 80240014 AFB10014 */ sw $s1, 0x14($sp) -/* AF1C78 80240018 8E020000 */ lw $v0, ($s0) -/* AF1C7C 8024001C 14400010 */ bnez $v0, .L80240060 -/* AF1C80 80240020 0080882D */ daddu $s1, $a0, $zero -/* AF1C84 80240024 0C00AB39 */ jal heap_malloc -/* AF1C88 80240028 24040040 */ addiu $a0, $zero, 0x40 -/* AF1C8C 8024002C AE020000 */ sw $v0, ($s0) -/* AF1C90 80240030 0000182D */ daddu $v1, $zero, $zero -/* AF1C94 80240034 0040282D */ daddu $a1, $v0, $zero -/* AF1C98 80240038 0220202D */ daddu $a0, $s1, $zero -.L8024003C: -/* AF1C9C 8024003C 8C820084 */ lw $v0, 0x84($a0) -/* AF1CA0 80240040 24840004 */ addiu $a0, $a0, 4 -/* AF1CA4 80240044 24630001 */ addiu $v1, $v1, 1 -/* AF1CA8 80240048 ACA20000 */ sw $v0, ($a1) -/* AF1CAC 8024004C 28620010 */ slti $v0, $v1, 0x10 -/* AF1CB0 80240050 1440FFFA */ bnez $v0, .L8024003C -/* AF1CB4 80240054 24A50004 */ addiu $a1, $a1, 4 -/* AF1CB8 80240058 08090027 */ j .L8024009C -/* AF1CBC 8024005C 00000000 */ nop -.L80240060: -/* AF1CC0 80240060 0000182D */ daddu $v1, $zero, $zero -/* AF1CC4 80240064 0040282D */ daddu $a1, $v0, $zero -/* AF1CC8 80240068 0220202D */ daddu $a0, $s1, $zero -.L8024006C: -/* AF1CCC 8024006C 8CA20000 */ lw $v0, ($a1) -/* AF1CD0 80240070 24A50004 */ addiu $a1, $a1, 4 -/* AF1CD4 80240074 24630001 */ addiu $v1, $v1, 1 -/* AF1CD8 80240078 AC820084 */ sw $v0, 0x84($a0) -/* AF1CDC 8024007C 28620010 */ slti $v0, $v1, 0x10 -/* AF1CE0 80240080 1440FFFA */ bnez $v0, .L8024006C -/* AF1CE4 80240084 24840004 */ addiu $a0, $a0, 4 -/* AF1CE8 80240088 3C108024 */ lui $s0, %hi(D_802408C0_AF2520) -/* AF1CEC 8024008C 261008C0 */ addiu $s0, $s0, %lo(D_802408C0_AF2520) -/* AF1CF0 80240090 0C00AB4B */ jal heap_free -/* AF1CF4 80240094 8E040000 */ lw $a0, ($s0) -/* AF1CF8 80240098 AE000000 */ sw $zero, ($s0) -.L8024009C: -/* AF1CFC 8024009C 8FBF0018 */ lw $ra, 0x18($sp) -/* AF1D00 802400A0 8FB10014 */ lw $s1, 0x14($sp) -/* AF1D04 802400A4 8FB00010 */ lw $s0, 0x10($sp) -/* AF1D08 802400A8 24020002 */ addiu $v0, $zero, 2 -/* AF1D0C 802400AC 03E00008 */ jr $ra -/* AF1D10 802400B0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_20/AFDB40/func_80240000_AFDB40.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_20/AFDB40/func_80240000_AFDB40.s deleted file mode 100644 index af3ac8f887..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_20/AFDB40/func_80240000_AFDB40.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_AFDB40 -/* AFDB40 80240000 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AFDB44 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* AFDB48 80240008 3C108024 */ lui $s0, %hi(D_80240880_AFE3C0) -/* AFDB4C 8024000C 26100880 */ addiu $s0, $s0, %lo(D_80240880_AFE3C0) -/* AFDB50 80240010 AFBF0018 */ sw $ra, 0x18($sp) -/* AFDB54 80240014 AFB10014 */ sw $s1, 0x14($sp) -/* AFDB58 80240018 8E020000 */ lw $v0, ($s0) -/* AFDB5C 8024001C 14400010 */ bnez $v0, .L80240060 -/* AFDB60 80240020 0080882D */ daddu $s1, $a0, $zero -/* AFDB64 80240024 0C00AB39 */ jal heap_malloc -/* AFDB68 80240028 24040040 */ addiu $a0, $zero, 0x40 -/* AFDB6C 8024002C AE020000 */ sw $v0, ($s0) -/* AFDB70 80240030 0000182D */ daddu $v1, $zero, $zero -/* AFDB74 80240034 0040282D */ daddu $a1, $v0, $zero -/* AFDB78 80240038 0220202D */ daddu $a0, $s1, $zero -.L8024003C: -/* AFDB7C 8024003C 8C820084 */ lw $v0, 0x84($a0) -/* AFDB80 80240040 24840004 */ addiu $a0, $a0, 4 -/* AFDB84 80240044 24630001 */ addiu $v1, $v1, 1 -/* AFDB88 80240048 ACA20000 */ sw $v0, ($a1) -/* AFDB8C 8024004C 28620010 */ slti $v0, $v1, 0x10 -/* AFDB90 80240050 1440FFFA */ bnez $v0, .L8024003C -/* AFDB94 80240054 24A50004 */ addiu $a1, $a1, 4 -/* AFDB98 80240058 08090027 */ j .L8024009C -/* AFDB9C 8024005C 00000000 */ nop -.L80240060: -/* AFDBA0 80240060 0000182D */ daddu $v1, $zero, $zero -/* AFDBA4 80240064 0040282D */ daddu $a1, $v0, $zero -/* AFDBA8 80240068 0220202D */ daddu $a0, $s1, $zero -.L8024006C: -/* AFDBAC 8024006C 8CA20000 */ lw $v0, ($a1) -/* AFDBB0 80240070 24A50004 */ addiu $a1, $a1, 4 -/* AFDBB4 80240074 24630001 */ addiu $v1, $v1, 1 -/* AFDBB8 80240078 AC820084 */ sw $v0, 0x84($a0) -/* AFDBBC 8024007C 28620010 */ slti $v0, $v1, 0x10 -/* AFDBC0 80240080 1440FFFA */ bnez $v0, .L8024006C -/* AFDBC4 80240084 24840004 */ addiu $a0, $a0, 4 -/* AFDBC8 80240088 3C108024 */ lui $s0, %hi(D_80240880_AFE3C0) -/* AFDBCC 8024008C 26100880 */ addiu $s0, $s0, %lo(D_80240880_AFE3C0) -/* AFDBD0 80240090 0C00AB4B */ jal heap_free -/* AFDBD4 80240094 8E040000 */ lw $a0, ($s0) -/* AFDBD8 80240098 AE000000 */ sw $zero, ($s0) -.L8024009C: -/* AFDBDC 8024009C 8FBF0018 */ lw $ra, 0x18($sp) -/* AFDBE0 802400A0 8FB10014 */ lw $s1, 0x14($sp) -/* AFDBE4 802400A4 8FB00010 */ lw $s0, 0x10($sp) -/* AFDBE8 802400A8 24020002 */ addiu $v0, $zero, 2 -/* AFDBEC 802400AC 03E00008 */ jr $ra -/* AFDBF0 802400B0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240000_8ABF90.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240000_8ABF90.s index dce603ccc6..97204f470f 100644 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240000_8ABF90.s +++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240000_8ABF90.s @@ -40,8 +40,8 @@ glabel func_80240000_8ABF90 /* 8AC01C 8024008C 26100004 */ addiu $s0, $s0, 4 /* 8AC020 80240090 0C0B1EAF */ jal evt_get_variable /* 8AC024 80240094 0220202D */ daddu $a0, $s1, $zero -/* 8AC028 80240098 3C018024 */ lui $at, %hi(D_802440F0_BC1290) -/* 8AC02C 8024009C AC2240F0 */ sw $v0, %lo(D_802440F0_BC1290)($at) +/* 8AC028 80240098 3C018024 */ lui $at, %hi(obk_01_varTable) +/* 8AC02C 8024009C AC2240F0 */ sw $v0, %lo(obk_01_varTable)($at) /* 8AC030 802400A0 8E050000 */ lw $a1, ($s0) /* 8AC034 802400A4 26100004 */ addiu $s0, $s0, 4 /* 8AC038 802400A8 0C0B1EAF */ jal evt_get_variable @@ -119,8 +119,8 @@ glabel func_80240000_8ABF90 /* 8AC144 802401B4 00006812 */ mflo $t5 /* 8AC148 802401B8 3C068024 */ lui $a2, %hi(D_802440E2) /* 8AC14C 802401BC 90C640E2 */ lbu $a2, %lo(D_802440E2)($a2) -/* 8AC150 802401C0 3C028024 */ lui $v0, %hi(D_802440F0_BC1290) -/* 8AC154 802401C4 8C4240F0 */ lw $v0, %lo(D_802440F0_BC1290)($v0) +/* 8AC150 802401C0 3C028024 */ lui $v0, %hi(obk_01_varTable) +/* 8AC154 802401C4 8C4240F0 */ lw $v0, %lo(obk_01_varTable)($v0) /* 8AC158 802401C8 00461023 */ subu $v0, $v0, $a2 /* 8AC15C 802401CC 00430018 */ mult $v0, $v1 /* 8AC160 802401D0 00004012 */ mflo $t0 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240390_8B0400.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240390_8B0400.s deleted file mode 100644 index 935c37252c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240390_8B0400.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240390_8B0400 -/* 8B0400 80240390 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8B0404 80240394 AFB00010 */ sw $s0, 0x10($sp) -/* 8B0408 80240398 3C108024 */ lui $s0, %hi(D_802455D0_8B5640) -/* 8B040C 8024039C 261055D0 */ addiu $s0, $s0, %lo(D_802455D0_8B5640) -/* 8B0410 802403A0 AFBF0018 */ sw $ra, 0x18($sp) -/* 8B0414 802403A4 AFB10014 */ sw $s1, 0x14($sp) -/* 8B0418 802403A8 8E020000 */ lw $v0, ($s0) -/* 8B041C 802403AC 14400010 */ bnez $v0, .L802403F0 -/* 8B0420 802403B0 0080882D */ daddu $s1, $a0, $zero -/* 8B0424 802403B4 0C00AB39 */ jal heap_malloc -/* 8B0428 802403B8 24040040 */ addiu $a0, $zero, 0x40 -/* 8B042C 802403BC AE020000 */ sw $v0, ($s0) -/* 8B0430 802403C0 0000182D */ daddu $v1, $zero, $zero -/* 8B0434 802403C4 0040282D */ daddu $a1, $v0, $zero -/* 8B0438 802403C8 0220202D */ daddu $a0, $s1, $zero -.L802403CC: -/* 8B043C 802403CC 8C820084 */ lw $v0, 0x84($a0) -/* 8B0440 802403D0 24840004 */ addiu $a0, $a0, 4 -/* 8B0444 802403D4 24630001 */ addiu $v1, $v1, 1 -/* 8B0448 802403D8 ACA20000 */ sw $v0, ($a1) -/* 8B044C 802403DC 28620010 */ slti $v0, $v1, 0x10 -/* 8B0450 802403E0 1440FFFA */ bnez $v0, .L802403CC -/* 8B0454 802403E4 24A50004 */ addiu $a1, $a1, 4 -/* 8B0458 802403E8 0809010B */ j .L8024042C -/* 8B045C 802403EC 00000000 */ nop -.L802403F0: -/* 8B0460 802403F0 0000182D */ daddu $v1, $zero, $zero -/* 8B0464 802403F4 0040282D */ daddu $a1, $v0, $zero -/* 8B0468 802403F8 0220202D */ daddu $a0, $s1, $zero -.L802403FC: -/* 8B046C 802403FC 8CA20000 */ lw $v0, ($a1) -/* 8B0470 80240400 24A50004 */ addiu $a1, $a1, 4 -/* 8B0474 80240404 24630001 */ addiu $v1, $v1, 1 -/* 8B0478 80240408 AC820084 */ sw $v0, 0x84($a0) -/* 8B047C 8024040C 28620010 */ slti $v0, $v1, 0x10 -/* 8B0480 80240410 1440FFFA */ bnez $v0, .L802403FC -/* 8B0484 80240414 24840004 */ addiu $a0, $a0, 4 -/* 8B0488 80240418 3C108024 */ lui $s0, %hi(D_802455D0_8B5640) -/* 8B048C 8024041C 261055D0 */ addiu $s0, $s0, %lo(D_802455D0_8B5640) -/* 8B0490 80240420 0C00AB4B */ jal heap_free -/* 8B0494 80240424 8E040000 */ lw $a0, ($s0) -/* 8B0498 80240428 AE000000 */ sw $zero, ($s0) -.L8024042C: -/* 8B049C 8024042C 8FBF0018 */ lw $ra, 0x18($sp) -/* 8B04A0 80240430 8FB10014 */ lw $s1, 0x14($sp) -/* 8B04A4 80240434 8FB00010 */ lw $s0, 0x10($sp) -/* 8B04A8 80240438 24020002 */ addiu $v0, $zero, 2 -/* 8B04AC 8024043C 03E00008 */ jr $ra -/* 8B04B0 80240440 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_802402C8_8CABC8.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_802402C8_8CABC8.s deleted file mode 100644 index b084045764..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_802402C8_8CABC8.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402C8_8CABC8 -/* 8CABC8 802402C8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8CABCC 802402CC AFB00010 */ sw $s0, 0x10($sp) -/* 8CABD0 802402D0 3C108024 */ lui $s0, %hi(D_802429F4_8CD2F4) -/* 8CABD4 802402D4 261029F4 */ addiu $s0, $s0, %lo(D_802429F4_8CD2F4) -/* 8CABD8 802402D8 AFBF0018 */ sw $ra, 0x18($sp) -/* 8CABDC 802402DC AFB10014 */ sw $s1, 0x14($sp) -/* 8CABE0 802402E0 8E020000 */ lw $v0, ($s0) -/* 8CABE4 802402E4 14400010 */ bnez $v0, .L80240328 -/* 8CABE8 802402E8 0080882D */ daddu $s1, $a0, $zero -/* 8CABEC 802402EC 0C00AB39 */ jal heap_malloc -/* 8CABF0 802402F0 24040040 */ addiu $a0, $zero, 0x40 -/* 8CABF4 802402F4 AE020000 */ sw $v0, ($s0) -/* 8CABF8 802402F8 0000182D */ daddu $v1, $zero, $zero -/* 8CABFC 802402FC 0040282D */ daddu $a1, $v0, $zero -/* 8CAC00 80240300 0220202D */ daddu $a0, $s1, $zero -.L80240304: -/* 8CAC04 80240304 8C820084 */ lw $v0, 0x84($a0) -/* 8CAC08 80240308 24840004 */ addiu $a0, $a0, 4 -/* 8CAC0C 8024030C 24630001 */ addiu $v1, $v1, 1 -/* 8CAC10 80240310 ACA20000 */ sw $v0, ($a1) -/* 8CAC14 80240314 28620010 */ slti $v0, $v1, 0x10 -/* 8CAC18 80240318 1440FFFA */ bnez $v0, .L80240304 -/* 8CAC1C 8024031C 24A50004 */ addiu $a1, $a1, 4 -/* 8CAC20 80240320 080900D9 */ j .L80240364 -/* 8CAC24 80240324 00000000 */ nop -.L80240328: -/* 8CAC28 80240328 0000182D */ daddu $v1, $zero, $zero -/* 8CAC2C 8024032C 0040282D */ daddu $a1, $v0, $zero -/* 8CAC30 80240330 0220202D */ daddu $a0, $s1, $zero -.L80240334: -/* 8CAC34 80240334 8CA20000 */ lw $v0, ($a1) -/* 8CAC38 80240338 24A50004 */ addiu $a1, $a1, 4 -/* 8CAC3C 8024033C 24630001 */ addiu $v1, $v1, 1 -/* 8CAC40 80240340 AC820084 */ sw $v0, 0x84($a0) -/* 8CAC44 80240344 28620010 */ slti $v0, $v1, 0x10 -/* 8CAC48 80240348 1440FFFA */ bnez $v0, .L80240334 -/* 8CAC4C 8024034C 24840004 */ addiu $a0, $a0, 4 -/* 8CAC50 80240350 3C108024 */ lui $s0, %hi(D_802429F4_8CD2F4) -/* 8CAC54 80240354 261029F4 */ addiu $s0, $s0, %lo(D_802429F4_8CD2F4) -/* 8CAC58 80240358 0C00AB4B */ jal heap_free -/* 8CAC5C 8024035C 8E040000 */ lw $a0, ($s0) -/* 8CAC60 80240360 AE000000 */ sw $zero, ($s0) -.L80240364: -/* 8CAC64 80240364 8FBF0018 */ lw $ra, 0x18($sp) -/* 8CAC68 80240368 8FB10014 */ lw $s1, 0x14($sp) -/* 8CAC6C 8024036C 8FB00010 */ lw $s0, 0x10($sp) -/* 8CAC70 80240370 24020002 */ addiu $v0, $zero, 2 -/* 8CAC74 80240374 03E00008 */ jr $ra -/* 8CAC78 80240378 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240000_8D84D0.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240000_8D84D0.s deleted file mode 100644 index 880d032e58..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240000_8D84D0.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_8D84D0 -/* 8D84D0 80240000 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8D84D4 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* 8D84D8 80240008 3C108024 */ lui $s0, %hi(D_80240C20_8D90F0) -/* 8D84DC 8024000C 26100C20 */ addiu $s0, $s0, %lo(D_80240C20_8D90F0) -/* 8D84E0 80240010 AFBF0018 */ sw $ra, 0x18($sp) -/* 8D84E4 80240014 AFB10014 */ sw $s1, 0x14($sp) -/* 8D84E8 80240018 8E020000 */ lw $v0, ($s0) -/* 8D84EC 8024001C 14400010 */ bnez $v0, .L80240060 -/* 8D84F0 80240020 0080882D */ daddu $s1, $a0, $zero -/* 8D84F4 80240024 0C00AB39 */ jal heap_malloc -/* 8D84F8 80240028 24040040 */ addiu $a0, $zero, 0x40 -/* 8D84FC 8024002C AE020000 */ sw $v0, ($s0) -/* 8D8500 80240030 0000182D */ daddu $v1, $zero, $zero -/* 8D8504 80240034 0040282D */ daddu $a1, $v0, $zero -/* 8D8508 80240038 0220202D */ daddu $a0, $s1, $zero -.L8024003C: -/* 8D850C 8024003C 8C820084 */ lw $v0, 0x84($a0) -/* 8D8510 80240040 24840004 */ addiu $a0, $a0, 4 -/* 8D8514 80240044 24630001 */ addiu $v1, $v1, 1 -/* 8D8518 80240048 ACA20000 */ sw $v0, ($a1) -/* 8D851C 8024004C 28620010 */ slti $v0, $v1, 0x10 -/* 8D8520 80240050 1440FFFA */ bnez $v0, .L8024003C -/* 8D8524 80240054 24A50004 */ addiu $a1, $a1, 4 -/* 8D8528 80240058 08090027 */ j .L8024009C -/* 8D852C 8024005C 00000000 */ nop -.L80240060: -/* 8D8530 80240060 0000182D */ daddu $v1, $zero, $zero -/* 8D8534 80240064 0040282D */ daddu $a1, $v0, $zero -/* 8D8538 80240068 0220202D */ daddu $a0, $s1, $zero -.L8024006C: -/* 8D853C 8024006C 8CA20000 */ lw $v0, ($a1) -/* 8D8540 80240070 24A50004 */ addiu $a1, $a1, 4 -/* 8D8544 80240074 24630001 */ addiu $v1, $v1, 1 -/* 8D8548 80240078 AC820084 */ sw $v0, 0x84($a0) -/* 8D854C 8024007C 28620010 */ slti $v0, $v1, 0x10 -/* 8D8550 80240080 1440FFFA */ bnez $v0, .L8024006C -/* 8D8554 80240084 24840004 */ addiu $a0, $a0, 4 -/* 8D8558 80240088 3C108024 */ lui $s0, %hi(D_80240C20_8D90F0) -/* 8D855C 8024008C 26100C20 */ addiu $s0, $s0, %lo(D_80240C20_8D90F0) -/* 8D8560 80240090 0C00AB4B */ jal heap_free -/* 8D8564 80240094 8E040000 */ lw $a0, ($s0) -/* 8D8568 80240098 AE000000 */ sw $zero, ($s0) -.L8024009C: -/* 8D856C 8024009C 8FBF0018 */ lw $ra, 0x18($sp) -/* 8D8570 802400A0 8FB10014 */ lw $s1, 0x14($sp) -/* 8D8574 802400A4 8FB00010 */ lw $s0, 0x10($sp) -/* 8D8578 802400A8 24020002 */ addiu $v0, $zero, 2 -/* 8D857C 802400AC 03E00008 */ jr $ra -/* 8D8580 802400B0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8ED440/func_80241620_8ED440.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8ED440/func_80241620_8ED440.s deleted file mode 100644 index bd21e73ae7..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8ED440/func_80241620_8ED440.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241620_8ED440 -/* 8ED440 80241620 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8ED444 80241624 AFB00010 */ sw $s0, 0x10($sp) -/* 8ED448 80241628 3C108025 */ lui $s0, %hi(D_8024A908_8F6728) -/* 8ED44C 8024162C 2610A908 */ addiu $s0, $s0, %lo(D_8024A908_8F6728) -/* 8ED450 80241630 AFBF0018 */ sw $ra, 0x18($sp) -/* 8ED454 80241634 AFB10014 */ sw $s1, 0x14($sp) -/* 8ED458 80241638 8E020000 */ lw $v0, ($s0) -/* 8ED45C 8024163C 14400010 */ bnez $v0, .L80241680 -/* 8ED460 80241640 0080882D */ daddu $s1, $a0, $zero -/* 8ED464 80241644 0C00AB39 */ jal heap_malloc -/* 8ED468 80241648 24040040 */ addiu $a0, $zero, 0x40 -/* 8ED46C 8024164C AE020000 */ sw $v0, ($s0) -/* 8ED470 80241650 0000182D */ daddu $v1, $zero, $zero -/* 8ED474 80241654 0040282D */ daddu $a1, $v0, $zero -/* 8ED478 80241658 0220202D */ daddu $a0, $s1, $zero -.L8024165C: -/* 8ED47C 8024165C 8C820084 */ lw $v0, 0x84($a0) -/* 8ED480 80241660 24840004 */ addiu $a0, $a0, 4 -/* 8ED484 80241664 24630001 */ addiu $v1, $v1, 1 -/* 8ED488 80241668 ACA20000 */ sw $v0, ($a1) -/* 8ED48C 8024166C 28620010 */ slti $v0, $v1, 0x10 -/* 8ED490 80241670 1440FFFA */ bnez $v0, .L8024165C -/* 8ED494 80241674 24A50004 */ addiu $a1, $a1, 4 -/* 8ED498 80241678 080905AF */ j .L802416BC -/* 8ED49C 8024167C 00000000 */ nop -.L80241680: -/* 8ED4A0 80241680 0000182D */ daddu $v1, $zero, $zero -/* 8ED4A4 80241684 0040282D */ daddu $a1, $v0, $zero -/* 8ED4A8 80241688 0220202D */ daddu $a0, $s1, $zero -.L8024168C: -/* 8ED4AC 8024168C 8CA20000 */ lw $v0, ($a1) -/* 8ED4B0 80241690 24A50004 */ addiu $a1, $a1, 4 -/* 8ED4B4 80241694 24630001 */ addiu $v1, $v1, 1 -/* 8ED4B8 80241698 AC820084 */ sw $v0, 0x84($a0) -/* 8ED4BC 8024169C 28620010 */ slti $v0, $v1, 0x10 -/* 8ED4C0 802416A0 1440FFFA */ bnez $v0, .L8024168C -/* 8ED4C4 802416A4 24840004 */ addiu $a0, $a0, 4 -/* 8ED4C8 802416A8 3C108025 */ lui $s0, %hi(D_8024A908_8F6728) -/* 8ED4CC 802416AC 2610A908 */ addiu $s0, $s0, %lo(D_8024A908_8F6728) -/* 8ED4D0 802416B0 0C00AB4B */ jal heap_free -/* 8ED4D4 802416B4 8E040000 */ lw $a0, ($s0) -/* 8ED4D8 802416B8 AE000000 */ sw $zero, ($s0) -.L802416BC: -/* 8ED4DC 802416BC 8FBF0018 */ lw $ra, 0x18($sp) -/* 8ED4E0 802416C0 8FB10014 */ lw $s1, 0x14($sp) -/* 8ED4E4 802416C4 8FB00010 */ lw $s0, 0x10($sp) -/* 8ED4E8 802416C8 24020002 */ addiu $v0, $zero, 2 -/* 8ED4EC 802416CC 03E00008 */ jr $ra -/* 8ED4F0 802416D0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240380_A57830.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240380_A57830.s deleted file mode 100644 index 7788f09248..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240380_A57830.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240380_A57830 -/* A57830 80240380 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A57834 80240384 AFB00010 */ sw $s0, 0x10($sp) -/* A57838 80240388 3C108024 */ lui $s0, %hi(D_80241900_A58DB0) -/* A5783C 8024038C 26101900 */ addiu $s0, $s0, %lo(D_80241900_A58DB0) -/* A57840 80240390 AFBF0018 */ sw $ra, 0x18($sp) -/* A57844 80240394 AFB10014 */ sw $s1, 0x14($sp) -/* A57848 80240398 8E020000 */ lw $v0, ($s0) -/* A5784C 8024039C 14400010 */ bnez $v0, .L802403E0 -/* A57850 802403A0 0080882D */ daddu $s1, $a0, $zero -/* A57854 802403A4 0C00AB39 */ jal heap_malloc -/* A57858 802403A8 24040040 */ addiu $a0, $zero, 0x40 -/* A5785C 802403AC AE020000 */ sw $v0, ($s0) -/* A57860 802403B0 0000182D */ daddu $v1, $zero, $zero -/* A57864 802403B4 0040282D */ daddu $a1, $v0, $zero -/* A57868 802403B8 0220202D */ daddu $a0, $s1, $zero -.L802403BC: -/* A5786C 802403BC 8C820084 */ lw $v0, 0x84($a0) -/* A57870 802403C0 24840004 */ addiu $a0, $a0, 4 -/* A57874 802403C4 24630001 */ addiu $v1, $v1, 1 -/* A57878 802403C8 ACA20000 */ sw $v0, ($a1) -/* A5787C 802403CC 28620010 */ slti $v0, $v1, 0x10 -/* A57880 802403D0 1440FFFA */ bnez $v0, .L802403BC -/* A57884 802403D4 24A50004 */ addiu $a1, $a1, 4 -/* A57888 802403D8 08090107 */ j .L8024041C -/* A5788C 802403DC 00000000 */ nop -.L802403E0: -/* A57890 802403E0 0000182D */ daddu $v1, $zero, $zero -/* A57894 802403E4 0040282D */ daddu $a1, $v0, $zero -/* A57898 802403E8 0220202D */ daddu $a0, $s1, $zero -.L802403EC: -/* A5789C 802403EC 8CA20000 */ lw $v0, ($a1) -/* A578A0 802403F0 24A50004 */ addiu $a1, $a1, 4 -/* A578A4 802403F4 24630001 */ addiu $v1, $v1, 1 -/* A578A8 802403F8 AC820084 */ sw $v0, 0x84($a0) -/* A578AC 802403FC 28620010 */ slti $v0, $v1, 0x10 -/* A578B0 80240400 1440FFFA */ bnez $v0, .L802403EC -/* A578B4 80240404 24840004 */ addiu $a0, $a0, 4 -/* A578B8 80240408 3C108024 */ lui $s0, %hi(D_80241900_A58DB0) -/* A578BC 8024040C 26101900 */ addiu $s0, $s0, %lo(D_80241900_A58DB0) -/* A578C0 80240410 0C00AB4B */ jal heap_free -/* A578C4 80240414 8E040000 */ lw $a0, ($s0) -/* A578C8 80240418 AE000000 */ sw $zero, ($s0) -.L8024041C: -/* A578CC 8024041C 8FBF0018 */ lw $ra, 0x18($sp) -/* A578D0 80240420 8FB10014 */ lw $s1, 0x14($sp) -/* A578D4 80240424 8FB00010 */ lw $s0, 0x10($sp) -/* A578D8 80240428 24020002 */ addiu $v0, $zero, 2 -/* A578DC 8024042C 03E00008 */ jr $ra -/* A578E0 80240430 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_15/A596A0/func_80240310_A596A0.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_15/A596A0/func_80240310_A596A0.s deleted file mode 100644 index fb22ab57d3..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_15/A596A0/func_80240310_A596A0.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240310_A596A0 -/* A596A0 80240310 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A596A4 80240314 AFB00010 */ sw $s0, 0x10($sp) -/* A596A8 80240318 3C108024 */ lui $s0, %hi(D_80240AA0_A59E30) -/* A596AC 8024031C 26100AA0 */ addiu $s0, $s0, %lo(D_80240AA0_A59E30) -/* A596B0 80240320 AFBF0018 */ sw $ra, 0x18($sp) -/* A596B4 80240324 AFB10014 */ sw $s1, 0x14($sp) -/* A596B8 80240328 8E020000 */ lw $v0, ($s0) -/* A596BC 8024032C 14400010 */ bnez $v0, .L80240370 -/* A596C0 80240330 0080882D */ daddu $s1, $a0, $zero -/* A596C4 80240334 0C00AB39 */ jal heap_malloc -/* A596C8 80240338 24040040 */ addiu $a0, $zero, 0x40 -/* A596CC 8024033C AE020000 */ sw $v0, ($s0) -/* A596D0 80240340 0000182D */ daddu $v1, $zero, $zero -/* A596D4 80240344 0040282D */ daddu $a1, $v0, $zero -/* A596D8 80240348 0220202D */ daddu $a0, $s1, $zero -.L8024034C: -/* A596DC 8024034C 8C820084 */ lw $v0, 0x84($a0) -/* A596E0 80240350 24840004 */ addiu $a0, $a0, 4 -/* A596E4 80240354 24630001 */ addiu $v1, $v1, 1 -/* A596E8 80240358 ACA20000 */ sw $v0, ($a1) -/* A596EC 8024035C 28620010 */ slti $v0, $v1, 0x10 -/* A596F0 80240360 1440FFFA */ bnez $v0, .L8024034C -/* A596F4 80240364 24A50004 */ addiu $a1, $a1, 4 -/* A596F8 80240368 080900EB */ j .L802403AC -/* A596FC 8024036C 00000000 */ nop -.L80240370: -/* A59700 80240370 0000182D */ daddu $v1, $zero, $zero -/* A59704 80240374 0040282D */ daddu $a1, $v0, $zero -/* A59708 80240378 0220202D */ daddu $a0, $s1, $zero -.L8024037C: -/* A5970C 8024037C 8CA20000 */ lw $v0, ($a1) -/* A59710 80240380 24A50004 */ addiu $a1, $a1, 4 -/* A59714 80240384 24630001 */ addiu $v1, $v1, 1 -/* A59718 80240388 AC820084 */ sw $v0, 0x84($a0) -/* A5971C 8024038C 28620010 */ slti $v0, $v1, 0x10 -/* A59720 80240390 1440FFFA */ bnez $v0, .L8024037C -/* A59724 80240394 24840004 */ addiu $a0, $a0, 4 -/* A59728 80240398 3C108024 */ lui $s0, %hi(D_80240AA0_A59E30) -/* A5972C 8024039C 26100AA0 */ addiu $s0, $s0, %lo(D_80240AA0_A59E30) -/* A59730 802403A0 0C00AB4B */ jal heap_free -/* A59734 802403A4 8E040000 */ lw $a0, ($s0) -/* A59738 802403A8 AE000000 */ sw $zero, ($s0) -.L802403AC: -/* A5973C 802403AC 8FBF0018 */ lw $ra, 0x18($sp) -/* A59740 802403B0 8FB10014 */ lw $s1, 0x14($sp) -/* A59744 802403B4 8FB00010 */ lw $s0, 0x10($sp) -/* A59748 802403B8 24020002 */ addiu $v0, $zero, 2 -/* A5974C 802403BC 03E00008 */ jr $ra -/* A59750 802403C0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241FCC_C5C70C.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241FCC_C5C70C.s deleted file mode 100644 index 8dc5f0f33c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241FCC_C5C70C.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241FCC_C5C70C -/* C5C70C 80241FCC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C5C710 80241FD0 AFB00010 */ sw $s0, 0x10($sp) -/* C5C714 80241FD4 3C108024 */ lui $s0, %hi(D_80244A10_C5F150) -/* C5C718 80241FD8 26104A10 */ addiu $s0, $s0, %lo(D_80244A10_C5F150) -/* C5C71C 80241FDC AFBF0018 */ sw $ra, 0x18($sp) -/* C5C720 80241FE0 AFB10014 */ sw $s1, 0x14($sp) -/* C5C724 80241FE4 8E020000 */ lw $v0, ($s0) -/* C5C728 80241FE8 14400010 */ bnez $v0, .L8024202C -/* C5C72C 80241FEC 0080882D */ daddu $s1, $a0, $zero -/* C5C730 80241FF0 0C00AB39 */ jal heap_malloc -/* C5C734 80241FF4 24040040 */ addiu $a0, $zero, 0x40 -/* C5C738 80241FF8 AE020000 */ sw $v0, ($s0) -/* C5C73C 80241FFC 0000182D */ daddu $v1, $zero, $zero -/* C5C740 80242000 0040282D */ daddu $a1, $v0, $zero -/* C5C744 80242004 0220202D */ daddu $a0, $s1, $zero -.L80242008: -/* C5C748 80242008 8C820084 */ lw $v0, 0x84($a0) -/* C5C74C 8024200C 24840004 */ addiu $a0, $a0, 4 -/* C5C750 80242010 24630001 */ addiu $v1, $v1, 1 -/* C5C754 80242014 ACA20000 */ sw $v0, ($a1) -/* C5C758 80242018 28620010 */ slti $v0, $v1, 0x10 -/* C5C75C 8024201C 1440FFFA */ bnez $v0, .L80242008 -/* C5C760 80242020 24A50004 */ addiu $a1, $a1, 4 -/* C5C764 80242024 0809081A */ j .L80242068 -/* C5C768 80242028 00000000 */ nop -.L8024202C: -/* C5C76C 8024202C 0000182D */ daddu $v1, $zero, $zero -/* C5C770 80242030 0040282D */ daddu $a1, $v0, $zero -/* C5C774 80242034 0220202D */ daddu $a0, $s1, $zero -.L80242038: -/* C5C778 80242038 8CA20000 */ lw $v0, ($a1) -/* C5C77C 8024203C 24A50004 */ addiu $a1, $a1, 4 -/* C5C780 80242040 24630001 */ addiu $v1, $v1, 1 -/* C5C784 80242044 AC820084 */ sw $v0, 0x84($a0) -/* C5C788 80242048 28620010 */ slti $v0, $v1, 0x10 -/* C5C78C 8024204C 1440FFFA */ bnez $v0, .L80242038 -/* C5C790 80242050 24840004 */ addiu $a0, $a0, 4 -/* C5C794 80242054 3C108024 */ lui $s0, %hi(D_80244A10_C5F150) -/* C5C798 80242058 26104A10 */ addiu $s0, $s0, %lo(D_80244A10_C5F150) -/* C5C79C 8024205C 0C00AB4B */ jal heap_free -/* C5C7A0 80242060 8E040000 */ lw $a0, ($s0) -/* C5C7A4 80242064 AE000000 */ sw $zero, ($s0) -.L80242068: -/* C5C7A8 80242068 8FBF0018 */ lw $ra, 0x18($sp) -/* C5C7AC 8024206C 8FB10014 */ lw $s1, 0x14($sp) -/* C5C7B0 80242070 8FB00010 */ lw $s0, 0x10($sp) -/* C5C7B4 80242074 24020002 */ addiu $v0, $zero, 2 -/* C5C7B8 80242078 03E00008 */ jr $ra -/* C5C7BC 8024207C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_8024259C_C632AC.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_8024259C_C632AC.s deleted file mode 100644 index 4d91e336c6..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_8024259C_C632AC.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024259C_C632AC -/* C632AC 8024259C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C632B0 802425A0 AFB00010 */ sw $s0, 0x10($sp) -/* C632B4 802425A4 3C108024 */ lui $s0, %hi(D_802441A0_C64EB0) -/* C632B8 802425A8 261041A0 */ addiu $s0, $s0, %lo(D_802441A0_C64EB0) -/* C632BC 802425AC AFBF0018 */ sw $ra, 0x18($sp) -/* C632C0 802425B0 AFB10014 */ sw $s1, 0x14($sp) -/* C632C4 802425B4 8E020000 */ lw $v0, ($s0) -/* C632C8 802425B8 14400010 */ bnez $v0, .L802425FC -/* C632CC 802425BC 0080882D */ daddu $s1, $a0, $zero -/* C632D0 802425C0 0C00AB39 */ jal heap_malloc -/* C632D4 802425C4 24040040 */ addiu $a0, $zero, 0x40 -/* C632D8 802425C8 AE020000 */ sw $v0, ($s0) -/* C632DC 802425CC 0000182D */ daddu $v1, $zero, $zero -/* C632E0 802425D0 0040282D */ daddu $a1, $v0, $zero -/* C632E4 802425D4 0220202D */ daddu $a0, $s1, $zero -.L802425D8: -/* C632E8 802425D8 8C820084 */ lw $v0, 0x84($a0) -/* C632EC 802425DC 24840004 */ addiu $a0, $a0, 4 -/* C632F0 802425E0 24630001 */ addiu $v1, $v1, 1 -/* C632F4 802425E4 ACA20000 */ sw $v0, ($a1) -/* C632F8 802425E8 28620010 */ slti $v0, $v1, 0x10 -/* C632FC 802425EC 1440FFFA */ bnez $v0, .L802425D8 -/* C63300 802425F0 24A50004 */ addiu $a1, $a1, 4 -/* C63304 802425F4 0809098E */ j .L80242638 -/* C63308 802425F8 00000000 */ nop -.L802425FC: -/* C6330C 802425FC 0000182D */ daddu $v1, $zero, $zero -/* C63310 80242600 0040282D */ daddu $a1, $v0, $zero -/* C63314 80242604 0220202D */ daddu $a0, $s1, $zero -.L80242608: -/* C63318 80242608 8CA20000 */ lw $v0, ($a1) -/* C6331C 8024260C 24A50004 */ addiu $a1, $a1, 4 -/* C63320 80242610 24630001 */ addiu $v1, $v1, 1 -/* C63324 80242614 AC820084 */ sw $v0, 0x84($a0) -/* C63328 80242618 28620010 */ slti $v0, $v1, 0x10 -/* C6332C 8024261C 1440FFFA */ bnez $v0, .L80242608 -/* C63330 80242620 24840004 */ addiu $a0, $a0, 4 -/* C63334 80242624 3C108024 */ lui $s0, %hi(D_802441A0_C64EB0) -/* C63338 80242628 261041A0 */ addiu $s0, $s0, %lo(D_802441A0_C64EB0) -/* C6333C 8024262C 0C00AB4B */ jal heap_free -/* C63340 80242630 8E040000 */ lw $a0, ($s0) -/* C63344 80242634 AE000000 */ sw $zero, ($s0) -.L80242638: -/* C63348 80242638 8FBF0018 */ lw $ra, 0x18($sp) -/* C6334C 8024263C 8FB10014 */ lw $s1, 0x14($sp) -/* C63350 80242640 8FB00010 */ lw $s0, 0x10($sp) -/* C63354 80242644 24020002 */ addiu $v0, $zero, 2 -/* C63358 80242648 03E00008 */ jr $ra -/* C6335C 8024264C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71C10/func_80240790_C71C10.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71C10/func_80240790_C71C10.s deleted file mode 100644 index 05ac16572f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71C10/func_80240790_C71C10.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240790_C71C10 -/* C71C10 80240790 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C71C14 80240794 AFB00010 */ sw $s0, 0x10($sp) -/* C71C18 80240798 3C108024 */ lui $s0, %hi(D_80244BB0_C76030) -/* C71C1C 8024079C 26104BB0 */ addiu $s0, $s0, %lo(D_80244BB0_C76030) -/* C71C20 802407A0 AFBF0018 */ sw $ra, 0x18($sp) -/* C71C24 802407A4 AFB10014 */ sw $s1, 0x14($sp) -/* C71C28 802407A8 8E020000 */ lw $v0, ($s0) -/* C71C2C 802407AC 14400010 */ bnez $v0, .L802407F0 -/* C71C30 802407B0 0080882D */ daddu $s1, $a0, $zero -/* C71C34 802407B4 0C00AB39 */ jal heap_malloc -/* C71C38 802407B8 24040040 */ addiu $a0, $zero, 0x40 -/* C71C3C 802407BC AE020000 */ sw $v0, ($s0) -/* C71C40 802407C0 0000182D */ daddu $v1, $zero, $zero -/* C71C44 802407C4 0040282D */ daddu $a1, $v0, $zero -/* C71C48 802407C8 0220202D */ daddu $a0, $s1, $zero -.L802407CC: -/* C71C4C 802407CC 8C820084 */ lw $v0, 0x84($a0) -/* C71C50 802407D0 24840004 */ addiu $a0, $a0, 4 -/* C71C54 802407D4 24630001 */ addiu $v1, $v1, 1 -/* C71C58 802407D8 ACA20000 */ sw $v0, ($a1) -/* C71C5C 802407DC 28620010 */ slti $v0, $v1, 0x10 -/* C71C60 802407E0 1440FFFA */ bnez $v0, .L802407CC -/* C71C64 802407E4 24A50004 */ addiu $a1, $a1, 4 -/* C71C68 802407E8 0809020B */ j .L8024082C -/* C71C6C 802407EC 00000000 */ nop -.L802407F0: -/* C71C70 802407F0 0000182D */ daddu $v1, $zero, $zero -/* C71C74 802407F4 0040282D */ daddu $a1, $v0, $zero -/* C71C78 802407F8 0220202D */ daddu $a0, $s1, $zero -.L802407FC: -/* C71C7C 802407FC 8CA20000 */ lw $v0, ($a1) -/* C71C80 80240800 24A50004 */ addiu $a1, $a1, 4 -/* C71C84 80240804 24630001 */ addiu $v1, $v1, 1 -/* C71C88 80240808 AC820084 */ sw $v0, 0x84($a0) -/* C71C8C 8024080C 28620010 */ slti $v0, $v1, 0x10 -/* C71C90 80240810 1440FFFA */ bnez $v0, .L802407FC -/* C71C94 80240814 24840004 */ addiu $a0, $a0, 4 -/* C71C98 80240818 3C108024 */ lui $s0, %hi(D_80244BB0_C76030) -/* C71C9C 8024081C 26104BB0 */ addiu $s0, $s0, %lo(D_80244BB0_C76030) -/* C71CA0 80240820 0C00AB4B */ jal heap_free -/* C71CA4 80240824 8E040000 */ lw $a0, ($s0) -/* C71CA8 80240828 AE000000 */ sw $zero, ($s0) -.L8024082C: -/* C71CAC 8024082C 8FBF0018 */ lw $ra, 0x18($sp) -/* C71CB0 80240830 8FB10014 */ lw $s1, 0x14($sp) -/* C71CB4 80240834 8FB00010 */ lw $s0, 0x10($sp) -/* C71CB8 80240838 24020002 */ addiu $v0, $zero, 2 -/* C71CBC 8024083C 03E00008 */ jr $ra -/* C71CC0 80240840 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802432AC_C79F8C.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802432AC_C79F8C.s deleted file mode 100644 index a8193b796b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802432AC_C79F8C.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802432AC_C79F8C -/* C79F8C 802432AC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C79F90 802432B0 AFB00010 */ sw $s0, 0x10($sp) -/* C79F94 802432B4 3C108024 */ lui $s0, %hi(D_80245250_C7BF30) -/* C79F98 802432B8 26105250 */ addiu $s0, $s0, %lo(D_80245250_C7BF30) -/* C79F9C 802432BC AFBF0018 */ sw $ra, 0x18($sp) -/* C79FA0 802432C0 AFB10014 */ sw $s1, 0x14($sp) -/* C79FA4 802432C4 8E020000 */ lw $v0, ($s0) -/* C79FA8 802432C8 14400010 */ bnez $v0, .L8024330C -/* C79FAC 802432CC 0080882D */ daddu $s1, $a0, $zero -/* C79FB0 802432D0 0C00AB39 */ jal heap_malloc -/* C79FB4 802432D4 24040040 */ addiu $a0, $zero, 0x40 -/* C79FB8 802432D8 AE020000 */ sw $v0, ($s0) -/* C79FBC 802432DC 0000182D */ daddu $v1, $zero, $zero -/* C79FC0 802432E0 0040282D */ daddu $a1, $v0, $zero -/* C79FC4 802432E4 0220202D */ daddu $a0, $s1, $zero -.L802432E8: -/* C79FC8 802432E8 8C820084 */ lw $v0, 0x84($a0) -/* C79FCC 802432EC 24840004 */ addiu $a0, $a0, 4 -/* C79FD0 802432F0 24630001 */ addiu $v1, $v1, 1 -/* C79FD4 802432F4 ACA20000 */ sw $v0, ($a1) -/* C79FD8 802432F8 28620010 */ slti $v0, $v1, 0x10 -/* C79FDC 802432FC 1440FFFA */ bnez $v0, .L802432E8 -/* C79FE0 80243300 24A50004 */ addiu $a1, $a1, 4 -/* C79FE4 80243304 08090CD2 */ j .L80243348 -/* C79FE8 80243308 00000000 */ nop -.L8024330C: -/* C79FEC 8024330C 0000182D */ daddu $v1, $zero, $zero -/* C79FF0 80243310 0040282D */ daddu $a1, $v0, $zero -/* C79FF4 80243314 0220202D */ daddu $a0, $s1, $zero -.L80243318: -/* C79FF8 80243318 8CA20000 */ lw $v0, ($a1) -/* C79FFC 8024331C 24A50004 */ addiu $a1, $a1, 4 -/* C7A000 80243320 24630001 */ addiu $v1, $v1, 1 -/* C7A004 80243324 AC820084 */ sw $v0, 0x84($a0) -/* C7A008 80243328 28620010 */ slti $v0, $v1, 0x10 -/* C7A00C 8024332C 1440FFFA */ bnez $v0, .L80243318 -/* C7A010 80243330 24840004 */ addiu $a0, $a0, 4 -/* C7A014 80243334 3C108024 */ lui $s0, %hi(D_80245250_C7BF30) -/* C7A018 80243338 26105250 */ addiu $s0, $s0, %lo(D_80245250_C7BF30) -/* C7A01C 8024333C 0C00AB4B */ jal heap_free -/* C7A020 80243340 8E040000 */ lw $a0, ($s0) -/* C7A024 80243344 AE000000 */ sw $zero, ($s0) -.L80243348: -/* C7A028 80243348 8FBF0018 */ lw $ra, 0x18($sp) -/* C7A02C 8024334C 8FB10014 */ lw $s1, 0x14($sp) -/* C7A030 80243350 8FB00010 */ lw $s0, 0x10($sp) -/* C7A034 80243354 24020002 */ addiu $v0, $zero, 2 -/* C7A038 80243358 03E00008 */ jr $ra -/* C7A03C 8024335C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024259C_C8804C.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024259C_C8804C.s deleted file mode 100644 index adcba3a0f3..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024259C_C8804C.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024259C_C8804C -/* C8804C 8024259C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C88050 802425A0 AFB00010 */ sw $s0, 0x10($sp) -/* C88054 802425A4 3C108024 */ lui $s0, %hi(D_80244074_C89B24) -/* C88058 802425A8 26104074 */ addiu $s0, $s0, %lo(D_80244074_C89B24) -/* C8805C 802425AC AFBF0018 */ sw $ra, 0x18($sp) -/* C88060 802425B0 AFB10014 */ sw $s1, 0x14($sp) -/* C88064 802425B4 8E020000 */ lw $v0, ($s0) -/* C88068 802425B8 14400010 */ bnez $v0, .L802425FC -/* C8806C 802425BC 0080882D */ daddu $s1, $a0, $zero -/* C88070 802425C0 0C00AB39 */ jal heap_malloc -/* C88074 802425C4 24040040 */ addiu $a0, $zero, 0x40 -/* C88078 802425C8 AE020000 */ sw $v0, ($s0) -/* C8807C 802425CC 0000182D */ daddu $v1, $zero, $zero -/* C88080 802425D0 0040282D */ daddu $a1, $v0, $zero -/* C88084 802425D4 0220202D */ daddu $a0, $s1, $zero -.L802425D8: -/* C88088 802425D8 8C820084 */ lw $v0, 0x84($a0) -/* C8808C 802425DC 24840004 */ addiu $a0, $a0, 4 -/* C88090 802425E0 24630001 */ addiu $v1, $v1, 1 -/* C88094 802425E4 ACA20000 */ sw $v0, ($a1) -/* C88098 802425E8 28620010 */ slti $v0, $v1, 0x10 -/* C8809C 802425EC 1440FFFA */ bnez $v0, .L802425D8 -/* C880A0 802425F0 24A50004 */ addiu $a1, $a1, 4 -/* C880A4 802425F4 0809098E */ j .L80242638 -/* C880A8 802425F8 00000000 */ nop -.L802425FC: -/* C880AC 802425FC 0000182D */ daddu $v1, $zero, $zero -/* C880B0 80242600 0040282D */ daddu $a1, $v0, $zero -/* C880B4 80242604 0220202D */ daddu $a0, $s1, $zero -.L80242608: -/* C880B8 80242608 8CA20000 */ lw $v0, ($a1) -/* C880BC 8024260C 24A50004 */ addiu $a1, $a1, 4 -/* C880C0 80242610 24630001 */ addiu $v1, $v1, 1 -/* C880C4 80242614 AC820084 */ sw $v0, 0x84($a0) -/* C880C8 80242618 28620010 */ slti $v0, $v1, 0x10 -/* C880CC 8024261C 1440FFFA */ bnez $v0, .L80242608 -/* C880D0 80242620 24840004 */ addiu $a0, $a0, 4 -/* C880D4 80242624 3C108024 */ lui $s0, %hi(D_80244074_C89B24) -/* C880D8 80242628 26104074 */ addiu $s0, $s0, %lo(D_80244074_C89B24) -/* C880DC 8024262C 0C00AB4B */ jal heap_free -/* C880E0 80242630 8E040000 */ lw $a0, ($s0) -/* C880E4 80242634 AE000000 */ sw $zero, ($s0) -.L80242638: -/* C880E8 80242638 8FBF0018 */ lw $ra, 0x18($sp) -/* C880EC 8024263C 8FB10014 */ lw $s1, 0x14($sp) -/* C880F0 80242640 8FB00010 */ lw $s0, 0x10($sp) -/* C880F4 80242644 24020002 */ addiu $v0, $zero, 2 -/* C880F8 80242648 03E00008 */ jr $ra -/* C880FC 8024264C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241468_C8F018.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241468_C8F018.s deleted file mode 100644 index adfe64785e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241468_C8F018.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241468_C8F018 -/* C8F018 80241468 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C8F01C 8024146C AFB00010 */ sw $s0, 0x10($sp) -/* C8F020 80241470 3C108024 */ lui $s0, %hi(D_80243D74_C91924) -/* C8F024 80241474 26103D74 */ addiu $s0, $s0, %lo(D_80243D74_C91924) -/* C8F028 80241478 AFBF0018 */ sw $ra, 0x18($sp) -/* C8F02C 8024147C AFB10014 */ sw $s1, 0x14($sp) -/* C8F030 80241480 8E020000 */ lw $v0, ($s0) -/* C8F034 80241484 14400010 */ bnez $v0, .L802414C8 -/* C8F038 80241488 0080882D */ daddu $s1, $a0, $zero -/* C8F03C 8024148C 0C00AB39 */ jal heap_malloc -/* C8F040 80241490 24040040 */ addiu $a0, $zero, 0x40 -/* C8F044 80241494 AE020000 */ sw $v0, ($s0) -/* C8F048 80241498 0000182D */ daddu $v1, $zero, $zero -/* C8F04C 8024149C 0040282D */ daddu $a1, $v0, $zero -/* C8F050 802414A0 0220202D */ daddu $a0, $s1, $zero -.L802414A4: -/* C8F054 802414A4 8C820084 */ lw $v0, 0x84($a0) -/* C8F058 802414A8 24840004 */ addiu $a0, $a0, 4 -/* C8F05C 802414AC 24630001 */ addiu $v1, $v1, 1 -/* C8F060 802414B0 ACA20000 */ sw $v0, ($a1) -/* C8F064 802414B4 28620010 */ slti $v0, $v1, 0x10 -/* C8F068 802414B8 1440FFFA */ bnez $v0, .L802414A4 -/* C8F06C 802414BC 24A50004 */ addiu $a1, $a1, 4 -/* C8F070 802414C0 08090541 */ j .L80241504 -/* C8F074 802414C4 00000000 */ nop -.L802414C8: -/* C8F078 802414C8 0000182D */ daddu $v1, $zero, $zero -/* C8F07C 802414CC 0040282D */ daddu $a1, $v0, $zero -/* C8F080 802414D0 0220202D */ daddu $a0, $s1, $zero -.L802414D4: -/* C8F084 802414D4 8CA20000 */ lw $v0, ($a1) -/* C8F088 802414D8 24A50004 */ addiu $a1, $a1, 4 -/* C8F08C 802414DC 24630001 */ addiu $v1, $v1, 1 -/* C8F090 802414E0 AC820084 */ sw $v0, 0x84($a0) -/* C8F094 802414E4 28620010 */ slti $v0, $v1, 0x10 -/* C8F098 802414E8 1440FFFA */ bnez $v0, .L802414D4 -/* C8F09C 802414EC 24840004 */ addiu $a0, $a0, 4 -/* C8F0A0 802414F0 3C108024 */ lui $s0, %hi(D_80243D74_C91924) -/* C8F0A4 802414F4 26103D74 */ addiu $s0, $s0, %lo(D_80243D74_C91924) -/* C8F0A8 802414F8 0C00AB4B */ jal heap_free -/* C8F0AC 802414FC 8E040000 */ lw $a0, ($s0) -/* C8F0B0 80241500 AE000000 */ sw $zero, ($s0) -.L80241504: -/* C8F0B4 80241504 8FBF0018 */ lw $ra, 0x18($sp) -/* C8F0B8 80241508 8FB10014 */ lw $s1, 0x14($sp) -/* C8F0BC 8024150C 8FB00010 */ lw $s0, 0x10($sp) -/* C8F0C0 80241510 24020002 */ addiu $v0, $zero, 2 -/* C8F0C4 80241514 03E00008 */ jr $ra -/* C8F0C8 80241518 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_80240310_C96240.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_80240310_C96240.s deleted file mode 100644 index ae397e493c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_80240310_C96240.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240310_C96240 -/* C96240 80240310 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C96244 80240314 AFB00010 */ sw $s0, 0x10($sp) -/* C96248 80240318 3C108024 */ lui $s0, %hi(D_80241780_C976B0) -/* C9624C 8024031C 26101780 */ addiu $s0, $s0, %lo(D_80241780_C976B0) -/* C96250 80240320 AFBF0018 */ sw $ra, 0x18($sp) -/* C96254 80240324 AFB10014 */ sw $s1, 0x14($sp) -/* C96258 80240328 8E020000 */ lw $v0, ($s0) -/* C9625C 8024032C 14400010 */ bnez $v0, .L80240370 -/* C96260 80240330 0080882D */ daddu $s1, $a0, $zero -/* C96264 80240334 0C00AB39 */ jal heap_malloc -/* C96268 80240338 24040040 */ addiu $a0, $zero, 0x40 -/* C9626C 8024033C AE020000 */ sw $v0, ($s0) -/* C96270 80240340 0000182D */ daddu $v1, $zero, $zero -/* C96274 80240344 0040282D */ daddu $a1, $v0, $zero -/* C96278 80240348 0220202D */ daddu $a0, $s1, $zero -.L8024034C: -/* C9627C 8024034C 8C820084 */ lw $v0, 0x84($a0) -/* C96280 80240350 24840004 */ addiu $a0, $a0, 4 -/* C96284 80240354 24630001 */ addiu $v1, $v1, 1 -/* C96288 80240358 ACA20000 */ sw $v0, ($a1) -/* C9628C 8024035C 28620010 */ slti $v0, $v1, 0x10 -/* C96290 80240360 1440FFFA */ bnez $v0, .L8024034C -/* C96294 80240364 24A50004 */ addiu $a1, $a1, 4 -/* C96298 80240368 080900EB */ j .L802403AC -/* C9629C 8024036C 00000000 */ nop -.L80240370: -/* C962A0 80240370 0000182D */ daddu $v1, $zero, $zero -/* C962A4 80240374 0040282D */ daddu $a1, $v0, $zero -/* C962A8 80240378 0220202D */ daddu $a0, $s1, $zero -.L8024037C: -/* C962AC 8024037C 8CA20000 */ lw $v0, ($a1) -/* C962B0 80240380 24A50004 */ addiu $a1, $a1, 4 -/* C962B4 80240384 24630001 */ addiu $v1, $v1, 1 -/* C962B8 80240388 AC820084 */ sw $v0, 0x84($a0) -/* C962BC 8024038C 28620010 */ slti $v0, $v1, 0x10 -/* C962C0 80240390 1440FFFA */ bnez $v0, .L8024037C -/* C962C4 80240394 24840004 */ addiu $a0, $a0, 4 -/* C962C8 80240398 3C108024 */ lui $s0, %hi(D_80241780_C976B0) -/* C962CC 8024039C 26101780 */ addiu $s0, $s0, %lo(D_80241780_C976B0) -/* C962D0 802403A0 0C00AB4B */ jal heap_free -/* C962D4 802403A4 8E040000 */ lw $a0, ($s0) -/* C962D8 802403A8 AE000000 */ sw $zero, ($s0) -.L802403AC: -/* C962DC 802403AC 8FBF0018 */ lw $ra, 0x18($sp) -/* C962E0 802403B0 8FB10014 */ lw $s1, 0x14($sp) -/* C962E4 802403B4 8FB00010 */ lw $s0, 0x10($sp) -/* C962E8 802403B8 24020002 */ addiu $v0, $zero, 2 -/* C962EC 802403BC 03E00008 */ jr $ra -/* C962F0 802403C0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240630_7EB340.s b/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240630_7EB340.s deleted file mode 100644 index 74ebb45f4a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240630_7EB340.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240630_7EB340 -/* 7EB340 80240630 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 7EB344 80240634 AFB00010 */ sw $s0, 0x10($sp) -/* 7EB348 80240638 3C108024 */ lui $s0, %hi(D_80245DC0_7F0AD0) -/* 7EB34C 8024063C 26105DC0 */ addiu $s0, $s0, %lo(D_80245DC0_7F0AD0) -/* 7EB350 80240640 AFBF0018 */ sw $ra, 0x18($sp) -/* 7EB354 80240644 AFB10014 */ sw $s1, 0x14($sp) -/* 7EB358 80240648 8E020000 */ lw $v0, ($s0) -/* 7EB35C 8024064C 14400010 */ bnez $v0, .L80240690 -/* 7EB360 80240650 0080882D */ daddu $s1, $a0, $zero -/* 7EB364 80240654 0C00AB39 */ jal heap_malloc -/* 7EB368 80240658 24040040 */ addiu $a0, $zero, 0x40 -/* 7EB36C 8024065C AE020000 */ sw $v0, ($s0) -/* 7EB370 80240660 0000182D */ daddu $v1, $zero, $zero -/* 7EB374 80240664 0040282D */ daddu $a1, $v0, $zero -/* 7EB378 80240668 0220202D */ daddu $a0, $s1, $zero -.L8024066C: -/* 7EB37C 8024066C 8C820084 */ lw $v0, 0x84($a0) -/* 7EB380 80240670 24840004 */ addiu $a0, $a0, 4 -/* 7EB384 80240674 24630001 */ addiu $v1, $v1, 1 -/* 7EB388 80240678 ACA20000 */ sw $v0, ($a1) -/* 7EB38C 8024067C 28620010 */ slti $v0, $v1, 0x10 -/* 7EB390 80240680 1440FFFA */ bnez $v0, .L8024066C -/* 7EB394 80240684 24A50004 */ addiu $a1, $a1, 4 -/* 7EB398 80240688 080901B3 */ j .L802406CC -/* 7EB39C 8024068C 00000000 */ nop -.L80240690: -/* 7EB3A0 80240690 0000182D */ daddu $v1, $zero, $zero -/* 7EB3A4 80240694 0040282D */ daddu $a1, $v0, $zero -/* 7EB3A8 80240698 0220202D */ daddu $a0, $s1, $zero -.L8024069C: -/* 7EB3AC 8024069C 8CA20000 */ lw $v0, ($a1) -/* 7EB3B0 802406A0 24A50004 */ addiu $a1, $a1, 4 -/* 7EB3B4 802406A4 24630001 */ addiu $v1, $v1, 1 -/* 7EB3B8 802406A8 AC820084 */ sw $v0, 0x84($a0) -/* 7EB3BC 802406AC 28620010 */ slti $v0, $v1, 0x10 -/* 7EB3C0 802406B0 1440FFFA */ bnez $v0, .L8024069C -/* 7EB3C4 802406B4 24840004 */ addiu $a0, $a0, 4 -/* 7EB3C8 802406B8 3C108024 */ lui $s0, %hi(D_80245DC0_7F0AD0) -/* 7EB3CC 802406BC 26105DC0 */ addiu $s0, $s0, %lo(D_80245DC0_7F0AD0) -/* 7EB3D0 802406C0 0C00AB4B */ jal heap_free -/* 7EB3D4 802406C4 8E040000 */ lw $a0, ($s0) -/* 7EB3D8 802406C8 AE000000 */ sw $zero, ($s0) -.L802406CC: -/* 7EB3DC 802406CC 8FBF0018 */ lw $ra, 0x18($sp) -/* 7EB3E0 802406D0 8FB10014 */ lw $s1, 0x14($sp) -/* 7EB3E4 802406D4 8FB00010 */ lw $s0, 0x10($sp) -/* 7EB3E8 802406D8 24020002 */ addiu $v0, $zero, 2 -/* 7EB3EC 802406DC 03E00008 */ jr $ra -/* 7EB3F0 802406E0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243400_7EE110.s b/ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243400_7EE110.s deleted file mode 100644 index 48fcd744cc..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243400_7EE110.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243400_7EE110 -/* 7EE110 80243400 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 7EE114 80243404 AFB00010 */ sw $s0, 0x10($sp) -/* 7EE118 80243408 3C108025 */ lui $s0, %hi(D_8024ECE8_7F99F8) -/* 7EE11C 8024340C 2610ECE8 */ addiu $s0, $s0, %lo(D_8024ECE8_7F99F8) -/* 7EE120 80243410 AFBF0018 */ sw $ra, 0x18($sp) -/* 7EE124 80243414 AFB10014 */ sw $s1, 0x14($sp) -/* 7EE128 80243418 8E020000 */ lw $v0, ($s0) -/* 7EE12C 8024341C 14400010 */ bnez $v0, .L80243460 -/* 7EE130 80243420 0080882D */ daddu $s1, $a0, $zero -/* 7EE134 80243424 0C00AB39 */ jal heap_malloc -/* 7EE138 80243428 24040040 */ addiu $a0, $zero, 0x40 -/* 7EE13C 8024342C AE020000 */ sw $v0, ($s0) -/* 7EE140 80243430 0000182D */ daddu $v1, $zero, $zero -/* 7EE144 80243434 0040282D */ daddu $a1, $v0, $zero -/* 7EE148 80243438 0220202D */ daddu $a0, $s1, $zero -.L8024343C: -/* 7EE14C 8024343C 8C820084 */ lw $v0, 0x84($a0) -/* 7EE150 80243440 24840004 */ addiu $a0, $a0, 4 -/* 7EE154 80243444 24630001 */ addiu $v1, $v1, 1 -/* 7EE158 80243448 ACA20000 */ sw $v0, ($a1) -/* 7EE15C 8024344C 28620010 */ slti $v0, $v1, 0x10 -/* 7EE160 80243450 1440FFFA */ bnez $v0, .L8024343C -/* 7EE164 80243454 24A50004 */ addiu $a1, $a1, 4 -/* 7EE168 80243458 08090D27 */ j .L8024349C -/* 7EE16C 8024345C 00000000 */ nop -.L80243460: -/* 7EE170 80243460 0000182D */ daddu $v1, $zero, $zero -/* 7EE174 80243464 0040282D */ daddu $a1, $v0, $zero -/* 7EE178 80243468 0220202D */ daddu $a0, $s1, $zero -.L8024346C: -/* 7EE17C 8024346C 8CA20000 */ lw $v0, ($a1) -/* 7EE180 80243470 24A50004 */ addiu $a1, $a1, 4 -/* 7EE184 80243474 24630001 */ addiu $v1, $v1, 1 -/* 7EE188 80243478 AC820084 */ sw $v0, 0x84($a0) -/* 7EE18C 8024347C 28620010 */ slti $v0, $v1, 0x10 -/* 7EE190 80243480 1440FFFA */ bnez $v0, .L8024346C -/* 7EE194 80243484 24840004 */ addiu $a0, $a0, 4 -/* 7EE198 80243488 3C108025 */ lui $s0, %hi(D_8024ECE8_7F99F8) -/* 7EE19C 8024348C 2610ECE8 */ addiu $s0, $s0, %lo(D_8024ECE8_7F99F8) -/* 7EE1A0 80243490 0C00AB4B */ jal heap_free -/* 7EE1A4 80243494 8E040000 */ lw $a0, ($s0) -/* 7EE1A8 80243498 AE000000 */ sw $zero, ($s0) -.L8024349C: -/* 7EE1AC 8024349C 8FBF0018 */ lw $ra, 0x18($sp) -/* 7EE1B0 802434A0 8FB10014 */ lw $s1, 0x14($sp) -/* 7EE1B4 802434A4 8FB00010 */ lw $s0, 0x10($sp) -/* 7EE1B8 802434A8 24020002 */ addiu $v0, $zero, 2 -/* 7EE1BC 802434AC 03E00008 */ jr $ra -/* 7EE1C0 802434B0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241F10_802790.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241F10_802790.s deleted file mode 100644 index fb2c565312..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241F10_802790.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241F10_802790 -/* 802790 80241F10 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 802794 80241F14 AFB00010 */ sw $s0, 0x10($sp) -/* 802798 80241F18 3C108025 */ lui $s0, %hi(D_80248C30_8094B0) -/* 80279C 80241F1C 26108C30 */ addiu $s0, $s0, %lo(D_80248C30_8094B0) -/* 8027A0 80241F20 AFBF0018 */ sw $ra, 0x18($sp) -/* 8027A4 80241F24 AFB10014 */ sw $s1, 0x14($sp) -/* 8027A8 80241F28 8E020000 */ lw $v0, ($s0) -/* 8027AC 80241F2C 14400010 */ bnez $v0, .L80241F70 -/* 8027B0 80241F30 0080882D */ daddu $s1, $a0, $zero -/* 8027B4 80241F34 0C00AB39 */ jal heap_malloc -/* 8027B8 80241F38 24040040 */ addiu $a0, $zero, 0x40 -/* 8027BC 80241F3C AE020000 */ sw $v0, ($s0) -/* 8027C0 80241F40 0000182D */ daddu $v1, $zero, $zero -/* 8027C4 80241F44 0040282D */ daddu $a1, $v0, $zero -/* 8027C8 80241F48 0220202D */ daddu $a0, $s1, $zero -.L80241F4C: -/* 8027CC 80241F4C 8C820084 */ lw $v0, 0x84($a0) -/* 8027D0 80241F50 24840004 */ addiu $a0, $a0, 4 -/* 8027D4 80241F54 24630001 */ addiu $v1, $v1, 1 -/* 8027D8 80241F58 ACA20000 */ sw $v0, ($a1) -/* 8027DC 80241F5C 28620010 */ slti $v0, $v1, 0x10 -/* 8027E0 80241F60 1440FFFA */ bnez $v0, .L80241F4C -/* 8027E4 80241F64 24A50004 */ addiu $a1, $a1, 4 -/* 8027E8 80241F68 080907EB */ j .L80241FAC -/* 8027EC 80241F6C 00000000 */ nop -.L80241F70: -/* 8027F0 80241F70 0000182D */ daddu $v1, $zero, $zero -/* 8027F4 80241F74 0040282D */ daddu $a1, $v0, $zero -/* 8027F8 80241F78 0220202D */ daddu $a0, $s1, $zero -.L80241F7C: -/* 8027FC 80241F7C 8CA20000 */ lw $v0, ($a1) -/* 802800 80241F80 24A50004 */ addiu $a1, $a1, 4 -/* 802804 80241F84 24630001 */ addiu $v1, $v1, 1 -/* 802808 80241F88 AC820084 */ sw $v0, 0x84($a0) -/* 80280C 80241F8C 28620010 */ slti $v0, $v1, 0x10 -/* 802810 80241F90 1440FFFA */ bnez $v0, .L80241F7C -/* 802814 80241F94 24840004 */ addiu $a0, $a0, 4 -/* 802818 80241F98 3C108025 */ lui $s0, %hi(D_80248C30_8094B0) -/* 80281C 80241F9C 26108C30 */ addiu $s0, $s0, %lo(D_80248C30_8094B0) -/* 802820 80241FA0 0C00AB4B */ jal heap_free -/* 802824 80241FA4 8E040000 */ lw $a0, ($s0) -/* 802828 80241FA8 AE000000 */ sw $zero, ($s0) -.L80241FAC: -/* 80282C 80241FAC 8FBF0018 */ lw $ra, 0x18($sp) -/* 802830 80241FB0 8FB10014 */ lw $s1, 0x14($sp) -/* 802834 80241FB4 8FB00010 */ lw $s0, 0x10($sp) -/* 802838 80241FB8 24020002 */ addiu $v0, $zero, 2 -/* 80283C 80241FBC 03E00008 */ jr $ra -/* 802840 80241FC0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802417C0_824A80.s b/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802417C0_824A80.s deleted file mode 100644 index e6eff05606..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802417C0_824A80.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802417C0_824A80 -/* 824A80 802417C0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 824A84 802417C4 AFB00010 */ sw $s0, 0x10($sp) -/* 824A88 802417C8 3C108024 */ lui $s0, %hi(D_80246150_829410) -/* 824A8C 802417CC 26106150 */ addiu $s0, $s0, %lo(D_80246150_829410) -/* 824A90 802417D0 AFBF0018 */ sw $ra, 0x18($sp) -/* 824A94 802417D4 AFB10014 */ sw $s1, 0x14($sp) -/* 824A98 802417D8 8E020000 */ lw $v0, ($s0) -/* 824A9C 802417DC 14400010 */ bnez $v0, .L80241820 -/* 824AA0 802417E0 0080882D */ daddu $s1, $a0, $zero -/* 824AA4 802417E4 0C00AB39 */ jal heap_malloc -/* 824AA8 802417E8 24040040 */ addiu $a0, $zero, 0x40 -/* 824AAC 802417EC AE020000 */ sw $v0, ($s0) -/* 824AB0 802417F0 0000182D */ daddu $v1, $zero, $zero -/* 824AB4 802417F4 0040282D */ daddu $a1, $v0, $zero -/* 824AB8 802417F8 0220202D */ daddu $a0, $s1, $zero -.L802417FC: -/* 824ABC 802417FC 8C820084 */ lw $v0, 0x84($a0) -/* 824AC0 80241800 24840004 */ addiu $a0, $a0, 4 -/* 824AC4 80241804 24630001 */ addiu $v1, $v1, 1 -/* 824AC8 80241808 ACA20000 */ sw $v0, ($a1) -/* 824ACC 8024180C 28620010 */ slti $v0, $v1, 0x10 -/* 824AD0 80241810 1440FFFA */ bnez $v0, .L802417FC -/* 824AD4 80241814 24A50004 */ addiu $a1, $a1, 4 -/* 824AD8 80241818 08090617 */ j .L8024185C -/* 824ADC 8024181C 00000000 */ nop -.L80241820: -/* 824AE0 80241820 0000182D */ daddu $v1, $zero, $zero -/* 824AE4 80241824 0040282D */ daddu $a1, $v0, $zero -/* 824AE8 80241828 0220202D */ daddu $a0, $s1, $zero -.L8024182C: -/* 824AEC 8024182C 8CA20000 */ lw $v0, ($a1) -/* 824AF0 80241830 24A50004 */ addiu $a1, $a1, 4 -/* 824AF4 80241834 24630001 */ addiu $v1, $v1, 1 -/* 824AF8 80241838 AC820084 */ sw $v0, 0x84($a0) -/* 824AFC 8024183C 28620010 */ slti $v0, $v1, 0x10 -/* 824B00 80241840 1440FFFA */ bnez $v0, .L8024182C -/* 824B04 80241844 24840004 */ addiu $a0, $a0, 4 -/* 824B08 80241848 3C108024 */ lui $s0, %hi(D_80246150_829410) -/* 824B0C 8024184C 26106150 */ addiu $s0, $s0, %lo(D_80246150_829410) -/* 824B10 80241850 0C00AB4B */ jal heap_free -/* 824B14 80241854 8E040000 */ lw $a0, ($s0) -/* 824B18 80241858 AE000000 */ sw $zero, ($s0) -.L8024185C: -/* 824B1C 8024185C 8FBF0018 */ lw $ra, 0x18($sp) -/* 824B20 80241860 8FB10014 */ lw $s1, 0x14($sp) -/* 824B24 80241864 8FB00010 */ lw $s0, 0x10($sp) -/* 824B28 80241868 24020002 */ addiu $v0, $zero, 2 -/* 824B2C 8024186C 03E00008 */ jr $ra -/* 824B30 80241870 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802404B0_831CB0.s b/ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802404B0_831CB0.s deleted file mode 100644 index e7e091c043..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802404B0_831CB0.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404B0_831CB0 -/* 831CB0 802404B0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 831CB4 802404B4 AFB00010 */ sw $s0, 0x10($sp) -/* 831CB8 802404B8 3C108024 */ lui $s0, %hi(D_80246644_837E44) -/* 831CBC 802404BC 26106644 */ addiu $s0, $s0, %lo(D_80246644_837E44) -/* 831CC0 802404C0 AFBF0018 */ sw $ra, 0x18($sp) -/* 831CC4 802404C4 AFB10014 */ sw $s1, 0x14($sp) -/* 831CC8 802404C8 8E020000 */ lw $v0, ($s0) -/* 831CCC 802404CC 14400010 */ bnez $v0, .L80240510 -/* 831CD0 802404D0 0080882D */ daddu $s1, $a0, $zero -/* 831CD4 802404D4 0C00AB39 */ jal heap_malloc -/* 831CD8 802404D8 24040040 */ addiu $a0, $zero, 0x40 -/* 831CDC 802404DC AE020000 */ sw $v0, ($s0) -/* 831CE0 802404E0 0000182D */ daddu $v1, $zero, $zero -/* 831CE4 802404E4 0040282D */ daddu $a1, $v0, $zero -/* 831CE8 802404E8 0220202D */ daddu $a0, $s1, $zero -.L802404EC: -/* 831CEC 802404EC 8C820084 */ lw $v0, 0x84($a0) -/* 831CF0 802404F0 24840004 */ addiu $a0, $a0, 4 -/* 831CF4 802404F4 24630001 */ addiu $v1, $v1, 1 -/* 831CF8 802404F8 ACA20000 */ sw $v0, ($a1) -/* 831CFC 802404FC 28620010 */ slti $v0, $v1, 0x10 -/* 831D00 80240500 1440FFFA */ bnez $v0, .L802404EC -/* 831D04 80240504 24A50004 */ addiu $a1, $a1, 4 -/* 831D08 80240508 08090153 */ j .L8024054C -/* 831D0C 8024050C 00000000 */ nop -.L80240510: -/* 831D10 80240510 0000182D */ daddu $v1, $zero, $zero -/* 831D14 80240514 0040282D */ daddu $a1, $v0, $zero -/* 831D18 80240518 0220202D */ daddu $a0, $s1, $zero -.L8024051C: -/* 831D1C 8024051C 8CA20000 */ lw $v0, ($a1) -/* 831D20 80240520 24A50004 */ addiu $a1, $a1, 4 -/* 831D24 80240524 24630001 */ addiu $v1, $v1, 1 -/* 831D28 80240528 AC820084 */ sw $v0, 0x84($a0) -/* 831D2C 8024052C 28620010 */ slti $v0, $v1, 0x10 -/* 831D30 80240530 1440FFFA */ bnez $v0, .L8024051C -/* 831D34 80240534 24840004 */ addiu $a0, $a0, 4 -/* 831D38 80240538 3C108024 */ lui $s0, %hi(D_80246644_837E44) -/* 831D3C 8024053C 26106644 */ addiu $s0, $s0, %lo(D_80246644_837E44) -/* 831D40 80240540 0C00AB4B */ jal heap_free -/* 831D44 80240544 8E040000 */ lw $a0, ($s0) -/* 831D48 80240548 AE000000 */ sw $zero, ($s0) -.L8024054C: -/* 831D4C 8024054C 8FBF0018 */ lw $ra, 0x18($sp) -/* 831D50 80240550 8FB10014 */ lw $s1, 0x14($sp) -/* 831D54 80240554 8FB00010 */ lw $s0, 0x10($sp) -/* 831D58 80240558 24020002 */ addiu $v0, $zero, 2 -/* 831D5C 8024055C 03E00008 */ jr $ra -/* 831D60 80240560 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240460_843030.s b/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240460_843030.s deleted file mode 100644 index 945683a23d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240460_843030.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240460_843030 -/* 843030 80240460 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 843034 80240464 AFB00010 */ sw $s0, 0x10($sp) -/* 843038 80240468 3C108024 */ lui $s0, %hi(D_80243FE8_846BB8) -/* 84303C 8024046C 26103FE8 */ addiu $s0, $s0, %lo(D_80243FE8_846BB8) -/* 843040 80240470 AFBF0018 */ sw $ra, 0x18($sp) -/* 843044 80240474 AFB10014 */ sw $s1, 0x14($sp) -/* 843048 80240478 8E020000 */ lw $v0, ($s0) -/* 84304C 8024047C 14400010 */ bnez $v0, .L802404C0 -/* 843050 80240480 0080882D */ daddu $s1, $a0, $zero -/* 843054 80240484 0C00AB39 */ jal heap_malloc -/* 843058 80240488 24040040 */ addiu $a0, $zero, 0x40 -/* 84305C 8024048C AE020000 */ sw $v0, ($s0) -/* 843060 80240490 0000182D */ daddu $v1, $zero, $zero -/* 843064 80240494 0040282D */ daddu $a1, $v0, $zero -/* 843068 80240498 0220202D */ daddu $a0, $s1, $zero -.L8024049C: -/* 84306C 8024049C 8C820084 */ lw $v0, 0x84($a0) -/* 843070 802404A0 24840004 */ addiu $a0, $a0, 4 -/* 843074 802404A4 24630001 */ addiu $v1, $v1, 1 -/* 843078 802404A8 ACA20000 */ sw $v0, ($a1) -/* 84307C 802404AC 28620010 */ slti $v0, $v1, 0x10 -/* 843080 802404B0 1440FFFA */ bnez $v0, .L8024049C -/* 843084 802404B4 24A50004 */ addiu $a1, $a1, 4 -/* 843088 802404B8 0809013F */ j .L802404FC -/* 84308C 802404BC 00000000 */ nop -.L802404C0: -/* 843090 802404C0 0000182D */ daddu $v1, $zero, $zero -/* 843094 802404C4 0040282D */ daddu $a1, $v0, $zero -/* 843098 802404C8 0220202D */ daddu $a0, $s1, $zero -.L802404CC: -/* 84309C 802404CC 8CA20000 */ lw $v0, ($a1) -/* 8430A0 802404D0 24A50004 */ addiu $a1, $a1, 4 -/* 8430A4 802404D4 24630001 */ addiu $v1, $v1, 1 -/* 8430A8 802404D8 AC820084 */ sw $v0, 0x84($a0) -/* 8430AC 802404DC 28620010 */ slti $v0, $v1, 0x10 -/* 8430B0 802404E0 1440FFFA */ bnez $v0, .L802404CC -/* 8430B4 802404E4 24840004 */ addiu $a0, $a0, 4 -/* 8430B8 802404E8 3C108024 */ lui $s0, %hi(D_80243FE8_846BB8) -/* 8430BC 802404EC 26103FE8 */ addiu $s0, $s0, %lo(D_80243FE8_846BB8) -/* 8430C0 802404F0 0C00AB4B */ jal heap_free -/* 8430C4 802404F4 8E040000 */ lw $a0, ($s0) -/* 8430C8 802404F8 AE000000 */ sw $zero, ($s0) -.L802404FC: -/* 8430CC 802404FC 8FBF0018 */ lw $ra, 0x18($sp) -/* 8430D0 80240500 8FB10014 */ lw $s1, 0x14($sp) -/* 8430D4 80240504 8FB00010 */ lw $s0, 0x10($sp) -/* 8430D8 80240508 24020002 */ addiu $v0, $zero, 2 -/* 8430DC 8024050C 03E00008 */ jr $ra -/* 8430E0 80240510 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241320_853490.s b/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241320_853490.s deleted file mode 100644 index b36fc4d07a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241320_853490.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241320_853490 -/* 853490 80241320 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 853494 80241324 AFB00010 */ sw $s0, 0x10($sp) -/* 853498 80241328 3C108024 */ lui $s0, %hi(D_802450B0_857220) -/* 85349C 8024132C 261050B0 */ addiu $s0, $s0, %lo(D_802450B0_857220) -/* 8534A0 80241330 AFBF0018 */ sw $ra, 0x18($sp) -/* 8534A4 80241334 AFB10014 */ sw $s1, 0x14($sp) -/* 8534A8 80241338 8E020000 */ lw $v0, ($s0) -/* 8534AC 8024133C 14400010 */ bnez $v0, .L80241380 -/* 8534B0 80241340 0080882D */ daddu $s1, $a0, $zero -/* 8534B4 80241344 0C00AB39 */ jal heap_malloc -/* 8534B8 80241348 24040040 */ addiu $a0, $zero, 0x40 -/* 8534BC 8024134C AE020000 */ sw $v0, ($s0) -/* 8534C0 80241350 0000182D */ daddu $v1, $zero, $zero -/* 8534C4 80241354 0040282D */ daddu $a1, $v0, $zero -/* 8534C8 80241358 0220202D */ daddu $a0, $s1, $zero -.L8024135C: -/* 8534CC 8024135C 8C820084 */ lw $v0, 0x84($a0) -/* 8534D0 80241360 24840004 */ addiu $a0, $a0, 4 -/* 8534D4 80241364 24630001 */ addiu $v1, $v1, 1 -/* 8534D8 80241368 ACA20000 */ sw $v0, ($a1) -/* 8534DC 8024136C 28620010 */ slti $v0, $v1, 0x10 -/* 8534E0 80241370 1440FFFA */ bnez $v0, .L8024135C -/* 8534E4 80241374 24A50004 */ addiu $a1, $a1, 4 -/* 8534E8 80241378 080904EF */ j .L802413BC -/* 8534EC 8024137C 00000000 */ nop -.L80241380: -/* 8534F0 80241380 0000182D */ daddu $v1, $zero, $zero -/* 8534F4 80241384 0040282D */ daddu $a1, $v0, $zero -/* 8534F8 80241388 0220202D */ daddu $a0, $s1, $zero -.L8024138C: -/* 8534FC 8024138C 8CA20000 */ lw $v0, ($a1) -/* 853500 80241390 24A50004 */ addiu $a1, $a1, 4 -/* 853504 80241394 24630001 */ addiu $v1, $v1, 1 -/* 853508 80241398 AC820084 */ sw $v0, 0x84($a0) -/* 85350C 8024139C 28620010 */ slti $v0, $v1, 0x10 -/* 853510 802413A0 1440FFFA */ bnez $v0, .L8024138C -/* 853514 802413A4 24840004 */ addiu $a0, $a0, 4 -/* 853518 802413A8 3C108024 */ lui $s0, %hi(D_802450B0_857220) -/* 85351C 802413AC 261050B0 */ addiu $s0, $s0, %lo(D_802450B0_857220) -/* 853520 802413B0 0C00AB4B */ jal heap_free -/* 853524 802413B4 8E040000 */ lw $a0, ($s0) -/* 853528 802413B8 AE000000 */ sw $zero, ($s0) -.L802413BC: -/* 85352C 802413BC 8FBF0018 */ lw $ra, 0x18($sp) -/* 853530 802413C0 8FB10014 */ lw $s1, 0x14($sp) -/* 853534 802413C4 8FB00010 */ lw $s0, 0x10($sp) -/* 853538 802413C8 24020002 */ addiu $v0, $zero, 2 -/* 85353C 802413CC 03E00008 */ jr $ra -/* 853540 802413D0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80241014_B9E974.s b/ver/us/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80241014_B9E974.s deleted file mode 100644 index 52f427a481..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80241014_B9E974.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241014_B9E974 -/* B9E974 80241014 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B9E978 80241018 AFB00010 */ sw $s0, 0x10($sp) -/* B9E97C 8024101C 3C108024 */ lui $s0, %hi(D_80242614_B9FF74) -/* B9E980 80241020 26102614 */ addiu $s0, $s0, %lo(D_80242614_B9FF74) -/* B9E984 80241024 AFBF0018 */ sw $ra, 0x18($sp) -/* B9E988 80241028 AFB10014 */ sw $s1, 0x14($sp) -/* B9E98C 8024102C 8E020000 */ lw $v0, ($s0) -/* B9E990 80241030 14400010 */ bnez $v0, .L80241074 -/* B9E994 80241034 0080882D */ daddu $s1, $a0, $zero -/* B9E998 80241038 0C00AB39 */ jal heap_malloc -/* B9E99C 8024103C 24040040 */ addiu $a0, $zero, 0x40 -/* B9E9A0 80241040 AE020000 */ sw $v0, ($s0) -/* B9E9A4 80241044 0000182D */ daddu $v1, $zero, $zero -/* B9E9A8 80241048 0040282D */ daddu $a1, $v0, $zero -/* B9E9AC 8024104C 0220202D */ daddu $a0, $s1, $zero -.L80241050: -/* B9E9B0 80241050 8C820084 */ lw $v0, 0x84($a0) -/* B9E9B4 80241054 24840004 */ addiu $a0, $a0, 4 -/* B9E9B8 80241058 24630001 */ addiu $v1, $v1, 1 -/* B9E9BC 8024105C ACA20000 */ sw $v0, ($a1) -/* B9E9C0 80241060 28620010 */ slti $v0, $v1, 0x10 -/* B9E9C4 80241064 1440FFFA */ bnez $v0, .L80241050 -/* B9E9C8 80241068 24A50004 */ addiu $a1, $a1, 4 -/* B9E9CC 8024106C 0809042C */ j .L802410B0 -/* B9E9D0 80241070 00000000 */ nop -.L80241074: -/* B9E9D4 80241074 0000182D */ daddu $v1, $zero, $zero -/* B9E9D8 80241078 0040282D */ daddu $a1, $v0, $zero -/* B9E9DC 8024107C 0220202D */ daddu $a0, $s1, $zero -.L80241080: -/* B9E9E0 80241080 8CA20000 */ lw $v0, ($a1) -/* B9E9E4 80241084 24A50004 */ addiu $a1, $a1, 4 -/* B9E9E8 80241088 24630001 */ addiu $v1, $v1, 1 -/* B9E9EC 8024108C AC820084 */ sw $v0, 0x84($a0) -/* B9E9F0 80241090 28620010 */ slti $v0, $v1, 0x10 -/* B9E9F4 80241094 1440FFFA */ bnez $v0, .L80241080 -/* B9E9F8 80241098 24840004 */ addiu $a0, $a0, 4 -/* B9E9FC 8024109C 3C108024 */ lui $s0, %hi(D_80242614_B9FF74) -/* B9EA00 802410A0 26102614 */ addiu $s0, $s0, %lo(D_80242614_B9FF74) -/* B9EA04 802410A4 0C00AB4B */ jal heap_free -/* B9EA08 802410A8 8E040000 */ lw $a0, ($s0) -/* B9EA0C 802410AC AE000000 */ sw $zero, ($s0) -.L802410B0: -/* B9EA10 802410B0 8FBF0018 */ lw $ra, 0x18($sp) -/* B9EA14 802410B4 8FB10014 */ lw $s1, 0x14($sp) -/* B9EA18 802410B8 8FB00010 */ lw $s0, 0x10($sp) -/* B9EA1C 802410BC 24020002 */ addiu $v0, $zero, 2 -/* B9EA20 802410C0 03E00008 */ jr $ra -/* B9EA24 802410C4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240D68_9C6148.s b/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240D68_9C6148.s deleted file mode 100644 index cd3c49a3d3..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240D68_9C6148.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D68_9C6148 -/* 9C6148 80240D68 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9C614C 80240D6C AFB00010 */ sw $s0, 0x10($sp) -/* 9C6150 80240D70 3C108024 */ lui $s0, %hi(D_80245F44_9CB324) -/* 9C6154 80240D74 26105F44 */ addiu $s0, $s0, %lo(D_80245F44_9CB324) -/* 9C6158 80240D78 AFBF0018 */ sw $ra, 0x18($sp) -/* 9C615C 80240D7C AFB10014 */ sw $s1, 0x14($sp) -/* 9C6160 80240D80 8E020000 */ lw $v0, ($s0) -/* 9C6164 80240D84 14400010 */ bnez $v0, .L80240DC8 -/* 9C6168 80240D88 0080882D */ daddu $s1, $a0, $zero -/* 9C616C 80240D8C 0C00AB39 */ jal heap_malloc -/* 9C6170 80240D90 24040040 */ addiu $a0, $zero, 0x40 -/* 9C6174 80240D94 AE020000 */ sw $v0, ($s0) -/* 9C6178 80240D98 0000182D */ daddu $v1, $zero, $zero -/* 9C617C 80240D9C 0040282D */ daddu $a1, $v0, $zero -/* 9C6180 80240DA0 0220202D */ daddu $a0, $s1, $zero -.L80240DA4: -/* 9C6184 80240DA4 8C820084 */ lw $v0, 0x84($a0) -/* 9C6188 80240DA8 24840004 */ addiu $a0, $a0, 4 -/* 9C618C 80240DAC 24630001 */ addiu $v1, $v1, 1 -/* 9C6190 80240DB0 ACA20000 */ sw $v0, ($a1) -/* 9C6194 80240DB4 28620010 */ slti $v0, $v1, 0x10 -/* 9C6198 80240DB8 1440FFFA */ bnez $v0, .L80240DA4 -/* 9C619C 80240DBC 24A50004 */ addiu $a1, $a1, 4 -/* 9C61A0 80240DC0 08090381 */ j .L80240E04 -/* 9C61A4 80240DC4 00000000 */ nop -.L80240DC8: -/* 9C61A8 80240DC8 0000182D */ daddu $v1, $zero, $zero -/* 9C61AC 80240DCC 0040282D */ daddu $a1, $v0, $zero -/* 9C61B0 80240DD0 0220202D */ daddu $a0, $s1, $zero -.L80240DD4: -/* 9C61B4 80240DD4 8CA20000 */ lw $v0, ($a1) -/* 9C61B8 80240DD8 24A50004 */ addiu $a1, $a1, 4 -/* 9C61BC 80240DDC 24630001 */ addiu $v1, $v1, 1 -/* 9C61C0 80240DE0 AC820084 */ sw $v0, 0x84($a0) -/* 9C61C4 80240DE4 28620010 */ slti $v0, $v1, 0x10 -/* 9C61C8 80240DE8 1440FFFA */ bnez $v0, .L80240DD4 -/* 9C61CC 80240DEC 24840004 */ addiu $a0, $a0, 4 -/* 9C61D0 80240DF0 3C108024 */ lui $s0, %hi(D_80245F44_9CB324) -/* 9C61D4 80240DF4 26105F44 */ addiu $s0, $s0, %lo(D_80245F44_9CB324) -/* 9C61D8 80240DF8 0C00AB4B */ jal heap_free -/* 9C61DC 80240DFC 8E040000 */ lw $a0, ($s0) -/* 9C61E0 80240E00 AE000000 */ sw $zero, ($s0) -.L80240E04: -/* 9C61E4 80240E04 8FBF0018 */ lw $ra, 0x18($sp) -/* 9C61E8 80240E08 8FB10014 */ lw $s1, 0x14($sp) -/* 9C61EC 80240E0C 8FB00010 */ lw $s0, 0x10($sp) -/* 9C61F0 80240E10 24020002 */ addiu $v0, $zero, 2 -/* 9C61F4 80240E14 03E00008 */ jr $ra -/* 9C61F8 80240E18 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_802402E0_9D7300.s b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_802402E0_9D7300.s deleted file mode 100644 index 9b94a4d7b4..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_802402E0_9D7300.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402E0_9D7300 -/* 9D7300 802402E0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9D7304 802402E4 AFB00010 */ sw $s0, 0x10($sp) -/* 9D7308 802402E8 3C108024 */ lui $s0, %hi(D_802453D0_9DC3F0) -/* 9D730C 802402EC 261053D0 */ addiu $s0, $s0, %lo(D_802453D0_9DC3F0) -/* 9D7310 802402F0 AFBF0018 */ sw $ra, 0x18($sp) -/* 9D7314 802402F4 AFB10014 */ sw $s1, 0x14($sp) -/* 9D7318 802402F8 8E020000 */ lw $v0, ($s0) -/* 9D731C 802402FC 14400010 */ bnez $v0, .L80240340 -/* 9D7320 80240300 0080882D */ daddu $s1, $a0, $zero -/* 9D7324 80240304 0C00AB39 */ jal heap_malloc -/* 9D7328 80240308 24040040 */ addiu $a0, $zero, 0x40 -/* 9D732C 8024030C AE020000 */ sw $v0, ($s0) -/* 9D7330 80240310 0000182D */ daddu $v1, $zero, $zero -/* 9D7334 80240314 0040282D */ daddu $a1, $v0, $zero -/* 9D7338 80240318 0220202D */ daddu $a0, $s1, $zero -.L8024031C: -/* 9D733C 8024031C 8C820084 */ lw $v0, 0x84($a0) -/* 9D7340 80240320 24840004 */ addiu $a0, $a0, 4 -/* 9D7344 80240324 24630001 */ addiu $v1, $v1, 1 -/* 9D7348 80240328 ACA20000 */ sw $v0, ($a1) -/* 9D734C 8024032C 28620010 */ slti $v0, $v1, 0x10 -/* 9D7350 80240330 1440FFFA */ bnez $v0, .L8024031C -/* 9D7354 80240334 24A50004 */ addiu $a1, $a1, 4 -/* 9D7358 80240338 080900DF */ j .L8024037C -/* 9D735C 8024033C 00000000 */ nop -.L80240340: -/* 9D7360 80240340 0000182D */ daddu $v1, $zero, $zero -/* 9D7364 80240344 0040282D */ daddu $a1, $v0, $zero -/* 9D7368 80240348 0220202D */ daddu $a0, $s1, $zero -.L8024034C: -/* 9D736C 8024034C 8CA20000 */ lw $v0, ($a1) -/* 9D7370 80240350 24A50004 */ addiu $a1, $a1, 4 -/* 9D7374 80240354 24630001 */ addiu $v1, $v1, 1 -/* 9D7378 80240358 AC820084 */ sw $v0, 0x84($a0) -/* 9D737C 8024035C 28620010 */ slti $v0, $v1, 0x10 -/* 9D7380 80240360 1440FFFA */ bnez $v0, .L8024034C -/* 9D7384 80240364 24840004 */ addiu $a0, $a0, 4 -/* 9D7388 80240368 3C108024 */ lui $s0, %hi(D_802453D0_9DC3F0) -/* 9D738C 8024036C 261053D0 */ addiu $s0, $s0, %lo(D_802453D0_9DC3F0) -/* 9D7390 80240370 0C00AB4B */ jal heap_free -/* 9D7394 80240374 8E040000 */ lw $a0, ($s0) -/* 9D7398 80240378 AE000000 */ sw $zero, ($s0) -.L8024037C: -/* 9D739C 8024037C 8FBF0018 */ lw $ra, 0x18($sp) -/* 9D73A0 80240380 8FB10014 */ lw $s1, 0x14($sp) -/* 9D73A4 80240384 8FB00010 */ lw $s0, 0x10($sp) -/* 9D73A8 80240388 24020002 */ addiu $v0, $zero, 2 -/* 9D73AC 8024038C 03E00008 */ jr $ra -/* 9D73B0 80240390 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241910_9D8930.s b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241910_9D8930.s deleted file mode 100644 index b9946bc7c6..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241910_9D8930.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241910_9D8930 -/* 9D8930 80241910 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9D8934 80241914 AFB00010 */ sw $s0, 0x10($sp) -/* 9D8938 80241918 3C108024 */ lui $s0, %hi(D_802470C8_9DE0E8) -/* 9D893C 8024191C 261070C8 */ addiu $s0, $s0, %lo(D_802470C8_9DE0E8) -/* 9D8940 80241920 AFBF0018 */ sw $ra, 0x18($sp) -/* 9D8944 80241924 AFB10014 */ sw $s1, 0x14($sp) -/* 9D8948 80241928 8E020000 */ lw $v0, ($s0) -/* 9D894C 8024192C 14400010 */ bnez $v0, .L80241970 -/* 9D8950 80241930 0080882D */ daddu $s1, $a0, $zero -/* 9D8954 80241934 0C00AB39 */ jal heap_malloc -/* 9D8958 80241938 24040040 */ addiu $a0, $zero, 0x40 -/* 9D895C 8024193C AE020000 */ sw $v0, ($s0) -/* 9D8960 80241940 0000182D */ daddu $v1, $zero, $zero -/* 9D8964 80241944 0040282D */ daddu $a1, $v0, $zero -/* 9D8968 80241948 0220202D */ daddu $a0, $s1, $zero -.L8024194C: -/* 9D896C 8024194C 8C820084 */ lw $v0, 0x84($a0) -/* 9D8970 80241950 24840004 */ addiu $a0, $a0, 4 -/* 9D8974 80241954 24630001 */ addiu $v1, $v1, 1 -/* 9D8978 80241958 ACA20000 */ sw $v0, ($a1) -/* 9D897C 8024195C 28620010 */ slti $v0, $v1, 0x10 -/* 9D8980 80241960 1440FFFA */ bnez $v0, .L8024194C -/* 9D8984 80241964 24A50004 */ addiu $a1, $a1, 4 -/* 9D8988 80241968 0809066B */ j .L802419AC -/* 9D898C 8024196C 00000000 */ nop -.L80241970: -/* 9D8990 80241970 0000182D */ daddu $v1, $zero, $zero -/* 9D8994 80241974 0040282D */ daddu $a1, $v0, $zero -/* 9D8998 80241978 0220202D */ daddu $a0, $s1, $zero -.L8024197C: -/* 9D899C 8024197C 8CA20000 */ lw $v0, ($a1) -/* 9D89A0 80241980 24A50004 */ addiu $a1, $a1, 4 -/* 9D89A4 80241984 24630001 */ addiu $v1, $v1, 1 -/* 9D89A8 80241988 AC820084 */ sw $v0, 0x84($a0) -/* 9D89AC 8024198C 28620010 */ slti $v0, $v1, 0x10 -/* 9D89B0 80241990 1440FFFA */ bnez $v0, .L8024197C -/* 9D89B4 80241994 24840004 */ addiu $a0, $a0, 4 -/* 9D89B8 80241998 3C108024 */ lui $s0, %hi(D_802470C8_9DE0E8) -/* 9D89BC 8024199C 261070C8 */ addiu $s0, $s0, %lo(D_802470C8_9DE0E8) -/* 9D89C0 802419A0 0C00AB4B */ jal heap_free -/* 9D89C4 802419A4 8E040000 */ lw $a0, ($s0) -/* 9D89C8 802419A8 AE000000 */ sw $zero, ($s0) -.L802419AC: -/* 9D89CC 802419AC 8FBF0018 */ lw $ra, 0x18($sp) -/* 9D89D0 802419B0 8FB10014 */ lw $s1, 0x14($sp) -/* 9D89D4 802419B4 8FB00010 */ lw $s0, 0x10($sp) -/* 9D89D8 802419B8 24020002 */ addiu $v0, $zero, 2 -/* 9D89DC 802419BC 03E00008 */ jr $ra -/* 9D89E0 802419C0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243DB0_9DADD0.s b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243DB0_9DADD0.s deleted file mode 100644 index a73733ecc9..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243DB0_9DADD0.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243DB0_9DADD0 -/* 9DADD0 80243DB0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9DADD4 80243DB4 AFB00010 */ sw $s0, 0x10($sp) -/* 9DADD8 80243DB8 3C108025 */ lui $s0, %hi(D_80252720_9E9740) -/* 9DADDC 80243DBC 26102720 */ addiu $s0, $s0, %lo(D_80252720_9E9740) -/* 9DADE0 80243DC0 AFBF0018 */ sw $ra, 0x18($sp) -/* 9DADE4 80243DC4 AFB10014 */ sw $s1, 0x14($sp) -/* 9DADE8 80243DC8 8E020000 */ lw $v0, ($s0) -/* 9DADEC 80243DCC 14400010 */ bnez $v0, .L80243E10 -/* 9DADF0 80243DD0 0080882D */ daddu $s1, $a0, $zero -/* 9DADF4 80243DD4 0C00AB39 */ jal heap_malloc -/* 9DADF8 80243DD8 24040040 */ addiu $a0, $zero, 0x40 -/* 9DADFC 80243DDC AE020000 */ sw $v0, ($s0) -/* 9DAE00 80243DE0 0000182D */ daddu $v1, $zero, $zero -/* 9DAE04 80243DE4 0040282D */ daddu $a1, $v0, $zero -/* 9DAE08 80243DE8 0220202D */ daddu $a0, $s1, $zero -.L80243DEC: -/* 9DAE0C 80243DEC 8C820084 */ lw $v0, 0x84($a0) -/* 9DAE10 80243DF0 24840004 */ addiu $a0, $a0, 4 -/* 9DAE14 80243DF4 24630001 */ addiu $v1, $v1, 1 -/* 9DAE18 80243DF8 ACA20000 */ sw $v0, ($a1) -/* 9DAE1C 80243DFC 28620010 */ slti $v0, $v1, 0x10 -/* 9DAE20 80243E00 1440FFFA */ bnez $v0, .L80243DEC -/* 9DAE24 80243E04 24A50004 */ addiu $a1, $a1, 4 -/* 9DAE28 80243E08 08090F93 */ j .L80243E4C -/* 9DAE2C 80243E0C 00000000 */ nop -.L80243E10: -/* 9DAE30 80243E10 0000182D */ daddu $v1, $zero, $zero -/* 9DAE34 80243E14 0040282D */ daddu $a1, $v0, $zero -/* 9DAE38 80243E18 0220202D */ daddu $a0, $s1, $zero -.L80243E1C: -/* 9DAE3C 80243E1C 8CA20000 */ lw $v0, ($a1) -/* 9DAE40 80243E20 24A50004 */ addiu $a1, $a1, 4 -/* 9DAE44 80243E24 24630001 */ addiu $v1, $v1, 1 -/* 9DAE48 80243E28 AC820084 */ sw $v0, 0x84($a0) -/* 9DAE4C 80243E2C 28620010 */ slti $v0, $v1, 0x10 -/* 9DAE50 80243E30 1440FFFA */ bnez $v0, .L80243E1C -/* 9DAE54 80243E34 24840004 */ addiu $a0, $a0, 4 -/* 9DAE58 80243E38 3C108025 */ lui $s0, %hi(D_80252720_9E9740) -/* 9DAE5C 80243E3C 26102720 */ addiu $s0, $s0, %lo(D_80252720_9E9740) -/* 9DAE60 80243E40 0C00AB4B */ jal heap_free -/* 9DAE64 80243E44 8E040000 */ lw $a0, ($s0) -/* 9DAE68 80243E48 AE000000 */ sw $zero, ($s0) -.L80243E4C: -/* 9DAE6C 80243E4C 8FBF0018 */ lw $ra, 0x18($sp) -/* 9DAE70 80243E50 8FB10014 */ lw $s1, 0x14($sp) -/* 9DAE74 80243E54 8FB00010 */ lw $s0, 0x10($sp) -/* 9DAE78 80243E58 24020002 */ addiu $v0, $zero, 2 -/* 9DAE7C 80243E5C 03E00008 */ jr $ra -/* 9DAE80 80243E60 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_802407E0_BBD980.s b/ver/us/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_802407E0_BBD980.s deleted file mode 100644 index f7326b88be..0000000000 --- a/ver/us/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_802407E0_BBD980.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407E0_BBD980 -/* BBD980 802407E0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BBD984 802407E4 AFB00010 */ sw $s0, 0x10($sp) -/* BBD988 802407E8 3C108024 */ lui $s0, %hi(D_802440F0_BC1290) -/* BBD98C 802407EC 261040F0 */ addiu $s0, $s0, %lo(D_802440F0_BC1290) -/* BBD990 802407F0 AFBF0018 */ sw $ra, 0x18($sp) -/* BBD994 802407F4 AFB10014 */ sw $s1, 0x14($sp) -/* BBD998 802407F8 8E020000 */ lw $v0, ($s0) -/* BBD99C 802407FC 14400010 */ bnez $v0, .L80240840 -/* BBD9A0 80240800 0080882D */ daddu $s1, $a0, $zero -/* BBD9A4 80240804 0C00AB39 */ jal heap_malloc -/* BBD9A8 80240808 24040040 */ addiu $a0, $zero, 0x40 -/* BBD9AC 8024080C AE020000 */ sw $v0, ($s0) -/* BBD9B0 80240810 0000182D */ daddu $v1, $zero, $zero -/* BBD9B4 80240814 0040282D */ daddu $a1, $v0, $zero -/* BBD9B8 80240818 0220202D */ daddu $a0, $s1, $zero -.L8024081C: -/* BBD9BC 8024081C 8C820084 */ lw $v0, 0x84($a0) -/* BBD9C0 80240820 24840004 */ addiu $a0, $a0, 4 -/* BBD9C4 80240824 24630001 */ addiu $v1, $v1, 1 -/* BBD9C8 80240828 ACA20000 */ sw $v0, ($a1) -/* BBD9CC 8024082C 28620010 */ slti $v0, $v1, 0x10 -/* BBD9D0 80240830 1440FFFA */ bnez $v0, .L8024081C -/* BBD9D4 80240834 24A50004 */ addiu $a1, $a1, 4 -/* BBD9D8 80240838 0809021F */ j .L8024087C -/* BBD9DC 8024083C 00000000 */ nop -.L80240840: -/* BBD9E0 80240840 0000182D */ daddu $v1, $zero, $zero -/* BBD9E4 80240844 0040282D */ daddu $a1, $v0, $zero -/* BBD9E8 80240848 0220202D */ daddu $a0, $s1, $zero -.L8024084C: -/* BBD9EC 8024084C 8CA20000 */ lw $v0, ($a1) -/* BBD9F0 80240850 24A50004 */ addiu $a1, $a1, 4 -/* BBD9F4 80240854 24630001 */ addiu $v1, $v1, 1 -/* BBD9F8 80240858 AC820084 */ sw $v0, 0x84($a0) -/* BBD9FC 8024085C 28620010 */ slti $v0, $v1, 0x10 -/* BBDA00 80240860 1440FFFA */ bnez $v0, .L8024084C -/* BBDA04 80240864 24840004 */ addiu $a0, $a0, 4 -/* BBDA08 80240868 3C108024 */ lui $s0, %hi(D_802440F0_BC1290) -/* BBDA0C 8024086C 261040F0 */ addiu $s0, $s0, %lo(D_802440F0_BC1290) -/* BBDA10 80240870 0C00AB4B */ jal heap_free -/* BBDA14 80240874 8E040000 */ lw $a0, ($s0) -/* BBDA18 80240878 AE000000 */ sw $zero, ($s0) -.L8024087C: -/* BBDA1C 8024087C 8FBF0018 */ lw $ra, 0x18($sp) -/* BBDA20 80240880 8FB10014 */ lw $s1, 0x14($sp) -/* BBDA24 80240884 8FB00010 */ lw $s0, 0x10($sp) -/* BBDA28 80240888 24020002 */ addiu $v0, $zero, 2 -/* BBDA2C 8024088C 03E00008 */ jr $ra -/* BBDA30 80240890 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_80240170_BC43F0.s b/ver/us/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_80240170_BC43F0.s deleted file mode 100644 index 559eb59b03..0000000000 --- a/ver/us/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_80240170_BC43F0.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240170_BC43F0 -/* BC43F0 80240170 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BC43F4 80240174 AFB00010 */ sw $s0, 0x10($sp) -/* BC43F8 80240178 3C108024 */ lui $s0, %hi(D_80242ECC_BC714C) -/* BC43FC 8024017C 26102ECC */ addiu $s0, $s0, %lo(D_80242ECC_BC714C) -/* BC4400 80240180 AFBF0018 */ sw $ra, 0x18($sp) -/* BC4404 80240184 AFB10014 */ sw $s1, 0x14($sp) -/* BC4408 80240188 8E020000 */ lw $v0, ($s0) -/* BC440C 8024018C 14400010 */ bnez $v0, .L802401D0 -/* BC4410 80240190 0080882D */ daddu $s1, $a0, $zero -/* BC4414 80240194 0C00AB39 */ jal heap_malloc -/* BC4418 80240198 24040040 */ addiu $a0, $zero, 0x40 -/* BC441C 8024019C AE020000 */ sw $v0, ($s0) -/* BC4420 802401A0 0000182D */ daddu $v1, $zero, $zero -/* BC4424 802401A4 0040282D */ daddu $a1, $v0, $zero -/* BC4428 802401A8 0220202D */ daddu $a0, $s1, $zero -.L802401AC: -/* BC442C 802401AC 8C820084 */ lw $v0, 0x84($a0) -/* BC4430 802401B0 24840004 */ addiu $a0, $a0, 4 -/* BC4434 802401B4 24630001 */ addiu $v1, $v1, 1 -/* BC4438 802401B8 ACA20000 */ sw $v0, ($a1) -/* BC443C 802401BC 28620010 */ slti $v0, $v1, 0x10 -/* BC4440 802401C0 1440FFFA */ bnez $v0, .L802401AC -/* BC4444 802401C4 24A50004 */ addiu $a1, $a1, 4 -/* BC4448 802401C8 08090083 */ j .L8024020C -/* BC444C 802401CC 00000000 */ nop -.L802401D0: -/* BC4450 802401D0 0000182D */ daddu $v1, $zero, $zero -/* BC4454 802401D4 0040282D */ daddu $a1, $v0, $zero -/* BC4458 802401D8 0220202D */ daddu $a0, $s1, $zero -.L802401DC: -/* BC445C 802401DC 8CA20000 */ lw $v0, ($a1) -/* BC4460 802401E0 24A50004 */ addiu $a1, $a1, 4 -/* BC4464 802401E4 24630001 */ addiu $v1, $v1, 1 -/* BC4468 802401E8 AC820084 */ sw $v0, 0x84($a0) -/* BC446C 802401EC 28620010 */ slti $v0, $v1, 0x10 -/* BC4470 802401F0 1440FFFA */ bnez $v0, .L802401DC -/* BC4474 802401F4 24840004 */ addiu $a0, $a0, 4 -/* BC4478 802401F8 3C108024 */ lui $s0, %hi(D_80242ECC_BC714C) -/* BC447C 802401FC 26102ECC */ addiu $s0, $s0, %lo(D_80242ECC_BC714C) -/* BC4480 80240200 0C00AB4B */ jal heap_free -/* BC4484 80240204 8E040000 */ lw $a0, ($s0) -/* BC4488 80240208 AE000000 */ sw $zero, ($s0) -.L8024020C: -/* BC448C 8024020C 8FBF0018 */ lw $ra, 0x18($sp) -/* BC4490 80240210 8FB10014 */ lw $s1, 0x14($sp) -/* BC4494 80240214 8FB00010 */ lw $s0, 0x10($sp) -/* BC4498 80240218 24020002 */ addiu $v0, $zero, 2 -/* BC449C 8024021C 03E00008 */ jr $ra -/* BC44A0 80240220 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240940_BC87A0.s b/ver/us/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240940_BC87A0.s deleted file mode 100644 index 787e8b85b8..0000000000 --- a/ver/us/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240940_BC87A0.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240940_BC87A0 -/* BC87A0 80240940 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BC87A4 80240944 AFB00010 */ sw $s0, 0x10($sp) -/* BC87A8 80240948 3C108024 */ lui $s0, %hi(D_80243A10_BCB870) -/* BC87AC 8024094C 26103A10 */ addiu $s0, $s0, %lo(D_80243A10_BCB870) -/* BC87B0 80240950 AFBF0018 */ sw $ra, 0x18($sp) -/* BC87B4 80240954 AFB10014 */ sw $s1, 0x14($sp) -/* BC87B8 80240958 8E020000 */ lw $v0, ($s0) -/* BC87BC 8024095C 14400010 */ bnez $v0, .L802409A0 -/* BC87C0 80240960 0080882D */ daddu $s1, $a0, $zero -/* BC87C4 80240964 0C00AB39 */ jal heap_malloc -/* BC87C8 80240968 24040040 */ addiu $a0, $zero, 0x40 -/* BC87CC 8024096C AE020000 */ sw $v0, ($s0) -/* BC87D0 80240970 0000182D */ daddu $v1, $zero, $zero -/* BC87D4 80240974 0040282D */ daddu $a1, $v0, $zero -/* BC87D8 80240978 0220202D */ daddu $a0, $s1, $zero -.L8024097C: -/* BC87DC 8024097C 8C820084 */ lw $v0, 0x84($a0) -/* BC87E0 80240980 24840004 */ addiu $a0, $a0, 4 -/* BC87E4 80240984 24630001 */ addiu $v1, $v1, 1 -/* BC87E8 80240988 ACA20000 */ sw $v0, ($a1) -/* BC87EC 8024098C 28620010 */ slti $v0, $v1, 0x10 -/* BC87F0 80240990 1440FFFA */ bnez $v0, .L8024097C -/* BC87F4 80240994 24A50004 */ addiu $a1, $a1, 4 -/* BC87F8 80240998 08090277 */ j .L802409DC -/* BC87FC 8024099C 00000000 */ nop -.L802409A0: -/* BC8800 802409A0 0000182D */ daddu $v1, $zero, $zero -/* BC8804 802409A4 0040282D */ daddu $a1, $v0, $zero -/* BC8808 802409A8 0220202D */ daddu $a0, $s1, $zero -.L802409AC: -/* BC880C 802409AC 8CA20000 */ lw $v0, ($a1) -/* BC8810 802409B0 24A50004 */ addiu $a1, $a1, 4 -/* BC8814 802409B4 24630001 */ addiu $v1, $v1, 1 -/* BC8818 802409B8 AC820084 */ sw $v0, 0x84($a0) -/* BC881C 802409BC 28620010 */ slti $v0, $v1, 0x10 -/* BC8820 802409C0 1440FFFA */ bnez $v0, .L802409AC -/* BC8824 802409C4 24840004 */ addiu $a0, $a0, 4 -/* BC8828 802409C8 3C108024 */ lui $s0, %hi(D_80243A10_BCB870) -/* BC882C 802409CC 26103A10 */ addiu $s0, $s0, %lo(D_80243A10_BCB870) -/* BC8830 802409D0 0C00AB4B */ jal heap_free -/* BC8834 802409D4 8E040000 */ lw $a0, ($s0) -/* BC8838 802409D8 AE000000 */ sw $zero, ($s0) -.L802409DC: -/* BC883C 802409DC 8FBF0018 */ lw $ra, 0x18($sp) -/* BC8840 802409E0 8FB10014 */ lw $s1, 0x14($sp) -/* BC8844 802409E4 8FB00010 */ lw $s0, 0x10($sp) -/* BC8848 802409E8 24020002 */ addiu $v0, $zero, 2 -/* BC884C 802409EC 03E00008 */ jr $ra -/* BC8850 802409F0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCEBF0/func_80240000_BCEBF0.s b/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCEBF0/func_80240000_BCEBF0.s deleted file mode 100644 index d052810238..0000000000 --- a/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCEBF0/func_80240000_BCEBF0.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_BCEBF0 -/* BCEBF0 80240000 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BCEBF4 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* BCEBF8 80240008 3C108024 */ lui $s0, %hi(D_80241FB0_BD0BA0) -/* BCEBFC 8024000C 26101FB0 */ addiu $s0, $s0, %lo(D_80241FB0_BD0BA0) -/* BCEC00 80240010 AFBF0018 */ sw $ra, 0x18($sp) -/* BCEC04 80240014 AFB10014 */ sw $s1, 0x14($sp) -/* BCEC08 80240018 8E020000 */ lw $v0, ($s0) -/* BCEC0C 8024001C 14400010 */ bnez $v0, .L80240060 -/* BCEC10 80240020 0080882D */ daddu $s1, $a0, $zero -/* BCEC14 80240024 0C00AB39 */ jal heap_malloc -/* BCEC18 80240028 24040040 */ addiu $a0, $zero, 0x40 -/* BCEC1C 8024002C AE020000 */ sw $v0, ($s0) -/* BCEC20 80240030 0000182D */ daddu $v1, $zero, $zero -/* BCEC24 80240034 0040282D */ daddu $a1, $v0, $zero -/* BCEC28 80240038 0220202D */ daddu $a0, $s1, $zero -.L8024003C: -/* BCEC2C 8024003C 8C820084 */ lw $v0, 0x84($a0) -/* BCEC30 80240040 24840004 */ addiu $a0, $a0, 4 -/* BCEC34 80240044 24630001 */ addiu $v1, $v1, 1 -/* BCEC38 80240048 ACA20000 */ sw $v0, ($a1) -/* BCEC3C 8024004C 28620010 */ slti $v0, $v1, 0x10 -/* BCEC40 80240050 1440FFFA */ bnez $v0, .L8024003C -/* BCEC44 80240054 24A50004 */ addiu $a1, $a1, 4 -/* BCEC48 80240058 08090027 */ j .L8024009C -/* BCEC4C 8024005C 00000000 */ nop -.L80240060: -/* BCEC50 80240060 0000182D */ daddu $v1, $zero, $zero -/* BCEC54 80240064 0040282D */ daddu $a1, $v0, $zero -/* BCEC58 80240068 0220202D */ daddu $a0, $s1, $zero -.L8024006C: -/* BCEC5C 8024006C 8CA20000 */ lw $v0, ($a1) -/* BCEC60 80240070 24A50004 */ addiu $a1, $a1, 4 -/* BCEC64 80240074 24630001 */ addiu $v1, $v1, 1 -/* BCEC68 80240078 AC820084 */ sw $v0, 0x84($a0) -/* BCEC6C 8024007C 28620010 */ slti $v0, $v1, 0x10 -/* BCEC70 80240080 1440FFFA */ bnez $v0, .L8024006C -/* BCEC74 80240084 24840004 */ addiu $a0, $a0, 4 -/* BCEC78 80240088 3C108024 */ lui $s0, %hi(D_80241FB0_BD0BA0) -/* BCEC7C 8024008C 26101FB0 */ addiu $s0, $s0, %lo(D_80241FB0_BD0BA0) -/* BCEC80 80240090 0C00AB4B */ jal heap_free -/* BCEC84 80240094 8E040000 */ lw $a0, ($s0) -/* BCEC88 80240098 AE000000 */ sw $zero, ($s0) -.L8024009C: -/* BCEC8C 8024009C 8FBF0018 */ lw $ra, 0x18($sp) -/* BCEC90 802400A0 8FB10014 */ lw $s1, 0x14($sp) -/* BCEC94 802400A4 8FB00010 */ lw $s0, 0x10($sp) -/* BCEC98 802400A8 24020002 */ addiu $v0, $zero, 2 -/* BCEC9C 802400AC 03E00008 */ jr $ra -/* BCECA0 802400B0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240000_DAD400.s b/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240000_DAD400.s deleted file mode 100644 index 53af08b8d4..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240000_DAD400.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_DAD400 -/* DAD400 80240000 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DAD404 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* DAD408 80240008 3C108024 */ lui $s0, %hi(D_80242630_DAFA30) -/* DAD40C 8024000C 26102630 */ addiu $s0, $s0, %lo(D_80242630_DAFA30) -/* DAD410 80240010 AFBF0018 */ sw $ra, 0x18($sp) -/* DAD414 80240014 AFB10014 */ sw $s1, 0x14($sp) -/* DAD418 80240018 8E020000 */ lw $v0, ($s0) -/* DAD41C 8024001C 14400010 */ bnez $v0, .L80240060 -/* DAD420 80240020 0080882D */ daddu $s1, $a0, $zero -/* DAD424 80240024 0C00AB39 */ jal heap_malloc -/* DAD428 80240028 24040040 */ addiu $a0, $zero, 0x40 -/* DAD42C 8024002C AE020000 */ sw $v0, ($s0) -/* DAD430 80240030 0000182D */ daddu $v1, $zero, $zero -/* DAD434 80240034 0040282D */ daddu $a1, $v0, $zero -/* DAD438 80240038 0220202D */ daddu $a0, $s1, $zero -.L8024003C: -/* DAD43C 8024003C 8C820084 */ lw $v0, 0x84($a0) -/* DAD440 80240040 24840004 */ addiu $a0, $a0, 4 -/* DAD444 80240044 24630001 */ addiu $v1, $v1, 1 -/* DAD448 80240048 ACA20000 */ sw $v0, ($a1) -/* DAD44C 8024004C 28620010 */ slti $v0, $v1, 0x10 -/* DAD450 80240050 1440FFFA */ bnez $v0, .L8024003C -/* DAD454 80240054 24A50004 */ addiu $a1, $a1, 4 -/* DAD458 80240058 08090027 */ j .L8024009C -/* DAD45C 8024005C 00000000 */ nop -.L80240060: -/* DAD460 80240060 0000182D */ daddu $v1, $zero, $zero -/* DAD464 80240064 0040282D */ daddu $a1, $v0, $zero -/* DAD468 80240068 0220202D */ daddu $a0, $s1, $zero -.L8024006C: -/* DAD46C 8024006C 8CA20000 */ lw $v0, ($a1) -/* DAD470 80240070 24A50004 */ addiu $a1, $a1, 4 -/* DAD474 80240074 24630001 */ addiu $v1, $v1, 1 -/* DAD478 80240078 AC820084 */ sw $v0, 0x84($a0) -/* DAD47C 8024007C 28620010 */ slti $v0, $v1, 0x10 -/* DAD480 80240080 1440FFFA */ bnez $v0, .L8024006C -/* DAD484 80240084 24840004 */ addiu $a0, $a0, 4 -/* DAD488 80240088 3C108024 */ lui $s0, %hi(D_80242630_DAFA30) -/* DAD48C 8024008C 26102630 */ addiu $s0, $s0, %lo(D_80242630_DAFA30) -/* DAD490 80240090 0C00AB4B */ jal heap_free -/* DAD494 80240094 8E040000 */ lw $a0, ($s0) -/* DAD498 80240098 AE000000 */ sw $zero, ($s0) -.L8024009C: -/* DAD49C 8024009C 8FBF0018 */ lw $ra, 0x18($sp) -/* DAD4A0 802400A0 8FB10014 */ lw $s1, 0x14($sp) -/* DAD4A4 802400A4 8FB00010 */ lw $s0, 0x10($sp) -/* DAD4A8 802400A8 24020002 */ addiu $v0, $zero, 2 -/* DAD4AC 802400AC 03E00008 */ jr $ra -/* DAD4B0 802400B0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_06/DB8180/func_80240870_DB8180.s b/ver/us/asm/nonmatchings/world/area_omo/omo_06/DB8180/func_80240870_DB8180.s deleted file mode 100644 index 150e66688e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_06/DB8180/func_80240870_DB8180.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240870_DB8180 -/* DB8180 80240870 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DB8184 80240874 AFB00010 */ sw $s0, 0x10($sp) -/* DB8188 80240878 3C108024 */ lui $s0, %hi(D_802456C0_DBCFD0) -/* DB818C 8024087C 261056C0 */ addiu $s0, $s0, %lo(D_802456C0_DBCFD0) -/* DB8190 80240880 AFBF0018 */ sw $ra, 0x18($sp) -/* DB8194 80240884 AFB10014 */ sw $s1, 0x14($sp) -/* DB8198 80240888 8E020000 */ lw $v0, ($s0) -/* DB819C 8024088C 14400010 */ bnez $v0, .L802408D0 -/* DB81A0 80240890 0080882D */ daddu $s1, $a0, $zero -/* DB81A4 80240894 0C00AB39 */ jal heap_malloc -/* DB81A8 80240898 24040040 */ addiu $a0, $zero, 0x40 -/* DB81AC 8024089C AE020000 */ sw $v0, ($s0) -/* DB81B0 802408A0 0000182D */ daddu $v1, $zero, $zero -/* DB81B4 802408A4 0040282D */ daddu $a1, $v0, $zero -/* DB81B8 802408A8 0220202D */ daddu $a0, $s1, $zero -.L802408AC: -/* DB81BC 802408AC 8C820084 */ lw $v0, 0x84($a0) -/* DB81C0 802408B0 24840004 */ addiu $a0, $a0, 4 -/* DB81C4 802408B4 24630001 */ addiu $v1, $v1, 1 -/* DB81C8 802408B8 ACA20000 */ sw $v0, ($a1) -/* DB81CC 802408BC 28620010 */ slti $v0, $v1, 0x10 -/* DB81D0 802408C0 1440FFFA */ bnez $v0, .L802408AC -/* DB81D4 802408C4 24A50004 */ addiu $a1, $a1, 4 -/* DB81D8 802408C8 08090243 */ j .L8024090C -/* DB81DC 802408CC 00000000 */ nop -.L802408D0: -/* DB81E0 802408D0 0000182D */ daddu $v1, $zero, $zero -/* DB81E4 802408D4 0040282D */ daddu $a1, $v0, $zero -/* DB81E8 802408D8 0220202D */ daddu $a0, $s1, $zero -.L802408DC: -/* DB81EC 802408DC 8CA20000 */ lw $v0, ($a1) -/* DB81F0 802408E0 24A50004 */ addiu $a1, $a1, 4 -/* DB81F4 802408E4 24630001 */ addiu $v1, $v1, 1 -/* DB81F8 802408E8 AC820084 */ sw $v0, 0x84($a0) -/* DB81FC 802408EC 28620010 */ slti $v0, $v1, 0x10 -/* DB8200 802408F0 1440FFFA */ bnez $v0, .L802408DC -/* DB8204 802408F4 24840004 */ addiu $a0, $a0, 4 -/* DB8208 802408F8 3C108024 */ lui $s0, %hi(D_802456C0_DBCFD0) -/* DB820C 802408FC 261056C0 */ addiu $s0, $s0, %lo(D_802456C0_DBCFD0) -/* DB8210 80240900 0C00AB4B */ jal heap_free -/* DB8214 80240904 8E040000 */ lw $a0, ($s0) -/* DB8218 80240908 AE000000 */ sw $zero, ($s0) -.L8024090C: -/* DB821C 8024090C 8FBF0018 */ lw $ra, 0x18($sp) -/* DB8220 80240910 8FB10014 */ lw $s1, 0x14($sp) -/* DB8224 80240914 8FB00010 */ lw $s0, 0x10($sp) -/* DB8228 80240918 24020002 */ addiu $v0, $zero, 2 -/* DB822C 8024091C 03E00008 */ jr $ra -/* DB8230 80240920 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_80242F20_DC01D0.s b/ver/us/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_80242F20_DC01D0.s deleted file mode 100644 index 5af4437f6c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_80242F20_DC01D0.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242F20_DC01D0 -/* DC01D0 80242F20 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DC01D4 80242F24 AFB00010 */ sw $s0, 0x10($sp) -/* DC01D8 80242F28 3C108024 */ lui $s0, %hi(D_80245E00_DC30B0) -/* DC01DC 80242F2C 26105E00 */ addiu $s0, $s0, %lo(D_80245E00_DC30B0) -/* DC01E0 80242F30 AFBF0018 */ sw $ra, 0x18($sp) -/* DC01E4 80242F34 AFB10014 */ sw $s1, 0x14($sp) -/* DC01E8 80242F38 8E020000 */ lw $v0, ($s0) -/* DC01EC 80242F3C 14400010 */ bnez $v0, .L80242F80 -/* DC01F0 80242F40 0080882D */ daddu $s1, $a0, $zero -/* DC01F4 80242F44 0C00AB39 */ jal heap_malloc -/* DC01F8 80242F48 24040040 */ addiu $a0, $zero, 0x40 -/* DC01FC 80242F4C AE020000 */ sw $v0, ($s0) -/* DC0200 80242F50 0000182D */ daddu $v1, $zero, $zero -/* DC0204 80242F54 0040282D */ daddu $a1, $v0, $zero -/* DC0208 80242F58 0220202D */ daddu $a0, $s1, $zero -.L80242F5C: -/* DC020C 80242F5C 8C820084 */ lw $v0, 0x84($a0) -/* DC0210 80242F60 24840004 */ addiu $a0, $a0, 4 -/* DC0214 80242F64 24630001 */ addiu $v1, $v1, 1 -/* DC0218 80242F68 ACA20000 */ sw $v0, ($a1) -/* DC021C 80242F6C 28620010 */ slti $v0, $v1, 0x10 -/* DC0220 80242F70 1440FFFA */ bnez $v0, .L80242F5C -/* DC0224 80242F74 24A50004 */ addiu $a1, $a1, 4 -/* DC0228 80242F78 08090BEF */ j .L80242FBC -/* DC022C 80242F7C 00000000 */ nop -.L80242F80: -/* DC0230 80242F80 0000182D */ daddu $v1, $zero, $zero -/* DC0234 80242F84 0040282D */ daddu $a1, $v0, $zero -/* DC0238 80242F88 0220202D */ daddu $a0, $s1, $zero -.L80242F8C: -/* DC023C 80242F8C 8CA20000 */ lw $v0, ($a1) -/* DC0240 80242F90 24A50004 */ addiu $a1, $a1, 4 -/* DC0244 80242F94 24630001 */ addiu $v1, $v1, 1 -/* DC0248 80242F98 AC820084 */ sw $v0, 0x84($a0) -/* DC024C 80242F9C 28620010 */ slti $v0, $v1, 0x10 -/* DC0250 80242FA0 1440FFFA */ bnez $v0, .L80242F8C -/* DC0254 80242FA4 24840004 */ addiu $a0, $a0, 4 -/* DC0258 80242FA8 3C108024 */ lui $s0, %hi(D_80245E00_DC30B0) -/* DC025C 80242FAC 26105E00 */ addiu $s0, $s0, %lo(D_80245E00_DC30B0) -/* DC0260 80242FB0 0C00AB4B */ jal heap_free -/* DC0264 80242FB4 8E040000 */ lw $a0, ($s0) -/* DC0268 80242FB8 AE000000 */ sw $zero, ($s0) -.L80242FBC: -/* DC026C 80242FBC 8FBF0018 */ lw $ra, 0x18($sp) -/* DC0270 80242FC0 8FB10014 */ lw $s1, 0x14($sp) -/* DC0274 80242FC4 8FB00010 */ lw $s0, 0x10($sp) -/* DC0278 80242FC8 24020002 */ addiu $v0, $zero, 2 -/* DC027C 80242FCC 03E00008 */ jr $ra -/* DC0280 80242FD0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD3F0/func_80240720_DCD3F0.s b/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD3F0/func_80240720_DCD3F0.s deleted file mode 100644 index 3f83adc390..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD3F0/func_80240720_DCD3F0.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240720_DCD3F0 -/* DCD3F0 80240720 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DCD3F4 80240724 AFB00010 */ sw $s0, 0x10($sp) -/* DCD3F8 80240728 3C108024 */ lui $s0, %hi(D_80247010_DD3CE0) -/* DCD3FC 8024072C 26107010 */ addiu $s0, $s0, %lo(D_80247010_DD3CE0) -/* DCD400 80240730 AFBF0018 */ sw $ra, 0x18($sp) -/* DCD404 80240734 AFB10014 */ sw $s1, 0x14($sp) -/* DCD408 80240738 8E020000 */ lw $v0, ($s0) -/* DCD40C 8024073C 14400010 */ bnez $v0, .L80240780 -/* DCD410 80240740 0080882D */ daddu $s1, $a0, $zero -/* DCD414 80240744 0C00AB39 */ jal heap_malloc -/* DCD418 80240748 24040040 */ addiu $a0, $zero, 0x40 -/* DCD41C 8024074C AE020000 */ sw $v0, ($s0) -/* DCD420 80240750 0000182D */ daddu $v1, $zero, $zero -/* DCD424 80240754 0040282D */ daddu $a1, $v0, $zero -/* DCD428 80240758 0220202D */ daddu $a0, $s1, $zero -.L8024075C: -/* DCD42C 8024075C 8C820084 */ lw $v0, 0x84($a0) -/* DCD430 80240760 24840004 */ addiu $a0, $a0, 4 -/* DCD434 80240764 24630001 */ addiu $v1, $v1, 1 -/* DCD438 80240768 ACA20000 */ sw $v0, ($a1) -/* DCD43C 8024076C 28620010 */ slti $v0, $v1, 0x10 -/* DCD440 80240770 1440FFFA */ bnez $v0, .L8024075C -/* DCD444 80240774 24A50004 */ addiu $a1, $a1, 4 -/* DCD448 80240778 080901EF */ j .L802407BC -/* DCD44C 8024077C 00000000 */ nop -.L80240780: -/* DCD450 80240780 0000182D */ daddu $v1, $zero, $zero -/* DCD454 80240784 0040282D */ daddu $a1, $v0, $zero -/* DCD458 80240788 0220202D */ daddu $a0, $s1, $zero -.L8024078C: -/* DCD45C 8024078C 8CA20000 */ lw $v0, ($a1) -/* DCD460 80240790 24A50004 */ addiu $a1, $a1, 4 -/* DCD464 80240794 24630001 */ addiu $v1, $v1, 1 -/* DCD468 80240798 AC820084 */ sw $v0, 0x84($a0) -/* DCD46C 8024079C 28620010 */ slti $v0, $v1, 0x10 -/* DCD470 802407A0 1440FFFA */ bnez $v0, .L8024078C -/* DCD474 802407A4 24840004 */ addiu $a0, $a0, 4 -/* DCD478 802407A8 3C108024 */ lui $s0, %hi(D_80247010_DD3CE0) -/* DCD47C 802407AC 26107010 */ addiu $s0, $s0, %lo(D_80247010_DD3CE0) -/* DCD480 802407B0 0C00AB4B */ jal heap_free -/* DCD484 802407B4 8E040000 */ lw $a0, ($s0) -/* DCD488 802407B8 AE000000 */ sw $zero, ($s0) -.L802407BC: -/* DCD48C 802407BC 8FBF0018 */ lw $ra, 0x18($sp) -/* DCD490 802407C0 8FB10014 */ lw $s1, 0x14($sp) -/* DCD494 802407C4 8FB00010 */ lw $s0, 0x10($sp) -/* DCD498 802407C8 24020002 */ addiu $v0, $zero, 2 -/* DCD49C 802407CC 03E00008 */ jr $ra -/* DCD4A0 802407D0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_13/DE36C0/func_80241230_DE36C0.s b/ver/us/asm/nonmatchings/world/area_omo/omo_13/DE36C0/func_80241230_DE36C0.s deleted file mode 100644 index 4b7b61acaa..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_13/DE36C0/func_80241230_DE36C0.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241230_DE36C0 -/* DE36C0 80241230 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DE36C4 80241234 AFB00010 */ sw $s0, 0x10($sp) -/* DE36C8 80241238 3C108024 */ lui $s0, %hi(D_80242C70_DE5100) -/* DE36CC 8024123C 26102C70 */ addiu $s0, $s0, %lo(D_80242C70_DE5100) -/* DE36D0 80241240 AFBF0018 */ sw $ra, 0x18($sp) -/* DE36D4 80241244 AFB10014 */ sw $s1, 0x14($sp) -/* DE36D8 80241248 8E020000 */ lw $v0, ($s0) -/* DE36DC 8024124C 14400010 */ bnez $v0, .L80241290 -/* DE36E0 80241250 0080882D */ daddu $s1, $a0, $zero -/* DE36E4 80241254 0C00AB39 */ jal heap_malloc -/* DE36E8 80241258 24040040 */ addiu $a0, $zero, 0x40 -/* DE36EC 8024125C AE020000 */ sw $v0, ($s0) -/* DE36F0 80241260 0000182D */ daddu $v1, $zero, $zero -/* DE36F4 80241264 0040282D */ daddu $a1, $v0, $zero -/* DE36F8 80241268 0220202D */ daddu $a0, $s1, $zero -.L8024126C: -/* DE36FC 8024126C 8C820084 */ lw $v0, 0x84($a0) -/* DE3700 80241270 24840004 */ addiu $a0, $a0, 4 -/* DE3704 80241274 24630001 */ addiu $v1, $v1, 1 -/* DE3708 80241278 ACA20000 */ sw $v0, ($a1) -/* DE370C 8024127C 28620010 */ slti $v0, $v1, 0x10 -/* DE3710 80241280 1440FFFA */ bnez $v0, .L8024126C -/* DE3714 80241284 24A50004 */ addiu $a1, $a1, 4 -/* DE3718 80241288 080904B3 */ j .L802412CC -/* DE371C 8024128C 00000000 */ nop -.L80241290: -/* DE3720 80241290 0000182D */ daddu $v1, $zero, $zero -/* DE3724 80241294 0040282D */ daddu $a1, $v0, $zero -/* DE3728 80241298 0220202D */ daddu $a0, $s1, $zero -.L8024129C: -/* DE372C 8024129C 8CA20000 */ lw $v0, ($a1) -/* DE3730 802412A0 24A50004 */ addiu $a1, $a1, 4 -/* DE3734 802412A4 24630001 */ addiu $v1, $v1, 1 -/* DE3738 802412A8 AC820084 */ sw $v0, 0x84($a0) -/* DE373C 802412AC 28620010 */ slti $v0, $v1, 0x10 -/* DE3740 802412B0 1440FFFA */ bnez $v0, .L8024129C -/* DE3744 802412B4 24840004 */ addiu $a0, $a0, 4 -/* DE3748 802412B8 3C108024 */ lui $s0, %hi(D_80242C70_DE5100) -/* DE374C 802412BC 26102C70 */ addiu $s0, $s0, %lo(D_80242C70_DE5100) -/* DE3750 802412C0 0C00AB4B */ jal heap_free -/* DE3754 802412C4 8E040000 */ lw $a0, ($s0) -/* DE3758 802412C8 AE000000 */ sw $zero, ($s0) -.L802412CC: -/* DE375C 802412CC 8FBF0018 */ lw $ra, 0x18($sp) -/* DE3760 802412D0 8FB10014 */ lw $s1, 0x14($sp) -/* DE3764 802412D4 8FB00010 */ lw $s0, 0x10($sp) -/* DE3768 802412D8 24020002 */ addiu $v0, $zero, 2 -/* DE376C 802412DC 03E00008 */ jr $ra -/* DE3770 802412E0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_80240360_AB0350.s b/ver/us/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_80240360_AB0350.s deleted file mode 100644 index ee500556bb..0000000000 --- a/ver/us/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_80240360_AB0350.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240360_AB0350 -/* AB0350 80240360 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AB0354 80240364 AFB00010 */ sw $s0, 0x10($sp) -/* AB0358 80240368 3C108024 */ lui $s0, %hi(D_802411B8_AB11A8) -/* AB035C 8024036C 261011B8 */ addiu $s0, $s0, %lo(D_802411B8_AB11A8) -/* AB0360 80240370 AFBF0018 */ sw $ra, 0x18($sp) -/* AB0364 80240374 AFB10014 */ sw $s1, 0x14($sp) -/* AB0368 80240378 8E020000 */ lw $v0, ($s0) -/* AB036C 8024037C 14400010 */ bnez $v0, .L802403C0 -/* AB0370 80240380 0080882D */ daddu $s1, $a0, $zero -/* AB0374 80240384 0C00AB39 */ jal heap_malloc -/* AB0378 80240388 24040040 */ addiu $a0, $zero, 0x40 -/* AB037C 8024038C AE020000 */ sw $v0, ($s0) -/* AB0380 80240390 0000182D */ daddu $v1, $zero, $zero -/* AB0384 80240394 0040282D */ daddu $a1, $v0, $zero -/* AB0388 80240398 0220202D */ daddu $a0, $s1, $zero -.L8024039C: -/* AB038C 8024039C 8C820084 */ lw $v0, 0x84($a0) -/* AB0390 802403A0 24840004 */ addiu $a0, $a0, 4 -/* AB0394 802403A4 24630001 */ addiu $v1, $v1, 1 -/* AB0398 802403A8 ACA20000 */ sw $v0, ($a1) -/* AB039C 802403AC 28620010 */ slti $v0, $v1, 0x10 -/* AB03A0 802403B0 1440FFFA */ bnez $v0, .L8024039C -/* AB03A4 802403B4 24A50004 */ addiu $a1, $a1, 4 -/* AB03A8 802403B8 080900FF */ j .L802403FC -/* AB03AC 802403BC 00000000 */ nop -.L802403C0: -/* AB03B0 802403C0 0000182D */ daddu $v1, $zero, $zero -/* AB03B4 802403C4 0040282D */ daddu $a1, $v0, $zero -/* AB03B8 802403C8 0220202D */ daddu $a0, $s1, $zero -.L802403CC: -/* AB03BC 802403CC 8CA20000 */ lw $v0, ($a1) -/* AB03C0 802403D0 24A50004 */ addiu $a1, $a1, 4 -/* AB03C4 802403D4 24630001 */ addiu $v1, $v1, 1 -/* AB03C8 802403D8 AC820084 */ sw $v0, 0x84($a0) -/* AB03CC 802403DC 28620010 */ slti $v0, $v1, 0x10 -/* AB03D0 802403E0 1440FFFA */ bnez $v0, .L802403CC -/* AB03D4 802403E4 24840004 */ addiu $a0, $a0, 4 -/* AB03D8 802403E8 3C108024 */ lui $s0, %hi(D_802411B8_AB11A8) -/* AB03DC 802403EC 261011B8 */ addiu $s0, $s0, %lo(D_802411B8_AB11A8) -/* AB03E0 802403F0 0C00AB4B */ jal heap_free -/* AB03E4 802403F4 8E040000 */ lw $a0, ($s0) -/* AB03E8 802403F8 AE000000 */ sw $zero, ($s0) -.L802403FC: -/* AB03EC 802403FC 8FBF0018 */ lw $ra, 0x18($sp) -/* AB03F0 80240400 8FB10014 */ lw $s1, 0x14($sp) -/* AB03F4 80240404 8FB00010 */ lw $s0, 0x10($sp) -/* AB03F8 80240408 24020002 */ addiu $v0, $zero, 2 -/* AB03FC 8024040C 03E00008 */ jr $ra -/* AB0400 80240410 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240F20_D56AD0.s b/ver/us/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240F20_D56AD0.s deleted file mode 100644 index 2dc2e82bf8..0000000000 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240F20_D56AD0.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F20_D56AD0 -/* D56AD0 80240F20 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D56AD4 80240F24 AFB00010 */ sw $s0, 0x10($sp) -/* D56AD8 80240F28 3C108024 */ lui $s0, %hi(D_80241680_D57230) -/* D56ADC 80240F2C 26101680 */ addiu $s0, $s0, %lo(D_80241680_D57230) -/* D56AE0 80240F30 AFBF0018 */ sw $ra, 0x18($sp) -/* D56AE4 80240F34 AFB10014 */ sw $s1, 0x14($sp) -/* D56AE8 80240F38 8E020000 */ lw $v0, ($s0) -/* D56AEC 80240F3C 14400010 */ bnez $v0, .L80240F80 -/* D56AF0 80240F40 0080882D */ daddu $s1, $a0, $zero -/* D56AF4 80240F44 0C00AB39 */ jal heap_malloc -/* D56AF8 80240F48 24040040 */ addiu $a0, $zero, 0x40 -/* D56AFC 80240F4C AE020000 */ sw $v0, ($s0) -/* D56B00 80240F50 0000182D */ daddu $v1, $zero, $zero -/* D56B04 80240F54 0040282D */ daddu $a1, $v0, $zero -/* D56B08 80240F58 0220202D */ daddu $a0, $s1, $zero -.L80240F5C: -/* D56B0C 80240F5C 8C820084 */ lw $v0, 0x84($a0) -/* D56B10 80240F60 24840004 */ addiu $a0, $a0, 4 -/* D56B14 80240F64 24630001 */ addiu $v1, $v1, 1 -/* D56B18 80240F68 ACA20000 */ sw $v0, ($a1) -/* D56B1C 80240F6C 28620010 */ slti $v0, $v1, 0x10 -/* D56B20 80240F70 1440FFFA */ bnez $v0, .L80240F5C -/* D56B24 80240F74 24A50004 */ addiu $a1, $a1, 4 -/* D56B28 80240F78 080903EF */ j .L80240FBC -/* D56B2C 80240F7C 00000000 */ nop -.L80240F80: -/* D56B30 80240F80 0000182D */ daddu $v1, $zero, $zero -/* D56B34 80240F84 0040282D */ daddu $a1, $v0, $zero -/* D56B38 80240F88 0220202D */ daddu $a0, $s1, $zero -.L80240F8C: -/* D56B3C 80240F8C 8CA20000 */ lw $v0, ($a1) -/* D56B40 80240F90 24A50004 */ addiu $a1, $a1, 4 -/* D56B44 80240F94 24630001 */ addiu $v1, $v1, 1 -/* D56B48 80240F98 AC820084 */ sw $v0, 0x84($a0) -/* D56B4C 80240F9C 28620010 */ slti $v0, $v1, 0x10 -/* D56B50 80240FA0 1440FFFA */ bnez $v0, .L80240F8C -/* D56B54 80240FA4 24840004 */ addiu $a0, $a0, 4 -/* D56B58 80240FA8 3C108024 */ lui $s0, %hi(D_80241680_D57230) -/* D56B5C 80240FAC 26101680 */ addiu $s0, $s0, %lo(D_80241680_D57230) -/* D56B60 80240FB0 0C00AB4B */ jal heap_free -/* D56B64 80240FB4 8E040000 */ lw $a0, ($s0) -/* D56B68 80240FB8 AE000000 */ sw $zero, ($s0) -.L80240FBC: -/* D56B6C 80240FBC 8FBF0018 */ lw $ra, 0x18($sp) -/* D56B70 80240FC0 8FB10014 */ lw $s1, 0x14($sp) -/* D56B74 80240FC4 8FB00010 */ lw $s0, 0x10($sp) -/* D56B78 80240FC8 24020002 */ addiu $v0, $zero, 2 -/* D56B7C 80240FCC 03E00008 */ jr $ra -/* D56B80 80240FD0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240F20_D62420.s b/ver/us/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240F20_D62420.s deleted file mode 100644 index 199394d5ad..0000000000 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240F20_D62420.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F20_D62420 -/* D62420 80240F20 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D62424 80240F24 AFB00010 */ sw $s0, 0x10($sp) -/* D62428 80240F28 3C108024 */ lui $s0, %hi(D_80241610_D62B10) -/* D6242C 80240F2C 26101610 */ addiu $s0, $s0, %lo(D_80241610_D62B10) -/* D62430 80240F30 AFBF0018 */ sw $ra, 0x18($sp) -/* D62434 80240F34 AFB10014 */ sw $s1, 0x14($sp) -/* D62438 80240F38 8E020000 */ lw $v0, ($s0) -/* D6243C 80240F3C 14400010 */ bnez $v0, .L80240F80 -/* D62440 80240F40 0080882D */ daddu $s1, $a0, $zero -/* D62444 80240F44 0C00AB39 */ jal heap_malloc -/* D62448 80240F48 24040040 */ addiu $a0, $zero, 0x40 -/* D6244C 80240F4C AE020000 */ sw $v0, ($s0) -/* D62450 80240F50 0000182D */ daddu $v1, $zero, $zero -/* D62454 80240F54 0040282D */ daddu $a1, $v0, $zero -/* D62458 80240F58 0220202D */ daddu $a0, $s1, $zero -.L80240F5C: -/* D6245C 80240F5C 8C820084 */ lw $v0, 0x84($a0) -/* D62460 80240F60 24840004 */ addiu $a0, $a0, 4 -/* D62464 80240F64 24630001 */ addiu $v1, $v1, 1 -/* D62468 80240F68 ACA20000 */ sw $v0, ($a1) -/* D6246C 80240F6C 28620010 */ slti $v0, $v1, 0x10 -/* D62470 80240F70 1440FFFA */ bnez $v0, .L80240F5C -/* D62474 80240F74 24A50004 */ addiu $a1, $a1, 4 -/* D62478 80240F78 080903EF */ j .L80240FBC -/* D6247C 80240F7C 00000000 */ nop -.L80240F80: -/* D62480 80240F80 0000182D */ daddu $v1, $zero, $zero -/* D62484 80240F84 0040282D */ daddu $a1, $v0, $zero -/* D62488 80240F88 0220202D */ daddu $a0, $s1, $zero -.L80240F8C: -/* D6248C 80240F8C 8CA20000 */ lw $v0, ($a1) -/* D62490 80240F90 24A50004 */ addiu $a1, $a1, 4 -/* D62494 80240F94 24630001 */ addiu $v1, $v1, 1 -/* D62498 80240F98 AC820084 */ sw $v0, 0x84($a0) -/* D6249C 80240F9C 28620010 */ slti $v0, $v1, 0x10 -/* D624A0 80240FA0 1440FFFA */ bnez $v0, .L80240F8C -/* D624A4 80240FA4 24840004 */ addiu $a0, $a0, 4 -/* D624A8 80240FA8 3C108024 */ lui $s0, %hi(D_80241610_D62B10) -/* D624AC 80240FAC 26101610 */ addiu $s0, $s0, %lo(D_80241610_D62B10) -/* D624B0 80240FB0 0C00AB4B */ jal heap_free -/* D624B4 80240FB4 8E040000 */ lw $a0, ($s0) -/* D624B8 80240FB8 AE000000 */ sw $zero, ($s0) -.L80240FBC: -/* D624BC 80240FBC 8FBF0018 */ lw $ra, 0x18($sp) -/* D624C0 80240FC0 8FB10014 */ lw $s1, 0x14($sp) -/* D624C4 80240FC4 8FB00010 */ lw $s0, 0x10($sp) -/* D624C8 80240FC8 24020002 */ addiu $v0, $zero, 2 -/* D624CC 80240FCC 03E00008 */ jr $ra -/* D624D0 80240FD0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240F50_D63C60.s b/ver/us/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240F50_D63C60.s deleted file mode 100644 index 22b1aae396..0000000000 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240F50_D63C60.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F50_D63C60 -/* D63C60 80240F50 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D63C64 80240F54 AFB00010 */ sw $s0, 0x10($sp) -/* D63C68 80240F58 3C108024 */ lui $s0, %hi(D_802416B0_D643C0) -/* D63C6C 80240F5C 261016B0 */ addiu $s0, $s0, %lo(D_802416B0_D643C0) -/* D63C70 80240F60 AFBF0018 */ sw $ra, 0x18($sp) -/* D63C74 80240F64 AFB10014 */ sw $s1, 0x14($sp) -/* D63C78 80240F68 8E020000 */ lw $v0, ($s0) -/* D63C7C 80240F6C 14400010 */ bnez $v0, .L80240FB0 -/* D63C80 80240F70 0080882D */ daddu $s1, $a0, $zero -/* D63C84 80240F74 0C00AB39 */ jal heap_malloc -/* D63C88 80240F78 24040040 */ addiu $a0, $zero, 0x40 -/* D63C8C 80240F7C AE020000 */ sw $v0, ($s0) -/* D63C90 80240F80 0000182D */ daddu $v1, $zero, $zero -/* D63C94 80240F84 0040282D */ daddu $a1, $v0, $zero -/* D63C98 80240F88 0220202D */ daddu $a0, $s1, $zero -.L80240F8C: -/* D63C9C 80240F8C 8C820084 */ lw $v0, 0x84($a0) -/* D63CA0 80240F90 24840004 */ addiu $a0, $a0, 4 -/* D63CA4 80240F94 24630001 */ addiu $v1, $v1, 1 -/* D63CA8 80240F98 ACA20000 */ sw $v0, ($a1) -/* D63CAC 80240F9C 28620010 */ slti $v0, $v1, 0x10 -/* D63CB0 80240FA0 1440FFFA */ bnez $v0, .L80240F8C -/* D63CB4 80240FA4 24A50004 */ addiu $a1, $a1, 4 -/* D63CB8 80240FA8 080903FB */ j .L80240FEC -/* D63CBC 80240FAC 00000000 */ nop -.L80240FB0: -/* D63CC0 80240FB0 0000182D */ daddu $v1, $zero, $zero -/* D63CC4 80240FB4 0040282D */ daddu $a1, $v0, $zero -/* D63CC8 80240FB8 0220202D */ daddu $a0, $s1, $zero -.L80240FBC: -/* D63CCC 80240FBC 8CA20000 */ lw $v0, ($a1) -/* D63CD0 80240FC0 24A50004 */ addiu $a1, $a1, 4 -/* D63CD4 80240FC4 24630001 */ addiu $v1, $v1, 1 -/* D63CD8 80240FC8 AC820084 */ sw $v0, 0x84($a0) -/* D63CDC 80240FCC 28620010 */ slti $v0, $v1, 0x10 -/* D63CE0 80240FD0 1440FFFA */ bnez $v0, .L80240FBC -/* D63CE4 80240FD4 24840004 */ addiu $a0, $a0, 4 -/* D63CE8 80240FD8 3C108024 */ lui $s0, %hi(D_802416B0_D643C0) -/* D63CEC 80240FDC 261016B0 */ addiu $s0, $s0, %lo(D_802416B0_D643C0) -/* D63CF0 80240FE0 0C00AB4B */ jal heap_free -/* D63CF4 80240FE4 8E040000 */ lw $a0, ($s0) -/* D63CF8 80240FE8 AE000000 */ sw $zero, ($s0) -.L80240FEC: -/* D63CFC 80240FEC 8FBF0018 */ lw $ra, 0x18($sp) -/* D63D00 80240FF0 8FB10014 */ lw $s1, 0x14($sp) -/* D63D04 80240FF4 8FB00010 */ lw $s0, 0x10($sp) -/* D63D08 80240FF8 24020002 */ addiu $v0, $zero, 2 -/* D63D0C 80240FFC 03E00008 */ jr $ra -/* D63D10 80241000 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240F20_D68C20.s b/ver/us/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240F20_D68C20.s deleted file mode 100644 index 4d21026ef4..0000000000 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240F20_D68C20.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F20_D68C20 -/* D68C20 80240F20 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D68C24 80240F24 AFB00010 */ sw $s0, 0x10($sp) -/* D68C28 80240F28 3C108024 */ lui $s0, %hi(D_80241930_D69630) -/* D68C2C 80240F2C 26101930 */ addiu $s0, $s0, %lo(D_80241930_D69630) -/* D68C30 80240F30 AFBF0018 */ sw $ra, 0x18($sp) -/* D68C34 80240F34 AFB10014 */ sw $s1, 0x14($sp) -/* D68C38 80240F38 8E020000 */ lw $v0, ($s0) -/* D68C3C 80240F3C 14400010 */ bnez $v0, .L80240F80 -/* D68C40 80240F40 0080882D */ daddu $s1, $a0, $zero -/* D68C44 80240F44 0C00AB39 */ jal heap_malloc -/* D68C48 80240F48 24040040 */ addiu $a0, $zero, 0x40 -/* D68C4C 80240F4C AE020000 */ sw $v0, ($s0) -/* D68C50 80240F50 0000182D */ daddu $v1, $zero, $zero -/* D68C54 80240F54 0040282D */ daddu $a1, $v0, $zero -/* D68C58 80240F58 0220202D */ daddu $a0, $s1, $zero -.L80240F5C: -/* D68C5C 80240F5C 8C820084 */ lw $v0, 0x84($a0) -/* D68C60 80240F60 24840004 */ addiu $a0, $a0, 4 -/* D68C64 80240F64 24630001 */ addiu $v1, $v1, 1 -/* D68C68 80240F68 ACA20000 */ sw $v0, ($a1) -/* D68C6C 80240F6C 28620010 */ slti $v0, $v1, 0x10 -/* D68C70 80240F70 1440FFFA */ bnez $v0, .L80240F5C -/* D68C74 80240F74 24A50004 */ addiu $a1, $a1, 4 -/* D68C78 80240F78 080903EF */ j .L80240FBC -/* D68C7C 80240F7C 00000000 */ nop -.L80240F80: -/* D68C80 80240F80 0000182D */ daddu $v1, $zero, $zero -/* D68C84 80240F84 0040282D */ daddu $a1, $v0, $zero -/* D68C88 80240F88 0220202D */ daddu $a0, $s1, $zero -.L80240F8C: -/* D68C8C 80240F8C 8CA20000 */ lw $v0, ($a1) -/* D68C90 80240F90 24A50004 */ addiu $a1, $a1, 4 -/* D68C94 80240F94 24630001 */ addiu $v1, $v1, 1 -/* D68C98 80240F98 AC820084 */ sw $v0, 0x84($a0) -/* D68C9C 80240F9C 28620010 */ slti $v0, $v1, 0x10 -/* D68CA0 80240FA0 1440FFFA */ bnez $v0, .L80240F8C -/* D68CA4 80240FA4 24840004 */ addiu $a0, $a0, 4 -/* D68CA8 80240FA8 3C108024 */ lui $s0, %hi(D_80241930_D69630) -/* D68CAC 80240FAC 26101930 */ addiu $s0, $s0, %lo(D_80241930_D69630) -/* D68CB0 80240FB0 0C00AB4B */ jal heap_free -/* D68CB4 80240FB4 8E040000 */ lw $a0, ($s0) -/* D68CB8 80240FB8 AE000000 */ sw $zero, ($s0) -.L80240FBC: -/* D68CBC 80240FBC 8FBF0018 */ lw $ra, 0x18($sp) -/* D68CC0 80240FC0 8FB10014 */ lw $s1, 0x14($sp) -/* D68CC4 80240FC4 8FB00010 */ lw $s0, 0x10($sp) -/* D68CC8 80240FC8 24020002 */ addiu $v0, $zero, 2 -/* D68CCC 80240FCC 03E00008 */ jr $ra -/* D68CD0 80240FD0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240F50_D7A940.s b/ver/us/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240F50_D7A940.s deleted file mode 100644 index a6f2275efd..0000000000 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240F50_D7A940.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F50_D7A940 -/* D7A940 80240F50 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D7A944 80240F54 AFB00010 */ sw $s0, 0x10($sp) -/* D7A948 80240F58 3C108024 */ lui $s0, %hi(D_80241690_D7B080) -/* D7A94C 80240F5C 26101690 */ addiu $s0, $s0, %lo(D_80241690_D7B080) -/* D7A950 80240F60 AFBF0018 */ sw $ra, 0x18($sp) -/* D7A954 80240F64 AFB10014 */ sw $s1, 0x14($sp) -/* D7A958 80240F68 8E020000 */ lw $v0, ($s0) -/* D7A95C 80240F6C 14400010 */ bnez $v0, .L80240FB0 -/* D7A960 80240F70 0080882D */ daddu $s1, $a0, $zero -/* D7A964 80240F74 0C00AB39 */ jal heap_malloc -/* D7A968 80240F78 24040040 */ addiu $a0, $zero, 0x40 -/* D7A96C 80240F7C AE020000 */ sw $v0, ($s0) -/* D7A970 80240F80 0000182D */ daddu $v1, $zero, $zero -/* D7A974 80240F84 0040282D */ daddu $a1, $v0, $zero -/* D7A978 80240F88 0220202D */ daddu $a0, $s1, $zero -.L80240F8C: -/* D7A97C 80240F8C 8C820084 */ lw $v0, 0x84($a0) -/* D7A980 80240F90 24840004 */ addiu $a0, $a0, 4 -/* D7A984 80240F94 24630001 */ addiu $v1, $v1, 1 -/* D7A988 80240F98 ACA20000 */ sw $v0, ($a1) -/* D7A98C 80240F9C 28620010 */ slti $v0, $v1, 0x10 -/* D7A990 80240FA0 1440FFFA */ bnez $v0, .L80240F8C -/* D7A994 80240FA4 24A50004 */ addiu $a1, $a1, 4 -/* D7A998 80240FA8 080903FB */ j .L80240FEC -/* D7A99C 80240FAC 00000000 */ nop -.L80240FB0: -/* D7A9A0 80240FB0 0000182D */ daddu $v1, $zero, $zero -/* D7A9A4 80240FB4 0040282D */ daddu $a1, $v0, $zero -/* D7A9A8 80240FB8 0220202D */ daddu $a0, $s1, $zero -.L80240FBC: -/* D7A9AC 80240FBC 8CA20000 */ lw $v0, ($a1) -/* D7A9B0 80240FC0 24A50004 */ addiu $a1, $a1, 4 -/* D7A9B4 80240FC4 24630001 */ addiu $v1, $v1, 1 -/* D7A9B8 80240FC8 AC820084 */ sw $v0, 0x84($a0) -/* D7A9BC 80240FCC 28620010 */ slti $v0, $v1, 0x10 -/* D7A9C0 80240FD0 1440FFFA */ bnez $v0, .L80240FBC -/* D7A9C4 80240FD4 24840004 */ addiu $a0, $a0, 4 -/* D7A9C8 80240FD8 3C108024 */ lui $s0, %hi(D_80241690_D7B080) -/* D7A9CC 80240FDC 26101690 */ addiu $s0, $s0, %lo(D_80241690_D7B080) -/* D7A9D0 80240FE0 0C00AB4B */ jal heap_free -/* D7A9D4 80240FE4 8E040000 */ lw $a0, ($s0) -/* D7A9D8 80240FE8 AE000000 */ sw $zero, ($s0) -.L80240FEC: -/* D7A9DC 80240FEC 8FBF0018 */ lw $ra, 0x18($sp) -/* D7A9E0 80240FF0 8FB10014 */ lw $s1, 0x14($sp) -/* D7A9E4 80240FF4 8FB00010 */ lw $s0, 0x10($sp) -/* D7A9E8 80240FF8 24020002 */ addiu $v0, $zero, 2 -/* D7A9EC 80240FFC 03E00008 */ jr $ra -/* D7A9F0 80241000 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240F50_D7C1F0.s b/ver/us/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240F50_D7C1F0.s deleted file mode 100644 index bb8759aeef..0000000000 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240F50_D7C1F0.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F50_D7C1F0 -/* D7C1F0 80240F50 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D7C1F4 80240F54 AFB00010 */ sw $s0, 0x10($sp) -/* D7C1F8 80240F58 3C108024 */ lui $s0, %hi(D_80241690_D7C930) -/* D7C1FC 80240F5C 26101690 */ addiu $s0, $s0, %lo(D_80241690_D7C930) -/* D7C200 80240F60 AFBF0018 */ sw $ra, 0x18($sp) -/* D7C204 80240F64 AFB10014 */ sw $s1, 0x14($sp) -/* D7C208 80240F68 8E020000 */ lw $v0, ($s0) -/* D7C20C 80240F6C 14400010 */ bnez $v0, .L80240FB0 -/* D7C210 80240F70 0080882D */ daddu $s1, $a0, $zero -/* D7C214 80240F74 0C00AB39 */ jal heap_malloc -/* D7C218 80240F78 24040040 */ addiu $a0, $zero, 0x40 -/* D7C21C 80240F7C AE020000 */ sw $v0, ($s0) -/* D7C220 80240F80 0000182D */ daddu $v1, $zero, $zero -/* D7C224 80240F84 0040282D */ daddu $a1, $v0, $zero -/* D7C228 80240F88 0220202D */ daddu $a0, $s1, $zero -.L80240F8C: -/* D7C22C 80240F8C 8C820084 */ lw $v0, 0x84($a0) -/* D7C230 80240F90 24840004 */ addiu $a0, $a0, 4 -/* D7C234 80240F94 24630001 */ addiu $v1, $v1, 1 -/* D7C238 80240F98 ACA20000 */ sw $v0, ($a1) -/* D7C23C 80240F9C 28620010 */ slti $v0, $v1, 0x10 -/* D7C240 80240FA0 1440FFFA */ bnez $v0, .L80240F8C -/* D7C244 80240FA4 24A50004 */ addiu $a1, $a1, 4 -/* D7C248 80240FA8 080903FB */ j .L80240FEC -/* D7C24C 80240FAC 00000000 */ nop -.L80240FB0: -/* D7C250 80240FB0 0000182D */ daddu $v1, $zero, $zero -/* D7C254 80240FB4 0040282D */ daddu $a1, $v0, $zero -/* D7C258 80240FB8 0220202D */ daddu $a0, $s1, $zero -.L80240FBC: -/* D7C25C 80240FBC 8CA20000 */ lw $v0, ($a1) -/* D7C260 80240FC0 24A50004 */ addiu $a1, $a1, 4 -/* D7C264 80240FC4 24630001 */ addiu $v1, $v1, 1 -/* D7C268 80240FC8 AC820084 */ sw $v0, 0x84($a0) -/* D7C26C 80240FCC 28620010 */ slti $v0, $v1, 0x10 -/* D7C270 80240FD0 1440FFFA */ bnez $v0, .L80240FBC -/* D7C274 80240FD4 24840004 */ addiu $a0, $a0, 4 -/* D7C278 80240FD8 3C108024 */ lui $s0, %hi(D_80241690_D7C930) -/* D7C27C 80240FDC 26101690 */ addiu $s0, $s0, %lo(D_80241690_D7C930) -/* D7C280 80240FE0 0C00AB4B */ jal heap_free -/* D7C284 80240FE4 8E040000 */ lw $a0, ($s0) -/* D7C288 80240FE8 AE000000 */ sw $zero, ($s0) -.L80240FEC: -/* D7C28C 80240FEC 8FBF0018 */ lw $ra, 0x18($sp) -/* D7C290 80240FF0 8FB10014 */ lw $s1, 0x14($sp) -/* D7C294 80240FF4 8FB00010 */ lw $s0, 0x10($sp) -/* D7C298 80240FF8 24020002 */ addiu $v0, $zero, 2 -/* D7C29C 80240FFC 03E00008 */ jr $ra -/* D7C2A0 80241000 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8FBA0/func_80242950_D8FBA0.s b/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8FBA0/func_80242950_D8FBA0.s deleted file mode 100644 index 9c4aed376c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8FBA0/func_80242950_D8FBA0.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242950_D8FBA0 -/* D8FBA0 80242950 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D8FBA4 80242954 AFB00010 */ sw $s0, 0x10($sp) -/* D8FBA8 80242958 3C108024 */ lui $s0, %hi(D_80243DE0_D91030) -/* D8FBAC 8024295C 26103DE0 */ addiu $s0, $s0, %lo(D_80243DE0_D91030) -/* D8FBB0 80242960 AFBF0018 */ sw $ra, 0x18($sp) -/* D8FBB4 80242964 AFB10014 */ sw $s1, 0x14($sp) -/* D8FBB8 80242968 8E020000 */ lw $v0, ($s0) -/* D8FBBC 8024296C 14400010 */ bnez $v0, .L802429B0 -/* D8FBC0 80242970 0080882D */ daddu $s1, $a0, $zero -/* D8FBC4 80242974 0C00AB39 */ jal heap_malloc -/* D8FBC8 80242978 24040040 */ addiu $a0, $zero, 0x40 -/* D8FBCC 8024297C AE020000 */ sw $v0, ($s0) -/* D8FBD0 80242980 0000182D */ daddu $v1, $zero, $zero -/* D8FBD4 80242984 0040282D */ daddu $a1, $v0, $zero -/* D8FBD8 80242988 0220202D */ daddu $a0, $s1, $zero -.L8024298C: -/* D8FBDC 8024298C 8C820084 */ lw $v0, 0x84($a0) -/* D8FBE0 80242990 24840004 */ addiu $a0, $a0, 4 -/* D8FBE4 80242994 24630001 */ addiu $v1, $v1, 1 -/* D8FBE8 80242998 ACA20000 */ sw $v0, ($a1) -/* D8FBEC 8024299C 28620010 */ slti $v0, $v1, 0x10 -/* D8FBF0 802429A0 1440FFFA */ bnez $v0, .L8024298C -/* D8FBF4 802429A4 24A50004 */ addiu $a1, $a1, 4 -/* D8FBF8 802429A8 08090A7B */ j .L802429EC -/* D8FBFC 802429AC 00000000 */ nop -.L802429B0: -/* D8FC00 802429B0 0000182D */ daddu $v1, $zero, $zero -/* D8FC04 802429B4 0040282D */ daddu $a1, $v0, $zero -/* D8FC08 802429B8 0220202D */ daddu $a0, $s1, $zero -.L802429BC: -/* D8FC0C 802429BC 8CA20000 */ lw $v0, ($a1) -/* D8FC10 802429C0 24A50004 */ addiu $a1, $a1, 4 -/* D8FC14 802429C4 24630001 */ addiu $v1, $v1, 1 -/* D8FC18 802429C8 AC820084 */ sw $v0, 0x84($a0) -/* D8FC1C 802429CC 28620010 */ slti $v0, $v1, 0x10 -/* D8FC20 802429D0 1440FFFA */ bnez $v0, .L802429BC -/* D8FC24 802429D4 24840004 */ addiu $a0, $a0, 4 -/* D8FC28 802429D8 3C108024 */ lui $s0, %hi(D_80243DE0_D91030) -/* D8FC2C 802429DC 26103DE0 */ addiu $s0, $s0, %lo(D_80243DE0_D91030) -/* D8FC30 802429E0 0C00AB4B */ jal heap_free -/* D8FC34 802429E4 8E040000 */ lw $a0, ($s0) -/* D8FC38 802429E8 AE000000 */ sw $zero, ($s0) -.L802429EC: -/* D8FC3C 802429EC 8FBF0018 */ lw $ra, 0x18($sp) -/* D8FC40 802429F0 8FB10014 */ lw $s1, 0x14($sp) -/* D8FC44 802429F4 8FB00010 */ lw $s0, 0x10($sp) -/* D8FC48 802429F8 24020002 */ addiu $v0, $zero, 2 -/* D8FC4C 802429FC 03E00008 */ jr $ra -/* D8FC50 80242A00 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240700_CF8270.s b/ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240700_CF8270.s deleted file mode 100644 index 96e517973f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240700_CF8270.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240700_CF8270 -/* CF8270 80240700 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CF8274 80240704 AFB00010 */ sw $s0, 0x10($sp) -/* CF8278 80240708 3C108024 */ lui $s0, %hi(D_802435F0_CFB160) -/* CF827C 8024070C 261035F0 */ addiu $s0, $s0, %lo(D_802435F0_CFB160) -/* CF8280 80240710 AFBF0018 */ sw $ra, 0x18($sp) -/* CF8284 80240714 AFB10014 */ sw $s1, 0x14($sp) -/* CF8288 80240718 8E020000 */ lw $v0, ($s0) -/* CF828C 8024071C 14400010 */ bnez $v0, .L80240760 -/* CF8290 80240720 0080882D */ daddu $s1, $a0, $zero -/* CF8294 80240724 0C00AB39 */ jal heap_malloc -/* CF8298 80240728 24040040 */ addiu $a0, $zero, 0x40 -/* CF829C 8024072C AE020000 */ sw $v0, ($s0) -/* CF82A0 80240730 0000182D */ daddu $v1, $zero, $zero -/* CF82A4 80240734 0040282D */ daddu $a1, $v0, $zero -/* CF82A8 80240738 0220202D */ daddu $a0, $s1, $zero -.L8024073C: -/* CF82AC 8024073C 8C820084 */ lw $v0, 0x84($a0) -/* CF82B0 80240740 24840004 */ addiu $a0, $a0, 4 -/* CF82B4 80240744 24630001 */ addiu $v1, $v1, 1 -/* CF82B8 80240748 ACA20000 */ sw $v0, ($a1) -/* CF82BC 8024074C 28620010 */ slti $v0, $v1, 0x10 -/* CF82C0 80240750 1440FFFA */ bnez $v0, .L8024073C -/* CF82C4 80240754 24A50004 */ addiu $a1, $a1, 4 -/* CF82C8 80240758 080901E7 */ j .L8024079C -/* CF82CC 8024075C 00000000 */ nop -.L80240760: -/* CF82D0 80240760 0000182D */ daddu $v1, $zero, $zero -/* CF82D4 80240764 0040282D */ daddu $a1, $v0, $zero -/* CF82D8 80240768 0220202D */ daddu $a0, $s1, $zero -.L8024076C: -/* CF82DC 8024076C 8CA20000 */ lw $v0, ($a1) -/* CF82E0 80240770 24A50004 */ addiu $a1, $a1, 4 -/* CF82E4 80240774 24630001 */ addiu $v1, $v1, 1 -/* CF82E8 80240778 AC820084 */ sw $v0, 0x84($a0) -/* CF82EC 8024077C 28620010 */ slti $v0, $v1, 0x10 -/* CF82F0 80240780 1440FFFA */ bnez $v0, .L8024076C -/* CF82F4 80240784 24840004 */ addiu $a0, $a0, 4 -/* CF82F8 80240788 3C108024 */ lui $s0, %hi(D_802435F0_CFB160) -/* CF82FC 8024078C 261035F0 */ addiu $s0, $s0, %lo(D_802435F0_CFB160) -/* CF8300 80240790 0C00AB4B */ jal heap_free -/* CF8304 80240794 8E040000 */ lw $a0, ($s0) -/* CF8308 80240798 AE000000 */ sw $zero, ($s0) -.L8024079C: -/* CF830C 8024079C 8FBF0018 */ lw $ra, 0x18($sp) -/* CF8310 802407A0 8FB10014 */ lw $s1, 0x14($sp) -/* CF8314 802407A4 8FB00010 */ lw $s0, 0x10($sp) -/* CF8318 802407A8 24020002 */ addiu $v0, $zero, 2 -/* CF831C 802407AC 03E00008 */ jr $ra -/* CF8320 802407B0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241C90_CF9800.s b/ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241C90_CF9800.s deleted file mode 100644 index 95f56cc607..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241C90_CF9800.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241C90_CF9800 -/* CF9800 80241C90 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CF9804 80241C94 AFB00010 */ sw $s0, 0x10($sp) -/* CF9808 80241C98 3C108025 */ lui $s0, %hi(D_8024D8F0_D05460) -/* CF980C 80241C9C 2610D8F0 */ addiu $s0, $s0, %lo(D_8024D8F0_D05460) -/* CF9810 80241CA0 AFBF0018 */ sw $ra, 0x18($sp) -/* CF9814 80241CA4 AFB10014 */ sw $s1, 0x14($sp) -/* CF9818 80241CA8 8E020000 */ lw $v0, ($s0) -/* CF981C 80241CAC 14400010 */ bnez $v0, .L80241CF0 -/* CF9820 80241CB0 0080882D */ daddu $s1, $a0, $zero -/* CF9824 80241CB4 0C00AB39 */ jal heap_malloc -/* CF9828 80241CB8 24040040 */ addiu $a0, $zero, 0x40 -/* CF982C 80241CBC AE020000 */ sw $v0, ($s0) -/* CF9830 80241CC0 0000182D */ daddu $v1, $zero, $zero -/* CF9834 80241CC4 0040282D */ daddu $a1, $v0, $zero -/* CF9838 80241CC8 0220202D */ daddu $a0, $s1, $zero -.L80241CCC: -/* CF983C 80241CCC 8C820084 */ lw $v0, 0x84($a0) -/* CF9840 80241CD0 24840004 */ addiu $a0, $a0, 4 -/* CF9844 80241CD4 24630001 */ addiu $v1, $v1, 1 -/* CF9848 80241CD8 ACA20000 */ sw $v0, ($a1) -/* CF984C 80241CDC 28620010 */ slti $v0, $v1, 0x10 -/* CF9850 80241CE0 1440FFFA */ bnez $v0, .L80241CCC -/* CF9854 80241CE4 24A50004 */ addiu $a1, $a1, 4 -/* CF9858 80241CE8 0809074B */ j .L80241D2C -/* CF985C 80241CEC 00000000 */ nop -.L80241CF0: -/* CF9860 80241CF0 0000182D */ daddu $v1, $zero, $zero -/* CF9864 80241CF4 0040282D */ daddu $a1, $v0, $zero -/* CF9868 80241CF8 0220202D */ daddu $a0, $s1, $zero -.L80241CFC: -/* CF986C 80241CFC 8CA20000 */ lw $v0, ($a1) -/* CF9870 80241D00 24A50004 */ addiu $a1, $a1, 4 -/* CF9874 80241D04 24630001 */ addiu $v1, $v1, 1 -/* CF9878 80241D08 AC820084 */ sw $v0, 0x84($a0) -/* CF987C 80241D0C 28620010 */ slti $v0, $v1, 0x10 -/* CF9880 80241D10 1440FFFA */ bnez $v0, .L80241CFC -/* CF9884 80241D14 24840004 */ addiu $a0, $a0, 4 -/* CF9888 80241D18 3C108025 */ lui $s0, %hi(D_8024D8F0_D05460) -/* CF988C 80241D1C 2610D8F0 */ addiu $s0, $s0, %lo(D_8024D8F0_D05460) -/* CF9890 80241D20 0C00AB4B */ jal heap_free -/* CF9894 80241D24 8E040000 */ lw $a0, ($s0) -/* CF9898 80241D28 AE000000 */ sw $zero, ($s0) -.L80241D2C: -/* CF989C 80241D2C 8FBF0018 */ lw $ra, 0x18($sp) -/* CF98A0 80241D30 8FB10014 */ lw $s1, 0x14($sp) -/* CF98A4 80241D34 8FB00010 */ lw $s0, 0x10($sp) -/* CF98A8 80241D38 24020002 */ addiu $v0, $zero, 2 -/* CF98AC 80241D3C 03E00008 */ jr $ra -/* CF98B0 80241D40 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240B2C_D0625C.s b/ver/us/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240B2C_D0625C.s deleted file mode 100644 index 7bb8e52183..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240B2C_D0625C.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B2C_D0625C -/* D0625C 80240B2C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D06260 80240B30 AFB00010 */ sw $s0, 0x10($sp) -/* D06264 80240B34 3C108024 */ lui $s0, %hi(D_80246B60_D0C290) -/* D06268 80240B38 26106B60 */ addiu $s0, $s0, %lo(D_80246B60_D0C290) -/* D0626C 80240B3C AFBF0018 */ sw $ra, 0x18($sp) -/* D06270 80240B40 AFB10014 */ sw $s1, 0x14($sp) -/* D06274 80240B44 8E020000 */ lw $v0, ($s0) -/* D06278 80240B48 14400010 */ bnez $v0, .L80240B8C -/* D0627C 80240B4C 0080882D */ daddu $s1, $a0, $zero -/* D06280 80240B50 0C00AB39 */ jal heap_malloc -/* D06284 80240B54 24040040 */ addiu $a0, $zero, 0x40 -/* D06288 80240B58 AE020000 */ sw $v0, ($s0) -/* D0628C 80240B5C 0000182D */ daddu $v1, $zero, $zero -/* D06290 80240B60 0040282D */ daddu $a1, $v0, $zero -/* D06294 80240B64 0220202D */ daddu $a0, $s1, $zero -.L80240B68: -/* D06298 80240B68 8C820084 */ lw $v0, 0x84($a0) -/* D0629C 80240B6C 24840004 */ addiu $a0, $a0, 4 -/* D062A0 80240B70 24630001 */ addiu $v1, $v1, 1 -/* D062A4 80240B74 ACA20000 */ sw $v0, ($a1) -/* D062A8 80240B78 28620010 */ slti $v0, $v1, 0x10 -/* D062AC 80240B7C 1440FFFA */ bnez $v0, .L80240B68 -/* D062B0 80240B80 24A50004 */ addiu $a1, $a1, 4 -/* D062B4 80240B84 080902F2 */ j .L80240BC8 -/* D062B8 80240B88 00000000 */ nop -.L80240B8C: -/* D062BC 80240B8C 0000182D */ daddu $v1, $zero, $zero -/* D062C0 80240B90 0040282D */ daddu $a1, $v0, $zero -/* D062C4 80240B94 0220202D */ daddu $a0, $s1, $zero -.L80240B98: -/* D062C8 80240B98 8CA20000 */ lw $v0, ($a1) -/* D062CC 80240B9C 24A50004 */ addiu $a1, $a1, 4 -/* D062D0 80240BA0 24630001 */ addiu $v1, $v1, 1 -/* D062D4 80240BA4 AC820084 */ sw $v0, 0x84($a0) -/* D062D8 80240BA8 28620010 */ slti $v0, $v1, 0x10 -/* D062DC 80240BAC 1440FFFA */ bnez $v0, .L80240B98 -/* D062E0 80240BB0 24840004 */ addiu $a0, $a0, 4 -/* D062E4 80240BB4 3C108024 */ lui $s0, %hi(D_80246B60_D0C290) -/* D062E8 80240BB8 26106B60 */ addiu $s0, $s0, %lo(D_80246B60_D0C290) -/* D062EC 80240BBC 0C00AB4B */ jal heap_free -/* D062F0 80240BC0 8E040000 */ lw $a0, ($s0) -/* D062F4 80240BC4 AE000000 */ sw $zero, ($s0) -.L80240BC8: -/* D062F8 80240BC8 8FBF0018 */ lw $ra, 0x18($sp) -/* D062FC 80240BCC 8FB10014 */ lw $s1, 0x14($sp) -/* D06300 80240BD0 8FB00010 */ lw $s0, 0x10($sp) -/* D06304 80240BD4 24020002 */ addiu $v0, $zero, 2 -/* D06308 80240BD8 03E00008 */ jr $ra -/* D0630C 80240BDC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241A48_D218D8.s b/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241A48_D218D8.s deleted file mode 100644 index 1b56455cd5..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241A48_D218D8.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A48_D218D8 -/* D218D8 80241A48 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D218DC 80241A4C AFB00010 */ sw $s0, 0x10($sp) -/* D218E0 80241A50 3C108024 */ lui $s0, %hi(D_802443D0_D24260) -/* D218E4 80241A54 261043D0 */ addiu $s0, $s0, %lo(D_802443D0_D24260) -/* D218E8 80241A58 AFBF0018 */ sw $ra, 0x18($sp) -/* D218EC 80241A5C AFB10014 */ sw $s1, 0x14($sp) -/* D218F0 80241A60 8E020000 */ lw $v0, ($s0) -/* D218F4 80241A64 14400010 */ bnez $v0, .L80241AA8 -/* D218F8 80241A68 0080882D */ daddu $s1, $a0, $zero -/* D218FC 80241A6C 0C00AB39 */ jal heap_malloc -/* D21900 80241A70 24040040 */ addiu $a0, $zero, 0x40 -/* D21904 80241A74 AE020000 */ sw $v0, ($s0) -/* D21908 80241A78 0000182D */ daddu $v1, $zero, $zero -/* D2190C 80241A7C 0040282D */ daddu $a1, $v0, $zero -/* D21910 80241A80 0220202D */ daddu $a0, $s1, $zero -.L80241A84: -/* D21914 80241A84 8C820084 */ lw $v0, 0x84($a0) -/* D21918 80241A88 24840004 */ addiu $a0, $a0, 4 -/* D2191C 80241A8C 24630001 */ addiu $v1, $v1, 1 -/* D21920 80241A90 ACA20000 */ sw $v0, ($a1) -/* D21924 80241A94 28620010 */ slti $v0, $v1, 0x10 -/* D21928 80241A98 1440FFFA */ bnez $v0, .L80241A84 -/* D2192C 80241A9C 24A50004 */ addiu $a1, $a1, 4 -/* D21930 80241AA0 080906B9 */ j .L80241AE4 -/* D21934 80241AA4 00000000 */ nop -.L80241AA8: -/* D21938 80241AA8 0000182D */ daddu $v1, $zero, $zero -/* D2193C 80241AAC 0040282D */ daddu $a1, $v0, $zero -/* D21940 80241AB0 0220202D */ daddu $a0, $s1, $zero -.L80241AB4: -/* D21944 80241AB4 8CA20000 */ lw $v0, ($a1) -/* D21948 80241AB8 24A50004 */ addiu $a1, $a1, 4 -/* D2194C 80241ABC 24630001 */ addiu $v1, $v1, 1 -/* D21950 80241AC0 AC820084 */ sw $v0, 0x84($a0) -/* D21954 80241AC4 28620010 */ slti $v0, $v1, 0x10 -/* D21958 80241AC8 1440FFFA */ bnez $v0, .L80241AB4 -/* D2195C 80241ACC 24840004 */ addiu $a0, $a0, 4 -/* D21960 80241AD0 3C108024 */ lui $s0, %hi(D_802443D0_D24260) -/* D21964 80241AD4 261043D0 */ addiu $s0, $s0, %lo(D_802443D0_D24260) -/* D21968 80241AD8 0C00AB4B */ jal heap_free -/* D2196C 80241ADC 8E040000 */ lw $a0, ($s0) -/* D21970 80241AE0 AE000000 */ sw $zero, ($s0) -.L80241AE4: -/* D21974 80241AE4 8FBF0018 */ lw $ra, 0x18($sp) -/* D21978 80241AE8 8FB10014 */ lw $s1, 0x14($sp) -/* D2197C 80241AEC 8FB00010 */ lw $s0, 0x10($sp) -/* D21980 80241AF0 24020002 */ addiu $v0, $zero, 2 -/* D21984 80241AF4 03E00008 */ jr $ra -/* D21988 80241AF8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_09/D362F0/func_80240000_D362F0.s b/ver/us/asm/nonmatchings/world/area_sam/sam_09/D362F0/func_80240000_D362F0.s deleted file mode 100644 index 952056097d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_09/D362F0/func_80240000_D362F0.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_D362F0 -/* D362F0 80240000 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D362F4 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* D362F8 80240008 3C108024 */ lui $s0, %hi(D_802406C0_D369B0) -/* D362FC 8024000C 261006C0 */ addiu $s0, $s0, %lo(D_802406C0_D369B0) -/* D36300 80240010 AFBF0018 */ sw $ra, 0x18($sp) -/* D36304 80240014 AFB10014 */ sw $s1, 0x14($sp) -/* D36308 80240018 8E020000 */ lw $v0, ($s0) -/* D3630C 8024001C 14400010 */ bnez $v0, .L80240060 -/* D36310 80240020 0080882D */ daddu $s1, $a0, $zero -/* D36314 80240024 0C00AB39 */ jal heap_malloc -/* D36318 80240028 24040040 */ addiu $a0, $zero, 0x40 -/* D3631C 8024002C AE020000 */ sw $v0, ($s0) -/* D36320 80240030 0000182D */ daddu $v1, $zero, $zero -/* D36324 80240034 0040282D */ daddu $a1, $v0, $zero -/* D36328 80240038 0220202D */ daddu $a0, $s1, $zero -.L8024003C: -/* D3632C 8024003C 8C820084 */ lw $v0, 0x84($a0) -/* D36330 80240040 24840004 */ addiu $a0, $a0, 4 -/* D36334 80240044 24630001 */ addiu $v1, $v1, 1 -/* D36338 80240048 ACA20000 */ sw $v0, ($a1) -/* D3633C 8024004C 28620010 */ slti $v0, $v1, 0x10 -/* D36340 80240050 1440FFFA */ bnez $v0, .L8024003C -/* D36344 80240054 24A50004 */ addiu $a1, $a1, 4 -/* D36348 80240058 08090027 */ j .L8024009C -/* D3634C 8024005C 00000000 */ nop -.L80240060: -/* D36350 80240060 0000182D */ daddu $v1, $zero, $zero -/* D36354 80240064 0040282D */ daddu $a1, $v0, $zero -/* D36358 80240068 0220202D */ daddu $a0, $s1, $zero -.L8024006C: -/* D3635C 8024006C 8CA20000 */ lw $v0, ($a1) -/* D36360 80240070 24A50004 */ addiu $a1, $a1, 4 -/* D36364 80240074 24630001 */ addiu $v1, $v1, 1 -/* D36368 80240078 AC820084 */ sw $v0, 0x84($a0) -/* D3636C 8024007C 28620010 */ slti $v0, $v1, 0x10 -/* D36370 80240080 1440FFFA */ bnez $v0, .L8024006C -/* D36374 80240084 24840004 */ addiu $a0, $a0, 4 -/* D36378 80240088 3C108024 */ lui $s0, %hi(D_802406C0_D369B0) -/* D3637C 8024008C 261006C0 */ addiu $s0, $s0, %lo(D_802406C0_D369B0) -/* D36380 80240090 0C00AB4B */ jal heap_free -/* D36384 80240094 8E040000 */ lw $a0, ($s0) -/* D36388 80240098 AE000000 */ sw $zero, ($s0) -.L8024009C: -/* D3638C 8024009C 8FBF0018 */ lw $ra, 0x18($sp) -/* D36390 802400A0 8FB10014 */ lw $s1, 0x14($sp) -/* D36394 802400A4 8FB00010 */ lw $s0, 0x10($sp) -/* D36398 802400A8 24020002 */ addiu $v0, $zero, 2 -/* D3639C 802400AC 03E00008 */ jr $ra -/* D363A0 802400B0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_10/D37800/func_80240000_D37800.s b/ver/us/asm/nonmatchings/world/area_sam/sam_10/D37800/func_80240000_D37800.s deleted file mode 100644 index d8b7f43144..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_10/D37800/func_80240000_D37800.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_D37800 -/* D37800 80240000 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D37804 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* D37808 80240008 3C108024 */ lui $s0, %hi(D_80241040_D38840) -/* D3780C 8024000C 26101040 */ addiu $s0, $s0, %lo(D_80241040_D38840) -/* D37810 80240010 AFBF0018 */ sw $ra, 0x18($sp) -/* D37814 80240014 AFB10014 */ sw $s1, 0x14($sp) -/* D37818 80240018 8E020000 */ lw $v0, ($s0) -/* D3781C 8024001C 14400010 */ bnez $v0, .L80240060 -/* D37820 80240020 0080882D */ daddu $s1, $a0, $zero -/* D37824 80240024 0C00AB39 */ jal heap_malloc -/* D37828 80240028 24040040 */ addiu $a0, $zero, 0x40 -/* D3782C 8024002C AE020000 */ sw $v0, ($s0) -/* D37830 80240030 0000182D */ daddu $v1, $zero, $zero -/* D37834 80240034 0040282D */ daddu $a1, $v0, $zero -/* D37838 80240038 0220202D */ daddu $a0, $s1, $zero -.L8024003C: -/* D3783C 8024003C 8C820084 */ lw $v0, 0x84($a0) -/* D37840 80240040 24840004 */ addiu $a0, $a0, 4 -/* D37844 80240044 24630001 */ addiu $v1, $v1, 1 -/* D37848 80240048 ACA20000 */ sw $v0, ($a1) -/* D3784C 8024004C 28620010 */ slti $v0, $v1, 0x10 -/* D37850 80240050 1440FFFA */ bnez $v0, .L8024003C -/* D37854 80240054 24A50004 */ addiu $a1, $a1, 4 -/* D37858 80240058 08090027 */ j .L8024009C -/* D3785C 8024005C 00000000 */ nop -.L80240060: -/* D37860 80240060 0000182D */ daddu $v1, $zero, $zero -/* D37864 80240064 0040282D */ daddu $a1, $v0, $zero -/* D37868 80240068 0220202D */ daddu $a0, $s1, $zero -.L8024006C: -/* D3786C 8024006C 8CA20000 */ lw $v0, ($a1) -/* D37870 80240070 24A50004 */ addiu $a1, $a1, 4 -/* D37874 80240074 24630001 */ addiu $v1, $v1, 1 -/* D37878 80240078 AC820084 */ sw $v0, 0x84($a0) -/* D3787C 8024007C 28620010 */ slti $v0, $v1, 0x10 -/* D37880 80240080 1440FFFA */ bnez $v0, .L8024006C -/* D37884 80240084 24840004 */ addiu $a0, $a0, 4 -/* D37888 80240088 3C108024 */ lui $s0, %hi(D_80241040_D38840) -/* D3788C 8024008C 26101040 */ addiu $s0, $s0, %lo(D_80241040_D38840) -/* D37890 80240090 0C00AB4B */ jal heap_free -/* D37894 80240094 8E040000 */ lw $a0, ($s0) -/* D37898 80240098 AE000000 */ sw $zero, ($s0) -.L8024009C: -/* D3789C 8024009C 8FBF0018 */ lw $ra, 0x18($sp) -/* D378A0 802400A0 8FB10014 */ lw $s1, 0x14($sp) -/* D378A4 802400A4 8FB00010 */ lw $s0, 0x10($sp) -/* D378A8 802400A8 24020002 */ addiu $v0, $zero, 2 -/* D378AC 802400AC 03E00008 */ jr $ra -/* D378B0 802400B0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802407D0_D3ADA0.s b/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802407D0_D3ADA0.s deleted file mode 100644 index 25ddf47868..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802407D0_D3ADA0.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407D0_D3ADA0 -/* D3ADA0 802407D0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D3ADA4 802407D4 AFB00010 */ sw $s0, 0x10($sp) -/* D3ADA8 802407D8 3C108024 */ lui $s0, %hi(D_80244F78_D3F548) -/* D3ADAC 802407DC 26104F78 */ addiu $s0, $s0, %lo(D_80244F78_D3F548) -/* D3ADB0 802407E0 AFBF0018 */ sw $ra, 0x18($sp) -/* D3ADB4 802407E4 AFB10014 */ sw $s1, 0x14($sp) -/* D3ADB8 802407E8 8E020000 */ lw $v0, ($s0) -/* D3ADBC 802407EC 14400010 */ bnez $v0, .L80240830 -/* D3ADC0 802407F0 0080882D */ daddu $s1, $a0, $zero -/* D3ADC4 802407F4 0C00AB39 */ jal heap_malloc -/* D3ADC8 802407F8 24040040 */ addiu $a0, $zero, 0x40 -/* D3ADCC 802407FC AE020000 */ sw $v0, ($s0) -/* D3ADD0 80240800 0000182D */ daddu $v1, $zero, $zero -/* D3ADD4 80240804 0040282D */ daddu $a1, $v0, $zero -/* D3ADD8 80240808 0220202D */ daddu $a0, $s1, $zero -.L8024080C: -/* D3ADDC 8024080C 8C820084 */ lw $v0, 0x84($a0) -/* D3ADE0 80240810 24840004 */ addiu $a0, $a0, 4 -/* D3ADE4 80240814 24630001 */ addiu $v1, $v1, 1 -/* D3ADE8 80240818 ACA20000 */ sw $v0, ($a1) -/* D3ADEC 8024081C 28620010 */ slti $v0, $v1, 0x10 -/* D3ADF0 80240820 1440FFFA */ bnez $v0, .L8024080C -/* D3ADF4 80240824 24A50004 */ addiu $a1, $a1, 4 -/* D3ADF8 80240828 0809021B */ j .L8024086C -/* D3ADFC 8024082C 00000000 */ nop -.L80240830: -/* D3AE00 80240830 0000182D */ daddu $v1, $zero, $zero -/* D3AE04 80240834 0040282D */ daddu $a1, $v0, $zero -/* D3AE08 80240838 0220202D */ daddu $a0, $s1, $zero -.L8024083C: -/* D3AE0C 8024083C 8CA20000 */ lw $v0, ($a1) -/* D3AE10 80240840 24A50004 */ addiu $a1, $a1, 4 -/* D3AE14 80240844 24630001 */ addiu $v1, $v1, 1 -/* D3AE18 80240848 AC820084 */ sw $v0, 0x84($a0) -/* D3AE1C 8024084C 28620010 */ slti $v0, $v1, 0x10 -/* D3AE20 80240850 1440FFFA */ bnez $v0, .L8024083C -/* D3AE24 80240854 24840004 */ addiu $a0, $a0, 4 -/* D3AE28 80240858 3C108024 */ lui $s0, %hi(D_80244F78_D3F548) -/* D3AE2C 8024085C 26104F78 */ addiu $s0, $s0, %lo(D_80244F78_D3F548) -/* D3AE30 80240860 0C00AB4B */ jal heap_free -/* D3AE34 80240864 8E040000 */ lw $a0, ($s0) -/* D3AE38 80240868 AE000000 */ sw $zero, ($s0) -.L8024086C: -/* D3AE3C 8024086C 8FBF0018 */ lw $ra, 0x18($sp) -/* D3AE40 80240870 8FB10014 */ lw $s1, 0x14($sp) -/* D3AE44 80240874 8FB00010 */ lw $s0, 0x10($sp) -/* D3AE48 80240878 24020002 */ addiu $v0, $zero, 2 -/* D3AE4C 8024087C 03E00008 */ jr $ra -/* D3AE50 80240880 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_80240A44_92ACF4.s b/ver/us/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_80240A44_92ACF4.s deleted file mode 100644 index f2c1015899..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_80240A44_92ACF4.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A44_92ACF4 -/* 92ACF4 80240A44 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 92ACF8 80240A48 AFB00010 */ sw $s0, 0x10($sp) -/* 92ACFC 80240A4C 3C108024 */ lui $s0, %hi(D_802441D8_92E488) -/* 92AD00 80240A50 261041D8 */ addiu $s0, $s0, %lo(D_802441D8_92E488) -/* 92AD04 80240A54 AFBF0018 */ sw $ra, 0x18($sp) -/* 92AD08 80240A58 AFB10014 */ sw $s1, 0x14($sp) -/* 92AD0C 80240A5C 8E020000 */ lw $v0, ($s0) -/* 92AD10 80240A60 14400010 */ bnez $v0, .L80240AA4 -/* 92AD14 80240A64 0080882D */ daddu $s1, $a0, $zero -/* 92AD18 80240A68 0C00AB39 */ jal heap_malloc -/* 92AD1C 80240A6C 24040040 */ addiu $a0, $zero, 0x40 -/* 92AD20 80240A70 AE020000 */ sw $v0, ($s0) -/* 92AD24 80240A74 0000182D */ daddu $v1, $zero, $zero -/* 92AD28 80240A78 0040282D */ daddu $a1, $v0, $zero -/* 92AD2C 80240A7C 0220202D */ daddu $a0, $s1, $zero -.L80240A80: -/* 92AD30 80240A80 8C820084 */ lw $v0, 0x84($a0) -/* 92AD34 80240A84 24840004 */ addiu $a0, $a0, 4 -/* 92AD38 80240A88 24630001 */ addiu $v1, $v1, 1 -/* 92AD3C 80240A8C ACA20000 */ sw $v0, ($a1) -/* 92AD40 80240A90 28620010 */ slti $v0, $v1, 0x10 -/* 92AD44 80240A94 1440FFFA */ bnez $v0, .L80240A80 -/* 92AD48 80240A98 24A50004 */ addiu $a1, $a1, 4 -/* 92AD4C 80240A9C 080902B8 */ j .L80240AE0 -/* 92AD50 80240AA0 00000000 */ nop -.L80240AA4: -/* 92AD54 80240AA4 0000182D */ daddu $v1, $zero, $zero -/* 92AD58 80240AA8 0040282D */ daddu $a1, $v0, $zero -/* 92AD5C 80240AAC 0220202D */ daddu $a0, $s1, $zero -.L80240AB0: -/* 92AD60 80240AB0 8CA20000 */ lw $v0, ($a1) -/* 92AD64 80240AB4 24A50004 */ addiu $a1, $a1, 4 -/* 92AD68 80240AB8 24630001 */ addiu $v1, $v1, 1 -/* 92AD6C 80240ABC AC820084 */ sw $v0, 0x84($a0) -/* 92AD70 80240AC0 28620010 */ slti $v0, $v1, 0x10 -/* 92AD74 80240AC4 1440FFFA */ bnez $v0, .L80240AB0 -/* 92AD78 80240AC8 24840004 */ addiu $a0, $a0, 4 -/* 92AD7C 80240ACC 3C108024 */ lui $s0, %hi(D_802441D8_92E488) -/* 92AD80 80240AD0 261041D8 */ addiu $s0, $s0, %lo(D_802441D8_92E488) -/* 92AD84 80240AD4 0C00AB4B */ jal heap_free -/* 92AD88 80240AD8 8E040000 */ lw $a0, ($s0) -/* 92AD8C 80240ADC AE000000 */ sw $zero, ($s0) -.L80240AE0: -/* 92AD90 80240AE0 8FBF0018 */ lw $ra, 0x18($sp) -/* 92AD94 80240AE4 8FB10014 */ lw $s1, 0x14($sp) -/* 92AD98 80240AE8 8FB00010 */ lw $s0, 0x10($sp) -/* 92AD9C 80240AEC 24020002 */ addiu $v0, $zero, 2 -/* 92ADA0 80240AF0 03E00008 */ jr $ra -/* 92ADA4 80240AF4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240DDC_94038C.s b/ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240DDC_94038C.s deleted file mode 100644 index debb1759c8..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240DDC_94038C.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DDC_94038C -/* 94038C 80240DDC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 940390 80240DE0 AFB00010 */ sw $s0, 0x10($sp) -/* 940394 80240DE4 3C108024 */ lui $s0, %hi(D_80241FF4_9415A4) -/* 940398 80240DE8 26101FF4 */ addiu $s0, $s0, %lo(D_80241FF4_9415A4) -/* 94039C 80240DEC AFBF0018 */ sw $ra, 0x18($sp) -/* 9403A0 80240DF0 AFB10014 */ sw $s1, 0x14($sp) -/* 9403A4 80240DF4 8E020000 */ lw $v0, ($s0) -/* 9403A8 80240DF8 14400010 */ bnez $v0, .L80240E3C -/* 9403AC 80240DFC 0080882D */ daddu $s1, $a0, $zero -/* 9403B0 80240E00 0C00AB39 */ jal heap_malloc -/* 9403B4 80240E04 24040040 */ addiu $a0, $zero, 0x40 -/* 9403B8 80240E08 AE020000 */ sw $v0, ($s0) -/* 9403BC 80240E0C 0000182D */ daddu $v1, $zero, $zero -/* 9403C0 80240E10 0040282D */ daddu $a1, $v0, $zero -/* 9403C4 80240E14 0220202D */ daddu $a0, $s1, $zero -.L80240E18: -/* 9403C8 80240E18 8C820084 */ lw $v0, 0x84($a0) -/* 9403CC 80240E1C 24840004 */ addiu $a0, $a0, 4 -/* 9403D0 80240E20 24630001 */ addiu $v1, $v1, 1 -/* 9403D4 80240E24 ACA20000 */ sw $v0, ($a1) -/* 9403D8 80240E28 28620010 */ slti $v0, $v1, 0x10 -/* 9403DC 80240E2C 1440FFFA */ bnez $v0, .L80240E18 -/* 9403E0 80240E30 24A50004 */ addiu $a1, $a1, 4 -/* 9403E4 80240E34 0809039E */ j .L80240E78 -/* 9403E8 80240E38 00000000 */ nop -.L80240E3C: -/* 9403EC 80240E3C 0000182D */ daddu $v1, $zero, $zero -/* 9403F0 80240E40 0040282D */ daddu $a1, $v0, $zero -/* 9403F4 80240E44 0220202D */ daddu $a0, $s1, $zero -.L80240E48: -/* 9403F8 80240E48 8CA20000 */ lw $v0, ($a1) -/* 9403FC 80240E4C 24A50004 */ addiu $a1, $a1, 4 -/* 940400 80240E50 24630001 */ addiu $v1, $v1, 1 -/* 940404 80240E54 AC820084 */ sw $v0, 0x84($a0) -/* 940408 80240E58 28620010 */ slti $v0, $v1, 0x10 -/* 94040C 80240E5C 1440FFFA */ bnez $v0, .L80240E48 -/* 940410 80240E60 24840004 */ addiu $a0, $a0, 4 -/* 940414 80240E64 3C108024 */ lui $s0, %hi(D_80241FF4_9415A4) -/* 940418 80240E68 26101FF4 */ addiu $s0, $s0, %lo(D_80241FF4_9415A4) -/* 94041C 80240E6C 0C00AB4B */ jal heap_free -/* 940420 80240E70 8E040000 */ lw $a0, ($s0) -/* 940424 80240E74 AE000000 */ sw $zero, ($s0) -.L80240E78: -/* 940428 80240E78 8FBF0018 */ lw $ra, 0x18($sp) -/* 94042C 80240E7C 8FB10014 */ lw $s1, 0x14($sp) -/* 940430 80240E80 8FB00010 */ lw $s0, 0x10($sp) -/* 940434 80240E84 24020002 */ addiu $v0, $zero, 2 -/* 940438 80240E88 03E00008 */ jr $ra -/* 94043C 80240E8C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_80240040_945F10.s b/ver/us/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_80240040_945F10.s deleted file mode 100644 index 276b7275c9..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_80240040_945F10.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_945F10 -/* 945F10 80240040 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 945F14 80240044 AFB00010 */ sw $s0, 0x10($sp) -/* 945F18 80240048 3C108024 */ lui $s0, %hi(D_80240D9C_946C6C) -/* 945F1C 8024004C 26100D9C */ addiu $s0, $s0, %lo(D_80240D9C_946C6C) -/* 945F20 80240050 AFBF0018 */ sw $ra, 0x18($sp) -/* 945F24 80240054 AFB10014 */ sw $s1, 0x14($sp) -/* 945F28 80240058 8E020000 */ lw $v0, ($s0) -/* 945F2C 8024005C 14400010 */ bnez $v0, .L802400A0 -/* 945F30 80240060 0080882D */ daddu $s1, $a0, $zero -/* 945F34 80240064 0C00AB39 */ jal heap_malloc -/* 945F38 80240068 24040040 */ addiu $a0, $zero, 0x40 -/* 945F3C 8024006C AE020000 */ sw $v0, ($s0) -/* 945F40 80240070 0000182D */ daddu $v1, $zero, $zero -/* 945F44 80240074 0040282D */ daddu $a1, $v0, $zero -/* 945F48 80240078 0220202D */ daddu $a0, $s1, $zero -.L8024007C: -/* 945F4C 8024007C 8C820084 */ lw $v0, 0x84($a0) -/* 945F50 80240080 24840004 */ addiu $a0, $a0, 4 -/* 945F54 80240084 24630001 */ addiu $v1, $v1, 1 -/* 945F58 80240088 ACA20000 */ sw $v0, ($a1) -/* 945F5C 8024008C 28620010 */ slti $v0, $v1, 0x10 -/* 945F60 80240090 1440FFFA */ bnez $v0, .L8024007C -/* 945F64 80240094 24A50004 */ addiu $a1, $a1, 4 -/* 945F68 80240098 08090037 */ j .L802400DC -/* 945F6C 8024009C 00000000 */ nop -.L802400A0: -/* 945F70 802400A0 0000182D */ daddu $v1, $zero, $zero -/* 945F74 802400A4 0040282D */ daddu $a1, $v0, $zero -/* 945F78 802400A8 0220202D */ daddu $a0, $s1, $zero -.L802400AC: -/* 945F7C 802400AC 8CA20000 */ lw $v0, ($a1) -/* 945F80 802400B0 24A50004 */ addiu $a1, $a1, 4 -/* 945F84 802400B4 24630001 */ addiu $v1, $v1, 1 -/* 945F88 802400B8 AC820084 */ sw $v0, 0x84($a0) -/* 945F8C 802400BC 28620010 */ slti $v0, $v1, 0x10 -/* 945F90 802400C0 1440FFFA */ bnez $v0, .L802400AC -/* 945F94 802400C4 24840004 */ addiu $a0, $a0, 4 -/* 945F98 802400C8 3C108024 */ lui $s0, %hi(D_80240D9C_946C6C) -/* 945F9C 802400CC 26100D9C */ addiu $s0, $s0, %lo(D_80240D9C_946C6C) -/* 945FA0 802400D0 0C00AB4B */ jal heap_free -/* 945FA4 802400D4 8E040000 */ lw $a0, ($s0) -/* 945FA8 802400D8 AE000000 */ sw $zero, ($s0) -.L802400DC: -/* 945FAC 802400DC 8FBF0018 */ lw $ra, 0x18($sp) -/* 945FB0 802400E0 8FB10014 */ lw $s1, 0x14($sp) -/* 945FB4 802400E4 8FB00010 */ lw $s0, 0x10($sp) -/* 945FB8 802400E8 24020002 */ addiu $v0, $zero, 2 -/* 945FBC 802400EC 03E00008 */ jr $ra -/* 945FC0 802400F0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_02/86CA50/func_80240310_86CA50.s b/ver/us/asm/nonmatchings/world/area_tik/tik_02/86CA50/func_80240310_86CA50.s deleted file mode 100644 index d6574c5dfa..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_02/86CA50/func_80240310_86CA50.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240310_86CA50 -/* 86CA50 80240310 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 86CA54 80240314 AFB00010 */ sw $s0, 0x10($sp) -/* 86CA58 80240318 3C108024 */ lui $s0, %hi(D_802410C0_86D800) -/* 86CA5C 8024031C 261010C0 */ addiu $s0, $s0, %lo(D_802410C0_86D800) -/* 86CA60 80240320 AFBF0018 */ sw $ra, 0x18($sp) -/* 86CA64 80240324 AFB10014 */ sw $s1, 0x14($sp) -/* 86CA68 80240328 8E020000 */ lw $v0, ($s0) -/* 86CA6C 8024032C 14400010 */ bnez $v0, .L80240370 -/* 86CA70 80240330 0080882D */ daddu $s1, $a0, $zero -/* 86CA74 80240334 0C00AB39 */ jal heap_malloc -/* 86CA78 80240338 24040040 */ addiu $a0, $zero, 0x40 -/* 86CA7C 8024033C AE020000 */ sw $v0, ($s0) -/* 86CA80 80240340 0000182D */ daddu $v1, $zero, $zero -/* 86CA84 80240344 0040282D */ daddu $a1, $v0, $zero -/* 86CA88 80240348 0220202D */ daddu $a0, $s1, $zero -.L8024034C: -/* 86CA8C 8024034C 8C820084 */ lw $v0, 0x84($a0) -/* 86CA90 80240350 24840004 */ addiu $a0, $a0, 4 -/* 86CA94 80240354 24630001 */ addiu $v1, $v1, 1 -/* 86CA98 80240358 ACA20000 */ sw $v0, ($a1) -/* 86CA9C 8024035C 28620010 */ slti $v0, $v1, 0x10 -/* 86CAA0 80240360 1440FFFA */ bnez $v0, .L8024034C -/* 86CAA4 80240364 24A50004 */ addiu $a1, $a1, 4 -/* 86CAA8 80240368 080900EB */ j .L802403AC -/* 86CAAC 8024036C 00000000 */ nop -.L80240370: -/* 86CAB0 80240370 0000182D */ daddu $v1, $zero, $zero -/* 86CAB4 80240374 0040282D */ daddu $a1, $v0, $zero -/* 86CAB8 80240378 0220202D */ daddu $a0, $s1, $zero -.L8024037C: -/* 86CABC 8024037C 8CA20000 */ lw $v0, ($a1) -/* 86CAC0 80240380 24A50004 */ addiu $a1, $a1, 4 -/* 86CAC4 80240384 24630001 */ addiu $v1, $v1, 1 -/* 86CAC8 80240388 AC820084 */ sw $v0, 0x84($a0) -/* 86CACC 8024038C 28620010 */ slti $v0, $v1, 0x10 -/* 86CAD0 80240390 1440FFFA */ bnez $v0, .L8024037C -/* 86CAD4 80240394 24840004 */ addiu $a0, $a0, 4 -/* 86CAD8 80240398 3C108024 */ lui $s0, %hi(D_802410C0_86D800) -/* 86CADC 8024039C 261010C0 */ addiu $s0, $s0, %lo(D_802410C0_86D800) -/* 86CAE0 802403A0 0C00AB4B */ jal heap_free -/* 86CAE4 802403A4 8E040000 */ lw $a0, ($s0) -/* 86CAE8 802403A8 AE000000 */ sw $zero, ($s0) -.L802403AC: -/* 86CAEC 802403AC 8FBF0018 */ lw $ra, 0x18($sp) -/* 86CAF0 802403B0 8FB10014 */ lw $s1, 0x14($sp) -/* 86CAF4 802403B4 8FB00010 */ lw $s0, 0x10($sp) -/* 86CAF8 802403B8 24020002 */ addiu $v0, $zero, 2 -/* 86CAFC 802403BC 03E00008 */ jr $ra -/* 86CB00 802403C0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_80240680_875440.s b/ver/us/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_80240680_875440.s deleted file mode 100644 index c686849ab5..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_80240680_875440.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240680_875440 -/* 875440 80240680 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 875444 80240684 AFB00010 */ sw $s0, 0x10($sp) -/* 875448 80240688 3C108024 */ lui $s0, %hi(D_80241800_8765C0) -/* 87544C 8024068C 26101800 */ addiu $s0, $s0, %lo(D_80241800_8765C0) -/* 875450 80240690 AFBF0018 */ sw $ra, 0x18($sp) -/* 875454 80240694 AFB10014 */ sw $s1, 0x14($sp) -/* 875458 80240698 8E020000 */ lw $v0, ($s0) -/* 87545C 8024069C 14400010 */ bnez $v0, .L802406E0 -/* 875460 802406A0 0080882D */ daddu $s1, $a0, $zero -/* 875464 802406A4 0C00AB39 */ jal heap_malloc -/* 875468 802406A8 24040040 */ addiu $a0, $zero, 0x40 -/* 87546C 802406AC AE020000 */ sw $v0, ($s0) -/* 875470 802406B0 0000182D */ daddu $v1, $zero, $zero -/* 875474 802406B4 0040282D */ daddu $a1, $v0, $zero -/* 875478 802406B8 0220202D */ daddu $a0, $s1, $zero -.L802406BC: -/* 87547C 802406BC 8C820084 */ lw $v0, 0x84($a0) -/* 875480 802406C0 24840004 */ addiu $a0, $a0, 4 -/* 875484 802406C4 24630001 */ addiu $v1, $v1, 1 -/* 875488 802406C8 ACA20000 */ sw $v0, ($a1) -/* 87548C 802406CC 28620010 */ slti $v0, $v1, 0x10 -/* 875490 802406D0 1440FFFA */ bnez $v0, .L802406BC -/* 875494 802406D4 24A50004 */ addiu $a1, $a1, 4 -/* 875498 802406D8 080901C7 */ j .L8024071C -/* 87549C 802406DC 00000000 */ nop -.L802406E0: -/* 8754A0 802406E0 0000182D */ daddu $v1, $zero, $zero -/* 8754A4 802406E4 0040282D */ daddu $a1, $v0, $zero -/* 8754A8 802406E8 0220202D */ daddu $a0, $s1, $zero -.L802406EC: -/* 8754AC 802406EC 8CA20000 */ lw $v0, ($a1) -/* 8754B0 802406F0 24A50004 */ addiu $a1, $a1, 4 -/* 8754B4 802406F4 24630001 */ addiu $v1, $v1, 1 -/* 8754B8 802406F8 AC820084 */ sw $v0, 0x84($a0) -/* 8754BC 802406FC 28620010 */ slti $v0, $v1, 0x10 -/* 8754C0 80240700 1440FFFA */ bnez $v0, .L802406EC -/* 8754C4 80240704 24840004 */ addiu $a0, $a0, 4 -/* 8754C8 80240708 3C108024 */ lui $s0, %hi(D_80241800_8765C0) -/* 8754CC 8024070C 26101800 */ addiu $s0, $s0, %lo(D_80241800_8765C0) -/* 8754D0 80240710 0C00AB4B */ jal heap_free -/* 8754D4 80240714 8E040000 */ lw $a0, ($s0) -/* 8754D8 80240718 AE000000 */ sw $zero, ($s0) -.L8024071C: -/* 8754DC 8024071C 8FBF0018 */ lw $ra, 0x18($sp) -/* 8754E0 80240720 8FB10014 */ lw $s1, 0x14($sp) -/* 8754E4 80240724 8FB00010 */ lw $s0, 0x10($sp) -/* 8754E8 80240728 24020002 */ addiu $v0, $zero, 2 -/* 8754EC 8024072C 03E00008 */ jr $ra -/* 8754F0 80240730 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240960_889530.s b/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240960_889530.s deleted file mode 100644 index df1b29d94a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240960_889530.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240960_889530 -/* 889530 80240960 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 889534 80240964 AFB00010 */ sw $s0, 0x10($sp) -/* 889538 80240968 3C108024 */ lui $s0, %hi(D_80243C40_88C810) -/* 88953C 8024096C 26103C40 */ addiu $s0, $s0, %lo(D_80243C40_88C810) -/* 889540 80240970 AFBF0018 */ sw $ra, 0x18($sp) -/* 889544 80240974 AFB10014 */ sw $s1, 0x14($sp) -/* 889548 80240978 8E020000 */ lw $v0, ($s0) -/* 88954C 8024097C 14400010 */ bnez $v0, .L802409C0 -/* 889550 80240980 0080882D */ daddu $s1, $a0, $zero -/* 889554 80240984 0C00AB39 */ jal heap_malloc -/* 889558 80240988 24040040 */ addiu $a0, $zero, 0x40 -/* 88955C 8024098C AE020000 */ sw $v0, ($s0) -/* 889560 80240990 0000182D */ daddu $v1, $zero, $zero -/* 889564 80240994 0040282D */ daddu $a1, $v0, $zero -/* 889568 80240998 0220202D */ daddu $a0, $s1, $zero -.L8024099C: -/* 88956C 8024099C 8C820084 */ lw $v0, 0x84($a0) -/* 889570 802409A0 24840004 */ addiu $a0, $a0, 4 -/* 889574 802409A4 24630001 */ addiu $v1, $v1, 1 -/* 889578 802409A8 ACA20000 */ sw $v0, ($a1) -/* 88957C 802409AC 28620010 */ slti $v0, $v1, 0x10 -/* 889580 802409B0 1440FFFA */ bnez $v0, .L8024099C -/* 889584 802409B4 24A50004 */ addiu $a1, $a1, 4 -/* 889588 802409B8 0809027F */ j .L802409FC -/* 88958C 802409BC 00000000 */ nop -.L802409C0: -/* 889590 802409C0 0000182D */ daddu $v1, $zero, $zero -/* 889594 802409C4 0040282D */ daddu $a1, $v0, $zero -/* 889598 802409C8 0220202D */ daddu $a0, $s1, $zero -.L802409CC: -/* 88959C 802409CC 8CA20000 */ lw $v0, ($a1) -/* 8895A0 802409D0 24A50004 */ addiu $a1, $a1, 4 -/* 8895A4 802409D4 24630001 */ addiu $v1, $v1, 1 -/* 8895A8 802409D8 AC820084 */ sw $v0, 0x84($a0) -/* 8895AC 802409DC 28620010 */ slti $v0, $v1, 0x10 -/* 8895B0 802409E0 1440FFFA */ bnez $v0, .L802409CC -/* 8895B4 802409E4 24840004 */ addiu $a0, $a0, 4 -/* 8895B8 802409E8 3C108024 */ lui $s0, %hi(D_80243C40_88C810) -/* 8895BC 802409EC 26103C40 */ addiu $s0, $s0, %lo(D_80243C40_88C810) -/* 8895C0 802409F0 0C00AB4B */ jal heap_free -/* 8895C4 802409F4 8E040000 */ lw $a0, ($s0) -/* 8895C8 802409F8 AE000000 */ sw $zero, ($s0) -.L802409FC: -/* 8895CC 802409FC 8FBF0018 */ lw $ra, 0x18($sp) -/* 8895D0 80240A00 8FB10014 */ lw $s1, 0x14($sp) -/* 8895D4 80240A04 8FB00010 */ lw $s0, 0x10($sp) -/* 8895D8 80240A08 24020002 */ addiu $v0, $zero, 2 -/* 8895DC 80240A0C 03E00008 */ jr $ra -/* 8895E0 80240A10 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_15/890190/func_80240960_890500.s b/ver/us/asm/nonmatchings/world/area_tik/tik_15/890190/func_80240960_890500.s deleted file mode 100644 index a8da57a21c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_15/890190/func_80240960_890500.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240960_890500 -/* 890500 80240960 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 890504 80240964 AFB00010 */ sw $s0, 0x10($sp) -/* 890508 80240968 3C108024 */ lui $s0, %hi(D_80242758_8922F8) -/* 89050C 8024096C 26102758 */ addiu $s0, $s0, %lo(D_80242758_8922F8) -/* 890510 80240970 AFBF0018 */ sw $ra, 0x18($sp) -/* 890514 80240974 AFB10014 */ sw $s1, 0x14($sp) -/* 890518 80240978 8E020000 */ lw $v0, ($s0) -/* 89051C 8024097C 14400010 */ bnez $v0, .L802409C0 -/* 890520 80240980 0080882D */ daddu $s1, $a0, $zero -/* 890524 80240984 0C00AB39 */ jal heap_malloc -/* 890528 80240988 24040040 */ addiu $a0, $zero, 0x40 -/* 89052C 8024098C AE020000 */ sw $v0, ($s0) -/* 890530 80240990 0000182D */ daddu $v1, $zero, $zero -/* 890534 80240994 0040282D */ daddu $a1, $v0, $zero -/* 890538 80240998 0220202D */ daddu $a0, $s1, $zero -.L8024099C: -/* 89053C 8024099C 8C820084 */ lw $v0, 0x84($a0) -/* 890540 802409A0 24840004 */ addiu $a0, $a0, 4 -/* 890544 802409A4 24630001 */ addiu $v1, $v1, 1 -/* 890548 802409A8 ACA20000 */ sw $v0, ($a1) -/* 89054C 802409AC 28620010 */ slti $v0, $v1, 0x10 -/* 890550 802409B0 1440FFFA */ bnez $v0, .L8024099C -/* 890554 802409B4 24A50004 */ addiu $a1, $a1, 4 -/* 890558 802409B8 0809027F */ j .L802409FC -/* 89055C 802409BC 00000000 */ nop -.L802409C0: -/* 890560 802409C0 0000182D */ daddu $v1, $zero, $zero -/* 890564 802409C4 0040282D */ daddu $a1, $v0, $zero -/* 890568 802409C8 0220202D */ daddu $a0, $s1, $zero -.L802409CC: -/* 89056C 802409CC 8CA20000 */ lw $v0, ($a1) -/* 890570 802409D0 24A50004 */ addiu $a1, $a1, 4 -/* 890574 802409D4 24630001 */ addiu $v1, $v1, 1 -/* 890578 802409D8 AC820084 */ sw $v0, 0x84($a0) -/* 89057C 802409DC 28620010 */ slti $v0, $v1, 0x10 -/* 890580 802409E0 1440FFFA */ bnez $v0, .L802409CC -/* 890584 802409E4 24840004 */ addiu $a0, $a0, 4 -/* 890588 802409E8 3C108024 */ lui $s0, %hi(D_80242758_8922F8) -/* 89058C 802409EC 26102758 */ addiu $s0, $s0, %lo(D_80242758_8922F8) -/* 890590 802409F0 0C00AB4B */ jal heap_free -/* 890594 802409F4 8E040000 */ lw $a0, ($s0) -/* 890598 802409F8 AE000000 */ sw $zero, ($s0) -.L802409FC: -/* 89059C 802409FC 8FBF0018 */ lw $ra, 0x18($sp) -/* 8905A0 80240A00 8FB10014 */ lw $s1, 0x14($sp) -/* 8905A4 80240A04 8FB00010 */ lw $s0, 0x10($sp) -/* 8905A8 80240A08 24020002 */ addiu $v0, $zero, 2 -/* 8905AC 80240A0C 03E00008 */ jr $ra -/* 8905B0 80240A10 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_00/999F80/func_80240310_999F80.s b/ver/us/asm/nonmatchings/world/area_trd/trd_00/999F80/func_80240310_999F80.s deleted file mode 100644 index 2fd96e1ccf..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_00/999F80/func_80240310_999F80.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240310_999F80 -/* 999F80 80240310 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 999F84 80240314 AFB00010 */ sw $s0, 0x10($sp) -/* 999F88 80240318 3C108024 */ lui $s0, %hi(D_80241340_99AFB0) -/* 999F8C 8024031C 26101340 */ addiu $s0, $s0, %lo(D_80241340_99AFB0) -/* 999F90 80240320 AFBF0018 */ sw $ra, 0x18($sp) -/* 999F94 80240324 AFB10014 */ sw $s1, 0x14($sp) -/* 999F98 80240328 8E020000 */ lw $v0, ($s0) -/* 999F9C 8024032C 14400010 */ bnez $v0, .L80240370 -/* 999FA0 80240330 0080882D */ daddu $s1, $a0, $zero -/* 999FA4 80240334 0C00AB39 */ jal heap_malloc -/* 999FA8 80240338 24040040 */ addiu $a0, $zero, 0x40 -/* 999FAC 8024033C AE020000 */ sw $v0, ($s0) -/* 999FB0 80240340 0000182D */ daddu $v1, $zero, $zero -/* 999FB4 80240344 0040282D */ daddu $a1, $v0, $zero -/* 999FB8 80240348 0220202D */ daddu $a0, $s1, $zero -.L8024034C: -/* 999FBC 8024034C 8C820084 */ lw $v0, 0x84($a0) -/* 999FC0 80240350 24840004 */ addiu $a0, $a0, 4 -/* 999FC4 80240354 24630001 */ addiu $v1, $v1, 1 -/* 999FC8 80240358 ACA20000 */ sw $v0, ($a1) -/* 999FCC 8024035C 28620010 */ slti $v0, $v1, 0x10 -/* 999FD0 80240360 1440FFFA */ bnez $v0, .L8024034C -/* 999FD4 80240364 24A50004 */ addiu $a1, $a1, 4 -/* 999FD8 80240368 080900EB */ j .L802403AC -/* 999FDC 8024036C 00000000 */ nop -.L80240370: -/* 999FE0 80240370 0000182D */ daddu $v1, $zero, $zero -/* 999FE4 80240374 0040282D */ daddu $a1, $v0, $zero -/* 999FE8 80240378 0220202D */ daddu $a0, $s1, $zero -.L8024037C: -/* 999FEC 8024037C 8CA20000 */ lw $v0, ($a1) -/* 999FF0 80240380 24A50004 */ addiu $a1, $a1, 4 -/* 999FF4 80240384 24630001 */ addiu $v1, $v1, 1 -/* 999FF8 80240388 AC820084 */ sw $v0, 0x84($a0) -/* 999FFC 8024038C 28620010 */ slti $v0, $v1, 0x10 -/* 99A000 80240390 1440FFFA */ bnez $v0, .L8024037C -/* 99A004 80240394 24840004 */ addiu $a0, $a0, 4 -/* 99A008 80240398 3C108024 */ lui $s0, %hi(D_80241340_99AFB0) -/* 99A00C 8024039C 26101340 */ addiu $s0, $s0, %lo(D_80241340_99AFB0) -/* 99A010 802403A0 0C00AB4B */ jal heap_free -/* 99A014 802403A4 8E040000 */ lw $a0, ($s0) -/* 99A018 802403A8 AE000000 */ sw $zero, ($s0) -.L802403AC: -/* 99A01C 802403AC 8FBF0018 */ lw $ra, 0x18($sp) -/* 99A020 802403B0 8FB10014 */ lw $s1, 0x14($sp) -/* 99A024 802403B4 8FB00010 */ lw $s0, 0x10($sp) -/* 99A028 802403B8 24020002 */ addiu $v0, $zero, 2 -/* 99A02C 802403BC 03E00008 */ jr $ra -/* 99A030 802403C0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index 7bc65f678a..de12dcf2e0 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -11957,7 +11957,7 @@ mac_00_UpdateTexturePanSmooth = 0x802402E0; // type:func rom:0x7EAFF0 mac_00_UpdateTexturePanStepped = 0x80240404; // type:func rom:0x7EB114 func_802405EC_7EB2FC = 0x802405EC; // type:func rom:0x7EB2FC func_80240624_7EB334 = 0x80240624; // type:func rom:0x7EB334 -func_80240630_7EB340 = 0x80240630; // type:func rom:0x7EB340 +mac_00_StashVars = 0x80240630; // type:func rom:0x7EB340 mac_00_GetItemName = 0x802406E4; // type:func rom:0x7EB3F4 mac_00_Set80151310_1 = 0x80240748; // type:func rom:0x7EB458 mac_00_Set80151310_0 = 0x8024075C; // type:func rom:0x7EB46C @@ -12018,7 +12018,7 @@ mac_00_UnkFunc15 = 0x80242EBC; // type:func rom:0x7EDBCC mac_00_UnkNpcDurationFlagFunc = 0x80242FDC; // type:func rom:0x7EDCEC mac_00_UnkFunc16 = 0x80243044; // type:func rom:0x7EDD54 mac_00_UnkNpcAIMainFunc = 0x80243104; // type:func rom:0x7EDE14 -func_80243400_7EE110 = 0x80243400; // type:func rom:0x7EE110 +dup_mac_00_StashVars = 0x80243400; // type:func rom:0x7EE110 dup_mac_00_GetItemName = 0x802434B4; // type:func rom:0x7EE1C4 dup_mac_00_GetNpcCollisionHeight = 0x80243518; // type:func rom:0x7EE228 dup_mac_00_AddPlayerHandsOffset = 0x80243574; // type:func rom:0x7EE284 @@ -12029,7 +12029,7 @@ dup_mac_00_SetManyVars = 0x8024386C; // type:func rom:0x7EE57C dup_mac_00_UnkYawFunc = 0x8024395C; // type:func rom:0x7EE66C func_80243AE8_7EE7F8 = 0x80243AE8; // type:func rom:0x7EE7F8 func_80243B2C_7EE83C = 0x80243B2C; // type:func rom:0x7EE83C -D_80245DC0_7F0AD0 = 0x80245DC0; // type:data rom:0x7F0AD0 +mac_00_varTable = 0x80245DC0; // type:data rom:0x7F0AD0 D_80245E24_7F0B34 = 0x80245E24; // type:data rom:0x7F0B34 D_80245E64_7F0B74 = 0x80245E64; // type:data rom:0x7F0B74 D_802483E8_7F30F8 = 0x802483E8; // type:data rom:0x7F30F8 @@ -12038,7 +12038,7 @@ D_80248F18_7F3C28 = 0x80248F18; // type:data rom:0x7F3C28 D_80248F20_7F3C30 = 0x80248F20; // type:data rom:0x7F3C30 D_80248F28_7F3C38 = 0x80248F28; // type:data rom:0x7F3C38 mac_00_dojoBattleIDs = 0x8024A632; // type:data rom:0x7F5340 -D_8024ECE8_7F99F8 = 0x8024ECE8; // type:data rom:0x7F99F8 +dup_mac_00_varTable = 0x8024ECE8; // type:data rom:0x7F99F8 D_8024ED4C_7F9A5C = 0x8024ED4C; // type:data rom:0x7F9A5C D_8024ED50_7F9A60 = 0x8024ED50; // type:data rom:0x7F9A60 D_802559C0_8006D0 = 0x802559C0; // type:data rom:0x8006D0 @@ -12064,7 +12064,7 @@ mac_01_UnkFunc15 = 0x802419CC; // type:func rom:0x80224C dup_mac_01_UnkNpcDurationFlagFunc = 0x80241AEC; // type:func rom:0x80236C mac_01_UnkFunc16 = 0x80241B54; // type:func rom:0x8023D4 func_80241C14_802494 = 0x80241C14; // type:func rom:0x802494 -func_80241F10_802790 = 0x80241F10; // type:func rom:0x802790 +mac_01_StashVars = 0x80241F10; // type:func rom:0x802790 mac_01_GetItemName = 0x80241FC4; // type:func rom:0x802844 mac_01_Set80151310_1 = 0x80242028; // type:func rom:0x8028A8 mac_01_Set80151310_0 = 0x8024203C; // type:func rom:0x8028BC @@ -12164,7 +12164,7 @@ D_80247F88_808808 = 0x80247F88; // type:data rom:0x808808 D_80248420_808CA0 = 0x80248420; // type:data rom:0x808CA0 D_802485E8_808E68 = 0x802485E8; // type:data rom:0x808E68 D_80248714_808F94 = 0x80248714; // type:data rom:0x808F94 -D_80248C30_8094B0 = 0x80248C30; // type:data rom:0x8094B0 +mac_01_varTable = 0x80248C30; // type:data rom:0x8094B0 D_80248C94_809514 = 0x80248C94; // type:data rom:0x809514 D_80248CD4_809554 = 0x80248CD4; // type:data rom:0x809554 D_8024D944_80E1C4 = 0x8024D944; // type:data rom:0x80E1C4 @@ -12201,7 +12201,7 @@ mac_02_UnkFunc15 = 0x8024127C; // type:func rom:0x82453C mac_02_UnkNpcDurationFlagFunc = 0x8024139C; // type:func rom:0x82465C mac_02_UnkFunc16 = 0x80241404; // type:func rom:0x8246C4 mac_02_UnkNpcAIMainFunc = 0x802414C4; // type:func rom:0x824784 -func_802417C0_824A80 = 0x802417C0; // type:func rom:0x824A80 +mac_02_StashVars = 0x802417C0; // type:func rom:0x824A80 mac_02_GetItemName = 0x80241874; // type:func rom:0x824B34 mac_02_Set80151310_1 = 0x802418D8; // type:func rom:0x824B98 mac_02_Set80151310_0 = 0x802418EC; // type:func rom:0x824BAC @@ -12245,7 +12245,7 @@ mac_02_UnkYawFunc = 0x802431F4; // type:func rom:0x8264B4 filemenu_update_show_name_input_826640 = 0x80243380; // type:func rom:0x826640 func_802433C4_826684 = 0x802433C4; // type:func rom:0x826684 mac_02_UnkMusicFunc = 0x802433F0; // type:func rom:0x8266B0 -D_80246150_829410 = 0x80246150; // type:data rom:0x829410 +mac_02_varTable = 0x80246150; // type:data rom:0x829410 D_802461B4_829474 = 0x802461B4; // type:data rom:0x829474 D_802461F4_8294B4 = 0x802461F4; // type:data rom:0x8294B4 D_80248778_82BA38 = 0x80248778; // type:data rom:0x82BA38 @@ -12269,7 +12269,7 @@ mac_03_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0x8319D0 mac_03_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x831A3C func_802402E0_831AE0 = 0x802402E0; // type:func rom:0x831AE0 mac_03_UnkFloatFunc = 0x80240320; // type:func rom:0x831B20 -func_802404B0_831CB0 = 0x802404B0; // type:func rom:0x831CB0 +mac_03_StashVars = 0x802404B0; // type:func rom:0x831CB0 mac_03_GetItemName = 0x80240564; // type:func rom:0x831D64 mac_03_Set80151310_1 = 0x802405C8; // type:func rom:0x831DC8 mac_03_Set80151310_0 = 0x802405DC; // type:func rom:0x831DDC @@ -12321,7 +12321,7 @@ func_802425A8_833DA8 = 0x802425A8; // type:func rom:0x833DA8 func_80242608_833E08 = 0x80242608; // type:func rom:0x833E08 func_80242694_833E94 = 0x80242694; // type:func rom:0x833E94 func_802427D0_833FD0 = 0x802427D0; // type:func rom:0x833FD0 -D_80246644_837E44 = 0x80246644; // type:data rom:0x837E44 +mac_03_varTable = 0x80246644; // type:data rom:0x837E44 D_802466A8_837EA8 = 0x802466A8; // type:data rom:0x837EA8 D_802466E8_837EE8 = 0x802466E8; // type:data rom:0x837EE8 D_80248C6C_83A46C = 0x80248C6C; // type:data rom:0x83A46C @@ -12333,7 +12333,7 @@ func_80240194_842D64 = 0x80240194; // type:func rom:0x842D64 func_802401C0_842D90 = 0x802401C0; // type:func rom:0x842D90 mac_04_foliage_setup_shear_mtx = 0x80240220; // type:func rom:0x842DF0 mac_04_TransformFoliage = 0x80240290; // type:func rom:0x842E60 -func_80240460_843030 = 0x80240460; // type:func rom:0x843030 +mac_04_StashVars = 0x80240460; // type:func rom:0x843030 mac_04_GetItemName = 0x80240514; // type:func rom:0x8430E4 mac_04_Set80151310_1 = 0x80240578; // type:func rom:0x843148 mac_04_Set80151310_0 = 0x8024058C; // type:func rom:0x84315C @@ -12384,7 +12384,7 @@ func_80241D30_844900 = 0x80241D30; // type:func rom:0x844900 func_80241DAC_84497C = 0x80241DAC; // type:func rom:0x84497C mac_04_SetEntityFlags100000 = 0x80241EB0; // type:func rom:0x844A80 mac_04_UnkMusicFunc = 0x80241EF0; // type:func rom:0x844AC0 -D_80243FE8_846BB8 = 0x80243FE8; // type:data rom:0x846BB8 +mac_04_varTable = 0x80243FE8; // type:data rom:0x846BB8 D_8024404C_846C1C = 0x8024404C; // type:data rom:0x846C1C D_8024408C_846C5C = 0x8024408C; // type:data rom:0x846C5C D_80246610_8491E0 = 0x80246610; // type:data rom:0x8491E0 @@ -12407,7 +12407,7 @@ mac_05_UnkFunc15 = 0x80240DDC; // type:func rom:0x852F4C mac_05_UnkNpcDurationFlagFunc = 0x80240EFC; // type:func rom:0x85306C mac_05_UnkFunc16 = 0x80240F64; // type:func rom:0x8530D4 mac_05_UnkNpcAIMainFunc = 0x80241024; // type:func rom:0x853194 -func_80241320_853490 = 0x80241320; // type:func rom:0x853490 +mac_05_StashVars = 0x80241320; // type:func rom:0x853490 mac_05_GetItemName = 0x802413D4; // type:func rom:0x853544 mac_05_Set80151310_1 = 0x80241438; // type:func rom:0x8535A8 mac_05_Set80151310_0 = 0x8024144C; // type:func rom:0x8535BC @@ -12466,7 +12466,7 @@ func_80243CD4_855E44 = 0x80243CD4; // type:func rom:0x855E44 func_80243D78_855EE8 = 0x80243D78; // type:func rom:0x855EE8 func_80243DB0_855F20 = 0x80243DB0; // type:func rom:0x855F20 func_80243F0C_85607C = 0x80243F0C; // type:func rom:0x85607C -D_802450B0_857220 = 0x802450B0; // type:data rom:0x857220 +mac_05_varTable = 0x802450B0; // type:data rom:0x857220 D_80245114_857284 = 0x80245114; // type:data rom:0x857284 D_80245154_8572C4 = 0x80245154; // type:data rom:0x8572C4 D_802476D8_859848 = 0x802476D8; // type:data rom:0x859848 @@ -12520,13 +12520,13 @@ func_80240A30_869EE0 = 0x80240A30; // type:func rom:0x869EE0 D_80242B7E_86C02E = 0x80242B7E; // type:data rom:0x86C02E tik_02_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0x86C740 tik_02_UpdateTexturePanStepped = 0x80240124; // type:func rom:0x86C864 -func_80240310_86CA50 = 0x80240310; // type:func rom:0x86CA50 +tik_02_StashVars = 0x80240310; // type:func rom:0x86CA50 tik_02_GetItemName = 0x802403C4; // type:func rom:0x86CB04 tik_02_SomeItemEntityFunc = 0x80240428; // type:func rom:0x86CB68 tik_02_CheckItemFlags40 = 0x80240578; // type:func rom:0x86CCB8 tik_02_UnkPosFunc2 = 0x802405D0; // type:func rom:0x86CD10 func_80240940_86D080 = 0x80240940; // type:func rom:0x86D080 -D_802410C0_86D800 = 0x802410C0; // type:data rom:0x86D800 +tik_02_varTable = 0x802410C0; // type:data rom:0x86D800 D_80241BAE_86E2EE = 0x80241BAE; // type:data rom:0x86E2EE tik_03_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0x86EB00 tik_03_GetCurrentFloor = 0x80240020; // type:func rom:0x86EB20 @@ -12558,13 +12558,13 @@ func_80240C20_872650 = 0x80240C20; // type:func rom:0x872650 tik_05_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0x874DC0 tik_05_UpdateTexturePanStepped = 0x80240124; // type:func rom:0x874EE4 tik_05_UnkPosFunc2 = 0x80240310; // type:func rom:0x8750D0 -func_80240680_875440 = 0x80240680; // type:func rom:0x875440 +tik_05_StashVars = 0x80240680; // type:func rom:0x875440 tik_05_GetItemName = 0x80240734; // type:func rom:0x8754F4 tik_05_SomeItemEntityFunc = 0x80240798; // type:func rom:0x875558 tik_05_CheckItemFlags40 = 0x802408E8; // type:func rom:0x8756A8 func_8024093C_8756FC = 0x8024093C; // type:func rom:0x8756FC tik_05_SetEntityPosition = 0x80240984; // type:func rom:0x875744 -D_80241800_8765C0 = 0x80241800; // type:data rom:0x8765C0 +tik_05_varTable = 0x80241800; // type:data rom:0x8765C0 tik_06_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0x876EE0 tik_06_GetCurrentFloor = 0x80240020; // type:func rom:0x876F00 tik_06_UnkFunc25 = 0x80240034; // type:func rom:0x876F14 @@ -12684,7 +12684,7 @@ tik_12_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x888E0C tik_12_UpdateTexturePanSmooth = 0x802402E0; // type:func rom:0x888EB0 tik_12_UpdateTexturePanStepped = 0x80240404; // type:func rom:0x888FD4 tik_12_UnkPosFunc2 = 0x802405F0; // type:func rom:0x8891C0 -func_80240960_889530 = 0x80240960; // type:func rom:0x889530 +tik_12_StashVars = 0x80240960; // type:func rom:0x889530 tik_12_GetItemName = 0x80240A14; // type:func rom:0x8895E4 tik_12_SomeItemEntityFunc = 0x80240A78; // type:func rom:0x889648 tik_12_CheckItemFlags40 = 0x80240BC8; // type:func rom:0x889798 @@ -12714,7 +12714,7 @@ tik_12_UnkNpcAIMainFunc5 = 0x80241CF4; // type:func rom:0x88A8C4 tik_12_func_80240814_97BE44 = 0x80242134; // type:func rom:0x88AD04 tik_12_AwaitPlayerNearNpc = 0x8024217C; // type:func rom:0x88AD4C tik_12_func_802408B4_97BEE4 = 0x802421D4; // type:func rom:0x88ADA4 -D_80243C40_88C810 = 0x80243C40; // type:data rom:0x88C810 +tik_12_varTable = 0x80243C40; // type:data rom:0x88C810 D_80243CAC_88C87C = 0x80243CAC; // type:data rom:0x88C87C D_80243CB4_88C884 = 0x80243CB4; // type:data rom:0x88C884 D_80243CC4_88C894 = 0x80243CC4; // type:data rom:0x88C894 @@ -12738,12 +12738,12 @@ tik_15_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x88FDDC tik_15_UpdateTexturePanSmooth = 0x802402E0; // type:func rom:0x88FE80 tik_15_UpdateTexturePanStepped = 0x80240404; // type:func rom:0x88FFA4 tik_15_UnkPosFunc2 = 0x802405F0; // type:func rom:0x890190 -func_80240960_890500 = 0x80240960; // type:func rom:0x890500 +tik_15_StashVars = 0x80240960; // type:func rom:0x890500 tik_15_GetItemName = 0x80240A14; // type:func rom:0x8905B4 func_80240A78_890618 = 0x80240A78; // type:func rom:0x890618 func_80240AA4_890644 = 0x80240AA4; // type:func rom:0x890644 func_80240AD0_890670 = 0x80240AD0; // type:func rom:0x890670 -D_80242758_8922F8 = 0x80242758; // type:data rom:0x8922F8 +tik_15_varTable = 0x80242758; // type:data rom:0x8922F8 D_802427BC_89235C = 0x802427BC; // type:data rom:0x89235C func_80240000_892A20 = 0x80240000; // type:func rom:0x892A20 tik_17_SetOverrideFlags_40 = 0x80240030; // type:func rom:0x892A50 @@ -12878,15 +12878,15 @@ tik_25_UnkPosFunc2 = 0x8024030C; // type:func rom:0x8A828C func_80240680_8A8600 = 0x80240680; // type:func rom:0x8A8600 tik_25_SetEntityPosition = 0x802406AC; // type:func rom:0x8A862C func_80240770_8A86F0 = 0x80240770; // type:func rom:0x8A86F0 -func_80240000_8A9A10 = 0x80240000; // type:func rom:0x8A9A10 -func_80240160_8A9B70 = 0x80240160; // type:func rom:0x8A9B70 +kgr_01_DarkRoomUpdate = 0x80240000; // type:func rom:0x8A9A10 +kgr_01_add_tongue_deformation = 0x80240160; // type:func rom:0x8A9B70 kgr_01_make_tongue_gfx = 0x80240354; // type:func rom:0x8A9D64 kgr_01_GetEffectiveTongueOffset = 0x802403E0; // type:func rom:0x8A9DF0 -func_80240500_8A9F10 = 0x80240500; // type:func rom:0x8A9F10 +kgr_01_HasBombetteExploded = 0x80240500; // type:func rom:0x8A9F10 kgr_01_TongueWiggleTime = 0x802407C0; // type:data rom:0x8AA1D0 D_80240A30_8AA440 = 0x80240A30; // type:data rom:0x8AA440 D_80240A38_8AA448 = 0x80240A38; // type:data rom:0x8AA448 -func_80240000_8AA450 = 0x80240000; // type:func rom:0x8AA450 +kgr_02_DarkRoomUpdate = 0x80240000; // type:func rom:0x8AA450 func_80240160_8AA5B0 = 0x80240160; // type:func rom:0x8AA5B0 func_80240730_8AAB80 = 0x80240730; // type:func rom:0x8AAB80 func_80240748_8AAB98 = 0x80240748; // type:func rom:0x8AAB98 @@ -12913,7 +12913,7 @@ kmr_02_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0x8B0240 kmr_02_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x8B02AC func_802402E0_8B0350 = 0x802402E0; // type:func rom:0x8B0350 func_80240370_8B03E0 = 0x80240370; // type:func rom:0x8B03E0 -func_80240390_8B0400 = 0x80240390; // type:func rom:0x8B0400 +kmr_02_StashVars = 0x80240390; // type:func rom:0x8B0400 kmr_02_GetItemName = 0x80240444; // type:func rom:0x8B04B4 kmr_02_Set80151310_1 = 0x802404A8; // type:func rom:0x8B0518 kmr_02_Set80151310_0 = 0x802404BC; // type:func rom:0x8B052C @@ -13001,7 +13001,7 @@ kmr_02_foliage_setup_shear_mtx = 0x80243760; // type:func rom:0x8B37D0 kmr_02_TransformFoliage = 0x802437D0; // type:func rom:0x8B3840 func_802439A0_8B3A10 = 0x802439A0; // type:func rom:0x8B3A10 D_80244B2C_8B4B9C = 0x80244B2C; // type:data rom:0x8B4B9C -D_802455D0_8B5640 = 0x802455D0; // type:data rom:0x8B5640 +kmr_02_varTable = 0x802455D0; // type:data rom:0x8B5640 D_80245634_8B56A4 = 0x80245634; // type:data rom:0x8B56A4 D_80245674_8B56E4 = 0x80245674; // type:data rom:0x8B56E4 D_80247E30_8B7EA0 = 0x80247E30; // type:data rom:0x8B7EA0 @@ -13063,14 +13063,14 @@ kmr_04_func_8024002C_8CA92C = 0x8024002C; // type:func rom:0x8CA92C kmr_04_foliage_setup_shear_mtx = 0x80240060; // type:func rom:0x8CA960 kmr_04_TransformFoliage = 0x802400D0; // type:func rom:0x8CA9D0 dup_kmr_04_CheckPartnerFlags1000 = 0x8024029C; // type:func rom:0x8CAB9C -func_802402C8_8CABC8 = 0x802402C8; // type:func rom:0x8CABC8 +kmr_04_StashVars = 0x802402C8; // type:func rom:0x8CABC8 kmr_04_GetItemName = 0x8024037C; // type:func rom:0x8CAC7C func_802403E0_8CACE0 = 0x802403E0; // type:func rom:0x8CACE0 kmr_04_func_80240434_8CAD34 = 0x80240434; // type:func rom:0x8CAD34 kmr_04_func_80240444_8CAD44 = 0x80240444; // type:func rom:0x8CAD44 D_80241BF0_8CC4F0 = 0x80241BF0; // type:data rom:0x8CC4F0 D_80242070_8CC970 = 0x80242070; // type:data rom:0x8CC970 -D_802429F4_8CD2F4 = 0x802429F4; // type:data rom:0x8CD2F4 +kmr_04_varTable = 0x802429F4; // type:data rom:0x8CD2F4 kmr_05_UnkNpcAIFunc23 = 0x80240000; // type:func rom:0x8CE070 kmr_05_UnkNpcAIFunc35 = 0x802401B0; // type:func rom:0x8CE220 kmr_05_UnkNpcAIFunc1_copy = 0x802407D8; // type:func rom:0x8CE848 @@ -13142,7 +13142,7 @@ kmr_09_sixFloats = 0x8024186C; // type:data rom:0x8D766C D_80242670_8D8470 = 0x80242670; // type:data rom:0x8D8470 D_80242678_8D8478 = 0x80242678; // type:data rom:0x8D8478 D_80242680_8D8480 = 0x80242680; // type:data rom:0x8D8480 -func_80240000_8D84D0 = 0x80240000; // type:func rom:0x8D84D0 +kmr_10_StashVars = 0x80240000; // type:func rom:0x8D84D0 kmr_10_GetItemName = 0x802400B4; // type:func rom:0x8D8584 kmr_10_SomeItemEntityFunc = 0x80240118; // type:func rom:0x8D85E8 kmr_10_CheckItemFlags40 = 0x80240268; // type:func rom:0x8D8738 @@ -13150,7 +13150,7 @@ func_802402BC_8D878C = 0x802402BC; // type:func rom:0x8D878C kmr_10_SetEntityPosition = 0x80240304; // type:func rom:0x8D87D4 kmr_10_foliage_setup_shear_mtx = 0x802403D0; // type:func rom:0x8D88A0 kmr_10_TransformFoliage = 0x80240440; // type:func rom:0x8D8910 -D_80240C20_8D90F0 = 0x80240C20; // type:data rom:0x8D90F0 +kmr_10_varTable = 0x80240C20; // type:data rom:0x8D90F0 kmr_11_foliage_setup_shear_mtx = 0x80240000; // type:func rom:0x8DA100 kmr_11_TransformFoliage = 0x80240070; // type:func rom:0x8DA170 kmr_11_UnkFogFunc = 0x8024023C; // type:func rom:0x8DA33C @@ -13232,7 +13232,7 @@ kmr_20_UnkFunc36 = 0x80241594; // type:func rom:0x8ED3B4 func_8024159C_8ED3BC = 0x8024159C; // type:func rom:0x8ED3BC func_802415C4_8ED3E4 = 0x802415C4; // type:func rom:0x8ED3E4 kmr_20_UnkFunc40 = 0x802415EC; // type:func rom:0x8ED40C -func_80241620_8ED440 = 0x80241620; // type:func rom:0x8ED440 +kmr_20_StashVars = 0x80241620; // type:func rom:0x8ED440 kmr_20_GetItemName = 0x802416D4; // type:func rom:0x8ED4F4 func_80241738_8ED558 = 0x80241738; // type:func rom:0x8ED558 dup_kmr_20_SetPlayerStatusAnimFlags100000 = 0x80241780; // type:func rom:0x8ED5A0 @@ -13268,7 +13268,7 @@ D_80244D84_8F0BA4 = 0x80244D84; // type:data rom:0x8F0BA4 D_80244DB4_8F0BD4 = 0x80244DB4; // type:data rom:0x8F0BD4 D_80244FA0_8F0DC0 = 0x80244FA0; // type:data rom:0x8F0DC0 D_80244FD0_8F0DF0 = 0x80244FD0; // type:data rom:0x8F0DF0 -D_8024A908_8F6728 = 0x8024A908; // type:data rom:0x8F6728 +kmr_20_varTable = 0x8024A908; // type:data rom:0x8F6728 D_80252D50_8FEB70 = 0x80252D50; // type:data rom:0x8FEB70 D_80252DC0_8FEBE0 = 0x80252DC0; // type:data rom:0x8FEBE0 D_80253030_8FEE50 = 0x80253030; // type:data rom:0x8FEE50 @@ -13335,11 +13335,11 @@ func_8024045C_90BB2C = 0x8024045C; // type:func rom:0x90BB2C func_80240488_90BB58 = 0x80240488; // type:func rom:0x90BB58 D_80240C0C_90C2DC = 0x80240C0C; // type:data rom:0x90C2DC D_80240C0F_90C2DF = 0x80240C0F; // type:data rom:0x90C2DF -func_80240000_90CC40 = 0x80240000; // type:func rom:0x90CC40 +iwa_00_StashVars = 0x80240000; // type:func rom:0x90CC40 iwa_00_GetItemName = 0x802400B4; // type:func rom:0x90CCF4 func_80240118_90CD58 = 0x80240118; // type:func rom:0x90CD58 func_802402B0_90CEF0 = 0x802402B0; // type:func rom:0x90CEF0 -D_80240FF8_90DC38 = 0x80240FF8; // type:data rom:0x90DC38 +iwa_00_varTable = 0x80240FF8; // type:data rom:0x90DC38 func_80240000_90F6B0 = 0x80240000; // type:func rom:0x90F6B0 func_80240398_90FA48 = 0x80240398; // type:func rom:0x90FA48 iwa_01_UnkFunc61 = 0x80240520; // type:func rom:0x90FBD0 @@ -13413,15 +13413,15 @@ iwa_02_UnkNpcAIFunc19 = 0x80240B68; // type:func rom:0x9168D8 iwa_02_UnkNpcAIFunc17 = 0x80240BE4; // type:func rom:0x916954 iwa_02_UnkDurationCheck = 0x80240C4C; // type:func rom:0x9169BC func_80240C90_916A00 = 0x80240C90; // type:func rom:0x916A00 -func_80240FE0_916D50 = 0x80240FE0; // type:func rom:0x916D50 +iwa_02_StashVars = 0x80240FE0; // type:func rom:0x916D50 iwa_02_GetItemName = 0x80241094; // type:func rom:0x916E04 -D_80241DA8_917B18 = 0x80241DA8; // type:data rom:0x917B18 +iwa_02_varTable = 0x80241DA8; // type:data rom:0x917B18 D_80242D40_918AB0 = 0x80242D40; // type:data rom:0x918AB0 D_80242D48_918AB8 = 0x80242D48; // type:data rom:0x918AB8 D_80242D50_918AC0 = 0x80242D50; // type:data rom:0x918AC0 D_80242D58_918AC8 = 0x80242D58; // type:data rom:0x918AC8 D_80242D60_918AD0 = 0x80242D60; // type:data rom:0x918AD0 -func_80240000_918BB0 = 0x80240000; // type:func rom:0x918BB0 +iwa_03_StashVars = 0x80240000; // type:func rom:0x918BB0 iwa_03_GetItemName = 0x802400B4; // type:func rom:0x918C64 iwa_03_SomeItemEntityFunc = 0x80240118; // type:func rom:0x918CC8 iwa_03_CheckItemFlags40 = 0x80240268; // type:func rom:0x918E18 @@ -13443,7 +13443,7 @@ iwa_03_UnkNpcAIFunc17 = 0x80240F24; // type:func rom:0x919AD4 iwa_03_UnkDurationCheck = 0x80240F8C; // type:func rom:0x919B3C func_80240FD0_919B80 = 0x80240FD0; // type:func rom:0x919B80 func_80241320_919ED0 = 0x80241320; // type:func rom:0x919ED0 -D_80241530_91A0E0 = 0x80241530; // type:data rom:0x91A0E0 +iwa_03_varTable = 0x80241530; // type:data rom:0x91A0E0 D_80242C30_91B7E0 = 0x80242C30; // type:data rom:0x91B7E0 D_80242C38_91B7E8 = 0x80242C38; // type:data rom:0x91B7E8 D_80242C40_91B7F0 = 0x80242C40; // type:data rom:0x91B7F0 @@ -13474,7 +13474,7 @@ D_80242BA0_91E480 = 0x80242BA0; // type:data rom:0x91E480 D_80242BA8_91E488 = 0x80242BA8; // type:data rom:0x91E488 D_80242BB0_91E490 = 0x80242BB0; // type:data rom:0x91E490 func_80240000_91E570 = 0x80240000; // type:func rom:0x91E570 -func_80240040_91E5B0 = 0x80240040; // type:func rom:0x91E5B0 +iwa_10_StashVars = 0x80240040; // type:func rom:0x91E5B0 iwa_10_GetItemName = 0x802400F4; // type:func rom:0x91E664 iwa_10_UnkFloatFunc = 0x80240160; // type:func rom:0x91E6D0 iwa_10_SetOverrideFlags_40 = 0x802402F0; // type:func rom:0x91E860 @@ -13504,7 +13504,7 @@ func_8024146C_91F9DC = 0x8024146C; // type:func rom:0x91F9DC func_80241510_91FA80 = 0x80241510; // type:func rom:0x91FA80 iwa_10_foliage_setup_shear_mtx = 0x802415B0; // type:func rom:0x91FB20 iwa_10_TransformFoliage = 0x80241620; // type:func rom:0x91FB90 -D_80241DD0_920340 = 0x80241DD0; // type:data rom:0x920340 +iwa_10_varTable = 0x80241DD0; // type:data rom:0x920340 D_80245A60_923FD0 = 0x80245A60; // type:data rom:0x923FD0 D_80245A68_923FD8 = 0x80245A68; // type:data rom:0x923FD8 D_80245A78_923FE8 = 0x80245A78; // type:data rom:0x923FE8 @@ -13558,14 +13558,14 @@ sbk_02_AddPlayerHandsOffset = 0x8024074C; // type:func rom:0x92A9FC func_8024091C_92ABCC = 0x8024091C; // type:func rom:0x92ABCC func_80240970_92AC20 = 0x80240970; // type:func rom:0x92AC20 func_802409A8_92AC58 = 0x802409A8; // type:func rom:0x92AC58 -func_80240A44_92ACF4 = 0x80240A44; // type:func rom:0x92ACF4 +sbk_02_StashVars = 0x80240A44; // type:func rom:0x92ACF4 sbk_02_GetItemName = 0x80240AF8; // type:func rom:0x92ADA8 PostChapter2StatUpdate = 0x80240B5C; // type:func rom:0x92AE0C func_80240B98_92AE48 = 0x80240B98; // type:func rom:0x92AE48 GetItemCount = 0x80240BD4; // type:func rom:0x92AE84 D_8024404C_92E2FC = 0x8024404C; // type:data rom:0x92E2FC D_80244050_92E300 = 0x80244050; // type:data rom:0x92E300 -D_802441D8_92E488 = 0x802441D8; // type:data rom:0x92E488 +sbk_02_varTable = 0x802441D8; // type:data rom:0x92E488 sbk_03_SpawnSunEffect = 0x80240000; // type:func rom:0x92F8B0 sbk_03_SetNpcB5_3 = 0x80240040; // type:func rom:0x92F8F0 sbk_04_SpawnSunEffect = 0x80240000; // type:func rom:0x9304D0 @@ -13625,7 +13625,7 @@ sbk_30_UnkNpcAIFunc10 = 0x80240868; // type:func rom:0x93FE18 sbk_30_UnkNpcAIFunc42 = 0x802408B0; // type:func rom:0x93FE60 sbk_30_UnkNpcAIFunc45 = 0x8024095C; // type:func rom:0x93FF0C sbk_30_UnkNpcAIMainFunc4 = 0x80240B64; // type:func rom:0x940114 -func_80240DDC_94038C = 0x80240DDC; // type:func rom:0x94038C +sbk_30_StashVars = 0x80240DDC; // type:func rom:0x94038C sbk_30_GetItemName = 0x80240E90; // type:func rom:0x940440 sbk_30_GetNpcCollisionHeight = 0x80240EF4; // type:func rom:0x9404A4 sbk_30_AddPlayerHandsOffset = 0x80240F50; // type:func rom:0x940500 @@ -13639,7 +13639,7 @@ func_80241560_940B10 = 0x80241560; // type:func rom:0x940B10 func_802415A4_940B54 = 0x802415A4; // type:func rom:0x940B54 sbk_30_foliage_setup_shear_mtx = 0x802415D0; // type:func rom:0x940B80 sbk_30_TransformFoliage = 0x80241640; // type:func rom:0x940BF0 -D_80241FF4_9415A4 = 0x80241FF4; // type:data rom:0x9415A4 +sbk_30_varTable = 0x80241FF4; // type:data rom:0x9415A4 D_80242058_941608 = 0x80242058; // type:data rom:0x941608 D_8024205C_94160C = 0x8024205C; // type:data rom:0x94160C D_802448A0_943E50 = 0x802448A0; // type:data rom:0x943E50 @@ -13652,7 +13652,7 @@ sbk_32_Bandit_DropCoin = 0x80240040; // type:func rom:0x944AA0 sbk_32_SetNpcB5_3 = 0x80240140; // type:func rom:0x944BA0 sbk_33_SpawnSunEffect = 0x80240000; // type:func rom:0x9459D0 sbk_34_SpawnSunEffect = 0x80240000; // type:func rom:0x945ED0 -func_80240040_945F10 = 0x80240040; // type:func rom:0x945F10 +sbk_34_StashVars = 0x80240040; // type:func rom:0x945F10 sbk_34_GetItemName = 0x802400F4; // type:func rom:0x945FC4 sbk_34_GetNpcCollisionHeight = 0x80240158; // type:func rom:0x946028 sbk_34_AddPlayerHandsOffset = 0x802401B4; // type:func rom:0x946084 @@ -13665,7 +13665,7 @@ func_80240728_9465F8 = 0x80240728; // type:func rom:0x9465F8 func_8024076C_94663C = 0x8024076C; // type:func rom:0x94663C sbk_34_foliage_setup_shear_mtx = 0x802407A0; // type:func rom:0x946670 sbk_34_TransformFoliage = 0x80240810; // type:func rom:0x9466E0 -D_80240D9C_946C6C = 0x80240D9C; // type:data rom:0x946C6C +sbk_34_varTable = 0x80240D9C; // type:data rom:0x946C6C D_80240E00_946CD0 = 0x80240E00; // type:data rom:0x946CD0 D_80240E04_946CD4 = 0x80240E04; // type:data rom:0x946CD4 sbk_35_SpawnSunEffect = 0x80240000; // type:func rom:0x9486B0 @@ -13762,7 +13762,7 @@ dro_01_UnkFunc15 = 0x80240F2C; // type:func rom:0x95C12C dro_01_UnkNpcDurationFlagFunc = 0x8024104C; // type:func rom:0x95C24C dro_01_UnkFunc16 = 0x802410B4; // type:func rom:0x95C2B4 dro_01_UnkNpcAIMainFunc = 0x80241174; // type:func rom:0x95C374 -dro_01_func_80241470_95C670 = 0x80241470; // type:func rom:0x95C670 +dro_01_StashVars = 0x80241470; // type:func rom:0x95C670 dro_01_GetItemName = 0x80241524; // type:func rom:0x95C724 dro_01_Set80151310_1 = 0x80241588; // type:func rom:0x95C788 dro_01_Set80151310_0 = 0x8024159C; // type:func rom:0x95C79C @@ -13805,7 +13805,7 @@ dro_01_func_802430C8_95E2C8 = 0x802430C8; // type:func rom:0x95E2C8 dro_01_func_802431B4_95E3B4 = 0x802431B4; // type:func rom:0x95E3B4 dro_01_func_802431FC_95E3FC = 0x802431FC; // type:func rom:0x95E3FC dro_01_func_80243350_95E550 = 0x80243350; // type:func rom:0x95E550 -dro_01_func_80243460_95E660 = 0x80243460; // type:func rom:0x95E660 +dro_01_dup_StashVars = 0x80243460; // type:func rom:0x95E660 dro_01_dup_GetItemName = 0x80243514; // type:func rom:0x95E714 dro_01_func_80243578_95E778 = 0x80243578; // type:func rom:0x95E778 dro_01_dup_SetPlayerStatusAnimFlags100000 = 0x802435A0; // type:func rom:0x95E7A0 @@ -13841,7 +13841,7 @@ dro_01_npcSettings_80245108 = 0x80245108; // type:data rom:0x960308 dro_01_npcSettings_80245134 = 0x80245134; // type:data rom:0x960334 dro_01_npcSettings_80245160 = 0x80245160; // type:data rom:0x960360 dro_01_npcSettings_8024518C = 0x8024518C; // type:data rom:0x96038C -dro_01_D_802451B8_9603B8 = 0x802451B8; // type:data rom:0x9603B8 +dro_01_varTable = 0x802451B8; // type:data rom:0x9603B8 dro_01_802451BC = 0x802451BC; // type:data rom:0x9603BC dro_01_802451EC = 0x802451EC; // type:data rom:0x9603EC dro_01_quizAnswers = 0x8024521C; // type:data rom:0x96041C @@ -13910,7 +13910,7 @@ dro_01_npcGroupList_8024B47C = 0x8024B47C; // type:data rom:0x96667C dro_01_intTable_8024B4A0 = 0x8024B4A0; // type:data rom:0x9666A0 dro_01_shopInventory_8024B4FC = 0x8024B4FC; // type:data rom:0x9666FC dro_01_shopPriceList_8024B550 = 0x8024B550; // type:data rom:0x966750 -dro_01_D_8024B5B0_9667B0 = 0x8024B5B0; // type:data rom:0x9667B0 +dro_01_dup_varTable = 0x8024B5B0; // type:data rom:0x9667B0 dro_01_8024B5B4 = 0x8024B5B4; // type:data rom:0x9667B4 dro_01_8024B5E4 = 0x8024B5E4; // type:data rom:0x9667E4 dro_01_8024B614 = 0x8024B614; // type:data rom:0x966814 @@ -13962,7 +13962,7 @@ dro_01_pad_XXX = 0x8024DFAC; // type:data rom:0x9691AC dro_01_dro_01_name_hack = 0x8024DFB0; // type:data rom:0x9691B0 dro_02_UnkFunc27 = 0x80240000; // type:func rom:0x9691C0 dro_02_UnkFunc26 = 0x80240124; // type:func rom:0x9692E4 -dro_02_func_80240300_9694C0 = 0x80240300; // type:func rom:0x9694C0 +dro_02_StashVars = 0x80240300; // type:func rom:0x9694C0 dro_02_GetItemName = 0x802403B4; // type:func rom:0x969574 dro_02_Set80151310_1 = 0x80240418; // type:func rom:0x9695D8 dro_02_Set80151310_0 = 0x8024042C; // type:func rom:0x9695EC @@ -14048,7 +14048,7 @@ dro_02_80244A68 = 0x80244A68; // type:data rom:0x96DC28 dro_02_npcList_80244C64 = 0x80244C64; // type:data rom:0x96DE24 dro_02_npcList_80244C70 = 0x80244C70; // type:data rom:0x96DE30 dro_02_80244C78 = 0x80244C78; // type:data rom:0x96DE38 -dro_02_D_80244DE0_96DFA0 = 0x80244DE0; // type:data rom:0x96DFA0 +dro_02_varTable = 0x80244DE0; // type:data rom:0x96DFA0 dro_02_80244DE4 = 0x80244DE4; // type:data rom:0x96DFA4 dro_02_80244E14 = 0x80244E14; // type:data rom:0x96DFD4 dro_02_quizAnswers = 0x80244E44; // type:data rom:0x96E004 @@ -14230,13 +14230,13 @@ isk_08_func_80240814_97BE44 = 0x802407D4; // type:func rom:0x985604 isk_08_AwaitPlayerNearNpc = 0x8024081C; // type:func rom:0x98564C isk_08_func_802408B4_97BEE4 = 0x80240874; // type:func rom:0x9856A4 D_80241650_986480 = 0x80241650; // type:data rom:0x986480 -func_80240000_9864E0 = 0x80240000; // type:func rom:0x9864E0 +isk_09_StashVars = 0x80240000; // type:func rom:0x9864E0 isk_09_GetItemName = 0x802400B4; // type:func rom:0x986594 isk_09_SomeItemEntityFunc = 0x80240118; // type:func rom:0x9865F8 isk_09_CheckItemFlags40 = 0x80240268; // type:func rom:0x986748 func_802402BC_98679C = 0x802402BC; // type:func rom:0x98679C func_802402F0_9867D0 = 0x802402F0; // type:func rom:0x9867D0 -D_802406F0_986BD0 = 0x802406F0; // type:data rom:0x986BD0 +isk_09_varTable = 0x802406F0; // type:data rom:0x986BD0 isk_10_SetOverrideFlags_40 = 0x80240000; // type:func rom:0x988B60 isk_10_UnkFunc17 = 0x8024001C; // type:func rom:0x988B7C func_8024003C_988B9C = 0x8024003C; // type:func rom:0x988B9C @@ -14328,13 +14328,13 @@ isk_18_func_802408B4_97BEE4 = 0x80240874; // type:func rom:0x9987E4 D_80241770_9996E0 = 0x80241770; // type:data rom:0x9996E0 trd_00_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0x999C70 trd_00_UpdateTexturePanStepped = 0x80240124; // type:func rom:0x999D94 -func_80240310_999F80 = 0x80240310; // type:func rom:0x999F80 +trd_00_StashVars = 0x80240310; // type:func rom:0x999F80 trd_00_GetItemName = 0x802403C4; // type:func rom:0x99A034 trd_00_SomeItemEntityFunc = 0x80240428; // type:func rom:0x99A098 trd_00_CheckItemFlags40 = 0x80240578; // type:func rom:0x99A1E8 PostChapter1StatUpdate = 0x802405D0; // type:func rom:0x99A240 trd_00_SyncStatusMenu = 0x8024060C; // type:func rom:0x99A27C -D_80241340_99AFB0 = 0x80241340; // type:data rom:0x99AFB0 +trd_00_varTable = 0x80241340; // type:data rom:0x99AFB0 trd_01_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0x99C990 trd_01_UpdateTexturePanStepped = 0x80240124; // type:func rom:0x99CAB4 trd_01_SetEntityFlags100000 = 0x80240310; // type:func rom:0x99CCA0 @@ -14531,7 +14531,7 @@ nok_01_UnkFunc35 = 0x80240C80; // type:func rom:0x9C6060 nok_01_GetPartnerCall800EB168 = 0x80240CFC; // type:func rom:0x9C60DC nok_01_Call800EB168 = 0x80240D30; // type:func rom:0x9C6110 nok_01_UnkFunc36 = 0x80240D60; // type:func rom:0x9C6140 -func_80240D68_9C6148 = 0x80240D68; // type:func rom:0x9C6148 +nok_01_StashVars = 0x80240D68; // type:func rom:0x9C6148 nok_01_GetItemName = 0x80240E1C; // type:func rom:0x9C61FC nok_01_Set80151310_1 = 0x80240E80; // type:func rom:0x9C6260 nok_01_Set80151310_0 = 0x80240E94; // type:func rom:0x9C6274 @@ -14581,7 +14581,7 @@ func_802428D8_9C7CB8 = 0x802428D8; // type:func rom:0x9C7CB8 func_80242910_9C7CF0 = 0x80242910; // type:func rom:0x9C7CF0 nok_01_foliage_setup_shear_mtx = 0x80242930; // type:func rom:0x9C7D10 nok_01_TransformFoliage = 0x802429A0; // type:func rom:0x9C7D80 -D_80245F44_9CB324 = 0x80245F44; // type:data rom:0x9CB324 +nok_01_varTable = 0x80245F44; // type:data rom:0x9CB324 D_80245FA8_9CB388 = 0x80245FA8; // type:data rom:0x9CB388 D_80245FE8_9CB3C8 = 0x80245FE8; // type:data rom:0x9CB3C8 D_8024856C_9CD94C = 0x8024856C; // type:data rom:0x9CD94C @@ -14596,7 +14596,7 @@ nok_02_UnkFunc25 = 0x80240034; // type:func rom:0x9D7054 nok_02_GetEntryPos = 0x802400F0; // type:func rom:0x9D7110 nok_02_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0x9D71F0 nok_02_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x9D725C -func_802402E0_9D7300 = 0x802402E0; // type:func rom:0x9D7300 +nok_02_StashVars = 0x802402E0; // type:func rom:0x9D7300 dup_nok_02_GetItemName = 0x80240394; // type:func rom:0x9D73B4 dup_nok_02_GetNpcCollisionHeight = 0x802403F8; // type:func rom:0x9D7418 dup_nok_02_AddPlayerHandsOffset = 0x80240454; // type:func rom:0x9D7474 @@ -14617,7 +14617,7 @@ nok_02_UnkFunc15 = 0x802413CC; // type:func rom:0x9D83EC nok_02_UnkNpcDurationFlagFunc = 0x802414EC; // type:func rom:0x9D850C nok_02_UnkFunc16 = 0x80241554; // type:func rom:0x9D8574 nok_02_UnkNpcAIMainFunc = 0x80241614; // type:func rom:0x9D8634 -func_80241910_9D8930 = 0x80241910; // type:func rom:0x9D8930 +dup_nok_02_StashVars = 0x80241910; // type:func rom:0x9D8930 nok_02_GetItemName = 0x802419C4; // type:func rom:0x9D89E4 nok_02_Set80151310_1 = 0x80241A28; // type:func rom:0x9D8A48 nok_02_Set80151310_0 = 0x80241A3C; // type:func rom:0x9D8A5C @@ -14667,7 +14667,7 @@ func_80243BEC_9DAC0C = 0x80243BEC; // type:func rom:0x9DAC0C func_80243C40_9DAC60 = 0x80243C40; // type:func rom:0x9DAC60 func_80243C78_9DAC98 = 0x80243C78; // type:func rom:0x9DAC98 func_80243D14_9DAD34 = 0x80243D14; // type:func rom:0x9DAD34 -func_80243DB0_9DADD0 = 0x80243DB0; // type:func rom:0x9DADD0 +dup2_nok_02_StashVars = 0x80243DB0; // type:func rom:0x9DADD0 dup2_nok_02_GetItemName = 0x80243E64; // type:func rom:0x9DAE84 func_80243EC8_9DAEE8 = 0x80243EC8; // type:func rom:0x9DAEE8 func_80243F10_9DAF30 = 0x80243F10; // type:func rom:0x9DAF30 @@ -14677,10 +14677,10 @@ func_80244288_9DB2A8 = 0x80244288; // type:func rom:0x9DB2A8 func_802442E0_9DB300 = 0x802442E0; // type:func rom:0x9DB300 nok_02_foliage_setup_shear_mtx = 0x80244360; // type:func rom:0x9DB380 nok_02_TransformFoliage = 0x802443D0; // type:func rom:0x9DB3F0 -D_802453D0_9DC3F0 = 0x802453D0; // type:data rom:0x9DC3F0 +nok_02_varTable = 0x802453D0; // type:data rom:0x9DC3F0 D_80245434_9DC454 = 0x80245434; // type:data rom:0x9DC454 D_80245438_9DC458 = 0x80245438; // type:data rom:0x9DC458 -D_802470C8_9DE0E8 = 0x802470C8; // type:data rom:0x9DE0E8 +nok_02_varTable = 0x802470C8; // type:data rom:0x9DE0E8 D_8024712C_9DE14C = 0x8024712C; // type:data rom:0x9DE14C D_8024716C_9DE18C = 0x8024716C; // type:data rom:0x9DE18C D_802496F0_9E0710 = 0x802496F0; // type:data rom:0x9E0710 @@ -14688,7 +14688,7 @@ D_802496F4_9E0714 = 0x802496F4; // type:data rom:0x9E0714 D_802523B4_9E93D4 = 0x802523B4; // type:data rom:0x9E93D4 D_80252400_9E9420 = 0x80252400; // type:data rom:0x9E9420 D_80252404_9E9424 = 0x80252404; // type:data rom:0x9E9424 -D_80252720_9E9740 = 0x80252720; // type:data rom:0x9E9740 +nok_02_varTable = 0x80252720; // type:data rom:0x9E9740 D_80252784_9E97A4 = 0x80252784; // type:data rom:0x9E97A4 D_80252794_9E97B4 = 0x80252794; // type:data rom:0x9E97B4 D_80252798_9E97B8 = 0x80252798; // type:data rom:0x9E97B8 @@ -14871,7 +14871,7 @@ hos_00_UnkEffect0FFunc = 0x80240170; // type:func rom:0xA0BE60 hos_00_UnkEffect0FFunc3 = 0x8024036C; // type:func rom:0xA0C05C hos_00_UnkEffect0FFunc4 = 0x80240584; // type:func rom:0xA0C274 func_802407C0_A0C4B0 = 0x802407C0; // type:func rom:0xA0C4B0 -func_802407F0_A0C4E0 = 0x802407F0; // type:func rom:0xA0C4E0 +hos_00_StashVars = 0x802407F0; // type:func rom:0xA0C4E0 hos_00_GetItemName = 0x802408A4; // type:func rom:0xA0C594 hos_00_EnableActionCommands = 0x80240908; // type:func rom:0xA0C5F8 func_8024091C_A0C60C = 0x8024091C; // type:func rom:0xA0C60C @@ -14880,7 +14880,7 @@ func_80240A54_A0C744 = 0x80240A54; // type:func rom:0xA0C744 hos_00_SetCamera0Flag1000 = 0x80240B20; // type:func rom:0xA0C810 func_80240B3C_A0C82C = 0x80240B3C; // type:func rom:0xA0C82C func_80240C40_A0C930 = 0x80240C40; // type:func rom:0xA0C930 -D_80242970_A0E660 = 0x80242970; // type:data rom:0xA0E660 +hos_00_varTable = 0x80242970; // type:data rom:0xA0E660 D_80242B9C_A0E88C = 0x80242B9C; // type:data rom:0xA0E88C D_80242BA0_A0E890 = 0x80242BA0; // type:data rom:0xA0E890 D_80244B30_A10820 = 0x80244B30; // type:data rom:0xA10820 @@ -14988,7 +14988,7 @@ hos_03_UnkFunc35 = 0x802423BC; // type:func rom:0xA1D4BC hos_03_GetPartnerCall800EB168 = 0x80242438; // type:func rom:0xA1D538 hos_03_Call800EB168 = 0x8024246C; // type:func rom:0xA1D56C hos_03_UnkFunc36 = 0x8024249C; // type:func rom:0xA1D59C -func_802424A4_A1D5A4 = 0x802424A4; // type:func rom:0xA1D5A4 +hos_03_StashVars = 0x802424A4; // type:func rom:0xA1D5A4 hos_03_GetItemName = 0x80242558; // type:func rom:0xA1D658 hos_03_Set80151310_1 = 0x802425BC; // type:func rom:0xA1D6BC hos_03_Set80151310_0 = 0x802425D0; // type:func rom:0xA1D6D0 @@ -15021,7 +15021,7 @@ D_80243BD0_A1ECD0 = 0x80243BD0; // type:data rom:0xA1ECD0 D_80243BD2_A1ECD2 = 0x80243BD2; // type:data rom:0xA1ECD2 D_80243BD4_A1ECD4 = 0x80243BD4; // type:data rom:0xA1ECD4 hos_03_sixFloats = 0x802457F4; // type:data rom:0xA208F4 -D_8024801C_A2311C = 0x8024801C; // type:data rom:0xA2311C +hos_03_varTable = 0x8024801C; // type:data rom:0xA2311C D_80248080_A23180 = 0x80248080; // type:data rom:0xA23180 D_802480C0_A231C0 = 0x802480C0; // type:data rom:0xA231C0 D_8024BD60_A26E60 = 0x8024BD60; // type:data rom:0xA26E60 @@ -15212,7 +15212,7 @@ D_8024F238_A39478 = 0x8024F238; // type:data rom:0xA39478 D_8024F280_A394C0 = 0x8024F280; // type:data rom:0xA394C0 hos_06_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xA394E0 hos_06_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xA39604 -func_80240310_A397F0 = 0x80240310; // type:func rom:0xA397F0 +hos_06_StashVars = 0x80240310; // type:func rom:0xA397F0 dup2_hos_06_GetItemName = 0x802403C4; // type:func rom:0xA398A4 dup_hos_06_GetNpcCollisionHeight = 0x80240428; // type:func rom:0xA39908 dup_hos_06_AddPlayerHandsOffset = 0x80240484; // type:func rom:0xA39964 @@ -15232,7 +15232,7 @@ hos_06_AddPlayerHandsOffset = 0x80240DAC; // type:func rom:0xA3A28C func_80240F7C_A3A45C = 0x80240F7C; // type:func rom:0xA3A45C func_80240FD0_A3A4B0 = 0x80240FD0; // type:func rom:0xA3A4B0 func_80241008_A3A4E8 = 0x80241008; // type:func rom:0xA3A4E8 -func_802410A4_A3A584 = 0x802410A4; // type:func rom:0xA3A584 +dup_hos_06_StashVars = 0x802410A4; // type:func rom:0xA3A584 hos_06_GetItemName = 0x80241158; // type:func rom:0xA3A638 func_802411BC_A3A69C = 0x802411BC; // type:func rom:0xA3A69C func_802411F0_A3A6D0 = 0x802411F0; // type:func rom:0xA3A6D0 @@ -15247,20 +15247,20 @@ func_80241A58_A3AF38 = 0x80241A58; // type:func rom:0xA3AF38 func_80241B74_A3B054 = 0x80241B74; // type:func rom:0xA3B054 func_80241CCC_A3B1AC = 0x80241CCC; // type:func rom:0xA3B1AC func_80241F98_A3B478 = 0x80241F98; // type:func rom:0xA3B478 -func_80241FD0_A3B4B0 = 0x80241FD0; // type:func rom:0xA3B4B0 +dup2_hos_06_StashVars = 0x80241FD0; // type:func rom:0xA3B4B0 dup_hos_06_GetItemName = 0x80242084; // type:func rom:0xA3B564 hos_06_SomeItemEntityFunc = 0x802420E8; // type:func rom:0xA3B5C8 hos_06_CheckItemFlags40 = 0x80242238; // type:func rom:0xA3B718 func_8024228C_A3B76C = 0x8024228C; // type:func rom:0xA3B76C func_802424CC_A3B9AC = 0x802424CC; // type:func rom:0xA3B9AC func_80242534_A3BA14 = 0x80242534; // type:func rom:0xA3BA14 -D_80242C08_A3C0E8 = 0x80242C08; // type:data rom:0xA3C0E8 +hos_06_varTable = 0x80242C08; // type:data rom:0xA3C0E8 D_80242C6C_A3C14C = 0x80242C6C; // type:data rom:0xA3C14C D_80242C70_A3C150 = 0x80242C70; // type:data rom:0xA3C150 D_802435EC_A3CACC = 0x802435EC; // type:data rom:0xA3CACC D_802445D0_A3DAB0 = 0x802445D0; // type:data rom:0xA3DAB0 D_802445D4_A3DAB4 = 0x802445D4; // type:data rom:0xA3DAB4 -D_8024476C_A3DC4C = 0x8024476C; // type:data rom:0xA3DC4C +hos_06_varTable = 0x8024476C; // type:data rom:0xA3DC4C D_802447D0_A3DCB0 = 0x802447D0; // type:data rom:0xA3DCB0 D_802447D4_A3DCB4 = 0x802447D4; // type:data rom:0xA3DCB4 D_802447D8_A3DCB8 = 0x802447D8; // type:data rom:0xA3DCB8 @@ -15268,7 +15268,7 @@ D_80244B88_A3E068 = 0x80244B88; // type:data rom:0xA3E068 D_80244B8C_A3E06C = 0x80244B8C; // type:data rom:0xA3E06C D_80244C48_A3E128 = 0x80244C48; // type:data rom:0xA3E128 D_80244C4C_A3E12C = 0x80244C4C; // type:data rom:0xA3E12C -D_80245E80_A3F360 = 0x80245E80; // type:data rom:0xA3F360 +hos_06_varTable = 0x80245E80; // type:data rom:0xA3F360 D_80245EEC_A3F3CC = 0x80245EEC; // type:data rom:0xA3F3CC hos_10_SetPlayerSpriteSet2 = 0x80240000; // type:func rom:0xA3F740 hos_10_UpdateTexturePanSmooth = 0x80240020; // type:func rom:0xA3F760 @@ -15411,7 +15411,7 @@ func_80240000_A574B0 = 0x80240000; // type:func rom:0xA574B0 kpa_14_UpdateTexturePanSmooth = 0x80240040; // type:func rom:0xA574F0 kpa_14_UpdateTexturePanStepped = 0x80240164; // type:func rom:0xA57614 func_8024034C_A577FC = 0x8024034C; // type:func rom:0xA577FC -func_80240380_A57830 = 0x80240380; // type:func rom:0xA57830 +kpa_14_StashVars = 0x80240380; // type:func rom:0xA57830 kpa_14_GetItemName = 0x80240434; // type:func rom:0xA578E4 kpa_14_SomeItemEntityFunc = 0x80240498; // type:func rom:0xA57948 kpa_14_CheckItemFlags40 = 0x802405E8; // type:func rom:0xA57A98 @@ -15420,14 +15420,14 @@ kpa_14_GetEntityPosition = 0x80240670; // type:func rom:0xA57B20 kpa_14_func_80240710_A57BC0 = 0x80240710; // type:func rom:0xA57BC0 func_8024073C_A57BEC = 0x8024073C; // type:func rom:0xA57BEC func_80240840_A57CF0 = 0x80240840; // type:func rom:0xA57CF0 -D_80241900_A58DB0 = 0x80241900; // type:data rom:0xA58DB0 +kpa_14_varTable = 0x80241900; // type:data rom:0xA58DB0 kpa_15_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xA59390 kpa_15_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xA594B4 -func_80240310_A596A0 = 0x80240310; // type:func rom:0xA596A0 +kpa_15_StashVars = 0x80240310; // type:func rom:0xA596A0 kpa_15_GetItemName = 0x802403C4; // type:func rom:0xA59754 kpa_15_SomeItemEntityFunc = 0x80240428; // type:func rom:0xA597B8 kpa_15_CheckItemFlags40 = 0x80240578; // type:func rom:0xA59908 -D_80240AA0_A59E30 = 0x80240AA0; // type:data rom:0xA59E30 +kpa_15_varTable = 0x80240AA0; // type:data rom:0xA59E30 kpa_16_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xA5A030 kpa_16_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xA5A154 func_80240310_A5A340 = 0x80240310; // type:func rom:0xA5A340 @@ -15797,7 +15797,7 @@ func_802406E0_AACF10 = 0x802406E0; // type:func rom:0xAACF10 func_80240000_AAFFF0 = 0x80240000; // type:func rom:0xAAFFF0 osr_01_UpdateTexturePanSmooth = 0x80240050; // type:func rom:0xAB0040 osr_01_UpdateTexturePanStepped = 0x80240174; // type:func rom:0xAB0164 -func_80240360_AB0350 = 0x80240360; // type:func rom:0xAB0350 +osr_01_StashVars = 0x80240360; // type:func rom:0xAB0350 osr_01_GetItemName = 0x80240414; // type:func rom:0xAB0404 osr_01_GetNpcCollisionHeight = 0x80240478; // type:func rom:0xAB0468 osr_01_AddPlayerHandsOffset = 0x802404D4; // type:func rom:0xAB04C4 @@ -15808,7 +15808,7 @@ osr_01_SetManyVars = 0x802407CC; // type:func rom:0xAB07BC osr_01_UnkYawFunc = 0x802408BC; // type:func rom:0xAB08AC func_80240A48_AB0A38 = 0x80240A48; // type:func rom:0xAB0A38 func_80240A8C_AB0A7C = 0x80240A8C; // type:func rom:0xAB0A7C -D_802411B8_AB11A8 = 0x802411B8; // type:data rom:0xAB11A8 +osr_01_varTable = 0x802411B8; // type:data rom:0xAB11A8 D_8024121C_AB120C = 0x8024121C; // type:data rom:0xAB120C D_80241220_AB1210 = 0x80241220; // type:data rom:0xAB1210 D_80242160_AB2150 = 0x80242160; // type:data rom:0xAB2150 @@ -15971,14 +15971,14 @@ D_80244820_AF1C30 = 0x80244820; // type:data rom:0xAF1C30 D_80244830_AF1C40 = 0x80244830; // type:data rom:0xAF1C40 D_80244838_AF1C48 = 0x80244838; // type:data rom:0xAF1C48 D_80244840_AF1C50 = 0x80244840; // type:data rom:0xAF1C50 -func_80240000_AF1C60 = 0x80240000; // type:func rom:0xAF1C60 +kkj_17_StashVars = 0x80240000; // type:func rom:0xAF1C60 kkj_17_GetItemName = 0x802400B4; // type:func rom:0xAF1D14 kkj_17_SomeItemEntityFunc = 0x80240118; // type:func rom:0xAF1D78 kkj_17_CheckItemFlags40 = 0x80240268; // type:func rom:0xAF1EC8 func_802402BC_AF1F1C = 0x802402BC; // type:func rom:0xAF1F1C func_80240500_AF2160 = 0x80240500; // type:func rom:0xAF2160 func_80240568_AF21C8 = 0x80240568; // type:func rom:0xAF21C8 -D_802408C0_AF2520 = 0x802408C0; // type:data rom:0xAF2520 +kkj_17_varTable = 0x802408C0; // type:data rom:0xAF2520 D_8024092C_AF258C = 0x8024092C; // type:data rom:0xAF258C kkj_18_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xAF2CA0 kkj_18_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xAF2DC4 @@ -16021,7 +16021,7 @@ D_80240E94_AF87E4 = 0x80240E94; // type:data rom:0xAF87E4 D_80240EF0_AF8840 = 0x80240EF0; // type:data rom:0xAF8840 D_80241B10_AF9460 = 0x80241B10; // type:data rom:0xAF9460 D_80241B14_AF9464 = 0x80241B14; // type:data rom:0xAF9464 -func_80240000_AFDB40 = 0x80240000; // type:func rom:0xAFDB40 +kkj_20_StashVars = 0x80240000; // type:func rom:0xAFDB40 kkj_20_GetItemName = 0x802400B4; // type:func rom:0xAFDBF4 kkj_20_SomeItemEntityFunc = 0x80240118; // type:func rom:0xAFDC58 kkj_20_CheckItemFlags40 = 0x80240268; // type:func rom:0xAFDDA8 @@ -16038,7 +16038,7 @@ kkj_20_GetPartnerCall800EB168 = 0x80240550; // type:func rom:0xAFE090 kkj_20_Call800EB168 = 0x80240584; // type:func rom:0xAFE0C4 kkj_20_UnkFunc36 = 0x802405B4; // type:func rom:0xAFE0F4 func_802405BC_AFE0FC = 0x802405BC; // type:func rom:0xAFE0FC -D_80240880_AFE3C0 = 0x80240880; // type:data rom:0xAFE3C0 +kkj_20_varTable = 0x80240880; // type:data rom:0xAFE3C0 kkj_23_SetPlayerSpriteSet2 = 0x80240000; // type:func rom:0xB02880 func_80240020_B028A0 = 0x80240020; // type:func rom:0xB028A0 func_80240048_B028C8 = 0x80240048; // type:func rom:0xB028C8 @@ -16119,7 +16119,7 @@ jan_00_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xB20540 jan_00_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xB20664 func_8024030C_B2084C = 0x8024030C; // type:func rom:0xB2084C func_80240340_B20880 = 0x80240340; // type:func rom:0xB20880 -func_802403F4_B20934 = 0x802403F4; // type:func rom:0xB20934 +jan_00_StashVars = 0x802403F4; // type:func rom:0xB20934 jan_00_GetItemName = 0x802404A8; // type:func rom:0xB209E8 jan_00_GetNpcCollisionHeight = 0x8024050C; // type:func rom:0xB20A4C jan_00_AddPlayerHandsOffset = 0x80240568; // type:func rom:0xB20AA8 @@ -16143,7 +16143,7 @@ func_802416F8_B21C38 = 0x802416F8; // type:func rom:0xB21C38 func_80241868_B21DA8 = 0x80241868; // type:func rom:0xB21DA8 jan_00_foliage_setup_shear_mtx = 0x80241960; // type:func rom:0xB21EA0 jan_00_TransformFoliage = 0x802419D0; // type:func rom:0xB21F10 -D_802423C8_B22908 = 0x802423C8; // type:data rom:0xB22908 +jan_00_varTable = 0x802423C8; // type:data rom:0xB22908 D_8024242C_B2296C = 0x8024242C; // type:data rom:0xB2296C D_80242430_B22970 = 0x80242430; // type:data rom:0xB22970 D_80245950_B25E90 = 0x80245950; // type:data rom:0xB25E90 @@ -16188,7 +16188,7 @@ jan_02_AddPlayerHandsOffset = 0x8024131C; // type:func rom:0xB2D78C func_802414EC_B2D95C = 0x802414EC; // type:func rom:0xB2D95C func_80241540_B2D9B0 = 0x80241540; // type:func rom:0xB2D9B0 func_80241578_B2D9E8 = 0x80241578; // type:func rom:0xB2D9E8 -func_80241614_B2DA84 = 0x80241614; // type:func rom:0xB2DA84 +jan_02_StashVars = 0x80241614; // type:func rom:0xB2DA84 jan_02_GetItemName = 0x802416C8; // type:func rom:0xB2DB38 jan_02_Set80151310_1 = 0x8024172C; // type:func rom:0xB2DB9C jan_02_Set80151310_0 = 0x80241740; // type:func rom:0xB2DBB0 @@ -16221,7 +16221,7 @@ jan_02_TransformFoliage = 0x80242750; // type:func rom:0xB2EBC0 D_80242BD8_B2F048 = 0x80242BD8; // type:data rom:0xB2F048 D_80243048_B2F4B8 = 0x80243048; // type:data rom:0xB2F4B8 D_8024304C_B2F4BC = 0x8024304C; // type:data rom:0xB2F4BC -D_802431E4_B2F654 = 0x802431E4; // type:data rom:0xB2F654 +jan_02_varTable = 0x802431E4; // type:data rom:0xB2F654 D_80243248_B2F6B8 = 0x80243248; // type:data rom:0xB2F6B8 D_80243288_B2F6F8 = 0x80243288; // type:data rom:0xB2F6F8 D_802485C0_B34A30 = 0x802485C0; // type:data rom:0xB34A30 @@ -16265,7 +16265,7 @@ func_802419D8_B365A8 = 0x802419D8; // type:func rom:0xB365A8 func_80241A2C_B365FC = 0x80241A2C; // type:func rom:0xB365FC func_80241A64_B36634 = 0x80241A64; // type:func rom:0xB36634 func_80241B00_B366D0 = 0x80241B00; // type:func rom:0xB366D0 -func_80241B9C_B3676C = 0x80241B9C; // type:func rom:0xB3676C +jan_03_StashVars = 0x80241B9C; // type:func rom:0xB3676C jan_03_GetItemName = 0x80241C50; // type:func rom:0xB36820 jan_03_Set80151310_1 = 0x80241CB4; // type:func rom:0xB36884 jan_03_Set80151310_0 = 0x80241CC8; // type:func rom:0xB36898 @@ -16302,7 +16302,7 @@ jan_03_foliage_setup_shear_mtx = 0x80243050; // type:func rom:0xB37C20 jan_03_TransformFoliage = 0x802430C0; // type:func rom:0xB37C90 D_80247444_B3C014 = 0x80247444; // type:data rom:0xB3C014 D_80247448_B3C018 = 0x80247448; // type:data rom:0xB3C018 -D_80247764_B3C334 = 0x80247764; // type:data rom:0xB3C334 +jan_03_varTable = 0x80247764; // type:data rom:0xB3C334 D_802477C8_B3C398 = 0x802477C8; // type:data rom:0xB3C398 D_80247808_B3C3D8 = 0x80247808; // type:data rom:0xB3C3D8 D_8024A5AC_B3F17C = 0x8024A5AC; // type:data rom:0xB3F17C @@ -16311,7 +16311,7 @@ D_8024F9F8_B445C8 = 0x8024F9F8; // type:data rom:0xB445C8 func_80240000_B44770 = 0x80240000; // type:func rom:0xB44770 jan_04_UpdateTexturePanSmooth = 0x80240040; // type:func rom:0xB447B0 jan_04_UpdateTexturePanStepped = 0x80240164; // type:func rom:0xB448D4 -func_80240350_B44AC0 = 0x80240350; // type:func rom:0xB44AC0 +jan_04_StashVars = 0x80240350; // type:func rom:0xB44AC0 jan_04_GetItemName = 0x80240404; // type:func rom:0xB44B74 jan_04_SomeItemEntityFunc = 0x80240468; // type:func rom:0xB44BD8 jan_04_CheckItemFlags40 = 0x802405B8; // type:func rom:0xB44D28 @@ -16326,7 +16326,7 @@ func_80240D0C_B4547C = 0x80240D0C; // type:func rom:0xB4547C dup_jan_04_foliage_setup_shear_mtx = 0x80240D80; // type:func rom:0xB454F0 dup_jan_04_TransformFoliage = 0x80240DF0; // type:func rom:0xB45560 func_80240FC0_B45730 = 0x80240FC0; // type:func rom:0xB45730 -D_80241800_B45F70 = 0x80241800; // type:data rom:0xB45F70 +jan_04_varTable = 0x80241800; // type:data rom:0xB45F70 D_8024625C_B4A9CC = 0x8024625C; // type:data rom:0xB4A9CC D_802462C0_B4AA30 = 0x802462C0; // type:data rom:0xB4AA30 D_802462E0_B4AA50 = 0x802462E0; // type:data rom:0xB4AA50 @@ -16569,7 +16569,7 @@ jan_22_UnkFunc15 = 0x8024094C; // type:func rom:0xB84ACC jan_22_UnkNpcDurationFlagFunc = 0x80240A6C; // type:func rom:0xB84BEC jan_22_UnkFunc16 = 0x80240AD4; // type:func rom:0xB84C54 jan_22_UnkNpcAIMainFunc = 0x80240B94; // type:func rom:0xB84D14 -func_80240E90_B85010 = 0x80240E90; // type:func rom:0xB85010 +jan_22_StashVars = 0x80240E90; // type:func rom:0xB85010 jan_22_GetItemName = 0x80240F44; // type:func rom:0xB850C4 jan_22_SetCamera0Flag1000 = 0x80240FA8; // type:func rom:0xB85128 jan_22_UnsetCamera0Flag1000 = 0x80240FC4; // type:func rom:0xB85144 @@ -16584,7 +16584,7 @@ func_8024160C_B8578C = 0x8024160C; // type:func rom:0xB8578C func_80241668_B857E8 = 0x80241668; // type:func rom:0xB857E8 dup_jan_22_foliage_setup_shear_mtx = 0x80241720; // type:func rom:0xB858A0 dup_jan_22_TransformFoliage = 0x80241790; // type:func rom:0xB85910 -D_802425BC_B8673C = 0x802425BC; // type:data rom:0xB8673C +jan_22_varTable = 0x802425BC; // type:data rom:0xB8673C D_8024B9A0_B8FB20 = 0x8024B9A0; // type:data rom:0xB8FB20 D_8024B9A8_B8FB28 = 0x8024B9A8; // type:data rom:0xB8FB28 D_8024BB40_B8FCC0 = 0x8024BB40; // type:data rom:0xB8FCC0 @@ -16645,13 +16645,13 @@ mim_04_UnkNpcAIFunc15 = 0x802409CC; // type:func rom:0xB9E32C mim_04_UnkNpcAIFunc39 = 0x80240AAC; // type:func rom:0xB9E40C mim_04_UnkDurationCheck = 0x80240DAC; // type:func rom:0xB9E70C mim_04_UnkNpcAIMainFunc2 = 0x80240DF0; // type:func rom:0xB9E750 -func_80241014_B9E974 = 0x80241014; // type:func rom:0xB9E974 +mim_04_StashVars = 0x80241014; // type:func rom:0xB9E974 mim_04_GetItemName = 0x802410C8; // type:func rom:0xB9EA28 D_80241530_B9EE90 = 0x80241530; // type:data rom:0xB9EE90 D_80241534_B9EE94 = 0x80241534; // type:data rom:0xB9EE94 D_80241538_B9EE98 = 0x80241538; // type:data rom:0xB9EE98 D_8024153B_B9EE9B = 0x8024153B; // type:data rom:0xB9EE9B -D_80242614_B9FF74 = 0x80242614; // type:data rom:0xB9FF74 +mim_04_varTable = 0x80242614; // type:data rom:0xB9FF74 D_80242D80_BA06E0 = 0x80242D80; // type:data rom:0xBA06E0 mim_05_SetForeverForestFog = 0x80240000; // type:func rom:0xBA0730 mim_05_UnkNpcAIFunc6 = 0x80240070; // type:func rom:0xBA07A0 @@ -16812,7 +16812,7 @@ func_80240098_BBD238 = 0x80240098; // type:func rom:0xBBD238 func_802406AC_BBD84C = 0x802406AC; // type:func rom:0xBBD84C func_80240730_BBD8D0 = 0x80240730; // type:func rom:0xBBD8D0 func_80240790_BBD930 = 0x80240790; // type:func rom:0xBBD930 -func_802407E0_BBD980 = 0x802407E0; // type:func rom:0xBBD980 +obk_01_StashVars = 0x802407E0; // type:func rom:0xBBD980 obk_01_GetItemName = 0x80240894; // type:func rom:0xBBDA34 obk_01_GetNpcCollisionHeight = 0x802408F8; // type:func rom:0xBBDA98 obk_01_AddPlayerHandsOffset = 0x80240954; // type:func rom:0xBBDAF4 @@ -16826,7 +16826,7 @@ func_80240F0C_BBE0AC = 0x80240F0C; // type:func rom:0xBBE0AC func_80240F38_BBE0D8 = 0x80240F38; // type:func rom:0xBBE0D8 func_80241094_BBE234 = 0x80241094; // type:func rom:0xBBE234 D_80241C58_BBEDF8 = 0x80241C58; // type:data rom:0xBBEDF8 -D_802440F0_BC1290 = 0x802440F0; // type:data rom:0xBC1290 +obk_01_varTable = 0x802440F0; // type:data rom:0xBC1290 D_80244154_BC12F4 = 0x80244154; // type:data rom:0xBC12F4 D_80244158_BC12F8 = 0x80244158; // type:data rom:0xBC12F8 D_80244A54_BC1BF4 = 0x80244A54; // type:data rom:0xBC1BF4 @@ -16837,7 +16837,7 @@ func_80240240_BC2CD0 = 0x80240240; // type:func rom:0xBC2CD0 D_80240CBC_BC374C = 0x80240CBC; // type:data rom:0xBC374C obk_03_SetEntityPosition = 0x80240000; // type:func rom:0xBC4280 obk_03_GetEntityPosition = 0x802400C4; // type:func rom:0xBC4344 -func_80240170_BC43F0 = 0x80240170; // type:func rom:0xBC43F0 +obk_03_StashVars = 0x80240170; // type:func rom:0xBC43F0 obk_03_GetItemName = 0x80240224; // type:func rom:0xBC44A4 obk_03_GetNpcCollisionHeight = 0x80240288; // type:func rom:0xBC4508 obk_03_AddPlayerHandsOffset = 0x802402E4; // type:func rom:0xBC4564 @@ -16849,7 +16849,7 @@ obk_03_UnkYawFunc = 0x802406CC; // type:func rom:0xBC494C func_80240858_BC4AD8 = 0x80240858; // type:func rom:0xBC4AD8 func_8024089C_BC4B1C = 0x8024089C; // type:func rom:0xBC4B1C func_802408D0_BC4B50 = 0x802408D0; // type:func rom:0xBC4B50 -D_80242ECC_BC714C = 0x80242ECC; // type:data rom:0xBC714C +obk_03_varTable = 0x80242ECC; // type:data rom:0xBC714C D_80242F30_BC71B0 = 0x80242F30; // type:data rom:0xBC71B0 D_80242F34_BC71B4 = 0x80242F34; // type:data rom:0xBC71B4 D_80243BD0_BC7E50 = 0x80243BD0; // type:data rom:0xBC7E50 @@ -16864,7 +16864,7 @@ func_802402F4_BC8154 = 0x802402F4; // type:func rom:0xBC8154 func_802405B4_BC8414 = 0x802405B4; // type:func rom:0xBC8414 func_80240624_BC8484 = 0x80240624; // type:func rom:0xBC8484 func_80240910_BC8770 = 0x80240910; // type:func rom:0xBC8770 -func_80240940_BC87A0 = 0x80240940; // type:func rom:0xBC87A0 +obk_04_StashVars = 0x80240940; // type:func rom:0xBC87A0 obk_04_GetItemName = 0x802409F4; // type:func rom:0xBC8854 func_80240A58_BC88B8 = 0x80240A58; // type:func rom:0xBC88B8 func_80240C10_BC8A70 = 0x80240C10; // type:func rom:0xBC8A70 @@ -16872,7 +16872,7 @@ func_80240CA0_BC8B00 = 0x80240CA0; // type:func rom:0xBC8B00 func_80240D00_BC8B60 = 0x80240D00; // type:func rom:0xBC8B60 func_80240D14_BC8B74 = 0x80240D14; // type:func rom:0xBC8B74 func_80240E58_BC8CB8 = 0x80240E58; // type:func rom:0xBC8CB8 -D_80243A10_BCB870 = 0x80243A10; // type:data rom:0xBCB870 +obk_04_varTable = 0x80243A10; // type:data rom:0xBCB870 obk_05_UnsetCamera0MoveFlag1 = 0x80240000; // type:func rom:0xBCD060 obk_05_SetCamera0MoveFlag1 = 0x8024001C; // type:func rom:0xBCD07C func_80240038_BCD098 = 0x80240038; // type:func rom:0xBCD098 @@ -16882,7 +16882,7 @@ func_802407A0_BCD800 = 0x802407A0; // type:func rom:0xBCD800 func_802407AC_BCD80C = 0x802407AC; // type:func rom:0xBCD80C func_80240934_BCD994 = 0x80240934; // type:func rom:0xBCD994 D_8024100C_BCE06C = 0x8024100C; // type:data rom:0xBCE06C -func_80240000_BCEBF0 = 0x80240000; // type:func rom:0xBCEBF0 +obk_07_StashVars = 0x80240000; // type:func rom:0xBCEBF0 obk_07_GetItemName = 0x802400B4; // type:func rom:0xBCECA4 obk_07_SomeItemEntityFunc = 0x80240118; // type:func rom:0xBCED08 obk_07_CheckItemFlags40 = 0x80240268; // type:func rom:0xBCEE58 @@ -16916,7 +16916,7 @@ func_80241790_BD0380 = 0x80241790; // type:func rom:0xBD0380 func_80241898_BD0488 = 0x80241898; // type:func rom:0xBD0488 func_802418E0_BD04D0 = 0x802418E0; // type:func rom:0xBD04D0 func_80241B50_BD0740 = 0x80241B50; // type:func rom:0xBD0740 -D_80241FB0_BD0BA0 = 0x80241FB0; // type:data rom:0xBD0BA0 +obk_07_varTable = 0x80241FB0; // type:data rom:0xBD0BA0 D_8024292C_BD151C = 0x8024292C; // type:data rom:0xBD151C D_80243090_BD1C80 = 0x80243090; // type:data rom:0xBD1C80 D_80243098_BD1C88 = 0x80243098; // type:data rom:0xBD1C88 @@ -18867,7 +18867,7 @@ dgb_18_UnkFunc16 = 0x80240AD4; // type:func rom:0xC56A14 dgb_18_UnkNpcAIMainFunc = 0x80240B94; // type:func rom:0xC56AD4 dgb_18_UnkFunc1 = 0x80240E90; // type:func rom:0xC56DD0 dgb_18_func_80240EBC_C56DFC = 0x80240EBC; // type:func rom:0xC56DFC -dgb_18_func_80240FB0_C56EF0 = 0x80240FB0; // type:func rom:0xC56EF0 +dgb_18_StashVars = 0x80240FB0; // type:func rom:0xC56EF0 dgb_18_GetItemName = 0x80241064; // type:func rom:0xC56FA4 dgb_18_SomeItemEntityFunc = 0x802410C8; // type:func rom:0xC57008 dgb_18_CheckItemFlags40 = 0x80241218; // type:func rom:0xC57158 @@ -18893,7 +18893,7 @@ dgb_18_init_8024329C = 0x8024329C; // type:data rom:0xC591DC dgb_18_npcGroup_802432D4 = 0x802432D4; // type:data rom:0xC59214 dgb_18_npcGroup_802434C4 = 0x802434C4; // type:data rom:0xC59404 dgb_18_npcGroupList_802436B4 = 0x802436B4; // type:data rom:0xC595F4 -dgb_18_D_802436E0_C59620 = 0x802436E0; // type:data rom:0xC59620 +dgb_18_varTable = 0x802436E0; // type:data rom:0xC59620 dgb_18_802436E4 = 0x802436E4; // type:data rom:0xC59624 dgb_18_8024374C = 0x8024374C; // type:data rom:0xC5968C dgb_18_8024382C = 0x8024382C; // type:data rom:0xC5976C @@ -18925,7 +18925,7 @@ kzn_02_UnkNpcAIFunc13 = 0x802419D8; // type:func rom:0xC5C118 kzn_02_UnkNpcAIFunc34 = 0x80241B08; // type:func rom:0xC5C248 kzn_02_UnkFunc45 = 0x80241D88; // type:func rom:0xC5C4C8 kzn_02_UnkNpcAIMainFunc10 = 0x80241DE4; // type:func rom:0xC5C524 -func_80241FCC_C5C70C = 0x80241FCC; // type:func rom:0xC5C70C +kzn_02_StashVars = 0x80241FCC; // type:func rom:0xC5C70C kzn_02_GetItemName = 0x80242080; // type:func rom:0xC5C7C0 kzn_02_GetNpcCollisionHeight = 0x802420E4; // type:func rom:0xC5C824 kzn_02_AddPlayerHandsOffset = 0x80242140; // type:func rom:0xC5C880 @@ -18938,7 +18938,7 @@ func_802426B4_C5CDF4 = 0x802426B4; // type:func rom:0xC5CDF4 func_802426F8_C5CE38 = 0x802426F8; // type:func rom:0xC5CE38 func_80242730_C5CE70 = 0x80242730; // type:func rom:0xC5CE70 kzn_02_sixFloats = 0x80244900; // type:data rom:0xC5F040 -D_80244A10_C5F150 = 0x80244A10; // type:data rom:0xC5F150 +kzn_02_varTable = 0x80244A10; // type:data rom:0xC5F150 D_80244A74_C5F1B4 = 0x80244A74; // type:data rom:0xC5F1B4 D_80244A78_C5F1B8 = 0x80244A78; // type:data rom:0xC5F1B8 D_802464A4_C60BE4 = 0x802464A4; // type:data rom:0xC60BE4 @@ -18971,7 +18971,7 @@ kzn_03_UnkNpcAIFunc33 = 0x80242100; // type:func rom:0xC62E10 kzn_03_UnkNpcDurationFlagFunc2 = 0x80242200; // type:func rom:0xC62F10 kzn_03_UnkNpcAIFunc30 = 0x80242260; // type:func rom:0xC62F70 func_8024234C_C6305C = 0x8024234C; // type:func rom:0xC6305C -func_8024259C_C632AC = 0x8024259C; // type:func rom:0xC632AC +kzn_03_StashVars = 0x8024259C; // type:func rom:0xC632AC kzn_03_GetItemName = 0x80242650; // type:func rom:0xC63360 kzn_03_GetNpcCollisionHeight = 0x802426B4; // type:func rom:0xC633C4 kzn_03_AddPlayerHandsOffset = 0x80242710; // type:func rom:0xC63420 @@ -18989,7 +18989,7 @@ func_80242DB0_C63AC0 = 0x80242DB0; // type:func rom:0xC63AC0 func_80242E54_C63B64 = 0x80242E54; // type:func rom:0xC63B64 btl_state_draw_begin_partner_turn_C63C08 = 0x80242EF8; // type:func rom:0xC63C08 func_80243070_C63D80 = 0x80243070; // type:func rom:0xC63D80 -D_802441A0_C64EB0 = 0x802441A0; // type:data rom:0xC64EB0 +kzn_03_varTable = 0x802441A0; // type:data rom:0xC64EB0 D_80244204_C64F14 = 0x80244204; // type:data rom:0xC64F14 D_80244208_C64F18 = 0x80244208; // type:data rom:0xC64F18 D_802471E0_C67EF0 = 0x802471E0; // type:data rom:0xC67EF0 @@ -19075,7 +19075,7 @@ func_80240348_C717C8 = 0x80240348; // type:func rom:0xC717C8 kzn_08_UpdateTexturePanSmooth = 0x8024040C; // type:func rom:0xC7188C kzn_08_UpdateTexturePanStepped = 0x80240530; // type:func rom:0xC719B0 func_80240718_C71B98 = 0x80240718; // type:func rom:0xC71B98 -func_80240790_C71C10 = 0x80240790; // type:func rom:0xC71C10 +kzn_08_StashVars = 0x80240790; // type:func rom:0xC71C10 kzn_08_GetItemName = 0x80240844; // type:func rom:0xC71CC4 kzn_08_SomeItemEntityFunc = 0x802408A8; // type:func rom:0xC71D28 kzn_08_CheckItemFlags40 = 0x802409F8; // type:func rom:0xC71E78 @@ -19111,7 +19111,7 @@ kzn_08_UnkNpcAIFunc30 = 0x80243BA4; // type:func rom:0xC75024 func_80243C90_C75110 = 0x80243C90; // type:func rom:0xC75110 func_80243EE0_C75360 = 0x80243EE0; // type:func rom:0xC75360 D_80244170_C755F0 = 0x80244170; // type:data rom:0xC755F0 -D_80244BB0_C76030 = 0x80244BB0; // type:data rom:0xC76030 +kzn_08_varTable = 0x80244BB0; // type:data rom:0xC76030 kzn_08_sixFloats = 0x80244DA0; // type:data rom:0xC76220 D_802455D0_C76A50 = 0x802455D0; // type:data rom:0xC76A50 D_802455E0_C76A60 = 0x802455E0; // type:data rom:0xC76A60 @@ -19170,7 +19170,7 @@ kzn_09_UnkNpcAIMainFunc5 = 0x80242D58; // type:func rom:0xC79A38 kzn_09_func_80240814_97BE44 = 0x80243198; // type:func rom:0xC79E78 kzn_09_AwaitPlayerNearNpc = 0x802431E0; // type:func rom:0xC79EC0 kzn_09_func_802408B4_97BEE4 = 0x80243238; // type:func rom:0xC79F18 -func_802432AC_C79F8C = 0x802432AC; // type:func rom:0xC79F8C +kzn_09_StashVars = 0x802432AC; // type:func rom:0xC79F8C kzn_09_GetItemName = 0x80243360; // type:func rom:0xC7A040 kzn_09_GetNpcCollisionHeight = 0x802433C4; // type:func rom:0xC7A0A4 kzn_09_AddPlayerHandsOffset = 0x80243420; // type:func rom:0xC7A100 @@ -19185,7 +19185,7 @@ D_80243D00_C7A9E0 = 0x80243D00; // type:data rom:0xC7A9E0 D_80243D08_C7A9E8 = 0x80243D08; // type:data rom:0xC7A9E8 D_80243D18_C7A9F8 = 0x80243D18; // type:data rom:0xC7A9F8 kzn_09_bigFuncFloats = 0x80243D58; // type:data rom:0xC7AA38 -D_80245250_C7BF30 = 0x80245250; // type:data rom:0xC7BF30 +kzn_09_varTable = 0x80245250; // type:data rom:0xC7BF30 D_802452B4_C7BF94 = 0x802452B4; // type:data rom:0xC7BF94 D_802452B8_C7BF98 = 0x802452B8; // type:data rom:0xC7BF98 D_80247270_C7DF50 = 0x80247270; // type:data rom:0xC7DF50 @@ -19264,7 +19264,7 @@ kzn_17_UnkNpcAIMainFunc5 = 0x80242048; // type:func rom:0xC87AF8 kzn_17_func_80240814_97BE44 = 0x80242488; // type:func rom:0xC87F38 kzn_17_AwaitPlayerNearNpc = 0x802424D0; // type:func rom:0xC87F80 kzn_17_func_802408B4_97BEE4 = 0x80242528; // type:func rom:0xC87FD8 -func_8024259C_C8804C = 0x8024259C; // type:func rom:0xC8804C +kzn_17_StashVars = 0x8024259C; // type:func rom:0xC8804C kzn_17_GetItemName = 0x80242650; // type:func rom:0xC88100 kzn_17_GetNpcCollisionHeight = 0x802426B4; // type:func rom:0xC88164 kzn_17_AddPlayerHandsOffset = 0x80242710; // type:func rom:0xC881C0 @@ -19283,7 +19283,7 @@ kzn_17_UnkFunc48 = 0x80242E84; // type:func rom:0xC88934 kzn_17_UnkFunc49 = 0x80242EBC; // type:func rom:0xC8896C kzn_17_UnkFunc50 = 0x80242F74; // type:func rom:0xC88A24 kzn_17_UnkFunc51 = 0x80243004; // type:func rom:0xC88AB4 -D_80244074_C89B24 = 0x80244074; // type:data rom:0xC89B24 +kzn_17_varTable = 0x80244074; // type:data rom:0xC89B24 D_802440D8_C89B88 = 0x802440D8; // type:data rom:0xC89B88 D_802440DC_C89B8C = 0x802440DC; // type:data rom:0xC89B8C D_802463A0_C8BE50 = 0x802463A0; // type:data rom:0xC8BE50 @@ -19320,7 +19320,7 @@ func_80240E2C_C8E9DC = 0x80240E2C; // type:func rom:0xC8E9DC func_802413C0_C8EF70 = 0x802413C0; // type:func rom:0xC8EF70 func_802413FC_C8EFAC = 0x802413FC; // type:func rom:0xC8EFAC func_8024140C_C8EFBC = 0x8024140C; // type:func rom:0xC8EFBC -func_80241468_C8F018 = 0x80241468; // type:func rom:0xC8F018 +kzn_19_StashVars = 0x80241468; // type:func rom:0xC8F018 kzn_19_GetItemName = 0x8024151C; // type:func rom:0xC8F0CC kzn_19_GetNpcCollisionHeight = 0x80241580; // type:func rom:0xC8F130 kzn_19_AddPlayerHandsOffset = 0x802415DC; // type:func rom:0xC8F18C @@ -19334,13 +19334,13 @@ func_80241B94_C8F744 = 0x80241B94; // type:func rom:0xC8F744 func_80241BC0_C8F770 = 0x80241BC0; // type:func rom:0xC8F770 D_80243AD8_C91688 = 0x80243AD8; // type:data rom:0xC91688 D_80243BB8_C91768 = 0x80243BB8; // type:data rom:0xC91768 -D_80243D74_C91924 = 0x80243D74; // type:data rom:0xC91924 +kzn_19_varTable = 0x80243D74; // type:data rom:0xC91924 D_80243DD8_C91988 = 0x80243DD8; // type:data rom:0xC91988 D_80243DDC_C9198C = 0x80243DDC; // type:data rom:0xC9198C D_80248370_C95F20 = 0x80248370; // type:data rom:0xC95F20 kzn_20_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xC95F30 kzn_20_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xC96054 -func_80240310_C96240 = 0x80240310; // type:func rom:0xC96240 +kzn_20_StashVars = 0x80240310; // type:func rom:0xC96240 kzn_20_GetItemName = 0x802403C4; // type:func rom:0xC962F4 kzn_20_GetNpcCollisionHeight = 0x80240428; // type:func rom:0xC96358 kzn_20_AddPlayerHandsOffset = 0x80240484; // type:func rom:0xC963B4 @@ -19353,7 +19353,7 @@ func_802409F8_C96928 = 0x802409F8; // type:func rom:0xC96928 func_80240A3C_C9696C = 0x80240A3C; // type:func rom:0xC9696C func_80240A68_C96998 = 0x80240A68; // type:func rom:0xC96998 kzn_20_GetFloorCollider = 0x80240A8C; // type:func rom:0xC969BC -D_80241780_C976B0 = 0x80241780; // type:data rom:0xC976B0 +kzn_20_varTable = 0x80241780; // type:data rom:0xC976B0 D_802417E4_C97714 = 0x802417E4; // type:data rom:0xC97714 D_802417E8_C97718 = 0x802417E8; // type:data rom:0xC97718 kzn_22_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xC9A200 @@ -19471,7 +19471,7 @@ flo_00_pad_XXX = 0x80249368; // type:data rom:0xCA7288 flo_00_sam_11_name_hack = 0x80249370; // type:data rom:0xCA7290 flo_00_flo_19_name_hack = 0x80249378; // type:data rom:0xCA7298 flo_03_func_80240000_CA72A0 = 0x80240000; // type:func rom:0xCA72A0 -flo_03_func_80240040_CA72E0 = 0x80240040; // type:func rom:0xCA72E0 +flo_03_StashVars = 0x80240040; // type:func rom:0xCA72E0 flo_03_GetItemName = 0x802400F4; // type:func rom:0xCA7394 flo_03_func_80240158_CA73F8 = 0x80240158; // type:func rom:0xCA73F8 flo_03_foliage_setup_shear_mtx = 0x802403F0; // type:func rom:0xCA7690 @@ -19488,7 +19488,7 @@ flo_03_80240BE4 = 0x80240BE4; // type:data rom:0xCA7E84 flo_03_main = 0x80240C2C; // type:data rom:0xCA7ECC flo_03_npcSettings_80240EB0 = 0x80240EB0; // type:data rom:0xCA8150 flo_03_npcSettings_80240EDC = 0x80240EDC; // type:data rom:0xCA817C -flo_03_D_80240F08_CA81A8 = 0x80240F08; // type:data rom:0xCA81A8 +flo_03_varTable = 0x80240F08; // type:data rom:0xCA81A8 flo_03_80240F0C = 0x80240F0C; // type:data rom:0xCA81AC flo_03_80240F3C = 0x80240F3C; // type:data rom:0xCA81DC flo_03_intTable_80240F6C = 0x80240F6C; // type:data rom:0xCA820C @@ -19537,7 +19537,7 @@ flo_07_SpawnSunEffect = 0x8024030C; // type:func rom:0xCAC4FC flo_07_func_80240344_CAC534 = 0x80240344; // type:func rom:0xCAC534 flo_07_foliage_setup_shear_mtx = 0x802403E0; // type:func rom:0xCAC5D0 flo_07_TransformFoliage = 0x80240450; // type:func rom:0xCAC640 -flo_07_func_8024061C_CAC80C = 0x8024061C; // type:func rom:0xCAC80C +flo_07_StashVars = 0x8024061C; // type:func rom:0xCAC80C flo_07_GetItemName = 0x802406D0; // type:func rom:0xCAC8C0 flo_07_entryList = 0x80240740; // type:data rom:0xCAC930 flo_07_config = 0x80240760; // type:data rom:0xCAC950 @@ -19552,7 +19552,7 @@ flo_07_main = 0x80240CA0; // type:data rom:0xCACE90 flo_07_npcSettings_80241220 = 0x80241220; // type:data rom:0xCAD410 flo_07_searchBush = 0x8024124C; // type:data rom:0xCAD43C flo_07_shakeTree = 0x802415AC; // type:data rom:0xCAD79C -flo_07_D_80241BB0_CADDA0 = 0x80241BB0; // type:data rom:0xCADDA0 +flo_07_varTable = 0x80241BB0; // type:data rom:0xCADDA0 flo_07_80241BB4 = 0x80241BB4; // type:data rom:0xCADDA4 flo_07_80241BE4 = 0x80241BE4; // type:data rom:0xCADDD4 flo_07_80241C14 = 0x80241C14; // type:data rom:0xCADE04 @@ -19722,7 +19722,7 @@ D_802441A8_CB91A8 = 0x802441A8; // type:data rom:0xCB91A8 D_802441B0_CB91B0 = 0x802441B0; // type:data rom:0xCB91B0 flo_10_func_80240000_CB9200 = 0x80240000; // type:func rom:0xCB9200 flo_10_func_80240040_CB9240 = 0x80240040; // type:func rom:0xCB9240 -flo_10_func_80240080_CB9280 = 0x80240080; // type:func rom:0xCB9280 +flo_10_StashVars = 0x80240080; // type:func rom:0xCB9280 flo_10_GetItemName = 0x80240134; // type:func rom:0xCB9334 flo_10_UpdateTexturePanSmooth = 0x80240198; // type:func rom:0xCB9398 flo_10_UpdateTexturePanStepped = 0x802402BC; // type:func rom:0xCB94BC @@ -19740,7 +19740,7 @@ flo_10_80241680 = 0x80241680; // type:data rom:0xCBA880 flo_10_exitWalk_8024192C = 0x8024192C; // type:data rom:0xCBAB2C flo_10_80241988 = 0x80241988; // type:data rom:0xCBAB88 flo_10_main = 0x802419B4; // type:data rom:0xCBABB4 -flo_10_D_80241CB0_CBAEB0 = 0x80241CB0; // type:data rom:0xCBAEB0 +flo_10_varTable = 0x80241CB0; // type:data rom:0xCBAEB0 flo_10_80241CB4 = 0x80241CB4; // type:data rom:0xCBAEB4 flo_10_80241CE4 = 0x80241CE4; // type:data rom:0xCBAEE4 flo_10_updateTexturePan_80241D14 = 0x80241D14; // type:data rom:0xCBAF14 @@ -19832,7 +19832,7 @@ flo_11_makeEntities = 0x802430F0; // type:data rom:0xCC0DC0 flo_12_func_80240000_CC0E30 = 0x80240000; // type:func rom:0xCC0E30 flo_12_foliage_setup_shear_mtx = 0x80240040; // type:func rom:0xCC0E70 flo_12_TransformFoliage = 0x802400B0; // type:func rom:0xCC0EE0 -flo_12_func_8024027C_CC10AC = 0x8024027C; // type:func rom:0xCC10AC +flo_12_StashVars = 0x8024027C; // type:func rom:0xCC10AC flo_12_GetItemName = 0x80240330; // type:func rom:0xCC1160 flo_12_GetNpcCollisionHeight = 0x80240394; // type:func rom:0xCC11C4 flo_12_AddPlayerHandsOffset = 0x802403F0; // type:func rom:0xCC1220 @@ -19852,7 +19852,7 @@ flo_12_npcSettings_80240E30 = 0x80240E30; // type:data rom:0xCC1C60 flo_12_npcSettings_80240E5C = 0x80240E5C; // type:data rom:0xCC1C8C flo_12_searchBush = 0x80240E88; // type:data rom:0xCC1CB8 flo_12_shakeTree = 0x802411E8; // type:data rom:0xCC2018 -flo_12_D_802417EC_CC261C = 0x802417EC; // type:data rom:0xCC261C +flo_12_varTable = 0x802417EC; // type:data rom:0xCC261C flo_12_802417F0 = 0x802417F0; // type:data rom:0xCC2620 flo_12_80241820 = 0x80241820; // type:data rom:0xCC2650 flo_12_D_80241850_CC2680 = 0x80241850; // type:data rom:0xCC2680 @@ -20513,7 +20513,7 @@ func_8024053C_CF80AC = 0x8024053C; // type:func rom:0xCF80AC func_80240590_CF8100 = 0x80240590; // type:func rom:0xCF8100 func_802405C8_CF8138 = 0x802405C8; // type:func rom:0xCF8138 func_80240664_CF81D4 = 0x80240664; // type:func rom:0xCF81D4 -func_80240700_CF8270 = 0x80240700; // type:func rom:0xCF8270 +sam_01_StashVars = 0x80240700; // type:func rom:0xCF8270 sam_01_GetItemName = 0x802407B4; // type:func rom:0xCF8324 sam_01_Set80151310_1 = 0x80240818; // type:func rom:0xCF8388 sam_01_Set80151310_0 = 0x8024082C; // type:func rom:0xCF839C @@ -20546,16 +20546,16 @@ func_80241A10_CF9580 = 0x80241A10; // type:func rom:0xCF9580 func_80241A54_CF95C4 = 0x80241A54; // type:func rom:0xCF95C4 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_StashVars = 0x80241C90; // type:func rom:0xCF9800 dup_sam_01_GetItemName = 0x80241D44; // type:func rom:0xCF98B4 sam_01_SomeItemEntityFunc = 0x80241DA8; // type:func rom:0xCF9918 sam_01_CheckItemFlags40 = 0x80241EF8; // type:func rom:0xCF9A68 D_802432D0_CFAE40 = 0x802432D0; // type:data rom:0xCFAE40 D_802432D4_CFAE44 = 0x802432D4; // type:data rom:0xCFAE44 -D_802435F0_CFB160 = 0x802435F0; // type:data rom:0xCFB160 +sam_01_varTable = 0x802435F0; // type:data rom:0xCFB160 D_802436FC_CFB26C = 0x802436FC; // type:data rom:0xCFB26C D_8024373C_CFB2AC = 0x8024373C; // type:data rom:0xCFB2AC -D_8024D8F0_D05460 = 0x8024D8F0; // type:data rom:0xD05460 +sam_01_varTable = 0x8024D8F0; // type:data rom:0xD05460 sam_02_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0xD05730 sam_02_GetCurrentFloor = 0x80240020; // type:func rom:0xD05750 sam_02_UnkFunc25 = 0x80240034; // type:func rom:0xD05764 @@ -20578,7 +20578,7 @@ sam_02_UnkFunc35 = 0x80240A44; // type:func rom:0xD06174 sam_02_GetPartnerCall800EB168 = 0x80240AC0; // type:func rom:0xD061F0 sam_02_Call800EB168 = 0x80240AF4; // type:func rom:0xD06224 sam_02_UnkFunc36 = 0x80240B24; // type:func rom:0xD06254 -func_80240B2C_D0625C = 0x80240B2C; // type:func rom:0xD0625C +sam_02_StashVars = 0x80240B2C; // type:func rom:0xD0625C sam_02_GetItemName = 0x80240BE0; // type:func rom:0xD06310 sam_02_Set80151310_1 = 0x80240C44; // type:func rom:0xD06374 sam_02_Set80151310_0 = 0x80240C58; // type:func rom:0xD06388 @@ -20605,7 +20605,7 @@ sam_02_UnkRotatePartner = 0x802419AC; // type:func rom:0xD070DC sam_02_UnkMovePartner = 0x80241A3C; // type:func rom:0xD0716C func_80241B24_D07254 = 0x80241B24; // type:func rom:0xD07254 func_80241B90_D072C0 = 0x80241B90; // type:func rom:0xD072C0 -D_80246B60_D0C290 = 0x80246B60; // type:data rom:0xD0C290 +sam_02_varTable = 0x80246B60; // type:data rom:0xD0C290 D_80246BC4_D0C2F4 = 0x80246BC4; // type:data rom:0xD0C2F4 D_80246C04_D0C334 = 0x80246C04; // type:data rom:0xD0C334 func_80240000_D110C0 = 0x80240000; // type:func rom:0xD110C0 @@ -20668,7 +20668,7 @@ sam_06_UnkNpcAIFunc3 = 0x80241344; // type:func rom:0xD211D4 sam_06_UnkFunc6 = 0x802413A8; // type:func rom:0xD21238 sam_06_UnkFunc5 = 0x80241738; // type:func rom:0xD215C8 sam_06_UnkNpcAIMainFunc9 = 0x8024185C; // type:func rom:0xD216EC -func_80241A48_D218D8 = 0x80241A48; // type:func rom:0xD218D8 +sam_06_StashVars = 0x80241A48; // type:func rom:0xD218D8 sam_06_GetItemName = 0x80241AFC; // type:func rom:0xD2198C sam_06_GetNpcCollisionHeight = 0x80241B60; // type:func rom:0xD219F0 sam_06_AddPlayerHandsOffset = 0x80241BBC; // type:func rom:0xD21A4C @@ -20694,7 +20694,7 @@ func_802424C8_D22358 = 0x802424C8; // type:func rom:0xD22358 func_8024250C_D2239C = 0x8024250C; // type:func rom:0xD2239C func_80242538_D223C8 = 0x80242538; // type:func rom:0xD223C8 sam_06_sixFloats = 0x802441B8; // type:data rom:0xD24048 -D_802443D0_D24260 = 0x802443D0; // type:data rom:0xD24260 +sam_06_varTable = 0x802443D0; // type:data rom:0xD24260 D_80244434_D242C4 = 0x80244434; // type:data rom:0xD242C4 D_80244438_D242C8 = 0x80244438; // type:data rom:0xD242C8 D_8024BE40_D2BCD0 = 0x8024BE40; // type:data rom:0xD2BCD0 @@ -20761,14 +20761,14 @@ D_80241AE8_D31768 = 0x80241AE8; // type:data rom:0xD31768 D_80241AF8_D31778 = 0x80241AF8; // type:data rom:0xD31778 sam_08_bigFuncFloats = 0x80241B38; // type:data rom:0xD317B8 D_802464D0_D36150 = 0x802464D0; // type:data rom:0xD36150 -func_80240000_D362F0 = 0x80240000; // type:func rom:0xD362F0 +sam_09_StashVars = 0x80240000; // type:func rom:0xD362F0 sam_09_GetItemName = 0x802400B4; // type:func rom:0xD363A4 func_80240118_D36408 = 0x80240118; // type:func rom:0xD36408 func_80240158_D36448 = 0x80240158; // type:func rom:0xD36448 func_80240264_D36554 = 0x80240264; // type:func rom:0xD36554 func_802403A0_D36690 = 0x802403A0; // type:func rom:0xD36690 -D_802406C0_D369B0 = 0x802406C0; // type:data rom:0xD369B0 -func_80240000_D37800 = 0x80240000; // type:func rom:0xD37800 +sam_09_varTable = 0x802406C0; // type:data rom:0xD369B0 +sam_10_StashVars = 0x80240000; // type:func rom:0xD37800 sam_10_GetItemName = 0x802400B4; // type:func rom:0xD378B4 sam_10_SomeItemEntityFunc = 0x80240118; // type:func rom:0xD37918 sam_10_CheckItemFlags40 = 0x80240268; // type:func rom:0xD37A68 @@ -20781,7 +20781,7 @@ sam_10_UnkNpcAIFunc5 = 0x80240584; // type:func rom:0xD37D84 sam_10_UnkNpcAIFunc26 = 0x802405D8; // type:func rom:0xD37DD8 sam_10_UnkFunc7 = 0x8024078C; // type:func rom:0xD37F8C sam_10_UnkNpcAIFunc27 = 0x802409EC; // type:func rom:0xD381EC -D_80241040_D38840 = 0x80241040; // type:data rom:0xD38840 +sam_10_varTable = 0x80241040; // type:data rom:0xD38840 D_80242C30_D3A430 = 0x80242C30; // type:data rom:0xD3A430 func_80240000_D3A5D0 = 0x80240000; // type:func rom:0xD3A5D0 sam_11_foliage_setup_shear_mtx = 0x80240040; // type:func rom:0xD3A610 @@ -20797,7 +20797,7 @@ sam_11_SetCamera0MoveFlag1 = 0x80240580; // type:func rom:0xD3AB50 func_8024059C_D3AB6C = 0x8024059C; // type:func rom:0xD3AB6C func_8024072C_D3ACFC = 0x8024072C; // type:func rom:0xD3ACFC func_80240754_D3AD24 = 0x80240754; // type:func rom:0xD3AD24 -func_802407D0_D3ADA0 = 0x802407D0; // type:func rom:0xD3ADA0 +sam_11_StashVars = 0x802407D0; // type:func rom:0xD3ADA0 sam_11_GetItemName = 0x80240884; // type:func rom:0xD3AE54 dup_sam_11_Set80151310_1 = 0x802408E8; // type:func rom:0xD3AEB8 dup_sam_11_Set80151310_0 = 0x802408FC; // type:func rom:0xD3AECC @@ -20836,7 +20836,7 @@ func_80242074_D3C644 = 0x80242074; // type:func rom:0xD3C644 D_80243CC0_D3E290 = 0x80243CC0; // type:data rom:0xD3E290 D_80243CC4_D3E294 = 0x80243CC4; // type:data rom:0xD3E294 D_80243CC8_D3E298 = 0x80243CC8; // type:data rom:0xD3E298 -D_80244F78_D3F548 = 0x80244F78; // type:data rom:0xD3F548 +sam_11_varTable = 0x80244F78; // type:data rom:0xD3F548 D_80244FDC_D3F5AC = 0x80244FDC; // type:data rom:0xD3F5AC D_8024501C_D3F5EC = 0x8024501C; // type:data rom:0xD3F5EC D_80251430_D4BA00 = 0x80251430; // type:data rom:0xD4BA00 @@ -20924,11 +20924,11 @@ pra_05_ReflectPartner = 0x80240D3C; // type:func rom:0xD568EC pra_05_SetPartnerFlagsA0000 = 0x80240E84; // type:func rom:0xD56A34 pra_05_SetPartnerFlags80000 = 0x80240EB8; // type:func rom:0xD56A68 pra_05_SetPartnerFlags20000 = 0x80240EEC; // type:func rom:0xD56A9C -func_80240F20_D56AD0 = 0x80240F20; // type:func rom:0xD56AD0 +pra_05_StashVars = 0x80240F20; // type:func rom:0xD56AD0 pra_05_GetItemName = 0x80240FD4; // type:func rom:0xD56B84 pra_05_SomeItemEntityFunc = 0x80241038; // type:func rom:0xD56BE8 pra_05_CheckItemFlags40 = 0x80241188; // type:func rom:0xD56D38 -D_80241680_D57230 = 0x80241680; // type:data rom:0xD57230 +pra_05_varTable = 0x80241680; // type:data rom:0xD57230 func_80240000_D57430 = 0x80240000; // type:func rom:0xD57430 pra_06_reflection_unk_resolve_anim = 0x80240050; // type:func rom:0xD57480 pra_06_reflection_unk_change_anim_facing = 0x80240084; // type:func rom:0xD574B4 @@ -21002,11 +21002,11 @@ pra_11_ReflectPartner = 0x80240D3C; // type:func rom:0xD6223C pra_11_SetPartnerFlagsA0000 = 0x80240E84; // type:func rom:0xD62384 pra_11_SetPartnerFlags80000 = 0x80240EB8; // type:func rom:0xD623B8 pra_11_SetPartnerFlags20000 = 0x80240EEC; // type:func rom:0xD623EC -func_80240F20_D62420 = 0x80240F20; // type:func rom:0xD62420 +pra_11_StashVars = 0x80240F20; // type:func rom:0xD62420 pra_11_GetItemName = 0x80240FD4; // type:func rom:0xD624D4 pra_11_SomeItemEntityFunc = 0x80241038; // type:func rom:0xD62538 pra_11_CheckItemFlags40 = 0x80241188; // type:func rom:0xD62688 -D_80241610_D62B10 = 0x80241610; // type:data rom:0xD62B10 +pra_11_varTable = 0x80241610; // type:data rom:0xD62B10 func_80240000_D62D10 = 0x80240000; // type:func rom:0xD62D10 pra_12_reflection_unk_resolve_anim = 0x80240050; // type:func rom:0xD62D60 pra_12_reflection_unk_change_anim_facing = 0x80240084; // type:func rom:0xD62D94 @@ -21021,11 +21021,11 @@ pra_12_ReflectPartner = 0x80240D6C; // type:func rom:0xD63A7C pra_12_SetPartnerFlagsA0000 = 0x80240EB4; // type:func rom:0xD63BC4 pra_12_SetPartnerFlags80000 = 0x80240EE8; // type:func rom:0xD63BF8 pra_12_SetPartnerFlags20000 = 0x80240F1C; // type:func rom:0xD63C2C -func_80240F50_D63C60 = 0x80240F50; // type:func rom:0xD63C60 +pra_12_StashVars = 0x80240F50; // type:func rom:0xD63C60 pra_12_GetItemName = 0x80241004; // type:func rom:0xD63D14 pra_12_SomeItemEntityFunc = 0x80241068; // type:func rom:0xD63D78 pra_12_CheckItemFlags40 = 0x802411B8; // type:func rom:0xD63EC8 -D_802416B0_D643C0 = 0x802416B0; // type:data rom:0xD643C0 +pra_12_varTable = 0x802416B0; // type:data rom:0xD643C0 D_802418A0_D645B0 = 0x802418A0; // type:data rom:0xD645B0 D_802418B0_D645C0 = 0x802418B0; // type:data rom:0xD645C0 pra_13_SetGameStatusUnk84_1 = 0x80240000; // type:func rom:0xD645E0 @@ -21069,11 +21069,11 @@ pra_14_ReflectPartner = 0x80240D3C; // type:func rom:0xD68A3C pra_14_SetPartnerFlagsA0000 = 0x80240E84; // type:func rom:0xD68B84 pra_14_SetPartnerFlags80000 = 0x80240EB8; // type:func rom:0xD68BB8 pra_14_SetPartnerFlags20000 = 0x80240EEC; // type:func rom:0xD68BEC -func_80240F20_D68C20 = 0x80240F20; // type:func rom:0xD68C20 +pra_14_StashVars = 0x80240F20; // type:func rom:0xD68C20 pra_14_GetItemName = 0x80240FD4; // type:func rom:0xD68CD4 pra_14_SomeItemEntityFunc = 0x80241038; // type:func rom:0xD68D38 pra_14_CheckItemFlags40 = 0x80241188; // type:func rom:0xD68E88 -D_80241930_D69630 = 0x80241930; // type:data rom:0xD69630 +pra_14_varTable = 0x80241930; // type:data rom:0xD69630 pra_15_SetGameStatusUnk84_1 = 0x80240000; // type:func rom:0xD69810 func_80240020_D69830 = 0x80240020; // type:func rom:0xD69830 pra_16_SetGameStatusUnk84_1 = 0x80240000; // type:func rom:0xD69B20 @@ -21171,11 +21171,11 @@ pra_27_ReflectPartner = 0x80240D6C; // type:func rom:0xD7A75C pra_27_SetPartnerFlagsA0000 = 0x80240EB4; // type:func rom:0xD7A8A4 pra_27_SetPartnerFlags80000 = 0x80240EE8; // type:func rom:0xD7A8D8 pra_27_SetPartnerFlags20000 = 0x80240F1C; // type:func rom:0xD7A90C -func_80240F50_D7A940 = 0x80240F50; // type:func rom:0xD7A940 +pra_27_StashVars = 0x80240F50; // type:func rom:0xD7A940 pra_27_GetItemName = 0x80241004; // type:func rom:0xD7A9F4 pra_27_SomeItemEntityFunc = 0x80241068; // type:func rom:0xD7AA58 pra_27_CheckItemFlags40 = 0x802411B8; // type:func rom:0xD7ABA8 -D_80241690_D7B080 = 0x80241690; // type:data rom:0xD7B080 +pra_27_varTable = 0x80241690; // type:data rom:0xD7B080 D_80241880_D7B270 = 0x80241880; // type:data rom:0xD7B270 D_80241890_D7B280 = 0x80241890; // type:data rom:0xD7B280 func_80240000_D7B2A0 = 0x80240000; // type:func rom:0xD7B2A0 @@ -21192,11 +21192,11 @@ pra_28_ReflectPartner = 0x80240D6C; // type:func rom:0xD7C00C pra_28_SetPartnerFlagsA0000 = 0x80240EB4; // type:func rom:0xD7C154 pra_28_SetPartnerFlags80000 = 0x80240EE8; // type:func rom:0xD7C188 pra_28_SetPartnerFlags20000 = 0x80240F1C; // type:func rom:0xD7C1BC -func_80240F50_D7C1F0 = 0x80240F50; // type:func rom:0xD7C1F0 +pra_28_StashVars = 0x80240F50; // type:func rom:0xD7C1F0 pra_28_GetItemName = 0x80241004; // type:func rom:0xD7C2A4 pra_28_SomeItemEntityFunc = 0x80241068; // type:func rom:0xD7C308 pra_28_CheckItemFlags40 = 0x802411B8; // type:func rom:0xD7C458 -D_80241690_D7C930 = 0x80241690; // type:data rom:0xD7C930 +pra_28_varTable = 0x80241690; // type:data rom:0xD7C930 D_80241880_D7CB20 = 0x80241880; // type:data rom:0xD7CB20 D_80241890_D7CB30 = 0x80241890; // type:data rom:0xD7CB30 pra_29_SetGameStatusUnk84_1 = 0x80240000; // type:func rom:0xD7CB50 @@ -21317,11 +21317,11 @@ pra_35_UnkNpcAIFunc26 = 0x80241FB8; // type:func rom:0xD8F208 pra_35_UnkFunc7 = 0x8024216C; // type:func rom:0xD8F3BC func_802423CC_D8F61C = 0x802423CC; // type:func rom:0xD8F61C pra_35_UnkNpcAIFunc27 = 0x80242698; // type:func rom:0xD8F8E8 -func_80242950_D8FBA0 = 0x80242950; // type:func rom:0xD8FBA0 +pra_35_StashVars = 0x80242950; // type:func rom:0xD8FBA0 pra_35_GetItemName = 0x80242A04; // type:func rom:0xD8FC54 pra_35_SomeItemEntityFunc = 0x80242A68; // type:func rom:0xD8FCB8 pra_35_CheckItemFlags40 = 0x80242BB8; // type:func rom:0xD8FE08 -D_80243DE0_D91030 = 0x80243DE0; // type:data rom:0xD91030 +pra_35_varTable = 0x80243DE0; // type:data rom:0xD91030 D_80243FE0_D91230 = 0x80243FE0; // type:data rom:0xD91230 D_80243FE8_D91238 = 0x80243FE8; // type:data rom:0xD91238 D_80244180_D913D0 = 0x80244180; // type:data rom:0xD913D0 @@ -21478,7 +21478,7 @@ omo_03_UnkFloatFunc = 0x802403A8; // type:func rom:0xDA55E8 omo_03_IsAOrBPressed = 0x80240538; // type:func rom:0xDA5778 omo_03_UpdateTexturePanSmooth = 0x8024057C; // type:func rom:0xDA57BC omo_03_UpdateTexturePanStepped = 0x802406A0; // type:func rom:0xDA58E0 -func_80240000_DAD400 = 0x80240000; // type:func rom:0xDAD400 +omo_04_StashVars = 0x80240000; // type:func rom:0xDAD400 omo_04_GetItemName = 0x802400B4; // type:func rom:0xDAD4B4 omo_04_SomeItemEntityFunc = 0x80240118; // type:func rom:0xDAD518 omo_04_CheckItemFlags40 = 0x80240268; // type:func rom:0xDAD668 @@ -21504,7 +21504,7 @@ func_80241AD0_DAEED0 = 0x80241AD0; // type:func rom:0xDAEED0 omo_04_SetCamera0Flag1000 = 0x80241E04; // type:func rom:0xDAF204 omo_04_UnsetCamera0Flag1000 = 0x80241E20; // type:func rom:0xDAF220 func_80241E40_DAF240 = 0x80241E40; // type:func rom:0xDAF240 -D_80242630_DAFA30 = 0x80242630; // type:data rom:0xDAFA30 +omo_04_varTable = 0x80242630; // type:data rom:0xDAFA30 omo_04_sixFloats = 0x80242EF0; // type:data rom:0xDB02F0 D_80244CB0_DB20B0 = 0x80244CB0; // type:data rom:0xDB20B0 D_80244CB8_DB20B8 = 0x80244CB8; // type:data rom:0xDB20B8 @@ -21559,11 +21559,11 @@ omo_06_UnkFloatFunc = 0x80240388; // type:func rom:0xDB7C98 omo_06_IsAOrBPressed = 0x80240518; // type:func rom:0xDB7E28 omo_06_UpdateTexturePanSmooth = 0x8024055C; // type:func rom:0xDB7E6C omo_06_UpdateTexturePanStepped = 0x80240680; // type:func rom:0xDB7F90 -func_80240870_DB8180 = 0x80240870; // type:func rom:0xDB8180 +omo_06_StashVars = 0x80240870; // type:func rom:0xDB8180 omo_06_GetItemName = 0x80240924; // type:func rom:0xDB8234 omo_06_SomeItemEntityFunc = 0x80240988; // type:func rom:0xDB8298 omo_06_CheckItemFlags40 = 0x80240AD8; // type:func rom:0xDB83E8 -D_802456C0_DBCFD0 = 0x802456C0; // type:data rom:0xDBCFD0 +omo_06_varTable = 0x802456C0; // type:data rom:0xDBCFD0 func_80240000_DBD2B0 = 0x80240000; // type:func rom:0xDBD2B0 func_80240070_DBD320 = 0x80240070; // type:func rom:0xDBD320 func_80240140_DBD3F0 = 0x80240140; // type:func rom:0xDBD3F0 @@ -21600,7 +21600,7 @@ omo_07_UnkNpcAIMainFunc9 = 0x80242C84; // type:func rom:0xDBFF34 omo_07_SetCamera0Flag1000 = 0x80242E70; // type:func rom:0xDC0120 omo_07_UnsetCamera0Flag1000 = 0x80242E8C; // type:func rom:0xDC013C func_80242EA8_DC0158 = 0x80242EA8; // type:func rom:0xDC0158 -func_80242F20_DC01D0 = 0x80242F20; // type:func rom:0xDC01D0 +omo_07_StashVars = 0x80242F20; // type:func rom:0xDC01D0 omo_07_GetItemName = 0x80242FD4; // type:func rom:0xDC0284 omo_07_SomeItemEntityFunc = 0x80243038; // type:func rom:0xDC02E8 omo_07_CheckItemFlags40 = 0x80243188; // type:func rom:0xDC0438 @@ -21608,7 +21608,7 @@ omo_07_UnsetCamera0MoveFlag1 = 0x802431DC; // type:func rom:0xDC048C omo_07_SetCamera0MoveFlag1 = 0x802431F8; // type:func rom:0xDC04A8 func_80243220_DC04D0 = 0x80243220; // type:func rom:0xDC04D0 omo_07_sixFloats = 0x80243A14; // type:data rom:0xDC0CC4 -D_80245E00_DC30B0 = 0x80245E00; // type:data rom:0xDC30B0 +omo_07_varTable = 0x80245E00; // type:data rom:0xDC30B0 D_80246BD0_DC3E80 = 0x80246BD0; // type:data rom:0xDC3E80 D_80246BD8_DC3E88 = 0x80246BD8; // type:data rom:0xDC3E88 D_80246D70_DC4020 = 0x80246D70; // type:data rom:0xDC4020 @@ -21641,7 +21641,7 @@ func_80240078_DCCD48 = 0x80240078; // type:func rom:0xDCCD48 func_802402D0_DCCFA0 = 0x802402D0; // type:func rom:0xDCCFA0 func_80240534_DCD204 = 0x80240534; // type:func rom:0xDCD204 func_802406E0_DCD3B0 = 0x802406E0; // type:func rom:0xDCD3B0 -func_80240720_DCD3F0 = 0x80240720; // type:func rom:0xDCD3F0 +omo_09_StashVars = 0x80240720; // type:func rom:0xDCD3F0 omo_09_GetItemName = 0x802407D4; // type:func rom:0xDCD4A4 omo_09_SomeItemEntityFunc = 0x80240838; // type:func rom:0xDCD508 omo_09_CheckItemFlags40 = 0x80240988; // type:func rom:0xDCD658 @@ -21686,7 +21686,7 @@ D_80243A80_DD0750 = 0x80243A80; // type:data rom:0xDD0750 D_80243A90_DD0760 = 0x80243A90; // type:data rom:0xDD0760 D_802451AC_DD1E7C = 0x802451AC; // type:data rom:0xDD1E7C D_8024636C_DD303C = 0x8024636C; // type:data rom:0xDD303C -D_80247010_DD3CE0 = 0x80247010; // type:data rom:0xDD3CE0 +omo_09_varTable = 0x80247010; // type:data rom:0xDD3CE0 D_8024A630_DD7300 = 0x8024A630; // type:data rom:0xDD7300 D_8024A638_DD7308 = 0x8024A638; // type:data rom:0xDD7308 D_8024A7D0_DD74A0 = 0x8024A7D0; // type:data rom:0xDD74A0 @@ -21758,14 +21758,14 @@ func_80240F00_DE3390 = 0x80240F00; // type:func rom:0xDE3390 func_80240F54_DE33E4 = 0x80240F54; // type:func rom:0xDE33E4 func_80240F8C_DE341C = 0x80240F8C; // type:func rom:0xDE341C func_80241028_DE34B8 = 0x80241028; // type:func rom:0xDE34B8 -func_80241230_DE36C0 = 0x80241230; // type:func rom:0xDE36C0 +omo_13_StashVars = 0x80241230; // type:func rom:0xDE36C0 omo_13_GetItemName = 0x802412E4; // type:func rom:0xDE3774 omo_13_SomeItemEntityFunc = 0x80241348; // type:func rom:0xDE37D8 omo_13_CheckItemFlags40 = 0x80241498; // type:func rom:0xDE3928 D_80241A78_DE3F08 = 0x80241A78; // type:data rom:0xDE3F08 D_80241C04_DE4094 = 0x80241C04; // type:data rom:0xDE4094 D_80241C08_DE4098 = 0x80241C08; // type:data rom:0xDE4098 -D_80242C70_DE5100 = 0x80242C70; // type:data rom:0xDE5100 +omo_13_varTable = 0x80242C70; // type:data rom:0xDE5100 D_80242EE0_DE5370 = 0x80242EE0; // type:data rom:0xDE5370 D_80242EE8_DE5378 = 0x80242EE8; // type:data rom:0xDE5378 D_80243080_DE5510 = 0x80243080; // type:data rom:0xDE5510 @@ -22290,7 +22290,7 @@ EA0C10_DeadUnkNpcAIMainFunc5 = 0x802420FC; // type:func rom:0xEA29FC EA0C10_func_80240814_97BE44 = 0x80242568; // type:func rom:0xEA2E68 EA0C10_AwaitPlayerNearNpc = 0x802425B0; // type:func rom:0xEA2EB0 EA0C10_func_802408B4_97BEE4 = 0x80242608; // type:func rom:0xEA2F08 -func_8024267C_EA2F7C = 0x8024267C; // type:func rom:0xEA2F7C +EA0C10_StashVars = 0x8024267C; // type:func rom:0xEA2F7C EA0C10_GetItemName = 0x80242730; // type:func rom:0xEA3030 EA0C10_GetNpcCollisionHeight = 0x80242794; // type:func rom:0xEA3094 EA0C10_AddPlayerHandsOffset = 0x802427F0; // type:func rom:0xEA30F0 @@ -22309,7 +22309,7 @@ EA36E0_UnkFunc48 = 0x80242F64; // type:func rom:0xEA3864 EA36E0_UnkFunc49 = 0x80242F9C; // type:func rom:0xEA389C func_80243054_EA3954 = 0x80243054; // type:func rom:0xEA3954 EA36E0_UnkFunc51 = 0x802430E4; // type:func rom:0xEA39E4 -D_80244154_EA4A54 = 0x80244154; // type:data rom:0xEA4A54 +EA0C10_varTable = 0x80244154; // type:data rom:0xEA4A54 D_802441B8_EA4AB8 = 0x802441B8; // type:data rom:0xEA4AB8 D_802441BC_EA4ABC = 0x802441BC; // type:data rom:0xEA4ABC ascii_EA6D70 = 0x80246470; // type:data rom:0xEA6D70 @@ -22348,7 +22348,7 @@ func_80240E2C_EA990C = 0x80240E2C; // type:func rom:0xEA990C func_802413C0_EA9EA0 = 0x802413C0; // type:func rom:0xEA9EA0 func_802413FC_EA9EDC = 0x802413FC; // type:func rom:0xEA9EDC func_8024140C_EA9EEC = 0x8024140C; // type:func rom:0xEA9EEC -func_80241468_EA9F48 = 0x80241468; // type:func rom:0xEA9F48 +EA8AE0_StashVars = 0x80241468; // type:func rom:0xEA9F48 EA8AE0_GetItemName = 0x8024151C; // type:func rom:0xEA9FFC EA8AE0_GetNpcCollisionHeight = 0x80241580; // type:func rom:0xEAA060 EA8AE0_AddPlayerHandsOffset = 0x802415DC; // type:func rom:0xEAA0BC @@ -22362,13 +22362,13 @@ func_80241B94_EAA674 = 0x80241B94; // type:func rom:0xEAA674 func_80241BC0_EAA6A0 = 0x80241BC0; // type:func rom:0xEAA6A0 D_80243AD8_EAC5B8 = 0x80243AD8; // type:data rom:0xEAC5B8 D_80243BB8_EAC698 = 0x80243BB8; // type:data rom:0xEAC698 -D_80243D74_EAC854 = 0x80243D74; // type:data rom:0xEAC854 +EA8AE0_varTable = 0x80243D74; // type:data rom:0xEAC854 D_80243DD8_EAC8B8 = 0x80243DD8; // type:data rom:0xEAC8B8 D_80243DDC_EAC8BC = 0x80243DDC; // type:data rom:0xEAC8BC D_80248370_EB0E50 = 0x80248370; // type:data rom:0xEB0E50 EB0E60_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xEB0E60 EB0E60_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xEB0F84 -func_80240310_EB1170 = 0x80240310; // type:func rom:0xEB1170 +EB1170_StashVars = 0x80240310; // type:func rom:0xEB1170 EB1170_GetItemName = 0x802403C4; // type:func rom:0xEB1224 EB1170_GetNpcCollisionHeight = 0x80240428; // type:func rom:0xEB1288 EB1170_AddPlayerHandsOffset = 0x80240484; // type:func rom:0xEB12E4 @@ -22381,7 +22381,7 @@ func_802409F8_EB1858 = 0x802409F8; // type:func rom:0xEB1858 func_80240A3C_EB189C = 0x80240A3C; // type:func rom:0xEB189C func_80240A68_EB18C8 = 0x80240A68; // type:func rom:0xEB18C8 func_80240A8C_EB18EC = 0x80240A8C; // type:func rom:0xEB18EC -D_80241780_EB25E0 = 0x80241780; // type:data rom:0xEB25E0 +EB1170_varTable = 0x80241780; // type:data rom:0xEB25E0 D_802417E4_EB2644 = 0x802417E4; // type:data rom:0xEB2644 D_802417E8_EB2648 = 0x802417E8; // type:data rom:0xEB2648 EB5130_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xEB5130 @@ -22428,12 +22428,12 @@ ascii_EC2030 = 0x802491E0; // type:data rom:0xEC2030 D_802491F0_EC2040 = 0x802491F0; // type:data rom:0xEC2040 D_802491F8_EC2048 = 0x802491F8; // type:data rom:0xEC2048 EC2200_DeadUnkFunc1 = 0x80240000; // type:func rom:0xEC2200 -func_80240040_EC2240 = 0x80240040; // type:func rom:0xEC2240 +EC2240_StashVars = 0x80240040; // type:func rom:0xEC2240 EC2240_GetItemName = 0x802400F4; // type:func rom:0xEC22F4 func_80240158_EC2358 = 0x80240158; // type:func rom:0xEC2358 EC2610_foliage_setup_shear_mtx = 0x80240410; // type:func rom:0xEC2610 EC2610_TransformFoliage = 0x80240480; // type:func rom:0xEC2680 -D_80240F28_EC3128 = 0x80240F28; // type:data rom:0xEC3128 +EC2240_varTable = 0x80240F28; // type:data rom:0xEC3128 D_80244F88_EC7188 = 0x80244F88; // type:data rom:0xEC7188 D_80244F90_EC7190 = 0x80244F90; // type:data rom:0xEC7190 D_80244F98_EC7198 = 0x80244F98; // type:data rom:0xEC7198 @@ -22443,9 +22443,9 @@ EC71B0_SpawnSunEffect = 0x8024030C; // type:func rom:0xEC74BC func_80240344_EC74F4 = 0x80240344; // type:func rom:0xEC74F4 EC7590_foliage_setup_shear_mtx = 0x802403E0; // type:func rom:0xEC7590 EC7590_TransformFoliage = 0x80240450; // type:func rom:0xEC7600 -func_8024061C_EC77CC = 0x8024061C; // type:func rom:0xEC77CC +EC7590_StashVars = 0x8024061C; // type:func rom:0xEC77CC EC7590_GetItemName = 0x802406D0; // type:func rom:0xEC7880 -D_80241BB0_EC8D60 = 0x80241BB0; // type:data rom:0xEC8D60 +EC7590_varTable = 0x80241BB0; // type:data rom:0xEC8D60 EC9D00_SetOverrideFlags_40 = 0x80240000; // type:func rom:0xEC9D00 EC9D00_UnkFunc17 = 0x8024001C; // type:func rom:0xEC9D1C func_8024003C_EC9D3C = 0x8024003C; // type:func rom:0xEC9D3C @@ -22507,7 +22507,7 @@ D_802441D8_ED41C8 = 0x802441D8; // type:data rom:0xED41C8 D_802441E0_ED41D0 = 0x802441E0; // type:data rom:0xED41D0 func_80240000_ED4220 = 0x80240000; // type:func rom:0xED4220 ED4260_DeadUnkFunc1 = 0x80240040; // type:func rom:0xED4260 -func_80240080_ED42A0 = 0x80240080; // type:func rom:0xED42A0 +ED42A0_StashVars = 0x80240080; // type:func rom:0xED42A0 ED42A0_GetItemName = 0x80240134; // type:func rom:0xED4354 ED42A0_UpdateTexturePanSmooth = 0x80240198; // type:func rom:0xED43B8 ED42A0_UpdateTexturePanStepped = 0x802402BC; // type:func rom:0xED44DC @@ -22515,7 +22515,7 @@ func_802404B0_ED46D0 = 0x802404B0; // type:func rom:0xED46D0 func_80240B10_ED4D30 = 0x80240B10; // type:func rom:0xED4D30 ED5540_foliage_setup_shear_mtx = 0x80241320; // type:func rom:0xED5540 ED5540_TransformFoliage = 0x80241390; // type:func rom:0xED55B0 -D_80241DA0_ED5FC0 = 0x80241DA0; // type:data rom:0xED5FC0 +ED42A0_varTable = 0x80241DA0; // type:data rom:0xED5FC0 D_80244160_ED8380 = 0x80244160; // type:data rom:0xED8380 D_80244BB8_ED8DD8 = 0x80244BB8; // type:data rom:0xED8DD8 D_80244BEC_ED8E0C = 0x80244BEC; // type:data rom:0xED8E0C @@ -22530,14 +22530,14 @@ D_80243170_EDBF90 = 0x80243170; // type:data rom:0xEDBF90 func_80240000_EDBFE0 = 0x80240000; // type:func rom:0xEDBFE0 EDC020_foliage_setup_shear_mtx = 0x80240040; // type:func rom:0xEDC020 EDC020_TransformFoliage = 0x802400B0; // type:func rom:0xEDC090 -func_8024027C_EDC25C = 0x8024027C; // type:func rom:0xEDC25C +EDC020_StashVars = 0x8024027C; // type:func rom:0xEDC25C EDC020_GetItemName = 0x80240330; // type:func rom:0xEDC310 EDC020_GetNpcCollisionHeight = 0x80240394; // type:func rom:0xEDC374 EDC020_AddPlayerHandsOffset = 0x802403F0; // type:func rom:0xEDC3D0 func_802405C0_EDC5A0 = 0x802405C0; // type:func rom:0xEDC5A0 func_80240614_EDC5F4 = 0x80240614; // type:func rom:0xEDC5F4 func_8024064C_EDC62C = 0x8024064C; // type:func rom:0xEDC62C -D_802417EC_EDD7CC = 0x802417EC; // type:data rom:0xEDD7CC +EDC020_varTable = 0x802417EC; // type:data rom:0xEDD7CC D_80241850_EDD830 = 0x80241850; // type:data rom:0xEDD830 D_80241854_EDD834 = 0x80241854; // type:data rom:0xEDD834 func_80240000_EDE9C0 = 0x80240000; // type:func rom:0xEDE9C0 @@ -22878,6 +22878,7 @@ osMemSize = 0x80000318; // type:data D_8000031C = 0x8000031C; // type:data D_80026AC7 = 0x80026AC7; // type:data dead_atan2 = 0x8002AF70; // type:data +dead_heap_free = 0x8002C01C; // type:data D_8004AA85 = 0x8004AA85; // type:data gcc2_compiled. = 0x80060D60; // type:data ai = 0x8006AD64; // @@ -23343,6 +23344,7 @@ arn_09_pad_4CC = 0x802404CC; // type:data flo_22_pad_518 = 0x80240518; // type:data dgb_11_pad_56C = 0x8024056C; // type:data arn_09_pad_5A8 = 0x802405A8; // type:data +dgb_06_varTable = 0x80240620; // type:data varTable.2 = 0x80240620; // type:data dgb_10_pad_66C = 0x8024066C; // type:data arn_11_pad_674 = 0x80240674; // type:data @@ -23350,6 +23352,7 @@ sbk_00_pad_78C = 0x8024078C; // type:data dgb_06_pad_834 = 0x80240834; // type:data dgb_12_pad_868 = 0x80240868; // type:data flo_12_pad_86C = 0x8024086C; // type:data +dgb_12_varTable = 0x80240870; // type:data flo_18_pad_8B8 = 0x802408B8; // type:data flo_07_pad_8CC = 0x802408CC; // type:data kmr_03_pad_948 = 0x80240948; // type:data @@ -23398,6 +23401,7 @@ flo_19_pad_1A68 = 0x80241A68; // type:data dgb_02_pad_1AA8 = 0x80241AA8; // type:data flo_11_pad_1AB8 = 0x80241AB8; // type:data arn_03_pad_1BB8 = 0x80241BB8; // type:data +arn_03_varTable = 0x80241C68; // type:data varTable.32 = 0x80241C68; // type:data flo_10_pad_1CA8 = 0x80241CA8; // type:data dgb_07_pad_1E74 = 0x80241E88; // type:data @@ -23407,8 +23411,18 @@ some_80241FBC = 0x80241FBC; // type:data flo_09_pad_2004 = 0x80242004; // type:data flo_24_pad_21A4 = 0x802421A4; // type:data D_80242208 = 0x80242208; // type:data +D_80242310 = 0x80242310; // type:data +D_80242330 = 0x80242330; // type:data D_80242344 = 0x80242344; // type:data +D_80242350 = 0x80242350; // type:data +D_80242370 = 0x80242370; // type:data +D_80242390 = 0x80242390; // type:data D_802423B0 = 0x802423B0; // type:data +D_802423D0 = 0x802423D0; // type:data +D_802423F0 = 0x802423F0; // type:data +D_80242410 = 0x80242410; // type:data +D_80242430 = 0x80242430; // type:data +D_80242450 = 0x80242450; // type:data D_802424E0 = 0x802424E0; // type:data flo_23_pad_2598 = 0x80242598; // type:data flo_23_D_802426E0 = 0x802426E0; // type:data diff --git a/ver/us/undefined_syms.txt b/ver/us/undefined_syms.txt index 3bef3beb22..589ae3dc43 100644 --- a/ver/us/undefined_syms.txt +++ b/ver/us/undefined_syms.txt @@ -267,6 +267,7 @@ func_8004D8E0 = 0x8004D8E0; dead_rand_int = 0x8002ACEC; dead_get_npc_safe = 0x8003E534; dead_heap_malloc = 0x8002BFD4; +dead_heap_free = 0x8002C01C; dead_general_heap_malloc = 0x8002BF18; func_8002C01C = 0x8002C01C; dead_sin_deg = 0x8002B5DC;